Merge pull request #9718 from frederic34/patch-9

define $code for all execution paths
Prepare 6.0.8
2018-10-12 17:42:07 +02:00 · 2018-10-12 17:36:49 +02:00 · 2018-10-09 19:28:52 +02:00 · 2018-10-09 16:57:08 +02:00 · 2018-10-06 12:46:25 +02:00 · 2018-10-05 12:12:04 +02:00
4747 changed files with 142995 additions and 548831 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -0,0 +1,16 @@
+build
+build.xml
+ChangeLog
+composer.json
+CONTRIBUTING.md
+COPYING
+COPYRIGHT
+dev
+doc
+Dockerfile
+INSTALL
+README-FR.md
+README.md
+robots.txt
+scripts
+test
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@ dolibarr_install.log
 upgrade.log
 doxygen_warnings.log
 /.project
+/.vscode
 .DS_Store
 .idea
 *.iml
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,7 +37,6 @@ php:
 - '5.6'
 - '7.0'
 - '7.1'
- '7.2'
 #- hhvm		only with dist: trusty
 - nightly

@@ -64,6 +63,14 @@ matrix:
  - php: nightly
  # We exclude some combinations not usefull to save Travis CPU
  exclude:
+  - php: '5.4'
+    env: DB=mariadb
+  - php: '5.5'
+    env: DB=mariadb
+  - php: '5.6'
+    env: DB=mariadb
+  - php: '7.0'
+    env: DB=mariadb
  - php: '5.4'
    env: DB=postgresql
  - php: '5.5'
@@ -72,8 +79,6 @@ matrix:
    env: DB=postgresql
  - php: '7.0'
    env: DB=postgresql
-  - php: '7.1'
-    env: DB=postgresql
  - php: hhvm
    env: DB=postgresql
  - php: nightly
@@ -82,7 +87,7 @@ matrix:
 notifications:
  email:
    on_success: never # [always|never|change] default: change
-    on_failure: never # [always|never|change] default: always
+    on_failure: change # [always|never|change] default: always
  irc:
    channels:
    - "chat.freenode.net#dolibarr"
@@ -126,10 +131,7 @@ install:
  if [ "$TRAVIS_PHP_VERSION" = '5.3' ] || [ "$TRAVIS_PHP_VERSION" = '5.4' ] || [ "$TRAVIS_PHP_VERSION" = '5.5' ]; then
    composer -n require phpunit/phpunit ^4
  fi
-  if [ "$TRAVIS_PHP_VERSION" = '5.6' ] || [ "$TRAVIS_PHP_VERSION" = '7.0' ] || [ "$TRAVIS_PHP_VERSION" = '7.1' ]; then
-    composer -n require phpunit/phpunit ^5
-  fi
-  if [ "$TRAVIS_PHP_VERSION" = '7.2' ] || [ "$TRAVIS_PHP_VERSION" = 'nightly' ]; then
+  if [ "$TRAVIS_PHP_VERSION" = '5.6' ] || [ "$TRAVIS_PHP_VERSION" = '7.0' ] || [ "$TRAVIS_PHP_VERSION" = '7.1' ] || [ "$TRAVIS_PHP_VERSION" = 'nightly' ]; then
    composer -n require phpunit/phpunit ^5
  fi
  echo
@@ -169,7 +171,7 @@ before_script:
    #echo 'extension = apc.so' >> ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php.ini
    echo
    echo "Enabling Memcached for PHP <= 5.4"
-    #   Documentation says it should be available for all PHP versions but it's not for 5.5 and 5.6, 7.0, 7.1, 7.2 and nightly!
+    #   Documentation says it should be available for all PHP versions but it's not for 5.5 and 5.6, 7.0, 7.1 and nightly!
    echo 'extension = memcached.so' >> ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php.ini
  fi
  phpenv rehash
@@ -243,7 +245,7 @@ before_script:
  echo "Setting up Apache + FPM"
  # enable php-fpm
  cp ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php-fpm.conf.default ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php-fpm.conf
-  if [ "$TRAVIS_PHP_VERSION" = '7.0' ] || [ "$TRAVIS_PHP_VERSION" = '7.1' ] || [ "$TRAVIS_PHP_VERSION" = '7.2' ] || [ "$TRAVIS_PHP_VERSION" = 'nightly' ]; then
+  if [ "$TRAVIS_PHP_VERSION" = '7.0' ] || [ "$TRAVIS_PHP_VERSION" = '7.1' ] || [ "$TRAVIS_PHP_VERSION" = 'nightly' ]; then
    # Copy the included pool
    cp ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php-fpm.d/www.conf.default ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php-fpm.d/www.conf
  fi
@@ -319,34 +321,30 @@ script:
  php upgrade2.php 3.9.0 4.0.0 MAIN_MODULE_API,MAIN_MODULE_SUPPLIERPROPOSAL > $TRAVIS_BUILD_DIR/upgrade390400-2.log
  php step5.php 3.9.0 4.0.0 > $TRAVIS_BUILD_DIR/upgrade390400-3.log
  php upgrade.php 4.0.0 5.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade400500.log
-  php upgrade2.php 4.0.0 5.0.0 > $TRAVIS_BUILD_DIR/upgrade400500-2.log
+  php upgrade2.php 4.0.0 5.0.0 MAIN_MODULE_API,MAIN_MODULE_SUPPLIERPROPOSAL > $TRAVIS_BUILD_DIR/upgrade400500-2.log
  php step5.php 4.0.0 5.0.0 > $TRAVIS_BUILD_DIR/upgrade400500-3.log
  php upgrade.php 5.0.0 6.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade500600.log
-  php upgrade2.php 5.0.0 6.0.0 > $TRAVIS_BUILD_DIR/upgrade500600-2.log
+  php upgrade2.php 5.0.0 6.0.0 MAIN_MODULE_API,MAIN_MODULE_SUPPLIERPROPOSAL > $TRAVIS_BUILD_DIR/upgrade500600-2.log
  php step5.php 5.0.0 6.0.0 > $TRAVIS_BUILD_DIR/upgrade500600-3.log
  php upgrade.php 6.0.0 7.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade600700.log
-  php upgrade2.php 6.0.0 7.0.0 MAIN_MODULE_WEBSITE,MAIN_MODULE_SUPPLIERPROPOSAL > $TRAVIS_BUILD_DIR/upgrade600700-2.log
+  php upgrade2.php 6.0.0 7.0.0 MAIN_MODULE_API,MAIN_MODULE_SUPPLIERPROPOSAL > $TRAVIS_BUILD_DIR/upgrade600700-2.log
  php step5.php 6.0.0 7.0.0 > $TRAVIS_BUILD_DIR/upgrade600700-3.log
  cd -
  set +e
  echo
  #cat $TRAVIS_BUILD_DIR/upgrade400500-2.log
-  #cat $TRAVIS_BUILD_DIR/upgrade500600.log
-  #cat $TRAVIS_BUILD_DIR/upgrade500600-2.log
-  #cat $TRAVIS_BUILD_DIR/upgrade500600-3.log
  #cat /tmp/dolibarr_install.log
  
 - |
  echo "Unit testing"
-  phpunit --version
-  # Ensure we catch errors. Set this to +e if you want to go to the end to see dolibarr.log file.
+  # Ensure we catch errors. Set this to +e if you want to go to the end to see log file.
  set -e
  phpunit -d memory_limit=-1 -c test/phpunit/phpunittest.xml test/phpunit/AllTests.php
  set +e

 - |
  #echo "Output dolibarr.log"
-  #cat documents/dolibarr.log
+  #echo cat documents/dolibarr.log

 after_script:
 - |
--- a/11
+++ b/11
@@ -34,11 +34,12 @@ Swift Mailer           5.4.2-DEV     MIT license                 Yes
 Stripe                 4.7.0         MIT licence                 Yes             Library for Stripe module

 JS libraries:
-jQuery                 3.1.1         MIT License                 Yes             JS library
-jQuery UI              1.12.1        GPL and MIT License         Yes             JS library plugin UI
-jQuery select2         4.0.5         GPL and Apache License      Yes             JS library plugin for sexier multiselect
+jQuery                 1.11.3        MIT License                 Yes             JS library
+jQuery UI              1.11.4        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.70.0        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 FileUpload      5.0.3         GPL and MIT License         Yes             JS library to upload files
 jQuery Flot            0.8.3         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)
@@ -48,10 +49,10 @@ jQuery jqueryFileTree  1.0.1         GPL and MIT License         Yes
 jQuery jquerytreeview  1.4.1         MIT License                 Yes             JS library for filetree
 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
-jsGanttImproved        1.7.5.4       BSD License                 Yes             JS library (to build Gantt reports)
+jQuery Tiptip          1.3           GPL and MIT License         Yes             JS library for tooltips
+jsGanttImproved        1.7.5.2       BSD License                 Yes             JS library (to build Gantt reports)
 JsTimezoneDetect       1.0.6         MIT License                 Yes             JS library to detect user timezone
 SwaggerUI			   2.0.24		 GPL-2+                      Yes             JS library to offer the REST API explorer
-Ace                    1.2.8         BSD                         Yes             JS library to get code syntaxique coloration in a textarea.    

 For licenses compatibility informations:
 http://www.gnu.org/licenses/licenses.en.html
--- a/479
+++ b/479
@@ -2,451 +2,37 @@
 English Dolibarr ChangeLog
 --------------------------------------------------------------

-
-***** ChangeLog for 7.0.2 compared to 7.0.1 *****
-FIX: #8023
-FIX: #8259 can't update contact birthday with REST API
-FIX: #8359
-FIX: #8389
-FIX: #8478 !empty instead of count to avoid warning
-FIX: #8488
-FIX: #8559 Bug to generate cheque receipt
-FIX: #8571
-FIX: #8574
-FIX: #8580
-FIX: #8650
-FIX: actioncomm export: type filtering not working
-FIX: Add a test to avoid to reset binding by error.
-FIX: addline on invoice supplier manage rank on its own if not provided
-FIX: Add warning when expense report line not into range
-FIX: avoid Error: Call to undefined method mysqli::get_charset()
-FIX: avoid focus problem when select2 is in a modal dialog window
-FIX: Binding pages must start on fiscal month not calendar month
-FIX: button "Classify bill" on supplier order was not visible
-FIX: Button receive products not visible
-FIX: can bypass the CSRF protection with url with domain inside
-FIX: Can't edit option PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY
-FIX: commonobject: don't require notnull field if default set
-FIX: CommonObject: don't require 'notnull' field if 'default' set
-FIX: cron script disabled if module disabled
-FIX: CVE-2018-10092
-FIX: CVE-2018-10094
-FIX: CVE-2018-10095
-FIX: CVE-2018-9019
-FIX: CWE-89
-FIX: Data on income/expense report was always 0
-FIX: default addupdatedelete actions: uniformize add/update value checks
-FIX: default currency not set on supplier order creation from commercial menu #8459
-FIX: delete all product variants of a parent product
-FIX: Detail per account not visible when total < 0
-FIX: DOL_AUTOSET_COOKIE was not correctly setting value of cookie
-FIX: don't print empty date in CommonObject::showOutputField
-FIX: dont print empty date in CommonObject::showOutputField
-FIX: Draft invoice must be excluded from report
-FIX: environment shown on cron card
-FIX: Error in ContractLigne not return to Contract
-FIX: extrafields price and double were lost during a failed post.
-FIX: File name not visible in email preview
-FIX: filter/sorting on extrafield on contact list from contact tab
-FIX: Initial month on report income/expense per predefined group
-FIX: issue #8037
-FIX: Issue #8455
-FIX: issue #8470
-FIX: label in getnomurl projectlist
-FIX: limit access of email template page to internal users
-FIX: look and feel v7 "back to" for bookkeeping record
-FIX: Max nb of generation of recurring invoice should not show warning
-FIX: missing english name for object
-FIX: Missing include
-FIX: missing User object with API REST
-FIX: modulebuilder: could not create html fields
-FIX: modulebuilder: handle 'price' fieldtype
-FIX: multiple creation of same event
-FIX: Name of user not visible on journalizing expense report payments
-FIX: Not approved holidays must not be visible into timesheet
-FIX: Only approved expense report must be journalized
-FIX: payment term doc-specific label was not used
-FIX: payment term doc-specific label was not used (issue #8414)
-FIX: project category is type 6 not 5
-FIX: Projet is not prefilled when created from overwiew page
-FIX: Related contact printed in societe agenda
-FIX: Removed error when no error on accounting setup page
-FIX: remove var_dump
-FIX: sanitize setup params
-FIX: selectForFormsList: entity checked even is object not multi-entity managed
-FIX: service creation, right is tested regarding the product type
-FIX: some localtaxes errors
-FIX: Some report have data when several chart of accounts exists
-FIX: sql error using no category
-FIX: SQL Injection CWE-89
-FIX: Support or multicompany for sheduled jobs
-FIX: Test on mandatory status when closing proposal failed
-FIX: to allow IRPF not null even if main VAT is null.
-FIX: update wrong datetime extrafield
-FIX: Use priority to define order of sheduled jobs
-FIX: various modulebuilder-related issues
-FIX: view of balance before field
-FIX: weird password autocompletion in Goocle Chrome (issue #8479)
-FIX: weird password autocompletion in Google Chrome (issue #8479)
-FIX: When clearing filter, we must not save tmp criterias in session
-FIX: With x extrafields, request for multicompany label was done x times
-FIX: several XSS
-FIX: zip not filtered
-
-***** ChangeLog for 7.0.1 compared to 7.0.0 *****
-FIX: #8139 User search does not work if MAIN_USE_OLD_SEARCH_FORM, missing list.php
-FIX: #8200
-FIX: #8219
-FIX: #8232
-FIX: #8269
-FIX: #8277
-FIX: #8285 Extrafields now reported by /api/index.php/agendaevents/{id}
-FIX: #8289 add a configuration for stock calculation
-FIX: Activate all also if there are inactive services
-FIX: add planned delivery to order exports
-FIX: approval date was not visible if leave was canceled after
-FIX: avoid "Array" on screen
-FIX: Avoid empty value to fk_multicurrency attribute
-FIX: Bad var for substitution of free text
-FIX: Can't activate tasks on projects configuration
-FIX: Can use odx templates that does not include lines tags
-FIX: check shipping on delete order
-FIX: check verif exped on delete order
-FIX: comment on tasks
-FIX: country must not be mandatory for accounting report groups
-FIX: css
-FIX: Delete tasks on project delete will now trigger TASK_DELETE
-FIX: Do not lose filter when editing comment of a time spent in task view
-FIX: duplicate confirm message. Missing reposition class
-FIX: Duplicate product_type asignement on order addline
-FIX: email use the validate user instead of approver in holiday approval
-FIX: Error management in leave request
-FIX: for nondisplay of  fk_element 's id in  REST API response
-FIX: Generic substitution of constant disabled for sensitive constant
-FIX: if we make a mistake with situation_percent, now we can correct it. before situation_final was always set to 1 and no way to go back
-FIX: Import process must stop after ending line nb to import
-FIX: Infinite loop on deletion of temp file when there is symbolic links
-FIX: Input of holiday for subordinates was ko
-FIX: invoice creation fails when next date not defined
-FIX: Label of event show twice
-FIX: letter for month March
-FIX: Look and feel v7
-FIX: Make a redirect after the remove_file action to avoid deletion done
-FIX: migration script for product photo
-FIX: missing email of customer in stripe info payments
-FIX: missing object entity in fetch
-FIX: Missing restore_lastsearch_values
-FIX: multicompany compatibility and fix reports
-FIX: natural search double quote
-FIX: navigation and filters on holiday list
-FIX: Parameter must be an array or an object that implements Countable
-FIX: Payment mode not correctly set in donation and document
-FIX: Permission in list of holiday
-FIX: Properties updated if update successfull.
-FIX: reverse field to have object loaded in doaction
-FIX: Saving wrong localtax on order addline
-FIX: Search criteria on vat
-FIX: security report by DIGITEMIS CYBERSECURITY & PRIVACY
-FIX: show status on societe banner
-FIX: solve column mismatch in user card with multicompany transverse mode + code cleanup
-FIX: Subscription events not recorded into agenda
-FIX: Subscription not correctly log in blockedlog
-FIX: Temporary dir for mail files must be cleaned at beginning of form
-FIX: Trad and creation date in subscription create
-FIX: translation of holiday types
-FIX: Unknown column 'pl.amount_requested' in compta/prelevement/factures.php
-FIX: Useless clean of tree
-FIX: Use of undefined constant _ROWS_2
-FIX: warning when adding ECM files using old photo path
-
-
-***** ChangeLog for 7.0.0 compared to 6.0.5 *****
-For users:
-NEW: Add a preview icon after files that can be previewed (pdf + images)
-NEW: When payment is registered, PDF of invoices are also regenerated so payments
-     appears with no need to click on regenerate.
-NEW: #5711 Add shipment line deleting and editing for draft shipments.
-NEW: Accept substitution key __(ABC)__ replaced with value of translation of key ABC
-NEW: Accept substitution key __[ABC]__ replaced with value of const ABC
-NEW: Accountancy Add fields for sale accounting account for intracommunity sales & export sales
-NEW: Add a button "Activate all services" on contracts
-NEW: Add a confirmation for all mass action 'delete'
-NEW: Add a group task line for tasks on same level on gantt diagram
-NEW: Add and edit country for chart of accounts systems
-NEW: add a new notification for the signed closed event of a proposal.
-NEW: Add a parameter to specify char used as separator for variant product label
-NEW: Add a profile to import product translations
-NEW: Add a protection so we can't journalize non balanced transactions
-NEW: Add a status enabled/disabled on recurring invoices
-NEW: add burger menu to list action comm
-NEW: Add button cancel on shipment creation
-NEW: Add chart of account for england
-NEW: Add Chile accounting plan
-NEW: Add class in societe/card.php
-NEW: add company alias name when create company from member
-NEW: Add date of birth on user card.
-NEW: Add date_valid and date_pointoftax on supplier invoices.
-NEW: Added Region name to state/province form field
-NEW: Added regions to third party/societe lists, can be filtered
-NEW: Add error message
-NEW: Add expense report rules and ik
-NEW: Add filter on event code on automatic filling setup page
-NEW: Add filters on month/year on the accountancy binding tools
-NEW: add fk_unit field into product/service import/export
-NEW: add 'formObjectOptions' hook to the form setting the product selling price
-NEW: Add hidden option PROJECT_DISABLE_UNLINK_FROM_OVERVIEW
-NEW: add image object_phoning_mobile.png
-NEW: Adding Field "First date of expire" + filter on contract list
-NEW: add ldap_rename for avoid password if ldap key changed
-NEW: Add mass action "validate" on supplier invoices.
-NEW: add members types ldap group management
-NEW: Add new property visible dy default on lists on extrafields
-NEW: Add Next/Previous button on operation date of bank line
-NEW: Add option EXPENSEREPORT_ALLOW_OVERLAPPING_PERIODS
-NEW: Add option PROPOSAL/ORDER/INVOICE_ALLOW_EXTERNAL_DOWNLOAD
-NEW: Add product unit fields for ODT substitution
-NEW: Add project on a various payment
-NEW: Add project related fields to ODT
-NEW: Add protection to avoid to send to much emails using builk actions
-NEW: Add search field for date on supplier payment page
-NEW: Add search on date and accounting account in various payment list
-NEW: add specific translation for title of documents (Invoice, Order, Proposal)
-NEW: Adds the payment reference to the return of the function getListOfPayements
-NEW: Add supplier proposals into stats of product page.
-NEW: Add tab "Expense report" on user card
-NEW: add the ability to regenerate a pdf for the order module
-NEW: Add The accountancy Switzerland chart of accounts
-NEW: Add The developed French chart of accounts 2014
-NEW: Add The Luxembourg chart of accounts
-NEW: Add The Moroccan chart of accounts
-NEW: Add The Switzerland chart of accounts
-NEW: Add The SYSCOHADA chart of accounts
-NEW: Add the total in the perday view of the time spent form.
-NEW: Add The Tunisia chart of accounts
-NEW: Add toolkit for StockLimit and DesiredStock
-NEW: add translation and possibility to change month and year
-NEW: Add view of status of template invoice
-NEW: All search boxes are available on smartphone
-NEW: All setup of accountancy can be done from menu "Accountancy-Setup"
-NEW: Attaching doc automatically in email is now a parameter of template.
-NEW: automatic activation of external module on country set
-NEW: Better autoselect customer or supplier fields to save clicks
-NEW: Better behaviour when using a text browser
-NEW: Break lines per project on the new timesheet page
-NEW: Bulk action validate on customer invoices
-NEW: Bulk delete actions available on leave requests
-NEW: burger menu and hooks on list action
-NEW: Can add html content on right of tabs
-NEW: Can add link to other element on a donation
-NEW: Can create intervention from a proposal
-NEW: Can create thirdparty from card proposal, order or invoice
-NEW: Can download PDF document from the payment page
-NEW: Can edit the language into the email templates editor.
-NEW: Can edit with delete/insert a forced translation
-NEW: Can export list of stock movements
-NEW: Can filter on date on the page showing existing bindings
-NEW: Can filter on document name in ECM module for automatic tree
-NEW: can filter on status of template invoices
-NEW: Can filter on the "other" column on emailing target list
-NEW: Can filter on type of email template
-NEW: Can filter on user on unalterable log
-NEW: Can import local tax rates in prices
-NEW: Can include extrafields into member card templates
-NEW: Can include tag {uuu} into some numbering masks to replace with user
-NEW: Can make a specific setup for SMTP sending for emailing module
-NEW: Can rename (so reorder) bank receipts
-NEW: Can send email from contract card
-NEW: Can send email from the member card using email templates.
-NEW: Can set a dedicated message on payment forms
-NEW: Can set email of thirdparty as unique and/or mandatory
-NEW: Can setup csv accounting export from admin config
-NEW: Can show currency in list of bank accounts
-NEW: Can show stock in alert even if alter is set to 0
-NEW: Can sort joined files on thirdparty and user card.
-NEW: Can transfer from bank account to bank account with different currencies
-NEW: Can use an url like $conf->global>-MYPARAM for menu urls
-NEW: change description on click
-NEW: Chart of account is loaded when selected into accounting setup
-NEW: Classify the order as invoiced in the REST API
-NEW: comments system on task
-NEW: comment system working with all objects
-NEW: Compatibility with PHP 7.2
-NEW: confirm form style to accept or reject proposal
-NEW: Create an invoice using an existing order
-NEW: Create an order using an existing proposal
-NEW: customizable meteo in value or percentage
-NEW: Days where user is on vacation use different colors in timesheet.
-NEW: Deduct an available credit to an existing invoice
-NEW: Default filter and sort order can use partial list of query
-NEW: Deposit invoice more explicit in invoice line description
-NEW: deposits can be converted even if unpaid
-NEW: detection of edge browser
-NEW: Each user can edit its own email template (menu tools)
-NEW: Enabled sending email in bulk actions for supplier orders
-NEW: Enhance the anti XSS filter
-NEW: extrafield on facture_rec
-NEW: Extrafields "link to object" now use a combo selection and getNomUrl
-NEW: filter date for blockedlog
-NEW: filter on extrafield on product list (as in company list)
-NEW: General ledger : Add field date_creation and selected field
-NEW: generate also document when invoice is build from recurring template
-NEW: Generated files are now indexed in database
-NEW: generate invoice PDF on disount application or payment
-NEW: Get a list of payments terms
-NEW: hrm details output on user
-NEW: If max nb of generation is reached, date for next gen is striked
-NEW: improvements of invoices, orders and proposals in the REST API
-NEW: Include a color syntaxed HTML editor for emailing edition.
-NEW: Introduce code syntax coloration with mode 'ace' for DolEditor.
-NEW: Introduce experimental feature to search dolistore from application
-NEW: jquery date selector become default date selector
-NEW: langs
-NEW: link project from other company conf
-NEW: manageme extrafields with multientity
-NEW: Mass PDF Merging is available on contracts
-NEW: merge categories while merging thirdparties
-NEW: Merge resource/add.php to resource/card.php
-NEW: Module "Product variants" is moved as stable.
-NEW: More picto for phone
-NEW: Move accountancy features into a dedicated menu
-NEW: Move contacts of a thirdparty on tab Contacts/Addresses
-NEW: Move the upload input on top right in ECM module
-NEW: new columns into extrafields table to get update create information
-NEW: new param on load_board() function in ActionComm class to avoid duplicate code
-NEW: On bulk email from a list, can uncheck "Join main document".
-NEW: On reconciliation, show balance including all reconciliated fields
-NEW: Option "one email per recipient" when using bulk actions emails.
-NEW: Option STOCK_SUPPORTS_SERVICES become visible.
-NEW: option to avoid countries to disable there blockedlog
-NEW: option to fix top menu with eldy theme (hidden conf)
-NEW: Popup for preview of image add a button "Original size"
-NEW: post lines of an invoice using the REST API
-NEW: preload comments in task
-NEW: Provide a way to download a file from a public URL for files in ECM
-NEW: Reduce size of HTML page by removing duplicate tooltips
-NEW: Remove background on agenda view when event is a not busy event.
-NEW: Retrieves available discounts and payments details from a specific invoice
-NEW: Revenue stamp can be a percent
-NEW: Search filters in lists are restored when using "back to list"
-NEW: Send by email available in bulk for expense report
-NEW: Set a proposal to draft
-NEW: Show badge with nbr of shipment on shimpen tab of order
-NEW: Show country and vat number into company tooltip
-NEW: Show direct preview link on contract
-NEW: Show expected worked hours on the timesheet form.
-NEW: Show line "other filtered task" when using filter on timesheet.
-NEW: Show list of tracked events into the module config page.
-NEW: Show the supplier ref into supplier cards
-NEW: Show user id of web process in system info - web server
-NEW: Summary of last events on a card are sorted on decreasing date.
-NEW: Support Italian addresses format. Fixes #7785
-NEW: Support visibility on extrafields
-NEW: Template invoices are visible on the customer tab
-NEW: template invoices support substition key
-NEW: The bank account is visible on payment of taxes
-NEW: The comment when closing a proposal is added to commercial proposal
-NEW: The gantt diagram is now sensitive to hours
-NEW: The lot of a product uses the link and picto when shown into list.
-NEW: The "Show detail by account" accepts 3 values: yes, no, if non zero
-NEW: The unalterable log can be browse by any user with he permission
-NEW: Tooltip for substitutions variables on tooltips on admin pages
-NEW: unexistant function load_state_board() on several objects
-NEW: Update availability
-NEW: Update bank account when updating an invoice
-NEW: Update bank account when updating an order
-NEW: Use autocompletion on selection of chart of account
-NEW: view company name if different of fullname in dol_banner
-NEW: warning on module blocked log reset if country code is FR
-
-For developers:
-NEW: Add 2 new automatic classification in workflow module
-NEW: Add API for contracts
-NEW: Add API to activate/unactivate a contract
-NEW: Add api validate and close on contracts
-NEW: add doActions hook in admin ihm
-NEW: add doActions hook in company admin
-NEW: Added functionality to get order customer contact as contact_xx tags
-NEW: Add hook addAdminLdapOptions and doAction in ldap admin page
-NEW: Add method executeCLI and a phpunit
-NEW: add '$moreatt' parameter in picto_from_langcode function
-NEW: Add non intrusive js library to make syntaxic coloring of textarea
-NEW: Add payment line to a specific invoice using the REST API
-NEW: add possibility to disabled the LDAP trigger
-NEW: add possibility to hide LDAP tab for non admin
-NEW: Add possibility to propose last num releve in conciliation
-NEW: add possibility to remove address field
-NEW: Add REST API for supplier proposals
-NEW: Add REST API to add payment line to a specific invoice
-NEW: Add the attribute accept to the input form for file upload
-NEW: add translation column for extrafields list
-NEW: Add performances indexes on calendar events
-NEW: A module can change order of element in the quick search combo
-NEW: Can test signature of a version from API
-NEW: complete_head_from_modules() in ldap_prepare_head()
-NEW: Consolidates REST dictionary APIs into a single tree and a single file
-NEW: Delete a line of invoice using the REST API
-NEW: documents REST API return list of documents by element
-NEW: Download a document using the REST API
-NEW: Enhance framework so we can use html/icons into SELECT options.
-NEW: External module can interact with the customer summary page
-NEW: Generates the document before downloading using REST API
-NEW: get and post lines of an invoice using the REST API
-NEW: Get a payment list of a given invoice using the REST API
-NEW: Get available assets of an invoice using the REST API
-NEW: Get credit notes or deposits of a thirdparty
-NEW: GET lines of an invoice in the REST API
-NEW: get payment types using the REST API + consolidates REST dictionary APIs
-NEW: Get the list of payments terms.
-NEW: hook formObjectOptions in the form setting product selling price
-NEW: hook to enrich homepage open elements dashboard
-NEW: Insert a discount in a specific invoice using the REST API
-NEW: Remove js library fileupload that was not used by core code.
-NEW: Remove tooltip tipTip library replaced with standatd jquery tooltip
-NEW: Set invoices as draft using the REST API
-NEW: Sets an invoice as paid using the REST API
-NEW: Tag the order as validated (opened) in the REST API
-NEW: Update end of validity date of proposal using the API
-NEW: Update in the order REST API
-NEW: Upgrade jquery select2 to 4.0.4
-
-
-WARNING:
-
-If you enabled (for test) the experimental BlockedLog module before 7.0, you must purge the table llx_blockedlog because
-way to save data for final version has changed.
-
-Following changes may create regressions for some external modules, but were necessary to make Dolibarr better:
-* The methode "cloture" on contract were renamed into "closeAll".
-* The method "is_erasable" of invoice return a value <= 0 if not erasable (value is meaning) instead of always 0.  
-* The substitution key for reference of objects is now __REF__ whatever is the object (it replaces __ORDERREF__, 
-  __PROPALREF__, ...)
-* The substition key __SIGNATURE__ was renamed into __USER_SIGNATURE__ to follow naming conventions. 
-* Substitution keys with syntax %XXX% were renamed into __XXX__ to match others.
-* Removed old deprecated REST API (APIs found into '/root' section of the REST API explorer in Dolibarr v6).
-* Some REST API to access setup features, like dictionaries (country, town, extrafields, ...) were moved into a 
-  common API "/setup".
-* The REST API /documents were renamed into /documents/download and /documents/upload. 
-* Page bank/index.php, bank/bankentries.php and comm/actions/listactions.php were renamed into 
-  bank/list.php, bank/bankentries_list.php and comm/actions/list.php to follow page naming
-  conventions (so default filter/sort order features can also work for this pages).
-* The trigger ORDER_SUPPLIER_STATUS_ONPROCESS was renamed into ORDER_SUPPLIER_STATUS_ORDERED.
-* The trigger ORDER_SUPPLIER_STATUS_RECEIVED_ALL was renamed into ORDER_SUPPLIER_STATUS_RECEIVED_COMPLETELY.
-* The parameter note into method cloture() is added at end of private note (previously in v6, it replaced).
-* The parameter $user is now mandatory for method createFromOrder and createFromPropal.
-* Removed js library 'fileupload' that was not used by core code.
-* Jquery plugin tableDnd updated. You now need to use decodeURI on the return value of tableDnDSerialize() 
-  and add 'td.' to the beginning of the dragHandle match string. 
-* IE8 and earlier and Firefox 12 and earlier (< 2012) are no more supported. 
-* The module ExpenseReport use numbering rules that you can setup (like other modules do). If you need to 
-  keep the hard coded numbering rule of expenses report used in 6.0, just add constant
-  EXPENSEREPORT_USE_OLD_NUMBERING_RULE to 1.
-* If you use the external module "multicompany", you must also upgrade the module. Multicompany module for
-  Dolibarr v7 is required because with Dolibarr v7, payment modes and payment conditions are management as data
-  that are dedicated to each company. If you keep your old version of multicompany module, mode and
-  condition of payments will appears empty in all companies that are not the first one. By upgrading the 
-  multicompany module to a version that support Dolibarr v7, everything should work as expected. 
-
-
+***** ChangeLog for 6.0.8 compared to 6.0.7 *****
+FIX: #8762
+FIX: #9032
+FIX: case when we valid form with keyboard
+FIX: clause must not be there
+FIX: dol_delete_file must work in a context without db handler loaded
+FIX: entity test must be on product_fourn_price table and not product table
+FIX: Fetch shipping will now fetch project id
+FIX: $fk_account is always empty, must be $soc->fk_account
+FIX: getEntity project and not projet
+FIX: If we enable 3 steps for supplier order approbation, we must no…
+FIX: If we enable 3 steps for supplier order approbation, we must not delete all fourn rights def.
+FIX: Keep supplier proposal price for supplier order
+FIX: langs fr
+FIX: missing filters during ordering
+FIX: missing filters during reordering
+FIX: need to filter on aa.entity for same accounting accounts available in several entities
+FIX: page must always be 0 when we search
+FIX: page must always be 0 when we search (to avoid case : when we're on page 3 and we're looking for a precise thirdparty, we stay on page 3 and nothing's displaied)
+FIX: PDF address: handle when contact thirdparty different from document thirdparty
+FIX: propal: correctly preset project when creating with origin/originid
+FIX: pu_ht_devise was not converted to numeric so decimals were lost
+FIX: pu_ht_devise was not converted to numeric so decimals were lost when calculating total_ht_devise
+FIX: remain to pay for credit note was wrong on invoice list
+FIX: shipment: fk_proje(c)t not handled in fetch() and update() methods
+FIX: showOptionals: column mismatches
+FIX: sometimes amounts are identical but php find them different.
+FIX: test is_erasable() must be done before call function delete()
+FIX: test is_erasable() must be done before call function delete() too to avoid delete invoice with &action=delete in url
+FIX: we must see number of all shared projects
+FIX: wrong var name

 ***** ChangeLog for 6.0.7 compared to 6.0.6 *****
 FIX: #8023
@@ -541,7 +127,6 @@ FIX: test for filter fk_status
 FIX: too much users on holiday list
 FIX: Wrong alias sql

-
 ***** ChangeLog for 6.0.3 compared to 6.0.2 *****
 FIX: #7211 Update qty dispatched on qty change
 FIX: #7458
@@ -641,7 +226,7 @@ FIX: View of timespent for another user
 FIX: ODT generation
 FIX: CVE-2017-9840, CVE-2017-14238, CVE-2017-14239, CVE-2017-14240, CVE-2017-14241,
     CVE-2017-14242 
-     
+
 ***** ChangeLog for 6.0.0 compared to 5.0.* *****
 NEW: Add experimental BlockeLog module (to log business events in a non reversible log file).
 NEW: Add a payment module for Stripe. 
--- a/build/docker/Dockerfile
+++ b/build/docker/Dockerfile
@@ -1,7 +1,4 @@
-FROM php:7.0-apache
-
-ENV HOST_USER_ID 33
-ENV PHP_INI_DATE_TIMEZONE 'UTC'
+FROM php:5.6-apache

 RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libldap2-dev \
 	&& rm -rf /var/lib/apt/lists/* \
@@ -12,9 +9,11 @@ RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libldap2-dev \
        && docker-php-ext-install mysqli \
        && apt-get purge -y libpng12-dev libjpeg-dev libldap2-dev

-COPY docker-run.sh /usr/local/bin/
-RUN chmod +x /usr/local/bin/docker-run.sh
+COPY htdocs/ /var/www/html/
+
+RUN chown -hR www-data:www-data /var/www/html
+
+VOLUME /var/www/html/conf
+VOLUME /var/www/html/documents

 EXPOSE 80
-
-ENTRYPOINT ["docker-run.sh"]
--- a/README.md
+++ b/README.md
@@ -1,10 +1,10 @@
 # DOLIBARR ERP & CRM

-![Build status](https://img.shields.io/travis/Dolibarr/dolibarr/develop.svg) ![Downloads per day](https://img.shields.io/sourceforge/dm/dolibarr.svg)
+![Build status](https://img.shields.io/travis/Dolibarr/dolibarr/6.0.svg) ![Downloads per day](https://img.shields.io/sourceforge/dm/dolibarr.svg)

-Dolibarr ERP & CRM is a modern software package to manage your organization's activity (contacts, suppliers, invoices, orders, stocks, agenda…).
+Dolibarr ERP & CRM is a modern software package to manage your organization's activity (contacts, suppliers, invoices, orders, stocks, agenda, ...).

-It's an Open Source Software (written in PHP language) designed for small, medium or large companies, foundations and freelances.
+It's an Open Source software (wrote in PHP language) designed for small, medium or large companies, foundations and freelances.

 You can freely use, study, modify or distribute it according to its Free Software licence.

@@ -29,25 +29,18 @@ Other licenses apply for some included dependencies. See [COPYRIGHT](https://git
 Releases can be downloaded from [official website](https://www.dolibarr.org/).

 ### Install from composer
+If you do not already have Composer installed, you may do so by following the instructions at getcomposer.org. On Linux and Mac OS X, you'll run the following commands:

-If you do not already have Composer installed, you may do so by following the instructions at [getcomposer.org](https://getcomposer.org/). On Linux and macOS, you may run the following commands:
-
-```bash
 curl -sS https://getcomposer.org/installer | php
 mv composer.phar /usr/local/bin/composer
-```

-On Windows, you can download and run https://getcomposer.org/Composer-Setup.exe
+On Windows, you'll download and run https://getcomposer.org/Composer-Setup.exe

-You can then create a new project
-
-```bash
 composer create-project dolibarr/dolibarr erp
-```

 ### Simple setup

-If you have low technical skills and you're looking to install Dolibarr ERP/CRM in just a few clicks, you can use one of the packaged versions:
+If you have low technical skills and you're looking to install Dolibarr ERP/CRM in few clicks, you can use one of the packaged versions:

 - DoliWamp for Windows
 - DoliDeb for Debian or Ubuntu
@@ -55,11 +48,11 @@ If you have low technical skills and you're looking to install Dolibarr ERP/CRM

 ### Advanced setup

-You can use a Web server and a supported database (MariaDB, MySQL or PostgreSQL) to install the standard version.
+You can use a Web server and a supported database (MariaDb, MySql or Postgresql) to install the standard version.

 - Uncompress the downloaded archive
- Copy the "dolibarr" directory and all its files inside your web server root or anywhere you'd like and set up your web server to use "*dolibarr/htdocs*" as root for a new web server virtual host (second choice need to be server administrator)
- Create an empty `htdocs/conf/conf.php` file and set permissions for your web server user (*write* permissions will be removed once install is finished)
+- Copy directory "dolibarr" and all its files inside your web server root, or copy directory anywhere and set up your web server to use "dolibarr/htdocs" as root for a new web server virtual host (second choice need to be server administrator)
+- Create an empty file "htdocs/conf/conf.php" and set permissions for your web server user (write permissions will be removed once install is finished)
 - From your browser, go to the dolibarr "install/" page

    The URL will depends on choices made in the first step:
@@ -80,10 +73,10 @@ You can use a Web server and a supported database (MariaDB, MySQL or PostgreSQL)
 ## UPGRADING

 - Overwrite all old files from 'dolibarr' directory with files provided into the new version's package.
- At first next access, Dolibarr will redirect your to the "install/" page to follow the upgrade process.
-  If an `install.lock` file exists to lock any other upgrade process, the application will ask you to remove the file manually (you should find the `install.lock` file into the directory used to store generated and uploaded documents, in most cases, it is the directory called "*documents*").
+- At first next access, Dolibarr will redirect your to the "install/" page to make the upgrade process.
+  If a file install.lock exists to lock any run of upgrade process, the application will ask you to remove the file manually (you should find the install.lock file into the directory used to store generated and uploaded documents, in most cases, it is the directory called "documents").

-*Note: migration process can be safely done multiple times by calling the `/install/index.php` page*
+*Note: migration process can safely be done multiple times by calling the page /install/index.php*


 ## WHAT'S NEW
@@ -179,7 +172,7 @@ Administrator, user, developer and translator's documentations are available alo

 ## CONTRIBUTING

-See [CONTRIBUTING](https://github.com/Dolibarr/dolibarr/blob/develop/.github/CONTRIBUTING.md) file
+See file [CONTRIBUTING](https://github.com/Dolibarr/dolibarr/blob/develop/.github/CONTRIBUTING.md)


 ## CREDITS
--- a/build/debian/patches/use-etc-dolibarr-conf.patch
+++ b/build/debian/patches/use-etc-dolibarr-conf.patch
@@ -34,4 +34,17 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 +$conffiletoshow = "/etc/dolibarr/conf.php";
 
 
+ // Load conf file if it is already defined
+--- a/htdocs/support/inc.php
+++ b/htdocs/support/inc.php
+@@ -69,8 +69,8 @@ $conffiletoshowshort = "conf.php";
+ $conffile = "../conf/conf.php";
+ $conffiletoshow = "htdocs/conf/conf.php";
+ // For debian/redhat like systems
+-//$conffile = "/etc/dolibarr/conf.php";
+-//$conffiletoshow = "/etc/dolibarr/conf.php";
+$conffile = "/etc/dolibarr/conf.php";
+$conffiletoshow = "/etc/dolibarr/conf.php";
+ 
+ 
 // Load conf file if it is already defined
--- a/build/debian/rules
+++ b/build/debian/rules
@@ -10,23 +10,12 @@ export DH_OPTIONS=-v
 %:
 	dh $@

-# Replace standard debian package actions with a new one
-########################################################
-
 override_dh_auto_clean:
 # Do nothing. Added to disable launchpad to use bugged dh_auto_clean search for ant

 override_dh_auto_build:
 # Do nothing. Added to disable launchpad to use bugged dh_auto_build search for ant
-
-#override_dh_compress:
-#	dh_compress --no-act -X.png
-
-# We disable this for png file because it modify content of original file so make
-# the dolibarr signature not valid.
-override_dh_strip_nondeterminism:
-	dh_strip_nondeterminism -X.png
-
+	
 override_dh_install:
 	dh_install
 	# Delete files
--- a/build/docker/.dockerignore
+++ b/build/docker/.dockerignore
@@ -1,3 +0,0 @@
-Dockerfile
-README.md
-docker-compose.yml
--- a/build/docker/README.md
+++ b/build/docker/README.md
@@ -1,25 +0,0 @@
-# How to use it ?
-
-The docker-compose.yml file is used to build and run Dolibarr in the current workspace.
-
-Before build/run, define the variable HOST_USER_ID as following:
-
-        export HOST_USER_ID=$(id -u)
-
-Go in repository build/docker :
-
-        cd build/docker
-
-And then, you can run :
-
-        docker-compose up
-
-This will run 3 container Docker : Dolibarr, MariaDB and PhpMyAdmin.
-
-The URL to go to the Dolibarr is :
-
-        http://0.0.0.0
-
-The URL to go to PhpMyAdmin is (login/password is root/root) :
-
-        http://0.0.0.0:8080
--- a/build/docker/docker-compose.yml
+++ b/build/docker/docker-compose.yml
@@ -1,25 +0,0 @@
-mariadb:
-    image: mariadb:latest
-    environment:
-        MYSQL_ROOT_PASSWORD: root
-        MYSQL_DATABASE: dolibarr
-
-phpmyadmin:
-    image: phpmyadmin/phpmyadmin
-    environment:
-        PMA_HOST: mariadb
-    links:
-        - mariadb
-    ports:
-        - "8080:80"
-
-web:
-    build: .
-    environment:
-        HOST_USER_ID: $HOST_USER_ID
-    volumes:
-        - ../../htdocs:/var/www/html
-    links:
-        - mariadb
-    ports:
-        - "80:80"
--- a/build/docker/docker-run.sh
+++ b/build/docker/docker-run.sh
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-usermod -u $HOST_USER_ID www-data
-groupmod -g $HOST_USER_ID www-data
-
-chown -hR www-data:www-data /var/www
-
-if [ ! -f /usr/local/etc/php/php.ini ]; then
-  cat <<EOF > /usr/local/etc/php/php.ini
-date.timezone = $PHP_INI_DATE_TIMEZONE
-display_errors = On
-EOF
-fi
-
-exec apache2-foreground
--- a/build/doxygen/dolibarr-doxygen.doxyfile
+++ b/build/doxygen/dolibarr-doxygen.doxyfile
@@ -442,7 +442,7 @@ SORT_BY_SCOPE_NAME = NO
 # disable (NO) the todo list. This list is created by putting \todo
 # commands in the documentation.

-GENERATE_TODOLIST = NO
+GENERATE_TODOLIST = YES

 # The GENERATE_TESTLIST tag can be used to enable (YES) or
 # disable (NO) the test list. This list is created by putting \test
@@ -639,7 +639,7 @@ EXCLUDE_SYMBOLS =
 # directories that contain example code fragments that are included (see
 # the \include command).

-EXAMPLE_PATH = ../../htdocs/modulebuilder/template 
+EXAMPLE_PATH = ../../dev/skeletons

 # If the value of the EXAMPLE_PATH tag contains directories, you can use the
 # EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
--- a/build/exe/doliwamp/Languages/MyEnglish.isl
+++ b/build/exe/doliwamp/Languages/MyEnglish.isl
@@ -43,5 +43,3 @@ DoliWampWillStartApacheMysql=DoliWamp installer will now start or restart Apache
 OldVersionFoundAndMoveInNew=An old database version has been found and moved to be used by new Dolibarr version
 OldVersionFoundButFailedToMoveInNew=An old database version has been found but could not be moved to be used with new Dolibarr version

-DLLMissing=The "Visual C++ Redistributable for Visual Studio 2012" component is missing. Please install the 32-bit version (vcredit_x86.exe) first from https://www.microsoft.com/en-us/download/details.aspx?id=30679 and restart DoliWamp installation/upgrade.
-ContinueAnyway=Continue anyway (install process may fails without this prerequisite)
--- a/build/exe/doliwamp/doliwamp.iss
+++ b/build/exe/doliwamp/doliwamp.iss
@@ -32,7 +32,7 @@ AppPublisherURL=http://www.nltechno.com
 AppSupportURL=http://www.dolibarr.org
 AppUpdatesURL=http://www.dolibarr.org
 AppComments=DoliWamp includes Dolibarr, Apache, PHP and Mysql softwares.
-AppCopyright=Copyright (C) 2008-2017 Laurent Destailleur (NLTechno), Fabian Rodriguez (Le Goût du Libre)
+AppCopyright=Copyright (C) 2008-2016 Laurent Destailleur, NLTechno
 DefaultDirName=c:\dolibarr
 DefaultGroupName=Dolibarr
 ;LicenseFile=COPYING
@@ -202,30 +202,10 @@ var value: String;
 function InitializeSetup(): Boolean;
 begin
  Result := MsgBox(CustomMessage('YouWillInstallDoliWamp')+#13#13+CustomMessage('ThisAssistantInstallOrUpgrade')+#13#13+CustomMessage('IfYouHaveTechnicalKnowledge')+#13#13+CustomMessage('ButIfYouLook')+#13#13+CustomMessage('DoYouWantToStart'), mbConfirmation, MB_YESNO) = IDYES;
-
-  if Result then
-  begin
-  
-	//----------------------------------------------
-	// Test if msvcr110 DLL has been installed
-	//----------------------------------------------
-	
-	if not FileExists ('c:/windows/system32/msvcr110.dll') and not FileExists ('c:/windows/sysWOW64/msvcr110.dll') and not FileExists ('c:/winnt/system32/msvcr110.dll') and not FileExists ('c:/winnt/sysWOW64/msvcr110.dll') then
-	begin
-	    // TODO - offer to install the component by opening the URL in the default browser, abort installation if user doesn't accept 
-	    Result := MsgBox(CustomMessage('DLLMissing')+#13#13+CustomMessage('ContinueAnyway'), mbConfirmation, MB_YESNO) = IDYES;
-	    
-	end;
-	// Pb seems similar with msvcp110.dll
-	//vcredist_x64.exe
-	  
-  end;
-
 end;

 procedure InitializeWizard();
 begin
-
  //version des applis, a modifier pour chaque version de WampServer 2
  apacheVersion := '2.4.9';
  phpVersion := '5.5.12' ;
@@ -237,7 +217,6 @@ begin
  mysqlPort := '3306';
  newPassword := 'changeme';

-
  firstinstall := true;


@@ -365,6 +344,19 @@ begin
    exedirold := pathWithSlashes+'/bin/mysql/mysql5.0.45';
    exedirnew := pathWithSlashes+'/bin/mysql/mysql5.0.45';

+
+    //----------------------------------------------
+    // Test if msvcr110 DLL has been installed
+    //----------------------------------------------
+	
+    if not FileExists ('c:/windows/system32/msvcr110.dll') and not FileExists ('c:/windows/sysWOW64/msvcr110.dll') and not FileExists ('c:/winnt/system32/msvcr110.dll') and not FileExists ('c:/winnt/sysWOW64/msvcr110.dll') then
+    begin
+      // TODO Copy file or ask to install package ?
+      //CustomMessage('YouWillInstallDoliWamp')+#13#13
+      MsgBox('The Visual C++ Redistributable package should be installed, it seems it is not. Please install the 32-bit version from http://www.microsoft.com/en-us/download/details.aspx?id=30679, then restart the DoliWAMP installation/upgrade.',mbInformation,MB_OK);
+    end;
+	// Pb seems similar with msvcp110.dll
+	//vcredist_x64.exe
 	
 	
    // If we have a new database version, we should only copy old my.ini file into new directory
--- a/build/exe/doliwamp/index.php.install
+++ b/build/exe/doliwamp/index.php.install
@@ -535,7 +535,7 @@ a:hover {
 		<li><a href="?lang={$langues[$langue]['autreLangueLien1']}">{$langues[$langue]['autreLangue1']}</a>
 		- <a href="?lang={$langues[$langue]['autreLangueLien2']}">{$langues[$langue]['autreLangue2']}</a></li>
 		<br><br>
-		<li>Provided by <a href="https://www.nltechno.com" targer="_blank">NLTechno</a></li>
+		<li>Provided by <a href="http://www.nltechno.com" targer="_blank">NLTechno</a></li>
 	</ul>
 </td></tr></table>
 <hr>
@@ -580,7 +580,7 @@ a:hover {


 	<ul id="foot">
-		<li><a href="https://www.nltechno.com/pages/dolibarrwinbin.php">DoliWamp project</a> was built from modified sources of <a href="http://www.wampserver.com">WampServer project</a> from Anaska</li>
+		<li><a href="http://www.nltechno.com/pages/dolibarrwinbin.php">DoliWamp project</a> was built from modified sources of <a href="http://www.wampserver.com">WampServer project</a> from Anaska</li>
 	</ul>
 </body>
 </html>
--- a/build/generate_filelist_xml.php
+++ b/build/generate_filelist_xml.php
@@ -22,6 +22,8 @@
 * 		\brief      This script create a xml checksum file
 */

+if (! defined('NOREQUIREDB')) define('NOREQUIREDB','1');	// Do not create database handler $db
+
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
 $path=dirname(__FILE__).'/';
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -388,7 +388,7 @@ if ($nboftargetok) {
 	#-----------------------
 	if ($CHOOSEDTARGET{'-CHKSUM'})
 	{
-	   	print 'Create xml check file with md5 checksum with command php '.$SOURCE.'/build/generate_filelist_xml.php release='.$MAJOR.'.'.$MINOR.'.'.$BUILD."\n";
+	   	print 'Create xml check file with md5 checksum with command php '.$SOURCE.'/build/generate_filecheck_xml.php release='.$MAJOR.'.'.$MINOR.'.'.$BUILD."\n";
 	  	$ret=`php $SOURCE/build/generate_filelist_xml.php release=$MAJOR.$MINOR.$BUILD`;
 	  	print $ret."\n";
 	  	# Copy to final dir
@@ -560,7 +560,7 @@ if ($nboftargetok) {
   	    $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/geoip/sample*.*`;
        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/ckeditor/adapters`;		# Keep this removal in case we embed libraries
        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/ckeditor/samples`;		# Keep this removal in case we embed libraries
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/_source`;					# _source must be kept into tarball for official debian, not for the rest
+        #$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/_source`;		# _source must be kept into tarball
   	    
        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/multiselect/MIT-LICENSE.txt`;
        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/select2/release.sh`;
@@ -769,8 +769,8 @@ if ($nboftargetok) {
 			$cmd="cp -pr '$BUILDROOT/$PROJECT' '$BUILDROOT/$FILENAMETGZ2'";
 			$ret=`$cmd`;

-			# Removed files we don't need (already removed before)
-			#$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`;
@@ -919,8 +919,8 @@ if ($nboftargetok) {
 			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/mike42/escpos-php/LICENSE.md`;
 			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/mobiledetect/mobiledetectlib/LICENSE.txt`;
 			
-			# Removed files we don't need (already removed)
-			#$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/ckeditor/_source`;
+			# Removed files we don't need
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/ckeditor/_source`;
 			
 			# Rename upstream changelog to match debian rules
 			$ret=`mv $BUILDROOT/$PROJECT.tmp/ChangeLog $BUILDROOT/$PROJECT.tmp/changelog`;
@@ -982,7 +982,7 @@ if ($nboftargetok) {
 			$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/htdocs/modulebuilder/template/class/actions_mymodule.class.php`;
-			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/htdocs/modulebuilder/template/class/api_mymodule.class.php`;
+			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/htdocs/modulebuilder/template/class/api_myobject.class.php`;
 			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/htdocs/modulebuilder/template/class/myobject.class.php`;
 			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/htdocs/modulebuilder/template/core/modules/modMyModule.class.php`;
 			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/htdocs/modulebuilder/template/mymoduleindex.php`;
--- a/build/rpm/dolibarr-forrpm.patch
+++ b/build/rpm/dolibarr-forrpm.patch
@@ -15,7 +15,21 @@ diff -up htdocs/filefunc.inc.php.patch htdocs/filefunc.inc.php
 diff -up htdocs/install/inc.php.patch htdocs/install/inc.php
 --- htdocs/install/inc.php.patch	2011-09-03 02:33:26.450952000 +0200
 +++ htdocs/install/inc.php	2011-09-03 02:33:36.286952001 +0200
-@@ -74,8 +74,8 @@
+@@ -71,8 +71,8 @@
+ $conffile = "../conf/conf.php";
+ $conffiletoshow = "htdocs/conf/conf.php";
+ // For debian/redhat like systems
+-//$conffile = "/etc/dolibarr/conf.php";
+-//$conffiletoshow = "/etc/dolibarr/conf.php";
+$conffile = "/etc/dolibarr/conf.php";
+$conffiletoshow = "/etc/dolibarr/conf.php";
+ 
+ 
+ // Load conf file if it is already defined
+diff -up htdocs/support/inc.php.patch htdocs/support/inc.php
+--- htdocs/support/inc.php.patch	2011-09-03 02:34:39.606952000 +0200
+++ htdocs/support/inc.php	2011-09-03 02:33:59.814952000 +0200
+@@ -69,8 +69,8 @@
 $conffile = "../conf/conf.php";
 $conffiletoshow = "htdocs/conf/conf.php";
 // For debian/redhat like systems
--- a/build/rpm/dolibarr_fedora.spec
+++ b/build/rpm/dolibarr_fedora.spec
@@ -25,7 +25,7 @@ BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-build

 Group: Applications/Productivity
-Requires: httpd, php >= 5.3.0, php-cli, php-gd, php-ldap, php-imap, php-mysqli, php-adodb, php-nusoap, dejavu-sans-fonts
+Requires: httpd, php >= 5.3.0, php-cli, php-gd, php-ldap, php-imap, php-mysql, php-adodb, php-nusoap, dejavu-sans-fonts
 Requires: mysql-server, mysql
 #BuildRequires: desktop-file-utils

@@ -213,7 +213,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/user
 %_datadir/dolibarr/htdocs/variants
 %_datadir/dolibarr/htdocs/webservices
-%_datadir/dolibarr/htdocs/website
+%_datadir/dolibarr/htdocs/websites
 %_datadir/dolibarr/htdocs/*.ico
 %_datadir/dolibarr/htdocs/*.patch
 %_datadir/dolibarr/htdocs/*.php
--- a/build/rpm/dolibarr_generic.spec
+++ b/build/rpm/dolibarr_generic.spec
@@ -46,7 +46,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build

 %if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version}
 Group: Applications/Productivity
-Requires: httpd, php >= 5.3.0, php-cli, php-gd, php-ldap, php-imap, php-mysqli, php-adodb, php-nusoap, dejavu-sans-fonts, php-mbstring, php-xml
+Requires: httpd, php >= 5.3.0, php-cli, php-gd, php-ldap, php-imap, php-mysql, php-adodb, php-nusoap, dejavu-sans-fonts
 Requires: mysql-server, mysql
 BuildRequires: desktop-file-utils
 %else
@@ -63,9 +63,9 @@ Requires: mysql-community-server, mysql-community-server-client
 BuildRequires: update-desktop-files fdupes
 %else
 Group: Applications/Productivity
-Requires: httpd, php >= 5.3.0, php-cli, php-gd, php-ldap, php-imap, php-mbstring, php-xml
+Requires: httpd, php >= 5.3.0, php-cli, php-gd, php-ldap, php-imap 
 Requires: mysql-server, mysql 
-Requires: php-mysqli >= 4.1.0 
+Requires: php-mysql >= 4.1.0 
 %endif
 %endif
 %endif
@@ -293,7 +293,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/user
 %_datadir/dolibarr/htdocs/variants
 %_datadir/dolibarr/htdocs/webservices
-%_datadir/dolibarr/htdocs/website
+%_datadir/dolibarr/htdocs/websites
 %_datadir/dolibarr/htdocs/*.ico
 %_datadir/dolibarr/htdocs/*.patch
 %_datadir/dolibarr/htdocs/*.php
@@ -441,8 +441,8 @@ if [ "x$os" = "xfedora-redhat" -a -s /sbin/restorecon ]; then
 %else
  echo Add SE Linux permissions for dolibarr
  # semanage add records into /etc/selinux/targeted/contexts/files/file_contexts.local
-  semanage fcontext -a -t httpd_sys_rw_content_t "/etc/dolibarr(/.*)?"
-  semanage fcontext -a -t httpd_sys_rw_content_t "/var/lib/dolibarr(/.*)?"
+  semanage fcontext -a -t httpd_sys_script_rw_t "/etc/dolibarr(/.*?)"
+  semanage fcontext -a -t httpd_sys_script_rw_t "/var/lib/dolibarr(/.*?)"
  restorecon -R -v /etc/dolibarr
  restorecon -R -v /var/lib/dolibarr
 %endif
--- a/build/rpm/dolibarr_mandriva.spec
+++ b/build/rpm/dolibarr_mandriva.spec
@@ -210,7 +210,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/user
 %_datadir/dolibarr/htdocs/variants
 %_datadir/dolibarr/htdocs/webservices
-%_datadir/dolibarr/htdocs/website
+%_datadir/dolibarr/htdocs/websites
 %_datadir/dolibarr/htdocs/*.ico
 %_datadir/dolibarr/htdocs/*.patch
 %_datadir/dolibarr/htdocs/*.php
--- a/build/rpm/dolibarr_opensuse.spec
+++ b/build/rpm/dolibarr_opensuse.spec
@@ -221,7 +221,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/user
 %_datadir/dolibarr/htdocs/variants
 %_datadir/dolibarr/htdocs/webservices
-%_datadir/dolibarr/htdocs/website
+%_datadir/dolibarr/htdocs/websites
 %_datadir/dolibarr/htdocs/*.ico
 %_datadir/dolibarr/htdocs/*.patch
 %_datadir/dolibarr/htdocs/*.php
--- a/build/rpm/httpd-dolibarr.conf
+++ b/build/rpm/httpd-dolibarr.conf
@@ -15,14 +15,8 @@ Alias /dolibarr /usr/share/dolibarr/htdocs

 # Directory for web pages
 <DirectoryMatch /usr/share/dolibarr>
-  <IfVersion >= 2.3>
-    Require all granted
-  </IfVersion>
-  <IfVersion < 2.3>
-    Order deny,allow
-    Allow from all
-  </IfVersion>
-
+  Order deny,allow
+  Allow from all
  DirectoryIndex index.php
  Options +FollowSymLinks +Indexes

@@ -66,51 +60,27 @@ Alias /dolibarr /usr/share/dolibarr/htdocs

 # Directory for public pages
 <DirectoryMatch /usr/share/dolibarr/public>
-  <IfVersion >= 2.3>
-    Require all granted
-  </IfVersion>
-  <IfVersion < 2.3>
+    AllowOverride All
    Order deny,allow
    Allow from all
-  </IfVersion>
-
-    AllowOverride All
 </DirectoryMatch>

 # Config files
 <DirectoryMatch /etc/dolibarr>
-  <IfVersion >= 2.3>
-    Require all granted
-  </IfVersion>
-  <IfVersion < 2.3>
+	AllowOverride All
    Order deny,allow
    Allow from all
-  </IfVersion>
-
-	AllowOverride All
 </DirectoryMatch>

 # Directory for data files
 <DirectoryMatch /usr/share/dolibarr/documents>
-  <IfVersion >= 2.3>
-    Require all granted
-  </IfVersion>
-  <IfVersion < 2.3>
+    AllowOverride All
    Order deny,allow
    Allow from all
-  </IfVersion>
-
-    AllowOverride All
 </DirectoryMatch>
 <DirectoryMatch /var/lib/dolibarr/documents>
-  <IfVersion >= 2.3>
-    Require all granted
-  </IfVersion>
-  <IfVersion < 2.3>
-    Order allow,deny
-    Allow from all
-  </IfVersion>
-
    AllowOverride All
+    Order deny,allow
+    Allow from all
 </DirectoryMatch>

--- a/composer.json
+++ b/composer.json
@@ -13,7 +13,7 @@
    	"agenda"
    ],
    "homepage": "https://www.dolibarr.org",
-    "license": "GPL-3.0-or-later",
+    "license": "GPL-3.0+",
    "support": {
        "issues": "https://github.com/Dolibarr/dolibarr/issues",
        "forum": "https://www.dolibarr.org/forum",
--- a/dev/dolibarr_changes.txt
+++ b/dev/dolibarr_changes.txt
@@ -82,14 +82,8 @@ with
 // LDR To open in same window
 //var OpenWindow=window.open(pRef, "newwin", "height="+vHeight+",width="+vWidth);
 window.location.href=pRef
+* Replace hard coded string with i18n["String"];

-* Replace
-vTmpDiv=this.newNode(vTmpCell, 'div', null, null, vTaskList[i].getResource());
-with                       
-var vTmpNode=this.newNode(vTmpCell, 'div', null, '');
-vTmpNode=this.newNode(vTmpNode, 'a', null, '', vLangs[vLang]['moreinfo']);
-vTmpNode.setAttribute('href',vTaskList[i].getLink());
-                        

 JCROP:
 ------
@@ -116,45 +110,11 @@ to get
        if ($className == 'Luracast\Restler\string') return;
        if ($className == 'Luracast\Restler\mixed') return;
 		...
-
-Change also file Luracast/Restler/explorer/index.html
-
-+With swagger 2:
-
-* Add line into Util.php to complete function
-
-    public static function getShortName($className)
-    {
-    	// @CHANGE LDR
-    	if (! is_string($className)) return;
-    	//var_dump($className);
-
    	
    	
 PARSEDOWN
 ---------

-* Add support of css by adding in Parsedown.php:
-
-	// @CHANGE LDR
-	'class' => $Link['element']['attributes']['class'] 
-
-	...
-	
-	// @CHANGE LDR
-    if (preg_match('/{([^}]+)}/', $remainder, $matches2))
-    {
-        $Element['attributes']['class'] = $matches2[1];
-       	$remainder = preg_replace('/{'.preg_quote($matches2[1],'/').'}/', '', $remainder);
-    }
-
-
-	// @CHANGE LDR
-	//$markup .= $this->{$Element['handler']}($Element['text']);
-	$markup .= preg_replace('/>{[^}]+}/', '>', $this->{$Element['handler']}($Element['text']));
-
-
-
 * Fix to avoid fatal error when mb_strlen not available:

 	// @CHANGE LDR Fix when mb_strlen is not available
@@ -162,6 +122,7 @@ PARSEDOWN
 	if (function_exists('mb_strlen')) $len = mb_strlen($line, 'utf-8');
 	else $len = strlen($line);
 	$shortage = 4 - $len % 4;
+                	


 JEDITABLE.JS
@@ -170,3 +131,4 @@ JEDITABLE.JS
 * <button type="submit" />  =>  <button class="button" type="submit" />
 * <button type="cancel" />  =>  <button class="button" type="cancel" />

+
--- a/dev/examples/code/create_user.php
+++ b/dev/examples/code/create_user.php
@@ -60,14 +60,14 @@ $db->begin();

 require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php");

-// Create user object
+// Create invoice object
 $obj = new User($db);
 //$obj->initAsSpecimen();

 $obj->login = 'ABCDEF';
 $obj->nom   = 'ABCDEF';

-// Create user
+// Create invoice
 $idobject=$obj->create($user);
 if ($idobject > 0)
 {
--- a/dev/examples/code/get_contracts.php
+++ b/dev/examples/code/get_contracts.php
@@ -67,7 +67,7 @@ $db->begin();

 require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");

-// Create contract object
+// Create invoice object
 $obj = new Contrat($db);
 $obj->socid=$argv[1];

--- a/dev/examples/ldap/ldapsearch_sample1.txt
+++ b/dev/examples/ldap/ldapsearch_sample1.txt
@@ -7,7 +7,3 @@
 # ldapsearch -h hostname -x -b "ou=people,dc=teclib,dc=infra"
 # ldapsearch -h hostname -x -z 0 -b "o=somecompany.com" -D "cn=manager,o=somecompany.com" -w password "(objectclass=*)"
 # ldapsearch -h hostname -x -b "o=somecompany.com" -D "cn=manager,o=somecompany.com" -w password "(objectclass=*)"
-#
-# Example to test a ldap search: 
-# ldapsearch -h hostname -x -z 5 -b 'OU=Collaborateurs,OU=Utilisateurs,OU=MyCompany,DC=bocal,DC=lan' -D 'CN=UserAdmin,OU=Informatique,OU=Utilisateurs,OU=MyCompany,DC=bocal,DC=lan' -w password
-
--- a/dev/initdata/import-thirdparties.php
+++ b/dev/initdata/import-thirdparties.php
@@ -21,7 +21,7 @@

 /**
 *      \file       dev/initdata/import-thirdparties.php
- *		\brief      Script example to insert thirdparties from a csv file.
+ *		\brief      Script example to insert thirdparties from a csv file. 
 *                  To purge data, you can have a look at purge-data.php
 */

@@ -123,15 +123,15 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
    if ($endlinenb && $i > $endlinenb) continue;

    $nboflines++;
-
+    
    $object = new Societe($db);
    $object->state = $fields[6];
    $object->client = $fields[7];
    $object->fournisseur = $fields[8];
-
+    
    $object->name = $fields[13]?trim($fields[13]):$fields[0];
    $object->name_alias = $fields[0]!=$fields[13]?trim($fields[0]):'';
-
+    
    $object->address = trim($fields[14]);
    $object->zip = trim($fields[15]);
    $object->town = trim($fields[16]);
@@ -149,7 +149,7 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
        $condpayment = trim($fields[36]);
        if ($condpayment == 'A la commande') $condpayment = 'A réception de commande';
        if ($condpayment == 'A reception facture') $condpayment = 'Réception de facture';
-        $object->cond_reglement_id = dol_getIdFromCode($db, $condpayment, 'c_payment_term', 'libelle_facture', 'rowid', 1);
+        $object->cond_reglement_id = dol_getIdFromCode($db, $condpayment, 'c_payment_term', 'libelle_facture', 'rowid');
        if (empty($object->cond_reglement_id))
        {
            print " - Error cant find payment mode for ".$condpayment."\n";
@@ -166,7 +166,7 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
    // Set price level
    $object->price_level = 1;
    if ($labeltype == 'Revendeur') $object->price_level = 2;
-
+    
    print "Process line nb ".$i.", name ".$object->name;


@@ -182,7 +182,7 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
            print " - Error in create result code = ".$ret." - ".$object->errorsToString();
            $errorrecord++;
        }
-    	else
+    	else 
    	{
    	    print " - Creation OK with name ".$object->name." - id = ".$ret;
    	}
@@ -198,7 +198,7 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
 	if (! $errorrecord && $fields[3])
 	{
    	$salesrep=new User($db);
-
+    	
    	$tmp=explode(' ',$fields[3],2);
    	$salesrep->firstname = trim($tmp[0]);
    	$salesrep->lastname = trim($tmp[1]);
@@ -206,7 +206,7 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
    	else $salesrep->login=strtolower($salesrep->firstname);
    	$salesrep->login=preg_replace('/ /','',$salesrep->login);
    	$salesrep->fetch(0,$salesrep->login);
-
+    
    	$result = $object->add_commercial($user, $salesrep->id);
    	if ($result < 0)
    	{
@@ -217,14 +217,14 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
    	{
    	    print " - create link sale representative OK";
    	}
-	}
-
+	}	
+	
 	dol_syslog("Add invoice contacts");
 	// Insert an invoice contact if there is an invoice email != standard email
 	if (! $errorrecord && $fields[27] && $fields[26] != $fields[27])
 	{
 	    $ret1=$ret2=0;
-
+	    
 	    $contact = new Contact($db);
 	    $contact->lastname = $object->name;
 	    $contact->address=$object->address;
@@ -233,7 +233,7 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
 	    $contact->country_id=$object->country_id;
 	    $contact->email=$fields[27];
 	    $contact->socid=$object->id;
-
+	    
 	    $ret1=$contact->create($user);
 	    if ($ret1 > 0)
 	    {
@@ -244,18 +244,18 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
            print " - Error in create contact result code = ".$ret1." ".$ret2." - ".$object->errorsToString();
            $errorrecord++;
        }
-    	else
+    	else 
    	{
    	    print " - create contact OK";
    	}
 	}
-
+	
 	dol_syslog("Add delivery contacts");
 	// Insert a delivery contact
 	if (! $errorrecord && $fields[47])
 	{
 	    $ret1=$ret2=0;
-
+	    
 	    $contact2 = new Contact($db);
 	    $contact2->lastname = 'Service livraison - '.$fields[47];
 	    $contact2->address = $fields[48];
@@ -264,10 +264,10 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
 	    $contact2->country_id=dol_getIdFromCode($db, trim($fields[52]), 'c_country', 'code', 'rowid');
 	    $contact2->note_public=$fields[54];
 	    $contact2->socid=$object->id;
-
+	    
 	    // Extrafields
 	    $contact2->array_options['options_anazoneliv']=price2num($fields[53]);
-
+	    
 	    $ret1=$contact2->create($user);
 	    if ($ret1 > 0)
 	    {
@@ -278,16 +278,16 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
            print " - Error in create contact result code = ".$ret1." ".$ret2." - ".$object->errorsToString();
            $errorrecord++;
        }
-    	else
+    	else 
    	{
    	    print " - create contact OK";
    	}
 	}
-
+	

 	print "\n";
-
-	if ($errorrecord)
+	
+	if ($errorrecord) 
 	{
 	    fwrite($fhandleerr, 'Error on record nb '.$i." - ".$object->errorsToString()."\n");
 	    $error++;    // $errorrecord will be reset
--- a/dev/initdata/purge-data.php
+++ b/dev/initdata/purge-data.php
@@ -78,17 +78,15 @@ $sqls=array(
        'DELETE FROM '.MAIN_DB_PREFIX.'propaldet',
        'DELETE FROM '.MAIN_DB_PREFIX.'propal',
    ),
-    'supplier_proposal'=>array(
-        'DELETE FROM '.MAIN_DB_PREFIX.'supplier_proposaldet',
-        'DELETE FROM '.MAIN_DB_PREFIX.'supplier_proposal',
-    ),
-	'supplier_order'=>array(
+    'supplier_order'=>array(
        'DELETE FROM '.MAIN_DB_PREFIX.'commande_fournisseurdet',
        'DELETE FROM '.MAIN_DB_PREFIX.'commande_fournisseur',
    ),
-	'supplier_invoice'=>array(
+    'supplier_invoice'=>array(
        'DELETE FROM '.MAIN_DB_PREFIX.'facture_fourn_det',
        'DELETE FROM '.MAIN_DB_PREFIX.'facture_fourn',
+        'DELETE FROM '.MAIN_DB_PREFIX.'supplier_proposaldet',
+        'DELETE FROM '.MAIN_DB_PREFIX.'supplier_proposal',
    ),
    'delivery'=>array(
        'DELETE FROM '.MAIN_DB_PREFIX.'livraisondet',
@@ -116,10 +114,8 @@ $sqls=array(
        'DELETE FROM '.MAIN_DB_PREFIX.'product_lang',
        'DELETE FROM '.MAIN_DB_PREFIX.'product_price',
        'DELETE FROM '.MAIN_DB_PREFIX.'product_fournisseur_price',
-        'DELETE FROM '.MAIN_DB_PREFIX.'product_batch',
-    	'DELETE FROM '.MAIN_DB_PREFIX.'product_stock',
-        'DELETE FROM '.MAIN_DB_PREFIX.'product_lot',
-    	'DELETE FROM '.MAIN_DB_PREFIX.'product',
+        'DELETE FROM '.MAIN_DB_PREFIX.'product_stock',
+        'DELETE FROM '.MAIN_DB_PREFIX.'product',
    ),
    'project'=>array(
        'DELETE FROM '.MAIN_DB_PREFIX.'projet_task_time',
@@ -132,13 +128,12 @@ $sqls=array(
    ),
    'thirdparty'=>array(
        '@contact',
-        'DELETE FROM '.MAIN_DB_PREFIX.'cabinetmed_cons',
+        'DELETE FROM '.MAIN_DB_PREFIX.'cabinetmed_cons', 
        'UPDATE '.MAIN_DB_PREFIX.'adherent SET fk_soc = NULL',
        'DELETE FROM '.MAIN_DB_PREFIX.'categorie_fournisseur',
        'DELETE FROM '.MAIN_DB_PREFIX.'categorie_societe',
        'DELETE FROM '.MAIN_DB_PREFIX.'societe_remise_except',
-        'DELETE FROM '.MAIN_DB_PREFIX.'societe_rib',
-    	'DELETE FROM '.MAIN_DB_PREFIX.'societe',
+        'DELETE FROM '.MAIN_DB_PREFIX.'societe',
    )
 );

@@ -157,37 +152,27 @@ $mode = $argv[1];
 $option = $argv[2];

 if (empty($mode) || ! in_array($mode,array('test','confirm'))) {
-    print "Usage:  $script_file (test|confirm) (all|option) [dbtype dbhost dbuser dbpassword dbname dbport]\n";
+    print "Usage:  $script_file (test|confirm) (all|option)\n";
    print "\n";
    print "option can be ".implode(',',array_keys($sqls))."\n";
    exit(-1);
 }

 if (empty($option) || ! in_array($option, array_merge(array('all'),array_keys($sqls))) ) {
-    print "Usage:  $script_file (test|confirm) (all|option) [dbtype dbhost dbuser dbpassword dbname dbport]\n";
+    print "Usage:  $script_file (test|confirm) (all|option)\n";
    print "\n";
    print "option can be ".implode(',',array_keys($sqls))."\n";
    exit(-1);
 }

-// Replace database handler
-if (! empty($argv[3]))
-{
-	$db->close();
-	unset($db);
-	$db=getDoliDBInstance($argv[3], $argv[4], $argv[5], $argv[6], $argv[7], $argv[8]);
-	$user=new User($db);
-}

-//var_dump($user->db->database_name);
 $ret=$user->fetch('','admin');
 if (! $ret > 0)
 {
-	print 'An admin user with login "admin" must exists to use this script.'."\n";
+	print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
 	exit;
 }
-//$user->getrights();
-
+$user->getrights();

 print "Purge all data for this database:\n";
 print "Server = ".$db->database_host."\n";
@@ -205,14 +190,14 @@ if (! $confirmed)

 /**
 * Process sql requests of a family
- *
+ * 
 * @param   string  $family     Name of family key of array $sqls
 * @return  int                 -1 if KO, 1 if OK
 */
 function processfamily($family)
 {
    global $db, $sqls;
-
+    
    $error=0;
    foreach($sqls[$family] as $sql)
    {
@@ -222,7 +207,7 @@ function processfamily($family)
            processfamily($newfamily);
            continue;
        }
-
+        
        print "Run sql: ".$sql."\n";
        $resql=$db->query($sql);
        if (! $resql)
@@ -232,7 +217,7 @@ function processfamily($family)
                $error++;
            }
        }
-
+    
        if ($error)
        {
            print $db->lasterror();
@@ -240,7 +225,7 @@ function processfamily($family)
            break;
        }
    }
-
+    
    if ($error) return -1;
    else return 1;
 }
@@ -257,7 +242,7 @@ foreach($sqls as $family => $familysql)
    $oldfamily = $family;

    $result=processfamily($family);
-    if ($result < 0)
+    if ($result < 0) 
    {
        $error++;
        break;
--- a/dev/initdemo/documents_demo/medias/README.txt
+++ b/dev/initdemo/documents_demo/medias/README.txt
@@ -1,2 +0,0 @@
-# File(s) into root medias directory are provide by Pixabay with Licence "CC0 Creative Commons"
-# https://creativecommons.org/publicdomain/zero/1.0/
--- a/dev/initdemo/documents_demo/medias/background_sunset.jpg
+++ b/dev/initdemo/documents_demo/medias/background_sunset.jpg
--- a/dev/initdemo/initdemo.sh
+++ b/dev/initdemo/initdemo.sh
@@ -171,7 +171,6 @@ then
 	cp -pr $mydir/../../htdocs/install/doctemplates/* "$documentdir/doctemplates/"
 	mkdir -p "$documentdir/ecm/Administrative documents"
 	mkdir -p "$documentdir/ecm/Images"
-	rm -f "$documentdir/doctemplates/"*/index.html
 	echo cp -pr $mydir/../../doc/images/* "$documentdir/ecm/Images"
 	cp -pr $mydir/../../doc/images/* "$documentdir/ecm/Images"
 else
--- a/dev/initdemo/mysqldump_dolibarr_7.0.0.sql
+++ b/dev/initdemo/mysqldump_dolibarr_7.0.0.sql
--- a/dev/initdemo/sftpget_and_loaddump.php
+++ b/dev/initdemo/sftpget_and_loaddump.php
@@ -15,7 +15,7 @@
 * 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/
- *
+ * 
 * Get a distant dump file and load it into a mysql database
 */

@@ -92,7 +92,7 @@ if ($connection)
 {
 	if (! @ssh2_auth_password($connection, $login, $password))
 	{
-		dol_syslog("Could not authenticate with username ".$login." . and password ".preg_replace('/./', '*', $password),LOG_ERR);
+		dol_syslog("Could not authenticate with username ".$login." . and password ".$password,LOG_ERR);
 		exit(-5);
 	}
 	else
--- a/dev/resources/iso-normes/accountancy_rules.txt
+++ b/dev/resources/iso-normes/accountancy_rules.txt
@@ -1,14 +0,0 @@
-
-Gestion escompte:
-
-Sur une facture de 120 € TTC :
-707xxx                 100 € HT
-44571x                 20 € TVA
-411xxx    120 € TTC
- 
-Le client règle rapidement et on lui accorde un escompte de 3% (120 € * 3% = 3.6 € TTC), on aura donc :
-665000     3,00 € HT
-44571x     0,60 € TVA
-411xxx                 3.60 € TVA
- 
-Et ça marche à l’inverse avec un fournisseur sauf que l’on est en 775000 au lieu de 665000 pour escompte obtenus.
--- a/dev/resources/iso-normes/code_nace.txt
+++ b/dev/resources/iso-normes/code_nace.txt
@@ -1 +0,0 @@
-http://ec.europa.eu/eurostat/ramon/nomenclatures/index.cfm?TargetUrl=LST_CLS_DLD&StrNom=NACE_REV2&StrLanguageCode=FR&StrLayoutCode=#
--- a/dev/resources/iso-normes/sample_FEC_file.txt
+++ b/dev/resources/iso-normes/sample_FEC_file.txt
@@ -11,25 +11,3 @@ Banque	Banque	17306	20170119	5121CRA	CR AGRICOLE			A01	20170119	ZDAV courtage s/
 Banque	Banque	17306	20170119	401ZDAV	SANDRA DAVILA			A01	20170119	ZDAV courtage s/ ventes	       508,00	         0,00			20170119		
 Banque	Banque	17307	20170119	401ZDAV	SANDRA DAVILA			A01	20170119	ZDAV courtage s/ ventes	       508,00	         0,00			20170131		
 Banque	Banque	17307	20170119	5121CRA	CR AGRICOLE			A01	20170119	ZDAV courtage s/ ventes	         0,00	       508,00			20170131		
-
-
-
-
-
-
-Other example
-JournalCode	JournalLib	EcritureNum	EcritureDate	CompteNum	CompteLib	CompAuxNum	CompAuxLib	PieceRef	PieceDate	EcritureLib	Debit	Credit	EcritureLet	DateLet	ValidDate	Montantdevise	Idevise
-FAC	Factures clients	AB6/FAC/2017/0045	20171120	41110000	Clients - Ventes de biens ou de prestations de services	ID 2892	2 Et 3 Dimensions	-	20171120	/	1	0	0	0			20171120
-FAC	Factures clients	AB6/FAC/2017/0052	20171120	70710000	Marchandises (ou groupe) A	ID 2892	2 Et 3 Dimensions	-	20171120	[AX] Activités Annexes	0	0	1	0			20171120
-FAC	Factures clients	AB6/FAC/2017/0052	20171120	70710000	Marchandises (ou groupe) A	ID 2892	2 Et 3 Dimensions	-	20171120	[AX] Activités Annexes	0	0	1	0			20171120
-FAC	Factures clients	AB6/FAC/2017/0052	20171120	41110000	Clients - Ventes de biens ou de prestations de services	ID 2892	2 Et 3 Dimensions	-	20171120	/	2	0	0	0			20171120
-OUV	Balance initiale	Balance initiale BRED	20171101	51215000	BRED			-	20171101	/	6201	0	0	0			20171101
-OUV	Balance initiale	Balance initiale Crédit Coopératif Nation	20171101	51211000	Crédit Coopératif Nation			-	20171101	/	1364	20	0	0			20171101
-OUV	Balance initiale	Balance initiale TVA collectée (Taux Intermédiaire)	20171101	44571200	TVA collectée (Taux Intermédiaire)			-	20171101	/	0	0	147	4			20171101
-OUV	Balance initiale	Balance initiale TVA déductible intracommunautaire	20171101	44566200	TVA déductible intracommunautaire			-	20171101	/	18	0	0	0			20171101
-OUV	Balance initiale	Balance initiale Capital souscrit - non appelé	20171101	10110000	Capital souscrit - non appelé			-	20171101	/	10	0	0	0			20171101
-OUV	Balance initiale	Balance initiale Réserves statutaires ou contractuelles	20171101	10630000	Réserves statutaires ou contractuelles			-	20171101	/	0	0	10	0			20171101
-OUV	Balance initiale	Balance initiale Frais entrepreneurs	20171101	46750000	Frais entrepreneurs			-	20171101	/	0	0	100	0			20171101
-OUV	Balance initiale	Balance initiale Fournissseurs réglés par Coopaname	20171101	40100000	Fournissseurs réglés par Coopaname			-	20171101	/	0	0	4123	20			20171101
-OUV	Balance initiale	Balance initiale TVA sur autres biens et services	20171101	44566000	TVA sur autres biens et services			-	20171101	/	507	70	0	0			20171101
-OUV	Balance initiale	Balance initiale TVA en attente à 20%	20171101	44572200	TVA en attente à 20%			-	20171101	/	200	0	0	0			20171101
--- a/dev/resources/sepa/pain.001.001.03.xsd
+++ b/dev/resources/sepa/pain.001.001.03.xsd
@@ -1,921 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--Generated by SWIFTStandards Workstation (build:R6.1.0.2) on 2009 Jan 08 17:30:53-->
-<xs:schema xmlns="urn:iso:std:iso:20022:tech:xsd:pain.001.001.03" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="urn:iso:std:iso:20022:tech:xsd:pain.001.001.03">
-    <xs:element name="Document" type="Document"/>
-    <xs:complexType name="AccountIdentification4Choice">
-        <xs:sequence>
-            <xs:choice>
-                <xs:element name="IBAN" type="IBAN2007Identifier"/>
-                <xs:element name="Othr" type="GenericAccountIdentification1"/>
-            </xs:choice>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="AccountSchemeName1Choice">
-        <xs:sequence>
-            <xs:choice>
-                <xs:element name="Cd" type="ExternalAccountIdentification1Code"/>
-                <xs:element name="Prtry" type="Max35Text"/>
-            </xs:choice>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="ActiveOrHistoricCurrencyAndAmount_SimpleType">
-        <xs:restriction base="xs:decimal">
-            <xs:minInclusive value="0"/>
-            <xs:fractionDigits value="5"/>
-            <xs:totalDigits value="18"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="ActiveOrHistoricCurrencyAndAmount">
-        <xs:simpleContent>
-            <xs:extension base="ActiveOrHistoricCurrencyAndAmount_SimpleType">
-                <xs:attribute name="Ccy" type="ActiveOrHistoricCurrencyCode" use="required"/>
-            </xs:extension>
-        </xs:simpleContent>
-    </xs:complexType>
-    <xs:simpleType name="ActiveOrHistoricCurrencyCode">
-        <xs:restriction base="xs:string">
-            <xs:pattern value="[A-Z]{3,3}"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="AddressType2Code">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="ADDR"/>
-            <xs:enumeration value="PBOX"/>
-            <xs:enumeration value="HOME"/>
-            <xs:enumeration value="BIZZ"/>
-            <xs:enumeration value="MLTO"/>
-            <xs:enumeration value="DLVY"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="AmountType3Choice">
-        <xs:sequence>
-            <xs:choice>
-                <xs:element name="InstdAmt" type="ActiveOrHistoricCurrencyAndAmount"/>
-                <xs:element name="EqvtAmt" type="EquivalentAmount2"/>
-            </xs:choice>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="AnyBICIdentifier">
-        <xs:restriction base="xs:string">
-            <xs:pattern value="[A-Z]{6,6}[A-Z2-9][A-NP-Z0-9]([A-Z0-9]{3,3}){0,1}"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="Authorisation1Choice">
-        <xs:sequence>
-            <xs:choice>
-                <xs:element name="Cd" type="Authorisation1Code"/>
-                <xs:element name="Prtry" type="Max128Text"/>
-            </xs:choice>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="Authorisation1Code">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="AUTH"/>
-            <xs:enumeration value="FDET"/>
-            <xs:enumeration value="FSUM"/>
-            <xs:enumeration value="ILEV"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="BICIdentifier">
-        <xs:restriction base="xs:string">
-            <xs:pattern value="[A-Z]{6,6}[A-Z2-9][A-NP-Z0-9]([A-Z0-9]{3,3}){0,1}"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="BaseOneRate">
-        <xs:restriction base="xs:decimal">
-            <xs:fractionDigits value="10"/>
-            <xs:totalDigits value="11"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="BatchBookingIndicator">
-        <xs:restriction base="xs:boolean"/>
-    </xs:simpleType>
-    <xs:complexType name="BranchAndFinancialInstitutionIdentification4">
-        <xs:sequence>
-            <xs:element name="FinInstnId" type="FinancialInstitutionIdentification7"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="BrnchId" type="BranchData2"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="BranchData2">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="Id" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Nm" type="Max140Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="PstlAdr" type="PostalAddress6"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="CashAccount16">
-        <xs:sequence>
-            <xs:element name="Id" type="AccountIdentification4Choice"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Tp" type="CashAccountType2"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Ccy" type="ActiveOrHistoricCurrencyCode"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Nm" type="Max70Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="CashAccountType2">
-        <xs:sequence>
-            <xs:choice>
-                <xs:element name="Cd" type="CashAccountType4Code"/>
-                <xs:element name="Prtry" type="Max35Text"/>
-            </xs:choice>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="CashAccountType4Code">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="CASH"/>
-            <xs:enumeration value="CHAR"/>
-            <xs:enumeration value="COMM"/>
-            <xs:enumeration value="TAXE"/>
-            <xs:enumeration value="CISH"/>
-            <xs:enumeration value="TRAS"/>
-            <xs:enumeration value="SACC"/>
-            <xs:enumeration value="CACC"/>
-            <xs:enumeration value="SVGS"/>
-            <xs:enumeration value="ONDP"/>
-            <xs:enumeration value="MGLD"/>
-            <xs:enumeration value="NREX"/>
-            <xs:enumeration value="MOMA"/>
-            <xs:enumeration value="LOAN"/>
-            <xs:enumeration value="SLRY"/>
-            <xs:enumeration value="ODFT"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="CategoryPurpose1Choice">
-        <xs:sequence>
-            <xs:choice>
-                <xs:element name="Cd" type="ExternalCategoryPurpose1Code"/>
-                <xs:element name="Prtry" type="Max35Text"/>
-            </xs:choice>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="ChargeBearerType1Code">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="DEBT"/>
-            <xs:enumeration value="CRED"/>
-            <xs:enumeration value="SHAR"/>
-            <xs:enumeration value="SLEV"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="Cheque6">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="ChqTp" type="ChequeType2Code"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="ChqNb" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="ChqFr" type="NameAndAddress10"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="DlvryMtd" type="ChequeDeliveryMethod1Choice"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="DlvrTo" type="NameAndAddress10"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="InstrPrty" type="Priority2Code"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="ChqMtrtyDt" type="ISODate"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="FrmsCd" type="Max35Text"/>
-            <xs:element maxOccurs="2" minOccurs="0" name="MemoFld" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="RgnlClrZone" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="PrtLctn" type="Max35Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="ChequeDelivery1Code">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="MLDB"/>
-            <xs:enumeration value="MLCD"/>
-            <xs:enumeration value="MLFA"/>
-            <xs:enumeration value="CRDB"/>
-            <xs:enumeration value="CRCD"/>
-            <xs:enumeration value="CRFA"/>
-            <xs:enumeration value="PUDB"/>
-            <xs:enumeration value="PUCD"/>
-            <xs:enumeration value="PUFA"/>
-            <xs:enumeration value="RGDB"/>
-            <xs:enumeration value="RGCD"/>
-            <xs:enumeration value="RGFA"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="ChequeDeliveryMethod1Choice">
-        <xs:sequence>
-            <xs:choice>
-                <xs:element name="Cd" type="ChequeDelivery1Code"/>
-                <xs:element name="Prtry" type="Max35Text"/>
-            </xs:choice>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="ChequeType2Code">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="CCHQ"/>
-            <xs:enumeration value="CCCH"/>
-            <xs:enumeration value="BCHQ"/>
-            <xs:enumeration value="DRFT"/>
-            <xs:enumeration value="ELDR"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="ClearingSystemIdentification2Choice">
-        <xs:sequence>
-            <xs:choice>
-                <xs:element name="Cd" type="ExternalClearingSystemIdentification1Code"/>
-                <xs:element name="Prtry" type="Max35Text"/>
-            </xs:choice>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="ClearingSystemMemberIdentification2">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="ClrSysId" type="ClearingSystemIdentification2Choice"/>
-            <xs:element name="MmbId" type="Max35Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="ContactDetails2">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="NmPrfx" type="NamePrefix1Code"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Nm" type="Max140Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="PhneNb" type="PhoneNumber"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="MobNb" type="PhoneNumber"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="FaxNb" type="PhoneNumber"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="EmailAdr" type="Max2048Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Othr" type="Max35Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="CountryCode">
-        <xs:restriction base="xs:string">
-            <xs:pattern value="[A-Z]{2,2}"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="CreditDebitCode">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="CRDT"/>
-            <xs:enumeration value="DBIT"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="CreditTransferTransactionInformation10">
-        <xs:sequence>
-            <xs:element name="PmtId" type="PaymentIdentification1"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="PmtTpInf" type="PaymentTypeInformation19"/>
-            <xs:element name="Amt" type="AmountType3Choice"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="XchgRateInf" type="ExchangeRateInformation1"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="ChrgBr" type="ChargeBearerType1Code"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="ChqInstr" type="Cheque6"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="UltmtDbtr" type="PartyIdentification32"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="IntrmyAgt1" type="BranchAndFinancialInstitutionIdentification4"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="IntrmyAgt1Acct" type="CashAccount16"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="IntrmyAgt2" type="BranchAndFinancialInstitutionIdentification4"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="IntrmyAgt2Acct" type="CashAccount16"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="IntrmyAgt3" type="BranchAndFinancialInstitutionIdentification4"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="IntrmyAgt3Acct" type="CashAccount16"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="CdtrAgt" type="BranchAndFinancialInstitutionIdentification4"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="CdtrAgtAcct" type="CashAccount16"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Cdtr" type="PartyIdentification32"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="CdtrAcct" type="CashAccount16"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="UltmtCdtr" type="PartyIdentification32"/>
-            <xs:element maxOccurs="unbounded" minOccurs="0" name="InstrForCdtrAgt" type="InstructionForCreditorAgent1"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="InstrForDbtrAgt" type="Max140Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Purp" type="Purpose2Choice"/>
-            <xs:element maxOccurs="10" minOccurs="0" name="RgltryRptg" type="RegulatoryReporting3"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Tax" type="TaxInformation3"/>
-            <xs:element maxOccurs="10" minOccurs="0" name="RltdRmtInf" type="RemittanceLocation2"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="RmtInf" type="RemittanceInformation5"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="CreditorReferenceInformation2">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="Tp" type="CreditorReferenceType2"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Ref" type="Max35Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="CreditorReferenceType1Choice">
-        <xs:sequence>
-            <xs:choice>
-                <xs:element name="Cd" type="DocumentType3Code"/>
-                <xs:element name="Prtry" type="Max35Text"/>
-            </xs:choice>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="CreditorReferenceType2">
-        <xs:sequence>
-            <xs:element name="CdOrPrtry" type="CreditorReferenceType1Choice"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Issr" type="Max35Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="CustomerCreditTransferInitiationV03">
-        <xs:sequence>
-            <xs:element name="GrpHdr" type="GroupHeader32"/>
-            <xs:element maxOccurs="unbounded" minOccurs="1" name="PmtInf" type="PaymentInstructionInformation3"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="DateAndPlaceOfBirth">
-        <xs:sequence>
-            <xs:element name="BirthDt" type="ISODate"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="PrvcOfBirth" type="Max35Text"/>
-            <xs:element name="CityOfBirth" type="Max35Text"/>
-            <xs:element name="CtryOfBirth" type="CountryCode"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="DatePeriodDetails">
-        <xs:sequence>
-            <xs:element name="FrDt" type="ISODate"/>
-            <xs:element name="ToDt" type="ISODate"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="DecimalNumber">
-        <xs:restriction base="xs:decimal">
-            <xs:fractionDigits value="17"/>
-            <xs:totalDigits value="18"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="Document">
-        <xs:sequence>
-            <xs:element name="CstmrCdtTrfInitn" type="CustomerCreditTransferInitiationV03"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="DocumentAdjustment1">
-        <xs:sequence>
-            <xs:element name="Amt" type="ActiveOrHistoricCurrencyAndAmount"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="CdtDbtInd" type="CreditDebitCode"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Rsn" type="Max4Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="AddtlInf" type="Max140Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="DocumentType3Code">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="RADM"/>
-            <xs:enumeration value="RPIN"/>
-            <xs:enumeration value="FXDR"/>
-            <xs:enumeration value="DISP"/>
-            <xs:enumeration value="PUOR"/>
-            <xs:enumeration value="SCOR"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="DocumentType5Code">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="MSIN"/>
-            <xs:enumeration value="CNFA"/>
-            <xs:enumeration value="DNFA"/>
-            <xs:enumeration value="CINV"/>
-            <xs:enumeration value="CREN"/>
-            <xs:enumeration value="DEBN"/>
-            <xs:enumeration value="HIRI"/>
-            <xs:enumeration value="SBIN"/>
-            <xs:enumeration value="CMCN"/>
-            <xs:enumeration value="SOAC"/>
-            <xs:enumeration value="DISP"/>
-            <xs:enumeration value="BOLD"/>
-            <xs:enumeration value="VCHR"/>
-            <xs:enumeration value="AROI"/>
-            <xs:enumeration value="TSUT"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="EquivalentAmount2">
-        <xs:sequence>
-            <xs:element name="Amt" type="ActiveOrHistoricCurrencyAndAmount"/>
-            <xs:element name="CcyOfTrf" type="ActiveOrHistoricCurrencyCode"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="ExchangeRateInformation1">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="XchgRate" type="BaseOneRate"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="RateTp" type="ExchangeRateType1Code"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="CtrctId" type="Max35Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="ExchangeRateType1Code">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="SPOT"/>
-            <xs:enumeration value="SALE"/>
-            <xs:enumeration value="AGRD"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="ExternalAccountIdentification1Code">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="4"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="ExternalCategoryPurpose1Code">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="4"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="ExternalClearingSystemIdentification1Code">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="5"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="ExternalFinancialInstitutionIdentification1Code">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="4"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="ExternalLocalInstrument1Code">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="35"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="ExternalOrganisationIdentification1Code">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="4"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="ExternalPersonIdentification1Code">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="4"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="ExternalPurpose1Code">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="4"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="ExternalServiceLevel1Code">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="4"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="FinancialIdentificationSchemeName1Choice">
-        <xs:sequence>
-            <xs:choice>
-                <xs:element name="Cd" type="ExternalFinancialInstitutionIdentification1Code"/>
-                <xs:element name="Prtry" type="Max35Text"/>
-            </xs:choice>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="FinancialInstitutionIdentification7">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="BIC" type="BICIdentifier"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="ClrSysMmbId" type="ClearingSystemMemberIdentification2"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Nm" type="Max140Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="PstlAdr" type="PostalAddress6"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Othr" type="GenericFinancialIdentification1"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="GenericAccountIdentification1">
-        <xs:sequence>
-            <xs:element name="Id" type="Max34Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="SchmeNm" type="AccountSchemeName1Choice"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Issr" type="Max35Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="GenericFinancialIdentification1">
-        <xs:sequence>
-            <xs:element name="Id" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="SchmeNm" type="FinancialIdentificationSchemeName1Choice"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Issr" type="Max35Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="GenericOrganisationIdentification1">
-        <xs:sequence>
-            <xs:element name="Id" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="SchmeNm" type="OrganisationIdentificationSchemeName1Choice"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Issr" type="Max35Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="GenericPersonIdentification1">
-        <xs:sequence>
-            <xs:element name="Id" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="SchmeNm" type="PersonIdentificationSchemeName1Choice"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Issr" type="Max35Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="GroupHeader32">
-        <xs:sequence>
-            <xs:element name="MsgId" type="Max35Text"/>
-            <xs:element name="CreDtTm" type="ISODateTime"/>
-            <xs:element maxOccurs="2" minOccurs="0" name="Authstn" type="Authorisation1Choice"/>
-            <xs:element name="NbOfTxs" type="Max15NumericText"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="CtrlSum" type="DecimalNumber"/>
-            <xs:element name="InitgPty" type="PartyIdentification32"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="FwdgAgt" type="BranchAndFinancialInstitutionIdentification4"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="IBAN2007Identifier">
-        <xs:restriction base="xs:string">
-            <xs:pattern value="[A-Z]{2,2}[0-9]{2,2}[a-zA-Z0-9]{1,30}"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="ISODate">
-        <xs:restriction base="xs:date"/>
-    </xs:simpleType>
-    <xs:simpleType name="ISODateTime">
-        <xs:restriction base="xs:dateTime"/>
-    </xs:simpleType>
-    <xs:simpleType name="Instruction3Code">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="CHQB"/>
-            <xs:enumeration value="HOLD"/>
-            <xs:enumeration value="PHOB"/>
-            <xs:enumeration value="TELB"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="InstructionForCreditorAgent1">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="Cd" type="Instruction3Code"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="InstrInf" type="Max140Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="LocalInstrument2Choice">
-        <xs:sequence>
-            <xs:choice>
-                <xs:element name="Cd" type="ExternalLocalInstrument1Code"/>
-                <xs:element name="Prtry" type="Max35Text"/>
-            </xs:choice>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="Max10Text">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="10"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="Max128Text">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="128"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="Max140Text">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="140"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="Max15NumericText">
-        <xs:restriction base="xs:string">
-            <xs:pattern value="[0-9]{1,15}"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="Max16Text">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="16"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="Max2048Text">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="2048"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="Max34Text">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="34"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="Max35Text">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="35"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="Max4Text">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="4"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="Max70Text">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="70"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="NameAndAddress10">
-        <xs:sequence>
-            <xs:element name="Nm" type="Max140Text"/>
-            <xs:element name="Adr" type="PostalAddress6"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="NamePrefix1Code">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="DOCT"/>
-            <xs:enumeration value="MIST"/>
-            <xs:enumeration value="MISS"/>
-            <xs:enumeration value="MADM"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="Number">
-        <xs:restriction base="xs:decimal">
-            <xs:fractionDigits value="0"/>
-            <xs:totalDigits value="18"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="OrganisationIdentification4">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="BICOrBEI" type="AnyBICIdentifier"/>
-            <xs:element maxOccurs="unbounded" minOccurs="0" name="Othr" type="GenericOrganisationIdentification1"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="OrganisationIdentificationSchemeName1Choice">
-        <xs:sequence>
-            <xs:choice>
-                <xs:element name="Cd" type="ExternalOrganisationIdentification1Code"/>
-                <xs:element name="Prtry" type="Max35Text"/>
-            </xs:choice>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="Party6Choice">
-        <xs:sequence>
-            <xs:choice>
-                <xs:element name="OrgId" type="OrganisationIdentification4"/>
-                <xs:element name="PrvtId" type="PersonIdentification5"/>
-            </xs:choice>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="PartyIdentification32">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="Nm" type="Max140Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="PstlAdr" type="PostalAddress6"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Id" type="Party6Choice"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="CtryOfRes" type="CountryCode"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="CtctDtls" type="ContactDetails2"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="PaymentIdentification1">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="InstrId" type="Max35Text"/>
-            <xs:element name="EndToEndId" type="Max35Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="PaymentInstructionInformation3">
-        <xs:sequence>
-            <xs:element name="PmtInfId" type="Max35Text"/>
-            <xs:element name="PmtMtd" type="PaymentMethod3Code"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="BtchBookg" type="BatchBookingIndicator"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="NbOfTxs" type="Max15NumericText"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="CtrlSum" type="DecimalNumber"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="PmtTpInf" type="PaymentTypeInformation19"/>
-            <xs:element name="ReqdExctnDt" type="ISODate"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="PoolgAdjstmntDt" type="ISODate"/>
-            <xs:element name="Dbtr" type="PartyIdentification32"/>
-            <xs:element name="DbtrAcct" type="CashAccount16"/>
-            <xs:element name="DbtrAgt" type="BranchAndFinancialInstitutionIdentification4"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="DbtrAgtAcct" type="CashAccount16"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="UltmtDbtr" type="PartyIdentification32"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="ChrgBr" type="ChargeBearerType1Code"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="ChrgsAcct" type="CashAccount16"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="ChrgsAcctAgt" type="BranchAndFinancialInstitutionIdentification4"/>
-            <xs:element maxOccurs="unbounded" minOccurs="1" name="CdtTrfTxInf" type="CreditTransferTransactionInformation10"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="PaymentMethod3Code">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="CHK"/>
-            <xs:enumeration value="TRF"/>
-            <xs:enumeration value="TRA"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="PaymentTypeInformation19">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="InstrPrty" type="Priority2Code"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="SvcLvl" type="ServiceLevel8Choice"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="LclInstrm" type="LocalInstrument2Choice"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="CtgyPurp" type="CategoryPurpose1Choice"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="PercentageRate">
-        <xs:restriction base="xs:decimal">
-            <xs:fractionDigits value="10"/>
-            <xs:totalDigits value="11"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="PersonIdentification5">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="DtAndPlcOfBirth" type="DateAndPlaceOfBirth"/>
-            <xs:element maxOccurs="unbounded" minOccurs="0" name="Othr" type="GenericPersonIdentification1"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="PersonIdentificationSchemeName1Choice">
-        <xs:sequence>
-            <xs:choice>
-                <xs:element name="Cd" type="ExternalPersonIdentification1Code"/>
-                <xs:element name="Prtry" type="Max35Text"/>
-            </xs:choice>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="PhoneNumber">
-        <xs:restriction base="xs:string">
-            <xs:pattern value="\+[0-9]{1,3}-[0-9()+\-]{1,30}"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="PostalAddress6">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="AdrTp" type="AddressType2Code"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Dept" type="Max70Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="SubDept" type="Max70Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="StrtNm" type="Max70Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="BldgNb" type="Max16Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="PstCd" type="Max16Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="TwnNm" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="CtrySubDvsn" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Ctry" type="CountryCode"/>
-            <xs:element maxOccurs="7" minOccurs="0" name="AdrLine" type="Max70Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="Priority2Code">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="HIGH"/>
-            <xs:enumeration value="NORM"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="Purpose2Choice">
-        <xs:sequence>
-            <xs:choice>
-                <xs:element name="Cd" type="ExternalPurpose1Code"/>
-                <xs:element name="Prtry" type="Max35Text"/>
-            </xs:choice>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="ReferredDocumentInformation3">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="Tp" type="ReferredDocumentType2"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Nb" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="RltdDt" type="ISODate"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="ReferredDocumentType1Choice">
-        <xs:sequence>
-            <xs:choice>
-                <xs:element name="Cd" type="DocumentType5Code"/>
-                <xs:element name="Prtry" type="Max35Text"/>
-            </xs:choice>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="ReferredDocumentType2">
-        <xs:sequence>
-            <xs:element name="CdOrPrtry" type="ReferredDocumentType1Choice"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Issr" type="Max35Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="RegulatoryAuthority2">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="Nm" type="Max140Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Ctry" type="CountryCode"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="RegulatoryReporting3">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="DbtCdtRptgInd" type="RegulatoryReportingType1Code"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Authrty" type="RegulatoryAuthority2"/>
-            <xs:element maxOccurs="unbounded" minOccurs="0" name="Dtls" type="StructuredRegulatoryReporting3"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="RegulatoryReportingType1Code">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="CRED"/>
-            <xs:enumeration value="DEBT"/>
-            <xs:enumeration value="BOTH"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="RemittanceAmount1">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="DuePyblAmt" type="ActiveOrHistoricCurrencyAndAmount"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="DscntApldAmt" type="ActiveOrHistoricCurrencyAndAmount"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="CdtNoteAmt" type="ActiveOrHistoricCurrencyAndAmount"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="TaxAmt" type="ActiveOrHistoricCurrencyAndAmount"/>
-            <xs:element maxOccurs="unbounded" minOccurs="0" name="AdjstmntAmtAndRsn" type="DocumentAdjustment1"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="RmtdAmt" type="ActiveOrHistoricCurrencyAndAmount"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="RemittanceInformation5">
-        <xs:sequence>
-            <xs:element maxOccurs="unbounded" minOccurs="0" name="Ustrd" type="Max140Text"/>
-            <xs:element maxOccurs="unbounded" minOccurs="0" name="Strd" type="StructuredRemittanceInformation7"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="RemittanceLocation2">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="RmtId" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="RmtLctnMtd" type="RemittanceLocationMethod2Code"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="RmtLctnElctrncAdr" type="Max2048Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="RmtLctnPstlAdr" type="NameAndAddress10"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="RemittanceLocationMethod2Code">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="FAXI"/>
-            <xs:enumeration value="EDIC"/>
-            <xs:enumeration value="URID"/>
-            <xs:enumeration value="EMAL"/>
-            <xs:enumeration value="POST"/>
-            <xs:enumeration value="SMSM"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="ServiceLevel8Choice">
-        <xs:sequence>
-            <xs:choice>
-                <xs:element name="Cd" type="ExternalServiceLevel1Code"/>
-                <xs:element name="Prtry" type="Max35Text"/>
-            </xs:choice>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="StructuredRegulatoryReporting3">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="Tp" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Dt" type="ISODate"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Ctry" type="CountryCode"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Cd" type="Max10Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Amt" type="ActiveOrHistoricCurrencyAndAmount"/>
-            <xs:element maxOccurs="unbounded" minOccurs="0" name="Inf" type="Max35Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="StructuredRemittanceInformation7">
-        <xs:sequence>
-            <xs:element maxOccurs="unbounded" minOccurs="0" name="RfrdDocInf" type="ReferredDocumentInformation3"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="RfrdDocAmt" type="RemittanceAmount1"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="CdtrRefInf" type="CreditorReferenceInformation2"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Invcr" type="PartyIdentification32"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Invcee" type="PartyIdentification32"/>
-            <xs:element maxOccurs="3" minOccurs="0" name="AddtlRmtInf" type="Max140Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="TaxAmount1">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="Rate" type="PercentageRate"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="TaxblBaseAmt" type="ActiveOrHistoricCurrencyAndAmount"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="TtlAmt" type="ActiveOrHistoricCurrencyAndAmount"/>
-            <xs:element maxOccurs="unbounded" minOccurs="0" name="Dtls" type="TaxRecordDetails1"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="TaxAuthorisation1">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="Titl" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Nm" type="Max140Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="TaxInformation3">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="Cdtr" type="TaxParty1"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Dbtr" type="TaxParty2"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="AdmstnZn" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="RefNb" type="Max140Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Mtd" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="TtlTaxblBaseAmt" type="ActiveOrHistoricCurrencyAndAmount"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="TtlTaxAmt" type="ActiveOrHistoricCurrencyAndAmount"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Dt" type="ISODate"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="SeqNb" type="Number"/>
-            <xs:element maxOccurs="unbounded" minOccurs="0" name="Rcrd" type="TaxRecord1"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="TaxParty1">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="TaxId" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="RegnId" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="TaxTp" type="Max35Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="TaxParty2">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="TaxId" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="RegnId" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="TaxTp" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Authstn" type="TaxAuthorisation1"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="TaxPeriod1">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="Yr" type="ISODate"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Tp" type="TaxRecordPeriod1Code"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="FrToDt" type="DatePeriodDetails"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="TaxRecord1">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="Tp" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Ctgy" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="CtgyDtls" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="DbtrSts" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="CertId" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="FrmsCd" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Prd" type="TaxPeriod1"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="TaxAmt" type="TaxAmount1"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="AddtlInf" type="Max140Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="TaxRecordDetails1">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="Prd" type="TaxPeriod1"/>
-            <xs:element name="Amt" type="ActiveOrHistoricCurrencyAndAmount"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="TaxRecordPeriod1Code">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="MM01"/>
-            <xs:enumeration value="MM02"/>
-            <xs:enumeration value="MM03"/>
-            <xs:enumeration value="MM04"/>
-            <xs:enumeration value="MM05"/>
-            <xs:enumeration value="MM06"/>
-            <xs:enumeration value="MM07"/>
-            <xs:enumeration value="MM08"/>
-            <xs:enumeration value="MM09"/>
-            <xs:enumeration value="MM10"/>
-            <xs:enumeration value="MM11"/>
-            <xs:enumeration value="MM12"/>
-            <xs:enumeration value="QTR1"/>
-            <xs:enumeration value="QTR2"/>
-            <xs:enumeration value="QTR3"/>
-            <xs:enumeration value="QTR4"/>
-            <xs:enumeration value="HLF1"/>
-            <xs:enumeration value="HLF2"/>
-        </xs:restriction>
-    </xs:simpleType>
-</xs:schema>
--- a/dev/resources/sepa/pain.008.001.02.xsd
+++ b/dev/resources/sepa/pain.008.001.02.xsd
@@ -1,879 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--Generated by SWIFTStandards Workstation (build:R6.1.0.2) on 2009 Jan 08 17:30:53-->
-<xs:schema xmlns="urn:iso:std:iso:20022:tech:xsd:pain.008.001.02" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="urn:iso:std:iso:20022:tech:xsd:pain.008.001.02">
-    <xs:element name="Document" type="Document"/>
-    <xs:complexType name="AccountIdentification4Choice">
-        <xs:sequence>
-            <xs:choice>
-                <xs:element name="IBAN" type="IBAN2007Identifier"/>
-                <xs:element name="Othr" type="GenericAccountIdentification1"/>
-            </xs:choice>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="AccountSchemeName1Choice">
-        <xs:sequence>
-            <xs:choice>
-                <xs:element name="Cd" type="ExternalAccountIdentification1Code"/>
-                <xs:element name="Prtry" type="Max35Text"/>
-            </xs:choice>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="ActiveOrHistoricCurrencyAndAmount_SimpleType">
-        <xs:restriction base="xs:decimal">
-            <xs:minInclusive value="0"/>
-            <xs:fractionDigits value="5"/>
-            <xs:totalDigits value="18"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="ActiveOrHistoricCurrencyAndAmount">
-        <xs:simpleContent>
-            <xs:extension base="ActiveOrHistoricCurrencyAndAmount_SimpleType">
-                <xs:attribute name="Ccy" type="ActiveOrHistoricCurrencyCode" use="required"/>
-            </xs:extension>
-        </xs:simpleContent>
-    </xs:complexType>
-    <xs:simpleType name="ActiveOrHistoricCurrencyCode">
-        <xs:restriction base="xs:string">
-            <xs:pattern value="[A-Z]{3,3}"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="AddressType2Code">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="ADDR"/>
-            <xs:enumeration value="PBOX"/>
-            <xs:enumeration value="HOME"/>
-            <xs:enumeration value="BIZZ"/>
-            <xs:enumeration value="MLTO"/>
-            <xs:enumeration value="DLVY"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="AmendmentInformationDetails6">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="OrgnlMndtId" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="OrgnlCdtrSchmeId" type="PartyIdentification32"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="OrgnlCdtrAgt" type="BranchAndFinancialInstitutionIdentification4"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="OrgnlCdtrAgtAcct" type="CashAccount16"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="OrgnlDbtr" type="PartyIdentification32"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="OrgnlDbtrAcct" type="CashAccount16"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="OrgnlDbtrAgt" type="BranchAndFinancialInstitutionIdentification4"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="OrgnlDbtrAgtAcct" type="CashAccount16"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="OrgnlFnlColltnDt" type="ISODate"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="OrgnlFrqcy" type="Frequency1Code"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="AnyBICIdentifier">
-        <xs:restriction base="xs:string">
-            <xs:pattern value="[A-Z]{6,6}[A-Z2-9][A-NP-Z0-9]([A-Z0-9]{3,3}){0,1}"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="Authorisation1Choice">
-        <xs:sequence>
-            <xs:choice>
-                <xs:element name="Cd" type="Authorisation1Code"/>
-                <xs:element name="Prtry" type="Max128Text"/>
-            </xs:choice>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="Authorisation1Code">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="AUTH"/>
-            <xs:enumeration value="FDET"/>
-            <xs:enumeration value="FSUM"/>
-            <xs:enumeration value="ILEV"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="BICIdentifier">
-        <xs:restriction base="xs:string">
-            <xs:pattern value="[A-Z]{6,6}[A-Z2-9][A-NP-Z0-9]([A-Z0-9]{3,3}){0,1}"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="BatchBookingIndicator">
-        <xs:restriction base="xs:boolean"/>
-    </xs:simpleType>
-    <xs:complexType name="BranchAndFinancialInstitutionIdentification4">
-        <xs:sequence>
-            <xs:element name="FinInstnId" type="FinancialInstitutionIdentification7"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="BrnchId" type="BranchData2"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="BranchData2">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="Id" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Nm" type="Max140Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="PstlAdr" type="PostalAddress6"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="CashAccount16">
-        <xs:sequence>
-            <xs:element name="Id" type="AccountIdentification4Choice"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Tp" type="CashAccountType2"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Ccy" type="ActiveOrHistoricCurrencyCode"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Nm" type="Max70Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="CashAccountType2">
-        <xs:sequence>
-            <xs:choice>
-                <xs:element name="Cd" type="CashAccountType4Code"/>
-                <xs:element name="Prtry" type="Max35Text"/>
-            </xs:choice>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="CashAccountType4Code">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="CASH"/>
-            <xs:enumeration value="CHAR"/>
-            <xs:enumeration value="COMM"/>
-            <xs:enumeration value="TAXE"/>
-            <xs:enumeration value="CISH"/>
-            <xs:enumeration value="TRAS"/>
-            <xs:enumeration value="SACC"/>
-            <xs:enumeration value="CACC"/>
-            <xs:enumeration value="SVGS"/>
-            <xs:enumeration value="ONDP"/>
-            <xs:enumeration value="MGLD"/>
-            <xs:enumeration value="NREX"/>
-            <xs:enumeration value="MOMA"/>
-            <xs:enumeration value="LOAN"/>
-            <xs:enumeration value="SLRY"/>
-            <xs:enumeration value="ODFT"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="CategoryPurpose1Choice">
-        <xs:sequence>
-            <xs:choice>
-                <xs:element name="Cd" type="ExternalCategoryPurpose1Code"/>
-                <xs:element name="Prtry" type="Max35Text"/>
-            </xs:choice>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="ChargeBearerType1Code">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="DEBT"/>
-            <xs:enumeration value="CRED"/>
-            <xs:enumeration value="SHAR"/>
-            <xs:enumeration value="SLEV"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="ClearingSystemIdentification2Choice">
-        <xs:sequence>
-            <xs:choice>
-                <xs:element name="Cd" type="ExternalClearingSystemIdentification1Code"/>
-                <xs:element name="Prtry" type="Max35Text"/>
-            </xs:choice>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="ClearingSystemMemberIdentification2">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="ClrSysId" type="ClearingSystemIdentification2Choice"/>
-            <xs:element name="MmbId" type="Max35Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="ContactDetails2">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="NmPrfx" type="NamePrefix1Code"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Nm" type="Max140Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="PhneNb" type="PhoneNumber"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="MobNb" type="PhoneNumber"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="FaxNb" type="PhoneNumber"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="EmailAdr" type="Max2048Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Othr" type="Max35Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="CountryCode">
-        <xs:restriction base="xs:string">
-            <xs:pattern value="[A-Z]{2,2}"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="CreditDebitCode">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="CRDT"/>
-            <xs:enumeration value="DBIT"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="CreditorReferenceInformation2">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="Tp" type="CreditorReferenceType2"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Ref" type="Max35Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="CreditorReferenceType1Choice">
-        <xs:sequence>
-            <xs:choice>
-                <xs:element name="Cd" type="DocumentType3Code"/>
-                <xs:element name="Prtry" type="Max35Text"/>
-            </xs:choice>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="CreditorReferenceType2">
-        <xs:sequence>
-            <xs:element name="CdOrPrtry" type="CreditorReferenceType1Choice"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Issr" type="Max35Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="CustomerDirectDebitInitiationV02">
-        <xs:sequence>
-            <xs:element name="GrpHdr" type="GroupHeader39"/>
-            <xs:element maxOccurs="unbounded" minOccurs="1" name="PmtInf" type="PaymentInstructionInformation4"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="DateAndPlaceOfBirth">
-        <xs:sequence>
-            <xs:element name="BirthDt" type="ISODate"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="PrvcOfBirth" type="Max35Text"/>
-            <xs:element name="CityOfBirth" type="Max35Text"/>
-            <xs:element name="CtryOfBirth" type="CountryCode"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="DatePeriodDetails">
-        <xs:sequence>
-            <xs:element name="FrDt" type="ISODate"/>
-            <xs:element name="ToDt" type="ISODate"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="DecimalNumber">
-        <xs:restriction base="xs:decimal">
-            <xs:fractionDigits value="17"/>
-            <xs:totalDigits value="18"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="DirectDebitTransaction6">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="MndtRltdInf" type="MandateRelatedInformation6"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="CdtrSchmeId" type="PartyIdentification32"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="PreNtfctnId" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="PreNtfctnDt" type="ISODate"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="DirectDebitTransactionInformation9">
-        <xs:sequence>
-            <xs:element name="PmtId" type="PaymentIdentification1"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="PmtTpInf" type="PaymentTypeInformation20"/>
-            <xs:element name="InstdAmt" type="ActiveOrHistoricCurrencyAndAmount"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="ChrgBr" type="ChargeBearerType1Code"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="DrctDbtTx" type="DirectDebitTransaction6"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="UltmtCdtr" type="PartyIdentification32"/>
-            <xs:element name="DbtrAgt" type="BranchAndFinancialInstitutionIdentification4"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="DbtrAgtAcct" type="CashAccount16"/>
-            <xs:element name="Dbtr" type="PartyIdentification32"/>
-            <xs:element name="DbtrAcct" type="CashAccount16"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="UltmtDbtr" type="PartyIdentification32"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="InstrForCdtrAgt" type="Max140Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Purp" type="Purpose2Choice"/>
-            <xs:element maxOccurs="10" minOccurs="0" name="RgltryRptg" type="RegulatoryReporting3"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Tax" type="TaxInformation3"/>
-            <xs:element maxOccurs="10" minOccurs="0" name="RltdRmtInf" type="RemittanceLocation2"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="RmtInf" type="RemittanceInformation5"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="Document">
-        <xs:sequence>
-            <xs:element name="CstmrDrctDbtInitn" type="CustomerDirectDebitInitiationV02"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="DocumentAdjustment1">
-        <xs:sequence>
-            <xs:element name="Amt" type="ActiveOrHistoricCurrencyAndAmount"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="CdtDbtInd" type="CreditDebitCode"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Rsn" type="Max4Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="AddtlInf" type="Max140Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="DocumentType3Code">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="RADM"/>
-            <xs:enumeration value="RPIN"/>
-            <xs:enumeration value="FXDR"/>
-            <xs:enumeration value="DISP"/>
-            <xs:enumeration value="PUOR"/>
-            <xs:enumeration value="SCOR"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="DocumentType5Code">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="MSIN"/>
-            <xs:enumeration value="CNFA"/>
-            <xs:enumeration value="DNFA"/>
-            <xs:enumeration value="CINV"/>
-            <xs:enumeration value="CREN"/>
-            <xs:enumeration value="DEBN"/>
-            <xs:enumeration value="HIRI"/>
-            <xs:enumeration value="SBIN"/>
-            <xs:enumeration value="CMCN"/>
-            <xs:enumeration value="SOAC"/>
-            <xs:enumeration value="DISP"/>
-            <xs:enumeration value="BOLD"/>
-            <xs:enumeration value="VCHR"/>
-            <xs:enumeration value="AROI"/>
-            <xs:enumeration value="TSUT"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="ExternalAccountIdentification1Code">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="4"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="ExternalCategoryPurpose1Code">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="4"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="ExternalClearingSystemIdentification1Code">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="5"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="ExternalFinancialInstitutionIdentification1Code">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="4"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="ExternalLocalInstrument1Code">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="35"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="ExternalOrganisationIdentification1Code">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="4"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="ExternalPersonIdentification1Code">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="4"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="ExternalPurpose1Code">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="4"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="ExternalServiceLevel1Code">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="4"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="FinancialIdentificationSchemeName1Choice">
-        <xs:sequence>
-            <xs:choice>
-                <xs:element name="Cd" type="ExternalFinancialInstitutionIdentification1Code"/>
-                <xs:element name="Prtry" type="Max35Text"/>
-            </xs:choice>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="FinancialInstitutionIdentification7">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="BIC" type="BICIdentifier"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="ClrSysMmbId" type="ClearingSystemMemberIdentification2"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Nm" type="Max140Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="PstlAdr" type="PostalAddress6"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Othr" type="GenericFinancialIdentification1"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="Frequency1Code">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="YEAR"/>
-            <xs:enumeration value="MNTH"/>
-            <xs:enumeration value="QURT"/>
-            <xs:enumeration value="MIAN"/>
-            <xs:enumeration value="WEEK"/>
-            <xs:enumeration value="DAIL"/>
-            <xs:enumeration value="ADHO"/>
-            <xs:enumeration value="INDA"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="GenericAccountIdentification1">
-        <xs:sequence>
-            <xs:element name="Id" type="Max34Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="SchmeNm" type="AccountSchemeName1Choice"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Issr" type="Max35Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="GenericFinancialIdentification1">
-        <xs:sequence>
-            <xs:element name="Id" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="SchmeNm" type="FinancialIdentificationSchemeName1Choice"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Issr" type="Max35Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="GenericOrganisationIdentification1">
-        <xs:sequence>
-            <xs:element name="Id" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="SchmeNm" type="OrganisationIdentificationSchemeName1Choice"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Issr" type="Max35Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="GenericPersonIdentification1">
-        <xs:sequence>
-            <xs:element name="Id" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="SchmeNm" type="PersonIdentificationSchemeName1Choice"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Issr" type="Max35Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="GroupHeader39">
-        <xs:sequence>
-            <xs:element name="MsgId" type="Max35Text"/>
-            <xs:element name="CreDtTm" type="ISODateTime"/>
-            <xs:element maxOccurs="2" minOccurs="0" name="Authstn" type="Authorisation1Choice"/>
-            <xs:element name="NbOfTxs" type="Max15NumericText"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="CtrlSum" type="DecimalNumber"/>
-            <xs:element name="InitgPty" type="PartyIdentification32"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="FwdgAgt" type="BranchAndFinancialInstitutionIdentification4"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="IBAN2007Identifier">
-        <xs:restriction base="xs:string">
-            <xs:pattern value="[A-Z]{2,2}[0-9]{2,2}[a-zA-Z0-9]{1,30}"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="ISODate">
-        <xs:restriction base="xs:date"/>
-    </xs:simpleType>
-    <xs:simpleType name="ISODateTime">
-        <xs:restriction base="xs:dateTime"/>
-    </xs:simpleType>
-    <xs:complexType name="LocalInstrument2Choice">
-        <xs:sequence>
-            <xs:choice>
-                <xs:element name="Cd" type="ExternalLocalInstrument1Code"/>
-                <xs:element name="Prtry" type="Max35Text"/>
-            </xs:choice>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="MandateRelatedInformation6">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="MndtId" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="DtOfSgntr" type="ISODate"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="AmdmntInd" type="TrueFalseIndicator"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="AmdmntInfDtls" type="AmendmentInformationDetails6"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="ElctrncSgntr" type="Max1025Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="FrstColltnDt" type="ISODate"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="FnlColltnDt" type="ISODate"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Frqcy" type="Frequency1Code"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="Max1025Text">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="1025"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="Max10Text">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="10"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="Max128Text">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="128"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="Max140Text">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="140"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="Max15NumericText">
-        <xs:restriction base="xs:string">
-            <xs:pattern value="[0-9]{1,15}"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="Max16Text">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="16"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="Max2048Text">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="2048"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="Max34Text">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="34"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="Max35Text">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="35"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="Max4Text">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="4"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="Max70Text">
-        <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:maxLength value="70"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="NameAndAddress10">
-        <xs:sequence>
-            <xs:element name="Nm" type="Max140Text"/>
-            <xs:element name="Adr" type="PostalAddress6"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="NamePrefix1Code">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="DOCT"/>
-            <xs:enumeration value="MIST"/>
-            <xs:enumeration value="MISS"/>
-            <xs:enumeration value="MADM"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="Number">
-        <xs:restriction base="xs:decimal">
-            <xs:fractionDigits value="0"/>
-            <xs:totalDigits value="18"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="OrganisationIdentification4">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="BICOrBEI" type="AnyBICIdentifier"/>
-            <xs:element maxOccurs="unbounded" minOccurs="0" name="Othr" type="GenericOrganisationIdentification1"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="OrganisationIdentificationSchemeName1Choice">
-        <xs:sequence>
-            <xs:choice>
-                <xs:element name="Cd" type="ExternalOrganisationIdentification1Code"/>
-                <xs:element name="Prtry" type="Max35Text"/>
-            </xs:choice>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="Party6Choice">
-        <xs:sequence>
-            <xs:choice>
-                <xs:element name="OrgId" type="OrganisationIdentification4"/>
-                <xs:element name="PrvtId" type="PersonIdentification5"/>
-            </xs:choice>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="PartyIdentification32">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="Nm" type="Max140Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="PstlAdr" type="PostalAddress6"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Id" type="Party6Choice"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="CtryOfRes" type="CountryCode"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="CtctDtls" type="ContactDetails2"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="PaymentIdentification1">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="InstrId" type="Max35Text"/>
-            <xs:element name="EndToEndId" type="Max35Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="PaymentInstructionInformation4">
-        <xs:sequence>
-            <xs:element name="PmtInfId" type="Max35Text"/>
-            <xs:element name="PmtMtd" type="PaymentMethod2Code"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="BtchBookg" type="BatchBookingIndicator"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="NbOfTxs" type="Max15NumericText"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="CtrlSum" type="DecimalNumber"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="PmtTpInf" type="PaymentTypeInformation20"/>
-            <xs:element name="ReqdColltnDt" type="ISODate"/>
-            <xs:element name="Cdtr" type="PartyIdentification32"/>
-            <xs:element name="CdtrAcct" type="CashAccount16"/>
-            <xs:element name="CdtrAgt" type="BranchAndFinancialInstitutionIdentification4"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="CdtrAgtAcct" type="CashAccount16"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="UltmtCdtr" type="PartyIdentification32"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="ChrgBr" type="ChargeBearerType1Code"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="ChrgsAcct" type="CashAccount16"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="ChrgsAcctAgt" type="BranchAndFinancialInstitutionIdentification4"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="CdtrSchmeId" type="PartyIdentification32"/>
-            <xs:element maxOccurs="unbounded" minOccurs="1" name="DrctDbtTxInf" type="DirectDebitTransactionInformation9"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="PaymentMethod2Code">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="DD"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="PaymentTypeInformation20">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="InstrPrty" type="Priority2Code"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="SvcLvl" type="ServiceLevel8Choice"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="LclInstrm" type="LocalInstrument2Choice"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="SeqTp" type="SequenceType1Code"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="CtgyPurp" type="CategoryPurpose1Choice"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="PercentageRate">
-        <xs:restriction base="xs:decimal">
-            <xs:fractionDigits value="10"/>
-            <xs:totalDigits value="11"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="PersonIdentification5">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="DtAndPlcOfBirth" type="DateAndPlaceOfBirth"/>
-            <xs:element maxOccurs="unbounded" minOccurs="0" name="Othr" type="GenericPersonIdentification1"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="PersonIdentificationSchemeName1Choice">
-        <xs:sequence>
-            <xs:choice>
-                <xs:element name="Cd" type="ExternalPersonIdentification1Code"/>
-                <xs:element name="Prtry" type="Max35Text"/>
-            </xs:choice>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="PhoneNumber">
-        <xs:restriction base="xs:string">
-            <xs:pattern value="\+[0-9]{1,3}-[0-9()+\-]{1,30}"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="PostalAddress6">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="AdrTp" type="AddressType2Code"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Dept" type="Max70Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="SubDept" type="Max70Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="StrtNm" type="Max70Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="BldgNb" type="Max16Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="PstCd" type="Max16Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="TwnNm" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="CtrySubDvsn" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Ctry" type="CountryCode"/>
-            <xs:element maxOccurs="7" minOccurs="0" name="AdrLine" type="Max70Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="Priority2Code">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="HIGH"/>
-            <xs:enumeration value="NORM"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="Purpose2Choice">
-        <xs:sequence>
-            <xs:choice>
-                <xs:element name="Cd" type="ExternalPurpose1Code"/>
-                <xs:element name="Prtry" type="Max35Text"/>
-            </xs:choice>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="ReferredDocumentInformation3">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="Tp" type="ReferredDocumentType2"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Nb" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="RltdDt" type="ISODate"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="ReferredDocumentType1Choice">
-        <xs:sequence>
-            <xs:choice>
-                <xs:element name="Cd" type="DocumentType5Code"/>
-                <xs:element name="Prtry" type="Max35Text"/>
-            </xs:choice>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="ReferredDocumentType2">
-        <xs:sequence>
-            <xs:element name="CdOrPrtry" type="ReferredDocumentType1Choice"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Issr" type="Max35Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="RegulatoryAuthority2">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="Nm" type="Max140Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Ctry" type="CountryCode"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="RegulatoryReporting3">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="DbtCdtRptgInd" type="RegulatoryReportingType1Code"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Authrty" type="RegulatoryAuthority2"/>
-            <xs:element maxOccurs="unbounded" minOccurs="0" name="Dtls" type="StructuredRegulatoryReporting3"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="RegulatoryReportingType1Code">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="CRED"/>
-            <xs:enumeration value="DEBT"/>
-            <xs:enumeration value="BOTH"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="RemittanceAmount1">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="DuePyblAmt" type="ActiveOrHistoricCurrencyAndAmount"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="DscntApldAmt" type="ActiveOrHistoricCurrencyAndAmount"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="CdtNoteAmt" type="ActiveOrHistoricCurrencyAndAmount"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="TaxAmt" type="ActiveOrHistoricCurrencyAndAmount"/>
-            <xs:element maxOccurs="unbounded" minOccurs="0" name="AdjstmntAmtAndRsn" type="DocumentAdjustment1"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="RmtdAmt" type="ActiveOrHistoricCurrencyAndAmount"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="RemittanceInformation5">
-        <xs:sequence>
-            <xs:element maxOccurs="unbounded" minOccurs="0" name="Ustrd" type="Max140Text"/>
-            <xs:element maxOccurs="unbounded" minOccurs="0" name="Strd" type="StructuredRemittanceInformation7"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="RemittanceLocation2">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="RmtId" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="RmtLctnMtd" type="RemittanceLocationMethod2Code"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="RmtLctnElctrncAdr" type="Max2048Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="RmtLctnPstlAdr" type="NameAndAddress10"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="RemittanceLocationMethod2Code">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="FAXI"/>
-            <xs:enumeration value="EDIC"/>
-            <xs:enumeration value="URID"/>
-            <xs:enumeration value="EMAL"/>
-            <xs:enumeration value="POST"/>
-            <xs:enumeration value="SMSM"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="SequenceType1Code">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="FRST"/>
-            <xs:enumeration value="RCUR"/>
-            <xs:enumeration value="FNAL"/>
-            <xs:enumeration value="OOFF"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:complexType name="ServiceLevel8Choice">
-        <xs:sequence>
-            <xs:choice>
-                <xs:element name="Cd" type="ExternalServiceLevel1Code"/>
-                <xs:element name="Prtry" type="Max35Text"/>
-            </xs:choice>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="StructuredRegulatoryReporting3">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="Tp" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Dt" type="ISODate"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Ctry" type="CountryCode"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Cd" type="Max10Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Amt" type="ActiveOrHistoricCurrencyAndAmount"/>
-            <xs:element maxOccurs="unbounded" minOccurs="0" name="Inf" type="Max35Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="StructuredRemittanceInformation7">
-        <xs:sequence>
-            <xs:element maxOccurs="unbounded" minOccurs="0" name="RfrdDocInf" type="ReferredDocumentInformation3"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="RfrdDocAmt" type="RemittanceAmount1"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="CdtrRefInf" type="CreditorReferenceInformation2"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Invcr" type="PartyIdentification32"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Invcee" type="PartyIdentification32"/>
-            <xs:element maxOccurs="3" minOccurs="0" name="AddtlRmtInf" type="Max140Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="TaxAmount1">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="Rate" type="PercentageRate"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="TaxblBaseAmt" type="ActiveOrHistoricCurrencyAndAmount"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="TtlAmt" type="ActiveOrHistoricCurrencyAndAmount"/>
-            <xs:element maxOccurs="unbounded" minOccurs="0" name="Dtls" type="TaxRecordDetails1"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="TaxAuthorisation1">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="Titl" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Nm" type="Max140Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="TaxInformation3">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="Cdtr" type="TaxParty1"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Dbtr" type="TaxParty2"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="AdmstnZn" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="RefNb" type="Max140Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Mtd" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="TtlTaxblBaseAmt" type="ActiveOrHistoricCurrencyAndAmount"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="TtlTaxAmt" type="ActiveOrHistoricCurrencyAndAmount"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Dt" type="ISODate"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="SeqNb" type="Number"/>
-            <xs:element maxOccurs="unbounded" minOccurs="0" name="Rcrd" type="TaxRecord1"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="TaxParty1">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="TaxId" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="RegnId" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="TaxTp" type="Max35Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="TaxParty2">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="TaxId" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="RegnId" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="TaxTp" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Authstn" type="TaxAuthorisation1"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="TaxPeriod1">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="Yr" type="ISODate"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Tp" type="TaxRecordPeriod1Code"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="FrToDt" type="DatePeriodDetails"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="TaxRecord1">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="Tp" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Ctgy" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="CtgyDtls" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="DbtrSts" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="CertId" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="FrmsCd" type="Max35Text"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="Prd" type="TaxPeriod1"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="TaxAmt" type="TaxAmount1"/>
-            <xs:element maxOccurs="1" minOccurs="0" name="AddtlInf" type="Max140Text"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="TaxRecordDetails1">
-        <xs:sequence>
-            <xs:element maxOccurs="1" minOccurs="0" name="Prd" type="TaxPeriod1"/>
-            <xs:element name="Amt" type="ActiveOrHistoricCurrencyAndAmount"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:simpleType name="TaxRecordPeriod1Code">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="MM01"/>
-            <xs:enumeration value="MM02"/>
-            <xs:enumeration value="MM03"/>
-            <xs:enumeration value="MM04"/>
-            <xs:enumeration value="MM05"/>
-            <xs:enumeration value="MM06"/>
-            <xs:enumeration value="MM07"/>
-            <xs:enumeration value="MM08"/>
-            <xs:enumeration value="MM09"/>
-            <xs:enumeration value="MM10"/>
-            <xs:enumeration value="MM11"/>
-            <xs:enumeration value="MM12"/>
-            <xs:enumeration value="QTR1"/>
-            <xs:enumeration value="QTR2"/>
-            <xs:enumeration value="QTR3"/>
-            <xs:enumeration value="QTR4"/>
-            <xs:enumeration value="HLF1"/>
-            <xs:enumeration value="HLF2"/>
-        </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="TrueFalseIndicator">
-        <xs:restriction base="xs:boolean"/>
-    </xs:simpleType>
-</xs:schema>
--- a/dev/resources/sepa/test.xml
+++ b/dev/resources/sepa/test.xml
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<Document xmlns="urn:iso:std:iso:20022:tech:xsd:pain.008.001.02" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<CstmrDrctDbtInitn>
-		<GrpHdr>
-			<MsgId>PREL20171012/REF10</MsgId>
-			<CreDtTm>2017-10-12T00:08:30</CreDtTm>
-			<NbOfTxs>2</NbOfTxs>
-			<CtrlSum>734.4</CtrlSum>
-			<InitgPty>
-				<Nm>MyBigCompany</Nm>
-				<Id>
-				    <PrvtId>
-					<Othr>
-						<Id>FR76AAAAA</Id>
-					</Othr>
-				    </PrvtId>
-				</Id>
-			</InitgPty>
-		</GrpHdr>
-		<PmtInf>
-			<PmtInfId>PREL20171012/ID00010-T171001</PmtInfId>
-			<PmtMtd>DD</PmtMtd>
-			<NbOfTxs>2</NbOfTxs>
-			<CtrlSum>734.4</CtrlSum>
-			<PmtTpInf>
-				<SvcLvl>
-					<Cd>SEPA</Cd>
-				</SvcLvl>
-				<LclInstrm>
-					<Cd>CORE</Cd>
-				</LclInstrm>
-				<SeqTp>RCUR</SeqTp>
-			</PmtTpInf>
-			<ReqdColltnDt>2017-10-12</ReqdColltnDt>
-			<Cdtr>
-				<Nm>MyBigCompany</Nm>
-				<PstlAdr>
-					<Ctry>FR</Ctry>
-					<AdrLine>Address1</AdrLine>
-					<AdrLine>Address2</AdrLine>
-				</PstlAdr>
-			</Cdtr>
-			<CdtrAcct>
-				<Id>
-					<IBAN>FR76123456</IBAN>
-				</Id>
-			</CdtrAcct>
-			<CdtrAgt>
-				<FinInstnId>
-					<BIC>BICABCDEF</BIC>
-				</FinInstnId>
-			</CdtrAgt>
-			<ChrgBr>SLEV</ChrgBr>
-			<CdtrSchmeId>
-				<Id>
-					<PrvtId>
-						<Othr>
-							<Id>FR76AAAAA</Id>
-							<SchmeNm>
-								<Prtry>SEPA</Prtry>
-							</SchmeNm>
-						</Othr>
-					</PrvtId>
-				</Id>
-			</CdtrSchmeId>
-			<DrctDbtTxInf>
-				<PmtId>
-					<EndToEndId>AS-FA1710-0416-000679</EndToEndId>
-				</PmtId>
-				<InstdAmt Ccy="EUR">540</InstdAmt>
-				<DrctDbtTx>
-					<MndtRltdInf>
-						<MndtId>RUM-CU1610-0001-3-1476058417</MndtId>
-						<DtOfSgntr>2016-10-10</DtOfSgntr>
-						<AmdmntInd>false</AmdmntInd>
-					</MndtRltdInf>
-				</DrctDbtTx>
-				<DbtrAgt>
-					<FinInstnId>
-						<BIC>BICXYZ</BIC>
-					</FinInstnId>
-				</DbtrAgt>
-				<Dbtr>
-					<Nm>CUSTOMER A</Nm>
-					<PstlAdr>
-						<Ctry>FR</Ctry>
-						<AdrLine>Mr abc</AdrLine>
-					</PstlAdr>
-				</Dbtr>
-				<DbtrAcct>
-					<Id>
-						<IBAN>FR123456</IBAN>
-					</Id>
-				</DbtrAcct>
-				<RmtInf>
-					<Ustrd>FA1710-0416</Ustrd>
-				</RmtInf>
-			</DrctDbtTxInf>
-			<DrctDbtTxInf>
-				<PmtId>
-					<EndToEndId>AS-FA1710-0415-000683</EndToEndId>
-				</PmtId>
-				<InstdAmt Ccy="EUR">194.4</InstdAmt>
-				<DrctDbtTx>
-					<MndtRltdInf>
-						<MndtId>RUM-CU1709-0011-4-1506525346</MndtId>
-						<DtOfSgntr>2017-09-27</DtOfSgntr>
-						<AmdmntInd>false</AmdmntInd>
-					</MndtRltdInf>
-				</DrctDbtTx>
-				<DbtrAgt>
-					<FinInstnId>
-						<BIC>BICJKL</BIC>
-					</FinInstnId>
-				</DbtrAgt>
-				<Dbtr>
-					<Nm>CUSTOMER2</Nm>
-					<PstlAdr>
-						<Ctry>FR</Ctry>
-					</PstlAdr>
-				</Dbtr>
-				<DbtrAcct>
-					<Id>
-						<IBAN>FR76123456</IBAN>
-					</Id>
-				</DbtrAcct>
-				<RmtInf>
-					<Ustrd>FA1710-0415</Ustrd>
-				</RmtInf>
-			</DrctDbtTxInf>
-		</PmtInf>
-	</CstmrDrctDbtInitn>
-</Document>
--- a/dev/resources/sepa/text.txt
+++ b/dev/resources/sepa/text.txt
@@ -1,2 +0,0 @@
-To test a SEPA file:
-http://www.mesfluxdepaiement.fr/testez-vos-fichiers-sepa
--- a/dev/setup/apache/virtualhost
+++ b/dev/setup/apache/virtualhost
@@ -1,62 +0,0 @@
-<VirtualHost *:80>
-#php_admin_value sendmail_path "/usr/sbin/sendmail -t -i"
-#php_admin_value mail.force_extra_parameters "-f postmaster@mydomain.com"
-php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f postmaster@mydomain.com"
-php_admin_value open_basedir /tmp/:/home/../htdocs
-
-ServerName myvirtualalias
-ServerAlias myvirtualalias
-
-UseCanonicalName On
-
-AddDefaultCharset UTF-8
-
-DocumentRoot "/home/.../htdocs"
-
-<Directory /home/.../htdocs/>
-   AllowOverride None
-   Options       -Indexes -MultiViews +FollowSymLinks -ExecCGI
-   Require all granted
-</Directory>
-
-<Directory "/home/../htdocs/cache">
-   Deny from all
-   RemoveHandler .phtml .php .php3 .php4 .php5 .php6 .phps .cgi .exe .pl .asp .aspx .shtml .shtm .fcgi .fpl .jsp .htm .html .wml
-   AddType application/x-httpd-php-source .phtml .php .php3 .php4 .php5 .php6 .phps .cgi .exe .pl .asp .aspx .shtml .shtm .fcgi .fpl .jsp .htm .html .wml
-</Directory>
-
-
-ErrorLog /var/log/apache2/myvirtualalias_error_log
-TransferLog /var/log/apache2/myvirtualalias_access_log
-
-# Compress returned resources of type php pages, text file export, css and javascript
-AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css text/javascript application/javascript application/x-javascript
-
-AddType text/javascript .jgz
-AddEncoding gzip .jgz
-ExpiresActive On
-ExpiresByType image/x-icon A2592000
-ExpiresByType image/gif A2592000
-ExpiresByType image/png A2592000
-ExpiresByType image/jpeg A2592000
-ExpiresByType text/css A2592000
-ExpiresByType text/javascript A2592000
-ExpiresByType application/x-javascript A2592000
-ExpiresByType application/javascript A2592000
-
-SSLEngine On
-
-#   A self-signed (snakeoil) certificate can be created by installing
-#   the ssl-cert package. See
-#   /usr/share/doc/apache2.2-common/README.Debian.gz for more info.
-#   If both key and certificate are stored in the same file, only the
-#   SSLCertificateFile directive is needed.
-SSLCertificateFile    /etc/letsencrypt/live/www.mydomain.com/cert.pem
-SSLCertificateKeyFile /etc/letsencrypt/live/www.mydomain.com/privkey.pem
-SSLCertificateChainFile /etc/letsencrypt/live/www.mydomain.com/chain.pem
-
-#RewriteEngine   on
-#RewriteCond     %{SERVER_PORT} ^80$
-#RewriteRule     ^(.*)$ https://%{SERVER_NAME}$1 [L,R]
-
-</VirtualHost>
--- a/dev/setup/codesniffer/ruleset.xml
+++ b/dev/setup/codesniffer/ruleset.xml
@@ -126,12 +126,12 @@
    <rule ref="Generic.Metrics.CyclomaticComplexity">
        <properties>
            <property name="complexity" value="120" />
-            <property name="absoluteComplexity" value="300" />
+            <property name="absoluteComplexity" value="250" />
        </properties>
    </rule>
    <rule ref="Generic.Metrics.NestingLevel">
        <properties>
-            <property name="nestingLevel" value="12" />
+            <property name="nestingLevel" value="10" />
            <property name="absoluteNestingLevel" value="50" />
        </properties>
    </rule>
--- a/dev/tools/fixaltlanguages.sh
+++ b/dev/tools/fixaltlanguages.sh
@@ -46,20 +46,13 @@ then
        then
        	aaupper="GR"
        fi        
-        if [ $bb = "EG" ]
-        then
-        	aaupper="SA"
-        fi        
-
    	bblower=`echo $dirshort | nawk -F"_" '{ print tolower($2) }'`
-
-		echo "***** Process language "$aa"_"$bb
    	if [ "$aa" != "$bblower" -a "$dirshort" != "en_US" ]
    	then
    	    reflang="htdocs/langs/"$aa"_"$aaupper
    	    if [ -d $reflang -a $aa"_"$bb != $aa"_"$aaupper ]
    	    then
-		    	echo "***** Search original into "$reflang
+		    	echo "***** Process language "$aa"_"$bb" - Search original into "$reflang
    			echo $dirshort is an alternative language of $reflang
    			echo ./dev/translation/strip_language_file.php $aa"_"$aaupper $aa"_"$bb $2
    			./dev/translation/strip_language_file.php $aa"_"$aaupper $aa"_"$bb $2
--- a/dev/translation/txpush.sh
+++ b/dev/translation/txpush.sh
@@ -15,7 +15,7 @@ then
 	echo "This push local files to transifex for project $project."
 	echo "Note:  If you push a language file (not source), file will be skipped if transifex file is newer."
 	echo "       Using -f will overwrite translation but not memory."
-	echo "Usage: ./dev/translation/txpush.sh (source|xx_XX|all) [-r ".$project.".file] [-f] [--no-interactive]"
+	echo "Usage: ./dev/translation/txpush.sh (source|xx_XX|all) [-r dolibarr.file] [-f] [--no-interactive]"
 	exit
 fi

--- a/doc/images/dolibarr_screenshot1_1680x1050.png
+++ b/doc/images/dolibarr_screenshot1_1680x1050.png
--- a/doc/images/dolibarr_screenshot4_1680x1050.png
+++ b/doc/images/dolibarr_screenshot4_1680x1050.png
--- a/doc/images/dolibarr_screenshot5_1920x1080_a.jpg
+++ b/doc/images/dolibarr_screenshot5_1920x1080_a.jpg
--- a/doc/images/dolibarr_screenshot5_1920x1080_b.jpg
+++ b/doc/images/dolibarr_screenshot5_1920x1080_b.jpg
--- a/doc/images/dolibarr_screenshot9_1680x1050.png
+++ b/doc/images/dolibarr_screenshot9_1680x1050.png
--- a/htdocs/accountancy/admin/account.php
+++ b/htdocs/accountancy/admin/account.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2013-2016 Olivier Geffroy      <jeff@jeffinfo.com>
 * Copyright (C) 2013-2017 Alexandre Spangaro   <aspangaro@zendsi.com>
- * Copyright (C) 2016-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2016      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,7 +37,7 @@ $langs->load("salaries");

 $mesg = '';
 $action = GETPOST('action','aZ09');
-$cancel = GETPOST('cancel','alpha');
+$cancel = GETPOST('cancel');
 $id = GETPOST('id', 'int');
 $rowid = GETPOST('rowid', 'int');

@@ -53,10 +53,12 @@ if (! $user->rights->accounting->chartofaccount) accessforbidden();

 // Load variable for pagination
 $limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
-$sortfield = GETPOST('sortfield','alpha');
-$sortorder = GETPOST('sortorder','alpha');
-$page = GETPOST('page','int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+$sortfield = GETPOST("sortfield", 'alpha');
+$sortorder = GETPOST("sortorder", 'sortorder');
+$page = GETPOST("page", 'int');
+if ($page == - 1) {
+	$page = 0;
+}
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
@@ -67,8 +69,8 @@ $arrayfields=array(
    'aa.account_number'=>array('label'=>$langs->trans("AccountNumber"), 'checked'=>1),
    'aa.label'=>array('label'=>$langs->trans("Label"), 'checked'=>1),
 	'aa.account_parent'=>array('label'=>$langs->trans("Accountparent"), 'checked'=>0),
-    'aa.pcg_type'=>array('label'=>$langs->trans("Pcgtype"), 'checked'=>1, 'help'=>'PcgtypeDesc'),
-    'aa.pcg_subtype'=>array('label'=>$langs->trans("Pcgsubtype"), 'checked'=>1, 'help'=>'PcgtypeDesc'),
+    'aa.pcg_type'=>array('label'=>$langs->trans("Pcgtype"), 'checked'=>0),
+    'aa.pcg_subtype'=>array('label'=>$langs->trans("Pcgsubtype"), 'checked'=>0),
 	'aa.active'=>array('label'=>$langs->trans("Activated"), 'checked'=>1)
 );

@@ -82,8 +84,8 @@ $contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'accounting
 * Actions
 */

-if (GETPOST('cancel','alpha')) { $action='list'; $massaction=''; }
-if (! GETPOST('confirmmassaction','alpha')) { $massaction=''; }
+if (GETPOST('cancel')) { $action='list'; $massaction=''; }
+if (! GETPOST('confirmmassaction')) { $massaction=''; }

 $parameters=array();
 $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
@@ -105,32 +107,14 @@ if (empty($reshook))
 		$search_array_options=array();
    }

-    if (GETPOST('change_chart','alpha'))
+    if (GETPOST('change_chart'))
    {
        $chartofaccounts = GETPOST('chartofaccounts', 'int');

-        if ($chartofaccounts > 0)
-        {
-			// Get language code for this $chartofaccounts
-			$sql ='SELECT code FROM '.MAIN_DB_PREFIX.'c_country as c, '.MAIN_DB_PREFIX.'accounting_system as a';
-			$sql.=' WHERE c.rowid = a.fk_country AND a.rowid = '.(int) $chartofaccounts;
-			$resql = $db->query($sql);
-			if ($resql)
-			{
-				$obj = $db->fetch_object($resql);
-				$country_code = $obj->code;
-			}
-			else dol_print_error($db);
-
-			// Try to load sql file
-			if ($country_code)
-			{
-				$sqlfile = DOL_DOCUMENT_ROOT.'/install/mysql/data/llx_accounting_account_'.strtolower($country_code).'.sql';
-				$result = run_sql($sqlfile, 1, 0, 1);
-			}
+        if (! empty($chartofaccounts)) {

            if (! dolibarr_set_const($db, 'CHARTOFACCOUNTS', $chartofaccounts, 'chaine', 0, '', $conf->entity)) {
-                $error++;
+                $error ++;
            }
        } else {
            $error ++;
@@ -206,14 +190,13 @@ if ($resql)
 {
 	$num = $db->num_rows($resql);

-    $param='';
+    $params='';
 	if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
-	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
-	if ($search_account) $param.= '&search_account='.urlencode($search_account);
-	if ($search_label) $param.= '&search_label='.urlencode($search_label);
-	if ($search_accountparent) $param.= '&search_accountparent='.urlencode($search_accountparent);
-	if ($search_pcgtype) $param.= '&search_pcgtype='.urlencode($search_pcgtype);
-	if ($search_pcgsubtype) $param.= '&search_pcgsubtype='.urlencode($search_pcgsubtype);
+	if ($search_account) $params.= '&search_account='.urlencode($search_account);
+	if ($search_label) $params.= '&search_label='.urlencode($search_label);
+	if ($search_accountparent) $params.= '&search_accountparent='.urlencode($search_accountparent);
+	if ($search_pcgtype) $params.= '&search_pcgtype='.urlencode($search_pcgtype);
+	if ($search_pcgsubtype) $params.= '&search_pcgsubtype='.urlencode($search_pcgsubtype);
    if ($optioncss != '') $param.='&optioncss='.$optioncss;


@@ -229,36 +212,31 @@ if ($resql)

 	$htmlbuttonadd = '<a class="butAction" href="./card.php?action=create">' . $langs->trans("Addanaccount") . '</a>';

-	print_barre_liste($langs->trans('ListAccounts'), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_accountancy', 0, $htmlbuttonadd, '', $limit);
+    print_barre_liste($langs->trans('ListAccounts'), $page, $_SERVER["PHP_SELF"], $params, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_accountancy', 0, $htmlbuttonadd);

 	// Box to select active chart of account
    print $langs->trans("Selectchartofaccounts") . " : ";
    print '<select class="flat" name="chartofaccounts" id="chartofaccounts">';
-    $sql = "SELECT a.rowid, a.pcg_version, a.label, a.active, c.code as country_code";
-    $sql .= " FROM " . MAIN_DB_PREFIX . "accounting_system as a";
-    $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_country as c ON a.fk_country = c.rowid";
-    $sql .= " WHERE a.active = 1";
-    dol_syslog('accountancy/admin/account.php $sql='.$sql);
-    print $sql;
+    $sql = "SELECT rowid, pcg_version, label, active";
+    $sql .= " FROM " . MAIN_DB_PREFIX . "accounting_system";
+    $sql .= " WHERE active = 1";
+    dol_syslog('accountancy/admin/account.php:: $sql=' . $sql);
    $resqlchart = $db->query($sql);
    if ($resqlchart) {
        $numbis = $db->num_rows($resqlchart);
        $i = 0;
-        while ($i < $numbis) {
-            $obj = $db->fetch_object($resqlchart);
+        while ( $i < $numbis ) {
+            $row = $db->fetch_row($resqlchart);

-            print '<option value="' . $obj->rowid . '"';
-            print ($pcgver == $obj->rowid) ? ' selected' : '';
-            print '>' . $obj->pcg_version . ' - ' . $obj->label . ' - (' . $obj->country_code . ')</option>';
+            print '<option value="' . $row[0] . '"';
+            print $pcgver == $row[0] ? ' selected' : '';
+            print '>' . $row[1] . ' - ' . $row[2] . '</option>';

-            $i++;
+            $i ++;
        }
    }
-    else dol_print_error($db);
    print "</select>";
-    print ajax_combobox("chartofaccounts");
    print '<input type="submit" class="button" name="change_chart" value="'.dol_escape_htmltag($langs->trans("ChangeAndLoad")).'">';
-
    print '<br>';
 	print '<br>';

@@ -286,8 +264,8 @@ if ($resql)
 	if (! empty($arrayfields['aa.account_number']['checked']))	print_liste_field_titre($arrayfields['aa.account_number']['label'], $_SERVER["PHP_SELF"],"aa.account_number","",$param,'',$sortfield,$sortorder);
 	if (! empty($arrayfields['aa.label']['checked']))			print_liste_field_titre($arrayfields['aa.label']['label'], $_SERVER["PHP_SELF"],"aa.label","",$param,'',$sortfield,$sortorder);
 	if (! empty($arrayfields['aa.account_parent']['checked']))	print_liste_field_titre($arrayfields['aa.account_parent']['label'], $_SERVER["PHP_SELF"],"aa.account_parent", "", $param,'align="left"',$sortfield,$sortorder);
-	if (! empty($arrayfields['aa.pcg_type']['checked']))		print_liste_field_titre($arrayfields['aa.pcg_type']['label'],$_SERVER["PHP_SELF"],'aa.pcg_type','',$param,'',$sortfield,$sortorder,'',$arrayfields['aa.pcg_type']['help']);
-	if (! empty($arrayfields['aa.pcg_subtype']['checked']))		print_liste_field_titre($arrayfields['aa.pcg_subtype']['label'],$_SERVER["PHP_SELF"],'aa.pcg_subtype','',$param,'',$sortfield,$sortorder,'',$arrayfields['aa.pcg_subtype']['help']);
+	if (! empty($arrayfields['aa.pcg_type']['checked']))		print_liste_field_titre($arrayfields['aa.pcg_type']['label'],$_SERVER["PHP_SELF"],'aa.pcg_type','',$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['aa.pcg_subtype']['checked']))		print_liste_field_titre($arrayfields['aa.pcg_subtype']['label'],$_SERVER["PHP_SELF"],'aa.pcg_subtype','',$param,'',$sortfield,$sortorder);
 	if (! empty($arrayfields['aa.active']['checked']))			print_liste_field_titre($arrayfields['aa.active']['label'],$_SERVER["PHP_SELF"],'aa.active','',$param,'',$sortfield,$sortorder);
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
 	print "</tr>\n";
--- a/htdocs/accountancy/admin/accountmodel.php
+++ b/htdocs/accountancy/admin/accountmodel.php
--- a/htdocs/accountancy/admin/card.php
+++ b/htdocs/accountancy/admin/card.php
@@ -37,11 +37,10 @@ $langs->load("accountancy");

 $mesg = '';
 $action = GETPOST('action','aZ09');
-$backtopage = GETPOST('backtopage','alpha');
+$backtopage = GETPOST('backtopage');
 $id = GETPOST('id', 'int');
-$ref = GETPOST('ref', 'alpha');
 $rowid = GETPOST('rowid', 'int');
-$cancel = GETPOST('cancel','alpha');
+$cancel = GETPOST('cancel');

 // Security check

@@ -53,7 +52,7 @@ $object = new AccountingAccount($db);
 * Action
 */

-if (GETPOST('cancel','alpha'))
+if (GETPOST('cancel'))
 {
 	$urltogo=$backtopage?$backtopage:dol_buildpath('/accountancy/admin/account.php',1);
 	header("Location: ".$urltogo);
@@ -64,7 +63,7 @@ if ($action == 'add' && $user->rights->accounting->chartofaccount)
 {
 	if (! $cancel) {
 		$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);
@@ -173,16 +172,16 @@ if ($action == 'add' && $user->rights->accounting->chartofaccount)
 	}
 } else if ($action == 'delete' && $user->rights->accounting->chartofaccount) {
 	$result = $object->fetch($id);
-
+	
 	if (! empty($object->id)) {
 		$result = $object->delete($user);
-
+		
 		if ($result > 0) {
 			header("Location: account.php");
 			exit;
 		}
 	}
-
+	
 	if ($result < 0) {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
@@ -262,10 +261,8 @@ if ($action == 'create') {
 	print '</div>';

 	print '</form>';
-}
-else if ($id > 0 || $ref) {
-
-	$result = $object->fetch($id, $ref, 1);
+} else if ($id) {
+	$result = $object->fetch($id);

 	if ($result > 0) {
 		dol_htmloutput_mesg($mesg);
@@ -273,7 +270,7 @@ else if ($id > 0 || $ref) {
 		$head = accounting_prepare_head($object);

 		// Edit mode
-		if ($action == 'update')
+		if ($action == 'update') 
 		{
 			dol_fiche_head($head, 'card', $langs->trans('AccountAccounting'), 0, 'billr');

@@ -330,20 +327,19 @@ else if ($id > 0 || $ref) {
 			print '</form>';
 		} else {
 			// View mode
-			$linkback = '<a href="'.DOL_URL_ROOT.'/accountancy/admin/account.php">' . $langs->trans("BackToList") . '</a>';
+			$linkback = '<a href="../admin/account.php">' . $langs->trans("BackToChartofaccounts") . '</a>';

-			dol_fiche_head($head, 'card', $langs->trans('AccountAccounting'), -1, 'billr');
-
-			dol_banner_tab($object, 'ref', $linkback, 1, 'account_number', 'ref');
-
-
-			print '<div class="fichecenter">';
-			print '<div class="underbanner clearboth"></div>';
+			dol_fiche_head($head, 'card', $langs->trans('AccountAccounting'), 0, 'billr');

 			print '<table class="border" width="100%">';

+			// Account number
+			print '<tr><td class="titlefield">' . $langs->trans("AccountNumber") . '</td>';
+			print '<td>' . $object->account_number . '</td>';
+			print '<td align="right" width="25%">' . $linkback . '</td></tr>';
+
 			// Label
-			print '<tr><td class="titlefield">' . $langs->trans("Label") . '</td>';
+			print '<tr><td>' . $langs->trans("Label") . '</td>';
 			print '<td colspan="2">' . $object->label . '</td></tr>';

 			// Account parent
@@ -365,9 +361,19 @@ else if ($id > 0 || $ref) {
 			print '<tr><td>' . $langs->trans("Pcgsubtype") . '</td>';
 			print '<td colspan="2">' . $object->pcg_subtype . '</td></tr>';

-			print '</table>';
+			// Active
+			print '<tr><td>' . $langs->trans("Status") . '</td>';
+			print '<td colspan="2">';
+			print $object->getLibStatut(4);
+			/*if (empty($object->active)) {
+				print img_picto($langs->trans("Disabled"), 'switch_off');
+			} else {
+				print img_picto($langs->trans("Activated"), 'switch_on');
+			}*/

-			print '</div>';
+			print '</td></tr>';
+
+			print '</table>';

 			dol_fiche_end();

@@ -391,7 +397,7 @@ else if ($id > 0 || $ref) {
 			print '</div>';
 		}
 	} else {
-		dol_print_error($db, $object->error, $object->errors);
+		dol_print_error($db);
 	}
 }

--- a/htdocs/accountancy/admin/categories.php
+++ b/htdocs/accountancy/admin/categories.php
@@ -35,7 +35,7 @@ $langs->load("accountancy");
 $mesg = '';
 $id = GETPOST('id', 'int');
 $rowid = GETPOST('rowid', 'int');
-$cancel = GETPOST('cancel','alpha');
+$cancel = GETPOST('cancel');
 $action = GETPOST('action','aZ09');
 $cat_id = GETPOST('account_category');
 $selectcpt = GETPOST('cpt_bk', 'array');
@@ -86,11 +86,9 @@ if ($action == 'delete') {
 $form = new Form($db);
 $formaccounting = new FormAccounting($db);

-llxheader('', $langs->trans('AccountingCategory'));
+llxheader('', $langs->trans('AccountAccounting'));

-$linkback = '<a href="'.DOL_URL_ROOT.'/accountancy/admin/categories_list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
-
-print load_fiche_titre($langs->trans('AccountingCategory'), $linkback);
+print load_fiche_titre($langs->trans('AccountingCategory'));

 print '<form name="add" action="' . $_SERVER["PHP_SELF"] . '" method="POST">' . "\n";
 print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
@@ -100,7 +98,7 @@ dol_fiche_head();

 print '<table class="border" width="100%">';
 // Category
-print '<tr><td class="titlefield">' . $langs->trans("AccountingCategory") . '</td>';
+print '<tr><td>' . $langs->trans("AccountingCategory") . '</td>';
 print '<td>';
 $formaccounting->select_accounting_category($cat_id, 'account_category', 1, 0, 0, 1);
 print '<input class="button" type="submit" value="' . $langs->trans("Select") . '">';
@@ -114,24 +112,12 @@ if (! empty($cat_id))
 	}
 	print '<tr><td>' . $langs->trans("AddAccountFromBookKeepingWithNoCategories") . '</td>';
 	print '<td>';
-
-	$arraykeyvalue=array();
-	foreach($accountingcategory->lines_cptbk as $key => $val)
-	{
-		$arraykeyvalue[length_accountg($val->numero_compte)] = length_accountg($val->numero_compte) . ' (' . $val->label_compte . ($val->doc_ref?' '.$val->doc_ref:'').')';
-	}
-
 	if (is_array($accountingcategory->lines_cptbk) && count($accountingcategory->lines_cptbk) > 0) {
-
-		print $form->multiselectarray('cpt_bk', $arraykeyvalue, GETPOST('cpt_bk', 'array'), null, null, null, null, "90%");
-		print '<br>';
-		/*print '<select class="flat minwidth200" size="8" name="cpt_bk[]" multiple>';
+		print '<select class="flat minwidth200" size="' . count($obj) . '" name="cpt_bk[]" multiple>';
 		foreach ( $accountingcategory->lines_cptbk as $cpt ) {
 			print '<option value="' . length_accountg($cpt->numero_compte) . '">' . length_accountg($cpt->numero_compte) . ' (' . $cpt->label_compte . ' ' . $cpt->doc_ref . ')</option>';
 		}
 		print '</select><br>';
-		print ajax_combobox('cpt_bk');
-		*/
 		print '<input class="button" type="submit" id="" class="action-delete" value="' . $langs->trans("Add") . '"> ';
 	}
 	print '</td></tr>';
--- a/htdocs/accountancy/admin/categories_list.php
+++ b/htdocs/accountancy/admin/categories_list.php
@@ -1,6 +1,16 @@
 <?php
-/* Copyright (C) 2004-2017  Laurent Destailleur     <eldy@users.sourceforge.net>
- * Copyright (C) 2011-2017  Alexandre Spangaro      <aspangaro@zendsi.com>
+/* Copyright (C) 2004       Rodolphe Quiedeville    <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2015  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-2016  Juanjo Menent           <jmenent@2byte.es>
+ * Copyright (C) 2011-2015  Philippe Grand          <philippe.grand@atoo-net.com>
+ * Copyright (C) 2011       Remy Younes             <ryounes@gmail.com>
+ * Copyright (C) 2012-2015  Marcos García           <marcosgdf@gmail.com>
+ * Copyright (C) 2012       Christophe Battarel     <christophe.battarel@ltairis.fr>
+ * Copyright (C) 2011-2016  Alexandre Spangaro      <aspangaro@zendsi.com>
+ * Copyright (C) 2015       Ferran Marcet           <fmarcet@2byte.es>
+ * Copyright (C) 2016       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
@@ -31,11 +41,18 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';

-$langs->loadLangs(array("errors","admin","companies","resource","holiday","accountancy","hrm"));
+$langs->load("errors");
+$langs->load("admin");
+$langs->load("main");
+$langs->load("companies");
+$langs->load("resource");
+$langs->load("holiday");
+$langs->load("accountancy");
+$langs->load("hrm");

 $action=GETPOST('action','alpha')?GETPOST('action','alpha'):'view';
 $confirm=GETPOST('confirm','alpha');
-$id=32;
+$id=GETPOST('id','int');
 $rowid=GETPOST('rowid','alpha');
 $code=GETPOST('code','alpha');

@@ -54,10 +71,10 @@ $listoffset=GETPOST('listoffset');
 $listlimit=GETPOST('listlimit')>0?GETPOST('listlimit'):1000;
 $active = 1;

-$sortfield = GETPOST("sortfield",'aZ09comma');
-$sortorder = GETPOST("sortorder",'aZ09comma');
+$sortfield = GETPOST("sortfield",'alpha');
+$sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if ($page == -1 || $page == null) { $page = 0 ; }
 $offset = $listlimit * $page ;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
@@ -83,7 +100,7 @@ $tablib[32]= "DictionaryAccountancyCategory";

 // Requests to extract data
 $tabsql=array();
-$tabsql[32]= "SELECT a.rowid as rowid, a.code as code, a.label, a.range_account, a.category_type, a.formula, a.position as position, a.fk_country as country_id, c.code as country_code, c.label as country, a.active FROM ".MAIN_DB_PREFIX."c_accounting_category as a, ".MAIN_DB_PREFIX."c_country as c WHERE a.fk_country=c.rowid and c.active=1";
+$tabsql[32]= "SELECT a.rowid as rowid, a.code as code, a.label, a.range_account, a.sens, a.category_type, a.formula, a.position as position, a.fk_country as country_id, c.code as country_code, c.label as country, a.active FROM ".MAIN_DB_PREFIX."c_accounting_category as a, ".MAIN_DB_PREFIX."c_country as c WHERE a.fk_country=c.rowid and c.active=1";

 // Criteria to sort dictionaries
 $tabsqlsort=array();
@@ -91,15 +108,15 @@ $tabsqlsort[32]="position ASC";

 // Nom des champs en resultat de select pour affichage du dictionnaire
 $tabfield=array();
-$tabfield[32]= "code,label,range_account,category_type,formula,position,country";
+$tabfield[32]= "code,label,range_account,sens,category_type,formula,position,country_id,country";

 // Nom des champs d'edition pour modification d'un enregistrement
 $tabfieldvalue=array();
-$tabfieldvalue[32]= "code,label,range_account,category_type,formula,position,country_id";
+$tabfieldvalue[32]= "code,label,range_account,sens,category_type,formula,position,country";

 // Nom des champs dans la table pour insertion d'un enregistrement
 $tabfieldinsert=array();
-$tabfieldinsert[32]= "code,label,range_account,category_type,formula,position,fk_country";
+$tabfieldinsert[32]= "code,label,range_account,sens,category_type,formula,position,fk_country";

 // Nom du rowid si le champ n'est pas de type autoincrement
 // Example: "" if id field is "rowid" and has autoincrement on
@@ -113,7 +130,7 @@ $tabcond[32]= ! empty($conf->accounting->enabled);

 // List of help for fields
 $tabhelp=array();
-$tabhelp[32] = array('code'=>$langs->trans("EnterAnyCode"), 'category_type'=>$langs->trans("SetToYesIfGroupIsComputationOfOtherGroups"), 'formula'=>$langs->trans("EnterCalculationRuleIfPreviousFieldIsYes"));
+$tabhelp[32] = array('code'=>$langs->trans("EnterAnyCode"));

 // List of check for fields (NOT USED YET)
 $tabfieldcheck=array();
@@ -150,17 +167,24 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
    $ok=1;
    foreach ($listfield as $f => $value)
    {
+        if ($value == 'country_id' && in_array($tablib[$id],array('DictionaryVAT','DictionaryRegion','DictionaryCompanyType','DictionaryHolidayTypes','DictionaryRevenueStamp','DictionaryAccountancysystem','DictionaryAccountancyCategory'))) continue;		// For some pages, country is not mandatory
+    	if ($value == 'country' && in_array($tablib[$id],array('DictionaryCanton','DictionaryCompanyType','DictionaryRevenueStamp'))) continue;		// For some pages, country is not mandatory
 		if ($value == 'formula' && empty($_POST['formula'])) continue;
-		if ($value == 'range_account' && empty($_POST['range_account'])) continue;
-		if ($value == 'country' || $value == 'country_id') continue;
-		if (! isset($_POST[$value]) || $_POST[$value]=='')
+        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
+        	&& (! ($id == 10 && $listfield[$f] == 'code')) // Code is mandatory fir table 10
+        	)
+		)
        {
            $ok=0;
            $fieldnamekey=$listfield[$f];
            // We take translate key of field
            if ($fieldnamekey == 'libelle' || ($fieldnamekey == 'label'))  $fieldnamekey='Label';
+            if ($fieldnamekey == 'libelle_facture') $fieldnamekey = 'LabelOnDocuments';
+            if ($fieldnamekey == 'module')   $fieldnamekey='Module';
            if ($fieldnamekey == 'code') $fieldnamekey = 'Code';
            if ($fieldnamekey == 'note') $fieldnamekey = 'Note';
+            if ($fieldnamekey == 'taux') $fieldnamekey = 'Rate';
            if ($fieldnamekey == 'type') $fieldnamekey = 'Type';
            if ($fieldnamekey == 'position') $fieldnamekey = 'Position';
 			if ($fieldnamekey == 'category_type') $fieldnamekey = 'Calculated';
@@ -168,6 +192,11 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
            setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities($fieldnamekey)), null, 'errors');
        }
    }
+    // Other checks
+    if ($tabname[$id] == MAIN_DB_PREFIX."c_actioncomm" && isset($_POST["type"]) && in_array($_POST["type"],array('system','systemauto'))) {
+        $ok=0;
+        setEventMessages($langs->transnoentities('ErrorReservedTypeSystemSystemAuto'), null, 'errors');
+    }
    if (isset($_POST["code"]))
    {
    	if ($_POST["code"]=='0')
@@ -175,12 +204,23 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
        	$ok=0;
    		setEventMessages($langs->transnoentities('ErrorCodeCantContainZero'), null, 'errors');
        }
+        /*if (!is_numeric($_POST['code']))	// disabled, code may not be in numeric base
+    	{
+	    	$ok = 0;
+	    	$msg .= $langs->transnoentities('ErrorFieldFormat', $langs->transnoentities('Code')).'<br />';
+	    }*/
    }
-    if (! is_numeric(GETPOST('position','alpha')))
+    if (isset($_POST["country"]) && ($_POST["country"]=='0'))
    {
-    	$langs->load("errors");
-   		$ok=0;
-   		setEventMessages($langs->transnoentities('ErrorFieldMustBeANumeric', $langs->transnoentities("Position")), null, 'errors');
+    	if (in_array($tablib[$id],array('DictionaryCompanyType','DictionaryHolidayTypes')))	// Field country is no mandatory for such dictionaries
+    	{
+    		$_POST["country"]='';
+    	}
+    	else
+    	{
+        	$ok=0;
+        	setEventMessages($langs->transnoentities("ErrorFieldRequired",$langs->transnoentities("Country")), null, 'errors');
+    	}
    }

 	// Clean some parameters
@@ -189,7 +229,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
 	if ($_POST["accountancy_code_buy"] <= 0) $_POST["accountancy_code_buy"]='';	// If empty, we force to null

    // Si verif ok et action add, on ajoute la ligne
-    if ($ok && GETPOST('actionadd','alpha'))
+    if ($ok && GETPOST('actionadd'))
    {
        if ($tabrowid[$id])
        {
@@ -210,21 +250,26 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
        // Add new entry
        $sql = "INSERT INTO ".$tabname[$id]." (";
        // List of fields
-        if ($tabrowid[$id] && ! in_array($tabrowid[$id],$listfieldinsert)) $sql.= $tabrowid[$id].",";
+        if ($tabrowid[$id] && ! in_array($tabrowid[$id],$listfieldinsert))
+        	$sql.= $tabrowid[$id].",";
        $sql.= $tabfieldinsert[$id];
        $sql.=",active)";
        $sql.= " VALUES(";

        // List of values
-        if ($tabrowid[$id] && ! in_array($tabrowid[$id],$listfieldinsert)) $sql.= $newid.",";
+        if ($tabrowid[$id] && ! in_array($tabrowid[$id],$listfieldinsert))
+        	$sql.= $newid.",";
        $i=0;
        foreach ($listfieldinsert as $f => $value)
        {
-            if ($value == 'entity') {
+            if ($value == 'price' || preg_match('/^amount/i',$value) || $value == 'taux') {
+            	$_POST[$listfieldvalue[$i]] = price2num($_POST[$listfieldvalue[$i]],'MU');
+            }
+            else if ($value == 'entity') {
            	$_POST[$listfieldvalue[$i]] = $conf->entity;
            }
            if ($i) $sql.=",";
-            if ($_POST[$listfieldvalue[$i]] == '' && ! $listfieldvalue[$i] == 'formula') $sql.="null";  // For vat, we want/accept code = ''
+            if ($_POST[$listfieldvalue[$i]] == '' && ! ($listfieldvalue[$i] == 'code' && $id == 10)) $sql.="null";  // For vat, we want/accept code = ''
            else $sql.="'".$db->escape($_POST[$listfieldvalue[$i]])."'";
            $i++;
        }
@@ -265,15 +310,15 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
        $i = 0;
        foreach ($listfieldmodify as $field)
        {
-            if ($field == 'fk_country' && $_POST['country'] > 0) {
-            	$_POST[$listfieldvalue[$i]] = $_POST['country'];
+            if ($field == 'price' || preg_match('/^amount/i',$field) || $field == 'taux') {
+            	$_POST[$listfieldvalue[$i]] = price2num($_POST[$listfieldvalue[$i]],'MU');
            }
            else if ($field == 'entity') {
            	$_POST[$listfieldvalue[$i]] = $conf->entity;
            }
            if ($i) $sql.=",";
            $sql.= $field."=";
-            if ($_POST[$listfieldvalue[$i]] == '' && ! $listfieldvalue[$i] == 'range_account') $sql.="null";  // For range_account, we want/accept code = ''
+            if ($_POST[$listfieldvalue[$i]] == '' && ! ($listfieldvalue[$i] == 'code' && $id == 10)) $sql.="null";  // For vat, we want/accept code = ''
            else $sql.="'".$db->escape($_POST[$listfieldvalue[$i]])."'";
            $i++;
        }
@@ -300,7 +345,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
    if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; }
    else { $rowidcol="rowid"; }

-    $sql = "DELETE from ".$tabname[$id]." WHERE ".$rowidcol." = '".$db->escape($rowid)."'";
+    $sql = "DELETE from ".$tabname[$id]." WHERE ".$rowidcol."='".$rowid."'";

    dol_syslog("delete", LOG_DEBUG);
    $result = $db->query($sql);
@@ -324,10 +369,10 @@ if ($action == $acts[0])
    else { $rowidcol="rowid"; }

    if ($rowid) {
-        $sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE ".$rowidcol." = '".$db->escape($rowid)."'";
+        $sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE ".$rowidcol."='".$rowid."'";
    }
    elseif ($code) {
-    	$sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE code = '".$db->escape($code)."'";
+        $sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE code='".$code."'";
    }

    $result = $db->query($sql);
@@ -344,10 +389,10 @@ if ($action == $acts[1])
    else { $rowidcol="rowid"; }

    if ($rowid) {
-    	$sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE ".$rowidcol." = '".$db->escape($rowid)."'";
+        $sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE ".$rowidcol."='".$rowid."'";
    }
    elseif ($code) {
-    	$sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE code = '".$db->escape($code)."'";
+        $sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE code='".$code."'";
    }

    $result = $db->query($sql);
@@ -364,10 +409,10 @@ if ($action == 'activate_favorite')
    else { $rowidcol="rowid"; }

    if ($rowid) {
-    	$sql = "UPDATE ".$tabname[$id]." SET favorite = 1 WHERE ".$rowidcol." = '".$db->escape($rowid)."'";
+        $sql = "UPDATE ".$tabname[$id]." SET favorite = 1 WHERE ".$rowidcol."='".$rowid."'";
    }
    elseif ($code) {
-    	$sql = "UPDATE ".$tabname[$id]." SET favorite = 1 WHERE code = '".$db->escape($code)."'";
+        $sql = "UPDATE ".$tabname[$id]." SET favorite = 1 WHERE code='".$code."'";
    }

    $result = $db->query($sql);
@@ -384,10 +429,10 @@ if ($action == 'disable_favorite')
    else { $rowidcol="rowid"; }

    if ($rowid) {
-    	$sql = "UPDATE ".$tabname[$id]." SET favorite = 0 WHERE ".$rowidcol." = '".$db->escape($rowid)."'";
+        $sql = "UPDATE ".$tabname[$id]." SET favorite = 0 WHERE ".$rowidcol."='".$rowid."'";
    }
    elseif ($code) {
-    	$sql = "UPDATE ".$tabname[$id]." SET favorite = 0 WHERE code = '".$db->escape($code)."'";
+        $sql = "UPDATE ".$tabname[$id]." SET favorite = 0 WHERE code='".$code."'";
    }

    $result = $db->query($sql);
@@ -405,20 +450,19 @@ if ($action == 'disable_favorite')
 $form = new Form($db);
 $formadmin=new FormAdmin($db);

-llxHeader('', $langs->trans('DictionaryAccountancyCategory'));
+llxHeader();

 $titre=$langs->trans($tablib[$id]);
 $linkback='';
 $titlepicto='title_setup';

-print load_fiche_titre($titre, $linkback, $titlepicto);
+print load_fiche_titre($titre,$linkback,$titlepicto);

-print $langs->trans("AccountingAccountGroupsDesc", $langs->transnoentitiesnoconv("ByPersonalizedAccountGroups")).'<br><br>';

 // Confirmation de la suppression de la ligne
 if ($action == 'delete')
 {
-    print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.$rowid.'&code='.$code.'&id='.$id.($search_country_id>0?'&search_country_id='.$search_country_id:''), $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete','',0,1);
+    print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.$rowid.'&code='.$code.'&id='.$id, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete','',0,1);
 }
 //var_dump($elementList);

@@ -434,12 +478,27 @@ if ($id)
    {
        if (preg_match('/ WHERE /',$sql)) $sql.= " AND ";
        else $sql.=" WHERE ";
-        $sql.= " (a.fk_country = ".$search_country_id." OR a.fk_country = 0)";
+        $sql.= " c.rowid = ".$search_country_id;
    }

-    // If sort order is "country", we use country_code instead
-    if ($sortfield == 'country') $sortfield='country_code';
-    $sql.=$db->order($sortfield,$sortorder);
+    if ($sortfield)
+    {
+        // If sort order is "country", we use country_code instead
+    	if ($sortfield == 'country') $sortfield='country_code';
+        $sql.= " ORDER BY ".$sortfield;
+        if ($sortorder)
+        {
+            $sql.=" ".strtoupper($sortorder);
+        }
+        $sql.=", ";
+        // Clear the required sort criteria for the tabsqlsort to be able to force it with selected value
+        $tabsqlsort[$id]=preg_replace('/([a-z]+\.)?'.$sortfield.' '.$sortorder.',/i','',$tabsqlsort[$id]);
+        $tabsqlsort[$id]=preg_replace('/([a-z]+\.)?'.$sortfield.',/i','',$tabsqlsort[$id]);
+    }
+    else {
+        $sql.=" ORDER BY ";
+    }
+    $sql.=$tabsqlsort[$id];
    $sql.=$db->plimit($listlimit+1,$offset);
    //print $sql;

@@ -449,7 +508,6 @@ if ($id)
    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
    print '<input type="hidden" name="from" value="'.dol_escape_htmltag(GETPOST('from','alpha')).'">';

-	print '<div class="div-table-responsive">';
    print '<table class="noborder" width="100%">';

    // Form to add a new line
@@ -478,15 +536,18 @@ if ($id)
            {
            	$valuetoshow=$langs->trans("Label");
            }
-            if ($fieldlist[$field]=='libelle_facture') { $valuetoshow=$langs->trans("LabelOnDocuments"); }
+            if ($fieldlist[$field]=='libelle_facture') { $valuetoshow=$langs->trans("LabelOnDocuments")."*"; }
            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
                $valuetoshow=$langs->trans("Country");
            }
+            if ($fieldlist[$field]=='region_id' || $fieldlist[$field]=='country_id') { $valuetoshow=''; }
            if ($fieldlist[$field]=='accountancy_code'){ $valuetoshow=$langs->trans("AccountancyCode"); }
            if ($fieldlist[$field]=='accountancy_code_sell'){ $valuetoshow=$langs->trans("AccountancyCodeSell"); }
            if ($fieldlist[$field]=='accountancy_code_buy'){ $valuetoshow=$langs->trans("AccountancyCodeBuy"); }
            if ($fieldlist[$field]=='pcg_version' || $fieldlist[$field]=='fk_pcg_version') { $valuetoshow=$langs->trans("Pcg_version"); }
-            if ($fieldlist[$field]=='range_account')   { $valuetoshow=$langs->trans("Comment"); }
+            if ($fieldlist[$field]=='range_account')   { $valuetoshow=$langs->trans("Range"); }
+			if ($fieldlist[$field]=='sens')            { $valuetoshow=$langs->trans("Direction"); }
 			if ($fieldlist[$field]=='category_type')   { $valuetoshow=$langs->trans("Calculated"); }

            if ($valuetoshow != '')
@@ -538,7 +599,6 @@ if ($id)
        print "</tr>";

        $colspan=count($fieldlist)+3;
-        if ($id == 32) $colspan++;

        print '<tr><td colspan="'.$colspan.'">&nbsp;</td></tr>';	// Keep &nbsp; to have a line with enough height
    }
@@ -557,7 +617,8 @@ if ($id)
        $paramwithsearch = $param;
        if ($sortorder) $paramwithsearch.= '&sortorder='.$sortorder;
        if ($sortfield) $paramwithsearch.= '&sortfield='.$sortfield;
-        if (GETPOST('from','alpha')) $paramwithsearch.= '&from='.GETPOST('from','alpha');
+        if (GETPOST('from')) $paramwithsearch.= '&from='.GETPOST('from','alpha');
+
        // There is several pages
        if ($num > $listlimit)
        {
@@ -627,6 +688,7 @@ if ($id)
            if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label')
            {
            	$valuetoshow=$langs->trans("Label");
+               	if ($id != 25) $valuetoshow.="*";
            }
            if ($fieldlist[$field]=='country')         { $valuetoshow=$langs->trans("Country"); }
            if ($fieldlist[$field]=='region_id' || $fieldlist[$field]=='country_id') { $showfield=0; }
@@ -638,7 +700,8 @@ 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]=='type_template')   { $valuetoshow=$langs->trans("TypeOfTemplate"); }
-			if ($fieldlist[$field]=='range_account')   { $valuetoshow=$langs->trans("Comment"); }
+			if ($fieldlist[$field]=='range_account')   { $valuetoshow=$langs->trans("Range"); }
+			if ($fieldlist[$field]=='sens')            { $valuetoshow=$langs->trans("Direction"); }
 			if ($fieldlist[$field]=='category_type')   { $valuetoshow=$langs->trans("Calculated"); }
            // Affiche nom du champ
            if ($showfield)
@@ -679,7 +742,6 @@ if ($id)
                    print '<div name="'.(! empty($obj->rowid)?$obj->rowid:$obj->code).'"></div>';
                    print '<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'">';
                    print '</td>';
-                    print '<td></td>';
                }
                else
                {
@@ -697,9 +759,17 @@ if ($id)
                            $showfield=1;
                        	$align="left";
                            $valuetoshow=$obj->{$fieldlist[$field]};
-                            if ($value == 'category_type')
+                            if ($value == 'type_template')
                            {
-                                $valuetoshow = yn($valuetoshow);
+                                $valuetoshow = isset($elementList[$valuetoshow])?$elementList[$valuetoshow]:$valuetoshow;
+                            }
+                            if ($value == 'element')
+                            {
+                                $valuetoshow = isset($elementList[$valuetoshow])?$elementList[$valuetoshow]:$valuetoshow;
+                            }
+                            else if ($value == 'source')
+                            {
+                                $valuetoshow = isset($sourceList[$valuetoshow])?$sourceList[$valuetoshow]:$valuetoshow;
                            }
                            else if ($valuetoshow=='all') {
                                $valuetoshow=$langs->trans('All');
@@ -715,6 +785,12 @@ if ($id)
                                    $valuetoshow=($key != "Country".strtoupper($obj->country_code)?$obj->country_code." - ".$key:$obj->country);
                                }
                            }
+                            else if ($fieldlist[$field]=='libelle_facture') {
+                                $langs->load("bills");
+                                $key=$langs->trans("PaymentCondition".strtoupper($obj->code));
+                                $valuetoshow=($obj->code && $key != "PaymentCondition".strtoupper($obj->code)?$key:$obj->{$fieldlist[$field]});
+                                $valuetoshow=nl2br($valuetoshow);
+                            }
                            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]});
@@ -728,11 +804,83 @@ if ($id)
                                $key=$langs->trans("Action".strtoupper($obj->code));
                                $valuetoshow=($obj->code && $key != "Action".strtoupper($obj->code)?$key:$obj->{$fieldlist[$field]});
                            }
+                            else if (! empty($obj->code_iso) && $fieldlist[$field]=='label' && $tabname[$id]==MAIN_DB_PREFIX.'c_currencies') {
+                                $key=$langs->trans("Currency".strtoupper($obj->code_iso));
+                                $valuetoshow=($obj->code_iso && $key != "Currency".strtoupper($obj->code_iso)?$key:$obj->{$fieldlist[$field]});
+                            }
+                            else if ($fieldlist[$field]=='libelle' && $tabname[$id]==MAIN_DB_PREFIX.'c_typent') {
+                                $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_prospectlevel') {
+                                $key=$langs->trans(strtoupper($obj->code));
+                                $valuetoshow=($key != strtoupper($obj->code)?$key:$obj->{$fieldlist[$field]});
+                            }
+                            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]});
+                            }
+                            else if ($fieldlist[$field]=='libelle' && $tabname[$id]==MAIN_DB_PREFIX.'c_type_contact') {
+                            	$langs->load('agenda');
+                                $key=$langs->trans("TypeContact_".$obj->element."_".$obj->source."_".strtoupper($obj->code));
+                                $valuetoshow=($obj->code && $key != "TypeContact_".$obj->element."_".$obj->source."_".strtoupper($obj->code)?$key:$obj->{$fieldlist[$field]});
+                            }
+                            else if ($fieldlist[$field]=='libelle' && $tabname[$id]==MAIN_DB_PREFIX.'c_payment_term') {
+                                $langs->load("bills");
+                                $key=$langs->trans("PaymentConditionShort".strtoupper($obj->code));
+                                $valuetoshow=($obj->code && $key != "PaymentConditionShort".strtoupper($obj->code)?$key:$obj->{$fieldlist[$field]});
+                            }
+                            else if ($fieldlist[$field]=='libelle' && $tabname[$id]==MAIN_DB_PREFIX.'c_paiement') {
+                                $langs->load("bills");
+                                $key=$langs->trans("PaymentType".strtoupper($obj->code));
+                                $valuetoshow=($obj->code && $key != "PaymentType".strtoupper($obj->code)?$key:$obj->{$fieldlist[$field]});
+                            }
+                            else if ($fieldlist[$field]=='label' && $tabname[$id]==MAIN_DB_PREFIX.'c_input_reason') {
+                                $key=$langs->trans("DemandReasonType".strtoupper($obj->code));
+                                $valuetoshow=($obj->code && $key != "DemandReasonType".strtoupper($obj->code)?$key:$obj->{$fieldlist[$field]});
+                            }
+                            else if ($fieldlist[$field]=='libelle' && $tabname[$id]==MAIN_DB_PREFIX.'c_input_method') {
+                                $langs->load("orders");
+                                $key=$langs->trans($obj->code);
+                                $valuetoshow=($obj->code && $key != $obj->code)?$key:$obj->{$fieldlist[$field]};
+                            }
+                            else if ($fieldlist[$field]=='libelle' && $tabname[$id]==MAIN_DB_PREFIX.'c_shipment_mode') {
+                                $langs->load("sendings");
+                                $key=$langs->trans("SendingMethod".strtoupper($obj->code));
+                                $valuetoshow=($obj->code && $key != "SendingMethod".strtoupper($obj->code)?$key:$obj->{$fieldlist[$field]});
+                            }
+                            else if ($fieldlist[$field] == 'libelle' && $tabname[$id]==MAIN_DB_PREFIX.'c_paper_format')
+                            {
+                                $key = $langs->trans('PaperFormat'.strtoupper($obj->code));
+                                $valuetoshow = ($obj->code && $key != 'PaperFormat'.strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+                            }
+                            else if ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_type_fees')
+                            {
+                                $langs->load('trips');
+                                $key = $langs->trans(strtoupper($obj->code));
+                                $valuetoshow = ($obj->code && $key != strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+                            }
                            else if ($fieldlist[$field]=='region_id' || $fieldlist[$field]=='country_id') {
                                $showfield=0;
                            }
+                            else if ($fieldlist[$field]=='label' && $tabname[$_GET["id"]]==MAIN_DB_PREFIX.'c_units') {
+	                            $langs->load("products");
+	                            $valuetoshow=$langs->trans($obj->{$fieldlist[$field]});
+                            }
+                            else if ($fieldlist[$field]=='short_label' && $tabname[$_GET["id"]]==MAIN_DB_PREFIX.'c_units') {
+	                            $langs->load("products");
+	                            $valuetoshow = $langs->trans($obj->{$fieldlist[$field]});
+                            }
+							else if (in_array($fieldlist[$field],array('recuperableonly')))
+							{
+								$align="center";
+							}
+							else if ($fieldlist[$field]=='accountancy_code' || $fieldlist[$field]=='accountancy_code_sell' || $fieldlist[$field]=='accountancy_code_buy') {
+                                $valuetoshow = length_accountg($valuetoshow);
+                            }

                            $class='tddict';
+                            if ($fieldlist[$field] == 'tracking') $class.=' tdoverflowauto';
 							// Show value for field
 							if ($showfield) print '<!-- '.$fieldlist[$field].' --><td align="'.$align.'" class="'.$class.'">'.$valuetoshow.'</td>';
                        }
@@ -743,9 +891,14 @@ if ($id)
                    if (isset($obj->code))
                    {
                    	if (($obj->code == '0' || $obj->code == '' || preg_match('/unknown/i',$obj->code))) { $iserasable = 0; $canbedisabled = 0; }
+                    	else if ($obj->code == 'RECEP') { $iserasable = 0; $canbedisabled = 0; }
+                    	else if ($obj->code == 'EF0')   { $iserasable = 0; $canbedisabled = 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'))) { $canbedisabled=0; $canbedisabled = 0; }
                    $canbemodified=$iserasable;
+                    if ($obj->code == 'RECEP') $canbemodified=1;

                    $url = $_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(! empty($obj->rowid)?$obj->rowid:(! empty($obj->code)?$obj->code:'')).'&code='.(! empty($obj->code)?urlencode($obj->code):'');
                    if ($param) $url .= '&'.$param;
@@ -756,7 +909,10 @@ if ($id)
                    if ($canbedisabled) print '<a href="'.$url.'action='.$acts[$obj->active].'">'.$actl[$obj->active].'</a>';
                    else
                 	{
-                    	print $langs->trans("AlwaysActive");
+                 		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>";

@@ -775,16 +931,14 @@ if ($id)
                    else print '<td>&nbsp;</td>';

                    // Link to setup the group
-                    print '<td class="center">';
+                    print '<td>';
                    if (empty($obj->formula))
                    {
-                        print '<a href="'.DOL_URL_ROOT.'/accountancy/admin/categories.php?action=display&save_lastsearch_values=1&account_category='.$obj->rowid.'">';
-                        print $langs->trans("ListOfAccounts");
-                        print '</a>';
+                        print '<a href="'.DOL_URL_ROOT.'/accountancy/admin/categories.php?action=display&account_category='.$obj->rowid.'">'.$langs->trans("Setup").'</a>';
                    }
                    print '</td>';
+                    print "</tr>\n";
                }
-                print "</tr>\n";
                $i++;
            }
        }
@@ -794,7 +948,6 @@ if ($id)
    }

    print '</table>';
-	print '</div>';

    print '</form>';
 }
@@ -831,17 +984,16 @@ function fieldListAccountingCategories($fieldlist, $obj='', $tabname='', $contex
 	{
 		if ($fieldlist[$field] == 'country')
 		{
+			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>';
 			$fieldname='country';
-			if ($context == 'add')
-			{
-				$fieldname='country_id';
-				print $form->select_country(GETPOST('country_id','int'), $fieldname, '', 28, 'maxwidth200 maxwidthonsmartphone');
-			}
-			else
-			{
-				print $form->select_country((! empty($obj->country_code)?$obj->country_code:(! empty($obj->country)?$obj->country:$mysoc->country_code)), $fieldname, '', 28, 'maxwidth200 maxwidthonsmartphone');
-			}
+			print $form->select_country((! empty($obj->country_code)?$obj->country_code:(! empty($obj->country)?$obj->country:$mysoc->country_code)), $fieldname, '', 28, 'maxwidth200 maxwidthonsmartphone');
 			print '</td>';
 		}
 		elseif ($fieldlist[$field] == 'country_id')
@@ -854,14 +1006,130 @@ function fieldListAccountingCategories($fieldlist, $obj='', $tabname='', $contex
 				print '</td>';
 			}
 		}
-		elseif ($fieldlist[$field] == 'category_type') {
-		    print '<td>';
-			print $form->selectyesno($fieldlist[$field],(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:''),1);
+		elseif ($fieldlist[$field] == 'region')
+		{
+			print '<td>';
+			$formcompany->select_region($region_id,'region');
 			print '</td>';
 		}
+		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>';
+			print $formadmin->select_language($conf->global->MAIN_LANG_DEFAULT,'lang');
+			print '</td>';
+		}
+		// Le type de template
+		elseif ($fieldlist[$field] == 'type_template')
+		{
+			print '<td>';
+			print $form->selectarray('type_template', $elementList,(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:''));
+			print '</td>';
+		}
+		// Le type de l'element (pour les type de contact)
+		elseif ($fieldlist[$field] == 'element')
+		{
+			print '<td>';
+			print $form->selectarray('element', $elementList,(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:''));
+			print '</td>';
+		}
+		// La source de l'element (pour les type de contact)
+		elseif ($fieldlist[$field] == 'source')
+		{
+			print '<td>';
+			print $form->selectarray('source', $sourceList,(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:''));
+			print '</td>';
+		}
+		elseif ($fieldlist[$field] == 'type' && $tabname == MAIN_DB_PREFIX."c_actioncomm")
+		{
+			print '<td>';
+			print 'user<input type="hidden" name="type" value="user">';
+			print '</td>';
+		}
+		elseif ($fieldlist[$field] == 'recuperableonly' || $fieldlist[$field] == 'type_cdr' || $fieldlist[$field] == 'deductible' || $fieldlist[$field] == 'category_type') {
+		    if ($fieldlist[$field] == 'type_cdr') print '<td align="center">';
+		    else print '<td>';
+			if ($fieldlist[$field] == 'type_cdr') {
+				print $form->selectarray($fieldlist[$field], array(0=>$langs->trans('None'), 1=>$langs->trans('AtEndOfMonth'), 2=>$langs->trans('CurrentNext')), (! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:''));
+			} else {
+				print $form->selectyesno($fieldlist[$field],(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:''),1);
+			}
+			print '</td>';
+		}
+		elseif (in_array($fieldlist[$field],array('nbjour','decalage','taux','localtax1','localtax2'))) {
+			$align="left";
+			if (in_array($fieldlist[$field],array('taux','localtax1','localtax2'))) $align="center";	// Fields aligned on right
+			print '<td align="'.$align.'">';
+			print '<input type="text" class="flat" value="'.(isset($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]} : '').'" size="3" name="'.$fieldlist[$field].'">';
+			print '</td>';
+		}
+		elseif (in_array($fieldlist[$field], array('libelle_facture'))) {
+			print '<td><textarea cols="30" rows="'.ROWS_2.'" class="flat" name="'.$fieldlist[$field].'">'.(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'').'</textarea></td>';
+		}
+		elseif (in_array($fieldlist[$field], array('content')))
+		{
+			if ($tabname == MAIN_DB_PREFIX.'c_email_templates')
+			{
+				print '<td colspan="4"></td></tr><tr class="pair nohover"><td colspan="5">';		// To create an artificial CR for the current tr we are on
+			}
+			else print '<td>';
+			if ($context != 'hide')
+			{
+				//print '<textarea cols="3" rows="'.ROWS_2.'" class="flat" name="'.$fieldlist[$field].'">'.(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'').'</textarea>';
+				$okforextended=true;
+				if ($tabname == MAIN_DB_PREFIX.'c_email_templates' && empty($conf->global->FCKEDITOR_ENABLE_MAIL)) $okforextended=false;
+				$doleditor = new DolEditor($fieldlist[$field], (! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:''), '', 140, 'dolibarr_mailings', 'In', 0, false, $okforextended, ROWS_5, '90%');
+				print $doleditor->Create(1);
+			}
+			else print '&nbsp;';
+			print '</td>';
+		}
+		elseif ($fieldlist[$field] == 'price' || preg_match('/^amount/i',$fieldlist[$field])) {
+			print '<td><input type="text" class="flat minwidth75" value="'.price((! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'')).'" name="'.$fieldlist[$field].'"></td>';
+		}
 		elseif ($fieldlist[$field] == 'code' && isset($obj->{$fieldlist[$field]})) {
 			print '<td><input type="text" class="flat minwidth100" value="'.(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'').'" name="'.$fieldlist[$field].'"></td>';
 		}
+		elseif ($fieldlist[$field]=='unit') {
+			print '<td>';
+			$units = array(
+					'mm' => $langs->trans('SizeUnitmm'),
+					'cm' => $langs->trans('SizeUnitcm'),
+					'point' => $langs->trans('SizeUnitpoint'),
+					'inch' => $langs->trans('SizeUnitinch')
+			);
+			print $form->selectarray('unit', $units, (! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:''), 0, 0, 0);
+			print '</td>';
+		}
+		// Le type de taxe locale
+		elseif ($fieldlist[$field] == 'localtax1_type' || $fieldlist[$field] == 'localtax2_type')
+		{
+			print '<td align="center">';
+			print $form->selectarray($fieldlist[$field], $localtax_typeList, (! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:''));
+			print '</td>';
+		}
+		elseif ($fieldlist[$field] == 'accountancy_code' || $fieldlist[$field] == 'accountancy_code_sell' || $fieldlist[$field] == 'accountancy_code_buy')
+		{
+			print '<td>';
+			if (! empty($conf->accounting->enabled))
+			{
+			    $fieldname = $fieldlist[$field];
+				$accountancy_account = (! empty($obj->$fieldname) ? $obj->$fieldname : 0);
+				print $formaccounting->select_account($accountancy_account, $fieldlist[$field], 1, '', 1, 1, 'maxwidth200 maxwidthonsmartphone');
+			}
+			else
+			{
+			    $fieldname = $fieldlist[$field];
+			    print '<input type="text" size="10" class="flat" value="'.(isset($obj->$fieldname)?$obj->$fieldname:'').'" name="'.$fieldlist[$field].'">';
+			}
+			print '</td>';
+		}
 		else
 		{
 			print '<td>';
@@ -869,7 +1137,8 @@ function fieldListAccountingCategories($fieldlist, $obj='', $tabname='', $contex
 			if ($fieldlist[$field]=='code') $class='maxwidth100';
 			if ($fieldlist[$field]=='position') $class='maxwidth50';
 			if ($fieldlist[$field]=='libelle') $class='quatrevingtpercent';
-			if ($fieldlist[$field]=='sortorder' || $fieldlist[$field]=='category_type') $size='size="2" ';
+			if ($fieldlist[$field]=='tracking') $class='quatrevingtpercent';
+			if ($fieldlist[$field]=='sortorder' || $fieldlist[$field]=='sens' || $fieldlist[$field]=='category_type') $size='size="2" ';
 			print '<input type="text" '.$size.'class="flat'.($class?' '.$class:'').'" value="'.(isset($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'').'" name="'.$fieldlist[$field].'">';
 			print '</td>';
 		}
--- a/htdocs/accountancy/admin/defaultaccounts.php
+++ b/htdocs/accountancy/admin/defaultaccounts.php
@@ -77,7 +77,7 @@ $list_account = array (
 * Actions
 */

-$accounting_mode = empty($conf->global->ACCOUNTING_MODE) ? 'RECETTES-DEPENSES' : $conf->global->ACCOUNTING_MODE;
+$accounting_mode = defined('ACCOUNTING_MODE') ? ACCOUNTING_MODE : 'RECETTES-DEPENSES';


 if (GETPOST('change_chart'))
--- a/htdocs/accountancy/admin/export.php
+++ b/htdocs/accountancy/admin/export.php
@@ -1,11 +1,10 @@
 <?php
 /* Copyright (C) 2013-2014 Olivier Geffroy		<jeff@jeffinfo.com>
- * Copyright (C) 2013-2017 Alexandre Spangaro	<aspangaro@zendsi.com>
+ * Copyright (C) 2013-2015 Alexandre Spangaro	<aspangaro@zendsi.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>
 * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.fr>
- * Copyright (C) 2017      Frédéric France      <frederic.france@netlogic.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
@@ -38,45 +37,29 @@ $langs->load("bills");
 $langs->load("admin");
 $langs->load("accountancy");

-// Security access
-if (empty($user->rights->accounting->chartofaccount))
+// Security check
+if (empty($user->admin) && empty($user->rights->accounting->chartofaccount))
 {
-	accessforbidden();
+    accessforbidden();
 }

 $action = GETPOST('action', 'alpha');

 // Parameters ACCOUNTING_EXPORT_*
 $main_option = array (
-    'ACCOUNTING_EXPORT_PREFIX_SPEC',
+		'ACCOUNTING_EXPORT_PREFIX_SPEC'
 );

-$configuration = AccountancyExport::getTypeConfig();
-
-$listparam = $configuration[param];
-
-$listformat = $configuration[format];
-
-$listcr = $configuration[cr];
-
-
 $model_option = array (
-    '1' => array(
-        'label' => 'ACCOUNTING_EXPORT_FORMAT',
-        'param' => $listformat,
-    ),
-    '2' => array(
-        'label' => 'ACCOUNTING_EXPORT_SEPARATORCSV',
-        'param' => '',
-    ),
-    '3' => array(
-        'label' => 'ACCOUNTING_EXPORT_ENDLINE',
-        'param' => $listcr,
-    ),
-    '4' => array(
-        'label' => 'ACCOUNTING_EXPORT_DATE',
-        'param' => '',
-    ),
+		'ACCOUNTING_EXPORT_SEPARATORCSV',
+		'ACCOUNTING_EXPORT_DATE'
+		/*
+		'ACCOUNTING_EXPORT_PIECE',
+		'ACCOUNTING_EXPORT_GLOBAL_ACCOUNT',
+		'ACCOUNTING_EXPORT_LABEL',
+		'ACCOUNTING_EXPORT_AMOUNT',
+		'ACCOUNTING_EXPORT_DEVISE'
+		*/
 );

 /*
@@ -85,15 +68,24 @@ $model_option = array (
 if ($action == 'update') {
 	$error = 0;

-	$modelcsv = GETPOST('ACCOUNTING_EXPORT_MODELCSV', 'int');
+	$format = GETPOST('format', 'alpha');
+	$modelcsv = GETPOST('modelcsv', 'int');
+
+	if (! empty($format)) {
+		if (! dolibarr_set_const($db, 'ACCOUNTING_EXPORT_FORMAT', $format, 'chaine', 0, '', $conf->entity)) {
+			$error ++;
+		}
+	} else {
+		$error ++;
+	}

 	if (! empty($modelcsv)) {
 		if (! dolibarr_set_const($db, 'ACCOUNTING_EXPORT_MODELCSV', $modelcsv, 'chaine', 0, '', $conf->entity)) {
 			$error ++;
 		}
-		//if ($modelcsv==AccountancyExport::$EXPORT_TYPE_QUADRATUS || $modelcsv==AccountancyExport::$EXPORT_TYPE_CIEL) {
-		//	dolibarr_set_const($db, 'ACCOUNTING_EXPORT_FORMAT', 'txt', 'chaine', 0, '', $conf->entity);
-		//}
+		if ($modelcsv==AccountancyExport::$EXPORT_TYPE_QUADRATUS || $modelcsv==AccountancyExport::$EXPORT_TYPE_CIEL) {
+			dolibarr_set_const($db, 'ACCOUNTING_EXPORT_FORMAT', 'txt', 'chaine', 0, '', $conf->entity);
+		}
 	} else {
 		$error ++;
 	}
@@ -106,22 +98,16 @@ if ($action == 'update') {
 		}
 	}

-    foreach ($listparam[$modelcsv] as $key => $value ) {
-        $constante = $key;
+	foreach ( $model_option as $constname ) {
+		$constvalue = GETPOST($constname, 'alpha');

-        if (strpos($constante, 'ACCOUNTING')!==false) {
-            $constvalue = GETPOST($key, 'alpha');
-            if (! dolibarr_set_const($db, $constante, $constvalue, 'chaine', 0, '', $conf->entity)) {
-                $error ++;
-            }
-        }
+		if (! dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
+			$error ++;
+		}
 	}

 	if (! $error) {
-        // reload
-        $configuration = AccountancyExport::getTypeConfig();
-        $listparam = $configuration[param];
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
@@ -135,57 +121,19 @@ llxHeader();

 $form = new Form($db);

-// $linkback = '<a href="' . DOL_URL_ROOT . '/admin/modules.php?restore_lastsearch_values=1">' . $langs->trans("BackToModuleList") . '</a>';
+$linkback = '<a href="' . DOL_URL_ROOT . '/admin/modules.php">' . $langs->trans("BackToModuleList") . '</a>';
 print load_fiche_titre($langs->trans('ConfigAccountingExpert'), $linkback, 'title_setup');

-print "\n".'<script type="text/javascript" language="javascript">'."\n";
-print 'jQuery(document).ready(function () {'."\n";
-print '    function initfields()'."\n";
-print '    {'."\n";
-foreach ($listparam as $key => $param) {
-    print '        if (jQuery("#ACCOUNTING_EXPORT_MODELCSV").val()=="'.$key.'")'."\n";
-    print '        {'."\n";
-    print '            //console.log("'.$param[label].'");'."\n";
-    if (empty($param[ACCOUNTING_EXPORT_FORMAT])) {
-        print '            jQuery("#ACCOUNTING_EXPORT_FORMAT").val("'.$conf->global->ACCOUNTING_EXPORT_FORMAT.'");'."\n";
-        print '            jQuery("#ACCOUNTING_EXPORT_FORMAT").prop("disabled", true);'."\n";
-    } else {
-        print '            jQuery("#ACCOUNTING_EXPORT_FORMAT").val("'.$param[ACCOUNTING_EXPORT_FORMAT].'");'."\n";
-        print '            jQuery("#ACCOUNTING_EXPORT_FORMAT").removeAttr("disabled");'."\n";
-    }
-    if (empty($param[ACCOUNTING_EXPORT_SEPARATORCSV])) {
-        print '            jQuery("#ACCOUNTING_EXPORT_SEPARATORCSV").val("");'."\n";
-        print '            jQuery("#ACCOUNTING_EXPORT_SEPARATORCSV").prop("disabled", true);'."\n";
-    } else {
-        print '            jQuery("#ACCOUNTING_EXPORT_SEPARATORCSV").val("'.$conf->global->ACCOUNTING_EXPORT_SEPARATORCSV.'");'."\n";
-        print '            jQuery("#ACCOUNTING_EXPORT_SEPARATORCSV").removeAttr("disabled");'."\n";
-    }
-    if (empty($param[ACCOUNTING_EXPORT_ENDLINE])) {
-        print '            jQuery("#ACCOUNTING_EXPORT_ENDLINE").prop("disabled", true);'."\n";
-    } else {
-        print '            jQuery("#ACCOUNTING_EXPORT_ENDLINE").removeAttr("disabled");'."\n";
-    }
-    if (empty($param[ACCOUNTING_EXPORT_DATE])) {
-        print '            jQuery("#ACCOUNTING_EXPORT_DATE").val("");'."\n";
-        print '            jQuery("#ACCOUNTING_EXPORT_DATE").prop("disabled", true);'."\n";
-    } else {
-        print '            jQuery("#ACCOUNTING_EXPORT_DATE").val("'.$conf->global->ACCOUNTING_EXPORT_DATE.'");'."\n";
-        print '            jQuery("#ACCOUNTING_EXPORT_DATE").removeAttr("disabled");'."\n";
-    }
-    print '        }'."\n";
-}
-print '    }'."\n";
-print '    initfields();'."\n";
-print '    jQuery("#ACCOUNTING_EXPORT_MODELCSV").change(function() {'."\n";
-print '        initfields();'."\n";
-print '    });'."\n";
-print '})'."\n";
-print '</script>'."\n";
+$head = admin_accounting_prepare_head();

 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">';

+dol_fiche_head($head, 'export', $langs->trans("Configuration"), -1, 'cron');
+
+$var = true;
+
 /*
 * Main Options
 */
@@ -195,6 +143,7 @@ print '<tr class="liste_titre">';
 print '<td colspan="3">' . $langs->trans('Options') . '</td>';
 print "</tr>\n";

+$var = ! $var;

 $num = count($main_option);
 if ($num) {
@@ -208,7 +157,7 @@ if ($num) {

 		// Value
 		print '<td>';
-		print '<input type="text" size="20" id="'.$key.'" name="' . $key . '" value="' . $conf->global->$key . '">';
+		print '<input type="text" size="20" name="' . $key . '" value="' . $conf->global->$key . '">';
 		print '</td></tr>';
 	}
 }
@@ -226,6 +175,7 @@ print '<tr class="liste_titre">';
 print '<td colspan="2">' . $langs->trans("Modelcsv") . '</td>';
 print '</tr>';

+$var = ! $var;

 print '<tr class="oddeven">';
 print '<td width="50%">' . $langs->trans("Selectmodelcsv") . '</td>';
@@ -236,7 +186,7 @@ if (! $conf->use_javascript_ajax) {
 } else {
 	print '<td>';
 	$listmodelcsv = AccountancyExport::getType();
-	print $form->selectarray("ACCOUNTING_EXPORT_MODELCSV", $listmodelcsv, $conf->global->ACCOUNTING_EXPORT_MODELCSV, 0);
+	print $form->selectarray("modelcsv", $listmodelcsv, $conf->global->ACCOUNTING_EXPORT_MODELCSV, 0);

 	print '</td>';
 }
@@ -256,27 +206,47 @@ if ($num2) {
 	print '<td colspan="3">' . $langs->trans('OtherOptions') . '</td>';
 	print "</tr>\n";

-	foreach ( $model_option as $key) {
+	if ($conf->global->ACCOUNTING_EXPORT_MODELCSV > AccountancyExport::$EXPORT_TYPE_NORMAL)
+	{
+		print '<tr><td colspan="2" bgcolor="red"><b>' . $langs->trans('OptionsDeactivatedForThisExportModel') . '</b></td></tr>';
+	}
+
+	print '<tr class="oddeven">';
+	print '<td width="50%">' . $langs->trans("Selectformat") . '</td>';
+	if (! $conf->use_javascript_ajax) {
+	    print '<td class="nowrap">';
+	    print $langs->trans("NotAvailableWhenAjaxDisabled");
+	    print "</td>";
+	} else {
+	    print '<td>';
+	    $listformat = array (
+	        'csv' => $langs->trans("csv"),
+	        'txt' => $langs->trans("txt")
+	    );
+	    print $form->selectarray("format", $listformat, $conf->global->ACCOUNTING_EXPORT_FORMAT, 0);
+
+	    print '</td>';
+	}
+	print "</td></tr>";
+
+	foreach ( $model_option as $key ) {
 		print '<tr class="oddeven value">';

-        // Param
-        $label = $key[label];
-		print '<td width="50%">' . $langs->trans($label) . '</td>';
+		// Param
+		$label = $langs->trans($key);
+		print '<td width="50%">' . $label . '</td>';

 		// Value
-        print '<td>';
-        if (is_array($key[param])) {
-            print $form->selectarray($label, $key[param], $conf->global->$label, 0);
-        } else {
-            print '<input type="text" size="20" id="'. $label .'" name="' . $key[label] . '" value="' . $conf->global->$label . '">';
-        }
-		
+		print '<td>';
+		print '<input type="text" size="20" name="' . $key . '" value="' . $conf->global->$key . '">';
 		print '</td></tr>';
 	}

 	print "</table>\n";
 }

+dol_fiche_end();
+
 print '<div class="center"><input type="submit" class="button" value="' . dol_escape_htmltag($langs->trans('Modify')) . '" name="button"></div>';

 print '</form>';
--- a/htdocs/accountancy/admin/fiscalyear.php
+++ b/htdocs/accountancy/admin/fiscalyear.php
@@ -47,16 +47,16 @@ if ($user->societe_id > 0)
 	accessforbidden();
 if (! $user->rights->accounting->fiscalyear)              // If we can read accounting records, we shoul be able to see fiscal year.
    accessforbidden();
-
+	
 $error = 0;

 // List of status
 static $tmpstatut2label = array (
 		'0' => 'OpenFiscalYear',
-		'1' => 'CloseFiscalYear'
+		'1' => 'CloseFiscalYear' 
 );
 $statut2label = array (
-		''
+		'' 
 );
 foreach ( $tmpstatut2label as $key => $val )
 	$statut2label[$key] = $langs->trans($val);
@@ -100,23 +100,14 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 $sql.= $db->plimit($limit+1, $offset);

 $result = $db->query($sql);
-if ($result)
-{
+if ($result) {
+	$var = false;
 	$num = $db->num_rows($result);

 	$i = 0;

-	if (! empty($user->rights->accounting->fiscalyear))
-	{
-		$addbutton = '<a class="butAction" href="fiscalyear_card.php?action=create">' . $langs->trans("NewFiscalYear") . '</a>';
-	}
-	else
-	{
-		$addbutton = '<a class="butActionRefused" href="#">' . $langs->trans("NewFiscalYear") . '</a>';
-	}
-
 	$title = $langs->trans('AccountingPeriods');
-	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $params, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_accountancy', 0, $addbutton, '', $limit, 1);
+	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $params, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit, 1);

 	// Load attribute_label
 	print '<table class="noborder" width="100%">';
@@ -141,7 +132,8 @@ if ($result)
 			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>';
-			$i++;
+			$var = ! $var;
+			$i ++;
 		}
 	} else {
 		print '<tr class="oddeven"><td colspan="5" class="opacitymedium">' . $langs->trans("None") . '</td></tr>';
@@ -151,6 +143,19 @@ if ($result)
 	dol_print_error($db);
 }

+dol_fiche_end();
+
+// Buttons
+print '<div class="tabsAction">';
+if (! empty($user->rights->accounting->fiscalyear))
+{
+    print '<a class="butAction" href="fiscalyear_card.php?action=create">' . $langs->trans("NewFiscalYear") . '</a>';
+}
+else
+{
+    print '<a class="butActionRefused" href="#">' . $langs->trans("NewFiscalYear") . '</a>';
+}
+print '</div>';

 llxFooter();
 $db->close();
--- a/htdocs/accountancy/admin/fiscalyear_card.php
+++ b/htdocs/accountancy/admin/fiscalyear_card.php
@@ -20,7 +20,6 @@
 * \ingroup     Advanced accountancy
 * \brief       Page to show a fiscal year
 */
-
 require '../../main.inc.php';

 require_once DOL_DOCUMENT_ROOT . '/core/lib/fiscalyear.lib.php';
--- a/htdocs/accountancy/admin/index.php
+++ b/htdocs/accountancy/admin/index.php
@@ -6,7 +6,6 @@
 * Copyright (C) 2014      Marcos García        <marcosgdf@gmail.com>
 * Copyright (C) 2014      Juanjo Menent        <jmenent@2byte.es>
 * Copyright (C) 2015      Jean-François Ferry  <jfefe@aternatik.fr>
- * Copyright (C) 2017      Laurent Destailleur  <eldy@destailleur.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
@@ -20,6 +19,7 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
 */

 /**
@@ -27,8 +27,9 @@
 * \ingroup		Advanced accountancy
 * \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';

@@ -36,9 +37,10 @@ $langs->load("compta");
 $langs->load("bills");
 $langs->load("admin");
 $langs->load("accountancy");
+$langs->load("salaries");

-// Security access
-if (empty($user->rights->accounting->chartofaccount))
+// Security check
+if (empty($user->admin))
 {
 	accessforbidden();
 }
@@ -59,28 +61,44 @@ $list = array (
 * Actions
 */

-$accounting_mode = empty($conf->global->ACCOUNTING_MODE) ? 'RECETTES-DEPENSES' : $conf->global->ACCOUNTING_MODE;
+$accounting_mode = defined('ACCOUNTING_MODE') ? ACCOUNTING_MODE : 'RECETTES-DEPENSES';

 if ($action == 'update') {
 	$error = 0;

-	if (! $error)
-	{
-	    foreach ($list as $constname)
-	    {
-	        $constvalue = GETPOST($constname, 'alpha');
+	$accounting_modes = array (
+			'RECETTES-DEPENSES',
+			'CREANCES-DETTES'
+	);

-	        if (! dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
-	            $error++;
-	        }
-	    }
-	    if ($error) {
-	    	setEventMessages($langs->trans("Error"), null, 'errors');
-	    }
+	$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 ++;
 	}

+	if ($error) {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
+
+    foreach ($list as $constname)
+    {
+        $constvalue = GETPOST($constname, 'alpha');
+
+        if (! dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
+            $error ++;
+        }
+    }
+
    if (! $error) {
        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+    } else {
+        setEventMessages($langs->trans("Error"), null, 'errors');
    }
 }

@@ -142,15 +160,20 @@ llxHeader();

 $form = new Form($db);

-//$linkback = '<a href="' . DOL_URL_ROOT . '/admin/modules.php?restore_lastsearch_values=1">' . $langs->trans("BackToModuleList") . '</a>';
+$linkback = '<a href="' . DOL_URL_ROOT . '/admin/modules.php">' . $langs->trans("BackToModuleList") . '</a>';
 print load_fiche_titre($langs->trans('ConfigAccountingExpert'), $linkback, 'title_setup');

+$head = admin_accounting_prepare_head($accounting);
+
 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">';

+dol_fiche_head($head, 'general', $langs->trans("Configuration"), -1, 'cron');
+
+
 // Default mode for calculating turnover (parameter ACCOUNTING_MODE)
-/*
+
 print '<table class="noborder" width="100%">';

 print '<tr class="liste_titre">';
@@ -177,7 +200,7 @@ print "</table>\n";


 print '<br>';
-*/
+

 // Others params

@@ -264,11 +287,18 @@ foreach ($list as $key)

 print '</table>';

+
+
+
+dol_fiche_end();
+
 print '<div class="center"><input type="submit" class="button" value="' . $langs->trans('Modify') . '" name="button"></div>';

 print '<br>';
 print '<br>';

+print '<div class="opacitymedium">'.$langs->trans("AccountancySetupDoneFromAccountancyMenu", $langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy")).'</div>';
+
 print '<br>';
 print '</form>';

--- a/htdocs/accountancy/admin/journals_list.php
+++ b/htdocs/accountancy/admin/journals_list.php
@@ -36,7 +36,7 @@ $langs->load("accountancy");

 $action=GETPOST('action','alpha')?GETPOST('action','alpha'):'view';
 $confirm=GETPOST('confirm','alpha');
-$id=35;
+$id=GETPOST('id','int');
 $rowid=GETPOST('rowid','alpha');
 $code=GETPOST('code','alpha');

@@ -58,7 +58,7 @@ $active = 1;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if ($page == -1 || $page == null) { $page = 0 ; }
 $offset = $listlimit * $page ;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
@@ -128,8 +128,8 @@ complete_dictionary_with_modules($taborder,$tabname,$tablib,$tabsql,$tabsqlsort,

 // Define elementList and sourceList (used for dictionary type of contacts "llx_c_type_contact")
 $elementList = array();
-	// Must match ids defined into eldy.lib.php
-	$sourceList = array(
+    // Must match ids defined into eldy.lib.php
+    $sourceList = array(
 			'1' => $langs->trans('AccountingJournalType1'),
 			'2' => $langs->trans('AccountingJournalType2'),
 			'3' => $langs->trans('AccountingJournalType3'),
@@ -144,226 +144,216 @@ $elementList = array();

 if (GETPOST('button_removefilter') || GETPOST('button_removefilter.x') || GETPOST('button_removefilter_x'))
 {
-	$search_country_id = '';
+    $search_country_id = '';
 }

 // Actions add or modify an entry into a dictionary
 if (GETPOST('actionadd') || GETPOST('actionmodify'))
 {
-	$listfield=explode(',', str_replace(' ', '',$tabfield[$id]));
-	$listfieldinsert=explode(',',$tabfieldinsert[$id]);
-	$listfieldmodify=explode(',',$tabfieldinsert[$id]);
-	$listfieldvalue=explode(',',$tabfieldvalue[$id]);
+    $listfield=explode(',', str_replace(' ', '',$tabfield[$id]));
+    $listfieldinsert=explode(',',$tabfieldinsert[$id]);
+    $listfieldmodify=explode(',',$tabfieldinsert[$id]);
+    $listfieldvalue=explode(',',$tabfieldvalue[$id]);

-	// Check that all fields are filled
-	$ok=1;
-	foreach ($listfield as $f => $value)
-	{
+    // Check that all fields are filled
+    $ok=1;
+    foreach ($listfield as $f => $value)
+    {
 		if ($fieldnamekey == 'libelle' || ($fieldnamekey == 'label'))  $fieldnamekey='Label';
-		if ($fieldnamekey == 'code') $fieldnamekey = 'Code';
+        if ($fieldnamekey == 'code') $fieldnamekey = 'Code';
 		if ($fieldnamekey == 'nature') $fieldnamekey = 'Nature';
-	}
-	// Other checks
-	if (isset($_POST["code"]))
-	{
-		if ($_POST["code"]=='0')
-		{
-			$ok=0;
-			setEventMessages($langs->transnoentities('ErrorCodeCantContainZero'), null, 'errors');
-		}
-		/*if (!is_numeric($_POST['code']))	// disabled, code may not be in numeric base
+    }
+    // Other checks
+    if (isset($_POST["code"]))
+    {
+    	if ($_POST["code"]=='0')
+    	{
+        	$ok=0;
+    		setEventMessages($langs->transnoentities('ErrorCodeCantContainZero'), null, 'errors');
+        }
+        /*if (!is_numeric($_POST['code']))	// disabled, code may not be in numeric base
    	{
 	    	$ok = 0;
-	    	$msg .= $langs->transnoentities('ErrorFieldFormat', $langs->transnoentities('Code')).'<br>';
+	    	$msg .= $langs->transnoentities('ErrorFieldFormat', $langs->transnoentities('Code')).'<br />';
 	    }*/
-	}
-	if (! GETPOST('label','alpha'))
-	{
-		setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label")), null, 'errors');
-		$ok=0;
-	}
+    }

 	// Clean some parameters
-	if ($_POST["accountancy_code"] <= 0) $_POST["accountancy_code"]='';	// If empty, we force to null
+    if ($_POST["accountancy_code"] <= 0) $_POST["accountancy_code"]='';	// If empty, we force to null
 	if ($_POST["accountancy_code_sell"] <= 0) $_POST["accountancy_code_sell"]='';	// If empty, we force to null
 	if ($_POST["accountancy_code_buy"] <= 0) $_POST["accountancy_code_buy"]='';	// If empty, we force to null

-	// Si verif ok et action add, on ajoute la ligne
-	if ($ok && GETPOST('actionadd'))
-	{
-		if ($tabrowid[$id])
-		{
-			// Recupere id libre pour insertion
-			$newid=0;
-			$sql = "SELECT max(".$tabrowid[$id].") newid from ".$tabname[$id];
-			$result = $db->query($sql);
-			if ($result)
-			{
-				$obj = $db->fetch_object($result);
-				$newid=($obj->newid + 1);
+    // Si verif ok et action add, on ajoute la ligne
+    if ($ok && GETPOST('actionadd'))
+    {
+        if ($tabrowid[$id])
+        {
+            // Recupere id libre pour insertion
+            $newid=0;
+            $sql = "SELECT max(".$tabrowid[$id].") newid from ".$tabname[$id];
+            $result = $db->query($sql);
+            if ($result)
+            {
+                $obj = $db->fetch_object($result);
+                $newid=($obj->newid + 1);

-			} else {
-				dol_print_error($db);
-			}
-		}
+            } else {
+                dol_print_error($db);
+            }
+        }

-		// Add new entry
-		$sql = "INSERT INTO ".$tabname[$id]." (";
-		// List of fields
-		if ($tabrowid[$id] && ! in_array($tabrowid[$id],$listfieldinsert))
-			$sql.= $tabrowid[$id].",";
-		$sql.= $tabfieldinsert[$id];
-		$sql.=",active,entity)";
-		$sql.= " VALUES(";
+        // Add new entry
+        $sql = "INSERT INTO ".$tabname[$id]." (";
+        // List of fields
+        if ($tabrowid[$id] && ! in_array($tabrowid[$id],$listfieldinsert))
+        	$sql.= $tabrowid[$id].",";
+        $sql.= $tabfieldinsert[$id];
+        $sql.=",active)";
+        $sql.= " VALUES(";

-		// List of values
-		if ($tabrowid[$id] && ! in_array($tabrowid[$id],$listfieldinsert))
-			$sql.= $newid.",";
-		$i=0;
-		foreach ($listfieldinsert as $f => $value)
-		{
-			if ($value == 'entity') {
-				$_POST[$listfieldvalue[$i]] = $conf->entity;
-			}
-			if ($i) $sql.=",";
-			if ($_POST[$listfieldvalue[$i]] == '') $sql.="null";  // For vat, we want/accept code = ''
-			else $sql.="'".$db->escape($_POST[$listfieldvalue[$i]])."'";
-			$i++;
-		}
-		$sql.=",1,".$conf->entity.")";
+        // List of values
+        if ($tabrowid[$id] && ! in_array($tabrowid[$id],$listfieldinsert))
+        	$sql.= $newid.",";
+        $i=0;
+        foreach ($listfieldinsert as $f => $value)
+        {
+            if ($value == 'entity') {
+            	$_POST[$listfieldvalue[$i]] = $conf->entity;
+            }
+            if ($i) $sql.=",";
+            if ($_POST[$listfieldvalue[$i]] == '' && ! ($listfieldvalue[$i] == 'code' && $id == 10)) $sql.="null";  // For vat, we want/accept code = ''
+            else $sql.="'".$db->escape($_POST[$listfieldvalue[$i]])."'";
+            $i++;
+        }
+        $sql.=",1)";

-		dol_syslog("actionadd", LOG_DEBUG);
-		$result = $db->query($sql);
-		if ($result)	// Add is ok
-		{
-			setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
-			$_POST=array('id'=>$id);	// Clean $_POST array, we keep only
-		}
-		else
-		{
-			if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
-				setEventMessages($langs->transnoentities("ErrorRecordAlreadyExists"), null, 'errors');
-			}
-			else {
-				dol_print_error($db);
-			}
-		}
-	}
+        dol_syslog("actionadd", LOG_DEBUG);
+        $result = $db->query($sql);
+        if ($result)	// Add is ok
+        {
+            setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
+        	$_POST=array('id'=>$id);	// Clean $_POST array, we keep only
+        }
+        else
+        {
+            if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+                setEventMessages($langs->transnoentities("ErrorRecordAlreadyExists"), null, 'errors');
+            }
+            else {
+                dol_print_error($db);
+            }
+        }
+    }

-	// Si verif ok et action modify, on modifie la ligne
-	if ($ok && GETPOST('actionmodify'))
-	{
-		if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; }
-		else { $rowidcol="rowid"; }
+    // Si verif ok et action modify, on modifie la ligne
+    if ($ok && GETPOST('actionmodify'))
+    {
+        if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; }
+        else { $rowidcol="rowid"; }

-		// Modify entry
-		$sql = "UPDATE ".$tabname[$id]." SET ";
-		// Modifie valeur des champs
-		if ($tabrowid[$id] && ! in_array($tabrowid[$id],$listfieldmodify))
-		{
-			$sql.= $tabrowid[$id]."=";
-			$sql.= "'".$db->escape($rowid)."', ";
-		}
-		$i = 0;
-		foreach ($listfieldmodify as $field)
-		{
-			if ($field == 'price' || preg_match('/^amount/i',$field) || $field == 'taux') {
-				$_POST[$listfieldvalue[$i]] = price2num($_POST[$listfieldvalue[$i]],'MU');
-			}
-			else if ($field == 'entity') {
-				$_POST[$listfieldvalue[$i]] = $conf->entity;
-			}
-			if ($i) $sql.=",";
-			$sql.= $field."=";
-			if ($_POST[$listfieldvalue[$i]] == '' && ! ($listfieldvalue[$i] == 'code' && $id == 10)) $sql.="null";  // For vat, we want/accept code = ''
-			else $sql.="'".$db->escape($_POST[$listfieldvalue[$i]])."'";
-			$i++;
-		}
-		$sql.= " WHERE ".$rowidcol." = '".$rowid."'";
-		$sql.=" AND entity = ".$conf->entity;
+        // Modify entry
+        $sql = "UPDATE ".$tabname[$id]." SET ";
+        // Modifie valeur des champs
+        if ($tabrowid[$id] && ! in_array($tabrowid[$id],$listfieldmodify))
+        {
+            $sql.= $tabrowid[$id]."=";
+            $sql.= "'".$db->escape($rowid)."', ";
+        }
+        $i = 0;
+        foreach ($listfieldmodify as $field)
+        {
+            if ($field == 'price' || preg_match('/^amount/i',$field) || $field == 'taux') {
+            	$_POST[$listfieldvalue[$i]] = price2num($_POST[$listfieldvalue[$i]],'MU');
+            }
+            else if ($field == 'entity') {
+            	$_POST[$listfieldvalue[$i]] = $conf->entity;
+            }
+            if ($i) $sql.=",";
+            $sql.= $field."=";
+            if ($_POST[$listfieldvalue[$i]] == '' && ! ($listfieldvalue[$i] == 'code' && $id == 10)) $sql.="null";  // For vat, we want/accept code = ''
+            else $sql.="'".$db->escape($_POST[$listfieldvalue[$i]])."'";
+            $i++;
+        }
+        $sql.= " WHERE ".$rowidcol." = '".$rowid."'";

-		dol_syslog("actionmodify", LOG_DEBUG);
-		//print $sql;
-		$resql = $db->query($sql);
-		if (! $resql)
-		{
-			setEventMessages($db->error(), null, 'errors');
-		}
-	}
-	//$_GET["id"]=GETPOST('id', 'int');       // Force affichage dictionnaire en cours d'edition
+        dol_syslog("actionmodify", LOG_DEBUG);
+        //print $sql;
+        $resql = $db->query($sql);
+        if (! $resql)
+        {
+            setEventMessages($db->error(), null, 'errors');
+        }
+    }
+    //$_GET["id"]=GETPOST('id', 'int');       // Force affichage dictionnaire en cours d'edition
 }

 if (GETPOST('actioncancel'))
 {
-	//$_GET["id"]=GETPOST('id', 'int');       // Force affichage dictionnaire en cours d'edition
+    //$_GET["id"]=GETPOST('id', 'int');       // Force affichage dictionnaire en cours d'edition
 }

 if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
 {
-	if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; }
-	else { $rowidcol="rowid"; }
+    if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; }
+    else { $rowidcol="rowid"; }

-	$sql = "DELETE from ".$tabname[$id]." WHERE ".$rowidcol."='".$rowid."'";
-	$sql.=" AND entity = ".$conf->entity;
+    $sql = "DELETE from ".$tabname[$id]." WHERE ".$rowidcol."='".$rowid."'";

-	dol_syslog("delete", LOG_DEBUG);
-	$result = $db->query($sql);
-	if (! $result)
-	{
-		if ($db->errno() == 'DB_ERROR_CHILD_EXISTS')
-		{
-			setEventMessages($langs->transnoentities("ErrorRecordIsUsedByChild"), null, 'errors');
-		}
-		else
-		{
-			dol_print_error($db);
-		}
-	}
+    dol_syslog("delete", LOG_DEBUG);
+    $result = $db->query($sql);
+    if (! $result)
+    {
+        if ($db->errno() == 'DB_ERROR_CHILD_EXISTS')
+        {
+            setEventMessages($langs->transnoentities("ErrorRecordIsUsedByChild"), null, 'errors');
+        }
+        else
+        {
+            dol_print_error($db);
+        }
+    }
 }

 // activate
 if ($action == $acts[0])
 {
-	if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; }
-	else { $rowidcol="rowid"; }
+    if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; }
+    else { $rowidcol="rowid"; }

-	if ($rowid) {
-		$sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE ".$rowidcol."='".$rowid."'";
-	}
-	elseif ($code) {
-		$sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE code='".$code."'";
-	}
-	$sql.=" AND entity = ".$conf->entity;
+    if ($rowid) {
+        $sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE ".$rowidcol."='".$rowid."'";
+    }
+    elseif ($code) {
+        $sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE code='".$code."'";
+    }

-	$result = $db->query($sql);
-	if (!$result)
-	{
-		dol_print_error($db);
-	}
+    $result = $db->query($sql);
+    if (!$result)
+    {
+        dol_print_error($db);
+    }
 }

 // disable
 if ($action == $acts[1])
 {
-	if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; }
-	else { $rowidcol="rowid"; }
+    if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; }
+    else { $rowidcol="rowid"; }

-	if ($rowid) {
-		$sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE ".$rowidcol."='".$rowid."'";
-	}
-	elseif ($code) {
-		$sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE code='".$code."'";
-	}
-	$sql.=" AND entity = ".$conf->entity;
+    if ($rowid) {
+        $sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE ".$rowidcol."='".$rowid."'";
+    }
+    elseif ($code) {
+        $sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE code='".$code."'";
+    }

-	$result = $db->query($sql);
-	if (!$result)
-	{
-		dol_print_error($db);
-	}
+    $result = $db->query($sql);
+    if (!$result)
+    {
+        dol_print_error($db);
+    }
 }

-
 /*
 * View
 */
@@ -377,8 +367,8 @@ $titre=$langs->trans("DictionarySetup");
 $linkback='';
 if ($id)
 {
-	$titre.=' - '.$langs->trans($tablib[$id]);
-	$titlepicto='title_accountancy';
+    $titre.=' - '.$langs->trans($tablib[$id]);
+    $titlepicto='title_accountancy';
 }

 print load_fiche_titre($titre,$linkback,$titlepicto);
@@ -387,7 +377,7 @@ print load_fiche_titre($titre,$linkback,$titlepicto);
 // Confirmation de la suppression de la ligne
 if ($action == 'delete')
 {
-	print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.$rowid.'&code='.$code.'&id='.$id, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete','',0,1);
+    print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.$rowid.'&code='.$code.'&id='.$id, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete','',0,1);
 }
 //var_dump($elementList);

@@ -396,293 +386,313 @@ if ($action == 'delete')
 */
 if ($id)
 {
-	// Complete requete recherche valeurs avec critere de tri
-	$sql=$tabsql[$id];
-	$sql.= " WHERE a.entity = ".$conf->entity;
+    // Complete requete recherche valeurs avec critere de tri
+    $sql=$tabsql[$id];

-	// If sort order is "country", we use country_code instead
-	if ($sortfield == 'country') $sortfield='country_code';
-	$sql.=$db->order($sortfield,$sortorder);
-	$sql.=$db->plimit($listlimit+1,$offset);
+    if ($search_country_id > 0)
+    {
+        if (preg_match('/ WHERE /',$sql)) $sql.= " AND ";
+        else $sql.=" WHERE ";
+        $sql.= " c.rowid = ".$search_country_id;
+    }

-	$fieldlist=explode(',',$tabfield[$id]);
+    if ($sortfield)
+    {
+        // If sort order is "country", we use country_code instead
+    	if ($sortfield == 'country') $sortfield='country_code';
+        $sql.= " ORDER BY ".$sortfield;
+        if ($sortorder)
+        {
+            $sql.=" ".strtoupper($sortorder);
+        }
+        $sql.=", ";
+        // Clear the required sort criteria for the tabsqlsort to be able to force it with selected value
+        $tabsqlsort[$id]=preg_replace('/([a-z]+\.)?'.$sortfield.' '.$sortorder.',/i','',$tabsqlsort[$id]);
+        $tabsqlsort[$id]=preg_replace('/([a-z]+\.)?'.$sortfield.',/i','',$tabsqlsort[$id]);
+    }
+    else {
+        $sql.=" ORDER BY ";
+    }
+    $sql.=$tabsqlsort[$id];
+    $sql.=$db->plimit($listlimit+1,$offset);
+    //print $sql;

-	print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<input type="hidden" name="from" value="'.dol_escape_htmltag(GETPOST('from','alpha')).'">';
+    $fieldlist=explode(',',$tabfield[$id]);

-	print '<div class="div-table-responsive">';
-	print '<table class="noborder" width="100%">';
+    print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<input type="hidden" name="from" value="'.dol_escape_htmltag(GETPOST('from','alpha')).'">';

-	// Form to add a new line
-	if ($tabname[$id])
-	{
-		$alabelisused=0;
-		$var=false;
+    print '<table class="noborder" width="100%">';

-		$fieldlist=explode(',',$tabfield[$id]);
+    // Form to add a new line
+    if ($tabname[$id])
+    {
+        $alabelisused=0;
+        $var=false;

-		// Line for title
-		print '<tr class="liste_titre">';
-		foreach ($fieldlist as $field => $value)
-		{
-			// Determine le nom du champ par rapport aux noms possibles
-			// dans les dictionnaires de donnees
-			$valuetoshow=ucfirst($fieldlist[$field]);   // Par defaut
-			$valuetoshow=$langs->trans($valuetoshow);   // try to translate
-			$align="left";
-			if ($fieldlist[$field]=='code')            { $valuetoshow=$langs->trans("Code"); }
-			if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label')
-			{
-				$valuetoshow=$langs->trans("Label");
-			}
-			if ($fieldlist[$field]=='nature')          { $valuetoshow=$langs->trans("Nature"); }
+        $fieldlist=explode(',',$tabfield[$id]);

-			if ($valuetoshow != '')
-			{
-				print '<td align="'.$align.'">';
-				if (! empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i',$tabhelp[$id][$value])) print '<a href="'.$tabhelp[$id][$value].'" target="_blank">'.$valuetoshow.' '.img_help(1,$valuetoshow).'</a>';
-				else if (! empty($tabhelp[$id][$value])) print $form->textwithpicto($valuetoshow,$tabhelp[$id][$value]);
-				else print $valuetoshow;
-				print '</td>';
-			 }
-			 if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label') $alabelisused=1;
-		}
+        // Line for title
+        print '<tr class="liste_titre">';
+        foreach ($fieldlist as $field => $value)
+        {
+            // Determine le nom du champ par rapport aux noms possibles
+            // dans les dictionnaires de donnees
+            $valuetoshow=ucfirst($fieldlist[$field]);   // Par defaut
+            $valuetoshow=$langs->trans($valuetoshow);   // try to translate
+            $align="left";
+            if ($fieldlist[$field]=='code')            { $valuetoshow=$langs->trans("Code"); }
+            if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label')
+            {
+            	$valuetoshow=$langs->trans("Label");
+            }
+            if ($fieldlist[$field]=='nature')          { $valuetoshow=$langs->trans("Nature"); }

-		print '<td>';
-		print '<input type="hidden" name="id" value="'.$id.'">';
-		print '</td>';
-		print '<td style="min-width: 26px;"></td>';
-		print '<td style="min-width: 26px;"></td>';
-		print '<td style="min-width: 26px;"></td>';
-		print '</tr>';
+            if ($valuetoshow != '')
+            {
+                print '<td align="'.$align.'">';
+            	if (! empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i',$tabhelp[$id][$value])) print '<a href="'.$tabhelp[$id][$value].'" target="_blank">'.$valuetoshow.' '.img_help(1,$valuetoshow).'</a>';
+            	else if (! empty($tabhelp[$id][$value])) print $form->textwithpicto($valuetoshow,$tabhelp[$id][$value]);
+            	else print $valuetoshow;
+                print '</td>';
+             }
+             if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label') $alabelisused=1;
+        }

-		// Line to enter new values
-		print '<tr class="oddeven nodrag nodrap nohover">';
+        print '<td>';
+        print '<input type="hidden" name="id" value="'.$id.'">';
+        print '</td>';
+        print '<td style="min-width: 26px;"></td>';
+        print '<td style="min-width: 26px;"></td>';
+        print '<td style="min-width: 26px;"></td>';
+        print '</tr>';

-		$obj = new stdClass();
-		// If data was already input, we define them in obj to populate input fields.
-		if (GETPOST('actionadd'))
-		{
-			foreach ($fieldlist as $key=>$val)
-			{
-				if (GETPOST($val) != '')
-					$obj->$val=GETPOST($val);
-			}
-		}
+        // Line to enter new values
+        print '<tr class="oddeven nodrag nodrap nohover">';

-		$tmpaction = 'create';
-		$parameters=array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$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;
+        $obj = new stdClass();
+        // If data was already input, we define them in obj to populate input fields.
+        if (GETPOST('actionadd'))
+        {
+            foreach ($fieldlist as $key=>$val)
+            {
+                if (GETPOST($val) != '')
+                	$obj->$val=GETPOST($val);
+            }
+        }

-		if (empty($reshook))
-		{
-	   		fieldListJournal($fieldlist,$obj,$tabname[$id],'add');
-		}
+        $tmpaction = 'create';
+        $parameters=array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$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;

-		print '<td colspan="4" align="right">';
-	   	print '<input type="submit" class="button" name="actionadd" value="'.$langs->trans("Add").'">';
-		print '</td>';
-		print "</tr>";
+        if (empty($reshook))
+        {
+       		fieldList($fieldlist,$obj,$tabname[$id],'add');
+        }

-		print '<tr><td colspan="7">&nbsp;</td></tr>';	// Keep &nbsp; to have a line with enough height
-	}
+        print '<td colspan="4" align="right">';
+       	print '<input type="submit" class="button" name="actionadd" value="'.$langs->trans("Add").'">';
+        print '</td>';
+        print "</tr>";
+
+        print '<tr><td colspan="7">&nbsp;</td></tr>';	// Keep &nbsp; to have a line with enough height
+    }



-	// List of available record in database
-	dol_syslog("htdocs/admin/dict", LOG_DEBUG);
-	$resql=$db->query($sql);
-	if ($resql)
-	{
-		$num = $db->num_rows($resql);
-		$i = 0;
-		$var=true;
+    // List of available record in database
+    dol_syslog("htdocs/admin/dict", LOG_DEBUG);
+    $resql=$db->query($sql);
+    if ($resql)
+    {
+        $num = $db->num_rows($resql);
+        $i = 0;
+        $var=true;

-		$param = '&id='.$id;
-		if ($search_country_id > 0) $param.= '&search_country_id='.$search_country_id;
-		$paramwithsearch = $param;
-		if ($sortorder) $paramwithsearch.= '&sortorder='.$sortorder;
-		if ($sortfield) $paramwithsearch.= '&sortfield='.$sortfield;
-		if (GETPOST('from')) $paramwithsearch.= '&from='.GETPOST('from','alpha');
+        $param = '&id='.$id;
+        if ($search_country_id > 0) $param.= '&search_country_id='.$search_country_id;
+        $paramwithsearch = $param;
+        if ($sortorder) $paramwithsearch.= '&sortorder='.$sortorder;
+        if ($sortfield) $paramwithsearch.= '&sortfield='.$sortfield;
+        if (GETPOST('from')) $paramwithsearch.= '&from='.GETPOST('from','alpha');

-		// There is several pages
-		if ($num > $listlimit)
-		{
-			print '<tr class="none"><td align="right" colspan="'.(3+count($fieldlist)).'">';
-			print_fleche_navigation($page, $_SERVER["PHP_SELF"], $paramwithsearch, ($num > $listlimit), '<li class="pagination"><span>'.$langs->trans("Page").' '.($page+1).'</span></li>');
-			print '</td></tr>';
-		}
+        // There is several pages
+        if ($num > $listlimit)
+        {
+            print '<tr class="none"><td align="right" colspan="'.(3+count($fieldlist)).'">';
+            print_fleche_navigation($page, $_SERVER["PHP_SELF"], $paramwithsearch, ($num > $listlimit), '<li class="pagination"><span>'.$langs->trans("Page").' '.($page+1).'</span></li>');
+            print '</td></tr>';
+        }

-		// Title line with search boxes
-		print '<tr class="liste_titre_filter liste_titre_add">';
-		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"></td>';
-		print '<td class="liste_titre"></td>';
-		print '<td class="liste_titre" align="center">';
-		if ($filterfound)
-		{
-			$searchpicto=$form->showFilterAndCheckAddButtons(0);
-			print $searchpicto;
-		}
-		print '</td>';
-		print '</tr>';
-
-		// Title of lines
-		print '<tr class="liste_titre">';
-		foreach ($fieldlist as $field => $value)
-		{
-			// Determine le nom du champ par rapport aux noms possibles
-			// dans les dictionnaires de donnees
-			$showfield=1;							  	// By defaut
-			$align="left";
-			$sortable=1;
-			$valuetoshow='';
-			/*
+        // Title of lines
+        print '<tr class="liste_titre liste_titre_add">';
+        foreach ($fieldlist as $field => $value)
+        {
+            // Determine le nom du champ par rapport aux noms possibles
+            // dans les dictionnaires de donnees
+            $showfield=1;							  	// By defaut
+            $align="left";
+            $sortable=1;
+            $valuetoshow='';
+            /*
            $tmparray=getLabelOfField($fieldlist[$field]);
            $showfield=$tmp['showfield'];
            $valuetoshow=$tmp['valuetoshow'];
            $align=$tmp['align'];
            $sortable=$tmp['sortable'];
 			*/
-			$valuetoshow=ucfirst($fieldlist[$field]);   // By defaut
-			$valuetoshow=$langs->trans($valuetoshow);   // try to translate
-			if ($fieldlist[$field]=='code')            { $valuetoshow=$langs->trans("Code"); }
-			if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label') { $valuetoshow=$langs->trans("Label"); }
-			if ($fieldlist[$field]=='nature')          { $valuetoshow=$langs->trans("Nature"); }
+            $valuetoshow=ucfirst($fieldlist[$field]);   // By defaut
+            $valuetoshow=$langs->trans($valuetoshow);   // try to translate
+            if ($fieldlist[$field]=='code')            { $valuetoshow=$langs->trans("Code"); }
+            if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label') { $valuetoshow=$langs->trans("Label"); }
+            if ($fieldlist[$field]=='nature')          { $valuetoshow=$langs->trans("Nature"); }

-			// Affiche nom du champ
-			if ($showfield)
-			{
-				print getTitleFieldOfList($valuetoshow, 0, $_SERVER["PHP_SELF"], ($sortable?$fieldlist[$field]:''), ($page?'page='.$page.'&':''), $param, "align=".$align, $sortfield, $sortorder);
-			}
-		}
+            // Affiche nom du champ
+            if ($showfield)
+            {
+                print getTitleFieldOfList($valuetoshow, 0, $_SERVER["PHP_SELF"], ($sortable?$fieldlist[$field]:''), ($page?'page='.$page.'&':''), $param, "align=".$align, $sortfield, $sortorder);
+            }
+        }
 		print getTitleFieldOfList($langs->trans("Status"), 0, $_SERVER["PHP_SELF"], "active", ($page?'page='.$page.'&':''), $param, 'align="center"', $sortfield, $sortorder);
-		print getTitleFieldOfList('');
-		print getTitleFieldOfList('');
-		print getTitleFieldOfList('');
-		print '</tr>';
+        print getTitleFieldOfList('');
+        print getTitleFieldOfList('');
+        print getTitleFieldOfList('');
+        print '</tr>';

-		if ($num)
-		{
-			// Lines with values
-			while ($i < $num)
-			{
-				$obj = $db->fetch_object($resql);
-				//print_r($obj);
-				print '<tr class="oddeven" id="rowid-'.$obj->rowid.'">';
-				if ($action == 'edit' && ($rowid == (! empty($obj->rowid)?$obj->rowid:$obj->code)))
-				{
-					$tmpaction='edit';
-					$parameters=array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
-					$reshook=$hookmanager->executeHooks('editDictionaryFieldlist',$parameters,$obj, $tmpaction);    // Note that $action and $object may have been modified by some hooks
-					$error=$hookmanager->error; $errors=$hookmanager->errors;
+        // Title line with search boxes
+        print '<tr class="liste_titre_filter">';
+        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"></td>';
+        print '<td class="liste_titre"></td>';
+        print '<td class="liste_titre" align="center">';
+    	if ($filterfound)
+    	{
+        	$searchpicto=$form->showFilterAndCheckAddButtons(0);
+        	print $searchpicto;
+    	}
+    	print '</td>';
+    	print '</tr>';

-					// Show fields
-					if (empty($reshook)) fieldListJournal($fieldlist,$obj,$tabname[$id],'edit');
+        if ($num)
+        {
+            // Lines with values
+            while ($i < $num)
+            {
+                $obj = $db->fetch_object($resql);
+                //print_r($obj);
+                print '<tr class="oddeven" id="rowid-'.$obj->rowid.'">';
+                if ($action == 'edit' && ($rowid == (! empty($obj->rowid)?$obj->rowid:$obj->code)))
+                {
+                    $tmpaction='edit';
+                    $parameters=array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
+                    $reshook=$hookmanager->executeHooks('editDictionaryFieldlist',$parameters,$obj, $tmpaction);    // Note that $action and $object may have been modified by some hooks
+                    $error=$hookmanager->error; $errors=$hookmanager->errors;

-					print '<td align="center" colspan="4">';
-					print '<input type="hidden" name="page" value="'.$page.'">';
-					print '<input type="hidden" name="rowid" value="'.$rowid.'">';
-					print '<input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
-					print '<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'">';
-					print '<div name="'.(! empty($obj->rowid)?$obj->rowid:$obj->code).'"></div>';
-					print '</td>';
-				}
-				else
-				{
-				  	$tmpaction = 'view';
-					$parameters=array('var'=>$var, 'fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
-					$reshook=$hookmanager->executeHooks('viewDictionaryFieldlist',$parameters,$obj, $tmpaction);    // Note that $action and $object may have been modified by some hooks
+                    // Show fields
+                    if (empty($reshook)) fieldList($fieldlist,$obj,$tabname[$id],'edit');

-					$error=$hookmanager->error; $errors=$hookmanager->errors;
+                    print '<td align="center" colspan="4">';
+                    print '<input type="hidden" name="page" value="'.$page.'">';
+                    print '<input type="hidden" name="rowid" value="'.$rowid.'">';
+                    print '<input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
+                    print '<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'">';
+                    print '<div name="'.(! empty($obj->rowid)?$obj->rowid:$obj->code).'"></div>';
+                    print '</td>';
+                }
+                else
+                {
+	              	$tmpaction = 'view';
+                    $parameters=array('var'=>$var, 'fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
+                    $reshook=$hookmanager->executeHooks('viewDictionaryFieldlist',$parameters,$obj, $tmpaction);    // Note that $action and $object may have been modified by some hooks

-					if (empty($reshook))
-					{
-						foreach ($fieldlist as $field => $value)
-						{
+                    $error=$hookmanager->error; $errors=$hookmanager->errors;

-							$showfield=1;
-							$align="left";
-							$valuetoshow=$obj->{$fieldlist[$field]};
-							if ($valuetoshow=='all') {
-								$valuetoshow=$langs->trans('All');
-							}
-							else if ($fieldlist[$field]=='nature' && $tabname[$id]==MAIN_DB_PREFIX.'accounting_journal') {
-								$langs->load("accountancy");
-								$key=$langs->trans("AccountingJournalType".strtoupper($obj->nature));
-								$valuetoshow=($obj->nature && $key != "AccountingJournalType".strtoupper($obj->nature)?$key:$obj->{$fieldlist[$field]});
-							}
+                    if (empty($reshook))
+                    {
+                        foreach ($fieldlist as $field => $value)
+                        {

-							$class='tddict';
+                            $showfield=1;
+                        	$align="left";
+                            $valuetoshow=$obj->{$fieldlist[$field]};
+                            if ($valuetoshow=='all') {
+                                $valuetoshow=$langs->trans('All');
+                            }
+                            else if ($fieldlist[$field]=='nature' && $tabname[$id]==MAIN_DB_PREFIX.'accounting_journal') {
+                                $langs->load("accountancy");
+                                $key=$langs->trans("AccountingJournalType".strtoupper($obj->nature));
+                                $valuetoshow=($obj->nature && $key != "AccountingJournalType".strtoupper($obj->nature)?$key:$obj->{$fieldlist[$field]});
+                            }
+
+                            $class='tddict';
 							// Show value for field
 							if ($showfield) print '<!-- '.$fieldlist[$field].' --><td align="'.$align.'" class="'.$class.'">'.$valuetoshow.'</td>';
-						}
-					}
+                        }
+                    }

-					// Can an entry be erased or disabled ?
-					$iserasable=1;$canbedisabled=1;$canbemodified=1;	// true by default
-					if (isset($obj->code) && $id != 10)
-					{
-						if (($obj->code == '0' || $obj->code == '' || preg_match('/unknown/i',$obj->code))) { $iserasable = 0; $canbedisabled = 0; }
-						else if ($obj->code == 'RECEP') { $iserasable = 0; $canbedisabled = 0; }
-						else if ($obj->code == 'EF0')   { $iserasable = 0; $canbedisabled = 0; }
-					}
+                    // Can an entry be erased or disabled ?
+                    $iserasable=1;$canbedisabled=1;$canbemodified=1;	// true by default
+                    if (isset($obj->code) && $id != 10)
+                    {
+                    	if (($obj->code == '0' || $obj->code == '' || preg_match('/unknown/i',$obj->code))) { $iserasable = 0; $canbedisabled = 0; }
+                    	else if ($obj->code == 'RECEP') { $iserasable = 0; $canbedisabled = 0; }
+                    	else if ($obj->code == 'EF0')   { $iserasable = 0; $canbedisabled = 0; }
+                    }

-					$canbemodified=$iserasable;
+                    $canbemodified=$iserasable;

-					$url = $_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(! empty($obj->rowid)?$obj->rowid:(! empty($obj->code)?$obj->code:'')).'&code='.(! empty($obj->code)?urlencode($obj->code):'');
-					if ($param) $url .= '&'.$param;
-					$url.='&';
+                    $url = $_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(! empty($obj->rowid)?$obj->rowid:(! empty($obj->code)?$obj->code:'')).'&code='.(! empty($obj->code)?urlencode($obj->code):'');
+                    if ($param) $url .= '&'.$param;
+                    $url.='&';

-					// Active
-					print '<td align="center" class="nowrap">';
-					if ($canbedisabled) print '<a href="'.$url.'action='.$acts[$obj->active].'">'.$actl[$obj->active].'</a>';
-					else
-				 	{
-				 		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>";
+                    // Active
+                    print '<td align="center" class="nowrap">';
+                    if ($canbedisabled) print '<a href="'.$url.'action='.$acts[$obj->active].'">'.$actl[$obj->active].'</a>';
+                    else
+                 	{
+                 		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>";

-					// Modify link
-					if ($canbemodified) print '<td align="center"><a class="reposition" href="'.$url.'action=edit">'.img_edit().'</a></td>';
-					else print '<td>&nbsp;</td>';
+                    // Modify link
+                    if ($canbemodified) print '<td align="center"><a class="reposition" href="'.$url.'action=edit">'.img_edit().'</a></td>';
+                    else print '<td>&nbsp;</td>';

-					// Delete link
-					if ($iserasable)
-					{
-						print '<td align="center">';
-						if ($user->admin) print '<a href="'.$url.'action=delete">'.img_delete().'</a>';
-						//else print '<a href="#">'.img_delete().'</a>';    // Some dictionary can be edited by other profile than admin
-						print '</td>';
-					}
-					else print '<td>&nbsp;</td>';
+                    // Delete link
+                    if ($iserasable)
+                    {
+                        print '<td align="center">';
+                        if ($user->admin) print '<a href="'.$url.'action=delete">'.img_delete().'</a>';
+                        //else print '<a href="#">'.img_delete().'</a>';    // Some dictionary can be edited by other profile than admin
+                        print '</td>';
+                    }
+                    else print '<td>&nbsp;</td>';

-					print '<td></td>';
+                    print '<td></td>';

-					print '</td>';
-				}
+                    print '</td>';
+                }

-				print "</tr>\n";
-				$i++;
-			}
-		}
-	}
-	else {
-		dol_print_error($db);
-	}
+                print "</tr>\n";
+                $i++;
+            }
+        }
+    }
+    else {
+        dol_print_error($db);
+    }

-	print '</table>';
-	print '</div>';
+    print '</table>';

-	print '</form>';
+    print '</form>';
 }

 print '<br>';
@@ -701,7 +711,7 @@ $db->close();
 *  @param		string	$context		'add'=Output field for the "add form", 'edit'=Output field for the "edit form", 'hide'=Output field for the "add form" but we dont want it to be rendered
 *	@return		void
 */
-function fieldListJournal($fieldlist, $obj='', $tabname='', $context='')
+function fieldList($fieldlist, $obj='', $tabname='', $context='')
 {
 	global $conf,$langs,$db;
 	global $form, $mysoc;
--- a/htdocs/accountancy/admin/productaccount.php
+++ b/htdocs/accountancy/admin/productaccount.php
@@ -90,8 +90,8 @@ $arrayfields=array();
 * Actions
 */

-if (GETPOST('cancel','alpha')) { $action='list'; $massaction=''; }
-if (! GETPOST('confirmmassaction','alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction=''; }
+if (GETPOST('cancel')) { $action='list'; $massaction=''; }
+if (! GETPOST('confirmmassaction') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction=''; }

 $parameters=array();
 $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
@@ -136,25 +136,17 @@ if ($action == 'update') {
 			$accounting = new AccountingAccount($db);

 			//$msg .= '<div><span  class="accountingprocessing">' . count($chk_prod) . ' ' . $langs->trans("SelectedLines") . '</span></div>';
-			$arrayofdifferentselectedvalues = array();

 			$cpt = 0; $ok = 0; $ko = 0;
-			foreach ( $chk_prod as $productid )
-			{
+			foreach ( $chk_prod as $productid ) {
+
 				$accounting_account_id = GETPOST('codeventil_' . $productid);

-				$result = 0;
-				if ($accounting_account_id > 0)
-				{
-					$arrayofdifferentselectedvalues[$accounting_account_id]=$accounting_account_id;
-					$result = $accounting->fetch($accounting_account_id, null, 1);
-				}
-				if ($result <= 0) {
+				$result = $accounting->fetch($accounting_account_id, null, 1);
+				if ($result < 0) {
 					// setEventMessages(null, $accounting->errors, 'errors');
 					$msg .= '<div><font color="red">' . $langs->trans("ErrorDB") . ' : ' . $langs->trans("Product") . ' ' . $productid . ' ' . $langs->trans("NotVentilatedinAccount") . ' : id=' . $accounting_account_id . '<br/> <pre>' . $sql . '</pre></font></div>';
-					$ko++;
 				} else {
-					$db->begin();

 					$sql = " UPDATE " . MAIN_DB_PREFIX . "product";
 					if ($accounting_product_mode == 'ACCOUNTANCY_BUY') {
@@ -166,23 +158,23 @@ if ($action == 'update') {
 					$sql .= " WHERE rowid = " . $productid;

 					dol_syslog("/accountancy/admin/productaccount.php sql=" . $sql, LOG_DEBUG);
-					if ($db->query($sql))
-					{
+					if ($db->query($sql)) {
 					    $ok++;
-					    $db->commit();
+						//$msg .= '<div><font color="green">' . $langs->trans("Product") . ' ' . $productid . ' - ' . $langs->trans("VentilatedinAccount") . ' : ' . length_accountg($accounting->account_number) . '</font></div>';
 					} else {
 					    $ko++;
-					    $db->rollback();
+						//$msg .= '<div><font color="red">' . $langs->trans("ErrorDB") . ' : ' . $langs->trans("Product") . ' ' . $productid . ' ' . $langs->trans("NotVentilatedinAccount") . ' : ' . length_accountg($accounting->account_number) . '<br/> <pre>' . $sql . '</pre></font></div>';
 					}
 				}

-				$cpt++;
+				$cpt ++;
 			}
-
+		} else {
+			//$msg .= '<div><span class="accountingprocessing">' . $langs->trans("AnyLineVentilate") . '</span></div>';
 		}
-
 		if ($ko) setEventMessages($langs->trans("XLineFailedToBeBinded", $ko), null, 'errors');
 		if ($ok) setEventMessages($langs->trans("XLineSuccessfullyBinded", $ok), null, 'mesgs');
+		//$msg .= '<div><span class="accountingprocessing">' . $langs->trans("EndProcessing") . '</span></div>';
 	}
 }

@@ -320,7 +312,6 @@ if ($result)
 	$texte=$langs->trans("ListOfProductsServices");
 	print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, '', 0, '', '', $limit);

-	print '<div class="div-table-responsive">';
 	print '<table class="liste '.($moreforfilter?"listwithfilterbefore":"").'">';

 	print '<tr class="liste_titre_filter">';
@@ -457,7 +448,6 @@ if ($result)
 		$i ++;
 	}
 	print '</table>';
-	print '</div>';

 	// Example : Adding jquery code
 	print '<script type="text/javascript" language="javascript">
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -1,7 +1,7 @@
 <?php
-/* Copyright (C) 2016       Olivier Geffroy		<jeff@jeffinfo.com>
- * Copyright (C) 2016       Florian Henry		<florian.henry@open-concept.pro>
- * Copyright (C) 2016-2017  Alexandre Spangaro	<aspangaro@zendsi.com>
+/* Copyright (C) 2016		Olivier Geffroy		<jeff@jeffinfo.com>
+ * Copyright (C) 2016		Florian Henry		<florian.henry@open-concept.pro>
+ * Copyright (C) 2016		Alexandre Spangaro	<aspangaro@zendsi.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
@@ -53,11 +53,11 @@ if ($search_accountancy_code_end == - 1) {
 	$search_accountancy_code_end = '';
 }

-if (GETPOST("exportcsv")) $action = 'export_csv';
-
+if (GETPOST("button_export_csv_x") || GETPOST("button_export_csv.x") || GETPOST("button_export_csv")) {
+	$action = 'export_csv';
+}

 $limit = GETPOST('limit','int')?GETPOST('limit', 'int'):$conf->liste_limit;
-if (empty($page) || $page < 0) { $page = 0; }

 $offset = $limit * $page;

@@ -67,29 +67,9 @@ $formaccounting = new FormAccounting($db);
 $formother = new FormOther($db);
 $form = new Form($db);

-if (empty($search_date_start) && ! GETPOSTISSET('formfilteraction'))
-{
-	$sql = 	"SELECT date_start, date_end from ".MAIN_DB_PREFIX."accounting_fiscalyear ";
-	$sql.= " where date_start < '".$db->idate(dol_now())."' and date_end > '".$db->idate(dol_now())."'";
-	$sql.= $db->plimit(1);
-	$res = $db->query($sql);
-	if ($res->num_rows > 0) {
-		$fiscalYear = $db->fetch_object($res);
-		$search_date_start = strtotime($fiscalYear->date_start);
-		$search_date_end = strtotime($fiscalYear->date_end);
-	} else {
-		$month_start= ($conf->global->SOCIETE_FISCAL_MONTH_START?($conf->global->SOCIETE_FISCAL_MONTH_START):1);
-		$year_start = dol_print_date(dol_now(), '%Y');
-		$year_end = $year_start + 1;
-		$month_end = $month_start - 1;
-		if ($month_end < 1)
-		{
-			$month_end = 12;
-			$year_end--;
-		}
-		$search_date_start = dol_mktime(0, 0, 0, $month_start, 1, $year_start);
-		$search_date_end = dol_get_last_day($year_end, $month_end);
-	}
+if (empty($search_date_start)) {
+	$search_date_start = dol_mktime(0, 0, 0, 1, 1, dol_print_date(dol_now(), '%Y'));
+	$search_date_end = dol_mktime(0, 0, 0, 12, 31, dol_print_date(dol_now(), '%Y'));
 }
 if ($sortorder == "")
 	$sortorder = "ASC";
@@ -126,7 +106,6 @@ if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x',
 	$search_accountancy_code_end = '';
 	$search_date_start = '';
 	$search_date_end = '';
-	$filter = array();
 }


@@ -137,8 +116,9 @@ if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x',
 if ($action == 'export_csv') {

 	$sep = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV;
+	if ($conf->global->ACCOUNTING_EXPORT_MODELCSV == AccountancyExport::$EXPORT_TYPE_CEGID) $sep = ";";     // For CEGID, we force separator.

-	$journal = 'balance';
+	$journal = 'bookkepping';

 	include DOL_DOCUMENT_ROOT . '/accountancy/tpl/export_journal.tpl.php';

@@ -147,27 +127,24 @@ if ($action == 'export_csv') {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}

-	foreach ($object->lines as $line)
-	{
+	foreach ($object->lines as $line) {
 		print length_accountg($line->numero_compte) . $sep;
-		print $object->get_compte_desc($line->numero_compte) . $sep;
-		print price($line->debit) . $sep;
-		print price($line->credit) . $sep;
-		print price($line->debit) . $sep;
-		print price($line->credit - $line->debit) . $sep;
+		print $line->debit . $sep;
+		print $line->credit . $sep;
+		print $line->debit . $sep;
+		print $line->credit - $line->debit . $sep;
 		print "\n";
 	}
 }

 else {
-	$title_page = $langs->trans("AccountBalance");
+	$title_page = $langs->trans("AccountBalance") . (($search_date_start || $search_date_end) ? ' ' . dol_print_date($search_date_start) . '-' . dol_print_date($search_date_end) : '');

 	llxHeader('', $title_page);

 	// List
 	$nbtotalofrecords = '';
-	if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-	{
+	if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 		$nbtotalofrecords = $object->fetchAllBalance($sortorder, $sortfield, 0, 0, $filter);
 		if ($nbtotalofrecords < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -180,24 +157,17 @@ else {
 	}

 	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
-	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
-	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="page" value="'.$page.'">';

-	$button = '<input type="submit" name="exportcsv" class="butAction" value="' . $langs->trans("Export") . ' ('.$conf->global->ACCOUNTING_EXPORT_FORMAT.')" />';
+	$button = '<input type="submit" name="button_export_csv" class="butAction" value="' . $langs->trans("Export") . ' ('.$conf->global->ACCOUNTING_EXPORT_FORMAT.')" />';
 	print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $options, $sortfield, $sortorder, '', $result, $result, 'title_accountancy', 0, $button);

 	$moreforfilter = '';

 	$moreforfilter .= '<div class="divsearchfield">';
 	$moreforfilter .= $langs->trans('DateStart') . ': ';
-	$moreforfilter .= $form->select_date($search_date_start?$search_date_start:-1, 'date_start', 0, 0, 1, '', 1, 0, 1);
+	$moreforfilter .= $form->select_date($search_date_start, 'date_start', 0, 0, 1, '', 1, 0, 1);
 	$moreforfilter .= $langs->trans('DateEnd') . ': ';
-	$moreforfilter .= $form->select_date($search_date_end?$search_date_end:-1, 'date_end', 0, 0, 1, '', 1, 0, 1);
+	$moreforfilter .= $form->select_date($search_date_end, 'date_end', 0, 0, 1, '', 1, 0, 1);
 	$moreforfilter .= '</div>';

 	if (! empty($moreforfilter)) {
@@ -231,7 +201,7 @@ else {
 	print_liste_field_titre("Label", $_SERVER['PHP_SELF'], "t.label_operation", "", $options, "", $sortfield, $sortorder);
 	print_liste_field_titre("Debit", $_SERVER['PHP_SELF'], "t.debit", "", $options, 'align="right"', $sortfield, $sortorder);
 	print_liste_field_titre("Credit", $_SERVER['PHP_SELF'], "t.credit", "", $options, 'align="right"', $sortfield, $sortorder);
-	print_liste_field_titre("Balance", $_SERVER["PHP_SELF"], "", $options, "", 'align="right"', $sortfield, $sortorder);
+	print_liste_field_titre("Solde", $_SERVER["PHP_SELF"], "", $options, "", 'align="right"', $sortfield, $sortorder);
 	print_liste_field_titre('', $_SERVER["PHP_SELF"], "", $options, "", 'width="60" align="center"', $sortfield, $sortorder);
 	print "</tr>\n";

@@ -241,8 +211,7 @@ else {
 	$sous_total_credit = 0;
 	$displayed_account = "";

-	foreach ($object->lines as $line)
-	{
+	foreach ($object->lines as $line) {
 		$link = '';
 		$total_debit += $line->debit;
 		$total_credit += $line->credit;
@@ -302,5 +271,4 @@ else {

 	llxFooter();
 }
-
-$db->close();
+$db->close();
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -1,8 +1,8 @@
 <?php
-/* Copyright (C) 2013-2017 Olivier Geffroy	  <jeff@jeffinfo.com>
+/* Copyright (C) 2013-2017 Olivier Geffroy		<jeff@jeffinfo.com>
 * Copyright (C) 2013-2017 Florian Henry		<florian.henry@open-concept.pro>
- * Copyright (C) 2013-2017 Alexandre Spangaro   <aspangaro@zendsi.com>
- * Copyright (C) 2017	  Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2013-2017 Alexandre Spangaro	<aspangaro@zendsi.com>
+ * Copyright (C) 2017      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
@@ -33,31 +33,27 @@ require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture.class.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';

 $langs->load("accountancy");
-$langs->load("bills");
-$langs->load("compta");
-
-$action = GETPOST('action','aZ09');
-
-$id = GETPOST('id', 'int');					// id of record
-$mode = GETPOST('mode','aZ09');		 		// '' or 'tmp'
-$piece_num = GETPOST("piece_num",'int');	// id of transaction (several lines share the same transaction id)

 // Security check
+$id = GETPOST('id', 'int');
 if ($user->societe_id > 0) {
 	accessforbidden();
 }
+$action = GETPOST('action','aZ09');
+$mode = GETPOST('mode','aZ09');         // '' or 'tmp'
+$piece_num = GETPOST("piece_num");

 $mesg = '';

-$account_number = GETPOST('account_number','alphanohtml');
-$subledger_account = GETPOST('subledger_account','alphanohtml');
+$account_number = GETPOST('account_number');
+$subledger_account = GETPOST('subledger_account');
 if ($subledger_account == - 1) {
 	$subledger_account = null;
 }
-$label_compte = GETPOST('label_compte','alphanohtml');
-$label_operation= GETPOST('label_operation','alphanohtml');
-$debit = price2num(GETPOST('debit','alpha'));
-$credit = price2num(GETPOST('credit','alpha'));
+$label_compte = GETPOST('label_compte');
+$label_operation= GETPOST('label_operation');
+$debit = price2num(GETPOST('debit'));
+$credit = price2num(GETPOST('credit'));

 $save = GETPOST('save','alpha');
 if (! empty($save)) $action = 'add';
@@ -76,16 +72,16 @@ if ($action == "confirm_update") {
 	$error = 0;

 	if ((floatval($debit) != 0.0) && (floatval($credit) != 0.0)) {
-		$error++;
-		setEventMessages($langs->trans('ErrorDebitCredit'), null, 'errors');
-		$action='update';
-	}
-	if (empty($account_number) || $account_number == '-1')
-	{
-		$error++;
-		setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("AccountAccountingShort")), null, 'errors');
-		$action='update';
+	    $error++;
+	    setEventMessages($langs->trans('ErrorDebitCredit'), null, 'errors');
+        $action='update';
 	}
+    if (empty($account_number) || $account_number == '-1')
+    {
+        $error++;
+        setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("AccountAccountingShort")), null, 'errors');
+        $action='update';
+    }

 	if (! $error)
 	{
@@ -93,7 +89,7 @@ if ($action == "confirm_update") {

 		$result = $book->fetch($id, null, $mode);
 		if ($result < 0) {
-			$error++;
+		    $error++;
 			setEventMessages($book->error, $book->errors, 'errors');
 		} else {
 			$book->numero_compte = $account_number;
@@ -116,13 +112,13 @@ if ($action == "confirm_update") {
 			if ($result < 0) {
 				setEventMessages($book->error, $book->errors, 'errors');
 			} else {
-				if ($mode != '_tmp')
-				{
-					setEventMessages($langs->trans('Saved'), null, 'mesgs');
-				}
+			    if ($mode != '_tmp')
+			    {
+				    setEventMessages($langs->trans('Saved'), null, 'mesgs');
+			    }

-				$debit = 0;
-				$credit = 0;
+			    $debit = 0;
+			    $credit = 0;

 				$action = '';
 			}
@@ -136,14 +132,14 @@ else if ($action == "add") {
 	if ((floatval($debit) != 0.0) && (floatval($credit) != 0.0))
 	{
 		$error++;
-		setEventMessages($langs->trans('ErrorDebitCredit'), null, 'errors');
-		$action='';
+	    setEventMessages($langs->trans('ErrorDebitCredit'), null, 'errors');
+	    $action='';
 	}
 	if (empty($account_number) || $account_number == '-1')
 	{
-		$error++;
-		setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("AccountAccountingShort")), null, 'errors');
-		$action='';
+	    $error++;
+	    setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("AccountAccountingShort")), null, 'errors');
+	    $action='';
 	}

 	if (! $error) {
@@ -155,13 +151,13 @@ else if ($action == "add") {
 		$book->label_operation= $label_operation;
 		$book->debit = $debit;
 		$book->credit = $credit;
-		$book->doc_date = GETPOST('doc_date','alpha');
-		$book->doc_type = GETPOST('doc_type','alpha');
+		$book->doc_date = GETPOST('doc_date');
+		$book->doc_type = GETPOST('doc_type');
 		$book->piece_num = $piece_num;
-		$book->doc_ref = GETPOST('doc_ref','alpha');
-		$book->code_journal = GETPOST('code_journal','alpha');
-		$book->fk_doc = GETPOST('fk_doc','alpha');
-		$book->fk_docdet = GETPOST('fk_docdet','alpha');
+		$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 (floatval($debit) != 0.0) {
 			$book->montant = $debit;
@@ -179,7 +175,7 @@ else if ($action == "add") {
 		} else {
 			if ($mode != '_tmp')
 			{
-				setEventMessages($langs->trans('Saved'), null, 'mesgs');
+                setEventMessages($langs->trans('Saved'), null, 'mesgs');
 			}

 			$debit = 0;
@@ -212,10 +208,10 @@ else if ($action == "confirm_create") {

 	$book = new BookKeeping($db);

-	if (! GETPOST('code_journal','alpha') || GETPOST('code_journal','alpha') == '-1') {
-		setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("Journal")), null, 'errors');
-		$action='create';
-		$error++;
+	if (! GETPOST('code_journal') || GETPOST('code_journal') == '-1') {
+	    setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("Journal")), null, 'errors');
+	    $action='create';
+	    $error++;
 	}
 	if (! GETPOST('next_num_mvt'))
 	{
@@ -228,11 +224,11 @@ else if ($action == "confirm_create") {
 		$book->label_compte = '';
 		$book->debit = 0;
 		$book->credit = 0;
-		$book->doc_date = $date_start = dol_mktime(0, 0, 0, GETPOST('doc_datemonth','int'), GETPOST('doc_dateday','int'), GETPOST('doc_dateyear','int'));
-		$book->doc_type = GETPOST('doc_type','alpha');
-		$book->piece_num = GETPOST('next_num_mvt','alpha');
-		$book->doc_ref = GETPOST('doc_ref','alpha');
-		$book->code_journal = GETPOST('code_journal','alpha');
+		$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;
@@ -241,10 +237,10 @@ else if ($action == "confirm_create") {
 		if ($result < 0) {
 			setEventMessages($book->error, $book->errors, 'errors');
 		} else {
-			if ($mode != '_tmp')
-			{
-				setEventMessages($langs->trans('Saved'), null, 'mesgs');
-			}
+		    if ($mode != '_tmp')
+		    {
+                setEventMessages($langs->trans('Saved'), null, 'mesgs');
+		    }
 			$action = 'update';
 			$id=$book->id;
 			$piece_num = $book->piece_num;
@@ -258,37 +254,37 @@ if ($action == 'setdate') {
 	if ($result < 0) {
 		setEventMessages($object->error, $object->errors, 'errors');
 	} else {
-		if ($mode != '_tmp')
-		{
-			setEventMessages($langs->trans('Saved'), null, 'mesgs');
-		}
+	    if ($mode != '_tmp')
+	    {
+    		setEventMessages($langs->trans('Saved'), null, 'mesgs');
+	    }
 		$action = '';
 	}
 }

 if ($action == 'setjournal') {
-	$journaldoc = trim(GETPOST('code_journal','alpha'));
-	$result = $object->updateByMvt($piece_num, 'code_journal', $journaldoc, $mode);
+	$journaldoc = trim(GETPOST('code_journal'));
+	$result = $object->updateByMvt($piece_num,'code_journal',$journaldoc,$mode);
 	if ($result < 0) {
 		setEventMessages($object->error, $object->errors, 'errors');
 	} else {
 		if ($mode != '_tmp')
 		{
-			setEventMessages($langs->trans('Saved'), null, 'mesgs');
+	       setEventMessages($langs->trans('Saved'), null, 'mesgs');
 		}
 		$action = '';
 	}
 }

 if ($action == 'setdocref') {
-	$refdoc = trim(GETPOST('doc_ref','alpha'));
+	$refdoc = trim(GETPOST('doc_ref'));
 	$result = $object->updateByMvt($piece_num,'doc_ref',$refdoc,$mode);
 	if ($result < 0) {
 		setEventMessages($object->error, $object->errors, 'errors');
 	} else {
 		if ($mode != '_tmp')
 		{
-			setEventMessages($langs->trans('Saved'), null, 'mesgs');
+	       setEventMessages($langs->trans('Saved'), null, 'mesgs');
 		}
 		$action = '';
 	}
@@ -322,8 +318,7 @@ if ($action == 'delete') {
 	print $formconfirm;
 }

-if ($action == 'create')
-{
+if ($action == 'create') {
 	print load_fiche_titre($langs->trans("CreateMvts"));

 	$book = new BookKeeping($db);
@@ -342,14 +337,13 @@ if ($action == 'create')
 	dol_fiche_head();

 	print '<table class="border" width="100%">';
-
-	/*print '<tr>';
+	print '<tr>';
 	print '<td class="titlefieldcreate fieldrequired">' . $langs->trans("NumPiece") . '</td>';
 	print '<td>' . $next_num_mvt . '</td>';
-	print '</tr>';*/
+	print '</tr>';

 	print '<tr>';
-	print '<td class="titlefieldcreate fieldrequired">' . $langs->trans("Docdate") . '</td>';
+	print '<td class="fieldrequired">' . $langs->trans("Docdate") . '</td>';
 	print '<td>';
 	print $html->select_date('', 'doc_date', '', '', '', "create_mvt", 1, 1);
 	print '</td>';
@@ -365,21 +359,17 @@ if ($action == 'create')
 	print '<td><input type="text" class="minwidth200" name="doc_ref" value=""/></td>';
 	print '</tr>';

-	/*
 	print '<tr>';
 	print '<td>' . $langs->trans("Doctype") . '</td>';
 	print '<td><input type="text" class="minwidth200 name="doc_type" value=""/></td>';
 	print '</tr>';
-	*/

 	print '</table>';

 	dol_fiche_end();

-	print '<div class="center">';
-	print '<input type="submit" class="button" value="' . $langs->trans("Create") . '">';
-	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="button" value="' . $langs->trans("Cancel") . '" class="button" onclick="history.go(-1)" />';
+	print '<div align="center"><input type="submit" class="button" value="' . $langs->trans("Create") . '">';
+	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="button" value="' . $langs->trans("Cancel") . '" class="button" onclick="history.go(-1)" />';
 	print '</div>';

 	print '</form>';
@@ -390,9 +380,9 @@ if ($action == 'create')
 		setEventMessages($book->error, $book->errors, 'errors');
 	}

-	if (! empty($book->piece_num))
-	{
-		$backlink = '<a href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/list.php?restore_lastsearch_values=1">' . $langs->trans('BackToList') . '</a>';
+	if (! empty($book->piece_num)) {
+
+	    $backlink = '<a href="list.php">' . $langs->trans('BackToList') . '</a>';

 		print load_fiche_titre($langs->trans("UpdateMvts"), $backlink);

@@ -405,21 +395,23 @@ if ($action == 'create')

 		dol_fiche_head($head, 'transaction', '', -1);

+
 		//dol_banner_tab($book, '', $backlink);

+
 		print '<div class="fichecenter">';
 		print '<div class="fichehalfleft">';

 		print '<div class="underbanner clearboth"></div>';
 		print '<table class="border tableforfield" width="100%">';

-		// Account movement
+		// account movement
 		print '<tr>';
 		print '<td class="titlefield">' . $langs->trans("NumMvts") . '</td>';
 		print '<td>' . $book->piece_num . '</td>';
 		print '</tr>';

-		// Date
+		// date
 		print '<tr><td>';
 		print '<table class="nobordernopadding" width="100%"><tr><td>';
 		print $langs->trans('Docdate');
@@ -437,12 +429,11 @@ if ($action == 'create')
 			print '<input type="submit" class="button" value="' . $langs->trans('Modify') . '">';
 			print '</form>';
 		} else {
-			print $book->doc_date ? dol_print_date($book->doc_date, 'day') : '&nbsp;';
+		  print $book->doc_date ? dol_print_date($book->doc_date, 'daytext') : '&nbsp;';
 		}
 		print '</td>';
 		print '</tr>';
-
-		// Journal
+		//journal
 		print '<tr><td>';
 		print '<table class="nobordernopadding" width="100%"><tr><td>';
 		print $langs->trans('Codejournal');
@@ -464,8 +455,7 @@ if ($action == 'create')
 		}
 		print '</td>';
 		print '</tr>';
-
-		// Ref document
+		//docref
 		print '<tr><td>';
 		print '<table class="nobordernopadding" width="100%"><tr><td>';
 		print $langs->trans('Docref');
@@ -479,11 +469,11 @@ if ($action == 'create')
 			print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
 			print '<input type="hidden" name="action" value="setdocref">';
 			print '<input type="hidden" name="mode" value="'.$mode.'">';
-			print '<input type="text" size="20" name="doc_ref" value="'.dol_escape_htmltag($book->doc_ref).'">';
+			print '<input type="text" size="20" name="doc_ref" value="'.$book->doc_ref.'">';
 			print '<input type="submit" class="button" value="' . $langs->trans('Modify') . '">';
 			print '</form>';
 		} else {
-			print $book->doc_ref ;
+		print $book->doc_ref ;
 		}
 		print '</td>';
 		print '</tr>';
@@ -498,20 +488,9 @@ if ($action == 'create')
 		print '<table class="border tableforfield" width="100%">';

 		// Doc type
-		if(! empty($book->doc_type))
-		{
-			print '<tr>';
-			print '<td class="titlefield">' . $langs->trans("Doctype") . '</td>';
-			print '<td>' . $book->doc_type . '</td>';
-			print '</tr>';
-		}
-
-		// Date document creation
 		print '<tr>';
-		print '<td class="titlefield">' . $langs->trans("DateCreation") . '</td>';
-		print '<td>';
-		print $book->date_creation ? dol_print_date($book->date_creation, 'day') : '&nbsp;';
-		print '</td>';
+		print '<td>' . $langs->trans("Doctype") . '</td>';
+		print '<td>' . $book->doc_type . '</td>';
 		print '</tr>';

 		// Validate
@@ -563,6 +542,7 @@ if ($action == 'create')

 		print '<br>';

+
 		$result = $book->fetchAllPerMvt($piece_num, $mode);
 		if ($result < 0) {
 			setEventMessages($book->error, $book->errors, 'errors');
@@ -589,15 +569,15 @@ if ($action == 'create')

 				print_liste_field_titre("AccountAccountingShort");
 				print_liste_field_titre("SubledgerAccount");
-				print_liste_field_titre("LabelAccount");
-				print_liste_field_titre("LabelOperation");
+				print_liste_field_titre("Labelcompte");
+				print_liste_field_titre("Label");
 				print_liste_field_titre("Debit", "", "", "", "", 'align="right"');
 				print_liste_field_titre("Credit", "", "", "", "", 'align="right"');
 				print_liste_field_titre("Action", "", "", "", "", 'width="60" align="center"');

 				print "</tr>\n";

-				foreach ($book->linesmvt as $line) {
+				foreach ( $book->linesmvt as $line ) {
 					print '<tr class="oddeven">';
 					$total_debit += $line->debit;
 					$total_credit += $line->credit;
@@ -607,19 +587,19 @@ if ($action == 'create')
 						print $formaccounting->select_account($line->numero_compte, 'account_number', 1, array (), 1, 1, '');
 						print '</td>';
 						print '<td>';
-						// TODO For the moment we keep a free input text instead of a combo. The select_auxaccount has problem because it does not
-						// use setup of keypress to select thirdparty and this hang browser on large database.
-						if (! empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX))
-						{
-							print $formaccounting->select_auxaccount($line->subledger_account, 'subledger_account', 1);
-						}
-						else
-						{
-							print '<input type="text" name="subledger_account" value="'.$line->subledger_account.'">';
-						}
+    					// TODO For the moment we keep a fre input text instead of a combo. The select_auxaccount has problem because it does not
+    					// use setup of keypress to select thirdparty and this hang browser on large database.
+                        if (! empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX))
+                        {
+                            print $formaccounting->select_auxaccount($line->subledger_account, 'subledger_account', 1);
+                        }
+                        else
+                        {
+                            print '<input type="text" name="subledger_account" value="'.$line->subledger_account.'">';
+                        }
 						print '</td>';
-						print '<td><input type="text" class="minwidth100" name="label_compte" value="' . $line->label_compte . '"/></td>';
-						print '<td><input type="text" class="minwidth300" name="label_operation" value="' . $line->label_operation. '"/></td>';
+						print '<td><input type="text" size="15" name="label_compte" value="' . $line->label_compte . '"/></td>';
+						print '<td><input type="text" size="15" name="label_operation" value="' . $line->label_operation. '"/></td>';
 						print '<td align="right"><input type="text" size="6" class="right" name="debit" value="' . price($line->debit) . '"/></td>';
 						print '<td align="right"><input type="text" size="6" class="right" name="credit" value="' . price($line->credit) . '"/></td>';
 						print '<td>';
@@ -639,8 +619,8 @@ if ($action == 'create')
 						print img_edit();
 						print '</a> &nbsp;';

-						$actiontodelete='delete';
-						if ($mode == '_tmp' || $action != 'delmouv') $actiontodelete='confirm_delete';
+						$actiontodelete='detele';
+						if ($mode == '_tmp') $actiontodelete='confirm_delete';

 						print '<a href="' . $_SERVER["PHP_SELF"] . '?action='.$actiontodelete.'&id=' . $line->id . '&piece_num=' . $line->piece_num . '&mode='.$mode.'">';
 						print img_delete();
@@ -651,10 +631,7 @@ if ($action == 'create')
 					print "</tr>\n";
 				}

-				$total_debit = price2num($total_debit);
-				$total_credit = price2num($total_credit);
-
-				if ($total_debit != $total_credit)
+				if (price2num($total_debit) != price2num($total_credit))
 				{
 					setEventMessages(null, array($langs->trans('MvtNotCorrectlyBalanced', $total_credit, $total_debit)), 'warnings');
 				}
@@ -667,17 +644,17 @@ if ($action == 'create')
 					print '<td>';
 					// TODO For the moment we keep a fre input text instead of a combo. The select_auxaccount has problem because it does not
 					// use setup of keypress to select thirdparty and this hang browser on large database.
-					if (! empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX))
-					{
-						print $formaccounting->select_auxaccount($subledger_account, 'subledger_account', 1);
-					}
-					else
-					{
-						print '<input type="text" name="subledger_account" value="">';
-					}
+                    if (! empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX))
+                    {
+					   print $formaccounting->select_auxaccount($subledger_account, 'subledger_account', 1);
+                    }
+                    else
+                    {
+					   print '<input type="text" name="subledger_account" value="">';
+                    }
 					print '</td>';
-					print '<td><input type="text" class="minwidth100" name="label_compte" value=""/></td>';
-					print '<td><input type="text" class="minwidth300" name="label_operation" value=""/></td>';
+					print '<td><input type="text" size="15" name="label_compte" value="' . $line->label_compte . '"/></td>';
+					print '<td><input type="text" size="15" name="label_operation" value="' . $line->label_operation. '"/></td>';
 					print '<td align="right"><input type="text" size="6" class="right" name="debit" value="' . ($debit ? price($debit) : '') . '"/></td>';
 					print '<td align="right"><input type="text" size="6" class="right" name="credit" value="' . ($credit ? price($credit) : '') . '"/></td>';
 					print '<td><input type="submit" class="button" name="save" value="' . $langs->trans("Add") . '"></td>';
@@ -688,15 +665,15 @@ if ($action == 'create')

 				if ($mode=='_tmp' && $action=='')
 				{
-					print '<br>';
+				    print '<br>';
 					print '<div class="center">';
 					if ($total_debit == $total_credit)
 					{
-						print '<a class="button" href="' . $_SERVER["PHP_SELF"] . '?piece_num=' . $book->piece_num . '&action=valid">'.$langs->trans("ValidTransaction").'</a>';
+					   print '<a class="button" href="' . $_SERVER["PHP_SELF"] . '?piece_num=' . $book->piece_num . '&action=valid">'.$langs->trans("ValidTransaction").'</a>';
 					}
 					else
 					{
-						print '<input type="submit" class="button" disabled="disabled" href="#" title="'.dol_escape_htmltag($langs->trans("MvtNotCorrectlyBalanced", $credit, $debit)).'" value="'.dol_escape_htmltag($langs->trans("ValidTransaction")).'">';
+					   print '<input type="submit" class="button" disabled="disabled" href="#" title="'.dol_escape_htmltag($langs->trans("MvtNotCorrectlyBalanced", $credit, $debit)).'" value="'.dol_escape_htmltag($langs->trans("ValidTransaction")).'">';
 					}

 					print ' &nbsp; ';
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -1,8 +1,8 @@
 <?php
-/* Copyright (C) 2013-2016  Olivier Geffroy      <jeff@jeffinfo.com>
- * Copyright (C) 2013-2016  Florian Henry        <florian.henry@open-concept.pro>
- * Copyright (C) 2013-2017  Alexandre Spangaro   <aspangaro@zendsi.com>
- * Copyright (C) 2016-2017  Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2013-2016 Olivier Geffroy		<jeff@jeffinfo.com>
+ * Copyright (C) 2013-2016 Florian Henry		<florian.henry@open-concept.pro>
+ * Copyright (C) 2013-2017 Alexandre Spangaro	<aspangaro@zendsi.com>
+ * Copyright (C) 2016-2017 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
@@ -30,23 +30,21 @@ require_once DOL_DOCUMENT_ROOT . '/accountancy/class/bookkeeping.class.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';

 // Langs
 $langs->load("accountancy");

+$page = GETPOST("page");
+$sortorder = GETPOST("sortorder");
+$sortfield = GETPOST("sortfield");
 $action = GETPOST('action', 'alpha');
 $search_mvt_num = GETPOST('search_mvt_num', 'int');
 $search_doc_type = GETPOST("search_doc_type");
 $search_doc_ref = GETPOST("search_doc_ref");
-$search_date_start = dol_mktime(0, 0, 0, GETPOST('search_date_startmonth', 'int'), GETPOST('search_date_startday', 'int'), GETPOST('search_date_startyear', 'int'));
-$search_date_end = dol_mktime(0, 0, 0, GETPOST('search_date_endmonth', 'int'), GETPOST('search_date_endday', 'int'), GETPOST('search_date_endyear', 'int'));
+$search_date_start = dol_mktime(0, 0, 0, GETPOST('date_startmonth', 'int'), GETPOST('date_startday', 'int'), GETPOST('date_startyear', 'int'));
+$search_date_end = dol_mktime(0, 0, 0, GETPOST('date_endmonth', 'int'), GETPOST('date_endday', 'int'), GETPOST('date_endyear', 'int'));
 $search_doc_date = dol_mktime(0, 0, 0, GETPOST('doc_datemonth', 'int'), GETPOST('doc_dateday', 'int'), GETPOST('doc_dateyear', 'int'));
-$search_date_creation_start = dol_mktime(0, 0, 0, GETPOST('date_creation_startmonth', 'int'), GETPOST('date_creation_startday', 'int'), GETPOST('date_creation_startyear', 'int'));
-$search_date_creation_end = dol_mktime(0, 0, 0, GETPOST('date_creation_endmonth', 'int'), GETPOST('date_creation_endday', 'int'), GETPOST('date_creation_endyear', 'int'));
-$search_date_modification_start = dol_mktime(0, 0, 0, GETPOST('date_modification_startmonth', 'int'), GETPOST('date_modification_startday', 'int'), GETPOST('date_modification_startyear', 'int'));
-$search_date_modification_end = dol_mktime(0, 0, 0, GETPOST('date_modification_endmonth', 'int'), GETPOST('date_modification_endday', 'int'), GETPOST('date_modification_endyear', 'int'));
-//var_dump($search_date_start);exit;
+
 if (GETPOST("button_delmvt_x") || GETPOST("button_delmvt.x") || GETPOST("button_delmvt")) {
 	$action = 'delbookkeepingyear';
 }
@@ -55,6 +53,7 @@ if (GETPOST("button_export_file_x") || GETPOST("button_export_file.x") || GETPOS
 }

 $search_accountancy_code = GETPOST("search_accountancy_code");
+
 $search_accountancy_code_start = GETPOST('search_accountancy_code_start', 'alpha');
 if ($search_accountancy_code_start == - 1) {
 	$search_accountancy_code_start = '';
@@ -65,6 +64,7 @@ if ($search_accountancy_code_end == - 1) {
 }

 $search_accountancy_aux_code = GETPOST("search_accountancy_aux_code");
+
 $search_accountancy_aux_code_start = GETPOST('search_accountancy_aux_code_start', 'alpha');
 if ($search_accountancy_aux_code_start == - 1) {
 	$search_accountancy_aux_code_start = '';
@@ -75,8 +75,6 @@ if ($search_accountancy_aux_code_end == - 1) {
 }
 $search_mvt_label = GETPOST('search_mvt_label', 'alpha');
 $search_direction = GETPOST('search_direction', 'alpha');
-$search_debit = GETPOST('search_debit', 'alpha');
-$search_credit = GETPOST('search_credit', 'alpha');
 $search_ledger_code = GETPOST('search_ledger_code', 'alpha');

 // Load variable for pagination
@@ -84,12 +82,12 @@ $limit = GETPOST('limit','int')?GETPOST('limit', 'int'):(empty($conf->global->AC
 $sortfield = GETPOST('sortfield', 'alpha');
 $sortorder = GETPOST('sortorder', 'alpha');
 $page = GETPOST('page','int');
-if (empty($page) || $page < 0) { $page = 0; }
+if ($page < 0) { $page = 0; }
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if ($sortorder == "") $sortorder = "ASC";
-if ($sortfield == "") $sortfield = "t.piece_num,t.rowid";
+if ($sortfield == "") $sortfield = "t.rowid";


 $object = new BookKeeping($db);
@@ -98,59 +96,20 @@ $formaccounting = new FormAccounting($db);
 $formother = new FormOther($db);
 $form = new Form($db);

-if (! in_array($action, array('export_file', 'delmouv', 'delmouvconfirm')) && ! isset($_POST['begin']) && ! isset($_GET['begin']) && ! isset($_POST['formfilteraction']) && GETPOST('page','int') == '' && ! GETPOST('noreset','int'))
-{
-	if (empty($search_date_start) && empty($search_date_end) && ! GETPOSTISSET('restore_lastsearch_values'))
-	{
-		$query = "SELECT date_start, date_end from ".MAIN_DB_PREFIX."accounting_fiscalyear ";
-		$query.= " where date_start < '".$db->idate(dol_now())."' and date_end > '".$db->idate(dol_now())."' limit 1";
-		$res = $db->query($query);

-		if ($res->num_rows > 0) {
-			$fiscalYear = $db->fetch_object($res);
-			$search_date_start = strtotime($fiscalYear->date_start);
-			$search_date_end = strtotime($fiscalYear->date_end);
-		} else {
-			$month_start= ($conf->global->SOCIETE_FISCAL_MONTH_START?($conf->global->SOCIETE_FISCAL_MONTH_START):1);
-			$year_start = dol_print_date(dol_now(), '%Y');
-			if (dol_print_date(dol_now(), '%m') < $month_start) $year_start--;	// If current month is lower that starting fiscal month, we start last year
-			$year_end = $year_start + 1;
-			$month_end = $month_start - 1;
-			if ($month_end < 1)
-			{
-				$month_end = 12;
-				$year_end--;
-			}
-			$search_date_start = dol_mktime(0, 0, 0, $month_start, 1, $year_start);
-			$search_date_end = dol_get_last_day($year_end, $month_end);
-		}
-	}
+if ($action != 'export_file' && ! isset($_POST['begin']) && ! isset($_GET['begin']) && ! isset($_POST['formfilteraction']) && empty($page)) {
+    $search_date_start = dol_mktime(0, 0, 0, 1, 1, dol_print_date(dol_now(), '%Y'));
+    $search_date_end = dol_mktime(0, 0, 0, 12, 31, dol_print_date(dol_now(), '%Y'));
 }


-$arrayfields=array(
-	't.piece_num'=>array('label'=>$langs->trans("TransactionNumShort"), 'checked'=>1),
-	't.doc_date'=>array('label'=>$langs->trans("Docdate"), 'checked'=>1),
-	't.doc_ref'=>array('label'=>$langs->trans("Piece"), 'checked'=>1),
-	't.numero_compte'=>array('label'=>$langs->trans("AccountAccountingShort"), 'checked'=>1),
-	't.subledger_account'=>array('label'=>$langs->trans("SubledgerAccount"), 'checked'=>1),
-	't.label_operation'=>array('label'=>$langs->trans("Label"), 'checked'=>1),
-	't.debit'=>array('label'=>$langs->trans("Debit"), 'checked'=>1),
-	't.credit'=>array('label'=>$langs->trans("Credit"), 'checked'=>1),
-	't.code_journal'=>array('label'=>$langs->trans("Codejournal"), 'checked'=>1),
-	't.date_creation'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0),
-	't.tms'=>array('label'=>$langs->trans("DateModification"), 'checked'=>0),
-);
-

 /*
- * Actions
+ * Action
 */

-if (GETPOST('cancel','alpha')) { $action='list'; $massaction=''; }
-if (! GETPOST('confirmmassaction','alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction=''; }
-
-include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+if (GETPOST('cancel')) { $action='list'; $massaction=''; }
+if (! GETPOST('confirmmassaction') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction=''; }

 if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')) // All tests are required to be compatible with all browsers
 {
@@ -169,107 +128,73 @@ if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x',
 	$search_ledger_code = '';
 	$search_date_start = '';
 	$search_date_end = '';
-	$search_date_creation_start = '';
-	$search_date_creation_end = '';
-	$search_date_modification_start = '';
-	$search_date_modification_end = '';
-	$search_debit = '';
-	$search_credit = '';
 }

 // Must be after the remove filter action, before the export.
 $param = '';
 $filter = array ();
 if (! empty($search_date_start)) {
-	$filter['t.doc_date>='] = $search_date_start;
-	$tmp=dol_getdate($search_date_start);
-	$param .= '&search_date_startmonth=' . $tmp['mon'] . '&search_date_startday=' . $tmp['mday'] . '&search_date_startyear=' . $tmp['year'];
+    $filter['t.doc_date>='] = $search_date_start;
+    $tmp=dol_getdate($search_date_start);
+    $param .= '&date_startmonth=' . $tmp['mon'] . '&date_startday=' . $tmp['mday'] . '&date_startyear=' . $tmp['year'];
 }
 if (! empty($search_date_end)) {
-	$filter['t.doc_date<='] = $search_date_end;
-	$tmp=dol_getdate($search_date_end);
-	$param .= '&search_date_endmonth=' . $tmp['mon'] . '&search_date_endday=' . $tmp['mday'] . '&search_date_endyear=' . $tmp['year'];
+    $filter['t.doc_date<='] = $search_date_end;
+    $tmp=dol_getdate($search_date_end);
+    $param .= '&date_endmonth=' . $tmp['mon'] . '&date_endday=' . $tmp['mday'] . '&date_endyear=' . $tmp['year'];
 }
 if (! empty($search_doc_date)) {
-	$filter['t.doc_date'] = $search_doc_date;
-	$tmp=dol_getdate($search_doc_date);
-	$param .= '&doc_datemonth=' . $tmp['mon'] . '&doc_dateday=' . $tmp['mday'] . '&doc_dateyear=' . $tmp['year'];
+    $filter['t.doc_date'] = $search_doc_date;
+    $tmp=dol_getdate($search_doc_date);
+    $param .= '&doc_datemonth=' . $tmp['mon'] . '&doc_dateday=' . $tmp['mday'] . '&doc_dateyear=' . $tmp['year'];
 }
 if (! empty($search_doc_type)) {
-	$filter['t.doc_type'] = $search_doc_type;
-	$param .= '&search_doc_type=' . urlencode($search_doc_type);
+    $filter['t.doc_type'] = $search_doc_type;
+    $param .= '&search_doc_type=' . $search_doc_type;
 }
 if (! empty($search_doc_ref)) {
-	$filter['t.doc_ref'] = $search_doc_ref;
-	$param .= '&search_doc_ref=' . urlencode($search_doc_ref);
+    $filter['t.doc_ref'] = $search_doc_ref;
+    $param .= '&search_doc_ref=' . $search_doc_ref;
 }
 if (! empty($search_accountancy_code)) {
-	$filter['t.numero_compte'] = $search_accountancy_code;
-	$param .= '&search_accountancy_code=' . urlencode($search_accountancy_code);
+    $filter['t.numero_compte'] = $search_accountancy_code;
+    $param .= '&search_accountancy_code=' . $search_accountancy_code;
 }
 if (! empty($search_accountancy_code_start)) {
-	$filter['t.numero_compte>='] = $search_accountancy_code_start;
-	$param .= '&search_accountancy_code_start=' . urlencode($search_accountancy_code_start);
+    $filter['t.numero_compte>='] = $search_accountancy_code_start;
+    $param .= '&search_accountancy_code_start=' . $search_accountancy_code_start;
 }
 if (! empty($search_accountancy_code_end)) {
-	$filter['t.numero_compte<='] = $search_accountancy_code_end;
-	$param .= '&search_accountancy_code_end=' . urlencode($search_accountancy_code_end);
+    $filter['t.numero_compte<='] = $search_accountancy_code_end;
+    $param .= '&search_accountancy_code_end=' . $search_accountancy_code_end;
 }
 if (! empty($search_accountancy_aux_code)) {
-	$filter['t.subledger_account'] = $search_accountancy_aux_code;
-	$param .= '&search_accountancy_aux_code=' . urlencode($search_accountancy_aux_code);
+    $filter['t.subledger_account'] = $search_accountancy_aux_code;
+    $param .= '&search_accountancy_aux_code=' . $search_accountancy_aux_code;
 }
 if (! empty($search_accountancy_aux_code_start)) {
-	$filter['t.subledger_account>='] = $search_accountancy_aux_code_start;
-	$param .= '&search_accountancy_aux_code_start=' . urlencode($search_accountancy_aux_code_start);
+    $filter['t.subledger_account>='] = $search_accountancy_aux_code_start;
+    $param .= '&search_accountancy_aux_code_start=' . $search_accountancy_aux_code_start;
 }
 if (! empty($search_accountancy_aux_code_end)) {
-	$filter['t.subledger_account<='] = $search_accountancy_aux_code_end;
-	$param .= '&search_accountancy_aux_code_end=' . urlencode($search_accountancy_aux_code_end);
+    $filter['t.subledger_account<='] = $search_accountancy_aux_code_end;
+    $param .= '&search_accountancy_aux_code_end=' . $search_accountancy_aux_code_end;
 }
 if (! empty($search_mvt_label)) {
-	$filter['t.label_operation'] = $search_mvt_label;
-	$param .= '&search_mvt_label=' . urlencode($search_mvt_label);
+    $filter['t.label_operation'] = $search_mvt_label;
+    $param .= '&search_mvt_label=' . $search_mvt_label;
 }
 if (! empty($search_direction)) {
-	$filter['t.sens'] = $search_direction;
-	$param .= '&search_direction=' . urlencode($search_direction);
+    $filter['t.sens'] = $search_direction;
+    $param .= '&search_direction=' . $search_direction;
 }
 if (! empty($search_ledger_code)) {
-	$filter['t.code_journal'] = $search_ledger_code;
-	$param .= '&search_ledger_code=' . urlencode($search_ledger_code);
+    $filter['t.code_journal'] = $search_ledger_code;
+    $param .= '&search_ledger_code=' . $search_ledger_code;
 }
 if (! empty($search_mvt_num)) {
-	$filter['t.piece_num'] = $search_mvt_num;
-	$param .= '&search_mvt_num=' . urlencode($search_mvt_num);
-}
-if (! empty($search_date_creation_start)) {
-	$filter['t.date_creation>='] = $search_date_creation_start;
-	$tmp=dol_getdate($search_date_creation_start);
-	$param .= '&date_creation_startmonth=' . $tmp['mon'] . '&date_creation_startday=' . $tmp['mday'] . '&date_creation_startyear=' . $tmp['year'];
-}
-if (! empty($search_date_creation_end)) {
-	$filter['t.date_creation<='] = $search_date_creation_end;
-	$tmp=dol_getdate($search_date_creation_end);
-	$param .= '&date_creation_endmonth=' . $tmp['mon'] . '&date_creation_endday=' . $tmp['mday'] . '&date_creation_endyear=' . $tmp['year'];
-}
-if (! empty($search_date_modification_start)) {
-	$filter['t.tms>='] = $search_date_modification_start;
-	$tmp=dol_getdate($search_date_modification_start);
-	$param .= '&date_modification_startmonth=' . $tmp['mon'] . '&date_modification_startday=' . $tmp['mday'] . '&date_modification_startyear=' . $tmp['year'];
-}
-if (! empty($search_date_modification_end)) {
-	$filter['t.tms<='] = $search_date_modification_end;
-	$tmp=dol_getdate($search_date_modification_end);
-	$param .= '&date_modification_endmonth=' . $tmp['mon'] . '&date_modification_endday=' . $tmp['mday'] . '&date_modification_endyear=' . $tmp['year'];
-}
-if (! empty($search_debit)) {
-	$filter['t.debit'] = $search_debit;
-	$param .= '&search_debit=' . urlencode($search_debit);
-}
-if (! empty($search_credit)) {
-	$filter['t.credit'] = $search_credit;
-	$param .= '&search_credit=' . urlencode($search_credit);
+    $filter['t.piece_num'] = $search_mvt_num;
+    $param .= '&search_mvt_num=' . $search_mvt_num;
 }

 if ($action == 'delbookkeeping') {
@@ -304,16 +229,16 @@ if ($action == 'delbookkeepingyearconfirm') {
 		}
 		else
 		{
-			setEventMessages("RecordDeleted", null, 'mesgs');
+		    setEventMessages("RecordDeleted", null, 'mesgs');
 		}
 		Header("Location: list.php");
 		exit;
 	}
 	else
 	{
-		setEventMessages("NoRecordDeleted", null, 'warnings');
-		Header("Location: list.php");
-		exit;
+	    setEventMessages("NoRecordDeleted", null, 'warnings');
+	    Header("Location: list.php");
+	    exit;
 	}
 }
 if ($action == 'delmouvconfirm') {
@@ -323,14 +248,13 @@ if ($action == 'delmouvconfirm') {
 	if (! empty($mvt_num)) {
 		$result = $object->deleteMvtNum($mvt_num);
 		if ($result < 0) {
-			setEventMessages($object->error, $object->errors, 'errors');
+		    setEventMessages($object->error, $object->errors, 'errors');
 		}
 		else
 		{
-			setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
+		    setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
 		}
-
-		Header("Location: list.php?noreset=1".($param?'&'.$param:''));
+		Header("Location: list.php");
 		exit;
 	}
 }
@@ -338,21 +262,21 @@ if ($action == 'delmouvconfirm') {
 // Export into a file with format defined into setup
 if ($action == 'export_file') {

-	$result = $object->fetchAll($sortorder, $sortfield, 0, 0, $filter);
+    $result = $object->fetchAll($sortorder, $sortfield, 0, 0, $filter);

-	if ($result < 0)
-	{
-		setEventMessages($object->error, $object->errors, 'errors');
-	}
-	else
-	{
-		$accountancyexport = new AccountancyExport($db);
-		$accountancyexport->export($object->lines);
-		if (!empty($accountancyexport->errors)) {
-			setEventMessages('', $accountancyexport->errors, 'errors');
-		}
-		exit;
-	}
+    if ($result < 0)
+    {
+        setEventMessages($object->error, $object->errors, 'errors');
+    }
+    else
+    {
+        $accountancyexport = new AccountancyExport($db);
+        $accountancyexport->export($object->lines);
+        if (!empty($accountancyexport->errors)) {
+            setEventMessages('', $accountancyexport->errors, 'errors');
+        }
+        exit;
+    }
 }


@@ -382,7 +306,7 @@ if ($result < 0) {
 $num=count($object->lines);

 if ($action == 'delmouv') {
-	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?mvt_num='.GETPOST('mvt_num').$param, $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvtPartial'), 'delmouvconfirm', '', 0, 1);
+	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?mvt_num=' . GETPOST('mvt_num'), $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvtPartial'), 'delmouvconfirm', '', 0, 1);
 	print $formconfirm;
 }
 if ($action == 'delbookkeepingyear') {
@@ -406,7 +330,7 @@ if ($action == 'delbookkeepingyear') {
 	);
 	$form_question['deljournal'] = array (
 			'name' => 'deljournal',
-			'type' => 'other',	   // We don't use select here, the journal_array is already a select html component
+			'type' => 'other',       // We don't use select here, the journal_array is already a select html component
 			'label' => $langs->trans('DelJournal'),
 			'value' => $journal_array,
 			'default' => $deljournal
@@ -416,7 +340,7 @@ if ($action == 'delbookkeepingyear') {
 	print $formconfirm;
 }

-//$param='';	param started before
+//$param='';    param started before
 if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
 if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;

@@ -433,315 +357,150 @@ $listofformat=AccountancyExport::getType();
 $button = '<a class="butAction" name="button_export_file" href="'.$_SERVER["PHP_SELF"].'?action=export_file'.($param?'&'.$param:'').'">';
 if (count($filter)) $button.= $langs->trans("ExportFilteredList");
 else $button.= $langs->trans("ExportList");
-//$button.=' ('.$listofformat[$conf->global->ACCOUNTING_EXPORT_MODELCSV].')';
+$button.=' ('.$listofformat[$conf->global->ACCOUNTING_EXPORT_MODELCSV].')';
 $button.= '</a>';

+$groupby = ' <a class="nohover" href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/listbyaccount.php"">' . $langs->trans("GroupByAccountAccounting") . '</a>';

-$groupby = ' <a class="nohover" href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/listbyaccount.php?'.$param.'">' . $langs->trans("GroupByAccountAccounting") . '</a>';
-$addbutton = '<a class="butAction" href="./card.php?action=create">' . $langs->trans("NewAccountingMvt") . '</a>';
+print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $button, $result, $nbtotalofrecords, 'title_accountancy', 0, $groupby, '', $limit);

-print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $button, $result, $nbtotalofrecords, 'title_accountancy', 0, $groupby.$addbutton, '', $limit);
+print '<div class="tabsAction tabsActionNoBottom">' . "\n";
+print '<div class="inline-block divButAction"><a class="butAction" href="./card.php?action=create">' . $langs->trans("NewAccountingMvt") . '</a></div>';
+print '<div class="inline-block divButAction"><a class="butActionDelete" name="button_delmvt" href="'.$_SERVER["PHP_SELF"].'?action=delbookkeepingyear'.($param?'&'.$param:'').'">' . $langs->trans("DelBookKeeping") . '</a></div>';

-$varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
-$selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
-if ($massactionbutton) $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
+print '</div>';

-print '<div class="div-table-responsive">';
-print '<table class="tagtable liste" width="100%">';
+print '<table class="noborder" width="100%">';

-// Filters lines
 print '<tr class="liste_titre_filter">';
-// Movement number
-if (! empty($arrayfields['t.piece_num']['checked']))
+print '<td class="liste_titre"><input type="text" name="search_mvt_num" size="6" value="' . dol_escape_htmltag($search_mvt_num) . '"></td>';
+print '<td class="liste_titre center">';
+print '<div class="nowrap">';
+print $langs->trans('From') . ' ';
+print $form->select_date($search_date_start, 'date_start', 0, 0, 1);
+print '</div>';
+print '<div class="nowrap">';
+print $langs->trans('to') . ' ';
+print $form->select_date($search_date_end, 'date_end', 0, 0, 1);
+print '</div>';
+print '</td>';
+print '<td class="liste_titre"><input type="text" name="search_doc_ref" size="8" value="' . dol_escape_htmltag($search_doc_ref) . '"></td>';
+print '<td class="liste_titre">';
+print '<div class="nowrap">';
+print $langs->trans('From').' ';
+print $formaccounting->select_account($search_accountancy_code_start, 'search_accountancy_code_start', 1, array (), 1, 1, 'maxwidth200');
+print '</div>';
+print '<div class="nowrap">';
+print $langs->trans('to').' ';
+print $formaccounting->select_account($search_accountancy_code_end, 'search_accountancy_code_end', 1, array (), 1, 1, 'maxwidth200');
+print '</div>';
+print '</td>';
+print '<td class="liste_titre">';
+print '<div class="nowrap">';
+print $langs->trans('From').' ';
+// TODO For the moment we keep a fre input text instead of a combo. The select_auxaccount has problem because it does not
+// use setup of keypress to select thirdparty and this hang browser on large database.
+if (! empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX))
 {
-	print '<td class="liste_titre"><input type="text" name="search_mvt_num" size="6" value="' . dol_escape_htmltag($search_mvt_num) . '"></td>';
+    print $formaccounting->select_auxaccount($search_accountancy_aux_code_start, 'search_accountancy_aux_code_start', 1);
 }
-// Date document
-if (! empty($arrayfields['t.doc_date']['checked']))
+else
 {
-	print '<td class="liste_titre center">';
-	print '<div class="nowrap">';
-	print $langs->trans('From') . ' ';
-	print $form->select_date($search_date_start?$search_date_start:-1, 'search_date_start', 0, 0, 1);
-	print '</div>';
-	print '<div class="nowrap">';
-	print $langs->trans('to') . ' ';
-	print $form->select_date($search_date_end?$search_date_end:-1, 'search_date_end', 0, 0, 1);
-	print '</div>';
-	print '</td>';
+    print '<input type="text" name="search_accountancy_aux_code_start" value="'.$search_accountancy_aux_code_start.'">';
 }
-// Ref document
-if (! empty($arrayfields['t.doc_ref']['checked']))
+print '</div>';
+print '<div class="nowrap">';
+print $langs->trans('to').' ';
+// TODO For the moment we keep a fre input text instead of a combo. The select_auxaccount has problem because it does not
+// use setup of keypress to select thirdparty and this hang browser on large database.
+if (! empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX))
 {
-	print '<td class="liste_titre"><input type="text" name="search_doc_ref" size="8" value="' . dol_escape_htmltag($search_doc_ref) . '"></td>';
+    print $formaccounting->select_auxaccount($search_accountancy_aux_code_end, 'search_accountancy_aux_code_end', 1);
 }
-// Accountancy account
-if (! empty($arrayfields['t.numero_compte']['checked']))
+else
 {
-	print '<td class="liste_titre">';
-	print '<div class="nowrap">';
-	print $langs->trans('From').' ';
-	print $formaccounting->select_account($search_accountancy_code_start, 'search_accountancy_code_start', 1, array (), 1, 1, 'maxwidth200');
-	print '</div>';
-	print '<div class="nowrap">';
-	print $langs->trans('to').' ';
-	print $formaccounting->select_account($search_accountancy_code_end, 'search_accountancy_code_end', 1, array (), 1, 1, 'maxwidth200');
-	print '</div>';
-	print '</td>';
+    print '<input type="text" name="search_accountancy_aux_code_end" value="'.$search_accountancy_aux_code_end.'">';
 }
-// Subledger account
-if (! empty($arrayfields['t.subledger_account']['checked']))
-{
-	print '<td class="liste_titre">';
-	print '<div class="nowrap">';
-	print $langs->trans('From').' ';
-	// TODO For the moment we keep a free input text instead of a combo. The select_auxaccount has problem because it does not
-	// use setup of keypress to select thirdparty and this hang browser on large database.
-	if (! empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX))
-	{
-		print $formaccounting->select_auxaccount($search_accountancy_aux_code_start, 'search_accountancy_aux_code_start', 1);
-	}
-	else
-	{
-		print '<input type="text" name="search_accountancy_aux_code_start" value="'.$search_accountancy_aux_code_start.'">';
-	}
-	print '</div>';
-	print '<div class="nowrap">';
-	print $langs->trans('to').' ';
-	// TODO For the moment we keep a free input text instead of a combo. The select_auxaccount has problem because it does not
-	// use setup of keypress to select thirdparty and this hang browser on large database.
-	if (! empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX))
-	{
-		print $formaccounting->select_auxaccount($search_accountancy_aux_code_end, 'search_accountancy_aux_code_end', 1);
-	}
-	else
-	{
-		print '<input type="text" name="search_accountancy_aux_code_end" value="'.$search_accountancy_aux_code_end.'">';
-	}
-	print '</div>';
-	print '</td>';
-}
-// Label operation
-if (! empty($arrayfields['t.label_operation']['checked']))
-{
-	print '<td class="liste_titre">';
-	print '<input type="text" size="7" class="flat" name="search_mvt_label" value="' . $search_mvt_label . '"/>';
-	print '</td>';
-}
-// Debit
-if (! empty($arrayfields['t.debit']['checked']))
-{
-	print '<td class="liste_titre" align="right">';
-	print '<input type="text" class="flat" name="search_debit" size="4" value="'.dol_escape_htmltag($search_debit).'">';
-	print '</td>';
-}
-// Credit
-if (! empty($arrayfields['t.credit']['checked']))
-{
-	print '<td class="liste_titre" align="right">';
-	print '<input type="text" class="flat" name="search_credit" size="4" value="'.dol_escape_htmltag($search_credit).'">';
-	print '</td>';
-}
-// Code journal
-if (! empty($arrayfields['t.code_journal']['checked']))
-{
-	print '<td class="liste_titre center"><input type="text" name="search_ledger_code" size="3" value="' . $search_ledger_code . '"></td>';
-}
-// Date creation
-if (! empty($arrayfields['t.date_creation']['checked']))
-{
-	print '<td class="liste_titre center">';
-	print '<div class="nowrap">';
-	print $langs->trans('From') . ' ';
-	print $form->select_date($search_date_creation_start, 'date_creation_start', 0, 0, 1);
-	print '</div>';
-	print '<div class="nowrap">';
-	print $langs->trans('to') . ' ';
-	print $form->select_date($search_date_creation_end, 'date_creation_end', 0, 0, 1);
-	print '</div>';
-	print '</td>';
-}
-// Date modification
-if (! empty($arrayfields['t.tms']['checked']))
-{
-	print '<td class="liste_titre center">';
-	print '<div class="nowrap">';
-	print $langs->trans('From') . ' ';
-	print $form->select_date($search_date_modification_start, 'date_modification_start', 0, 0, 1);
-	print '</div>';
-	print '<div class="nowrap">';
-	print $langs->trans('to') . ' ';
-	print $form->select_date($search_date_modification_end, 'date_modification_end', 0, 0, 1);
-	print '</div>';
-	print '</td>';
-}
-// Action column
+print '</div>';
+print '</td>';
+print '<td class="liste_titre">';
+print '<input type="text" size="7" class="flat" name="search_mvt_label" value="' . $search_mvt_label . '"/>';
+print '</td>';
+print '<td class="liste_titre center">&nbsp;</td>';
+print '<td class="liste_titre center">&nbsp;</td>';
+print '<td class="liste_titre center"><input type="text" name="search_ledger_code" size="3" value="' . $search_ledger_code . '"></td>';
 print '<td class="liste_titre center">';
 $searchpicto=$form->showFilterButtons();
 print $searchpicto;
 print '</td>';
-print "</tr>\n";
+print '</tr>';

 print '<tr class="liste_titre">';
-if (! empty($arrayfields['t.piece_num']['checked']))			print_liste_field_titre($arrayfields['t.piece_num']['label'], $_SERVER['PHP_SELF'], "t.piece_num", "", $param, "", $sortfield, $sortorder);
-if (! empty($arrayfields['t.doc_date']['checked']))				print_liste_field_titre($arrayfields['t.doc_date']['label'], $_SERVER['PHP_SELF'], "t.doc_date", "", $param, 'align="center"', $sortfield, $sortorder);
-if (! empty($arrayfields['t.doc_ref']['checked']))				print_liste_field_titre($arrayfields['t.doc_ref']['label'], $_SERVER['PHP_SELF'], "t.doc_ref", "", $param, "", $sortfield, $sortorder);
-if (! empty($arrayfields['t.numero_compte']['checked']))		print_liste_field_titre($arrayfields['t.numero_compte']['label'], $_SERVER['PHP_SELF'], "t.numero_compte", "", $param, "", $sortfield, $sortorder);
-if (! empty($arrayfields['t.subledger_account']['checked']))	print_liste_field_titre($arrayfields['t.subledger_account']['label'], $_SERVER['PHP_SELF'], "t.subledger_account", "", $param, "", $sortfield, $sortorder);
-if (! empty($arrayfields['t.label_operation']['checked']))		print_liste_field_titre($arrayfields['t.label_operation']['label'], $_SERVER['PHP_SELF'], "t.label_operation", "", $param, "", $sortfield, $sortorder);
-if (! empty($arrayfields['t.debit']['checked']))				print_liste_field_titre($arrayfields['t.debit']['label'], $_SERVER['PHP_SELF'], "t.debit", "", $param, 'align="right"', $sortfield, $sortorder);
-if (! empty($arrayfields['t.credit']['checked']))				print_liste_field_titre($arrayfields['t.credit']['label'], $_SERVER['PHP_SELF'], "t.credit", "", $param, 'align="right"', $sortfield, $sortorder);
-if (! empty($arrayfields['t.code_journal']['checked']))			print_liste_field_titre($arrayfields['t.code_journal']['label'], $_SERVER['PHP_SELF'], "t.code_journal", "", $param, 'align="center"', $sortfield, $sortorder);
-if (! empty($arrayfields['t.date_creation']['checked']))		print_liste_field_titre($arrayfields['t.date_creation']['label'], $_SERVER['PHP_SELF'], "t.date_creation", "", $param, 'align="center"', $sortfield, $sortorder);
-if (! empty($arrayfields['t.tms']['checked']))					print_liste_field_titre($arrayfields['t.tms']['label'], $_SERVER['PHP_SELF'], "t.tms", "", $param, 'align="center"', $sortfield, $sortorder);
-print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
+print_liste_field_titre("TransactionNumShort", $_SERVER['PHP_SELF'], "t.piece_num", "", $param, "", $sortfield, $sortorder);
+print_liste_field_titre("Docdate", $_SERVER['PHP_SELF'], "t.doc_date", "", $param, 'align="center"', $sortfield, $sortorder);
+print_liste_field_titre("Docref", $_SERVER['PHP_SELF'], "t.doc_ref", "", $param, "", $sortfield, $sortorder);
+print_liste_field_titre("AccountAccountingShort", $_SERVER['PHP_SELF'], "t.numero_compte", "", $param, "", $sortfield, $sortorder);
+print_liste_field_titre("SubledgerAccount", $_SERVER['PHP_SELF'], "t.subledger_account", "", $param, "", $sortfield, $sortorder);
+print_liste_field_titre("Label", $_SERVER['PHP_SELF'], "t.label_operation", "", $param, "", $sortfield, $sortorder);
+print_liste_field_titre("Debit", $_SERVER['PHP_SELF'], "t.debit", "", $param, 'align="right"', $sortfield, $sortorder);
+print_liste_field_titre("Credit", $_SERVER['PHP_SELF'], "t.credit", "", $param, 'align="right"', $sortfield, $sortorder);
+print_liste_field_titre("Codejournal", $_SERVER['PHP_SELF'], "t.code_journal", "", $param, 'align="center"', $sortfield, $sortorder);
+$checkpicto='';
+if ($massactionbutton) $checkpicto=$form->showCheckAddButtons('checkforselect', 1);
+print_liste_field_titre($checkpicto, $_SERVER["PHP_SELF"], "", $param, "", 'width="60" align="center"', $sortfield, $sortorder);
 print "</tr>\n";


-if ($num > 0)
+$total_debit = 0;
+$total_credit = 0;
+
+$i=0;
+while ($i < min($num, $limit))
 {
-	$i=0;
-	$totalarray=array();
-	while ($i < min($num, $limit))
-	{
-		$line = $object->lines[$i];
+	$line = $object->lines[$i];

-		$total_debit += $line->debit;
-		$total_credit += $line->credit;
+	$total_debit += $line->debit;
+	$total_credit += $line->credit;

-		print '<tr class="oddeven">';
+	print '<tr class="oddeven">';

-		// Piece number
-		if (! empty($arrayfields['t.piece_num']['checked']))
-		{
-			print '<td>';
-			$object->id = $line->id;
-			$object->piece_num = $line->piece_num;
-			print $object->getNomUrl(1,'',0,'',1);
-			//print '<a href="./card.php?piece_num=' . $line->piece_num . '&save_lastsearch_values=1">' . $line->piece_num . '</a>';
-			print '</td>';
-			if (! $i) $totalarray['nbfield']++;
-		}
+	print '<td><a href="./card.php?piece_num=' . $line->piece_num . '">' . $line->piece_num . '</a></td>';
+	print '<td align="center">' . dol_print_date($line->doc_date, 'day') . '</td>';
+	print '<td class="nowrap">' . $line->doc_ref . '</td>';
+	print '<td>' . length_accountg($line->numero_compte) . '</td>';
+	print '<td>' . length_accounta($line->subledger_account) . '</td>';
+	print '<td>' . $line->label_operation . '</td>';
+	print '<td align="right">' . ($line->debit ? price($line->debit) : ''). '</td>';
+	print '<td align="right">' . ($line->credit ? price($line->credit) : '') . '</td>';

-		// Document date
-		if (! empty($arrayfields['t.doc_date']['checked']))
-		{
-			print '<td align="center">' . dol_print_date($line->doc_date, 'day') . '</td>';
-			if (! $i) $totalarray['nbfield']++;
-		}
+	$accountingjournal = new AccountingJournal($db);
+	$result = $accountingjournal->fetch('',$line->code_journal);
+	$journaltoshow = (($result > 0)?$accountingjournal->getNomUrl(0,0,0,'',0) : $line->code_journal);
+	print '<td align="center">' . $journaltoshow . '</td>';

-		// Document ref
-		if (! empty($arrayfields['t.doc_ref']['checked']))
-		{
-			print '<td class="nowrap">' . $line->doc_ref . '</td>';
-			if (! $i) $totalarray['nbfield']++;
-		}
+	print '<td align="center">';
+	print '<a href="./card.php?piece_num=' . $line->piece_num . '">' . img_edit() . '</a>&nbsp;';
+	print '<a href="' . $_SERVER['PHP_SELF'] . '?action=delmouv&mvt_num=' . $line->piece_num . $param . '&page=' . $page . '">' . img_delete() . '</a>';
+	print '</td>';
+	print "</tr>\n";

-		// Account number
-		if (! empty($arrayfields['t.numero_compte']['checked']))
-		{
-			print '<td>' . length_accountg($line->numero_compte) . '</td>';
-			if (! $i) $totalarray['nbfield']++;
-		}
-
-		// Subledger account
-		if (! empty($arrayfields['t.subledger_account']['checked']))
-		{
-			print '<td>' . length_accounta($line->subledger_account) . '</td>';
-			if (! $i) $totalarray['nbfield']++;
-		}
-
-		// Label operation
-		if (! empty($arrayfields['t.label_operation']['checked']))
-		{
-			print '<td>' . $line->label_operation . '</td>';
-			if (! $i) $totalarray['nbfield']++;
-		}
-
-		// Amount debit
-		if (! empty($arrayfields['t.debit']['checked']))
-		{
-			print '<td align="right">' . ($line->debit ? price($line->debit) : ''). '</td>';
-			if (! $i) $totalarray['nbfield']++;
-			if (! $i) $totalarray['totaldebitfield']=$totalarray['nbfield'];
-			$totalarray['totaldebit'] += $line->debit;
-		}
-
-		// Amount credit
-		if (! empty($arrayfields['t.credit']['checked']))
-		{
-			print '<td align="right">' . ($line->credit ? price($line->credit) : '') . '</td>';
-			if (! $i) $totalarray['nbfield']++;
-			if (! $i) $totalarray['totalcreditfield']=$totalarray['nbfield'];
-			$totalarray['totalcredit'] += $line->credit;
-		}
-
-		// Journal code
-		if (! empty($arrayfields['t.code_journal']['checked']))
-		{
-			$accountingjournal = new AccountingJournal($db);
-			$result = $accountingjournal->fetch('',$line->code_journal);
-			$journaltoshow = (($result > 0)?$accountingjournal->getNomUrl(0,0,0,'',0) : $line->code_journal);
-			print '<td align="center">' . $journaltoshow . '</td>';
-			if (! $i) $totalarray['nbfield']++;
-		}
-
-		// Creation operation date
-		if (! empty($arrayfields['t.date_creation']['checked']))
-		{
-			print '<td align="center">' . dol_print_date($line->date_creation, 'dayhour') . '</td>';
-			if (! $i) $totalarray['nbfield']++;
-		}
-
-		// Modification operation date
-		if (! empty($arrayfields['t.tms']['checked']))
-		{
-			print '<td align="center">' . dol_print_date($line->date_modification, 'dayhour') . '</td>';
-			if (! $i) $totalarray['nbfield']++;
-		}
-
-		// Action column
-		print '<td align="center">';
-		print '<a href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?piece_num=' . $line->piece_num . $param . '&page=' . $page . ($sortfield ? '&sortfield='.$sortfield : '') . ($sortorder ? '&sortorder='.$sortorder : '') . '">' . img_edit() . '</a>&nbsp;';
-		print '<a href="' . $_SERVER['PHP_SELF'] . '?action=delmouv&mvt_num=' . $line->piece_num . $param . '&page=' . $page . ($sortfield ? '&sortfield='.$sortfield : '') . ($sortorder ? '&sortorder='.$sortorder : '') . '">' . img_delete() . '</a>';
-		print '</td>';
-		if (! $i) $totalarray['nbfield']++;
-
-		print "</tr>\n";
-
-		$i++;
-	}
-
-	// Show total line
-	if (isset($totalarray['totaldebitfield']) || isset($totalarray['totalcreditfield']))
-	{
-		$i=0;
-		print '<tr class="liste_total">';
-		while ($i < $totalarray['nbfield'])
-		{
-			$i++;
-				if ($i == 1)
-				{
-					if ($num < $limit && empty($offset)) print '<td align="left">'.$langs->trans("Total").'</td>';
-					else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
-				}
-				elseif ($totalarray['totaldebitfield'] == $i)  print '<td align="right">'.price($totalarray['totaldebit']).'</td>';
-				elseif ($totalarray['totalcreditfield'] == $i) print '<td align="right">'.price($totalarray['totalcredit']).'</td>';
-				else print '<td></td>';
-		}
-		print '</tr>';
-
-	}
+	$i++;
 }

+print '<tr class="liste_total">';
+if ($num < $limit) print '<td align="left" colspan="6">'.$langs->trans("Total").'</td>';
+else print '<td align="left" colspan="6">'.$langs->trans("Totalforthispage").'</td>';
+print '</td>';
+print '<td  align="right">';
+print price($total_debit);
+print '</td>';
+print '<td align="right">';
+print price($total_credit);
+print '</td>';
+print '<td colspan="2"></td>';
+print '</tr>';
+
 print "</table>";
-print '</div>';
-
-// TODO Replace this with mass delete action
-print '<div class="tabsAction tabsActionNoBottom">' . "\n";
-print '<a class="butActionDelete" name="button_delmvt" href="'.$_SERVER["PHP_SELF"].'?action=delbookkeepingyear'.($param?'&'.$param:'').'">' . $langs->trans("DelBookKeeping") . '</a>';
-print '</div>';
-

 print '</form>';

--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -31,7 +31,6 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/bookkeeping.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';

 // Langs
 $langs->load("accountancy");
@@ -47,11 +46,13 @@ $search_doc_date = dol_mktime(0, 0, 0, GETPOST('doc_datemonth', 'int'), GETPOST(


 $search_accountancy_code = GETPOST("search_accountancy_code");
+
 $search_accountancy_code_start = GETPOST('search_accountancy_code_start', 'alpha');
 if ($search_accountancy_code_start == - 1) {
 	$search_accountancy_code_start = '';
 }
 $search_label_account = GETPOST('search_label_account', 'alpha');
+
 $search_mvt_label = GETPOST('search_mvt_label', 'alpha');
 $search_direction = GETPOST('search_direction', 'alpha');
 $search_ledger_code = GETPOST('search_ledger_code', 'alpha');
@@ -61,38 +62,15 @@ $limit = GETPOST('limit','int')?GETPOST('limit', 'int'):(empty($conf->global->AC
 $sortfield = GETPOST('sortfield', 'alpha');
 $sortorder = GETPOST('sortorder', 'alpha');
 $page = GETPOST('page','int');
-if (empty($page) || $page < 0) { $page = 0; }
+if ($page < 0) { $page = 0; }
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if ($sortorder == "") $sortorder = "ASC";
 if ($sortfield == "") $sortfield = "t.rowid";

-if (empty($search_date_start) && empty($search_date_end)) {
-	$sql = 	"SELECT date_start, date_end from ".MAIN_DB_PREFIX."accounting_fiscalyear ";
-	$sql.= " where date_start < '".$db->idate(dol_now())."' and date_end > '".$db->idate(dol_now())."'";
-	$sql.= $db->plimit(1);
-	$res = $db->query($sql);
-
-	if ($res->num_rows > 0) {
-		$fiscalYear = $db->fetch_object($res);
-		$search_date_start = strtotime($fiscalYear->date_start);
-		$search_date_end = strtotime($fiscalYear->date_end);
-	} else {
-		$month_start= ($conf->global->SOCIETE_FISCAL_MONTH_START?($conf->global->SOCIETE_FISCAL_MONTH_START):1);
-		$year_start = dol_print_date(dol_now(), '%Y');
-		if (dol_print_date(dol_now(), '%m') < $month_start) $year_start--;	// If current month is lower that starting fiscal month, we start last year
-		$year_end = $year_start + 1;
-		$month_end = $month_start - 1;
-		if ($month_end < 1)
-		{
-			$month_end = 12;
-			$year_end--;
-		}
-		$search_date_start = dol_mktime(0, 0, 0, $month_start, 1, $year_start);
-		$search_date_end = dol_get_last_day($year_end, $month_end);
-	}
-}
+if (empty($search_date_start)) $search_date_start = dol_mktime(0, 0, 0, 1, 1, dol_print_date(dol_now(), '%Y'));
+if (empty($search_date_end)) $search_date_end = dol_mktime(0, 0, 0, 12, 31, dol_print_date(dol_now(), '%Y'));

 $object = new BookKeeping($db);

@@ -102,38 +80,39 @@ $filter = array ();

 if (! empty($search_date_start)) {
 	$filter['t.doc_date>='] = $search_date_start;
-	$options .= '&date_startmonth=' . GETPOST('date_startmonth', 'int') . '&date_startday=' . GETPOST('date_startday', 'int') . '&date_startyear=' . GETPOST('date_startyear', 'int');
+	$options .= '&amp;date_startmonth=' . GETPOST('date_startmonth', 'int') . '&amp;date_startday=' . GETPOST('date_startday', 'int') . '&amp;date_startyear=' . GETPOST('date_startyear', 'int');
 }
 if (! empty($search_date_end)) {
 	$filter['t.doc_date<='] = $search_date_end;
-	$options .= '&date_endmonth=' . GETPOST('date_endmonth', 'int') . '&date_endday=' . GETPOST('date_endday', 'int') . '&date_endyear=' . GETPOST('date_endyear', 'int');
+	$options .= '&amp;date_endmonth=' . GETPOST('date_endmonth', 'int') . '&amp;date_endday=' . GETPOST('date_endday', 'int') . '&amp;date_endyear=' . GETPOST('date_endyear', 'int');
 }
 if (! empty($search_doc_date)) {
 	$filter['t.doc_date'] = $search_doc_date;
-	$options .= '&doc_datemonth=' . GETPOST('doc_datemonth', 'int') . '&doc_dateday=' . GETPOST('doc_dateday', 'int') . '&doc_dateyear=' . GETPOST('doc_dateyear', 'int');
+	$options .= '&amp;doc_datemonth=' . GETPOST('doc_datemonth', 'int') . '&amp;doc_dateday=' . GETPOST('doc_dateday', 'int') . '&amp;doc_dateyear=' . GETPOST('doc_dateyear', 'int');
 }

+
 if (! GETPOST('button_removefilter_x','alpha') && ! GETPOST('button_removefilter.x','alpha') && ! GETPOST('button_removefilter','alpha')) // All tests are required to be compatible with all browsers
 {
  if (! empty($search_accountancy_code_start)) {
  	$filter['t.numero_compte'] = $search_accountancy_code_start;
-  	$options .= '&search_accountancy_code_start=' . urlencode($search_accountancy_code_start);
+  	$options .= '&amp;search_accountancy_code_start=' . $search_accountancy_code_start;
  }
  if (! empty($search_label_account)) {
  	$filter['t.label_operation'] = $search_label_account;
-  	$options .= '&search_label_account=' . urlencode($search_label_account);
+  	$options .= '&amp;search_label_account=' . $search_label_account;
  }
  if (! empty($search_mvt_label)) {
  	$filter['t.label_operation'] = $search_mvt_label;
-  	$options .= '&search_mvt_label=' . urlencode($search_mvt_label);
+  	$options .= '&amp;search_mvt_label=' . $search_mvt_label;
  }
  if (! empty($search_direction)) {
  	$filter['t.sens'] = $search_direction;
-  	$options .= '&search_direction=' . urlencode($search_direction);
+  	$options .= '&amp;search_direction=' . $search_direction;
  }
  if (! empty($search_ledger_code)) {
  	$filter['t.code_journal'] = $search_ledger_code;
-  	$options .= '&search_ledger_code=' . urlencode($search_ledger_code);
+  	$options .= '&amp;search_ledger_code=' . $search_ledger_code;
  }
 }

@@ -180,7 +159,6 @@ $title_page = $langs->trans("Bookkeeping") . ' ' . strtolower($langs->trans("By"

 llxHeader('', $title_page);

-
 // List
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
@@ -191,7 +169,6 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 }

 $result = $object->fetchAllByAccount($sortorder, $sortfield, $limit, $offset, $filter);
-
 if ($result < 0) {
 	setEventMessages($object->error, $object->errors, 'errors');
 }
@@ -200,7 +177,7 @@ $num=count($object->lines);


 if ($action == 'delmouv') {
-	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?mvt_num=' . GETPOST('mvt_num'), $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvtPartial'), 'delmouvconfirm', '', 0, 1);
+	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?mvt_num=' . GETPOST('mvt_num'), $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvt'), 'delmouvconfirm', '', 0, 1);
 	print $formconfirm;
 }
 if ($action == 'delbookkeepingyear') {
@@ -226,17 +203,13 @@ if ($action == 'delbookkeepingyear') {
 }


-$param=$options;
+

 print '<form method="POST" id="searchFormList" action="' . $_SERVER["PHP_SELF"] . '">';

-$viewflat = ' <a class="nohover" href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/list.php?'.$param.'">' . $langs->trans("ViewFlatList") . '</a>';
-$addbutton = '<a class="butAction" href="./card.php?action=create">' . $langs->trans("NewAccountingMvt") . '</a>';
+$viewflat = ' <a class="nohover" href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/list.php">' . $langs->trans("ViewFlatList") . '</a>';

-if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
-if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
-
-print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $result, $nbtotalofrecords, 'title_accountancy', 0, $viewflat.$addbutton, '', $limit);
+print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $options, $sortfield, $sortorder, '', $result, $nbtotalofrecords,'title_accountancy',0,$viewflat,'',$limit);

 // Reverse sort order
 if ( preg_match('/^asc/i', $sortorder) )
@@ -244,6 +217,10 @@ if ( preg_match('/^asc/i', $sortorder) )
 else
  $sortorder = "desc";

+print '<div class="tabsAction tabsActionNoBottom">' . "\n";
+print '<div class="inline-block divButAction"><a class="butAction" href="./card.php?action=create">' . $langs->trans("NewAccountingMvt") . '</a></div>';
+print '</div>';
+
 print '<table class="noborder" width="100%">';

 print '<tr class="liste_titre">';
@@ -338,7 +315,7 @@ while ($i < min($num, $limit))

    // Affiche un lien vers la facture client/fournisseur
    $doc_ref = preg_replace('/\(.*\)/', '', $line->doc_ref);
-    print strlen(length_accounta($line->subledger_account)) == 0 ? '<td>' . $line->label_operation . '</td>' : '<td>' . $line->label_operation . '<br><span style="font-size:0.8em">(' . length_accounta($line->subledger_account) . ')</span></td>';
+    print strlen(length_accounta($line->subledger_account)) == 0 ? '<td>' . $line->label_operation . '</td>' : '<td>' . $line->label_operation . '<br /><span style="font-size:0.8em">(' . length_accounta($line->subledger_account) . ')</span></td>';


 	print '<td align="right">' . ($line->debit ? price($line->debit) :''). '</td>';
--- a/htdocs/accountancy/bookkeeping/listbyyear.php
+++ b/htdocs/accountancy/bookkeeping/listbyyear.php
@@ -0,0 +1,295 @@
+<?php
+/* Copyright (C) 2013-2016 Olivier Geffroy		<jeff@jeffinfo.com>
+ * Copyright (C) 2013-2017 Alexandre Spangaro	<aspangaro@zendsi.com>
+ * Copyright (C) 2013-2016 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 	Advanced accountancy
+ * \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';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/bookkeeping.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
+
+// Langs
+$langs->load("accountancy");
+
+$page = GETPOST("page");
+$sortorder = GETPOST("sortorder");
+$sortfield = GETPOST("sortfield");
+$limit = GETPOST('limit','int')?GETPOST('limit', 'int'):$conf->liste_limit;
+$search_date_start = dol_mktime(0, 0, 0, GETPOST('date_startmonth', 'int'), GETPOST('date_startday', 'int'), GETPOST('date_startyear', 'int'));
+$search_date_end = dol_mktime(0, 0, 0, GETPOST('date_endmonth', 'int'), GETPOST('date_endday', 'int'), GETPOST('date_endyear', 'int'));
+$search_doc_type = GETPOST('search_doc_type', 'alpha');
+$search_doc_date = dol_mktime(0, 0, 0, GETPOST('doc_datemonth', 'int'), GETPOST('doc_dateday', 'int'), GETPOST('doc_dateyear', 'int'));
+$search_doc_ref = GETPOST('search_doc_ref', 'alpha');
+$search_numero_compte = GETPOST('search_numero_compte', 'alpha');
+$search_numero_compte_start = GETPOST('search_numero_compte_start', 'alpha');
+if ($search_numero_compte_start == - 1) {
+	$search_numero_compte_start = '';
+}
+$search_numero_compte_end = GETPOST('search_numero_compte_end', 'alpha');
+if ($search_numero_compte_end == - 1) {
+	$search_numero_compte_end = '';
+}
+$search_subledger_account = GETPOST('search_subledger_account', 'alpha');
+$search_subledger_account_start = GETPOST('search_subledger_account_start', 'alpha');
+if ($search_subledger_account_start == - 1) {
+	$search_subledger_account_start = '';
+}
+$search_subledger_account_end = GETPOST('search_subledger_account_end', 'alpha');
+if ($search_subledger_account_end == - 1) {
+	$search_subledger_account_end = '';
+}
+$search_label_operation = GETPOST('search_label_operation', 'alpha');
+$search_sens = GETPOST('search_sens', 'alpha');
+$search_code_journal = GETPOST('search_code_journal', 'alpha');
+
+$object = new BookKeeping($db);
+$form = new Form($db);
+$formaccounting = new FormAccounting($db);
+
+// Filter
+if (empty($search_date_start)) {
+	$search_date_start = dol_mktime(0, 0, 0, 1, 1, dol_print_date(dol_now(), '%Y'));
+	$search_date_end = dol_mktime(0, 0, 0, 12, 31, dol_print_date(dol_now(), '%Y'));
+}
+if ($sortorder == "")
+	$sortorder = "ASC";
+if ($sortfield == "")
+	$sortfield = "t.rowid";
+
+$offset = $limit * $page;
+
+
+/*
+ * Actions
+ */
+
+if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')) // All tests are required to be compatible with all browsers
+{
+	$search_doc_type = "";
+	$search_doc_date = "";
+	$search_doc_ref = "";
+	$search_numero_compte = "";
+	$search_subledger_account = "";
+	$search_label_operation = "";
+	$search_sens = "";
+	$search_code_journal = "";
+}
+
+$options = '';
+$filter = array ();
+if (! empty($search_date_start)) {
+	$filter['t.doc_date>='] = $search_date_start;
+	$options .= '&amp;date_startmonth=' . GETPOST('date_startmonth', 'int') . '&amp;date_startday=' . GETPOST('date_startday', 'int') . '&amp;date_startyear=' . GETPOST('date_startyear', 'int');
+}
+if (! empty($search_date_end)) {
+	$filter['t.doc_date<='] = $search_date_end;
+	$options .= '&amp;date_endmonth=' . GETPOST('date_endmonth', 'int') . '&amp;date_endday=' . GETPOST('date_endday', 'int') . '&amp;date_endyear=' . GETPOST('date_endyear', 'int');
+}
+if (! empty($search_doc_type)) {
+	$filter['t.doc_type'] = $search_doc_type;
+	$options .= '&amp;search_doc_type=' . $search_doc_type;
+}
+if (! empty($search_doc_date)) {
+	$filter['t.doc_date'] = $search_doc_date;
+	$options .= '&amp;doc_datemonth=' . GETPOST('doc_datemonth', 'int') . '&amp;doc_dateday=' . GETPOST('doc_dateday', 'int') . '&amp;doc_dateyear=' . GETPOST('doc_dateyear', 'int');
+}
+if (! empty($search_doc_ref)) {
+	$filter['t.doc_ref'] = $search_doc_ref;
+	$options .= '&amp;search_doc_ref=' . $search_doc_ref;
+}
+if (! empty($search_numero_compte)) {
+	$filter['t.numero_compte'] = $search_numero_compte;
+	$options .= '&amp;search_numero_compte=' . $search_numero_compte;
+}
+if (! empty($search_numero_compte_start)) {
+	$filter['t.numero_compte>='] = $search_numero_compte_start;
+	$options .= '&amp;search_numero_compte_start=' . $search_numero_compte_start;
+}
+if (! empty($search_numero_compte_end)) {
+	$filter['t.numero_compte<='] = $search_numero_compte_end;
+	$options .= '&amp;search_numero_compte_end=' . $search_numero_compte_end;
+}
+if (! empty($search_subledger_account)) {
+	$filter['t.subledger_account'] = $search_subledger_account;
+	$options .= '&amp;search_subledger_account=' . $search_subledger_account;
+}
+if (! empty($search_subledger_account_start)) {
+	$filter['t.subledger_account>='] = $search_subledger_account_start;
+	$options .= '&amp;search_subledger_account_start=' . $search_subledger_account_start;
+}
+if (! empty($search_subledger_account_end)) {
+	$filter['t.subledger_account<='] = $search_subledger_account_end;
+	$options .= '&amp;search_subledger_account_end=' . $search_subledger_account_end;
+}
+if (! empty($search_label_operation)) {
+	$filter['t.label_operation'] = $search_label_operation;
+	$options .= '&amp;search_label_operation=' . $search_label_operation;
+}
+if (! empty($search_sens)) {
+	$filter['t.sens'] = $search_sens;
+	$options .= '&amp;search_sens=' . $search_sens;
+}
+if (! empty($search_code_journal)) {
+	$filter['t.code_journal'] = $search_code_journal;
+	$options .= '&amp;search_code_journal=' . $search_code_journal;
+}
+
+
+/*
+ * Actions
+ */
+
+llxHeader('', $langs->trans("Bookkeeping"));
+
+$nbtotalofrecords = '';
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
+	$nbtotalofrecords = $object->fetchAll($sortorder, $sortfield, 0, 0);
+	if ($nbtotalofrecords < 0) {
+		setEventMessages($object->error, $object->errors, 'errors');
+	}
+}
+
+$result = $object->fetchAll($sortorder, $sortfield, $limit, $offset, $filter);
+if ($result < 0) {
+	setEventMessages($object->error, $object->errors, 'errors');
+}
+
+print_barre_liste($langs->trans("Bookkeeping") . ' ' . dol_print_date($search_date_start) . '-' . dol_print_date($search_date_end), $page, $_SERVER['PHP_SELF'], $options, $sortfield, $sortorder, '', $result, $nbtotalofrecords, 'title_accountancy');
+
+print '<form method="GET" id="searchFormList" action="' . $_SERVER["PHP_SELF"] . '">';
+print '<div class="liste_titre">';
+print $langs->trans('DateStart') . ': ';
+print $form->select_date($search_date_start, 'date_start');
+print $langs->trans('DateEnd') . ': ';
+print $form->select_date($search_date_end, 'date_end');
+print '</div>';
+print '<div class="liste_titre">';
+print $langs->trans('From') . ' ' . $langs->trans('AccountAccounting') . ': ';
+print $formaccounting->select_account($search_numero_compte_start, 'search_numero_compte_start', 1, array (), 1, 1, '');
+print $langs->trans('To') . ' ' . $langs->trans('AccountAccounting') . ': ';
+print $formaccounting->select_account($search_numero_compte_end, 'search_numero_compte_end', 1, array (), 1, 1, '');
+print '</div>';
+print '<div class="liste_titre">';
+print $langs->trans('From') . ' ' . $langs->trans('ThirdPartyAccount') . ': ';
+print $formaccounting->select_auxaccount($search_subledger_account_start, 'search_subledger_account_start', 1);
+print $langs->trans('To') . ' ' . $langs->trans('ThirdPartyAccount') . ': ';
+print $formaccounting->select_auxaccount($search_subledger_account_end, 'search_subledger_account_end', 1);
+print '</div>';
+print "<table class=\"noborder\" width=\"100%\">";
+
+print '<tr class="liste_titre">';
+print_liste_field_titre("NumPiece", $_SERVER['PHP_SELF'], "t.piece_num", "", $options, "", $sortfield, $sortorder);
+print_liste_field_titre("Doctype", $_SERVER['PHP_SELF'], "t.doc_type", "", $options, "", $sortfield, $sortorder);
+print_liste_field_titre("Date", $_SERVER['PHP_SELF'], "t.doc_date", "", $options, 'align="center"', $sortfield, $sortorder);
+print_liste_field_titre("Docref", $_SERVER['PHP_SELF'], "t.doc_ref", "", $options, "", $sortfield, $sortorder);
+print_liste_field_titre("AccountAccounting", $_SERVER['PHP_SELF'], "t.numero_compte", "", $options, "", $sortfield, $sortorder);
+print_liste_field_titre("ThirdPartyAccount", $_SERVER['PHP_SELF'], "t.subledger_account", "", $options, "", $sortfield, $sortorder);
+print_liste_field_titre("Label", $_SERVER['PHP_SELF'], "t.label_operation", "", $options, "", $sortfield, $sortorder);
+print_liste_field_titre("Debit", $_SERVER['PHP_SELF'], "t.debit", "", $options, "", $sortfield, $sortorder);
+print_liste_field_titre("Credit", $_SERVER['PHP_SELF'], "t.credit", "", $options, 'align="center"', $sortfield, $sortorder);
+print_liste_field_titre("Amount", $_SERVER['PHP_SELF'], "t.montant", "", $options, 'align="center"', $sortfield, $sortorder);
+print_liste_field_titre("Sens", $_SERVER['PHP_SELF'], "t.sens", "", $options, 'align="center"', $sortfield, $sortorder);
+print_liste_field_titre("Codejournal", $_SERVER['PHP_SELF'], "t.code_journal", "", $options, 'align="center"', $sortfield, $sortorder);
+print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", $options, "", 'width="60" align="center"', $sortfield, $sortorder);
+print "</tr>\n";
+
+print '<tr class="liste_titre">';
+print '<td class="liste_titre">';
+print '<input type="text" size=4 class="flat" name="search_piece_num" value="' . $search_piece_num . '"/>';
+print '</td>';
+
+print '<td class="liste_titre">';
+print '<input type="text" size=7 class="flat" name="search_doc_type" value="' . $search_doc_type . '"/>';
+print '</td>';
+
+print '<td class="liste_titre">';
+print $form->select_date($search_doc_date, 'doc_date', 0, 0, 1);
+print '</td>';
+
+print '<td class="liste_titre">';
+print '<input type="text" size=6 class="flat" name="search_doc_ref" value="' . $search_doc_ref . '"/>';
+print '</td>';
+
+print '<td class="liste_titre">';
+print '<input type="text" size=6 class="flat" name="search_numero_compte" value="' . $search_numero_compte . '"/>';
+print '</td>';
+
+print '<td class="liste_titre">';
+print '<input type="text" size=6 class="flat" name="search_subledger_account" value="' . $search_subledger_account . '"/>';
+print '</td>';
+
+print '<td class="liste_titre">';
+print '<input type="text" size=6 class="flat" name="search_label_operation" value="' . $search_label_operation . '"/>';
+print '</td>';
+
+print '<td class="liste_titre">';
+print '</td>';
+
+print '<td class="liste_titre">';
+print '</td>';
+
+print '<td class="liste_titre">';
+print '</td>';
+
+print '<td class="liste_titre" align="center">';
+print '<input type="text" size=2 class="flat" name="search_sens" value="' . $search_sens . '"/>';
+print '</td>';
+
+print '<td class="liste_titre" align="center">';
+print '<input type="text" size=3 class="flat" name="search_code_journal" value="' . $search_code_journal . '"/>';
+print '</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";
+
+foreach ( $object->lines as $line ) {
+
+	print '<tr class="oddeven">';
+	print '<td>' . $line->piece_num . '</td>' . "\n";
+	print '<td>' . $line->doc_type . '</td>' . "\n";
+	print '<td align="center">' . dol_print_date($line->doc_date) . '</td>';
+	print '<td>' . $line->doc_ref . '</td>';
+	print '<td>' . length_accountg($line->numero_compte) . '</td>';
+	print '<td>' . length_accounta($line->subledger_account) . '</td>';
+	print '<td>' . $line->label_operation . '</td>';
+	print '<td align="right">' . price($line->debit) . '</td>';
+	print '<td align="right">' . price($line->credit) . '</td>';
+	print '<td align="right">' . price($line->montant) . '</td>';
+	print '<td align="center">' . $line->sens . '</td>';
+	print '<td align="right">' . $line->code_journal . '</td>';
+	print '<td align="center"><a href="./card.php?action=update&amp;piece_num=' . $line->piece_num . '">' . img_edit() . '</a></td>';
+	print "</tr>\n";
+}
+print "</table>";
+print '</form>';
+
+llxFooter();
+$db->close();
--- a/htdocs/accountancy/bookkeeping/thirdparty_lettrage.php
+++ b/htdocs/accountancy/bookkeeping/thirdparty_lettrage.php
@@ -21,10 +21,11 @@
 */

 /**
- * \file accounting/bookkeeping/thirdparty_lettrage.php
- * \ingroup Advanced accountancy
- * \brief Onglet de gestion de parametrages des ventilations
+ * \file    accounting/bookkeeping/thirdparty_lettrage.php
+ * \ingroup Accounting Expert
+ * \brief   Onglet de gestion de parametrages des ventilations
 */
+
 require '../../main.inc.php';

 require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
@@ -33,286 +34,296 @@ require_once DOL_DOCUMENT_ROOT . '/accountancy/class/lettering.class.php';
 require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';

-$action = GETPOST('action', 'aZ09');
-$massaction = GETPOST('massaction', 'alpha');
-$show_files = GETPOST('show_files', 'int');
-$confirm = GETPOST('confirm', 'alpha');
+$action=GETPOST('action','aZ09');
+$massaction=GETPOST('massaction','alpha');
+$show_files=GETPOST('show_files','int');
+$confirm=GETPOST('confirm','alpha');
 $toselect = GETPOST('toselect', 'array');

-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
-$page = GETPOST("page", 'int');
-if (empty($page) || $page == - 1) {
-	$page = 0;
-} // If $page is not defined, or '' or -1
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
+$sortfield = GETPOST("sortfield",'alpha');
+$sortorder = GETPOST("sortorder",'alpha');
+$page = GETPOST("page",'int');
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if ($sortorder == "")
-	$sortorder = "DESC";
-if ($sortfield == "")
-	$sortfield = "bk.doc_date";
+if ($sortorder == "") $sortorder = "ASC";
+if ($sortfield == "") $sortfield = "bk.rowid";

-$search_year = GETPOST("search_year", 'int');
-$search_doc_type = GETPOST("search_doc_type", 'alpha');
-$search_doc_ref = GETPOST("search_doc_ref", 'alpha');
-
-$lettering = GETPOST('lettering');
-if (! empty($lettering)) {
-	$action = $lettering;
-}
-$toselect = GETPOST('toselect', 'array');
-
-// Did we click on purge search criteria ?
-// All tests are required to be compatible with all browsers
-if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
-	$search_year = '';
-	$search_doc_type = '';
-	$search_doc_ref = '';
-}
+$search_year = GETPOST ( "search_year" );

 // Security check
-$socid = GETPOST("socid", 'int');
+$socid = GETPOST("socid",'int');
 // if ($user->societe_id) $socid=$user->societe_id;

 $object = new Societe($db);
 $object->id = $socid;
-$result = $object->fetch($socid);
-if ($result < 0) {
-	setEventMessage($object->error, 'errors');
-}
+$object->fetch($socid);
+

 $form = new Form($db);
 $BookKeeping = new lettering($db);
 $formaccounting = new FormAccounting($db);

+
 /*
 * Action
 */

 if ($action == 'lettering') {

-	$result = $BookKeeping->updateLettrage($toselect);
+	$result =  $BookKeeping->updatelettrage($_POST['ids']);
+
+// 	var_dump($result);
+	if( $result < 0 ){
+		setEventMessages('', $BookKeeping->errors, 'errors' );
+		$error++;

-	if ($result < 0) {
-		setEventMessages('', $BookKeeping->errors, 'errors');
-		$error ++;
 	}
 }

 if ($action == 'autolettrage') {

-	$result = $BookKeeping->lettrageTiers($socid);
+	$result = $BookKeeping->LettrageTiers($socid);
+
+	if( $result < 0 ){
+							setEventMessages('', $BookKeeping->errors, 'errors' );
+							$error++;
+
+						}

-	if ($result < 0) {
-		setEventMessages('', $BookKeeping->errors, 'errors');
-		$error ++;
-	}
 }

-llxHeader('', 'Compta - Grand Livre');

-/*
- * Affichage onglets
- */
-$head = societe_prepare_head($object);
+llxHeader ( '', 'Compta - Grand Livre' );

-dol_htmloutput_mesg(is_numeric($error) ? '' : $error, $errors, 'error');

-dol_fiche_head($head, 'accounting', $langs->trans("ThirdParty"), 0, 'company');
+	/*
+	 * Affichage onglets
+	 */
+	$head = societe_prepare_head($object);

-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>';
+	dol_htmloutput_mesg(is_numeric($error)?'':$error, $errors, 'error');

-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>';
-}
+	dol_fiche_head($head, 'TabAccounting', $langs->trans("ThirdParty"),0,'company');

-print '<tr>';
-print '<td class="nowrap">' . $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>';
-print '</tr>';

-$langs->load('compta');
-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><td colspan="3">' . $object->zip . (($object->zip && $object->town) ? ' / ' : '') . $object->town . '</td>';
-print '</tr>';
+	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>';

-// Country
-print '<tr><td>' . $langs->trans("Country") . '</td><td colspan="3">';
-// $img=picto_from_langcode($object->country_code);
-$img = '';
-if ($object->isInEEC())
-	print $form->textwithpicto(($img ? $img . ' ' : '') . $object->country, $langs->trans("CountryIsInEEC"), 1, 0);
-else
-	print ($img ? $img . ' ' : '') . $object->country;
-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>';
+    }

-print '</table>';

-$sql = "SELECT bk.rowid, bk.doc_date, bk.doc_type, bk.doc_ref, ";
-$sql .= " bk.subledger_account, bk.numero_compte , bk.label_compte, bk.debit, ";
-$sql .= " bk.credit, bk.montant , bk.sens , bk.code_journal , bk.piece_num, bk.lettering_code ";
-$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as bk";
-$sql .= " WHERE (bk.subledger_account =  '" . $object->code_compta . "' AND bk.numero_compte = '" . $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER . "' )";
+		print '<tr>';
+        print '<td class="nowrap">'.$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>';
+        print '</tr>';

-if (dol_strlen($search_year)) {
-	$date_start = dol_mktime(0, 0, 0, 1, 1, $search_year);
-	$date_end = dol_mktime(23, 59, 59, 12, 31, $search_year);
-	$sql .= " AND ( bk.doc_date BETWEEN  '" . $db->idate($date_start) . "' AND  '" . $db->idate($date_end) . "' )";
-}
+		$langs->load('compta');
+        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>';

-$sql .= $db->order($sortfield, $sortorder);

-$debit = 0;
-$credit = 0;
-$solde = 0;
-// Count total nb of records and calc total sum
-$nbtotalofrecords = '';
-$resql = $db->query($sql);
-if (! $resql) {
-	dol_print_error($db);
-	exit();
-}
-$nbtotalofrecords = $db->num_rows($resql);
+	// 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>';

-while ( $obj = $db->fetch_object($resql) ) {
-	$debit += $obj->debit;
-	$credit += $obj->credit;
-
-	$solde += ($obj->credit - $obj->debit);
-}
-
-$sql .= $db->plimit($limit + 1, $offset);
-
-dol_syslog("/accountancy/bookkeeping/thirdparty_lettrage.php", LOG_DEBUG);
-$resql = $db->query($sql);
-if (! $resql) {
-	dol_print_error($db);
-	exit();
-}
-
-$num = $db->num_rows($resql);
-
-dol_syslog("/accountancy/bookkeeping/thirdparty_lettrage.php", LOG_DEBUG);
-if ($resql) {
-	$i = 0;
-
-	print '<form name="add" action="' . $_SERVER["PHP_SELF"] . '?socid=' . $object->id . '" method="POST">';
-	print '<input type="hidden" name="socid" value="' . $object->id . '">';
-
-	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_companies', 0, '', '', $limit);
-
-	print "<table class=\"noborder\" width=\"100%\">";
-	print '<tr class="liste_titre">';
-	print_liste_field_titre("Doctype", $_SERVER["PHP_SELF"], "bk.doc_type", "", $param, "", $sortfield, $sortorder);
-	print_liste_field_titre("Docdate", $_SERVER["PHP_SELF"], "bk.doc_date", "", $param, "", $sortfield, $sortorder);
-	print_liste_field_titre("Docref", $_SERVER["PHP_SELF"], "bk.doc_ref", "", $param, "", $sortfield, $sortorder);
-	print_liste_field_titre("Labelcompte", $_SERVER["PHP_SELF"], "bk.label_compte", "", $param, "", $sortfield, $sortorder);
-	print_liste_field_titre("Debit", $_SERVER["PHP_SELF"], "bk.debit", "", $param, "", $sortfield, $sortorder);
-	print_liste_field_titre("Credit", $_SERVER["PHP_SELF"], "bk.credit", "", $param, "", $sortfield, $sortorder);
-	print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "bk.montant", "", $param, "", $sortfield, $sortorder);
-	print_liste_field_titre("Sens", $_SERVER["PHP_SELF"], "bk.sens", "", $param, "", $sortfield, $sortorder);
-	print_liste_field_titre("Codejournal", $_SERVER["PHP_SELF"], "bk.code_journal", "", $param, "", $sortfield, $sortorder);
-	print_liste_field_titre("Solde", $_SERVER["PHP_SELF"], "", "", $param, "", $sortfield, $sortorder);
-	print '<td></td>';
-	print "</tr>\n";
-
-	print '<tr class="liste_titre">';
-	print '<td><input type="text" name="search_doc_type" value="' . $search_doc_type . '"></td>';
-	print '<td><input type="text" name="search_year" value="' . $search_year . '"></td>';
-	print '<td><input type="text" name="search_doc_refe" value="' . $search_doc_ref . '"></td>';
-	print '<td colspan="7">&nbsp;</td>';
-	print '<td align="right">';
-	$searchpicto = $form->showFilterButtons();
-	print $searchpicto;
-	print '</td>';
+	// 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>';

-	$var = false;
-	$solde = 0;
-	$tmp = '';
-	while ( $obj = $db->fetch_object($resql) ) {
+	// Country
+	print '<tr><td>'.$langs->trans("Country").'</td><td colspan="3">';
+	//$img=picto_from_langcode($object->country_code);
+	$img='';
+	if ($object->isInEEC()) print $form->textwithpicto(($img?$img.' ':'').$object->country,$langs->trans("CountryIsInEEC"),1,0);
+	else print ($img?$img.' ':'').$object->country;
+	print '</td></tr>';

-		if ($tmp != $obj->lettering_code || empty($tmp))
-			$tmp = $obj->lettering_code;
+	print '</table>';

-		if ($tmp != $obj->lettering_code || empty($obj->lettering_code))
-			$var = ! $var;

-		$solde += ($obj->credit - $obj->debit);

-		print "<tr $bc[$var]>";

-		if (empty($obj->lettering_code)) {
-			print '<td><a href="' . dol_buildpath('/accountancy/bookkeeping/card.php', 1) . '?piece_num=' . $obj->piece_num . '">';
-			print img_edit();
-			print '</a>&nbsp;' . $obj->doc_type . '</td>' . "\n";
-		} else
-			print '<td>' . $obj->doc_type . '</td>' . "\n";

-		print '<td>' . dol_print_date($db->jdate($obj->doc_date), 'day') . '</td>';
-		print '<td>' . $obj->doc_ref . '</td>';
-		print '<td>' . $obj->label_compte . '</td>';
-		print '<td>' . price($obj->debit) . '</td>';
-		print '<td>' . price($obj->credit) . '</td>';
-		print '<td>' . price($obj->montant) . '</td>';
-		print '<td>' . $obj->sens . '</td>';
-		print '<td>' . $obj->code_journal . '</td>';
-		print '<td>' . round($solde, 2) . '</td>';
+	$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, bk.lettering_code ";
+	$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as bk";
+	$sql .= " WHERE (bk.code_tiers =  '" . $object->code_compta . "' AND bk.numero_compte = '" .$conf->global->ACCOUNTING_ACCOUNT_CUSTOMER. "' )" ;

-		if (empty($obj->lettering_code)) {
-			print '<td class="nowrap" align="center"><input type="checkbox" class="flat checkforselect" name="toselect[]" id="toselect[]" value="' . $obj->rowid . '" /></td>';
-		} else
-			print '<td>' . $obj->lettering_code . '</td>';

-		print "</tr>\n";
+
+	if (dol_strlen ( $search_year  )) {
+		$sql .= " AND ( bk.doc_date BETWEEN  '" . $search_year . "-0-0' AND  '" . ($search_year+1). "-0-0' )";
 	}

-	print '<tr class="oddeven">';

-	print '<td colspan="4">Mouvement totaux</td>' . "\n";
-	print '<td><strong>' . price($debit) . '</strong></td>';
-	print '<td><strong>' . price($credit) . '</strong></td>';
-	print '<td colspan="5"></td>';
-	print "</tr>\n";
+	$sql .= " ORDER BY bk.lettering_code ASC, bk.doc_date ASC" ;//. $db->plimit ( $conf->liste_limit + 1, $offset );

-	print "<tr $bc[$var]>";
-	print '<td colspan="9">Solde Comptable</td>' . "\n";
-	print '<td><strong>' . price($credit - $debit) . '</strong></td>';
-	print '<td colspan="5"></td>';
-	print "</tr>\n";
+// 	echo $sql;
+// 	dol_syslog ( "bookkeping:liste:create sql=" . $sql, LOG_DEBUG );
+	$resql = $db->query ( $sql );
+	if ($resql) {
+		$num = $db->num_rows ( $resql );
+		$i = 0;

-	print "</table>";

-	print '<input class="butAction" type="submit" value="lettering" name="lettering" id="lettering">';
-	print '<a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?socid=' . $object->id . '&action=autolettrage">' . $langs->trans('AccountancyAutoLettering') . '</a>';
-	print "</form>";
-	$db->free($resql);
-} else {
-	dol_print_error($db);
-}
+		print '<form name="add" action="?socid='.$object->id.'" method="POST">';
+		print '<input type="hidden" name="action" value="lettering">';
+		print '<input type="hidden" name="socid" value="'.$object->id.'">';
+
+		print "<table class=\"noborder\" width=\"100%\">";
+		print '<tr class="liste_titre">';
+			print '<td></td>';
+		print_liste_field_titre("Doctype", "liste.php", "bk.doc_type" );
+		print_liste_field_titre("Docdate", "liste.php", "bk.doc_date" );
+		print_liste_field_titre("Docref", "liste.php", "bk.doc_ref" );
+// 		print_liste_field_titre("Numerocompte", "liste.php", "bk.numero_compte" );
+// 		print_liste_field_titre("Code_tiers", "liste.php", "bk.code_tiers" );
+		print_liste_field_titre("Labelcompte", "liste.php", "bk_label_compte" );
+		print_liste_field_titre("Debit", "liste.php", "bk.debit" );
+		print_liste_field_titre("Credit", "liste.php", "bk.credit" );
+//		print_liste_field_titre("Amount", "liste.php", "bk.montant" );
+//		print_liste_field_titre("Sens", "liste.php", "bk.sens" );
+		print_liste_field_titre("Codejournal", "liste.php", "bk.code_journal" );
+		print '<td></td>';
+		print '<td></td>';
+		print "</tr>\n";
+
+		print '<tr class="liste_titre">';
+		print '<form action="" method="GET">';
+		print '<input type="hidden" name="socid" value="' . $_GET ["socid"] . '">';
+		print '<td><input type="text" name="search_doc_type" value="' . $_GET ["search_doc_type"] . '"></td>';
+		print '<td><input type="text" name="search_year" value="' . $_GET ["search_year"] . '"></td>';
+		print '<td><input type="text" name="search_doc_refe" value="' . $_GET ["search_doc_ref"] . '"></td>';
+// 		print '<td><input type="text" name="search_compte" value="' . $_GET ["search_compte"] . '"></td>';
+// 		print '<td><input type="text" name="search_tiers" value="' . $_GET ["search_tiers"] . '"></td>';
+		print '<td>&nbsp;</td>';
+		print '<td>&nbsp;</td>';
+		print '<td>&nbsp;</td>';
+//		print '<td>&nbsp;</td>';
+//		print '<td>&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" value="' . dol_escape_htmltag ( $langs->trans ( "Search" ) ) . '" title="' . dol_escape_htmltag ( $langs->trans ( "Search" ) ) . '">';
+		print '</td>';
+		print '<td>&nbsp;</td>';
+		print '<td>&nbsp;</td>';
+		print '<td>&nbsp;</td>';
+		print '</form>';
+		print '</tr>';
+
+		$var = false;
+
+		$debit = 0;
+		$credit = 0;
+		$solde = 0;
+		$tmp = '';
+		while ( $i < $num ) {
+			$obj = $db->fetch_object ( $resql );
+
+			if($tmp !=$obj->lettering_code || empty($tmp) )
+				$tmp =$obj->lettering_code;
+
+			if($tmp !=$obj->lettering_code || empty($obj->lettering_code))
+				$var = ! $var;
+
+
+			$debit+= $obj->debit;
+			$credit+= $obj->credit;
+
+			$solde+=($obj->credit-$obj->debit);
+			print "<tr $bc[$var]>";
+
+			print '<td>' . $obj->rowid . '</td>';
+			if(empty($obj->lettering_code)){
+				print '<td><a href="'.dol_buildpath('/accountancy/bookkeeping/card.php', 1).'?piece_num=' . $obj->piece_num . '">';
+				print img_edit ();
+				print '</a>&nbsp;' . $obj->doc_type . '</td>' . "\n";
+			}
+			else
+				print '<td>'.$obj->doc_type . '</td>' . "\n";
+
+
+
+			print '<td>' . dol_print_date ( $db->jdate ( $obj->doc_date ), 'day' ) . '</td>';
+			print '<td>' . $obj->doc_ref . '</td>';
+// 			print '<td>' . $obj->numero_compte . '</td>';
+// 			print '<td>' . $obj->code_tiers . '</td>';
+			print '<td>' . $obj->label_compte . '</td>';
+			print '<td>' . $obj->debit . '</td>';
+			print '<td>' . $obj->credit . '</td>';
+//			print '<td>' . $obj->montant . '</td>';
+//			print '<td>' . $obj->sens . '</td>';
+			print '<td>' . $obj->code_journal . '</td>';
+			print '<td>' . round($solde, 2) . '</td>';
+
+			if(empty($obj->lettering_code)){
+				print '<td><input type="checkbox" name="ids[]" value="' . $obj->rowid . '" /></td>';
+			}
+			else
+				print '<td>' . $obj->lettering_code . '</td>';
+
+			print "</tr>\n";
+
+			$i ++;
+
+
+
+
+		}
+
+			print '<tr class="oddeven">';
+
+			print '<td colspan="4">Mouvement totaux</td>' . "\n";
+			print '<td></td>';
+	//		print '<td></td>';
+	//		print '<td></td>';
+			print '<td><strong>' . $debit . '</strong></td>';
+			print '<td><strong>' . $credit . '</strong></td>';
+			print '<td></td>';
+			print '<td></td>';
+			print '<td></td>';
+			print '<td>&nbsp;</td>';
+			print "</tr>\n";
+
+			print "<tr $bc[$var]>";
+			print '<td colspan="5">Solde Comptable</td>' . "\n";
+	//		print '<td></td>';
+	//		print '<td></td>';
+			print '<td></td>';
+			print '<td><strong>' . ($credit-$debit) . '</strong></td>';
+			print '<td></td>';
+			print '<td></td>';
+			print '<td></td>';
+			print '<td>&nbsp;</td>';
+			print "</tr>\n";
+
+		print "</table>";
+
+		print '<input class="butAction" type="submit" value="lettering">';
+		print '<a class="butAction" href="?socid='.$object->id.'&action=autolettrage">auto lettering</a>';
+		print "</form>";
+		$db->free($resql);
+	} else {
+		dol_print_error($db);
+	}
+

 // End of page
 llxFooter();
--- a/htdocs/accountancy/bookkeeping/thirdparty_lettrage_supplier.php
+++ b/htdocs/accountancy/bookkeeping/thirdparty_lettrage_supplier.php
@@ -21,9 +21,9 @@
 */

 /**
- * \file accounting/bookkeeping/thirdparty_lettrage.php
- * \ingroup Advanced accountancy
- * \brief Tab to setup lettering
+ * \file    accounting/bookkeeping/thirdparty_lettrage.php
+ * \ingroup Accounting Expert
+ * \brief   Onglet de gestion de parametrages des ventilations
 */

 // Dolibarr environment
@@ -35,304 +35,300 @@ require_once DOL_DOCUMENT_ROOT . '/accountancy/class/lettering.class.php';
 require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';

-$action = GETPOST('action', 'aZ09');
-$massaction = GETPOST('massaction', 'alpha');
-$show_files = GETPOST('show_files', 'int');
-$confirm = GETPOST('confirm', 'alpha');
+
+$action=GETPOST('action','aZ09');
+$massaction=GETPOST('massaction','alpha');
+$show_files=GETPOST('show_files','int');
+$confirm=GETPOST('confirm','alpha');
 $toselect = GETPOST('toselect', 'array');

-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
-$page = GETPOST("page", 'int');
-if (empty($page) || $page == - 1) {
-	$page = 0;
-} // If $page is not defined, or '' or -1
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
+$sortfield = GETPOST("sortfield",'alpha');
+$sortorder = GETPOST("sortorder",'alpha');
+$page = GETPOST("page",'int');
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if ($sortorder == "")
-	$sortorder = "DESC";
-if ($sortfield == "")
-	$sortfield = "bk.doc_date";
+if ($sortorder == "") $sortorder = "ASC";
+if ($sortfield == "") $sortfield = "bk.rowid";

-$search_year = GETPOST("search_year",'int');
-$search_doc_type = GETPOST("search_doc_type",'alpha');
-$search_doc_ref = GETPOST("search_doc_ref",'alpha');
-
-$lettering = GETPOST('lettering');
-if (!empty($lettering)) {
-	$action=$lettering;
-}
-$toselect = GETPOST('toselect','array');
-
-// Did we click on purge search criteria ?
-// All tests are required to be compatible with all browsers
-if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha'))
-{
-	$search_year='';
-	$search_doc_type='';
-	$search_doc_ref='';
-}
+$search_year = GETPOST ( "search_year" );


 // Security check
-$socid = GETPOST("socid", 'int');
+$socid = GETPOST("socid",'int');
 // if ($user->societe_id) $socid=$user->societe_id;

 $object = new Societe($db);
 $object->id = $socid;
-$result = $object->fetch($socid);
-if ($result<0) {
-	setEventMessage($object->error,'errors');
-}
+$object->fetch($socid);

 $form = new Form($db);
 $BookKeeping = new lettering($db);
 $formaccounting = new FormAccounting($db);

+
 /*
 * Action
 */
 if ($action == 'lettering') {

-	$result = $BookKeeping->updateLettrage($toselect);
+	$result =  $BookKeeping->updatelettrage($_POST['ids']);
+
+// 	var_dump($result);
+	if( $result < 0 ){
+		setEventMessages('', $BookKeeping->errors, 'errors' );
+		$error++;

-	// var_dump($result);
-	if ($result < 0) {
-		setEventMessages('', $BookKeeping->errors, 'errors');
-		$error ++;
 	}
 }

 if ($action == 'autolettrage') {

-	$result = $BookKeeping->lettrageTiers($socid);
+	$result = $BookKeeping->LettrageTiers($socid);
+
+	if( $result < 0 ){
+							setEventMessages('', $BookKeeping->errors, 'errors' );
+							$error++;
+
+						}

-	if ($result < 0) {
-		setEventMessages('', $BookKeeping->errors, 'errors');
-		$error ++;
-	}
 }

-$title = 'AccountancyLettrage';

-llxHeader('', $title);
+llxHeader ( '', 'Compta - Grand Livre' );


-$param='';
-if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
-if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
-if (!empty($search_year)) $param.='&search_year='.$search_year;
-if (!empty($socid)) $param.='&socid='.$socid;
-if (!empty($search_doc_type)) $param.='&search_doc_type='.$search_doc_type;
-if (!empty($search_doc_ref)) $param.='&search_doc_ref='.$search_doc_ref;
+	/*
+	 * Affichage onglets
+	 */
+	$head = societe_prepare_head($object);
+
+	dol_htmloutput_mesg(is_numeric($error)?'':$error, $errors, 'error');
+
+	dol_fiche_head($head, 'TabAccounting', $langs->trans("ThirdParty"),0,'company');


-/*
- * Affichage onglets
- */
-$head = societe_prepare_head($object);

-dol_htmloutput_mesg(is_numeric($error) ? '' : $error, $errors, 'error');

-dol_fiche_head($head, 'accounting_supplier', $langs->trans("ThirdParty"), 0, 'company');
+	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>';

-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 (! 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>';
-}

-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>';
+		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>';
+		$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>';
+	// 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>';

-// Country
-print '<tr><td>' . $langs->trans("Country") . '</td><td colspan="3">';
-// $img=picto_from_langcode($object->country_code);
-$img = '';
-if ($object->isInEEC())
-	print $form->textwithpicto(($img ? $img . ' ' : '') . $object->country, $langs->trans("CountryIsInEEC"), 1, 0);
-else
-	print ($img ? $img . ' ' : '') . $object->country;
-print '</td></tr>';
-
-print '</table>';
-
-$sql = "SELECT bk.rowid, bk.doc_date, bk.doc_type, bk.doc_ref, ";
-$sql .= " bk.subledger_account, bk.numero_compte , bk.label_compte, bk.debit, ";
-$sql .= " bk.credit, bk.montant , bk.sens , bk.code_journal , bk.piece_num, bk.lettering_code ";
-$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as bk";
-$sql .= " WHERE (bk.subledger_account =  '" . $object->code_compta_fournisseur . "' AND bk.numero_compte = '" . $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER . "' )";
-
-if (dol_strlen($search_year)) {
-	$date_start = dol_mktime(0, 0, 0, 1, 1, $search_year);
-	$date_end = dol_mktime(23, 59, 59, 12, 31, $search_year);
-	$sql .= " AND ( bk.doc_date BETWEEN  '".$db->idate($date_start)."' AND  '".$db->idate($date_end)."' )";
-}
-
-$sql.= $db->order($sortfield,$sortorder);
-
-$debit = 0;
-$credit = 0;
-$solde = 0;
-// Count total nb of records and calc total sum
-$nbtotalofrecords = '';
-$resql = $db->query($sql);
-if (! $resql)
-{
-	dol_print_error($db);
-	exit;
-}
-$nbtotalofrecords = $db->num_rows($resql);
-
-while ($obj = $db->fetch_object($resql)) {
-	$debit += $obj->debit;
-	$credit += $obj->credit;
-
-	$solde += ($obj->credit - $obj->debit);
-}
-
-$sql.= $db->plimit($limit+1, $offset);
-
-dol_syslog ( "/accountancy/bookkeeping/thirdparty_lettrage_supplier.php", LOG_DEBUG );
-$resql = $db->query($sql);
-if (! $resql)
-{
-		dol_print_error($db);
-		exit;
-}
-
-$num = $db->num_rows($resql);
-
-dol_syslog ( "/accountancy/bookkeeping/thirdparty_lettrage_supplier.php", LOG_DEBUG );
-$resql = $db->query($sql);
-if ($resql) {
-	$num = $db->num_rows($resql);
-	$i = 0;
-
-	print '<form name="add" action="'.$_SERVER["PHP_SELF"].'?socid=' . $object->id . '" method="POST">';
-	print '<input type="hidden" name="socid" value="' . $object->id . '">';
-
-	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_companies', 0, '', '', $limit);
-
-	print "<table class=\"noborder\" width=\"100%\">";
-	print '<tr class="liste_titre">';
-	print_liste_field_titre("Doctype", $_SERVER["PHP_SELF"], "bk.doc_type","",$param,"",$sortfield,$sortorder);
-	print_liste_field_titre("Docdate", $_SERVER["PHP_SELF"], "bk.doc_date","",$param,"",$sortfield,$sortorder);
-	print_liste_field_titre("Docref", $_SERVER["PHP_SELF"], "bk.doc_ref","",$param,"",$sortfield,$sortorder);
-	print_liste_field_titre("Labelcompte", $_SERVER["PHP_SELF"], "bk.label_compte","",$param,"",$sortfield,$sortorder);
-	print_liste_field_titre("Debit", $_SERVER["PHP_SELF"], "bk.debit","",$param,"",$sortfield,$sortorder);
-	print_liste_field_titre("Credit", $_SERVER["PHP_SELF"], "bk.credit","",$param,"",$sortfield,$sortorder);
-	print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "bk.montant","",$param,"",$sortfield,$sortorder);
-	print_liste_field_titre("Sens", $_SERVER["PHP_SELF"], "bk.sens","",$param,"",$sortfield,$sortorder);
-	print_liste_field_titre("Codejournal", $_SERVER["PHP_SELF"], "bk.code_journal","",$param,"",$sortfield,$sortorder);
-	print_liste_field_titre("Solde", $_SERVER["PHP_SELF"], "","",$param,"",$sortfield,$sortorder);
-	print '<td></td>';
-	print "</tr>\n";
-
-	print '<tr class="liste_titre">';
-	print '<td><input type="text" name="search_doc_type" value="' . $search_doc_type . '"></td>';
-	print '<td><input type="text" name="search_year" value="' . $search_year . '"></td>';
-	print '<td><input type="text" name="search_doc_refe" value="' . $search_doc_ref . '"></td>';
-	print '<td colspan="7">&nbsp;</td>';
-	print '<td align="right">';
-	$searchpicto=$form->showFilterButtons();
-	print $searchpicto;
-	print '</td>';
+	// 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>';

-	$var = false;
-	$solde = 0;
-	$tmp = '';
-	while ($obj = $db->fetch_object($resql)) {
+	// Country
+	print '<tr><td>'.$langs->trans("Country").'</td><td colspan="3">';
+	//$img=picto_from_langcode($object->country_code);
+	$img='';
+	if ($object->isInEEC()) print $form->textwithpicto(($img?$img.' ':'').$object->country,$langs->trans("CountryIsInEEC"),1,0);
+	else print ($img?$img.' ':'').$object->country;
+	print '</td></tr>';

-		if ($tmp != $obj->lettering_code || empty($tmp))
-			$tmp = $obj->lettering_code;
+	print '</table>';

-			if ($tmp != $obj->lettering_code || empty($obj->lettering_code))
-			$var = ! $var;
+// 	print_r($soc);
+// exit;
+//   [code_compta] => 411DOUA
+//     [code_compta_fournisseur] => 401SUPPCODE

-		$solde += ($obj->credit - $obj->debit);
+/*
+ * Mode Liste
+ *
+ *
+ *
+ */

-		print "<tr $bc[$var]>";
+	$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, bk.lettering ";
+	$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as bk";
+	$sql .= " WHERE (bk.code_tiers =  '" . $object->code_compta_fournisseur . "' AND bk.numero_compte = '" .$conf->global->ACCOUNTING_ACCOUNT_SUPPLIER. "' )" ;

-		if (empty($obj->lettering_code)) {
-			print '<td><a href="' . dol_buildpath('/accountancy/bookkeeping/card.php', 1) . '?piece_num=' . $obj->piece_num . '">';
-			print img_edit();
-			print '</a>&nbsp;' . $obj->doc_type . '</td>' . "\n";
-		} else
-			print '<td>' . $obj->doc_type . '</td>' . "\n";

-		print '<td>' . dol_print_date($db->jdate($obj->doc_date), 'day') . '</td>';
-		print '<td>' . $obj->doc_ref . '</td>';
-		print '<td>' . $obj->label_compte . '</td>';
-		print '<td>' . price($obj->debit) . '</td>';
-		print '<td>' . price($obj->credit) . '</td>';
-		print '<td>' . price($obj->montant) . '</td>';
-		print '<td>' . $obj->sens . '</td>';
-		print '<td>' . $obj->code_journal . '</td>';
-		print '<td>' . round($solde, 2) . '</td>';

-		if (empty($obj->lettering_code)) {
-			print '<td class="nowrap" align="center"><input type="checkbox" class="flat checkforselect" name="toselect[]" id="toselect[]" value="' . $obj->rowid . '" /></td>';
-		} else
-			print '<td>' . $obj->lettering_code . '</td>';
-
-		print "</tr>\n";
+	if (dol_strlen ( $search_year  )) {
+		$sql .= " AND ( bk.doc_date BETWEEN  '" . $search_year . "-0-0' AND  '" . ($search_year+1). "-0-0' )";
 	}

-	print '<tr class="oddeven">';

-	print '<td colspan="4">Mouvement totaux</td>' . "\n";
-	print '<td><strong>' . price($debit) . '</strong></td>';
-	print '<td><strong>' . price($credit) . '</strong></td>';
-	print '<td colspan="5"></td>';
-	print "</tr>\n";
+	$sql .= " ORDER BY bk.lettering ASC, bk.doc_date ASC" ;//. $db->plimit ( $conf->liste_limit + 1, $offset );

-	print "<tr $bc[$var]>";
-	print '<td colspan="9">Solde Comptable</td>' . "\n";
-	print '<td><strong>' . price($credit - $debit) . '</strong></td>';
-	print '<td colspan="5"></td>';
-	print "</tr>\n";
+// 	echo $sql;
+// 	dol_syslog ( "bookkeping:liste:create sql=" . $sql, LOG_DEBUG );
+	$resql = $db->query ( $sql );
+	if ($resql) {
+		$num = $db->num_rows ( $resql );
+		$i = 0;

-	print "</table>";

-	print '<input class="butAction" type="submit" value="lettering" name="lettering" id="lettering">';
-	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?socid=' . $object->id . '&action=autolettrage">'.$langs->trans('AccountancyAutoLettering').'</a>';
-	print "</form>";
-	$db->free($resql);
-} else {
-	dol_print_error($db);
-}
+		print '<form name="add" action="?socid='.$object->id.'" method="POST">';
+		print '<input type="hidden" name="action" value="lettering">';
+		print '<input type="hidden" name="socid" value="'.$object->id.'">';
+
+		print "<table class=\"noborder\" width=\"100%\">";
+		print '<tr class="liste_titre">';
+			print '<td></td>';
+		print_liste_field_titre("Doctype", "liste.php", "bk.doc_type" );
+		print_liste_field_titre("Docdate", "liste.php", "bk.doc_date" );
+		print_liste_field_titre("Docref", "liste.php", "bk.doc_ref" );
+// 		print_liste_field_titre("Numerocompte", "liste.php", "bk.numero_compte" );
+// 		print_liste_field_titre("Code_tiers", "liste.php", "bk.code_tiers" );
+		print_liste_field_titre("Labelcompte", "liste.php", "bk_label_compte" );
+		print_liste_field_titre("Debit", "liste.php", "bk.debit" );
+		print_liste_field_titre("Credit", "liste.php", "bk.credit" );
+		print_liste_field_titre("Amount", "liste.php", "bk.montant" );
+		print_liste_field_titre("Sens", "liste.php", "bk.sens" );
+		print_liste_field_titre("Codejournal", "liste.php", "bk.code_journal" );
+		print '<td></td>';
+		print '<td></td>';
+		print "</tr>\n";
+
+		print '<tr class="liste_titre">';
+		print '<form action="" method="GET">';
+		print '<input type="hidden" name="socid" value="' . $_GET ["socid"] . '">';
+		print '<td><input type="text" name="search_doc_type" value="' . $_GET ["search_doc_type"] . '"></td>';
+		print '<td><input type="text" name="search_year" value="' . $_GET ["search_year"] . '"></td>';
+		print '<td><input type="text" name="search_doc_refe" value="' . $_GET ["search_doc_ref"] . '"></td>';
+// 		print '<td><input type="text" name="search_compte" value="' . $_GET ["search_compte"] . '"></td>';
+// 		print '<td><input type="text" name="search_tiers" value="' . $_GET ["search_tiers"] . '"></td>';
+		print '<td>&nbsp;</td>';
+		print '<td>&nbsp;</td>';
+		print '<td>&nbsp;</td>';
+		print '<td>&nbsp;</td>';
+		print '<td>&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" value="' . dol_escape_htmltag ( $langs->trans ( "Search" ) ) . '" title="' . dol_escape_htmltag ( $langs->trans ( "Search" ) ) . '">';
+		print '</td>';
+		print '<td>&nbsp;</td>';
+		print '<td>&nbsp;</td>';
+		print '<td>&nbsp;</td>';
+		print '</form>';
+		print '</tr>';
+
+		$var = false;
+
+		$debit = 0;
+		$credit = 0;
+		$solde = 0;
+		$tmp = '';
+		while ( $i < $num ) {
+			$obj = $db->fetch_object ( $resql );
+
+			if($tmp !=$obj->lettering || empty($tmp) )
+				$tmp =$obj->lettering;
+
+			if($tmp !=$obj->lettering || empty($obj->lettering))
+				$var = ! $var;
+
+
+			$debit+= $obj->debit;
+			$credit+= $obj->credit;
+
+			$solde+=($obj->credit-$obj->debit);
+			print "<tr $bc[$var]>";
+
+			print '<td>' . $obj->rowid . '</td>';
+			if(empty($obj->lettering)){
+				print '<td><a href="'.dol_buildpath('/accountancy/bookkeeping/card.php', 1).'?piece_num=' . $obj->piece_num . '">';
+				print img_edit ();
+				print '</a>&nbsp;' . $obj->doc_type . '</td>' . "\n";
+			}
+			else
+				print '<td>'.$obj->doc_type . '</td>' . "\n";
+
+
+
+			print '<td>' . dol_print_date ( $db->jdate ( $obj->doc_date ), 'day' ) . '</td>';
+			print '<td>' . $obj->doc_ref . '</td>';
+// 			print '<td>' . $obj->numero_compte . '</td>';
+// 			print '<td>' . $obj->code_tiers . '</td>';
+			print '<td>' . $obj->label_compte . '</td>';
+			print '<td>' . $obj->debit . '</td>';
+			print '<td>' . $obj->credit . '</td>';
+			print '<td>' . $obj->montant . '</td>';
+			print '<td>' . $obj->sens . '</td>';
+			print '<td>' . $obj->code_journal . '</td>';
+			print '<td>' . round($solde, 2) . '</td>';
+
+			if(empty($obj->lettering)){
+				print '<td><input type="checkbox" name="ids[]" value="' . $obj->rowid . '" /></td>';
+			}
+			else
+				print '<td>' . $obj->lettering . '</td>';
+
+			print "</tr>\n";
+
+			$i ++;
+		}
+
+			print '<tr class="oddeven">';
+
+			print '<td colspan="4">Mouvement totaux</td>' . "\n";
+			print '<td></td>';
+			print '<td></td>';
+			print '<td></td>';
+			print '<td><strong>' . $debit . '</strong></td>';
+			print '<td><strong>' . $credit . '</strong></td>';
+			print '<td></td>';
+			print '<td></td>';
+			print '<td></td>';
+			print '<td>&nbsp;</td>';
+			print "</tr>\n";
+
+			print "<tr $bc[$var]>";
+			print '<td colspan="5">Solde Comptable</td>' . "\n";
+			print '<td></td>';
+			print '<td></td>';
+			print '<td></td>';
+			print '<td><strong>' . ($credit-$debit) . '</strong></td>';
+			print '<td></td>';
+			print '<td></td>';
+			print '<td></td>';
+			print '<td>&nbsp;</td>';
+			print "</tr>\n";
+
+		print "</table>";
+
+		print '<input class="butAction" type="submit" value="lettering">';
+		print '<a class="butAction" href="?socid='.$object->id.'&action=autolettrage">auto lettering</a>';
+		print "</form>";
+		$db->free ( $resql );
+	} else {
+		dol_print_error ( $db );
+	}
+

 // End of page
 llxFooter();
--- a/htdocs/accountancy/class/accountancycategory.class.php
+++ b/htdocs/accountancy/class/accountancycategory.class.php
@@ -276,25 +276,31 @@ class AccountancyCategory
 	 *
 	 * @return array       Result in table
 	 */
-	public function getCatsCpts()
-	{
+	public function getCatsCpts() {
 		global $mysoc;
-
 		$sql = "";

-		if (empty($mysoc->country_id)) {
+		if (empty($mysoc->country_id) && empty($mysoc->country_code)) {
 			dol_print_error('', 'Call to select_accounting_account with mysoc country not yet defined');
 			exit();
 		}

-		$sql = "SELECT t.rowid, t.account_number, t.label as account_label, cat.code, cat.position, cat.label as name_cat, cat.sens ";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as t, " . MAIN_DB_PREFIX . "c_accounting_category as cat";
-		$sql .= " WHERE t.fk_accounting_category IN ( SELECT c.rowid ";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "c_accounting_category as c";
-		$sql .= " WHERE c.active = 1";
-		$sql .= " AND (c.fk_country = ".$mysoc->country_id." OR c.fk_country = 0)";
-		$sql .= " AND cat.rowid = t.fk_accounting_category";
-		$sql .= " ORDER BY cat.position ASC";
+		if (! empty($mysoc->country_id)) {
+			$sql = "SELECT t.rowid, t.account_number, t.label as name_cpt, cat.code, cat.position, cat.label as name_cat, cat.sens ";
+			$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as t, " . MAIN_DB_PREFIX . "c_accounting_category as cat";
+			$sql .= " WHERE t.fk_accounting_category IN ( SELECT c.rowid ";
+			$sql .= " FROM " . MAIN_DB_PREFIX . "c_accounting_category as c";
+			$sql .= " WHERE c.active = 1";
+			$sql .= " AND c.fk_country = " . $mysoc->country_id . ")";
+			$sql .= " AND cat.rowid = t.fk_accounting_category";
+			$sql .= " ORDER BY cat.position ASC";
+		} else {
+			$sql = "SELECT c.rowid, c.code, c.label, c.category_type ";
+			$sql .= " FROM " . MAIN_DB_PREFIX . "c_accounting_category as c, " . MAIN_DB_PREFIX . "c_country as co";
+			$sql .= " WHERE c.active = 1 AND c.fk_country = co.rowid";
+			$sql .= " AND co.code = '" . $mysoc->country_code . "'";
+			$sql .= " ORDER BY c.position ASC";
+		}

 		$resql = $this->db->query($sql);
 		if ($resql) {
@@ -310,7 +316,7 @@ class AccountancyCategory
 							'code' => $obj->code,
 							'position' => $obj->position,
 							'account_number' => $obj->account_number,
-							'account_label' => $obj->account_label,
+							'name_cpt' => $obj->name_cpt,
 							'sens' => $obj->sens
 					);
 					$i ++;
@@ -328,28 +334,22 @@ class AccountancyCategory
 	/**
 	 * Function to show result of an accounting account from the ledger with a direction and a period
 	 *
-	 * @param int 		$cpt 				Id accounting account
-	 * @param string 	$month 				Specifig month - Can be empty
-	 * @param string 	$date_start			Date start
-	 * @param string 	$date_end			Date end
-	 * @param int 		$sens 				Sens of the account:  0: credit - debit, 1: debit - credit
-	 * @param string	$thirdparty_code	Thirdparty code
-	 * @return integer 						Result in table
+	 * @param int $cpt Id accounting account
+	 * @param string $month Specifig month - Can be empty
+	 * @param string $year Specific year
+	 * @param int $sens Sens of the account 0: credit - debit 1: debit - credit
+	 *
+	 * @return integer Result in table
 	 */
-	public function getResult($cpt, $month, $date_start, $date_end, $sens, $thirdparty_code='nofilter')
-	{
+	public function getResult($cpt, $month, $year, $sens) {
 		$sql = "SELECT SUM(t.debit) as debit, SUM(t.credit) as credit";
 		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as t";
 		$sql .= " WHERE t.numero_compte = '" . $cpt."'";
-		if (! empty($date_start) && ! empty($date_end))
-			$sql.= " AND t.doc_date >= '".$this->db->idate($date_start)."' AND t.doc_date <= '".$this->db->idate($date_end)."'";
+		$sql .= " AND YEAR(t.doc_date) = " . $year;
+
 		if (! empty($month)) {
 			$sql .= " AND MONTH(t.doc_date) = " . $month;
 		}
-		if ($thirdparty_code != 'nofilter')
-		{
-			$sql .= " AND thirdparty_code = '".$this->db->escape($thirdparty_code)."'";
-		}

 		dol_syslog(__METHOD__ . " sql=" . $sql, LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -375,27 +375,84 @@ class AccountancyCategory
 	}

 	/**
-	 * Return list of personalized groups that are active
+	 * Function to call category from a specific country
 	 *
-	 * @param	int			$categorytype		-1=All, 0=Only non computed groups, 1=Only computed groups
-	 * @return	array							Array of groups
+	 * @return array Result in table
 	 */
-	public function getCats($categorytype=-1)
-	{
+	public function getCatsCal() {
 		global $db, $langs, $user, $mysoc;

-		if (empty($mysoc->country_id)) {
+		if (empty($mysoc->country_id) && empty($mysoc->country_code)) {
 			dol_print_error('', 'Call to select_accounting_account with mysoc country not yet defined');
 			exit();
 		}

-		$sql = "SELECT c.rowid, c.code, c.label, c.formula, c.position, c.category_type";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "c_accounting_category as c";
-		$sql .= " WHERE c.active = 1 ";
-		if ($categorytype >= 0) $sql.=" AND c.category_type = 1";
-		$sql .= " AND (c.fk_country = ".$mysoc->country_id." OR c.fk_country = 0)";
-		$sql .= " ORDER BY c.position ASC";
+		if (! empty($mysoc->country_id)) {
+			$sql = "SELECT c.rowid, c.code, c.label, c.formula, c.position";
+			$sql .= " FROM " . MAIN_DB_PREFIX . "c_accounting_category as c";
+			$sql .= " WHERE c.active = 1 AND c.category_type = 1 ";
+			$sql .= " AND c.fk_country = " . $mysoc->country_id;
+			$sql .= " ORDER BY c.position ASC";
+		} else {
+			$sql = "SELECT c.rowid, c.code, c.label, c.formula, c.position";
+			$sql .= " FROM " . MAIN_DB_PREFIX . "c_accounting_category as c, " . MAIN_DB_PREFIX . "c_country as co";
+			$sql .= " WHERE c.active = 1 AND c.category_type = 1 AND c.fk_country = co.rowid";
+			$sql .= " AND co.code = '" . $mysoc->country_code . "'";
+			$sql .= " ORDER BY c.position ASC";
+		}

+		dol_syslog(__METHOD__ . " sql=" . $sql, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$i = 0;
+			$obj = '';
+			$num = $this->db->num_rows($resql);
+			$data = array ();
+			if ($num) {
+				while ( $i < $num ) {
+					$obj = $this->db->fetch_object($resql);
+					$position = $obj->position;
+					$data[$position] = array (
+							'code' => $obj->code,
+							'label' => $obj->label,
+							'formula' => $obj->formula
+					);
+					$i ++;
+				}
+			}
+			return $data;
+		} else {
+			$this->error = "Error " . $this->db->lasterror();
+			$this->errors[] = $this->error;
+			dol_syslog(__METHOD__ . " " . implode(',', $this->errors), LOG_ERR);
+
+			return - 1;
+		}
+	}
+
+	public function getCats() {
+		global $db, $langs, $user, $mysoc;
+
+		if (empty($mysoc->country_id) && empty($mysoc->country_code)) {
+			dol_print_error('', 'Call to select_accounting_account with mysoc country not yet defined');
+			exit();
+		}
+
+		if (! empty($mysoc->country_id)) {
+			$sql = "SELECT c.rowid, c.code, c.label, c.formula, c.position, c.category_type";
+			$sql .= " FROM " . MAIN_DB_PREFIX . "c_accounting_category as c";
+			$sql .= " WHERE c.active = 1 ";
+			$sql .= " AND c.fk_country = " . $mysoc->country_id;
+			$sql .= " ORDER BY c.position ASC";
+		} else {
+			$sql = "SELECT c.rowid, c.code, c.label, c.formula, c.position, c.category_type";
+			$sql .= " FROM " . MAIN_DB_PREFIX . "c_accounting_category as c, " . MAIN_DB_PREFIX . "c_country as co";
+			$sql .= " WHERE c.active = 1 AND c.fk_country = co.rowid";
+			$sql .= " AND co.code = '" . $mysoc->country_code . "'";
+			$sql .= " ORDER BY c.position ASC";
+		}
+
+		dol_syslog(__METHOD__ . " sql=" . $sql, LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$i = 0;
@@ -409,12 +466,12 @@ class AccountancyCategory
 					$data[] = array (
 							'rowid' => $obj->rowid,
 							'code' => $obj->code,
+							'position' => $obj->position,
 							'label' => $obj->label,
 							'formula' => $obj->formula,
-							'position' => $obj->position,
 							'category_type' => $obj->category_type
 					);
-					$i++;
+					$i ++;
 				}
 			}
 			return $data;
@@ -430,19 +487,13 @@ class AccountancyCategory

 	// calcule

-	/* I try to replace this with dol_eval()
-
 	const PATTERN = '/(?:\-?\d+(?:\.?\d+)?[\+\-\*\/])+\-?\d+(?:\.?\d+)?/';

 	const PARENTHESIS_DEPTH = 10;

-	public function calculate($input)
-	{
-		global $langs;
-
+	public function calculate($input){
 		if(strpos($input, '+') != null || strpos($input, '-') != null || strpos($input, '/') != null || strpos($input, '*') != null){
 			//  Remove white spaces and invalid math chars
-			$input = str_replace($langs->trans("ThousandSeparator"), '', $input);
 			$input = str_replace(',', '.', $input);
 			$input = preg_replace('[^0-9\.\+\-\*\/\(\)]', '', $input);

@@ -484,41 +535,28 @@ class AccountancyCategory

 		return 0;
 	}
-	*/
-

 	/**
-	 * Get all accounting account of a group.
-	 * You must choose between first parameter (personalized group) or the second (free criteria filter)
+	 * get cpts of category
 	 *
-	 * @param 	int 	$cat_id 				Id if personalized accounting group/category
-	 * @param 	string 	$predefinedgroupwhere 	Sql criteria filter to select accounting accounts
-	 * @return 	array       					Array of accounting accounts
+	 * @param int $cat_id Id accounting account category
+	 *
+	 * @return array       Result in table
 	 */
-	public function getCptsCat($cat_id, $predefinedgroupwhere='')
-	{
+	public function getCptsCat($cat_id) {
 		global $mysoc;
-		$sql = '';
+		$sql = "";

 		if (empty($mysoc->country_id) && empty($mysoc->country_code)) {
 			dol_print_error('', 'Call to select_accounting_account with mysoc country not yet defined');
 			exit();
 		}

-		if (! empty($cat_id))
-		{
-			$sql = "SELECT t.rowid, t.account_number, t.label as account_label";
-			$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as t";
-			$sql .= " WHERE t.fk_accounting_category = ".$cat_id;
-			$sql .= " ORDER BY t.account_number";
-		}
-		else
-		{
-			$sql = "SELECT t.rowid, t.account_number, t.label as account_label";
-			$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as t";
-			$sql .= " WHERE ".$predefinedgroupwhere;
-			$sql .= " ORDER BY t.account_number";
-		}
+		$sql = "SELECT t.rowid, t.account_number, t.label as name_cpt";
+		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as t";
+		$sql .= " WHERE t.fk_accounting_category = ".$cat_id;
+		$sql .= " ORDER BY t.account_number ";
+
 		//echo $sql;

 		$resql = $this->db->query($sql);
@@ -526,15 +564,14 @@ class AccountancyCategory
 			$i = 0;
 			$obj = '';
 			$num = $this->db->num_rows($resql);
-			$data = array();
+			$data = array ();
 			if ($num) {
-				while ($obj = $this->db->fetch_object($resql))
-				{
+				while ( $obj = $this->db->fetch_object($resql) ) {
 					$name_cat = $obj->name_cat;
 					$data[] = array (
 							'id' => $obj->rowid,
 							'account_number' => $obj->account_number,
-							'account_label' => $obj->account_label,
+							'name_cpt' => $obj->name_cpt,
 					);
 					$i ++;
 				}
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -6,10 +6,6 @@
 * Copyright (C) 2015		Raphaël Doursenaud	<rdoursenaud@gpcsolutions.fr>
 * Copyright (C) 2016		Pierre-Henry Favre	<phf@atm-consulting.fr>
 * Copyright (C) 2016-2017	Alexandre Spangaro	<aspangaro@zendsi.com>
- * Copyright (C) 2013-2017  Olivier Geffroy		<jeff@jeffinfo.com>
- * Copyright (C) 2017       Elarifr. Ari Elbaz	<github@accedinfo.com>
- * Copyright (C) 2017		Frédéric France     <frederic.france@netlogic.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
@@ -44,7 +40,7 @@ class AccountancyExport
 	/**
 	 * @var Type of export. Defined by $conf->global->ACCOUNTING_EXPORT_MODELCSV
 	 */
-	public static $EXPORT_TYPE_NORMAL = 1;	 // Classic CSV
+	public static $EXPORT_TYPE_NORMAL = 1;     // Classic CSV
 	public static $EXPORT_TYPE_CEGID = 2;
 	public static $EXPORT_TYPE_COALA = 3;
 	public static $EXPORT_TYPE_BOB50 = 4;
@@ -53,7 +49,6 @@ class AccountancyExport
 	public static $EXPORT_TYPE_EBP = 7;
 	public static $EXPORT_TYPE_COGILOG = 8;
 	public static $EXPORT_TYPE_AGIRIS = 9;
-	public static $EXPORT_TYPE_CONFIGURABLE = 10;

 	/**
 	 *
@@ -83,11 +78,11 @@ class AccountancyExport

 		$this->db = &$db;
 		$this->separator = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV;
-		$this->end_line = empty($conf->global->ACCOUNTING_EXPORT_ENDLINE)?"\n":($conf->global->ACCOUNTING_EXPORT_ENDLINE==1?"\n":"\r\n");
+		$this->end_line = "\n";
 	}

 	/**
-	 * Array with all export type available (key + label)
+	 * Array wit all export type available (key + label)
 	 *
 	 * @return array of type
 	 */
@@ -103,70 +98,7 @@ class AccountancyExport
 				self::$EXPORT_TYPE_QUADRATUS => $langs->trans('Modelcsv_quadratus'),
 				self::$EXPORT_TYPE_EBP => $langs->trans('Modelcsv_ebp'),
 				self::$EXPORT_TYPE_COGILOG => $langs->trans('Modelcsv_cogilog'),
-				self::$EXPORT_TYPE_AGIRIS => $langs->trans('Modelcsv_agiris'),
-				self::$EXPORT_TYPE_CONFIGURABLE => $langs->trans('Modelcsv_configurable'),
-			);
-	}
-
-	/**
-	 * Array with all export type available (key + label) and parameters for config
-	 *
-	 * @return array of type
-	 */
-	public static function getTypeConfig() {
-		global $conf, $langs;
-
-		return array (
-			'param' => array(
-				self::$EXPORT_TYPE_NORMAL => array(
-					'label' => $langs->trans('Modelcsv_normal'),
-					'ACCOUNTING_EXPORT_FORMAT' => empty($conf->global->ACCOUNTING_EXPORT_FORMAT)?'txt':$conf->global->ACCOUNTING_EXPORT_FORMAT,
-					'ACCOUNTING_EXPORT_SEPARATORCSV' => empty($conf->global->ACCOUNTING_EXPORT_SEPARATORCSV)?',':$conf->global->ACCOUNTING_EXPORT_SEPARATORCSV,
-					'ACCOUNTING_EXPORT_ENDLINE' => empty($conf->global->ACCOUNTING_EXPORT_ENDLINE)?1:$conf->global->ACCOUNTING_EXPORT_ENDLINE,
-					'ACCOUNTING_EXPORT_DATE' => empty($conf->global->ACCOUNTING_EXPORT_DATE)?'%d%m%Y':$conf->global->ACCOUNTING_EXPORT_DATE,
-				),
-				self::$EXPORT_TYPE_CEGID => array(
-					'label' => $langs->trans('Modelcsv_CEGID'),
-				),
-				self::$EXPORT_TYPE_COALA => array(
-					'label' => $langs->trans('Modelcsv_COALA'),
-				),
-				self::$EXPORT_TYPE_BOB50 => array(
-					'label' => $langs->trans('Modelcsv_bob50'),
-				),
-				self::$EXPORT_TYPE_CIEL => array(
-					'label' => $langs->trans('Modelcsv_ciel'),
-					'ACCOUNTING_EXPORT_FORMAT' => 'txt',
-				),
-				self::$EXPORT_TYPE_QUADRATUS => array(
-					'label' => $langs->trans('Modelcsv_quadratus'),
-					'ACCOUNTING_EXPORT_FORMAT' => 'txt',
-				),
-				self::$EXPORT_TYPE_EBP => array(
-					'label' => $langs->trans('Modelcsv_ebp'),
-				),
-				self::$EXPORT_TYPE_COGILOG => array(
-					'label' => $langs->trans('Modelcsv_cogilog'),
-				),
-				self::$EXPORT_TYPE_AGIRIS => array(
-					'label' => $langs->trans('Modelcsv_agiris'),
-				),
-				self::$EXPORT_TYPE_CONFIGURABLE => array(
-					'label' => $langs->trans('Modelcsv_configurable'),
-					'ACCOUNTING_EXPORT_FORMAT' => empty($conf->global->ACCOUNTING_EXPORT_FORMAT)?'txt':$conf->global->ACCOUNTING_EXPORT_FORMAT,
-					'ACCOUNTING_EXPORT_SEPARATORCSV' => empty($conf->global->ACCOUNTING_EXPORT_SEPARATORCSV)?',':$conf->global->ACCOUNTING_EXPORT_SEPARATORCSV,
-					'ACCOUNTING_EXPORT_ENDLINE' => empty($conf->global->ACCOUNTING_EXPORT_ENDLINE)?1:$conf->global->ACCOUNTING_EXPORT_ENDLINE,
-					'ACCOUNTING_EXPORT_DATE' => empty($conf->global->ACCOUNTING_EXPORT_DATE)?'%d%m%Y':$conf->global->ACCOUNTING_EXPORT_DATE,
-				),
-			),
-			'cr'=> array (
-				'1' => $langs->trans("Unix"),
-				'2' => $langs->trans("Windows")
-			),
-			'format' => array (
-				'csv' => $langs->trans("csv"),
-				'txt' => $langs->trans("txt")
-			),
+				self::$EXPORT_TYPE_AGIRIS => $langs->trans('Modelcsv_agiris')
 		);
 	}

@@ -219,9 +151,6 @@ class AccountancyExport
 			case self::$EXPORT_TYPE_AGIRIS :
 				$this->exportAgiris($TData);
 				break;
-			case self::$EXPORT_TYPE_CONFIGURABLE :
-				$this->exportConfigurable($TData);
-				break;
 			default:
 				$this->errors[] = $langs->trans('accountancy_error_modelnotfound');
 				break;
@@ -263,7 +192,6 @@ class AccountancyExport
 		foreach ( $objectLines as $line ) {
 			$date = dol_print_date($line->doc_date, '%d%m%Y');
 			$separator = ";";
-			$end_line = "\n";

 			print $date . $separator;
 			print $line->code_journal . $separator;
@@ -273,7 +201,7 @@ class AccountancyExport
 			print price($line->montant) . $separator;
 			print $line->label_operation . $separator;
 			print $line->doc_ref;
-			print $end_line;
+			print $this->end_line;
 		}
 	}

@@ -287,26 +215,24 @@ class AccountancyExport
 	public function exportCogilog($objectLines) {
 		foreach ( $objectLines as $line ) {
 			$date = dol_print_date($line->doc_date, '%d%m%Y');
-			$separator = ";";
-			$end_line = "\n";

-			print $line->code_journal . $separator;
-			print $date . $separator;
-			print $line->piece_num . $separator;
-			print length_accountg($line->numero_compte) . $separator;
-			print '' . $separator;
-			print $line->label_operation . $separator;
-			print $date . $separator;
+			print $line->code_journal . $this->separator;
+			print $date . $this->separator;
+			print $line->piece_num . $this->separator;
+			print length_accountg($line->numero_compte) . $this->separator;
+			print '' . $this->separator;
+			print $line->label_operation . $this->separator;
+			print $date . $this->separator;
 			if ($line->sens=='D') {
-				print price($line->montant) . $separator;
-				print '' . $separator;
+				print price($line->montant) . $this->separator;
+				print '' . $this->separator;
 			}elseif ($line->sens=='C') {
-				print '' . $separator;
-				print price($line->montant) . $separator;
+				print '' . $this->separator;
+				print price($line->montant) . $this->separator;
 			}
-			print $line->doc_ref . $separator;
-			print $line->label_operation . $separator;
-			print $end_line;
+			print $line->doc_ref . $this->separator;
+			print $line->label_operation . $this->separator;
+			print $this->end_line;
 		}
 	}

@@ -319,21 +245,18 @@ class AccountancyExport
 	 */
 	public function exportCoala($objectLines) {
 		// Coala export
-		$separator = ";";
-		$end_line = "\n";
-
 		foreach ( $objectLines as $line ) {
 			$date = dol_print_date($line->doc_date, '%d/%m/%Y');
-			print $date . $separator;
-			print $line->code_journal . $separator;
-			print length_accountg($line->numero_compte) . $separator;
-			print $line->piece_num . $separator;
-			print $line->doc_ref . $separator;
-			print price($line->debit) . $separator;
-			print price($line->credit) . $separator;
-			print 'E' . $separator;
-			print length_accountg($line->subledger_account) . $separator;
-			print $end_line;
+			print $date . $this->separator;
+			print $line->code_journal . $this->separator;
+			print length_accountg($line->numero_compte) . $this->separator;
+			print $line->piece_num . $this->separator;
+			print $line->doc_ref . $this->separator;
+			print price($line->debit) . $this->separator;
+			print price($line->credit) . $this->separator;
+			print 'E' . $this->separator;
+			print length_accountg($line->subledger_account) . $this->separator;
+			print $this->end_line;
 		}
 	}

@@ -347,31 +270,28 @@ class AccountancyExport
 	public function exportBob50($objectLines) {

 		// Bob50
-		$separator = ";";
-		$end_line = "\n";
-
 		foreach ( $objectLines as $line ) {
-			print $line->piece_num . $separator;
+			print $line->piece_num . $this->separator;
 			$date = dol_print_date($line->doc_date, '%d/%m/%Y');
-			print $date . $separator;
+			print $date . $this->separator;

 			if (empty($line->subledger_account)) {
-				print 'G' . $separator;
-				print length_accounta($line->numero_compte) . $separator;
+				print 'G' . $this->separator;
+				print length_accounta($line->numero_compte) . $this->separator;
 			} else {
 				if (substr($line->numero_compte, 0, 3) == '411') {
-					print 'C' . $separator;
+					print 'C' . $this->separator;
 				}
 				if (substr($line->numero_compte, 0, 3) == '401') {
-					print 'F' . $separator;
+					print 'F' . $this->separator;
 				}
-				print length_accountg($line->subledger_account) . $separator;
+				print length_accountg($line->subledger_account) . $this->separator;
 			}

-			print price($line->debit) . $separator;
-			print price($line->credit) . $separator;
-			print dol_trunc($line->label_operation, 32) . $separator;
-			print $end_line;
+			print price($line->debit) . $this->separator;
+			print price($line->credit) . $this->separator;
+			print dol_trunc($line->label_operation, 32) . $this->separator;
+			print $this->end_line;
 		}
 	}

@@ -385,7 +305,7 @@ class AccountancyExport
 	public function exportCiel(&$TData) {
 		global $conf;

-		$end_line ="\r\n";
+		$this->end_line ="\r\n";

 		$i = 1;
 		$date_ecriture = dol_print_date(dol_now(), $conf->global->ACCOUNTING_EXPORT_DATE); // format must be yyyymmdd
@@ -401,14 +321,14 @@ class AccountancyExport
 			$Tab['date_ope'] = dol_print_date($data->doc_date, $conf->global->ACCOUNTING_EXPORT_DATE);
 			$Tab['num_piece'] = str_pad(self::trunc($data->piece_num, 12), 12);
 			$Tab['num_compte'] = str_pad(self::trunc($code_compta, 11), 11);
-			$Tab['libelle_ecriture'] = str_pad(self::trunc(dol_string_unaccent($data->doc_ref) . dol_string_unaccent($data->label_operation), 25), 25);
+			$Tab['libelle_ecriture'] = str_pad(self::trunc($data->doc_ref . $data->label_operation, 25), 25);
 			$Tab['montant'] = str_pad(abs($data->montant), 13, ' ', STR_PAD_LEFT);
 			$Tab['type_montant'] = str_pad($data->sens, 1);
 			$Tab['vide'] = str_repeat(' ', 18);
-			$Tab['intitule_compte'] = str_pad(self::trunc(dol_string_unaccent($data->label_operation), 34), 34);
+			$Tab['intitule_compte'] = str_pad(self::trunc($data->label_operation, 34), 34);
 			$Tab['end'] = 'O2003';

-			$Tab['end_line'] = $end_line;
+			$Tab['end_line'] = $this->end_line;

 			print implode($Tab);
 			$i ++;
@@ -425,11 +345,9 @@ class AccountancyExport
 	public function exportQuadratus(&$TData) {
 		global $conf;

-		$end_line ="\r\n";
+		$this->end_line ="\r\n";

-        //We should use dol_now function not time however this is wrong date to transfert in accounting
-		//$date_ecriture = dol_print_date(dol_now(), $conf->global->ACCOUNTING_EXPORT_DATE); // format must be ddmmyy
-		//$date_ecriture = dol_print_date(time(), $conf->global->ACCOUNTING_EXPORT_DATE); // format must be ddmmyy
+		$date_ecriture = dol_print_date(time(), $conf->global->ACCOUNTING_EXPORT_DATE); // format must be ddmmyy
 		foreach ( $TData as $data ) {
 			$code_compta = $data->numero_compte;
 			if (! empty($data->subledger_account))
@@ -440,58 +358,29 @@ class AccountancyExport
 			$Tab['num_compte'] = str_pad(self::trunc($code_compta, 8), 8);
 			$Tab['code_journal'] = str_pad(self::trunc($data->code_journal, 2), 2);
 			$Tab['folio'] = '000';
-
-            //We use invoice date $data->doc_date not $date_ecriture which is the transfert date
-            //maybe we should set an option for customer who prefer to keep in accounting software the tranfert date instead of invoice date ?
-			//$Tab['date_ecriture'] = $date_ecriture;
-			$Tab['date_ecriture'] = dol_print_date($data->doc_date, '%d%m%y');
+			$Tab['date_ecriture'] = $date_ecriture;
 			$Tab['filler'] = ' ';
-			$Tab['libelle_ecriture'] = str_pad(self::trunc(dol_string_unaccent($data->doc_ref) . ' ' . dol_string_unaccent($data->label_operation), 20), 20);
+			$Tab['libelle_ecriture'] = str_pad(self::trunc($data->doc_ref . ' ' . $data->label_operation, 20), 20);
 			$Tab['sens'] = $data->sens; // C or D
 			$Tab['signe_montant'] = '+';
-
-            //elarifr le montant doit etre en centimes sans point decimal !
-			$Tab['montant'] = str_pad(abs($data->montant*100), 12, '0', STR_PAD_LEFT); // TODO manage negative amount
-		    // $Tab['montant'] = str_pad(abs($data->montant), 12, '0', STR_PAD_LEFT); // TODO manage negative amount
+			$Tab['montant'] = str_pad(abs($data->montant), 12, '0', STR_PAD_LEFT); // TODO manage negative amount
 			$Tab['contrepartie'] = str_repeat(' ', 8);
-
-            // elarifr:  date format must be fixed format : 6 char ddmmyy = %d%m%yand not defined by user / dolibarr setting
 			if (! empty($data->date_echeance))
-				//$Tab['date_echeance'] = dol_print_date($data->date_echeance, $conf->global->ACCOUNTING_EXPORT_DATE);
-				$Tab['date_echeance'] = dol_print_date($data->date_echeance,  '%d%m%y' );     // elarifr:  format must be ddmmyy
+				$Tab['date_echeance'] = dol_print_date($data->date_echeance, $conf->global->ACCOUNTING_EXPORT_DATE);
 			else
 				$Tab['date_echeance'] = '000000';
-
-            //elarifr please keep quadra named field lettrage(2) + codestat(3) instead of fake lettrage(5)
-			//$Tab['lettrage'] = str_repeat(' ', 5);
-			$Tab['lettrage'] = str_repeat(' ', 2);
-			$Tab['codestat'] = str_repeat(' ', 3);
+			$Tab['lettrage'] = str_repeat(' ', 5);
 			$Tab['num_piece'] = str_pad(self::trunc($data->piece_num, 5), 5);
-
-            //elarifr keep correct quadra named field instead of anon filler
-			//$Tab['filler2'] = str_repeat(' ', 20);
-			$Tab['affaire'] = str_repeat(' ', 10);
-			$Tab['quantity1'] = str_repeat(' ', 10);
+			$Tab['filler2'] = str_repeat(' ', 20);
 			$Tab['num_piece2'] = str_pad(self::trunc($data->piece_num, 8), 8);
 			$Tab['devis'] = str_pad($conf->currency, 3);
 			$Tab['code_journal2'] = str_pad(self::trunc($data->code_journal, 3), 3);
 			$Tab['filler3'] = str_repeat(' ', 3);
-
-            //elarifr keep correct quadra named field instead of anon filler libelle_ecriture2 is 30 char not 32 !!!!
-            //as we use utf8, we must remove accent to have only one ascii char instead of utf8 2 chars for specials that report wrong line size that will exceed import format spec
-            //todo we should filter more than only accent to avoid wrong line size
-            //TODO: remove invoice number doc_ref in libelle,
-            //TODO: we should offer an option for customer to build the libelle using invoice number / name / date in accounting software
-			//$Tab['libelle_ecriture2'] = str_pad(self::trunc(dol_string_unaccent($data->doc_ref) . ' ' . dol_string_unaccent($data->label_operation), 30), 30);
-			$Tab['libelle_ecriture2'] = str_pad(self::trunc(dol_string_unaccent($data->label_operation), 30), 30);
-			$Tab['codetva'] = str_repeat(' ', 2);
-
-            //elarifr we need to keep the 10 lastest number of invoice doc_ref not the beginning part that is the unusefull almost same part
-			//$Tab['num_piece3'] = str_pad(self::trunc($data->piece_num, 10), 10);
-			$Tab['num_piece3'] = substr(self::trunc($data->doc_ref, 20), -10);
+			$Tab['libelle_ecriture2'] = str_pad(self::trunc($data->doc_ref . ' ' . $data->label_operation, 32), 32);
+			$Tab['num_piece3'] = str_pad(self::trunc($data->piece_num, 10), 10);
 			$Tab['filler4'] = str_repeat(' ', 73);

-			$Tab['end_line'] = $end_line;
+			$Tab['end_line'] = $this->end_line;

 			print implode($Tab);
 		}
@@ -507,25 +396,24 @@ class AccountancyExport
 	 */
 	public function exportEbp($objectLines) {

-		$separator = ',';
-		$end_line = "\n";
+		$this->separator = ',';

 		foreach ( $objectLines as $line ) {

 			$date = dol_print_date($line->doc_date, '%d%m%Y');

-			print $line->id . $separator;
-			print $date . $separator;
-			print $line->code_journal . $separator;
-			print length_accountg($line->numero_compte) . $separator;
-			print substr(length_accountg($line->numero_compte),0,2) . $separator;
-			print '"'.dol_trunc($line->label_operation,40,'right','UTF-8',1).'"' . $separator;
-			print '"'.dol_trunc($line->piece_num,15,'right','UTF-8',1).'"'.$separator;
-			print price2num($line->montant).$separator;
-			print $line->sens.$separator;
-			print $date . $separator;
+			print $line->id . $this->separator;
+			print $date . $this->separator;
+			print $line->code_journal . $this->separator;
+			print length_accountg($line->numero_compte) . $this->separator;
+			print substr(length_accountg($line->numero_compte),0,2) . $this->separator;
+			print '"'.dol_trunc($line->label_operation,40,'right','UTF-8',1).'"' . $this->separator;
+			print '"'.dol_trunc($line->piece_num,15,'right','UTF-8',1).'"'.$this->separator;
+			print price2num($line->montant).$this->separator;
+			print $line->sens.$this->separator;
+			print $date . $this->separator;
 			print 'EUR';
-			print $end_line;
+			print $this->end_line;
 		}
 	}

@@ -539,61 +427,30 @@ class AccountancyExport
 	 */
 	public function exportAgiris($objectLines) {

-		$separator = ';';
-		$end_line = "\n";
+		$this->separator = ';';

 		foreach ( $objectLines as $line ) {

 			$date = dol_print_date($line->doc_date, '%d%m%Y');

-			print $line->piece_num . $separator;
-			print $line->label_operation . $separator;
-			print $date . $separator;
-			print $line->label_operation . $separator;
+			print $line->piece_num . $this->separator;
+			print $line->label_operation . $this->separator;
+			print $date . $this->separator;
+			print $line->label_operation . $this->separator;

 			if (empty($line->subledger_account)) {
-				print length_accountg($line->numero_compte) . $separator;
+				print length_accountg($line->numero_compte) . $this->separator;
 			} else {
-				print length_accounta($line->subledger_account) . $separator;
+				print length_accounta($line->subledger_account) . $this->separator;
 			}

-			print $line->doc_ref . $separator;
-			print price($line->debit) . $separator;
-			print price($line->credit) . $separator;
-			print price($line->montant) . $separator;
-			print $line->sens . $separator;
+			print $line->doc_ref . $this->separator;
+			print price($line->debit) . $this->separator;
+			print price($line->credit) . $this->separator;
+			print price($line->montant).$this->separator;
+			print $line->sens.$this->separator;
 			print $line->code_journal;
-			print $end_line;
-		}
-	}
-
-	/**
-	 * Export format : Configurable
-	 *
-	 * @param array $objectLines data
-	 *
-	 * @return void
-	 */
-	public function exportConfigurable($objectLines) {
-		global $conf;
-
-		foreach ($objectLines as $line) {
-			$tab = array();
-			// export configurable
-			$date = dol_print_date($line->doc_date, $conf->global->ACCOUNTING_EXPORT_DATE);
-			$tab[] = $line->piece_num;
-			$tab[] = $date;
-			$tab[] = $line->doc_ref;
-			$tab[] = $line->label_operation;
-			$tab[] =  length_accountg($line->numero_compte);
-			$tab[] =  length_accounta($line->subledger_account);
-			$tab[] =  price($line->debit);
-			$tab[] =  price($line->credit);
-			$tab[] =  price($line->montant);
-			$tab[] =  $line->code_journal;
-
-			$separator = $this->separator;
-			print implode($separator, $tab) . $this->end_line;
+			print $this->end_line;
 		}
 	}

--- a/htdocs/accountancy/class/accountancysystem.class.php
+++ b/htdocs/accountancy/class/accountancysystem.class.php
@@ -107,7 +107,7 @@ class AccountancySystem

 		$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->db->escape($this->numero) . "','" . $this->db->escape($this->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);
--- a/htdocs/accountancy/class/accountingaccount.class.php
+++ b/htdocs/accountancy/class/accountingaccount.class.php
@@ -1,9 +1,9 @@
 <?php
-/* Copyright (C) 2013-2014  Olivier Geffroy      <jeff@jeffinfo.com>
- * Copyright (C) 2013-2016  Alexandre Spangaro   <aspangaro@zendsi.com>
- * Copyright (C) 2013-2014  Florian Henry        <florian.henry@open-concept.pro>
- * Copyright (C) 2014       Juanjo Menent        <jmenent@2byte.es>
- * Copyright (C) 2015       Ari Elbaz (elarifr)  <github@accedinfo.com>
+/* Copyright (C) 2013-2014 Olivier Geffroy      <jeff@jeffinfo.com>
+ * Copyright (C) 2013-2016 Alexandre Spangaro   <aspangaro@zendsi.com>
+ * Copyright (C) 2013-2014 Florian Henry		<florian.henry@open-concept.pro>
+ * Copyright (C) 2014 	   Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2015      Ari Elbaz (elarifr)  <github@accedinfo.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,9 +20,9 @@
 */

 /**
- *  \file       htdocs/accountancy/class/accountingaccount.class.php
- *  \ingroup    Advanced accountancy
- *  \brief      File of class to manage accounting accounts
+ * \file		htdocs/accountancy/class/accountingaccount.class.php
+ * \ingroup		Advanced accountancy
+ * \brief		File of class to manage accounting accounts
 */

 /**
@@ -30,21 +30,6 @@
 */
 class AccountingAccount extends CommonObject
 {
-	public $element='accounting_account';
-	public $table_element='accounting_account';
-	public $picto = 'billr';
-
-	/**
-	 * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
-	 * @var int
-	 */
-	public $ismultientitymanaged = 1;
-	/**
-	 * 0=Default, 1=View may be restricted to sales representative only if no permission to see all or to company of external user if external user
-	 * @var integer
-	 */
-	public $restrictiononfksoc = 1;
-
 	var $db;
 	var $error;
 	var $errors;
@@ -62,31 +47,27 @@ class AccountingAccount extends CommonObject
 	var $fk_user_modif;
 	var $active;       // duplicate with status
 	var $status;
-
-
+	
 	/**
 	 * Constructor
 	 *
 	 * @param DoliDB $db Database handle
 	 */
 	function __construct($db) {
-		global $conf;
-
 		$this->db = $db;
-		$this->next_prev_filter='fk_pcg_version IN (SELECT pcg_version FROM ' . MAIN_DB_PREFIX . 'accounting_system WHERE rowid=' . $conf->global->CHARTOFACCOUNTS . ')';		// Used to add a filter in Form::showrefnav method
 	}
-
+	
 	/**
 	 * Load record in memory
 	 *
 	 * @param 	int 	$rowid 				   Id
 	 * @param 	string 	$account_number 	   Account number
 	 * @param 	int 	$limittocurrentchart   1=Do not load record if it is into another accounting system
-	 * @return 	int                            <0 if KO, 0 if not found, Id of record if OK and found
+	 * @return 	int                            <0 if KO, Id of record if OK and found
 	 */
 	function fetch($rowid = null, $account_number = null, $limittocurrentchart = 0) {
 		global $conf;
-
+		
 		if ($rowid || $account_number) {
 			$sql  = "SELECT a.rowid as rowid, a.datec, a.tms, a.fk_pcg_version, a.pcg_type, a.pcg_subtype, a.account_number, a.account_parent, a.label, a.fk_accounting_category, a.fk_user_author, a.fk_user_modif, a.active";
 			$sql .= ", ca.label as category_label";
@@ -106,11 +87,10 @@ class AccountingAccount extends CommonObject
 			$result = $this->db->query($sql);
 			if ($result) {
 				$obj = $this->db->fetch_object($result);
-
+				
 				if ($obj) {
 					$this->id = $obj->rowid;
 					$this->rowid = $obj->rowid;
-					$this->ref = $obj->account_number;
 					$this->datec = $obj->datec;
 					$this->tms = $obj->tms;
 					$this->fk_pcg_version = $obj->fk_pcg_version;
@@ -125,7 +105,7 @@ class AccountingAccount extends CommonObject
 					$this->fk_user_modif = $obj->fk_user_modif;
 					$this->active = $obj->active;
 					$this->status = $obj->active;
-
+					
 					return $this->id;
 				} else {
 					return 0;
@@ -135,9 +115,9 @@ class AccountingAccount extends CommonObject
 				$this->errors[] = "Error " . $this->db->lasterror();
 			}
 		}
-		return -1;
+		return - 1;
 	}
-
+	
 	/**
 	 * Insert new accounting account in chart of accounts
 	 *
@@ -149,7 +129,7 @@ class AccountingAccount extends CommonObject
 		global $conf;
 		$error = 0;
 		$now = dol_now();
-
+		
 		// Clean parameters
 		if (isset($this->fk_pcg_version))
 			$this->fk_pcg_version = trim($this->fk_pcg_version);
@@ -169,18 +149,18 @@ class AccountingAccount extends CommonObject
 			$this->fk_user_author = trim($this->fk_user_author);
 		if (isset($this->active))
 			$this->active = trim($this->active);
-
+			
 		if (empty($this->pcg_type) || $this->pcg_type == '-1')
 		{
-			$this->pcg_type = 'XXXXXX';
+		    $this->pcg_type = 'XXXXXX';
 		}
 		if (empty($this->pcg_subtype) || $this->pcg_subtype == '-1')
 		{
-			$this->pcg_subtype = 'XXXXXX';
+		    $this->pcg_subtype = 'XXXXXX';
 		}
 		// Check parameters
 		// Put here code to add control on parameters values
-
+			
 		// Insert request
 		$sql = "INSERT INTO " . MAIN_DB_PREFIX . "accounting_account(";
 		$sql .= "datec";
@@ -199,31 +179,31 @@ class AccountingAccount extends CommonObject
 		$sql .= ", " . $conf->entity;
 		$sql .= ", " . (empty($this->fk_pcg_version) ? 'NULL' : "'" . $this->db->escape($this->fk_pcg_version) . "'");
 		$sql .= ", " . (empty($this->pcg_type) ? 'NULL' : "'" . $this->db->escape($this->pcg_type) . "'");
-		$sql .= ", " . (empty($this->pcg_subtype) ? 'NULL' : "'" . $this->db->escape($this->pcg_subtype) . "'");
-		$sql .= ", " . (empty($this->account_number) ? 'NULL' : "'" . $this->db->escape($this->account_number) . "'");
+		$sql .= ", " . (empty($this->pcg_subtype) ? 'NULL' : "'" . $this->pcg_subtype . "'");
+		$sql .= ", " . (empty($this->account_number) ? 'NULL' : "'" . $this->account_number . "'");
 		$sql .= ", " . (empty($this->account_parent) ? 'NULL' : "'" . $this->db->escape($this->account_parent) . "'");
 		$sql .= ", " . (empty($this->label) ? 'NULL' : "'" . $this->db->escape($this->label) . "'");
 		$sql .= ", " . (empty($this->account_category) ? 'NULL' : "'" . $this->db->escape($this->account_category) . "'");
 		$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 . "accounting_account");
-
+			
 			// 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);
@@ -232,7 +212,7 @@ class AccountingAccount extends CommonObject
 			// // End call triggers
 			// }
 		}
-
+		
 		// Commit or rollback
 		if ($error) {
 			foreach ( $this->errors as $errmsg ) {
@@ -246,27 +226,27 @@ class AccountingAccount extends CommonObject
 			return $this->id;
 		}
 	}
-
+	
 	/**
 	 * Update record
 	 *
 	 * @param  User $user      Use making update
 	 * @return int             <0 if KO, >0 if OK
 	 */
-	function update($user)
+	function update($user) 
 	{
-		// Check parameters
-		if (empty($this->pcg_type) || $this->pcg_type == '-1')
-		{
-			$this->pcg_type = 'XXXXXX';
-		}
-		if (empty($this->pcg_subtype) || $this->pcg_subtype == '-1')
-		{
-			$this->pcg_subtype = 'XXXXXX';
-		}
-
-		$this->db->begin();
-
+	    // Check parameters
+	    if (empty($this->pcg_type) || $this->pcg_type == '-1')
+	    {
+	        $this->pcg_type = 'XXXXXX';
+	    }
+	    if (empty($this->pcg_subtype) || $this->pcg_subtype == '-1')
+	    {
+	        $this->pcg_subtype = 'XXXXXX';
+	    }
+	     
+	    $this->db->begin();
+		
 		$sql = "UPDATE " . MAIN_DB_PREFIX . "accounting_account ";
 		$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");
@@ -278,7 +258,7 @@ class AccountingAccount extends CommonObject
 		$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) {
@@ -290,7 +270,7 @@ class AccountingAccount extends CommonObject
 			return - 1;
 		}
 	}
-
+	
 	/**
 	 * Check usage of accounting code
 	 *
@@ -298,16 +278,16 @@ class AccountingAccount extends CommonObject
 	 */
 	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) {
@@ -321,7 +301,7 @@ class AccountingAccount extends CommonObject
 			return - 1;
 		}
 	}
-
+	
 	/**
 	 * Delete object in database
 	 *
@@ -331,18 +311,18 @@ class AccountingAccount extends CommonObject
 	 */
 	function delete($user, $notrigger = 0) {
 		$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);
@@ -351,11 +331,11 @@ class AccountingAccount extends CommonObject
 			// // End call triggers
 			// }
 			// }
-
+			
 			if (! $error) {
 				$sql = "DELETE FROM " . MAIN_DB_PREFIX . "accounting_account";
 				$sql .= " WHERE rowid=" . $this->id;
-
+				
 				dol_syslog(get_class($this) . "::delete sql=" . $sql);
 				$resql = $this->db->query($sql);
 				if (! $resql) {
@@ -363,7 +343,7 @@ class AccountingAccount extends CommonObject
 					$this->errors[] = "Error " . $this->db->lasterror();
 				}
 			}
-
+			
 			// Commit or rollback
 			if ($error) {
 				foreach ( $this->errors as $errmsg ) {
@@ -380,7 +360,7 @@ class AccountingAccount extends CommonObject
 			return - 1;
 		}
 	}
-
+	
 	/**
 	 * Return clicable name (with picto eventually)
 	 *
@@ -395,7 +375,7 @@ class AccountingAccount extends CommonObject
 	{
 		global $langs, $conf, $user;
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
-
+		
 		if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips

 		$result = '';
@@ -415,24 +395,24 @@ class AccountingAccount extends CommonObject
 		$linkclose='';
 		if (empty($notooltip))
 		{
-			if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-			{
-				$label=$langs->trans("ShowAccoutingAccount");
-				$linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
-			}
-			$linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
-			$linkclose.=' class="classfortooltip"';
+		    if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+		    {
+		        $label=$langs->trans("ShowAccoutingAccount");
+		        $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+		    }
+		    $linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
+		    $linkclose.=' class="classfortooltip"';
 		}

-		$linkstart='<a href="'.$url.'"';
-		$linkstart.=$linkclose.'>';
+        $linkstart='<a href="'.$url.'"';
+        $linkstart.=$linkclose.'>';
 		$linkend='</a>';

 		if ($nourl)
 		{
 			$linkstart = '';
 			$linkclose = '';
-			$linkend = '';
+			$linkend = '';			
 		}

 		$label_link = length_accountg($this->account_number);
@@ -443,7 +423,7 @@ class AccountingAccount extends CommonObject
 		if ($withpicto != 2) $result.=$linkstart . $label_link . $linkend;
 		return $result;
 	}
-
+	
 	/**
 	 * Information on record
 	 *
@@ -454,10 +434,10 @@ class AccountingAccount extends CommonObject
 		$sql = 'SELECT a.rowid, a.datec, a.fk_user_author, a.fk_user_modif, a.tms';
 		$sql .= ' FROM ' . MAIN_DB_PREFIX . 'accounting_account 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);
@@ -480,26 +460,26 @@ class AccountingAccount extends CommonObject
 			dol_print_error($this->db);
 		}
 	}
-
+	
 	/**
-	 * Account deactivated
+	 * Account desactivate
 	 *
-	 * @param  int  $id         Id
-	 * @return int              <0 if KO, >0 if OK
+	 * @param int $id Id
+	 * @return int <0 if KO, >0 if OK
 	 */
 	function account_desactivate($id) {
 		$result = $this->checkUsage();
-
+		
 		if ($result > 0) {
 			$this->db->begin();
-
+			
 			$sql = "UPDATE " . MAIN_DB_PREFIX . "accounting_account ";
 			$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;
@@ -512,20 +492,20 @@ class AccountingAccount extends CommonObject
 			return - 1;
 		}
 	}
-
+	
 	/**
-	 * Account activated
+	 * Account activate
 	 *
-	 * @param  int  $id         Id
-	 * @return int              <0 if KO, >0 if OK
+	 * @param int $id Id
+	 * @return int <0 if KO, >0 if OK
 	 */
 	function account_activate($id) {
 		$this->db->begin();
-
+		
 		$sql = "UPDATE " . MAIN_DB_PREFIX . "accounting_account ";
 		$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) {
@@ -537,61 +517,61 @@ class AccountingAccount extends CommonObject
 			return - 1;
 		}
 	}
-
-
+	
+	
 	/**
 	 *  Retourne le libelle du statut d'un user (actif, inactif)
 	 *
-	 *  @param  int     $mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
-	 *  @return string              Label of status
+	 *  @param	int		$mode          0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+	 *  @return	string 			       Label of status
 	 */
 	function getLibStatut($mode=0)
 	{
-		return $this->LibStatut($this->status,$mode);
+	    return $this->LibStatut($this->status,$mode);
 	}
-
+	
 	/**
 	 *  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 of status
+	 *  @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 of status
 	 */
 	function LibStatut($statut,$mode=0)
 	{
-		global $langs;
-		$langs->load('users');
-
-		if ($mode == 0)
-		{
-			$prefix='';
-			if ($statut == 1) return $langs->trans('Enabled');
-			if ($statut == 0) return $langs->trans('Disabled');
-		}
-		if ($mode == 1)
-		{
-			if ($statut == 1) return $langs->trans('Enabled');
-			if ($statut == 0) return $langs->trans('Disabled');
-		}
-		if ($mode == 2)
-		{
-			if ($statut == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
-			if ($statut == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
-		}
-		if ($mode == 3)
-		{
-			if ($statut == 1) return img_picto($langs->trans('Enabled'),'statut4');
-			if ($statut == 0) return img_picto($langs->trans('Disabled'),'statut5');
-		}
-		if ($mode == 4)
-		{
-			if ($statut == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
-			if ($statut == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
-		}
-		if ($mode == 5)
-		{
-			if ($statut == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
-			if ($statut == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
-		}
+	    global $langs;
+	    $langs->load('users');
+	
+	    if ($mode == 0)
+	    {
+	        $prefix='';
+	        if ($statut == 1) return $langs->trans('Enabled');
+	        if ($statut == 0) return $langs->trans('Disabled');
+	    }
+	    if ($mode == 1)
+	    {
+	        if ($statut == 1) return $langs->trans('Enabled');
+	        if ($statut == 0) return $langs->trans('Disabled');
+	    }
+	    if ($mode == 2)
+	    {
+	        if ($statut == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
+	        if ($statut == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
+	    }
+	    if ($mode == 3)
+	    {
+	        if ($statut == 1) return img_picto($langs->trans('Enabled'),'statut4');
+	        if ($statut == 0) return img_picto($langs->trans('Disabled'),'statut5');
+	    }
+	    if ($mode == 4)
+	    {
+	        if ($statut == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
+	        if ($statut == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
+	    }
+	    if ($mode == 5)
+	    {
+	        if ($statut == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
+	        if ($statut == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
+	    }
 	}
 }
--- a/htdocs/accountancy/class/accountingjournal.class.php
+++ b/htdocs/accountancy/class/accountingjournal.class.php
@@ -29,8 +29,7 @@ class AccountingJournal extends CommonObject
 	public $element='accounting_journal';
 	public $table_element='accounting_journal';
 	public $fk_element = '';
-	public $ismultientitymanaged = 0;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
-	public $picto = 'generic';
+	protected $ismultientitymanaged = 0;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe

 	var $rowid;

@@ -59,8 +58,6 @@ class AccountingJournal extends CommonObject
 	 */
 	function fetch($rowid = null, $journal_code = null)
 	{
-		global $conf;
-
 		if ($rowid || $journal_code)
 		{
 			$sql = "SELECT rowid, code, label, nature, active";
@@ -68,11 +65,8 @@ class AccountingJournal extends CommonObject
 			$sql .= " WHERE";
 			if ($rowid) {
 				$sql .= " rowid = " . (int) $rowid;
-			}
-			elseif ($journal_code)
-			{
+			} elseif ($journal_code) {
 				$sql .= " code = '" . $this->db->escape($journal_code) . "'";
-				$sql .= " AND entity  = " . $conf->entity;
 			}

 			dol_syslog(get_class($this)."::fetch sql=" . $sql, LOG_DEBUG);
@@ -193,6 +187,9 @@ class AccountingJournal extends CommonObject

 		$url = DOL_URL_ROOT . '/accountancy/admin/journals_list.php?id=35';

+		$picto = 'billr';
+		$label='';
+
 		$label = '<u>' . $langs->trans("ShowAccountingJournal") . '</u>';
 		if (! empty($this->code))
 			$label .= '<br><b>'.$langs->trans('Code') . ':</b> ' . $this->code;
@@ -226,11 +223,9 @@ class AccountingJournal extends CommonObject
 		$label_link = $this->code;
 		if ($withlabel) $label_link .= ' - ' . $this->label;

-		$result .= $linkstart;
-		if ($withpicto) $result.=img_object(($notooltip?'':$label), ($this->picto?$this->picto:'generic'), ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
-		if ($withpicto != 2) $result.= $label_link;
-		$result .= $linkend;
-
+		if ($withpicto) $result.=($linkstart.img_object(($notooltip?'':$label), $picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend);
+		if ($withpicto && $withpicto != 2) $result .= ' ';
+		if ($withpicto != 2) $result.=$linkstart . $label_link . $linkend;
 		return $result;
 	}

--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -32,37 +32,45 @@ require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php';
 class BookKeeping extends CommonObject
 {
 	/**
+	 *
 	 * @var string Error code (or message)
+	 * @deprecated
+	 *
+	 * @see Accountingbookkeeping::errors
 	 */
 	public $error;
 	/**
+	 *
 	 * @var string[] Error codes (or messages)
 	 */
 	public $errors = array ();
 	/**
+	 *
 	 * @var string Id to identify managed objects
 	 */
 	public $element = 'accountingbookkeeping';
 	/**
+	 *
 	 * @var string Name of table without prefix where object is stored
 	 */
 	public $table_element = 'accounting_bookkeeping';

-	public $entity;
+	public $entity = 1;

 	/**
+	 *
 	 * @var BookKeepingLine[] Lines
 	 */
 	public $lines = array ();

 	/**
+	 *
 	 * @var int ID
 	 */
 	public $id;
 	/**
 	 */
 	public $doc_date;
-	public $date_lim_reglement;
 	public $doc_type;
 	public $doc_ref;
 	public $fk_doc;
@@ -193,18 +201,13 @@ class BookKeeping extends CommonObject

 		$this->piece_num = 0;

-		// First check if line not yet already in bookkeeping.
-		// Note that we must include doc_type - fk_doc - numero_compte - label to be sure to have unicity of line (we may have several lines
-		// with same doc_type, fk_odc, numero_compte for 1 invoice line when using localtaxes with same account)
-		// WARNING: This is not reliable, label may have been modified. This is just a small protection.
-		// The page to make journalization make the test on couple doc_type - fk_doc only.
+		// First check if line not yet already in bookkeeping
 		$sql = "SELECT count(*) as nb";
 		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
 		$sql .= " WHERE doc_type = '" . $this->db->escape($this->doc_type) . "'";
 		$sql .= " AND fk_doc = " . $this->fk_doc;
-		//$sql .= " AND fk_docdet = " . $this->fk_docdet;					// This field can be 0 if record is for several lines
+		$sql .= " AND fk_docdet = " . $this->fk_docdet;					// This field can be 0 is record is for several lines
 		$sql .= " AND numero_compte = '" . $this->db->escape($this->numero_compte) . "'";
-		$sql .= " AND label_operation = '" . $this->db->escape($this->label_operation) . "'";
 		$sql .= " AND entity IN (" . getEntity('accountancy') . ")";

 		$resql = $this->db->query($sql);
@@ -252,7 +255,6 @@ class BookKeeping extends CommonObject

 				$sql = "INSERT INTO " . MAIN_DB_PREFIX . $this->table_element . " (";
 				$sql .= "doc_date";
-				$sql .= ", date_lim_reglement";
 				$sql .= ", doc_type";
 				$sql .= ", doc_ref";
 				$sql .= ", fk_doc";
@@ -275,7 +277,6 @@ class BookKeeping extends CommonObject
 				$sql .= ', entity';
 				$sql .= ") VALUES (";
 				$sql .= "'" . $this->db->idate($this->doc_date) . "'";
-				$sql .= ", ".(! isset($this->date_lim_reglement) || dol_strlen($this->date_lim_reglement) == 0 ? 'NULL' : "'" . $this->db->idate($this->date_lim_reglement) . "'");
 				$sql .= ",'" . $this->db->escape($this->doc_type) . "'";
 				$sql .= ",'" . $this->db->escape($this->doc_ref) . "'";
 				$sql .= "," . $this->fk_doc;
@@ -295,7 +296,7 @@ class BookKeeping extends CommonObject
 				$sql .= ",'" . $this->db->escape($this->code_journal) . "'";
 				$sql .= ",'" . $this->db->escape($this->journal_label) . "'";
 				$sql .= "," . $this->db->escape($this->piece_num);
-				$sql .= ", " . (! isset($this->entity) ? $conf->entity : $this->entity);
+				$sql .= ", " . (! isset($this->entity) ? '1' : $this->entity);
 				$sql .= ")";

 				dol_syslog(get_class($this) . ":: create sql=" . $sql, LOG_DEBUG);
@@ -354,67 +355,6 @@ class BookKeeping extends CommonObject
 		}
 	}

-	/**
-	 *  Return a link to the object card (with optionaly the picto)
-	 *
-	 *	@param	int		$withpicto					Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
-	 *	@param	string	$option						On what the link point to ('nolink', ...)
-	 *  @param	int  	$notooltip					1=Disable tooltip
-	 *  @param  string  $morecss            		Add more css on link
-	 *  @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
-	 *	@return	string								String with URL
-	 */
-	function getNomUrl($withpicto=0, $option='', $notooltip=0, $morecss='', $save_lastsearch_value=-1)
-	{
-		global $db, $conf, $langs;
-		global $dolibarr_main_authentication, $dolibarr_main_demo;
-		global $menumanager;
-
-		if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
-
-		$result = '';
-		$companylink = '';
-
-		$label = '<u>' . $langs->trans("Transaction") . '</u>';
-		$label.= '<br>';
-		$label.= '<b>' . $langs->trans('Ref') . ':</b> ' . $this->piece_num;
-
-		$url = DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?piece_num='.$this->piece_num;
-
-		if ($option != 'nolink')
-		{
-			// Add param to save lastsearch_values or not
-			$add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
-			if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
-			if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
-		}
-
-		$linkclose='';
-		if (empty($notooltip))
-		{
-			if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-			{
-				$label=$langs->trans("ShowTransaction");
-				$linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
-			}
-			$linkclose.=' title="'.dol_escape_htmltag($label, 1).'"';
-			$linkclose.=' class="classfortooltip'.($morecss?' '.$morecss:'').'"';
-		}
-		else $linkclose = ($morecss?' class="'.$morecss.'"':'');
-
-		$linkstart = '<a href="'.$url.'"';
-		$linkstart.=$linkclose.'>';
-		$linkend='</a>';
-
-		$result .= $linkstart;
-		if ($withpicto) $result.=img_object(($notooltip?'':$label), ($this->picto?$this->picto:'generic'), ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
-		if ($withpicto != 2) $result.= $this->piece_num;
-		$result .= $linkend;
-		//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
-
-		return $result;
-	}
-
 	/**
 	 * Create object into database
 	 *
@@ -424,8 +364,6 @@ class BookKeeping extends CommonObject
 	 * @return int				 <0 if KO, Id of created object if OK
 	 */
 	public function createStd(User $user, $notrigger = false, $mode='') {
-		global $conf;
-
 		dol_syslog(__METHOD__, LOG_DEBUG);

 		$error = 0;
@@ -506,7 +444,6 @@ class BookKeeping extends CommonObject
 		// Insert request
 		$sql = 'INSERT INTO ' . MAIN_DB_PREFIX . $this->table_element . $mode.'(';
 		$sql .= 'doc_date,';
-		$sql .= 'date_lim_reglement,';
 		$sql .= 'doc_type,';
 		$sql .= 'doc_ref,';
 		$sql .= 'fk_doc,';
@@ -529,7 +466,6 @@ class BookKeeping extends CommonObject
 		$sql .= 'entity';
 		$sql .= ') VALUES (';
 		$sql .= ' ' . (! isset($this->doc_date) || dol_strlen($this->doc_date) == 0 ? 'NULL' : "'" . $this->db->idate($this->doc_date) . "'") . ',';
-		$sql .= ' ' . (! isset($this->date_lim_reglement) || dol_strlen($this->date_lim_reglement) == 0 ? 'NULL' : "'" . $this->db->idate($this->date_lim_reglement) . "'") . ',';
 		$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 .= ' ' . (empty($this->fk_doc) ? '0' : $this->fk_doc) . ',';
@@ -549,7 +485,7 @@ class BookKeeping extends CommonObject
 		$sql .= ' ' . (empty($this->code_journal) ? 'NULL' : "'" . $this->db->escape($this->code_journal) . "'") . ',';
 		$sql .= ' ' . (empty($this->journal_label) ? 'NULL' : "'" . $this->db->escape($this->journal_label) . "'") . ',';
 		$sql .= ' ' . (empty($this->piece_num) ? 'NULL' : $this->db->escape($this->piece_num)).',';
-		$sql .= ' ' . (! isset($this->entity) ? $conf->entity : $this->entity);
+		$sql .= ' ' . (! isset($this->entity) ? '1' : $this->entity);
 		$sql .= ')';

 		$this->db->begin();
@@ -562,7 +498,7 @@ class BookKeeping extends CommonObject
 		}

 		if (! $error) {
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element . $mode);
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);

 			if (! $notrigger) {
 				// Uncomment this and change MYOBJECT to your own tag if you
@@ -604,7 +540,6 @@ class BookKeeping extends CommonObject
 		$sql = 'SELECT';
 		$sql .= ' t.rowid,';
 		$sql .= " t.doc_date,";
-		$sql .= " t.date_lim_reglement,";
 		$sql .= " t.doc_type,";
 		$sql .= " t.doc_ref,";
 		$sql .= " t.fk_doc,";
@@ -623,8 +558,7 @@ class BookKeeping extends CommonObject
 		$sql .= " t.import_key,";
 		$sql .= " t.code_journal,";
 		$sql .= " t.journal_label,";
-		$sql .= " t.piece_num,";
-		$sql .= " t.date_creation";
+		$sql .= " t.piece_num";
 		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element.$mode. ' as t';
 		$sql .= ' WHERE 1 = 1';
 		$sql .= " AND entity IN (" . getEntity('accountancy') . ")";
@@ -643,7 +577,6 @@ class BookKeeping extends CommonObject
 				$this->id = $obj->rowid;

 				$this->doc_date = $this->db->jdate($obj->doc_date);
-				$this->date_lim_reglement = $this->db->jdate($obj->date_lim_reglement);
 				$this->doc_type = $obj->doc_type;
 				$this->doc_ref = $obj->doc_ref;
 				$this->fk_doc = $obj->fk_doc;
@@ -663,7 +596,6 @@ class BookKeeping extends CommonObject
 				$this->code_journal = $obj->code_journal;
 				$this->journal_label = $obj->journal_label;
 				$this->piece_num = $obj->piece_num;
-				$this->date_creation = $this->db->jdate($obj->date_creation);
 			}
 			$this->db->free($resql);

@@ -691,15 +623,13 @@ class BookKeeping extends CommonObject
 	 * @param array $filter filter array
 	 * @param string $filtermode filter mode (AND or OR)
 	 *
-	 * @return int <0 if KO, >=0 if OK
+	 * @return int <0 if KO, >0 if OK
 	 */
 	public function fetchAllByAccount($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND') {
 		global $conf;

 		dol_syslog(__METHOD__, LOG_DEBUG);

-		$this->lines = array();
-
 		$sql = 'SELECT';
 		$sql .= ' t.rowid,';
 		$sql .= " t.doc_date,";
@@ -721,8 +651,7 @@ class BookKeeping extends CommonObject
 		$sql .= " t.import_key,";
 		$sql .= " t.code_journal,";
 		$sql .= " t.journal_label,";
-		$sql .= " t.piece_num,";
-		$sql .= " t.date_creation";
+		$sql .= " t.piece_num";
 		// Manage filter
 		$sqlwhere = array ();
 		if (count($filter) > 0) {
@@ -739,8 +668,6 @@ class BookKeeping extends CommonObject
 					$sqlwhere[] = $key . ' LIKE \'' . $this->db->escape($value) . '%\'';
 				} elseif ($key == 't.label_operation') {
 					$sqlwhere[] = $key . ' LIKE \'' . $this->db->escape($value) . '%\'';
-				} elseif ($key == 't.date_creation>=' || $key == 't.date_creation<=') {
-					$sqlwhere[] = $key . '\'' . $this->db->idate($value) . '\'';
 				} else {
 					$sqlwhere[] = $key . ' LIKE \'%' . $this->db->escape($value) . '%\'';
 				}
@@ -760,6 +687,7 @@ class BookKeeping extends CommonObject
 		if (! empty($limit)) {
 			$sql .= ' ' . $this->db->plimit($limit + 1, $offset);
 		}
+		$this->lines = array ();

 		$resql = $this->db->query($sql);
 		if ($resql) {
@@ -790,7 +718,6 @@ class BookKeeping extends CommonObject
 				$line->code_journal = $obj->code_journal;
 				$line->journal_label = $obj->journal_label;
 				$line->piece_num = $obj->piece_num;
-				$line->date_creation = $obj->date_creation;

 				$this->lines[] = $line;
 			}
@@ -801,7 +728,7 @@ class BookKeeping extends CommonObject
 			$this->errors[] = 'Error ' . $this->db->lasterror();
 			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);

-			return -1;
+			return - 1;
 		}
 	}

@@ -843,9 +770,7 @@ class BookKeeping extends CommonObject
 		$sql .= " t.import_key,";
 		$sql .= " t.code_journal,";
 		$sql .= " t.journal_label,";
-		$sql .= " t.piece_num,";
-		$sql .= " t.date_creation,";
-		$sql .= " t.tms as date_modification";
+		$sql .= " t.piece_num";
 		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
 		// Manage filter
 		$sqlwhere = array ();
@@ -861,18 +786,13 @@ class BookKeeping extends CommonObject
 					$sqlwhere[] = $key . '=' . $value;
 				} elseif ($key == 't.subledger_account' || $key == 't.numero_compte') {
 					$sqlwhere[] = $key . ' LIKE \'' . $this->db->escape($value) . '%\'';
-				} elseif ($key == 't.date_creation>=' || $key == 't.date_creation<=') {
-					$sqlwhere[] = $key . '\'' . $this->db->idate($value) . '\'';
-				} elseif ($key == 't.tms>=' || $key == 't.tms<=') {
-					$sqlwhere[] = $key . '\'' . $this->db->idate($value) . '\'';
-				} elseif ($key == 't.credit' || $key == 't.debit') {
-					$sqlwhere[] = natural_search($key, $value, 1, 1);
 				} else {
-					$sqlwhere[] = natural_search($key, $value, 0, 1);
+					$sqlwhere[] = $key . ' LIKE \'%' . $this->db->escape($value) . '%\'';
 				}
 			}
 		}
-		$sql.= ' WHERE entity IN (' . getEntity('accountancy') . ')';
+		$sql.= ' WHERE 1 = 1';
+		$sql .= " AND entity IN (" . getEntity('accountancy') . ")";
 		if (count($sqlwhere) > 0) {
 			$sql .= ' AND ' . implode(' ' . $filtermode . ' ', $sqlwhere);
 		}
@@ -914,8 +834,6 @@ class BookKeeping extends CommonObject
 				$line->code_journal = $obj->code_journal;
 				$line->journal_label = $obj->journal_label;
 				$line->piece_num = $obj->piece_num;
-				$line->date_creation = $this->db->jdate($obj->date_creation);
-				$line->date_modification = $this->db->jdate($obj->date_modification);

 				$this->lines[] = $line;
 			}
@@ -942,12 +860,9 @@ class BookKeeping extends CommonObject
 	 *
 	 * @return int <0 if KO, >0 if OK
 	 */
-	public function fetchAllBalance($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
-	{
+	public function fetchAllBalance($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND') {
 		global $conf;

-		$this->lines = array();
-
 		dol_syslog(__METHOD__, LOG_DEBUG);

 		$sql = 'SELECT';
@@ -990,6 +905,7 @@ class BookKeeping extends CommonObject
 		if (! empty($limit)) {
 			$sql .= ' ' . $this->db->plimit($limit + 1, $offset);
 		}
+		$this->lines = array ();

 		$resql = $this->db->query($sql);
 		if ($resql) {
@@ -1156,26 +1072,22 @@ class BookKeeping extends CommonObject
 	 * @param  string  $mode           Mode
 	 * @return number                  <0 if KO, >0 if OK
 	 */
-	public function updateByMvt($piece_num='', $field='', $value='', $mode='')
-	{
-		$error=0;
-
+	public function updateByMvt($piece_num='', $field='', $value='', $mode='') {
 		$this->db->begin();
-
 		$sql = "UPDATE " . MAIN_DB_PREFIX .  $this->table_element . $mode . " as ab";
 		$sql .= ' SET ab.' . $field . '=' . (is_numeric($value)?$value:"'".$value."'");
 		$sql .= ' WHERE ab.piece_num=' . $piece_num ;
 		$resql = $this->db->query($sql);

 		if (! $resql) {
-			$error++;
+			$error ++;
 			$this->errors[] = 'Error ' . $this->db->lasterror();
 			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
 		}
 		if ($error) {
 			$this->db->rollback();

-			return -1 * $error;
+			return - 1 * $error;
 		} else {
 			$this->db->commit();

@@ -1305,18 +1217,19 @@ class BookKeeping extends CommonObject
 	/**
 	 * Delete bookkepping by piece number
 	 *
-	 * @param 	int 	$piecenum 	Piecenum to delete
-	 * @return 	int 				Result
+	 * @param int $piecenum peicenum to delete
+	 * @param string $mode Mode
+	 * @return int Result
 	 */
-	function deleteMvtNum($piecenum) {
+	function deleteMvtNum($piecenum, $mode) {
 		global $conf;

 		$this->db->begin();

 		// first check if line not yet in bookkeeping
 		$sql = "DELETE";
-		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
-		$sql .= " WHERE piece_num = " . (int) $piecenum;
+		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element. $mode;
+		$sql .= " WHERE piece_num = " . $piecenum;
 		$sql .= " AND entity IN (" . getEntity('accountancy') . ")";

 		$resql = $this->db->query($sql);
@@ -1413,7 +1326,6 @@ class BookKeeping extends CommonObject
 		$this->code_journal = 'VT';
 		$this->journal_label = 'Journal de vente';
 		$this->piece_num = '';
-		$this->date_creation = $now;
 	}

 	/**
@@ -1426,7 +1338,7 @@ class BookKeeping extends CommonObject
 	public function fetchPerMvt($piecenum, $mode='') {
 		global $conf;

-		$sql = "SELECT piece_num,doc_date,code_journal,journal_label,doc_ref,doc_type,date_creation";
+		$sql = "SELECT piece_num,doc_date,code_journal,journal_label,doc_ref,doc_type";
 		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element.$mode;
 		$sql .= " WHERE piece_num = " . $piecenum;
 		$sql .= " AND entity IN (" . getEntity('accountancy') . ")";
@@ -1442,7 +1354,6 @@ class BookKeeping extends CommonObject
 			$this->doc_date = $this->db->jdate($obj->doc_date);
 			$this->doc_ref = $obj->doc_ref;
 			$this->doc_type = $obj->doc_type;
-			$this->date_creation = $obj->date_creation;
 		} else {
 			$this->error = "Error " . $this->db->lasterror();
 			dol_syslog(get_class($this) . "::" . __METHOD__ . $this->error, LOG_ERR);
@@ -1493,7 +1404,7 @@ class BookKeeping extends CommonObject
 		$sql = "SELECT rowid, doc_date, doc_type,";
 		$sql .= " doc_ref, fk_doc, fk_docdet, thirdparty_code, subledger_account, subledger_label,";
 		$sql .= " numero_compte, label_compte, label_operation, debit, credit,";
-		$sql .= " montant, sens, fk_user_author, import_key, code_journal, journal_label, piece_num, date_creation";
+		$sql .= " montant, sens, fk_user_author, import_key, code_journal, journal_label, piece_num";
 		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element.$mode;
 		$sql .= " WHERE piece_num = " . $piecenum;
 		$sql .= " AND entity IN (" . getEntity('accountancy') . ")";
@@ -1526,7 +1437,6 @@ class BookKeeping extends CommonObject
 				$line->code_journal = $obj->code_journal;
 				$line->journal_label = $obj->journal_label;
 				$line->piece_num = $obj->piece_num;
-				$line->date_creation = $obj->date_creation;

 				$this->linesmvt[] = $line;
 			}
@@ -1605,16 +1515,11 @@ class BookKeeping extends CommonObject
 	 * @param  string   $piece_num     Piece num
 	 * @return void
 	 */
-	public function transformTransaction($direction=0,$piece_num='')
-	{
-		$error = 0;
-
+	public function transformTransaction($direction=0,$piece_num='') {
 		$this->db->begin();
-
-		if ($direction==0)
-		{
+		if ($direction==0) {
 			$next_piecenum=$this->getNextNumMvt();
-			if ($next_piecenum < 0) {
+			if ($result < 0) {
 				$error++;
 			}
 			$sql = 'INSERT INTO ' . MAIN_DB_PREFIX . $this->table_element.'(doc_date, doc_type,';
@@ -1865,5 +1770,4 @@ class BookKeepingLine
 	public $code_journal;
 	public $journal_label;
 	public $piece_num;
-	public $date_creation;
 }
--- a/htdocs/accountancy/class/lettering.class.php
+++ b/htdocs/accountancy/class/lettering.class.php
@@ -18,297 +18,313 @@
 */

 /**
- * \file accountancy/class/bookkeeping.class.php
- * \ingroup Advanced accountancy
- * \brief 	File of class for lettering
+ * \file      accountancy/class/bookkeeping.class.php
+ * \ingroup   Accounting Expert
+ * \brief     Fichier de la classe des comptes comptable
 */
-include_once DOL_DOCUMENT_ROOT . "/accountancy/class/bookkeeping.class.php";
-include_once DOL_DOCUMENT_ROOT . "/societe/class/societe.class.php";
-include_once DOL_DOCUMENT_ROOT . "/core/lib/date.lib.php";
+
+include_once DOL_DOCUMENT_ROOT."/accountancy/class/bookkeeping.class.php";
+include_once DOL_DOCUMENT_ROOT."/societe/class/societe.class.php";
+include_once DOL_DOCUMENT_ROOT."/core/lib/date.lib.php";
+

 /**
 * Class lettering
 */
 class lettering extends BookKeeping
 {
-	/**
-	 * lettrageTiers
-	 *
-	 * @param int $socid Thirdparty id
-	 * @return void
-	 */
-	public function lettrageTiers($socid)
-	{
-		global $conf;
+    /**
+     * lettrageTiers
+     *
+     * @param   int   $socid      Thirdparty id
+     * @return  void
+     */
+	public function lettrageTiers($socid) {

-		$error = 0;
+		$db = $this->db;

 		$object = new Societe($this->db);
 		$object->id = $socid;
 		$object->fetch($socid);

-		if ($object->code_compta == '411CUSTCODE') {
+
+		if( $object->code_compta == '411CUSTCODE')
 			$object->code_compta = '';
+
+		if( $object->code_compta_fournisseur == '401SUPPCODE')
+			$object->code_compta_fournisseur = '';
+
+
+
+		$sql = "SELECT bk.rowid, bk.doc_date, bk.doc_type, bk.lettering_code, bk.code_tiers, bk.numero_compte , bk.label_compte, bk.debit , bk.credit, bk.montant , bk.sens , bk.code_journal , bk.piece_num, bk.date_lettering ";
+		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as bk";
+			$sql .= " WHERE code_journal = 'BQ' AND  ( ";
+		if(!empty($object->code_compta)  )
+			$sql .= "  bk.code_tiers = '" . $object->code_compta . "'  ";
+		if(!empty($object->code_compta) &&  !empty($object->code_compta_fournisseur) )
+			$sql .= "  OR  ";
+		if(!empty($object->code_compta_fournisseur)  )
+		$sql .= "   bk.code_tiers = '" . $object->code_compta_fournisseur . "' ";
+
+		$sql .= " ) AND ( bk.date_lettering ='' OR bk.date_lettering IS NULL ) AND bk.lettering_code  !='' ";
+
+		$sql .= " GROUP BY bk.lettering_code  ";
+
+
+		$resql = $db->query ( $sql );
+		if ($resql) {
+			$num = $db->num_rows ( $resql );
+			$i = 0;
+
+			while ( $i < $num ) {
+				$obj = $db->fetch_object ( $resql );
+				$i++;
+
+					$sql = "SELECT  bk.rowid  ";
+					$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as bk";
+					$sql .= " WHERE  bk.lettering_code = '".$obj->lettering_code."' ";
+										$sql .= " AND ( ";
+						if(!empty($object->code_compta)  )
+							$sql .= "  bk.code_tiers = '" . $object->code_compta . "'  ";
+						if(!empty($object->code_compta) &&  !empty($object->code_compta_fournisseur) )
+							$sql .= "  OR  ";
+						if(!empty($object->code_compta_fournisseur)  )
+							$sql .= "   bk.code_tiers = '" . $object->code_compta_fournisseur . "' ";
+						$sql .= " )  ";
+// echo $sql;
+					$resql2 = $db->query ( $sql );
+					if ($resql2) {
+						$num2 = $db->num_rows ( $resql2 );
+						$i2 = 0;
+						$ids = array();
+						while ( $i2 < $num2 ) {
+							$obj2 = $db->fetch_object ( $resql2 );
+							$i2++;
+							$ids[] = $obj2->rowid;
+						}
+
+
+						if(count($ids)  > 1 ){
+							$result =  $this->updatelettrage($ids);
+
+						// 	var_dump($result);
+// 							if( $result < 0 ){
+// 								setEventMessages('', $BookKeeping->errors, 'errors' );
+// 								$error++;
+//
+// 							}
+						}
+					}
+			}
 		}

-		if ($object->code_compta_fournisseur == '401SUPPCODE') {
-			$object->code_compta_fournisseur = '';
-		}

 		/**
-		 * Prise en charge des lettering complexe avec prelevment , virement
-		 */
-		$sql = "SELECT DISTINCT bk.rowid, bk.doc_date, bk.doc_type, bk.doc_ref, bk.subledger_account, ";
-		$sql .= " bk.numero_compte , bk.label_compte, bk.debit , bk.credit, bk.montant ";
-		$sql .= " , bk.sens , bk.code_journal , bk.piece_num, bk.date_lettering, bu.url_id , bu.type ";
+			Prise en charge des lettering complexe avec prelevment , virement
+		*/
+		$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, bk.date_lettering, bu.url_id , bu.type ";
 		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as bk";
 		$sql .= " LEFT JOIN  " . MAIN_DB_PREFIX . "bank_url as bu ON(bk.fk_doc = bu.fk_bank AND bu.type IN ('payment', 'payment_supplier') ) ";
-		$sql .= " WHERE   ( ";
-		if (! empty($object->code_compta))
-			$sql .= "  bk.subledger_account = '" . $object->code_compta . "'  ";
-		if (! empty($object->code_compta) && ! empty($object->code_compta_fournisseur))
+		$sql .= " WHERE code_journal = 'BQ' AND  ( ";
+		if(!empty($object->code_compta)  )
+			$sql .= "  bk.code_tiers = '" . $object->code_compta . "'  ";
+		if(!empty($object->code_compta) &&  !empty($object->code_compta_fournisseur) )
 			$sql .= "  OR  ";
-		if (! empty($object->code_compta_fournisseur))
-			$sql .= "   bk.subledger_account = '" . $object->code_compta_fournisseur . "' ";
+		if(!empty($object->code_compta_fournisseur)  )
+		$sql .= "   bk.code_tiers = '" . $object->code_compta_fournisseur . "' ";

-		$sql .= " ) AND (bk.date_lettering ='' OR bk.date_lettering IS NULL) ";
-		$sql .= "  AND (bk.lettering_code != '' OR bk.lettering_code IS NULL) ";
-		$sql .= $this->db->order('bk.doc_date', 'DESC');
+		$sql .= " ) AND date_lettering ='' ";
+		$sql .= " GROUP BY bk.lettering_code  ";

-		// echo $sql;
-		//
-		$resql = $this->db->query($sql);
+// 		echo $sql;
+//
+		$resql = $db->query ( $sql );
 		if ($resql) {
-			$num = $this->db->num_rows($resql);
+			$num = $db->num_rows ( $resql );
+			$i = 0;

-			while ($obj = $this->db->fetch_object($resql) ) {
+			while ( $i < $num ) {
+				$obj = $db->fetch_object ( $resql );
 				$ids = array();
-				$ids_fact = array();
+				$i++;

-				if ($obj->type == 'payment_supplier')
-				{
-					$sql = 'SELECT DISTINCT bk.rowid, facf.ref, facf.ref_supplier, payf.fk_bank, facf.rowid as fact_id';
-					$sql .= " FROM " . MAIN_DB_PREFIX . "facture_fourn facf ";
-					$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn_facturefourn as payfacf ON  payfacf.fk_facturefourn=facf.rowid";
-					$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn as payf ON  payfacf.fk_paiementfourn=payf.rowid";
-					$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "accounting_bookkeeping as bk ON (bk.fk_doc = payf.fk_bank AND bk.code_journal='" . $obj->code_journal . "')";
-					$sql .= " WHERE payfacf.fk_paiementfourn = '" . $obj->url_id . "' ";
-					$sql .= " AND facf.entity = ".$conf->entity;
-					$sql .= " AND code_journal IN (SELECT code FROM " . MAIN_DB_PREFIX . "accounting_journal WHERE nature=4 AND entity=".$conf->entity.") ";
-					$sql .= " AND ( ";
-					if (! empty($object->code_compta)) {
-						$sql .= "  bk.subledger_account = '" . $object->code_compta . "'  ";
-					}
-					if (! empty($object->code_compta) && ! empty($object->code_compta_fournisseur)) {
-						$sql .= "  OR  ";
-					}
-					if (! empty($object->code_compta_fournisseur)) {
-						$sql .= "   bk.subledger_account = '" . $object->code_compta_fournisseur . "' ";
-					}
-					$sql .= " )  ";
+	// 			print_r($obj);

-					$resql2 = $this->db->query($sql);
-					if ($resql2) {
-						while ( $obj2 = $this->db->fetch_object($resql2) ) {
-							$ids[$obj2->rowid] = $obj2->rowid;
-							$ids_fact[] = $obj2->fact_id;
-						}
-					} else {
-						$this->errors[] = $this->db->lasterror;
-						return - 1;
-					}
-					if (count($ids_fact)) {
-						$sql = 'SELECT bk.rowid, facf.ref, facf.ref_supplier ';
-						$sql .= " FROM " . MAIN_DB_PREFIX . "facture_fourn facf ";
-						$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "accounting_bookkeeping as bk ON(  bk.fk_doc = facf.rowid AND facf.rowid IN (" . implode(',', $ids_fact) . "))";
-						$sql .= " WHERE bk.code_journal IN (SELECT code FROM " . MAIN_DB_PREFIX . "accounting_journal WHERE nature=3 AND entity=".$conf->entity.") ";
-						$sql .= " AND facf.entity = ".$conf->entity;
+
+
+					if($obj->type =='payment_supplier' ) {
+						$ids[] = $obj->rowid;
+
+					$sql= 'SELECT bk.rowid, facf.ref, facf.ref_supplier, payf.fk_bank ';
+					$sql.= " FROM " . MAIN_DB_PREFIX . "facture_fourn facf ";
+					$sql.= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn_facturefourn as payfacf ON  payfacf.fk_facturefourn=facf.rowid";
+					$sql.= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn as payf ON  payfacf.fk_paiementfourn=payf.rowid";
+					$sql.= " INNER JOIN " .MAIN_DB_PREFIX .  "accounting_bookkeeping as bk ON(  bk.fk_doc = facf.ref) ";
+	// 				$sqlmid.= " LEFT JOIN " . MAIN_DB_PREFIX . "societe as soc ON  soc.rowid=facf.fk_soc";
+	// 				$sqlmid.= " INNER JOIN " . MAIN_DB_PREFIX . "c_paiement as payc ON  payc.id=payf.fk_paiement";
+						$sql .= " WHERE 1   ";
+						$sql .= "   AND  fk_paiementfourn = '".$obj->url_id."' ";
+	// 					$sql .= " AND (bk.numero_compte = '" . $object->code_compta . "' OR  bk.numero_compte = '" . $object->code_compta_fournisseur . "') ";
 						$sql .= " AND ( ";
-						if (! empty($object->code_compta)) {
-							$sql .= "  bk.subledger_account = '" . $object->code_compta . "'  ";
-						}
-						if (! empty($object->code_compta) && ! empty($object->code_compta_fournisseur)) {
+						if(!empty($object->code_compta)  )
+							$sql .= "  bk.code_tiers = '" . $object->code_compta . "'  ";
+						if(!empty($object->code_compta) &&  !empty($object->code_compta_fournisseur) )
 							$sql .= "  OR  ";
-						}
-						if (! empty($object->code_compta_fournisseur)) {
-							$sql .= "   bk.subledger_account = '" . $object->code_compta_fournisseur . "' ";
-						}
+						if(!empty($object->code_compta_fournisseur)  )
+							$sql .= "   bk.code_tiers = '" . $object->code_compta_fournisseur . "' ";
+						$sql .= " )  ";
+	// 					echo $sql;
+	// 					exit;
+					}
+					elseif($obj->type =='payment' ){
+						$ids[] = $obj->rowid;
+
+						$sql= 'SELECT bk.rowid,fac.facnumber , pay.fk_bank ';
+						$sql.= " FROM " . MAIN_DB_PREFIX . "facture fac ";
+						$sql.= " INNER JOIN " . MAIN_DB_PREFIX . "paiement_facture as payfac ON  payfac.fk_facture=fac.rowid";
+						$sql.= " INNER JOIN " . MAIN_DB_PREFIX . "paiement as pay ON  payfac.fk_paiement=pay.rowid";
+						$sql.= " INNER JOIN " .MAIN_DB_PREFIX .  "accounting_bookkeeping as bk ON(  bk.fk_doc = fac.rowid) ";
+						$sql .= " WHERE 1   ";
+						$sql .= "   AND   payfac.fk_paiement = '".$obj->url_id."' ";
+						$sql .= " AND ( ";
+						if(!empty($object->code_compta)  )
+							$sql .= "  bk.code_tiers = '" . $object->code_compta . "'  ";
+						if(!empty($object->code_compta) &&  !empty($object->code_compta_fournisseur) )
+							$sql .= "  OR  ";
+						if(!empty($object->code_compta_fournisseur)  )
+							$sql .= "   bk.code_tiers = '" . $object->code_compta_fournisseur . "' ";
 						$sql .= " )  ";

-						$resql2 = $this->db->query($sql);
-						if ($resql2) {
-							while ( $obj2 = $this->db->fetch_object($resql2) ) {
-								$ids[$obj2->rowid] = $obj2->rowid;
-							}
-						} else {
-							$this->errors[] = $this->db->lasterror;
-							return - 1;
-						}
+	// 					echo $sql;
 					}
-				} elseif ($obj->type == 'payment') {

-					$sql = 'SELECT DISTINCT bk.rowid, fac.ref, fac.ref, pay.fk_bank, fac.rowid as fact_id';
-					$sql .= " FROM " . MAIN_DB_PREFIX . "facture fac ";
-					$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement_facture as payfac ON  payfac.fk_facture=fac.rowid";
-					$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement as pay ON  payfac.fk_paiement=pay.rowid";
-					$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "accounting_bookkeeping as bk ON (bk.fk_doc = pay.fk_bank AND bk.code_journal='" . $obj->code_journal . "')";
-					$sql .= " WHERE payfac.fk_paiement = '" . $obj->url_id . "' ";
-					$sql .= " AND bk.code_journal IN (SELECT code FROM " . MAIN_DB_PREFIX . "accounting_journal WHERE nature=4 AND entity=".$conf->entity.") ";
-					$sql .= " AND fac.entity = ".$conf->entity;
-					$sql .= " AND ( ";
-					if (! empty($object->code_compta)) {
-						$sql .= "  bk.subledger_account = '" . $object->code_compta . "'  ";
-					}
-					if (! empty($object->code_compta) && ! empty($object->code_compta_fournisseur)) {
-						$sql .= "  OR  ";
-					}
-					if (! empty($object->code_compta_fournisseur)) {
-						$sql .= "   bk.subledger_account = '" . $object->code_compta_fournisseur . "' ";
-					}
-					$sql .= " )  ";

-					$resql2 = $this->db->query($sql);
+
+					$resql2 = $db->query ( $sql );
 					if ($resql2) {
-						while ( $obj2 = $this->db->fetch_object($resql2) ) {
-							$ids[$obj2->rowid] = $obj2->rowid;
-							$ids_fact[] = $obj2->fact_id;
-						}
-					} else {
-						$this->errors[] = $this->db->lasterror;
-						return - 1;
-					}
-					if (count($ids_fact)) {
-						$sql = 'SELECT bk.rowid, fac.ref, fac.ref_supplier ';
-						$sql .= " FROM " . MAIN_DB_PREFIX . "facture fac ";
-						$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "accounting_bookkeeping as bk ON(  bk.fk_doc = fac.rowid AND fac.rowid IN (" . implode(',', $ids_fact) . "))";
-						$sql .= " WHERE code_journal IN (SELECT code FROM " . MAIN_DB_PREFIX . "accounting_journal WHERE nature=2 AND entity=".$conf->entity.") ";
-						$sql .= " AND fac.entity = ".$conf->entity;
-						$sql .= " AND ( ";
-						if (! empty($object->code_compta)) {
-							$sql .= "  bk.subledger_account = '" . $object->code_compta . "'  ";
-						}
-						if (! empty($object->code_compta) && ! empty($object->code_compta_fournisseur)) {
-							$sql .= "  OR  ";
-						}
-						if (! empty($object->code_compta_fournisseur)) {
-							$sql .= "   bk.subledger_account = '" . $object->code_compta_fournisseur . "' ";
-						}
-						$sql .= " )  ";
+						$num2 = $db->num_rows ( $resql2 );
+						$i2 = 0;

-						$resql2 = $this->db->query($sql);
-						if ($resql2) {
-							while ( $obj2 = $this->db->fetch_object($resql2) ) {
-								$ids[$obj2->rowid] = $obj2->rowid;
-							}
-						} else {
-							$this->errors[] = $this->db->lasterror;
-							return - 1;
+						while ( $i2 < $num2 ) {
+							$obj2 = $db->fetch_object ( $resql2 );
+							$i2++;
+							$ids[] = $obj2->rowid;
 						}
-					}
-				}

-				if (count($ids) > 1) {
-					$result = $this->updatelettrage($ids);
-				}
+	// 					print_r($ids);
+	// 					exit;
+						if(count($ids)  > 1 ){
+							$result =  $this->updatelettrage($ids);
+
+	// 						var_dump($result);
+// 							if( $result < 0 ){
+// 								setEventMessages('', $BookKeeping->errors, 'errors' );
+// 								$error++;
+//
+// 							}
+						}
+
+	// 					exit;
+					}
 			}
 		}
-		if ($error) {
-			foreach ( $this->errors as $errmsg ) {
-				dol_syslog(get_class($this) . "::" . __METHOD__ . $errmsg, LOG_ERR);
-				$this->error .= ($this->error ? ', ' . $errmsg : $errmsg);
-			}
-			return - 1 * $error;
-		} else {
-			return 1;
-		}
+
+
 	}

-	/**
-	 *
-	 * @param array $ids ids array
-	 * @param boolean $notrigger no trigger
- 	 * @return number
-	 */
-	public function updateLettrage($ids = array(), $notrigger = false)
-	{
+
+	public function updatelettrage($ids, $notrigger=false){
 		$error = 0;
-		$lettre = 'AAA';

-		dol_syslog(get_class($this) . "::" . __METHOD__, LOG_DEBUG);
-
-		$sql = "SELECT DISTINCT lettering_code FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping WHERE ";
-		$sql .= " lettering_code != '' ORDER BY lettering_code DESC limit 1;  ";
-
-		$result = $this->db->query($sql);
+		$sql = "SELECT lettering_code FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping WHERE ";
+		$sql .= " lettering_code != '' GROUP BY lettering_code ORDER BY lettering_code DESC limit 1;  ";
+// 		echo $sql;
+		$result = $this->db->query ( $sql );
 		if ($result) {
-			$obj = $this->db->fetch_object($result);
-			$lettre = (empty($obj->lettering_code) ? 'AAA' : $obj->lettering_code);
-			if (! empty($obj->lettering_code))
+			$obj = $this->db->fetch_object ( $result );
+			$lettre = (empty($obj->lettering_code)? 'AAA' : $obj->lettering_code );
+			if(!empty($obj->lettering_code))
 				$lettre++;
-		} else {
-			$this->errors[] = 'Error' . $this->db->lasterror();
+		}
+		else{
+			$this->errors[] = 'Error'.$this->db->lasterror();;
 			$error++;
 		}
+// 			var_dump(__line__, $error);

 		$sql = "SELECT SUM(ABS(debit)) as deb, SUM(ABS(credit)) as cred   FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping WHERE ";
-		$sql .= " rowid IN (" . implode(',', $ids) . ") ";
-		$result = $this->db->query($sql);
+		$sql .= " rowid IN (".implode(',', $ids).") ";
+		$result = $this->db->query ( $sql );
 		if ($result) {
-			$obj = $this->db->fetch_object($result);
-			if (! (round(abs($obj->deb), 2) === round(abs($obj->cred), 2))) {
-				$this->errors[] = 'Total not exacts ' . round(abs($obj->deb), 2) . ' vs ' . round(abs($obj->cred), 2);
+			$obj = $this->db->fetch_object ( $result );
+// 			print_r($obj);
+			if( !(round(abs($obj->deb),2) === round(abs($obj->cred),2)) ){
+// 				echo $sql;
+// 				print_r($obj);
+				$this->errors[] = 'Total not exacts '.round(abs($obj->deb),2).' vs '. round(abs($obj->cred),2);
 				$error++;
 			}
-		} else {
-			$this->errors[] = 'Erreur sql' . $this->db->lasterror();
+		}
+		else{
+			$this->errors[] = 'Erreur sql'.$this->db->lasterror();;
 			$error++;
 		}

+
 		// Update request

 		$now = dol_now();

-		if (! $error)
-		{
-			$sql = "UPDATE " . MAIN_DB_PREFIX . "accounting_bookkeeping SET";
-			$sql .= " lettering_code='" . $lettre . "'";
-			$sql .= " , date_lettering = '" . $this->db->idate($now) . "'"; // todo correct date it's false
-			$sql .= "  WHERE rowid IN (" . implode(',', $ids) . ") ";
-			$this->db->begin();
+		$sql = "UPDATE ".MAIN_DB_PREFIX."accounting_bookkeeping SET";
+		$sql.= " lettering_code='".$lettre."'";
+		$sql.= " , date_lettering = " .$now ;  // todo correct date it's false
+		$sql.= "  WHERE rowid IN (".implode(',', $ids).") ";
+// 		echo $sql ;
+//
+// 		var_dump(__line__, $error);
+// 		print_r($this->errors);
+// 		exit;
+		$this->db->begin();

-			dol_syslog(get_class($this) . "::update sql=" . $sql, LOG_DEBUG);
+			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 (! $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.
+			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
+					//// 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);
+// 				var_dump(__line__, $error);
+			// 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();
+// 				echo $this->error;
+// 						var_dump(__line__, $error);
+				return -1*$error;
+			}
+			else
+			{
+				$this->db->commit();
+				return 1;
 			}
-			$this->db->rollback();
-			return - 1 * $error;
-		} else {
-			$this->db->commit();
-			return 1;
-		}
 	}
+
 }

--- a/htdocs/accountancy/customer/card.php
+++ b/htdocs/accountancy/customer/card.php
@@ -18,9 +18,9 @@
 */

 /**
- * \file 	htdocs/accountancy/customer/card.php
- * \ingroup Advanced accountancy
- * \brief 	Card customer ventilation
+ * \file htdocs/accountancy/customer/card.php
+ * \ingroup Accountancy
+ * \brief Card customer ventilation
 */
 require '../../main.inc.php';

@@ -33,9 +33,6 @@ $langs->load("bills");
 $langs->load("accountancy");

 $action = GETPOST('action', 'alpha');
-$cancel = GETPOST('cancel', 'alpha');
-$backtopage = GETPOST('backtopage', 'alpha');
-
 $codeventil = GETPOST('codeventil');
 $id = GETPOST('id');

@@ -43,21 +40,18 @@ $id = GETPOST('id');
 if ($user->societe_id > 0)
 	accessforbidden();

-
 /*
 * Actions
 */

-if ($action == 'ventil' && $user->rights->accounting->bind->write)
-{
-	if (! $cancel)
-	{
+if ($action == 'ventil' && $user->rights->accounting->bind->write) {
+	if (! GETPOST('cancel', 'alpha')) {
 	    if ($codeventil < 0) $codeventil = 0;
-
+	    
 		$sql = " UPDATE " . MAIN_DB_PREFIX . "facturedet";
 		$sql .= " SET fk_code_ventilation = " . $codeventil;
 		$sql .= " WHERE rowid = " . $id;
-
+		
 		$resql = $db->query($sql);
 		if (! $resql) {
 			setEventMessages($db->lasterror(), null, 'errors');
@@ -65,11 +59,6 @@ if ($action == 'ventil' && $user->rights->accounting->bind->write)
 		else
 		{
 		    setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
-		    if ($backtopage)
-		    {
-		    	header("Location: ".$backtopage);
-		    	exit();
-		    }
 		}
 	} else {
 		header("Location: ./lines.php");
@@ -120,7 +109,6 @@ if (! empty($id)) {
 			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 '<input type="hidden" name="backtopage" value="'.dol_escape_htmltag($backtopage).'">';

 			print load_fiche_titre($langs->trans('CustomersVentilation'), '', 'title_setup');

--- a/htdocs/accountancy/customer/index.php
+++ b/htdocs/accountancy/customer/index.php
@@ -1,9 +1,9 @@
 <?php
-/* Copyright (C) 2013       Olivier Geffroy		<jeff@jeffinfo.com>
- * Copyright (C) 2013-2014  Florian Henry		<florian.henry@open-concept.pro>
- * Copyright (C) 2013-2017  Alexandre Spangaro	<aspangaro@zendsi.com>
- * Copyright (C) 2014       Juanjo Menent		<jmenent@2byte.es>
- * Copyright (C) 2015       Jean-François Ferry	<jfefe@aternatik.fr>
+/* Copyright (C) 2013	  Olivier Geffroy		<jeff@jeffinfo.com>
+ * Copyright (C) 2013-2014 Florian Henry		<florian.henry@open-concept.pro>
+ * Copyright (C) 2013-2016 Alexandre Spangaro	<aspangaro@zendsi.com>
+ * Copyright (C) 2014	   Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2015	  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
@@ -21,9 +21,9 @@
 */

 /**
- * \file 	htdocs/accountancy/customer/index.php
+ * \file htdocs/accountancy/customer/index.php
 * \ingroup Advanced accountancy
- * \brief 	Home customer journalization page
+ * \brief Home customer journalization page
 */

 require '../../main.inc.php';
@@ -47,24 +47,15 @@ if ($user->societe_id > 0)
 if (! $user->rights->accounting->bind->write)
 	accessforbidden();

-
-$month_start= ($conf->global->SOCIETE_FISCAL_MONTH_START?($conf->global->SOCIETE_FISCAL_MONTH_START):1);
-if (GETPOST("year",'int')) $year_start = GETPOST("year",'int');
-else
-{
-	$year_start = dol_print_date(dol_now(), '%Y');
-	if (dol_print_date(dol_now(), '%m') < $month_start) $year_start--;	// If current month is lower that starting fiscal month, we start last year
+// Filter
+$year = GETPOST("year",'int');
+if ($year == 0) {
+	$year_current = strftime("%Y", time());
+	$year_start = $year_current;
+} else {
+	$year_current = $year;
+	$year_start = $year;
 }
-$year_end = $year_start + 1;
-$month_end = $month_start - 1;
-if ($month_end < 1)
-{
-	$month_end = 12;
-	$year_end--;
-}
-$search_date_start = dol_mktime(0, 0, 0, $month_start, 1, $year_start);
-$search_date_end = dol_get_last_day($year_end, $month_end);
-$year_current = $year_start;

 // Validate History
 $action = GETPOST('action','aZ09');
@@ -117,6 +108,53 @@ if ($action == 'validatehistory') {
 		$db->commit();
 		setEventMessages($langs->trans('AutomaticBindingDone'), null, 'mesgs');
 	}
+} elseif ($action == 'fixaccountancycode') {
+	$error = 0;
+	$db->begin();
+
+	$sql1 = "UPDATE " . MAIN_DB_PREFIX . "facturedet as fd";
+	$sql1 .= " SET fk_code_ventilation = 0";
+	$sql1 .= ' WHERE fd.fk_code_ventilation NOT IN ';
+	$sql1 .= '	(SELECT accnt.rowid ';
+	$sql1 .= '	FROM ' . MAIN_DB_PREFIX . 'accounting_account as accnt';
+	$sql1 .= '	INNER JOIN ' . MAIN_DB_PREFIX . 'accounting_system as syst';
+	$sql1 .= '	ON accnt.fk_pcg_version = syst.pcg_version AND syst.rowid=' . $conf->global->CHARTOFACCOUNTS . ')';
+
+	dol_syslog("htdocs/accountancy/customer/index.php fixaccountancycode", LOG_DEBUG);
+
+	$resql1 = $db->query($sql1);
+	if (! $resql1) {
+		$error ++;
+		$db->rollback();
+		setEventMessage($db->lasterror(), 'errors');
+	} else {
+		$db->commit();
+		setEventMessage($langs->trans('Done'), 'mesgs');
+	}
+} elseif ($action == 'cleanaccountancycode') {
+	$error = 0;
+	$db->begin();
+
+	// Now clean
+	$sql1 = "UPDATE " . MAIN_DB_PREFIX . "facturedet as fd";
+	$sql1.= " SET fk_code_ventilation = 0";
+	$sql1.= " WHERE fd.fk_facture IN ( SELECT f.rowid FROM " . MAIN_DB_PREFIX . "facture as f";
+	$sql1.= " WHERE f.datef >= '" . $db->idate(dol_get_first_day($year_current, 1, false)) . "'";
+	$sql1.= " AND f.datef <= '" . $db->idate(dol_get_last_day($year_current, 12, false)) . "'";
+	$sql1.= " AND f.entity IN (" . getEntity('accountancy') . ")";
+	$sql1.=")";
+
+	dol_syslog("htdocs/accountancy/customer/index.php fixaccountancycode", LOG_DEBUG);
+
+	$resql1 = $db->query($sql1);
+	if (! $resql1) {
+		$error ++;
+		$db->rollback();
+		setEventMessage($db->lasterror(), 'errors');
+	} else {
+		$db->commit();
+		setEventMessage($langs->trans('Done'), 'mesgs');
+	}
 }


@@ -131,63 +169,61 @@ $textnextyear = '&nbsp;<a href="' . $_SERVER["PHP_SELF"] . '?year=' . ($year_cur

 print load_fiche_titre($langs->trans("CustomersVentilation") . " " . $textprevyear . " " . $langs->trans("Year") . " " . $year_start . " " . $textnextyear, '', 'title_accountancy');

-// Clean database
-$db->begin();
-$sql1 = "UPDATE " . MAIN_DB_PREFIX . "facturedet as fd";
-$sql1 .= " SET fk_code_ventilation = 0";
-$sql1 .= ' WHERE fd.fk_code_ventilation NOT IN ';
-$sql1 .= '	(SELECT accnt.rowid ';
-$sql1 .= '	FROM ' . MAIN_DB_PREFIX . 'accounting_account as accnt';
-$sql1 .= '	INNER JOIN ' . MAIN_DB_PREFIX . 'accounting_system as syst';
-$sql1 .= '	ON accnt.fk_pcg_version = syst.pcg_version AND syst.rowid=' . $conf->global->CHARTOFACCOUNTS . ')';
-dol_syslog("htdocs/accountancy/customer/index.php fixaccountancycode", LOG_DEBUG);
-$resql1 = $db->query($sql1);
-if (! $resql1) {
-	$error ++;
-	$db->rollback();
-	setEventMessage($db->lasterror(), 'errors');
-} else {
-	$db->commit();
-}
-// End clean database
-
 print $langs->trans("DescVentilCustomer") . '<br>';
 print $langs->trans("DescVentilMore", $langs->transnoentitiesnoconv("ValidateHistory"), $langs->transnoentitiesnoconv("ToBind")) . '<br>';
 print '<br>';
+//print '<div class="inline-block divButAction">';
+// TODO Remove this. Should be done always or into the repair.php script.
+if ($conf->global->MAIN_FEATURES_LEVEL > 1) print '<a class="butActionDelete" href="' . $_SERVER['PHP_SELF'] . '?year=' . $year_current . '&action=fixaccountancycode">' . $langs->trans("CleanFixHistory", $year_current) . '</a>';
+//print '</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";
+$sql .= " AND f.fk_statut > 0";
+if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+	$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_SITUATION . ")";
+} else {
+	$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_DEPOSIT . "," . Facture::TYPE_SITUATION . ")";
+}
+$sql .= " AND f.entity IN (" . getEntity('facture', 0) . ")";	// We don't share object for accountancy
+
+dol_syslog('htdocs/accountancy/customer/index.php');
+$result = $db->query($sql);
+if ($result) {
+	$row = $db->fetch_row($result);
+	$nbfac = $row[0];
+	$db->free($result);
+}

 $y = $year_current;

 $buttonbind = '<a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?year=' . $year_current . '&action=validatehistory">' . $langs->trans("ValidateHistory") . '</a>';
+$buttonreset = '<a class="butActionDelete" href="' . $_SERVER['PHP_SELF'] . '?year=' . $year_current . '&action=cleanaccountancycode">' . $langs->trans("CleanHistory", $year_current) . '</a>';


 print_fiche_titre($langs->trans("OverviewOfAmountOfLinesNotBound"), $buttonbind, '');

-print '<div class="div-table-responsive-no-min">';
 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>';
 for($i = 1; $i <= 12; $i ++) {
-	$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START?$conf->global->SOCIETE_FISCAL_MONTH_START:1) - 1;
-	if ($j > 12) $j-=12;
-	print '<td width="60" align="right">' . $langs->trans('MonthShort' . str_pad($j, 2, '0', STR_PAD_LEFT)) . '</td>';
+	print '<td width="60" align="right">' . $langs->trans('MonthShort' . str_pad($i, 2, '0', STR_PAD_LEFT)) . '</td>';
 }
 print '<td width="60" align="right"><b>' . $langs->trans("Total") . '</b></td></tr>';

 $sql = "SELECT " . $db->ifsql('aa.account_number IS NULL', "'tobind'", 'aa.account_number') . " AS codecomptable,";
 $sql .= "  " . $db->ifsql('aa.label IS NULL', "'tobind'", 'aa.label') . " AS intitule,";
 for($i = 1; $i <= 12; $i ++) {
-	$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START?$conf->global->SOCIETE_FISCAL_MONTH_START:1) - 1;
-	if ($j > 12) $j-=12;
-	$sql .= "  SUM(" . $db->ifsql('MONTH(f.datef)=' . $j, 'fd.total_ht', '0') . ") AS month" . str_pad($j, 2, '0', STR_PAD_LEFT) . ",";
+	$sql .= "  SUM(" . $db->ifsql('MONTH(f.datef)=' . $i, 'fd.total_ht', '0') . ") AS month" . str_pad($i, 2, '0', STR_PAD_LEFT) . ",";
 }
 $sql .= "  SUM(fd.total_ht) 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 . "accounting_account as aa ON aa.rowid = fd.fk_code_ventilation";
-$sql .= " WHERE f.datef >= '" . $db->idate($search_date_start) . "'";
-$sql .= "  AND f.datef <= '" . $db->idate($search_date_end) . "'";
-$sql .= " AND f.fk_statut > 0";
+$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)) . "'";
 $sql .= " AND f.entity IN (" . getEntity('facture', 0) . ")";   // We don't share object for accountancy
 $sql .= " AND aa.account_number IS NULL";
 if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
@@ -230,40 +266,33 @@ if ($resql) {
 	print $db->lasterror(); // Show last sql error
 }
 print "</table>\n";
-print '</div>';


 print '<br>';


-print_fiche_titre($langs->trans("OverviewOfAmountOfLinesBound"), '', '');
+print_fiche_titre($langs->trans("OverviewOfAmountOfLinesBound"), $buttonreset, '');

-print '<div class="div-table-responsive-no-min">';
 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>';
 for($i = 1; $i <= 12; $i ++) {
-	$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START?$conf->global->SOCIETE_FISCAL_MONTH_START:1) - 1;
-	if ($j > 12) $j-=12;
-	print '<td width="60" align="right">' . $langs->trans('MonthShort' . str_pad($j, 2, '0', STR_PAD_LEFT)) . '</td>';
+	print '<td width="60" align="right">' . $langs->trans('MonthShort' . str_pad($i, 2, '0', STR_PAD_LEFT)) . '</td>';
 }
 print '<td width="60" align="right"><b>' . $langs->trans("Total") . '</b></td></tr>';

 $sql = "SELECT " . $db->ifsql('aa.account_number IS NULL', "'tobind'", 'aa.account_number') . " AS codecomptable,";
 $sql .= "  " . $db->ifsql('aa.label IS NULL', "'tobind'", 'aa.label') . " AS intitule,";
 for($i = 1; $i <= 12; $i ++) {
-	$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START?$conf->global->SOCIETE_FISCAL_MONTH_START:1) - 1;
-	if ($j > 12) $j-=12;
-	$sql .= "  SUM(" . $db->ifsql('MONTH(f.datef)=' . $j, 'fd.total_ht', '0') . ") AS month" . str_pad($j, 2, '0', STR_PAD_LEFT) . ",";
+	$sql .= "  SUM(" . $db->ifsql('MONTH(f.datef)=' . $i, 'fd.total_ht', '0') . ") AS month" . str_pad($i, 2, '0', STR_PAD_LEFT) . ",";
 }
 $sql .= "  SUM(fd.total_ht) 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 . "accounting_account as aa ON aa.rowid = fd.fk_code_ventilation";
-$sql .= " WHERE f.datef >= '" . $db->idate($search_date_start) . "'";
-$sql .= "  AND f.datef <= '" . $db->idate($search_date_end) . "'";
+$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)) . "'";
 $sql .= " AND f.entity IN (" . getEntity('facture', 0) . ")";   // We don't share object for accountancy
-$sql .= " AND f.fk_statut > 0";
 if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 	$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_SITUATION . ")";
 } else {
@@ -286,7 +315,6 @@ if ($resql) {
 		}
 		else print length_accountg($row[0]);
 		print '</td>';
-
 		print '<td align="left">';
 		if ($row[0] == 'tobind')
 		{
@@ -294,8 +322,7 @@ if ($resql) {
 		}
 		else print $row[1];
 		print '</td>';
-
-		for($i = 2; $i <= 12; $i++) {
+		for($i = 2; $i <= 12; $i ++) {
 			print '<td align="right">' . price($row[$i]) . '</td>';
 		}
 		print '<td align="right">' . price($row[13]) . '</td>';
@@ -307,7 +334,7 @@ if ($resql) {
 	print $db->lasterror(); // Show last sql error
 }
 print "</table>\n";
-print '</div>';
+


 if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange. Why showing a report that should rely on result of this step ?
@@ -317,29 +344,24 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.

 	print_fiche_titre($langs->trans("OtherInfo"), '', '');

-	print '<div class="div-table-responsive-no-min">';
+	print "<br>\n";
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre"><td width="400" align="left">' . $langs->trans("TotalVente") . '</td>';
 	for($i = 1; $i <= 12; $i ++) {
-		$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START?$conf->global->SOCIETE_FISCAL_MONTH_START:1) - 1;
-		if ($j > 12) $j-=12;
-		print '<td width="60" align="right">' . $langs->trans('MonthShort' . str_pad($j, 2, '0', STR_PAD_LEFT)) . '</td>';
+		print '<td width="60" align="right">' . $langs->trans('MonthShort' . str_pad($i, 2, '0', STR_PAD_LEFT)) . '</td>';
 	}
 	print '<td width="60" align="right"><b>' . $langs->trans("Total") . '</b></td></tr>';

 	$sql = "SELECT '" . $langs->trans("TotalVente") . "' AS total,";
 	for($i = 1; $i <= 12; $i ++) {
-		$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START?$conf->global->SOCIETE_FISCAL_MONTH_START:1) - 1;
-		if ($j > 12) $j-=12;
-		$sql .= "  SUM(" . $db->ifsql('MONTH(f.datef)=' . $j, 'fd.total_ht', '0') . ") AS month" . str_pad($j, 2, '0', STR_PAD_LEFT) . ",";
+		$sql .= "  SUM(" . $db->ifsql('MONTH(f.datef)=' . $i, 'fd.total_ht', '0') . ") AS month" . str_pad($i, 2, '0', STR_PAD_LEFT) . ",";
 	}
 	$sql .= "  SUM(fd.total_ht) 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($search_date_start) . "'";
-	$sql .= "  AND f.datef <= '" . $db->idate($search_date_end) . "'";
+	$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)) . "'";
 	$sql .= " AND f.entity IN (" . getEntity('facture', 0) . ")"; // We don't share object for accountancy
-	$sql .= " AND f.fk_statut > 0";
 	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 		$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_SITUATION . ")";
 	} else {
@@ -364,34 +386,27 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
 		print $db->lasterror(); // Show last sql error
 	}
 	print "</table>\n";
-	print '</div>';


 	if (! empty($conf->margin->enabled)) {
 		print "<br>\n";
-		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre"><td width="400">' . $langs->trans("TotalMarge") . '</td>';
 		for($i = 1; $i <= 12; $i ++) {
-			$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START?$conf->global->SOCIETE_FISCAL_MONTH_START:1) - 1;
-			if ($j > 12) $j-=12;
-			print '<td width="60" align="right">' . $langs->trans('MonthShort' . str_pad($j, 2, '0', STR_PAD_LEFT)) . '</td>';
+			print '<td width="60" align="right">' . $langs->trans('MonthShort' . str_pad($i, 2, '0', STR_PAD_LEFT)) . '</td>';
 		}
 		print '<td width="60" align="right"><b>' . $langs->trans("Total") . '</b></td></tr>';

 		$sql = "SELECT '" . $langs->trans("Vide") . "' AS marge,";
 		for($i = 1; $i <= 12; $i ++) {
-			$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START?$conf->global->SOCIETE_FISCAL_MONTH_START:1) - 1;
-			if ($j > 12) $j-=12;
-			$sql .= "  SUM(" . $db->ifsql('MONTH(f.datef)=' . $j, '(fd.total_ht-(fd.qty * fd.buy_price_ht))', '0') . ") AS month" . str_pad($j, 2, '0', STR_PAD_LEFT) . ",";
+			$sql .= "  SUM(" . $db->ifsql('MONTH(f.datef)=' . $i, '(fd.total_ht-(fd.qty * fd.buy_price_ht))', '0') . ") AS month" . str_pad($i, 2, '0', STR_PAD_LEFT) . ",";
 		}
 		$sql .= "  SUM((fd.total_ht-(fd.qty * fd.buy_price_ht))) 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($search_date_start) . "'";
-		$sql .= "  AND f.datef <= '" . $db->idate($search_date_end) . "'";
+		$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)) . "'";
 		$sql .= " AND f.entity IN (" . getEntity('facture', 0) . ")";   // We don't share object for accountancy
-		$sql .= " AND f.fk_statut > 0";
 		if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 			$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_SITUATION . ")";
 		} else {
@@ -417,7 +432,6 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
 			print $db->lasterror(); // Show last sql error
 		}
 		print "</table>\n";
-		print '</div>';
 	}
 }

--- a/htdocs/accountancy/customer/lines.php
+++ b/htdocs/accountancy/customer/lines.php
@@ -32,8 +32,6 @@ require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.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 . '/core/lib/accounting.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';

 // Langs
 $langs->load("bills");
@@ -53,9 +51,6 @@ $search_desc = GETPOST('search_desc', 'alpha');
 $search_amount = GETPOST('search_amount', 'alpha');
 $search_account = GETPOST('search_account', 'alpha');
 $search_vat = GETPOST('search_vat', 'alpha');
-$search_day=GETPOST("search_day","int");
-$search_month=GETPOST("search_month","int");
-$search_year=GETPOST("search_year","int");
 $search_country = GETPOST('search_country', 'alpha');
 $search_tvaintra = GETPOST('search_tvaintra', 'alpha');

@@ -64,7 +59,7 @@ $limit = GETPOST('limit','int')?GETPOST('limit', 'int'):(empty($conf->global->AC
 $sortfield = GETPOST('sortfield', 'alpha');
 $sortorder = GETPOST('sortorder', 'alpha');
 $page = GETPOST('page', 'int');
-if (empty($page) || $page < 0) $page = 0;
+if ($page < 0) $page = 0;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 $offset = $limit * $page;
@@ -100,9 +95,6 @@ if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x',
 	$search_amount = '';
 	$search_account = '';
 	$search_vat = '';
-	$search_day = '';
-	$search_month = '';
-	$search_year = '';
 	$search_country = '';
 	$search_tvaintra = '';
 }
@@ -110,37 +102,27 @@ if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x',
 if (is_array($changeaccount) && count($changeaccount) > 0) {
 	$error = 0;

-	if (! (GETPOST('account_parent','int') >= 0))
-	{
-		$error++;
-		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Account")), null, 'errors');
-	}
-
 	$db->begin();

-	if (! $error)
-	{
-		$sql1 = "UPDATE " . MAIN_DB_PREFIX . "facturedet as l";
-		$sql1 .= " SET l.fk_code_ventilation=" . (GETPOST('account_parent','int') > 0 ? GETPOST('account_parent','int') : '0');
-		$sql1 .= ' WHERE l.rowid IN (' . implode(',', $changeaccount) . ')';
+	$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 ++;
-			setEventMessages($db->lasterror(), null, 'errors');
-		}
-		if (! $error) {
-			$db->commit();
-			setEventMessages($langs->trans('Save'), null, 'mesgs');
-		} else {
-			$db->rollback();
-			setEventMessages($db->lasterror(), null, 'errors');
-		}
-
-		$account_parent = '';   // Protection to avoid to mass apply it a second time
+	dol_syslog('accountancy/customer/lines.php::changeaccount sql= ' . $sql1);
+	$resql1 = $db->query($sql1);
+	if (! $resql1) {
+		$error ++;
+		setEventMessages($db->lasterror(), null, 'errors');
+	}
+	if (! $error) {
+		$db->commit();
+		setEventMessages($langs->trans('Save'), null, 'mesgs');
+	} else {
+		$db->rollback();
+		setEventMessages($db->lasterror(), null, 'errors');
 	}

+	$account_parent = '';   // Protection to avoid to mass apply it a second time
 }


@@ -148,9 +130,6 @@ if (is_array($changeaccount) && count($changeaccount) > 0) {
 * View
 */

-$form = new Form($db);
-$formother = new FormOther($db);
-
 llxHeader('', $langs->trans("CustomersVentilation") . ' - ' . $langs->trans("Dispatched"));

 print '<script type="text/javascript">
@@ -173,7 +152,7 @@ print '<script type="text/javascript">
 /*
 * Customer Invoice lines
 */
-$sql = "SELECT f.rowid as facid, f.facnumber, f.type, f.datef, f.ref_client,";
+$sql = "SELECT f.rowid as factid, f.facnumber, f.type, f.datef, f.ref_client,";
 $sql .= " fd.rowid, fd.description, fd.product_type, fd.total_ht, fd.total_tva, fd.tva_tx, fd.vat_src_code, fd.total_ttc,";
 $sql .= " s.rowid as socid, s.nom as name, s.code_compta, s.code_client,";
 $sql .= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.accountancy_code_sell, aa.rowid as fk_compte, aa.account_number, aa.label as label_compte,";
@@ -214,26 +193,13 @@ if (strlen(trim($search_account))) {
 	$sql .= natural_search("aa.account_number", $search_account);
 }
 if (strlen(trim($search_vat))) {
-	$sql .= natural_search("fd.tva_tx", price2num($search_vat), 1);
-}
-if ($search_month > 0)
-{
-	if ($search_year > 0 && empty($search_day))
-		$sql.= " AND f.datef BETWEEN '".$db->idate(dol_get_first_day($search_year,$search_month,false))."' AND '".$db->idate(dol_get_last_day($search_year,$search_month,false))."'";
-		else if ($search_year > 0 && ! empty($search_day))
-			$sql.= " AND f.datef BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $search_month, $search_day, $search_year))."' AND '".$db->idate(dol_mktime(23, 59, 59, $search_month, $search_day, $search_year))."'";
-			else
-				$sql.= " AND date_format(f.datef, '%m') = '".$db->escape($search_month)."'";
-}
-else if ($search_year > 0)
-{
-	$sql.= " AND f.datef BETWEEN '".$db->idate(dol_get_first_day($search_year,1,false))."' AND '".$db->idate(dol_get_last_day($search_year,12,false))."'";
+	$sql .= natural_search("fd.tva_tx", $search_vat);
 }
 if (strlen(trim($search_country))) {
 	$sql .= natural_search("co.label", $search_country);
 }
 if (strlen(trim($search_tvaintra))) {
-	$sql .= natural_search("s.tva_intra", $search_tvaintra);
+	$sql .= natural_search("s.tva_intra", $search_tva_intra);
 }
 $sql .= " AND f.entity IN (" . getEntity('facture', 0) . ")";    // We don't share object for accountancy
 $sql .= $db->order($sortfield, $sortorder);
@@ -255,19 +221,25 @@ if ($result) {
 	$i = 0;

 	$param='';
-	if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
-	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
-	if ($search_invoice)	$param .= "&search_invoice=" . urlencode($search_invoice);
-	if ($search_ref)		$param .= "&search_ref=" . urlencode($search_ref);
-	if ($search_label)		$param .= "&search_label=" . urlencode($search_label);
-	if ($search_desc)		$param .= "&search_desc=" . urlencode($search_desc);
-	if ($search_account)	$param .= "&search_account=" . urlencode($search_account);
-	if ($search_vat)		$param .= "&search_vat=" . urlencode($search_vat);
-	if ($search_day)        $param .= '&search_day='.urlencode($search_day);
-	if ($search_month)      $param .= '&search_month='.urlencode($search_month);
-	if ($search_year)       $param .= '&search_year='.urlencode($search_year);
-	if ($search_country)  	$param .= "&search_country=" . urlencode($search_country);
-	if ($search_tvaintra)	$param .= "&search_tvaintra=" . urlencode($search_tvaintra);
+	if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
+	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
+	if ($search_invoice)
+		$param .= "&search_invoice=" . $search_invoice;
+	if ($search_ref)
+		$param .= "&search_ref=" . $search_ref;
+	if ($search_label)
+		$param .= "&search_label=" . $search_label;
+	if ($search_desc)
+		$param .= "&search_desc=" . $search_desc;
+	if ($search_account)
+		$param .= "&search_account=" . $search_account;
+	if ($search_vat)
+		$param .= "&search_vat=" . $search_vat;
+	if ($search_country)
+		$param .= "&search_country=" . $search_country;
+	if ($search_tvaintra)
+		$param .= "&search_tvaintra=" . $search_tvaintra;
+

 	print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">' . "\n";
 	print '<input type="hidden" name="action" value="ventil">';
@@ -282,7 +254,7 @@ if ($result) {
 	print $langs->trans("DescVentilDoneCustomer") . '<br>';

 	print '<br><div class="inline-block divButAction">' . $langs->trans("ChangeAccount") . '<br>';
-	print $formaccounting->select_account($account_parent, 'account_parent', 2, array(), 0, 0, 'maxwidth300 maxwidthonsmartphone valignmiddle');
+	print $formaccounting->select_account($account_parent, 'account_parent', 1);
 	print '<input type="submit" class="button valignmiddle" value="' . $langs->trans("ChangeBinding") . '"/></div>';

 	$moreforfilter = '';
@@ -293,11 +265,7 @@ if ($result) {
 	print '<tr class="liste_titre_filter">';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_lineid" value="' . dol_escape_htmltag($search_lineid) . '""></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_invoice" value="' . dol_escape_htmltag($search_invoice) . '"></td>';
-	print '<td class="liste_titre center">';
-   	if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="search_day" value="'.$search_day.'">';
-   	print '<input class="flat" type="text" size="1" maxlength="2" name="search_month" value="'.$search_month.'">';
-   	$formother->select_year($search_year,'search_year',1, 20, 5);
-	print '</td>';
+	print '<td class="liste_titre"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_ref" value="' . dol_escape_htmltag($search_ref) . '"></td>';
 	//print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_label" value="' . dol_escape_htmltag($search_label) . '"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_desc" value="' . dol_escape_htmltag($search_desc) . '"></td>';
@@ -334,7 +302,7 @@ if ($result) {
 		$codecompta = length_accountg($objp->account_number) . ' - ' . $objp->label_compte;

 		$facture_static->ref = $objp->facnumber;
-		$facture_static->id = $objp->facid;
+		$facture_static->id = $objp->factid;

 		$product_static->ref = $objp->product_ref;
 		$product_static->id = $objp->product_id;
@@ -366,12 +334,12 @@ if ($result) {
 		print '<td align="right">' . price($objp->total_ht) . '</td>';
 		print '<td align="right">' . vatrate($objp->tva_tx.($objp->vat_src_code?' ('.$objp->vat_src_code.')':'')) . '</td>';
 		print '<td align="center">';
-		print $codecompta . ' <a href="./card.php?id=' . $objp->rowid . '&backtopage='.urlencode($_SERVER["PHP_SELF"].($param?'?'.$param:'')).'">';
+		print $codecompta . ' <a href="./card.php?id=' . $objp->rowid . '">';
 		print img_edit();
 		print '</a>';
 		print '</td>';

-		print '<td>' . $objp->country .'</td>';
+		print '<td align="center">' . $objp->country .'</td>';

 		print '<td>' . $objp->tva_intra . '</td>';

--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -33,8 +33,6 @@ require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';

 // Langs
 $langs->load("compta");
@@ -62,10 +60,6 @@ $search_desc = GETPOST('search_desc', 'alpha');
 $search_amount = GETPOST('search_amount', 'alpha');
 $search_account = GETPOST('search_account', 'alpha');
 $search_vat = GETPOST('search_vat', 'alpha');
-$search_day=GETPOST("search_day","int");
-$search_month=GETPOST("search_month","int");
-$search_year=GETPOST("search_year","int");
-
 $btn_ventil = GETPOST('ventil', 'alpha');

 // Load variable for pagination
@@ -73,7 +67,7 @@ $limit = GETPOST('limit','int')?GETPOST('limit', 'int'):(empty($conf->global->AC
 $sortfield = GETPOST('sortfield', 'alpha');
 $sortorder = GETPOST('sortorder', 'alpha');
 $page = GETPOST('page','int');
-if (empty($page) || $page < 0) { $page = 0; }
+if ($page < 0) { $page = 0; }
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
@@ -99,15 +93,13 @@ $accounting = new AccountingAccount($db);
 $aarowid_s = $accounting->fetch('', $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT, 1);
 $aarowid_p = $accounting->fetch('', $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT, 1);

-$chartaccountcode = dol_getIdFromCode($db, $conf->global->CHARTOFACCOUNTS, 'accounting_system', 'rowid', 'pcg_version');
-

 /*
 * Action
 */

-if (GETPOST('cancel','alpha')) { $action='list'; $massaction=''; }
-if (! GETPOST('confirmmassaction','alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction=''; }
+if (GETPOST('cancel')) { $action='list'; $massaction=''; }
+if (! GETPOST('confirmmassaction') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction=''; }

 $parameters=array();
 $reshook=$hookmanager->executeHooks('doActions',$parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
@@ -126,9 +118,6 @@ if (empty($reshook))
 		$search_amount = '';
 		$search_account = '';
 		$search_vat = '';
-		$search_day = '';
-		$search_month = '';
-		$search_year = '';
 	}

 	// Mass actions
@@ -142,7 +131,6 @@ if (empty($reshook))

 if ($massaction == 'ventil') {
    $msg='';
-
    //print '<div><font color="red">' . $langs->trans("Processing") . '...</font></div>';
    if (! empty($mesCasesCochees)) {
        $msg = '<div>' . $langs->trans("SelectedLines") . ': '.count($mesCasesCochees).'</div>';
@@ -170,7 +158,7 @@ if ($massaction == 'ventil') {
                $accountventilated = new AccountingAccount($db);
                $accountventilated->fetch($monCompte, '');

-                dol_syslog("accountancy/customer/list.php sql=" . $sql, LOG_DEBUG);
+                dol_syslog("/accountancy/customer/list.php sql=" . $sql, LOG_DEBUG);
                if ($db->query($sql)) {
                    $msg.= '<div><font color="green">' . $langs->trans("Lineofinvoice") . ' ' . $monId . ' - ' . $langs->trans("VentilatedinAccount") . ' : ' . length_accountg($accountventilated->account_number) . '</font></div>';
                    $ok++;
@@ -196,34 +184,26 @@ if ($massaction == 'ventil') {
 */

 $form = new Form($db);
-$formother = new FormOther($db);

 llxHeader('', $langs->trans("Ventilation"));

-if (empty($chartaccountcode))
-{
-	print $langs->trans("ErrorChartOfAccountSystemNotSelected");
-	llxFooter();
-	$db->close();
-	exit;
-}
-
 // Customer Invoice lines
-$sql = "SELECT f.rowid as facid, f.facnumber, f.datef, f.type as ftype,";
-$sql.= " l.rowid, l.fk_product, l.description, l.total_ht, l.fk_code_ventilation, l.product_type as type_l, l.tva_tx as tva_tx_line, l.vat_src_code,";
-$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, p.tva_tx as tva_tx_prod,";
-$sql.= " aa.rowid as aarowid";
+$sql = "SELECT f.facnumber, f.rowid as facid, f.datef, f.type as ftype,";
+$sql .= " l.rowid, l.fk_product, l.description, l.total_ht, l.fk_code_ventilation, l.product_type as type_l, l.tva_tx as tva_tx_line, l.vat_src_code,";
+$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, p.tva_tx as tva_tx_prod,";
+$sql .= " aa.rowid as aarowid";
 $parameters=array();
 $reshook=$hookmanager->executeHooks('printFieldListSelect',$parameters);    // Note that $action and $object may have been modified by hook
 $sql.=$hookmanager->resPrint;
-$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 . "accounting_account as aa ON p.accountancy_code_sell = aa.account_number AND aa.fk_pcg_version = '" . $chartaccountcode."'";
-$sql.= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa2 ON p.accountancy_code_sell_intra = aa2.account_number AND aa2.fk_pcg_version = '" . $chartaccountcode."'";
-$sql.= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa3 ON p.accountancy_code_sell_export = aa3.account_number AND aa3.fk_pcg_version = '" . $chartaccountcode."'";
-$sql.= " WHERE f.fk_statut > 0 AND l.fk_code_ventilation <= 0";
-$sql.= " AND l.product_type <= 2";
+$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 . "accounting_account as aa ON (p.accountancy_code_sell = aa.account_number AND aa.entity = ".$conf->entity.")";
+$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 l.fk_code_ventilation <= 0";
+$sql .= " AND product_type <= 2";
+$sql .= " AND (accsys.rowid='" . $conf->global->CHARTOFACCOUNTS . "' OR p.accountancy_code_sell IS NULL OR p.accountancy_code_sell ='' OR p.accountancy_code_sell NOT IN
+	(SELECT aa.account_number FROM " . MAIN_DB_PREFIX . "accounting_account as aa , " . MAIN_DB_PREFIX . "accounting_system as asy  WHERE fk_pcg_version = asy.pcg_version AND asy.rowid ='" . $conf->global->CHARTOFACCOUNTS . "'))";
 // Add search filter like
 if ($search_lineid) {
    $sql .= natural_search("l.rowid", $search_lineid, 1);
@@ -249,23 +229,10 @@ if (strlen(trim($search_account))) {
 if (strlen(trim($search_vat))) {
    $sql .= natural_search("l.tva_tx",$search_vat,1);
 }
-if ($search_month > 0)
-{
-	if ($search_year > 0 && empty($search_day))
-		$sql.= " AND f.datef BETWEEN '".$db->idate(dol_get_first_day($search_year,$search_month,false))."' AND '".$db->idate(dol_get_last_day($search_year,$search_month,false))."'";
-		else if ($search_year > 0 && ! empty($search_day))
-			$sql.= " AND f.datef BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $search_month, $search_day, $search_year))."' AND '".$db->idate(dol_mktime(23, 59, 59, $search_month, $search_day, $search_year))."'";
-			else
-				$sql.= " AND date_format(f.datef, '%m') = '".$db->escape($search_month)."'";
-}
-else if ($search_year > 0)
-{
-	$sql.= " AND f.datef BETWEEN '".$db->idate(dol_get_first_day($search_year,1,false))."' AND '".$db->idate(dol_get_last_day($search_year,12,false))."'";
-}
 if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 	$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_SITUATION . ")";
 } else {
-	$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_DEPOSIT . "," . Facture::TYPE_SITUATION . ")";
+	$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_STANDARD . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_DEPOSIT . "," . Facture::TYPE_SITUATION . ")";
 }
 $sql .= " AND f.entity IN (" . getEntity('facture', 0) . ")";    // We don't share object for accountancy

@@ -286,7 +253,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))

 $sql .= $db->plimit($limit + 1, $offset);

-dol_syslog("accountancy/customer/list.php", LOG_DEBUG);
+dol_syslog("/accountancy/customer/list.php", LOG_DEBUG);
 $result = $db->query($sql);
 if ($result) {
 	$num_lines = $db->num_rows($result);
@@ -297,23 +264,14 @@ if ($result) {
 	$param='';
 	if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
 	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
-	if ($search_lineid)      $param.='&search_lineid='.urlencode($search_lineid);
-	if ($search_day)         $param.='&search_day='.urlencode($search_day);
-	if ($search_month)       $param.='&search_month='.urlencode($search_month);
-	if ($search_year)        $param.='&search_year='.urlencode($search_year);
-	if ($search_invoice)     $param.='&search_invoice='.urlencode($search_invoice);
-	if ($search_ref)         $param.='&search_ref='.urlencode($search_ref);
-	if ($search_desc)        $param.='&search_desc='.urlencode($search_desc);
-	if ($search_amount)      $param.='&search_amount='.urlencode($search_amount);
-	if ($search_vat)         $param.='&search_vat='.urlencode($search_vat);

 	$arrayofmassactions =  array(
 	    'ventil'=>$langs->trans("Ventilate")
 	    //'presend'=>$langs->trans("SendByMail"),
 	    //'builddoc'=>$langs->trans("PDFMerge"),
 	);
-	//if ($user->rights->mymodule->supprimer) $arrayofmassactions['predelete']=$langs->trans("Delete");
-	//if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
+	//if ($user->rights->mymodule->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
+	//if ($massaction == 'presend') $arrayofmassactions=array();
 	$massactionbutton=$form->selectMassAction('ventil', $arrayofmassactions, 1);

 	print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">' . "\n";
@@ -329,12 +287,6 @@ if ($result) {

 	print $langs->trans("DescVentilTodoCustomer") . '</br><br>';

-	/*$topicmail="Information";
-	 $modelmail="project";
-	 $objecttmp=new Project($db);
-	 $trackid='prj'.$object->id;
-	 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';*/
-
 	if ($msg) print $msg.'<br>';

 	$moreforfilter = '';
@@ -346,11 +298,7 @@ if ($result) {
 	print '<tr class="liste_titre_filter">';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_lineid" value="' . dol_escape_htmltag($search_lineid) . '""></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_invoice" value="' . dol_escape_htmltag($search_invoice) . '"></td>';
-	print '<td class="liste_titre center">';
-   	if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="search_day" value="'.$search_day.'">';
-   	print '<input class="flat" type="text" size="1" maxlength="2" name="search_month" value="'.$search_month.'">';
-   	$formother->select_year($search_year,'search_year',1, 20, 5);
-	print '</td>';
+	print '<td class="liste_titre"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_ref" value="' . dol_escape_htmltag($search_ref) . '"></td>';
 	//print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_label" value="' . dol_escape_htmltag($search_label) . '"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidthonsmartphone" name="search_desc" value="' . dol_escape_htmltag($search_desc) . '"></td>';
@@ -473,14 +421,12 @@ if ($result) {

 		// Suggested accounting account
 		print '<td align="center">';
-		print $formaccounting->select_account($objp->aarowid_suggest, 'codeventil'.$objp->rowid, 1, array(), 0, 0, 'codeventil maxwidth300 maxwidthonsmartphone', 'cachewithshowemptyone');
+		print $formaccounting->select_account($objp->aarowid_suggest, 'codeventil'.$objp->rowid, 1, array(), 0, 0, 'maxwidth300 maxwidthonsmartphone', 'cachewithshowemptyone');
 		print '</td>';

-		// Column with checkbox
 		print '<td align="center">';
-		print '<input type="checkbox" class="flat checkforselect checkforselect'.$objp->rowid.'" name="toselect[]" value="' . $objp->rowid . "_" . $i . '"' . ($objp->aarowid ? "checked" : "") . '/>';
+		print '<input type="checkbox" class="flat checkforselect" name="toselect[]"  value="' . $objp->rowid . "_" . $i . '"' . ($objp->aarowid ? "checked" : "") . '/>';
 		print '</td>';
-
 		print '</tr>';
 		$i ++;
 	}
@@ -492,17 +438,5 @@ if ($result) {
 	print $db->error();
 }

-// Add code to auto check the box when we select an account
-print '<script type="text/javascript" language="javascript">
-jQuery(document).ready(function() {
-	jQuery(".codeventil").change(function() {
-		var s=$(this).attr("id").replace("codeventil", "")
-		console.log(s+" "+$(this).val());
-		if ($(this).val() == -1) jQuery(".checkforselect"+s).prop("checked", false);
-		else jQuery(".checkforselect"+s).prop("checked", true);
-	});
-});
-</script>';
-
 llxFooter();
 $db->close();
--- a/htdocs/accountancy/expensereport/card.php
+++ b/htdocs/accountancy/expensereport/card.php
@@ -23,7 +23,7 @@
 */
 /**
 * \file		htdocs/accountancy/supplier/card.php
- * \ingroup		Advanced accountancy
+ * \ingroup		Accountancy
 * \brief		Card expense report ventilation
 */
 require '../../main.inc.php';
@@ -38,9 +38,6 @@ $langs->load("accountancy");
 $langs->load("trips");

 $action = GETPOST('action', 'alpha');
-$cancel = GETPOST('cancel', 'alpha');
-$backtopage = GETPOST('backtopage', 'alpha');
-
 $codeventil = GETPOST('codeventil');
 $id = GETPOST('id');

@@ -48,21 +45,18 @@ $id = GETPOST('id');
 if ($user->societe_id > 0)
 	accessforbidden();

-
 /*
 * Actions
 */

-if ($action == 'ventil' && $user->rights->accounting->bind->write)
-{
-	if (! $cancel)
-	{
+if ($action == 'ventil' && $user->rights->accounting->bind->write) {
+	if (! GETPOST('cancel', 'alpha')) {
 		if ($codeventil < 0) $codeventil = 0;

 		$sql = " UPDATE " . MAIN_DB_PREFIX . "expensereport_det";
 		$sql .= " SET fk_code_ventilation = " . $codeventil;
 		$sql .= " WHERE rowid = " . $id;
-
+		
 		$resql = $db->query($sql);
 		if (! $resql) {
 			setEventMessages($db->lasterror(), null, 'errors');
@@ -70,11 +64,6 @@ if ($action == 'ventil' && $user->rights->accounting->bind->write)
 		else
 		{
 			setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
-			if ($backtopage)
-			{
-				header("Location: ".$backtopage);
-				exit();
-			}
 		}
 	} else {
 		header("Location: ./lines.php");
@@ -122,7 +111,6 @@ if (! empty($id)) {
 			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 '<input type="hidden" name="backtopage" value="'.dol_escape_htmltag($backtopage).'">';

 			print load_fiche_titre($langs->trans('ExpenseReportsVentilation'), '', 'title_setup');

--- a/htdocs/accountancy/expensereport/index.php
+++ b/htdocs/accountancy/expensereport/index.php
@@ -27,7 +27,6 @@
 require '../../main.inc.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 . '/expensereport/class/expensereport.class.php';

 // Langs
 $langs->load("compta");
@@ -38,36 +37,27 @@ $langs->load("accountancy");

 // Security check
 if (empty($conf->accounting->enabled)) {
-	accessforbidden();
+    accessforbidden();
 }
 if ($user->societe_id > 0)
 	accessforbidden();
 if (! $user->rights->accounting->bind->write)
 	accessforbidden();

-$month_start= ($conf->global->SOCIETE_FISCAL_MONTH_START?($conf->global->SOCIETE_FISCAL_MONTH_START):1);
-if (GETPOST("year",'int')) $year_start = GETPOST("year",'int');
-else
-{
-	$year_start = dol_print_date(dol_now(), '%Y');
-	if (dol_print_date(dol_now(), '%m') < $month_start) $year_start--;	// If current month is lower that starting fiscal month, we start last year
+// Filter
+$year = GETPOST('year', 'int');
+if ($year == 0) {
+	$year_current = strftime("%Y", time());
+	$year_start = $year_current;
+} else {
+	$year_current = $year;
+	$year_start = $year;
 }
-$year_end = $year_start + 1;
-$month_end = $month_start - 1;
-if ($month_end < 1)
-{
-	$month_end = 12;
-	$year_end--;
-}
-$search_date_start = dol_mktime(0, 0, 0, $month_start, 1, $year_start);
-$search_date_end = dol_get_last_day($year_end, $month_end);
-$year_current = $year_start;

 // Validate History
 $action = GETPOST('action','aZ09');


-
 /*
 * Actions
 */
@@ -114,8 +104,54 @@ if ($action == 'validatehistory') {
 		$db->commit();
 		setEventMessages($langs->trans('AutomaticBindingDone'), null, 'mesgs');
 	}
-}
+} elseif ($action == 'fixaccountancycode') {
+	$error = 0;
+	$db->begin();

+	$sql1 = "UPDATE " . MAIN_DB_PREFIX . "expensereport_det as erd";
+	$sql1 .= " SET fk_code_ventilation = 0";
+	$sql1 .= ' WHERE erd.fk_code_ventilation NOT IN ';
+	$sql1 .= '	(SELECT accnt.rowid ';
+	$sql1 .= '	FROM ' . MAIN_DB_PREFIX . 'accounting_account as accnt';
+	$sql1 .= '	INNER JOIN ' . MAIN_DB_PREFIX . 'accounting_system as syst';
+	$sql1 .= '	ON accnt.fk_pcg_version = syst.pcg_version AND syst.rowid=' . $conf->global->CHARTOFACCOUNTS . ')';
+
+	dol_syslog("htdocs/accountancy/customer/index.php fixaccountancycode", LOG_DEBUG);
+
+	$resql1 = $db->query($sql1);
+	if (! $resql1) {
+		$error ++;
+		$db->rollback();
+		setEventMessage($db->lasterror(), 'errors');
+	} else {
+		$db->commit();
+		setEventMessage($langs->trans('Done'), 'mesgs');
+	}
+} elseif ($action == 'cleanaccountancycode') {
+	$error = 0;
+	$db->begin();
+
+	// Now clean
+	$sql1 = "UPDATE " . MAIN_DB_PREFIX . "expensereport_det as erd";
+	$sql1.= " SET fk_code_ventilation = 0";
+	$sql1.= " WHERE erd.fk_expensereport IN ( SELECT er.rowid FROM " . MAIN_DB_PREFIX . "expensereport as er";
+	$sql1.= " WHERE er.date_debut >= '" . $db->idate(dol_get_first_day($year_current, 1, false)) . "'";
+	$sql1.= " AND er.date_debut <= '" . $db->idate(dol_get_last_day($year_current, 12, false)) . "'";
+	$sql1.= " AND er.entity IN (" . getEntity('accountancy') . ")";
+	$sql1.=")";
+
+	dol_syslog("htdocs/accountancy/customer/index.php fixaccountancycode", LOG_DEBUG);
+
+	$resql1 = $db->query($sql1);
+	if (! $resql1) {
+		$error ++;
+		$db->rollback();
+		setEventMessage($db->lasterror(), 'errors');
+	} else {
+		$db->commit();
+		setEventMessage($langs->trans('Done'), 'mesgs');
+	}
+}

 /*
 * View
@@ -128,63 +164,48 @@ $textnextyear = '&nbsp;<a href="' . $_SERVER["PHP_SELF"] . '?year=' . ($year_cur

 print load_fiche_titre($langs->trans("ExpenseReportsVentilation") . "&nbsp;" . $textprevyear . "&nbsp;" . $langs->trans("Year") . "&nbsp;" . $year_start . "&nbsp;" . $textnextyear, '', 'title_accountancy');

-// Clean database
-$db->begin();
-$sql1 = "UPDATE " . MAIN_DB_PREFIX . "expensereport_det as erd";
-$sql1 .= " SET fk_code_ventilation = 0";
-$sql1 .= ' WHERE erd.fk_code_ventilation NOT IN ';
-$sql1 .= '	(SELECT accnt.rowid ';
-$sql1 .= '	FROM ' . MAIN_DB_PREFIX . 'accounting_account as accnt';
-$sql1 .= '	INNER JOIN ' . MAIN_DB_PREFIX . 'accounting_system as syst';
-$sql1 .= '	ON accnt.fk_pcg_version = syst.pcg_version AND syst.rowid=' . $conf->global->CHARTOFACCOUNTS . ')';
-dol_syslog("htdocs/accountancy/customer/index.php fixaccountancycode", LOG_DEBUG);
-$resql1 = $db->query($sql1);
-if (! $resql1) {
-	$error ++;
-	$db->rollback();
-	setEventMessage($db->lasterror(), 'errors');
-} else {
-	$db->commit();
-}
-// End clean database
-
 print $langs->trans("DescVentilExpenseReport") . '<br>';
 print $langs->trans("DescVentilExpenseReportMore", $langs->transnoentitiesnoconv("ValidateHistory"), $langs->transnoentitiesnoconv("ToBind")) . '<br>';
 print '<br>';

+//print '<div class="inline-block divButAction">';
+// TODO Remove this. Should be done always or into the repair.php script.
+if ($conf->global->MAIN_FEATURES_LEVEL > 1) print '<a class="butActionDelete" href="' . $_SERVER['PHP_SELF'] . '?year=' . $year_current . '&action=fixaccountancycode">' . $langs->trans("CleanFixHistory", $year_current) . '</a>';
+//print '</div>';
+
+
+
+

 $y = $year_current;

 $buttonbind = '<a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?year=' . $year_current . '&action=validatehistory">' . $langs->trans("ValidateHistory") . '</a>';
+$buttonreset = '<a class="butActionDelete" href="' . $_SERVER['PHP_SELF'] . '?year=' . $year_current . '&action=cleanaccountancycode">' . $langs->trans("CleanHistory", $year_current) . '</a>';


 print_fiche_titre($langs->trans("OverviewOfAmountOfLinesNotBound"), $buttonbind, '');

-print '<div class="div-table-responsive-no-min">';
+
 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>';
 for($i = 1; $i <= 12; $i ++) {
-	$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START?$conf->global->SOCIETE_FISCAL_MONTH_START:1) - 1;
-	if ($j > 12) $j-=12;
-	print '<td width="60" align="right">' . $langs->trans('MonthShort' . str_pad($j, 2, '0', STR_PAD_LEFT)) . '</td>';
+    print '<td width="60" align="right">' . $langs->trans('MonthShort' . str_pad($i, 2, '0', STR_PAD_LEFT)) . '</td>';
 }
 print '<td width="60" align="right"><b>' . $langs->trans("Total") . '</b></td></tr>';

 $sql = "SELECT  ".$db->ifsql('aa.account_number IS NULL', "'tobind'", 'aa.account_number') ." AS codecomptable,";
 $sql .= "  " . $db->ifsql('aa.label IS NULL', "'tobind'", 'aa.label') . " AS intitule,";
 for($i = 1; $i <= 12; $i ++) {
-	$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START?$conf->global->SOCIETE_FISCAL_MONTH_START:1) - 1;
-	if ($j > 12) $j-=12;
-	$sql .= "  SUM(" . $db->ifsql('MONTH(er.date_debut)=' . $j, 'erd.total_ht', '0') . ") AS month" . str_pad($j, 2, '0', STR_PAD_LEFT) . ",";
+    $sql .= "  SUM(" . $db->ifsql('MONTH(er.date_debut)=' . $i, 'erd.total_ht', '0') . ") AS month" . str_pad($i, 2, '0', STR_PAD_LEFT) . ",";
 }
 $sql .= " SUM(erd.total_ht) as total";
 $sql .= " FROM " . MAIN_DB_PREFIX . "expensereport_det as erd";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "expensereport as er ON er.rowid = erd.fk_expensereport";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.rowid = erd.fk_code_ventilation";
-$sql .= " WHERE er.date_debut >= '" . $db->idate($search_date_start) . "'";
-$sql .= " AND er.date_debut <= '" . $db->idate($search_date_end) . "'";
-$sql .= " AND er.fk_statut IN (".ExpenseReport::STATUS_APPROVED.", ".ExpenseReport::STATUS_CLOSED.")";
+$sql .= " WHERE er.date_debut >= '" . $db->idate(dol_get_first_day($y, 1, false)) . "'";
+$sql .= " AND er.date_debut <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'";
+$sql .= " AND er.fk_statut > 0 ";
 $sql .= " AND er.entity IN (" . getEntity('expensereport', 0) . ")";     // We don't share object for accountancy
 $sql .= " AND aa.account_number IS NULL";
 $sql .= " GROUP BY erd.fk_code_ventilation,aa.account_number,aa.label";
@@ -192,9 +213,9 @@ $sql .= " GROUP BY erd.fk_code_ventilation,aa.account_number,aa.label";
 dol_syslog('/accountancy/expensereport/index.php:: sql=' . $sql);
 $resql = $db->query($sql);
 if ($resql) {
-	$num = $db->num_rows($resql);
+    $num = $db->num_rows($resql);

-	while ( $row = $db->fetch_row($resql)) {
+    while ( $row = $db->fetch_row($resql)) {

 		print '<tr class="oddeven"><td>';
 		if ($row[0] == 'tobind')
@@ -222,39 +243,34 @@ if ($resql) {
    print $db->lasterror(); // Show last sql error
 }
 print "</table>\n";
-print '</div>';
+


 print '<br>';

-print_fiche_titre($langs->trans("OverviewOfAmountOfLinesBound"), '', '');
+print_fiche_titre($langs->trans("OverviewOfAmountOfLinesBound"), $buttonreset, '');


-print '<div class="div-table-responsive-no-min">';
 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>';
 for($i = 1; $i <= 12; $i ++) {
-	$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START?$conf->global->SOCIETE_FISCAL_MONTH_START:1) - 1;
-	if ($j > 12) $j-=12;
-	print '<td width="60" align="right">' . $langs->trans('MonthShort' . str_pad($j, 2, '0', STR_PAD_LEFT)) . '</td>';
+    print '<td width="60" align="right">' . $langs->trans('MonthShort' . str_pad($i, 2, '0', STR_PAD_LEFT)) . '</td>';
 }
 print '<td width="60" align="right"><b>' . $langs->trans("Total") . '</b></td></tr>';

 $sql = "SELECT  ".$db->ifsql('aa.account_number IS NULL', "'tobind'", 'aa.account_number') ." AS codecomptable,";
 $sql .= "  " . $db->ifsql('aa.label IS NULL', "'tobind'", 'aa.label') . " AS intitule,";
 for($i = 1; $i <= 12; $i ++) {
-	$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START?$conf->global->SOCIETE_FISCAL_MONTH_START:1) - 1;
-	if ($j > 12) $j-=12;
-	$sql .= "  SUM(" . $db->ifsql('MONTH(er.date_debut)=' . $j, 'erd.total_ht', '0') . ") AS month" . str_pad($j, 2, '0', STR_PAD_LEFT) . ",";
+    $sql .= "  SUM(" . $db->ifsql('MONTH(er.date_debut)=' . $i, 'erd.total_ht', '0') . ") AS month" . str_pad($i, 2, '0', STR_PAD_LEFT) . ",";
 }
 $sql .= " ROUND(SUM(erd.total_ht),2) as total";
 $sql .= " FROM " . MAIN_DB_PREFIX . "expensereport_det as erd";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "expensereport as er ON er.rowid = erd.fk_expensereport";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.rowid = erd.fk_code_ventilation";
-$sql .= " WHERE er.date_debut >= '" . $db->idate($search_date_start) . "'";
-$sql .= " AND er.date_debut <= '" . $db->idate($search_date_end) . "'";
-$sql .= " AND er.fk_statut IN (".ExpenseReport::STATUS_APPROVED.", ".ExpenseReport::STATUS_CLOSED.")";
+$sql .= " WHERE er.date_debut >= '" . $db->idate(dol_get_first_day($y, 1, false)) . "'";
+$sql .= " AND er.date_debut <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'";
+$sql .= " AND er.fk_statut > 0 ";
 $sql .= " AND er.entity IN (" . getEntity('expensereport', 0) . ")";     // We don't share object for accountancy
 $sql .= " AND aa.account_number IS NOT NULL";
 $sql .= " GROUP BY erd.fk_code_ventilation,aa.account_number,aa.label";
@@ -262,9 +278,9 @@ $sql .= " GROUP BY erd.fk_code_ventilation,aa.account_number,aa.label";
 dol_syslog('htdocs/accountancy/expensereport/index.php');
 $resql = $db->query($sql);
 if ($resql) {
-	$num = $db->num_rows($resql);
+    $num = $db->num_rows($resql);

-	while ( $row = $db->fetch_row($resql)) {
+    while ( $row = $db->fetch_row($resql)) {

 		print '<tr class="oddeven"><td>';
 		if ($row[0] == 'tobind')
@@ -273,7 +289,6 @@ if ($resql) {
 		}
 		else print length_accountg($row[0]);
 		print '</td>';
-
 		print '<td align="left">';
 		if ($row[0] == 'tobind')
 		{
@@ -293,39 +308,35 @@ if ($resql) {
    print $db->lasterror(); // Show last sql error
 }
 print "</table>\n";
-print '</div>';



-if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange. Why showing a report where results depends on next step (so not yet available) ?
+
+if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange. Why showing a report that should rely on result of this step ?
 {
    print '<br>';
    print '<br>';

    print_fiche_titre($langs->trans("OtherInfo"), '', '');

-	print '<div class="div-table-responsive-no-min">';
+    print "<br>\n";
    print '<table class="noborder" width="100%">';
    print '<tr class="liste_titre"><td width="400" align="left">' . $langs->trans("Total") . '</td>';
    for($i = 1; $i <= 12; $i ++) {
-    	$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START?$conf->global->SOCIETE_FISCAL_MONTH_START:1) - 1;
-    	if ($j > 12) $j-=12;
-    	print '<td width="60" align="right">' . $langs->trans('MonthShort' . str_pad($j, 2, '0', STR_PAD_LEFT)) . '</td>';
+    	print '<td width="60" align="right">' . $langs->trans('MonthShort' . str_pad($i, 2, '0', STR_PAD_LEFT)) . '</td>';
    }
    print '<td width="60" align="right"><b>' . $langs->trans("Total") . '</b></td></tr>';

    $sql = "SELECT '" . $langs->trans("TotalExpenseReport") . "' AS label,";
    for($i = 1; $i <= 12; $i ++) {
-    	$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START?$conf->global->SOCIETE_FISCAL_MONTH_START:1) - 1;
-    	if ($j > 12) $j-=12;
-    	$sql .= " SUM(" . $db->ifsql('MONTH(er.date_create)=' . $j, 'erd.total_ht', '0') . ") AS month" . str_pad($j, 2, '0', STR_PAD_LEFT) . ",";
+    	$sql .= " SUM(" . $db->ifsql('MONTH(er.date_create)=' . $i, 'erd.total_ht', '0') . ") AS month" . str_pad($i, 2, '0', STR_PAD_LEFT) . ",";
    }
    $sql .= " SUM(erd.total_ht) as total";
    $sql .= " FROM " . MAIN_DB_PREFIX . "expensereport_det as erd";
    $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "expensereport as er ON er.rowid = erd.fk_expensereport";
-    $sql .= " WHERE er.date_debut >= '" . $db->idate($search_date_start) . "'";
-    $sql .= " AND er.date_debut <= '" . $db->idate($search_date_end) . "'";
-    $sql .= " AND er.fk_statut IN (".ExpenseReport::STATUS_APPROVED.", ".ExpenseReport::STATUS_CLOSED.")";
+    $sql .= " WHERE er.date_debut >= '" . $db->idate(dol_get_first_day($y, 1, false)) . "'";
+    $sql .= " AND er.date_debut <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'";
+    $sql .= " AND er.fk_statut > 0 ";
    $sql .= " AND er.entity IN (" . getEntity('expensereport', 0) . ")";     // We don't share object for accountancy

    dol_syslog('htdocs/accountancy/expensereport/index.php');
@@ -333,7 +344,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
    if ($resql) {
    	$num = $db->num_rows($resql);

-    	while ($row = $db->fetch_row($resql)) {
+    	while ( $row = $db->fetch_row($resql)) {
    		print '<tr><td>' . $row[0] . '</td>';
    			for($i = 1; $i <= 12; $i ++) {
    			print '<td align="right">' . price($row[$i]) . '</td>';
@@ -347,7 +358,6 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
    	print $db->lasterror(); // Show last sql error
    }
    print "</table>\n";
-    print '</div>';
 }

 llxFooter();
--- a/htdocs/accountancy/expensereport/lines.php
+++ b/htdocs/accountancy/expensereport/lines.php
@@ -31,8 +31,6 @@ require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 require_once DOL_DOCUMENT_ROOT . '/expensereport/class/expensereport.class.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 . '/core/class/html.formother.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';

 // Langs
 $langs->load("compta");
@@ -43,7 +41,7 @@ $langs->load("accountancy");
 $langs->load("trips");
 $langs->load("productbatch");

-$account_parent = GETPOST('account_parent','int');
+$account_parent = GETPOST('account_parent');
 $changeaccount = GETPOST('changeaccount');
 // Search Getpost
 $search_expensereport = GETPOST('search_expensereport', 'alpha');
@@ -52,19 +50,16 @@ $search_desc = GETPOST('search_desc', 'alpha');
 $search_amount = GETPOST('search_amount', 'alpha');
 $search_account = GETPOST('search_account', 'alpha');
 $search_vat = GETPOST('search_vat', 'alpha');
-$search_day=GETPOST("search_day","int");
-$search_month=GETPOST("search_month","int");
-$search_year=GETPOST("search_year","int");

 // Load variable for pagination
 $limit = GETPOST('limit','int')?GETPOST('limit', 'int'):(empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)?$conf->liste_limit:$conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
 $sortfield = GETPOST('sortfield', 'alpha');
 $sortorder = GETPOST('sortorder', 'alpha');
 $page = GETPOST('page', 'int');
-if (empty($page) || $page < 0) $page = 0;
+if ($page < 0) $page = 0;
+$offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-$offset = $limit * $page;
 if (! $sortfield)
 	$sortfield = "erd.date, erd.rowid";
 if (! $sortorder) {
@@ -95,44 +90,32 @@ if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x',
 	$search_amount = '';
 	$search_account = '';
 	$search_vat = '';
-	$search_day = '';
-	$search_month = '';
-	$search_year = '';
 }

 if (is_array($changeaccount) && count($changeaccount) > 0) {
 	$error = 0;

-	if (! (GETPOST('account_parent','int') >= 0))
-	{
-		$error++;
-		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Account")), null, 'errors');
-	}
-
 	$db->begin();

-	if (! $error)
-	{
-		$sql1 = "UPDATE " . MAIN_DB_PREFIX . "expensereport_det as erd";
-		$sql1 .= " SET erd.fk_code_ventilation=" . (GETPOST('account_parent','int') > 0 ? GETPOST('account_parent','int') : '0');
-		$sql1 .= ' WHERE erd.rowid IN (' . implode(',', $changeaccount) . ')';
+	$sql1 = "UPDATE " . MAIN_DB_PREFIX . "expensereport_det as erd";
+	$sql1 .= " SET erd.fk_code_ventilation=" . GETPOST('account_parent');
+	$sql1 .= ' WHERE erd.rowid IN (' . implode(',', $changeaccount) . ')';

-		dol_syslog('accountancy/expensereport/lines.php::changeaccount sql= ' . $sql1);
-		$resql1 = $db->query($sql1);
-		if (! $resql1) {
-			$error ++;
-			setEventMessages($db->lasterror(), null, 'errors');
-		}
-		if (! $error) {
-			$db->commit();
-			setEventMessages($langs->trans('Save'), null, 'mesgs');
-		} else {
-			$db->rollback();
-			setEventMessages($db->lasterror(), null, 'errors');
-		}
-
-		$account_parent = '';   // Protection to avoid to mass apply it a second time
+	dol_syslog('accountancy/expensereport/lines.php::changeaccount sql= ' . $sql1);
+	$resql1 = $db->query($sql1);
+	if (! $resql1) {
+		$error ++;
+		setEventMessages($db->lasterror(), null, 'errors');
 	}
+	if (! $error) {
+		$db->commit();
+		setEventMessages($langs->trans('Save'), null, 'mesgs');
+	} else {
+		$db->rollback();
+		setEventMessages($db->lasterror(), null, 'errors');
+	}
+
+	$account_parent = '';   // Protection to avoid to mass apply it a second time
 }


@@ -140,9 +123,6 @@ if (is_array($changeaccount) && count($changeaccount) > 0) {
 * View
 */

-$form = new Form($db);
-$formother = new FormOther($db);
-
 llxHeader('', $langs->trans("ExpenseReportsVentilation") . ' - ' . $langs->trans("Dispatched"));

 print '<script type="text/javascript">
@@ -173,38 +153,25 @@ $sql .= " FROM " . MAIN_DB_PREFIX . "expensereport as er";
 $sql .= " , " . MAIN_DB_PREFIX . "accounting_account as aa";
 $sql .= " , " . MAIN_DB_PREFIX . "expensereport_det as erd";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_type_fees as f ON f.id = erd.fk_c_type_fees";
-$sql .= " WHERE er.rowid = erd.fk_expensereport and er.fk_statut IN (".ExpenseReport::STATUS_APPROVED.", ".ExpenseReport::STATUS_CLOSED.") AND erd.fk_code_ventilation <> 0 ";
+$sql .= " WHERE er.rowid = erd.fk_expensereport and er.fk_statut >= 5 AND erd.fk_code_ventilation <> 0 ";
 $sql .= " AND aa.rowid = erd.fk_code_ventilation";
 if (strlen(trim($search_expensereport))) {
-	$sql .= natural_search("er.ref", $search_expensereport);
+	$sql .= " AND er.ref like '%" . $search_expensereport . "%'";
 }
 if (strlen(trim($search_label))) {
-	$sql .= natural_search("f.label", $search_label);
+	$sql .= " AND f.label like '%" . $search_label . "%'";
 }
 if (strlen(trim($search_desc))) {
-	$sql .= natural_search("er.comments", $search_desc);
+	$sql .= " AND er.comments like '%" . $search_desc . "%'";
 }
 if (strlen(trim($search_amount))) {
-	$sql .= natural_search("erd.total_ht", $search_amount, 1);
+	$sql .= " AND erd.total_ht like '%" . $search_amount . "%'";
 }
 if (strlen(trim($search_account))) {
-	$sql .= natural_search("aa.account_number", $search_account);
+	$sql .= " AND aa.account_number like '%" . $search_account . "%'";
 }
 if (strlen(trim($search_vat))) {
-	$sql .= natural_search("erd.tva_tx", price2num($search_vat), 1);
-}
-if ($search_month > 0)
-{
-	if ($search_year > 0 && empty($search_day))
-		$sql.= " AND erd.date BETWEEN '".$db->idate(dol_get_first_day($search_year,$search_month,false))."' AND '".$db->idate(dol_get_last_day($search_year,$search_month,false))."'";
-		else if ($search_year > 0 && ! empty($search_day))
-			$sql.= " AND erd.date BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $search_month, $search_day, $search_year))."' AND '".$db->idate(dol_mktime(23, 59, 59, $search_month, $search_day, $search_year))."'";
-			else
-				$sql.= " AND date_format(erd.date, '%m') = '".$db->escape($search_month)."'";
-}
-else if ($search_year > 0)
-{
-	$sql.= " AND erd.date BETWEEN '".$db->idate(dol_get_first_day($search_year,1,false))."' AND '".$db->idate(dol_get_last_day($search_year,12,false))."'";
+	$sql .= " AND (erd.tva_tx like '" . $search_vat . "%')";
 }
 $sql .= " AND er.entity IN (" . getEntity('expensereport', 0) . ")";  // We don't share object for accountancy

@@ -228,18 +195,22 @@ if ($result) {
 	$i = 0;

 	$param='';
-	if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
-	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
-	if ($search_expensereport) $param .= "&search_expensereport=" . urlencode($search_expensereport);
-	if ($search_label)		$param .= "&search_label=" . urlencode($search_label);
-	if ($search_desc)		$param .= "&search_desc=" . urlencode($search_desc);
-	if ($search_account)	$param .= "&search_account=" . urlencode($search_account);
-	if ($search_vat)		$param .= "&search_vat=" . urlencode($search_vat);
-	if ($search_day)        $param .= '&search_day='.urlencode($search_day);
-	if ($search_month)      $param .= '&search_month='.urlencode($search_month);
-	if ($search_year)       $param .= '&search_year='.urlencode($search_year);
-	if ($search_country)	$param .= "&search_country=" . urlencode($search_country);
-	if ($search_tvaintra)	$param .= "&search_tvaintra=" . urlencode($search_tvaintra);
+	if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
+	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
+	if ($search_expensereport)
+		$param .= "&search_expensereport=" . $search_expensereport;
+	if ($search_label)
+		$param .= "&search_label=" . $search_label;
+	if ($search_desc)
+		$param .= "&search_desc=" . $search_desc;
+	if ($search_account)
+		$param .= "&search_account=" . $search_account;
+	if ($search_vat)
+		$param .= "&search_vat=" . $search_vat;
+	if ($search_country)
+		$param .= "&search_country=" . $search_country;
+	if ($search_tvaintra)
+		$param .= "&search_tvaintra=" . $search_tvaintra;

 	print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">' . "\n";
 	print '<input type="hidden" name="action" value="ventil">';
@@ -255,7 +226,7 @@ if ($result) {
 	print $langs->trans("DescVentilDoneExpenseReport") . '<br>';

 	print '<br><div class="inline-block divButAction">' . $langs->trans("ChangeAccount") . '<br>';
-	print $formaccounting->select_account($account_parent, 'account_parent', 2, array(), 0, 0, 'maxwidth300 maxwidthonsmartphone valignmiddle');
+	print $formaccounting->select_account(GETPOST('account_parent'), 'account_parent', 1);
 	print '<input type="submit" class="button valignmiddle" value="' . $langs->trans("ChangeBinding") . '" /></div>';

 	$moreforfilter = '';
@@ -266,11 +237,7 @@ if ($result) {
 	print '<tr class="liste_titre_filter">';
 	print '<td class="liste_titre"></td>';
 	print '<td><input type="text" class="flat maxwidth50" name="search_expensereport" value="' . dol_escape_htmltag($search_expensereport) . '"></td>';
-	print '<td class="liste_titre center">';
-   	if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="search_day" value="'.$search_day.'">';
-   	print '<input class="flat" type="text" size="1" maxlength="2" name="search_month" value="'.$search_month.'">';
-   	$formother->select_year($search_year,'search_year',1, 20, 5);
-	print '</td>';
+	print '<td class="liste_titre" align="right"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_label" value="' . dol_escape_htmltag($search_label) . '"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_desc" value="' . dol_escape_htmltag($search_desc) . '"></td>';
 	print '<td class="liste_titre" align="right"><input type="text" class="flat maxwidth50" name="search_amount" value="' . dol_escape_htmltag($search_amount) . '"></td>';
@@ -299,6 +266,7 @@ if ($result) {

 	$expensereport_static = new ExpenseReport($db);

+	$var = True;
 	while ( $i < min($num_lines, $limit) ) {
 		$objp = $db->fetch_object($result);
 		$codeCompta = length_accountg($objp->account_number) . ' - ' . $objp->label;
@@ -329,7 +297,7 @@ if ($result) {

 		print '<td>' . $codeCompta . '</td>';

-		print '<td align="left"><a href="./card.php?id=' . $objp->rowid . '&backtopage='.urlencode($_SERVER["PHP_SELF"].($param?'?'.$param:'')). '">';
+		print '<td align="left"><a href="./card.php?id=' . $objp->rowid . '">';
 		print img_edit();
 		print '</a></td>';

@@ -348,7 +316,7 @@ if ($result) {

 	print '</form>';
 } else {
-	print $db->lasterror();
+	print $db->error();
 }


--- a/htdocs/accountancy/expensereport/list.php
+++ b/htdocs/accountancy/expensereport/list.php
@@ -32,8 +32,6 @@ require_once DOL_DOCUMENT_ROOT . '/expensereport/class/expensereport.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';

 // Langs
 $langs->load("compta");
@@ -60,10 +58,6 @@ $search_desc = GETPOST('search_desc', 'alpha');
 $search_amount = GETPOST('search_amount', 'alpha');
 $search_account = GETPOST('search_account', 'alpha');
 $search_vat = GETPOST('search_vat', 'alpha');
-$search_day=GETPOST("search_day","int");
-$search_month=GETPOST("search_month","int");
-$search_year=GETPOST("search_year","int");
-
 $btn_ventil = GETPOST('ventil', 'alpha');

 // Load variable for pagination
@@ -71,7 +65,7 @@ $limit = GETPOST('limit','int')?GETPOST('limit', 'int'):(empty($conf->global->AC
 $sortfield = GETPOST('sortfield', 'alpha');
 $sortorder = GETPOST('sortorder', 'alpha');
 $page = GETPOST('page','int');
-if (empty($page) || $page < 0) { $page = 0; }
+if ($page < 0) { $page = 0; }
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
@@ -92,15 +86,13 @@ if (! $user->rights->accounting->bind->write)
 $formaccounting = new FormAccounting($db);
 $accounting = new AccountingAccount($db);

-$chartaccountcode = dol_getIdFromCode($db, $conf->global->CHARTOFACCOUNTS, 'accounting_system', 'rowid', 'pcg_version');
-

 /*
 * Action
 */

-if (GETPOST('cancel','alpha')) { $action='list'; $massaction=''; }
-if (! GETPOST('confirmmassaction','alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction=''; }
+if (GETPOST('cancel')) { $action='list'; $massaction=''; }
+if (! GETPOST('confirmmassaction') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction=''; }

 // Purge search criteria
 if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')) // All test are required to be compatible with all browsers
@@ -111,17 +103,14 @@ if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x',
    $search_amount = '';
    $search_account = '';
    $search_vat = '';
-    $search_day = '';
-    $search_month = '';
-    $search_year = '';
 }

 // Mass actions
-$objectclass='ExpenseReport';
-$objectlabel='ExpenseReport';
-$permtoread = $user->rights->expensereport->read;
-$permtodelete = $user->rights->expensereport->delete;
-$uploaddir = $conf->expensereport->dir_output;
+$objectclass='Skeleton';
+$objectlabel='Skeleton';
+$permtoread = $user->rights->accounting->read;
+$permtodelete = $user->rights->accounting->delete;
+$uploaddir = $conf->accounting->dir_output;
 include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';

 if ($massaction == 'ventil') {
@@ -180,28 +169,21 @@ if ($massaction == 'ventil') {
 */

 $form = new Form($db);
-$formother = new FormOther($db);

 llxHeader('', $langs->trans("ExpenseReportsVentilation"));

-if (empty($chartaccountcode))
-{
-	print $langs->trans("ErrorChartOfAccountSystemNotSelected");
-	llxFooter();
-	$db->close();
-	exit;
-}
-
 // Expense report lines
 $sql = "SELECT er.ref, er.rowid as erid, er.date_debut,";
-$sql.= " erd.rowid, erd.fk_c_type_fees, erd.comments, erd.total_ht as price, erd.fk_code_ventilation, erd.tva_tx as tva_tx_line, erd.vat_src_code, erd.date,";
-$sql.= " f.id as type_fees_id, f.code as type_fees_code, f.label as type_fees_label, f.accountancy_code as code_buy,";
-$sql.= " aa.rowid as aarowid";
-$sql.= " FROM " . MAIN_DB_PREFIX . "expensereport as er";
-$sql.= " INNER JOIN " . MAIN_DB_PREFIX . "expensereport_det as erd ON er.rowid = erd.fk_expensereport";
-$sql.= " LEFT JOIN " . MAIN_DB_PREFIX . "c_type_fees as f ON f.id = erd.fk_c_type_fees";
-$sql.= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON f.accountancy_code = aa.account_number AND aa.fk_pcg_version = '" . $chartaccountcode."'";
-$sql.= " WHERE er.fk_statut IN (".ExpenseReport::STATUS_APPROVED.", ".ExpenseReport::STATUS_CLOSED.") AND erd.fk_code_ventilation <= 0";
+$sql .= " erd.rowid, erd.fk_c_type_fees, erd.comments, erd.total_ht as price, erd.fk_code_ventilation, erd.tva_tx as tva_tx_line, erd.vat_src_code, erd.date,";
+$sql .= " f.id as type_fees_id, f.code as type_fees_code, f.label as type_fees_label, f.accountancy_code as code_buy,";
+$sql .= " aa.rowid as aarowid";
+$sql .= " FROM " . MAIN_DB_PREFIX . "expensereport as er";
+$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "expensereport_det as erd ON er.rowid = erd.fk_expensereport";
+$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_type_fees as f ON f.id = erd.fk_c_type_fees";
+$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON f.accountancy_code = aa.account_number";
+$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_system as accsys ON accsys.pcg_version = aa.fk_pcg_version";
+$sql .= " WHERE er.fk_statut > 4 AND erd.fk_code_ventilation <= 0";
+$sql .= " AND (accsys.rowid='" . $conf->global->CHARTOFACCOUNTS . "' OR f.accountancy_code IS NULL OR f.accountancy_code ='')";
 // Add search filter like
 if (strlen(trim($search_expensereport))) {
    $sql .= natural_search("er.ref",$search_expensereport);
@@ -221,19 +203,6 @@ if (strlen(trim($search_account))) {
 if (strlen(trim($search_vat))) {
    $sql .= natural_search("erd.tva_tx",$search_vat,1);
 }
-if ($search_month > 0)
-{
-	if ($search_year > 0 && empty($search_day))
-		$sql.= " AND erd.date BETWEEN '".$db->idate(dol_get_first_day($search_year,$search_month,false))."' AND '".$db->idate(dol_get_last_day($search_year,$search_month,false))."'";
-		else if ($search_year > 0 && ! empty($search_day))
-			$sql.= " AND erd.date BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $search_month, $search_day, $search_year))."' AND '".$db->idate(dol_mktime(23, 59, 59, $search_month, $search_day, $search_year))."'";
-			else
-				$sql.= " AND date_format(erd.date, '%m') = '".$db->escape($search_month)."'";
-}
-else if ($search_year > 0)
-{
-	$sql.= " AND erd.date BETWEEN '".$db->idate(dol_get_first_day($search_year,1,false))."' AND '".$db->idate(dol_get_last_day($search_year,12,false))."'";
-}
 $sql .= " AND er.entity IN (" . getEntity('expensereport', 0) . ")";  // We don't share object for accountancy

 $sql .= $db->order($sortfield, $sortorder);
@@ -259,23 +228,14 @@ if ($result) {
 	$param='';
 	if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
 	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
-	if ($search_lineid)      $param.='&search_lineid='.urlencode($search_lineid);
-	if ($search_day)         $param.='&search_day='.urlencode($search_day);
-	if ($search_month)       $param.='&search_month='.urlencode($search_month);
-	if ($search_year)        $param.='&search_year='.urlencode($search_year);
-	if ($search_expensereport) $param.='&search_expensereport='.urlencode($search_expensereport);
-	if ($search_label)       $param.='&search_label='.urlencode($search_label);
-	if ($search_desc)        $param.='&search_desc='.urlencode($search_desc);
-	if ($search_amount)      $param.='&search_amount='.urlencode($search_amount);
-	if ($search_vat)         $param.='&search_vat='.urlencode($search_vat);

 	$arrayofmassactions =  array(
 	    'ventil'=>$langs->trans("Ventilate")
 	    //'presend'=>$langs->trans("SendByMail"),
 	    //'builddoc'=>$langs->trans("PDFMerge"),
 	);
-	//if ($user->rights->mymodule->supprimer) $arrayofmassactions['predelete']=$langs->trans("Delete");
-	//if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
+	//if ($user->rights->mymodule->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
+	//if ($massaction == 'presend') $arrayofmassactions=array();
 	$massactionbutton=$form->selectMassAction('ventil', $arrayofmassactions, 1);


@@ -292,12 +252,6 @@ if ($result) {

 	print $langs->trans("DescVentilTodoExpenseReport") . '</br><br>';

-	/*$topicmail="Information";
-	$modelmail="project";
-	$objecttmp=new Project($db);
-	$trackid='prj'.$object->id;
-	include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';*/
-
 	if ($msg) print $msg.'<br>';

 	$moreforfilter = '';
@@ -309,11 +263,7 @@ if ($result) {
 	print '<tr class="liste_titre_filter">';
 	print '<td class="liste_titre"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_expensereport" value="' . dol_escape_htmltag($search_expensereport) . '"></td>';
-	print '<td class="liste_titre center">';
-   	if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="search_day" value="'.$search_day.'">';
-   	print '<input class="flat" type="text" size="1" maxlength="2" name="search_month" value="'.$search_month.'">';
-   	$formother->select_year($search_year,'search_year',1, 20, 5);
-	print '</td>';
+	print '<td class="liste_titre"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_label" value="' . dol_escape_htmltag($search_label) . '"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidthonsmartphone" name="search_desc" value="' . dol_escape_htmltag($search_desc) . '"></td>';
 	print '<td class="liste_titre" align="right"><input type="text" class="right flat maxwidth50" name="search_amount" value="' . dol_escape_htmltag($search_amount) . '"></td>';
@@ -363,7 +313,6 @@ if ($result) {
 		// Ref Expense report
 		print '<td>' . $expensereport_static->getNomUrl(1) . '</td>';

-		// Date
 		print '<td align="center">' . dol_print_date($db->jdate($objp->date), 'day') . '</td>';

 		// Fees label
@@ -394,11 +343,11 @@ if ($result) {

 		// Suggested accounting account
 		print '<td align="center">';
-		print $formaccounting->select_account($objp->aarowid_suggest, 'codeventil'.$objp->rowid, 1, array(), 0, 0, 'codeventil maxwidth300 maxwidthonsmartphone', 'cachewithshowemptyone');
+		print $formaccounting->select_account($objp->aarowid_suggest, 'codeventil'.$objp->rowid, 1, array(), 0, 0, 'maxwidth300 maxwidthonsmartphone', 'cachewithshowemptyone');
 		print '</td>';

 		print '<td align="center">';
-		print '<input type="checkbox" class="flat checkforselect checkforselect'.$objp->rowid.'" name="toselect[]" value="' . $objp->rowid . "_" . $i . '"' . ($objp->aarowid ? "checked" : "") . '/>';
+		print '<input type="checkbox" class="flat checkforselect" name="toselect[]" value="' . $objp->rowid . "_" . $i . '"' . ($objp->aarowid ? "checked" : "") . '/>';
 		print '</td>';

 		print "</tr>";
@@ -413,17 +362,5 @@ if ($result) {
 	print $db->error();
 }

-// Add code to auto check the box when we select an account
-print '<script type="text/javascript" language="javascript">
-jQuery(document).ready(function() {
-	jQuery(".codeventil").change(function() {
-		var s=$(this).attr("id").replace("codeventil", "")
-		console.log(s+" "+$(this).val());
-		if ($(this).val() == -1) jQuery(".checkforselect"+s).prop("checked", false);
-		else jQuery(".checkforselect"+s).prop("checked", true);
-	});
-});
-</script>';
-
 llxFooter();
 $db->close();
--- a/htdocs/accountancy/index.php
+++ b/htdocs/accountancy/index.php
@@ -63,118 +63,108 @@ print load_fiche_titre($langs->trans("AccountancyArea"), '', 'title_accountancy'

 $step = 0;

-if ($conf->accounting->enabled)
+print $langs->trans("AccountancyAreaDescIntro")."<br>\n";
+print "<br>\n";print "<br>\n";
+
+print_fiche_titre($langs->trans("AccountancyAreaDescActionOnce"), '', 'object_calendar')."<br>\n";
+print '<hr>';
+print "<br>\n";
+
+// STEPS
+$step++;
+print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescJournalSetup", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("AccountingJournals").'</strong>');
+print "<br>\n";
+$step++;
+print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescChartModel", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("Pcg_version").'</strong>');
+print "<br>\n";
+$step++;
+print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescChart", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("Chartofaccounts").'</strong>');
+print "<br>\n";
+
+print "<br>\n";
+print $langs->trans("AccountancyAreaDescActionOnceBis");
+print "<br>\n";
+print "<br>\n";
+
+$step++;
+print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescMisc", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong>')."\n";
+print "<br>\n";
+$step++;
+$textlink = '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup").'-'.$langs->transnoentitiesnoconv("MenuVatAccounts").'</strong>';
+print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescVat", $step, $textlink);
+print "<br>\n";
+if (! empty($conf->tax->enabled))
 {
-	print $langs->trans("AccountancyAreaDescIntro")."<br>\n";
-	print "<br>\n";print "<br>\n";
-
-	print_fiche_titre('<span class="fa fa-calendar-check-o"></span> '.$langs->trans("AccountancyAreaDescActionOnce"), '', '')."<br>\n";
-	print '<hr>';
-	print "<br>\n";
-
-	// STEPS
-	$step++;
-	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescJournalSetup", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("AccountingJournals").'</strong>');
-	print "<br>\n";
-	$step++;
-	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescChartModel", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("Pcg_version").'</strong>');
-	print "<br>\n";
-	$step++;
-	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescChart", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("Chartofaccounts").'</strong>');
-	print "<br>\n";
-
-	print "<br>\n";
-	print $langs->trans("AccountancyAreaDescActionOnceBis");
-	print "<br>\n";
-	print "<br>\n";
-
-	$step++;
-	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescProd", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong>');
-	print "<br>\n";
-
-	$step++;
-	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBank", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuBankAccounts").'</strong>')."\n";
-	print "<br>\n";
-
-	$step++;
-	$textlink = '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup").'-'.$langs->transnoentitiesnoconv("MenuVatAccounts").'</strong>';
-	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescVat", $step, $textlink);
-	print "<br>\n";
-	if (! empty($conf->tax->enabled))
-	{
-	    $textlink = '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup").'-'.$langs->transnoentitiesnoconv("MenuTaxAccounts").'</strong>';
-	    $step++;
-	    print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescContrib", $step, $textlink);
-	    print "<br>\n";
-	}
-	/*if (! empty($conf->salaries->enabled))
-	{
-	    $step++;
-	    print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescSal", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy")."-".$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong>');
-	    // htdocs/admin/salaries.php
-	    print "<br>\n";
-	    print "<br>\n";
-	}*/
-	if (! empty($conf->expensereport->enabled))  // TODO Move this in the default account page because this is only one accounting account per purpose, not several.
-	{
-	    $step++;
-	    print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescExpenseReport", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuExpenseReportAccounts").'</strong>');
-	    print "<br>\n";
-	}
-	/*
-	if (! empty($conf->loan->enabled))
-	{
-	    $step++;
-	    print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescLoan", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuSpecialExpenses").'-'.$langs->transnoentitiesnoconv("Loans").'</strong> '.$langs->transnoentitiesnoconv("or").' <strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong>');
-	    print "<br>\n";
-	}
-	if (! empty($conf->don->enabled))
-	{
-	    $step++;
-	    print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescDonation", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuDonationAccounts").'</strong>');
-	    print "<br>\n";
-	}*/
-
-	$step++;
-	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescProd", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("ProductsBinding").'</strong>');
-	print "<br>\n";
-
-
-	print '<br>';
-
-
-	print "<br>\n";
-	print_fiche_titre('<span class="fa fa-calendar"></span> '.$langs->trans("AccountancyAreaDescActionFreq"), '', '');
-	print '<hr>';
-	print "<br>\n";
-	$step = 0;
-
-	$langs->loadLangs(array('bills', 'trips'));
-
-	$step++;
-	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64+$step), $langs->transnoentitiesnoconv("BillsCustomers"), '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy")."-".$langs->transnoentitiesnoconv("CustomersVentilation").'</strong>')."\n";
-	print "<br>\n";
-
-	$step++;
-	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64+$step), $langs->transnoentitiesnoconv("BillsSuppliers"), '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy")."-".$langs->transnoentitiesnoconv("SuppliersVentilation").'</strong>')."\n";
-	print "<br>\n";
-
-	$step++;
-	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64+$step), $langs->transnoentitiesnoconv("ExpenseReports"), '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy")."-".$langs->transnoentitiesnoconv("ExpenseReportsVentilation").'</strong>')."\n";
-	print "<br>\n";
-
-	$step++;
-	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescWriteRecords", chr(64+$step), $langs->transnoentitiesnoconv("Journalization"), $langs->transnoentitiesnoconv("WriteBookKeeping"))."\n";
-	print "<br>\n";
-
-	$step++;
-	print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescAnalyze", chr(64+$step))."<br>\n";
-	print "<br>\n";
+    $textlink = '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup").'-'.$langs->transnoentitiesnoconv("MenuTaxAccounts").'</strong>';
+    $step++;
+    print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescContrib", $step, $textlink);
+    print "<br>\n";
 }
-else
+/*if (! empty($conf->salaries->enabled))
 {
-	print $langs->trans("Module10Desc")."<br>\n";
+    $step++;
+    print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescSal", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy")."-".$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong>');
+    // htdocs/admin/salaries.php
+    print "<br>\n";
+    print "<br>\n";
+}*/
+if (! empty($conf->expensereport->enabled))  // TODO Move this in the default account page because this is only one accounting account per purpose, not several.
+{
+    $step++;
+    print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescExpenseReport", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuExpenseReportAccounts").'</strong>');
+    print "<br>\n";
 }
+/*
+if (! empty($conf->loan->enabled))
+{
+    $step++;
+    print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescLoan", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuSpecialExpenses").'-'.$langs->transnoentitiesnoconv("Loans").'</strong> '.$langs->transnoentitiesnoconv("or").' <strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong>');
+    print "<br>\n";
+}
+if (! empty($conf->don->enabled))
+{
+    $step++;
+    print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescDonation", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuDonationAccounts").'</strong>');
+    print "<br>\n";
+}*/
+
+$step++;
+print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescProd", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("ProductsBinding").'</strong>');
+print "<br>\n";
+
+$step++;
+$textlink='<strong>'.$langs->transnoentitiesnoconv("MenuBankCash").'</strong>';
+print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBank", $step, $textlink);
+print "<br>\n";
+
+
+print "<br>\n";
+print_fiche_titre($langs->trans("AccountancyAreaDescActionFreq"), '', 'object_calendarweek');
+print '<hr>';
+print "<br>\n";
+$step = 0;
+
+$langs->loadLangs(array('bills', 'trips'));
+
+$step++;
+print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64+$step), $langs->transnoentitiesnoconv("BillsCustomers"), '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy")."-".$langs->transnoentitiesnoconv("CustomersVentilation").'</strong>')."\n";
+print "<br>\n";
+
+$step++;
+print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64+$step), $langs->transnoentitiesnoconv("BillsSuppliers"), '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy")."-".$langs->transnoentitiesnoconv("SuppliersVentilation").'</strong>')."\n";
+print "<br>\n";
+
+$step++;
+print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64+$step), $langs->transnoentitiesnoconv("ExpenseReports"), '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy")."-".$langs->transnoentitiesnoconv("ExpenseReportsVentilation").'</strong>')."\n";
+print "<br>\n";
+
+$step++;
+print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescWriteRecords", chr(64+$step), $langs->transnoentitiesnoconv("Journalization"), $langs->transnoentitiesnoconv("WriteBookKeeping"))."\n";
+print "<br>\n";
+
+$step++;
+print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescAnalyze", chr(64+$step))."<br>\n";
+print "<br>\n";

 llxFooter();
 $db->close();
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
--- a/htdocs/accountancy/journal/expensereportsjournal.php
+++ b/htdocs/accountancy/journal/expensereportsjournal.php
@@ -1,11 +1,11 @@
 <?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.houssin@capnetworks.com>
- * Copyright (C) 2013-2017  Alexandre Spangaro	<aspangaro@zendsi.com>
- * Copyright (C) 2013-2016  Olivier Geffroy		<jeff@jeffinfo.com>
- * Copyright (C) 2013-2016  Florian Henry		<florian.henry@open-concept.pro>
+/* 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.houssin@capnetworks.com>
+ * Copyright (C) 2013-2017	Alexandre Spangaro	<aspangaro@zendsi.com>
+ * Copyright (C) 2013-2016	Olivier Geffroy		<jeff@jeffinfo.com>
+ * Copyright (C) 2013-2016	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
@@ -77,7 +77,7 @@ if ($pastmonth == 0) {
 $date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear);
 $date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear);

-if (! GETPOSTISSET('date_startmonth') && (empty($date_start) || empty($date_end))) // We define date_start and date_end, only if we did not submit the form
+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);
@@ -101,15 +101,10 @@ $sql .= " AND erd.fk_code_ventilation > 0";
 $sql .= " AND er.entity IN (" . getEntity('expensereport', 0) . ")";  // We don't share object for accountancy
 if ($date_start && $date_end)
 	$sql .= " AND er.date_debut >= '" . $db->idate($date_start) . "' AND er.date_debut <= '" . $db->idate($date_end) . "'";
-// Already in bookkeeping or not
 if ($in_bookkeeping == 'already')
-{
    $sql .= " AND er.rowid IN (SELECT fk_doc FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as ab  WHERE ab.doc_type='expense_report')";
-}
 if ($in_bookkeeping == 'notyet')
-{
    $sql .= " AND er.rowid NOT IN (SELECT fk_doc FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as ab  WHERE ab.doc_type='expense_report')";
-}
 $sql .= " ORDER BY er.date_debut";

 dol_syslog('accountancy/journal/expensereportsjournal.php', LOG_DEBUG);
@@ -188,9 +183,6 @@ if ($action == 'writebookkeeping') {
 	{
 		$errorforline = 0;

-		$totalcredit = 0;
-		$totaldebit = 0;
-
 		$db->begin();

 		// Thirdparty
@@ -216,10 +208,6 @@ if ($action == 'writebookkeeping') {
 					$bookkeeping->code_journal = $journal;
 					$bookkeeping->journal_label = $journal_label;
 					$bookkeeping->fk_user_author = $user->id;
-					$bookkeeping->entity = $conf->entity;
-
-					$totaldebit += $bookkeeping->debit;
-					$totalcredit += $bookkeeping->credit;

 					$result = $bookkeeping->create($user);
 					if ($result < 0) {
@@ -266,10 +254,6 @@ if ($action == 'writebookkeeping') {
 						$bookkeeping->code_journal = $journal;
 						$bookkeeping->journal_label = $journal_label;
 						$bookkeeping->fk_user_author = $user->id;
-						$bookkeeping->entity = $conf->entity;
-
-						$totaldebit += $bookkeeping->debit;
-						$totalcredit += $bookkeeping->credit;

 						$result = $bookkeeping->create($user);
 						if ($result < 0) {
@@ -314,7 +298,7 @@ if ($action == 'writebookkeeping') {
 					$bookkeeping->subledger_account = '';
 					$bookkeeping->subledger_label = '';
 					$bookkeeping->numero_compte = $k;
-					$bookkeeping->label_operation = $langs->trans("VAT"). ' '.join(', ',$def_tva[$key][$k]).' %';
+					$bookkeeping->label_operation = $langs->trans("VAT"). ' '.join(', ',$def_tva[$key][$k]);
 					$bookkeeping->montant = $mt;
 					$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
 					$bookkeeping->debit = ($mt > 0) ? $mt : 0;
@@ -322,10 +306,6 @@ if ($action == 'writebookkeeping') {
 					$bookkeeping->code_journal = $journal;
 					$bookkeeping->journal_label = $journal_label;
 					$bookkeeping->fk_user_author = $user->id;
-					$bookkeeping->entity = $conf->entity;
-
-					$totaldebit += $bookkeeping->debit;
-					$totalcredit += $bookkeeping->credit;

 					$result = $bookkeeping->create($user);
 					if ($result < 0) {
@@ -347,14 +327,6 @@ if ($action == 'writebookkeeping') {
 			}
 		}

-		// Protection against a bug on line before
-		if (price2num($totaldebit) != price2num($totalcredit))
-		{
-			$error++;
-			$errorforline++;
-			setEventMessages('Try to insert a non balanced transaction in book for '.$val["ref"].'. Canceled. Surely a bug.', null, 'errors');
-		}
-
 		if (! $errorforline)
 		{
 			$db->commit();
@@ -371,8 +343,6 @@ if ($action == 'writebookkeeping') {
 		}
 	}

-	$tabpay = $taber;
-
 	if (empty($error) && count($tabpay) > 0) {
 		setEventMessages($langs->trans("GeneralLedgerIsWritten"), null, 'mesgs');
 	}
@@ -397,7 +367,7 @@ if ($action == 'writebookkeeping') {
 		$param.='&date_endday='.$date_endday;
 		$param.='&date_endmonth='.$date_endmonth;
 		$param.='&date_endyear='.$date_endyear;
-		$param.='&in_bookkeeping='.$in_bookkeeping;
+		$param.='&in_bookeeping='.$in_bookeeping;
 		header("Location: ".$_SERVER['PHP_SELF'].($param?'?'.$param:''));
 		exit;
 	}
@@ -528,11 +498,11 @@ if (empty($action) || $action == 'view') {
 	$nomlink = '';
 	$periodlink = '';
 	$exportlink = '';
-	$builddate=dol_now();
+	$builddate = time();
 	$description.= $langs->trans("DescJournalOnlyBindedVisible").'<br>';

-	$listofchoices=array('notyet'=>$langs->trans("NotYetInGeneralLedger"), 'already'=>$langs->trans("AlreadyInGeneralLedger"));
-	$period = $form->select_date($date_start?$date_start:-1, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end?$date_end:-1, 'date_end', 0, 0, 0, '', 1, 0, 1). ' -  ' .$langs->trans("JournalizationInLedgerStatus").' '. $form->selectarray('in_bookkeeping', $listofchoices, $in_bookkeeping, 1);
+	$listofchoices=array('already'=>$langs->trans("AlreadyInGeneralLedger"), 'notyet'=>$langs->trans("NotYetInGeneralLedger"));
+	$period = $form->select_date($date_start, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1). ' -  ' .$langs->trans("AlreadyInGeneralLedger").' '. $form->selectarray('in_bookkeeping', $listofchoices, $in_bookkeeping, 1);

 	$varlink = 'id_journal=' . $id_journal;

@@ -540,33 +510,30 @@ if (empty($action) || $action == 'view') {

 	// Button to write into Ledger
 	if (empty($conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT) || $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT == '-1') {
-		print '<br>'.img_warning().' '.$langs->trans("SomeMandatoryStepsOfSetupWereNotDone");
-		print ' : '.$langs->trans("AccountancyAreaDescMisc", 4, '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong>');
+	    print img_warning().' '.$langs->trans("SomeMandatoryStepsOfSetupWereNotDone");
+	    print ' : '.$langs->trans("AccountancyAreaDescMisc", 4, '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong>');
 	}
 	print '<div class="tabsAction tabsActionNoBottom">';
 	if (empty($conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT) || $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT == '-1') {
-		print '<input type="button" class="butActionRefused" title="'.dol_escape_htmltag($langs->trans("SomeMandatoryStepsOfSetupWereNotDone")).'" value="' . $langs->trans("WriteBookKeeping") . '" />';
+	    print '<input type="button" class="butActionRefused" title="'.dol_escape_htmltag($langs->trans("SomeMandatoryStepsOfSetupWereNotDone")).'" value="' . $langs->trans("WriteBookKeeping") . '" />';
 	}
 	else {
-		if ($in_bookkeeping == 'notyet') print '<input type="button" class="butAction" name="writebookkeeping" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
-		else print '<a href="#" class="butActionRefused" name="writebookkeeping">' . $langs->trans("WriteBookKeeping") . '</a>';
+	   print '<input type="button" class="butAction" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
 	}
-	//print '<input type="button" class="butAction" name="exportcsv" value="' . $langs->trans("ExportDraftJournal") . '" onclick="launch_export();" />';
+	//print '<input type="button" class="butAction" value="' . $langs->trans("ExportDraftJournal") . '" onclick="launch_export();" />';
 	print '</div>';

-	// TODO Avoid using js. We can use a direct link with $param
 	print '
 	<script type="text/javascript">
 		function launch_export() {
-			$("div.fiche form input[name=\"action\"]").val("exportcsv");
-			$("div.fiche form input[type=\"submit\"]").click();
-			$("div.fiche form input[name=\"action\"]").val("");
+			$("div.fiche div.tabBar form input[name=\"action\"]").val("exportcsv");
+			$("div.fiche div.tabBar form input[type=\"submit\"]").click();
+			$("div.fiche div.tabBar form input[name=\"action\"]").val("");
 		}
 		function writebookkeeping() {
-			console.log("click on writebookkeeping");
-			$("div.fiche form input[name=\"action\"]").val("writebookkeeping");
-			$("div.fiche form input[type=\"submit\"]").click();
-			$("div.fiche form input[name=\"action\"]").val("");
+			$("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>';

@@ -576,7 +543,6 @@ if (empty($action) || $action == 'view') {
 	print '<br>';

 	$i = 0;
-	print '<div class="div-table-responsive">';
 	print "<table class=\"noborder\" width=\"100%\">";
 	print "<tr class=\"liste_titre\">";
 	print "<td></td>";
@@ -584,7 +550,7 @@ if (empty($action) || $action == 'view') {
 	print "<td>" . $langs->trans("Piece") . ' (' . $langs->trans("ExpenseReportRef") . ")</td>";
 	print "<td>" . $langs->trans("AccountAccounting") . "</td>";
 	print "<td>" . $langs->trans("SubledgerAccount") . "</td>";
-	print "<td>" . $langs->trans("LabelOperation") . "</td>";
+	print "<td>" . $langs->trans("Label") . "</td>";
 	print "<td align='right'>" . $langs->trans("Debit") . "</td>";
 	print "<td align='right'>" . $langs->trans("Credit") . "</td>";
 	print "</tr>\n";
@@ -691,7 +657,7 @@ if (empty($action) || $action == 'view') {
 				// Subledger account
 				print "<td>";
 				print '</td>';
-				print "<td>" . $userstatic->getNomUrl(0, 'user', 16) . ' - ' . $langs->trans("VAT"). ' '.join(', ',$def_tva[$key][$k]).' %'.($numtax?' - Localtax '.$numtax:'');
+				print "<td>" . $userstatic->getNomUrl(0, 'user', 16) . ' - ' . $langs->trans("VAT"). ' '.join(', ',$def_tva[$key][$k]).($numtax?' - Localtax '.$numtax:'');
 				print "</td>";
 				print '<td align="right">' . ($mt >= 0 ? price($mt) : '') . "</td>";
 				print '<td align="right">' . ($mt < 0 ? price(- $mt) : '') . "</td>";
@@ -702,7 +668,6 @@ if (empty($action) || $action == 'view') {
 	}

 	print "</table>";
-	print '</div>';

 	// End of page
 	llxFooter();
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -56,18 +56,9 @@ $now = dol_now();
 if ($user->societe_id > 0)
 	accessforbidden();

-$hookmanager->initHooks(array('purchasesjournal'));
-$parameters=array();
-
 /*
 * Actions
 */
-$reshook=$hookmanager->executeHooks('doActions',$parameters,$user,$action);    // Note that $action and $object may have been modified by some hooks
-
-
-/*
- * Views
- */

 // Get informations of journal
 $accountingjournalstatic = new AccountingJournal($db);
@@ -86,7 +77,7 @@ if ($pastmonth == 0) {
 $date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear);
 $date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear);

-if (! GETPOSTISSET('date_startmonth') && (empty($date_start) || empty($date_end))) // We define date_start and date_end, only if we did not submit the form
+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);
@@ -94,34 +85,31 @@ if (! GETPOSTISSET('date_startmonth') && (empty($date_start) || empty($date_end)

 $idpays = $mysoc->country_id;

-$sql = "SELECT f.rowid, f.ref, f.type, f.datef as df, f.libelle,f.ref_supplier, f.date_lim_reglement as dlf, f.close_code,";
+$sql = "SELECT f.rowid, f.ref, f.type, f.datef as df, f.libelle,f.ref_supplier,";
 $sql .= " fd.rowid as fdid, fd.description, fd.product_type, fd.total_ht, fd.tva as total_tva, fd.total_localtax1, fd.total_localtax2, fd.tva_tx, fd.total_ttc, fd.vat_src_code,";
 $sql .= " s.rowid as socid, s.nom as name, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur,";
 $sql .= " p.accountancy_code_buy , aa.rowid as fk_compte, aa.account_number as compte, aa.label as label_compte";
+//$sql .= " ct.accountancy_code_buy as account_tva";
 $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 . "accounting_account 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";
+$sql .= " WHERE f.fk_statut > 0"; // TODO Facture annulée ?
 $sql .= " AND fd.fk_code_ventilation > 0";
 $sql .= " AND f.entity IN (" . getEntity('facture_fourn', 0) . ")";  // We don't share object for accountancy
 if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
-	$sql .= " AND f.type IN (" . FactureFournisseur::TYPE_STANDARD . "," . FactureFournisseur::TYPE_REPLACEMENT . "," . FactureFournisseur::TYPE_CREDIT_NOTE . "," . FactureFournisseur::TYPE_SITUATION . ")";
+    $sql .= " AND f.type IN (" . FactureFournisseur::TYPE_STANDARD . "," . FactureFournisseur::TYPE_REPLACEMENT . "," . FactureFournisseur::TYPE_CREDIT_NOTE . "," . FactureFournisseur::TYPE_SITUATION . ")";
 } else {
-	$sql .= " AND f.type IN (" . FactureFournisseur::TYPE_STANDARD . "," . FactureFournisseur::TYPE_REPLACEMENT . "," . FactureFournisseur::TYPE_CREDIT_NOTE . "," . FactureFournisseur::TYPE_DEPOSIT . "," . FactureFournisseur::TYPE_SITUATION . ")";
+    $sql .= " AND f.type IN (" . FactureFournisseur::TYPE_STANDARD . "," . FactureFournisseur::TYPE_REPLACEMENT . "," . FactureFournisseur::TYPE_CREDIT_NOTE . "," . FactureFournisseur::TYPE_DEPOSIT . "," . FactureFournisseur::TYPE_SITUATION . ")";
 }
 if ($date_start && $date_end)
 	$sql .= " AND f.datef >= '" . $db->idate($date_start) . "' AND f.datef <= '" . $db->idate($date_end) . "'";
-// Already in bookkeeping or not
 if ($in_bookkeeping == 'already')
-{
-	$sql .= " AND f.rowid IN (SELECT fk_doc FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as ab WHERE ab.doc_type='supplier_invoice')";
-}
+	$sql .= " AND f.rowid IN (SELECT fk_doc FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as ab  WHERE ab.doc_type='supplier_invoice')";
 if ($in_bookkeeping == 'notyet')
-{
-	$sql .= " AND f.rowid NOT IN (SELECT fk_doc FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as ab WHERE ab.doc_type='supplier_invoice')";
-}
+	$sql .= " AND f.rowid NOT IN (SELECT fk_doc FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as ab  WHERE ab.doc_type='supplier_invoice')";
 $sql .= " ORDER BY f.datef";

 dol_syslog('accountancy/journal/purchasesjournal.php', LOG_DEBUG);
@@ -135,7 +123,6 @@ if ($result) {
 	$tablocaltax1 = array ();
 	$tablocaltax2 = array ();
 	$tabcompany = array ();
-	$tabother = array();

 	$num = $db->num_rows($result);

@@ -160,27 +147,20 @@ if ($result) {

 		$vatdata = getTaxesFromId($obj->tva_tx.($obj->vat_src_code?' ('.$obj->vat_src_code.')':''), $mysoc, $mysoc, 0);
 		$compta_tva = (! empty($vatdata['accountancy_code_buy']) ? $vatdata['accountancy_code_buy'] : $cpttva);
-		$compta_localtax1 = (! empty($vatdata['accountancy_code_buy']) ? $vatdata['accountancy_code_buy'] : $cpttva);
-		$compta_localtax2 = (! empty($vatdata['accountancy_code_buy']) ? $vatdata['accountancy_code_buy'] : $cpttva);
-		$compta_counterpart_tva_npr = (! empty($conf->global->ACCOUNTING_COUNTERPART_VAT_NPR)) ? $conf->global->ACCOUNTING_COUNTERPART_VAT_NPR : 'NotDefined';

 		// Define array to display all VAT rates that use this accounting account $compta_tva
 		if (price2num($obj->tva_tx) || ! empty($obj->vat_src_code))
 		{
-			$def_tva[$obj->rowid][$compta_tva][vatrate($obj->tva_tx).($obj->vat_src_code?' ('.$obj->vat_src_code.')':'')]=(vatrate($obj->tva_tx).($obj->vat_src_code?' ('.$obj->vat_src_code.')':''));
+            $def_tva[$obj->rowid][$compta_tva][vatrate($obj->tva_tx).($obj->vat_src_code?' ('.$obj->vat_src_code.')':'')]=(vatrate($obj->tva_tx).($obj->vat_src_code?' ('.$obj->vat_src_code.')':''));
 		}

-		$line = new SupplierInvoiceLine($db);
-		$line->fetch($obj->fdid);
-
 		$tabfac[$obj->rowid]["date"] = $db->jdate($obj->df);
-		$tabfac[$obj->rowid]["datereg"] = $db->jdate($obj->dlr);
 		$tabfac[$obj->rowid]["ref"] = $obj->ref_supplier . ' (' . $obj->ref . ')';
 		$tabfac[$obj->rowid]["refsologest"] = $obj->ref;
 		$tabfac[$obj->rowid]["refsuppliersologest"] = $obj->ref_supplier;
+
 		$tabfac[$obj->rowid]["type"] = $obj->type;
 		$tabfac[$obj->rowid]["description"] = $obj->description;
-		$tabfac[$obj->rowid]["close_code"] = $obj->close_code;		// close_code = 'replaced' for replacement invoices (not used in most european countries)
 		//$tabfac[$obj->rowid]["fk_facturefourndet"] = $obj->fdid;

 		// Avoid warnings
@@ -193,10 +173,6 @@ if ($result) {
 		$tabttc[$obj->rowid][$compta_soc] += $obj->total_ttc;
 		$tabht[$obj->rowid][$compta_prod] += $obj->total_ht;
 		$tabtva[$obj->rowid][$compta_tva] += $obj->total_tva;
-		if (! empty($line->tva_npr))	// Add an entry for counterpart
-		{
-			$tabother[$obj->rowid][$compta_counterpart_tva_npr] += $obj->total_tva;
-		}
 		$tablocaltax1[$obj->rowid][$compta_localtax1] += $obj->total_localtax1;
 		$tablocaltax2[$obj->rowid][$compta_localtax2] += $obj->total_localtax2;
 		$tabcompany[$obj->rowid] = array (
@@ -204,104 +180,49 @@ if ($result) {
 				'name' => $obj->name,
 				'code_fournisseur' => $obj->code_fournisseur,
 				'code_compta_fournisseur' => $compta_soc
-			);
+		);

-		$i++;
+		$i ++;
 	}
 } else {
 	dol_print_error($db);
 }

-$errorforinvoice = array();
-
-// Loop in invoices to detect lines with not binding lines
-foreach ($tabfac as $key => $val) {		// Loop on each invoice
-	$sql = "SELECT COUNT(fd.rowid) as nb";
-	$sql.= " FROM " . MAIN_DB_PREFIX . "facture_fourn_det as fd";
-	$sql.= " WHERE fd.product_type <= 2 AND fd.fk_code_ventilation <= 0";
-	$sql.= " AND fd.total_ttc <> 0 AND fk_facture_fourn = ".$key;
-	$resql=$db->query($sql);
-	if ($resql)
-	{
-		$obj = $db->fetch_object($resql);
-		if ($obj->nb > 0)
-		{
-			$errorforinvoice[$key]='somelinesarenotbound';
-		}
-	}
-	else dol_print_error($db);
-}
-//var_dump($errorforinvoice);exit;
-
-
-
 // Bookkeeping Write
 if ($action == 'writebookkeeping') {
 	$now = dol_now();
 	$error = 0;

-	$companystatic = new Societe($db);
-	$invoicestatic = new FactureFournisseur($db);
-
 	foreach ($tabfac as $key => $val) {		// Loop on each invoice
-
 		$errorforline = 0;

-		$totalcredit = 0;
-		$totaldebit = 0;
-
 		$db->begin();

+		$companystatic = new Societe($db);
+		$invoicestatic = new FactureFournisseur($db);
+
 		$companystatic->id = $tabcompany[$key]['id'];
 		$companystatic->name = $tabcompany[$key]['name'];
 		$companystatic->code_compta = $tabcompany[$key]['code_compta'];
 		$companystatic->code_compta_fournisseur = $tabcompany[$key]['code_compta_fournisseur'];
 		$companystatic->code_client = $tabcompany[$key]['code_client'];
 		$companystatic->code_fournisseur = $tabcompany[$key]['code_fournisseur'];
-		$companystatic->fournisseur = 1;
+		$companystatic->client = $tabcompany[$key]['code_client'];

 		$invoicestatic->id = $key;
 		$invoicestatic->ref = (string) $val["refsologest"];
-		$invoicestatic->ref_supplier = $val["refsuppliersologest"];
+		$invoicestatic->refsupplier = $val["refsuppliersologest"];
 		$invoicestatic->type = $val["type"];
 		$invoicestatic->description = html_entity_decode(dol_trunc($val["description"], 32));
-		$invoicestatic->close_code = $val["close_code"];
-
-		$date = dol_print_date($val["date"], 'day');
-
-		// Is it a replaced invoice ? 0=not a replaced invoice, 1=replaced invoice not yet dispatched, 2=replaced invoice dispatched
-		$replacedinvoice = 0;
-		if ($invoicestatic->close_code == FactureFournisseur::CLOSECODE_REPLACED)
-		{
-			$replacedinvoice = 1;
-			$alreadydispatched = $invoicestatic->getVentilExportCompta();	// Test if replaced invoice already into bookkeeping.
-			if ($alreadydispatched) $replacedinvoice = 2;
-		}
-
-		// If not already into bookkeeping, we won't add it. If yes, do nothing (should not happen because creating replacement not possible if invoice is accounted)
-		if ($replacedinvoice == 1)
-		{
-			$db->rollback();
-			continue;
-		}
-
-		// Error if some lines are not binded/ready to be journalized
-		if ($errorforinvoice[$key] == 'somelinesarenotbound')
-		{
-			$error++;
-			$errorforline++;
-			setEventMessages($langs->trans('ErrorInvoiceContainsLinesNotYetBounded', $val['ref']), null, 'errors');
-		}

 		// Thirdparty
 		if (! $errorforline)
 		{
 			foreach ( $tabttc[$key] as $k => $mt ) {
-				//if ($mt) {
+				if ($mt) {
 					$bookkeeping = new BookKeeping($db);
 					$bookkeeping->doc_date = $val["date"];
-					$bookkeeping->date_lim_reglement = $val["datereg"];
-					$bookkeeping->doc_ref = $val["refsologest"];
+					$bookkeeping->doc_ref = $val["ref"];
 					$bookkeeping->date_create = $now;
 					$bookkeeping->doc_type = 'supplier_invoice';
 					$bookkeeping->fk_doc = $key;
@@ -310,7 +231,7 @@ if ($action == 'writebookkeeping') {
 					$bookkeeping->subledger_account = $tabcompany[$key]['code_compta_fournisseur'];
 					$bookkeeping->subledger_label = '';    // TODO To complete
 					$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER;
-					$bookkeeping->label_operation = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref_supplier . ' - ' . $langs->trans("SubledgerAccount");
+					$bookkeeping->label_operation = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("SubledgerAccount");
 					$bookkeeping->montant = $mt;
 					$bookkeeping->sens = ($mt >= 0) ? 'C' : 'D';
 					$bookkeeping->debit = ($mt <= 0) ? -$mt : 0;
@@ -318,10 +239,6 @@ if ($action == 'writebookkeeping') {
 					$bookkeeping->code_journal = $journal;
 					$bookkeeping->journal_label = $journal_label;
 					$bookkeeping->fk_user_author = $user->id;
-					$bookkeeping->entity = $conf->entity;
-
-					$totaldebit += $bookkeeping->debit;
-					$totalcredit += $bookkeeping->credit;

 					$result = $bookkeeping->create($user);
 					if ($result < 0) {
@@ -329,18 +246,16 @@ if ($action == 'writebookkeeping') {
 						{
 							$error++;
 							$errorforline++;
-							$errorforinvoice[$key]='alreadyjournalized';
 							//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
 						}
 						else
 						{
 							$error++;
 							$errorforline++;
-							$errorforinvoice[$key]='other';
 							setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
 						}
 					}
-				//}
+				}
 			}
 		}

@@ -348,23 +263,22 @@ if ($action == 'writebookkeeping') {
 		if (! $errorforline)
 		{
 			foreach ( $tabht[$key] as $k => $mt ) {
-				//if ($mt) {
+				if ($mt) {
 					// get compte id and label
 					$accountingaccount = new AccountingAccount($db);
 					if ($accountingaccount->fetch(null, $k, true)) {
 						$bookkeeping = new BookKeeping($db);
 						$bookkeeping->doc_date = $val["date"];
-						$bookkeeping->date_lim_reglement = $val["datereg"];
-						$bookkeeping->doc_ref = $val["refsologest"];
+						$bookkeeping->doc_ref = $val["ref"];
 						$bookkeeping->date_create = $now;
 						$bookkeeping->doc_type = 'supplier_invoice';
 						$bookkeeping->fk_doc = $key;
 						$bookkeeping->fk_docdet = 0;	// Useless, can be several lines that are source of this record to add
-						$bookkeeping->thirdparty_code = $companystatic->code_fournisseur;
+					    $bookkeeping->thirdparty_code = $companystatic->code_fournisseur;
 						$bookkeeping->subledger_account = '';
 						$bookkeeping->subledger_label = '';
 						$bookkeeping->numero_compte = $k;
-						$bookkeeping->label_operation = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref_supplier . ' - ' . $accountingaccount->label;
+						$bookkeeping->label_operation = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $accountingaccount->label;
 						$bookkeeping->montant = $mt;
 						$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
 						$bookkeeping->debit = ($mt > 0) ? $mt : 0;
@@ -372,10 +286,6 @@ if ($action == 'writebookkeeping') {
 						$bookkeeping->code_journal = $journal;
 						$bookkeeping->journal_label = $journal_label;
 						$bookkeeping->fk_user_author = $user->id;
-						$bookkeeping->entity = $conf->entity;
-
-						$totaldebit += $bookkeeping->debit;
-						$totalcredit += $bookkeeping->credit;

 						$result = $bookkeeping->create($user);
 						if ($result < 0) {
@@ -383,19 +293,17 @@ if ($action == 'writebookkeeping') {
 							{
 								$error++;
 								$errorforline++;
-								$errorforinvoice[$key]='alreadyjournalized';
 								//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
 							}
 							else
 							{
 								$error++;
 								$errorforline++;
-								$errorforinvoice[$key]='other';
 								setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
 							}
 						}
 					}
-				//}
+				}
 			}
 		}

@@ -411,64 +319,10 @@ if ($action == 'writebookkeeping') {
 				if ($numtax == 2) $arrayofvat = $tablocaltax2;

 				foreach ( $arrayofvat[$key] as $k => $mt ) {
-					if ($mt) {
-						$bookkeeping = new BookKeeping($db);
-						$bookkeeping->doc_date = $val["date"];
-						$bookkeeping->date_lim_reglement = $val["datereg"];
-						$bookkeeping->doc_ref = $val["refsologest"];
-						$bookkeeping->date_create = $now;
-						$bookkeeping->doc_type = 'supplier_invoice';
-						$bookkeeping->fk_doc = $key;
-						$bookkeeping->fk_docdet = 0;    // Useless, can be several lines that are source of this record to add
-						$bookkeeping->thirdparty_code = $companystatic->code_fournisseur;
-						$bookkeeping->subledger_account = '';
-						$bookkeeping->subledger_label = '';
-						$bookkeeping->numero_compte = $k;
-						$bookkeeping->label_operation = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref_supplier . ' - ' . $langs->trans("VAT").' '.join(', ',$def_tva[$key][$k]) .' %' . ($numtax?' - Localtax '.$numtax:'');
-						$bookkeeping->montant = $mt;
-						$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
-						$bookkeeping->debit = ($mt > 0) ? $mt : 0;
-						$bookkeeping->credit = ($mt <= 0) ? -$mt : 0;
-						$bookkeeping->code_journal = $journal;
-						$bookkeeping->journal_label = $journal_label;
-						$bookkeeping->fk_user_author = $user->id;
-						$bookkeeping->entity = $conf->entity;
-
-						$totaldebit += $bookkeeping->debit;
-						$totalcredit += $bookkeeping->credit;
-
-						$result = $bookkeeping->create($user);
-						if ($result < 0) {
-							if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
-							{
-								$error++;
-								$errorforline++;
-								$errorforinvoice[$key]='alreadyjournalized';
-								//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-							}
-							else
-							{
-								$error++;
-								$errorforline++;
-								$errorforinvoice[$key]='other';
-								setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
-							}
-						}
-					}
-				}
-			}
-		}
-
-		// Counterpart of VAT for VAT NPR
-		// var_dump($tabother);
-		if (! $errorforline && is_array($tabother[$key]))
-		{
-			foreach ( $tabother[$key] as $k => $mt ) {
 				if ($mt) {
 					$bookkeeping = new BookKeeping($db);
 					$bookkeeping->doc_date = $val["date"];
-					$bookkeeping->date_lim_reglement = $val["datereg"];
-					$bookkeeping->doc_ref = $val["refsologest"];
+					$bookkeeping->doc_ref = $val["ref"];
 					$bookkeeping->date_create = $now;
 					$bookkeeping->doc_type = 'supplier_invoice';
 					$bookkeeping->fk_doc = $key;
@@ -477,7 +331,7 @@ if ($action == 'writebookkeeping') {
 					$bookkeeping->subledger_account = '';
 					$bookkeeping->subledger_label = '';
 					$bookkeeping->numero_compte = $k;
-					$bookkeeping->label_operation = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref_supplier . ' - ' . $langs->trans("VAT").' NPR';
+					$bookkeeping->label_operation = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("VAT").' '.join(', ',$def_tva[$key][$k]) . ($numtax?' - Localtax '.$numtax:'');
 					$bookkeeping->montant = $mt;
 					$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
 					$bookkeeping->debit = ($mt > 0) ? $mt : 0;
@@ -485,10 +339,6 @@ if ($action == 'writebookkeeping') {
 					$bookkeeping->code_journal = $journal;
 					$bookkeeping->journal_label = $journal_label;
 					$bookkeeping->fk_user_author = $user->id;
-					$bookkeeping->entity = $conf->entity;
-
-					$totaldebit += $bookkeeping->debit;
-					$totalcredit += $bookkeeping->credit;

 					$result = $bookkeeping->create($user);
 					if ($result < 0) {
@@ -496,28 +346,18 @@ if ($action == 'writebookkeeping') {
 						{
 							$error++;
 							$errorforline++;
-							$errorforinvoice[$key]='alreadyjournalized';
 							//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
 						}
 						else
 						{
 							$error++;
 							$errorforline++;
-							$errorforinvoice[$key]='other';
 							setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
 						}
 					}
 				}
 			}
 		}
-
-		// Protection against a bug on lines before
-		if (! $errorforline && (price2num($totaldebit) != price2num($totalcredit)))
-		{
-			$error++;
-			$errorforline++;
-			$errorforinvoice[$key]='amountsnotbalanced';
-			setEventMessages('Try to insert a non balanced transaction in book for '.$invoicestatic->ref.'. Canceled. Surely a bug.', null, 'errors');
 		}

 		if (! $errorforline)
@@ -530,14 +370,12 @@ if ($action == 'writebookkeeping') {

 			if ($error >= 10)
 			{
-				setEventMessages($langs->trans("ErrorTooManyErrorsProcessStopped"), null, 'errors');
-				break;  // Break in the foreach
+			    setEventMessages($langs->trans("ErrorTooManyErrorsProcessStopped"), null, 'errors');
+			    break;  // Break in the foreach
 			}
 		}
 	}

-	$tabpay = $tabfac;
-
 	if (empty($error) && count($tabpay) > 0) {
 		setEventMessages($langs->trans("GeneralLedgerIsWritten"), null, 'mesgs');
 	}
@@ -562,7 +400,7 @@ if ($action == 'writebookkeeping') {
 		$param.='&date_endday='.$date_endday;
 		$param.='&date_endmonth='.$date_endmonth;
 		$param.='&date_endyear='.$date_endyear;
-		$param.='&in_bookkeeping='.$in_bookkeeping;
+		$param.='&in_bookeeping='.$in_bookeeping;
 		header("Location: ".$_SERVER['PHP_SELF'].($param?'?'.$param:''));
 		exit;
 	}
@@ -577,6 +415,7 @@ $form = new Form($db);
 // Export
 if ($action == 'exportcsv') {
 	$sep = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV;
+	$journal = $conf->global->ACCOUNTING_PURCHASE_JOURNAL;

 	include DOL_DOCUMENT_ROOT . '/accountancy/tpl/export_journal.tpl.php';

@@ -585,122 +424,78 @@ if ($action == 'exportcsv') {

 	foreach ( $tabfac as $key => $val )
 	{
-		$companystatic->id = $tabcompany[$key]['id'];
-		$companystatic->name = $tabcompany[$key]['name'];
-		$companystatic->code_compta = $tabcompany[$key]['code_compta'];
-		$companystatic->code_compta_fournisseur = $tabcompany[$key]['code_compta_fournisseur'];
-		$companystatic->code_client = $tabcompany[$key]['code_client'];
-		$companystatic->code_fournisseur = $tabcompany[$key]['code_fournisseur'];
-		$companystatic->fournisseur = 1;
+			$companystatic->id = $tabcompany[$key]['id'];
+			$companystatic->name = $tabcompany[$key]['name'];
+			$companystatic->client = $tabcompany[$key]['code_client'];

-		$invoicestatic->id = $key;
-		$invoicestatic->ref = $val["refsologest"];
-		$invoicestatic->ref_supplier = $val["refsuppliersologest"];
-		$invoicestatic->type = $val["type"];
-		$invoicestatic->description = dol_trunc(html_entity_decode($val["description"]), 32);
-		$invoicestatic->close_code = $val["close_code"];
+			$invoicestatic->id = $key;
+			$invoicestatic->ref = $val["ref"];
+			$invoicestatic->ref = $val["refsologest"];
+			$invoicestatic->refsupplier = $val["refsuppliersologest"];
+			$invoicestatic->type = $val["type"];
+			$invoicestatic->description = dol_trunc($val["description"], 32);

-		$date = dol_print_date($val["date"], 'day');
+			$date = dol_print_date($val["date"], 'day');

-		// Is it a replaced invoice ? 0=not a replaced invoice, 1=replaced invoice not yet dispatched, 2=replaced invoice dispatched
-		$replacedinvoice = 0;
-		if ($invoicestatic->close_code == FactureFournisseur::CLOSECODE_REPLACED)
-		{
-			$replacedinvoice = 1;
-			$alreadydispatched = $invoicestatic->getVentilExportCompta();	// Test if replaced invoice already into bookkeeping.
-			if ($alreadydispatched) $replacedinvoice = 2;
-		}
-
-		// If not already into bookkeeping, we won't add it. If yes, do nothing (should not happen because creating replacement not possible if invoice is accounted)
-		if ($replacedinvoice == 1)
-		{
-			continue;
-		}
-
-		// Third party
-		foreach ( $tabttc[$key] as $k => $mt ) {
-			//if ($mt) {
+			// Third party
+			foreach ( $tabttc[$key] as $k => $mt ) {
 				print '"' . $key . '"' . $sep;
 				print '"' . $date . '"' . $sep;
-				print '"' . $val["refsologest"] . '"' . $sep;
+				print '"' . $val["refsuppliersologest"] . '"' . $sep;
 				print '"' . utf8_decode ( dol_trunc($companystatic->name, 32) ). '"' . $sep;
 				print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
 				print '"' . $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER . '"' . $sep;
 				print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
-				print '"' . $langs->trans("Thirdparty") . '"' . $sep;
-				print '"' . utf8_decode ( dol_trunc($companystatic->name, 16) ) . ' - ' . $val["refsuppliersologest"] . ' - ' . $langs->trans("Thirdparty") . '"' . $sep;
+				print '"' . $langs->trans("Code_tiers") . '"' . $sep;
+				print '"' . utf8_decode ( dol_trunc($companystatic->name, 16) ) . ' - ' . $val["refsuppliersologest"] . ' - ' . $langs->trans("Code_tiers") . '"' . $sep;
 				print '"' . ($mt < 0 ? price(- $mt) : '') . '"' . $sep;
 				print '"' . ($mt >= 0 ? price($mt) : '') . '"'. $sep;
 				print '"' . $journal . '"' ;
 				print "\n";
-			//}
-		}
+			}

-		// Product / Service
-		foreach ( $tabht[$key] as $k => $mt ) {
-			$accountingaccount = new AccountingAccount($db);
-			$accountingaccount->fetch(null, $k, true);
-			//if ($mt) {
-				print '"' . $key . '"' . $sep;
-				print '"' . $date . '"' . $sep;
-				print '"' . $val["refsologest"] . '"' . $sep;
-				print '"' . utf8_decode ( dol_trunc($companystatic->name, 32) ) . '"' . $sep;
-				print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
-				print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
-				print '""' . $sep;
-				print '"' . utf8_decode ( dol_trunc($accountingaccount->label, 32) ) . '"' . $sep;
-				print '"' . utf8_decode ( dol_trunc($companystatic->name, 16) ) . ' - ' . $val["refsuppliersologest"] . ' - ' . dol_trunc($accountingaccount->label, 32) . '"' . $sep;
-				print '"' . ($mt >= 0 ? price($mt) : '') . '"' . $sep;
-				print '"' . ($mt < 0 ? price(- $mt) : '') . '"'. $sep;
-				print '"' . $journal . '"' ;
-				print "\n";
-			//}
-		}
-
-		// VAT
-		$listoftax = array(0, 1, 2);
-		foreach ($listoftax as $numtax) {
-			$arrayofvat = $tabtva;
-			if ($numtax == 1) $arrayofvat = $tablocaltax1;
-			if ($numtax == 2) $arrayofvat = $tablocaltax2;
-
-			foreach ($arrayofvat[$key] as $k => $mt) {
+			// Product / Service
+			foreach ( $tabht[$key] as $k => $mt ) {
+				$accountingaccount = new AccountingAccount($db);
+				$accountingaccount->fetch(null, $k, true);
 				if ($mt) {
 					print '"' . $key . '"' . $sep;
 					print '"' . $date . '"' . $sep;
-					print '"' . $val["refsologest"] . '"' . $sep;
+					print '"' . $val["refsuppliersologest"] . '"' . $sep;
 					print '"' . utf8_decode ( dol_trunc($companystatic->name, 32) ) . '"' . $sep;
 					print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
 					print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
-					print '""' . $sep;
-					print '"' . $langs->trans("VAT") . ' - ' . $def_tva[$key] . '"' . $sep;
-					print '"' . utf8_decode(dol_trunc($companystatic->name, 16) ) . ' - ' . $val["refsuppliersologest"] . ' - ' . $langs->trans("VAT") . join(', ',$def_tva[$key][$k]) .' %' . ($numtax?' - Localtax '.$numtax:'') . '"' . $sep;
+					print "  " . $sep;
+					print '"' . utf8_decode ( dol_trunc($accountingaccount->label, 32) ) . '"' . $sep;
+					print '"' . utf8_decode ( dol_trunc($companystatic->name, 16) ) . ' - ' . $val["refsuppliersologest"] . ' - ' . dol_trunc($accountingaccount->label, 32) . '"' . $sep;
 					print '"' . ($mt >= 0 ? price($mt) : '') . '"' . $sep;
 					print '"' . ($mt < 0 ? price(- $mt) : '') . '"'. $sep;
 					print '"' . $journal . '"' ;
 					print "\n";
 				}
 			}
+			// VAT
+			$listoftax = array(0, 1, 2);
+			foreach ($listoftax as $numtax) {
+				$arrayofvat = $tabtva;
+				if ($numtax == 1) $arrayofvat = $tablocaltax1;
+				if ($numtax == 2) $arrayofvat = $tablocaltax2;

-			// VAT counterpart for NPR
-			if (is_array($tabother[$key]))
-			{
-				foreach ( $tabother[$key] as $k => $mt ) {
-					if ($mt) {
-						print '"' . $key . '"' . $sep;
-						print '"' . $date . '"' . $sep;
-						print '"' . $val["refsologest"] . '"' . $sep;
-						print '"' . utf8_decode ( dol_trunc($companystatic->name, 32) ). '"' . $sep;
-						print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
-						print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
-						print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
-						print '"' . $langs->trans("Thirdparty") . '"' . $sep;
-						print '"' . utf8_decode ( dol_trunc($companystatic->name, 16) ) . ' - ' . $val["refsuppliersologest"] . ' - ' . $langs->trans("VAT") . ' NPR"' . $sep;
-						print '"' . ($mt < 0 ? price(- $mt) : '') . '"' . $sep;
-						print '"' . ($mt >= 0 ? price($mt) : '') . '"'. $sep;
-						print '"' . $journal . '"' ;
-						print "\n";
-					}
+				foreach ($arrayofvat[$key] as $k => $mt) {
+				if ($mt) {
+					print '"' . $key . '"' . $sep;
+					print '"' . $date . '"' . $sep;
+					print '"' . $val["refsuppliersologest"] . '"' . $sep;
+					print '"' . utf8_decode ( dol_trunc($companystatic->name, 32) ) . '"' . $sep;
+					print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
+					print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
+					print "  " . $sep;
+					print '"' . $langs->trans("VAT") . ' - ' . $def_tva[$key] . '"' . $sep;
+					print '"' . utf8_decode(dol_trunc($companystatic->name, 16) ) . ' - ' . $val["refsuppliersologest"] . ' - ' . $langs->trans("VAT") . join(', ',$def_tva[$key][$k]) . ($numtax?' - Localtax '.$numtax:'') . '"' . $sep;
+					print '"' . ($mt >= 0 ? price($mt) : '') . '"' . $sep;
+					print '"' . ($mt < 0 ? price(- $mt) : '') . '"'. $sep;
+					print '"' . $journal . '"' ;
+					print "\n";
 				}
 			}
 		}
@@ -715,7 +510,7 @@ if (empty($action) || $action == 'view') {
 	$nomlink = '';
 	$periodlink = '';
 	$exportlink = '';
-	$builddate=dol_now();
+	$builddate = time();
 	$description.= $langs->trans("DescJournalOnlyBindedVisible").'<br>';
 	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 		$description .= $langs->trans("DepositsAreNotIncluded");
@@ -723,8 +518,8 @@ if (empty($action) || $action == 'view') {
 		$description .= $langs->trans("DepositsAreIncluded");
 	}

-	$listofchoices=array('notyet'=>$langs->trans("NotYetInGeneralLedger"), 'already'=>$langs->trans("AlreadyInGeneralLedger"));
-	$period = $form->select_date($date_start?$date_start:-1, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end?$date_end:-1, 'date_end', 0, 0, 0, '', 1, 0, 1). ' -  ' .$langs->trans("JournalizationInLedgerStatus").' '. $form->selectarray('in_bookkeeping', $listofchoices, $in_bookkeeping, 1);
+	$listofchoices=array('already'=>$langs->trans("AlreadyInGeneralLedger"), 'notyet'=>$langs->trans("NotYetInGeneralLedger"));
+	$period = $form->select_date($date_start, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1). ' -  ' .$langs->trans("AlreadyInGeneralLedger").' '. $form->selectarray('in_bookkeeping', $listofchoices, $in_bookkeeping, 1);

 	$varlink = 'id_journal=' . $id_journal;

@@ -732,33 +527,30 @@ if (empty($action) || $action == 'view') {

 	// Button to write into Ledger
 	if (empty($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER) || $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER == '-1') {
-		print img_warning().' '.$langs->trans("SomeMandatoryStepsOfSetupWereNotDone");
-		print ' : '.$langs->trans("AccountancyAreaDescMisc", 4, '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong>');
+	    print img_warning().' '.$langs->trans("SomeMandatoryStepsOfSetupWereNotDone");
+	    print ' : '.$langs->trans("AccountancyAreaDescMisc", 4, '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong>');
 	}
 	print '<div class="tabsAction tabsActionNoBottom">';
-	print '<input type="button" class="butAction" name="exportcsv" value="' . $langs->trans("ExportDraftJournal") . '" onclick="launch_export();" />';
 	if (empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER) || $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == '-1') {
-		print '<input type="button" class="butActionRefused" title="'.dol_escape_htmltag($langs->trans("SomeMandatoryStepsOfSetupWereNotDone")).'" value="' . $langs->trans("WriteBookKeeping") . '" />';
+	    print '<input type="button" class="butActionRefused" title="'.dol_escape_htmltag($langs->trans("SomeMandatoryStepsOfSetupWereNotDone")).'" value="' . $langs->trans("WriteBookKeeping") . '" />';
 	}
 	else {
-		if ($in_bookkeeping == 'notyet') print '<input type="button" class="butAction" name="writebookkeeping" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
-		else print '<a href="#" class="butActionRefused" name="writebookkeeping">' . $langs->trans("WriteBookKeeping") . '</a>';
+	    print '<input type="button" class="butAction" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
 	}
+	print '<input type="button" class="butAction" value="' . $langs->trans("ExportDraftJournal") . '" onclick="launch_export();" />';
 	print '</div>';

-	// TODO Avoid using js. We can use a direct link with $param
 	print '
 	<script type="text/javascript">
 		function launch_export() {
-			$("div.fiche form input[name=\"action\"]").val("exportcsv");
-			$("div.fiche form input[type=\"submit\"]").click();
-			$("div.fiche form input[name=\"action\"]").val("");
+			$("div.fiche div.tabBar form input[name=\"action\"]").val("exportcsv");
+			$("div.fiche div.tabBar form input[type=\"submit\"]").click();
+			$("div.fiche div.tabBar form input[name=\"action\"]").val("");
 		}
 		function writebookkeeping() {
-			console.log("click on writebookkeeping");
-			$("div.fiche form input[name=\"action\"]").val("writebookkeeping");
-			$("div.fiche form input[type=\"submit\"]").click();
-			$("div.fiche form input[name=\"action\"]").val("");
+			$("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>';

@@ -768,7 +560,6 @@ if (empty($action) || $action == 'view') {
 	print '<br>';

 	$i = 0;
-	print '<div class="div-table-responsive">';
 	print "<table class=\"noborder\" width=\"100%\">";
 	print "<tr class=\"liste_titre\">";
 	print "<td></td>";
@@ -776,7 +567,7 @@ if (empty($action) || $action == 'view') {
 	print "<td>" . $langs->trans("Piece") . ' (' . $langs->trans("InvoiceRef") . ")</td>";
 	print "<td>" . $langs->trans("AccountAccounting") . "</td>";
 	print "<td>" . $langs->trans("SubledgerAccount") . "</td>";
-	print "<td>" . $langs->trans("LabelOperation") . "</td>";
+	print "<td>" . $langs->trans("Label") . "</td>";
 	print "<td align='right'>" . $langs->trans("Debit") . "</td>";
 	print "<td align='right'>" . $langs->trans("Credit") . "</td>";
 	print "</tr>\n";
@@ -786,114 +577,56 @@ if (empty($action) || $action == 'view') {
 	$invoicestatic = new FactureFournisseur($db);
 	$companystatic = new Fournisseur($db);

-	foreach ( $tabfac as $key => $val )
-	{
-		$companystatic->id = $tabcompany[$key]['id'];
-		$companystatic->name = $tabcompany[$key]['name'];
-		$companystatic->code_compta = $tabcompany[$key]['code_compta'];
-		$companystatic->code_compta_fournisseur = $tabcompany[$key]['code_compta_fournisseur'];
-		$companystatic->code_client = $tabcompany[$key]['code_client'];
-		$companystatic->code_fournisseur = $tabcompany[$key]['code_fournisseur'];
-		$companystatic->fournisseur = 1;
-
+	foreach ( $tabfac as $key => $val ) {
 		$invoicestatic->id = $key;
-		$invoicestatic->ref = $val["refsologest"];
-		$invoicestatic->ref_supplier = $val["refsuppliersologest"];
+		$invoicestatic->ref = $val["ref"];
 		$invoicestatic->type = $val["type"];
-		$invoicestatic->description = dol_trunc(html_entity_decode($val["description"]), 32);
-		$invoicestatic->close_code = $val["close_code"];
+
+		$invoicestatic->ref = $val["refsologest"];
+		$invoicestatic->refsupplier = $val["refsuppliersologest"];
+
+		$invoicestatic->description = html_entity_decode(dol_trunc($val["description"], 32));

 		$date = dol_print_date($val["date"], 'day');

-		// Is it a replaced invoice ? 0=not a replaced invoice, 1=replaced invoice not yet dispatched, 2=replaced invoice dispatched
-		$replacedinvoice = 0;
-		if ($invoicestatic->close_code == FactureFournisseur::CLOSECODE_REPLACED)
-		{
-			$replacedinvoice = 1;
-			$alreadydispatched = $invoicestatic->getVentilExportCompta();	// Test if replaced invoice already into bookkeeping.
-			if ($alreadydispatched) $replacedinvoice = 2;
-		}
-
-		// If not already into bookkeeping, we won't add it, if yes, add the counterpart ???.
-		if ($replacedinvoice == 1)
-		{
-			print '<tr class="oddeven">';
-			print "<td><!-- Replaced invoice --></td>";
-			print "<td>" . $date . "</td>";
-			print "<td><strike>" . $invoicestatic->getNomUrl(1) . "</strike></td>";
-			// Account
-			print "<td>";
-			print $langs->trans("Replaced");
-			print '</td>';
-			// Subledger account
-			print "<td>";
-			print '</td>';
-			print "<td>";
-			print "</td>";
-			print '<td align="right"></td>';
-			print '<td align="right"></td>';
-			print "</tr>";
-
-			continue;
-		}
-		if ($errorforinvoice[$key] == 'somelinesarenotbound')
-		{
-			print '<tr class="oddeven">';
-			print "<td><!-- Some lines are not bound --></td>";
-			print "<td>" . $date . "</td>";
-			print "<td>" . $invoicestatic->getNomUrl(1) . "</td>";
-			// Account
-			print "<td>";
-			print '<span class="error">'.$langs->trans('ErrorInvoiceContainsLinesNotYetBoundedShort', $val['ref']).'</span>';
-			print '</td>';
-			// Subledger account
-			print "<td>";
-			print '</td>';
-			print "<td>";
-			print "</td>";
-			print '<td align="right"></td>';
-			print '<td align="right"></td>';
-			print "</tr>";
-		}
-
 		// Third party
 		foreach ( $tabttc[$key] as $k => $mt ) {
-			//if ($mt) {
-				print '<tr class="oddeven">';
-				print "<td><!-- Thirdparty --></td>";
-				print "<td>" . $date . "</td>";
-				print "<td>" . $invoicestatic->getNomUrl(1) . "</td>";
-				// Account
-				print "<td>";
-				$accountoshow = length_accounta($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER);
-				if (empty($accountoshow) || $accountoshow == 'NotDefined')
-				{
-					print '<span class="error">'.$langs->trans("MainAccountForCustomersNotDefined").'</span>';
-				}
-				else print $accountoshow;
-				print '</td>';
-				// Subledger account
-				print "<td>";
-				$accountoshow = length_accounta($k);
-				if (empty($accountoshow) || $accountoshow == 'NotDefined')
-				{
-					print '<span class="error">'.$langs->trans("ThirdpartyAccountNotDefined").'</span>';
-				}
-				else print $accountoshow;
-				print '</td>';
-				print "<td>" . $companystatic->getNomUrl(0, 'supplier', 16) . ' - ' . $invoicestatic->ref_supplier . ' - ' . $langs->trans("SubledgerAccount") . "</td>";
-				print '<td align="right">' . ($mt < 0 ? - price(- $mt) : '') . "</td>";
-				print '<td align="right">' . ($mt >= 0 ? price($mt) : '') . "</td>";
-				print "</tr>";
-			//}
+			print '<tr class="oddeven">';
+			print "<td><!-- Thirdparty --></td>";
+			print "<td>" . $date . "</td>";
+			print "<td>" . $invoicestatic->getNomUrl(1) . "</td>";
+			$companystatic->id = $tabcompany[$key]['id'];
+			$companystatic->name = $tabcompany[$key]['name'];
+			$companystatic->supplier_code = $tabcompany[$key]['code_supplier'];
+			// Account
+			print "<td>";
+			$accountoshow = length_accounta($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER);
+			if (empty($accountoshow) || $accountoshow == 'NotDefined')
+			{
+				print '<span class="error">'.$langs->trans("MainAccountForCustomersNotDefined").'</span>';
+			}
+			else print $accountoshow;
+			print '</td>';
+			// Subledger account
+			print "<td>";
+			$accountoshow = length_accounta($k);
+			if (empty($accountoshow) || $accountoshow == 'NotDefined')
+			{
+				print '<span class="error">'.$langs->trans("ThirdpartyAccountNotDefined").'</span>';
+			}
+			else print $accountoshow;
+			print '</td>';
+			print "<td>" . $companystatic->getNomUrl(0, 'supplier', 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("SubledgerAccount") . "</td>";
+			print '<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 ) {
 			$accountingaccount = new AccountingAccount($db);
 			$accountingaccount->fetch(null, $k, true);

-			//if ($mt) {
+			if ($mt) {
 				print '<tr class="oddeven">';
 				print "<td><!-- Product --></td>";
 				print "<td>" . $date . "</td>";
@@ -912,11 +645,11 @@ if (empty($action) || $action == 'view') {
 				print '</td>';
 				$companystatic->id = $tabcompany[$key]['id'];
 				$companystatic->name = $tabcompany[$key]['name'];
-				print "<td>" . $companystatic->getNomUrl(0, 'supplier', 16) . ' - ' . $invoicestatic->ref_supplier . ' - ' . $accountingaccount->label . "</td>";
+				print "<td>" . $companystatic->getNomUrl(0, 'supplier', 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $accountingaccount->label . "</td>";
 				print '<td align="right">' . ($mt >= 0 ? price($mt) : '') . "</td>";
 				print '<td align="right">' . ($mt < 0 ? price(- $mt) : '') . "</td>";
 				print "</tr>";
-			//}
+			}
 		}

 		// VAT
@@ -928,64 +661,33 @@ if (empty($action) || $action == 'view') {

 			foreach ( $arrayofvat[$key] as $k => $mt ) {
 				if ($mt) {
-					print '<tr class="oddeven">';
-					print "<td><!-- VAT --></td>";
-					print "<td>" . $date . "</td>";
-					print "<td>" . $invoicestatic->getNomUrl(1) . "</td>";
-					// Account
-					print "<td>";
-					$accountoshow = length_accountg($k);
-					if (empty($accountoshow) || $accountoshow == 'NotDefined')
-					{
-						print '<span class="error">'.$langs->trans("VATAccountNotDefined").' ('.$langs->trans("Purchase").')'.'</span>';
-					}
-					else print $accountoshow;
-					print "</td>";
-					// Subledger account
-					print "<td>";
-					print '</td>';
-					print "<td>";
-					print $companystatic->getNomUrl(0, 'supplier', 16) . ' - ' . $invoicestatic->ref_supplier . ' - ' . $langs->trans("VAT"). ' '.join(', ',$def_tva[$key][$k]).' %'.($numtax?' - Localtax '.$numtax:'');
-					print "</td>";
-					print '<td align="right">' . ($mt >= 0 ? price($mt) : '') . "</td>";
-					print '<td align="right">' . ($mt < 0 ? price(- $mt) : '') . "</td>";
-					print "</tr>";
+				print '<tr class="oddeven">';
+				print "<td><!-- VAT --></td>";
+				print "<td>" . $date . "</td>";
+				print "<td>" . $invoicestatic->getNomUrl(1) . "</td>";
+				// Account
+				print "<td>";
+				$accountoshow = length_accountg($k);
+				if (empty($accountoshow) || $accountoshow == 'NotDefined')
+				{
+					print '<span class="error">'.$langs->trans("VATAccountNotDefined").'</span>';
 				}
+				else print $accountoshow;
+				print "</td>";
+				// Subledger account
+				print "<td>";
+				print '</td>';
+				print "<td>" . $companystatic->getNomUrl(0, 'supplier', 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("VAT"). ' '.join(', ',$def_tva[$key][$k]).($numtax?' - Localtax '.$numtax:'');
+				print "</td>";
+				print '<td align="right">' . ($mt >= 0 ? price($mt) : '') . "</td>";
+				print '<td align="right">' . ($mt < 0 ? price(- $mt) : '') . "</td>";
+				print "</tr>";
 			}
-		}
-
-		// VAT counterpart for NPR
-		if (is_array($tabother[$key]))
-		{
-			foreach ( $tabother[$key] as $k => $mt ) {
-				if ($mt) {
-					print '<tr class="oddeven">';
-					print "<td><!-- VAT counterpart NPR --></td>";
-					print "<td>" . $date . "</td>";
-					print "<td>" . $invoicestatic->getNomUrl(1) . "</td>";
-					// Account
-					print "<td>";
-					$accountoshow = length_accountg($k);
-					if (empty($accountoshow) || $accountoshow == 'NotDefined')
-					{
-						print '<span class="error">'.$langs->trans("VATAccountNotDefined").' ('.$langs->trans("NPR counterpart").'). Set ACCOUNTING_COUNTERPART_VAT_NPR to the subvention account'.'</span>';
-					}
-					else print $accountoshow;
-					print '</td>';
-					// Subledger account
-					print "<td>";
-					print '</td>';
-					print "<td>" . $companystatic->getNomUrl(0, 'supplier', 16) . ' - ' . $invoicestatic->ref_supplier . ' - ' . $langs->trans("VAT") . " NPR (counterpart)</td>";
-					print '<td align="right">' . ($mt < 0 ? - price(- $mt) : '') . "</td>";
-					print '<td align="right">' . ($mt >= 0 ? price($mt) : '') . "</td>";
-					print "</tr>";
-				}
 			}
 		}
 	}

 	print "</table>";
-	print '</div>';

 	// End of page
 	llxFooter();
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -81,7 +81,7 @@ if ($pastmonth == 0) {
 $date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear);
 $date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear);

-if (! GETPOSTISSET('date_startmonth') && (empty($date_start) || empty($date_end))) // We define date_start and date_end, only if we did not submit the form
+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);
@@ -89,19 +89,21 @@ if (! GETPOSTISSET('date_startmonth') && (empty($date_start) || empty($date_end)

 $idpays = $mysoc->country_id;

-$sql = "SELECT f.rowid, f.facnumber, f.type, f.datef as df, f.ref_client, f.date_lim_reglement as dlr, f.close_code,";
+$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.total_localtax1, fd.total_localtax2, fd.tva_tx, fd.total_ttc, fd.situation_percent, fd.vat_src_code,";
 $sql .= " s.rowid as socid, s.nom as name, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur,";
 $sql .= " p.rowid as pid, p.ref as pref, p.accountancy_code_sell, aa.rowid as fk_compte, aa.account_number as compte, aa.label as label_compte";
+//$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 . "accounting_account 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 as ct ON ((fd.vat_src_code <> '' AND fd.vat_src_code = ct.code) OR (fd.vat_src_code = '' AND fd.tva_tx = ct.taux)) AND ct.fk_pays = '" . $idpays . "'";
 $sql .= " WHERE fd.fk_code_ventilation > 0";
-$sql .= " AND f.entity IN (".getEntity('facture', 0).')';	// We don't share object for accountancy, we use source object sharing
-$sql .= " AND f.fk_statut > 0";
-if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {	// Non common setup
+$sql .= " AND f.entity IN (".getEntity('facture', 0).')';	// We don't share object for accountancy
+$sql .= " AND f.fk_statut > 0"; // TODO Facture annulée ?
+if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 	$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_SITUATION . ")";
 } else {
 	$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_DEPOSIT . "," . Facture::TYPE_SITUATION . ")";
@@ -109,19 +111,11 @@ if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {	// Non common
 $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) . "'";
-// Already in bookkeeping or not
 if ($in_bookkeeping == 'already')
-{
-	$sql .= " AND f.rowid IN (SELECT fk_doc FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as ab WHERE ab.doc_type='customer_invoice')";
-	//	$sql .= " AND fd.rowid IN (SELECT fk_docdet FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as ab WHERE ab.doc_type='customer_invoice')";		// Useless, we save one line for all products with same account
-}
+	$sql .= " AND f.rowid IN (SELECT fk_doc FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as ab  WHERE ab.doc_type='customer_invoice')";
 if ($in_bookkeeping == 'notyet')
-{
-	$sql .= " AND f.rowid NOT IN (SELECT fk_doc FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as ab WHERE ab.doc_type='customer_invoice')";
-//	$sql .= " AND fd.rowid NOT IN (SELECT fk_docdet FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as ab WHERE ab.doc_type='customer_invoice')";		// Useless, we save one line for all products with same account
-}
+	$sql .= " AND f.rowid NOT IN (SELECT fk_doc FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as ab  WHERE ab.doc_type='customer_invoice')";
 $sql .= " ORDER BY f.datef";
-//print $sql;

 dol_syslog('accountancy/journal/sellsjournal.php', LOG_DEBUG);
 $result = $db->query($sql);
@@ -162,17 +156,15 @@ if ($result) {
 		$compta_localtax2 = (! empty($vatdata['accountancy_code_sell']) ? $vatdata['accountancy_code_sell'] : $cpttva);

 		// Define array to display all VAT rates that use this accounting account $compta_tva
-		if (price2num($obj->tva_tx) || ! empty($obj->vat_src_code))
+        if (price2num($obj->tva_tx) || ! empty($obj->vat_src_code))
 		{
 			$def_tva[$obj->rowid][$compta_tva][vatrate($obj->tva_tx).($obj->vat_src_code?' ('.$obj->vat_src_code.')':'')]=(vatrate($obj->tva_tx).($obj->vat_src_code?' ('.$obj->vat_src_code.')':''));
 		}

+		// Situation invoices handling
 		$line = new FactureLigne($db);
 		$line->fetch($obj->fdid);
-
-		// Situation invoices handling
 		$prev_progress = $line->get_prev_progress($obj->rowid);
-
 		if ($obj->type == Facture::TYPE_SITUATION) {
 			// Avoid divide by 0
 			if ($obj->situation_percent == 0) {
@@ -186,11 +178,9 @@ if ($result) {

 		// Invoice lines
 		$tabfac[$obj->rowid]["date"] = $db->jdate($obj->df);
-		$tabfac[$obj->rowid]["datereg"] = $db->jdate($obj->dlr);
 		$tabfac[$obj->rowid]["ref"] = $obj->facnumber;
 		$tabfac[$obj->rowid]["type"] = $obj->type;
 		$tabfac[$obj->rowid]["description"] = $obj->label_compte;
-		$tabfac[$obj->rowid]["close_code"] = $obj->close_code;		// close_code = 'replaced' for replacement invoices (not used in most european countries)
 		//$tabfac[$obj->rowid]["fk_facturedet"] = $obj->fdid;

 		// Avoid warnings
@@ -202,7 +192,7 @@ if ($result) {

 		$tabttc[$obj->rowid][$compta_soc] += $obj->total_ttc * $situation_ratio;
 		$tabht[$obj->rowid][$compta_prod] += $obj->total_ht * $situation_ratio;
-		if (empty($line->tva_npr)) $tabtva[$obj->rowid][$compta_tva] += $obj->total_tva * $situation_ratio;		// We ignore line if VAT is a NPR
+		$tabtva[$obj->rowid][$compta_tva] += $obj->total_tva * $situation_ratio;
 		$tablocaltax1[$obj->rowid][$compta_localtax1] += $obj->total_localtax1 * $situation_ratio;
 		$tablocaltax2[$obj->rowid][$compta_localtax2] += $obj->total_localtax2 * $situation_ratio;
 		$tabcompany[$obj->rowid] = array (
@@ -218,92 +208,38 @@ if ($result) {
 	dol_print_error($db);
 }

-$errorforinvoice = array();
-
-// Loop in invoices to detect lines with not binding lines
-foreach ($tabfac as $key => $val) {		// Loop on each invoice
-	$sql = "SELECT COUNT(fd.rowid) as nb";
-	$sql.= " FROM " . MAIN_DB_PREFIX . "facturedet as fd";
-	$sql.= " WHERE fd.product_type <= 2 AND fd.fk_code_ventilation <= 0";
-	$sql.= " AND fd.total_ttc <> 0 AND fk_facture = ".$key;
-	$resql=$db->query($sql);
-	if ($resql)
-	{
-		$obj = $db->fetch_object($resql);
-		if ($obj->nb > 0)
-		{
-			$errorforinvoice[$key]='somelinesarenotbound';
-		}
-	}
-	else dol_print_error($db);
-}
-//var_dump($errorforinvoice);exit;
-
-
 // Bookkeeping Write
 if ($action == 'writebookkeeping') {
 	$now = dol_now();
 	$error = 0;

-	$companystatic = new Societe($db);
-	$invoicestatic = new Facture($db);
-
 	foreach ($tabfac as $key => $val) {		// Loop on each invoice

 		$errorforline = 0;

-		$totalcredit = 0;
-		$totaldebit = 0;
-
 		$db->begin();

+		$companystatic = new Societe($db);
+		$invoicestatic = new Facture($db);
+
 		$companystatic->id = $tabcompany[$key]['id'];
 		$companystatic->name = $tabcompany[$key]['name'];
 		$companystatic->code_compta = $tabcompany[$key]['code_compta'];
 		$companystatic->code_compta_fournisseur = $tabcompany[$key]['code_compta_fournisseur'];
 		$companystatic->code_client = $tabcompany[$key]['code_client'];
 		$companystatic->code_fournisseur = $tabcompany[$key]['code_fournisseur'];
-		$companystatic->client = 3;
+		$companystatic->client = $tabcompany[$key]['code_client'];

 		$invoicestatic->id = $key;
 		$invoicestatic->ref = (string) $val["ref"];
-		$invoicestatic->type = $val["type"];
-		$invoicestatic->close_code = $val["close_code"];
-
-		$date = dol_print_date($val["date"], 'day');
-
-		// Is it a replaced invoice ? 0=not a replaced invoice, 1=replaced invoice not yet dispatched, 2=replaced invoice dispatched
-		$replacedinvoice = 0;
-		if ($invoicestatic->close_code == Facture::CLOSECODE_REPLACED)
-		{
-			$replacedinvoice = 1;
-			$alreadydispatched = $invoicestatic->getVentilExportCompta();	// Test if replaced invoice already into bookkeeping.
-			if ($alreadydispatched) $replacedinvoice = 2;
-		}
-
-		// If not already into bookkeeping, we won't add it. If yes, do nothing (should not happen because creating replacement not possible if invoice is accounted)
-		if ($replacedinvoice == 1)
-		{
-			$db->rollback();
-			continue;
-		}
-
-		// Error if some lines are not binded/ready to be journalized
-		if ($errorforinvoice[$key] == 'somelinesarenotbound')
-		{
-			$error++;
-			$errorforline++;
-			setEventMessages($langs->trans('ErrorInvoiceContainsLinesNotYetBounded', $val['ref']), null, 'errors');
-		}

 		// Thirdparty
 		if (! $errorforline)
 		{
 			foreach ( $tabttc[$key] as $k => $mt ) {
-				//if ($mt) {
+				if ($mt) {
 					$bookkeeping = new BookKeeping($db);
 					$bookkeeping->doc_date = $val["date"];
-					$bookkeeping->date_lim_reglement = $val["datereg"];
 					$bookkeeping->doc_ref = $val["ref"];
 					$bookkeeping->date_create = $now;
 					$bookkeeping->doc_type = 'customer_invoice';
@@ -321,10 +257,6 @@ if ($action == 'writebookkeeping') {
 					$bookkeeping->code_journal = $journal;
 					$bookkeeping->journal_label = $journal_label;
 					$bookkeeping->fk_user_author = $user->id;
-					$bookkeeping->entity = $conf->entity;
-
-					$totaldebit += $bookkeeping->debit;
-					$totalcredit += $bookkeeping->credit;

 					$result = $bookkeeping->create($user);
 					if ($result < 0) {
@@ -332,18 +264,16 @@ if ($action == 'writebookkeeping') {
 						{
 							$error++;
 							$errorforline++;
-							$errorforinvoice[$key]='alreadyjournalized';
 							//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
 						}
 						else
 						{
 							$error++;
 							$errorforline++;
-							$errorforinvoice[$key]='other';
 							setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
 						}
 					}
-				//}
+				}
 			}
 		}

@@ -351,19 +281,18 @@ if ($action == 'writebookkeeping') {
 		if (! $errorforline)
 		{
 			foreach ( $tabht[$key] as $k => $mt ) {
-				//if ($mt) {
+				if ($mt) {
 					// get compte id and label
 					$accountingaccount = new AccountingAccount($db);
 					if ($accountingaccount->fetch(null, $k, true)) {
 						$bookkeeping = new BookKeeping($db);
 						$bookkeeping->doc_date = $val["date"];
-						$bookkeeping->date_lim_reglement = $val["datereg"];
 						$bookkeeping->doc_ref = $val["ref"];
 						$bookkeeping->date_create = $now;
 						$bookkeeping->doc_type = 'customer_invoice';
 						$bookkeeping->fk_doc = $key;
 						$bookkeeping->fk_docdet = 0;	// Useless, can be several lines that are source of this record to add
-						$bookkeeping->thirdparty_code = $companystatic->code_client;
+					    $bookkeeping->thirdparty_code = $companystatic->code_client;
 						$bookkeeping->subledger_account = '';
 						$bookkeeping->subledger_label = '';
 						$bookkeeping->numero_compte = $k;
@@ -375,10 +304,6 @@ if ($action == 'writebookkeeping') {
 						$bookkeeping->code_journal = $journal;
 						$bookkeeping->journal_label = $journal_label;
 						$bookkeeping->fk_user_author = $user->id;
-						$bookkeeping->entity = $conf->entity;
-
-						$totaldebit += $bookkeeping->debit;
-						$totalcredit += $bookkeeping->credit;

 						$result = $bookkeeping->create($user);
 						if ($result < 0) {
@@ -386,23 +311,22 @@ if ($action == 'writebookkeeping') {
 							{
 								$error++;
 								$errorforline++;
-								$errorforinvoice[$key]='alreadyjournalized';
 								//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
 							}
 							else
 							{
 								$error++;
 								$errorforline++;
-								$errorforinvoice[$key]='other';
 								setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
 							}
 						}
 					}
-				//}
+				}
 			}
 		}

 		// VAT
+		// var_dump($tabtva);
 		if (! $errorforline)
 		{
 			$listoftax=array(0, 1, 2);
@@ -416,7 +340,6 @@ if ($action == 'writebookkeeping') {
 					if ($mt) {
 						$bookkeeping = new BookKeeping($db);
 						$bookkeeping->doc_date = $val["date"];
-						$bookkeeping->date_lim_reglement = $val["datereg"];
 						$bookkeeping->doc_ref = $val["ref"];
 						$bookkeeping->date_create = $now;
 						$bookkeeping->doc_type = 'customer_invoice';
@@ -426,7 +349,7 @@ if ($action == 'writebookkeeping') {
 						$bookkeeping->subledger_account = '';
 						$bookkeeping->subledger_label = '';
 						$bookkeeping->numero_compte = $k;
-						$bookkeeping->label_operation = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("VAT").' '.join(', ',$def_tva[$key][$k]) .' %' . ($numtax?' - Localtax '.$numtax:'');
+						$bookkeeping->label_operation = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("VAT").' '.join(', ',$def_tva[$key][$k]) . ($numtax?' - Localtax '.$numtax:'');
 						$bookkeeping->montant = $mt;
 						$bookkeeping->sens = ($mt < 0) ? 'D' : 'C';
 						$bookkeeping->debit = ($mt < 0) ? -$mt : 0;
@@ -434,10 +357,6 @@ if ($action == 'writebookkeeping') {
 						$bookkeeping->code_journal = $journal;
 						$bookkeeping->journal_label = $journal_label;
 						$bookkeeping->fk_user_author = $user->id;
-						$bookkeeping->entity = $conf->entity;
-
-						$totaldebit += $bookkeeping->debit;
-						$totalcredit += $bookkeeping->credit;

 						$result = $bookkeeping->create($user);
 						if ($result < 0) {
@@ -445,14 +364,12 @@ if ($action == 'writebookkeeping') {
 							{
 								$error++;
 								$errorforline++;
-								$errorforinvoice[$key]='alreadyjournalized';
 								//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
 							}
 							else
 							{
 								$error++;
 								$errorforline++;
-								$errorforinvoice[$key]='other';
 								setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
 							}
 						}
@@ -461,15 +378,6 @@ if ($action == 'writebookkeeping') {
 			}
 		}

-		// Protection against a bug on lines before
-		if (! $errorforline && (price2num($totaldebit) != price2num($totalcredit)))
-		{
-			$error++;
-			$errorforline++;
-			$errorforinvoice[$key]='amountsnotbalanced';
-			setEventMessages('Try to insert a non balanced transaction in book for '.$invoicestatic->ref.'. Canceled. Surely a bug.', null, 'errors');
-		}
-
 		if (! $errorforline)
 		{
 			$db->commit();
@@ -480,15 +388,13 @@ if ($action == 'writebookkeeping') {

 			if ($error >= 10)
 			{
-				setEventMessages($langs->trans("ErrorTooManyErrorsProcessStopped"), null, 'errors');
-				break;  // Break in the foreach
+                setEventMessages($langs->trans("ErrorTooManyErrorsProcessStopped"), null, 'errors');
+                break;  // Break in the foreach
 			}
 		}

 	}

-	$tabpay = $tabfac;
-
 	if (empty($error) && count($tabpay) > 0) {
 		setEventMessages($langs->trans("GeneralLedgerIsWritten"), null, 'mesgs');
 	}
@@ -513,7 +419,7 @@ if ($action == 'writebookkeeping') {
 		$param.='&date_endday='.$date_endday;
 		$param.='&date_endmonth='.$date_endmonth;
 		$param.='&date_endyear='.$date_endyear;
-		$param.='&in_bookkeeping='.$in_bookkeeping;
+		$param.='&in_bookeeping='.$in_bookeeping;
 		header("Location: ".$_SERVER['PHP_SELF'].($param?'?'.$param:''));
 		exit;
 	}
@@ -531,6 +437,7 @@ $form = new Form($db);
 if ($action == 'exportcsv') {

 	$sep = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV;
+	$sell_journal = $conf->global->ACCOUNTING_SELL_JOURNAL;

 	include DOL_DOCUMENT_ROOT . '/accountancy/tpl/export_journal.tpl.php';

@@ -541,72 +448,49 @@ if ($action == 'exportcsv') {
 	{
 		$companystatic->id = $tabcompany[$key]['id'];
 		$companystatic->name = $tabcompany[$key]['name'];
-		$companystatic->code_compta = $tabcompany[$key]['code_compta'];
-		$companystatic->code_compta_fournisseur = $tabcompany[$key]['code_compta_fournisseur'];
-		$companystatic->code_client = $tabcompany[$key]['code_client'];
-		$companystatic->code_fournisseur = $tabcompany[$key]['code_fournisseur'];
-		$companystatic->client = 3;
+		$companystatic->client = $tabcompany[$key]['code_client'];

 		$invoicestatic->id = $key;
-		$invoicestatic->ref = (string) $val["ref"];
-		$invoicestatic->type = $val["type"];
-		$invoicestatic->close_code = $val["close_code"];
+		$invoicestatic->ref = $val["ref"];

 		$date = dol_print_date($val["date"], 'day');

-		// Is it a replaced invoice ? 0=not a replaced invoice, 1=replaced invoice not yet dispatched, 2=replaced invoice dispatched
-		$replacedinvoice = 0;
-		if ($invoicestatic->close_code == Facture::CLOSECODE_REPLACED)
-		{
-			$replacedinvoice = 1;
-			$alreadydispatched = $invoicestatic->getVentilExportCompta();	// Test if replaced invoice already into bookkeeping.
-			if ($alreadydispatched) $replacedinvoice = 2;
-		}
-
-		// If not already into bookkeeping, we won't add it. If yes, do nothing (should not happen because creating replacement not possible if invoice is accounted)
-		if ($replacedinvoice == 1)
-		{
-			continue;
-		}
-
 		// Third party
 		foreach ($tabttc[$key] as $k => $mt) {
-			//if ($mt) {
-				print '"' . $key . '"' . $sep;
-				print '"' . $date . '"' . $sep;
-				print '"' . $val["ref"] . '"' . $sep;
-				print '"' . utf8_decode(dol_trunc($companystatic->name, 32)) . '"' . $sep;
-				print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
-				print '"' . $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER . '"' . $sep;
-				print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
-				print '"' . $langs->trans("Thirdparty") . '"' . $sep;
-				print '"' . utf8_decode(dol_trunc($companystatic->name, 16)) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("Thirdparty") . '"' . $sep;
-				print '"' . ($mt >= 0 ? price($mt) : '') . '"' . $sep;
-				print '"' . ($mt < 0 ? price(- $mt) : '') . '"' . $sep;
-				print '"' . $journal . '"';
-				print "\n";
-			//}
+			print '"' . $key . '"' . $sep;
+			print '"' . $date . '"' . $sep;
+			print '"' . $val["ref"] . '"' . $sep;
+			print '"' . utf8_decode(dol_trunc($companystatic->name, 32)) . '"' . $sep;
+			print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
+			print '"' . $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER . '"' . $sep;
+			print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
+			print '"' . $langs->trans("Code_tiers") . '"' . $sep;
+			print '"' . utf8_decode(dol_trunc($companystatic->name, 16)) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("Code_tiers") . '"' . $sep;
+			print '"' . ($mt >= 0 ? price($mt) : '') . '"' . $sep;
+			print '"' . ($mt < 0 ? price(- $mt) : '') . '"' . $sep;
+			print '"' . $sell_journal . '"';
+			print "\n";
 		}

 		// Product / Service
 		foreach ($tabht[$key] as $k => $mt) {
 			$accountingaccount = new AccountingAccount($db);
 			$accountingaccount->fetch(null, $k, true);
-			//if ($mt) {
+			if ($mt) {
 				print '"' . $key . '"' . $sep;
 				print '"' . $date . '"' . $sep;
 				print '"' . $val["ref"] . '"' . $sep;
 				print '"' . utf8_decode(dol_trunc($companystatic->name, 32)) . '"' . $sep;
 				print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
 				print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
-				print '""' . $sep;
+				print "  " . $sep;
 				print '"' . utf8_decode(dol_trunc($accountingaccount->label, 32)) . '"' . $sep;
 				print '"' . utf8_decode(dol_trunc($companystatic->name, 16)) . ' - ' . dol_trunc($accountingaccount->label, 32) . '"' . $sep;
 				print '"' . ($mt < 0 ? price(- $mt) : '') . '"' . $sep;
 				print '"' . ($mt >= 0 ? price($mt) : '') . '"' . $sep;
-				print '"' . $journal . '"';
+				print '"' . $sell_journal . '"';
 				print "\n";
-			//}
+			}
 		}

 		// VAT
@@ -624,12 +508,12 @@ if ($action == 'exportcsv') {
 					print '"' . utf8_decode(dol_trunc($companystatic->name, 32)) . '"' . $sep;
 					print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
 					print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
-					print '""' . $sep;
-					print '"' . $langs->trans("VAT") . ' - ' . $def_tva[$key] . ' %"' . $sep;
-					print '"' . utf8_decode(dol_trunc($companystatic->name, 16)) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("VAT") . join(', ',$def_tva[$key][$k]) .' %' . ($numtax?' - Localtax '.$numtax:'') . '"' . $sep;
+					print "  " . $sep;
+					print '"' . $langs->trans("VAT") . ' - ' . $def_tva[$key] . '"' . $sep;
+					print '"' . utf8_decode(dol_trunc($companystatic->name, 16)) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("VAT") . join(', ',$def_tva[$key][$k]) . ($numtax?' - Localtax '.$numtax:'') . '"' . $sep;
 					print '"' . ($mt < 0 ? price(- $mt) : '') . '"' . $sep;
 					print '"' . ($mt >= 0 ? price($mt) : '') . '"' . $sep;
-					print '"' . $journal . '"';
+					print '"' . $sell_journal . '"';
 					print "\n";
 				}
 			}
@@ -647,15 +531,15 @@ if (empty($action) || $action == 'view') {
 	$nomlink = '';
 	$periodlink = '';
 	$exportlink = '';
-	$builddate=dol_now();
+	$builddate = time();
 	$description.= $langs->trans("DescJournalOnlyBindedVisible").'<br>';
 	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS))
 		$description .= $langs->trans("DepositsAreNotIncluded");
 	else
 		$description .= $langs->trans("DepositsAreIncluded");

-	$listofchoices=array('notyet'=>$langs->trans("NotYetInGeneralLedger"), 'already'=>$langs->trans("AlreadyInGeneralLedger"));
-	$period = $form->select_date($date_start?$date_start:-1, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end?$date_end:-1, 'date_end', 0, 0, 0, '', 1, 0, 1). ' -  ' .$langs->trans("JournalizationInLedgerStatus").' '. $form->selectarray('in_bookkeeping', $listofchoices, $in_bookkeeping, 1);
+	$listofchoices=array('already'=>$langs->trans("AlreadyInGeneralLedger"), 'notyet'=>$langs->trans("NotYetInGeneralLedger"));
+	$period = $form->select_date($date_start, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1). ' -  ' .$langs->trans("AlreadyInGeneralLedger").' '. $form->selectarray('in_bookkeeping', $listofchoices, $in_bookkeeping, 1);

 	$varlink = 'id_journal=' . $id_journal;

@@ -663,33 +547,30 @@ if (empty($action) || $action == 'view') {

 	// Button to write into Ledger
 	if (empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER) || $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == '-1') {
-		print img_warning().' '.$langs->trans("SomeMandatoryStepsOfSetupWereNotDone");
-		print ' : '.$langs->trans("AccountancyAreaDescMisc", 4, '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong>');
+	    print img_warning().' '.$langs->trans("SomeMandatoryStepsOfSetupWereNotDone");
+	    print ' : '.$langs->trans("AccountancyAreaDescMisc", 4, '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong>');
 	}
 	print '<div class="tabsAction tabsActionNoBottom">';
-	print '<input type="button" class="butAction" name="exportcsv" value="' . $langs->trans("ExportDraftJournal") . '" onclick="launch_export();" />';
 	if (empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER) || $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == '-1') {
-		print '<input type="button" class="butActionRefused" title="'.dol_escape_htmltag($langs->trans("SomeMandatoryStepsOfSetupWereNotDone")).'" value="' . $langs->trans("WriteBookKeeping") . '" />';
+	    print '<input type="button" class="butActionRefused" title="'.dol_escape_htmltag($langs->trans("SomeMandatoryStepsOfSetupWereNotDone")).'" value="' . $langs->trans("WriteBookKeeping") . '" />';
 	}
 	else {
-		if ($in_bookkeeping == 'notyet') print '<input type="button" class="butAction" name="writebookkeeping" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
-		else print '<a href="#" class="butActionRefused" name="writebookkeeping">' . $langs->trans("WriteBookKeeping") . '</a>';
+	   print '<input type="button" class="butAction" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
 	}
+	print '<input type="button" class="butAction" value="' . $langs->trans("ExportDraftJournal") . '" onclick="launch_export();" />';
 	print '</div>';

-	// TODO Avoid using js. We can use a direct link with $param
 	print '
 	<script type="text/javascript">
 		function launch_export() {
-			$("div.fiche form input[name=\"action\"]").val("exportcsv");
-			$("div.fiche form input[type=\"submit\"]").click();
-			$("div.fiche form input[name=\"action\"]").val("");
+			$("div.fiche div.tabBar form input[name=\"action\"]").val("exportcsv");
+			$("div.fiche div.tabBar form input[type=\"submit\"]").click();
+			$("div.fiche div.tabBar form input[name=\"action\"]").val("");
 		}
 		function writebookkeeping() {
-			console.log("click on writebookkeeping");
-			$("div.fiche form input[name=\"action\"]").val("writebookkeeping");
-			$("div.fiche form input[type=\"submit\"]").click();
-			$("div.fiche form input[name=\"action\"]").val("");
+			$("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>';

@@ -699,7 +580,6 @@ if (empty($action) || $action == 'view') {
 	print '<br>';

 	$i = 0;
-	print '<div class="div-table-responsive">';
 	print "<table class=\"noborder\" width=\"100%\">";
 	print "<tr class=\"liste_titre\">";
 	print "<td></td>";
@@ -707,124 +587,62 @@ if (empty($action) || $action == 'view') {
 	print "<td>" . $langs->trans("Piece") . ' (' . $langs->trans("InvoiceRef") . ")</td>";
 	print "<td>" . $langs->trans("AccountAccounting") . "</td>";
 	print "<td>" . $langs->trans("SubledgerAccount") . "</td>";
-	print "<td>" . $langs->trans("LabelOperation") . "</td>";
+	print "<td>" . $langs->trans("Label") . "</td>";
 	print "<td align='right'>" . $langs->trans("Debit") . "</td>";
 	print "<td align='right'>" . $langs->trans("Credit") . "</td>";
 	print "</tr>\n";

 	$r = '';

-	$companystatic = new Client($db);
 	$invoicestatic = new Facture($db);
+	$companystatic = new Client($db);

-	foreach ( $tabfac as $key => $val )
-	{
-		$companystatic->id = $tabcompany[$key]['id'];
-		$companystatic->name = $tabcompany[$key]['name'];
-		$companystatic->code_compta = $tabcompany[$key]['code_compta'];
-		$companystatic->code_compta_fournisseur = $tabcompany[$key]['code_compta_fournisseur'];
-		$companystatic->code_client = $tabcompany[$key]['code_client'];
-		$companystatic->code_fournisseur = $tabcompany[$key]['code_fournisseur'];
-		$companystatic->client = 3;
-
+	foreach ( $tabfac as $key => $val ) {
 		$invoicestatic->id = $key;
-		$invoicestatic->ref = (string) $val["ref"];
+		$invoicestatic->ref = $val["ref"];
 		$invoicestatic->type = $val["type"];
-		$invoicestatic->close_code = $val["close_code"];

 		$date = dol_print_date($val["date"], 'day');

-		// Is it a replaced invoice ? 0=not a replaced invoice, 1=replaced invoice not yet dispatched, 2=replaced invoice dispatched
-		$replacedinvoice = 0;
-		if ($invoicestatic->close_code == Facture::CLOSECODE_REPLACED)
-		{
-			$replacedinvoice = 1;
-			$alreadydispatched = $invoicestatic->getVentilExportCompta();	// Test if replaced invoice already into bookkeeping.
-			if ($alreadydispatched) $replacedinvoice = 2;
-		}
-
-		// If not already into bookkeeping, we won't add it, if yes, add the counterpart ???.
-		if ($replacedinvoice == 1)
-		{
+		// Third party
+		foreach ( $tabttc[$key] as $k => $mt ) {
 			print '<tr class="oddeven">';
-			print "<td><!-- Replaced invoice --></td>";
-			print "<td>" . $date . "</td>";
-			print "<td><strike>" . $invoicestatic->getNomUrl(1) . "</strike></td>";
-			// Account
-			print "<td>";
-			print $langs->trans("Replaced");
-			print '</td>';
-			// Subledger account
-			print "<td>";
-			print '</td>';
-			print "<td>";
-			print "</td>";
-			print '<td align="right"></td>';
-			print '<td align="right"></td>';
-			print "</tr>";
-
-			continue;
-		}
-		if ($errorforinvoice[$key] == 'somelinesarenotbound')
-		{
-			print '<tr class="oddeven">';
-			print "<td><!-- Some lines are not bound --></td>";
+			print "<td><!-- Thirdparty --></td>";
 			print "<td>" . $date . "</td>";
 			print "<td>" . $invoicestatic->getNomUrl(1) . "</td>";
+			$companystatic->id = $tabcompany[$key]['id'];
+			$companystatic->name = $tabcompany[$key]['name'];
+			$companystatic->customer_code = $tabcompany[$key]['code_client'];
 			// Account
 			print "<td>";
-			print '<span class="error">'.$langs->trans('ErrorInvoiceContainsLinesNotYetBoundedShort', $val['ref']).'</span>';
+			$accountoshow = length_accounta($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER);
+			if (empty($accountoshow) || $accountoshow == 'NotDefined')
+			{
+				print '<span class="error">'.$langs->trans("MainAccountForCustomersNotDefined").'</span>';
+			}
+			else print $accountoshow;
 			print '</td>';
 			// Subledger account
 			print "<td>";
+			$accountoshow = length_accounta($k);
+			if (empty($accountoshow) || $accountoshow == 'NotDefined')
+			{
+				print '<span class="error">'.$langs->trans("ThirdpartyAccountNotDefined").'</span>';
+			}
+			else print $accountoshow;
 			print '</td>';
-			print "<td>";
-			print "</td>";
-			print '<td align="right"></td>';
-			print '<td align="right"></td>';
+			print "<td>" . $companystatic->getNomUrl(0, 'customer', 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("SubledgerAccount") . "</td>";
+			print '<td align="right">' . ($mt >= 0 ? price($mt) : '') . "</td>";
+			print '<td align="right">' . ($mt < 0 ? price(- $mt) : '') . "</td>";
 			print "</tr>";
 		}

-		// Third party
-		foreach ($tabttc[$key] as $k => $mt)
-		{
-			//if ($mt) {
-				print '<tr class="oddeven">';
-				print "<td><!-- Thirdparty --></td>";
-				print "<td>" . $date . "</td>";
-				print "<td>" . $invoicestatic->getNomUrl(1) . "</td>";
-				// Account
-				print "<td>";
-				$accountoshow = length_accounta($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER);
-				if (empty($accountoshow) || $accountoshow == 'NotDefined')
-				{
-					print '<span class="error">'.$langs->trans("MainAccountForCustomersNotDefined").'</span>';
-				}
-				else print $accountoshow;
-				print '</td>';
-				// Subledger account
-				print "<td>";
-				$accountoshow = length_accounta($k);
-				if (empty($accountoshow) || $accountoshow == 'NotDefined')
-				{
-					print '<span class="error">'.$langs->trans("ThirdpartyAccountNotDefined").'</span>';
-				}
-				else print $accountoshow;
-				print '</td>';
-				print "<td>" . $companystatic->getNomUrl(0, 'customer', 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("SubledgerAccount") . "</td>";
-				print '<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)
-		{
+		foreach ( $tabht[$key] as $k => $mt ) {
 			$accountingaccount = new AccountingAccount($db);
 			$accountingaccount->fetch(null, $k, true);

-			//if ($mt) {
+			if ($mt) {
 				print '<tr class="oddeven">';
 				print "<td><!-- Product --></td>";
 				print "<td>" . $date . "</td>";
@@ -847,13 +665,12 @@ if (empty($action) || $action == 'view') {
 				print "<td align='right'>" . ($mt < 0 ? price(- $mt) : '') . "</td>";
 				print "<td align='right'>" . ($mt >= 0 ? price($mt) : '') . "</td>";
 				print "</tr>";
-			//}
+			}
 		}

 		// VAT
 		$listoftax = array(0, 1, 2);
-		foreach ($listoftax as $numtax)
-		{
+		foreach ($listoftax as $numtax) {
 			$arrayofvat = $tabtva;
 			if ($numtax == 1) $arrayofvat = $tablocaltax1;
 			if ($numtax == 2) $arrayofvat = $tablocaltax2;
@@ -869,14 +686,14 @@ if (empty($action) || $action == 'view') {
 					$accountoshow = length_accountg($k);
 					if (empty($accountoshow) || $accountoshow == 'NotDefined')
 					{
-						print '<span class="error">'.$langs->trans("VATAccountNotDefined").' ('.$langs->trans("Sale").')'.'</span>';
+						print '<span class="error">'.$langs->trans("VATAccountNotDefined").'</span>';
 					}
 					else print $accountoshow;
 					print "</td>";
 					// Subledger account
 					print "<td>";
 					print '</td>';
-					print "<td>" . $companystatic->getNomUrl(0, 'customer', 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("VAT"). ' '.join(', ',$def_tva[$key][$k]).' %'.($numtax?' - Localtax '.$numtax:'');
+					print "<td>" . $companystatic->getNomUrl(0, 'customer', 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("VAT"). ' '.join(', ',$def_tva[$key][$k]).($numtax?' - Localtax '.$numtax:'');
 					print "</td>";
 					print '<td align="right">' . ($mt < 0 ? price(- $mt) : '') . "</td>";
 					print '<td align="right">' . ($mt >= 0 ? price($mt) : '') . "</td>";
@@ -887,7 +704,6 @@ if (empty($action) || $action == 'view') {
 	}

 	print "</table>";
-	print '</div>';

 	// End of page
 	llxFooter();
--- a/htdocs/core/modules/expensereport/index.html
+++ b/htdocs/core/modules/expensereport/index.html
--- a/htdocs/accountancy/report/result.php
+++ b/htdocs/accountancy/report/result.php
@@ -0,0 +1,302 @@
+<?php
+/* Copyright (C) 2016/17		Jamal Elbaz			<jamelbaz@gmail.com>
+ * Copyright (C) 2016 		Alexandre Spangaro	<aspangaro.dolibarr@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/report/result.php
+ * \ingroup 	Advanced accountancy
+ * \brief 		Page for accounting result
+ */
+require '../../main.inc.php';
+
+// Class
+require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/report.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountancycategory.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
+
+$error = 0;
+
+// Langs
+$langs->load("accountancy");
+$langs->load("compta");
+
+$mesg = '';
+$action = GETPOST('action','aZ09');
+$cat_id = GETPOST('account_category');
+$selectcpt = GETPOST('cpt_bk');
+$id = GETPOST('id', 'int');
+$rowid = GETPOST('rowid', 'int');
+$cancel = GETPOST('cancel');
+$simple_report = GETPOST('simple_report');
+
+
+// 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($cat_id == 0){
+	$cat_id = null;
+}
+
+// Security check
+if ($user->societe_id > 0)
+	accessforbidden();
+if (! $user->rights->accounting->comptarapport->lire)
+	accessforbidden();
+
+$AccCat = new AccountancyCategory($db);
+
+
+/*
+ * View
+ */
+
+llxheader('', $langs->trans('ReportInOut'));
+
+$formaccounting = new FormAccounting($db);
+$form = new Form($db);
+
+$textprevyear = '<a href="' . $_SERVER["PHP_SELF"] . '?year=' . ($year_current - 1) . '">' . img_previous() . '</a>';
+$textnextyear = '&nbsp;<a href="' . $_SERVER["PHP_SELF"] . '?year=' . ($year_current + 1) . '">' . img_next() . '</a>';
+
+$nom = $langs->trans("ReportInOut").', '.$langs->trans("ByAccounts");
+$nomlink = '';
+$periodlink = '';
+$exportlink = '';
+$builddate = time();
+$description = '';
+$period = $langs->trans("Detail").' '. $form->selectyesno('simple_report',$simple_report,0) . " " .$textprevyear . " " . $langs->trans("Year") . " " . $year_start . " " . $textnextyear ;
+report_header($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''));
+
+$moreforfilter='';
+
+print '<div class="div-table-responsive">';
+print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
+
+$months = array( $langs->trans("JanuaryMin"),
+				$langs->trans("FebruaryMin"),
+				$langs->trans("MarchMin"),
+				$langs->trans("AprilMin"),
+				$langs->trans("MayMin"),
+				$langs->trans("JuneMin"),
+				$langs->trans("JulyMin"),
+				$langs->trans("AugustMin"),
+				$langs->trans("SeptemberMin"),
+				$langs->trans("OctoberMin"),
+				$langs->trans("NovemberMin"),
+				$langs->trans("DecemberMin"),
+			);
+
+print '<tr class="liste_titre">';
+print '<th class="liste_titre">'.$langs->trans("Account").'</th>';
+print '<th class="liste_titre">'.$langs->trans("Description").'</th>';
+print '<th class="liste_titre" align="center">N-1</th>';
+print '<th class="liste_titre" align="center">'.$langs->trans("NReal").'</th>';
+foreach($months as $k => $v){
+	print '<th class="liste_titre"  align="center">'.$langs->trans($v).'</th>';
+}
+print	'</tr>';
+
+
+
+//All categories
+$cats = $AccCat->getCats();
+if ($catsCalcule < 0) dol_print_error($db, $AccCat->error, $AccCat->errors);
+
+$j=1;
+$sommes = array();
+
+foreach($cats as $cat ){
+	if(!empty($cat['category_type'])){ // category calculed
+
+		$formula = $cat['formula'];
+
+		print "<tr class='liste_titre'>";
+		print '<td colspan="2">' . $cat['label'] . '</td>';
+
+		$vars = array();
+
+		// Previous Fiscal year (N-1)
+		foreach($sommes as $code => $det){
+			$vars[$code] = $det['NP'];
+		}
+
+
+		$result = strtr($formula, $vars);
+
+
+		$r = $AccCat->calculate($result);
+
+		print '<td align="right"><font color="blue">' . price($r) . '</td>';
+		$code = $cat['code']; // code categorie de calcule
+		$sommes[$code]['NP'] += $r;
+
+		// Current fiscal year (N)
+		if (is_array($sommes) && ! empty($sommes)){
+			foreach($sommes as $code => $det){
+				$vars[$code] = $det['N'];
+			}
+		}
+
+		$result = strtr($formula, $vars);
+
+		$r = $AccCat->calculate($result);
+
+		print '<td align="right"><font color="blue">' . price($r) . '</td>';
+		$sommes[$code]['N'] += $r;
+
+		// Detail by month
+		foreach($months as $k => $v){
+			foreach($sommes as $code => $det){
+				$vars[$code] = $det['M'][$k];
+			}
+			$result = strtr($formula, $vars);
+			$r = $AccCat->calculate($result);
+			print '<td align="right"><font color="blue">' . price($r) . '</td>';
+			$sommes[$code]['M'][$k] += $r;
+		}
+
+
+		print "</tr>\n";
+
+
+	}else{ // normal category
+
+		$totCat = array();
+		$totCat['M'] = array();
+
+		// get cpts of category
+		$cpts = $AccCat->getCptsCat($cat['rowid']);
+
+
+		print "<tr class='liste_titre'>";
+		print '<td colspan="2">' . $cat['label'] . '</td>';
+
+		foreach($cpts as $i => $cpt){
+			$var = ! $var;
+
+			$code = $cat['code'];
+
+			// N-1
+			$return = $AccCat->getResult($cpt['account_number'], 0, $year_current -1, $cpt['dc']);
+
+			if ($return < 0) {
+				setEventMessages(null, $AccCat->errors, 'errors');
+				$resultNP=0;
+			} else {
+				$resultNP=$AccCat->sdc;
+			}
+
+			//N
+			$return = $AccCat->getResult($cpt['account_number'], 0, $year_current, $cpt['dc']);
+			if ($return < 0) {
+				setEventMessages(null, $AccCat->errors, 'errors');
+				$resultN=0;
+			} else {
+				$resultN=$AccCat->sdc;
+			}
+
+			$totCat['NP'] += $resultNP;
+			$totCat['N'] += $resultN;
+
+			foreach($months as $k => $v){
+				$return = $AccCat->getResult($cpt['account_number'], $k+1, $year_current, $cpt['dc']);
+				if ($return < 0) {
+					setEventMessages(null, $AccCat->errors, 'errors');
+					$resultM=0;
+				} else {
+					$resultM=$AccCat->sdc;
+				}
+				$totCat['M'][$k] += $resultM;
+
+			}
+		}
+
+		print '<td align="right">' . price($totCat['NP'])  . '</td>';
+		print '<td align="right">' . price($totCat['N']) . '</td>';
+
+		foreach($totCat['M'] as $k => $v){
+			print '<td align="right">' . price($v) . '</td>';
+		}
+		print "</tr>\n";
+
+		foreach($cpts as $i => $cpt){
+			$var = ! $var;
+
+			$code = $cat['code'];
+
+			// N-1
+			$return = $AccCat->getResult($cpt['account_number'], 0, $year_current -1, $cpt['dc']);
+
+			if ($return < 0) {
+				setEventMessages(null, $AccCat->errors, 'errors');
+				$resultNP=0;
+			} else {
+				$resultNP=$AccCat->sdc;
+			}
+
+			//N
+			$return = $AccCat->getResult($cpt['account_number'], 0, $year_current, $cpt['dc']);
+			if ($return < 0) {
+				setEventMessages(null, $AccCat->errors, 'errors');
+				$resultN=0;
+			} else {
+				$resultN=$AccCat->sdc;
+			}
+
+			$sommes[$code]['NP'] += $resultNP;
+			$sommes[$code]['N'] += $resultN;
+			print '<tr'. $bc[$var].'>';
+			if ($simple_report == 'yes') {
+			print '<td>' . length_accountg($cpt['account_number']) . '</td>';
+			print '<td>' . $cpt['name_cpt'] . '</td>';
+			print '<td align="right">' . price($resultNP)  . '</td>';
+			print '<td align="right">' . price($resultN) . '</td>';
+			}
+
+			foreach($months as $k => $v){
+				$return = $AccCat->getResult($cpt['account_number'], $k+1, $year_current, $cpt['dc']);
+				if ($return < 0) {
+					setEventMessages(null, $AccCat->errors, 'errors');
+					$resultM=0;
+				} else {
+					$resultM=$AccCat->sdc;
+				}
+				$sommes[$code]['M'][$k] += $resultM;
+				if ($simple_report == 'yes') {
+				print '<td align="right">' . price($resultM) . '</td>';
+				}
+			}
+
+			print "</tr>\n";
+		}
+	}
+
+}
+
+print "</table>";
+print '</div>';
+
+llxFooter();
+$db->close();
--- a/htdocs/accountancy/supplier/card.php
+++ b/htdocs/accountancy/supplier/card.php
@@ -22,9 +22,9 @@
 *
 */
 /**
- * \file 	htdocs/accountancy/supplier/card.php
- * \ingroup Advanced accountancy
- * \brief 	Card supplier ventilation
+ * \file htdocs/accountancy/supplier/card.php
+ * \ingroup Accountancy
+ * \brief Card supplier ventilation
 */
 require '../../main.inc.php';

@@ -37,9 +37,6 @@ $langs->load("bills");
 $langs->load("accountancy");

 $action = GETPOST('action', 'alpha');
-$cancel = GETPOST('cancel', 'alpha');
-$backtopage = GETPOST('backtopage', 'alpha');
-
 $codeventil = GETPOST('codeventil');
 $id = GETPOST('id');

@@ -47,15 +44,13 @@ $id = GETPOST('id');
 if ($user->societe_id > 0)
 	accessforbidden();

-
+	
 /*
 * Actions
 */

-if ($action == 'ventil' && $user->rights->accounting->bind->write)
-{
-	if (! $cancel)
-	{
+if ($action == 'ventil' && $user->rights->accounting->bind->write) {
+	if (! GETPOST('cancel', 'alpha')) {
 	    if ($codeventil < 0) $codeventil = 0;

 		$sql = " UPDATE " . MAIN_DB_PREFIX . "facture_fourn_det";
@@ -69,11 +64,6 @@ if ($action == 'ventil' && $user->rights->accounting->bind->write)
 		else
 		{
 		    setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
-		    if ($backtopage)
-		    {
-		    	header("Location: ".$backtopage);
-		    	exit();
-		    }
 		}
 	} else {
 		header("Location: ./lines.php");
@@ -107,21 +97,20 @@ if (! empty($id)) {
 	$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;
 	$sql .= " AND f.entity IN (" . getEntity('facture_fourn', 0) . ")";     // We don't share object for accountancy
-
+	
 	dol_syslog("/accounting/supplier/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">';
-			print '<input type="hidden" name="backtopage" value="'.dol_escape_htmltag($backtopage).'">';

 			print load_fiche_titre($langs->trans('SuppliersVentilation'), '', 'title_setup');

--- a/htdocs/accountancy/supplier/index.php
+++ b/htdocs/accountancy/supplier/index.php
@@ -38,35 +38,25 @@ $langs->load("accountancy");

 // Security check
 if (empty($conf->accounting->enabled)) {
-	accessforbidden();
+    accessforbidden();
 }
 if ($user->societe_id > 0)
 	accessforbidden();
 if (! $user->rights->accounting->bind->write)
 	accessforbidden();

-
-$month_start= ($conf->global->SOCIETE_FISCAL_MONTH_START?($conf->global->SOCIETE_FISCAL_MONTH_START):1);
-if (GETPOST("year",'int')) $year_start = GETPOST("year",'int');
-else
-{
-	$year_start = dol_print_date(dol_now(), '%Y');
-	if (dol_print_date(dol_now(), '%m') < $month_start) $year_start--;	// If current month is lower that starting fiscal month, we start last year
+// Filter
+$year = GETPOST("year",'int');
+if ($year == 0) {
+	$year_current = strftime("%Y", time());
+	$year_start = $year_current;
+} else {
+	$year_current = $year;
+	$year_start = $year;
 }
-$year_end = $year_start + 1;
-$month_end = $month_start - 1;
-if ($month_end < 1)
-{
-	$month_end = 12;
-	$year_end--;
-}
-$search_date_start = dol_mktime(0, 0, 0, $month_start, 1, $year_start);
-$search_date_end = dol_get_last_day($year_end, $month_end);
-$year_current = $year_start;

 // Validate History
-$action = GETPOST('action','aZ09');
-
+$action = GETPOST('action', 'aZ09');


 /*
@@ -115,8 +105,53 @@ if ($action == 'validatehistory') {
 		$db->commit();
 		setEventMessages($langs->trans('AutomaticBindingDone'), null, 'mesgs');
 	}
-}
+} elseif ($action == 'fixaccountancycode') {
+	$error = 0;
+	$db->begin();

+	$sql1 = "UPDATE " . MAIN_DB_PREFIX . "facture_fourn_det as fd";
+	$sql1 .= " SET fk_code_ventilation = 0";
+	$sql1 .= ' WHERE fd.fk_code_ventilation NOT IN ';
+	$sql1 .= '	(SELECT accnt.rowid ';
+	$sql1 .= '	FROM ' . MAIN_DB_PREFIX . 'accounting_account as accnt';
+	$sql1 .= '	INNER JOIN ' . MAIN_DB_PREFIX . 'accounting_system as syst';
+	$sql1 .= '	ON accnt.fk_pcg_version = syst.pcg_version AND syst.rowid=' . $conf->global->CHARTOFACCOUNTS . ')';
+
+	dol_syslog("htdocs/accountancy/customer/index.php fixaccountancycode", LOG_DEBUG);
+
+	$resql1 = $db->query($sql1);
+	if (! $resql1) {
+		$error ++;
+		$db->rollback();
+		setEventMessage($db->lasterror(), 'errors');
+	} else {
+		$db->commit();
+		setEventMessage($langs->trans('Done'), 'mesgs');
+	}
+} elseif ($action == 'cleanaccountancycode') {
+	$error = 0;
+	$db->begin();
+
+	$sql1 = "UPDATE " . MAIN_DB_PREFIX . "facture_fourn_det as fd";
+	$sql1.= " SET fk_code_ventilation = 0";
+	$sql1.= " WHERE fd.fk_facture_fourn IN ( SELECT f.rowid FROM " . MAIN_DB_PREFIX . "facture_fourn as f";
+	$sql1.= " WHERE f.datef >= '" . $db->idate(dol_get_first_day($year_current, 1, false)) . "'";
+	$sql1.= " AND f.datef <= '" . $db->idate(dol_get_last_day($year_current, 12, false)) . "'";
+	$sql1.= " AND f.entity IN (" . getEntity('accountancy') . ")";
+	$sql1.= ")";
+
+	dol_syslog("htdocs/accountancy/customer/index.php fixaccountancycode", LOG_DEBUG);
+
+	$resql1 = $db->query($sql1);
+	if (! $resql1) {
+		$error ++;
+		$db->rollback();
+		setEventMessage($db->lasterror(), 'errors');
+	} else {
+		$db->commit();
+		setEventMessage($langs->trans('Done'), 'mesgs');
+	}
+}

 /*
 * View
@@ -129,62 +164,44 @@ $textnextyear = '&nbsp;<a href="' . $_SERVER["PHP_SELF"] . '?year=' . ($year_cur

 print load_fiche_titre($langs->trans("SuppliersVentilation") . " " . $textprevyear . "&nbsp;" . $langs->trans("Year") . "&nbsp;" . $year_start . "&nbsp;" . $textnextyear, '', 'title_accountancy');

-// Clean database
-$db->begin();
-$sql1 = "UPDATE " . MAIN_DB_PREFIX . "facture_fourn_det as fd";
-$sql1 .= " SET fk_code_ventilation = 0";
-$sql1 .= ' WHERE fd.fk_code_ventilation NOT IN ';
-$sql1 .= '	(SELECT accnt.rowid ';
-$sql1 .= '	FROM ' . MAIN_DB_PREFIX . 'accounting_account as accnt';
-$sql1 .= '	INNER JOIN ' . MAIN_DB_PREFIX . 'accounting_system as syst';
-$sql1 .= '	ON accnt.fk_pcg_version = syst.pcg_version AND syst.rowid=' . $conf->global->CHARTOFACCOUNTS . ')';
-dol_syslog("htdocs/accountancy/customer/index.php fixaccountancycode", LOG_DEBUG);
-$resql1 = $db->query($sql1);
-if (! $resql1) {
-	$error ++;
-	$db->rollback();
-	setEventMessage($db->lasterror(), 'errors');
-} else {
-	$db->commit();
-}
-// End clean database
-
 print $langs->trans("DescVentilSupplier") . '<br>';
 print $langs->trans("DescVentilMore", $langs->transnoentitiesnoconv("ValidateHistory"), $langs->transnoentitiesnoconv("ToBind")) . '<br>';
 print '<br>';

+//print '<div class="inline-block divButAction">';
+// TODO Remove this. Should be done always or into the repair.php script.
+if ($conf->global->MAIN_FEATURES_LEVEL > 1) print '<a class="butActionDelete" href="' . $_SERVER['PHP_SELF'] . '?year=' . $year_current . '&action=fixaccountancycode">' . $langs->trans("CleanFixHistory", $year_current) . '</a>';
+//print '</div>';
+
+
 $y = $year_current;

 $buttonbind = '<a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?year=' . $year_current . '&action=validatehistory">' . $langs->trans("ValidateHistory") . '</a>';
+$buttonreset = '<a class="butActionDelete" href="' . $_SERVER['PHP_SELF'] . '?year=' . $year_current . '&action=cleanaccountancycode">' . $langs->trans("CleanHistory", $year_current) . '</a>';


 print_fiche_titre($langs->trans("OverviewOfAmountOfLinesNotBound"), $buttonbind, '');

-print '<div class="div-table-responsive-no-min">';
 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>';
 for($i = 1; $i <= 12; $i ++) {
-	$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START?$conf->global->SOCIETE_FISCAL_MONTH_START:1) - 1;
-	if ($j > 12) $j-=12;
-	print '<td width="60" align="right">' . $langs->trans('MonthShort' . str_pad($j, 2, '0', STR_PAD_LEFT)) . '</td>';
+	print '<td width="60" align="right">' . $langs->trans('MonthShort' . str_pad($i, 2, '0', STR_PAD_LEFT)) . '</td>';
 }
 print '<td width="60" align="right"><b>' . $langs->trans("Total") . '</b></td></tr>';

 $sql = "SELECT  ".$db->ifsql('aa.account_number IS NULL', "'tobind'", 'aa.account_number') ." AS codecomptable,";
 $sql .= "  " . $db->ifsql('aa.label IS NULL', "'tobind'", 'aa.label') . " AS intitule,";
 for($i = 1; $i <= 12; $i ++) {
-	$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START?$conf->global->SOCIETE_FISCAL_MONTH_START:1) - 1;
-	if ($j > 12) $j-=12;
-	$sql .= "  SUM(" . $db->ifsql('MONTH(ff.datef)=' . $j, 'ffd.total_ht', '0') . ") AS month" . str_pad($j, 2, '0', STR_PAD_LEFT) . ",";
+	$sql .= "  SUM(" . $db->ifsql('MONTH(ff.datef)=' . $i, 'ffd.total_ht', '0') . ") AS month" . str_pad($i, 2, '0', STR_PAD_LEFT) . ",";
 }
 $sql .= "  SUM(ffd.total_ht) 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 . "accounting_account as aa ON aa.rowid = ffd.fk_code_ventilation";
-$sql .= " WHERE ff.datef >= '" . $db->idate($search_date_start) . "'";
-$sql .= "  AND ff.datef <= '" . $db->idate($search_date_end) . "'";
-$sql .= "  AND ff.fk_statut > 0";
+$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 ";
 $sql .= " AND ff.entity IN (" . getEntity('facture_fourn', 0) . ")";     // We don't share object for accountancy
 $sql .= " AND aa.account_number IS NULL";
 $sql .= " GROUP BY ffd.fk_code_ventilation,aa.account_number,aa.label";
@@ -222,39 +239,35 @@ if ($resql) {
 	print $db->lasterror(); // Show last sql error
 }
 print "</table>\n";
-print '</div>';
+
+


 print '<br>';


-print_fiche_titre($langs->trans("OverviewOfAmountOfLinesBound"), '', '');
+print_fiche_titre($langs->trans("OverviewOfAmountOfLinesBound"), $buttonreset, '');

-print '<div class="div-table-responsive-no-min">';
 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>';
 for($i = 1; $i <= 12; $i ++) {
-	$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START?$conf->global->SOCIETE_FISCAL_MONTH_START:1) - 1;
-	if ($j > 12) $j-=12;
-	print '<td width="60" align="right">' . $langs->trans('MonthShort' . str_pad($j, 2, '0', STR_PAD_LEFT)) . '</td>';
+    print '<td width="60" align="right">' . $langs->trans('MonthShort' . str_pad($i, 2, '0', STR_PAD_LEFT)) . '</td>';
 }
 print '<td width="60" align="right"><b>' . $langs->trans("Total") . '</b></td></tr>';

 $sql = "SELECT  ".$db->ifsql('aa.account_number IS NULL', "'tobind'", 'aa.account_number') ." AS codecomptable,";
 $sql .= "  " . $db->ifsql('aa.label IS NULL', "'tobind'", 'aa.label') . " AS intitule,";
 for($i = 1; $i <= 12; $i ++) {
-	$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START?$conf->global->SOCIETE_FISCAL_MONTH_START:1) - 1;
-	if ($j > 12) $j-=12;
-	$sql .= "  SUM(" . $db->ifsql('MONTH(ff.datef)=' . $j, 'ffd.total_ht', '0') . ") AS month" . str_pad($j, 2, '0', STR_PAD_LEFT) . ",";
+    $sql .= "  SUM(" . $db->ifsql('MONTH(ff.datef)=' . $i, 'ffd.total_ht', '0') . ") AS month" . str_pad($i, 2, '0', STR_PAD_LEFT) . ",";
 }
 $sql .= "  SUM(ffd.total_ht) 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 . "accounting_account as aa ON aa.rowid = ffd.fk_code_ventilation";
-$sql .= " WHERE ff.datef >= '" . $db->idate($search_date_start) . "'";
-$sql .= "  AND ff.datef <= '" . $db->idate($search_date_end) . "'";
-$sql .= "  AND ff.fk_statut > 0";
+$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 ";
 $sql .= " AND ff.entity IN (" . getEntity('facture_fourn', 0) . ")";     // We don't share object for accountancy
 $sql .= " AND aa.account_number IS NOT NULL";
 $sql .= " GROUP BY ffd.fk_code_ventilation,aa.account_number,aa.label";
@@ -280,7 +293,7 @@ if ($resql) {
 		}
 		else print $row[1];
 		print '</td>';
-    	for($i = 2; $i <= 12; $i++) {
+    	for($i = 2; $i <= 12; $i ++) {
            print '<td align="right">' . price($row[$i]) . '</td>';
        }
        print '<td align="right">' . price($row[13]) . '</td>';
@@ -292,7 +305,7 @@ if ($resql) {
    print $db->lasterror(); // Show last sql error
 }
 print "</table>\n";
-print '</div>';
+



@@ -303,28 +316,24 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.

    print_fiche_titre($langs->trans("OtherInfo"), '', '');

-	print '<div class="div-table-responsive-no-min">';
+    print "<br>\n";
    print '<table class="noborder" width="100%">';
    print '<tr class="liste_titre"><td width="400" align="left">' . $langs->trans("Total") . '</td>';
    for($i = 1; $i <= 12; $i ++) {
-    	$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START?$conf->global->SOCIETE_FISCAL_MONTH_START:1) - 1;
-    	if ($j > 12) $j-=12;
-    	print '<td width="60" align="right">' . $langs->trans('MonthShort' . str_pad($j, 2, '0', STR_PAD_LEFT)) . '</td>';
+    	print '<td width="60" align="right">' . $langs->trans('MonthShort' . str_pad($i, 2, '0', STR_PAD_LEFT)) . '</td>';
    }
    print '<td width="60" align="right"><b>' . $langs->trans("Total") . '</b></td></tr>';

    $sql = "SELECT '" . $langs->trans("CAHTF") . "' AS label,";
    for($i = 1; $i <= 12; $i ++) {
-    	$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START?$conf->global->SOCIETE_FISCAL_MONTH_START:1) - 1;
-    	if ($j > 12) $j-=12;
-    	$sql .= "  SUM(" . $db->ifsql('MONTH(ff.datef)=' . $j, 'ffd.total_ht', '0') . ") AS month" . str_pad($j, 2, '0', STR_PAD_LEFT) . ",";
+    	$sql .= "  SUM(" . $db->ifsql('MONTH(ff.datef)=' . $i, 'ffd.total_ht', '0') . ") AS month" . str_pad($i, 2, '0', STR_PAD_LEFT) . ",";
    }
    $sql .= "  SUM(ffd.total_ht) 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($search_date_start) . "'";
-    $sql .= "  AND ff.datef <= '" . $db->idate($search_date_end) . "'";
-    $sql .= "  AND ff.fk_statut > 0";
+    $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 ";
    $sql .= " AND ff.entity IN (" . getEntity('facture_fourn', 0) . ")";     // We don't share object for accountancy

    dol_syslog('htdocs/accountancy/supplier/index.php');
@@ -332,7 +341,9 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
    if ($resql) {
    	$num = $db->num_rows($resql);

-    	while ($row = $db->fetch_row($resql)) {
+    	while ( $row = $db->fetch_row($resql)) {
+
+
    		print '<tr><td>' . $row[0] . '</td>';
    			for($i = 1; $i <= 12; $i ++) {
    			print '<td align="right">' . price($row[$i]) . '</td>';
@@ -340,12 +351,12 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
    		print '<td align="right"><b>' . price($row[13]) . '</b></td>';
    		print '</tr>';
    	}
+
    	$db->free($resql);
    } else {
    	print $db->lasterror(); // Show last sql error
    }
    print "</table>\n";
-    print '</div>';
 }


--- a/htdocs/accountancy/supplier/lines.php
+++ b/htdocs/accountancy/supplier/lines.php
@@ -32,8 +32,6 @@ 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';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';

 // Langs
 $langs->load("compta");
@@ -54,9 +52,6 @@ $search_desc = GETPOST('search_desc', 'alpha');
 $search_amount = GETPOST('search_amount', 'alpha');
 $search_account = GETPOST('search_account', 'alpha');
 $search_vat = GETPOST('search_vat', 'alpha');
-$search_day=GETPOST("search_day","int");
-$search_month=GETPOST("search_month","int");
-$search_year=GETPOST("search_year","int");
 $search_country = GETPOST('search_country', 'alpha');
 $search_tvaintra = GETPOST('search_tvaintra', 'alpha');

@@ -65,8 +60,8 @@ $limit = GETPOST('limit','int')?GETPOST('limit', 'int'):(empty($conf->global->AC
 $sortfield = GETPOST('sortfield', 'alpha');
 $sortorder = GETPOST('sortorder', 'alpha');
 $page = GETPOST('page', 'int');
-if (empty($page) || $page < 0) $page = 0;
-$offset = $limit * $page;
+if ($page < 0) $page = 0;
+$offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (! $sortfield)
@@ -101,9 +96,6 @@ if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x',
 	$search_amount = '';
 	$search_account = '';
 	$search_vat = '';
-	$search_day = '';
-	$search_month = '';
-	$search_year = '';
 	$search_country = '';
 	$search_tvaintra = '';
 }
@@ -111,36 +103,27 @@ if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x',
 if (is_array($changeaccount) && count($changeaccount) > 0) {
 	$error = 0;

-	if (! (GETPOST('account_parent','int') >= 0))
-	{
-		$error++;
-		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Account")), null, 'errors');
-	}
-
 	$db->begin();

-	if (! $error)
-	{
-		$sql1 = "UPDATE " . MAIN_DB_PREFIX . "facture_fourn_det as l";
-		$sql1 .= " SET l.fk_code_ventilation=" . (GETPOST('account_parent','int') > 0 ? GETPOST('account_parent','int') : '0');
-		$sql1 .= ' WHERE l.rowid IN (' . implode(',', $changeaccount) . ')';
+	$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 ++;
-			setEventMessages($db->lasterror(), null, 'errors');
-		}
-		if (! $error) {
-			$db->commit();
-			setEventMessages($langs->trans('Save'), null, 'mesgs');
-		} else {
-			$db->rollback();
-			setEventMessages($db->lasterror(), null, 'errors');
-		}
-
-		$account_parent = '';   // Protection to avoid to mass apply it a second time
+	dol_syslog('accountancy/supplier/lines.php::changeaccount sql= ' . $sql1);
+	$resql1 = $db->query($sql1);
+	if (! $resql1) {
+		$error ++;
+		setEventMessages($db->lasterror(), null, 'errors');
 	}
+	if (! $error) {
+		$db->commit();
+		setEventMessages($langs->trans('Save'), null, 'mesgs');
+	} else {
+		$db->rollback();
+		setEventMessages($db->lasterror(), null, 'errors');
+	}
+
+	$account_parent = '';   // Protection to avoid to mass apply it a second time
 }


@@ -148,9 +131,6 @@ if (is_array($changeaccount) && count($changeaccount) > 0) {
 * View
 */

-$form = new Form($db);
-$formother = new FormOther($db);
-
 llxHeader('', $langs->trans("SuppliersVentilation") . ' - ' . $langs->trans("Dispatched"));

 print '<script type="text/javascript">
@@ -204,29 +184,16 @@ if (strlen(trim($search_amount))) {
 	$sql .= natural_search("l.total_ht", $search_amount, 1);
 }
 if (strlen(trim($search_account))) {
-	$sql .= natural_search("aa.account_number", $search_account);
+	$sql .= natural_search("aa.account_number", $search_account, 1);
 }
 if (strlen(trim($search_vat))) {
-	$sql .= natural_search("l.tva_tx", price2num($search_vat), 1);
-}
-if ($search_month > 0)
-{
-	if ($search_year > 0 && empty($search_day))
-		$sql.= " AND f.datef BETWEEN '".$db->idate(dol_get_first_day($search_year,$search_month,false))."' AND '".$db->idate(dol_get_last_day($search_year,$search_month,false))."'";
-		else if ($search_year > 0 && ! empty($search_day))
-			$sql.= " AND f.datef BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $search_month, $search_day, $search_year))."' AND '".$db->idate(dol_mktime(23, 59, 59, $search_month, $search_day, $search_year))."'";
-			else
-				$sql.= " AND date_format(f.datef, '%m') = '".$db->escape($search_month)."'";
-}
-else if ($search_year > 0)
-{
-	$sql.= " AND f.datef BETWEEN '".$db->idate(dol_get_first_day($search_year,1,false))."' AND '".$db->idate(dol_get_last_day($search_year,12,false))."'";
+	$sql .= natural_search("l.tva_tx", $search_vat, 1);
 }
 if (strlen(trim($search_country))) {
-	$sql .= natural_search("co.label", $search_country);
+	$sql .= " AND (co.label like'" . $search_country . "%')";
 }
 if (strlen(trim($search_tvaintra))) {
-	$sql .= natural_search("s.tva_intra", $search_tvaintra);
+	$sql .= " AND (s.tva_intra like'" . $search_tvaintra . "%')";
 }
 $sql .= " AND f.entity IN (" . getEntity('facture_fourn', 0) . ")";  // We don't share object for accountancy

@@ -250,19 +217,24 @@ if ($result) {
 	$i = 0;

 	$param='';
-	if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
-	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
-	if ($search_invoice)	$param .= "&search_invoice=" . urlencode($search_invoice);
-	if ($search_ref)		$param .= "&search_ref=" . urlencode($search_ref);
-	if ($search_label)		$param .= "&search_label=" . urlencode($search_label);
-	if ($search_desc)		$param .= "&search_desc=" . urlencode($search_desc);
-	if ($search_account)	$param .= "&search_account=" . urlencode($search_account);
-	if ($search_vat)		$param .= "&search_vat=" . urlencode($search_vat);
-	if ($search_day)        $param .= '&search_day='.urlencode($search_day);
-	if ($search_month)      $param .= '&search_month='.urlencode($search_month);
-	if ($search_year)       $param .= '&search_year='.urlencode($search_year);
-	if ($search_country) 	$param .= "&search_country=" . urlencode($search_country);
-	if ($search_tvaintra)	$param .= "&search_tvaintra=" . urlencode($search_tvaintra);
+	if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
+	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
+	if ($search_invoice)
+		$param .= "&search_invoice=" . $search_invoice;
+	if ($search_ref)
+		$param .= "&search_ref=" . $search_ref;
+	if ($search_label)
+		$param .= "&search_label=" . $search_label;
+	if ($search_desc)
+		$param .= "&search_desc=" . $search_desc;
+	if ($search_account)
+		$param .= "&search_account=" . $search_account;
+	if ($search_vat)
+		$param .= "&search_vat=" . $search_vat;
+	if ($search_country)
+		$param .= "&search_country=" . $search_country;
+	if ($search_tvaintra)
+		$param .= "&search_tvaintra=" . $search_tvaintra;

 	print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">' . "\n";
 	print '<input type="hidden" name="action" value="ventil">';
@@ -278,7 +250,7 @@ if ($result) {
 	print $langs->trans("DescVentilDoneSupplier") . '<br>';

 	print '<br><div class="inline-block divButAction">' . $langs->trans("ChangeAccount") . '<br>';
-	print $formaccounting->select_account($account_parent, 'account_parent', 2, array(), 0, 0, 'maxwidth300 maxwidthonsmartphone valignmiddle');
+	print $formaccounting->select_account(GETPOST('account_parent'), 'account_parent', 1);
 	print '<input type="submit" class="button valignmiddle" value="' . $langs->trans("ChangeBinding") . '" /></div>';

 	$moreforfilter = '';
@@ -290,11 +262,7 @@ if ($result) {
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_lineid" value="' . dol_escape_htmltag($search_lineid) . '""></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_invoice" value="' . dol_escape_htmltag($search_invoice) . '"></td>';
 	print '<td class="liste_titre"></td>';
-	print '<td class="liste_titre center">';
-   	if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="search_day" value="'.$search_day.'">';
-   	print '<input class="flat" type="text" size="1" maxlength="2" name="search_month" value="'.$search_month.'">';
-   	$formother->select_year($search_year,'search_year',1, 20, 5);
-	print '</td>';
+	print '<td class="liste_titre"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_ref" value="' . dol_escape_htmltag($search_ref) . '"></td>';
 	//print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_label" value="' . dol_escape_htmltag($search_label) . '"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_desc" value="' . dol_escape_htmltag($search_desc) . '"></td>';
@@ -369,13 +337,13 @@ if ($result) {
 		print '</td>';

 		print '<td align="right">' . price($objp->total_ht) . '</td>';
-		print '<td align="right">' . vatrate($objp->tva_tx.($objp->vat_src_code?' ('.$objp->vat_src_code.')':'')) . '</td>';
-		print '<td align="center">';
-		print $codecompta . ' <a href="./card.php?id=' . $objp->rowid  . '&backtopage='.urlencode($_SERVER["PHP_SELF"].($param?'?'.$param:'')) . '">';
+		print '<td align="center">' . vatrate($objp->tva_tx.($objp->vat_src_code?' ('.$objp->vat_src_code.')':'')) . '</td>';
+		print '<td align="left">';
+		print $codecompta . ' <a href="./card.php?id=' . $objp->rowid . '">';
 		print img_edit();
 		print '</a></td>';
-		print '<td>' . $objp->country .'</td>';
-		print '<td>' . $objp->tva_intra . '</td>';
+		print '<td align="right">' . $objp->country .'</td>';
+		print '<td align="center">' . $objp->tva_intra . '</td>';
 		print '<td class="center"><input type="checkbox" class="checkforaction" name="changeaccount[]" value="' . $objp->rowid . '"/></td>';

 		print "</tr>";
@@ -390,7 +358,7 @@ if ($result) {

    print '</form>';
 } else {
-	print $db->lasterror();
+	print $db->error();
 }


--- a/htdocs/accountancy/supplier/list.php
+++ b/htdocs/accountancy/supplier/list.php
@@ -33,8 +33,6 @@ require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.product.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';

 // Langs
 $langs->load("compta");
@@ -62,10 +60,6 @@ $search_desc = GETPOST('search_desc', 'alpha');
 $search_amount = GETPOST('search_amount', 'alpha');
 $search_account = GETPOST('search_account', 'alpha');
 $search_vat = GETPOST('search_vat', 'alpha');
-$search_day=GETPOST("search_day","int");
-$search_month=GETPOST("search_month","int");
-$search_year=GETPOST("search_year","int");
-
 $btn_ventil = GETPOST('ventil', 'alpha');

 // Load variable for pagination
@@ -73,7 +67,7 @@ $limit = GETPOST('limit','int')?GETPOST('limit', 'int'):(empty($conf->global->AC
 $sortfield = GETPOST('sortfield', 'alpha');
 $sortorder = GETPOST('sortorder', 'alpha');
 $page = GETPOST('page','int');
-if (empty($page) || $page < 0) { $page = 0; }
+if ($page < 0) { $page = 0; }
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
@@ -100,15 +94,13 @@ $accounting = new AccountingAccount($db);
 $aarowid_s = $accounting->fetch('', $conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT, 1);
 $aarowid_p = $accounting->fetch('', $conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT, 1);

-$chartaccountcode = dol_getIdFromCode($db, $conf->global->CHARTOFACCOUNTS, 'accounting_system', 'rowid', 'pcg_version');
-

 /*
 * Action
 */

-if (GETPOST('cancel','alpha')) { $action='list'; $massaction=''; }
-if (! GETPOST('confirmmassaction','alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction=''; }
+if (GETPOST('cancel')) { $action='list'; $massaction=''; }
+if (! GETPOST('confirmmassaction') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction=''; }

 $parameters=array();
 $reshook=$hookmanager->executeHooks('doActions',$parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
@@ -119,40 +111,36 @@ if (empty($reshook))
 	// Purge search criteria
 	if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')) // All test are required to be compatible with all browsers
 	{
-		$search_lineid = '';
-		$search_ref = '';
-		$search_invoice = '';
-		$search_label = '';
-		$search_desc = '';
-		$search_amount = '';
-		$search_account = '';
-		$search_vat = '';
-		$search_day = '';
-		$search_month = '';
-		$search_year = '';
+	    $search_lineid = '';
+	    $search_ref = '';
+	    $search_invoice = '';
+	    $search_label = '';
+	    $search_desc = '';
+	    $search_amount = '';
+	    $search_account = '';
+	    $search_vat = '';
 	}

 	// Mass actions
-	$objectclass='AccountingAccount';
+		$objectclass='AccountingAccount';
 	$permtoread = $user->rights->accounting->read;
 	$permtodelete = $user->rights->accounting->delete;
 	$uploaddir = $conf->accounting->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }

-
 if ($massaction == 'ventil') {
    $msg='';
-
    //print '<div><font color="red">' . $langs->trans("Processing") . '...</font></div>';
    if (! empty($mesCasesCochees)) {
        $msg = '<div>' . $langs->trans("SelectedLines") . ': '.count($mesCasesCochees).'</div>';
        $msg.='<div class="detail">';
+        $mesCodesVentilChoisis = $codeventil;
        $cpt = 0;
        $ok=0;
        $ko=0;

-        foreach ($mesCasesCochees as $maLigneCochee) {
+        foreach ( $mesCasesCochees as $maLigneCochee ) {
            $maLigneCourante = explode("_", $maLigneCochee);
            $monId = $maLigneCourante[0];
            $monCompte = GETPOST('codeventil'.$monId);
@@ -197,21 +185,12 @@ if ($massaction == 'ventil') {
 */

 $form = new Form($db);
-$formother = new FormOther($db);

 llxHeader('', $langs->trans("SuppliersVentilation"));

-if (empty($chartaccountcode))
-{
-	print $langs->trans("ErrorChartOfAccountSystemNotSelected");
-	llxFooter();
-	$db->close();
-	exit;
-}
-
 // Supplier Invoice Lines
-$sql = "SELECT f.rowid as facid, f.ref, f.ref_supplier, f.libelle as invoice_label, f.datef, f.type as ftype,";
-$sql.= " l.rowid, l.fk_product, l.description, l.total_ht, l.fk_code_ventilation, l.product_type as type_l, l.tva_tx as tva_tx_line, l.vat_src_code,";
+$sql = "SELECT f.rowid as facid, f.ref, f.ref_supplier, f.libelle as invoice_label, f.datef,";
+$sql.= " l.rowid, l.fk_product, l.description, l.total_ht as price, l.fk_code_ventilation, l.product_type as type_l, l.tva_tx as tva_tx_line, l.vat_src_code,";
 $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, p.tva_tx as tva_tx_prod,";
 $sql.= " aa.rowid as aarowid";
 $parameters=array();
@@ -220,9 +199,12 @@ $sql.=$hookmanager->resPrint;
 $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 . "accounting_account as aa ON p.accountancy_code_buy = aa.account_number AND aa.fk_pcg_version = '" . $chartaccountcode."'";
+$sql.= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account 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 l.fk_code_ventilation <= 0";
-$sql.= " AND l.product_type <= 2";
+$sql.= " AND product_type <= 2";
+$sql.= " AND (accsys.rowid='" . $conf->global->CHARTOFACCOUNTS . "' OR p.accountancy_code_buy IS NULL OR p.accountancy_code_buy =''OR p.accountancy_code_buy  NOT IN
+	(SELECT aa.account_number FROM " . MAIN_DB_PREFIX . "accounting_account as aa , " . MAIN_DB_PREFIX . "accounting_system as asy  WHERE fk_pcg_version = asy.pcg_version AND asy.rowid ='" . $conf->global->CHARTOFACCOUNTS . "'))";
 // Add search filter like
 if ($search_lineid) {
    $sql .= natural_search("l.rowid", $search_lineid, 1);
@@ -248,24 +230,6 @@ if (strlen(trim($search_account))) {
 if (strlen(trim($search_vat))) {
    $sql .= natural_search("l.tva_tx",$search_vat,1);
 }
-if ($search_month > 0)
-{
-	if ($search_year > 0 && empty($search_day))
-		$sql.= " AND f.datef BETWEEN '".$db->idate(dol_get_first_day($search_year,$search_month,false))."' AND '".$db->idate(dol_get_last_day($search_year,$search_month,false))."'";
-		else if ($search_year > 0 && ! empty($search_day))
-			$sql.= " AND f.datef BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $search_month, $search_day, $search_year))."' AND '".$db->idate(dol_mktime(23, 59, 59, $search_month, $search_day, $search_year))."'";
-			else
-				$sql.= " AND date_format(f.datef, '%m') = '".$db->escape($search_month)."'";
-}
-else if ($search_year > 0)
-{
-	$sql.= " AND f.datef BETWEEN '".$db->idate(dol_get_first_day($search_year,1,false))."' AND '".$db->idate(dol_get_last_day($search_year,12,false))."'";
-}
-if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
-	$sql .= " AND f.type IN (" . FactureFournisseur::TYPE_STANDARD . "," . FactureFournisseur::TYPE_REPLACEMENT . "," . FactureFournisseur::TYPE_CREDIT_NOTE . "," . FactureFournisseur::TYPE_SITUATION . ")";
-} else {
-	$sql .= " AND f.type IN (" . FactureFournisseur::TYPE_STANDARD . "," . FactureFournisseur::TYPE_REPLACEMENT . "," . FactureFournisseur::TYPE_CREDIT_NOTE . "," . FactureFournisseur::TYPE_DEPOSIT . "," . FactureFournisseur::TYPE_SITUATION . ")";
-}
 $sql .= " AND f.entity IN (" . getEntity('facture_fourn', 0) . ")";  // We don't share object for accountancy

 // Add where from hooks
@@ -296,23 +260,14 @@ if ($result) {
 	$param='';
 	if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
 	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
-	if ($search_lineid)      $param.='&search_lineid='.urlencode($search_lineid);
-	if ($search_day)         $param.='&search_day='.urlencode($search_day);
-	if ($search_month)       $param.='&search_month='.urlencode($search_month);
-	if ($search_year)        $param.='&search_year='.urlencode($search_year);
-	if ($search_invoice)     $param.='&search_invoice='.urlencode($search_invoice);
-	if ($search_ref)         $param.='&search_ref='.urlencode($search_ref);
-	if ($search_desc)        $param.='&search_desc='.urlencode($search_desc);
-	if ($search_amount)      $param.='&search_amount='.urlencode($search_amount);
-	if ($search_vat)         $param.='&search_vat='.urlencode($search_vat);

 	$arrayofmassactions =  array(
 	    'ventil'=>$langs->trans("Ventilate")
 	    //'presend'=>$langs->trans("SendByMail"),
 	    //'builddoc'=>$langs->trans("PDFMerge"),
 	);
-	//if ($user->rights->mymodule->supprimer) $arrayofmassactions['predelete']=$langs->trans("Delete");
-	//if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
+	//if ($user->rights->mymodule->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
+	//if ($massaction == 'presend') $arrayofmassactions=array();
 	$massactionbutton=$form->selectMassAction('ventil', $arrayofmassactions, 1);

 	print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">' . "\n";
@@ -328,29 +283,20 @@ if ($result) {

 	print $langs->trans("DescVentilTodoCustomer") . '</br><br>';

-	/*$topicmail="Information";
-	 $modelmail="project";
-	 $objecttmp=new Project($db);
-	 $trackid='prj'.$object->id;
-	 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';*/
-
 	if ($msg) print $msg.'<br>';

 	$moreforfilter = '';

-	print '<div class="div-table-responsive">';
-	print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
+    print '<div class="div-table-responsive">';
+
+    print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";

 	// We add search filter
 	print '<tr class="liste_titre_filter">';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_lineid" value="' . dol_escape_htmltag($search_lineid) . '""></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_invoice" value="' . dol_escape_htmltag($search_invoice) . '"></td>';
 	print '<td class="liste_titre"></td>';
-	print '<td class="liste_titre center">';
-   	if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="search_day" value="'.$search_day.'">';
-   	print '<input class="flat" type="text" size="1" maxlength="2" name="search_month" value="'.$search_month.'">';
-   	$formother->select_year($search_year,'search_year',1, 20, 5);
-	print '</td>';
+	print '<td class="liste_titre"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_ref" value="' . dol_escape_htmltag($search_ref) . '"></td>';
 	//print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_label" value="' . dol_escape_htmltag($search_label) . '"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidthonsmartphone" name="search_desc" value="' . dol_escape_htmltag($search_desc) . '"></td>';
@@ -458,7 +404,7 @@ if ($result) {
 		print '</td>';

 		print '<td align="right">';
-		print price($objp->total_ht);
+		print price($objp->price);
 		print '</td>';

 		// Vat rate
@@ -480,15 +426,15 @@ if ($result) {

 		// Suggested accounting account
 		print '<td align="center">';
-		print $formaccounting->select_account($objp->aarowid_suggest, 'codeventil'.$objp->rowid, 1, array(), 0, 0, 'codeventil maxwidth300 maxwidthonsmartphone', 'cachewithshowemptyone');
+		print $formaccounting->select_account($objp->aarowid_suggest, 'codeventil'.$objp->rowid, 1, array(), 0, 0, 'maxwidth300 maxwidthonsmartphone', 'cachewithshowemptyone');
 		print '</td>';

-		// Column with checkbox
+		// Colonne choix ligne a ventiler
 		print '<td align="center">';
-		print '<input type="checkbox" class="flat checkforselect checkforselect'.$objp->rowid.'" name="toselect[]" value="' . $objp->rowid . "_" . $i . '"' . ($objp->aarowid ? "checked" : "") . '/>';
+		print '<input type="checkbox" class="flat checkforselect" name="toselect[]" value="' . $objp->rowid . "_" . $i . '"' . ($objp->aarowid ? "checked" : "") . '/>';
 		print '</td>';

-		print '</tr>';
+		print "</tr>";
 		$i ++;
 	}

@@ -500,17 +446,5 @@ if ($result) {
 	print $db->error();
 }

-// Add code to auto check the box when we select an account
-print '<script type="text/javascript" language="javascript">
-jQuery(document).ready(function() {
-	jQuery(".codeventil").change(function() {
-		var s=$(this).attr("id").replace("codeventil", "")
-		console.log(s+" "+$(this).val());
-		if ($(this).val() == -1) jQuery(".checkforselect"+s).prop("checked", false);
-		else jQuery(".checkforselect"+s).prop("checked", true);
-	});
-});
-</script>';
-
 llxFooter();
 $db->close();
--- a/htdocs/adherents/admin/adherent.php
+++ b/htdocs/adherents/admin/adherent.php
@@ -53,7 +53,7 @@ if ($action == 'updateall')
 {
    $db->begin();
    $res1=$res2=$res3=$res4=$res5=$res6=0;
-    $res1=dolibarr_set_const($db, 'ADHERENT_LOGIN_NOT_REQUIRED', GETPOST('ADHERENT_LOGIN_NOT_REQUIRED', 'alpha')?0:1, 'chaine', 0, '', $conf->entity);
+    $res1=dolibarr_set_const($db, 'ADHERENT_LOGIN_NOT_REQUIRED', GETPOST('ADHERENT_LOGIN_NOT_REQUIRED', 'alpha'), 'chaine', 0, '', $conf->entity);
    $res2=dolibarr_set_const($db, 'ADHERENT_MAIL_REQUIRED', GETPOST('ADHERENT_MAIL_REQUIRED', 'alpha'), 'chaine', 0, '', $conf->entity);
    $res3=dolibarr_set_const($db, 'ADHERENT_DEFAULT_SENDINFOBYMAIL', GETPOST('ADHERENT_DEFAULT_SENDINFOBYMAIL', 'alpha'), 'chaine', 0, '', $conf->entity);
    $res4=dolibarr_set_const($db, 'ADHERENT_BANK_USE', GETPOST('ADHERENT_BANK_USE', 'alpha'), 'chaine', 0, '', $conf->entity);
@@ -141,7 +141,7 @@ $help_url='EN:Module_Foundations|FR:Module_Adh&eacute;rents|ES:M&oacute;dulo_Mie
 llxHeader('',$langs->trans("MembersSetup"),$help_url);


-$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
+$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($langs->trans("MembersSetup"),$linkback,'title_setup');


@@ -162,7 +162,7 @@ print "</tr>\n";

 // Login/Pass required for members
 print '<tr class="oddeven"><td>'.$langs->trans("AdherentLoginRequired").'</td><td>';
-print $form->selectyesno('ADHERENT_LOGIN_NOT_REQUIRED', (! empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)?0:1), 1);
+print $form->selectyesno('ADHERENT_LOGIN_NOT_REQUIRED',(! empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)?0:1),1);
 print "</td></tr>\n";

 // Mail required for members
@@ -203,7 +203,7 @@ if ($conf->facture->enabled)
 		print '</td>';
 	}
 	print "</tr>\n";
-
+	
 	if (! empty($conf->product->enabled) || ! empty($conf->service->enabled))
 	{
 		print '<tr class="oddeven"><td>'.$langs->trans("ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS").'</td>';
@@ -240,9 +240,9 @@ $constantes=array(
 print load_fiche_titre($langs->trans("MembersCards"),'','');

 $helptext='*'.$langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
-$helptext.='__DOL_MAIN_URL_ROOT__, __ID__, __FIRSTNAME__, __LASTNAME__, __FULLNAME__, __LOGIN__, __PASSWORD__, ';
-$helptext.='__COMPANY__, __ADDRESS__, __ZIP__, __TOWN__, __COUNTRY__, __EMAIL__, __BIRTH__, __PHOTO__, __TYPE__, ';
-$helptext.='__YEAR__, __MONTH__, __DAY__';
+$helptext.='%DOL_MAIN_URL_ROOT%, %ID%, %FIRSTNAME%, %LASTNAME%, %FULLNAME%, %LOGIN%, %PASSWORD%, ';
+$helptext.='%COMPANY%, %ADDRESS%, %ZIP%, %TOWN%, %COUNTRY%, %EMAIL%, %BIRTH%, %PHOTO%, %TYPE%, ';
+$helptext.='%YEAR%, %MONTH%, %DAY%';

 form_constantes($constantes, 0, $helptext);

@@ -257,9 +257,43 @@ $constantes=array('ADHERENT_ETIQUETTE_TYPE','ADHERENT_ETIQUETTE_TEXT');
 print load_fiche_titre($langs->trans("MembersTickets"),'','');

 $helptext='*'.$langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
-$helptext.='__DOL_MAIN_URL_ROOT__, __ID__, __FIRSTNAME__, __LASTNAME__, __FULLNAME__, __LOGIN__, __PASSWORD__, ';
-$helptext.='__COMPANY__, __ADDRESS__, __ZIP__, __TOWN__, __COUNTRY__, __EMAIL__, __BIRTH__, __PHOTO__, __TYPE__, ';
-$helptext.='__YEAR__, __MONTH__, __DAY__';
+$helptext.='%DOL_MAIN_URL_ROOT%, %ID%, %FIRSTNAME%, %LASTNAME%, %FULLNAME%, %LOGIN%, %PASSWORD%, ';
+$helptext.='%COMPANY%, %ADDRESS%, %ZIP%, %TOWN%, %COUNTRY%, %EMAIL%, %BIRTH%, %PHOTO%, %TYPE%, ';
+$helptext.='%YEAR%, %MONTH%, %DAY%';
+
+form_constantes($constantes, 0, $helptext);
+
+print '<br>';
+
+
+/*
+ * Editing global variables not related to a specific theme
+ */
+$constantes=array(
+		'ADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT',
+		'ADHERENT_AUTOREGISTER_NOTIF_MAIL',
+		'ADHERENT_AUTOREGISTER_MAIL_SUBJECT',
+		'ADHERENT_AUTOREGISTER_MAIL',
+		'ADHERENT_MAIL_VALID_SUBJECT',
+		'ADHERENT_MAIL_VALID',
+		'ADHERENT_MAIL_COTIS_SUBJECT',
+		'ADHERENT_MAIL_COTIS',
+		'ADHERENT_MAIL_RESIL_SUBJECT',
+		'ADHERENT_MAIL_RESIL',
+		'ADHERENT_MAIL_FROM',
+		);
+
+print load_fiche_titre($langs->trans("Other"),'','');
+
+$helptext='*'.$langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
+$helptext.='%DOL_MAIN_URL_ROOT%, %ID%, %FIRSTNAME%, %LASTNAME%, %FULLNAME%, %LOGIN%, %PASSWORD%, ';
+$helptext.='%COMPANY%, %ADDRESS%, %ZIP%, %TOWN%, %COUNTRY%, %EMAIL%, %BIRTH%, %PHOTO%, %TYPE%, ';
+$helptext.='%YEAR%, %MONTH%, %DAY%';
+
+$helptext='*'.$langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
+$helptext.='%DOL_MAIN_URL_ROOT%, %ID%, %FIRSTNAME%, %LASTNAME%, %FULLNAME%, %LOGIN%, %PASSWORD%, ';
+$helptext.='%COMPANY%, %ADDRESS%, %ZIP%, %TOWN%, %COUNTRY%, %EMAIL%, %BIRTH%, %PHOTO%, %TYPE%, ';
+//$helptext.='%YEAR%, %MONTH%, %DAY%';	// Not supported

 form_constantes($constantes, 0, $helptext);

--- a/htdocs/adherents/admin/adherent_emails.php
+++ b/htdocs/adherents/admin/adherent_emails.php
@@ -1,190 +0,0 @@
-<?php
-/* Copyright (C) 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>
- * 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) 2011-2012 Juanjo Menent		<jmenent@2byte.es>
- * Copyright (C) 2012      J. Fernando Lagrange <fernando@demo-tic.org>
- * Copyright (C) 2015      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
- * 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.php
- *		\ingroup    member
- *		\brief      Page to setup the module Foundation
- */
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
-
-$langs->load("admin");
-$langs->load("members");
-
-if (! $user->admin) accessforbidden();
-
-
-$type=array('yesno','texte','chaine');
-
-$action = GETPOST('action','alpha');
-
-
-/*
- * Actions
- */
-
-//
-if ($action == 'updateall')
-{
-    $db->begin();
-    $res1=$res2=$res3=$res4=$res5=$res6=0;
-    $res1=dolibarr_set_const($db, 'ADHERENT_LOGIN_NOT_REQUIRED', GETPOST('ADHERENT_LOGIN_NOT_REQUIRED', 'alpha'), 'chaine', 0, '', $conf->entity);
-    $res2=dolibarr_set_const($db, 'ADHERENT_MAIL_REQUIRED', GETPOST('ADHERENT_MAIL_REQUIRED', 'alpha'), 'chaine', 0, '', $conf->entity);
-    $res3=dolibarr_set_const($db, 'ADHERENT_DEFAULT_SENDINFOBYMAIL', GETPOST('ADHERENT_DEFAULT_SENDINFOBYMAIL', 'alpha'), 'chaine', 0, '', $conf->entity);
-    $res4=dolibarr_set_const($db, 'ADHERENT_BANK_USE', GETPOST('ADHERENT_BANK_USE', 'alpha'), 'chaine', 0, '', $conf->entity);
-    // Use vat for invoice creation
-    if ($conf->facture->enabled)
-    {
-        $res4=dolibarr_set_const($db, 'ADHERENT_VAT_FOR_SUBSCRIPTIONS', GETPOST('ADHERENT_VAT_FOR_SUBSCRIPTIONS', 'alpha'), 'chaine', 0, '', $conf->entity);
-        $res5=dolibarr_set_const($db, 'ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS', GETPOST('ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS', 'alpha'), 'chaine', 0, '', $conf->entity);
-        if (! empty($conf->product->enabled) || ! empty($conf->service->enabled))
-        {
-            $res6=dolibarr_set_const($db, 'ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS', GETPOST('ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS', 'alpha'), 'chaine', 0, '', $conf->entity);
-        }
-    }
-    if ($res1 < 0 || $res2 < 0 || $res3 < 0 || $res4 < 0 || $res5 < 0 || $res6 < 0)
-    {
-        setEventMessages('ErrorFailedToSaveDate', null, 'errors');
-        $db->rollback();
-    }
-    else
-    {
-        setEventMessages('RecordModifiedSuccessfully', null, 'mesgs');
-        $db->commit();
-    }
-}
-
-// Action mise a jour ou ajout d'une constante
-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' || $constname=='ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS') && $constvalue == -1) $constvalue='';
-	if ($constname=='ADHERENT_LOGIN_NOT_REQUIRED') // Invert choice
-	{
-		if ($constvalue) $constvalue=0;
-		else $constvalue=1;
-	}
-
-	$consttype=GETPOST('consttype','alpha');
-	$constnote=GETPOST('constnote');
-	$res=dolibarr_set_const($db,$constname,$constvalue,$type[$consttype],0,$constnote,$conf->entity);
-
-	if (! $res > 0) $error++;
-
-	if (! $error)
-	{
-		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
-		setEventMessages($langs->trans("Error"), null, 'errors');
-	}
-}
-
-// Action activation d'un sous module du module adherent
-if ($action == 'set')
-{
-    $result=dolibarr_set_const($db, GETPOST('name','alpha'),GETPOST('value'),'',0,'',$conf->entity);
-    if ($result < 0)
-    {
-        print $db->error();
-    }
-}
-
-// Action desactivation d'un sous module du module adherent
-if ($action == 'unset')
-{
-    $result=dolibarr_del_const($db,GETPOST('name','alpha'),$conf->entity);
-    if ($result < 0)
-    {
-        print $db->error();
-    }
-}
-
-
-
-/*
- * View
- */
-
-$form = new Form($db);
-
-$help_url='EN:Module_Foundations|FR:Module_Adh&eacute;rents|ES:M&oacute;dulo_Miembros';
-
-llxHeader('',$langs->trans("MembersSetup"),$help_url);
-
-
-$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
-print load_fiche_titre($langs->trans("MembersSetup"),$linkback,'title_setup');
-
-
-$head = member_admin_prepare_head();
-
-dol_fiche_head($head, 'emails', $langs->trans("Members"), -1, 'user');
-
-print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<input type="hidden" name="action" value="updateall">';
-
-/*
- * Editing global variables not related to a specific theme
- */
-$constantes=array(
-		'ADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT',
-		'ADHERENT_AUTOREGISTER_NOTIF_MAIL',
-		'ADHERENT_AUTOREGISTER_MAIL_SUBJECT',
-		'ADHERENT_AUTOREGISTER_MAIL',
-		'ADHERENT_MAIL_VALID_SUBJECT',
-		'ADHERENT_MAIL_VALID',
-		'ADHERENT_MAIL_COTIS_SUBJECT',
-		'ADHERENT_MAIL_COTIS',
-		'ADHERENT_MAIL_RESIL_SUBJECT',
-		'ADHERENT_MAIL_RESIL',
-		'ADHERENT_MAIL_FROM',
-		);
-
-$helptext='*'.$langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
-$helptext.='__DOL_MAIN_URL_ROOT__, __ID__, __FIRSTNAME__, __LASTNAME__, __FULLNAME__, __LOGIN__, __PASSWORD__, ';
-$helptext.='__COMPANY__, __ADDRESS__, __ZIP__, __TOWN__, __COUNTRY__, __EMAIL__, __BIRTH__, __PHOTO__, __TYPE__, ';
-$helptext.='__YEAR__, __MONTH__, __DAY__';
-
-$helptext='*'.$langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
-$helptext.='__DOL_MAIN_URL_ROOT__, __ID__, __FIRSTNAME__, __LASTNAME__, __FULLNAME__, __LOGIN__, __PASSWORD__, ';
-$helptext.='__COMPANY__, __ADDRESS__, __ZIP__, __TOWN__, __COUNTRY__, __EMAIL__, __BIRTH__, __PHOTO__, __TYPE__, ';
-//$helptext.='__YEAR__, __MONTH__, __DAY__';	// Not supported
-
-form_constantes($constantes, 0, $helptext);
-
-dol_fiche_end();
-
-
-llxFooter();
-
-$db->close();
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Laurent Destailleur	2fdc1a9883	Merge pull request #9718 from frederic34/patch-9 define $code for all execution paths	2018-10-12 17:42:07 +02:00
Laurent Destailleur	817920f282	Prepare 6.0.8	2018-10-12 17:36:49 +02:00
Frédéric FRANCE	c3f07dd2e0	define $code for all execution paths	2018-10-09 19:28:52 +02:00
Laurent Destailleur	430f833222	Merge pull request #9626 from OPEN-DSI/fix_product_margin FIX Product margin tab and credit note	2018-10-09 16:57:08 +02:00
Laurent Destailleur	e165dce908	Merge pull request #9689 from ATM-Marc/FIX_6.0_facture_stats_situation FIX: invoice stats: situation invoices were not counted	2018-10-06 12:46:25 +02:00
Marc de Lima Lucio	82651cd920	FIX: invoice stats: situation invoices were not counted	2018-10-05 12:12:04 +02:00
Laurent Destailleur	9e397206d3	Merge pull request #9668 from atm-greg/Fix_pdf_generation fix error 500 on pdf_generation	2018-10-04 17:27:29 +02:00
atm-greg	583ea05567	fix missing letter...	2018-10-03 12:13:53 +02:00
Philippe	06fe172669	FIX Product marge tabs on product card Credit note are not negative so the grand total are false	2018-09-27 20:06:00 +02:00
Philippe	8deb2eaa0c	Merge branch '6.0' of https://github.com/Dolibarr/dolibarr into 6.0	2018-09-27 19:00:09 +02:00
Laurent Destailleur	4c8664b297	Merge pull request #9619 from ATM-Marc/FIX_6.0_extrafield_columns FIX: showOptionals: column mismatches	2018-09-27 09:39:51 +02:00
Laurent Destailleur	2d88b69cf6	Merge pull request #9616 from frederic34/patch-14 add try catch for swiftmailer	2018-09-27 09:34:21 +02:00
Laurent Destailleur	77341470e1	Merge pull request #9608 from frederic34/patch-10 comparaison of two boolean in rssparser.class.php	2018-09-27 09:23:24 +02:00
Marc de Lima Lucio	af93fc7484	FIX: showOptionals: column mismatches	2018-09-26 17:19:06 +02:00
Frédéric FRANCE	1bac3a0ccf	swiftmailer is doing encodetorfc2822	2018-09-26 10:37:20 +02:00
Frédéric FRANCE	92a3faeaf7	add try catch for swiftmailer	2018-09-26 10:13:14 +02:00
Frédéric FRANCE	d15c52db3b	Update rssparser.class.php	2018-09-25 08:16:05 +02:00
Laurent Destailleur	2dbb82fc76	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0	2018-09-24 10:03:21 +02:00
Laurent Destailleur	12690666e2	Missing trans	2018-09-24 10:03:08 +02:00
Laurent Destailleur	a0bc26a923	Merge pull request #9476 from atm-maxime/fix_invoicelist_creditnote Fix invoicelist creditnote	2018-09-21 09:56:43 +02:00
Laurent Destailleur	779d7e9689	Merge pull request #9568 from atm-gauthier/6.0_fix_langs_fr FIX : langs fr	2018-09-19 15:04:18 +02:00
gauthier	d62118dca8	FIX : langs fr	2018-09-19 14:53:56 +02:00
Laurent Destailleur	a6996169d6	Merge pull request #9565 from frederic34/multicpdf correct typo in multicurrency doc pdf #9562	2018-09-19 14:30:15 +02:00
Frédéric FRANCE	cdbb79a26c	correct typo in multicurrency doc pdf	2018-09-19 09:26:56 +02:00
Laurent Destailleur	5655856ca5	Merge pull request #9504 from atm-gauthier/6.0_fix_refsupplier FIX : wrong var name	2018-09-13 17:55:04 +02:00
gauthier	7838b75ec9	FIX : wrong var name	2018-09-13 16:11:42 +02:00
Maxime Kohlhaas	c94689e9a9	FIX remain to pay for credit note was wrong on invoice list	2018-09-12 11:53:57 +02:00
Laurent Destailleur	f7d5172a74	Merge pull request #9410 from frederic34/patch-10 Create index.html	2018-09-05 14:15:22 +02:00
Laurent Destailleur	ead2a764c7	Merge pull request #9409 from frederic34/patch-9 Create index.html	2018-09-05 14:15:12 +02:00
Frédéric FRANCE	2015268b7e	Create index.html	2018-09-04 22:06:24 +02:00
Frédéric FRANCE	e4afd4af00	Create index.html	2018-09-04 22:05:06 +02:00
Laurent Destailleur	847189805a	Merge pull request #9404 from ATM-Marc/FIX_6.0_pdf_address FIX: PDF address: handle when contact thirdparty different from document thirdparty	2018-09-04 09:57:07 +02:00
Laurent Destailleur	252335318f	Update pdf.lib.php	2018-09-04 09:57:01 +02:00
Marc de Lima Lucio	e285b42a18	FIX: PDF address: handle when contact thirdparty different from document thirdparty	2018-09-03 17:57:30 +02:00
Laurent Destailleur	e0b272941f	Fix mariadb	2018-09-02 15:25:27 +02:00
Laurent Destailleur	bd3647a9d7	Prepare phpunit 6.1 compatibility	2018-09-02 14:23:52 +02:00
Laurent Destailleur	b9c95a5a5c	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0	2018-09-02 14:19:43 +02:00
Laurent Destailleur	5bab9d59b2	Fix var_dump	2018-09-02 14:19:23 +02:00
Laurent Destailleur	df721a5fbc	Only min and max php version	2018-09-02 14:18:04 +02:00
Laurent Destailleur	37fb70d983	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0	2018-09-02 14:15:32 +02:00
Laurent Destailleur	02bedc49d3	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 Conflicts: test/phpunit/PricesTest.php test/phpunit/RestAPIUserTest.php test/phpunit/WebservicesInvoicesTest.php	2018-09-02 14:15:17 +02:00
Laurent Destailleur	e41b55af13	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0	2018-09-02 14:10:28 +02:00
Laurent Destailleur	a69c3caf2c	Prepare compatibility with phpunit 6.1	2018-09-02 14:10:06 +02:00
Laurent Destailleur	53caac13a9	Test phpunit	2018-09-02 13:57:51 +02:00
Laurent Destailleur	179feebd80	Merge pull request #9347 from atm-greg/fix_getLabelOfUnit remove useless db begin	2018-09-01 12:34:43 +02:00
atm-greg	f8fef61075	remove useless db begin	2018-08-30 09:19:44 +02:00
Laurent Destailleur	e317b0847a	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 Conflicts: README.md	2018-08-29 18:50:00 +02:00
Laurent Destailleur	7af083f1ec	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0	2018-08-29 18:49:08 +02:00
Laurent Destailleur	275b9a9960	Merge pull request #9325 from frederic34/patch-12 Fix allow barcode with special char	2018-08-29 18:01:15 +02:00
Laurent Destailleur	46a24ff28f	Merge pull request #9321 from atm-gauthier/6.0_fix_default_bank_on_create_propal FIX : $fk_account is always empty, must be $soc->fk_account	2018-08-29 17:56:36 +02:00
Laurent Destailleur	cb24fa0f08	Merge pull request #9310 from frederic34/patch-9 Build Badge for 6.0	2018-08-29 17:50:04 +02:00
Frédéric FRANCE	24be0b7305	Update viewimage.php code may have rich content (qrcode, datamatrix,...)	2018-08-29 13:08:52 +02:00
gauthier	61a57e619f	FIX : $fk_account is always empty, must be $soc->fk_account	2018-08-28 16:54:04 +02:00
Frédéric FRANCE	53e476483c	Build Badge for 6.0	2018-08-28 09:38:24 +02:00
Laurent Destailleur	b96082a577	Merge pull request #9274 from frederic34/patch-17 Build badge for 5.0	2018-08-28 01:38:06 +02:00
Frédéric FRANCE	b1a3238c94	Build badge for 5.0	2018-08-21 14:22:29 +02:00
Laurent Destailleur	009424cd67	Merge pull request #9226 from atm-greg/Fix_project_delete_tasks Fix project delete tasks	2018-08-21 13:11:00 +02:00
Laurent Destailleur	91bfa4be6c	Update project.class.php	2018-08-21 13:10:20 +02:00
Laurent Destailleur	3523c2b3d2	Update project.class.php	2018-08-21 13:09:06 +02:00
Laurent Destailleur	e03d7eba8c	Merge pull request #9254 from frederic34/patch-17 Build Badge by branch	2018-08-21 12:48:23 +02:00
Frédéric FRANCE	2aa0956f15	Update README.md	2018-08-16 16:08:04 +02:00
Frédéric FRANCE	bb09bcece4	Update README.md	2018-08-16 16:03:56 +02:00
Laurent Destailleur	e88b68f131	Merge pull request #9246 from atm-florian/6.0 fix : ODT project substitution	2018-08-16 00:33:04 +02:00
florian HENRY	20309665e6	fix : ODT project substitution	2018-08-14 10:45:08 +02:00
atm-greg	ba6f7d4b0a	fix infinite loop	2018-08-14 09:32:43 +02:00
Laurent Destailleur	61a5be6e2a	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0	2018-08-12 19:19:21 +02:00
Laurent Destailleur	b81b6b651f	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0	2018-08-12 19:17:26 +02:00
Laurent Destailleur	7f797668c9	Merge pull request #9186 from atm-florian/6.0 fix : odt project and task extrafields management	2018-08-12 18:15:02 +02:00
florian HENRY	06189f8153	Merge branch '6.0' into 6.0_fhe	2018-08-09 18:31:59 +02:00
atm-greg	3d84adbd76	fix recurcivity	2018-08-09 12:21:48 +02:00
atm-greg	4e16f64af0	Fix project::delete to delete children tasks before parent tasks	2018-08-09 12:13:06 +02:00
Laurent Destailleur	e85ec19018	Merge pull request #9093 from atm-gauthier/FIX_filters FIX : page must always be 0 when we search	2018-08-02 17:48:35 +02:00
Laurent Destailleur	b5a0e14ffe	Merge pull request #9185 from atm-john/fix_situation_total_calcul Important: fix situation line's total	2018-08-02 17:45:44 +02:00
Juanjo Menent	2cf51fbdf1	Merge pull request #9173 from frederic34/patch-22 fix #8820	2018-08-02 11:08:47 +02:00
florian HENRY	ceb85cfa45	fix : odt project and task extrafields management	2018-07-31 17:29:08 +02:00
John BOTELLA	4ddca02bb9	fix situation line's total	2018-07-31 14:58:33 +02:00
Frédéric FRANCE	7dada7ae8e	fix #8820	2018-07-29 09:15:42 +02:00
Laurent Destailleur	c7f54439ff	Merge pull request #9145 from frederic34/patch-12 use defaut currency for supplier order	2018-07-24 17:32:11 +02:00
Frédéric FRANCE	bde30b85ad	use defaut currency for supplier order	2018-07-24 17:06:12 +02:00
Laurent Destailleur	3bdf7d411d	Merge pull request #9125 from atm-john/fix_php7_warning_mysql Fix: Warning: Use of undefined constant MYSQL_NUM - assumed 'MYSQL_NU…	2018-07-24 16:56:10 +02:00
Laurent Destailleur	8866b8eb1d	Merge pull request #9133 from frederic34/patch-12 __NEXT_MONTH __PREVIOUS_MONTH give day instead month	2018-07-24 16:54:04 +02:00
Laurent Destailleur	e4705669ba	Merge pull request #9136 from frederic34/patch-17 remove % in supplier order pdf	2018-07-24 16:51:58 +02:00
Frédéric FRANCE	4341e367d2	remove % in supplier order pdf	2018-07-23 10:30:28 +02:00
Frédéric FRANCE	d582f72bd9	__NEXT_MONTH __PREVIOUS_MONTH give day instead month	2018-07-22 17:27:02 +02:00
John BOTELLA	1e986bc39a	Fix: Warning: Use of undefined constant MYSQL_NUM - assumed 'MYSQL_NUM' (this will throw an Error in a future version of PHP)	2018-07-20 11:51:01 +02:00
gauthier	80ff7fa86f	FIX : case when we valid form with keyboard	2018-07-11 15:18:30 +02:00
gauthier	103c7e6d06	FIX : page must always be 0 when we search (to avoid case : when we're on page 3 and we're looking for a precise thirdparty, we stay on page 3 and nothing's displaied)	2018-07-11 09:51:36 +02:00
Laurent Destailleur	97b1589fb5	Merge pull request #9082 from ATM-Marc/FIX_5.0_propal_projectFromOrigin FIX: propal: correctly preset project when creating with origin/originid	2018-07-10 10:42:10 +02:00
Marc de Lima Lucio	2ba7c07574	FIX: propal: correctly preset project when creating with origin/originid	2018-07-09 17:34:31 +02:00
Laurent Destailleur	2f668ccc79	Merge pull request #9076 from atm-john/fix_count_parameter_6.0 Fix count(): Parameter must be an array or an object that implements …	2018-07-09 17:34:10 +02:00
John BOTELLA	1daba56bbc	Fix count(): Parameter must be an array or an object that implements Countable	2018-07-09 10:05:53 +02:00
Laurent Destailleur	bc632c9ab7	Merge pull request #9019 from atm-gauthier/6.0_fix_getentity FIX : getEntity project and not projet	2018-06-30 01:15:23 +02:00
Laurent Destailleur	a6c6bbe16d	Merge pull request #9029 from hregis/6.0_multicompany Fix: broken feature with edit in place	2018-06-29 19:40:17 +02:00
Laurent Destailleur	3f2b3c0840	FIX #9032	2018-06-29 19:38:12 +02:00
Laurent Destailleur	1c7cd19c1d	Merge pull request #9033 from hregis/6.0_bug3 Fix: #9032 Vulnerability	2018-06-29 19:26:12 +02:00
Laurent Destailleur	c4143763be	Update step1.php	2018-06-29 19:23:17 +02:00
Regis Houssin	41709f07d0	Fix: #9032 Vulnerability	2018-06-29 18:18:10 +02:00
Regis Houssin	2d13b5b59d	Fix: broken feature with edit in place	2018-06-29 15:57:34 +02:00
gauthier	d8ca9f2947	FIX : we must see number of all shared projects	2018-06-27 17:26:04 +02:00
gauthier	86a58def3b	FIX : getEntity project and not projet	2018-06-27 17:13:50 +02:00
Laurent Destailleur	dab264c641	Merge pull request #8994 from hregis/6.0_multicompany Fix: to avoid deleting line breaks	2018-06-22 15:00:26 +02:00
Regis Houssin	8fc2f7441c	Fix: to avoid deleting line breaks	2018-06-20 09:06:16 +02:00
Laurent Destailleur	5d6d43d539	Merge pull request #8964 from atm-gauthier/6.0_accounting_entity FIX : need to filter on aa.entity for same accounting accounts available in several entities	2018-06-18 14:30:55 +02:00
gauthier	fed61930d5	FIX : clause must not be there	2018-06-18 11:37:15 +02:00
Laurent Destailleur	95dfa1f7aa	Merge pull request #8973 from altatof/FIX_HTML_DETECTION Fix <br/> detection	2018-06-18 10:42:02 +02:00
Laurent Destailleur	63fb82931c	Update functions.lib.php	2018-06-18 10:41:11 +02:00
altatof	5d6cd381b9	Fix <br/> detection	2018-06-15 15:59:14 +02:00
gauthier	e9d65ea751	FIX : need to filter on aa.entity for same accounting accounts available in several entities	2018-06-14 11:56:22 +02:00
Laurent Destailleur	09c92b7cc8	Merge pull request #8936 from atm-gauthier/6.0_fix_dont_remove_all_fourn_rights FIX : If we enable 3 steps for supplier order approbation, we must no…	2018-06-13 21:36:01 +02:00
Laurent Destailleur	c586f2ecf7	Merge pull request #8957 from altatof/FIX_TOTAL_HT_DEVISE FIX : pu_ht_devise was not converted to numeric so decimals were lost when calculating total_ht_devise	2018-06-13 21:20:42 +02:00
Laurent Destailleur	b5cd722eb1	Merge pull request #8917 from atm-gauthier/6.0_fix_apply_reduc FIX : sometimes amounts are identical but php find them different.	2018-06-13 20:34:59 +02:00
Laurent Destailleur	5fcfad5966	Merge pull request #8918 from atm-gauthier/6.0_fix_entity_select_prod_fourn_prices FIX : entity test must be on product_fourn_price table and not product table	2018-06-13 20:08:25 +02:00
altatof	d42f00bca9	FIX : pu_ht_devise was not converted to numeric so decimals were lost when clculating total_ht_devise	2018-06-13 16:35:52 +02:00
gauthier	baf9d4a806	FIX : If we enable 3 steps for supplier order approbation, we must not delete all fourn rights def.	2018-06-08 17:11:59 +02:00
Laurent Destailleur	426eb178f2	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0	2018-06-05 18:22:28 +02:00
Laurent Destailleur	8785d69548	Do not load database handler	2018-06-05 18:21:56 +02:00
Laurent Destailleur	4c21ad4e4e	FIX: dol_delete_file must work in a context without db handler loaded Conflicts: htdocs/core/lib/files.lib.php	2018-06-05 18:12:14 +02:00
gauthier	45ecb0258b	FIX : entity test must be on product_fourn_price table and not product table	2018-06-05 12:41:38 +02:00
gauthier	77e7932671	FIX : sometimes amounts are identical but php find them different.	2018-06-05 11:33:58 +02:00
Laurent Destailleur	7eaa2011ba	Merge pull request #8900 from atm-florian/6.0_fixagenda fix: when agenda is filterd with "todo" event, do not display "not applicable" event	2018-06-04 13:39:23 +02:00
florian HENRY	b996237142	fix: when agenda is filterd with "todo" event, do not display "not applicable" event	2018-05-30 13:37:17 +02:00
Laurent Destailleur	60321aabd8	Fix regression	2018-05-30 11:59:23 +02:00
Laurent Destailleur	7590df85e6	Merge pull request #8887 from atm-florian/6.0 add hook on balence pages	2018-05-30 10:47:59 +02:00
Laurent Destailleur	aa59c380ad	Merge pull request #8886 from ATM-Nicolas/fix_supplier_order FIX : Keep supplier proposal price for supplier order	2018-05-30 10:45:37 +02:00
Laurent Destailleur	e57ceab5de	Update fournisseur.commande.class.php	2018-05-30 10:45:06 +02:00
florian HENRY	b65b545e0f	add hook on balence pages	2018-05-29 16:29:14 +02:00
Laurent Destailleur	2e2cc55350	Backport fix of file checker generation	2018-05-29 12:15:28 +02:00
Laurent Destailleur	95e3c5a4b1	Backport fix of file list check generation	2018-05-29 12:13:58 +02:00
ATM-Nicolas	6b0b975ffd	FIX : Keep supplier proposal price for supplier order	2018-05-29 11:21:30 +02:00
Laurent Destailleur	1a1f0fbc62	Merge pull request #8839 from ATM-Nicolas/fix_shipping_fetch FIX : Fetch shipping will now fetch project id	2018-05-25 11:46:06 +02:00
Laurent Destailleur	131ddd6984	Merge pull request #8827 from ATM-Marc/FIX_shipment_fk_project FIX: shipment: fk_proje(c)t not handled in fetch() and update() methods	2018-05-25 11:12:39 +02:00
Laurent Destailleur	b25c7e44d3	Merge pull request #8816 from atm-gauthier/6.0_fix_test_before_delete_invoice FIX : test is_erasable() must be done before call function delete()	2018-05-25 11:05:20 +02:00
Laurent Destailleur	0a581e48d4	Update card.php	2018-05-25 11:04:04 +02:00
Laurent Destailleur	545133960e	Merge pull request #8849 from atm-quentin/FIX_missing_filters_during_ordering FIX missing filters during reordering	2018-05-25 10:15:20 +02:00
atm-quentin	eb224e43a5	FIX missing filters during ordering	2018-05-24 10:41:24 +02:00
ATM-Nicolas	734ecbc9b5	FIX : Fetch shipping will now fetch project id	2018-05-23 09:47:29 +02:00
Laurent Destailleur	be21405d21	Fix missing error message	2018-05-22 19:24:56 +02:00
Marc de Lima Lucio	c9222adf6d	FIX: shipment: fk_proje(c)t not handled in fetch() and update() methods	2018-05-21 16:22:06 +02:00
Philippe	4d72573484	Merge branch '6.0' of https://github.com/Dolibarr/dolibarr into 6.0	2018-05-21 14:44:22 +02:00
gauthier	4c3f9d6d5e	FIX : test is_erasable() must be done before call function delete() too to avoid delete invoice with &action=delete in url	2018-05-18 15:20:16 +02:00
Laurent Destailleur	7de812d2ed	Merge pull request #8793 from atm-john/Fix_situation_discount_used Fix creating next situation invoice if a discount was allready apply	2018-05-18 12:18:58 +02:00
Laurent Destailleur	5f8346f854	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0	2018-05-18 11:48:30 +02:00
Laurent Destailleur	492b1e7169	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0	2018-05-18 11:48:08 +02:00
Laurent Destailleur	f2cfb928e8	Merge pull request #8809 from simnandez/5.0 Fix: extrafiels is not passing orders to invoice	2018-05-18 11:47:27 +02:00
Laurent Destailleur	2e9f5d1c94	Merge pull request #8798 from atm-florian/6.0 fix SQL and add hook	2018-05-18 11:18:10 +02:00
John	3dd11e1eaf	Fix discount id	2018-05-18 11:02:04 +02:00
Juanjo Menent	dd259043cd	Fix: Cashdesk does not apply multi-price or price per customer	2018-05-18 09:20:18 +02:00
Juanjo Menent	dc7a1610e7	Fix: extrafiels is not passing orders to invoice	2018-05-17 18:56:01 +02:00
florian HENRY	630e38072b	fix SQL and add hook	2018-05-15 17:02:54 +02:00
John	b42c87256c	Fix_situation_discount_used	2018-05-14 14:55:33 +02:00
Laurent Destailleur	842c6168a2	FIX #8762	2018-05-10 11:50:35 +02:00
Laurent Destailleur	20c50e809d	Start 6.0.8	2018-05-06 10:43:40 +02:00
Philippe	cbf12b779d	Merge branch '6.0' of https://github.com/Dolibarr/dolibarr into 6.0	2018-02-21 12:50:23 +01:00
Philippe	7406d3c7ee	Merge branch '6.0' of https://github.com/Dolibarr/dolibarr into 6.0	2018-01-11 15:32:52 +01:00
Philippe	bcbbcc1c66	Merge branch '6.0' of https://github.com/Dolibarr/dolibarr into 6.0	2018-01-11 09:13:46 +01:00
Philippe	e66847d5c3	Merge branch '6.0' of https://github.com/Dolibarr/dolibarr into 6.0	2018-01-05 14:47:04 +01:00
Philippe	dd8ef47a25	Merge branch '6.0' of https://github.com/Dolibarr/dolibarr into 6.0	2017-12-18 15:37:46 +01:00
Philippe	2f2b0630e2	Merge branch '6.0' of https://github.com/Dolibarr/dolibarr into 6.0	2017-11-23 21:52:11 +01:00
Philippe	26e3593c98	Merge branch '6.0' of https://github.com/Dolibarr/dolibarr into 6.0	2017-10-25 14:15:59 +02:00
Philippe	c88f5c560c	Merge branch '6.0' of https://github.com/Dolibarr/dolibarr into 6.0	2017-09-06 15:30:45 +02:00
Philippe	04466651d6	Merge branch '6.0' of https://github.com/Dolibarr/dolibarr into 6.0	2017-07-27 14:28:28 +02:00
				`@@ -1 +0,0 @@`
				`http://ec.europa.eu/eurostat/ramon/nomenclatures/index.cfm?TargetUrl=LST_CLS_DLD&StrNom=NACE_REV2&StrLanguageCode=FR&StrLayoutCode=#`