Prepare 5.0.7

Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-10-29 10:38:57 +01:00 · 2017-10-28 22:03:23 +02:00 · 2017-10-28 22:03:06 +02:00 · 2017-10-28 22:02:13 +02:00 · 2017-10-28 22:01:30 +02:00 · 2017-10-27 13:27:38 +02:00
2125 changed files with 75608 additions and 127478 deletions
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -6,7 +6,7 @@ Bug reports and feature requests

 <a name="not-a-support-forum"></a>*Note*: Issues are not a support forum. If you need help using the software, please use [the forums](http://www.dolibarr.org/forum).

-Issues are managed on [GitHub](https://github.com/Dolibarr/dolibarr/issues).
+Issues are managed on [GitHub](https://github.com/Dolibarr/dolibarr/Issues).

 1. Please [use the search engine](https://help.github.com/articles/searching-issues) to check if nobody's already reported your problem.
 2. [Create an issue](https://help.github.com/articles/creating-an-issue). Choose an appropriate title. Prepend appropriately with Bug or Feature Request.
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,7 @@
 # from Dolibarr GitHub repository.
 # For syntax, see http://about.travis-ci.org/docs/user/languages/php/

+dist: precise
 sudo: required

 language: php
@@ -10,7 +11,7 @@ php:
 - '5.3'
 - '5.4'
 - '5.5'
- '5.6'
+- '5.6.29'
 - '7.0'
 - '7.1'
 - nightly
@@ -292,9 +293,6 @@ script:
  php upgrade.php 4.0.0 5.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade400500.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 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
  cd -
  set +e
  echo
--- a/.tx/config
+++ b/.tx/config
@@ -224,18 +224,6 @@ source_file = htdocs/langs/en_US/members.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES

-[dolibarr.modulebuilder]
-file_filter = htdocs/langs/<lang>/modulebuilder.lang
-source_file = htdocs/langs/en_US/modulebuilder.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.multicurrency]
-file_filter = htdocs/langs/<lang>/multicurrency.lang
-source_file = htdocs/langs/en_US/multicurrency.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
 [dolibarr.oauth]
 file_filter = htdocs/langs/<lang>/oauth.lang
 source_file = htdocs/langs/en_US/oauth.lang
@@ -338,12 +326,6 @@ source_file = htdocs/langs/en_US/stocks.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES

-[dolibarr.stripe]
-file_filter = htdocs/langs/<lang>/stripe.lang
-source_file = htdocs/langs/en_US/stripe.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
 [dolibarr.suppliers]
 file_filter = htdocs/langs/<lang>/suppliers.lang
 source_file = htdocs/langs/en_US/suppliers.lang
@@ -368,18 +350,18 @@ source_file = htdocs/langs/en_US/users.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES

-[dolibarr.website]
-file_filter = htdocs/langs/<lang>/website.lang
-source_file = htdocs/langs/en_US/website.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
 [dolibarr.withdrawals]
 file_filter = htdocs/langs/<lang>/withdrawals.lang
 source_file = htdocs/langs/en_US/withdrawals.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES

+[dolibarr.website]
+file_filter = htdocs/langs/<lang>/website.lang
+source_file = htdocs/langs/en_US/website.lang
+source_lang = en_US
+type = MOZILLAPROPERTIES
+
 [dolibarr.workflow]
 file_filter = htdocs/langs/<lang>/workflow.lang
 source_file = htdocs/langs/en_US/workflow.lang
--- a/148
+++ b/148
@@ -14,24 +14,23 @@ Component              Version       License                     GPL Compatible
 PHP libraries:
 AdoDb-Date             0.36          Modified BSD License        Yes             Date convertion (not into rpm package)
 ChromePHP              4.1.0         Apache Software License 2.0 Yes             Return server log to chrome browser console
-CKEditor               4.6.2         LGPL-2.1+                   Yes             Editor WYSIWYG
+CKEditor               4.5.8         LGPL-2.1+                   Yes             Editor WYSIWYG
 EvalMath               1.0           BSD                         Yes             Safe math expressions evaluation
 Escpos-php                           MIT License                 Yes             Thermal receipt printer library, for use with ESC/POS compatible printers
+FPDI                   1.5.2         Apache Software License 2.0 Yes             PDF templates management
 GeoIP                  1.4           LGPL-2.1+                   Yes             Sample code to make geoip convert (not into deb package)
 Mobiledetect           2.8.17        MIT License                 Yes             Detect mobile devices browsers
 NuSoap                 0.9.5         LGPL 2.1+                   Yes             Library to develop SOAP Web services (not into rpm and deb package)
 PEAR Mail_MIME         1.8.9         BSD                         Yes             NuSoap dependency
-odtPHP                 1.0.1         GPL-2+                      Yes             Library to build/edit ODT files
-ParseDown              1.6           MIT License                 Yes             Markdown parser
+odtPHP                 1.0.1         GPL-2+  b                   Yes             Library to build/edit ODT files
 PHPExcel               1.8.1         LGPL-2.1+                   Yes             Read/Write XLS files, read ODS files
 php-iban               1.4.7         LGPL-3+                     Yes             Parse and validate IBAN (and IIBAN) bank account information in PHP
 PHPoAuthLib            0.8.2         MIT License                 Yes             Library to provide oauth1 and oauth2 to different service
 PHPPrintIPP            1.3           GPL-2+                      Yes             Library to send print IPP requests
-Restler                3.0.0RC6      LGPL-3+                     Yes             Library to develop REST Web services (+ swagger-ui js lib into dir explorer)
+Restler                3.0.0RC6      LGPL-3+                     Yes             Library to develop REST Web services
 TCPDF                  6.2.12        LGPL-3+                     Yes             PDF generation
 TCPDI                  1.0.0         LGPL-3+ / Apache 2.0        Yes             FPDI replacement
 Swift Mailer           5.4.2-DEV     MIT license                 Yes             Comprehensive mailing tools for PHP
-Stripe                 4.7.0         MIT licence                 Yes             Library for Stripe module

 JS libraries:
 jQuery                 1.11.3        MIT License                 Yes             JS library
@@ -45,20 +44,147 @@ jQuery JCrop           0.9.8         GPL and MIT License         Yes
 jQuery Jeditable       1.7.1         GPL and MIT License         Yes             JS library plugin jeditable (to edit in place)
 jQuery jNotify         1.1.00        Apache Software License 2.0 Yes             JS library plugin jNotify (to use ajax popups)
 jQuery jPicker         1.1.6         GPL and MIT License         Yes             JS library for color picker with not defined list of colors
-jQuery jqueryFileTree  1.0.1         GPL and MIT License         Yes             JS library for filetree
-jQuery jquerytreeview  1.4.1         MIT License                 Yes             JS library for filetree
+jQuery jqueryFileTree  1.0.1         GPL and MIT License         Yes             JS library for color picker with not defined list of colors
+jQuery jquerytreeview  1.4.1         MIT License                 Yes             JS library for color picker with not defined list of colors
+jQuery Layout          1.4.3         GPL and MIT License         Yes             JS library plugin Layout
+jQuery Mobile          1.3.0         GPL and MIT License         Yes             JS library for smartphone (not used)
 jQuery TableDnD        0.6           GPL and MIT License         Yes             JS library plugin TableDnD (to reorder table rows)
 jQuery Timepicker      1.1.0         GPL and MIT License         Yes             JS library Timepicker addon for Datepicker
 jQuery Tiptip          1.3           GPL and MIT License         Yes             JS library for tooltips
 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

 For licenses compatibility informations:
 http://www.gnu.org/licenses/licenses.en.html


-Copyright / Authors
-------------------
+Copyright
+---------
+
+Copyright (C) 2016
+
+Copyright (C) 2015
+- Laurent Destailleur <eldy@users.sourceforge.net>
+- Marcos García <marcosgdf@gmail.com>
+- Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
+- Frederic France <frederic.france@free.fr>
+- Regis Houssin <regis.houssin@capnetworks.com>
+
+Copyright (C) 2014
+- Laurent Destailleur <eldy@users.sourceforge.net>
+- Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
+- Jean-François Ferry <jfefe@aternatik.fr>
+- Marcos García <marcosgdf@gmail.com>
+- Philippe Grand <philippe.grand@atoo-net.com>
+- Florian Henry <florian.henry@open-concept.pro>
+- Regis Houssin <regis.houssin@capnetworks.com>
+- Maxime Kohlhaas <mko@atm-consulting.fr>
+- Juanjo Menent <jmenent@2byte.es>
+- Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
+- Frederic France <frederic.france@free.fr>
+
+Copyright (C) 2013
+- Christophe Battarel <christophe.battarel@altairis.fr>
+- Laurent Destailleur <eldy@users.sourceforge.net>
+- Jean-François Ferry <jfefe@aternatik.fr>
+- Marcos García <marcosgdf@gmail.com>
+- Philippe Grand <philippe.grand@atoo-net.com>
+- Florian Henry <florian.henry@open-concept.pro>
+- Regis Houssin <regis.houssin@capnetworks.com>
+- Maxime Kohlhaas <mko@atm-consulting.fr>
+- Juanjo Menent <jmenent@2byte.es>
+- Adolfo Segura <adolfo.segura@gmail.com>
+- Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
+
+Copyright (C) 2012
+- Christophe Battarel <christophe.battarel@altairis.fr>
+- Laurent Destailleur <eldy@users.sourceforge.net>
+- Jean-François Ferry <jfefe@aternatik.fr>
+- Marcos García <marcosgdf@gmail.com>
+- Philippe Grand <philippe.grand@atoo-net.com>
+- Jean Heimburger <jean@tiaris.info>
+- Florian Henry <florian.henry@open-concept.pro>
+- Regis Houssin <regis.houssin@capnetworks.com>
+- Maxime Kohlhaas <mko@atm-consulting.fr>
+- Juanjo Menent <jmenent@2byte.es>
+- Nicolas Péré <nicolas@amarok2.net>
+- Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
+
+Copyright (C) 2011
+- Laurent Destailleur <eldy@users.sourceforge.net>
+- Regis Houssin <regis.houssin@capnetworks.com>
+- Juanjo Menent <jmenent@2byte.es>
+- Philippe Grand <philippe.grand@atoo-net.com>
+- Jean Heimburger <jean@tiaris.info>
+
+Copyright (C) 2010
+- Laurent Destailleur <eldy@users.sourceforge.net>
+- Regis Houssin <regis.houssin@capnetworks.com>
+- Juanjo Menent <jmenent@2byte.es>
+- r2gnl
+- meos
+
+Copyright (C) 2009
+- Laurent Destailleur <eldy@users.sourceforge.net>
+- Regis Houssin <regis.houssin@capnetworks.com>
+- Juanjo Menent <jmenent@2byte.es>
+
+Copyright (C) 2008
+- Laurent Destailleur <eldy@users.sourceforge.net>
+- Regis Houssin <regis.houssin@capnetworks.com>
+- Rodolphe Quiedeville <rodolphe@quiedeville.org>
+- Jeremie Ollivier <jeremie.o@laposte.net>
+
+Copyright (C) 2007
+- Rodolphe Quiedeville <rodolphe@quiedeville.org>
+- Laurent Destailleur <eldy@users.sourceforge.net>
+- Regis Houssin <regis.houssin@capnetworks.com>
+- Auguria SARL <info@auguria.org>
+- Jean Heimburger <jean@tiaris.info>
+- Jeremie Ollivier <jeremie.o@laposte.net>
+
+Copyright (C) 2006
+- Auguria SARL <info@auguria.org>
+- Marc Barilley/Ocebo <marc@ocebo.com>
+- Laurent Destailleur <eldy@users.sourceforge.net>
+- Rodolphe Quiedeville <rodolphe@quiedeville.org>
+- Regis Houssin <regis.houssin@capnetworks.com>
+- Andre Cianfarani <acianfa@free.fr>
+- Yannick Warnier <ywarnier@beeznest.org>
+- Jean Heimburger <jean@tiaris.info>
+
+Copyright (C) 2005
+- Brice Davoleau <brice.davoleau@gmail.com>
+- Laurent Destailleur <eldy@users.sourceforge.net>
+- Benoit Mortier <benoit.mortier@opensides.be>
+- Rodolphe Quiedeville <rodolphe@quiedeville.org>
+- Eric Seigne <erics@rycks.com>
+- Matthieu Valleton <mv@seeschloss.org>
+- Regis Houssin <regis.houssin@capnetworks.com>
+
+Copyright (C) 2004
+- Laurent Destailleur <eldy@users.sourceforge.net>
+- Rodolphe Quiedeville <rodolphe@quiedeville.org>
+- Eric Seigne <erics@rycks.com>
+- Benoit Mortier <benoit.mortier@opensides.be>
+- Christophe Combelles <ccomb@free.fr>
+- Sebastien Di Cintio <sdicintio@ressource-toi.org>
+
+Copyright (C) 2003
+- Jean-Louis Bergamo <jlb@j1b.org>
+- Xavier Dutoit <doli@sydesy.com>
+- Rodolphe Quiedeville <rodolphe@quiedeville.org>
+- Emmanuel Raviart <eraviart@entrouvert.com>
+- Eric Seigne <erics@rycks.com>
+
+Copyright (C) 2002
+- Jean-Louis Bergamo <jlb@j1b.org>
+- Rodolphe Quiedeville <rodolphe@quiedeville.org>
+
+Copyright (C) 2001
+- Rodolphe Quiedeville <rodolphe@quiedeville.org>
+
+
+
+

-See page https://github.com/Dolibarr/dolibarr/graphs/contributors
--- a/95
+++ b/95
@@ -2,31 +2,80 @@
 English Dolibarr ChangeLog
 --------------------------------------------------------------

-***** ChangeLog for 6.0.0 compared to 5.0.* *****
+***** ChangeLog for 5.0.7 compared to 5.0.6 *****
+FIX: #7000 Dashboard link for late pending payment supplier invoices do not work
+FIX: #7148
+FIX: #7325 Default VAT rate when editing template invoices is 0%
+FIX: #7366 renaming table with pgsql
+FIX: #7391
+FIX: #7510 Bug: extrafield content disappear when generate pdf within intervention
+FIX: Agenda events are not exported in the ICAL, VCAL if begin exactly with the same $datestart
+FIX: Bad link to unpayed suppliers invoices
+FIX: bankentries search conciliated if val 0
+FIX: multicompany better accuracy in rounding and with revenue stamp.
+FIX: PDF output was sharing 2 different currencies in same total
+FIX: Upgrade missing on field
+FIX: wrong key in selectarray
+FIX: wrong personnal project time spent

-For developers:
-NEW: Add a lot of API REST: dictionaryevents, memberstypes, ...
-NEW: Big refactorization of multicompany transverse mode.
-NEW: getEntity function use true $shared value by default.
+***** ChangeLog for 5.0.6 compared to 5.0.5 *****
+FIX: Removed a bad symbolic link into custom directory.
+FIX: Renaming a resouce ref rename also the directory of attached files.

-WARNING: 
+***** ChangeLog for 5.0.5 compared to 5.0.4 *****
+FIX: #7075 : bad path for document
+FIX: #7156
+FIX: #7173
+FIX: #7224
+FIX: #7226
+FIX: #7239
+FIX: add supplierproposaldet without price (new product)
+FIX: amount overlap other amount when a pagebreak is done due to an image at the bottom of page.
+FIX: Bad tax calculation with expense report
+FIX: Best buy price calculation
+FIX: Buying prices must always be in positive value.
+FIX: calculate correct remain to pay for planned bank transactions
+FIX: delete linked element on facture rec
+FIX: edit sociale was emptying label
+FIX: Error when updating thirdparty not returned
+FIX: holidays with postgresql like on rowid integer
+FIX: id of user not saved when making a payment of expense report
+FIX: invoice page list
+FIX: invoice situation VAT total rounding into PDF crabe
+FIX: PgSQL compatibility.
+FIX: remove order rights on invoice page
+FIX: status were wrong on product referent list
+FIX: supplier id was not passed to hooks
+FIX: Support of vat code when using price per customer
+FIX: User id correction on holiday request
+FIX: value of user id filled to 0 in llx_bank_url when recording an expense report.
+FIX: we have to check if contact doesn't already exist on add_contact() function
+FIX: We should be able to insert data with value '0' into const
+FIX: install process with DoliWamp

-Following changes may create regression for some external modules, but were necessary to make Dolibarr better:
-* The hook getNodeList has been replaced by a normalized 'addreplace' hook getDirList.
-* The trigger USER_SETINGROUP and USER_REMOVEFROMGROUP has been replaced with trigger USER_MODIFY.
-* The page societe/soc.php was renamed into societe/card.php to match page naming conventions.
-* The page compta/facture.php was renamed into compta/facture/card.php to match page naming conventions.
-* The signature of method ->delete() of class Product and PriceExpression was changed from 
-  ->delete(id, notrigger) to ->delete(User, notrigger) to match standard dev rules.
-* The signature of method ->delete() of class Adherent was changed from 
-  ->delete(id) to ->delete(id, User, notrigger) to match standard dev rules.
-* Removed CommonObject::displayMarginInfos (was deprecated in 3.8). Use same method into
-  html.formmargin.class.php
-* Removed Societe::set_commnucation_level (was deprecated in 4.0). Was not used.
-* Removed the trigger file of PAYPAL module that stored data that was not used by Dolibarr. The trigger event still
-  exists, but if an external module need action on it, it must provides itself its trigger file.
-* Use $conf->global->MULTICOMPANY_TRANSVERSE_MODE instead $conf->multicompany->transverse_mode
-* Use getEntity('xxx') instead getEntity('xxx', 1) and use getEntity('xxx', 0) instead getEntity('xxx')
+***** ChangeLog for 5.0.4 compared to 5.0.3 *****
+FIX: #5640 Prices of a predefined product/service were incorrect under certain circumstances
+FIX: #6541 since 4.0.4 to 5.0.0 autofill zip/town not working
+FIX: #6880 #6925
+FIX: #6885
+FIX: #6926
+FIX: #7003
+FIX: #7012
+FIX: #7040
+FIX: #7048 #6075
+FIX: Can set supplier invoice to billed.
+FIX: Can't create invoice if PO disapproved
+FIX: contratligne update
+FIX: CVE-2017-7886
+FIX: default param
+FIX: Line of invoices not inserted when using POS module and VAT NPR.
+FIX: origin & originid on supplierproposal
+FIX: Redirect to payment page from member subscription page failed if a unique security key was defined.
+FIX: REST api to get project when user has permission to read all.
+FIX: situation_progress param default value must be 100 and not 0
+FIX: SQL injection on user/index.php parameter search_statut.
+FIX: vat code not saved during product creation.
+FIX: Warnings

 ***** ChangeLog for 5.0.3 compared to 5.0.2 *****
 FIX: #6677 Expired contracts dashboard box does not show the name of the thirdparty
@@ -508,7 +557,7 @@ NEW: Disabled users are striked.
 NEW: Enhance navigation of project module
 NEW: fichinter lines ordered by rang AND DATE
 NEW: hidden conf to use input file multiple from mail form
-NEW: hidden feature: SUPPLIERORDER_WITH_NOPRICEDEFINED allow supplier order even if no supplier price defined
+NEW: hidden feature: SUPPLIER_ORDER_WITH_NOPRICEDEFINED allow supplier order even if no supplier price defined
 NEW: Hidden option MAIN_LANDING_PAGE to choose the first page to show after login works as a "global" option (llx_const) and as a "per user" option (llx_user_param).
 NEW: Holiday is a now a RH module. All RH module provides by default visilibity on users of its hierarchy.
 NEW: If error is reported during migration process, you can ignore it to avoid to be locked.
--- a/README.md
+++ b/README.md
@@ -26,16 +26,6 @@ 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:
-
-curl -sS https://getcomposer.org/installer | php
-mv composer.phar /usr/local/bin/composer
-
-On Windows, you'll download and run https://getcomposer.org/Composer-Setup.exe
-
-composer create-project dolibarr/dolibarr erp
-
 ### Simple setup

 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:
--- a/build/debian/README.howto
+++ b/build/debian/README.howto
@@ -152,7 +152,7 @@ tag 729538 -moreinfo



-##### Testing a package into a chroot environment
+##### Testing a package into unstable env

 Check you have a mysql server available from another interface than "localhost".
 Set line in /etc/mysql/my.cnf if required and restart mysql
@@ -160,11 +160,9 @@ Set line in /etc/mysql/my.cnf if required and restart mysql
 [mysqld]
 bind-address           = *

-Create a chroot called "jessie" or "unstable".
+Create a chroot called "unstable-amd64-sbuild".
 Chroot env is stored into /srv/chroot directory.
 > sudo sbuild-createchroot --keyring=unstable /srv/chroot/unstable http://ftp.uk.debian.org/debian
-or
-> sudo sbuild-createchroot jessie /srv/chroot/jessie http://ftp.uk.debian.org/debian

 Pour lister les env chroot
 > schroot -l
@@ -172,9 +170,8 @@ or
 > ls /srv/chroot

 Puis pour se connecter et préparer l'environnement 
-> schroot -c name_of_chroot  (exemple schroot -c unstable-amd64-sbuild)
+> schroot -c name_of_chroot
 > cat /etc/debian_chroot       to check which debian branch we are into
-> apt-get install vi dialog
 > vi /usr/sbin/policy-rc.d     and replace return code 101 (not allowed) into 0 (ok)
 > apt-get update
 > apt-get upgrade
@@ -323,8 +320,8 @@ x.y.z+dfsgw
 Note: If there was errors solved manually after get-orig-sources.sh, you may need to make a git commit

 * Update/fix debian/* files used to build package.
-At least, add an entry into debian/changelog with command
-> dch -v x.y.z+dfsgw-1 "My comment"
+At least, add an entry into debian/changelog
+> dch -v x.y.z+dfsgw-v "My comment" will add entry.
 For example: dch -v x.y.z+dfsgw-1 "New upstream release." for a new version (x.y.z = version, w start from 1 and increased for each new import)
 Then check/modify changelog to replace "version" or "unstable" with "UNRELEASED".
 Then check/modify also the user/date signature:
@@ -335,27 +332,23 @@ Then check/modify also the user/date signature:
 To update dolibarr debian package when only files into debian has changed:

 * Change files and commit.
-* Add a line into changelog for version debian/x.y.z+dfsgw-v (increase the last v into 2, 3...)
-> dch -v x.y.z+dfsgw-v "My comment"
-* git tag will be added when package is pushed.
+* Add a tag debian/x.y.z+dfsgw-2 (increase the last 1 into 2, 3...)


 To update dolibarr debian package when only files not into debian has changed:

-* Checkout the branch you want to work on: master of debian/...  
-* Manually, add patches into debian/patches and update the file debian/series, or do the 2 steps with "quilt import filepatch.patch"
+* Manually, add patches into debian/patches and update file debian/series, or do the 2 steps with "quilt import filepatch.patch"
 * You can test patching of serie with "quilt push" (autant de fois que de patch). Avec "quilt pop -a", on revient a l'état du upstream sans les patch.
-* Update the debian/changelog to add entry of change.

 Once files has been prepared, it's time to test:

 * Try to build package
 > rm -fr ../build-area;
-> git-buildpackage -us -uc --git-debian-branch=[master|jessie] --git-upstream-branch=[upstream|upstream-jessie|upstream-3.5.x|3.5.5]
+> git-buildpackage -us -uc --git-debian-branch=[master|jessie] --git-upstream-branch=[upstream|upstream-3.5.x|3.5.5]
 ou
-> git-buildpackage -us -uc --git-ignore-branch --git-upstream-branch=[upstream|upstream-jessie|upstream-3.5.x|3.5.5]
+> git-buildpackage -us -uc --git-ignore-branch --git-upstream-branch=[upstream|upstream-3.5.x|3.5.5]

-Note: To build an old version, do: git checkout oldtagname -b newbranchname; git-buildpackage -us -uc --git-debian-branch=newbranchname --git-upstream-branch=[upstream|upstream-jessie|upstream-3.5.x|3.5.5]
+Note: To build an old version, do: git checkout oldtagname -b newbranchname; git-buildpackage -us -uc --git-debian-branch=newbranchname --git-upstream-branch=[upstream|upstream-3.5.x]
 Note: You can use git-buildpackage -us -uc --git-ignore-new  if you want to test build with uncommited file
 Note: You can use git-buildpackage -us -uc -d                if you want to test build when dependencies does not match 
 Note: Package is built into directory ../build-area
@@ -388,14 +381,13 @@ http://packages.qa.debian.org
 * Package will be into release when test will be moved as stable.


-
-##### Send an unblock request to make a full update of a stable package 
+##### Send an unblock request 

 Use this to move from unstable to testing.

 reportbug -B debian --smtphost=smtp.gmail.com:587 --smtpuser=xxxx --smtppasswd=yyyy --tls
 Choose package "release.debian.org"
-Then usertag "unblock"
+Then "unblock"
 Then name of package "dolibarr"
 Fill message, for example:
 "Please unblock package dolibarr
@@ -405,11 +397,11 @@ so it is a better solution to validate this maintenance release than applying a
 After discussion with ..., it appears that security holes are enough to request this unblock request."


-Use this to request an full update of a stable package
+Use this to request an update of a stable package

 reportbug -B debian --smtphost=smtp.gmail.com:587 --smtpuser=xxxx --smtppasswd=yyyy --tls
 Choose package "release.debian.org"
-Then usertag "unblock"
+Then "unblock"
 Then name of package "dolibarr"
 Fill message, for example:
 "
@@ -421,27 +413,11 @@ Pro are:
 - It fixes also stability bugs
 - Patches were already tested because deployed and used by several thousands of users.
 - It is easier for package maintener to include this official set of fixes than applying one patch after one patch for each debian report or backported each patch into a dedicated version.
- Debian maintenance version is inline with official project maintenance version (better when all fixes are not related to the way the software is packaged)
+- Debian maintenance version matches with official project maintenance version (better when all fixes are not related to the way the software is packaged)
 Cons are: 
- The patch include more than the only one security reported fixes
+- The patch include more than the only one security reported fxes

 So I just need to know if it's ok to push such a version 3.5.7 (fixes for 3.5.* branch) instead of only one fix for only the few (the only) reported debian bugs,
 since it provides more stability and is for me a more secured process.
 "

-##### Send an request to ask a simple fix of a stable package 
-
-Use this to ask to apply patches on a stable version.
-
-reportbug -B debian --smtphost=smtp.gmail.com:587 --smtpuser=xxxx --smtppasswd=yyyy --tls
-Choose package "release.debian.org"
-Then usertag "jessie-pu" (if tags is not available in list, choose another one, and change it later into email content text)
-Then name of package "dolibarr"
-Fill message, for example:
-"Please unblock package dolibarr
-A security error CVE-2015-3935 was reported and is fixed into package 3.5.7.
-Note that package 3.5.7 contains not only fixed for bugs reported to debian. It includes other fixes, but they are all related to stability or security,
-so it is a better solution to validate this maintenance release than applying a patch of the only CVE-2015-3935. 
-After discussion with ..., it appears that security holes are enough to request this unblock request."
-
-Note: If there is a response to ask more information, don't forget to remove the tag during answer.
--- a/build/exe/doliwamp/doliwamp.iss
+++ b/build/exe/doliwamp/doliwamp.iss
@@ -353,10 +353,12 @@ begin
    begin
      // TODO Copy file or ask to install package ?
      //CustomMessage('YouWillInstallDoliWamp')+#13#13
-      MsgBox('The package vcredist_x86.exe must have been installed first. It seems it is not. Please install it first from <a href="http://ccc">http://www.microsoft.com/en-us/download/details.aspx?id=30679</a> then restart DoliWamp installation/upgrade.',mbInformation,MB_OK);
+      MsgBox('The package vcredist_x86.exe must have been installed first. It seems it is not. Please install it first from <a href="http://www.microsoft.com/en-us/download/details.aspx?id=30679">http://www.microsoft.com/en-us/download/details.aspx?id=30679</a> then restart 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
    // and change only all basedir= strings to use new version. Like this, data dir is still correct.
    // Install of service and stop/start scripts are already rebuild by installer.
--- a/build/exe/doliwamp/install.forced.php.install
+++ b/build/exe/doliwamp/install.forced.php.install
@@ -5,7 +5,7 @@
 // during install process to be used.
 //
 //
-$force_install_noedit=2;
+$force_install_noedit=2;		// 1=To block vars specific to distrib, 2 to block all technical parameters
 $force_install_message='KeepDefaultValuesWamp';
 $force_install_main_data_root='WAMPROOT/dolibarr_documents';
 $force_install_type='mysqli';
--- a/build/generate_filelist_xml.php
+++ b/build/generate_filelist_xml.php
@@ -1,6 +1,6 @@
 #!/usr/bin/env php
 <?php
-/* Copyright (C) 2015-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2015 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
@@ -40,117 +40,55 @@ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 * Main
 */

-$includecustom=0;
-$includeconstants=array();
-
 if (empty($argv[1]))
 {
-    print "Usage:   ".$script_file." release=x.y.z[-...] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
-    print "Example: ".$script_file." release=6.0.0 includecustom=1 includeconstant=FR:INVOICE_CAN_ALWAYS_BE_REMOVED:0 includeconstant=all:MAILING_NO_USING_PHPMAIL:1\n";
+    print "Usage: ".$script_file." release=x.y.z\n";
    exit -1;
 }
-$i=0;
-while ($i < $argc)
-{
-    if (! empty($argv[$i])) parse_str($argv[$i]);
-    if (preg_match('/includeconstant=/',$argv[$i]))
-    {
-        $tmp=explode(':', $includeconstant, 3);
-        if (count($tmp) != 3)
-        {
-            print "Error: Bad parameter includeconstant ".$includeconstant."\n";
-            exit -1;
-        }
-        $includeconstants[$tmp[0]][$tmp[1]] = $tmp[2];
-    }
-    $i++;
-}
+parse_str($argv[1]);

-if (empty($includecustom))
+if ($release != DOL_VERSION)
 {
-    if (DOL_VERSION != $release)
-    {
-        print 'Error: When parameter "includecustom" is not set, version declared into filefunc.in.php ('.DOL_VERSION.') must be exact same value than "release" parameter ('.$release.')'."\n";
-        print "Usage: ".$script_file." release=x.y.z[-...] [includecustom=1]\n";
-        exit -1;
-    }
+    print 'Error: release is not version declared into filefunc.in.php.'."\n";
+    exit -1;
 }
-else
-{
-    if (! preg_match('/'.preg_quote(DOL_VERSION,'/').'-/',$release))
-    {
-        print 'Error: When parameter "includecustom" is set, version declared into filefunc.inc.php ('.DOL_VERSION.') must be used with a suffix into "release" parmater (ex: '.DOL_VERSION.'-mydistrib).'."\n";
-        print "Usage: ".$script_file." release=x.y.z[-...] [includecustom=1]\n";
-        exit -1;
-    }
-}
-
-print "Release                        : ".$release."\n";
-print "Include custom in signature    : ".$includecustom."\n";
-print "Include constants in signature : ";
-foreach ($includeconstants as $countrycode => $tmp)
-{
-    foreach($tmp as $constname => $constvalue)
-    {
-        print $constname.'='.$constvalue." ";
-    }
-}
-print "\n";

 //$outputfile=dirname(__FILE__).'/../htdocs/install/filelist-'.$release.'.xml';
-$outputdir=dirname(__FILE__).'/../htdocs/install';
-print 'Delete current files '.$outputdir.'/filelist-'.$release.'.xml'."\n";
-dol_delete_file($outputdir.'/filelist-'.$release.'.xml',0,1,1);
-
-$checksumconcat=array();
+$outputdir=dirname(dirname(__FILE__)).'/htdocs/install';
+print 'Delete current files '.$outputdir.'/filelist*.xml'."\n";
+dol_delete_file($outputdir.'/filelist*.xml',0,1,1);

 $outputfile=$outputdir.'/filelist-'.$release.'.xml';
 $fp = fopen($outputfile,'w');
 fputs($fp, '<?xml version="1.0" encoding="UTF-8" ?>'."\n");
-fputs($fp, '<checksum_list version="'.$release.'" date="'.dol_print_date(dol_now(), 'dayhourrfc').'" generator="'.$script_file.'">'."\n");
+fputs($fp, '<checksum_list version="'.$release.'">'."\n");

-foreach ($includeconstants as $countrycode => $tmp)
-{
-    fputs($fp, '<dolibarr_constants country="'.$countrycode.'">'."\n");
-    foreach($tmp as $constname => $constvalue)
-    {
-        $valueforchecksum=(empty($constvalue)?'0':$constvalue);
-        $checksumconcat[]=$valueforchecksum;
-        fputs($fp, '    <constant name="'.$constname.'">'.$valueforchecksum.'</constant>'."\n");
-    }
-    fputs($fp, '</dolibarr_constants>'."\n");
-}
+fputs($fp, '<dolibarr_htdocs_dir>'."\n");

-fputs($fp, '<dolibarr_htdocs_dir includecustom="'.$includecustom.'">'."\n");
+$checksumconcat=array();

-/*$dir_iterator1 = new RecursiveDirectoryIterator(dirname(__FILE__).'/../htdocs/');
+$dir_iterator1 = new RecursiveDirectoryIterator(dirname(__FILE__).'/../htdocs/');
 $iterator1 = new RecursiveIteratorIterator($dir_iterator1);
-// Need to ignore document custom etc. Note: this also ignore natively symbolic links.
-$files = new RegexIterator($iterator1, '#^(?:[A-Z]:)?(?:/(?!(?:'.($includecustom?'':'custom\/|').'documents\/|conf\/|install\/))[^/]+)+/[^/]+\.(?:php|css|html|js|json|tpl|jpg|png|gif|sql|lang)$#i');
-*/
-$regextoinclude='\.(php|css|html|js|json|tpl|jpg|png|gif|sql|lang)$';
-$regextoexclude='('.($includecustom?'':'custom|').'documents|conf|install)$';  // Exclude dirs
-$files = dol_dir_list(DOL_DOCUMENT_ROOT, 'files', 1, $regextoinclude, $regextoexclude, 'fullname');
+// need to ignore document custom etc
+$files = new RegexIterator($iterator1, '#^(?:[A-Z]:)?(?:/(?!(?:custom|documents|conf|install|nltechno))[^/]+)+/[^/]+\.(?:php|css|html|js|json|tpl|jpg|png|gif|sql|lang)$#i');
 $dir='';
 $needtoclose=0;
-foreach ($files as $filetmp) {
-	$file = $filetmp['fullname'];
-	//$newdir = str_replace(dirname(__FILE__).'/../htdocs', '', dirname($file));
-	$newdir = str_replace(DOL_DOCUMENT_ROOT, '', dirname($file));
-	if ($newdir!=$dir) {
+foreach ($files as $file) {
+    $newdir = str_replace(dirname(__FILE__).'/../htdocs', '', dirname($file));
+    if ($newdir!=$dir) {
        if ($needtoclose)
-            fputs($fp, '  </dir>'."\n");
-        fputs($fp, '  <dir name="'.$newdir.'" >'."\n");
+            fputs($fp, '</dir>'."\n");
+        fputs($fp, '<dir name="'.$newdir.'" >'."\n");
        $dir = $newdir;
        $needtoclose=1;
    }
    if (filetype($file)=="file") {
        $md5=md5_file($file);
        $checksumconcat[]=$md5;
-        fputs($fp, '    <md5file name="'.basename($file).'">'.$md5.'</md5file>'."\n");
+        fputs($fp, '<md5file name="'.basename($file).'">'.$md5.'</md5file>'."\n");
    }
 }
-fputs($fp, '  </dir>'."\n");
+fputs($fp, '</dir>'."\n");
 fputs($fp, '</dolibarr_htdocs_dir>'."\n");

 asort($checksumconcat); // Sort list of checksum
@@ -164,36 +102,28 @@ $checksumconcat=array();

 fputs($fp, '<dolibarr_script_dir version="'.$release.'">'."\n");

-// TODO Replace RecursiveDirectoryIterator with dol_dir_list
-/*$dir_iterator2 = new RecursiveDirectoryIterator(dirname(__FILE__).'/../scripts/');
+$dir_iterator2 = new RecursiveDirectoryIterator(dirname(__FILE__).'/../scripts/');
 $iterator2 = new RecursiveIteratorIterator($dir_iterator2);
-// Need to ignore document custom etc. Note: this also ignore natively symbolic links.
-$files = new RegexIterator($iterator2, '#^(?:[A-Z]:)?(?:/(?!(?:custom|documents|conf|install))[^/]+)+/[^/]+\.(?:php|css|html|js|json|tpl|jpg|png|gif|sql|lang)$#i');
-*/
-$regextoinclude='\.(php|css|html|js|json|tpl|jpg|png|gif|sql|lang)$';
-$regextoexclude='(custom|documents|conf|install)$';  // Exclude dirs
-$files = dol_dir_list(dirname(__FILE__).'/../scripts/', 'files', 1, $regextoinclude, $regextoexclude, 'fullname');
+// need to ignore document custom etc
+$files = new RegexIterator($iterator2, '#^(?:[A-Z]:)?(?:/(?!(?:custom|documents|conf|install|nltechno))[^/]+)+/[^/]+\.(?:php|css|html|js|json|tpl|jpg|png|gif|sql|lang)$#i');
 $dir='';
 $needtoclose=0;
-foreach ($files as $filetmp) {
-	$file = $filetmp['fullname'];
-	//$newdir = str_replace(dirname(__FILE__).'/../scripts', '', dirname($file));
-	$newdir = str_replace(DOL_DOCUMENT_ROOT, '', dirname($file));
-	$newdir = str_replace(dirname(__FILE__).'/../scripts', '', dirname($file));
+foreach ($files as $file) {
+    $newdir = str_replace(dirname(__FILE__).'/../scripts', '', dirname($file));
    if ($newdir!=$dir) {
        if ($needtoclose)
-            fputs($fp, '  </dir>'."\n");
-        fputs($fp, '  <dir name="'.$newdir.'" >'."\n");
+            fputs($fp, '</dir>'."\n");
+        fputs($fp, '<dir name="'.$newdir.'" >'."\n");
        $dir = $newdir;
        $needtoclose=1;
    }
    if (filetype($file)=="file") {
        $md5=md5_file($file);
        $checksumconcat[]=$md5;
-        fputs($fp, '    <md5file name="'.basename($file).'">'.$md5.'</md5file>'."\n");
+        fputs($fp, '<md5file name="'.basename($file).'">'.$md5.'</md5file>'."\n");
    }
 }
-fputs($fp, '  </dir>'."\n");
+fputs($fp, '</dir>'."\n");
 fputs($fp, '</dolibarr_script_dir>'."\n");

 asort($checksumconcat); // Sort list of checksum
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -334,7 +334,7 @@ foreach my $target (sort keys %CHOOSEDTARGET) {
 }
 foreach my $target (sort keys %CHOOSEDPUBLISH) {
 	if ($CHOOSEDPUBLISH{$target} < 0) { next; }
-	if ($target eq 'ASSO') { $nbofpublishneedchangelog++; $nbofpublishneedtag++; }
+	if ($target eq 'ASSO') { $nbofpublishneedchangelog++; }
 	if ($target eq 'SF') { $nbofpublishneedchangelog++; $nbofpublishneedtag++; }
 	$nboftargetok++;
 }
@@ -548,6 +548,8 @@ if ($nboftargetok) {
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/themes/oblyon*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/themes/allscreen*`;
 		# Removed other test files
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/themes/eldy/*.new`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/public/api/explorer`;				# This is a dev tool
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/public/test`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/test`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/Thumbs.db $BUILDROOT/$PROJECT/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/*/Thumbs.db`;
@@ -561,6 +563,8 @@ if ($nboftargetok) {
        $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
   	    
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/datatables/extensions/TableTools/swf`;	# Source of this flash is not available
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/datatables/extras/TableTools/swf`;	    # Source of this flash is not available
        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/multiselect/MIT-LICENSE.txt`;
        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/select2/release.sh`;
        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/mike42/escpos-php/doc`;
@@ -579,19 +583,20 @@ if ($nboftargetok) {
        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/license.md`;
        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-*`;
        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/freefont-*`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/ae_fonts_*`;
        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils`;
        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/LICENSE.TXT`;
        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-*`;
        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/fonts/freefont-*`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/fonts/ae_fonts_*`;
        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/fonts/utils`;
        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/tools`;
        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/LICENSE.TXT`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/savant`;
        
        print "Remove subdir of custom dir\n";
   	    print "find $BUILDROOT/$PROJECT/htdocs/custom/* -type d -exec rm -fr {} \\;\n";
-   	    $ret=`find $BUILDROOT/$PROJECT/htdocs/custom/* -type d -exec rm -fr {} \\; >/dev/null 2>&1`;	# For custom we want to remove all subdirs but not files
+   	    $ret=`find $BUILDROOT/$PROJECT/htdocs/custom/* -type d -exec rm -fr {} \\; >/dev/null 2>&1`;	# For custom we want to keep files only
+   	    print "find $BUILDROOT/$PROJECT/htdocs/custom/* -type l -exec rm -fr {} \\;\n";
+   	    $ret=`find $BUILDROOT/$PROJECT/htdocs/custom/* -type l -exec rm -fr {} \\; >/dev/null 2>&1`;	# For custom we want to keep files only
 	}

 	# Build package for each target
@@ -910,6 +915,9 @@ 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`;
 			
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-2.34/LICENSE`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/tecnickcom/tcpdf/fonts/freefont-20120503/COPYING`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/tecnickcom/tcpdf/fonts/ae_fonts_2.0/COPYING`;
 			# Removed files we don't need
 			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/ckeditor/_source`;
 			
@@ -972,12 +980,13 @@ if ($nboftargetok) {
 			$ret=`$cmd`;
 			$ret=`chmod 755 $BUILDROOT/$PROJECT.tmp/debian/rules`;
 			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/translation/autotranslator.class.php`;
-			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/htdocs/modulebuilder/template/class/myobject.class.php`;
-			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/htdocs/modulebuilder/template/class/myobject_api_class.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/myobject_card.php`;
-			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/htdocs/modulebuilder/template/myobject_list.php`;
-			$ret=`chmod -R 755 $BUILDROOT/$PROJECT.tmp/htdocs/modulebuilder/template/scripts/myobject.php`;
+			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/modMyModule.class.php`;
+			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_api_class.class.php`;
+			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_card.php`;
+			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_class.class.php`;
+			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_list.php`;
+			$ret=`chmod -R 755 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_script.php`;
+			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_webservice_server.php`;
 			$cmd="find $BUILDROOT/$PROJECT.tmp/scripts -name '*.php' -type f -exec chmod 755 {} \\; ";
 			$ret=`$cmd`;
 			$cmd="find $BUILDROOT/$PROJECT.tmp/scripts -name '*.sh' -type f -exec chmod 755 {} \\; ";
--- a/build/pad/pad_dolibarr.xml
+++ b/build/pad/pad_dolibarr.xml
@@ -7,20 +7,20 @@
 	</MASTER_PAD_VERSION_INFO>
 	<Company_Info>
 		<Company_Name>Dolibarr team</Company_Name>
-		<Address_1>20 rue camponac</Address_1>
+		<Address_1>11 rue raymond Queneau</Address_1>
 		<Address_2 />
-		<City_Town>Pessac</City_Town>
+		<City_Town>Rueil Malmaison</City_Town>
 		<State_Province />
-		<Zip_Postal_Code>33600</Zip_Postal_Code>
+		<Zip_Postal_Code>92500</Zip_Postal_Code>
 		<Country>FRANCE</Country>
-		<Company_WebSite_URL>https://www.dolibarr.org</Company_WebSite_URL>
+		<Company_WebSite_URL>http://www.dolibarr.org</Company_WebSite_URL>
 		<Contact_Info>
 			<Author_First_Name>Dolibarr team</Author_First_Name>
 			<Author_Last_Name>Dolibarr team</Author_Last_Name>
-			<Author_Email>contact@dolibarr.org</Author_Email>
+			<Author_Email>dolibarr-dev@nongnu.org</Author_Email>
 			<Contact_First_Name>Dolibarr team</Contact_First_Name>
 			<Contact_Last_Name>Dolibarr team</Contact_Last_Name>
-			<Contact_Email>contact@dolibarr.org</Contact_Email>
+			<Contact_Email>dolibarr-dev@nongnu.org</Contact_Email>
 		</Contact_Info>
 		<Support_Info>
 			<Sales_Email>dolibarr-dev@nongnu.org</Sales_Email>
@@ -34,10 +34,10 @@
 	</Company_Info>
 	<Program_Info>
 		<Program_Name>Dolibarr</Program_Name>
-		<Program_Version>5.0</Program_Version>
-		<Program_Release_Month>02</Program_Release_Month>
+		<Program_Version>3.5</Program_Version>
+		<Program_Release_Month>01</Program_Release_Month>
 		<Program_Release_Day>01</Program_Release_Day>
-		<Program_Release_Year>2017</Program_Release_Year>
+		<Program_Release_Year>2014</Program_Release_Year>
 		<Program_Cost_Dollars />
 		<Program_Cost_Other_Code />
 		<Program_Cost_Other />
@@ -71,8 +71,8 @@
 			<Char_Desc_45>Dolibarr ERP &amp; CRM</Char_Desc_45>
 			<Char_Desc_80>Dolibarr ERP &amp; CRM, the easy to use open source software to manage your activity</Char_Desc_80>
 			<Char_Desc_250>Dolibarr ERP &amp; CRM, the easy to use open source software to manage your activity (invoices, customers, suppliers, contracts, agenda, emailings...) and any other things a small or mid-sized business or a foundation needs to manage.</Char_Desc_250>
-			<Char_Desc_450>Dolibarr ERP &amp; CRM is a software package built by modules addition (you enable only features you need), to manage small or medium companies, freelancers or foundations. We can say Dolibarr is an ERP or CRM. Dolibarr is also available with an auto-installer for Windows users with no technical knowledge to install Dolibarr and all its prerequisites (Apache, Mysql, PHP) with just one auto-exe file. See DoliWamp software for this.</Char_Desc_450>
-			<Char_Desc_2000>Dolibarr ERP &amp; CRM is a software package built by modules addition (you enable only features you need), to manage small or mid-sized businesses, freelancers or foundations. We can say Dolibarr is an ERP or CRM (or both depending on activated modules). It's an OpenSource project base on a WAMP, MAMP or LAMP server (Apache, Mysql, PHP for all Operating Systems). Dolibarr differs from other ERP or CRM softwares (like OpenAguila, OpenBravo, Odoo, Neogia, Compiere, etc) because everything was made to be more simple:
+			<Char_Desc_450>Dolibarr ERP &amp; CRM is a software built by modules addition (you enable only features you need), to manage small or medium companies, freelancers or foundations. We can say Dolibarr is an ERP or CRM. Dolibarr is also available with an auto-installer for Windows users with no technical knowledge to install Dolibarr and all its prerequisites (Apache, Mysql, PHP) with just one auto-exe file. See DoliWamp software for this.</Char_Desc_450>
+			<Char_Desc_2000>Dolibarr ERP &amp; CRM is a software built by modules addition (you enable only features you need), to manage small or mid-sized businesses, freelancers or foundations. We can say Dolibarr is an ERP or CRM (or both depending on activated modules). It's an OpenSource project base on a WAMP, MAMP or LAMP server (Apache, Mysql, PHP for all Operating Systems). Dolibarr differs from other ERP or CRM softwares (like OpenAguila, OpenBravo, OpenERP, Neogia, Compiere, etc) because everything was made to be more simple:
 Simple to install
 Simple to use
 Simple to develop 
@@ -101,14 +101,14 @@ Dolibarr intègre en effet sa propre architecture (design patterns) permettant
 	</Program_Descriptions>
 	<Web_Info>
 		<Application_URLs>
-			<Application_Info_URL>https://www.dolibarr.org</Application_Info_URL>
-			<Application_Order_URL>https://www.dolibarr.org</Application_Order_URL>
-			<Application_Screenshot_URL>https://www.dolibarr.org/images/dolibarr_screenshot1.png</Application_Screenshot_URL>
-			<Application_Icon_URL>https://www.dolibarr.org/images/dolibarr.gif</Application_Icon_URL>
-			<Application_XML_File_URL>https://www.dolibarr.org/files/pad_dolibarr.xml</Application_XML_File_URL>
+			<Application_Info_URL>http://www.dolibarr.org</Application_Info_URL>
+			<Application_Order_URL>http://www.dolibarr.org</Application_Order_URL>
+			<Application_Screenshot_URL>http://www.dolibarr.org/images/dolibarr_screenshot1.png</Application_Screenshot_URL>
+			<Application_Icon_URL>http://www.dolibarr.org/images/dolibarr.gif</Application_Icon_URL>
+			<Application_XML_File_URL>http://www.dolibarr.org/files/pad_dolibarr.xml</Application_XML_File_URL>
 		</Application_URLs>
 		<Download_URLs>
-			<Primary_Download_URL>https://www.dolibarr.org/files/dolibarr.tgz</Primary_Download_URL>
+			<Primary_Download_URL>http://www.dolibarr.org/files/dolibarr.tgz</Primary_Download_URL>
 			<Secondary_Download_URL>http://www.dolibarr.org/files/dolibarr.tgz</Secondary_Download_URL>
 			<Additional_Download_URL_1 />
 			<Additional_Download_URL_2 />
--- a/build/pad/pad_dolibarr_nos.xml
+++ b/build/pad/pad_dolibarr_nos.xml
@@ -1,232 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<XML_DIZ_INFO>
-	<MASTER_PAD_VERSION_INFO>
-		<MASTER_PAD_VERSION>3.11</MASTER_PAD_VERSION>
-		<MASTER_PAD_EDITOR>PADGen 3.1.1.47 http://www.padgen.org</MASTER_PAD_EDITOR>
-		<MASTER_PAD_INFO>Portable Application Description, or PAD for short, is a data set that is used by shareware authors to disseminate information to anyone interested in their software products. To find out more go to http://pad.asp-software.org</MASTER_PAD_INFO>
-	</MASTER_PAD_VERSION_INFO>
-	<Company_Info>
-		<Company_Name>Dolibarr team</Company_Name>
-		<Address_1>20 rue camponac</Address_1>
-		<Address_2 />
-		<City_Town>Pessac</City_Town>
-		<State_Province />
-		<Zip_Postal_Code>33600</Zip_Postal_Code>
-		<Country>FRANCE</Country>
-		<Company_WebSite_URL>https://www.dolibarr.org</Company_WebSite_URL>
-		<Contact_Info>
-			<Author_First_Name>Dolibarr team</Author_First_Name>
-			<Author_Last_Name>Dolibarr team</Author_Last_Name>
-			<Author_Email>contact@dolibarr.org</Author_Email>
-			<Contact_First_Name>Dolibarr team</Contact_First_Name>
-			<Contact_Last_Name>Dolibarr team</Contact_Last_Name>
-			<Contact_Email>contact@dolibarr.org</Contact_Email>
-		</Contact_Info>
-		<Support_Info>
-			<Sales_Email>dolibarr-dev@nongnu.org</Sales_Email>
-			<Support_Email>dolibarr-dev@nongnu.org</Support_Email>
-			<General_Email>dolibarr-dev@nongnu.org</General_Email>
-			<Sales_Phone />
-			<Support_Phone />
-			<General_Phone />
-			<Fax_Phone />
-		</Support_Info>
-	</Company_Info>
-	<Program_Info>
-		<Program_Name>Dolibarr</Program_Name>
-		<Program_Version>5.0</Program_Version>
-		<Program_Release_Month>02</Program_Release_Month>
-		<Program_Release_Day>01</Program_Release_Day>
-		<Program_Release_Year>2017</Program_Release_Year>
-		<Program_Cost_Dollars />
-		<Program_Cost_Other_Code />
-		<Program_Cost_Other />
-		<Program_Type>Freeware</Program_Type>
-		<Program_Release_Status>Major Update</Program_Release_Status>
-		<Program_Install_Support>No Install Support</Program_Install_Support>
-		<Program_OS_Support>Linux,Mac OS X,Mac Other,Unix,Win2000,Win7 x32,Win7 x64,Win98,WinOther,WinServer,WinVista,WinVista x64,WinXP,Other</Program_OS_Support>
-		<Program_Language>English,Arabic,Catalan,Chinese,Danish,Dutch,Finnish,French,German,Greek,Icelandic,Italian,Norwegian,Polish,Portuguese,Romanian,Russian,Slovenian,Spanish,Swedish,Turkish</Program_Language>
-		<Program_Change_Info>Increase performances, Setup process is easier, Reduce number of clicks required to use software</Program_Change_Info>
-		<Program_Specific_Category>Business</Program_Specific_Category>
-		<Program_Category_Class>Business::Accounting &amp; Finance</Program_Category_Class>
-		<Program_System_Requirements>None</Program_System_Requirements>
-		<File_Info>
-			<File_Size_Bytes>18037439</File_Size_Bytes>
-			<File_Size_K>18037</File_Size_K>
-			<File_Size_MB>18.03</File_Size_MB>
-		</File_Info>
-		<Expire_Info>
-			<Has_Expire_Info>N</Has_Expire_Info>
-			<Expire_Count />
-			<Expire_Based_On>Days</Expire_Based_On>
-			<Expire_Other_Info />
-			<Expire_Month />
-			<Expire_Day />
-			<Expire_Year />
-		</Expire_Info>
-	</Program_Info>
-	<Program_Descriptions>
-		<English>
-			<Keywords>dolibarr, erp, crm, invoices, commercial proposals, orders, accounting, stock, products, agenda, bank, business, company, foundation, management, sme, doliwamp</Keywords>
-			<Char_Desc_45>Dolibarr ERP &amp; CRM</Char_Desc_45>
-			<Char_Desc_80>Dolibarr ERP &amp; CRM, the easy to use open source software to manage your activity</Char_Desc_80>
-			<Char_Desc_250>Dolibarr ERP &amp; CRM, the easy to use open source software to manage your activity (invoices, customers, suppliers, contracts, agenda, emailings...) and any other things a small or mid-sized business or a foundation needs to manage.</Char_Desc_250>
-			<Char_Desc_450>Dolibarr ERP &amp; CRM is a software package built by modules addition (you enable only features you need), to manage small or medium companies, freelancers or foundations. We can say Dolibarr is an ERP or CRM. Dolibarr is also available with an auto-installer for Windows users with no technical knowledge to install Dolibarr and all its prerequisites (Apache, Mysql, PHP) with just one auto-exe file. See DoliWamp software for this.</Char_Desc_450>
-			<Char_Desc_2000>Dolibarr ERP &amp; CRM is a software package built by modules addition (you enable only features you need), to manage small or mid-sized businesses, freelancers or foundations. We can say Dolibarr is an ERP or CRM (or both depending on activated modules). It's an OpenSource project base on a WAMP, MAMP or LAMP server (Apache, Mysql, PHP for all Operating Systems). Dolibarr differs from other ERP or CRM softwares (like OpenAguila, OpenBravo, OpenERP, Neogia, Compiere, etc) because everything was made to be more simple:
-Simple to install
-Simple to use
-Simple to develop 
-Note that Dolibarr is also available with an auto-installer for Windows or Ubuntu users with no technical knowledge to install Dolibarr and all its prerequisites (Apache, Mysql, PHP) with just one auto-exe file. This version is called DoliWamp (for Windows) or DoliBuntu (for Ubuntu/Debian).</Char_Desc_2000>
-		</English>
-		<French>
-			<Keywords>dolibarr, erp, crm, invoices, commercial proposals, orders, accounting, stock, products, agenda, bank, business, company, foundation, management, sme, doliwamp</Keywords>
-			<Char_Desc_45>Dolibarr ERP &amp; CRM</Char_Desc_45>
-			<Char_Desc_80>Dolibarr ERP &amp; CRM, le gestionnaire simple pour gérer votre activité</Char_Desc_80>
-			<Char_Desc_250>Dolibarr ERP &amp; CRM, le logiciel simple et OpenSource pour gérer votre activité (factures, devis, facturation, commandes, compta, trésorerie, stocks, produits, agenda, comptes bancaires, associations)</Char_Desc_250>
-			<Char_Desc_450>Dolibarr ERP &amp; CRM est un logiciel modulaire (on n'active que les fonctions que l'on désire) de gestions de TPE/PME, d'indépendants, d'entrepreneurs ou d'associations. En terme plus techniques, c'est un ERP et CRM. C'est un projet OpenSource qui s'exécute au sein d'un serveur Web et peut donc être accessible depuis n'importe quel lieu disposant d'une connexion Internet (Projet basé sur un serveur WAMP, MAMP ou LAMP: Apache, MySQL, PHP).</Char_Desc_450>
-			<Char_Desc_2000>Dolibarr ERP &amp; CRM est un logiciel modulaire (on n'active que les fonctions que l'on désire) de gestions de TPE/PME, d'indépendants, d'entrepreneurs ou d'associations. En terme plus techniques, c'est un ERP et CRM. C'est un projet OpenSource qui s'exécute au sein d'un serveur Web et peut donc être accessible depuis n'importe quel lieu disposant d'une connexion Internet (Projet basé sur un serveur WAMP, MAMP ou LAMP: Apache, MySQL, PHP). Dolibarr vient compléter les offres déjà nombreuses de logiciels de cette catégorie (comme OpenBravo, OpenERP, SugarCRM, Neogia, Compiere, etc.) mais se démarque par le fait qu'ici tout est fait pour offrir de la simplicité (règle des 3 S):
-Simple pour l'installation (avec au choix des installeurs clé en main pour ceux qui ignorent comment installer un serveur Web, ou une installation manuelle)
-Simple pour l'utilisation (fonctions modulaires pour ne pas surcharger les menus, informations claires à la saisie)
-Simple pour le développement (pas de frameworks lourds). 
-Dolibarr intègre en effet sa propre architecture (design patterns) permettant à tout développeur d'être tout de suite opérationnel sans connaissances particulières autre que le PHP. </Char_Desc_2000>
-		</French>
-		<Italian>
-			<Keywords>erp, crm, gestionale, medie imprese, fondazioni</Keywords>
-			<Char_Desc_45>Gestionale open source e gratuito</Char_Desc_45>
-			<Char_Desc_80>Gestionale open source e gratuito per piccole e medie imprese, fondazioni</Char_Desc_80>
-			<Char_Desc_250>Dolibarr è un a gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti. Include varie funzionalità per Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori attività.</Char_Desc_250>
-			<Char_Desc_450>Dolibarr è un programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti. Include varie funzionalità per Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori attività. Dolibar è progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare.</Char_Desc_450>
-			<Char_Desc_2000>Dolibarr è un programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti. Include varie funzionalità per Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori attività. Dolibar è progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare. Dolibar è completamente web-based, progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare.</Char_Desc_2000>
-		</Italian>
-	</Program_Descriptions>
-	<Web_Info>
-		<Application_URLs>
-			<Application_Info_URL>https://www.dolibarr.org</Application_Info_URL>
-			<Application_Order_URL>https://www.dolibarr.org</Application_Order_URL>
-			<Application_Screenshot_URL>http://www.dolibarr.org/images/dolibarr_screenshot1.png</Application_Screenshot_URL>
-			<Application_Icon_URL>http://www.dolibarr.org/images/dolibarr.gif</Application_Icon_URL>
-			<Application_XML_File_URL>https://www.dolibarr.org/files/pad_dolibarr.xml</Application_XML_File_URL>
-		</Application_URLs>
-		<Download_URLs>
-			<Primary_Download_URL>https://www.dolibarr.org/files/dolibarr.zip</Primary_Download_URL>
-			<Secondary_Download_URL>http://www.dolibarr.org/files/dolibarr.zip</Secondary_Download_URL>
-			<Additional_Download_URL_1 />
-			<Additional_Download_URL_2 />
-		</Download_URLs>
-	</Web_Info>
-	<Permissions>
-		<Distribution_Permissions>GNU GPL</Distribution_Permissions>
-		<EULA>GNU GPL</EULA>
-	</Permissions>
-	<Affiliates>
-		<Affiliates_FORM>Y</Affiliates_FORM>
-		<Affiliates_VERSION>1.4</Affiliates_VERSION>
-		<Affiliates_URL>http://pad.asp-software.org/extensions/Affiliates.htm</Affiliates_URL>
-		<Affiliates_Information_Page />
-		<Affiliates_Avangate_Order_Page />
-		<Affiliates_Avangate_Vendor_ID />
-		<Affiliates_Avangate_Product_ID />
-		<Affiliates_Avangate_Maximum_Commission_Rate />
-		<Affiliates_BMTMicro_Order_Page />
-		<Affiliates_BMTMicro_Vendor_ID />
-		<Affiliates_BMTMicro_Product_ID />
-		<Affiliates_BMTMicro_Maximum_Commission_Rate />
-		<Affiliates_Cleverbridge_Order_Page />
-		<Affiliates_Cleverbridge_Vendor_ID />
-		<Affiliates_Cleverbridge_Product_ID />
-		<Affiliates_Cleverbridge_Maximum_Commission_Rate />
-		<Affiliates_clixGalore_Order_Page />
-		<Affiliates_clixGalore_Vendor_ID />
-		<Affiliates_clixGalore_Product_ID />
-		<Affiliates_clixGalore_Maximum_Commission_Rate />
-		<Affiliates_CommissionJunction_Order_Page />
-		<Affiliates_CommissionJunction_Vendor_ID />
-		<Affiliates_CommissionJunction_Product_ID />
-		<Affiliates_CommissionJunction_Maximum_Commission_Rate />
-		<Affiliates_DigiBuy_Order_Page />
-		<Affiliates_DigiBuy_Vendor_ID />
-		<Affiliates_DigiBuy_Product_ID />
-		<Affiliates_DigiBuy_Maximum_Commission_Rate />
-		<Affiliates_DigitalCandle_Order_Page />
-		<Affiliates_DigitalCandle_Vendor_ID />
-		<Affiliates_DigitalCandle_Product_ID />
-		<Affiliates_DigitalCandle_Maximum_Commission_Rate />
-		<Affiliates_Emetrix_Order_Page />
-		<Affiliates_Emetrix_Vendor_ID />
-		<Affiliates_Emetrix_Product_ID />
-		<Affiliates_Emetrix_Maximum_Commission_Rate />
-		<Affiliates_eSellerate_Order_Page />
-		<Affiliates_eSellerate_Vendor_ID />
-		<Affiliates_eSellerate_Product_ID />
-		<Affiliates_eSellerate_Maximum_Commission_Rate />
-		<Affiliates_Kagi_Order_Page />
-		<Affiliates_Kagi_Vendor_ID />
-		<Affiliates_Kagi_Product_ID />
-		<Affiliates_Kagi_Maximum_Commission_Rate />
-		<Affiliates_LinkShare_Order_Page />
-		<Affiliates_LinkShare_Vendor_ID />
-		<Affiliates_LinkShare_Product_ID />
-		<Affiliates_LinkShare_Maximum_Commission_Rate />
-		<Affiliates_NorthStarSol_Order_Page />
-		<Affiliates_NorthStarSol_Vendor_ID />
-		<Affiliates_NorthStarSol_Product_ID />
-		<Affiliates_NorthStarSol_Maximum_Commission_Rate />
-		<Affiliates_OneNetworkDirect_Order_Page />
-		<Affiliates_OneNetworkDirect_Vendor_ID />
-		<Affiliates_OneNetworkDirect_Product_ID />
-		<Affiliates_OneNetworkDirect_Maximum_Commission_Rate />
-		<Affiliates_Order1_Order_Page />
-		<Affiliates_Order1_Vendor_ID />
-		<Affiliates_Order1_Product_ID />
-		<Affiliates_Order1_Maximum_Commission_Rate />
-		<Affiliates_Osolis_Order_Page />
-		<Affiliates_Osolis_Vendor_ID />
-		<Affiliates_Osolis_Product_ID />
-		<Affiliates_Osolis_Maximum_Commission_Rate />
-		<Affiliates_Plimus_Order_Page />
-		<Affiliates_Plimus_Vendor_ID />
-		<Affiliates_Plimus_Product_ID />
-		<Affiliates_Plimus_Maximum_Commission_Rate />
-		<Affiliates_Regnet_Order_Page />
-		<Affiliates_Regnet_Vendor_ID />
-		<Affiliates_Regnet_Product_ID />
-		<Affiliates_Regnet_Maximum_Commission_Rate />
-		<Affiliates_Regnow_Order_Page />
-		<Affiliates_Regnow_Vendor_ID />
-		<Affiliates_Regnow_Product_ID />
-		<Affiliates_Regnow_Maximum_Commission_Rate />
-		<Affiliates_Regsoft_Order_Page />
-		<Affiliates_Regsoft_Vendor_ID />
-		<Affiliates_Regsoft_Product_ID />
-		<Affiliates_Regsoft_Maximum_Commission_Rate />
-		<Affiliates_ShareIt_Order_Page />
-		<Affiliates_ShareIt_Vendor_ID />
-		<Affiliates_ShareIt_Product_ID />
-		<Affiliates_ShareIt_Maximum_Commission_Rate />
-		<Affiliates_Shareasale_Order_Page />
-		<Affiliates_Shareasale_Vendor_ID />
-		<Affiliates_Shareasale_Product_ID />
-		<Affiliates_Shareasale_Maximum_Commission_Rate />
-		<Affiliates_SWReg_Order_Page />
-		<Affiliates_SWReg_Vendor_ID />
-		<Affiliates_SWReg_Product_ID />
-		<Affiliates_SWReg_Maximum_Commission_Rate />
-		<Affiliates_V-Share_Order_Page />
-		<Affiliates_V-Share_Vendor_ID />
-		<Affiliates_V-Share_Product_ID />
-		<Affiliates_V-Share_Maximum_Commission_Rate />
-		<Affiliates_VFree_Order_Page />
-		<Affiliates_VFree_Vendor_ID />
-		<Affiliates_VFree_Product_ID />
-		<Affiliates_VFree_Maximum_Commission_Rate />
-		<Affiliates_Yaskifo_Order_Page />
-		<Affiliates_Yaskifo_Vendor_ID />
-		<Affiliates_Yaskifo_Product_ID />
-		<Affiliates_Yaskifo_Maximum_Commission_Rate />
-	</Affiliates>
-	<ASP>
-		<ASP_FORM>Y</ASP_FORM>
-		<ASP_Member>N</ASP_Member>
-		<ASP_Member_Number />
-	</ASP>
-</XML_DIZ_INFO>
--- a/build/pad/pad_doliwamp.xml
+++ b/build/pad/pad_doliwamp.xml
@@ -7,13 +7,13 @@
 	</MASTER_PAD_VERSION_INFO>
 	<Company_Info>
 		<Company_Name>NLTechno</Company_Name>
-		<Address_1>20 Rue Camponac</Address_1>
+		<Address_1>11 Rue raymond Queneau</Address_1>
 		<Address_2 />
-		<City_Town>Pessac</City_Town>
+		<City_Town>Rueil Malmaison</City_Town>
 		<State_Province />
-		<Zip_Postal_Code>33600</Zip_Postal_Code>
+		<Zip_Postal_Code>92500</Zip_Postal_Code>
 		<Country>FRANCE</Country>
-		<Company_WebSite_URL>https://www.dolibarr.org</Company_WebSite_URL>
+		<Company_WebSite_URL>http://www.nltechno.com</Company_WebSite_URL>
 		<Contact_Info>
 			<Author_First_Name>NLTechno</Author_First_Name>
 			<Author_Last_Name>NLTechno</Author_Last_Name>
@@ -34,10 +34,10 @@
 	</Company_Info>
 	<Program_Info>
 		<Program_Name>DoliWamp</Program_Name>
-		<Program_Version>5.0</Program_Version>
-		<Program_Release_Month>02</Program_Release_Month>
+		<Program_Version>3.5</Program_Version>
+		<Program_Release_Month>01</Program_Release_Month>
 		<Program_Release_Day>01</Program_Release_Day>
-		<Program_Release_Year>2017</Program_Release_Year>
+		<Program_Release_Year>2014</Program_Release_Year>
 		<Program_Cost_Dollars />
 		<Program_Cost_Other_Code />
 		<Program_Cost_Other />
@@ -53,7 +53,7 @@
 		<File_Info>
 			<File_Size_Bytes>26048004</File_Size_Bytes>
 			<File_Size_K>25437</File_Size_K>
-			<File_Size_MB>45.84</File_Size_MB>
+			<File_Size_MB>24.84</File_Size_MB>
 		</File_Info>
 		<Expire_Info>
 			<Has_Expire_Info>N</Has_Expire_Info>
@@ -72,7 +72,7 @@
 			<Char_Desc_80>DoliWamp, the easy to use Dolibarr for Windows to manage your company,foundation</Char_Desc_80>
 			<Char_Desc_250>DoliWamp is the Dolibarr ERP/CRM for Windows, the easy to use open source software to manage your activity (invoices, customers, suppliers, contracts, agenda, emailings...) and any other things a small or mid-sized business or a foundation needs.</Char_Desc_250>
 			<Char_Desc_450>DoliWamp is the Dolibarr ERP/CRM autoinstaller for Windows users with no technical knowledge to install Dolibarr and all its prerequisites (Apache, Mysql, PHP) with just one auto-exe file. Dolibarr ERP/CRM is a software package built by modules addition (you enable only features you need), to manage small or mid-sized businesses, freelancers or foundations.</Char_Desc_450>
-			<Char_Desc_2000>DoliWamp is the Dolibarr ERP/CRM for Windows. Dolibarr ERP &amp; CRM is a software package built by modules addition (you enable only features you need), to manage small or mid-sized businesses, freelancers or foundations (You can manage or follow contacts, invoices, orders, commercial proposals, products, stock management, agenda, mass emailings, members of a foundation, bank accounts...). Based on a WAMP, MAMP or LAMP server (Apache, Mysql, PHP for all Operating Systems), you can install it as a standalone program or use it from anywhere with any web browser. Dolibarr is an OpenSource project. It differs from other ERP or CRM softwares (like OpenAguila, OpenBravo, OpenERP, Neogia, Compiere, etc) because everything was made to be more simple: Simple to install, Simple to use, Simple to develop. 
+			<Char_Desc_2000>DoliWamp is the Dolibarr ERP/CRM for Windows. Dolibarr ERP &amp; CRM is a software built by modules addition (you enable only features you need), to manage small or mid-sized businesses, freelancers or foundations (You can manage or follow contacts, invoices, orders, commercial proposals, products, stock management, agenda, mass emailings, members of a foundation, bank accounts...). Based on a WAMP, MAMP or LAMP server (Apache, Mysql, PHP for all Operating Systems), you can install it as a standalone program or use it from anywhere with any web browser. Dolibarr is an OpenSource project. It differs from other ERP or CRM softwares (like OpenAguila, OpenBravo, OpenERP, Neogia, Compiere, etc) because everything was made to be more simple: Simple to install, Simple to use, Simple to develop. 
 DoliWamp is the auto-installer for Windows users with no technical knowledge to install Dolibarr ERP/CRM and all its prerequisites (Apache, Mysql, PHP) with just one auto-exe file.</Char_Desc_2000>
 		</English>
 		<French>
@@ -96,12 +96,12 @@ DoliWamp is the auto-installer for Windows users with no technical knowledge to
 		<Application_URLs>
 			<Application_Info_URL>http://www.nltechno.com/doliwamp/</Application_Info_URL>
 			<Application_Order_URL>http://www.nltechno.com/doliwamp/</Application_Order_URL>
-			<Application_Screenshot_URL>https://www.dolibarr.org/images/dolibarr_screenshot1.png</Application_Screenshot_URL>
-			<Application_Icon_URL>https://www.dolibarr.org/images/dolibarr.gif</Application_Icon_URL>
-			<Application_XML_File_URL>https://www.dolibarr.org/files/pad_doliwamp.xml</Application_XML_File_URL>
+			<Application_Screenshot_URL>http://www.dolibarr.org/images/dolibarr_screenshot1.png</Application_Screenshot_URL>
+			<Application_Icon_URL>http://www.dolibarr.org/images/dolibarr.gif</Application_Icon_URL>
+			<Application_XML_File_URL>http://www.dolibarr.org/files/pad_doliwamp.xml</Application_XML_File_URL>
 		</Application_URLs>
 		<Download_URLs>
-			<Primary_Download_URL>https://www.dolibarr.org/files/doliwamp.exe</Primary_Download_URL>
+			<Primary_Download_URL>http://www.dolibarr.org/files/doliwamp.exe</Primary_Download_URL>
 			<Secondary_Download_URL>http://www.dolibarr.org/files/doliwamp.exe</Secondary_Download_URL>
 			<Additional_Download_URL_1 />
 			<Additional_Download_URL_2 />
--- a/build/pad/pad_doliwamp_nos.xml
+++ b/build/pad/pad_doliwamp_nos.xml
@@ -1,225 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<XML_DIZ_INFO>
-	<MASTER_PAD_VERSION_INFO>
-		<MASTER_PAD_VERSION>3.11</MASTER_PAD_VERSION>
-		<MASTER_PAD_EDITOR>PADGen 3.1.1.47 http://www.padgen.org</MASTER_PAD_EDITOR>
-		<MASTER_PAD_INFO>Portable Application Description, or PAD for short, is a data set that is used by shareware authors to disseminate information to anyone interested in their software products. To find out more go to http://pad.asp-software.org</MASTER_PAD_INFO>
-	</MASTER_PAD_VERSION_INFO>
-	<Company_Info>
-		<Company_Name>NLTechno</Company_Name>
-		<Address_1>20 Rue Camponac</Address_1>
-		<Address_2 />
-		<City_Town>Pessac</City_Town>
-		<State_Province />
-		<Zip_Postal_Code>33600</Zip_Postal_Code>
-		<Country>FRANCE</Country>
-		<Company_WebSite_URL>https://www.dolibarr.org</Company_WebSite_URL>
-		<Contact_Info>
-			<Author_First_Name>NLTechno</Author_First_Name>
-			<Author_Last_Name>NLTechno</Author_Last_Name>
-			<Author_Email>contact@nltechno.com</Author_Email>
-			<Contact_First_Name>NLTechno</Contact_First_Name>
-			<Contact_Last_Name>NLTechno</Contact_Last_Name>
-			<Contact_Email>contact@nltechno.com</Contact_Email>
-		</Contact_Info>
-		<Support_Info>
-			<Sales_Email>support@nltechno.com</Sales_Email>
-			<Support_Email>support@nltechno.com</Support_Email>
-			<General_Email>support@nltechno.com</General_Email>
-			<Sales_Phone />
-			<Support_Phone />
-			<General_Phone />
-			<Fax_Phone />
-		</Support_Info>
-	</Company_Info>
-	<Program_Info>
-		<Program_Name>DoliWamp</Program_Name>
-		<Program_Version>5.0</Program_Version>
-		<Program_Release_Month>02</Program_Release_Month>
-		<Program_Release_Day>01</Program_Release_Day>
-		<Program_Release_Year>2017</Program_Release_Year>
-		<Program_Cost_Dollars />
-		<Program_Cost_Other_Code />
-		<Program_Cost_Other />
-		<Program_Type>Freeware</Program_Type>
-		<Program_Release_Status>Major Update</Program_Release_Status>
-		<Program_Install_Support>Install and Uninstall</Program_Install_Support>
-		<Program_OS_Support>Win2000,Win7 x32,Win7 x64,Win98,WinOther,WinServer,WinVista,WinVista x64,WinXP,Other</Program_OS_Support>
-		<Program_Language>English,Arabic,Catalan,Chinese,Dutch,Finnish,French,German,Icelandic,Italian,Norwegian,Polish,Portuguese,Romanian,Russian,Slovenian,Spanish,Swedish,Turkish</Program_Language>
-		<Program_Change_Info>Increase performances, Setup process is easier, Reduce number of clicks required to use software</Program_Change_Info>
-		<Program_Specific_Category>Business</Program_Specific_Category>
-		<Program_Category_Class>Business::Accounting &amp; Finance</Program_Category_Class>
-		<Program_System_Requirements>None</Program_System_Requirements>
-		<File_Info>
-			<File_Size_Bytes>26048004</File_Size_Bytes>
-			<File_Size_K>25437</File_Size_K>
-			<File_Size_MB>45.84</File_Size_MB>
-		</File_Info>
-		<Expire_Info>
-			<Has_Expire_Info>N</Has_Expire_Info>
-			<Expire_Count />
-			<Expire_Based_On>Days</Expire_Based_On>
-			<Expire_Other_Info />
-			<Expire_Month />
-			<Expire_Day />
-			<Expire_Year />
-		</Expire_Info>
-	</Program_Info>
-	<Program_Descriptions>
-		<English>
-			<Keywords>doliwamp, dolibarr, erp, crm, invoices, commercial proposals, orders, accounting, stock, products, agenda, bank, business, company, foundation, management</Keywords>
-			<Char_Desc_45>DoliWamp, Dolibarr ERP/CRM for Windows</Char_Desc_45>
-			<Char_Desc_80>DoliWamp, the easy to use Dolibarr for Windows to manage your company,foundation</Char_Desc_80>
-			<Char_Desc_250>DoliWamp is the Dolibarr ERP/CRM for Windows, the easy to use open source software to manage your activity (invoices, customers, suppliers, contracts, agenda, emailings...) and any other things a small or mid-sized business or a foundation needs.</Char_Desc_250>
-			<Char_Desc_450>DoliWamp is the Dolibarr ERP/CRM autoinstaller for Windows users with no technical knowledge to install Dolibarr and all its prerequisites (Apache, Mysql, PHP) with just one auto-exe file. Dolibarr ERP/CRM is a software package built by modules addition (you enable only features you need), to manage small or mid-sized businesses, freelancers or foundations.</Char_Desc_450>
-			<Char_Desc_2000>DoliWamp is the Dolibarr ERP/CRM for Windows. Dolibarr ERP &amp; CRM is a software package built by modules addition (you enable only features you need), to manage small or mid-sized businesses, freelancers or foundations (You can manage or follow contacts, invoices, orders, commercial proposals, products, stock management, agenda, mass emailings, members of a foundation, bank accounts...). Based on a WAMP, MAMP or LAMP server (Apache, Mysql, PHP for all Operating Systems), you can install it as a standalone program or use it from anywhere with any web browser. Dolibarr is an OpenSource project. It differs from other ERP or CRM softwares (like OpenAguila, OpenBravo, OpenERP, Neogia, Compiere, etc) because everything was made to be more simple: Simple to install, Simple to use, Simple to develop. 
-DoliWamp is the auto-installer for Windows users with no technical knowledge to install Dolibarr ERP/CRM and all its prerequisites (Apache, Mysql, PHP) with just one auto-exe file.</Char_Desc_2000>
-		</English>
-		<French>
-			<Keywords>doliwamp, dolibarr, erp, crm, factures, devis, facturation, commandes, compta, trésorerie, stocks, produits, agenda, comptes bancaires, associations, entreprises, PME, TPE</Keywords>
-			<Char_Desc_45>DoliWamp, Dolibarr ERP/CRM pour Windows</Char_Desc_45>
-			<Char_Desc_80>DoliWamp, la distribution de Dolibarr pour gérer votre entreprise ou association</Char_Desc_80>
-			<Char_Desc_250>DoliWamp est la version spécialisée pour Windows de Dolibarr ERP-CRM, le logiciel simple et OpenSource pour gérer votre activité (factures, devis, facturation, commandes, compta, trésorerie, stocks, produits, agenda, comptes bancaires, associations)</Char_Desc_250>
-			<Char_Desc_450>DoliWamp est la version spécialisée pour Windows de Dolibarr ERP-CRM, le logiciel simple et OpenSource pour gérer votre activité (factures, devis, facturation, commandes, compta, trésorerie, stocks, produits, agenda, comptes bancaires, associations)</Char_Desc_450>
-			<Char_Desc_2000>DoliWamp est la version spécialisée pour Windows de Dolibarr ERP-CRM, le logiciel simple et OpenSource pour gérer votre activité (factures, devis, facturation, commandes, compta, trésorerie, stocks, produits, agenda, comptes bancaires, associations)</Char_Desc_2000>
-		</French>
-		<Italian>
-			<Keywords>doliwamp, dolibarr, erp, crm, gestionale, medie imprese, fondazioni</Keywords>
-			<Char_Desc_45>DoliWamp, Dolibarr ERP/CRM per Windows</Char_Desc_45>
-			<Char_Desc_80>Gestionale open source e gratuito per piccole e medie imprese, fondazioni</Char_Desc_80>
-			<Char_Desc_250>Dolibarr è un a gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti. Include varie funzionalità per Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori attività.</Char_Desc_250>
-			<Char_Desc_450>Dolibarr è un programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti. Include varie funzionalità per Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori attività. Dolibar è progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare.</Char_Desc_450>
-			<Char_Desc_2000>Dolibarr è un programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti. Include varie funzionalità per Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori attività. Dolibar è progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare. Dolibar è completamente web-based, progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare.</Char_Desc_2000>
-		</Italian>
-	</Program_Descriptions>
-	<Web_Info>
-		<Application_URLs>
-			<Application_Info_URL>http://www.nltechno.com/doliwamp/</Application_Info_URL>
-			<Application_Order_URL>http://www.nltechno.com/doliwamp/</Application_Order_URL>
-			<Application_Screenshot_URL>http://www.dolibarr.org/images/dolibarr_screenshot1.png</Application_Screenshot_URL>
-			<Application_Icon_URL>http://www.dolibarr.org/images/dolibarr.gif</Application_Icon_URL>
-			<Application_XML_File_URL>https://www.dolibarr.org/files/pad_doliwamp.xml</Application_XML_File_URL>
-		</Application_URLs>
-		<Download_URLs>
-			<Primary_Download_URL>https://www.dolibarr.org/files/doliwamp.exe</Primary_Download_URL>
-			<Secondary_Download_URL>http://www.dolibarr.org/files/doliwamp.exe</Secondary_Download_URL>
-			<Additional_Download_URL_1 />
-			<Additional_Download_URL_2 />
-		</Download_URLs>
-	</Web_Info>
-	<Permissions>
-		<Distribution_Permissions>GNU GPL</Distribution_Permissions>
-		<EULA>GNU GPL</EULA>
-	</Permissions>
-	<Affiliates>
-		<Affiliates_FORM>Y</Affiliates_FORM>
-		<Affiliates_VERSION>1.4</Affiliates_VERSION>
-		<Affiliates_URL>http://pad.asp-software.org/extensions/Affiliates.htm</Affiliates_URL>
-		<Affiliates_Information_Page />
-		<Affiliates_Avangate_Order_Page />
-		<Affiliates_Avangate_Vendor_ID />
-		<Affiliates_Avangate_Product_ID />
-		<Affiliates_Avangate_Maximum_Commission_Rate />
-		<Affiliates_BMTMicro_Order_Page />
-		<Affiliates_BMTMicro_Vendor_ID />
-		<Affiliates_BMTMicro_Product_ID />
-		<Affiliates_BMTMicro_Maximum_Commission_Rate />
-		<Affiliates_Cleverbridge_Order_Page />
-		<Affiliates_Cleverbridge_Vendor_ID />
-		<Affiliates_Cleverbridge_Product_ID />
-		<Affiliates_Cleverbridge_Maximum_Commission_Rate />
-		<Affiliates_clixGalore_Order_Page />
-		<Affiliates_clixGalore_Vendor_ID />
-		<Affiliates_clixGalore_Product_ID />
-		<Affiliates_clixGalore_Maximum_Commission_Rate />
-		<Affiliates_CommissionJunction_Order_Page />
-		<Affiliates_CommissionJunction_Vendor_ID />
-		<Affiliates_CommissionJunction_Product_ID />
-		<Affiliates_CommissionJunction_Maximum_Commission_Rate />
-		<Affiliates_DigiBuy_Order_Page />
-		<Affiliates_DigiBuy_Vendor_ID />
-		<Affiliates_DigiBuy_Product_ID />
-		<Affiliates_DigiBuy_Maximum_Commission_Rate />
-		<Affiliates_DigitalCandle_Order_Page />
-		<Affiliates_DigitalCandle_Vendor_ID />
-		<Affiliates_DigitalCandle_Product_ID />
-		<Affiliates_DigitalCandle_Maximum_Commission_Rate />
-		<Affiliates_Emetrix_Order_Page />
-		<Affiliates_Emetrix_Vendor_ID />
-		<Affiliates_Emetrix_Product_ID />
-		<Affiliates_Emetrix_Maximum_Commission_Rate />
-		<Affiliates_eSellerate_Order_Page />
-		<Affiliates_eSellerate_Vendor_ID />
-		<Affiliates_eSellerate_Product_ID />
-		<Affiliates_eSellerate_Maximum_Commission_Rate />
-		<Affiliates_Kagi_Order_Page />
-		<Affiliates_Kagi_Vendor_ID />
-		<Affiliates_Kagi_Product_ID />
-		<Affiliates_Kagi_Maximum_Commission_Rate />
-		<Affiliates_LinkShare_Order_Page />
-		<Affiliates_LinkShare_Vendor_ID />
-		<Affiliates_LinkShare_Product_ID />
-		<Affiliates_LinkShare_Maximum_Commission_Rate />
-		<Affiliates_NorthStarSol_Order_Page />
-		<Affiliates_NorthStarSol_Vendor_ID />
-		<Affiliates_NorthStarSol_Product_ID />
-		<Affiliates_NorthStarSol_Maximum_Commission_Rate />
-		<Affiliates_OneNetworkDirect_Order_Page />
-		<Affiliates_OneNetworkDirect_Vendor_ID />
-		<Affiliates_OneNetworkDirect_Product_ID />
-		<Affiliates_OneNetworkDirect_Maximum_Commission_Rate />
-		<Affiliates_Order1_Order_Page />
-		<Affiliates_Order1_Vendor_ID />
-		<Affiliates_Order1_Product_ID />
-		<Affiliates_Order1_Maximum_Commission_Rate />
-		<Affiliates_Osolis_Order_Page />
-		<Affiliates_Osolis_Vendor_ID />
-		<Affiliates_Osolis_Product_ID />
-		<Affiliates_Osolis_Maximum_Commission_Rate />
-		<Affiliates_Plimus_Order_Page />
-		<Affiliates_Plimus_Vendor_ID />
-		<Affiliates_Plimus_Product_ID />
-		<Affiliates_Plimus_Maximum_Commission_Rate />
-		<Affiliates_Regnet_Order_Page />
-		<Affiliates_Regnet_Vendor_ID />
-		<Affiliates_Regnet_Product_ID />
-		<Affiliates_Regnet_Maximum_Commission_Rate />
-		<Affiliates_Regnow_Order_Page />
-		<Affiliates_Regnow_Vendor_ID />
-		<Affiliates_Regnow_Product_ID />
-		<Affiliates_Regnow_Maximum_Commission_Rate />
-		<Affiliates_Regsoft_Order_Page />
-		<Affiliates_Regsoft_Vendor_ID />
-		<Affiliates_Regsoft_Product_ID />
-		<Affiliates_Regsoft_Maximum_Commission_Rate />
-		<Affiliates_ShareIt_Order_Page />
-		<Affiliates_ShareIt_Vendor_ID />
-		<Affiliates_ShareIt_Product_ID />
-		<Affiliates_ShareIt_Maximum_Commission_Rate />
-		<Affiliates_Shareasale_Order_Page />
-		<Affiliates_Shareasale_Vendor_ID />
-		<Affiliates_Shareasale_Product_ID />
-		<Affiliates_Shareasale_Maximum_Commission_Rate />
-		<Affiliates_SWReg_Order_Page />
-		<Affiliates_SWReg_Vendor_ID />
-		<Affiliates_SWReg_Product_ID />
-		<Affiliates_SWReg_Maximum_Commission_Rate />
-		<Affiliates_V-Share_Order_Page />
-		<Affiliates_V-Share_Vendor_ID />
-		<Affiliates_V-Share_Product_ID />
-		<Affiliates_V-Share_Maximum_Commission_Rate />
-		<Affiliates_VFree_Order_Page />
-		<Affiliates_VFree_Vendor_ID />
-		<Affiliates_VFree_Product_ID />
-		<Affiliates_VFree_Maximum_Commission_Rate />
-		<Affiliates_Yaskifo_Order_Page />
-		<Affiliates_Yaskifo_Vendor_ID />
-		<Affiliates_Yaskifo_Product_ID />
-		<Affiliates_Yaskifo_Maximum_Commission_Rate />
-	</Affiliates>
-	<ASP>
-		<ASP_FORM>Y</ASP_FORM>
-		<ASP_Member>N</ASP_Member>
-		<ASP_Member_Number />
-	</ASP>
-</XML_DIZ_INFO>
--- a/build/rpm/dolibarr_fedora.spec
+++ b/build/rpm/dolibarr_fedora.spec
@@ -18,8 +18,8 @@ License: GPLv3+
 #Packager: Laurent Destailleur (Eldy) <eldy@users.sourceforge.net>
 Vendor: Dolibarr dev team

-URL: https://www.dolibarr.org
-Source0: https://www.dolibarr.org/files/lastbuild/package_rpm_redhat-fedora/%{name}-%{version}.tgz
+URL: http://www.dolibarr.org
+Source0: http://www.dolibarr.org/files/lastbuild/package_rpm_redhat-fedora/%{name}-%{version}.tgz
 Patch0: %{name}-forrpm.patch
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -165,7 +165,6 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/bookmarks
 %_datadir/dolibarr/htdocs/cashdesk
 %_datadir/dolibarr/htdocs/categories
-%_datadir/dolibarr/htdocs/collab
 %_datadir/dolibarr/htdocs/comm
 %_datadir/dolibarr/htdocs/commande
 %_datadir/dolibarr/htdocs/compta
@@ -194,7 +193,6 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/loan
 %_datadir/dolibarr/htdocs/mailmanspip
 %_datadir/dolibarr/htdocs/margin
-%_datadir/dolibarr/htdocs/modulebuilder
 %_datadir/dolibarr/htdocs/multicurrency
 %_datadir/dolibarr/htdocs/opensurvey
 %_datadir/dolibarr/htdocs/paybox
@@ -205,12 +203,10 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/public
 %_datadir/dolibarr/htdocs/resource
 %_datadir/dolibarr/htdocs/societe
-%_datadir/dolibarr/htdocs/stripe
 %_datadir/dolibarr/htdocs/supplier_proposal
 %_datadir/dolibarr/htdocs/support
 %_datadir/dolibarr/htdocs/theme
 %_datadir/dolibarr/htdocs/user
-%_datadir/dolibarr/htdocs/variants
 %_datadir/dolibarr/htdocs/webservices
 %_datadir/dolibarr/htdocs/websites
 %_datadir/dolibarr/htdocs/*.ico
--- a/build/rpm/dolibarr_generic.spec
+++ b/build/rpm/dolibarr_generic.spec
@@ -26,17 +26,17 @@ License: GPL-3.0+
 #Packager: Laurent Destailleur (Eldy) <eldy@users.sourceforge.net>
 Vendor: Dolibarr dev team

-URL: https://www.dolibarr.org
+URL: http://www.dolibarr.org
 %if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version}
-Source0: https://www.dolibarr.org/files/lastbuild/package_rpm_redhat-fedora/%{name}-%{version}.tgz
+Source0: http://www.dolibarr.org/files/lastbuild/package_rpm_redhat-fedora/%{name}-%{version}.tgz
 %else
 %if 0%{?mdkversion}
-Source0: https://www.dolibarr.org/files/lastbuild/package_rpm_mandriva/%{name}-%{version}.tgz
+Source0: http://www.dolibarr.org/files/lastbuild/package_rpm_mandriva/%{name}-%{version}.tgz
 %else
 %if 0%{?suse_version}
-Source0: https://www.dolibarr.org/files/lastbuild/package_rpm_opensuse/%{name}-%{version}.tgz
+Source0: http://www.dolibarr.org/files/lastbuild/package_rpm_opensuse/%{name}-%{version}.tgz
 %else
-Source0: https://www.dolibarr.org/files/lastbuild/package_rpm_generic/%{name}-%{version}.tgz
+Source0: http://www.dolibarr.org/files/lastbuild/package_rpm_generic/%{name}-%{version}.tgz
 %endif
 %endif
 %endif
@@ -245,7 +245,6 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/bookmarks
 %_datadir/dolibarr/htdocs/cashdesk
 %_datadir/dolibarr/htdocs/categories
-%_datadir/dolibarr/htdocs/collab
 %_datadir/dolibarr/htdocs/comm
 %_datadir/dolibarr/htdocs/commande
 %_datadir/dolibarr/htdocs/compta
@@ -274,7 +273,6 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/loan
 %_datadir/dolibarr/htdocs/mailmanspip
 %_datadir/dolibarr/htdocs/margin
-%_datadir/dolibarr/htdocs/modulebuilder
 %_datadir/dolibarr/htdocs/multicurrency
 %_datadir/dolibarr/htdocs/opensurvey
 %_datadir/dolibarr/htdocs/paybox
@@ -285,12 +283,10 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/public
 %_datadir/dolibarr/htdocs/resource
 %_datadir/dolibarr/htdocs/societe
-%_datadir/dolibarr/htdocs/stripe
 %_datadir/dolibarr/htdocs/supplier_proposal
 %_datadir/dolibarr/htdocs/support
 %_datadir/dolibarr/htdocs/theme
 %_datadir/dolibarr/htdocs/user
-%_datadir/dolibarr/htdocs/variants
 %_datadir/dolibarr/htdocs/webservices
 %_datadir/dolibarr/htdocs/websites
 %_datadir/dolibarr/htdocs/*.ico
--- a/build/rpm/dolibarr_mandriva.spec
+++ b/build/rpm/dolibarr_mandriva.spec
@@ -18,8 +18,8 @@ License: GPL-3.0+
 #Packager: Laurent Destailleur (Eldy) <eldy@users.sourceforge.net>
 Vendor: Dolibarr dev team

-URL: https://www.dolibarr.org
-Source0: https://www.dolibarr.org/files/lastbuild/package_rpm_mandriva/%{name}-%{version}.tgz
+URL: http://www.dolibarr.org
+Source0: http://www.dolibarr.org/files/lastbuild/package_rpm_mandriva/%{name}-%{version}.tgz
 Patch0: %{name}-forrpm.patch
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -190,7 +190,6 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/loan
 %_datadir/dolibarr/htdocs/mailmanspip
 %_datadir/dolibarr/htdocs/margin
-%_datadir/dolibarr/htdocs/modulebuilder
 %_datadir/dolibarr/htdocs/multicurrency
 %_datadir/dolibarr/htdocs/opensurvey
 %_datadir/dolibarr/htdocs/paybox
@@ -201,12 +200,10 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/public
 %_datadir/dolibarr/htdocs/resource
 %_datadir/dolibarr/htdocs/societe
-%_datadir/dolibarr/htdocs/stripe
 %_datadir/dolibarr/htdocs/supplier_proposal
 %_datadir/dolibarr/htdocs/support
 %_datadir/dolibarr/htdocs/theme
 %_datadir/dolibarr/htdocs/user
-%_datadir/dolibarr/htdocs/variants
 %_datadir/dolibarr/htdocs/webservices
 %_datadir/dolibarr/htdocs/websites
 %_datadir/dolibarr/htdocs/*.ico
--- a/build/rpm/dolibarr_opensuse.spec
+++ b/build/rpm/dolibarr_opensuse.spec
@@ -18,8 +18,8 @@ License: GPL-3.0+
 #Packager: Laurent Destailleur (Eldy) <eldy@users.sourceforge.net>
 Vendor: Dolibarr dev team

-URL: https://www.dolibarr.org
-Source0: https://www.dolibarr.org/files/lastbuild/package_rpm_opensuse/%{name}-%{version}.tgz
+URL: http://www.dolibarr.org
+Source0: http://www.dolibarr.org/files/lastbuild/package_rpm_opensuse/%{name}-%{version}.tgz
 Patch0: %{name}-forrpm.patch
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -173,7 +173,6 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/bookmarks
 %_datadir/dolibarr/htdocs/cashdesk
 %_datadir/dolibarr/htdocs/categories
-%_datadir/dolibarr/htdocs/collab
 %_datadir/dolibarr/htdocs/comm
 %_datadir/dolibarr/htdocs/commande
 %_datadir/dolibarr/htdocs/compta
@@ -202,7 +201,6 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/loan
 %_datadir/dolibarr/htdocs/mailmanspip
 %_datadir/dolibarr/htdocs/margin
-%_datadir/dolibarr/htdocs/modulebuilder
 %_datadir/dolibarr/htdocs/multicurrency
 %_datadir/dolibarr/htdocs/opensurvey
 %_datadir/dolibarr/htdocs/paybox
@@ -213,12 +211,10 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/public
 %_datadir/dolibarr/htdocs/resource
 %_datadir/dolibarr/htdocs/societe
-%_datadir/dolibarr/htdocs/stripe
 %_datadir/dolibarr/htdocs/supplier_proposal
 %_datadir/dolibarr/htdocs/support
 %_datadir/dolibarr/htdocs/theme
 %_datadir/dolibarr/htdocs/user
-%_datadir/dolibarr/htdocs/variants
 %_datadir/dolibarr/htdocs/webservices
 %_datadir/dolibarr/htdocs/websites
 %_datadir/dolibarr/htdocs/*.ico
--- a/build/rpm/install.forced.php.fedora
+++ b/build/rpm/install.forced.php.fedora
@@ -1,7 +1,7 @@
 <?php

 $force_install_packager='rpmfedora';
-$force_install_noedit=1;	# 1 to block var specific to distrib, 2 to block every technical parameters
+$force_install_noedit=1;	// 1 to block var specific to distrib, 2 to block every technical parameters
 $force_install_message='KeepDefaultValuesDeb';
 $force_install_main_data_root='/var/lib/dolibarr/documents';
 $force_install_type='mysqli';
--- a/build/rpm/install.forced.php.generic
+++ b/build/rpm/install.forced.php.generic
@@ -1,7 +1,7 @@
 <?php

 $force_install_packager='rpmgeneric';
-$force_install_noedit=1;	# 1 to block var specific to distrib, 2 to block every technical parameters
+$force_install_noedit=1;	// 1 to block var specific to distrib, 2 to block every technical parameters
 $force_install_message='KeepDefaultValuesDeb';
 $force_install_main_data_root='/var/lib/dolibarr/documents';
 $force_install_type='mysqli';
--- a/build/rpm/install.forced.php.mandriva
+++ b/build/rpm/install.forced.php.mandriva
@@ -1,7 +1,7 @@
 <?php

 $force_install_packager='rpmmandriva';
-$force_install_noedit=1;	# 1 to block var specific to distrib, 2 to block every technical parameters
+$force_install_noedit=1;	// 1 to block var specific to distrib, 2 to block every technical parameters
 $force_install_message='KeepDefaultValuesDeb';
 $force_install_main_data_root='/var/lib/dolibarr/documents';
 $force_install_type='mysqli';
--- a/build/rpm/install.forced.php.opensuse
+++ b/build/rpm/install.forced.php.opensuse
@@ -1,7 +1,7 @@
 <?php

 $force_install_packager='rpmopensuse';
-$force_install_noedit=1;	# 1 to block var specific to distrib, 2 to block every technical parameters
+$force_install_noedit=1;	// 1 to block var specific to distrib, 2 to block every technical parameters
 $force_install_message='KeepDefaultValuesDeb';
 $force_install_main_data_root='/var/lib/dolibarr/documents';
 $force_install_type='mysqli';
--- a/dev/dolibarr_changes.txt
+++ b/dev/dolibarr_changes.txt
@@ -3,18 +3,20 @@ This file describe changes made on external library after beeing included
 in Dolibarr root.


+
 ALL:
 ----
-Check "DOL_CHANGE"
+Replace "& new" by "new"


-CKEDITOR (4.6.2):
-----------------
+
+CKEDITOR:
+---------
 * In ckeditor/ckeditor/contents.css
 Replace:
-	body { ... margin: 20px;
+	margin: 20px;
 With
-	body { ... margin: 5px;
+	margin: 5px;



@@ -31,6 +33,21 @@ Replace call to serialize_val with no bugged value



+FPDI:
+-----
+Replace:
+	$this->_readXref($this->_xref, $this->_findXref());
+with:
+    try {
+	        $this->_readXref($this->_xref, $this->_findXref());
+    }
+    catch(Exception $e)
+    {
+        	print $e->getMessage();
+        	exit;
+    }
+
+

 TCPDF:
 ------
@@ -39,7 +56,7 @@ define('QR_FIND_FROM_RANDOM', 2);
 with
 define('QR_FIND_FROM_RANDOM', false);

-* Removed useless directories ("examples", "tools")
+* Removed useless directories (examples, tools)

 * Fix
 	// initialize subsetchars
--- a/dev/examples/ldap/ldapsearch_sample1.txt
+++ b/dev/examples/ldap/ldapsearch_sample1.txt
@@ -5,5 +5,5 @@
 #
 # ldapsearch -h hostname -x
 # 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=*)"
+# ldapsearch -h hostname -x -z 0 -b "o=somecompany.com" -D "cn=manager,o=somecompany.com" -W "(objectclass=*)"
+# ldapsearch -h hostname -x -b "o=somecompany.com" -D "cn=manager,o=somecompany.com" -W "(objectclass=*)"
--- a/dev/resources/iso-normes/sample_FEC_file.txt
+++ b/dev/resources/iso-normes/sample_FEC_file.txt
@@ -1,13 +0,0 @@
-JOURNALCODE	JOURNALLIB	ECRITURENUM	ECRITUREDATE	COMPTENUM	COMPTELIB	COMPAUXNUM	COMPAUXLIB	PIECEREF	PIECEDATE	ECRITURELIB	DEBIT	CREDIT	ECRITURELET	DATELET	VALIDDATE	MONTANTDEVISE	IDEVISE
-Banque	Banque	17293	20170109	401PPRO	PUBLI-PROV			L08	20170109	PPRO domiciliation 1TR	       187,20	         0,00			20170109		
-Banque	Banque	17293	20170109	5121CRA	CR AGRICOLE			L08	20170109	PPRO domiciliation 1TR	         0,00	       187,20			20170109		
-Banque	Banque	17295	20170109	401ORPA	ORANGE PARIS			Report	20170109	ORPA adsl par 12	        96,00	         0,00			20170109		
-Banque	Banque	17295	20170109	5121CRA	CR AGRICOLE			Report	20170109	ORPA adsl par 12	         0,00	        96,00			20170109		
-Banque	Banque	17302	20170105	401ORVI	ORANGE VEBRON INTERNET			Report	20170105	ORVI adsl veb 12	        26,00	         0,00			20170109		
-Banque	Banque	17302	20170105	5121CRA	CR AGRICOLE			Report	20170105	ORVI adsl veb 12	         0,00	        26,00			20170109		
-Fournisseurs	Fournisseurs	17305	20170119	401ZDAV	SANDRA DAVILA			A01	20170119	ZDAV courtage s/ ventes	         0,00	       508,00			20170119		
-Fournisseurs	Fournisseurs	17305	20170119	622200	Courtages s/ ventes			A01	20170119	ZDAV courtage s/ ventes	       508,00	         0,00			20170119		
-Banque	Banque	17306	20170119	5121CRA	CR AGRICOLE			A01	20170119	ZDAV courtage s/ ventes	         0,00	       508,00			20170119		
-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		
--- a/dev/skeletons/.gitignore
+++ b/dev/skeletons/.gitignore
@@ -0,0 +1,2 @@
+out.*
+socpeople*
--- a/dev/skeletons/README
+++ b/dev/skeletons/README
@@ -0,0 +1,34 @@
+README (English)
+--------------------------------
+This directory contains PHP script samples that can be used to start a development on Dolibarr.
+
+
+*** build_class_from_table.php:
+
+This is the script to use to generate PHP code of a PHP POJO class
+object, a PHP script that use this POJO. This script use the files
+skeleton_*.php to build its generated code. 
+
+
+*** modMyModule.class.php:
+
+Is a sample of module descriptor that you can use if you want to build a new module/plugin for
+Dolibarr.
+
+
+*** skeleton_script.php:
+
+Is a sample you can use as an example if you need to build a script to run on command line
+
+
+*** skeleton_page.php:
+
+Is a sample you can use as an example if you need to build an HTML page to include in Dolibarr GUI.
+
+
+*** skeleton_class.class.php:
+
+Is a sample you can use as an example if you need to build a class file to access a new table required by a Dolibarr development.
+However it is better to run the build_class_from_table.php script that accepts a table name as a parameter and will uses the description table within database and the skeleton_class.class.php file to generate full code for your class file.
+After running this script, the class to access your table (insert a record, update, delete and select) is directly finished and can be used by your module's code. 
+No more coding is needed to get access to table with this script because the file is completely generated once.
--- a/dev/skeletons/README.md
+++ b/dev/skeletons/README.md
@@ -1 +0,0 @@
-Files and tools were moved into htdocs/modulebuilder/template
--- a/dev/skeletons/build_api_class.php
+++ b/dev/skeletons/build_api_class.php
@@ -0,0 +1,123 @@
+#!/usr/bin/env php
+<?php
+/* 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       dev/skeletons/build_api_class.php
+ *  \ingroup    core
+ *  \brief      Create a complete API class file from existant class file
+ */
+
+$sapi_type = php_sapi_name();
+$script_file = basename(__FILE__);
+$path=dirname(__FILE__).'/';
+
+// Test if batch mode
+if (substr($sapi_type, 0, 3) == 'cgi') {
+    echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
+    exit;
+}
+
+// Include Dolibarr environment
+require_once($path."../../htdocs/master.inc.php");
+// After this $db is a defined handler to database.
+
+// Main
+$version='1';
+@set_time_limit(0);
+$error=0;
+
+$langs->load("main");
+
+
+print "***** $script_file ($version) *****\n";
+
+
+// -------------------- START OF BUILD_API_FROM_CLASS --------------------
+
+// Check parameters
+if (! isset($argv[1]) && ! isset($argv[2]))
+{
+    print "Usage: $script_file phpClassFile phpClassName\n";
+    exit;
+}
+// Show parameters
+print 'Classfile='.$argv[1]."\n";
+print 'Classname='.$argv[2]."\n";
+
+$classfile=$argv[1];
+$classname=$argv[2];
+$classmin=strtolower($classname);
+$classnameApi = $classname.'Api';
+$property=array();
+$targetcontent='';
+
+// Load the class and read properties
+require_once($classfile);
+
+$property=array();
+$class = new $classname($db);
+$values=get_class_vars($classname);
+
+unset($values['db']);
+unset($values['error']);
+unset($values['errors']);
+unset($values['element']);
+unset($values['table_element']);
+unset($values['table_element_line']);
+unset($values['fk_element']);
+unset($values['ismultientitymanaged']);
+
+// Read skeleton_api_class.class.php file
+$skeletonfile=$path.'skeleton_api_class.class.php';
+$sourcecontent=file_get_contents($skeletonfile);
+if (! $sourcecontent)
+{
+	print "\n";
+	print "Error: Failed to read skeleton sample '".$skeletonfile."'\n";
+	print "Try to run script from skeletons directory.\n";
+	exit;
+}
+
+// Define output variables
+$outfile='out.api_'.$classmin.'.class.php';
+$targetcontent=$sourcecontent;
+
+// Substitute class name
+$targetcontent=preg_replace('/skeleton_api_class\.class\.php/', 'api_'.$classmin.'.class.php', $targetcontent);
+$targetcontent=preg_replace('/skeleton/', $classmin, $targetcontent);
+//$targetcontent=preg_replace('/\$table_element=\'skeleton\'/', '\$table_element=\''.$tablenoprefix.'\'', $targetcontent);
+$targetcontent=preg_replace('/SkeletonApi/', $classnameApi, $targetcontent);
+$targetcontent=preg_replace('/Skeleton/', $classname, $targetcontent);
+
+// Build file
+$fp=fopen($outfile,"w");
+if ($fp)
+{
+	fputs($fp, $targetcontent);
+	fclose($fp);
+	print "\n";
+	print "File '".$outfile."' has been built in current directory.\n";
+}
+else $error++;
+
+
+
+// -------------------- END OF BUILD_CLASS_FROM_TABLE SCRIPT --------------------
+
+print "You can now rename generated files by removing the 'out.' prefix in their name and store them into directory /module/class.\n";
+return $error;
--- a/dev/skeletons/build_class_from_table.php
+++ b/dev/skeletons/build_class_from_table.php
@@ -0,0 +1,678 @@
+#!/usr/bin/env php
+<?php
+/* Copyright (C) 2008-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2017 Nicolas ZABOURI  <info@inovea-conseil.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       dev/skeletons/build_class_from_table.php
+ *  \ingroup    core
+ *  \brief      Create a complete class file from a table in database
+ */
+
+$sapi_type = php_sapi_name();
+$script_file = basename(__FILE__);
+$path=dirname(__FILE__).'/';
+
+// Test if batch mode
+if (substr($sapi_type, 0, 3) == 'cgi') {
+    echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
+    exit;
+}
+
+// Include Dolibarr environment
+require_once($path."../../htdocs/master.inc.php");
+// After this $db is a defined handler to database.
+
+// Main
+$version='3.2';
+@set_time_limit(0);
+$error=0;
+
+$langs->load("main");
+
+
+print "***** $script_file ($version) *****\n";
+
+
+// -------------------- START OF BUILD_CLASS_FROM_TABLE SCRIPT --------------------
+
+// Check parameters
+if (! isset($argv[1]) || ! isset($argv[2]) || (isset($argv[3]) && ! isset($argv[7])))
+{
+    print "Usage: $script_file tablename modulename [server port databasename user pass]\n";
+    exit;
+}
+
+if (isset($argv[3]) && isset($argv[4]) && isset($argv[5]) && isset($argv[6]) && isset($argv[7]))
+{
+	print 'Use specific database ids'."\n";
+	$db=getDoliDBInstance('mysqli',$argv[3],$argv[6],$argv[7],$argv[5],$argv[4]);
+}
+
+if ($db->type != 'mysql' && $db->type != 'mysqli')
+{
+	print "Error: This script works with mysql or mysqli driver only\n";
+	exit;
+}
+
+$table=$argv[1];
+$module=$argv[2];
+
+// Show parameters
+print 'Tablename: '.$table."\n";
+print 'Modulename: '.$module."\n";
+print "Current dir: ".getcwd()."\n";
+print "Database name: ".$db->database_name."\n";
+
+
+// Define array with list of properties
+$property=array();
+$foundprimary=0;
+$resql=$db->DDLDescTable($table);
+if ($resql)
+{
+	$i=0;
+	while($obj=$db->fetch_object($resql))
+	{
+		//var_dump($obj);
+		$i++;
+		$property[$i]['field']=$obj->Field;
+		if ($obj->Key == 'PRI')
+		{
+			$property[$i]['primary']=1;
+			$foundprimary=1;
+		}
+		else
+		{
+			$property[$i]['primary']=1;
+		}
+		$property[$i]['type'] =$obj->Type;
+		$property[$i]['null'] =$obj->Null;
+		$property[$i]['extra']=$obj->Extra;
+		if ($property[$i]['type'] == 'date'
+			|| $property[$i]['type'] == 'datetime'
+			|| $property[$i]['type'] == 'timestamp')
+		{
+			$property[$i]['istime']=true;
+		}
+		else
+		{
+			$property[$i]['istime']=false;
+		}
+		if (preg_match('/varchar/i',$property[$i]['type'])
+			|| preg_match('/text/i',$property[$i]['type']))
+		{
+			$property[$i]['ischar']=true;
+		}
+		else
+		{
+			$property[$i]['ischar']=false;
+		}
+		if (preg_match('/int/i',$property[$i]['type']))
+		{
+			$property[$i]['isint']=true;
+		}
+		else
+		{
+			$property[$i]['isint']=false;
+		}
+	}
+}
+else
+{
+	print "Error: Failed to get description for table '".$table."'.\n";
+	return false;
+}
+//var_dump($property);
+
+// Define substitute fetch/select parameters
+$varpropselect="\n";
+$cleanparam='';
+$i=0;
+foreach($property as $key => $prop)
+{
+    $i++;
+    if ($prop['field'] != 'rowid')
+    {
+        $varpropselect.="\t\t\$sql .= \" ";
+        $varpropselect.="t.".$prop['field'];
+        if ($i < count($property)) $varpropselect.=",";
+        $varpropselect.="\";";
+        $varpropselect.="\n";
+    }
+}
+
+
+
+//--------------------------------
+// Build skeleton_class.class.php
+//--------------------------------
+
+// Define working variables
+$table=strtolower($table);
+$tablenoprefix=preg_replace('/'.preg_quote(MAIN_DB_PREFIX,'/').'/i','',$table);
+$classname=preg_replace('/_/','',ucfirst($tablenoprefix));
+$classmin=preg_replace('/_/','',strtolower($classname));
+
+
+// Read skeleton_class.class.php file
+$skeletonfile=$path.'skeleton_class.class.php';
+$sourcecontent=file_get_contents($skeletonfile);
+if (! $sourcecontent)
+{
+	print "\n";
+	print "Error: Failed to read skeleton sample '".$skeletonfile."'\n";
+	print "Try to run script from skeletons directory.\n";
+	exit;
+}
+
+// Define output variables
+$outfile=$classmin.'.class.php';
+$targetcontent=$sourcecontent;
+
+// Substitute module name
+$targetcontent=preg_replace('/dev\/skeletons/', $module, $targetcontent);
+$targetcontent=preg_replace('/mymodule othermodule1 othermodule2/', $module, $targetcontent);
+$targetcontent=preg_replace('/mymodule/', $module, $targetcontent);
+
+// Substitute class name
+$targetcontent=preg_replace('/skeleton_class\.class\.php/', $classmin.'.class.php', $targetcontent);
+$targetcontent=preg_replace('/\$element = \'skeleton\'/', '\$element = \''.$classmin.'\'', $targetcontent);
+$targetcontent=preg_replace('/\$table_element = \'skeleton\'/', '\$table_element = \''.$tablenoprefix.'\'', $targetcontent);
+$targetcontent=preg_replace('/Skeleton_Class/', $classname, $targetcontent);
+$targetcontent=preg_replace('/skeletons/', $classmin, $targetcontent);
+$targetcontent=preg_replace('/skeleton/', $classmin, $targetcontent);
+
+// Substitute comments
+$targetcontent=preg_replace('/This file is an example to create a new class file/', 'Put here description of this class', $targetcontent);
+$targetcontent=preg_replace('/\s*\/\/\.\.\./', '', $targetcontent);
+$targetcontent=preg_replace('/Put here some comments/','Initialy built by build_class_from_table on '.strftime('%Y-%m-%d %H:%M',mktime()), $targetcontent);
+
+// Substitute table name
+$targetcontent=preg_replace('/MAIN_DB_PREFIX."mytable/', 'MAIN_DB_PREFIX."'.$tablenoprefix, $targetcontent);
+
+// Substitute declaration parameters
+$varprop="\n";
+$cleanparam='';
+foreach($property as $key => $prop)
+{
+	if ($prop['field'] != 'rowid' && $prop['field'] != 'id')
+	{
+		$varprop.="\tpublic \$".$prop['field'];
+		if ($prop['istime']) $varprop.=" = ''";
+		$varprop.=";";
+		if ($prop['comment']) $varprop.="\t// ".$prop['extra'];
+		$varprop.="\n";
+	}
+}
+$targetcontent=preg_replace('/'.preg_quote('public $prop1;','/').'/', $varprop, $targetcontent);
+$targetcontent=preg_replace('/'.preg_quote('public $prop2;','/').'/', '', $targetcontent);
+
+$targetcontent=preg_replace('/\*((\s|\n|\r|\t)*)\@var mixed Sample property 1((\s|\n|\r|\t)*)/', '', $targetcontent);
+$targetcontent=preg_replace('/\*((\s|\n|\r|\t)*)\@var mixed Sample property 2((\s|\n|\r|\t)*)/', '', $targetcontent);
+
+// Substitute clean parameters
+$varprop="\n";
+$cleanparam='';
+foreach($property as $key => $prop)
+{
+	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
+	{
+		$varprop.="\t\tif (isset(\$this->".$prop['field'].")) {\n\t\t\t \$this->".$prop['field']." = trim(\$this->".$prop['field'].");\n\t\t}";
+		$varprop.="\n";
+	}
+}
+$targetcontent=preg_replace('/if \(isset\(\$this->prop1\)\) {((\n|\r|\t)*)\$this->prop1 = trim\(\$this->prop1\);((\n|\r|\t)*)}/', $varprop, $targetcontent);
+$targetcontent=preg_replace('/if \(isset\(\$this->prop2\)\) {((\n|\r|\t)*)\$this->prop2 = trim\(\$this->prop2\);((\n|\r|\t)*)}/', '', $targetcontent);
+
+
+$no_output_field=0;
+foreach($property as $key => $prop)
+{
+	if ($prop['field'] == 'tms') $no_output_field++;	// This is a field of type timestamp edited automatically
+	if ($prop['extra'] == 'auto_increment') $no_output_field++;
+}
+// Substitute insert into parameters
+$varprop="\n";
+$cleanparam='';
+$i=0;
+foreach($property as $key => $prop)
+{
+	
+	$addfield=1;
+	if ($prop['field'] == 'tms') $addfield=0;	// This is a field of type timestamp edited automatically
+	if ($prop['extra'] == 'auto_increment') $addfield=0;
+
+	if ($addfield)
+	{
+		$varprop.="\t\t\$sql.= '".$prop['field'];
+		if ($i < (count($property)-$no_output_field)) $varprop.=",";
+		$varprop.="';";
+		$varprop.="\n";
+	}
+	$i++;
+}
+$targetcontent=preg_replace('/\$sql \.= \' field1,\';/', $varprop, $targetcontent);
+$targetcontent=preg_replace('/\$sql \.= \' field2\';/', '', $targetcontent);
+
+// Substitute insert values parameters
+$varprop="\n";
+$cleanparam='';
+$i=0;
+
+//Count nb field to output to manage commat at end SQL instruction
+
+
+foreach($property as $key => $prop)
+{
+	
+	$addfield=1;
+	if ($prop['field'] == 'tms') $addfield=0;	// This is a field of type timestamp edited automatically
+	if ($prop['extra'] == 'auto_increment') $addfield=0;
+	
+	if ($addfield)
+	{
+		$i++;
+		
+		$varprop.="\t\t\$sql .= ' ";
+		if ($prop['field']=='datec')
+		{
+			$varprop.='\'."\'".$this->db->idate(dol_now())."\'"';
+		}
+		elseif ($prop['istime'])
+		{
+			$varprop.='\'.(! isset($this->'.$prop['field'].') || dol_strlen($this->'.$prop['field'].')==0?\'NULL\':"\'".$this->db->idate(';
+			$varprop.="\$this->".$prop['field'];
+			$varprop.=").\"'\")";
+		}
+		elseif ($prop['ischar'])
+		{
+			$varprop.="'.(! isset(\$this->".$prop['field'].")?'NULL':\"'\".";
+			$varprop.="\$this->db->escape(\$this->".$prop['field'].")";
+			$varprop.=".\"'\")";
+		}
+		elseif ($prop['field']=='fk_user_mod' || $prop['field']=='fk_user_author')
+		{
+			$varprop.="'.\$user->id";
+		}
+		elseif ($prop['isint'])
+		{
+			$varprop.='\'.(! isset($this->'.$prop['field'].')?\'NULL\':';
+			$varprop.="\$this->".$prop['field'];
+			$varprop.=')';
+		}
+		else
+		{
+			$varprop.='\'.(! isset($this->'.$prop['field'].')?\'NULL\':"\'".';
+			$varprop.="\$this->".$prop['field'];
+			$varprop.='."\'")';
+		}
+		
+		if ($i < (count($property)-$no_output_field)) $varprop.=".','";
+		$varprop.=';';
+		$varprop.="\n";
+	}
+}
+
+$patern1='/\$sql \.= \' (.*)\' \. \$this->prop1 \. \'(.*),\';/';
+$patern2='/\$sql \.= \' (.*)\' \. \$this->prop2 \. \'(.*)\';/';
+$targetcontent=preg_replace($patern1, $varprop, $targetcontent);
+$targetcontent=preg_replace($patern2, '', $targetcontent);
+
+// Substitute update values parameters
+
+//Count nb field to output to manage commat at end SQL instruction
+$no_output_field=0;
+foreach($property as $key => $prop)
+{
+	if ($prop['extra'] == 'auto_increment') $no_output_field++;
+}
+
+$varprop="\n";
+$cleanparam='';
+$i=0;
+foreach($property as $key => $prop)
+{
+	
+	$addfield=1;
+	if ($prop['extra'] == 'auto_increment') $addfield=0;
+	
+	if ($addfield)
+	{
+		$i++;
+		
+		$varprop.="\t\t\$sql .= ' ";
+		$varprop.=$prop['field'].' = ';
+		if ($prop['field']=='tms') {
+			$varprop.='\'.(dol_strlen($this->'.$prop['field'].') != 0 ? "\'".$this->db->idate(';
+			$varprop.='$this->'.$prop['field'];
+			$varprop.=')."\'" : "\'".$this->db->idate(dol_now())."\'")';
+		}
+		elseif ($prop['istime'])
+		{
+			$varprop.='\'.(! isset($this->'.$prop['field'].') || dol_strlen($this->'.$prop['field'].') != 0 ? "\'".$this->db->idate(';
+			$varprop.='$this->'.$prop['field'];
+			$varprop.=')."\'" : \'null\')';
+		}
+		
+		elseif ($prop['field']=='fk_user_mod') {
+			$varprop.="'.\$user->id";
+		}
+		else
+		{
+			$varprop.="'.";
+			if ($prop['ischar']) $varprop.='(isset($this->'.$prop['field'].')?"\'".$this->db->escape($this->'.$prop['field'].')."\'":"null")';
+			elseif ($prop['isint']) $varprop.='(isset($this->'.$prop['field'].')?$this->'.$prop['field'].':"null")';
+			else $varprop.='(isset($this->'.$prop['field'].')?$this->'.$prop['field'].':"null")';
+		}
+
+		if ($i < (count($property)-$no_output_field)) $varprop.=".','";
+		$varprop.=';';
+		$varprop.="\n";
+	}
+}
+$targetcontent=preg_replace('/\$sql \.= " field1=".\(isset\(\$this->field1\)\?"\'".\$this->db->escape\(\$this->field1\)."\'":"null"\).",";/', $varprop, $targetcontent);
+$targetcontent=preg_replace('/\$sql \.= " field2=".\(isset\(\$this->field2\)\?"\'".\$this->db->escape\(\$this->field2\)."\'":"null"\)."";/', '', $targetcontent);
+
+// Substitute fetch/select parameters
+$targetcontent=preg_replace('/\$sql \.= \' t\.field1,\';/', $varpropselect, $targetcontent);
+$targetcontent=preg_replace('/\$sql \.= \' t\.field2\';/', '', $targetcontent);
+
+// Substitute select set parameters
+$varprop="\n";
+$varpropline="\n";
+$cleanparam='';
+$i=0;
+foreach($property as $key => $prop)
+{
+	$i++;
+	if ($prop['field'] != 'rowid' && $prop['field'] != 'id')
+	{
+		$varprop.="\t\t\t\t\$this->".$prop['field']." = ";
+		if ($prop['istime']) $varprop.='$this->db->jdate(';
+		$varprop.='$obj->'.$prop['field'];
+		if ($prop['istime']) $varprop.=')';
+		$varprop.=";";
+		$varprop.="\n";
+		
+		$varpropline.="\t\t\t\t\$line->".$prop['field']." = ";
+		if ($prop['istime']) $varpropline.='$this->db->jdate(';
+		$varpropline.='$obj->'.$prop['field'];
+		if ($prop['istime']) $varpropline.=')';
+		$varpropline.=";";
+		$varpropline.="\n";
+	}
+}
+$targetcontent=preg_replace('/\$this->prop1 = \$obj->field1;/', $varprop, $targetcontent);
+$targetcontent=preg_replace('/\$this->prop2 = \$obj->field2;/', '', $targetcontent);
+
+//Substirute fetchAll
+$targetcontent=preg_replace('/\$line->prop1 = \$obj->field1;/', $varpropline, $targetcontent);
+$targetcontent=preg_replace('/\$line->prop2 = \$obj->field2;/', '', $targetcontent);
+
+
+// Substitute initasspecimen parameters
+$varprop="\n";
+$cleanparam='';
+foreach($property as $key => $prop)
+{
+	if ($prop['field'] != 'rowid' && $prop['field'] != 'id')
+	{
+		$varprop.="\t\t\$this->".$prop['field']." = '';";
+		$varprop.="\n";
+	}
+}
+$targetcontent=preg_replace('/\$this->prop1 = \'prop1\';/', $varprop, $targetcontent);
+$targetcontent=preg_replace('/\$this->prop2 = \'prop2\';/', '', $targetcontent);
+
+// Build file
+$fp=fopen($outfile,"w");
+if ($fp)
+{
+	fputs($fp, $targetcontent);
+	fclose($fp);
+	print "\n";
+	print "File '".$outfile."' has been built in current directory.\n";
+}
+else $error++;
+
+
+
+//--------------------------------------------------------------------
+// Build skeleton_script.php, skeleton_list.php and skeleton_card.php
+//--------------------------------------------------------------------
+
+$skeletonfiles=array(
+    $path.'skeleton_script.php' => $classmin.'_script.php', 
+    $path.'skeleton_list.php' => $classmin.'_list.php', 
+    $path.'skeleton_card.php' => $classmin.'_card.php'
+    );
+    
+foreach ($skeletonfiles as $skeletonfile => $outfile)
+{
+    $sourcecontent=file_get_contents($skeletonfile);
+    if (! $sourcecontent)
+    {
+    	print "\n";
+    	print "Error: Failed to read skeleton sample '".$skeletonfile."'\n";
+    	print "Try to run script from skeletons directory.\n";
+    	exit;
+    }
+    
+    // Define output variables
+    $targetcontent=$sourcecontent;
+    
+    // Substitute module name
+    $targetcontent=preg_replace('/dev\/skeletons/', $module, $targetcontent);
+    $targetcontent=preg_replace('/mymodule othermodule1 othermodule2/', $module, $targetcontent);
+    $targetcontent=preg_replace('/mymodule/', $module, $targetcontent);
+    
+    // Substitute class name
+    $targetcontent=preg_replace('/skeleton_class\.class\.php/', $classmin.'.class.php', $targetcontent);
+    $targetcontent=preg_replace('/skeleton_script\.php/', $classmin.'_script.php', $targetcontent);
+    $targetcontent=preg_replace('/\$element = \'skeleton\'/', '\$element=\''.$classmin.'\'', $targetcontent);
+    $targetcontent=preg_replace('/\$table_element = \'skeleton\'/', '\$table_element=\''.$classmin.'\'', $targetcontent);
+    $targetcontent=preg_replace('/Skeleton_Class/', $classname, $targetcontent);
+    $targetcontent=preg_replace('/skeletons/', $classmin, $targetcontent);
+    $targetcontent=preg_replace('/skeleton/', $classmin, $targetcontent);
+    
+    // Substitute comments
+    $targetcontent=preg_replace('/This file is an example to create a new class file/', 'Put here description of this class', $targetcontent);
+    $targetcontent=preg_replace('/\s*\/\/\.\.\./', '', $targetcontent);
+    $targetcontent=preg_replace('/Put here some comments/','Initialy built by build_class_from_table on '.strftime('%Y-%m-%d %H:%M',mktime()), $targetcontent);
+    
+    // Substitute table name
+    $targetcontent=preg_replace('/MAIN_DB_PREFIX."mytable/', 'MAIN_DB_PREFIX."'.$tablenoprefix, $targetcontent);
+        
+    // Substitute GETPOST search_fieldx
+    $varprop="\n";
+    $cleanparam='';
+    foreach($property as $key => $prop)
+    {
+    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
+    	{
+    	    if ($prop['isint']) $varprop.='$search_'.$prop['field']."=GETPOST('search_".$prop['field']."','int');\n";
+    	    else $varprop.='$search_'.$prop['field']."=GETPOST('search_".$prop['field']."','alpha');\n";
+    	}
+    }
+    $targetcontent=preg_replace('/'.preg_quote('$search_field1=GETPOST("search_field1");','/').'/', $varprop, $targetcontent);
+    $targetcontent=preg_replace('/'.preg_quote('$search_field2=GETPOST("search_field2");','/').'/', '', $targetcontent);
+    
+    // Substitute GETPOST fieldx
+    $varprop="\n";
+    $cleanparam='';
+    foreach($property as $key => $prop)
+    {
+    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
+    	{
+    	    if ($prop['isint']) $varprop.="\t\$object->".$prop['field']."=GETPOST('".$prop['field']."','int');\n";
+    	    else $varprop.="\t\$object->".$prop['field']."=GETPOST('".$prop['field']."','alpha');\n";
+    	}
+    }
+    $targetcontent=preg_replace('/'.preg_quote('$object->prop1=GETPOST("field1");','/').'/', $varprop, $targetcontent);
+    $targetcontent=preg_replace('/'.preg_quote('$object->prop2=GETPOST("field2");','/').'/', '', $targetcontent);
+    
+    // Substitute reset search_field = '';
+    $varprop="\n";
+    $cleanparam='';
+    foreach($property as $key => $prop)
+    {
+    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
+    	{
+    	    $varprop.='$search_'.$prop['field']."='';\n";
+    	}
+    }
+    $targetcontent=preg_replace('/'.preg_quote('$search_field1=\'\';','/').'/', $varprop, $targetcontent);
+    $targetcontent=preg_replace('/'.preg_quote('$search_field2=\'\';','/').'/', '', $targetcontent);
+    
+    // Substitute fetch/select parameters
+    $targetcontent=preg_replace('/\$sql\s*\.= " t\.field1,";/', $varpropselect, $targetcontent);
+    $targetcontent=preg_replace('/\$sql\s*\.= " t\.field2";/', '', $targetcontent);
+    
+    // Substitute where for search
+    $varprop="\n";
+    $cleanparam='';
+    foreach($property as $key => $prop)
+    {
+    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
+    	{
+    	    $varprop.='if ($search_'.$prop['field'].') $sql.= natural_search("'.$prop['field'].'",$search_'.$prop['field'].');'."\n";
+    	}
+    }
+    $targetcontent=preg_replace('/'.preg_quote('if ($search_field1) $sql.= natural_search("field1",$search_field1);','/').'/', $varprop, $targetcontent);
+    $targetcontent=preg_replace('/'.preg_quote('if ($search_field2) $sql.= natural_search("field2",$search_field2);','/').'/', '', $targetcontent);
+    
+    // substitute $params.=
+    $varprop="\n";
+    $cleanparam='';
+    foreach($property as $key => $prop)
+    {
+    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
+    	{
+    	    $varprop.="if (\$search_".$prop['field']." != '') \$params.= '&amp;search_".$prop['field']."='.urlencode(\$search_".$prop['field'].");\n";
+    	}
+    }
+    $targetcontent=preg_replace('/'.preg_quote("if (\$search_field1 != '') \$params.= '&amp;search_field1='.urlencode(\$search_field1);",'/').'/', $varprop, $targetcontent);
+    $targetcontent=preg_replace('/'.preg_quote("if (\$search_field2 != '') \$params.= '&amp;search_field2='.urlencode(\$search_field2);",'/').'/', '', $targetcontent);
+    
+    // Substitute arrayfields
+    $varprop="\n";
+    $cleanparam='';
+    foreach($property as $key => $prop)
+    {
+    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
+    	{
+    	    $varprop.="'t.".$prop['field']."'=>array('label'=>\$langs->trans(\"Field".$prop['field']."\"), 'checked'=>1),\n";
+    	}
+    }
+    $targetcontent=preg_replace('/'.preg_quote("'t.field1'=>array('label'=>\$langs->trans(\"Field1\"), 'checked'=>1),",'/').'/', $varprop, $targetcontent);
+    $targetcontent=preg_replace('/'.preg_quote("'t.field2'=>array('label'=>\$langs->trans(\"Field2\"), 'checked'=>1),",'/').'/', '', $targetcontent);
+    
+    // Substitute print_liste_field_titre
+    $varprop="\n";
+    $cleanparam='';
+    foreach($property as $key => $prop)
+    {
+    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
+    	{
+    	    $varprop.="if (! empty(\$arrayfields['t.".$prop['field']."']['checked'])) print_liste_field_titre(\$arrayfields['t.".$prop['field']."']['label'],\$_SERVER['PHP_SELF'],'t.".$prop['field']."','',\$params,'',\$sortfield,\$sortorder);\n";
+    	}
+    }
+    $targetcontent=preg_replace('/LIST_OF_TD_TITLE_FIELDS/', $varprop, $targetcontent);
+    
+    // Substitute fields title search
+    $varprop="\n";
+    $cleanparam='';
+    foreach($property as $key => $prop)
+    {
+    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
+    	{
+    	    $varprop.="if (! empty(\$arrayfields['t.".$prop['field']."']['checked'])) print '<td class=\"liste_titre\"><input type=\"text\" class=\"flat\" name=\"search_".$prop['field']."\" value=\"'.\$search_".$prop['field'].".'\" size=\"10\"></td>';\n";
+    	}
+    }
+    $targetcontent=preg_replace('/LIST_OF_TD_TITLE_SEARCH/', $varprop, $targetcontent);
+    
+    // Substitute where for <td>.fieldx.</td>
+    $varprop="\n";
+    $cleanparam='';
+    foreach($property as $key => $prop)
+    {
+    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
+    	{
+    	    $varprop.="if (! empty(\$arrayfields['t.".$prop['field']."']['checked'])) print '<td>'.\$obj->".$prop['field'].".'</td>';\n";
+    	}
+    }
+    $targetcontent=preg_replace('/'.preg_quote("if (! empty(\$arrayfields['t.field1']['checked'])) print '<td>'.\$obj->field1.'</td>';",'/').'/', $varprop, $targetcontent);
+    $targetcontent=preg_replace('/'.preg_quote("if (! empty(\$arrayfields['t.field2']['checked'])) print '<td>'.\$obj->field2.'</td>';",'/').'/', '', $targetcontent);
+
+    // LIST_OF_TD_LABEL_FIELDS_CREATE - List of td for card view 
+    $varprop="\n";
+    $cleanparam='';
+    foreach($property as $key => $prop)
+    {
+    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
+    	{
+    	    $varprop.="print '<tr><td class=\"fieldrequired\">'.\$langs->trans(\"Field".$prop['field']."\").'</td><td><input class=\"flat\" type=\"text\" name=\"".$prop['field']."\" value=\"'.GETPOST('".$prop['field']."').'\"></td></tr>';\n";
+    	}
+    }
+    $targetcontent=preg_replace('/LIST_OF_TD_LABEL_FIELDS_CREATE/', $varprop, $targetcontent);
+
+    // LIST_OF_TD_LABEL_FIELDS_EDIT - List of td for card view 
+    $varprop="\n";
+    $cleanparam='';
+    foreach($property as $key => $prop)
+    {
+    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
+    	{
+    	    $varprop.="print '<tr><td class=\"fieldrequired\">'.\$langs->trans(\"Field".$prop['field']."\").'</td><td><input class=\"flat\" type=\"text\" name=\"".$prop['field']."\" value=\"'.\$object->".$prop['field'].".'\"></td></tr>';\n";
+    	}
+    }
+    $targetcontent=preg_replace('/LIST_OF_TD_LABEL_FIELDS_EDIT/', $varprop, $targetcontent);
+    
+    // LIST_OF_TD_LABEL_FIELDS_VIEW - List of td for card view 
+    $varprop="\n";
+    $cleanparam='';
+    foreach($property as $key => $prop)
+    {
+    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
+    	{
+    	    $varprop.="print '<tr><td class=\"fieldrequired\">'.\$langs->trans(\"Field".$prop['field']."\").'</td><td>'.\$object->".$prop['field'].".'</td></tr>';\n";
+    	}
+    }
+    $targetcontent=preg_replace('/LIST_OF_TD_LABEL_FIELDS_VIEW/', $varprop, $targetcontent);
+    
+    
+    // LIST_OF_TD_FIELDS_LIST
+    
+    
+    
+    // Build file
+    $fp=fopen($outfile,"w");
+    if ($fp)
+    {
+    	fputs($fp, $targetcontent);
+    	fclose($fp);
+    	print "File '".$outfile."' has been built in current directory.\n";
+    }
+    else $error++;
+}
+
+
+// -------------------- END OF BUILD_CLASS_FROM_TABLE SCRIPT --------------------
+
+print "You can now move generated files to store them into directory /yourmodule/class (for .class.php file) or /yourmodule.\n";
+return $error;
--- a/dev/skeletons/build_webservice_from_class.php
+++ b/dev/skeletons/build_webservice_from_class.php
@@ -0,0 +1,179 @@
+#!/usr/bin/env php
+<?php
+/* Copyright (C) 2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       dev/skeletons/build_webservice_from_class.php
+ *  \ingroup    core
+ *  \brief      Create a complete webservice file from CRUD functions of a PHP class
+ */
+
+$sapi_type = php_sapi_name();
+$script_file = basename(__FILE__);
+$path=dirname(__FILE__).'/';
+
+// Test if batch mode
+if (substr($sapi_type, 0, 3) == 'cgi') {
+    echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
+    exit;
+}
+
+// Include Dolibarr environment
+require_once($path."../../htdocs/master.inc.php");
+// After this $db is a defined handler to database.
+
+// Main
+$version='1.8';
+@set_time_limit(0);
+$error=0;
+
+$langs->load("main");
+
+
+print "***** $script_file ($version) *****\n";
+
+
+// -------------------- START OF BUILD_CLASS_FROM_TABLE SCRIPT --------------------
+
+// Check parameters
+if (! isset($argv[1]) && ! isset($argv[2]))
+{
+    print "Usage: $script_file phpClassFile phpClassName\n";
+    exit;
+}
+
+// Show parameters
+print 'Classfile='.$argv[1]."\n";
+print 'Classname='.$argv[2]."\n";
+
+$classfile=$argv[1];
+$classname=$argv[2];
+$classmin=strtolower($classname);
+$property=array();
+$targetcontent='';
+
+// Load the class and read properties
+require_once($classfile);
+
+$property=array();
+$class = new $classname($db);
+$values=get_class_vars($classname);
+
+unset($values['db']);
+unset($values['error']);
+unset($values['errors']);
+unset($values['element']);
+unset($values['table_element']);
+unset($values['table_element_line']);
+unset($values['fk_element']);
+unset($values['ismultientitymanaged']);
+
+$properties=array_keys($values);
+
+// Read skeleton_class.class.php file
+$skeletonfile='skeleton_webservice_server.php';
+$sourcecontent=file_get_contents($skeletonfile);
+if (! $sourcecontent)
+{
+	print "\n";
+	print "Error: Failed to read skeleton sample '".$skeletonfile."'\n";
+	print "Try to run script from skeletons directory.\n";
+	exit;
+}
+
+// Define output variables
+$outfile='out.server_'.$classmin.'.php';
+$targetcontent=$sourcecontent;
+
+
+
+// Substitute class name
+$targetcontent=preg_replace('/Skeleton/', $classname, $targetcontent);
+$targetcontent=preg_replace('/skeleton/', $classmin, $targetcontent);
+
+// Substitute declaration parameters
+$varprop="\n";
+$cleanparam='';
+$i=0;
+
+while($i<count($properties))
+{
+		$varprop.="'".$properties[$i]."' => array('name'=>'".$properties[$i]."','type'=>'xsd:string')";
+		$i++;
+
+		if ($i == count($properties))
+			$varprop.="\n";
+		else
+			$varprop.=",\n";
+}
+
+$targetcontent=preg_replace('/\'prop1\'=>\'xxx\',/', $varprop, $targetcontent);
+$targetcontent=preg_replace('/\'prop2\'=>\'xxx\',/', '', $targetcontent);
+// Substitute get method parameters
+$varprop="\n";
+$cleanparam='';
+$i=0;
+
+while($i<count($properties))
+{
+		$varprop.="'".$properties[$i]."' => $".$classmin."->".$properties[$i];
+
+		$i++;
+		if ($i == count($properties))
+			$varprop.="\n";
+		else
+			$varprop.=",\n";
+}
+
+$targetcontent=preg_replace('/\'prop1\'=>\$'.$classmin.'->prop1,/', $varprop, $targetcontent);
+$targetcontent=preg_replace('/\'prop2\'=>\$'.$classmin.'->prop2,/', '', $targetcontent);
+
+// Substitute get method parameters
+$varprop="\n\t\t";
+$cleanparam='';
+$i=0;
+
+while($i<count($properties))
+{
+
+	$varprop.='$newobject->'.$properties[$i].'=$'.$classmin.'->'.$properties[$i].';';
+
+	$i++;
+	if ($i == count($properties))
+		$varprop.="\n";
+	else
+		$varprop.="\n\t\t";
+}
+$targetcontent=preg_replace('/\$newobject->prop1=\$'.$classmin.'->prop1;/', $varprop, $targetcontent);
+$targetcontent=preg_replace('/\$newobject->prop2=\$'.$classmin.'->prop2;/', '', $targetcontent);
+
+
+
+// Build file
+$fp=fopen($outfile,"w");
+if ($fp)
+{
+	fputs($fp, $targetcontent);
+	fclose($fp);
+	print "File '".$outfile."' has been built in current directory.\n";
+}
+else $error++;
+
+// -------------------- END OF BUILD_CLASS_FROM_TABLE SCRIPT --------------------
+
+print "You must rename files by removing the 'out.' prefix in their name.\n";
+return $error;
--- a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
+++ b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
@@ -19,8 +19,8 @@

 /**
 * 	\defgroup   mymodule     Module MyModule
- *  \brief      MyModule module descriptor.
- *
+ *  \brief      Example of a module descriptor.
+ *				Such a file must be copied into htdocs/mymodule/core/modules directory.
 *  \file       htdocs/mymodule/core/modules/modMyModule.class.php
 *  \ingroup    mymodule
 *  \brief      Description and activation file for module MyModule
@@ -28,15 +28,11 @@
 include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';


-// The class name should start with a lower case mod for Dolibarr to pick it up
-// so we ignore the Squiz.Classes.ValidClassName.NotCamelCaps rule.
-// @codingStandardsIgnoreStart
 /**
 *  Description and activation class for module MyModule
 */
 class modMyModule extends DolibarrModules
 {
-	// @codingStandardsIgnoreEnd
 	/**
 	 * Constructor. Define names, constants, directories, boxes, permissions
 	 *
@@ -50,7 +46,7 @@ class modMyModule extends DolibarrModules

 		// Id for module (must be unique).
 		// Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
-		$this->numero = 500000;		// TODO Go on page https://wiki.dolibarr.org/index.php/List_of_modules_id to reserve id number for your module
+		$this->numero = 500000;		// TODO Go on page http://wiki.dolibarr.org/index.php/List_of_modules_id to reserve id number for your module
 		// Key text used to identify module (for permissions, menus, etc...)
 		$this->rights_class = 'mymodule';

@@ -62,16 +58,14 @@ class modMyModule extends DolibarrModules
 		// Gives the possibility to the module, to provide his own family info and position of this family (Overwrite $this->family and $this->module_position. Avoid this)
 		//$this->familyinfo = array('myownfamily' => array('position' => '001', 'label' => $langs->trans("MyOwnFamily")));

-		// Module label (no space allowed), used if translation string 'ModuleMyModuleName' not found (MyModue is name of module).
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
 		$this->name = preg_replace('/^mod/i','',get_class($this));
-		// Module description, used if translation string 'ModuleMyModuleDesc' not found (MyModue is name of module).
-		$this->description = "MyModuleDescription";
-		// Used only if file README.md and README-LL.md not found.
-		$this->descriptionlong = "MyModuleDescription (Long)";
-
+		// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
+		$this->description = "Description of module MyModule";
+		$this->descriptionlong = "A very long description. Can be a full HTML content";
 		$this->editor_name = 'Editor name';
-		$this->editor_url = 'https://www.example.com';
-
+		$this->editor_url = 'https://www.dolibarr.org';
+		
 		// Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
 		$this->version = '1.0';
 		// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
@@ -85,26 +79,29 @@ class modMyModule extends DolibarrModules
 		// for default path (eg: /mymodule/core/xxxxx) (0=disable, 1=enable)
 		// for specific path of parts (eg: /mymodule/core/modules/barcode)
 		// for specific css file (eg: /mymodule/css/mymodule.css.php)
-		$this->module_parts = array(
-		                        	'triggers' => 1,                                 	// Set this to 1 if module has its own trigger directory (core/triggers)
-									'login' => 0,                                    	// Set this to 1 if module has its own login method directory (core/login)
-									'substitutions' => 0,                            	// Set this to 1 if module has its own substitution function file (core/substitutions)
-									'menus' => 0,                                    	// Set this to 1 if module has its own menus handler directory (core/menus)
-									'theme' => 0,                                    	// Set this to 1 if module has its own theme directory (theme)
-		                        	'tpl' => 0,                                      	// Set this to 1 if module overwrite template dir (core/tpl)
-									'barcode' => 0,                                  	// Set this to 1 if module has its own barcode directory (core/modules/barcode)
-									'models' => 0,                                   	// Set this to 1 if module has its own models directory (core/modules/xxx)
-									'css' => array('/mymodule/css/mymodule.css.php'),	// Set this to relative path of css file if module has its own css file
-	 								'js' => array('/mymodule/js/mymodule.js'),          // Set this to relative path of js file if module must load a js on all pages
-									'hooks' => array('hookcontext1','hookcontext2') 	// Set here all hooks context managed by module. You can also set hook context 'all'
-		                        );
+		//$this->module_parts = array(
+		//                        	'triggers' => 0,                                 	// Set this to 1 if module has its own trigger directory (core/triggers)
+		//							'login' => 0,                                    	// Set this to 1 if module has its own login method directory (core/login)
+		//							'substitutions' => 0,                            	// Set this to 1 if module has its own substitution function file (core/substitutions)
+		//							'menus' => 0,                                    	// Set this to 1 if module has its own menus handler directory (core/menus)
+		//							'theme' => 0,                                    	// Set this to 1 if module has its own theme directory (theme)
+		//                        	'tpl' => 0,                                      	// Set this to 1 if module overwrite template dir (core/tpl)
+		//							'barcode' => 0,                                  	// Set this to 1 if module has its own barcode directory (core/modules/barcode)
+		//							'models' => 0,                                   	// Set this to 1 if module has its own models directory (core/modules/xxx)
+		//							'css' => array('/mymodule/css/mymodule.css.php'),	// Set this to relative path of css file if module has its own css file
+	 	//							'js' => array('/mymodule/js/mymodule.js'),          // Set this to relative path of js file if module must load a js on all pages
+		//							'hooks' => array('hookcontext1','hookcontext2',...) // Set here all hooks context managed by module. You can also set hook context 'all'
+		//							'dir' => array('output' => 'othermodulename'),      // To force the default directories names
+		//							'workflow' => array('WORKFLOW_MODULE1_YOURACTIONTYPE_MODULE2'=>array('enabled'=>'! empty($conf->module1->enabled) && ! empty($conf->module2->enabled)', 'picto'=>'yourpicto@mymodule')) // Set here all workflow context managed by module
+		//                        );
+		$this->module_parts = array();

 		// Data directories to create when module is enabled.
 		// Example: this->dirs = array("/mymodule/temp");
 		$this->dirs = array();

 		// Config pages. Put here list of php page, stored into mymodule/admin directory, to use to setup module.
-		$this->config_page_url = array("setup.php@mymodule");
+		$this->config_page_url = array("mysetuppage.php@mymodule");

 		// Dependencies
 		$this->hidden = false;			// A condition to hide module
@@ -113,7 +110,7 @@ class modMyModule extends DolibarrModules
 		$this->conflictwith = array();	// List of module class names as string this module is in conflict with
 		$this->phpmin = array(5,0);					// Minimum version of PHP required by module
 		$this->need_dolibarr_version = array(3,0);	// Minimum version of Dolibarr required by module
-		$this->langfiles = array("mymodule@mymodule");
+		$this->langfiles = array("mylangfile@mymodule");

 		// Constants
 		// List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
@@ -153,7 +150,7 @@ class modMyModule extends DolibarrModules
        	$conf->mymodule=new stdClass();
        	$conf->mymodule->enabled=0;
        }
-
+        
        // Dictionaries
 		$this->dictionaries=array();
        /* Example:
@@ -171,9 +168,8 @@ class modMyModule extends DolibarrModules
        );
        */

-
        // Boxes
-		// Add here list of php file(s) stored in core/boxes that contains class to show a widget.
+		// Add here list of php file(s) stored in core/boxes that contains class to show a box.
        $this->boxes = array();			// List of boxes
 		// Example:
 		//$this->boxes=array(
@@ -182,38 +178,24 @@ class modMyModule extends DolibarrModules
 		//    2=>array('file'=>'myboxc.php@mymodule','note'=>'')
 		//);

-
 		// Cronjobs
 		$this->cronjobs = array();			// List of cron jobs entries to add
 		// Example: $this->cronjobs=array(0=>array('label'=>'My label', 'jobtype'=>'method', 'class'=>'/dir/class/file.class.php', 'objectname'=>'MyClass', 'method'=>'myMethod', 'parameters'=>'', 'comment'=>'Comment', 'frequency'=>2, 'unitfrequency'=>3600, 'test'=>true),
 		//                                1=>array('label'=>'My label', 'jobtype'=>'command', 'command'=>'', 'parameters'=>'', 'comment'=>'Comment', 'frequency'=>1, 'unitfrequency'=>3600*24, 'test'=>true)
 		// );

-
 		// Permissions
 		$this->rights = array();		// Permission array used by this module
-
 		$r=0;
-		$this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
-		$this->rights[$r][1] = 'Read objects of My Module';	// Permission label
-		$this->rights[$r][3] = 1; 					// Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'read';				// In php code, permission will be checked by test if ($user->rights->mymodule->level1->level2)
-		$this->rights[$r][5] = '';				    // In php code, permission will be checked by test if ($user->rights->mymodule->level1->level2)
-
-		$r++;
-		$this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
-		$this->rights[$r][1] = 'Create/Update objects of My Module';	// Permission label
-		$this->rights[$r][3] = 1; 					// Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'create';				// In php code, permission will be checked by test if ($user->rights->mymodule->level1->level2)
-		$this->rights[$r][5] = '';				    // In php code, permission will be checked by test if ($user->rights->mymodule->level1->level2)
-
-		$r++;
-		$this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
-		$this->rights[$r][1] = 'Delete objects of My Module';	// Permission label
-		$this->rights[$r][3] = 1; 					// Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'delete';				// In php code, permission will be checked by test if ($user->rights->mymodule->level1->level2)
-		$this->rights[$r][5] = '';				    // In php code, permission will be checked by test if ($user->rights->mymodule->level1->level2)

+		// Add here list of permission defined by an id, a label, a boolean and two constant strings.
+		// Example:
+		// $this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
+		// $this->rights[$r][1] = 'Permision label';	// Permission label
+		// $this->rights[$r][3] = 1; 					// Permission by default for new user (0/1)
+		// $this->rights[$r][4] = 'level1';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		// $this->rights[$r][5] = 'level2';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		// $r++;

 		// Main menu entries
 		$this->menu = array();			// List of menus to add
@@ -285,7 +267,7 @@ class modMyModule extends DolibarrModules
 	{
 		$sql = array();

-		$this->_load_tables('/mymodule/sql/');
+		//$this->_load_tables('/mymodule/sql/');

 		return $this->_init($sql, $options);
 	}
@@ -306,3 +288,4 @@ class modMyModule extends DolibarrModules
 	}

 }
+
--- a/htdocs/modulebuilder/template/class/myobject_api_class.class.php
+++ b/htdocs/modulebuilder/template/class/myobject_api_class.class.php
@@ -15,22 +15,19 @@
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

-use Luracast\Restler\RestException;
+ use Luracast\Restler\RestException;
+

 /**
- * \file    htdocs/modulebuilder/template/class/myobject_api_class.class.php
- * \ingroup mymodule
- * \brief   File for API management of myobject.
- */
- 
-/**
- * API class for mymodule myobject
+ * API class for skeleton object
 *
 * @smart-auto-routing false
 * @access protected 
 * @class  DolibarrApiAccess {@requires user,external}
+ * 
+ *
 */
-class MyObjectApi extends DolibarrApi
+class SkeletonApi extends DolibarrApi
 {
    /**
     * @var array   $FIELDS     Mandatory fields, checked when create and update object 
@@ -40,56 +37,56 @@ class MyObjectApi extends DolibarrApi
    );

    /**
-     * @var MyObject $myobject {@type MyObject}
+     * @var Skeleton $skeleton {@type Skeleton}
     */
-    public $myobject;
+    public $skeleton;

    /**
     * Constructor
     *
-     * @url     GET myobject/
+     * @url     GET skeleton/
     * 
     */
    function __construct()
    {
 		global $db, $conf;
 		$this->db = $db;
-        $this->myobject = new MyObject($this->db);
+        $this->skeleton = new Skeleton($this->db);
    }

    /**
-     * Get properties of a myobject object
+     * Get properties of a skeleton object
     *
-     * Return an array with myobject informations
+     * Return an array with skeleton informations
     *
-     * @param 	int 	$id ID of myobject
+     * @param 	int 	$id ID of skeleton
     * @return 	array|mixed data without useless information
 	 * 
-     * @url	GET myobject/{id}
+     * @url	GET skeleton/{id}
     * @throws 	RestException
     */
    function get($id)
    {		
-		if(! DolibarrApiAccess::$user->rights->myobject->read) {
+		if(! DolibarrApiAccess::$user->rights->skeleton->read) {
 			throw new RestException(401);
 		}
 			
-        $result = $this->myobject->fetch($id);
+        $result = $this->skeleton->fetch($id);
        if( ! $result ) {
-            throw new RestException(404, 'MyObject not found');
+            throw new RestException(404, 'Skeleton not found');
        }
 		
-		if( ! DolibarrApi::_checkAccessToResource('myobject',$this->myobject->id)) {
+		if( ! DolibarrApi::_checkAccessToResource('skeleton',$this->skeleton->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}

-		return $this->_cleanObjectDatas($this->myobject);
+		return $this->_cleanObjectDatas($this->skeleton);
    }

    /**
-     * List myobjects
+     * List skeletons
     * 
-     * Get a list of myobjects
+     * Get a list of skeletons
     * 
     * @param int		$mode		Use this param to filter list
     * @param string	$sortfield	Sort field
@@ -97,9 +94,9 @@ class MyObjectApi extends DolibarrApi
     * @param int		$limit		Limit for list
     * @param int		$page		Page number
     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101') or (t.import_key:=:'20160101')"
-     * @return array Array of myobject objects
+     * @return array Array of skeleton objects
     *
-     * @url	GET /myobjects/
+     * @url	GET /skeletons/
     */
    function index($mode, $sortfield = "t.rowid", $sortorder = 'ASC', $limit = 0, $page = 0, $sqlfilters = '') {
        global $db, $conf;
@@ -113,7 +110,7 @@ class MyObjectApi extends DolibarrApi

        $sql = "SELECT s.rowid";
        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
-        $sql.= " FROM ".MAIN_DB_PREFIX."myobject as s";
+        $sql.= " FROM ".MAIN_DB_PREFIX."skeleton as s";
        
        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
        $sql.= ", ".MAIN_DB_PREFIX."c_stcomm as st";
@@ -123,7 +120,7 @@ class MyObjectApi extends DolibarrApi
        //if ($mode == 1) $sql.= " AND s.client IN (1, 3)";
        //if ($mode == 2) $sql.= " AND s.client IN (2, 3)";

-        $sql.= ' AND s.entity IN ('.getEntity('myobject').')';
+        $sql.= ' AND s.entity IN ('.getEntity('skeleton', 1).')';
        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= " AND s.fk_soc = sc.fk_soc";
        if ($socid) $sql.= " AND s.fk_soc = ".$socid;
        if ($search_sale > 0) $sql.= " AND s.rowid = sc.fk_soc";		// Join for the needed table to filter by sale
@@ -160,104 +157,104 @@ class MyObjectApi extends DolibarrApi
            while ($i < $num)
            {
                $obj = $db->fetch_object($result);
-                $myobject_static = new MyObject($db);
-                if($myobject_static->fetch($obj->rowid)) {
-                    $obj_ret[] = parent::_cleanObjectDatas($myobject_static);
+                $skeleton_static = new Skeleton($db);
+                if($skeleton_static->fetch($obj->rowid)) {
+                    $obj_ret[] = parent::_cleanObjectDatas($skeleton_static);
                }
                $i++;
            }
        }
        else {
-            throw new RestException(503, 'Error when retrieve myobject list');
+            throw new RestException(503, 'Error when retrieve skeleton list');
        }
        if( ! count($obj_ret)) {
-            throw new RestException(404, 'No myobject found');
+            throw new RestException(404, 'No skeleton found');
        }
 		return $obj_ret;
    }
    
    /**
-     * Create myobject object
+     * Create skeleton object
     *
     * @param array $request_data   Request datas
-     * @return int  ID of myobject
+     * @return int  ID of skeleton
     * 
-     * @url	POST myobject/
+     * @url	POST skeleton/
     */
    function post($request_data = NULL)
    {
-        if(! DolibarrApiAccess::$user->rights->myobject->create) {
+        if(! DolibarrApiAccess::$user->rights->skeleton->create) {
 			throw new RestException(401);
 		}
        // Check mandatory fields
        $result = $this->_validate($request_data);
        
        foreach($request_data as $field => $value) {
-            $this->myobject->$field = $value;
+            $this->skeleton->$field = $value;
        }
-        if( ! $this->myobject->create(DolibarrApiAccess::$user)) {
+        if( ! $this->skeleton->create(DolibarrApiAccess::$user)) {
            throw new RestException(500);
        }
-        return $this->myobject->id;
+        return $this->skeleton->id;
    }

    /**
-     * Update myobject
+     * Update skeleton
     *
-     * @param int   $id             Id of myobject to update
+     * @param int   $id             Id of skeleton to update
     * @param array $request_data   Datas   
     * @return int 
     * 
-     * @url	PUT myobject/{id}
+     * @url	PUT skeleton/{id}
     */
    function put($id, $request_data = NULL)
    {
-        if(! DolibarrApiAccess::$user->rights->myobject->create) {
+        if(! DolibarrApiAccess::$user->rights->skeleton->create) {
 			throw new RestException(401);
 		}
        
-        $result = $this->myobject->fetch($id);
+        $result = $this->skeleton->fetch($id);
        if( ! $result ) {
-            throw new RestException(404, 'MyObject not found');
+            throw new RestException(404, 'Skeleton not found');
        }
 		
-		if( ! DolibarrApi::_checkAccessToResource('myobject',$this->myobject->id)) {
+		if( ! DolibarrApi::_checkAccessToResource('skeleton',$this->skeleton->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}

        foreach($request_data as $field => $value) {
-            $this->myobject->$field = $value;
+            $this->skeleton->$field = $value;
        }
        
-        if($this->myobject->update($id, DolibarrApiAccess::$user))
+        if($this->skeleton->update($id, DolibarrApiAccess::$user))
            return $this->get ($id);
        
        return false;
    }
    
    /**
-     * Delete myobject
+     * Delete skeleton
     *
-     * @param   int     $id   MyObject ID
+     * @param   int     $id   Skeleton ID
     * @return  array
     * 
-     * @url	DELETE myobject/{id}
+     * @url	DELETE skeleton/{id}
     */
    function delete($id)
    {
-        if(! DolibarrApiAccess::$user->rights->myobject->supprimer) {
+        if(! DolibarrApiAccess::$user->rights->skeleton->supprimer) {
 			throw new RestException(401);
 		}
-        $result = $this->myobject->fetch($id);
+        $result = $this->skeleton->fetch($id);
        if( ! $result ) {
-            throw new RestException(404, 'MyObject not found');
+            throw new RestException(404, 'Skeleton not found');
        }
 		
-		if( ! DolibarrApi::_checkAccessToResource('myobject',$this->myobject->id)) {
+		if( ! DolibarrApi::_checkAccessToResource('skeleton',$this->skeleton->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
        
-        if( !$this->myobject->delete($id))
+        if( !$this->skeleton->delete($id))
        {
            throw new RestException(500);
        }
@@ -265,7 +262,7 @@ class MyObjectApi extends DolibarrApi
         return array(
            'success' => array(
                'code' => 200,
-                'message' => 'MyObject deleted'
+                'message' => 'Skeleton deleted'
            )
        );
        
@@ -281,12 +278,12 @@ class MyObjectApi extends DolibarrApi
     */
    function _validate($data)
    {
-        $myobject = array();
-        foreach (MyObjectApi::$FIELDS as $field) {
+        $skeleton = array();
+        foreach (SkeletonApi::$FIELDS as $field) {
            if (!isset($data[$field]))
                throw new RestException(400, "$field field missing");
-            $myobject[$field] = $data[$field];
+            $skeleton[$field] = $data[$field];
        }
-        return $myobject;
+        return $skeleton;
    }
 }
--- a/dev/skeletons/skeleton_card.php
+++ b/dev/skeletons/skeleton_card.php
@@ -0,0 +1,349 @@
+<?php
+/* Copyright (C) 2007-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) ---Put here your own copyright and developer email---
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * 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       dev/skeletons/skeleton_card.php
+ *		\ingroup    mymodule othermodule1 othermodule2
+ *		\brief      This file is an example of a php page
+ *					Put here some comments
+ */
+
+//if (! defined('NOREQUIREUSER'))  define('NOREQUIREUSER','1');
+//if (! defined('NOREQUIREDB'))    define('NOREQUIREDB','1');
+//if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
+//if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
+//if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');			// Do not check anti CSRF attack test
+//if (! defined('NOSTYLECHECK'))   define('NOSTYLECHECK','1');			// Do not check style html tag into posted data
+//if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');		// Do not check anti POST attack test
+//if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');			// If there is no need to load and show top and left menu
+//if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');			// If we don't need to load the html.form.class.php
+//if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
+//if (! defined("NOLOGIN"))        define("NOLOGIN",'1');				// If this page is public (can be called outside logged session)
+
+// Change this following line to use the correct relative path (../, ../../, etc)
+$res=0;
+if (! $res && file_exists("../main.inc.php")) $res=@include '../main.inc.php';					// to work if your module directory is into dolibarr root htdocs directory
+if (! $res && file_exists("../../main.inc.php")) $res=@include '../../main.inc.php';			// to work if your module directory is into a subdir of root htdocs directory
+if (! $res && file_exists("../../../dolibarr/htdocs/main.inc.php")) $res=@include '../../../dolibarr/htdocs/main.inc.php';     // Used on dev env only
+if (! $res && file_exists("../../../../dolibarr/htdocs/main.inc.php")) $res=@include '../../../../dolibarr/htdocs/main.inc.php';   // Used on dev env only
+if (! $res) die("Include of main fails");
+// Change this following line to use the correct relative path from htdocs
+include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php');
+dol_include_once('/mymodule/class/skeleton_class.class.php');
+
+// Load traductions files requiredby by page
+$langs->load("mymodule");
+$langs->load("other");
+
+// Get parameters
+$id			= GETPOST('id','int');
+$action		= GETPOST('action','alpha');
+$cancel     = GETPOST('cancel');
+$backtopage = GETPOST('backtopage');
+$myparam	= GETPOST('myparam','alpha');
+
+$search_field1=GETPOST("search_field1");
+$search_field2=GETPOST("search_field2");
+
+if (empty($action) && empty($id) && empty($ref)) $action='view';
+
+// Protection if external user
+if ($user->societe_id > 0)
+{
+	//accessforbidden();
+}
+//$result = restrictedArea($user, 'mymodule', $id);
+
+
+$object = new Skeleton_Class($db);
+$extrafields = new ExtraFields($db);
+
+// fetch optionals attributes and labels
+$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
+
+// Load object
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php';  // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
+
+// Initialize technical object to manage hooks of modules. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array('skeleton'));
+
+
+
+/*******************************************************************
+* ACTIONS
+*
+* Put here all code to do according to value of "action" parameter
+********************************************************************/
+
+$parameters=array();
+$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook))
+{
+	if ($cancel) 
+	{
+		if ($action != 'addlink')
+		{
+			$urltogo=$backtopage?$backtopage:dol_buildpath('/mymodule/list.php',1);
+			header("Location: ".$urltogo);
+			exit;
+		}		
+		if ($id > 0 || ! empty($ref)) $ret = $object->fetch($id,$ref);
+		$action='';
+	}
+	
+	// Action to add record
+	if ($action == 'add')
+	{
+		if (GETPOST('cancel'))
+		{
+			$urltogo=$backtopage?$backtopage:dol_buildpath('/mymodule/list.php',1);
+			header("Location: ".$urltogo);
+			exit;
+		}
+
+		$error=0;
+
+		/* object_prop_getpost_prop */
+		$object->prop1=GETPOST("field1");
+		$object->prop2=GETPOST("field2");
+
+		if (empty($object->ref))
+		{
+			$error++;
+			setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Ref")), null, 'errors');
+		}
+
+		if (! $error)
+		{
+			$result=$object->create($user);
+			if ($result > 0)
+			{
+				// Creation OK
+				$urltogo=$backtopage?$backtopage:dol_buildpath('/mymodule/list.php',1);
+				header("Location: ".$urltogo);
+				exit;
+			}
+			{
+				// Creation KO
+				if (! empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
+				else  setEventMessages($object->error, null, 'errors');
+				$action='create';
+			}
+		}
+		else
+		{
+			$action='create';
+		}
+	}
+
+	// Action to update record
+	if ($action == 'update')
+	{
+		$error=0;
+
+		$object->prop1=GETPOST("field1");
+		$object->prop2=GETPOST("field2");
+
+		if (empty($object->ref))
+		{
+			$error++;
+			setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("Ref")), null, 'errors');
+		}
+
+		if (! $error)
+		{
+			$result=$object->update($user);
+			if ($result > 0)
+			{
+				$action='view';
+			}
+			else
+			{
+				// Creation KO
+				if (! empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
+				else setEventMessages($object->error, null, 'errors');
+				$action='edit';
+			}
+		}
+		else
+		{
+			$action='edit';
+		}
+	}
+
+	// Action to delete
+	if ($action == 'confirm_delete')
+	{
+		$result=$object->delete($user);
+		if ($result > 0)
+		{
+			// Delete OK
+			setEventMessages("RecordDeleted", null, 'mesgs');
+			header("Location: ".dol_buildpath('/mymodule/list.php',1));
+			exit;
+		}
+		else
+		{
+			if (! empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
+			else setEventMessages($object->error, null, 'errors');
+		}
+	}
+}
+
+
+
+
+/***************************************************
+* VIEW
+*
+* Put here all code to build page
+****************************************************/
+
+llxHeader('','MyPageName','');
+
+$form=new Form($db);
+
+
+// Put here content of your page
+
+// Example : Adding jquery code
+print '<script type="text/javascript" language="javascript">
+jQuery(document).ready(function() {
+	function init_myfunc()
+	{
+		jQuery("#myid").removeAttr(\'disabled\');
+		jQuery("#myid").attr(\'disabled\',\'disabled\');
+	}
+	init_myfunc();
+	jQuery("#mybutton").click(function() {
+		init_myfunc();
+	});
+});
+</script>';
+
+
+// Part to create
+if ($action == 'create')
+{
+	print load_fiche_titre($langs->trans("NewMyModule"));
+
+	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<input type="hidden" name="action" value="add">';
+	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+
+	dol_fiche_head();
+
+	print '<table class="border centpercent">'."\n";
+	// print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td><input class="flat" type="text" size="36" name="label" value="'.$label.'"></td></tr>';
+	// LIST_OF_TD_LABEL_FIELDS_CREATE
+	print '</table>'."\n";
+
+	dol_fiche_end();
+
+	print '<div class="center"><input type="submit" class="button" name="add" value="'.$langs->trans("Create").'"> &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'"></div>';
+
+	print '</form>';
+}
+
+
+
+// Part to edit record
+if (($id || $ref) && $action == 'edit')
+{
+	print load_fiche_titre($langs->trans("MyModule"));
+    
+	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<input type="hidden" name="action" value="update">';
+	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+	print '<input type="hidden" name="id" value="'.$object->id.'">';
+	
+	dol_fiche_head();
+
+	print '<table class="border centpercent">'."\n";
+	// print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td><input class="flat" type="text" size="36" name="label" value="'.$label.'"></td></tr>';
+	// LIST_OF_TD_LABEL_FIELDS_EDIT
+	print '</table>';
+	
+	dol_fiche_end();
+
+	print '<div class="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
+	print ' &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '</div>';
+
+	print '</form>';
+}
+
+
+
+// Part to show record
+if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create')))
+{
+    $res = $object->fetch_optionals($object->id, $extralabels);
+
+			
+	print load_fiche_titre($langs->trans("MyModule"));
+    
+	dol_fiche_head();
+
+	if ($action == 'delete') {
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('DeleteMyOjbect'), $langs->trans('ConfirmDeleteMyObject'), 'confirm_delete', '', 0, 1);
+		print $formconfirm;
+	}
+	
+	print '<table class="border centpercent">'."\n";
+	// print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td>'.$object->label.'</td></tr>';
+	// LIST_OF_TD_LABEL_FIELDS_VIEW
+	print '</table>';
+	
+	dol_fiche_end();
+
+
+	// Buttons
+	print '<div class="tabsAction">'."\n";
+	$parameters=array();
+	$reshook=$hookmanager->executeHooks('addMoreActionsButtons',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+	if (empty($reshook))
+	{
+		if ($user->rights->mymodule->write)
+		{
+			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a></div>'."\n";
+		}
+
+		if ($user->rights->mymodule->delete)
+		{
+			print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a></div>'."\n";
+		}
+	}
+	print '</div>'."\n";
+
+
+	// Example 2 : Adding links to objects
+	// Show links to link elements
+	//$linktoelem = $form->showLinkToObjectBlock($object, null, array('skeleton'));
+	//$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
+
+}
+
+
+// End of page
+llxFooter();
+$db->close();
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2007-2017  Laurent Destailleur <eldy@users.sourceforge.net>
+/* Copyright (C) 2007-2012  Laurent Destailleur <eldy@users.sourceforge.net>
 * Copyright (C) 2014-2016  Juanjo Menent       <jmenent@2byte.es>
 * Copyright (C) 2015       Florian Henry       <florian.henry@open-concept.pro>
 * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
@@ -20,9 +20,10 @@
 */

 /**
- * \file        htdocs/modulebuilder/template/class/myobject.class.php
- * \ingroup     mymodule othermodule1 othermodule2
- * \brief       This file is an example for a CRUD class file (Create/Read/Update/Delete)
+ * \file    dev/skeletons/skeleton_class.class.php
+ * \ingroup mymodule othermodule1 othermodule2
+ * \brief   This file is an example for a CRUD class file (Create/Read/Update/Delete)
+ *          Put some comments here
 */

 // Put here all includes required by your class file
@@ -31,28 +32,27 @@ require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php';
 //require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';

 /**
- * Class MyModuleObject
+ * Class Skeleton_Class
 *
- * Put here description of your class.
+ * Put here description of your class
+ *
+ * @see CommonObject
 */
-class MyModuleObject extends CommonObject
+class Skeleton_Class extends CommonObject
 {
 	/**
-	 * @var string Id to identify managed object
+	 * @var string Id to identify managed objects
 	 */
-	public $element = 'mymoduleobject';
+	public $element = 'skeleton';
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
-	public $table_element = 'mymoduleobject';
-    /**
-     * @var array Array with all fields and their property
-     */
-	public $picto = 'generic';
-    /**
-     * @var array Array with all fields and their property
-     */
-	public $fields;
+	public $table_element = 'skeleton';
+
+	/**
+	 * @var Skeleton_ClassLine[] Lines
+	 */
+	public $lines = array();

 	/**
 	 * @var mixed Sample property 1
@@ -62,22 +62,8 @@ class MyModuleObject extends CommonObject
 	 * @var mixed Sample property 2
 	 */
 	public $prop2;
-
 	//...

-	protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
-
-	public $table_element_line = 'mymoduleobjectdet';
-    public $class_element_line = 'MyModuleObjectline';
-    public $fk_element = 'fk_mymoduleobject';
-
-    /**
-	 * @var MyModuleObjectLine[] Lines
-	 */
-	public $lines = array();
-
-
-
 	/**
 	 * Constructor
 	 *
@@ -163,9 +149,10 @@ class MyModuleObject extends CommonObject
 	/**
 	 * Load object in memory from the database
 	 *
-	 * @param  int     $id      Id object
-	 * @param  string  $ref     Ref
-	 * @return int              <0 if KO, 0 if not found, >0 if OK
+	 * @param int    $id  Id object
+	 * @param string $ref Ref
+	 *
+	 * @return int <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id, $ref = null)
 	{
@@ -179,7 +166,7 @@ class MyModuleObject extends CommonObject
 		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
 		$sql.= ' WHERE 1 = 1';
 		if (! empty($conf->multicompany->enabled)) {
-		    $sql .= " AND entity IN (" . getEntity('mymoduleobject') . ")";
+		    $sql .= " AND entity IN (" . getEntity("skeleton", 1) . ")";
 		}
 		if (null !== $ref) {
 			$sql .= ' AND t.ref = ' . '\'' . $ref . '\'';
@@ -198,12 +185,17 @@ class MyModuleObject extends CommonObject
 				$this->prop2 = $obj->field2;
 				//...
 			}
-
-			$this->db->free($resql);
-
-			$this->fetch_optionals();
+			
+			// Retrieve all extrafields for invoice
+			// fetch optionals attributes and labels
+			require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+			$extrafields=new ExtraFields($this->db);
+			$extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
+			$this->fetch_optionals($this->id,$extralabels);

 			// $this->fetch_lines();
+			
+			$this->db->free($resql);

 			if ($numrows) {
 				return 1;
@@ -213,6 +205,7 @@ class MyModuleObject extends CommonObject
 		} else {
 			$this->errors[] = 'Error ' . $this->db->lasterror();
 			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+
 			return - 1;
 		}
 	}
@@ -249,7 +242,7 @@ class MyModuleObject extends CommonObject
 		}
 		$sql.= ' WHERE 1 = 1';
 		if (! empty($conf->multicompany->enabled)) {
-		    $sql .= " AND entity IN (" . getEntity('mymoduleobject') . ")";
+		    $sql .= " AND entity IN (" . getEntity("skeleton", 1) . ")";
 		}
 		if (count($sqlwhere) > 0) {
 			$sql .= ' AND ' . implode(' '.$filtermode.' ', $sqlwhere);
@@ -258,19 +251,23 @@ class MyModuleObject extends CommonObject
 			$sql .= $this->db->order($sortfield,$sortorder);
 		}
 		if (!empty($limit)) {
-		 $sql .=  ' ' . $this->db->plimit($limit, $offset);
+		 $sql .=  ' ' . $this->db->plimit($limit + 1, $offset);
 		}

+		$this->lines = array();
+
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$num = $this->db->num_rows($resql);

 			while ($obj = $this->db->fetch_object($resql)) {
-				$line = new self($this->db);
+				$line = new Skeleton_ClassLine();

 				$line->id = $obj->rowid;
 				$line->prop1 = $obj->field1;
 				$line->prop2 = $obj->field2;
+
+				$this->lines[$line->id] = $line;
 				//...
 			}
 			$this->db->free($resql);
@@ -294,10 +291,10 @@ class MyModuleObject extends CommonObject
 	 */
 	public function update(User $user, $notrigger = false)
 	{
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
 		$error = 0;

+		dol_syslog(__METHOD__, LOG_DEBUG);
+
 		// Clean parameters
 		if (isset($this->prop1)) {
 			$this->prop1 = trim($this->prop1);
@@ -377,7 +374,7 @@ class MyModuleObject extends CommonObject
 		}

 		// If you need to delete child tables to, you can insert them here
-
+		
 		if (!$error) {
 			$sql = 'DELETE FROM ' . MAIN_DB_PREFIX . $this->table_element;
 			$sql .= ' WHERE rowid=' . $this->id;
@@ -415,7 +412,7 @@ class MyModuleObject extends CommonObject

 		global $user;
 		$error = 0;
-		$object = new MyModuleObject($this->db);
+		$object = new Skeleton_Class($this->db);

 		$this->db->begin();

@@ -466,7 +463,7 @@ class MyModuleObject extends CommonObject
        global $menumanager;

        if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
-
+        
        $result = '';
        $companylink = '';

@@ -475,7 +472,7 @@ class MyModuleObject extends CommonObject
        $label.= '<b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;

        $url = DOL_URL_ROOT.'/mymodule/'.$this->table_name.'_card.php?id='.$this->id;
-
+        
        $linkclose='';
        if (empty($notooltip))
        {
@@ -488,7 +485,7 @@ class MyModuleObject extends CommonObject
            $linkclose.=' class="classfortooltip'.($morecss?' '.$morecss:'').'"';
        }
        else $linkclose = ($morecss?' class="'.$morecss.'"':'');
-
+        
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart.=$linkclose.'>';
 		$linkend='</a>';
@@ -579,9 +576,9 @@ class MyModuleObject extends CommonObject
 }

 /**
- * Class MyModuleObjectLine
+ * Class Skeleton_ClassLine
 */
-class MyModuleObjectLine
+class Skeleton_ClassLine
 {
 	/**
 	 * @var int ID
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -1,6 +1,8 @@
 <?php
 /* Copyright (C) 2007-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) ---Put here your own copyright and developer email---
+ * Copyright (C) 2014-2016 Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2016      Jean-François Ferry	<jfefe@aternatik.fr>
+ * Copyright (C) 2017      Nicolas ZABOURI	<info@inovea-conseil.com>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -17,7 +19,7 @@
 */

 /**
- *   	\file       htdocs/modulebuilder/template/myobject_list.php
+ *   	\file       dev/skeletons/skeleton_list.php
 *		\ingroup    mymodule othermodule1 othermodule2
 *		\brief      This file is an example of a php page
 *					Put here some comments
@@ -35,7 +37,7 @@
 //if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
 //if (! defined("NOLOGIN"))        define("NOLOGIN",'1');				// If this page is public (can be called outside logged session)

-// Change this following lines to use the correct relative path (../, ../../, etc)
+// Change this following line to use the correct relative path (../, ../../, etc)
 $res=0;
 if (! $res && file_exists("../main.inc.php")) $res=@include '../main.inc.php';					// to work if your module directory is into dolibarr root htdocs directory
 if (! $res && file_exists("../../main.inc.php")) $res=@include '../../main.inc.php';			// to work if your module directory is into a subdir of root htdocs directory
@@ -46,10 +48,11 @@ if (! $res) die("Include of main fails");
 require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php');
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-dol_include_once('/mymodule/class/myobject.class.php');
+dol_include_once('/mymodule/class/skeleton_class.class.php');

 // Load traductions files requiredby by page
-$langs->loadLangs(array("mymodule","other"));
+$langs->load("mymodule");
+$langs->load("other");

 $action=GETPOST('action','alpha');
 $massaction=GETPOST('massaction','alpha');
@@ -68,11 +71,11 @@ $search_myfield=GETPOST('search_myfield');
 $optioncss = GETPOST('optioncss','alpha');

 // Load variable for pagination
-$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
+$limit = GETPOST("limit")?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
+if ($page == -1) { $page = 0; }
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
@@ -88,14 +91,14 @@ if ($user->societe_id > 0)
 }

 // Initialize technical object to manage context to save list fields
-$contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'myobjectlist';
+$contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'mymodulelist';

 // Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
-$hookmanager->initHooks(array('myobjectlist'));
+$hookmanager->initHooks(array('mymodulelist'));
 $extrafields = new ExtraFields($db);

 // fetch optionals attributes and labels
-$extralabels = $extrafields->fetch_name_optionals_label('myobject');
+$extralabels = $extrafields->fetch_name_optionals_label('mymodule');
 $search_array_options=$extrafields->getOptionalsFromPost($extralabels,'','search_');

 // List of fields to search into when doing a "search in all"
@@ -107,12 +110,12 @@ if (empty($user->socid)) $fieldstosearchall["t.note_private"]="NotePrivate";

 // Definition of fields for list
 $arrayfields=array(
-    't.field1'=>array('label'=>"Field1", 'checked'=>1),
-    't.field2'=>array('label'=>"Field2", 'checked'=>1),
-    //'t.entity'=>array('label'=>"Entity", 'checked'=>1, 'enabled'=>(! empty($conf->multicompany->enabled) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))),
-    't.datec'=>array('label'=>"DateCreationShort", 'checked'=>0, 'position'=>500),
-    't.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500),
-    //'t.statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000),
+    't.field1'=>array('label'=>$langs->trans("Field1"), 'checked'=>1),
+    't.field2'=>array('label'=>$langs->trans("Field2"), 'checked'=>1),
+    //'t.entity'=>array('label'=>$langs->trans("Entity"), 'checked'=>1, 'enabled'=>(! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode))),
+    't.datec'=>array('label'=>$langs->trans("DateCreationShort"), 'checked'=>0, 'position'=>500),
+    't.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
+    //'t.statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
 );
 // Extra fields
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
@@ -124,16 +127,22 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 }


+// Load object if id or ref is provided as parameter
 $object=new Skeleton_Class($db);
+if (($id > 0 || ! empty($ref)) && $action != 'add')
+{
+	$result=$object->fetch($id,$ref);
+	if ($result < 0) dol_print_error($db);
+}




-/*
- * ACTIONS
- *
- * Put here all code to do according to value of "action" parameter
- */
+/*******************************************************************
+* ACTIONS
+*
+* Put here all code to do according to value of "action" parameter
+********************************************************************/

 if (GETPOST('cancel')) { $action='list'; $massaction=''; }
 if (! GETPOST('confirmmassaction') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction=''; }
@@ -169,11 +178,11 @@ if (empty($reshook))



-/*
- * VIEW
- *
- * Put here all code to build page
- */
+/***************************************************
+* VIEW
+*
+* Put here all code to build page
+****************************************************/

 $now=dol_now();

@@ -214,7 +223,7 @@ $sql.=$hookmanager->resPrint;
 $sql.= " FROM ".MAIN_DB_PREFIX."mytable as t";
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."mytable_extrafields as ef on (t.rowid = ef.fk_object)";
 $sql.= " WHERE 1 = 1";
-//$sql.= " WHERE u.entity IN (".getEntity('mytable').")";
+//$sql.= " WHERE u.entity IN (".getEntity('mytable',1).")";
 if ($search_field1) $sql.= natural_search("field1",$search_field1);
 if ($search_field2) $sql.= natural_search("field2",$search_field2);
 if ($sall)          $sql.= natural_search(array_keys($fieldstosearchall), $sall);
@@ -226,7 +235,7 @@ foreach ($search_array_options as $key => $val)
    $typ=$extrafields->attribute_type[$tmpkey];
    $mode=0;
    if (in_array($typ, array('int','double'))) $mode=1;    // Search on a numeric
-    if ($val && ( ($crit != '' && ! in_array($typ, array('select'))) || ! empty($crit)))
+    if ($val && ( ($crit != '' && ! in_array($typ, array('select'))) || ! empty($crit))) 
    {
        $sql .= natural_search('ef.'.$tmpkey, $crit, $mode);
    }
@@ -236,6 +245,7 @@ $parameters=array();
 $reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
 $sql.=$hookmanager->resPrint;
 $sql.=$db->order($sortfield,$sortorder);
+//$sql.= $db->plimit($conf->liste_limit+1, $offset);

 // Count total nb of records
 $nbtotalofrecords = '';
@@ -243,7 +253,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
 	$result = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($result);
-}
+}	

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

@@ -262,7 +272,7 @@ if ($num == 1 && ! empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) &&
 {
    $obj = $db->fetch_object($resql);
    $id = $obj->rowid;
-    header("Location: ".DOL_URL_ROOT.'/mymodule/myobject_card.php?id='.$id);
+    header("Location: ".DOL_URL_ROOT.'/skeleton/card.php?id='.$id);
    exit;
 }

@@ -282,13 +292,13 @@ foreach ($search_array_options as $key => $val)
    $crit=$val;
    $tmpkey=preg_replace('/search_options_/','',$key);
    if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
-}
+} 

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

@@ -299,7 +309,6 @@ print '<input type="hidden" name="formfilteraction" id="formfilteraction" value=
 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.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';

 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_companies', 0, '', '', $limit);
@@ -329,11 +338,36 @@ if (! empty($moreforfilter))

 $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 class="div-table-responsive">';
 print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";

+// Fields title
+print '<tr class="liste_titre">';
+// LIST_OF_TD_TITLE_FIELDS
+//if (! empty($arrayfields['t.field1']['checked'])) print_liste_field_titre($arrayfields['t.field1']['label'],$_SERVER['PHP_SELF'],'t.field1','',$param,'',$sortfield,$sortorder);
+//if (! empty($arrayfields['t.field2']['checked'])) print_liste_field_titre($arrayfields['t.field2']['label'],$_SERVER['PHP_SELF'],'t.field2','',$param,'',$sortfield,$sortorder);
+// Extra fields
+if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+{
+   foreach($extrafields->attribute_label as $key => $val) 
+   {
+       if (! empty($arrayfields["ef.".$key]['checked'])) 
+       {
+			$align=$extrafields->getAlignFlag($key);
+			print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+       }
+   }
+}
+// Hook fields
+$parameters=array('arrayfields'=>$arrayfields);
+$reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+if (! empty($arrayfields['t.datec']['checked']))  print_liste_field_titre($arrayfields['t.datec']['label'],$_SERVER["PHP_SELF"],"t.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+if (! empty($arrayfields['t.tms']['checked']))    print_liste_field_titre($arrayfields['t.tms']['label'],$_SERVER["PHP_SELF"],"t.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+//if (! empty($arrayfields['t.status']['checked'])) print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"t.status","",$param,'align="center"',$sortfield,$sortorder);
+print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
+print '</tr>'."\n";

 // Fields title search
 print '<tr class="liste_titre">';
@@ -343,22 +377,22 @@ print '<tr class="liste_titre">';
 // Extra fields
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 {
-    foreach($extrafields->attribute_label as $key => $val)
+    foreach($extrafields->attribute_label as $key => $val) 
    {
        if (! empty($arrayfields["ef.".$key]['checked']))
        {
            $align=$extrafields->getAlignFlag($key);
            $typeofextrafield=$extrafields->attribute_type[$key];
            print '<td class="liste_titre'.($align?' '.$align:'').'">';
-            if (in_array($typeofextrafield, array('varchar', 'int', 'double', 'select')) && empty($extrafields->attribute_computed[$key]))
-            {
-                $crit=$val;
-                $tmpkey=preg_replace('/search_options_/','',$key);
-                $searchclass='';
-                if (in_array($typeofextrafield, array('varchar', 'select'))) $searchclass='searchstring';
-                if (in_array($typeofextrafield, array('int', 'double'))) $searchclass='searchnum';
-                print '<input class="flat'.($searchclass?' '.$searchclass:'').'" size="4" type="text" name="search_options_'.$tmpkey.'" value="'.dol_escape_htmltag($search_array_options['search_options_'.$tmpkey]).'">';
-            }
+        	if (in_array($typeofextrafield, array('varchar', 'int', 'double', 'select')))
+			{
+			    $crit=$val;
+				$tmpkey=preg_replace('/search_options_/','',$key);
+				$searchclass='';
+				if (in_array($typeofextrafield, array('varchar', 'select'))) $searchclass='searchstring';
+				if (in_array($typeofextrafield, array('int', 'double'))) $searchclass='searchnum';
+				print '<input class="flat'.($searchclass?' '.$searchclass:'').'" size="4" type="text" name="search_options_'.$tmpkey.'" value="'.dol_escape_htmltag($search_array_options['search_options_'.$tmpkey]).'">';
+			}
            print '</td>';
        }
    }
@@ -380,84 +414,47 @@ if (! empty($arrayfields['t.tms']['checked']))
    print '</td>';
 }
 /*if (! empty($arrayfields['u.statut']['checked']))
- {
- // Status
- print '<td class="liste_titre" align="center">';
- print $form->selectarray('search_statut', array('-1'=>'','0'=>$langs->trans('Disabled'),'1'=>$langs->trans('Enabled')),$search_statut);
- print '</td>';
- }*/
+{
+    // Status
+    print '<td class="liste_titre" align="center">';
+    print $form->selectarray('search_statut', array('-1'=>'','0'=>$langs->trans('Disabled'),'1'=>$langs->trans('Enabled')),$search_statut);
+    print '</td>';
+}*/
 // Action column
 print '<td class="liste_titre" align="right">';
-$searchpicto=$form->showFilterButtons();
-print $searchpicto;
+$searchpitco=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
+print $searchpitco;
 print '</td>';
 print '</tr>'."\n";
-
-// Fields title
-print '<tr class="liste_titre">';
-// LIST_OF_TD_TITLE_FIELDS
-//if (! empty($arrayfields['t.field1']['checked'])) print_liste_field_titre($arrayfields['t.field1']['label'],$_SERVER['PHP_SELF'],'t.field1','',$param,'',$sortfield,$sortorder);
-//if (! empty($arrayfields['t.field2']['checked'])) print_liste_field_titre($arrayfields['t.field2']['label'],$_SERVER['PHP_SELF'],'t.field2','',$param,'',$sortfield,$sortorder);
-// Extra fields
-if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
-{
-   foreach($extrafields->attribute_label as $key => $val)
-   {
-       if (! empty($arrayfields["ef.".$key]['checked']))
-       {
-			$align=$extrafields->getAlignFlag($key);
-			$sortonfield = "ef.".$key;
-			if (! empty($extrafields->attribute_computed[$key])) $sortonfield='';
-			print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],$sortonfield,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
-       }
-   }
-}
-// Hook fields
-$parameters=array('arrayfields'=>$arrayfields);
-$reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
-print $hookmanager->resPrint;
-if (! empty($arrayfields['t.datec']['checked']))  print_liste_field_titre($arrayfields['t.datec']['label'],$_SERVER["PHP_SELF"],"t.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-if (! empty($arrayfields['t.tms']['checked']))    print_liste_field_titre($arrayfields['t.tms']['label'],$_SERVER["PHP_SELF"],"t.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-//if (! empty($arrayfields['t.status']['checked'])) print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"t.status","",$param,'align="center"',$sortfield,$sortorder);
-print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
-print '</tr>'."\n";
-
-
-// Detect if we need a fetch on each output line
-$needToFetchEachLine=0;
-foreach ($extrafields->attribute_computed as $key => $val)
-{
-    if (preg_match('/\$object/',$val)) $needToFetchEachLine++;  // There is at least one compute field that use $object
-}
-
+    

 $i=0;
+$var=true;
 $totalarray=array();
 while ($i < min($num, $limit))
 {
    $obj = $db->fetch_object($resql);
    if ($obj)
    {
+        $var = !$var;
+        
        // Show here line of result
-        print '<tr class="oddeven">';
+        print '<tr '.$bc[$var].'>';
        // LIST_OF_TD_FIELDS_LIST
-        /*
-        if (! empty($arrayfields['t.field1']['checked']))
-        {
-            print '<td>'.$obj->field1.'</td>';
-		    if (! $i) $totalarray['nbfield']++;
+        foreach ($arrayfields as $key => $value) {
+        	if (!empty($arrayfields[$key]['checked'])) {
+                	$key2 = str_replace('t.', '', $key);
+                	print '<td>' . $obj->$key2 . '</td>';
+                	if (!$i)
+                    	$totalarray['nbfield'] ++;
+            	}
        }
-        if (! empty($arrayfields['t.field2']['checked']))
-        {
-            print '<td>'.$obj->field2.'</td>';
-		    if (! $i) $totalarray['nbfield']++;
-        }*/
    	// Extra fields
 		if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 		{
-		   foreach($extrafields->attribute_label as $key => $val)
+		   foreach($extrafields->attribute_label as $key => $val) 
 		   {
-				if (! empty($arrayfields["ef.".$key]['checked']))
+				if (! empty($arrayfields["ef.".$key]['checked'])) 
 				{
 					print '<td';
 					$align=$extrafields->getAlignFlag($key);
@@ -524,7 +521,7 @@ if (isset($totalarray['totalhtfield']))
        $i++;
        if ($i == 1)
        {
-            if ($num < $limit) print '<td align="left">'.$langs->trans("Total").'</td>';
+            if ($num < $limit && empty($offset)) print '<td align="left">'.$langs->trans("Total").'</td>';
            else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
        }
        elseif ($totalarray['totalhtfield'] == $i) print '<td align="right">'.price($totalarray['totalht']).'</td>';
--- a/htdocs/modulebuilder/template/scripts/myobject.php
+++ b/htdocs/modulebuilder/template/scripts/myobject.php
@@ -18,9 +18,10 @@
 */

 /**
- *      \file       htdocs/modulebuilder/template/scripts/myobject.php
+ *      \file       dev/skeletons/skeleton_script.php
 *		\ingroup    mymodule
- *      \brief      This file is an example for a command line script to work on MyObject
+ *      \brief      This file is an example for a command line script
+ *					Put here some comments
 */

 $sapi_type = php_sapi_name();
@@ -70,9 +71,9 @@ print 'Argument 2='.$argv[2]."\n";
 $db->begin();


-// Examples for manipulating class MyObject
-dol_include_once("/mymodule/class/myobject.class.php");
-$myobject=new MyObject($db);
+// Examples for manipulating class skeleton_class
+require_once(DOL_DOCUMENT_ROOT."/../dev/skeletons/skeleton_class.class.php");
+$myobject=new Skeleton_Class($db);

 // Example for inserting creating object in database
 /*
@@ -114,7 +115,7 @@ else print "Object with id ".$myobject->id." deleted\n";
 // An example of a direct SQL read without using the fetch method
 /*
 $sql = "SELECT field1, field2";
-$sql.= " FROM ".MAIN_DB_PREFIX."myobject";
+$sql.= " FROM ".MAIN_DB_PREFIX."skeleton";
 $sql.= " WHERE field3 = 'xxx'";
 $sql.= " ORDER BY field1 ASC";

--- a/dev/skeletons/skeleton_webservice_server.php
+++ b/dev/skeletons/skeleton_webservice_server.php
@@ -0,0 +1,272 @@
+<?php
+/* Copyright (C) 2006-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *       \file       htdocs/webservices/server_skeleton.php
+ *       \brief      File that is entry point to call Dolibarr WebServices
+ *       \version    $Id: server_skeleton.php,v 1.7 2010/12/19 11:49:37 eldy Exp $
+ */
+
+// This is to make Dolibarr working with Plesk
+set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs');
+
+require_once("../master.inc.php");
+require_once(NUSOAP_PATH.'/nusoap.php');		// Include SOAP
+require_once(DOL_DOCUMENT_ROOT."/core/lib/ws.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/skeleton/class/skeleton.class.php");
+
+
+dol_syslog("Call Skeleton webservices interfaces");
+
+// Enable and test if module web services is enabled
+if (empty($conf->global->MAIN_MODULE_WEBSERVICES))
+{
+    $langs->load("admin");
+    dol_syslog("Call Dolibarr webservices interfaces with module webservices disabled");
+    print $langs->trans("WarningModuleNotActive",'WebServices').'.<br><br>';
+    print $langs->trans("ToActivateModule");
+    exit;
+}
+
+// Create the soap Object
+$server = new nusoap_server();
+$server->soap_defencoding='UTF-8';
+$server->decode_utf8=false;
+$ns='http://www.dolibarr.org/ns/';
+$server->configureWSDL('WebServicesDolibarrSkeleton',$ns);
+$server->wsdl->schemaTargetNamespace=$ns;
+
+
+// Define WSDL Authentication object
+$server->wsdl->addComplexType(
+    'authentication',
+    'complexType',
+    'struct',
+    'all',
+    '',
+    array(
+        'dolibarrkey' => array('name'=>'dolibarrkey','type'=>'xsd:string'),
+    	'sourceapplication' => array('name'=>'sourceapplication','type'=>'xsd:string'),
+    	'login' => array('name'=>'login','type'=>'xsd:string'),
+    	'password' => array('name'=>'password','type'=>'xsd:string'),
+        'entity' => array('name'=>'entity','type'=>'xsd:string'),
+    )
+);
+
+// Define WSDL Return object
+$server->wsdl->addComplexType(
+    'result',
+    'complexType',
+    'struct',
+    'all',
+    '',
+    array(
+        'result_code' => array('name'=>'result_code','type'=>'xsd:string'),
+        'result_label' => array('name'=>'result_label','type'=>'xsd:string'),
+    )
+);
+
+// Define other specific objects
+$server->wsdl->addComplexType(
+    'skeleton',
+    'complexType',
+    'struct',
+    'all',
+    '',
+    array(
+	    'prop1'=>'xxx',
+		'prop2'=>'xxx',
+    //...
+    )
+);
+
+
+
+// 5 styles: RPC/encoded, RPC/literal, Document/encoded (not WS-I compliant), Document/literal, Document/literal wrapped
+// Style merely dictates how to translate a WSDL binding to a SOAP message. Nothing more. You can use either style with any programming model.
+// http://www.ibm.com/developerworks/webservices/library/ws-whichwsdl/
+$styledoc='rpc';       // rpc/document (document is an extend into SOAP 1.0 to support unstructured messages)
+$styleuse='encoded';   // encoded/literal/literal wrapped
+// Better choice is document/literal wrapped but literal wrapped not supported by nusoap.
+
+
+// Register WSDL
+$server->register(
+    'getSkeleton',
+    // Entry values
+    array('authentication'=>'tns:authentication','id'=>'xsd:string','ref'=>'xsd:string','ref_ext'=>'xsd:string'),
+    // Exit values
+    array('result'=>'tns:result','skeleton'=>'tns:skeleton'),
+    $ns,
+    $ns.'#getSkeleton',
+    $styledoc,
+    $styleuse,
+    'WS to get skeleton'
+);
+
+// Register WSDL
+$server->register(
+	'createSkeleton',
+	// Entry values
+	array('authentication'=>'tns:authentication','skeleton'=>'tns:skeleton'),
+	// Exit values
+	array('result'=>'tns:result','id'=>'xsd:string'),
+	$ns,
+	$ns.'#createSkeleton',
+	$styledoc,
+	$styleuse,
+	'WS to create a skeleton'
+);
+
+
+
+
+/**
+ * Get Skeleton
+ *
+ * @param	array		$authentication		Array of authentication information
+ * @param	int			$id					Id of object
+ * @param	string		$ref				Ref of object
+ * @param	string		$ref_ext			Ref external of object
+ * @return	mixed
+ */
+function getSkeleton($authentication,$id,$ref='',$ref_ext='')
+{
+    global $db,$conf,$langs;
+
+    dol_syslog("Function: getSkeleton login=".$authentication['login']." id=".$id." ref=".$ref." ref_ext=".$ref_ext);
+
+    if ($authentication['entity']) $conf->entity=$authentication['entity'];
+
+    // Init and check authentication
+    $objectresp=array();
+    $errorcode='';$errorlabel='';
+    $error=0;
+    $fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
+    // Check parameters
+    if (! $error && (($id && $ref) || ($id && $ref_ext) || ($ref && $ref_ext)))
+    {
+        $error++;
+        $errorcode='BAD_PARAMETERS'; $errorlabel="Parameter id, ref and ref_ext can't be both provided. You must choose one or other but not both.";
+    }
+
+    if (! $error)
+    {
+        $fuser->getrights();
+
+        if ($fuser->rights->skeleton->read)
+        {
+            $skeleton=new Skeleton($db);
+            $result=$skeleton->fetch($id,$ref,$ref_ext);
+            if ($result > 0)
+            {
+                // Create
+                $objectresp = array(
+			    	'result'=>array('result_code'=>'OK', 'result_label'=>''),
+			        'skeleton'=>array(
+				    'prop1'=>$skeleton->prop1,
+				    'prop2'=>$skeleton->prop2,
+                    //...
+                    )
+                );
+            }
+            else
+            {
+                $error++;
+                $errorcode='NOT_FOUND'; $errorlabel='Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
+            }
+        }
+        else
+        {
+            $error++;
+            $errorcode='PERMISSION_DENIED'; $errorlabel='User does not have permission for this request';
+        }
+    }
+
+    if ($error)
+    {
+        $objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
+    }
+
+    return $objectresp;
+}
+
+
+/**
+ * Create Skeleton
+ *
+ * @param	array		$authentication		Array of authentication information
+ * @param	Skeleton	$skeleton		    $skeleton
+ * @return	array							Array result
+ */
+function createSkeleton($authentication,$skeleton)
+{
+	global $db,$conf,$langs;
+
+	$now=dol_now();
+
+	dol_syslog("Function: createSkeleton login=".$authentication['login']);
+
+	if ($authentication['entity']) $conf->entity=$authentication['entity'];
+
+	// Init and check authentication
+	$objectresp=array();
+	$errorcode='';$errorlabel='';
+	$error=0;
+	$fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
+	// Check parameters
+
+
+	if (! $error)
+	{
+		$newobject=new Skeleton($db);
+		$newobject->prop1=$skeleton->prop1;
+		$newobject->prop2=$skeleton->prop2;
+		//...
+
+		$db->begin();
+
+		$result=$newobject->create($fuser);
+		if ($result <= 0)
+		{
+			$error++;
+		}
+
+		if (! $error)
+		{
+			$db->commit();
+			$objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''),'id'=>$newobject->id,'ref'=>$newobject->ref);
+		}
+		else
+		{
+			$db->rollback();
+			$error++;
+			$errorcode='KO';
+			$errorlabel=$newobject->error;
+		}
+	}
+
+	if ($error)
+	{
+		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
+	}
+
+	return $objectresp;
+}
+
+// Return the results.
+$server->service(file_get_contents("php://input"));
--- a/dev/tools/github_authors_peryear.sh
+++ b/dev/tools/github_authors_peryear.sh
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-FROM=2016-01-01
-TO=2016-12-31
-
-echo "git log --since $FROM --before $TO | grep ^Author | sort -u -f -i -b | wc -l"
-git log --since $FROM --before $TO | grep ^Author | sort -u -f -i -b | wc -l
-
--- a/dev/tools/github_commits_perversion.sh
+++ b/dev/tools/github_commits_perversion.sh
@@ -1,15 +0,0 @@
-#/bin/bash
-Releases=("3.8" "3.9" "4.0" "5.0", "develop")
-Dates=("2010-01-01", "2011-01-01", "2012-01-01", "2013-01-01", "2014-01-01", "2015-01-01", "2016-07-01")
-let "counter = 1"
-
-for i in "${Releases[@]}"
-do
-  git shortlog -s -n  --after=${Dates[counter-1]} --before=${Dates[counter]}
-  echo -n "Total $i: " 
-  git log --pretty=oneline --after=${Dates[counter-1]} --before=${Dates[counter]} | wc -l
-  echo "=======================" 
-  echo
-  let "counter +=1"
-done
-
--- a/dev/translation/erp_comparison_translation.txt
+++ b/dev/translation/erp_comparison_translation.txt
@@ -1,14 +0,0 @@
-
-
-Term Dolibarr		SAP					Odoo							...
----------------------------------------------------------------------------
-Thirdparty			Contact partner		Partner/Contact (company)
-Contact/address		Contact person		Partner/Contact (individual)
-
-Financial			??					Invoicing
-
-Income / Expense	??					Profit / Loss
-Balance									Net profit
-
-
-
--- a/dev/translation/sanity_check_en_langfiles.php
+++ b/dev/translation/sanity_check_en_langfiles.php
@@ -310,8 +310,6 @@ if ((! empty($_REQUEST['unused']) && $_REQUEST['unused'] == 'true') || (isset($a
 	    if (preg_match('/^.*Bytes$/', $value)) $qualifiedforclean=0;
 	    if (preg_match('/^NoteSomeFeaturesAreDisabled/', $value)) $qualifiedforclean=0;
 	    if (preg_match('/^(DoTest|Under|Limits|Cards|CurrentValue|DateLimit|DateAndHour|NbOfLines|NbOfObjects|NbOfReferes|TotalTTCShort|VATs)/', $value)) $qualifiedforclean=0;
-		// modulebuilder
-		if (preg_match('/^ModuleBuilderDesc/', $value)) $qualifiedforclean=0;
 	    // orders
 	    if (preg_match('/^OrderSource/', $value)) $qualifiedforclean=0;
 	    if (preg_match('/^TypeContact_/', $value)) $qualifiedforclean=0;
--- a/doc/images/README.md
+++ b/doc/images/README.md
@@ -1,16 +1,8 @@
-# README (English)
+README (English)
 --------------------------------

-
-* Screen captures and icons are Dolibarr contributions
-
-
-* Most logos were created by Dolibarr developers. You may find sources of them on:
-
-https://github.com/Dolibarr/foundation
-
-
-* Few icons are from http://led24.de/iconset/. This is original README file for this source:
+* Most screen captures and icons are Dolibarr contributions, however,
+some icons are from http://led24.de/iconset/. This is original README file for this source:
 -------------------------------------------------------
 You can do whatever you want with these icons (use on web or in desktop applications) as long as you don’t pass them off as your own and remove this readme file. A credit statement and a link back to
 http://led24.de/iconset/ or http://led24.de/ would be appreciated.
--- a/doc/images/dolibarr_logo.jpg
+++ b/doc/images/dolibarr_logo.jpg
--- a/doc/images/dolibarr_logo.png
+++ b/doc/images/dolibarr_logo.png
--- a/doc/images/dolibarr_screenshot11_1280x800.png
+++ b/doc/images/dolibarr_screenshot11_1280x800.png
--- a/htdocs/accountancy/admin/account.php
+++ b/htdocs/accountancy/admin/account.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2013-2016 Olivier Geffroy      <jeff@jeffinfo.com>
- * Copyright (C) 2013-2017 Alexandre Spangaro   <aspangaro@zendsi.com>
+ * Copyright (C) 2013-2016 Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
 * Copyright (C) 2016      Laurent Destailleur  <eldy@users.sourceforge.net>
 *
 * This program is free software; you can redistribute it and/or modify
@@ -27,6 +27,7 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';

 // Langs
 $langs->load("compta");
@@ -36,11 +37,10 @@ $langs->load("accountancy");
 $langs->load("salaries");

 $mesg = '';
-$action = GETPOST('action','aZ09');
+$action = GETPOST('action');
 $cancel = GETPOST('cancel');
 $id = GETPOST('id', 'int');
 $rowid = GETPOST('rowid', 'int');
-
 $search_account = GETPOST("search_account");
 $search_label = GETPOST("search_label");
 $search_accountparent = GETPOST("search_accountparent");
@@ -52,9 +52,10 @@ if ($user->societe_id > 0) accessforbidden();
 if (! $user->rights->accounting->chartofaccount) accessforbidden();

 // Load variable for pagination
-$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
+$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'sortorder');
+$limit = GETPOST('limit') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $page = GETPOST("page", 'int');
 if ($page == - 1) {
 	$page = 0;
@@ -62,23 +63,13 @@ if ($page == - 1) {
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortfield) $sortfield = "aa.account_number";
-if (! $sortorder) $sortorder = "ASC";
-
-$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'=>0),
-    'aa.pcg_subtype'=>array('label'=>$langs->trans("Pcgsubtype"), 'checked'=>0),
-	'aa.active'=>array('label'=>$langs->trans("Activated"), 'checked'=>1)
-);
+if (! $sortfield)
+	$sortfield = "aa.account_number";
+if (! $sortorder)
+	$sortorder = "ASC";

 $accounting = new AccountingAccount($db);

-// Initialize technical object to manage context to save list fields
-$contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'accountingaccountlist';
-

 /*
 * Actions
@@ -104,7 +95,6 @@ if (empty($reshook))
    	$search_accountparent = "";
    	$search_pcgtype = "";
    	$search_pcgsubtype = "";
-		$search_array_options=array();
    }
    
    if (GETPOST('change_chart'))
@@ -146,8 +136,6 @@ if (empty($reshook))
 * View
 */

-$form=new Form($db);
-
 llxHeader('', $langs->trans("ListAccounts"));

 if ($action == 'delete') {
@@ -166,11 +154,21 @@ if ($db->type == 'pgsql') $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_accou
 else $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as a2 ON a2.rowid = CAST(aa.account_parent AS UNSIGNED)";
 $sql .= " WHERE asy.rowid = " . $pcgver;

-if (strlen(trim($search_account)))			$sql .= natural_search("aa.account_number", $search_account);
-if (strlen(trim($search_label)))			$sql .= natural_search("aa.label", $search_label);
-if (strlen(trim($search_accountparent)))	$sql .= natural_search("aa.account_parent", $search_accountparent);
-if (strlen(trim($search_pcgtype)))			$sql .= natural_search("aa.pcg_type", $search_pcgtype);
-if (strlen(trim($search_pcgsubtype)))		$sql .= natural_search("aa.pcg_subtype", $search_pcgsubtype);
+if (strlen(trim($search_account))) {
+	$sql .= natural_search("aa.account_number", $search_account);
+}
+if (strlen(trim($search_label))) {
+	$sql .= natural_search("aa.label", $search_label);
+}
+if (strlen(trim($search_accountparent))) {
+	$sql .= natural_search("aa.account_parent", $search_accountparent);
+}
+if (strlen(trim($search_pcgtype))) {
+	$sql .= natural_search("aa.pcg_type", $search_pcgtype);
+}
+if (strlen(trim($search_pcgsubtype))) {
+	$sql .= natural_search("aa.pcg_subtype", $search_pcgsubtype);
+}
 $sql .= $db->order($sortfield, $sortorder);

 // Count total nb of records
@@ -186,46 +184,39 @@ $sql .= $db->plimit($limit + 1, $offset);
 dol_syslog('accountancy/admin/account.php:: $sql=' . $sql);
 $resql = $db->query($sql);

-if ($resql)
-{
+if ($resql) {
+    
 	$num = $db->num_rows($resql);
-
+	
    $params='';
-	if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
-	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 ($search_account != "") $params.= '&amp;search_account='.urlencode($search_account);
+	if ($search_label != "") $params.= '&amp;search_label='.urlencode($search_label);
+	if ($search_accountparent != "") $params.= '&amp;search_accountparent='.urlencode($search_accountparent);
+	if ($search_pcgtype != "") $params.= '&amp;search_pcgtype='.urlencode($search_pcgtype);
+	if ($search_pcgsubtype != "") $params.= '&amp;search_pcgsubtype='.urlencode($search_pcgsubtype);
    if ($optioncss != '') $param.='&optioncss='.$optioncss;
-
-
-	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.'">';
-	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+	
+	print '<form method="GET" action="' . $_SERVER["PHP_SELF"] . '">';
 	
 	$htmlbuttonadd = '<a class="butAction" href="./card.php?action=create">' . $langs->trans("Addanaccount") . '</a>';
 	
    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
+    $var = ! $var;
    print $langs->trans("Selectchartofaccounts") . " : ";
    print '<select class="flat" name="chartofaccounts" id="chartofaccounts">';
    $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);
+    dol_syslog('accountancy/admin/index.php:: $sql=' . $sql);
    $resqlchart = $db->query($sql);
+    $var = true;
    if ($resqlchart) {
        $numbis = $db->num_rows($resqlchart);
        $i = 0;
        while ( $i < $numbis ) {
+            $var = ! $var;
            $row = $db->fetch_row($resqlchart);
    
            print '<option value="' . $row[0] . '"';
@@ -240,41 +231,37 @@ if ($resql)
    print '<br>';    
 	print '<br>';
 	
-	$varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
-    $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
+	print '<table class="noborder" width="100%">';
+	print '<tr class="liste_titre">';
+	print_liste_field_titre($langs->trans("AccountNumber"), $_SERVER["PHP_SELF"], "aa.account_number", "", $params, "", $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Label"), $_SERVER["PHP_SELF"], "aa.label", "", $params, "", $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Accountparent"), $_SERVER["PHP_SELF"], "aa.account_parent", "", $params, "", $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Pcgtype"), $_SERVER["PHP_SELF"], "aa.pcg_type", "", $params, "", $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Pcgsubtype"), $_SERVER["PHP_SELF"], "aa.pcg_subtype", "", $params, "", $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Activated"), $_SERVER["PHP_SELF"], "aa.active", "", $params, "", $sortfield, $sortorder);
+	print_liste_field_titre('', $_SERVER["PHP_SELF"], "", $params, "", 'width="60" align="center"', $sortfield, $sortorder);
+	print '</tr>';
 	
-    print '<div class="div-table-responsive">';
-    print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
-
-	// Line for search fields
-	print '<tr class="liste_titre_filter">';
-	if (! empty($arrayfields['aa.account_number']['checked']))	print '<td class="liste_titre"><input type="text" class="flat" size="10" name="search_account" value="' . $search_account . '"></td>';
-	if (! empty($arrayfields['aa.label']['checked']))			print '<td class="liste_titre"><input type="text" class="flat" size="20" name="search_label" value="' . $search_label . '"></td>';
-	if (! empty($arrayfields['aa.account_parent']['checked']))	print '<td class="liste_titre"><input type="text" class="flat" size="10" name="search_accountparent" value="' . $search_accountparent . '"></td>';
-	if (! empty($arrayfields['aa.pcg_type']['checked']))		print '<td class="liste_titre"><input type="text" class="flat" size="6" name="search_pcgtype" value="' . $search_pcgtype . '"></td>';
-	if (! empty($arrayfields['aa.pcg_subtype']['checked']))		print '<td class="liste_titre"><input type="text" class="flat" size="6" name="search_pcgsubtype" value="' . $search_pcgsubtype . '"></td>';
-	if (! empty($arrayfields['aa.active']['checked']))			print '<td class="liste_titre">&nbsp;</td>';
+	print '<tr class="liste_titre">';
+	print '<td class="liste_titre"><input type="text" class="flat" size="10" name="search_account" value="' . $search_account . '"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat" size="20" name="search_label" value="' . $search_label . '"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat" size="10" name="search_accountparent" value="' . $search_accountparent . '"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat" size="6" name="search_pcgtype" value="' . $search_pcgtype . '"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat" size="6" name="search_pcgsubtype" value="' . $search_pcgsubtype . '"></td>';
+	print '<td class="liste_titre">&nbsp;</td>';
 	print '<td align="right" colspan="2" class="liste_titre">';
-	$searchpicto=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
-	print $searchpicto;
+	$searchpitco=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
+	print $searchpitco;
 	print '</td>';
 	print '</tr>';
 	
-    print '<tr class="liste_titre">';
-	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);
-	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";
-
+	$var = false;
+	
 	$accountstatic = new AccountingAccount($db);
 	$accountparent = new AccountingAccount($db);
-
-	$i=0;
-	while ($i < min($num, $limit)) 
+	
+	$i = 0;
+	while ( $i < min($num, $limit) ) 
 	{
 		$obj = $db->fetch_object($resql);

@@ -282,82 +269,36 @@ if ($resql)
 		$accountstatic->label = $obj->label;
 		$accountstatic->account_number = $obj->account_number;
 		
-		print '<tr class="oddeven">';
+		print '<tr ' . $bc[$var] . '>';
+		print '<td>' . $accountstatic->getNomUrl(1) . '</td>';
+		print '<td>' . $obj->label . '</td>';

-		// Account number
-		if (! empty($arrayfields['aa.account_number']['checked']))
-		{
-			print "<td>";
-			print $accountstatic->getNomUrl(1);
-			print "</td>\n";
-			if (! $i) $totalarray['nbfield']++;
+		if (! empty($obj->account_parent))
+        {
+			$accountparent->id = $obj->rowid2;
+			$accountparent->label = $obj->label2;
+			$accountparent->account_number = $obj->account_number2;
+		
+			print '<td>' . $accountparent->getNomUrl(1) . '</td>';
 		}
-
-		// Account label
-		if (! empty($arrayfields['aa.label']['checked']))
+		else
 		{
-			print "<td>";
-			print $obj->label;
-			print "</td>\n";
-			if (! $i) $totalarray['nbfield']++;
+			print '<td>&nbsp;</td>';
 		}
-
-		// Account parent
-		if (! empty($arrayfields['aa.account_parent']['checked']))
-		{
-			if (! empty($obj->account_parent))
-			{
-				$accountparent->id = $obj->rowid2;
-				$accountparent->label = $obj->label2;
-				$accountparent->account_number = $obj->account_number2;
-			
-				print "<td>";
-				print $accountparent->getNomUrl(1);
-				print "</td>\n";
-				if (! $i) $totalarray['nbfield']++;
-			}
-			else
-			{
-				print '<td>&nbsp;</td>';
-				if (! $i) $totalarray['nbfield']++;
-			}
+		print '<td>' . $obj->pcg_type . '</td>';
+		print '<td>' . $obj->pcg_subtype . '</td>';
+		print '<td>';
+		if (empty($obj->active)) {
+			print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $obj->rowid . '&action=enable">';
+			print img_picto($langs->trans("Disabled"), 'switch_off');
+			print '</a>';
+		} else {
+			print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $obj->rowid . '&action=disable">';
+			print img_picto($langs->trans("Activated"), 'switch_on');
+			print '</a>';
 		}
-
-		// Chart of accounts type
-		if (! empty($arrayfields['aa.pcg_type']['checked']))
-		{
-			print "<td>";
-			print $obj->pcg_type;
-			print "</td>\n";
-			if (! $i) $totalarray['nbfield']++;
-		}
-
-		// Chart of accounts subtype
-		if (! empty($arrayfields['aa.pcg_subtype']['checked']))
-		{
-			print "<td>";
-			print $obj->pcg_subtype;
-			print "</td>\n";
-			if (! $i) $totalarray['nbfield']++;
-		}
-
-		// Activated or not
-		if (! empty($arrayfields['aa.active']['checked']))
-		{
-			print '<td>';
-			if (empty($obj->active)) {
-				print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $obj->rowid . '&action=enable">';
-				print img_picto($langs->trans("Disabled"), 'switch_off');
-				print '</a>';
-			} else {
-				print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $obj->rowid . '&action=disable">';
-				print img_picto($langs->trans("Activated"), 'switch_on');
-				print '</a>';
-			}
-			print '</td>';
-			if (! $i) $totalarray['nbfield']++;
-		}
-
+		print '</td>';
+		
 		// Action
 		print '<td align="center">';
 		if ($user->rights->accounting->chartofaccount) {
@@ -370,14 +311,13 @@ if ($resql)
 			print '</a>';
 		}
 		print '</td>' . "\n";
-		if (! $i) $totalarray['nbfield']++;
 		
 		print "</tr>\n";
+		$var = ! $var;
 		$i++;
 	}
 	
 	print "</table>";
-	print "</div>";
 	print '</form>';
 } else {
 	dol_print_error($db);
--- a/htdocs/accountancy/admin/accountmodel.php
+++ b/htdocs/accountancy/admin/accountmodel.php
@@ -39,7 +39,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
-if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
+if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';

 $langs->load("errors");
 $langs->load("admin");
@@ -217,6 +217,21 @@ if ($id == 25)
 	}
 }

+// Define localtax_typeList (used for dictionary "llx_c_tva")
+$localtax_typeList = array();
+if ($id == 10)
+{
+	$localtax_typeList = array(
+			"0" => $langs->trans("No"),
+			"1" => $langs->trans("Yes").' ('.$langs->trans("Type")." 1)",	//$langs->trans("%ageOnAllWithoutVAT"),
+			"2" => $langs->trans("Yes").' ('.$langs->trans("Type")." 2)",	//$langs->trans("%ageOnAllBeforeVAT"),
+			"3" => $langs->trans("Yes").' ('.$langs->trans("Type")." 3)",	//$langs->trans("%ageOnProductsWithoutVAT"),
+			"4" => $langs->trans("Yes").' ('.$langs->trans("Type")." 4)",	//$langs->trans("%ageOnProductsBeforeVAT"),
+			"5" => $langs->trans("Yes").' ('.$langs->trans("Type")." 5)",	//$langs->trans("%ageOnServiceWithoutVAT"),
+			"6" => $langs->trans("Yes").' ('.$langs->trans("Type")." 6)"	//$langs->trans("%ageOnServiceBeforeVAT"),
+	);
+}
+


 /*
@@ -721,11 +736,11 @@ if ($id)
        {
        	if ($tabname[$id] == MAIN_DB_PREFIX.'c_email_templates' && $action == 'edit')
        	{
-				fieldListAccountModel($fieldlist,$obj,$tabname[$id],'hide');
+				fieldList($fieldlist,$obj,$tabname[$id],'hide');
        	}
        	else
        	{
-        		fieldListAccountModel($fieldlist,$obj,$tabname[$id],'add');
+        		fieldList($fieldlist,$obj,$tabname[$id],'add');
        	}
        }

@@ -742,7 +757,8 @@ if ($id)
        {
        	print '<tr><td colspan="8">* '.$langs->trans("AvailableVariables").": ";
        	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-        	$tmp=FormMail::getAvailableSubstitKey('formemail');
+        	$formmail=new FormMail($db);
+        	$tmp=$formmail->getAvailableSubstitKey('form');
        	print implode(', ', $tmp);
        	print '</td></tr>';
        }
@@ -885,8 +901,8 @@ if ($id)
        if ($id == 4) print '<td></td>';
        print '<td class="liste_titre"></td>';
    	print '<td class="liste_titre" colspan="2" align="right">';
-    	$searchpicto=$form->showFilterAndCheckAddButtons(0);
-    	print $searchpicto;
+    	$searchpitco=$form->showFilterAndCheckAddButtons(0);
+    	print $searchpitco;
    	print '</td>';
        print '</tr>';
            
@@ -895,9 +911,11 @@ if ($id)
            // Lines with values
            while ($i < $num)
            {
+                $var = ! $var;
+
                $obj = $db->fetch_object($resql);
                //print_r($obj);
-                print '<tr class="oddeven" id="rowid-'.$obj->rowid.'">';
+                print '<tr '.$bc[$var].' id="rowid-'.$obj->rowid.'">';
                if ($action == 'edit' && ($rowid == (! empty($obj->rowid)?$obj->rowid:$obj->code)))
                {
                    print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
@@ -910,7 +928,7 @@ if ($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;

-                    if (empty($reshook)) fieldListAccountModel($fieldlist,$obj,$tabname[$id],'edit');
+                    if (empty($reshook)) fieldList($fieldlist,$obj,$tabname[$id],'edit');

                    print '<td colspan="3" align="right"><a name="'.(! empty($obj->rowid)?$obj->rowid:$obj->code).'">&nbsp;</a><input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
                    print '&nbsp;<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'"></td>';
@@ -1060,6 +1078,21 @@ if ($id)
                            	$key = $langs->trans('SizeUnit'.strtolower($obj->unit));
                                $valuetoshow = ($obj->code && $key != 'SizeUnit'.strtolower($obj->unit) ? $key : $obj->{$fieldlist[$field]});
                            }
+
+							else if ($fieldlist[$field]=='localtax1_type') {
+							  if ($obj->localtax1 != 0)
+							    $valuetoshow=$localtax_typeList[$valuetoshow];
+							  else
+							    $valuetoshow = '';
+							  $align="right";
+							}
+							else if ($fieldlist[$field]=='localtax2_type') {
+							 if ($obj->localtax2 != 0)
+							    $valuetoshow=$localtax_typeList[$valuetoshow];
+							  else
+							    $valuetoshow = '';
+							  $align="right";
+							}
 							else if ($fieldlist[$field]=='taux') {
                                $valuetoshow = price($valuetoshow, 0, $langs, 0, 0);
 							    $align="right";
@@ -1165,13 +1198,14 @@ else
        {
        	if ($showemptyline)
        	{
-        		print '<tr class="oddeven"><td width="30%">&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>';
+        		$var=!$var;
+        		print '<tr '.$bc[$var].'><td width="30%">&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>';
        		$showemptyline=0;
        	}

-            
+            $var=!$var;
            $value=$tabname[$i];
-            print '<tr class="oddeven"><td width="50%">';
+            print '<tr '.$bc[$var].'><td width="50%">';
            if (! empty($tabcond[$i]))
            {
                print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$i.'">'.$langs->trans($tablib[$i]).'</a>';
@@ -1218,18 +1252,18 @@ $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 fieldListAccountModel($fieldlist, $obj='', $tabname='', $context='')
+function fieldList($fieldlist, $obj='', $tabname='', $context='')
 {
 	global $conf,$langs,$db;
 	global $form;
 	global $region_id;
-	global $elementList,$sourceList;
+	global $elementList,$sourceList,$localtax_typeList;
 	global $bc;

 	$formadmin = new FormAdmin($db);
 	$formcompany = new FormCompany($db);
-	$formaccounting = new FormAccounting($db);
-
+	$formaccountancy = new FormVentilation($db);
+	
 	foreach ($fieldlist as $field => $value)
 	{
 		if ($fieldlist[$field] == 'country')
@@ -1346,13 +1380,31 @@ function fieldListAccountModel($fieldlist, $obj='', $tabname='', $context='')
 		elseif ($fieldlist[$field] == 'code' && isset($obj->{$fieldlist[$field]})) {
 			print '<td><input type="text" class="flat" value="'.(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'').'" size="10" 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))
 			{
 				$accountancy_account = (! empty($obj->$fieldlist[$field]) ? $obj->$fieldlist[$field] : 0);
-				print $formaccounting->select_account($accountancy_account, $fieldlist[$field], 1, '', 1, 1, 'maxwidth200 maxwidthonsmartphone');
+				print $formaccountancy->select_account($accountancy_account, $fieldlist[$field], 1, '', 1, 1, 'maxwidth200 maxwidthonsmartphone');
 			}
 			else
 			{
--- a/htdocs/accountancy/admin/card.php
+++ b/htdocs/accountancy/admin/card.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2013-2014 Olivier Geffroy      <jeff@jeffinfo.com>
- * Copyright (C) 2013-2017 Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
- * Copyright (C) 2014      Florian Henry        <florian.henry@open-concept.pro>
+ * Copyright (C) 2013-2016 Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2014	   Florian Henry		<florian.henry@open-concept.pro>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@

 /**
 * \file 		htdocs/accountancy/admin/card.php
- * \ingroup		Advanced accountancy
+ * \ingroup     Advanced accountancy
 * \brief 		Card of accounting account
 */

@@ -27,6 +27,7 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountancysystem.class.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';

 $error = 0;
@@ -36,7 +37,7 @@ $langs->load("bills");
 $langs->load("accountancy");

 $mesg = '';
-$action = GETPOST('action','aZ09');
+$action = GETPOST('action');
 $backtopage = GETPOST('backtopage');
 $id = GETPOST('id', 'int');
 $rowid = GETPOST('rowid', 'int');
@@ -58,7 +59,7 @@ if (GETPOST('cancel'))
 	header("Location: ".$urltogo);
 	exit;
 }
-
+		
 if ($action == 'add' && $user->rights->accounting->chartofaccount)
 {
 	if (! $cancel) {
@@ -85,7 +86,7 @@ if ($action == 'add' && $user->rights->accounting->chartofaccount)
 		} else {
 			$account_parent = GETPOST('account_parent','int');
 		}
-
+		
 		$object->fk_pcg_version = $obj->pcg_version;
 		$object->pcg_type = GETPOST('pcg_type');
 		$object->pcg_subtype = GETPOST('pcg_subtype');
@@ -94,7 +95,7 @@ if ($action == 'add' && $user->rights->accounting->chartofaccount)
 		$object->account_category = GETPOST('account_category');
 		$object->label = GETPOST('label', 'alpha');
 		$object->active = 1;
-
+		
 		$res = $object->create($user);
 		if ($res == - 3) {
 			$error = 1;
@@ -123,9 +124,9 @@ if ($action == 'add' && $user->rights->accounting->chartofaccount)
 } else if ($action == 'edit' && $user->rights->accounting->chartofaccount) {
 	if (! $cancel) {
 		$result = $object->fetch($id);
-
+		
 		$sql = 'SELECT pcg_version FROM ' . MAIN_DB_PREFIX . 'accounting_system WHERE rowid=' . $conf->global->CHARTOFACCOUNTS;
-
+		
 		dol_syslog('accountancy/admin/card.php:: $sql=' . $sql);
 		$result2 = $db->query($sql);
 		$obj = $db->fetch_object($result2);
@@ -155,9 +156,9 @@ if ($action == 'add' && $user->rights->accounting->chartofaccount)
 		$object->account_parent = $account_parent;
 		$object->account_category = GETPOST('account_category');
 		$object->label = GETPOST('label', 'alpha');
-
+		
 		$result = $object->update($user);
-
+		
 		if ($result > 0) {
 		    $urltogo=$backtopage?$backtopage:($_SERVER["PHP_SELF"]."?id=".$id);
 		    header("Location: " . $urltogo);
@@ -195,6 +196,7 @@ $helpurl = '';
 llxheader('', $title, $helpurl);

 $form = new Form($db);
+$htmlacc = new FormVentilation($db);
 $formaccounting = new FormAccounting($db);

 $accountsystem = new AccountancySystem($db);
@@ -203,13 +205,13 @@ $accountsystem->fetch($conf->global->CHARTOFACCOUNTS);
 // Create mode
 if ($action == 'create') {
 	print load_fiche_titre($langs->trans('NewAccountingAccount'));
-
+	
 	print '<form name="add" action="' . $_SERVER["PHP_SELF"] . '" method="POST">' . "\n";
 	print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
 	print '<input type="hidden" name="action" value="add">';
-
+	
 	dol_fiche_head();
-
+	
 	print '<table class="border" width="100%">';

 	// Chart of account
@@ -217,7 +219,8 @@ if ($action == 'create') {
 	print '<td>';
 	print $accountsystem->ref;
 	print '</td></tr>';
-
+	
+	
 	// Account number
 	print '<tr><td class="titlefieldcreate"><span class="fieldrequired">' . $langs->trans("AccountNumber") . '</span></td>';
 	print '<td><input name="account_number" size="30" value="' . $object->account_number . '"></td></tr>';
@@ -229,7 +232,7 @@ if ($action == 'create') {
 	// Account parent
 	print '<tr><td>' . $langs->trans("Accountparent") . '</td>';
 	print '<td>';
-	print $formaccounting->select_account($object->account_parent, 'account_parent', 1, null, 0, 0, 'minwidth200');
+	print $htmlacc->select_account($object->account_parent, 'account_parent', 1, null, 0, 0, 'minwidth200');
 	print '</td></tr>';

 	// Category
@@ -242,69 +245,72 @@ if ($action == 'create') {
 	print '<tr><td>' . $langs->trans("Pcgtype") . '</td>';
 	print '<td>';
 	print '<input type="text" name="pcg_type" value="'.dol_escape_htmltag(isset($_POST['pcg_type'])?GETPOST('pcg_type','alpha'):$object->pcg_type).'">';
+	//print $htmlacc->select_pcgtype($object->pcg_type, 'pcg_type', 1);
 	print '</td></tr>';

 	// Chart of acounts subtype
 	print '<tr><td>' . $langs->trans("Pcgsubtype") . '</td>';
 	print '<td>';
 	print '<input type="text" name="pcg_subtype" value="'.dol_escape_htmltag(isset($_POST['pcg_subtype'])?GETPOST('pcg_subtype','alpha'):$object->pcg_subtype).'">';
+	//print $htmlacc->select_pcgsubtype($object->pcg_subtype, 'pcg_subtype', 1);
 	print '</td></tr>';
-
+	
 	print '</table>';
-
+	
 	dol_fiche_end();
-
+	
 	print '<div class="center">';
 	print '<input class="button" type="submit" value="' . $langs->trans("Save") . '">';
 	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
 	print '<input class="button" type="submit" name="cancel" value="' . $langs->trans("Cancel") . '">';
 	print '</div>';
-
+	
 	print '</form>';
 } else if ($id) {
 	$result = $object->fetch($id);
-
+	
 	if ($result > 0) {
 		dol_htmloutput_mesg($mesg);
-
+		
 		$head = accounting_prepare_head($object);
-
+		
 		// Edit mode
 		if ($action == 'update') 
 		{
 			dol_fiche_head($head, 'card', $langs->trans('AccountAccounting'), 0, 'billr');
-
+			
 			print '<form name="update" action="' . $_SERVER["PHP_SELF"] . '" method="POST">' . "\n";
 			print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
 			print '<input type="hidden" name="action" value="edit">';
 			print '<input type="hidden" name="id" value="' . $id . '">';
 			print '<input type="hidden" name="backtopage" value="' . $backtopage . '">';
-
+				
 			print '<table class="border" width="100%">';
-
+			
 			// Account number
 			print '<tr><td class="titlefieldcreate"><span class="fieldrequired">' . $langs->trans("AccountNumber") . '</span></td>';
 			print '<td><input name="account_number" size="30" value="' . $object->account_number . '"</td></tr>';
-
+			
 			// Label
 			print '<tr><td><span class="fieldrequired">' . $langs->trans("Label") . '</span></td>';
 			print '<td><input name="label" size="70" value="' . $object->label . '"</td></tr>';
-
+			
 			// Account parent
 			print '<tr><td>' . $langs->trans("Accountparent") . '</td>';
 			print '<td>';
-			print $formaccounting->select_account($object->account_parent, 'account_parent', 1);
+			print $htmlacc->select_account($object->account_parent, 'account_parent', 1);
 			print '</td></tr>';

 			// Category
-			print '<tr><td>'.$langs->trans("AccountingCategory").'</td>';
+            print '<tr><td>'.$langs->trans("AccountingCategory").'</td>';
 			print '<td>';
-			$formaccounting->select_accounting_category($object->account_category, 'account_category', 1);
-			print '</td></tr>';
+            $formaccounting->select_accounting_category($object->account_category, 'account_category', 1);
+            print '</td></tr>';

 			// Chart of accounts type
 			print '<tr><td>' . $langs->trans("Pcgtype") . '</td>';
 			print '<td>';
+			//print $htmlacc->select_pcgtype($object->pcg_type, 'pcg_type', 1);
 			print '<input type="text" name="pcg_type" value="'.dol_escape_htmltag(isset($_POST['pcg_type'])?GETPOST('pcg_type','alpha'):$object->pcg_type).'">';
 			print '</td></tr>';

@@ -312,27 +318,29 @@ if ($action == 'create') {
 			print '<tr><td>' . $langs->trans("Pcgsubtype") . '</td>';
 			print '<td>';
 			print '<input type="text" name="pcg_subtype" value="'.dol_escape_htmltag(isset($_POST['pcg_subtype'])?GETPOST('pcg_subtype','alpha'):$object->pcg_subtype).'">';
+			//print $htmlacc->select_pcgsubtype($object->pcg_subtype, 'pcg_subtype', 1);
 			print '</td></tr>';
-
+			
 			print '</table>';
-
+			
 			dol_fiche_end();
-
+			
 			print '<div class="center">';
 			print '<input type="submit" class="button" value="' . $langs->trans("Save") . '">';
 			print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
 			print '<input type="submit" name="cancel" class="button" value="' . $langs->trans("Cancel") . '">';
 			print '</div>';
-
+			
 			print '</form>';
 		} else {
+			
 			// View mode
 			$linkback = '<a href="../admin/account.php">' . $langs->trans("BackToChartofaccounts") . '</a>';
-
+			
 			dol_fiche_head($head, 'card', $langs->trans('AccountAccounting'), 0, 'billr');
-
+			
 			print '<table class="border" width="100%">';
-
+			
 			// Account number
 			print '<tr><td class="titlefield">' . $langs->trans("AccountNumber") . '</td>';
 			print '<td>' . $object->account_number . '</td>';
@@ -370,30 +378,31 @@ if ($action == 'create') {
 			} else {
 				print img_picto($langs->trans("Activated"), 'switch_on');
 			}*/
-
+			
 			print '</td></tr>';
-
+			
 			print '</table>';
-
+			
 			dol_fiche_end();
-
+			
 			/*
 			 * Actions buttons
 			 */
+			
 			print '<div class="tabsAction">';
-
+			
 			if (! empty($user->rights->accounting->chartofaccount)) {
 				print '<a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?action=update&id=' . $id . '">' . $langs->trans('Modify') . '</a>';
 			} else {
 				print '<a class="butActionRefused" href="#" title="' . dol_escape_htmltag($langs->trans("NotAllowed")) . '">' . $langs->trans('Modify') . '</a>';
 			}
-
+			
 			if (! empty($user->rights->accounting->chartofaccount)) {
 				print '<a class="butActionDelete" href="' . $_SERVER["PHP_SELF"] . '?action=delete&id=' . $id . '">' . $langs->trans('Delete') . '</a>';
 			} else {
 				print '<a class="butActionRefused" href="#" title="' . dol_escape_htmltag($langs->trans("NotAllowed")) . '">' . $langs->trans('Delete') . '</a>';
 			}
-
+			
 			print '</div>';
 		}
 	} else {
--- a/htdocs/accountancy/admin/categories.php
+++ b/htdocs/accountancy/admin/categories.php
@@ -1,6 +1,5 @@
 <?php
-/* Copyright (C) 2016		Jamal Elbaz			<jamelbaz@gmail.pro>
- * Copyright (C) 2017		Alexandre Spangaro	<aspangaro@zendsi.com>
+/* Copyright (C) 2016	   Jamal Elbaz		<jamelbaz@gmail.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
@@ -17,9 +16,9 @@
 */

 /**
- * \file	htdocs/accountancy/admin/categories.php
+ * \file htdocs/accountancy/admin/categories.php
 * \ingroup Advanced accountancy
- * \brief	Page to assign mass categories to accounts
+ * \brief Page to assign mass categories to accounts
 */

 require '../../main.inc.php';
@@ -29,14 +28,12 @@ require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';

 $error = 0;

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

 $mesg = '';
-$id = GETPOST('id', 'int');
-$rowid = GETPOST('rowid', 'int');
-$cancel = GETPOST('cancel');
-$action = GETPOST('action','aZ09');
+$action = GETPOST('action');
 $cat_id = GETPOST('account_category');
 $selectcpt = GETPOST('cpt_bk', 'array');
 $cpt_id = GETPOST('cptid');
@@ -45,34 +42,38 @@ if ($cat_id == 0) {
 	$cat_id = null;
 }

+$id = GETPOST('id', 'int');
+$rowid = GETPOST('rowid', 'int');
+$cancel = GETPOST('cancel');
+
 // Security check
 if (! empty($user->rights->accountancy->chartofaccount))
 {
 	accessforbidden();
 }

-$accountingcategory = new AccountancyCategory($db);
+$AccCat = new AccountancyCategory($db);

 // si ajout de comptes
 if (! empty($selectcpt)) {
 	$cpts = array ();
-	foreach ( $selectcpt as $selectedoption ) {
-		if (! array_key_exists($selectedoption, $cpts))
-			$cpts[$selectedoption] = "'" . $selectedoption . "'";
+	foreach ( $selectcpt as $selectedOption ) {
+		if (! array_key_exists($selectedOption, $cpts))
+			$cpts[$selectedOption] = "'" . $selectedOption . "'";
 	}

-	$return= $accountingcategory->updateAccAcc($cat_id, $cpts);
+	$return= $AccCat->updateAccAcc($cat_id, $cpts);

 	if ($return<0) {
-		setEventMessages($langs->trans('errors'), $accountingcategory->errors, 'errors');
+		setEventMessages($langs->trans('errors'), $AccCat->errors, 'errors');
 	} else {
 		setEventMessages($langs->trans('Saved'), null, 'mesgs');
 	}
 }
 if ($action == 'delete') {
 	if ($cpt_id) {
-		if ($accountingcategory->deleteCptCat($cpt_id)) {
-			setEventMessages($langs->trans('CategoryDeleted'), null, 'mesgs');
+		if ($AccCat->deleteCptCat($cpt_id)) {
+			setEventMessages($langs->trans('Deleted'), null, 'mesgs');
 		} else {
 			setEventMessages($langs->trans('errors'), null, 'errors');
 		}
@@ -83,11 +84,12 @@ if ($action == 'delete') {
 /*
 * View
 */
-$form = new Form($db);
-$formaccounting = new FormAccounting($db);

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

+$formaccounting = new FormAccounting($db);
+$form = new Form($db);
+
 print load_fiche_titre($langs->trans('AccountingCategory'));

 print '<form name="add" action="' . $_SERVER["PHP_SELF"] . '" method="POST">' . "\n";
@@ -106,19 +108,18 @@ print '</td></tr>';

 if (! empty($cat_id)) 
 {
-	$return = $accountingcategory->getAccountsWithNoCategory($cat_id);
+	$return = $AccCat->getAccountsWithNoCategory($cat_id);
 	if ($return < 0) {
-		setEventMessages(null, $accountingcategory->errors, 'errors');
+		setEventMessages(null, $AccCat->errors, 'errors');
 	}
-	print '<tr><td>' . $langs->trans("AddAccountFromBookKeepingWithNoCategories") . '</td>';
+	print '<tr><td>' . $langs->trans("AddCompteFromBK") . '</td>';
 	print '<td>';
-	if (is_array($accountingcategory->lines_cptbk) && count($accountingcategory->lines_cptbk) > 0) {
+	if (is_array($AccCat->lines_cptbk) && count($AccCat->lines_cptbk) > 0) {
 		print '<select class="flat minwidth200" size="' . count($obj) . '" name="cpt_bk[]" multiple>';
-		foreach ( $accountingcategory->lines_cptbk as $cpt ) {
+		foreach ( $AccCat->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 '<input class="button" type="submit" id="" class="action-delete" value="' . $langs->trans("Add") . '"> ';
+		print '</select><br><input class="button" type="submit" id="" class="action-delete" value="' . $langs->trans("Add") . '"> ';
 	}
 	print '</td></tr>';
 }
@@ -132,29 +133,29 @@ print '</form>';

 if ($action == 'display' || $action == 'delete') {

-    print "<table class='noborder' width='100%'>\n";
-    print '<tr class="liste_titre">';
-	print '<td class="liste_titre">'.$langs->trans("AccountAccounting")."</td>";
-	print '<td class="liste_titre" colspan="2">'.$langs->trans("Label")."</td>";
-	print "</tr>\n";
+	print '<table class="noborder" width="100%">';
+
+	print '<tr class="liste_titre"><th class="liste_titre">' . $langs->trans("AccountAccounting") . '</th><th class="liste_titre">' . $langs->trans("Description") . '</th><th class="liste_titre" width="60" align="center">Action</th></tr>';

 	if (! empty($cat_id)) {
-		$return = $accountingcategory->display($cat_id);
+		$return = $AccCat->display($cat_id);
 		if ($return < 0) {
-			setEventMessages(null, $accountingcategory->errors, 'errors');
+			setEventMessages(null, $AccCat->errors, 'errors');
 		}
-
-		if (is_array($accountingcategory->lines_display) && count($accountingcategory->lines_display) > 0) {
-			foreach ( $accountingcategory->lines_display as $cpt ) {
-				print '<tr class="oddeven">';
+		$j = 1;
+		if (is_array($AccCat->lines_display) && count($AccCat->lines_display) > 0) {
+			foreach ( $AccCat->lines_display as $cpt ) {
+				$var = ! $var;
+				print '<tr ' . $bc[$var] . '>';
 				print '<td>' . length_accountg($cpt->account_number) . '</td>';
 				print '<td>' . $cpt->label . '</td>';
-				print '<td align="right">';
-				print "<a href= '".$_SERVER['PHP_SELF']."?action=delete&account_category=" . $cat_id . "&cptid=" . $cpt->rowid."'>";
-				print img_delete($langs->trans("DeleteFromCat")).' ';
-				print $langs->trans("DeleteFromCat")."</a>";
-				print "</td>";
+				print $form->formconfirm($_SERVER["PHP_SELF"] . "?account_category=$cat_id&cptid=" . $cpt->rowid, $langs->trans("DeleteCptCategory"), $langs->trans("ConfirmDeleteCptCategory"), "delete", '', 0, "action-delete" . $j);
+				print '<td>';
+				//print img_delete();
+				print '<input class="button" type="button" id="action-delete' . $j . '" value="' . $langs->trans("Delete") . '">';
+				print '</td>';
 				print "</tr>\n";
+				$j ++;
 			}
 		}
 	}
--- a/htdocs/accountancy/admin/categories_list.php
+++ b/htdocs/accountancy/admin/categories_list.php
@@ -39,7 +39,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 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';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/html.formventilation.class.php';

 $langs->load("errors");
 $langs->load("admin");
@@ -168,6 +168,9 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
    {
        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 == 'localtax1' && empty($_POST['localtax1_type'])) continue;
+        if ($value == 'localtax2' && empty($_POST['localtax2_type'])) continue;
+        if ($value == 'color' && empty($_POST['color'])) continue;
 		if ($value == 'formula' && empty($_POST['formula'])) continue;
        if ((! isset($_POST[$value]) || $_POST[$value]=='')
        	&& (! in_array($listfield[$f], array('decalage','module','accountancy_code','accountancy_code_sell','accountancy_code_buy'))  // Fields that are not mandatory
@@ -180,12 +183,17 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
            // We take translate key of field
            if ($fieldnamekey == 'libelle' || ($fieldnamekey == 'label'))  $fieldnamekey='Label';
            if ($fieldnamekey == 'libelle_facture') $fieldnamekey = 'LabelOnDocuments';
+            if ($fieldnamekey == 'nbjour')   $fieldnamekey='NbOfDays';
+            if ($fieldnamekey == 'decalage') $fieldnamekey='Offset';
            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 == 'unicode') $fieldnamekey = 'Unicode';
+            if ($fieldnamekey == 'deductible') $fieldnamekey = 'Deductible';
+            if ($fieldnamekey == 'sortorder') $fieldnamekey = 'SortOrder';
 			if ($fieldnamekey == 'category_type') $fieldnamekey = 'Calculated';

            setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities($fieldnamekey)), null, 'errors');
@@ -209,7 +217,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
 	    	$msg .= $langs->transnoentities('ErrorFieldFormat', $langs->transnoentities('Code')).'<br />';
 	    }*/
    }
-    if (isset($_POST["country"]) && ($_POST["country"]=='0'))
+    if (isset($_POST["country"]) && ($_POST["country"]=='0') && ($id != 2))
    {
    	if (in_array($tablib[$id],array('DictionaryCompanyType','DictionaryHolidayTypes')))	// Field country is no mandatory for such dictionaries
    	{
@@ -221,8 +229,15 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
        	setEventMessages($langs->transnoentities("ErrorFieldRequired",$langs->transnoentities("Country")), null, 'errors');
    	}
    }
+    if ($id == 3 && ! is_numeric($_POST["code"]))
+    {
+       	$ok=0;
+       	setEventMessages($langs->transnoentities("ErrorFieldMustBeANumeric",$langs->transnoentities("Code")), null, 'errors');
+    }

 	// Clean some parameters
+    if ((! empty($_POST["localtax1_type"]) || ($_POST['localtax1_type'] == '0')) && empty($_POST["localtax1"])) $_POST["localtax1"]='0';	// If empty, we force to 0
+    if ((! empty($_POST["localtax2_type"]) || ($_POST['localtax2_type'] == '0')) && empty($_POST["localtax2"])) $_POST["localtax2"]='0';	// If empty, we force to 0
 	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
@@ -451,12 +466,34 @@ $formadmin=new FormAdmin($db);

 llxHeader();

-$titre=$langs->trans($tablib[$id]);
+$titre=$langs->trans("DictionarySetup");
 $linkback='';
+if ($id)
+{
+    $titre.=' - '.$langs->trans($tablib[$id]);
+    $linkback='<a href="'.$_SERVER['PHP_SELF'].'">'.$langs->trans("BackToDictionaryList").'</a>';
+}
 $titlepicto='title_setup';
+if ($id == 10 && GETPOST('from') == 'accountancy')
+{
+    $titre=$langs->trans("MenuVatAccounts");
+    $titlepicto='title_accountancy';
+}
+if ($id == 7 && GETPOST('from') == 'accountancy')
+{
+    $titre=$langs->trans("MenuTaxAccounts");
+    $titlepicto='title_accountancy';
+}

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

+if (empty($id))
+{
+    print $langs->trans("DictionaryDesc");
+    print " ".$langs->trans("OnlyActiveElementsAreShown")."<br>\n";
+}
+print "<br>\n";
+

 // Confirmation de la suppression de la ligne
 if ($action == 'delete')
@@ -526,6 +563,19 @@ if ($id)
            $valuetoshow=ucfirst($fieldlist[$field]);   // Par defaut
            $valuetoshow=$langs->trans($valuetoshow);   // try to translate
            $align="left";
+            if ($fieldlist[$field]=='source')          { $valuetoshow=$langs->trans("Contact"); }
+            if ($fieldlist[$field]=='price')           { $valuetoshow=$langs->trans("PriceUHT"); }
+            if ($fieldlist[$field]=='taux')            {
+				if ($tabname[$id] != MAIN_DB_PREFIX."c_revenuestamp") $valuetoshow=$langs->trans("Rate");
+				else $valuetoshow=$langs->trans("Amount");
+				$align='center';
+            }
+            if ($fieldlist[$field]=='localtax1_type')  { $valuetoshow=$langs->trans("UseLocalTax")." 2"; $align="center"; $sortable=0; }
+            if ($fieldlist[$field]=='localtax1')       { $valuetoshow=$langs->trans("Rate")." 2"; $align="center"; }
+            if ($fieldlist[$field]=='localtax2_type')  { $valuetoshow=$langs->trans("UseLocalTax")." 3"; $align="center"; $sortable=0; }
+            if ($fieldlist[$field]=='localtax2')       { $valuetoshow=$langs->trans("Rate")." 3"; $align="center"; }
+            if ($fieldlist[$field]=='organization')    { $valuetoshow=$langs->trans("Organization"); }
+            if ($fieldlist[$field]=='lang')            { $valuetoshow=$langs->trans("Language"); }
            if ($fieldlist[$field]=='type')            {
 				if ($tabname[$id] == MAIN_DB_PREFIX."c_paiement") $valuetoshow=$form->textwithtooltip($langs->trans("Type"),$langs->trans("TypePaymentDesc"),2,1,img_help(1,''));
 				else $valuetoshow=$langs->trans("Type");
@@ -534,20 +584,49 @@ if ($id)
            if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label')
            {
            	$valuetoshow=$langs->trans("Label");
+            	if ($id != 25) $valuetoshow.="*";
            }
            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]=='recuperableonly') { $valuetoshow=$langs->trans("NPR"); $align="center"; }
+            if ($fieldlist[$field]=='nbjour')          { $valuetoshow=$langs->trans("NbOfDays"); }
+            if ($fieldlist[$field]=='type_cdr')        { $valuetoshow=$langs->trans("AtEndOfMonth"); $align="center"; }
+            if ($fieldlist[$field]=='decalage')        { $valuetoshow=$langs->trans("Offset"); }
+            if ($fieldlist[$field]=='width' || $fieldlist[$field]=='nx') { $valuetoshow=$langs->trans("Width"); }
+            if ($fieldlist[$field]=='height' || $fieldlist[$field]=='ny') { $valuetoshow=$langs->trans("Height"); }
+            if ($fieldlist[$field]=='unit' || $fieldlist[$field]=='metric') { $valuetoshow=$langs->trans("MeasuringUnit"); }
            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("Range"); }
+            if ($fieldlist[$field]=='account_parent')  { $valuetoshow=$langs->trans("Accountparent"); }
+            if ($fieldlist[$field]=='pcg_type')        { $valuetoshow=$langs->trans("Pcg_type"); }
+            if ($fieldlist[$field]=='pcg_subtype')     { $valuetoshow=$langs->trans("Pcg_subtype"); }
+            if ($fieldlist[$field]=='sortorder')       { $valuetoshow=$langs->trans("SortOrder"); }
+	        if ($fieldlist[$field]=='short_label')     { $valuetoshow=$langs->trans("ShortLabel"); }
+            if ($fieldlist[$field]=='type_template')   { $valuetoshow=$langs->trans("TypeOfTemplate"); }
+			if ($fieldlist[$field]=='range_account')   { $valuetoshow=$langs->trans("Range"); }
 			if ($fieldlist[$field]=='sens')            { $valuetoshow=$langs->trans("Sens"); }
 			if ($fieldlist[$field]=='category_type')   { $valuetoshow=$langs->trans("Calculated"); }
+			if ($fieldlist[$field]=='formula')         { $valuetoshow=$langs->trans("Formula"); }
+			if ($fieldlist[$field]=='paper_size')      { $valuetoshow=$langs->trans("PaperSize"); }
+			if ($fieldlist[$field]=='orientation')     { $valuetoshow=$langs->trans("Orientation"); }
+			if ($fieldlist[$field]=='leftmargin')      { $valuetoshow=$langs->trans("LeftMargin"); }
+			if ($fieldlist[$field]=='topmargin')       { $valuetoshow=$langs->trans("TopMargin"); }
+			if ($fieldlist[$field]=='spacex')          { $valuetoshow=$langs->trans("SpaceX"); }
+			if ($fieldlist[$field]=='spacey')          { $valuetoshow=$langs->trans("SpaceY"); }
+			if ($fieldlist[$field]=='font_size')       { $valuetoshow=$langs->trans("FontSize"); }
+			if ($fieldlist[$field]=='custom_x')        { $valuetoshow=$langs->trans("CustomX"); }
+			if ($fieldlist[$field]=='custom_y')        { $valuetoshow=$langs->trans("CustomY"); }
+			if ($fieldlist[$field]=='content')         { $valuetoshow=$langs->trans("Content"); }
+			if ($fieldlist[$field]=='percent')         { $valuetoshow=$langs->trans("Percentage"); }
+			if ($fieldlist[$field]=='affect')          { $valuetoshow=$langs->trans("Info"); }
+			if ($fieldlist[$field]=='delay')           { $valuetoshow=$langs->trans("NoticePeriod"); }
+			if ($fieldlist[$field]=='newbymonth')      { $valuetoshow=$langs->trans("NewByMonth"); }
 				
            if ($valuetoshow != '')
            {
@@ -560,6 +639,7 @@ if ($id)
             if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label') $alabelisused=1;
        }

+        if ($id == 4) print '<td></td>';
        print '<td>';
        print '<input type="hidden" name="id" value="'.$id.'">';
        print '</td>';
@@ -569,7 +649,7 @@ if ($id)
        print '</tr>';

        // Line to enter new values
-        print '<tr class="oddeven nodrag nodrop nohover">';
+        print "<tr ".$bcnd[$var].">";

        $obj = new stdClass();
        // If data was already input, we define them in obj to populate input fields.
@@ -589,7 +669,7 @@ if ($id)

        if (empty($reshook))
        {
-       		fieldListAccountingCategories($fieldlist,$obj,$tabname[$id],'add');
+       		fieldList($fieldlist,$obj,$tabname[$id],'add');
        }

        print '<td colspan="4" align="right">';
@@ -599,9 +679,15 @@ if ($id)

        $colspan=count($fieldlist)+3;

+        if (! empty($alabelisused))  // If there is one label among fields, we show legend of *
+        {
+        	print '<tr><td colspan="'.$colspan.'">* '.$langs->trans("LabelUsedByDefault").'.</td></tr>';
+        }
        print '<tr><td colspan="'.$colspan.'">&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);
@@ -626,8 +712,101 @@ if ($id)
            print '</td></tr>';
        }

+        // 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]=='source')          { $valuetoshow=$langs->trans("Contact"); }
+            if ($fieldlist[$field]=='price')           { $valuetoshow=$langs->trans("PriceUHT"); }
+            if ($fieldlist[$field]=='taux')            {
+				if ($tabname[$id] != MAIN_DB_PREFIX."c_revenuestamp") $valuetoshow=$langs->trans("Rate");
+				else $valuetoshow=$langs->trans("Amount");
+				$align='center';
+            }
+            if ($fieldlist[$field]=='localtax1_type')  { $valuetoshow=$langs->trans("UseLocalTax")." 2"; $align="center"; $sortable=0; }
+            if ($fieldlist[$field]=='localtax1')       { $valuetoshow=$langs->trans("Rate")." 2"; $align="center"; $sortable=0; }
+            if ($fieldlist[$field]=='localtax2_type')  { $valuetoshow=$langs->trans("UseLocalTax")." 3"; $align="center"; $sortable=0; }
+            if ($fieldlist[$field]=='localtax2')       { $valuetoshow=$langs->trans("Rate")." 3"; $align="center"; $sortable=0; }
+            if ($fieldlist[$field]=='organization')    { $valuetoshow=$langs->trans("Organization"); }
+            if ($fieldlist[$field]=='lang')            { $valuetoshow=$langs->trans("Language"); }
+            if ($fieldlist[$field]=='type')            { $valuetoshow=$langs->trans("Type"); }
+            if ($fieldlist[$field]=='code')            { $valuetoshow=$langs->trans("Code"); }
+            if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label')
+            {
+            	$valuetoshow=$langs->trans("Label");
+               	if ($id != 25) $valuetoshow.="*";
+            }
+            if ($fieldlist[$field]=='libelle_facture') { $valuetoshow=$langs->trans("LabelOnDocuments")."*"; }
+            if ($fieldlist[$field]=='country')         { $valuetoshow=$langs->trans("Country"); }
+            if ($fieldlist[$field]=='recuperableonly') { $valuetoshow=$langs->trans("NPR"); $align="center"; }
+            if ($fieldlist[$field]=='nbjour')          { $valuetoshow=$langs->trans("NbOfDays"); }
+            if ($fieldlist[$field]=='type_cdr')        { $valuetoshow=$langs->trans("AtEndOfMonth"); $align="center"; }
+            if ($fieldlist[$field]=='decalage')        { $valuetoshow=$langs->trans("Offset"); }
+            if ($fieldlist[$field]=='width' || $fieldlist[$field]=='nx') { $valuetoshow=$langs->trans("Width"); }
+            if ($fieldlist[$field]=='height' || $fieldlist[$field]=='ny') { $valuetoshow=$langs->trans("Height"); }
+            if ($fieldlist[$field]=='unit' || $fieldlist[$field]=='metric') { $valuetoshow=$langs->trans("MeasuringUnit"); }
+            if ($fieldlist[$field]=='region_id' || $fieldlist[$field]=='country_id') { $showfield=0; }
+            if ($fieldlist[$field]=='accountancy_code'){ $valuetoshow=$langs->trans("AccountancyCode"); }
+            if ($fieldlist[$field]=='accountancy_code_sell'){ $valuetoshow=$langs->trans("AccountancyCodeSell"); $sortable=0; }
+            if ($fieldlist[$field]=='accountancy_code_buy'){ $valuetoshow=$langs->trans("AccountancyCodeBuy"); $sortable=0; }
+			if ($fieldlist[$field]=='fk_pcg_version')  { $valuetoshow=$langs->trans("Pcg_version"); }
+            if ($fieldlist[$field]=='account_parent')  { $valuetoshow=$langs->trans("Accountsparent"); }
+            if ($fieldlist[$field]=='pcg_type')        { $valuetoshow=$langs->trans("Pcg_type"); }
+            if ($fieldlist[$field]=='pcg_subtype')     { $valuetoshow=$langs->trans("Pcg_subtype"); }
+            if ($fieldlist[$field]=='sortorder')       { $valuetoshow=$langs->trans("SortOrder"); }
+            if ($fieldlist[$field]=='short_label')     { $valuetoshow=$langs->trans("ShortLabel"); }
+        	if ($fieldlist[$field]=='type_template')   { $valuetoshow=$langs->trans("TypeOfTemplate"); }
+			if ($fieldlist[$field]=='range_account')   { $valuetoshow=$langs->trans("Range"); }
+			if ($fieldlist[$field]=='sens')            { $valuetoshow=$langs->trans("Sens"); }
+			if ($fieldlist[$field]=='category_type')   { $valuetoshow=$langs->trans("Calculated"); }
+			if ($fieldlist[$field]=='formula')         { $valuetoshow=$langs->trans("Formula"); }
+			if ($fieldlist[$field]=='paper_size')      { $valuetoshow=$langs->trans("PaperSize"); }
+			if ($fieldlist[$field]=='orientation')     { $valuetoshow=$langs->trans("Orientation"); }
+			if ($fieldlist[$field]=='leftmargin')      { $valuetoshow=$langs->trans("LeftMargin"); }
+			if ($fieldlist[$field]=='topmargin')       { $valuetoshow=$langs->trans("TopMargin"); }
+			if ($fieldlist[$field]=='spacex')          { $valuetoshow=$langs->trans("SpaceX"); }
+			if ($fieldlist[$field]=='spacey')          { $valuetoshow=$langs->trans("SpaceY"); }
+			if ($fieldlist[$field]=='font_size')       { $valuetoshow=$langs->trans("FontSize"); }
+			if ($fieldlist[$field]=='custom_x')        { $valuetoshow=$langs->trans("CustomX"); }
+			if ($fieldlist[$field]=='custom_y')        { $valuetoshow=$langs->trans("CustomY"); }
+			if ($fieldlist[$field]=='content')         { $valuetoshow=$langs->trans("Content"); }
+			if ($fieldlist[$field]=='percent')         { $valuetoshow=$langs->trans("Percentage"); }
+			if ($fieldlist[$field]=='affect')          { $valuetoshow=$langs->trans("Info"); }
+			if ($fieldlist[$field]=='delay')           { $valuetoshow=$langs->trans("NoticePeriod"); }
+			if ($fieldlist[$field]=='newbymonth')      { $valuetoshow=$langs->trans("NewByMonth"); }
+
+            // Affiche nom du champ
+            if ($showfield)
+            {
+                print getTitleFieldOfList($valuetoshow, 0, $_SERVER["PHP_SELF"], ($sortable?$fieldlist[$field]:''), ($page?'page='.$page.'&':''), $param, "align=".$align, $sortfield, $sortorder);
+            }
+        }
+		// Favorite - Only activated on country dictionary
+        if ($id == 4) print getTitleFieldOfList($langs->trans("Favorite"), 0, $_SERVER["PHP_SELF"], "favorite", ($page?'page='.$page.'&':''), $param, 'align="center"', $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>';
+
        // Title line with search boxes
-        print '<tr class="liste_titre liste_titre_add liste_titre_filter">';
+        print '<tr class="liste_titre">';
        $filterfound=0;
        foreach ($fieldlist as $field => $value)
        {
@@ -650,78 +829,27 @@ if ($id)
                }
            }
        }
+        if ($id == 4) print '<td></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">';
+    	print '<td class="liste_titre" colspan="3" align="center">';
    	if ($filterfound)
    	{
-        	$searchpicto=$form->showFilterAndCheckAddButtons(0);
-        	print $searchpicto;
+        	$searchpitco=$form->showFilterAndCheckAddButtons(0);
+        	print $searchpitco;
    	}
    	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='';
-
-            $valuetoshow=ucfirst($fieldlist[$field]);   // By defaut
-            $valuetoshow=$langs->trans($valuetoshow);   // try to translate
-            if ($fieldlist[$field]=='source')          { $valuetoshow=$langs->trans("Contact"); }
-            if ($fieldlist[$field]=='price')           { $valuetoshow=$langs->trans("PriceUHT"); }
-            if ($fieldlist[$field]=='taux')            {
-				if ($tabname[$id] != MAIN_DB_PREFIX."c_revenuestamp") $valuetoshow=$langs->trans("Rate");
-				else $valuetoshow=$langs->trans("Amount");
-				$align='center';
-            }
-            if ($fieldlist[$field]=='type')            { $valuetoshow=$langs->trans("Type"); }
-            if ($fieldlist[$field]=='code')            { $valuetoshow=$langs->trans("Code"); }
-            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; }
-            if ($fieldlist[$field]=='accountancy_code'){ $valuetoshow=$langs->trans("AccountancyCode"); }
-            if ($fieldlist[$field]=='accountancy_code_sell'){ $valuetoshow=$langs->trans("AccountancyCodeSell"); $sortable=0; }
-            if ($fieldlist[$field]=='accountancy_code_buy'){ $valuetoshow=$langs->trans("AccountancyCodeBuy"); $sortable=0; }
-			if ($fieldlist[$field]=='fk_pcg_version')  { $valuetoshow=$langs->trans("Pcg_version"); }
-            if ($fieldlist[$field]=='account_parent')  { $valuetoshow=$langs->trans("Accountsparent"); }
-            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("Range"); }
-			if ($fieldlist[$field]=='sens')            { $valuetoshow=$langs->trans("Sens"); }
-			if ($fieldlist[$field]=='category_type')   { $valuetoshow=$langs->trans("Calculated"); }
-            // 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>';
-
+            
        if ($num)
        {
            // Lines with values
            while ($i < $num)
            {
+                $var = ! $var;
+
                $obj = $db->fetch_object($resql);
                //print_r($obj);
-                print '<tr class="oddeven" id="rowid-'.$obj->rowid.'">';
+                print '<tr '.$bc[$var].' id="rowid-'.$obj->rowid.'">';
                if ($action == 'edit' && ($rowid == (! empty($obj->rowid)?$obj->rowid:$obj->code)))
                {
                    $tmpaction='edit';
@@ -730,11 +858,9 @@ if ($id)
                    $error=$hookmanager->error; $errors=$hookmanager->errors;

                    // Show fields
-                    if (empty($reshook)) fieldListAccountingCategories($fieldlist,$obj,$tabname[$id],'edit');
+                    if (empty($reshook)) fieldList($fieldlist,$obj,$tabname[$id],'edit');

-                    print '<td></td>';
-                    print '<td></td>';
-                    print '<td align="center">';
+                    print '<td colspan="3" align="center">';
                    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").'">';
@@ -784,6 +910,19 @@ if ($id)
                                    $valuetoshow=($key != "Country".strtoupper($obj->country_code)?$obj->country_code." - ".$key:$obj->country);
                                }
                            }
+                            else if ($fieldlist[$field]=='recuperableonly' || $fieldlist[$field] == 'deductible' || $fieldlist[$field] == 'category_type') {
+                                $valuetoshow=yn($valuetoshow);
+                                $align="center";
+                            }
+                            else if ($fieldlist[$field]=='type_cdr') {
+                				if(empty($valuetoshow)) $valuetoshow = $langs->trans('None');
+                				elseif($valuetoshow == 1) $valuetoshow = $langs->trans('AtEndOfMonth');
+                				elseif($valuetoshow == 2) $valuetoshow = $langs->trans('CurrentNext');
+                                $align="center";
+                            }
+                            else if ($fieldlist[$field]=='price' || preg_match('/^amount/i',$fieldlist[$field])) {
+                                $valuetoshow=price($valuetoshow);
+                            }
                            else if ($fieldlist[$field]=='libelle_facture') {
                                $langs->load("bills");
                                $key=$langs->trans("PaymentCondition".strtoupper($obj->code));
@@ -862,6 +1001,9 @@ if ($id)
                            else if ($fieldlist[$field]=='region_id' || $fieldlist[$field]=='country_id') {
                                $showfield=0;
                            }
+                            else if ($fieldlist[$field]=='unicode') {
+                            	$valuetoshow = $langs->getCurrencySymbol($obj->code,1);
+                            }
                            else if ($fieldlist[$field]=='label' && $tabname[$_GET["id"]]==MAIN_DB_PREFIX.'c_units') {
 	                            $langs->load("products");
 	                            $valuetoshow=$langs->trans($obj->{$fieldlist[$field]});
@@ -870,6 +1012,32 @@ if ($id)
 	                            $langs->load("products");
 	                            $valuetoshow = $langs->trans($obj->{$fieldlist[$field]});
                            }
+                            else if (($fieldlist[$field] == 'unit') && ($tabname[$id] == MAIN_DB_PREFIX.'c_paper_format'))
+                            {
+                            	$key = $langs->trans('SizeUnit'.strtolower($obj->unit));
+                                $valuetoshow = ($obj->code && $key != 'SizeUnit'.strtolower($obj->unit) ? $key : $obj->{$fieldlist[$field]});
+                            }
+							else if ($fieldlist[$field]=='localtax1' || $fieldlist[$field]=='localtax2') {
+							    $align="center";
+							}
+							else if ($fieldlist[$field]=='localtax1_type') {
+                              if ($obj->localtax1 != 0)
+							    $valuetoshow=$localtax_typeList[$valuetoshow];
+							  else
+							    $valuetoshow = '';
+							  $align="center";
+							}
+							else if ($fieldlist[$field]=='localtax2_type') {
+							 if ($obj->localtax2 != 0)
+							    $valuetoshow=$localtax_typeList[$valuetoshow];
+							  else
+							    $valuetoshow = '';
+							  $align="center";
+							}
+							else if ($fieldlist[$field]=='taux') {
+                                $valuetoshow = price($valuetoshow, 0, $langs, 0, 0);
+							    $align="center";
+							}
 							else if (in_array($fieldlist[$field],array('recuperableonly')))
 							{
 								$align="center";
@@ -887,7 +1055,7 @@ if ($id)

                    // Can an entry be erased or disabled ?
                    $iserasable=1;$canbedisabled=1;$canbemodified=1;	// true by default
-                    if (isset($obj->code))
+                    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; }
@@ -903,6 +1071,16 @@ if ($id)
                    if ($param) $url .= '&'.$param;
                    $url.='&';

+					// Favorite
+					// Only activated on country dictionary
+                    if ($id == 4)
+					{
+						print '<td align="center" class="nowrap">';
+						if ($iserasable) print '<a href="'.$url.'action='.$acts[$obj->favorite].'_favorite">'.$actl[$obj->favorite].'</a>';
+						else print $langs->trans("AlwaysActive");
+						print '</td>';
+					}
+
                    // Active
                    print '<td align="center" class="nowrap">';
                    if ($canbedisabled) print '<a href="'.$url.'action='.$acts[$obj->active].'">'.$actl[$obj->active].'</a>';
@@ -924,7 +1102,7 @@ if ($id)
                    {
                        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
+                        //else print '<a href="#">'.img_delete().'</a>';    // Some dictionnary can be edited by other profile than admin
                        print '</td>';
                    }
                    else print '<td>&nbsp;</td>';
@@ -967,7 +1145,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 fieldListAccountingCategories($fieldlist, $obj='', $tabname='', $context='')
+function fieldList($fieldlist, $obj='', $tabname='', $context='')
 {
 	global $conf,$langs,$db;
 	global $form, $mysoc;
@@ -977,7 +1155,7 @@ function fieldListAccountingCategories($fieldlist, $obj='', $tabname='', $contex

 	$formadmin = new FormAdmin($db);
 	$formcompany = new FormCompany($db);
-	if (! empty($conf->accounting->enabled)) $formaccounting = new FormAccounting($db);
+	if (! empty($conf->accounting->enabled)) $formaccountancy = new FormVentilation($db);

 	foreach ($fieldlist as $field => $value)
 	{
@@ -1120,7 +1298,7 @@ function fieldListAccountingCategories($fieldlist, $obj='', $tabname='', $contex
 			{
 			    $fieldname = $fieldlist[$field];
 				$accountancy_account = (! empty($obj->$fieldname) ? $obj->$fieldname : 0);
-				print $formaccounting->select_account($accountancy_account, $fieldlist[$field], 1, '', 1, 1, 'maxwidth200 maxwidthonsmartphone');
+				print $formaccountancy->select_account($accountancy_account, $fieldlist[$field], 1, '', 1, 1, 'maxwidth200 maxwidthonsmartphone');
 			}
 			else
 			{
--- a/htdocs/accountancy/admin/defaultaccounts.php
+++ b/htdocs/accountancy/admin/defaultaccounts.php
@@ -32,7 +32,7 @@ require '../../main.inc.php';
 // Class
 require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';

 $langs->load("compta");
 $langs->load("bills");
@@ -117,11 +117,12 @@ if ($action == 'update') {
 llxHeader();

 $form = new Form($db);
-$formaccounting = new FormAccounting($db);
+$formaccountancy = new FormVentilation($db);

 $linkback = '';
 print load_fiche_titre($langs->trans('MenuDefaultAccounts'), $linkback, 'title_accountancy');

+print '<br>';
 print $langs->trans("DefaultBindingDesc").'<br>';
 print '<br>';

@@ -134,14 +135,15 @@ print '<input type="hidden" name="action" value="update">';
 print '<table class="noborder" width="100%">';

 foreach ( $list_account as $key ) {
+	$var = ! $var;
 	
-	print '<tr class="oddeven value">';
+	print '<tr ' . $bc[$var] . ' class="value">';
 	// Param
 	$label = $langs->trans($key);
 	print '<td>' . $label . '</td>';
 	// Value
 	print '<td>';  // Do not force align=right, or it align also the content of the select box 
-	print $formaccounting->select_account($conf->global->$key, $key, 1, '', 1, 1);
+	print $formaccountancy->select_account($conf->global->$key, $key, 1, '', 1, 1);
 	print '</td>';
 	print '</tr>';
 }
--- a/htdocs/accountancy/admin/export.php
+++ b/htdocs/accountancy/admin/export.php
@@ -130,7 +130,7 @@ 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');
+dol_fiche_head($head, 'export', $langs->trans("Configuration"), 0, 'cron');

 $var = true;

@@ -148,8 +148,9 @@ $var = ! $var;
 $num = count($main_option);
 if ($num) {
 	foreach ( $main_option as $key ) {
+		$var = ! $var;
 		
-		print '<tr class="oddeven value">';
+		print '<tr ' . $bc[$var] . ' class="value">';
 		
 		// Param
 		$label = $langs->trans($key);
@@ -177,7 +178,7 @@ print '</tr>';

 $var = ! $var;

-print '<tr class="oddeven">';
+print '<tr ' . $bc[$var] . '>';
 print '<td width="50%">' . $langs->trans("Selectmodelcsv") . '</td>';
 if (! $conf->use_javascript_ajax) {
 	print '<td class="nowrap">';
@@ -211,7 +212,7 @@ if ($num2) {
 		print '<tr><td colspan="2" bgcolor="red"><b>' . $langs->trans('OptionsDeactivatedForThisExportModel') . '</b></td></tr>';
 	}
 	
-	print '<tr class="oddeven">';
+	print '<tr ' . $bc[$var] . '>';
 	print '<td width="50%">' . $langs->trans("Selectformat") . '</td>';
 	if (! $conf->use_javascript_ajax) {
 	    print '<td class="nowrap">';
@@ -229,8 +230,10 @@ if ($num2) {
 	}
 	print "</td></tr>";
 	
-	foreach ( $model_option as $key ) {		
-		print '<tr class="oddeven value">';
+	foreach ( $model_option as $key ) {
+		$var = ! $var;
+		
+		print '<tr ' . $bc[$var] . ' class="value">';
 		
 		// Param
 		$label = $langs->trans($key);
--- a/htdocs/accountancy/admin/fiscalyear.php
+++ b/htdocs/accountancy/admin/fiscalyear.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2013-2016 Alexandre Spangaro   <aspangaro@zendsi.com>
+/* Copyright (C) 2013-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
@@ -25,14 +25,14 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/fiscalyear.class.php';

-$action = GETPOST('action','aZ09');
+$action = GETPOST('action');

 // Load variable for pagination
-$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
+$limit = GETPOST("limit")?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
+if ($page == -1) { $page = 0; }
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
@@ -125,7 +125,7 @@ if ($result) {
 		while ( $i < $num && $i < $max ) {
 			$obj = $db->fetch_object($result);
 			$fiscalyearstatic->id = $obj->rowid;
-			print '<tr class="oddeven">';
+			print '<tr ' . $bc[$var] . '>';
 			print '<td><a href="fiscalyear_card.php?id=' . $obj->rowid . '">' . img_object($langs->trans("ShowFiscalYear"), "technic") . ' ' . $obj->rowid . '</a></td>';
 			print '<td align="left">' . $obj->label . '</td>';
 			print '<td align="left">' . dol_print_date($db->jdate($obj->date_start), 'day') . '</td>';
@@ -136,7 +136,7 @@ if ($result) {
 			$i ++;
 		}
 	} else {
-		print '<tr class="oddeven"><td colspan="5" class="opacitymedium">' . $langs->trans("None") . '</td></tr>';
+		print '<tr ' . $bc[$var] . '><td colspan="5" class="opacitymedium">' . $langs->trans("None") . '</td></tr>';
 	}
 	print '</table>';
 } else {
--- a/htdocs/accountancy/admin/fiscalyear_card.php
+++ b/htdocs/accountancy/admin/fiscalyear_card.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2014-2016  Alexandre Spangaro	<aspangaro@zendsi.com>
+/* Copyright (C) 2014-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
@@ -176,15 +176,13 @@ if ($action == 'create')
 	print $form->select_date(($date_end ? $date_end : - 1), 'fiscalyearend');
 	print '</td></tr>';

-	/*
 	// Statut
 	print '<tr>';
 	print '<td class="fieldrequired">' . $langs->trans("Status") . '</td>';
 	print '<td class="valeur">';
 	print $form->selectarray('statut', $statut2label, GETPOST('statut'));
 	print '</td></tr>';
-	*/
-	
+
 	print '</table>';

 	dol_fiche_end();
@@ -234,8 +232,7 @@ if ($action == 'create')

 			// Statut
 			print '<tr><td>' . $langs->trans("Statut") . '</td><td>';
-			// print $form->selectarray('statut', $statut2label, $object->statut);
-			print $object->getLibStatut(4);
+			print $form->selectarray('statut', $statut2label, $object->statut);
 			print '</td></tr>';

 			print '</table>';
@@ -307,7 +304,7 @@ if ($action == 'create')

    			print '<a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?action=edit&id=' . $id . '">' . $langs->trans('Modify') . '</a>';
    
-    			// print '<a class="butActionDelete" href="' . $_SERVER["PHP_SELF"] . '?action=delete&id=' . $id . '">' . $langs->trans('Delete') . '</a>';
+    			print '<a class="butActionDelete" href="' . $_SERVER["PHP_SELF"] . '?action=delete&id=' . $id . '">' . $langs->trans('Delete') . '</a>';
 			
    			print '</div>';
 			}
--- a/htdocs/accountancy/admin/importaccounts.php
+++ b/htdocs/accountancy/admin/importaccounts.php
@@ -1,7 +1,8 @@
 <?php
-/* Copyright (C) 2013-2014 Olivier Geffroy      <jeff@jeffinfo.com>
- * Copyright (C) 2013-2017 Alexandre Spangaro   <aspangaro.dolibarr@gmail.com> 
- * Copyright (C) 2014      Florian Henry        <florian.henry@open-concept.pro>
+/* 
+ * Copyright (C) 2013-2014 Olivier Geffroy      <jeff@jeffinfo.com>
+ * Copyright (C) 2013-2014 Alexandre Spangaro   <aspangaro.dolibarr@gmail.com> 
+ * Copyright (C) 2014	   Florian Henry		<florian.henry@open-concept.pro>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -27,7 +28,7 @@ require '../../main.inc.php';
 // Class
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';

 // langs
 $langs->load("compta");
@@ -39,11 +40,11 @@ $langs->load("accountancy");
 if (! $user->admin)
 	accessforbidden();

-$limit = GETPOST('limit','int')?GETPOST('limit','int'):(empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)?$conf->liste_limit:$conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
+$limit = GETPOST("limit")?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 == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if ($page == -1) { $page = 0; }
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
@@ -64,22 +65,22 @@ if ($_POST["action"] == 'import') {
 	if (is_array($to_import) && count($to_import) > 0) {
 		print '<div><font color="red">' . count($to_import) . ' ' . $langs->trans("SelectedLines") . '</font></div>';
 		$sql = 'SELECT pcg_version FROM ' . MAIN_DB_PREFIX . 'accounting_system WHERE rowid=' . $conf->global->CHARTOFACCOUNTS;
-
+		
 		$result = $db->query($sql);
 		if ($result && ($db->num_rows($result) > 0)) {
-
+			
 			$obj = $db->fetch_object($result);
-
+			
 			$cpt = 0;
 			foreach ( $to_import as $maLigneCochee ) {
-
+				
 				$accounting = new AccountingAccount($db);
-
+				
 				$monLabel = GETPOST('label' . $maLigneCochee);
 				$monParentAccount = GETPOST('AccountParent' . $maLigneCochee);
 				$monType = GETPOST('pcgType' . $maLigneCochee);
 				$monSubType = GETPOST('pcgSubType' . $maLigneCochee);
-
+				
 				$accounting->fk_pcg_version = $obj->pcg_version;
 				$accounting->account_number = $maLigneCochee;
 				$accounting->label = $monLabel;
@@ -125,10 +126,10 @@ if ($result) {
 	$num_lines = $db->num_rows($result);
 	$i = 0;
 	print_barre_liste($langs->trans("ImportAccount"), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, '', $num_lines);
-
+	
 	print '<form action="' . $_SERVER["PHP_SELF"] . '" method="POST">' . "\n";
 	print '<input type="hidden" name="action" value="import">';
-
+	
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre"><td>' . $langs->trans("AccountAccouting") . '</td>';
 	print '<td>' . $langs->trans("label") . '</td>';
@@ -137,43 +138,45 @@ if ($result) {
 	print '<td>' . $langs->trans("Pcgsubtype") . '</td>';
 	print '<td align="center">' . $langs->trans("Import") . '</td>';
 	print '</tr>';
-
+	
 	$form = new Form($db);
-	$formaccounting = new FormAccounting($db);
-
+	$htmlacc = new FormVentilation($db);
+	
 	$var = true;
 	while ( $i < min($num_lines, $limit) ) {
 		$objp = $db->fetch_object($result);
-		print '<tr class="oddeven">';
-
+		$var = ! $var;
+		print '<tr'. $bc[$var].'>';
+		
 		print '<td align="left">';
 		print $objp->accounting;
 		print '</td>';
-
+		
 		print '<td align="left">';
 		print '<input name="label" size="30" value="">';
 		print '</td>';
-
+		
 		// Colonne choix du compte
 		print '<td>';
-		print $formaccounting->select_account($accounting->account_parent, 'AccountParent');
+		print $htmlacc->select_account($accounting->account_parent, 'AccountParent');
 		print '</td>';
-
+		
 		print '<td>';
-		print '<input type="text" name="pcgType" value="'.dol_escape_htmltag(isset($_POST['pcg_subtype'])?GETPOST('pcg_subtype','alpha'):$accounting->pcg_type).'">';
+		print $htmlacc->select_pcgtype($accounting->pcg_type, 'pcgType');
 		print '</td>';
-
+		
 		print '<td>';
-		print '<input type="text" name="pcgSubType" value="'.dol_escape_htmltag(isset($_POST['pcg_subtype'])?GETPOST('pcg_subtype','alpha'):$accounting->pcg_subtype).'">';
+		print $htmlacc->select_pcgsubtype($accounting->pcg_subtype, 'pcgSubType');
 		print '</td>';
-
+		
 		// Colonne choix ligne a ventiler
+		
 		$checked = ('label' == 'O') ? ' checked' : '';
-
+		
 		print '<td align="center">';
 		print '<input type="checkbox" name="mesCasesCochees[]" ' . $checked . ' value="' . $objp->accounting . '"/>';
 		print '</td>';
-
+		
 		print '</tr>';
 		$i ++;
 	}
--- a/htdocs/accountancy/admin/index.php
+++ b/htdocs/accountancy/admin/index.php
@@ -1,11 +1,11 @@
 <?php
-/* Copyright (C) 2013-2014 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-2015 Ari Elbaz (elarifr)  <github@accedinfo.com>
+/* Copyright (C) 2013-2014 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-2015 Ari Elbaz (elarifr)	<github@accedinfo.com>
 * 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) 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
@@ -31,6 +31,8 @@ require '../../main.inc.php';

 // Class
 require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';

 $langs->load("compta");
 $langs->load("bills");
@@ -140,17 +142,18 @@ if ($action == 'setmanagezero') {
 }

 if ($action == 'setdisabledirectinput') {
-	$setdisabledirectinput = GETPOST('value', 'int');
-	$res = dolibarr_set_const($db, "BANK_DISABLE_DIRECT_INPUT", $setdisabledirectinput, 'yesno', 0, '', $conf->entity);
-	if (! $res > 0)
-		$error ++;
-		if (! $error) {
-			setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-		} else {
-			setEventMessages($langs->trans("Error"), null, 'mesgs');
-		}
+    $setdisabledirectinput = GETPOST('value', 'int');
+    $res = dolibarr_set_const($db, "BANK_DISABLE_DIRECT_INPUT", $setdisabledirectinput, 'yesno', 0, '', $conf->entity);
+    if (! $res > 0)
+        $error ++;
+        if (! $error) {
+            setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+        } else {
+            setEventMessages($langs->trans("Error"), null, 'mesgs');
+        }
 }

+
 /*
 * View
 */
@@ -158,6 +161,7 @@ if ($action == 'setdisabledirectinput') {
 llxHeader();

 $form = new Form($db);
+$formaccountancy = new FormVentilation($db);

 $linkback = '<a href="' . DOL_URL_ROOT . '/admin/modules.php">' . $langs->trans("BackToModuleList") . '</a>';
 print load_fiche_titre($langs->trans('ConfigAccountingExpert'), $linkback, 'title_setup');
@@ -168,7 +172,7 @@ 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');
+dol_fiche_head($head, 'general', $langs->trans("Configuration"), 0, 'cron');


 // Default mode for calculating turnover (parameter ACCOUNTING_MODE)
@@ -211,7 +215,8 @@ print "</tr>\n";
 if (! empty($user->admin))
 {
    // TO DO Mutualize code for yes/no constants
-    print '<tr class="oddeven">';
+    $var = ! $var;
+    print "<tr " . $bc[$var] . ">";
    print '<td>' . $langs->trans("ACCOUNTING_LIST_SORT_VENTILATION_TODO") . '</td>';
    if (! empty($conf->global->ACCOUNTING_LIST_SORT_VENTILATION_TODO)) {
        print '<td align="right"><a href="' . $_SERVER['PHP_SELF'] . '?action=setlistsorttodo&value=0">';
@@ -224,7 +229,8 @@ if (! empty($user->admin))
    }
    print '</tr>';

-    print '<tr class="oddeven">';
+    $var = ! $var;
+    print "<tr " . $bc[$var] . ">";
    print '<td>' . $langs->trans("ACCOUNTING_LIST_SORT_VENTILATION_DONE") . '</td>';
    if (! empty($conf->global->ACCOUNTING_LIST_SORT_VENTILATION_DONE)) {
        print '<td align="right"><a href="' . $_SERVER['PHP_SELF'] . '?action=setlistsortdone&value=0">';
@@ -237,20 +243,22 @@ if (! empty($user->admin))
    }
    print '</tr>';

-	print '<tr class="oddeven">';
-	print '<td>' . $langs->trans("BANK_DISABLE_DIRECT_INPUT") . '</td>';
-	if (! empty($conf->global->BANK_DISABLE_DIRECT_INPUT)) {
-		print '<td align="right"><a href="' . $_SERVER['PHP_SELF'] . '?action=setdisabledirectinput&value=0">';
-		print img_picto($langs->trans("Activated"), 'switch_on');
-		print '</a></td>';
-	} else {
-		print '<td align="right"><a href="' . $_SERVER['PHP_SELF'] . '?action=setdisabledirectinput&value=1">';
-		print img_picto($langs->trans("Disabled"), 'switch_off');
-		print '</a></td>';
-	}
-	print '</tr>';
-
-    print '<tr class="oddeven">';
+    $var = ! $var;
+    print "<tr " . $bc[$var] . ">";
+    print '<td>' . $langs->trans("BANK_DISABLE_DIRECT_INPUT") . '</td>';
+    if (! empty($conf->global->BANK_DISABLE_DIRECT_INPUT)) {
+        print '<td align="right"><a href="' . $_SERVER['PHP_SELF'] . '?action=setdisabledirectinput&value=0">';
+        print img_picto($langs->trans("Activated"), 'switch_on');
+        print '</a></td>';
+    } else {
+        print '<td align="right"><a href="' . $_SERVER['PHP_SELF'] . '?action=setdisabledirectinput&value=1">';
+        print img_picto($langs->trans("Disabled"), 'switch_off');
+        print '</a></td>';
+    }
+    print '</tr>';
+    
+    $var = ! $var;
+    print "<tr " . $bc[$var] . ">";
    print '<td>' . $langs->trans("ACCOUNTING_MANAGE_ZERO") . '</td>';
    if (! empty($conf->global->ACCOUNTING_MANAGE_ZERO)) {
        print '<td align="right"><a href="' . $_SERVER['PHP_SELF'] . '?action=setmanagezero&value=0">';
@@ -268,7 +276,9 @@ if (! empty($user->admin))
 // Param a user $user->rights->accountancy->chartofaccount can access
 foreach ($list as $key) 
 {
-    print '<tr class="oddeven value">';
+    $var = ! $var;
+
+    print '<tr ' . $bc[$var] . ' class="value">';
    
    if (! empty($conf->global->ACCOUNTING_MANAGE_ZERO) && ($key == 'ACCOUNTING_LENGTH_GACCOUNT' || $key == 'ACCOUNTING_LENGTH_AACCOUNT')) continue;

@@ -296,7 +306,7 @@ print '<div class="center"><input type="submit" class="button" value="' . $langs
 print '<br>';
 print '<br>';

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

 print '<br>';
 print '</form>';
--- a/htdocs/accountancy/admin/journal.php
+++ b/htdocs/accountancy/admin/journal.php
@@ -0,0 +1,210 @@
+<?php
+/* Copyright (C) 2013-2014 Olivier Geffroy      <jeff@jeffinfo.com>
+ * Copyright (C) 2013-2017 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) 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * \file		htdocs/accountancy/admin/journal.php
+* \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';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/bank.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/compta/bank/class/account.class.php';
+
+$langs->load("compta");
+$langs->load("bills");
+$langs->load("admin");
+$langs->load("accountancy");
+$langs->load("salaries");
+
+// Security check
+if (empty($user->admin) || ! empty($user->rights->accountancy->chartofaccount))
+{
+    accessforbidden();
+}
+
+$action = GETPOST('action', 'alpha');
+
+// Other parameters ACCOUNTING_*
+$list = array (
+		'ACCOUNTING_SELL_JOURNAL',
+		'ACCOUNTING_PURCHASE_JOURNAL',
+		'ACCOUNTING_SOCIAL_JOURNAL',
+		'ACCOUNTING_MISCELLANEOUS_JOURNAL',
+		'ACCOUNTING_EXPENSEREPORT_JOURNAL'
+);
+
+/*
+ * Actions
+*/
+
+if ($action == 'update') {
+	$error = 0;
+
+	// Save vars
+	foreach ($list as $constname)
+	{
+		$constvalue = GETPOST($constname, 'alpha');
+
+		if (! dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
+			$error ++;
+		}
+	}
+
+	// Save bank account journals
+	$arrayofbankaccount = GETPOST('bank_account', 'array');
+	foreach($arrayofbankaccount as $key => $code)
+	{
+		$bankaccount = new Account($db);
+		$res = $bankaccount->fetch($key);
+		if ($res > 0)
+		{
+			$bankaccount->accountancy_journal = $code;
+			$bankaccount->update($user);
+		}
+		else
+		{
+			$error++;
+			break;
+		}
+	}
+
+	if (! $error) {
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
+}
+
+/*
+ * View
+*/
+
+llxHeader();
+
+$form = new Form($db);
+
+$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(null);
+
+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, 'journal', $langs->trans("Configuration"), 0, 'cron');
+
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre">';
+print '<td colspan="2">' . $langs->trans('Journaux') . '</td>';
+print "</tr>\n";
+
+foreach ( $list as $key ) {
+	$var = ! $var;
+
+	print '<tr ' . $bc[$var] . ' class="value">';
+
+	// Param
+	$label = $langs->trans($key);
+	print '<td width="50%"><label for="' . $key . '">' . $label . '</label></td>';
+
+	// Value
+	print '<td>';
+	print '<input type="text" size="20" id="' . $key . '" name="' . $key . '" value="' . $conf->global->$key . '">';
+	print '</td></tr>';
+}
+
+print "</table>\n";
+
+print '<br>';
+
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre">';
+print '<td colspan="2">' . $langs->trans('JournalFinancial') . ' ('.$langs->trans('Opened').')</td>';
+print "</tr>\n";
+
+// Bank account
+$sql = "SELECT rowid, ref, label, number, account_number, accountancy_journal";
+$sql .= " FROM " . MAIN_DB_PREFIX . "bank_account";
+$sql .= " WHERE entity = " . $conf->entity;
+$sql .= " AND clos = 0";
+$sql .= " ORDER BY label";
+
+$resql = $db->query($sql);
+if ($resql) {
+	$numr = $db->num_rows($resql);
+	$i = 0;
+
+	if ($numr > 0)
+
+		$bankaccountstatic = new Account($db);
+
+	while ( $i < $numr ) {
+		$objp = $db->fetch_object($resql);
+
+		$var = ! $var;
+
+		$bankaccountstatic->rowid = $objp->rowid;
+		$bankaccountstatic->id = $objp->rowid;
+		$bankaccountstatic->ref = $objp->ref;
+		$bankaccountstatic->label = $objp->label;
+		$bankaccountstatic->number = $objp->number;
+		$bankaccountstatic->account_number = $objp->account_number;
+		$bankaccountstatic->accountancy_journal = $objp->accountancy_journal;
+
+		print '<tr ' . $bc[$var] . ' class="value">';
+
+		// Param
+		print '<td width="50%"><label for="' . $objp->rowid . '">' . $langs->trans("Journal");
+		print ' - '.$bankaccountstatic->getNomUrl(1);
+		print '</label></td>';
+
+		// Value
+		print '<td>';
+		print '<input type="text" size="20" id="' . $objp->rowid . '" name="bank_account['.$objp->rowid.']" value="' . $objp->accountancy_journal . '">';
+		print '</td></tr>';
+
+		$i ++;
+	}
+	$db->free($resql);
+}
+else
+{
+	dol_print_error($db);
+}
+
+print "</table>\n";
+
+dol_fiche_end();
+
+print '<div class="center"><input type="submit" class="button" value="' . $langs->trans('Modify') . '" name="button"></div>';
+
+print '</form>';
+
+llxFooter();
+$db->close();
--- a/htdocs/accountancy/admin/journals_list.php
+++ b/htdocs/accountancy/admin/journals_list.php
@@ -1,752 +0,0 @@
-<?php
-/* Copyright (C) 2017		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
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-/**
- * \file		htdocs/accountancy/admin/journals_list.php
- * \ingroup		Advanced accountancy
- * \brief		Setup page to configure journals
- */
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-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.'/accountancy/class/accountingjournal.class.php';
-
-$langs->load("admin");
-$langs->load("compta");
-$langs->load("accountancy");
-
-$action=GETPOST('action','alpha')?GETPOST('action','alpha'):'view';
-$confirm=GETPOST('confirm','alpha');
-$id=GETPOST('id','int');
-$rowid=GETPOST('rowid','alpha');
-
-// Security access
-if (! empty($user->rights->accountancy->chartofaccount))
-{
-	accessforbidden();
-}
-
-$acts[0] = "activate";
-$acts[1] = "disable";
-$actl[0] = img_picto($langs->trans("Disabled"),'switch_off');
-$actl[1] = img_picto($langs->trans("Activated"),'switch_on');
-
-$listoffset=GETPOST('listoffset');
-$listlimit=GETPOST('listlimit')>0?GETPOST('listlimit'):1000;
-$active = 1;
-
-$sortfield = GETPOST("sortfield",'alpha');
-$sortorder = GETPOST("sortorder",'alpha');
-$page = GETPOST("page",'int');
-if ($page == -1) { $page = 0 ; }
-$offset = $listlimit * $page ;
-$pageprev = $page - 1;
-$pagenext = $page + 1;
-if (empty($sortfield)) $sortfield='code';
-if (empty($sortorder)) $sortorder='ASC';
-
-$error = 0;
-
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('admin'));
-
-// This page is a generic page to edit dictionaries
-// Put here declaration of dictionaries properties
-
-// Sort order to show dictionary (0 is space). All other dictionaries (added by modules) will be at end of this.
-$taborder=array(35);
-
-// Name of SQL tables of dictionaries
-$tabname=array();
-$tabname[35]= MAIN_DB_PREFIX."accounting_journal";
-
-// Dictionary labels
-$tablib=array();
-$tablib[35]= "DictionaryAccountancyJournal";
-
-// Requests to extract data
-$tabsql=array();
-$tabsql[35]= "SELECT a.rowid as rowid, a.code as code, a.label, a.nature, a.active FROM ".MAIN_DB_PREFIX."accounting_journal as a";
-
-// Criteria to sort dictionaries
-$tabsqlsort=array();
-$tabsqlsort[35]="code ASC";
-
-// Nom des champs en resultat de select pour affichage du dictionnaire
-$tabfield=array();
-$tabfield[35]= "code,label,nature";
-
-// Nom des champs d'edition pour modification d'un enregistrement
-$tabfieldvalue=array();
-$tabfieldvalue[35]= "code,label,nature";
-
-// Nom des champs dans la table pour insertion d'un enregistrement
-$tabfieldinsert=array();
-$tabfieldinsert[35]= "code,label,nature";
-
-// Nom du rowid si le champ n'est pas de type autoincrement
-// Example: "" if id field is "rowid" and has autoincrement on
-//          "nameoffield" if id field is not "rowid" or has not autoincrement on
-$tabrowid=array();
-$tabrowid[35]= "";
-
-// Condition to show dictionary in setup page
-$tabcond=array();
-$tabcond[35]= ! empty($conf->accounting->enabled);
-
-// List of help for fields
-$tabhelp=array();
-$tabhelp[35] = array('code'=>$langs->trans("EnterAnyCode"));
-
-// List of check for fields (NOT USED YET)
-$tabfieldcheck=array();
-$tabfieldcheck[35] = array();
-
-// Complete all arrays with entries found into modules
-complete_dictionary_with_modules($taborder,$tabname,$tablib,$tabsql,$tabsqlsort,$tabfield,$tabfieldvalue,$tabfieldinsert,$tabrowid,$tabcond,$tabhelp,$tabfieldcheck);
-
-
-// Define elementList and sourceList (used for dictionary type of contacts "llx_c_type_contact")
-$elementList = array();
-    // Must match ids defined into eldy.lib.php 
-    $sourceList = array(
-			'1' => $langs->trans('AccountingJournalType1'),
-			'2' => $langs->trans('AccountingJournalType2'),
-			'3' => $langs->trans('AccountingJournalType3'),
-			'4' => $langs->trans('AccountingJournalType4'),
-			'9' => $langs->trans('AccountingJournalType9')
-	);
-
-/*
- * Actions
- */
-
-if (GETPOST('button_removefilter') || GETPOST('button_removefilter.x') || GETPOST('button_removefilter_x'))
-{
-    $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]);
-
-    // 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 == '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
-    	{
-	    	$ok = 0;
-	    	$msg .= $langs->transnoentities('ErrorFieldFormat', $langs->transnoentities('Code')).'<br />';
-	    }*/
-    }
-
-	// Clean some parameters
-    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);
-
-            } 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)";
-        $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]] == '' && ! ($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);
-            }
-        }
-    }
-
-    // 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."'";
-
-        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
-}
-
-if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
-{
-    if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; }
-    else { $rowidcol="rowid"; }
-
-    $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);
-        }
-    }
-}
-
-// activate
-if ($action == $acts[0])
-{
-    if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; }
-    else { $rowidcol="rowid"; }
-
-    if ($rowid) {
-        $sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE ".$rowidcol."='".$rowid."'";
-    }
-    elseif ($_GET["code"]) {
-        $sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE code='".$_GET["code"]."'";
-    }
-
-    $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 ($rowid) {
-        $sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE ".$rowidcol."='".$rowid."'";
-    }
-    elseif ($_GET["code"]) {
-        $sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE code='".$_GET["code"]."'";
-    }
-
-    $result = $db->query($sql);
-    if (!$result)
-    {
-        dol_print_error($db);
-    }
-}
-
-/*
- * View
- */
-
-$form = new Form($db);
-$formadmin=new FormAdmin($db);
-
-llxHeader();
-
-$titre=$langs->trans("DictionarySetup");
-$linkback='';
-if ($id)
-{
-    $titre.=' - '.$langs->trans($tablib[$id]);
-    $titlepicto='title_accountancy';
-}
-
-print load_fiche_titre($titre,$linkback,$titlepicto);
-
-if (empty($id))
-{
-    print $langs->trans("DictionaryDesc");
-    print " ".$langs->trans("OnlyActiveElementsAreShown")."<br>\n";
-}
-print "<br>\n";
-
-
-// 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='.$_GET["code"].'&id='.$id, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete','',0,1);
-}
-//var_dump($elementList);
-
-/*
- * Show a dictionary
- */
-if ($id)
-{
-    // Complete requete recherche valeurs avec critere de tri
-    $sql=$tabsql[$id];
-
-    if ($search_country_id > 0)
-    {
-        if (preg_match('/ WHERE /',$sql)) $sql.= " AND ";
-        else $sql.=" WHERE ";
-        $sql.= " c.rowid = ".$search_country_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;
-
-    $fieldlist=explode(',',$tabfield[$id]);
-
-    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')).'">';
-    
-    print '<table class="noborder" width="100%">';
-
-    // Form to add a new line
-    if ($tabname[$id])
-    {
-        $alabelisused=0;
-        $var=false;
-
-        $fieldlist=explode(',',$tabfield[$id]);
-
-        // 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"); }
-				
-            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;
-        }
-
-        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>';
-
-        // Line to enter new values
-        print '<tr class="oddeven nodrag nodrap nohover">';
-
-        $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);
-            }
-        }
-
-        $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;
-
-        if (empty($reshook))
-        {
-       		fieldList($fieldlist,$obj,$tabname[$id],'add');
-        }
-
-        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;
-
-        $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>';
-        }
-
-        // 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"); }
-
-            // 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>';
-
-        // 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>';
-            
-        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;
-
-                    // Show fields
-                    if (empty($reshook)) fieldList($fieldlist,$obj,$tabname[$id],'edit');
-
-                    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
-
-                    $error=$hookmanager->error; $errors=$hookmanager->errors;
-
-                    if (empty($reshook))
-                    {
-                        foreach ($fieldlist as $field => $value)
-                        {
-                            
-                            $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; }
-                    }
-
-                    $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.='&';
-
-                    // 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>';
-
-                    // 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>';
-                }
-                
-                print "</tr>\n";
-                $i++;
-            }
-        }
-    }
-    else {
-        dol_print_error($db);
-    }
-
-    print '</table>';
-
-    print '</form>';
-}
-
-print '<br>';
-
-
-llxFooter();
-$db->close();
-
-
-/**
- *	Show fields in insert/edit mode
- *
- * 	@param		array	$fieldlist		Array of fields
- * 	@param		Object	$obj			If we show a particular record, obj is filled with record fields
- *  @param		string	$tabname		Name of SQL table
- *  @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 fieldList($fieldlist, $obj='', $tabname='', $context='')
-{
-	global $conf,$langs,$db;
-	global $form, $mysoc;
-	global $region_id;
-	global $elementList,$sourceList,$localtax_typeList;
-	global $bc;
-
-	$formadmin = new FormAdmin($db);
-	$formcompany = new FormCompany($db);
-
-	foreach ($fieldlist as $field => $value)
-	{
-		if ($fieldlist[$field] == 'nature')
-		{
-			print '<td>';
-			print $form->selectarray('nature', $sourceList,(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:''));
-			print '</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>';
-		}
-		else
-		{
-			print '<td>';
-			$size=''; $class='';
-			if ($fieldlist[$field]=='code')  $class='maxwidth100';
-			if ($fieldlist[$field]=='label') $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/productaccount.php
+++ b/htdocs/accountancy/admin/productaccount.php
@@ -31,7 +31,7 @@ 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 . '/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
 require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';

@@ -70,11 +70,11 @@ $accounting_product_mode = GETPOST('accounting_product_mode', 'alpha');
 $btn_changeaccount = GETPOST('changeaccount');
 $btn_changetype = GETPOST('changetype');

-$limit = GETPOST('limit','int')?GETPOST('limit','int'):(empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)?$conf->liste_limit:$conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
+$limit = GETPOST("limit")?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 == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if ($page == -1) { $page = 0; }
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
@@ -184,7 +184,7 @@ if ($action == 'update') {
 * View
 */

-$form = new FormAccounting($db);
+$form = new FormVentilation($db);

 // Defaut AccountingAccount RowId Product / Service
 // at this time ACCOUNTING_SERVICE_SOLD_ACCOUNT & ACCOUNTING_PRODUCT_SOLD_ACCOUNT are account number not accountingacount rowid
@@ -218,7 +218,7 @@ else
 {
    $sql.=" p.accountancy_code_sell = aa.account_number AND aa.fk_pcg_version = '" . $pcgvercode . "'";
 }
-$sql.= ' WHERE p.entity IN ('.getEntity('product').')';
+$sql.= ' WHERE p.entity IN ('.getEntity('product', 1).')';
 if ($accounting_product_mode == 'ACCOUNTANCY_BUY') {
    if (strlen(trim($search_current_account))) {
        $sql .= natural_search("p.accountancy_code_buy",$search_current_account);
@@ -279,7 +279,6 @@ if ($result)
    print '<input type="hidden" name="action" value="update">';
    print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
    print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-    print '<input type="hidden" name="page" value="'.$page.'">';
    
    print load_fiche_titre($langs->trans("ProductsBinding"), '', 'title_accountancy');
 	print '<br>';
@@ -313,8 +312,22 @@ if ($result)
 	print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, '', 0, '', '', $limit);
 	
 	print '<table class="liste '.($moreforfilter?"listwithfilterbefore":"").'">';
-
-	print '<tr class="liste_titre_filter">';
+	print '<tr class="liste_titre">';
+	print_liste_field_titre($langs->trans("Ref"), $_SERVER["PHP_SELF"], "p.ref", "", $param, '', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Label"), $_SERVER["PHP_SELF"], "p.label", "", $param, '', $sortfield, $sortorder);
+    if (! empty($conf->global->ACCOUNTANCY_SHOW_PROD_DESC)) print_liste_field_titre($langs->trans("Description"), $_SERVER["PHP_SELF"], "p.description", "", $param, '', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("OnSell"), $_SERVER["PHP_SELF"], "p.tosell", "", $param, 'align="center"', $sortfield, $sortorder);
+   	print_liste_field_titre($langs->trans("OnBuy"), $_SERVER["PHP_SELF"], "p.tobuy", "", $param, 'align="center"', $sortfield, $sortorder);
+   	if ($accounting_product_mode == 'ACCOUNTANCY_BUY') {
+   	    $fieldtosortaccount="p.accountancy_code_buy";
+   	}
+   	else $fieldtosortaccount="p.accountancy_code_sell";
+   	print_liste_field_titre($langs->trans("CurrentDedicatedAccountingAccount"), $_SERVER["PHP_SELF"], $fieldtosortaccount, "", $param, '', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("AssignDedicatedAccountingAccount"));
+	print_liste_field_titre('', '', '', '', '', 'align="center"');
+	print '</tr>';
+	
+	print '<tr class="liste_titre">';
 	print '<td class="liste_titre"><input type="text" class="flat" size="8" name="search_ref" value="' . dol_escape_htmltag($search_ref) . '"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat" size="10" name="search_label" value="' . dol_escape_htmltag($search_label) . '"></td>';
 	if (! empty($conf->global->ACCOUNTANCY_SHOW_PROD_DESC)) print '<td class="liste_titre"><input type="text" class="flat" size="20" name="search_desc" value="' . dol_escape_htmltag($search_desc) . '"></td>';
@@ -329,28 +342,12 @@ if ($result)
 	print ' '.$langs->trans("or").' '.$form->selectarray('search_current_account_valid', $listofvals, $search_current_account_valid, 1);
 	print '</td>';
 	print '<td class="liste_titre">&nbsp;</td>';
-	print '<td align="center" class="liste_titre">';
-	$searchpicto=$form->showFilterButtons();
-	print $searchpicto;
+	print '<td align="right" class="liste_titre">';
+	$searchpitco=$form->showFilterAndCheckAddButtons(1, 'checkforselect', 1);
+	print $searchpitco;
 	print '</td>';
 	print '</tr>';
 	
-	print '<tr class="liste_titre">';
-	print_liste_field_titre($langs->trans("Ref"), $_SERVER["PHP_SELF"], "p.ref", "", $param, '', $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans("Label"), $_SERVER["PHP_SELF"], "p.label", "", $param, '', $sortfield, $sortorder);
-    if (! empty($conf->global->ACCOUNTANCY_SHOW_PROD_DESC)) print_liste_field_titre($langs->trans("Description"), $_SERVER["PHP_SELF"], "p.description", "", $param, '', $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans("OnSell"), $_SERVER["PHP_SELF"], "p.tosell", "", $param, 'align="center"', $sortfield, $sortorder);
-   	print_liste_field_titre($langs->trans("OnBuy"), $_SERVER["PHP_SELF"], "p.tobuy", "", $param, 'align="center"', $sortfield, $sortorder);
-   	if ($accounting_product_mode == 'ACCOUNTANCY_BUY') {
-   	    $fieldtosortaccount="p.accountancy_code_buy";
-   	}
-   	else $fieldtosortaccount="p.accountancy_code_sell";
-   	print_liste_field_titre($langs->trans("CurrentDedicatedAccountingAccount"), $_SERVER["PHP_SELF"], $fieldtosortaccount, "", $param, '', $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans("AssignDedicatedAccountingAccount"));
-	$clickpitco=$form->showCheckAddButtons('checkforselect', 1);
-	print_liste_field_titre($clickpitco, '', '', '', '', 'align="center"');
-	print '</tr>';
-	
 	$product_static = new Product($db);
 	
 	$var = true;
@@ -384,7 +381,8 @@ if ($result)
 			$compta_prodbuy_id = $aarowid_servbuy;
 		}
 		
-		print '<tr class="oddeven">';
+		$var = ! $var;
+		print '<tr '. $bc[$var].'>';
 		
 		print '<td>';
 		print $product_static->getNomUrl(1);
@@ -442,7 +440,7 @@ if ($result)
 		}
 		
 		// Checkbox select
-		print '<td align="center">';
+		print '<td align="right">';
 		print '<input type="checkbox" class="checkforselect" name="chk_prod[]" value="' . $obj->rowid . '"/></td>';
 		print "</tr>";
 		$i ++;
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -28,8 +28,8 @@ require '../../main.inc.php';

 // Class
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/bookkeeping.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';

 // Langs
@@ -55,13 +55,13 @@ if (GETPOST("button_export_csv_x") || GETPOST("button_export_csv")) {
 	$action = 'export_csv';
 }

-$limit = GETPOST('limit','int')?GETPOST('limit', 'int'):$conf->liste_limit;
+$limit = GETPOST('limit') ? GETPOST('limit', 'int') : $conf->liste_limit;

 $offset = $limit * $page;

 $object = new BookKeeping($db);

-$formaccounting = new FormAccounting($db);
+$formventilation = new FormVentilation($db);
 $formother = new FormOther($db);
 $form = new Form($db);

@@ -98,7 +98,7 @@ if (! empty($search_accountancy_code_end)) {
 * Action
 */

-if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
+if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
 {
    $search_accountancy_code_start = '';
    $search_accountancy_code_end = '';
@@ -137,7 +137,7 @@ if ($action == 'export_csv') {
 }

 else {
-    $title_page = $langs->trans("AccountBalance") . (($search_date_start || $search_date_end) ? ' ' . dol_print_date($search_date_start) . '-' . dol_print_date($search_date_end) : '');
+    $title_page = $langs->trans("AccountBalance") . ' ' . dol_print_date($search_date_start) . '-' . dol_print_date($search_date_end);
    
    llxHeader('', $title_page);
    
@@ -160,7 +160,7 @@ else {
    print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
    
    $button = '<input type="submit" name="button_export_csv" class="butAction" value="' . $langs->trans("Export") . '" />';
-    print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $options, $sortfield, $sortorder, '', $result, $result, 'title_accountancy', 0, $button);
+    print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $options, $sortfield, $sortorder, '', $result, 0, 'title_accountancy', 0, $button);
    
    
    $moreforfilter = '';
@@ -182,22 +182,6 @@ else {
    }
    
    print '<table class="liste ' . ($moreforfilter ? "listwithfilterbefore" : "") . '">';
-
-    print '<tr class="liste_titre_filter">';
-    print '<td class="liste_titre" colspan="5">';
-    print $langs->trans('From');
-    print $formaccounting->select_account($search_accountancy_code_start, 'search_accountancy_code_start', 1, array(), 1, 1, '');
-    print ' ';
-    print $langs->trans('to');
-    print $formaccounting->select_account($search_accountancy_code_end, 'search_accountancy_code_end', 1, array(), 1, 1, '');
-    print '</td>';
-    print '<td align="right" class="liste_titre">';
-	$searchpicto=$form->showFilterAndCheckAddButtons(0);
-	print $searchpicto;
-    print '</td>';
-    
-    print '</tr>';
-    
    print '<tr class="liste_titre">';
    print_liste_field_titre($langs->trans("AccountAccounting"), $_SERVER['PHP_SELF'], "t.numero_compte", "", $options, "", $sortfield, $sortorder);
    print_liste_field_titre($langs->trans("Label"), $_SERVER['PHP_SELF'], "t.label_compte", "", $options, "", $sortfield, $sortorder);
@@ -207,6 +191,28 @@ else {
    print_liste_field_titre('', $_SERVER["PHP_SELF"], "", $options, "", 'width="60" align="center"', $sortfield, $sortorder);
    print "</tr>\n";
    
+    print '<tr class="liste_titre">';
+    print '<td class="liste_titre" colspan="2">';
+    print $langs->trans('From');
+    print $formventilation->select_account($search_accountancy_code_start, 'search_accountancy_code_start', 1, array(), 1, 1, '');
+    print '<br>';
+    print $langs->trans('to');
+    print $formventilation->select_account($search_accountancy_code_end, 'search_accountancy_code_end', 1, array(), 1, 1, '');
+    print '</td>';
+    
+    print '<td class="liste_titre center">&nbsp;</td>';
+    print '<td class="liste_titre center">&nbsp;</td>';
+    print '<td class="liste_titre center">&nbsp;</td>';
+    
+    print '<td align="right" class="liste_titre">';
+	$searchpitco=$form->showFilterAndCheckAddButtons(0);
+	print $searchpitco;
+    print '</td>';
+    
+    print '</tr>';
+    
+    $var = True;
+    
    $total_debit = 0;
    $total_credit = 0;
    $sous_total_debit = 0;
@@ -214,6 +220,7 @@ else {
    $displayed_account = "";
    
    foreach ($object->lines as $line) {
+        $var = ! $var;
        $link = '';
        $total_debit += $line->debit;
        $total_credit += $line->credit;
@@ -222,7 +229,7 @@ else {
        if (empty($description)) {
            $link = '<a href="../admin/card.php?action=create&compte=' . length_accountg($line->numero_compte) . '">' . img_edit_add() . '</a>';
        }
-        print '<tr class="oddeven">';
+        print '<tr ' . $bc[$var] . '>';
        
        // Permet d'afficher le compte comptable
        if ($root_account_description != $displayed_account) {
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -1,7 +1,7 @@
 <?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) 2013-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
@@ -18,23 +18,19 @@
 */

 /**
- * \file	htdocs/accountancy/bookkeeping/card.php
+ * \file htdocs/accountancy/bookkeeping/card.php
 * \ingroup Advanced accountancy
- * \brief	Page to show book-entry
+ * \brief Page to show book-entry
 */
 require '../../main.inc.php';

 // Class
 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 . '/accountancy/class/accountingjournal.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';

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

 // Security check
 $id = GETPOST('id', 'int');
@@ -42,7 +38,7 @@ if ($user->societe_id > 0) {
 	accessforbidden();
 }

-$action = GETPOST('action','aZ09');
+$action = GETPOST('action');
 $piece_num = GETPOST("piece_num");

 $mesg = '';
@@ -214,7 +210,7 @@ else if ($action == "confirm_create") {
 llxHeader();

 $html = new Form($db);
-$formaccountancy = new FormAccounting($db);
+$formventilation = new FormVentilation($db);

 /*
 *  Confirmation to delete the command
@@ -227,6 +223,26 @@ if ($action == 'delete') {
 if ($action == 'create') {
 	print load_fiche_titre($langs->trans("CreateMvts"));

+	$code_journal_array = array (
+			$conf->global->ACCOUNTING_SELL_JOURNAL => $conf->global->ACCOUNTING_SELL_JOURNAL,
+			$conf->global->ACCOUNTING_PURCHASE_JOURNAL => $conf->global->ACCOUNTING_PURCHASE_JOURNAL,
+			$conf->global->ACCOUNTING_SOCIAL_JOURNAL => $conf->global->ACCOUNTING_SOCIAL_JOURNAL,
+			$conf->global->ACCOUNTING_MISCELLANEOUS_JOURNAL => $conf->global->ACCOUNTING_MISCELLANEOUS_JOURNAL,
+			$conf->global->ACCOUNTING_EXPENSEREPORT_JOURNAL => $conf->global->ACCOUNTING_EXPENSEREPORT_JOURNAL
+	);
+
+	$sql = 'SELECT DISTINCT accountancy_journal FROM ' . MAIN_DB_PREFIX . 'bank_account WHERE clos=0';
+	$resql = $db->query($sql);
+	if (! $resql) {
+		setEventMessages($db->lasterror, null, 'errors');
+	} else {
+		while ( $obj_bank = $db->fetch_object($resql) ) {
+			if (! empty($obj_bank->accountancy_journal)) {
+				$code_journal_array[$obj_bank->accountancy_journal] = $obj_bank->accountancy_journal;
+			}
+		}
+	}
+
 	$book = new BookKeeping($db);
 	$next_num_mvt = $book->getNextNumMvt();
    if (empty($next_num_mvt))
@@ -254,10 +270,9 @@ if ($action == 'create') {
 	print '</tr>';

 	print '<tr>';
-	print '<td class="fieldrequired">'.$langs->trans("AccountancyJournal").'</td>';
-	print '<td>';
-	print $formaccountancy->select_journal('', 'code_journal', '', 0, '', 1, 1, 1, 1);
-	print '</td></tr>';
+	print '<td class="fieldrequired">' . $langs->trans("Codejournal") . '</td>';
+	print '<td>' . $html->selectarray('code_journal', $code_journal_array) . '</td>';
+	print '</tr>';

 	print '<tr>';
 	print '<td>' . $langs->trans("Docref") . '</td>';
@@ -290,54 +305,29 @@ if ($action == 'create') {

 		dol_fiche_head();
 		
-		print '<div class="fichecenter">';
-		
 		print '<table class="border" width="100%">';
-
 		print '<tr class="pair">';
 		print '<td class="titlefield">' . $langs->trans("NumMvts") . '</td>';
 		print '<td>' . $book->piece_num . '</td>';
 		print '</tr>';
-
 		print '<tr class="impair">';
 		print '<td>' . $langs->trans("Docdate") . '</td>';
 		print '<td>' . dol_print_date($book->doc_date, 'daytextshort') . '</td>';
 		print '</tr>';
-
 		print '<tr class="pair">';
 		print '<td>' . $langs->trans("Codejournal") . '</td>';
-		print '<td>';	
-		$accountingjournal = new AccountingJournal($db);
-		$accountingjournal->fetch('',$book->code_journal);
-		print $accountingjournal->getNomUrl(0,1,1,'',1);	
-		print '</td></tr>';
-		
+		print '<td>' . $book->code_journal . '</td>';
+		print '</tr>';
 		print '<tr class="impair">';
 		print '<td>' . $langs->trans("Docref") . '</td>';
 		print '<td>' . $book->doc_ref . '</td>';
 		print '</tr>';
-
-		$typelabel = $book->doc_type;
-		if ($typelabel == 'bank') {
-			$typelabel = $langs->trans('Bank');
-		}
-		if ($typelabel == 'customer_invoice') {
-			$typelabel = $langs->trans('CustomerInvoice');
-		}
-		if ($typelabel == 'supplier_invoice') {
-			$typelabel = $langs->trans('SupplierInvoice');
-		}
-		if ($typelabel == 'expense_report') {
-			$typelabel = $langs->trans('ExpenseReport');
-		}
 		print '<tr class="pair">';
 		print '<td>' . $langs->trans("Doctype") . '</td>';
-		print '<td>' . $typelabel . '</td>';
+		print '<td>' . $book->doc_type . '</td>';
 		print '</tr>';
 		print '</table>';
 		
-		print '</div>';
-		
 		dol_fiche_end();

 		print '<br>';
@@ -379,7 +369,8 @@ if ($action == 'create') {
 				print "</tr>\n";

 				foreach ($book->linesmvt as $line) {
-					print '<tr class="oddeven">';
+					$var = ! $var;
+					print '<tr ' . $bc[$var] . '>';

 					$total_debit += $line->debit;
 					$total_credit += $line->credit;
@@ -387,10 +378,10 @@ if ($action == 'create') {
 					if ($action == 'update' && $line->id == $id) {

 						print '<td>';
-						print $formaccounting->select_account($line->numero_compte, 'account_number', 0, array (), 1, 1, '');
+						print $formventilation->select_account($line->numero_compte, 'account_number', 0, array (), 1, 1, '');
 						print '</td>';
 						print '<td>';
-						print $formaccounting->select_auxaccount($line->code_tiers, 'code_tiers', 1);
+						print $formventilation->select_auxaccount($line->code_tiers, 'code_tiers', 1);
 						print '</td>';
 						print '<td><input type="text" size="15" name="label_compte" value="' . $line->label_compte . '"/></td>';
 						print '<td align="right"><input type="text" size="6" name="debit" value="' . price($line->debit) . '"/></td>';
@@ -429,16 +420,17 @@ if ($action == 'create') {
 				}

 				if ($action == "" || $action == 'add') {
-					print '<tr class="oddeven">';
+					$var = ! $var;
+					print '<tr ' . $bc[$var] . '>';
 					print '<td>';
-					print $formaccounting->select_account($account_number, 'account_number', 0, array (), 1, 1, '');
+					print $formventilation->select_account($account_number, 'account_number', 0, array (), 1, 1, '');
 					print '</td>';
 					print '<td>';
-					print $formaccounting->select_auxaccount($code_tiers, 'code_tiers', 1);
+					print $formventilation->select_auxaccount($code_tiers, 'code_tiers', 1);
 					print '</td>';
 					print '<td><input type="text" size="15" name="label_compte" value="' . $label_compte . '"/></td>';
-					print '<td align="right"><input type="text" class="right maxwidth50" name="debit" value="' . price($debit) . '"/></td>';
-					print '<td align="right"><input type="text" class="right maxwidth50" name="credit" value="' . price($credit) . '"/></td>';
+					print '<td align="right"><input type="text" size="6" name="debit" value="' . price($debit) . '"/></td>';
+					print '<td align="right"><input type="text" size="6" name="credit" value="' . price($credit) . '"/></td>';
 					print '<td></td>';
 					print '<td></td>';
 					print '<td><input type="submit" class="button" name="save" value="' . $langs->trans("Add") . '"></td>';
--- 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		Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2013-2016	Alexandre Spangaro	<aspangaro.dolibarr@gmail.com>
+ * 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
@@ -28,10 +28,9 @@ require '../../main.inc.php';

 // Class
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/bookkeeping.class.php';
-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';

 // Langs
 $langs->load("accountancy");
@@ -80,7 +79,7 @@ $search_direction = GETPOST('search_direction', 'alpha');
 $search_ledger_code = GETPOST('search_ledger_code', 'alpha');

 // 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);
+$limit = GETPOST('limit') ? 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');
@@ -94,7 +93,7 @@ if ($sortfield == "") $sortfield = "t.rowid";

 $object = new BookKeeping($db);

-$formaccounting = new FormAccounting($db);
+$formventilation = new FormVentilation($db);
 $formother = new FormOther($db);
 $form = new Form($db);

@@ -292,6 +291,7 @@ $title_page = $langs->trans("Bookkeeping");
 llxHeader('', $title_page);

 // List
+
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	$nbtotalofrecords = $object->fetchAll($sortorder, $sortfield, 0, 0, $filter);
@@ -321,8 +321,8 @@ if ($action == 'delbookkeepingyear') {
 	if (empty($delyear)) {
 		$delyear = dol_print_date(dol_now(), '%Y');
 	}
-	$year_array = $formaccounting->selectyear_accountancy_bookkepping($delyear, 'delyear', 0, 'array');
-	$journal_array = $formaccounting->selectjournal($deljournal, 'deljournal', '', 1, 'array', 1, 1);
+	$year_array = $formventilation->selectyear_accountancy_bookkepping($delyear, 'delyear', 0, 'array');
+	$journal_array = $formventilation->selectjournal_accountancy_bookkepping($deljournal, 'deljournal', 0, 'array');

 	$form_question['delyear'] = array (
 			'name' => 'delyear',
@@ -354,14 +354,13 @@ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="formfilteraction" id="formfilteraction" 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 = '<a class="butAction" name="button_export_csv" href="'.$_SERVER["PHP_SELF"].'?action=export_csv'.($param?'&'.$param:'').'">';
 if (count($filter)) $button.= $langs->trans("ExportFilteredList");
 else $button.= $langs->trans("ExportList");
 $button.= '</a>';

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

 print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $button, $result, $nbtotalofrecords, 'title_accountancy', 0, $groupby, '', $limit);

@@ -372,8 +371,20 @@ print '<div class="inline-block divButAction"><a class="butActionDelete" name="b
 print '</div>';

 print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre">';
+print_liste_field_titre($langs->trans("TransactionNumShort"), $_SERVER['PHP_SELF'], "t.piece_num", "", $param, "", $sortfield, $sortorder);
+print_liste_field_titre($langs->trans("Docdate"), $_SERVER['PHP_SELF'], "t.doc_date", "", $param, 'align="center"', $sortfield, $sortorder);
+print_liste_field_titre($langs->trans("Docref"), $_SERVER['PHP_SELF'], "t.doc_ref", "", $param, "", $sortfield, $sortorder);
+print_liste_field_titre($langs->trans("AccountAccountingShort"), $_SERVER['PHP_SELF'], "t.numero_compte", "", $param, "", $sortfield, $sortorder);
+print_liste_field_titre($langs->trans("Code_tiers"), $_SERVER['PHP_SELF'], "t.code_tiers", "", $param, "", $sortfield, $sortorder);
+print_liste_field_titre($langs->trans("Label"), $_SERVER['PHP_SELF'], "t.label_compte", "", $param, "", $sortfield, $sortorder);
+print_liste_field_titre($langs->trans("Debit"), $_SERVER['PHP_SELF'], "t.debit", "", $param, 'align="right"', $sortfield, $sortorder);
+print_liste_field_titre($langs->trans("Credit"), $_SERVER['PHP_SELF'], "t.credit", "", $param, 'align="right"', $sortfield, $sortorder);
+print_liste_field_titre($langs->trans("Codejournal"), $_SERVER['PHP_SELF'], "t.code_journal", "", $param, 'align="center"', $sortfield, $sortorder);
+print_liste_field_titre('', $_SERVER["PHP_SELF"], "", $param, "", 'width="60" align="center"', $sortfield, $sortorder);
+print "</tr>\n";

-print '<tr class="liste_titre_filter">';
+print '<tr class="liste_titre">';
 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 $langs->trans('From') . ': ';
@@ -385,17 +396,17 @@ 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 $langs->trans('From');
-print $formaccounting->select_account($search_accountancy_code_start, 'search_accountancy_code_start', 1, array (), 1, 1, '');
+print $formventilation->select_account($search_accountancy_code_start, 'search_accountancy_code_start', 1, array (), 1, 1, '');
 print '<br>';
 print $langs->trans('to');
-print $formaccounting->select_account($search_accountancy_code_end, 'search_accountancy_code_end', 1, array (), 1, 1, '');
+print $formventilation->select_account($search_accountancy_code_end, 'search_accountancy_code_end', 1, array (), 1, 1, '');
 print '</td>';
 print '<td class="liste_titre">';
 print $langs->trans('From');
-print $formaccounting->select_auxaccount($search_accountancy_aux_code_start, 'search_accountancy_aux_code_start', 1);
+print $formventilation->select_auxaccount($search_accountancy_aux_code_start, 'search_accountancy_aux_code_start', 1);
 print '<br>';
 print $langs->trans('to');
-print $formaccounting->select_auxaccount($search_accountancy_aux_code_end, 'search_accountancy_aux_code_end', 1);
+print $formventilation->select_auxaccount($search_accountancy_aux_code_end, 'search_accountancy_aux_code_end', 1);
 print '</td>';
 print '<td class="liste_titre">';
 print '<input type="text" size="7" class="flat" name="search_mvt_label" value="' . $search_mvt_label . '"/>';
@@ -404,26 +415,12 @@ 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;
+$searchpitco=$form->showFilterAndCheckAddButtons(0);
+print $searchpitco;
 print '</td>';
 print '</tr>';

-print '<tr class="liste_titre">';
-print_liste_field_titre($langs->trans("TransactionNumShort"), $_SERVER['PHP_SELF'], "t.piece_num", "", $param, "", $sortfield, $sortorder);
-print_liste_field_titre($langs->trans("Docdate"), $_SERVER['PHP_SELF'], "t.doc_date", "", $param, 'align="center"', $sortfield, $sortorder);
-print_liste_field_titre($langs->trans("Docref"), $_SERVER['PHP_SELF'], "t.doc_ref", "", $param, "", $sortfield, $sortorder);
-print_liste_field_titre($langs->trans("AccountAccountingShort"), $_SERVER['PHP_SELF'], "t.numero_compte", "", $param, "", $sortfield, $sortorder);
-print_liste_field_titre($langs->trans("Code_tiers"), $_SERVER['PHP_SELF'], "t.code_tiers", "", $param, "", $sortfield, $sortorder);
-print_liste_field_titre($langs->trans("Label"), $_SERVER['PHP_SELF'], "t.label_compte", "", $param, "", $sortfield, $sortorder);
-print_liste_field_titre($langs->trans("Debit"), $_SERVER['PHP_SELF'], "t.debit", "", $param, 'align="right"', $sortfield, $sortorder);
-print_liste_field_titre($langs->trans("Credit"), $_SERVER['PHP_SELF'], "t.credit", "", $param, 'align="right"', $sortfield, $sortorder);
-print_liste_field_titre($langs->trans("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";
-
+$var = True;

 $total_debit = 0;
 $total_credit = 0;
@@ -434,21 +431,17 @@ foreach ($object->lines as $line ) {
 	$total_debit += $line->debit;
 	$total_credit += $line->credit;

-	print '<tr class="oddeven">';
+	print '<tr '. $bc[$var].'>';

 	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>' . $line->doc_ref . '</td>';
 	print '<td>' . length_accountg($line->numero_compte) . '</td>';
 	print '<td>' . length_accounta($line->code_tiers) . '</td>';
 	print '<td>' . $line->label_compte . '</td>';
 	print '<td align="right">' . price($line->debit) . '</td>';
 	print '<td align="right">' . price($line->credit) . '</td>';
-
-	$accountingjournal = new AccountingJournal($db);
-	$accountingjournal->fetch('',$line->code_journal);
-	print '<td align="center">' . $accountingjournal->getNomUrl(0,0,0,'',0) . '</td>';
-
+	print '<td align="center">' . $line->code_journal . '</td>';
 	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>';
@@ -463,10 +456,10 @@ print '</td>';
 print '<td  align="right">';
 print price($total_debit);
 print '</td>';
-print '<td align="right">';
+print '<td  align="right">';
 print price($total_credit);
 print '</td>';
-print '<td colspan="2"></td>';
+print '<td></td>';
 print '</tr>';

 print "</table>";
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -29,8 +29,8 @@ require '../../main.inc.php';

 // Class
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/bookkeeping.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';

 // Langs
@@ -59,7 +59,7 @@ $search_direction = GETPOST('search_direction', 'alpha');
 $search_ledger_code = GETPOST('search_ledger_code', 'alpha');

 // 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);
+$limit = GETPOST('limit') ? 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');
@@ -75,7 +75,7 @@ if (empty($search_date_end)) $search_date_end = dol_mktime(0, 0, 0, 12, 31, dol_

 $object = new BookKeeping($db);

-$formaccounting = new FormAccounting($db);
+$formventilation = new FormVentilation($db);
 $formother = new FormOther($db);
 $form = new Form($db);

@@ -188,7 +188,7 @@ if ($action == 'delbookkeepingyear') {
 	if (empty($delyear)) {
 		$delyear = dol_print_date(dol_now(), '%Y');
 	}
-	$year_array = $formaccounting->selectyear_accountancy_bookkepping($delyear, 'delyear', 0, 'array');
+	$year_array = $formventilation->selectyear_accountancy_bookkepping($delyear, 'delyear', 0, 'array');

 	$form_question['delyear'] = array (
 			'name' => 'delyear',
@@ -207,7 +207,7 @@ if ($action == 'delbookkeepingyear') {

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

-$viewflat = ' <a class="nohover" href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/list.php">' . $langs->trans("ViewFlatList") . '</a>';
+$viewflat = ' <a href="./list.php">' . $langs->trans("ViewFlatList") . '</a>';

 print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $options, $sortfield, $sortorder, '', $result, $nbtotalofrecords,'title_accountancy',0,$viewflat,'',$limit);

@@ -222,6 +222,17 @@ print '<div class="inline-block divButAction"><a class="butAction" href="./card.
 print '</div>';

 print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre">';
+print '<td>' . $langs->trans("AccountAccounting") . '</td>';
+print_liste_field_titre($langs->trans("TransactionNumShort"), $_SERVER['PHP_SELF'], "t.piece_num", "", $options, 'align="right"', $sortfield, $sortorder);
+print_liste_field_titre($langs->trans("Docdate"), $_SERVER['PHP_SELF'], "t.doc_date", "", $options, 'align="center"', $sortfield, $sortorder);
+print_liste_field_titre($langs->trans("Docref"), $_SERVER['PHP_SELF'], "t.doc_ref", "", $options, "", $sortfield, $sortorder);
+print_liste_field_titre($langs->trans("SuppliersInvoices") . ' / ' . $langs->trans("CustomersInvoices"));
+print_liste_field_titre($langs->trans("Debit"), $_SERVER['PHP_SELF'], "t.debit", "", $options, 'align="right"', $sortfield, $sortorder);
+print_liste_field_titre($langs->trans("Credit"), $_SERVER['PHP_SELF'], "t.credit", "", $options, 'align="right"', $sortfield, $sortorder);
+print_liste_field_titre($langs->trans("Codejournal"), $_SERVER['PHP_SELF'], "t.code_journal", "", $options, 'align="right"', $sortfield, $sortorder);
+print_liste_field_titre('', $_SERVER["PHP_SELF"], "", $options, "", 'width="60" align="center"', $sortfield, $sortorder);
+print "</tr>\n";

 print '<tr class="liste_titre">';
 print '<td class="liste_titre">' . $object->select_account($search_accountancy_code_start, 'search_accountancy_code_start', 1, array (), 1, 1, '') . '</td>';
@@ -239,22 +250,10 @@ print '<td class="liste_titre">&nbsp;</td>';
 print '<td class="liste_titre">&nbsp;</td>';
 print '<td class="liste_titre" align="right"><input type="text" name="search_ledger_code" size="3" value="' . $search_ledger_code . '"></td>';
 print '<td class="liste_titre" align="right" colspan="2">';
-$searchpicto=$form->showFilterAndCheckAddButtons(0);
-print $searchpicto;
+$searchpitco=$form->showFilterAndCheckAddButtons(0);
+print $searchpitco;
 print '</td>';

-print '<tr class="liste_titre">';
-print_liste_field_titre($langs->trans("AccountAccountingShort"), $_SERVER['PHP_SELF']);
-print_liste_field_titre($langs->trans("TransactionNumShort"), $_SERVER['PHP_SELF'], "t.piece_num", "", $options, 'align="right"', $sortfield, $sortorder);
-print_liste_field_titre($langs->trans("Docdate"), $_SERVER['PHP_SELF'], "t.doc_date", "", $options, 'align="center"', $sortfield, $sortorder);
-print_liste_field_titre($langs->trans("Docref"), $_SERVER['PHP_SELF'], "t.doc_ref", "", $options, "", $sortfield, $sortorder);
-print_liste_field_titre($langs->trans("Label"));
-print_liste_field_titre($langs->trans("Debit"), $_SERVER['PHP_SELF'], "t.debit", "", $options, 'align="right"', $sortfield, $sortorder);
-print_liste_field_titre($langs->trans("Credit"), $_SERVER['PHP_SELF'], "t.credit", "", $options, 'align="right"', $sortfield, $sortorder);
-print_liste_field_titre($langs->trans("Codejournal"), $_SERVER['PHP_SELF'], "t.code_journal", "", $options, 'align="right"', $sortfield, $sortorder);
-print_liste_field_titre('', $_SERVER["PHP_SELF"], "", $options, "", 'width="60" align="center"', $sortfield, $sortorder);
-print "</tr>\n";
-
 print '</tr>';

 $var = True;
@@ -266,6 +265,7 @@ $sous_total_credit = 0;
 $displayed_account_number = null;       // Start with undefined to be able to distinguish with empty 

 foreach ( $object->lines as $line ) {
+	$var = ! $var;

 	$total_debit += $line->debit;
 	$total_credit += $line->credit;
@@ -278,10 +278,9 @@ foreach ( $object->lines as $line ) {
        
        // Affiche un Sous-Total par compte comptable
        if (isset($displayed_account_number)) {
-            print '<tr class="liste_total"><td align="right" colspan="5">'.$langs->trans("SubTotal").':</td><td class="nowrap" align="right">'.price($sous_total_debit).'</td><td class="nowrap" align="right">'.price($sous_total_credit).'</td>';
-            print "<td>&nbsp;</td>\n";
-            print "<td>&nbsp;</td>\n";
-            print '</tr>';
+          print '<tr class="liste_total"><td align="right" colspan="4">'.$langs->trans("SubTotal").':</td><td class="nowrap" align="right">'.price($sous_total_debit).'</td><td class="nowrap" align="right">'.price($sous_total_credit).'</td>';
+          print "<td>&nbsp;</td>\n";
+          print '</tr>';
        }
        
        // Show the break account
@@ -299,20 +298,19 @@ foreach ( $object->lines as $line ) {
        $sous_total_credit = 0;
    }

-	print '<tr class="oddeven">';
+	print '<tr '. $bc[$var].'>';
 	print '<td>&nbsp;</td>';
-	print '<td align="right"><a href="./card.php?piece_num=' . $line->piece_num . '">'.$line->piece_num.'</a></td>';
+	print '<td align="right">'.$line->piece_num.'</td>';
 	print '<td align="center">' . dol_print_date($line->doc_date, 'day') . '</td>';
-	
-	// TODO Add a link according to doc_type and fk_doc
-	print '<td class="nowrap">';
-    //if ($line->doc_type == 'supplier_invoice')
-    //if ($line->doc_type == 'customer_invoice')
-	print $line->doc_ref;
-    print '</td>';
+	print '<td><a href="./card.php?piece_num=' . $line->piece_num . '">' . $line->doc_ref . '</a></td>';
    
    // Affiche un lien vers la facture client/fournisseur
    $doc_ref = preg_replace('/\(.*\)/', '', $line->doc_ref);
+    if ($line->doc_type == 'supplier_invoice')
+     print strlen(length_accounta($line->code_tiers)) == 0 ? '<td><a href="/fourn/facture/list.php?search_ref_supplier=' . $doc_ref . '">' . $line->label_compte . '</a></td>' : '<td><a href="/fourn/facture/list.php?search_ref_supplier=' . $doc_ref . '">' . $line->label_compte . '</a><br /><span style="font-size:0.8em">(' . length_accounta($line->code_tiers) . ')</span></td>';
+    elseif ($line->doc_type == 'customer_invoice')
+    print strlen(length_accounta($line->code_tiers)) == 0 ? '<td><a href="/compta/facture/list.php?search_ref=' . $doc_ref . '">' . $line->label_compte . '</a></td>' : '<td><a href="/compta/facture/list.php?search_ref=' . $doc_ref . '">' . $line->label_compte . '</a><br /><span style="font-size:0.8em">(' . length_accounta($line->code_tiers) . ')</span></td>';
+    else
    print strlen(length_accounta($line->code_tiers)) == 0 ? '<td>' . $line->label_compte . '</td>' : '<td>' . $line->label_compte . '<br /><span style="font-size:0.8em">(' . length_accounta($line->code_tiers) . ')</span></td>';


@@ -335,7 +333,6 @@ foreach ( $object->lines as $line ) {
 print '<tr class="liste_total">';
 print '<td align="right" colspan="5">'.$langs->trans("SubTotal").':</td><td class="nowrap" align="right">'.price($sous_total_debit).'</td><td class="nowrap" align="right">'.price($sous_total_credit).'</td>';
 print "<td>&nbsp;</td>\n";
-print "<td>&nbsp;</td>\n";
 print '</tr>';


--- a/htdocs/accountancy/bookkeeping/listbyyear.php
+++ b/htdocs/accountancy/bookkeeping/listbyyear.php
@@ -29,7 +29,7 @@ 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 . '/accountancy/class/bookkeeping.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';

 // Langs
 $langs->load("accountancy");
@@ -37,7 +37,7 @@ $langs->load("accountancy");
 $page = GETPOST("page");
 $sortorder = GETPOST("sortorder");
 $sortfield = GETPOST("sortfield");
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int'):$conf->liste_limit;
+$limit = GETPOST('limit') ? 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');
@@ -67,7 +67,7 @@ $search_code_journal = GETPOST('search_code_journal', 'alpha');

 $object = new BookKeeping($db);
 $form = new Form($db);
-$formaccounting = new FormAccounting($db);
+$formventilation = new FormVentilation($db);

 // Filter
 if (empty($search_date_start)) {
@@ -182,15 +182,15 @@ 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 $formventilation->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 $formventilation->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_code_tiers_start, 'search_code_tiers_start', 1);
+print $formventilation->select_auxaccount($search_code_tiers_start, 'search_code_tiers_start', 1);
 print $langs->trans('To') . ' ' . $langs->trans('ThirdPartyAccount') . ': ';
-print $formaccounting->select_auxaccount($search_code_tiers_end, 'searchcode_tiers_end', 1);
+print $formventilation->select_auxaccount($search_code_tiers_end, 'searchcode_tiers_end', 1);
 print '</div>';
 print "<table class=\"noborder\" width=\"100%\">";

@@ -267,8 +267,9 @@ print "</tr>\n";
 $var = True;

 foreach ( $object->lines as $line ) {
+	$var = ! $var;

-	print '<tr class="oddeven">';
+	print '<tr '. $bc[$var].'>';
 	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>';
--- a/htdocs/accountancy/class/accountancycategory.class.php
+++ b/htdocs/accountancy/class/accountancycategory.class.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2016		Jamal Elbaz			<jamelbaz@gmail.pro>
- * Copyright (C) 2016-2017	Alexandre Spangaro	<aspangaro@zendsi.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
@@ -17,9 +17,9 @@
 */

 /**
- * \file	htdocs/accountancy/class/accountancycategory.class.php
+ * \file htdocs/accountancy/class/accountancycategory.class.php
 * \ingroup Advanced accountancy
- * \brief	File of class to manage categories of an accounting category_type
+ * \brief File of class to manage categories of an accounting category_type
 */

 // Class
@@ -72,6 +72,7 @@ class AccountancyCategory
 					$this->lines_display[] = $obj;
 				}
 			}
+
 			return $num;
 		} else {
 			$this->error = "Error " . $this->db->lasterror();
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -47,7 +47,6 @@ class AccountancyExport
 	public static $EXPORT_TYPE_QUADRATUS = 6;
 	public static $EXPORT_TYPE_EBP = 7;
 	public static $EXPORT_TYPE_COGILOG = 8;
-	public static $EXPORT_TYPE_AGIRIS = 9;

 	/**
 	 *
@@ -97,7 +96,6 @@ 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')
 		);
 	}

@@ -147,9 +145,6 @@ class AccountancyExport
 			case self::$EXPORT_TYPE_COGILOG :
 				$this->exportCogilog($TData);
 				break;
-			case self::$EXPORT_TYPE_AGIRIS :
-				$this->exportAgiris($TData);
-				break;
 			default:
 				$this->errors[] = $langs->trans('accountancy_error_modelnotfound');
 				break;
@@ -387,7 +382,7 @@ class AccountancyExport


 	/**
-	 * Export format : EBP
+	 * Export format : Normal
 	 *
 	 * @param array $objectLines data
 	 *
@@ -417,47 +412,6 @@ class AccountancyExport
 	}


-	/**
-	 * Export format : Agiris
-	 *
-	 * @param array $objectLines data
-	 *
-	 * @return void
-	 */
-	public function exportAgiris($objectLines) {
-
-		$this->separator = ';';
-
-		foreach ( $objectLines as $line ) {
-
-			$date = dol_print_date($line->doc_date, '%d%m%Y');
-
-			print $line->id . $this->separator;
-			print '"'.dol_trunc($line->piece_num,15,'right','UTF-8',1).'"'.$this->separator;
-			print $date . $this->separator;
-			print '"'.dol_trunc($line->piece_num,15,'right','UTF-8',1).'"'.$this->separator;
-			
-			if (empty($line->code_tiers)) {
-				print length_accountg($line->numero_compte) . $this->separator;
-			} else {
-				if (substr($line->numero_compte, 0, 1) == 'C' || substr($line->numero_compte, 0, 1) == '9') {
-					print '411' . substr(str_replace(" ", "", $line->code_tiers), 0, 5) . $this->separator;
-				}
-				if (substr($line->numero_compte, 0, 1) == 'F' || substr($line->numero_compte, 0, 1) == '0') {
-					print '401' . substr(str_replace(" ", "", $line->code_tiers), 0, 5) . $this->separator;
-				}
-			}
-			
-			print length_accounta($line->code_tiers) . $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 . $this->separator;
-			print $this->end_line;
-		}
-	}
-

 	/**
 	 *
--- a/htdocs/accountancy/class/accountingaccount.class.php
+++ b/htdocs/accountancy/class/accountingaccount.class.php
@@ -251,12 +251,12 @@ class AccountingAccount extends CommonObject
 		$sql .= " SET fk_pcg_version = " . ($this->fk_pcg_version ? "'" . $this->db->escape($this->fk_pcg_version) . "'" : "null");
 		$sql .= " , pcg_type = " . ($this->pcg_type ? "'" . $this->db->escape($this->pcg_type) . "'" : "null");
 		$sql .= " , pcg_subtype = " . ($this->pcg_subtype ? "'" . $this->db->escape($this->pcg_subtype) . "'" : "null");
-		$sql .= " , account_number = '" . $this->db->escape($this->account_number) . "'";
-		$sql .= " , account_parent = '" . $this->db->escape($this->account_parent) . "'";
+		$sql .= " , account_number = '" . $this->account_number . "'";
+		$sql .= " , account_parent = '" . $this->account_parent . "'";
 		$sql .= " , label = " . ($this->label ? "'" . $this->db->escape($this->label) . "'" : "null");
-		$sql .= " , fk_accounting_category = '" . $this->db->escape($this->account_category) . "'";
+		$sql .= " , fk_accounting_category = '" . $this->account_category . "'";
 		$sql .= " , fk_user_modif = " . $user->id;
-		$sql .= " , active = " . $this->active;
+		$sql .= " , active = '" . $this->active . "'";
 		$sql .= " WHERE rowid = " . $this->id;
 		
 		dol_syslog(get_class($this) . "::update sql=" . $sql, LOG_DEBUG);
@@ -364,63 +364,27 @@ class AccountingAccount extends CommonObject
 	/**
 	 * Return clicable name (with picto eventually)
 	 *
-	 * @param	int		$withpicto		0=No picto, 1=Include picto into link, 2=Only picto
-	 * @param	int		$withlabel		0=No label, 1=Include label of account
-	 * @param	int  	$nourl			1=Disable url
-	 * @param	string  $moretitle		Add more text to title tooltip
-	 * @param	int  	$notooltip		1=Disable tooltip
-	 * @return	string	String with URL
+	 * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto
+	 * @return string Chaine avec URL
 	 */
-	function getNomUrl($withpicto = 0, $withlabel = 0, $nourl = 0, $moretitle='',$notooltip=0)
-	{
-		global $langs, $conf, $user;
-		require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+	function getNomUrl($withpicto = 0) {
+		global $langs;
 		
-		if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
-
 		$result = '';
-
-		$url = DOL_URL_ROOT . '/accountancy/admin/card.php?id=' . $this->id;
-
+		
+		$link = '<a href="' . DOL_URL_ROOT . '/accountancy/admin/card.php?id=' . $this->id . '">';
+		$linkend = '</a>';
+		
 		$picto = 'billr';
-		$label='';
-
-		$label = '<u>' . $langs->trans("ShowAccountingAccount") . '</u>';
-		if (! empty($this->account_number))
-			$label .= '<br><b>'.$langs->trans('AccountAccounting') . ':</b> ' . length_accountg($this->account_number);
-		if (! empty($this->label))
-			$label .= '<br><b>'.$langs->trans('Label') . ':</b> ' . $this->label;
-		if ($moretitle) $label.=' - '.$moretitle;
-
-		$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"';
-		}
-
-        $linkstart='<a href="'.$url.'"';
-        $linkstart.=$linkclose.'>';
-		$linkend='</a>';
-
-		if ($nourl)
-		{
-			$linkstart = '';
-			$linkclose = '';
-			$linkend = '';			
-		}
-
-		$label_link = length_accountg($this->account_number);
-		if ($withlabel) $label_link .= ' - ' . $this->label;
-
-		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;
+		
+		$label = $langs->trans("Show") . ': ' . $this->account_number . ' - ' . $this->label;
+		
+		if ($withpicto)
+			$result .= ($link . img_object($label, $picto) . $linkend);
+		if ($withpicto && $withpicto != 2)
+			$result .= ' ';
+		if ($withpicto != 2)
+			$result .= $link . $this->account_number . $linkend;
 		return $result;
 	}
 	
--- a/htdocs/accountancy/class/accountingjournal.class.php
+++ b/htdocs/accountancy/class/accountingjournal.class.php
@@ -1,204 +0,0 @@
-<?php
-/* Copyright (C) 2017		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
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * \file		htdocs/accountancy/class/accountingjournal.class.php
- * \ingroup		Advanced accountancy
- * \brief		File of class to manage accounting journals
- */
-
-/**
- * Class to manage accounting accounts
- */
-class AccountingJournal extends CommonObject
-{
-	public $element='accounting_journal';
-	public $table_element='accounting_journal';
-	public $fk_element = '';
-	protected $ismultientitymanaged = 0;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
-
-	var $rowid;
-
-	var $code;
-	var $label;
-	var $nature;		// 0:various operations, 1:sale, 2:purchase, 3:bank, 9: has-new
-	var $active;
-
-	/**
-	 * Constructor
-	 *
-	 * @param DoliDB $db Database handle
-	 */
-	function __construct($db) {
-		$this->db = $db;
-	}
-	
-	/**
-	 * Load an object from database
-	 *
-	 * @param	int		$rowid				Id of record to load
-	 * @param 	string 	$journal_code		Journal code
-	 * @return	int							<0 if KO, Id of record if OK and found
-	 */
-	function fetch($rowid = null, $journal_code = null)
-	{
-		if ($rowid || $journal_code)
-		{
-			$sql = "SELECT rowid, code, label, nature, active";
-			$sql.= " FROM ".MAIN_DB_PREFIX."accounting_journal";
-			$sql .= " WHERE";
-			if ($rowid) {
-				$sql .= " rowid = '" . $rowid . "'";
-			} elseif ($journal_code) {
-				$sql .= " code = '" . $journal_code . "'";
-			}
-
-			dol_syslog(get_class($this)."::fetch sql=" . $sql, LOG_DEBUG);
-			$result = $this->db->query($sql);
-			if ($result)
-			{
-				$obj = $this->db->fetch_object($result);
-
-				if ($obj) {
-					$this->id			= $obj->rowid;
-					$this->rowid		= $obj->rowid;
-
-					$this->code			= $obj->code;
-					$this->ref			= $obj->code;
-					$this->label		= $obj->label;
-					$this->nature	    = $obj->nature;
-					$this->active		= $obj->active;
-
-					return $this->id;
-				} else {
-					return 0;
-				}
-			}
-			else
-			{
-				$this->error = "Error " . $this->db->lasterror();
-				$this->errors[] = "Error " . $this->db->lasterror();
-			}
-		}
-		return -1;
-	}
-	
-	/**
-	 * Return clicable name (with picto eventually)
-	 *
-	 * @param	int		$withpicto		0=No picto, 1=Include picto into link, 2=Only picto
-	 * @param	int		$withlabel		0=No label, 1=Include label of journal
-	 * @param	int  	$nourl			1=Disable url
-	 * @param	string  $moretitle		Add more text to title tooltip
-	 * @param	int  	$notooltip		1=Disable tooltip
-	 * @return	string	String with URL
-	 */
-	function getNomUrl($withpicto = 0, $withlabel = 0, $nourl = 0, $moretitle='',$notooltip=0)
-	{
-		global $langs, $conf, $user;
-
-		if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
-
-		$result = '';
-
-		$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;
-		if (! empty($this->label))
-			$label .= '<br><b>'.$langs->trans('Label') . ':</b> ' . $this->label;
-		if ($moretitle) $label.=' - '.$moretitle;
-
-		$linkclose='';
-		if (empty($notooltip))
-		{
-		    if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-		    {
-		        $label=$langs->trans("ShowAccoutingJournal");
-		        $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
-		    }
-		    $linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
-		    $linkclose.=' class="classfortooltip"';
-		}
-
-        $linkstart='<a href="'.$url.'"';
-        $linkstart.=$linkclose.'>';
-		$linkend='</a>';
-
-		if ($nourl)
-		{
-			$linkstart = '';
-			$linkclose = '';
-			$linkend = '';			
-		}
-
-		$label_link = $this->code;
-		if ($withlabel) $label_link .= ' - ' . $this->label;
-
-		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;
-	}
-	
-	/**
-	 *  Retourne le libelle du statut d'un user (actif, inactif)
-	 *
-	 *  @param	int		$mode          0=libelle long, 1=libelle court
-	 *  @return	string 			       Label of type
-	 */
-	function getLibType($mode=0)
-	{
-	    return $this->LibType($this->nature,$mode);
-	}
-	
-	/**
-	 *  Return type of an accounting journal
-	 *
-	 *  @param	int		$nature        	Id type
-	 *  @param  int		$mode          	0=libelle long, 1=libelle court
-	 *  @return string 			       	Label of type
-	 */
-	function LibType($nature,$mode=0)
-	{
-	    global $langs;
-
-		$langs->load("accountancy");
-	
-	    if ($mode == 0)
-	    {
-	        $prefix='';
-			if ($nature == 9) return $langs->trans('AccountingJournalType9');
-			if ($nature == 4) return $langs->trans('AccountingJournalType4');
-			if ($nature == 3) return $langs->trans('AccountingJournalType3');
-	        if ($nature == 2) return $langs->trans('AccountingJournalType2');
-	        if ($nature == 1) return $langs->trans('AccountingJournalType1');
-	    }
-	    if ($mode == 1)
-	    {
-			if ($nature == 9) return $langs->trans('AccountingJournalType9');
-			if ($nature == 4) return $langs->trans('AccountingJournalType4');
-			if ($nature == 3) return $langs->trans('AccountingJournalType3');
-	        if ($nature == 2) return $langs->trans('AccountingJournalType2');
-	        if ($nature == 1) return $langs->trans('AccountingJournalType1');
-	    }
-	}
-}
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -53,16 +53,19 @@ class BookKeeping extends CommonObject
 	 *
 	 * @var string Name of table without prefix where object is stored
 	 */
-	public $table_element = 'accounting_bookkeeping';  
+	public $table_element = 'accounting_bookkeeping';
+

 	public $entity = 1;

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

+
 	/**
 	 *
 	 * @var int ID
@@ -85,7 +88,6 @@ class BookKeeping extends CommonObject
 	public $fk_user_author;
 	public $import_key;
 	public $code_journal;
-	public $journal_label;
 	public $piece_num;

 	/**
@@ -108,7 +110,7 @@ class BookKeeping extends CommonObject
 	 * @return int                 <0 if KO, Id of created object if OK
 	 */
 	public function create(User $user, $notrigger = false) {
-		global $conf, $langs;
+	    global $conf, $langs;

 		dol_syslog(__METHOD__, LOG_DEBUG);

@@ -157,15 +159,12 @@ class BookKeeping extends CommonObject
 		if (isset($this->code_journal)) {
 			$this->code_journal = trim($this->code_journal);
 		}
-		if (isset($this->journal_label)) {
-			$this->journal_label = trim($this->journal_label);
-		}
 		if (isset($this->piece_num)) {
 			$this->piece_num = trim($this->piece_num);
 		}
 		if (empty($this->debit)) $this->debit = 0;
 		if (empty($this->credit)) $this->credit = 0;
-		
+
 		// Check parameters
 		if (empty($this->numero_compte) || $this->numero_compte == '-1')
 		{
@@ -176,12 +175,13 @@ class BookKeeping extends CommonObject
            }
            else
            {
-                $this->errors[]=$langs->trans('ErrorFieldAccountNotDefinedForInvoiceLine', $this->fk_doc,  $this->doc_type);		    
+                $this->errors[]=$langs->trans('ErrorFieldAccountNotDefinedForInvoiceLine', $this->fk_doc,  $this->doc_type);
            }

 		    return -1;
 		}

+
 		$this->db->begin();

 		$this->piece_num = 0;
@@ -189,25 +189,25 @@ class BookKeeping extends CommonObject
 		// 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 .= " WHERE doc_type = '" . $this->doc_type . "'";
 		$sql .= " AND fk_doc = " . $this->fk_doc;
-		$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 entity IN (" . getEntity('accountancy') . ")";
+		$sql .= " AND fk_docdet = " . $this->fk_docdet;                   // This field can be 0 is record is for several lines
+		$sql .= " AND numero_compte = '" . $this->numero_compte . "'";
+	    $sql .= " AND entity IN (" . getEntity("accountancy", 1) . ")";

 		$resql = $this->db->query($sql);

 		if ($resql) {
 			$row = $this->db->fetch_object($resql);
-			if ($row->nb == 0) 
+			if ($row->nb == 0)
 			{
 				// Determine piece_num
 				$sqlnum = "SELECT piece_num";
 				$sqlnum .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
-				$sqlnum .= " WHERE doc_type = '" . $this->db->escape($this->doc_type) . "'";		// For example doc_type = 'bank' 
-				$sqlnum .= " AND fk_docdet = " . $this->db->escape($this->fk_docdet);       		// fk_docdet is rowid into llx_bank or llx_facturedet or llx_facturefourndet, or ...
-				$sqlnum .= " AND doc_ref = '" . $this->db->escape($this->doc_ref) . "'";			// ref of source object
-				$sqlnum .= " AND entity IN (" . getEntity('accountancy') . ")";
+				$sqlnum .= " WHERE doc_type = '" . $this->doc_type . "'";		// For example doc_type = 'bank'
+				$sqlnum .= " AND fk_docdet = '" . $this->fk_docdet . "'";		// fk_docdet is rowid into llx_bank or llx_facturedet or llx_facturefourndet, or ...
+				$sqlnum .= " AND doc_ref = '" . $this->doc_ref . "'";			// ref of source object
+			    $sqlnum .= " AND entity IN (" . getEntity("accountancy", 1) . ")";

 				dol_syslog(get_class($this) . ":: create sqlnum=" . $sqlnum, LOG_DEBUG);
 				$resqlnum = $this->db->query($sqlnum);
@@ -219,7 +219,7 @@ class BookKeeping extends CommonObject
 				if (empty($this->piece_num)) {
 					$sqlnum = "SELECT MAX(piece_num)+1 as maxpiecenum";
 					$sqlnum .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
-					$sqlnum .= " WHERE entity IN (" . getEntity('accountancy') . ")";
+				    $sqlnum .= " WHERE entity IN (" . getEntity("accountancy", 1) . ")";

 					dol_syslog(get_class($this) . ":: create sqlnum=" . $sqlnum, LOG_DEBUG);
 					$resqlnum = $this->db->query($sqlnum);
@@ -254,9 +254,8 @@ class BookKeeping extends CommonObject
 				$sql .= ", fk_user_author";
 				$sql .= ", import_key";
 				$sql .= ", code_journal";
-				$sql .= ", journal_label";
 				$sql .= ", piece_num";
-				$sql .= ', entity';				
+				$sql .= ', entity';
 				$sql .= ") VALUES (";
 				$sql .= "'" . $this->db->idate($this->doc_date) . "'";
 				$sql .= ",'" . $this->doc_type . "'";
@@ -273,7 +272,6 @@ class BookKeeping extends CommonObject
 				$sql .= ",'" . $this->fk_user_author . "'";
 				$sql .= ",'" . $this->db->idate($this->date_create). "'";
 				$sql .= ",'" . $this->code_journal . "'";
-				$sql .= ",'" . $this->journal_label . "'";
 				$sql .= "," . $this->piece_num;
 				$sql .= ", " . (! isset($this->entity) ? '1' : $this->entity);
 				$sql .= ")";
@@ -282,7 +280,7 @@ class BookKeeping extends CommonObject
 				$resql = $this->db->query($sql);
 				if ($resql) {
 					$id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);
-					
+
 					if ($id > 0) {
 						$this->id = $id;
 						$result = 0;
@@ -312,11 +310,11 @@ class BookKeeping extends CommonObject
 		}

 		if (! $error) {
-			
+
 			if (! $notrigger) {
 				// Uncomment this and change MYOBJECT to your own tag if you
 				// want this action to call a trigger.
-				
+
 				// // Call triggers
 				// $result=$this->call_trigger('MYOBJECT_CREATE',$user);
 				// if ($result < 0) $error++;
@@ -390,9 +388,6 @@ class BookKeeping extends CommonObject
 		if (isset($this->code_journal)) {
 			$this->code_journal = trim($this->code_journal);
 		}
-		if (isset($this->journal_label)) {
-			$this->journal_label = trim($this->journal_label);
-		}
 		if (isset($this->piece_num)) {
 			$this->piece_num = trim($this->piece_num);
 		}
@@ -419,7 +414,6 @@ class BookKeeping extends CommonObject
 		$sql .= 'fk_user_author,';
 		$sql .= 'import_key,';
 		$sql .= 'code_journal,';
-		$sql .= 'journal_label,';
 		$sql .= 'piece_num,';
 		$sql .= 'entity';
 		$sql .= ') VALUES (';
@@ -438,7 +432,6 @@ class BookKeeping extends CommonObject
 		$sql .= ' ' . $user->id . ',';
 		$sql .= ' ' . (! isset($this->import_key) ? 'NULL' : "'" . $this->db->escape($this->import_key) . "'") . ',';
 		$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->piece_num).',';
 		$sql .= ' ' . (! isset($this->entity) ? '1' : $this->entity);
 		$sql .= ')';
@@ -458,7 +451,7 @@ class BookKeeping extends CommonObject
 			if (! $notrigger) {
 				// Uncomment this and change MYOBJECT to your own tag if you
 				// want this action to call a trigger.
-				
+
 				// // Call triggers
 				// $result=$this->call_trigger('MYOBJECT_CREATE',$user);
 				// if ($result < 0) $error++;
@@ -483,13 +476,13 @@ class BookKeeping extends CommonObject
 	 *
 	 * @param int $id Id object
 	 * @param string $ref Ref
-	 * 
+	 *
 	 * @return int <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id, $ref = null) {
 		global $conf;

-		dol_syslog(__METHOD__, LOG_DEBUG);
+	    dol_syslog(__METHOD__, LOG_DEBUG);

 		$sql = 'SELECT';
 		$sql .= ' t.rowid,';
@@ -508,11 +501,10 @@ class BookKeeping extends CommonObject
 		$sql .= " t.fk_user_author,";
 		$sql .= " t.import_key,";
 		$sql .= " t.code_journal,";
-		$sql .= " t.journal_label,";
 		$sql .= " t.piece_num";
 		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
 		$sql .= ' WHERE 1 = 1';
-	    $sql .= " AND entity IN (" . getEntity('accountancy') . ")";
+	    $sql .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
 		if (null !== $ref) {
 			$sql .= ' AND t.ref = ' . '\'' . $ref . '\'';
 		} else {
@@ -542,7 +534,6 @@ class BookKeeping extends CommonObject
 				$this->fk_user_author = $obj->fk_user_author;
 				$this->import_key = $obj->import_key;
 				$this->code_journal = $obj->code_journal;
-				$this->journal_label = $obj->journal_label;
 				$this->piece_num = $obj->piece_num;
 			}
 			$this->db->free($resql);
@@ -555,11 +546,11 @@ class BookKeeping extends CommonObject
 		} else {
 			$this->errors[] = 'Error ' . $this->db->lasterror();
 			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
-			
+
 			return - 1;
 		}
 	}
-  
+
  /**
 	 * Load object in memory from the database
 	 *
@@ -569,13 +560,13 @@ class BookKeeping extends CommonObject
 	 * @param int $offset offset limit
 	 * @param array $filter filter array
 	 * @param string $filtermode filter mode (AND or OR)
-	 *       
+	 *
 	 * @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);
+	    dol_syslog(__METHOD__, LOG_DEBUG);

 		$sql = 'SELECT';
 		$sql .= ' t.rowid,';
@@ -594,7 +585,6 @@ class BookKeeping extends CommonObject
 		$sql .= " t.fk_user_author,";
 		$sql .= " t.import_key,";
 		$sql .= " t.code_journal,";
-		$sql .= " t.journal_label,";
 		$sql .= " t.piece_num";
 		// Manage filter
 		$sqlwhere = array ();
@@ -619,7 +609,7 @@ class BookKeeping extends CommonObject
 		}
 		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
 		$sql .= ' WHERE 1 = 1';
-	    $sql .= " AND entity IN (" . getEntity('accountancy') . ")";
+	    $sql .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
 		if (count($sqlwhere) > 0) {
 			$sql .= ' AND ' . implode(' ' . $filtermode . ' ', $sqlwhere);
 		}
@@ -630,7 +620,7 @@ class BookKeeping extends CommonObject
 		}
 		if (! empty($limit)) {
 			$sql .= ' ' . $this->db->plimit($limit + 1, $offset);
-		} 
+		}
 		$this->lines = array ();

 		$resql = $this->db->query($sql);
@@ -657,7 +647,6 @@ class BookKeeping extends CommonObject
 				$line->fk_user_author = $obj->fk_user_author;
 				$line->import_key = $obj->import_key;
 				$line->code_journal = $obj->code_journal;
-				$line->journal_label = $obj->journal_label;
 				$line->piece_num = $obj->piece_num;

 				$this->lines[] = $line;
@@ -672,8 +661,8 @@ class BookKeeping extends CommonObject
 			return - 1;
 		}
 	}
-  
-	
+
+
 	/**
 	 * Load object in memory from the database
 	 *
@@ -683,7 +672,7 @@ class BookKeeping extends CommonObject
 	 * @param int $offset offset limit
 	 * @param array $filter filter array
 	 * @param string $filtermode filter mode (AND or OR)
-	 *       
+	 *
 	 * @return int <0 if KO, >0 if OK
 	 */
 	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND') {
@@ -708,7 +697,6 @@ class BookKeeping extends CommonObject
 		$sql .= " t.fk_user_author,";
 		$sql .= " t.import_key,";
 		$sql .= " t.code_journal,";
-		$sql .= " t.journal_label,";
 		$sql .= " t.piece_num";
 		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
 		// Manage filter
@@ -731,7 +719,7 @@ class BookKeeping extends CommonObject
 			}
 		}
 		$sql.= ' WHERE 1 = 1';
-	    $sql .= " AND entity IN (" . getEntity('accountancy') . ")";
+	    $sql .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
 		if (count($sqlwhere) > 0) {
 			$sql .= ' AND ' . implode(' ' . $filtermode . ' ', $sqlwhere);
 		}
@@ -768,7 +756,6 @@ class BookKeeping extends CommonObject
 				$line->fk_user_author = $obj->fk_user_author;
 				$line->import_key = $obj->import_key;
 				$line->code_journal = $obj->code_journal;
-				$line->journal_label = $obj->journal_label;
 				$line->piece_num = $obj->piece_num;

 				$this->lines[] = $line;
@@ -826,7 +813,7 @@ class BookKeeping extends CommonObject
 			}
 		}
 		$sql.= ' WHERE 1 = 1';
-	    $sql .= " AND entity IN (" . getEntity('accountancy') . ")";
+	    $sql .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
 		if (count($sqlwhere) > 0) {
 			$sql .= ' AND ' . implode(' ' . $filtermode . ' ', $sqlwhere);
 		}
@@ -834,7 +821,7 @@ class BookKeeping extends CommonObject
 		$sql .= ' GROUP BY t.numero_compte';

 		if (! empty($sortfield)) {
-			$sql .= $this->db->order($sortfield, $sortorder); 
+			$sql .= $this->db->order($sortfield, $sortorder);
 		}
 		if (! empty($limit)) {
 			$sql .= ' ' . $this->db->plimit($limit + 1, $offset);
@@ -869,7 +856,7 @@ class BookKeeping extends CommonObject
 	 *
 	 * @param User $user User that modifies
 	 * @param bool $notrigger false=launch triggers after, true=disable triggers
-	 *       
+	 *
 	 * @return int <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = false) {
@@ -878,6 +865,7 @@ class BookKeeping extends CommonObject
 		dol_syslog(__METHOD__, LOG_DEBUG);

 		// Clean parameters
+
 		if (isset($this->doc_type)) {
 			$this->doc_type = trim($this->doc_type);
 		}
@@ -920,9 +908,6 @@ class BookKeeping extends CommonObject
 		if (isset($this->code_journal)) {
 			$this->code_journal = trim($this->code_journal);
 		}
-		if (isset($this->journal_label)) {
-			$this->journal_label = trim($this->journal_label);
-		}
 		if (isset($this->piece_num)) {
 			$this->piece_num = trim($this->piece_num);
 		}
@@ -947,7 +932,6 @@ class BookKeeping extends CommonObject
 		$sql .= ' fk_user_author = ' . (isset($this->fk_user_author) ? $this->fk_user_author : "null") . ',';
 		$sql .= ' import_key = ' . (isset($this->import_key) ? "'" . $this->db->escape($this->import_key) . "'" : "null") . ',';
 		$sql .= ' code_journal = ' . (isset($this->code_journal) ? "'" . $this->db->escape($this->code_journal) . "'" : "null") . ',';
-		$sql .= ' journal_label = ' . (isset($this->journal_label) ? "'" . $this->db->escape($this->journal_label) . "'" : "null") . ',';
 		$sql .= ' piece_num = ' . (isset($this->piece_num) ? $this->piece_num : "null");
 		$sql .= ' WHERE rowid=' . $this->id;

@@ -963,7 +947,7 @@ class BookKeeping extends CommonObject
 		if (! $error && ! $notrigger) {
 			// Uncomment this and change MYOBJECT to your own tag if you
 			// want this action calls a trigger.
-			
+
 			// // Call triggers
 			// $result=$this->call_trigger('MYOBJECT_MODIFY',$user);
 			// if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
@@ -987,7 +971,7 @@ class BookKeeping extends CommonObject
 	 *
 	 * @param User $user User that deletes
 	 * @param bool $notrigger false=launch triggers after, true=disable triggers
-	 *       
+	 *
 	 * @return int <0 if KO, >0 if OK
 	 */
 	public function delete(User $user, $notrigger = false) {
@@ -1070,7 +1054,7 @@ class BookKeeping extends CommonObject
 	function deleteByYearAndJournal($delyear='', $journal='') {
 	    global $conf;

-	    if (empty($delyear) && empty($journal)) 
+	    if (empty($delyear) && empty($journal))
 	    {
 	        return -1;
 	    }
@@ -1083,7 +1067,7 @@ class BookKeeping extends CommonObject
 		$sql.= " WHERE 1 = 1";
 		if (! empty($delyear)) $sql.= " AND YEAR(doc_date) = " . $delyear;         // FIXME Must use between
 		if (! empty($journal)) $sql.= " AND code_journal = '".$journal."'";
-		$sql .= " AND entity IN (" . getEntity('accountancy') . ")";
+	    $sql .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
 		$resql = $this->db->query($sql);

 		if (! $resql) {
@@ -1115,7 +1099,7 @@ class BookKeeping extends CommonObject
 		$sql = "DELETE";
 		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
 		$sql .= " WHERE piece_num = " . $piecenum;
-		$sql .= " AND entity IN (" . getEntity('accountancy') . ")";
+	    $sql .= " AND entity IN (" . getEntity("accountancy", 1) . ")";

 		$resql = $this->db->query($sql);

@@ -1137,7 +1121,7 @@ class BookKeeping extends CommonObject
 	 * Load an object from its id and create a new one in database
 	 *
 	 * @param int $fromid Id of object to clone
-	 *       
+	 *
 	 * @return int New id of clone
 	 */
 	public function createFromClone($fromid) {
@@ -1145,7 +1129,7 @@ class BookKeeping extends CommonObject

 		global $user;
 		$error = 0;
-		$object = new Accountingbookkeeping($this->db);
+		$object = new BookKeeping($this->db);

 		$this->db->begin();

@@ -1206,7 +1190,6 @@ class BookKeeping extends CommonObject
 		$this->fk_user_author = $user->id;
 		$this->import_key = '';
 		$this->code_journal = '';
-		$this->journal_label = '';
 		$this->piece_num = '';
 	}

@@ -1219,10 +1202,10 @@ class BookKeeping extends CommonObject
 	public function fetchPerMvt($piecenum) {
 		global $conf;

-		$sql = "SELECT piece_num,doc_date,code_journal,journal_label,doc_ref,doc_type";
+	    $sql = "SELECT piece_num,doc_date,code_journal,doc_ref,doc_type";
 		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
 		$sql .= " WHERE piece_num = " . $piecenum;
-		$sql .= " AND entity IN (" . getEntity('accountancy') . ")";
+	    $sql .= " AND entity IN (" . getEntity("accountancy", 1) . ")";

 		dol_syslog(get_class($this) . "::" . __METHOD__, LOG_DEBUG);
 		$result = $this->db->query($sql);
@@ -1231,7 +1214,6 @@ class BookKeeping extends CommonObject

 			$this->piece_num = $obj->piece_num;
 			$this->code_journal = $obj->code_journal;
-			$this->journal_label = $obj->journal_label;
 			$this->doc_date = $this->db->jdate($obj->doc_date);
 			$this->doc_ref = $obj->doc_ref;
 			$this->doc_type = $obj->doc_type;
@@ -1249,21 +1231,21 @@ class BookKeeping extends CommonObject
 	 *
 	 * @return string      Next numero to use
 	 */
-	public function getNextNumMvt() 
+	public function getNextNumMvt()
 	{
-		global $conf;
+	    global $conf;

 		$sql = "SELECT MAX(piece_num)+1 as max FROM " . MAIN_DB_PREFIX . $this->table_element;
-	    $sql .= " WHERE entity IN (" . getEntity('accountancy') . ")";
+	    $sql .= " WHERE entity IN (" . getEntity("accountancy", 1) . ")";

 		dol_syslog(get_class($this) . "getNextNumMvt sql=" . $sql, LOG_DEBUG);
 		$result = $this->db->query($sql);

 		if ($result) {
 			$obj = $this->db->fetch_object($result);
-			if ($obj) $result = $obj->max;
-			if (empty($result)) $result = 1;
-			return $result;
+	        if ($obj) $result = $obj->max;
+	        if (empty($result)) $result = 1;
+	        return $result;
 		} else {
 			$this->error = "Error " . $this->db->lasterror();
 			dol_syslog(get_class($this) . "::getNextNumMvt " . $this->error, LOG_ERR);
@@ -1278,15 +1260,15 @@ class BookKeeping extends CommonObject
 	 * @return int <0 if KO, >0 if OK
 	 */
 	function fetch_all_per_mvt($piecenum) {
-		global $conf;
+	    global $conf;

 		$sql = "SELECT rowid, doc_date, doc_type,";
 		$sql .= " doc_ref, fk_doc, fk_docdet, code_tiers,";
 		$sql .= " numero_compte, label_compte, debit, credit,";
-		$sql .= " montant, sens, fk_user_author, import_key, code_journal, journal_label, piece_num";
+		$sql .= " montant, sens, fk_user_author, import_key, code_journal, piece_num";
 		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
 		$sql .= " WHERE piece_num = " . $piecenum;
-		$sql .= " AND entity IN (" . getEntity('accountancy') . ")";
+	    $sql .= " AND entity IN (" . getEntity("accountancy", 1) . ")";

 		dol_syslog(get_class($this) . "::" . __METHOD__, LOG_DEBUG);
 		$result = $this->db->query($sql);
@@ -1311,7 +1293,6 @@ class BookKeeping extends CommonObject
 				$line->montant = $obj->montant;
 				$line->sens = $obj->sens;
 				$line->code_journal = $obj->code_journal;
-				$line->journal_label = $obj->journal_label;
 				$line->piece_num = $obj->piece_num;

 				$this->linesmvt[] = $line;
@@ -1332,14 +1313,14 @@ class BookKeeping extends CommonObject
 	 * @return int Result
 	 */
 	function export_bookkeping($model = 'ebp') {
-		global $conf;
+	    global $conf;

 		$sql = "SELECT rowid, doc_date, doc_type,";
 		$sql .= " doc_ref, fk_doc, fk_docdet, code_tiers,";
 		$sql .= " numero_compte, label_compte, debit, credit,";
 		$sql .= " montant, sens, fk_user_author, import_key, code_journal, piece_num";
 		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
-		$sql .= " WHERE entity IN (" . getEntity('accountancy') . ")";
+	    $sql .= " WHERE entity IN (" . getEntity("accountancy", 1) . ")";

 		dol_syslog(get_class($this) . "::export_bookkeping", LOG_DEBUG);

@@ -1380,9 +1361,9 @@ class BookKeeping extends CommonObject
 			return - 1;
 		}
 	}
-  
-  
-  
+
+
+
    /**
    * Return list of accounts with label by chart of accounts
    *
@@ -1397,64 +1378,65 @@ class BookKeeping extends CommonObject
    */
    function select_account($selectid, $htmlname = 'account', $showempty = 0, $event = array(), $select_in = 0, $select_out = 0, $aabase = '') {
        global $conf;
-        
+
        require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
-        
+
        $pcgver = $conf->global->CHARTOFACCOUNTS;
-        
+
        $sql = "SELECT DISTINCT ab.numero_compte as account_number, aa.label as label, aa.rowid as rowid, aa.fk_pcg_version";
        $sql .= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as ab";
        $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.account_number = ab.numero_compte";
        $sql .= " AND aa.active = 1";
        $sql .= " INNER JOIN " . MAIN_DB_PREFIX . "accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
        $sql .= " AND asy.rowid = " . $pcgver;
-	    $sql .= " AND ab.entity IN (" . getEntity('accountancy') . ")";
+	    $sql .= " AND ab.entity IN (" . getEntity("accountancy", 1) . ")";
        $sql .= " ORDER BY account_number ASC";
-        
+
        dol_syslog(get_class($this) . "::select_account", LOG_DEBUG);
        $resql = $this->db->query($sql);
-        
+
        if (! $resql) {
            $this->error = "Error " . $this->db->lasterror();
            dol_syslog(get_class($this) . "::select_account " . $this->error, LOG_ERR);
            return - 1;
        }
-        
+
        $out = ajax_combobox($htmlname, $event);
-        
+
        $options = array();
        $selected = null;
-        
+
        while ($obj = $this->db->fetch_object($resql)) {
            $label = length_accountg($obj->account_number) . ' - ' . $obj->label;
-            
+
            $select_value_in = $obj->rowid;
            $select_value_out = $obj->rowid;
-            
+
            if ($select_in == 1) {
                $select_value_in = $obj->account_number;
            }
            if ($select_out == 1) {
                $select_value_out = $obj->account_number;
            }
-            
+
            // Remember guy's we store in database llx_facturedet the rowid of accounting_account and not the account_number
            // Because same account_number can be share between different accounting_system and do have the same meaning
            if (($selectid != '') && $selectid == $select_value_in) {
                $selected = $select_value_out;
            }
-            
+
            $options[$select_value_out] = $label;
        }
-        
+
        $out .= Form::selectarray($htmlname, $options, $selected, $showempty, 0, 0, '', 0, 0, 0, '', 'maxwidth300');
        $this->db->free($resql);
        return $out;
    }


+
 	/**
-	* Description of a root accounting account 
+	* Description of a root accounting account
 	*
 	* @param 	string 	$account	Accounting account
 	* @return 	string 	            Root account
@@ -1470,17 +1452,17 @@ class BookKeeping extends CommonObject
        $sql .= " AND asy.rowid = " . $pcgver;
        $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as parent ON aa.account_parent = parent.rowid";
        $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as root ON parent.account_parent = root.rowid";
-        $sql .= " WHERE aa.account_number = '" . $account . "'";  
+        $sql .= " WHERE aa.account_number = '" . $account . "'";
        $sql .= " AND parent.active = 1";
        $sql .= " AND root.active = 1";
-        $sql .= " AND aa.entity IN (" . getEntity('accountancy') . ")";
+        $sql .= " AND aa.entity IN (" . getEntity("accountancy", 1) . ")";

 		dol_syslog(get_class($this) . "::select_account sql=" . $sql, LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$obj = '';
 			if ($this->db->num_rows($resql)) {
-				$obj = $this->db->fetch_object($resql);	
+				$obj = $this->db->fetch_object($resql);
 			}

 			return $obj->label;
@@ -1492,8 +1474,8 @@ class BookKeeping extends CommonObject
 			return -1;
 		}
 	}
-  
-  
+
+
  /**
 	* Description of accounting account
 	*
@@ -1512,19 +1494,21 @@ class BookKeeping extends CommonObject
 		$sql .= " AND asy.rowid = " . $pcgver;
 		$sql .= " AND aa.active = 1";
 		$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_accounting_category as cat ON aa.fk_accounting_category = cat.rowid";
-	    $sql .= " WHERE aa.entity IN (" . getEntity('accountancy') . ")";
+	    $sql .= " WHERE aa.entity IN (" . getEntity("accountancy", 1) . ")";

 		dol_syslog(get_class($this) . "::select_account sql=" . $sql, LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$obj = '';
 			if ($this->db->num_rows($resql)) {
-				$obj = $this->db->fetch_object($resql);	
+				$obj = $this->db->fetch_object($resql);
 			}
+
 			if(empty($obj->category)){
 				return $obj->label;
 			}else{
 				return $obj->label.' ('.$obj->category.')';
+
 			}
 		} else {
 			$this->error = "Error " . $this->db->lasterror();
@@ -1532,7 +1516,7 @@ class BookKeeping extends CommonObject
 			return -1;
 		}
 	}
-	
+
 }


@@ -1557,6 +1541,5 @@ class BookKeepingLine
 	public $fk_user_author;
 	public $import_key;
 	public $code_journal;
-	public $journal_label;
 	public $piece_num;
 }
--- a/htdocs/accountancy/class/html.formventilation.class.php
+++ b/htdocs/accountancy/class/html.formventilation.class.php
@@ -0,0 +1,381 @@
+<?php
+/* Copyright (C) 2013-2016 Florian Henry        <florian.henry@open-concept.pro>
+ * Copyright (C) 2013-2014 Olivier Geffroy      <jeff@jeffinfo.com>
+ * Copyright (C) 2013-2016 Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2015      Ari Elbaz (elarifr)  <github@accedinfo.com>
+ * Copyright (C) 2016      Marcos García        <marcosgdf@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file		htdocs/accountancy/class/html.formventilation.class.php
+ * \ingroup		Advanced accountancy
+ * \brief		File of class with all html predefined components
+ */
+
+/**
+ * Class to manage generation of HTML components for bank module
+ */
+class FormVentilation extends Form
+{
+
+    private $options_cache = array();
+
+
+	/**
+	 * Return select filter with date of transaction
+	 *
+	 * @param string $htmlname Name of select field
+	 * @param string $selectedkey Value
+	 * @return string HTML edit field
+	 */
+	function select_bookkeeping_importkey($htmlname = 'importkey', $selectedkey = '') {
+		$options = array();
+
+		$sql = 'SELECT DISTINCT import_key from ' . MAIN_DB_PREFIX . 'accounting_bookkeeping';
+	    $sql .= " WHERE entity IN (" . getEntity("accountancy", 1) . ")";
+		$sql .= ' ORDER BY import_key DESC';
+
+		dol_syslog(get_class($this) . "::select_bookkeeping_importkey", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+
+		if (!$resql) {
+			$this->error = "Error " . $this->db->lasterror();
+			dol_syslog(get_class($this) . "::select_bookkeeping_importkey " . $this->error, LOG_ERR);
+			return - 1;
+		}
+
+		while ($obj = $this->db->fetch_object($resql)) {
+			$options[$obj->import_key] = dol_print_date($obj->import_key, 'dayhourtext');
+		}
+
+		return Form::selectarray($htmlname, $options, $selectedkey);
+	}
+
+	/**
+	 * Return list of accounts with label by chart of accounts
+	 *
+	 * @param string   $selectid           Preselected id or code of accounting accounts (depends on $select_in)
+	 * @param string   $htmlname           Name of field in html form
+	 * @param int      $showempty          Add an empty field
+	 * @param array    $event              Event options
+	 * @param int      $select_in          0=selectid value is a aa.rowid (default) or 1=selectid is aa.account_number
+	 * @param int      $select_out         Set value returned by select. 0=rowid (default), 1=account_number
+	 * @param string   $morecss            More css non HTML object
+	 * @param string   $usecache           Key to use to store result into a cache. Next call with same key will reuse the cache.
+	 * @return string                      String with HTML select
+	 */
+	function select_account($selectid, $htmlname = 'account', $showempty = 0, $event = array(), $select_in = 0, $select_out = 0, $morecss='maxwidth300 maxwidthonsmartphone', $usecache='')
+	{
+		global $conf;
+
+		require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
+
+    	$options = array();
+		if ($usecache && ! empty($this->options_cache[$usecache]))
+		{
+		    $options = $this->options_cache[$usecache];
+		    $selected=$selectid;
+		}
+		else
+		{
+    		$trunclength = defined('ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT') ? $conf->global->ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT : 50;
+
+    		$sql = "SELECT DISTINCT aa.account_number, aa.label, aa.rowid, aa.fk_pcg_version";
+    		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as aa";
+    		$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
+    		$sql .= " AND asy.rowid = " . $conf->global->CHARTOFACCOUNTS;
+    		$sql .= " AND aa.active = 1";
+    		$sql .= " ORDER BY aa.account_number";
+
+    		dol_syslog(get_class($this) . "::select_account", LOG_DEBUG);
+    		$resql = $this->db->query($sql);
+
+    		if (!$resql) {
+    			$this->error = "Error " . $this->db->lasterror();
+    			dol_syslog(get_class($this) . "::select_account " . $this->error, LOG_ERR);
+    			return -1;
+    		}
+
+    		$out = ajax_combobox($htmlname, $event);
+
+    		$selected = 0;
+    		while ($obj = $this->db->fetch_object($resql))
+    		{
+    			$label = length_accountg($obj->account_number) . ' - ' . $obj->label;
+    			$label = dol_trunc($label, $trunclength);
+
+    			$select_value_in = $obj->rowid;
+    			$select_value_out = $obj->rowid;
+
+    			// Try to guess if we have found default value
+    			if ($select_in == 1) {
+    				$select_value_in = $obj->account_number;
+    			}
+    			if ($select_out == 1) {
+    				$select_value_out = $obj->account_number;
+    			}
+    			// Remember guy's we store in database llx_facturedet the rowid of accounting_account and not the account_number
+    			// Because same account_number can be share between different accounting_system and do have the same meaning
+    			if ($selectid != '' && $selectid == $select_value_in) {
+    			    //var_dump("Found ".$selectid." ".$select_value_in);
+    				$selected = $select_value_out;
+    			}
+
+    			$options[$select_value_out] = $label;
+    		}
+    		$this->db->free($resql);
+
+    		if ($usecache)
+    		{
+                $this->options_cache[$usecache] = $options;
+    		}
+		}
+
+		$out .= Form::selectarray($htmlname, $options, $selected, $showempty, 0, 0, '', 0, 0, 0, '', $morecss, 1);
+
+		return $out;
+	}
+
+	/**
+	 * Return list of accounts with label by class of accounts
+	 *
+	 * @param string $selectid Preselected pcg_type
+	 * @param string $htmlname Name of field in html form
+	 * @param int $showempty Add an empty field
+	 * @param array $event Event options
+	 *
+	 * @return string String with HTML select
+	 */
+	function select_pcgtype($selectid, $htmlname = 'pcg_type', $showempty = 0, $event = array()) {
+		global $conf;
+
+		$sql = "SELECT DISTINCT pcg_type ";
+		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as aa";
+		$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
+		$sql .= " AND asy.rowid = " . $conf->global->CHARTOFACCOUNTS;
+		$sql .= " ORDER BY pcg_type";
+
+		dol_syslog(get_class($this) . "::select_pcgtype", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+
+		if (!$resql) {
+			$this->error = "Error ".$this->db->lasterror();
+			dol_syslog(get_class($this)."::select_pcgtype ".$this->error, LOG_ERR);
+			return -1;
+		}
+
+		$options = array();
+		$out = ajax_combobox($htmlname, $event);
+
+		while ($obj = $this->db->fetch_object($resql)) 
+		{
+		    if ($obj->pcg_type != '-1')
+		    {
+                $options[$obj->pcg_type] = $obj->pcg_type;
+		    }
+		}
+
+		$out .= Form::selectarray($htmlname, $options, $selectid, $showempty, 0, 0, '', 0, 0, 0, '', 'minwidth200');
+
+		$this->db->free($resql);
+		return $out;
+	}
+
+	/**
+	 * Return list of accounts with label by sub_class of accounts
+	 *
+	 * @param string $selectid Preselected pcg_type
+	 * @param string $htmlname Name of field in html form
+	 * @param int $showempty Add an empty field
+	 * @param array $event Event options
+	 *
+	 * @return string String with HTML select
+	 */
+	function select_pcgsubtype($selectid, $htmlname = 'pcg_subtype', $showempty = 0, $event = array()) 
+	{
+		global $conf;
+
+		$sql = "SELECT DISTINCT pcg_subtype ";
+		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as aa";
+		$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
+		$sql .= " AND asy.rowid = " . $conf->global->CHARTOFACCOUNTS;
+		$sql .= " ORDER BY pcg_subtype";
+
+		dol_syslog(get_class($this) . "::select_pcgsubtype", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+
+		if (!$resql) {
+			$this->error = "Error ".$this->db->lasterror();
+			dol_syslog(get_class($this)."::select_pcgsubtype ".$this->error, LOG_ERR);
+			return -1;
+		}
+
+		$options = array();
+		$out = ajax_combobox($htmlname, $event);
+
+		while ($obj = $this->db->fetch_object($resql)) 
+		{
+		    if ($obj->pcg_type != '-1')
+		    {
+                $options[$obj->pcg_subtype] = $obj->pcg_subtype;
+		    }
+		}
+
+		$out .= Form::selectarray($htmlname, $options, $selectid, $showempty, 0, 0, '', 0, 0, 0, '', 'minwidth200');
+
+		$this->db->free($resql);
+		return $out;
+	}
+
+	/**
+	 * Return list of auxilary thirdparty accounts
+	 *
+	 * @param string $selectid Preselected pcg_type
+	 * @param string $htmlname Name of field in html form
+	 * @param int $showempty Add an empty field
+	 * @param array $event Event options
+	 *
+	 * @return string String with HTML select
+	 */
+	function select_auxaccount($selectid, $htmlname = 'account_num_aux', $showempty = 0, $event = array()) {
+
+		$aux_account = array();
+
+		// Auxiliary customer account
+		$sql = "SELECT DISTINCT code_compta, nom ";
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe";
+	    $sql .= " WHERE entity IN (" . getEntity("societe", 1) . ")";
+		$sql .= " ORDER BY code_compta";
+		dol_syslog(get_class($this)."::select_auxaccount", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
+				if (!empty($obj->code_compta)) {
+					$aux_account[$obj->code_compta] = $obj->code_compta.' ('.$obj->nom.')';
+				}
+			}
+		} else {
+			$this->error = "Error ".$this->db->lasterror();
+			dol_syslog(get_class($this)."::select_pcgsubtype ".$this->error, LOG_ERR);
+			return -1;
+		}
+		$this->db->free($resql);
+
+		// Auxiliary supplier account
+		$sql = "SELECT DISTINCT code_compta_fournisseur, nom ";
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe";
+	    $sql .= " WHERE entity IN (" . getEntity("societe", 1) . ")";
+		$sql .= " ORDER BY code_compta_fournisseur";
+		dol_syslog(get_class($this)."::select_auxaccount", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
+				if (!empty($obj->code_compta_fournisseur)) {
+					$aux_account[$obj->code_compta_fournisseur] = $obj->code_compta_fournisseur.' ('.$obj->nom.')';
+				}
+			}
+		} else {
+			$this->error = "Error ".$this->db->lasterror();
+			dol_syslog(get_class($this)."::select_pcgsubtype ".$this->error, LOG_ERR);
+			return -1;
+		}
+		$this->db->free($resql);
+
+		// Build select
+		$out = ajax_combobox($htmlname, $event);
+		$out .= Form::selectarray($htmlname, $aux_account, $selectid, $showempty, 0, 0, '', 0, 0, 0, '', 'maxwidth300');
+
+		return $out;
+	}
+
+	/**
+	 * Return HTML combo list of years existing into book keepping
+	 *
+	 * @param string $selected Preselected value
+	 * @param string $htmlname Name of HTML select object
+	 * @param int $useempty Affiche valeur vide dans liste
+	 * @param string $output_format (html/opton (for option html only)/array (to return options arrays
+	 * @return string/array
+	 */
+	function selectyear_accountancy_bookkepping($selected = '', $htmlname = 'yearid', $useempty = 0, $output_format = 'html')
+	{
+	    global $conf;
+
+		$out_array = array();
+
+		$sql = "SELECT DISTINCT date_format(doc_date,'%Y') as dtyear";
+		$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping";
+	    $sql .= " WHERE entity IN (" . getEntity("accountancy", 1) . ")";
+		$sql .= " ORDER BY date_format(doc_date,'%Y')";
+		dol_syslog(get_class($this)."::".__METHOD__, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+
+		if (!$resql) {
+			$this->error = "Error ".$this->db->lasterror();
+			dol_syslog(get_class($this)."::".__METHOD__.$this->error, LOG_ERR);
+			return -1;
+		}
+		while ($obj = $this->db->fetch_object($resql)) {
+			$out_array[$obj->dtyear] = $obj->dtyear;
+		}
+		$this->db->free($resql);
+
+		if ($output_format == 'html') {
+			return Form::selectarray($htmlname, $out_array, $selected, $useempty, 0, 0, 'placeholder="aa"');
+		} else {
+			return $out_array;
+		}
+	}
+
+	/**
+	 * Return HTML combo list of years existing into book keepping
+	 *
+	 * @param  string          $selected       Preselected value
+	 * @param  string          $htmlname       Name of HTML select object
+	 * @param  int             $useempty       Affiche valeur vide dans liste
+	 * @param  string          $output_format  Html/option (for option html only)/array (to return options arrays
+	 * @return string/array
+	 */
+	function selectjournal_accountancy_bookkepping($selected = '', $htmlname = 'journalid', $useempty = 0, $output_format = 'html')
+	{
+	    global $conf,$langs;
+
+		$out_array = array();
+
+		$sql = "SELECT DISTINCT code_journal";
+		$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping";
+	    $sql .= " WHERE entity IN (" . getEntity("accountancy", 1) . ")";
+		$sql .= " ORDER BY code_journal";
+		dol_syslog(get_class($this)."::".__METHOD__, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+
+		if (!$resql) {
+			$this->error = "Error ".$this->db->lasterror();
+			dol_syslog(get_class($this)."::".__METHOD__.$this->error, LOG_ERR);
+			return -1;
+		}
+		while ($obj = $this->db->fetch_object($resql)) {
+			$out_array[$obj->code_journal] = $obj->code_journal?$obj->code_journal:$langs->trans("NotDefined");  // TODO Not defined is accepted ? We should avoid this, shouldn't we ?
+		}
+		$this->db->free($resql);
+
+		if ($output_format == 'html') {
+			return Form::selectarray($htmlname, $out_array, $selected, $useempty, 0, 0, 'placeholder="aa"');
+		} else {
+			return $out_array;
+		}
+	}
+}
--- a/htdocs/accountancy/customer/card.php
+++ b/htdocs/accountancy/customer/card.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2013-2014 Olivier Geffroy		<jeff@jeffinfo.com>
 * Copyright (C) 2013-2014 Florian Henry		<florian.henry@open-concept.pro>
- * Copyright (C) 2013-2017 Alexandre Spangaro	<aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2013-2015 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
@@ -26,7 +26,7 @@ require '../../main.inc.php';

 // Class
 require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';

 // Langs
 $langs->load("bills");
@@ -39,7 +39,9 @@ $id = GETPOST('id');
 // Security check
 if ($user->societe_id > 0)
 	accessforbidden();
-
+	
+	
+	
 /*
 * Actions
 */
@@ -82,7 +84,7 @@ if ($cancel == $langs->trans("Cancel")) {
 */
 $form = new Form($db);
 $facture_static = new Facture($db);
-$formaccounting = new FormAccounting($db);
+$formventilation = new FormVentilation($db);

 if (! empty($id)) {
 	$sql = "SELECT f.facnumber, f.rowid as facid, l.fk_product, l.description, l.price,";
@@ -93,51 +95,51 @@ if (! empty($id)) {
 	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON l.fk_code_ventilation = aa.rowid";
 	$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = l.fk_facture";
 	$sql .= " WHERE f.fk_statut > 0 AND l.rowid = " . $id;
-	$sql .= " AND f.entity IN (" . getEntity('facture', 0) . ")"; // We don't share object for accountancy
-
+	$sql .= " AND f.entity IN (" . getEntity("facture", 0) . ")"; // We don't share object for accountancy
+	
 	dol_syslog("/accounting/customer/card.php sql=" . $sql, LOG_DEBUG);
 	$result = $db->query($sql);
-
+	
 	if ($result) {
 		$num_lines = $db->num_rows($result);
 		$i = 0;
-
+		
 		if ($num_lines) {
-
+			
 			$objp = $db->fetch_object($result);
-
+			
 			print '<form action="' . $_SERVER["PHP_SELF"] . '?id=' . $id . '" method="post">' . "\n";
 			print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
 			print '<input type="hidden" name="action" value="ventil">';
-
+			
 			print load_fiche_titre($langs->trans('CustomersVentilation'), '', 'title_setup');
-
+			
 			dol_fiche_head();
-
+			
 			print '<table class="border" width="100%">';
-
+			
 			// Ref facture
 			print '<tr><td>' . $langs->trans("Invoice") . '</td>';
 			$facture_static->ref = $objp->facnumber;
 			$facture_static->id = $objp->facid;
 			print '<td>' . $facture_static->getNomUrl(1) . '</td>';
 			print '</tr>';
-
+			
 			print '<tr><td width="20%">' . $langs->trans("Line") . '</td>';
 			print '<td>' . nl2br($objp->description) . '</td></tr>';
 			print '<tr><td width="20%">' . $langs->trans("Account") . '</td><td>';
-			print $formaccounting->select_account($objp->fk_code_ventilation, 'codeventil', 1);
+			print $formventilation->select_account($objp->fk_code_ventilation, 'codeventil', 1);
 			print '</td></tr>';
 			print '</table>';
-
+			
 			dol_fiche_end();
-
+			
 			print '<div class="center">';
 			print '<input class="button" type="submit" value="' . $langs->trans("Save") . '">';
 			print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
 			print '<input class="button" type="submit" name="cancel" value="' . $langs->trans("Cancel") . '">';
 			print '</div>';
-
+			
 			print '</form>';
 		} else {
 			print "Error";
--- a/htdocs/accountancy/customer/index.php
+++ b/htdocs/accountancy/customer/index.php
@@ -141,7 +141,7 @@ if ($action == 'validatehistory') {
 	$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.= " AND f.entity IN (" . getEntity("accountancy", 1) . ")";
 	$sql1.=")";
 	
 	dol_syslog("htdocs/accountancy/customer/index.php fixaccountancycode", LOG_DEBUG);
@@ -187,7 +187,7 @@ if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 } 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
+$sql .= " AND f.entity IN (" . getEntity("facture", 0) . ")";    // We don't share object for accountancy

 dol_syslog("htdocs/accountancy/customer/index.php sql=" . $sql, LOG_DEBUG);
 $result = $db->query($sql);
@@ -228,7 +228,7 @@ $sql .= "  LEFT JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = fd.fk_factu
 $sql .= "  LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.rowid = fd.fk_code_ventilation";
 $sql .= " WHERE f.datef >= '" . $db->idate(dol_get_first_day($y, 1, false)) . "'";
 $sql .= "  AND f.datef <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'";
-$sql .= " AND f.entity IN (" . getEntity('facture', 0) . ")";   // We don't share object for accountancy
+$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)) {
 	$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_SITUATION . ")";
@@ -244,7 +244,8 @@ if ($resql) {

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

-		print '<tr class="oddeven"><td>' . length_accountg($row[0]) . '</td>';
+		$var = ! $var;
+		print '<tr ' . $bc[$var] . '><td>' . length_accountg($row[0]) . '</td>';
 		print '<td align="left">' . $row[1] . '</td>';
 		for($i = 2; $i <= 12; $i ++) {
 			print '<td align="right">' . price($row[$i]) . '</td>';
@@ -284,7 +285,7 @@ $sql .= "  LEFT JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = fd.fk_factu
 $sql .= "  LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.rowid = fd.fk_code_ventilation";
 $sql .= " WHERE f.datef >= '" . $db->idate(dol_get_first_day($y, 1, false)) . "'";
 $sql .= "  AND f.datef <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'";
-$sql .= " AND f.entity IN (" . getEntity('facture', 0) . ")";   // We don't share object for accountancy
+$sql .= " AND f.entity IN (" . getEntity("facture", 0) . ")";   // We don't share object for accountancy
 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 {
@@ -300,7 +301,8 @@ if ($resql) {

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

-        print '<tr class="oddeven"><td>' . length_accountg($row[0]) . '</td>';
+        $var = ! $var;
+        print '<tr ' . $bc[$var] . '><td>' . length_accountg($row[0]) . '</td>';
        print '<td align="left">' . $row[1] . '</td>';
        for($i = 2; $i <= 12; $i ++) {
            print '<td align="right">' . price($row[$i]) . '</td>';
@@ -341,7 +343,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
    $sql .= "  LEFT JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = fd.fk_facture";
    $sql .= " WHERE f.datef >= '" . $db->idate(dol_get_first_day($y, 1, false)) . "'";
    $sql .= "  AND f.datef <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'";
-    $sql .= " AND f.entity IN (" . getEntity('facture', 0) . ")"; // We don't share object for accountancy
+    $sql .= " AND f.entity IN (" . getEntity("facture", 0) . ")"; // We don't share object for accountancy
    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 {
@@ -387,7 +389,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
    	$sql .= "  LEFT JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = fd.fk_facture";
    	$sql .= " WHERE f.datef >= '" . $db->idate(dol_get_first_day($y, 1, false)) . "'";
    	$sql .= "  AND f.datef <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'";
-    	$sql .= " AND f.entity IN (" . getEntity('facture', 0) . ")";   // We don't share object for accountancy
+    	$sql .= " AND f.entity IN (" . getEntity("facture", 0) . ")";   // We don't share object for accountancy
    	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 {
--- a/htdocs/accountancy/customer/lines.php
+++ b/htdocs/accountancy/customer/lines.php
@@ -28,7 +28,7 @@
 require '../../main.inc.php';

 // Class
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
 require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
@@ -43,7 +43,6 @@ $langs->load("productbatch");
 $account_parent = GETPOST('account_parent');
 $changeaccount = GETPOST('changeaccount');
 // Search Getpost
-$search_lineid = GETPOST('search_lineid', 'int');
 $search_ref = GETPOST('search_ref', 'alpha');
 $search_invoice = GETPOST('search_invoice', 'alpha');
 $search_label = GETPOST('search_label', 'alpha');
@@ -55,7 +54,7 @@ $search_country = GETPOST('search_country', 'alpha');
 $search_tvaintra = GETPOST('search_tvaintra', 'alpha');

 // 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);
+$limit = GETPOST('limit') ? 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');
@@ -77,7 +76,7 @@ if ($user->societe_id > 0)
 if (! $user->rights->accounting->bind->write)
 	accessforbidden();

-$formaccounting = new FormAccounting($db);
+$formventilation = new FormVentilation($db);


 /*
@@ -87,7 +86,6 @@ $formaccounting = new FormAccounting($db);
 // Purge search criteria
 if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
 {
-    $search_lineid = '';
 	$search_ref = '';
 	$search_invoice = '';
 	$search_label = '';
@@ -153,7 +151,7 @@ print '<script type="text/javascript">
 * Customer Invoice lines
 */
 $sql = "SELECT f.rowid, 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.total_ttc,";
+$sql .= " fd.rowid as fdid, fd.description, fd.product_type, fd.total_ht, fd.total_tva, fd.tva_tx, fd.total_ttc,";
 $sql .= " s.rowid as socid, s.nom as name, s.code_compta, s.code_client,";
 $sql .= " p.rowid as 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,";
 $sql .= " fd.situation_percent, co.label as country, s.tva_intra";
@@ -164,16 +162,13 @@ $sql .= " INNER JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = fd.fk_factu
 $sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe as s ON s.rowid = f.fk_soc";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_country as co ON co.rowid = s.fk_pays ";
 $sql .= " WHERE fd.fk_code_ventilation > 0 ";
-$sql .= " AND f.entity IN (" . getEntity('facture', 0) . ")";   // We don't share object for accountancy
+$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 {
 	$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_STANDARD . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_DEPOSIT . "," . Facture::TYPE_SITUATION . ")";
 }
-if ($search_lineid) {
-    $sql .= natural_search("fd.rowid", $search_lineid, 1);
-}
 if (strlen(trim($search_invoice))) {
 	$sql .= natural_search("f.facnumber", $search_invoice);
 }
@@ -201,7 +196,7 @@ if (strlen(trim($search_country))) {
 if (strlen(trim($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 .= " AND f.entity IN (" . getEntity("facture", 0) . ")";    // We don't share object for accountancy
 $sql .= $db->order($sortfield, $sortorder);

 // Count total nb of records
@@ -248,37 +243,19 @@ if ($result) {
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" 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.'">';
 	
 	print_barre_liste($langs->trans("InvoiceLinesDone"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num_lines, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit);
 	print $langs->trans("DescVentilDoneCustomer") . '<br>';

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

 	$moreforfilter = '';
-
-	print '<div class="div-table-responsive">';
+	
+    print '<div class="div-table-responsive">';
 	print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
-
-	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"><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>';
-	print '<td class="liste_titre" align="right"><input type="text" class="right flat maxwidth50" name="search_amount" value="' . dol_escape_htmltag($search_amount) . '"></td>';
-	print '<td class="liste_titre" align="center"><input type="text" class="right flat maxwidth50" placeholder="%" name="search_vat" size="1" value="' . dol_escape_htmltag($search_vat) . '"></td>';
-	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_account" value="' . dol_escape_htmltag($search_account) . '"></td>';
-	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_country" value="' . dol_escape_htmltag($search_country) . '"></td>';
-	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_tavintra" value="' . dol_escape_htmltag($search_tavintra) . '"></td>';
-	print '<td class="liste_titre" align="center">';
-	$searchpicto=$form->showFilterButtons();
-	print $searchpicto;
-	print "</td></tr>\n";
-
+	
 	print '<tr class="liste_titre">';
 	print_liste_field_titre($langs->trans("LineId"), $_SERVER["PHP_SELF"], "fd.rowid", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre($langs->trans("Invoice"), $_SERVER["PHP_SELF"], "f.facnumber", "", $param, '', $sortfield, $sortorder);
@@ -291,28 +268,46 @@ if ($result) {
 	print_liste_field_titre($langs->trans("Account"), $_SERVER["PHP_SELF"], "aa.account_number", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre($langs->trans("Country"), $_SERVER["PHP_SELF"], "co.label", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre($langs->trans("VATIntra"), $_SERVER["PHP_SELF"], "s.tva_intra", "", $param, '', $sortfield, $sortorder);
-	$clickpicto=$form->showCheckAddButtons();
-	print_liste_field_titre($clickpicto, '', '', '', '', 'align="center"');
+	print_liste_field_titre('', '', '', '', '', 'align="center"');
 	print "</tr>\n";

+	print '<tr class="liste_titre">';
+	print '<td class="liste_titre"></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"><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>';
+	print '<td class="liste_titre" align="right"><input type="text" class="flat maxwidth50" name="search_amount" value="' . dol_escape_htmltag($search_amount) . '"></td>';
+	print '<td class="liste_titre" align="center"><input type="text" class="flat maxwidth50" name="search_vat" size="1" value="' . dol_escape_htmltag($search_vat) . '"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_account" value="' . dol_escape_htmltag($search_account) . '"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_country" value="' . dol_escape_htmltag($search_country) . '"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_tavintra" value="' . dol_escape_htmltag($search_tavintra) . '"></td>';
+	print '<td class="liste_titre" align="center">';
+	$searchpitco=$form->showFilterAndCheckAddButtons(1);
+	print $searchpitco;
+	print "</td></tr>\n";
+
 	$facture_static = new Facture($db);
 	$product_static = new Product($db);

+	$var = True;
 	while ( $objp = $db->fetch_object($result) ) {
+		$var = ! $var;
 		$codecompta = length_accountg($objp->account_number) . ' - ' . $objp->label_compte;

 		$facture_static->ref = $objp->facnumber;
 		$facture_static->id = $objp->rowid;
-
+		
 		$product_static->ref = $objp->product_ref;
 		$product_static->id = $objp->product_id;
 		$product_static->type = $objp->product_type;
 		$product_static->label = $objp->product_label;
-
-		print '<tr class="oddeven">';
+		
+		print '<tr '. $bc[$var].'>';

 		print '<td>' . $objp->rowid . '</td>';
-
+		
 		// Ref Invoice
 		print '<td>' . $facture_static->getNomUrl(1) . '</td>';

@@ -324,34 +319,31 @@ if ($result) {
 			print $product_static->getNomUrl(1);
 		if ($objp->product_label) print '<br>'.$objp->product_label;
 		print '</td>';
-
+		
 		print '<td>';
 		$text = dolGetFirstLineOfText(dol_string_nohtmltag($objp->description));
 		$trunclength = defined('ACCOUNTING_LENGTH_DESCRIPTION') ? ACCOUNTING_LENGTH_DESCRIPTION : 32;
 		print $form->textwithtooltip(dol_trunc($text,$trunclength), $objp->description);
 		print '</td>';
-
+		
 		print '<td align="right">' . price($objp->total_ht) . '</td>';
 		print '<td align="center">' . price($objp->tva_tx) . '</td>';
 		print '<td>';
-		print $codecompta . ' <a href="./card.php?id=' . $objp->rowid . '">';
+		print $codecompta . ' <a href="./card.php?id=' . $objp->fdid . '">';
 		print img_edit();
 		print '</a>';
 		print '</td>';
-
 		print '<td>' . $objp->country .'</td>';
-
 		print '<td>' . $objp->tva_intra . '</td>';
-
-		print '<td class="center"><input type="checkbox" class="checkforaction" name="changeaccount[]" value="' . $objp->rowid . '"/></td>';
+		print '<td align="right"><input type="checkbox" class="checkforaction" name="changeaccount[]" value="' . $objp->fdid . '"/></td>';

 		print "</tr>";
 		$i ++;
 	}
-
+	
 	print "</table>";
 	print "</div>";
-
+	
    if ($nbtotalofrecords > $limit) {
        print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num_lines, $nbtotalofrecords, '', 0, '', '', $limit, 1);
    }
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -30,7 +30,7 @@ require '../../main.inc.php';
 // Class
 require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';

@@ -52,7 +52,6 @@ $toselect = GETPOST('toselect', 'array');
 $mesCasesCochees = GETPOST('toselect', 'array');

 // Search Getpost
-$search_lineid = GETPOST('search_lineid', 'int');
 $search_invoice = GETPOST('search_invoice', 'alpha');
 $search_ref = GETPOST('search_ref', 'alpha');
 $search_label = GETPOST('search_label', 'alpha');
@@ -63,7 +62,7 @@ $search_vat = GETPOST('search_vat', 'alpha');
 $btn_ventil = GETPOST('ventil', 'alpha');

 // 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);
+$limit = GETPOST('limit') ? 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');
@@ -85,7 +84,7 @@ if ($user->societe_id > 0)
 if (! $user->rights->accounting->bind->write)
 	accessforbidden();

-$formaccounting = new FormAccounting($db);
+$formventilation = new FormVentilation($db);
 $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);
@@ -101,7 +100,6 @@ if (! GETPOST('confirmmassaction') && $massaction != 'presend' && $massaction !=
 // Purge search criteria
 if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All test are required to be compatible with all browsers
 {
-	$search_lineid = '';
 	$search_ref = '';
 	$search_invoice = '';
 	$search_label = '';
@@ -179,7 +177,7 @@ llxHeader('', $langs->trans("Ventilation"));

 // Customer Invoice lines
 $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,";
+$sql .= " l.fk_product, l.description, l.total_ht, l.rowid, l.fk_code_ventilation, l.product_type as type_l, l.tva_tx as tva_tx_line,";
 $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 .= " FROM " . MAIN_DB_PREFIX . "facture as f";
@@ -191,9 +189,6 @@ $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 ='')";
 // Add search filter like
-if ($search_lineid) {
-    $sql .= natural_search("l.rowid", $search_lineid, 1);
-}
 if (strlen(trim($search_invoice))) {
    $sql .= natural_search("f.facnumber",$search_invoice);
 }
@@ -220,7 +215,7 @@ if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 } else {
 	$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
+$sql .= " AND f.entity IN (" . getEntity("facture", 0) . ")";    // We don't share object for accountancy

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

@@ -241,7 +236,7 @@ if ($result) {
 	$i = 0;

 	$arrayofselected=is_array($toselect)?$toselect:array();
-
+	
 	$param='';
 	if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
 	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
@@ -254,7 +249,8 @@ if ($result) {
 	//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";
 	print '<input type="hidden" name="action" value="ventil">';
 	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -262,37 +258,19 @@ if ($result) {
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" 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.'">';
-
+	
+	//$center='<div align="center"><input type="submit" class="butAction" value="' . $langs->trans("Ventilate") . '" name="ventil"></div>';
+	
 	print_barre_liste($langs->trans("InvoiceLines"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num_lines, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit);

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

 	if ($msg) print $msg.'<br>';
-
+	
 	$moreforfilter = '';
-
-	print '<div class="div-table-responsive">';
+	
+    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"><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>';
-	print '<td class="liste_titre" align="right"><input type="text" class="flat maxwidth50 right" name="search_amount" value="' . dol_escape_htmltag($search_amount) . '"></td>';
-	print '<td class="liste_titre" align="right"><input type="text" class="flat maxwidth50 right" name="search_vat" placeholder="%" size="1" value="' . dol_escape_htmltag($search_vat) . '"></td>';
-	print '<td class="liste_titre"></td>';
-	print '<td class="liste_titre"></td>';
-	print '<td align="center" class="liste_titre">';
-	$searchpicto=$form->showFilterButtons();
-	print $searchpicto;
-	print '</td>';
-	print '</tr>';
-
 	print '<tr class="liste_titre">';
 	print_liste_field_titre($langs->trans("LineId"), $_SERVER["PHP_SELF"], "l.rowid", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre($langs->trans("Invoice"), $_SERVER["PHP_SELF"], "f.facnumber", "", $param, '', $sortfield, $sortorder);
@@ -304,11 +282,27 @@ if ($result) {
 	print_liste_field_titre($langs->trans("VATRate"), $_SERVER["PHP_SELF"], "l.tva_tx", "", $param, 'align="right"', $sortfield, $sortorder);
 	print_liste_field_titre($langs->trans("AccountAccountingSuggest"), '', '', '', '', 'align="center"');
 	print_liste_field_titre($langs->trans("IntoAccount"), '', '', '', '', 'align="center"');
-	$checkpicto='';
-	if ($massactionbutton) $checkpicto=$form->showCheckAddButtons('checkforselect', 1);
-	print_liste_field_titre($checkpicto, '', '', '', '', 'align="center"');
+	print_liste_field_titre('', '', '', '', '', 'align="center"');
 	print "</tr>\n";

+	// We add search filter
+	print '<tr class="liste_titre">';
+	print '<td class="liste_titre"></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"><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>';
+	print '<td class="liste_titre" align="right"><input type="text" class="flat maxwidth50" name="search_amount" value="' . dol_escape_htmltag($search_amount) . '"></td>';
+	print '<td class="liste_titre" align="right"><input type="text" class="flat maxwidth50" name="search_vat" size="1" value="' . dol_escape_htmltag($search_vat) . '">%</td>';
+	print '<td class="liste_titre"></td>';
+	print '<td class="liste_titre"></td>';
+	print '<td align="right" class="liste_titre">';
+	$searchpitco=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
+	print $searchpitco;
+	print '</td>';
+	print '</tr>';
+
 	$facture_static = new Facture($db);
 	$product_static = new Product($db);
 	$form = new Form($db);
@@ -316,6 +310,7 @@ if ($result) {
 	$var = true;
 	while ( $i < min($num_lines, $limit) ) {
 		$objp = $db->fetch_object($result);
+		$var = ! $var;

 		$objp->code_sell_l = '';
 		$objp->code_sell_p = '';
@@ -329,7 +324,7 @@ if ($result) {
 		$facture_static->ref = $objp->facnumber;
 		$facture_static->id = $objp->facid;
 		$facture_static->type = $objp->ftype;
-
+		
 		$code_sell_p_notset = '';
 		$objp->aarowid_suggest = $objp->aarowid;

@@ -349,30 +344,30 @@ if ($result) {
 		if (! empty($objp->code_sell)) {
 			$objp->code_sell_p = $objp->code_sell;       // Code on product
 		} else {
-			$code_sell_p_notset = 'color:orange';
+    	    $code_sell_p_notset = 'color:orange';
 		}
 		if (empty($objp->code_sell_l) && empty($objp->code_sell_p)) $code_sell_p_notset = 'color:red';
-
+		
 		// $objp->code_sell_p is now code of product/service
 		// $objp->code_sell_l is now default code of product/service
-
-		print '<tr class="oddeven">';
+					
+		print '<tr '. $bc[$var].'>';

 		// Line id
 		print '<td>' . $objp->rowid . '</td>';
-
+		
 		// Ref Invoice
 		print '<td>' . $facture_static->getNomUrl(1) . '</td>';

 		print '<td align="center">' . dol_print_date($db->jdate($objp->datef), 'day') . '</td>';
-
+		
 		// Ref Product
 		print '<td>';
 		if ($product_static->id)
 			print $product_static->getNomUrl(1);
 		if ($objp->product_label) print '<br>'.$objp->product_label;
 		print '</td>';
-
+		
 		print '<td class="tdoverflowonsmartphone">';
 		$text = dolGetFirstLineOfText(dol_string_nohtmltag($objp->description));
 		$trunclength = defined('ACCOUNTING_LENGTH_DESCRIPTION') ? ACCOUNTING_LENGTH_DESCRIPTION : 32;
@@ -382,14 +377,14 @@ if ($result) {
 		print '<td align="right">';
 		print price($objp->total_ht);
 		print '</td>';
-
+		
 		// Vat rate
 		if ($objp->vat_tx_l != $objp->vat_tx_p)
 			$code_vat_differ = 'font-weight:bold; text-decoration:blink; color:red';
 		print '<td style="' . $code_vat_differ . '" align="right">';
 		print price($objp->tva_tx_line);
 		print '</td>';
-
+		
 		// Current account
 		print '<td align="center" style="' . $code_sell_p_notset . '">';
 	    print (($objp->type_l == 1)?$langs->trans("DefaultForService"):$langs->trans("DefaultForProduct")) . ' = ' . ($objp->code_sell_l > 0 ? length_accountg($objp->code_sell_l) : $langs->trans("Unknown"));
@@ -402,10 +397,10 @@ if ($result) {

 		// Suggested accounting account
 		print '<td align="center">';
-		print $formaccounting->select_account($objp->aarowid_suggest, 'codeventil'.$objp->rowid, 1, array(), 0, 0, 'maxwidth300 maxwidthonsmartphone', 'cachewithshowemptyone');
+		print $formventilation->select_account($objp->aarowid_suggest, 'codeventil'.$objp->rowid, 1, array(), 0, 0, 'maxwidth300 maxwidthonsmartphone', 'cachewithshowemptyone');
 		print '</td>';
 		
-		print '<td align="center">';
+		print '<td align="right">';
 		print '<input type="checkbox" class="flat checkforselect" name="toselect[]"  value="' . $objp->rowid . "_" . $i . '"' . ($objp->aarowid ? "checked" : "") . '/>';
 		print '</td>';
 		print '</tr>';
@@ -413,7 +408,7 @@ if ($result) {
 	}
 	print '</table>';
 	print "</div>";
-
+	
 	print '</form>';
 } else {
 	print $db->error();
--- a/htdocs/accountancy/expensereport/card.php
+++ b/htdocs/accountancy/expensereport/card.php
@@ -30,7 +30,7 @@ require '../../main.inc.php';

 // Class
 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/html.formventilation.class.php';

 // Langs
 $langs->load("bills");
@@ -85,7 +85,7 @@ if ($cancel == $langs->trans("Cancel")) {
 // Create
 $form = new Form($db);
 $expensereport_static = new ExpenseReport($db);
-$formaccounting = new FormAccounting($db);
+$formventilation = new FormVentilation($db);

 if (! empty($id)) {
 	$sql = "SELECT er.ref, er.rowid as facid, erd.fk_c_type_fees, erd.comments, erd.rowid, erd.fk_code_ventilation,";
@@ -96,7 +96,7 @@ if (! empty($id)) {
 	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON erd.fk_code_ventilation = aa.rowid";
 	$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "expensereport as er ON er.rowid = erd.fk_expensereport";
 	$sql .= " WHERE er.fk_statut > 0 AND erd.rowid = " . $id;
-	$sql .= " AND er.entity IN (" . getEntity('expensereport', 0) . ")";     // We don't share object for accountancy
+	$sql .= " AND er.entity IN (" . getEntity("expensereport", 0) . ")";     // We don't share object for accountancy

 	dol_syslog("/accounting/expensereport/card.php sql=" . $sql, LOG_DEBUG);
 	$result = $db->query($sql);
@@ -135,7 +135,7 @@ if (! empty($id)) {
 			print '<td>' . ($langs->trans($objp->type_fees_code) == $objp->type_fees_code ? $objp->type_fees_label : $langs->trans(($objp->type_fees_code))) . '</td>';

 			print '<tr><td>' . $langs->trans("Account") . '</td><td>';
-			print $formaccounting->select_account($objp->fk_code_ventilation, 'codeventil', 1);
+			print $formventilation->select_account($objp->fk_code_ventilation, 'codeventil', 1);
 			print '</td></tr>';
 			print '</table>';

--- a/htdocs/accountancy/expensereport/index.php
+++ b/htdocs/accountancy/expensereport/index.php
@@ -55,7 +55,7 @@ if ($year == 0) {
 }

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


 /*
@@ -134,7 +134,7 @@ if ($action == 'validatehistory') {
 	$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.= " AND er.entity IN (" . getEntity("accountancy", 1) . ")";
 	$sql1.=")";
 	
 	dol_syslog("htdocs/accountancy/customer/index.php fixaccountancycode", LOG_DEBUG);
@@ -167,7 +167,7 @@ print '<br>';

 //print '<div class="inline-block divButAction">';
 // TODO Remove this. Should be done always.
-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>';
+if ($conf->global->MAIN_FEATURES_LEVEL > 0) print '<a class="butActionDelete" href="' . $_SERVER['PHP_SELF'] . '?year=' . $year_current . '&action=fixaccountancycode">' . $langs->trans("CleanFixHistory", $year_current) . '</a>';
 //print '</div>';


@@ -206,7 +206,7 @@ $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.rowid =
 $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 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";

@@ -217,7 +217,8 @@ if ($resql) {

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

-        print '<tr class="oddeven"><td>' . length_accountg($row[0]) . '</td>';
+        $var = ! $var;
+        print '<tr ' . $bc[$var] . '><td>' . length_accountg($row[0]) . '</td>';
        print '<td align="left">' . $row[1] . '</td>';
        for($i = 2; $i <= 12; $i ++) {
            print '<td align="right">' . price($row[$i]) . '</td>';
@@ -259,7 +260,7 @@ $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.rowid =
 $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 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";

@@ -270,7 +271,8 @@ if ($resql) {

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

-        print '<tr class="oddeven"><td>' . length_accountg($row[0]) . '</td>';
+        $var = ! $var;
+        print '<tr ' . $bc[$var] . '><td>' . length_accountg($row[0]) . '</td>';
        print '<td align="left">' . $row[1] . '</td>';
        for($i = 2; $i <= 12; $i ++) {
            print '<td align="right">' . price($row[$i]) . '</td>';
@@ -313,7 +315,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
    $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 er.entity IN (" . getEntity("expensereport", 0) . ")";     // We don't share object for accountancy
    
    dol_syslog('/accountancy/expensereport/index.php:: sql=' . $sql);
    $resql = $db->query($sql);
--- a/htdocs/accountancy/expensereport/lines.php
+++ b/htdocs/accountancy/expensereport/lines.php
@@ -27,7 +27,7 @@
 require '../../main.inc.php';

 // Class
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.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';
@@ -52,7 +52,7 @@ $search_account = GETPOST('search_account', 'alpha');
 $search_vat = GETPOST('search_vat', 'alpha');

 // 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);
+$limit = GETPOST('limit') ? 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');
@@ -74,7 +74,7 @@ if ($user->societe_id > 0)
 if (! $user->rights->accounting->bind->write)
 	accessforbidden();

-$formaccounting = new FormAccounting($db);
+$formventilation = new FormVentilation($db);


 /*
@@ -173,7 +173,7 @@ if (strlen(trim($search_account))) {
 if (strlen(trim($search_vat))) {
 	$sql .= " AND (erd.tva_tx like '" . $search_vat . "%')";
 }
-$sql .= " AND er.entity IN (" . getEntity('expensereport', 0) . ")";  // We don't share object for accountancy
+$sql .= " AND er.entity IN (" . getEntity("expensereport", 0) . ")";  // We don't share object for accountancy

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

@@ -219,14 +219,13 @@ if ($result) {
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" 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.'">';
-	
+
 	print_barre_liste($langs->trans("ExpenseReportLinesDone"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num_lines, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit);

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

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

 	$moreforfilter = '';
@@ -234,22 +233,6 @@ if ($result) {
    print '<div class="div-table-responsive">';
 	print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";

-	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" 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>';
-	print '<td class="liste_titre" align="center"><input type="text" class="right flat maxwidth50" name="search_vat" size="1" placeholder="%" value="' . dol_escape_htmltag($search_vat) . '"></td>';
-	print '<td class="liste_titre" align="center"><input type="text" class="right flat maxwidth50" name="search_account" value="' . dol_escape_htmltag($search_account) . '"></td>';
-    print '<td class="liste_titre" align="right"></td>';
-    print '<td class="liste_titre" align="right">';
-    $searchpicto=$form->showFilterButtons();
-    print $searchpicto;
-    print '</td>';
-	print "</tr>\n";
-
 	print '<tr class="liste_titre">';
 	print_liste_field_titre($langs->trans("LineId"), $_SERVER["PHP_SELF"], "erd.rowid", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre($langs->trans("ExpenseReport"), $_SERVER["PHP_SELF"], "er.ref", "", $param, '', $sortfield, $sortorder);
@@ -260,8 +243,23 @@ if ($result) {
 	print_liste_field_titre($langs->trans("VATRate"), $_SERVER["PHP_SELF"], "erd.tva_tx", "", $param, 'align="center"', $sortfield, $sortorder);
 	print_liste_field_titre($langs->trans("Account"), $_SERVER["PHP_SELF"], "aa.account_number", "", $param, 'align="center"', $sortfield, $sortorder);
 	print_liste_field_titre('');
-    $checkpicto=$form->showCheckAddButtons();
-	print_liste_field_titre($checkpicto, '', '', '', '', 'align="center"');
+	print_liste_field_titre('', '', '', '', '', 'align="center"');
+	print "</tr>\n";
+
+	print '<tr class="liste_titre">';
+	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" 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>';
+	print '<td class="liste_titre" align="center"><input type="text" class="flat maxwidth50" name="search_vat" size="1" value="' . dol_escape_htmltag($search_vat) . '"></td>';
+	print '<td class="liste_titre" align="center"><input type="text" class="flat maxwidth50" name="search_account" value="' . dol_escape_htmltag($search_account) . '"></td>';
+    print '<td class="liste_titre" align="right"></td>';
+    print '<td class="liste_titre" align="right">';
+    $searchpicto=$form->showFilterAndCheckAddButtons(1);
+    print $searchpicto;
+    print '</td>';
 	print "</tr>\n";

 	$expensereport_static = new ExpenseReport($db);
@@ -269,12 +267,13 @@ if ($result) {
 	$var = True;
 	while ( $i < min($num_lines, $limit) ) {
 		$objp = $db->fetch_object($result);
+		$var = ! $var;
 		$codeCompta = length_accountg($objp->account_number) . ' - ' . $objp->label;

 		$expensereport_static->ref = $objp->ref;
 		$expensereport_static->id = $objp->erid;
 		
-		print '<tr class="oddeven">';
+		print '<tr '. $bc[$var].'>';

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

@@ -301,7 +300,7 @@ if ($result) {
 		print img_edit();
 		print '</a></td>';
 		
-		print '<td class="center"><input type="checkbox" class="checkforaction" name="changeaccount[]" value="' . $objp->rowid . '"/></td>';
+		print '<td align="right"><input type="checkbox" class="checkforaction" name="changeaccount[]" value="' . $objp->rowid . '"/></td>';
 		
 		print "</tr>";
 		$i ++;
--- a/htdocs/accountancy/expensereport/list.php
+++ b/htdocs/accountancy/expensereport/list.php
@@ -29,7 +29,7 @@ require '../../main.inc.php';

 // Class
 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/html.formventilation.class.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';

@@ -61,7 +61,7 @@ $search_vat = GETPOST('search_vat', 'alpha');
 $btn_ventil = GETPOST('ventil', 'alpha');

 // 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);
+$limit = GETPOST('limit') ? 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');
@@ -83,7 +83,7 @@ if ($user->societe_id > 0)
 if (! $user->rights->accounting->bind->write)
 	accessforbidden();

-$formaccounting = new FormAccounting($db);
+$formventilation = new FormVentilation($db);
 $accounting = new AccountingAccount($db);


@@ -203,7 +203,7 @@ if (strlen(trim($search_account))) {
 if (strlen(trim($search_vat))) {
    $sql .= natural_search("erd.tva_tx",$search_vat,1);
 }
-$sql .= " AND er.entity IN (" . getEntity('expensereport', 0) . ")";  // We don't share object for accountancy
+$sql .= " AND er.entity IN (" . getEntity("expensereport", 0) . ")";  // We don't share object for accountancy

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

@@ -246,8 +246,9 @@ if ($result) {
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" 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.'">';
-	
+
+	//$center='<div class="center"><input type="submit" class="butAction" value="' . $langs->trans("Ventilate") . '" name="ventil"></div>';
+
 	print_barre_liste($langs->trans("ExpenseReportLines"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num_lines, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit);

 	print $langs->trans("DescVentilTodoExpenseReport") . '</br><br>';
@@ -258,24 +259,6 @@ if ($result) {

    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"></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"></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>';
-	print '<td class="liste_titre" align="right"><input type="text" class="right flat maxwidth50" name="search_vat" placeholder="%" size="1" value="' . dol_escape_htmltag($search_vat) . '"></td>';
-	print '<td class="liste_titre"></td>';
-	print '<td class="liste_titre"></td>';
-	print '<td align="center" class="liste_titre">';
-	$searchpicto=$form->showFilterButtons();
-	print $searchpicto;
-	print '</td>';
-	print '</tr>';
-
 	print '<tr class="liste_titre">';
 	print_liste_field_titre($langs->trans("LineId"), $_SERVER["PHP_SELF"], "erd.rowid", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre($langs->trans("ExpenseReport"), $_SERVER["PHP_SELF"], "er.ref", "", $param, '', $sortfield, $sortorder);
@@ -286,18 +269,33 @@ if ($result) {
 	print_liste_field_titre($langs->trans("VATRate"), $_SERVER["PHP_SELF"], "erd.tva_tx", "", $param, 'align="right"', $sortfield, $sortorder);
 	print_liste_field_titre($langs->trans("AccountAccountingSuggest"), '', '', '', '', 'align="center"');
 	print_liste_field_titre($langs->trans("IntoAccount"), '', '', '', '', 'align="center"');
-	$checkpicto='';
-	if ($massactionbutton) $checkpicto=$form->showCheckAddButtons('checkforselect', 1);
-	print_liste_field_titre($checkpicto, '', '', '', '', 'align="center"');
+	print_liste_field_titre('', '', '', '', '', 'align="center"');
 	print "</tr>\n";
-	
-	
+
+	// We add search filter
+	print '<tr class="liste_titre">';
+	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"></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="flat maxwidth50" name="search_amount" value="' . dol_escape_htmltag($search_amount) . '"></td>';
+	print '<td class="liste_titre" align="right"><input type="text" class="flat maxwidth50" name="search_vat" size="1" value="' . dol_escape_htmltag($search_vat) . '"></td>';
+	print '<td class="liste_titre"></td>';
+	print '<td class="liste_titre"></td>';
+	print '<td align="right" class="liste_titre">';
+	$searchpicto=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
+	print $searchpicto;
+	print '</td>';
+	print '</tr>';
+
 	$expensereport_static = new ExpenseReport($db);
 	$form = new Form($db);

 	$var = true;
 	while ( $i < min($num_lines, $limit) ) {
 		$objp = $db->fetch_object($result);
+		$var = ! $var;

 		$objp->aarowid_suggest = '';
 		$objp->aarowid_suggest = $objp->aarowid;
@@ -305,7 +303,7 @@ if ($result) {
 		$expensereport_static->ref = $objp->ref;
 		$expensereport_static->id = $objp->erid;

-		print '<tr class="oddeven">';
+		print '<tr '. $bc[$var].'>';

 		// Line id
 		print '<td>' . $objp->rowid . '</td>';
@@ -343,10 +341,10 @@ if ($result) {

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

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

--- a/htdocs/accountancy/index.php
+++ b/htdocs/accountancy/index.php
@@ -45,13 +45,10 @@ $langs->load("compta");
 $langs->load("banks");
 $langs->load("loans");

-
 /*
 * Actions
 */

-// None
-

 /*
 * View
@@ -74,33 +71,33 @@ 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";
+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 img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescMisc", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong>')."<br>\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";
+print "<br>\n";
 if (! empty($conf->tax->enabled))
 {
    $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";
+    print "<br>\n";
 }
 /*if (! empty($conf->salaries->enabled))
 {
@@ -115,6 +112,7 @@ if (! empty($conf->expensereport->enabled))  // TODO Move this in the default ac
    $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";
+    print "<br>\n";
 }
 /*
 if (! empty($conf->loan->enabled))
@@ -122,23 +120,24 @@ 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";
+    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";
+    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>';
+$textlink='<strong>'.$langs->transnoentitiesnoconv("Home").'-'.$langs->transnoentitiesnoconv("MenuBankCash").'</strong>';
 print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBank", $step, $textlink);
 print "<br>\n";
+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>')."<br>\n";
+print "<br>\n";

 print "<br>\n";
 print_fiche_titre($langs->trans("AccountancyAreaDescActionFreq"), '', 'object_calendarweek');
@@ -146,26 +145,24 @@ 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 img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescCustomer", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy")."-".$langs->transnoentitiesnoconv("CustomersVentilation").'</strong>')."<br>\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 img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescSupplier", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy")."-".$langs->transnoentitiesnoconv("SuppliersVentilation").'</strong>')."<br>\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 img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescExpenseReport", $step, '<strong>'.$langs->transnoentitiesnoconv("MenuFinancial").'-'.$langs->transnoentitiesnoconv("MenuAccountancy")."-".$langs->transnoentitiesnoconv("ExpenseReportsVentilation").'</strong>')."<br>\n";
 print "<br>\n";

 $step++;
-print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescWriteRecords", chr(64+$step), $langs->transnoentitiesnoconv("Journalization"), $langs->transnoentitiesnoconv("WriteBookKeeping"))."\n";
+print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescWriteRecords", $step)."<br>\n";
 print "<br>\n";

 $step++;
-print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescAnalyze", chr(64+$step))."<br>\n";
+print img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescAnalyze", $step)."<br>\n";
 print "<br>\n";

 llxFooter();
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -28,17 +28,17 @@
 * \brief 		Page with bank journal
 */
 require '../../main.inc.php';
+
+// Class
 require_once DOL_DOCUMENT_ROOT . '/core/lib/report.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/bank.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
 require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
 require_once DOL_DOCUMENT_ROOT . '/user/class/user.class.php';
 require_once DOL_DOCUMENT_ROOT . '/adherents/class/adherent.class.php';
 require_once DOL_DOCUMENT_ROOT . '/compta/sociales/class/chargesociales.class.php';
 require_once DOL_DOCUMENT_ROOT . '/compta/paiement/class/paiement.class.php';
-require_once DOL_DOCUMENT_ROOT . '/don/class/don.class.php';
 require_once DOL_DOCUMENT_ROOT . '/don/class/paymentdonation.class.php';
 require_once DOL_DOCUMENT_ROOT . '/compta/tva/class/tva.class.php';
 require_once DOL_DOCUMENT_ROOT . '/compta/salaries/class/paymentsalary.class.php';
@@ -51,6 +51,8 @@ require_once DOL_DOCUMENT_ROOT . '/societe/class/client.class.php';
 require_once DOL_DOCUMENT_ROOT . '/expensereport/class/expensereport.class.php';
 require_once DOL_DOCUMENT_ROOT . '/expensereport/class/paymentexpensereport.class.php';

+
+// Langs
 $langs->load("companies");
 $langs->load("other");
 $langs->load("compta");
@@ -59,10 +61,9 @@ $langs->load('bills');
 $langs->load('donations');
 $langs->load("accountancy");
 $langs->load("trips");
-$langs->load("salaries");
+$langs->load("hrm");

-// Multi journal
-$id_journal = GETPOST('id_journal', 'int');
+$id_bank_account = GETPOST('id_account', 'int');

 $date_startmonth = GETPOST('date_startmonth');
 $date_startday = GETPOST('date_startday');
@@ -70,13 +71,12 @@ $date_startyear = GETPOST('date_startyear');
 $date_endmonth = GETPOST('date_endmonth');
 $date_endday = GETPOST('date_endday');
 $date_endyear = GETPOST('date_endyear');
-$action = GETPOST('action','aZ09');
+$action = GETPOST('action');

 $now = dol_now();
-$action = GETPOST('action','aZ09');

 // Security check
-if ($user->societe_id > 0 && empty($id_journal))
+if ($user->societe_id > 0 && empty($id_bank_account))
 	accessforbidden();


@@ -107,17 +107,17 @@ $p = explode(":", $conf->global->MAIN_INFO_SOCIETE_COUNTRY);
 $idpays = $p[0];

 $sql  = "SELECT b.rowid, b.dateo as do, b.datev as dv, b.amount, b.label, b.rappro, b.num_releve, b.num_chq, b.fk_type,";
-$sql .= " ba.courant, ba.ref as baref, ba.account_number, ba.fk_accountancy_journal,";
+$sql .= " ba.courant, ba.ref as baref, ba.account_number,";
 $sql .= " soc.code_compta, soc.code_compta_fournisseur, soc.rowid as socid, soc.nom as name, bu1.type as typeop,";
-$sql .= " u.accountancy_code, u.rowid as userid, u.lastname as lastname, u.firstname as firstname, bu2.type as typeop";
+$sql .= " u.accountancy_code, u.rowid as userid, u.lastname as name, u.firstname as firstname, bu2.type as typeop";
 $sql .= " FROM " . MAIN_DB_PREFIX . "bank as b";
 $sql .= " JOIN " . MAIN_DB_PREFIX . "bank_account as ba on b.fk_account=ba.rowid";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "bank_url as bu1 ON bu1.fk_bank = b.rowid AND bu1.type='company'";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "bank_url as bu2 ON bu2.fk_bank = b.rowid AND bu2.type='user'";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe as soc on bu1.url_id=soc.rowid";
 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "user as u on bu2.url_id=u.rowid";
-$sql .= " WHERE ba.fk_accountancy_journal=" . $id_journal;
-$sql .= ' AND ba.entity IN ('.getEntity('bank_account', 0).')';		// We don't share object for accountancy
+$sql .= " WHERE ba.rowid=" . $id_bank_account;
+$sql .= ' AND ba.entity IN ('.getEntity('bank_account', 0).')';        // We don't share object for accountancy
 if ($date_start && $date_end)
 	$sql .= " AND b.dateo >= '" . $db->idate($date_start) . "' AND b.dateo <= '" . $db->idate($date_end) . "'";
 $sql .= " ORDER BY b.datev";
@@ -134,10 +134,9 @@ $paymentsalstatic = new PaymentSalary($db);
 $paymentexpensereportstatic = new PaymentExpenseReport($db);

 // Get code of finance journal
-$accountingjournalstatic = new AccountingJournal($db);
-$accountingjournalstatic->fetch($id_journal);
-$journal = $accountingjournalstatic->code;
-$journal_label = $accountingjournalstatic->label;
+$bank_code_journal = new Account($db);
+$result = $bank_code_journal->fetch($id_bank_account);
+$journal = $bank_code_journal->accountancy_journal;

 dol_syslog("accountancy/journal/bankjournal.php", LOG_DEBUG);
 $result = $db->query($sql);
@@ -170,25 +169,25 @@ if ($result) {

 		// Set accountancy code (for bank and thirdparty)
 		$compta_bank = $obj->account_number;
-		if ($obj->label == '(SupplierInvoicePayment)')
+		$compta_soc = 'NotDefined';
+		if ($obj->label == '(SupplierInvoicePayment)' || $obj->label == '(SupplierInvoicePaymentBack)')
 			$compta_soc = (! empty($obj->code_compta_fournisseur) ? $obj->code_compta_fournisseur : $account_supplier);
-		if ($obj->label == '(CustomerInvoicePayment)')
+		if ($obj->label == '(CustomerInvoicePayment)' || $obj->label == '(CustomerInvoicePaymentBack)')
 			$compta_soc = (! empty($obj->code_compta) ? $obj->code_compta : $account_customer);

 		$tabcompany[$obj->rowid] = array (
 				'id' => $obj->socid,
 				'name' => $obj->name,
-				'code_compta' => $compta_soc,
+		        'code_compta' => $compta_soc,
 		);

 		$compta_user = (! empty($obj->accountancy_code) ? $obj->accountancy_code : $account_employee);

 		$tabuser[$obj->rowid] = array (
 				'id' => $obj->userid,
-				'name' => dolGetFirstLastname($obj->firstname, $obj->lastname),
 				'lastname' => $obj->lastname,
 				'firstname' => $obj->firstname,
-				'accountancy_code' => $compta_user,
+		        'accountancy_code' => $compta_user,
 		);

 		// Variable bookkeeping
@@ -205,14 +204,14 @@ if ($result) {

 		// get_url may return -1 which is not traversable
 		if (is_array($links)) {
-			// Now loop on each link of record in bank.
+		    // Now loop on each link of record in bank.
 			foreach ( $links as $key => $val ) {

-				if (in_array($links[$key]['type'], array('sc', 'payment_sc', 'payment', 'payment_supplier', 'payment_vat', 'payment_expensereport', 'banktransfert', 'payment_donation', 'payment_salary')))	 // So we excluded 'company' here
-				{
-					// We save tabtype for a future use, to remember what kind of payment it is
-					$tabtype[$obj->rowid] = $links[$key]['type'];
-				}
+			    if (in_array($links[$key]['type'], array('sc', 'payment_sc', 'payment', 'payment_supplier', 'payment_vat', 'payment_expensereport')))     // So we excluded 'company' here
+			    {
+			        // We save tabtype for a future use, to remember what kind of payment it is
+			        $tabtype[$obj->rowid] = $links[$key]['type'];
+			    }

 				if ($links[$key]['type'] == 'payment') {
 					$paymentstatic->id = $links[$key]['url_id'];
@@ -227,12 +226,12 @@ if ($result) {
 					$societestatic->id = $links[$key]['url_id'];
 					$societestatic->name = $links[$key]['label'];
 					$tabpay[$obj->rowid]["soclib"] = $societestatic->getNomUrl(1, '', 30);
-					$tabtp[$obj->rowid][$compta_soc] += $obj->amount;
+					if ($compta_soc) $tabtp[$obj->rowid][$compta_soc] += $obj->amount;
 				} else if ($links[$key]['type'] == 'user') {
 					$userstatic->id = $links[$key]['url_id'];
 					$userstatic->name = $links[$key]['label'];
 					$tabpay[$obj->rowid]["soclib"] = $userstatic->getNomUrl(1, '', 30);
-					$tabtp[$obj->rowid][$compta_user] += $obj->amount;
+					if ($compta_user) $tabtp[$obj->rowid][$compta_user] += $obj->amount;
 				} else if ($links[$key]['type'] == 'sc') {
 					$chargestatic->id = $links[$key]['url_id'];
 					$chargestatic->ref = $links[$key]['url_id'];
@@ -264,22 +263,20 @@ if ($result) {
 				} else if ($links[$key]['type'] == 'payment_donation') {
 					$paymentdonstatic->id = $links[$key]['url_id'];
 					$paymentdonstatic->fk_donation = $links[$key]['url_id'];
-					$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentdonstatic->getNomUrl(2);
-					$tabpay[$obj->rowid]["paymentdonationid"] = $paymentdonstatic->id;
+					$tabpay[$obj->rowid]["lib"] .= ' ' . $langs->trans("PaymentDonation");
 					$tabtp[$obj->rowid][$account_pay_donation] += $obj->amount;
 				} else if ($links[$key]['type'] == 'payment_vat') {
 					$paymentvatstatic->id = $links[$key]['url_id'];
 					$paymentvatstatic->ref = $links[$key]['url_id'];
 					$paymentvatstatic->label = $links[$key]['label'];
-					$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentvatstatic->getNomUrl(2);
-					$tabpay[$obj->rowid]["paymentvatid"] = $paymentvatstatic->id;
+					$tabpay[$obj->rowid]["lib"] .= ' ' . $langs->trans("PaymentVat");
 					$tabtp[$obj->rowid][$account_pay_vat] += $obj->amount;
 				} else if ($links[$key]['type'] == 'payment_salary') {
 					$paymentsalstatic->id = $links[$key]['url_id'];
 					$paymentsalstatic->ref = $links[$key]['url_id'];
 					$paymentsalstatic->label = $links[$key]['label'];
 					$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentsalstatic->getNomUrl(2);
-					$tabpay[$obj->rowid]["paymentsalid"] = $paymentsalstatic->id;
+					// $tabtp[$obj->rowid][$account_employee] += $obj->amount;
 				} else if ($links[$key]['type'] == 'payment_expensereport') {
 					$paymentexpensereportstatic->id = $links[$key]['url_id'];
 					$paymentexpensereportstatic->fk_expensereport = $links[$key]['url_id'];
@@ -296,22 +293,22 @@ if ($result) {


 		// Check account number is ok
-		/*if ($action == 'writebookkeeping')		// Make test now in such a case
+		/*if ($action == 'writebookkeeping')        // Make test now in such a case
 		{
-			reset($tabbq[$obj->rowid]);
-			$first_key_tabbq = key($tabbq[$obj->rowid]);
-			if (empty($first_key_tabbq))
-			{
-				$error++;
-				setEventMessages($langs->trans('ErrorAccountancyCodeOnBankAccountNotDefined', $obj->baref), null, 'errors');
-			}
-			reset($tabtp[$obj->rowid]);
-			$first_key_tabtp = key($tabtp[$obj->rowid]);
-			if (empty($first_key_tabtp))
-			{
-				$error++;
-				setEventMessages($langs->trans('ErrorAccountancyCodeOnThirdPartyNotDefined'), null, 'errors');
-			}
+    		reset($tabbq[$obj->rowid]);
+    		$first_key_tabbq = key($tabbq[$obj->rowid]);
+    		if (empty($first_key_tabbq))
+    		{
+    		    $error++;
+    		    setEventMessages($langs->trans('ErrorAccountancyCodeOnBankAccountNotDefined', $obj->baref), null, 'errors');
+    		}
+    		reset($tabtp[$obj->rowid]);
+    		$first_key_tabtp = key($tabtp[$obj->rowid]);
+    		if (empty($first_key_tabtp))
+    		{
+    	        $error++;
+    	        setEventMessages($langs->trans('ErrorAccountancyCodeOnThirdPartyNotDefined'), null, 'errors');
+    		}
 		}*/

 		// if($obj->socid)$tabtp[$obj->rowid][$compta_soc] += $obj->amount;
@@ -333,230 +330,202 @@ if (! $error && $action == 'writebookkeeping') {
 	$now = dol_now();

 	$error = 0;
-	foreach ( $tabpay as $key => $val ) {	  // $key is rowid into llx_bank
+	foreach ( $tabpay as $key => $val ) {      // $key is rowid into llx_bank

-		$errorforline = 0;
+	    $errorforline = 0;

-		$db->begin();
+	    $db->begin();

 		// Bank
 		if (! $errorforline)
 		{
-			// Line into bank account
-			foreach ( $tabbq[$key] as $k => $mt )
-			{
-				if ($mt) {
-					$bookkeeping = new BookKeeping($db);
-					$bookkeeping->doc_date = $val["date"];
-					$bookkeeping->doc_ref = $val["ref"];
-					$bookkeeping->doc_type = 'bank';
-					$bookkeeping->fk_doc = $key;
-					$bookkeeping->fk_docdet = $val["fk_bank"];
-					$bookkeeping->numero_compte = $k;
-					$bookkeeping->label_compte = $compte->label;
-					$bookkeeping->montant = ($mt < 0 ? - $mt : $mt);
-					$bookkeeping->sens = ($mt >= 0) ? 'D' : 'C';
-					$bookkeeping->debit = ($mt >= 0 ? $mt : 0);
-					$bookkeeping->credit = ($mt < 0 ? - $mt : 0);
-					$bookkeeping->code_journal = $journal;
-					$bookkeeping->journal_label = $journal_label;
-					$bookkeeping->fk_user_author = $user->id;
-					$bookkeeping->date_create = $now;
+		    // Line into bank account
+    		foreach ( $tabbq[$key] as $k => $mt )
+    		{
+    			if ($mt) {
+        		    $bookkeeping = new BookKeeping($db);
+        			$bookkeeping->doc_date = $val["date"];
+        			$bookkeeping->doc_ref = $val["ref"];
+        			$bookkeeping->doc_type = 'bank';
+        			$bookkeeping->fk_doc = $key;
+        			$bookkeeping->fk_docdet = $val["fk_bank"];
+        			$bookkeeping->numero_compte = $k;
+        			$bookkeeping->label_compte = $compte->label;
+        			$bookkeeping->montant = ($mt < 0 ? - $mt : $mt);
+        			$bookkeeping->sens = ($mt >= 0) ? 'D' : 'C';
+        			$bookkeeping->debit = ($mt >= 0 ? $mt : 0);
+        			$bookkeeping->credit = ($mt < 0 ? - $mt : 0);
+        			$bookkeeping->code_journal = $journal;
+        			$bookkeeping->fk_user_author = $user->id;
+        			$bookkeeping->date_create = $now;

-					if ($tabtype[$key] == 'payment') {
-						$bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
+        			if ($tabtype[$key] == 'payment') {
+        			    $bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];

-						$sqlmid = 'SELECT fac.facnumber';
-						$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture fac";
-						$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement_facture as payfac ON payfac.fk_facture=fac.rowid";
-						$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement as pay ON  payfac.fk_paiement=pay.rowid";
-						$sqlmid .= " WHERE pay.fk_bank=" . $key;
-						dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
-						$resultmid = $db->query($sqlmid);
-						if ($resultmid) {
-							$objmid = $db->fetch_object($resultmid);
-							$bookkeeping->doc_ref = $objmid->facnumber;	// Ref of invoice
-						}
-					} else if ($tabtype[$key] == 'payment_supplier') {
-						$bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
+        				$sqlmid = 'SELECT fac.facnumber';
+        				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture fac";
+        				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement_facture as payfac ON payfac.fk_facture=fac.rowid";
+        				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement as pay ON  payfac.fk_paiement=pay.rowid";
+        				$sqlmid .= " WHERE pay.fk_bank=" . $key;
+        				dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
+        				$resultmid = $db->query($sqlmid);
+        				if ($resultmid) {
+        					$objmid = $db->fetch_object($resultmid);
+        					$bookkeeping->doc_ref = $objmid->facnumber;    // Ref of invoice
+        				}
+        			} else if ($tabtype[$key] == 'payment_supplier') {
+        			    $bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];

-						$sqlmid = 'SELECT facf.ref_supplier, facf.ref';
-						$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture_fourn facf";
-						$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn_facturefourn as payfacf ON payfacf.fk_facturefourn=facf.rowid";
-						$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn as payf ON  payfacf.fk_paiementfourn=payf.rowid";
-						$sqlmid .= " WHERE payf.fk_bank=" . $key;
-						dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
-						$resultmid = $db->query($sqlmid);
-						if ($resultmid) {
-							$objmid = $db->fetch_object($resultmid);
-							$bookkeeping->doc_ref = $objmid->ref_supplier . ' (' . $objmid->ref . ')'; // Ref on invoice
-						}
-					} else if ($tabtype[$key] == 'payment_expensereport') {
-						$bookkeeping->code_tiers = $tabuser[$key]['accountancy_code'];
+        				$sqlmid = 'SELECT facf.ref_supplier, facf.ref';
+        				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture_fourn facf";
+        				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn_facturefourn as payfacf ON payfacf.fk_facturefourn=facf.rowid";
+        				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn as payf ON  payfacf.fk_paiementfourn=payf.rowid";
+        				$sqlmid .= " WHERE payf.fk_bank=" . $key;
+        				dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
+        				$resultmid = $db->query($sqlmid);
+        				if ($resultmid) {
+        					$objmid = $db->fetch_object($resultmid);
+        					$bookkeeping->doc_ref = $objmid->ref_supplier . ' (' . $objmid->ref . ')'; // Ref on invoice
+        				}
+        			} else if ($tabtype[$key] == 'payment_expensereport') {
+        			    $bookkeeping->code_tiers = $tabuser[$key]['accountancy_code'];

-						$sqlmid = 'SELECT e.ref';
-						$sqlmid .= " FROM " . MAIN_DB_PREFIX . "expensereport as e";
-						$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "payment_expensereport as payer ON payer.fk_expensereport=e.rowid";
-						$sqlmid .= " WHERE payer.fk_expensereport=" . $val["fk_expensereport"];
-						dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
-						$resultmid = $db->query($sqlmid);
-						if ($resultmid) {
-							$objmid = $db->fetch_object($resultmid);
-							$bookkeeping->doc_ref = $objmid->ref; // Ref of expensereport
-						}
-					} else if ($tabtype[$key] == 'payment_vat') {
-						$bookkeeping->code_tiers = '';
-						$bookkeeping->doc_ref = $langs->trans("PaymentVat") . ' (' . $val["paymentvatid"] . ')'; // Rowid of vat payment
-					} else if ($tabtype[$key] == 'payment_donation') {
-						$bookkeeping->code_tiers = '';
-						$bookkeeping->doc_ref = $langs->trans("Donation") . ' (' . $val["paymentdonationid"] . ')'; // Rowid of donation
-					} else if ($tabtype[$key] == 'payment_salary') {
-						$bookkeeping->code_tiers = '';
-						$bookkeeping->label_compte = $tabuser[$key]['name'];
-						$bookkeeping->doc_ref = $langs->trans("SalaryPayment") . ' (' . $val["paymentsalid"] . ')'; // Ref of salary payment
-					}
+        				$sqlmid = 'SELECT e.ref';
+        				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "expensereport as e";
+        				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "payment_expensereport as payer ON payer.fk_expensereport=e.rowid";
+        				$sqlmid .= " WHERE payer.fk_expensereport=" . $val["fk_expensereport"];
+        				dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
+        				$resultmid = $db->query($sqlmid);
+        				if ($resultmid) {
+        					$objmid = $db->fetch_object($resultmid);
+        					$bookkeeping->doc_ref = $objmid->ref; // Ref of expensereport
+        				}
+        			}

-					$result = $bookkeeping->create($user);
-					if ($result < 0) {
-						if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
-						{
-							$error++;
-							$errorforline++;
-							//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-						}
-						else
-						{
-							$error++;
-							$errorforline++;
-							setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
-						}
-					}
-				}
-			}
+        			$result = $bookkeeping->create($user);
+        			if ($result < 0) {
+        				if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+        				{
+        					$error++;
+        					$errorforline++;
+        					//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+        				}
+        				else
+        				{
+    	    				$error++;
+    	    				$errorforline++;
+    	    				setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+        				}
+        			}
+    			}
+    		}
 		}

 		// Third party
 		if (! $errorforline)
 		{
-			// Line into thirdparty account
-			foreach ( $tabtp[$key] as $k => $mt ) {
-				if ($mt) {
-					$bookkeeping = new BookKeeping($db);
-					$bookkeeping->doc_date = $val["date"];
-					$bookkeeping->doc_ref = $val["ref"];
-					$bookkeeping->doc_type = 'bank';
-					$bookkeeping->fk_doc = $key;
-					$bookkeeping->fk_docdet = $val["fk_bank"];
-					$bookkeeping->label_compte = $tabcompany[$key]['name'];
-					$bookkeeping->montant = ($mt < 0 ? - $mt : $mt);
-					$bookkeeping->sens = ($mt < 0) ? 'D' : 'C';
-					$bookkeeping->debit = ($mt < 0 ? - $mt : 0);
-					$bookkeeping->credit = ($mt >= 0) ? $mt : 0;
-					$bookkeeping->code_journal = $journal;
-					$bookkeeping->journal_label = $journal_label;
-					$bookkeeping->fk_user_author = $user->id;
-					$bookkeeping->date_create = $now;
+		    // Line into thirdparty account
+    		foreach ( $tabtp[$key] as $k => $mt ) {
+    			if ($mt) {
+        		    $bookkeeping = new BookKeeping($db);
+        			$bookkeeping->doc_date = $val["date"];
+        			$bookkeeping->doc_ref = $val["ref"];
+        			$bookkeeping->doc_type = 'bank';
+        			$bookkeeping->fk_doc = $key;
+        			$bookkeeping->fk_docdet = $val["fk_bank"];
+        			$bookkeeping->label_compte = $tabcompany[$key]['name'];
+        			$bookkeeping->montant = ($mt < 0 ? - $mt : $mt);
+        			$bookkeeping->sens = ($mt < 0) ? 'D' : 'C';
+        			$bookkeeping->debit = ($mt < 0 ? - $mt : 0);
+        			$bookkeeping->credit = ($mt >= 0) ? $mt : 0;
+        			$bookkeeping->code_journal = $journal;
+        			$bookkeeping->fk_user_author = $user->id;
+        			$bookkeeping->date_create = $now;

-					if (in_array($tabtype[$key], array('sc', 'payment_sc'))) {   // If payment is payment of social contribution
-						$bookkeeping->code_tiers = '';
-						$bookkeeping->numero_compte = $k;
-					} else if ($tabtype[$key] == 'payment') {	// If payment is payment of customer invoice, we get ref of invoice
-						$sqlmid = 'SELECT fac.facnumber';
-						$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture fac ";
-						$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement_facture as payfac ON  payfac.fk_facture=fac.rowid";
-						$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement as pay ON  payfac.fk_paiement=pay.rowid";
-						$sqlmid .= " WHERE pay.fk_bank=" . $key;
-						dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
-						$resultmid = $db->query($sqlmid);
-						if ($resultmid) {
-							$objmid = $db->fetch_object($resultmid);
-							$bookkeeping->doc_ref = $objmid->facnumber;
-						}
-						$bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
-						$bookkeeping->numero_compte = $k;
-					} else if ($tabtype[$key] == 'payment_supplier') {		   // If payment is payment of supplier invoice, we get ref of invoice
-						$sqlmid = 'SELECT facf.ref_supplier,facf.ref';
-						$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture_fourn facf ";
-						$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn_facturefourn as payfacf ON  payfacf.fk_facturefourn=facf.rowid";
-						$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn as payf ON  payfacf.fk_paiementfourn=payf.rowid";
-						$sqlmid .= " WHERE payf.fk_bank=" . $key;
-						dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
-						$resultmid = $db->query($sqlmid);
-						if ($resultmid) {
-							$objmid = $db->fetch_object($resultmid);
-							$bookkeeping->doc_ref = $objmid->ref_supplier . ' (' . $objmid->ref . ')';
-						}
-						$bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
-						$bookkeeping->numero_compte = $k;
-					} else if ($tabtype[$key] == 'payment_vat') {
-						$bookkeeping->code_tiers = '';
-						$bookkeeping->numero_compte = $k;
-						$bookkeeping->doc_ref = $langs->trans("PaymentVat") . ' (' . $val["paymentvatid"] . ')'; // Rowid of vat
-					} else if ($tabtype[$key] == 'payment_donation') {
-						$bookkeeping->code_tiers = '';
-						$bookkeeping->numero_compte = $k;
-						$bookkeeping->doc_ref = $langs->trans("Donation") . ' (' . $val["paymentdonationid"] . ')'; // Rowid of donation
-					} else if ($tabtype[$key] == 'payment_salary') {
-						$bookkeeping->code_tiers = $tabuser[$key]['accountancy_code'];
-						$bookkeeping->numero_compte = $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT;
-						$bookkeeping->label_compte = $tabuser[$key]['name'];
-						$bookkeeping->doc_ref = $langs->trans("SalaryPayment") . ' (' . $val["paymentsalid"] . ')'; // Rowid of salary payment
-					} else if ($tabtype[$key] == 'banktransfert') {
-						$bookkeeping->code_tiers = '';
-						$bookkeeping->numero_compte = $k;
-					} else {
-						// FIXME Should be a temporary account ???
-						$bookkeeping->doc_ref = $k;
-						//$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER;
-						$bookkeeping->numero_compte = 'CodeNotDef';
-					}
+        			if (in_array($tabtype[$key], array('sc', 'payment_sc'))) {   // If payment is payment of social contribution
+        				$bookkeeping->code_tiers = '';
+        				$bookkeeping->numero_compte = $k;
+        			} else if ($tabtype[$key] == 'payment') {    // If payment is payment of customer invoice, we get ref of invoice
+        				$sqlmid = 'SELECT fac.facnumber';
+        				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture fac ";
+        				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement_facture as payfac ON  payfac.fk_facture=fac.rowid";
+        				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement as pay ON  payfac.fk_paiement=pay.rowid";
+        				$sqlmid .= " WHERE pay.fk_bank=" . $key;
+        				dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
+        				$resultmid = $db->query($sqlmid);
+        				if ($resultmid) {
+        					$objmid = $db->fetch_object($resultmid);
+        					$bookkeeping->doc_ref = $objmid->facnumber;
+        				}
+        				$bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
+        				$bookkeeping->numero_compte = $k;
+        			} else if ($tabtype[$key] == 'payment_supplier') {           // If payment is payment of supplier invoice, we get ref of invoice

-					$result = $bookkeeping->create($user);
-					if ($result < 0) {
-						if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
-						{
-							$error++;
-							$errorforline++;
-							//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-						}
-						else
-						{
-							$error++;
-							$errorforline++;
-							setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
-						}
-					}
-				}
-			}
+        				$sqlmid = 'SELECT facf.ref_supplier,facf.ref';
+        				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture_fourn facf ";
+        				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn_facturefourn as payfacf ON  payfacf.fk_facturefourn=facf.rowid";
+        				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn as payf ON  payfacf.fk_paiementfourn=payf.rowid";
+        				$sqlmid .= " WHERE payf.fk_bank=" . $key;
+        				dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
+        				$resultmid = $db->query($sqlmid);
+        				if ($resultmid) {
+        					$objmid = $db->fetch_object($resultmid);
+        					$bookkeeping->doc_ref = $objmid->ref_supplier . ' (' . $objmid->ref . ')';
+        				}
+                        $bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
+        				$bookkeeping->numero_compte = $k;
+        			} else {
+        			    // FIXME Should be a temporary account ???
+        				$bookkeeping->doc_ref = $k;
+        				//$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER;
+        				$bookkeeping->numero_compte = 'CodeNotDef';
+        			}
+
+        			$result = $bookkeeping->create($user);
+        			if ($result < 0) {
+        				if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+        				{
+        					$error++;
+        					$errorforline++;
+        					//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+        				}
+        				else
+        				{
+    	    				$error++;
+    	    				$errorforline++;
+    	    				setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+        				}
+        			}
+    			}
+    		}
 		}

 		if (! $errorforline)
 		{
-			$db->commit();
+            $db->commit();
 		}
 		else
 		{
-			$db->rollback();
+		    $db->rollback();
 		}
 	}

 	if (empty($error)) {
-		setEventMessages($langs->trans("GeneralLedgerIsWritten"), null, 'mesgs');
+	    setEventMessages($langs->trans("GeneralLedgerIsWritten"), null, 'mesgs');
 	}
 	elseif (count($tabpay) == $error)
 	{
-		setEventMessages($langs->trans("NoNewRecordSaved"), null, 'warnings');
+	    setEventMessages($langs->trans("NoNewRecordSaved"), null, 'warnings');
 	}
 	else
 	{
-		setEventMessages($langs->trans("GeneralLedgerSomeRecordWasNotRecorded"), null, 'warnings');
+	    setEventMessages($langs->trans("GeneralLedgerSomeRecordWasNotRecorded"), null, 'warnings');
 	}

 	$action = '';
 }

 // Export
-/*
 if ($action == 'export_csv') {
 	$sep = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV;

@@ -574,10 +543,10 @@ if ($action == 'export_csv') {
 			$date = dol_print_date($db->jdate($val["date"]), '%d%m%Y');

 			$reflabel = $val["ref"];
-			if ($reflabel == '(SupplierInvoicePayment)') {
+			if ($reflabel == '(SupplierInvoicePayment)' || $reflabel == '(SupplierInvoicePaymentBack)') {
 				$reflabel = $langs->trans('Supplier');
 			}
-			if ($reflabel == '(CustomerInvoicePayment)') {
+			if ($reflabel == '(CustomerInvoicePayment)' || $reflabel == '(CustomerInvoicePaymentBack)') {
 				$reflabel = $langs->trans('Customer');
 			}
 			if ($reflabel == '(SocialContributionPayment)') {
@@ -723,7 +692,7 @@ if ($action == 'export_csv') {
 		}
 	}
 }
-*/
+


 /*
@@ -736,21 +705,18 @@ if (empty($action) || $action == 'view') {
 	$invoicestatic = new Facture($db);
 	$invoicesupplierstatic = new FactureFournisseur($db);
 	$expensereportstatic = new ExpenseReport($db);
-	$vatstatic = new Tva($db);
-	$donationstatic = new Don($db);
-	$salarystatic = new PaymentSalary($db);

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

-	$nom = $langs->trans("FinanceJournal") . ' - ' . $accountingjournalstatic->getNomUrl(1);
+	$nom = $langs->trans("FinanceJournal") . ' - ' . $bank_code_journal->getNomUrl(1);
 	$builddate = time();
 	//$description = $langs->trans("DescFinanceJournal") . '<br>';
 	$description.= $langs->trans("DescJournalOnlyBindedVisible").'<br>';
 	$period = $form->select_date($date_start, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1);

-	$varlink = 'id_journal=' . $id_journal;
+	$varlink = 'id_account=' . $id_bank_account;

-	journalHead($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''), '', $varlink);
+	report_header($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''), '', $varlink);

 	/*if ($conf->global->ACCOUNTING_EXPORT_MODELCSV != 1 && $conf->global->ACCOUNTING_EXPORT_MODELCSV != 2) {
 		print '<input type="button" class="butActionRefused" style="float: right;" value="' . $langs->trans('Export') . '" disabled="disabled" title="' . $langs->trans('ExportNotSupported') . '"/>';
@@ -758,24 +724,24 @@ if (empty($action) || $action == 'view') {
 		print '<input type="button" class="butAction" style="float: right;" value="' . $langs->trans("Export") . '" onclick="launch_export();" />';
 	}*/

-	print '<div class="tabsAction">';
+    print '<div class="tabsAction">';
 	print '<input type="button" class="butAction" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
-	print '</div>';
+    print '</div>';

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

@@ -797,16 +763,17 @@ if (empty($action) || $action == 'view') {
 	print "<td align='right'>" . $langs->trans("Credit") . "</td>";
 	print "</tr>\n";

+	$var = true;
 	$r = '';

-	foreach ( $tabpay as $key => $val ) {	  // $key is rowid in llx_bank
+	foreach ( $tabpay as $key => $val ) {      // $key is rowid in llx_bank
 		$date = dol_print_date($db->jdate($val["date"]), 'day');

 		$reflabel = $val["ref"];
-		if ($reflabel == '(SupplierInvoicePayment)') {
+		if ($reflabel == '(SupplierInvoicePayment)' || $reflabel == '(SupplierInvoicePaymentBack)') {
 			$reflabel = $langs->trans('Supplier');
 		}
-		if ($reflabel == '(CustomerInvoicePayment)') {
+		if ($reflabel == '(CustomerInvoicePayment)' || $reflabel == '(CustomerInvoicePaymentBack)') {
 			$reflabel = $langs->trans('Customer');
 		}
 		if ($reflabel == '(SocialContributionPayment)') {
@@ -825,87 +792,45 @@ if (empty($action) || $action == 'view') {
 		$ref=$reflabel;
 		if ($tabtype[$key] == 'payment')
 		{
-			$sqlmid = 'SELECT payfac.fk_facture as id';
-			$sqlmid .= " FROM ".MAIN_DB_PREFIX."paiement_facture as payfac";
-			$sqlmid .= " WHERE payfac.fk_paiement=" . $val["paymentid"];
-			dol_syslog("accountancy/journal/bankjournal.php::sqlmid=" . $sqlmid, LOG_DEBUG);
-			$resultmid = $db->query($sqlmid);
-			if ($resultmid) {
-				$objmid = $db->fetch_object($resultmid);
-				$invoicestatic->fetch($objmid->id);
-				$ref=$langs->trans("Invoice").' '.$invoicestatic->getNomUrl(1);
-			}
-			else dol_print_error($db);
+		    $sqlmid = 'SELECT payfac.fk_facture as id';
+		    $sqlmid .= " FROM ".MAIN_DB_PREFIX."paiement_facture as payfac";
+		    $sqlmid .= " WHERE payfac.fk_paiement=" . $val["paymentid"];
+		    dol_syslog("accountancy/journal/bankjournal.php::sqlmid=" . $sqlmid, LOG_DEBUG);
+		    $resultmid = $db->query($sqlmid);
+		    if ($resultmid) {
+		        $objmid = $db->fetch_object($resultmid);
+		        $invoicestatic->fetch($objmid->id);
+		        $ref=$langs->trans("Invoice").' '.$invoicestatic->getNomUrl(1);
+		    }
+		    else dol_print_error($db);
 		}
 		elseif ($tabtype[$key] == 'payment_supplier')
 		{
-			$sqlmid = 'SELECT payfac.fk_facturefourn as id';
-			$sqlmid .= " FROM " . MAIN_DB_PREFIX . "paiementfourn_facturefourn as payfac";
-			$sqlmid .= " WHERE payfac.fk_paiementfourn=" . $val["paymentsupplierid"];
-			dol_syslog("accountancy/journal/bankjournal.php::sqlmid=" . $sqlmid, LOG_DEBUG);
-			$resultmid = $db->query($sqlmid);
-			if ($resultmid) {
-				$objmid = $db->fetch_object($resultmid);
-				$invoicesupplierstatic->fetch($objmid->id);
-				$ref=$langs->trans("SupplierInvoice").' '.$invoicesupplierstatic->getNomUrl(1);
-			}
-			else dol_print_error($db);
+		    $sqlmid = 'SELECT payfac.fk_facturefourn as id';
+		    $sqlmid .= " FROM " . MAIN_DB_PREFIX . "paiementfourn_facturefourn as payfac";
+		    $sqlmid .= " WHERE payfac.fk_paiementfourn=" . $val["paymentsupplierid"];
+		    dol_syslog("accountancy/journal/bankjournal.php::sqlmid=" . $sqlmid, LOG_DEBUG);
+		    $resultmid = $db->query($sqlmid);
+		    if ($resultmid) {
+		        $objmid = $db->fetch_object($resultmid);
+		        $invoicesupplierstatic->fetch($objmid->id);
+		        $ref=$langs->trans("SupplierInvoice").' '.$invoicesupplierstatic->getNomUrl(1);
+		    }
+		    else dol_print_error($db);
 		}
 		elseif ($tabtype[$key] == 'payment_expensereport')
 		{
-			$sqlmid = 'SELECT payer.fk_expensereport as id';
-			$sqlmid .= " FROM " . MAIN_DB_PREFIX . "payment_expensereport as payer";
-			$sqlmid .= " WHERE payer.fk_expensereport=" . $val["fk_expensereport"];
-			dol_syslog("accountancy/journal/bankjournal.php::sqlmid=" . $sqlmid, LOG_DEBUG);
-			$resultmid = $db->query($sqlmid);
-			if ($resultmid) {
-				$objmid = $db->fetch_object($resultmid);
-				$expensereportstatic->fetch($objmid->id);
-				$ref=$langs->trans("ExpenseReport").' '.$expensereportstatic->getNomUrl(1);
-			}
-			else dol_print_error($db);
-		}
-		elseif ($tabtype[$key] == 'payment_vat')
-		{
-			$sqlmid = 'SELECT v.rowid as id';
-			$sqlmid .= " FROM " . MAIN_DB_PREFIX . "tva as v";
-			$sqlmid .= " WHERE v.rowid=" . $val["paymentvatid"];
-			dol_syslog("accountancy/journal/bankjournal.php::sqlmid=" . $sqlmid, LOG_DEBUG);
-			$resultmid = $db->query($sqlmid);
-			if ($resultmid) {
-				$objmid = $db->fetch_object($resultmid);
-				$vatstatic->fetch($objmid->id);
-				$ref=$langs->trans("PaymentVat").' '.$vatstatic->getNomUrl(1);
-			}
-			else dol_print_error($db);
-		}
-		elseif ($tabtype[$key] == 'payment_donation')
-		{
-			$sqlmid = 'SELECT payd.fk_donation as id';
-			$sqlmid .= " FROM " . MAIN_DB_PREFIX . "payment_donation as payd";
-			$sqlmid .= " WHERE payd.fk_donation=" . $val["paymentdonationid"];
-			dol_syslog("accountancy/journal/bankjournal.php::sqlmid=" . $sqlmid, LOG_DEBUG);
-			$resultmid = $db->query($sqlmid);
-			if ($resultmid) {
-				$objmid = $db->fetch_object($resultmid);
-				$donationstatic->fetch($objmid->id);
-				$ref=$langs->trans("Donation").' '.$donationstatic->getNomUrl(1);
-			}
-			else dol_print_error($db);
-		}
-		elseif ($tabtype[$key] == 'payment_salary')
-		{
-			$sqlmid = 'SELECT s.rowid as id';
-			$sqlmid .= " FROM " . MAIN_DB_PREFIX . "payment_salary as s";
-			$sqlmid .= " WHERE s.rowid=" . $val["paymentsalid"];
-			dol_syslog("accountancy/journal/bankjournal.php::sqlmid=" . $sqlmid, LOG_DEBUG);
-			$resultmid = $db->query($sqlmid);
-			if ($resultmid) {
-				$objmid = $db->fetch_object($resultmid);
-				$salarystatic->fetch($objmid->id);
-				$ref=$langs->trans("SalaryPayment").' '.$salarystatic->getNomUrl(1);
-			}
-			else dol_print_error($db);
+		    $sqlmid = 'SELECT payer.fk_expensereport as id';
+		    $sqlmid .= " FROM " . MAIN_DB_PREFIX . "payment_expensereport as payer";
+		    $sqlmid .= " WHERE payer.fk_expensereport=" . $val["fk_expensereport"];
+		    dol_syslog("accountancy/journal/bankjournal.php::sqlmid=" . $sqlmid, LOG_DEBUG);
+		    $resultmid = $db->query($sqlmid);
+		    if ($resultmid) {
+		        $objmid = $db->fetch_object($resultmid);
+		        $expensereportstatic->fetch($objmid->id);
+		        $ref=$langs->trans("ExpenseReport").' '.$expensereportstatic->getNomUrl(1);
+		    }
+		    else dol_print_error($db);
 		}


@@ -915,22 +840,22 @@ if (empty($action) || $action == 'view') {
 		// Bank
 		foreach ( $tabbq[$key] as $k => $mt )
 		{
-			print '<tr class="oddeven">';
-			print "<td><!-- Bank bank.rowid=".$key."--></td>";
-			print "<td>" . $date . "</td>";
+		    print "<tr " . $bc[$var] . ">";
+		    print "<td><!-- Bank bank.rowid=".$key."--></td>";
+		    print "<td>" . $date . "</td>";
 			print "<td>" . $ref . "</td>";
 			print "<td>";
 			$accountoshow = length_accountg($k);
 			if (empty($accountoshow) || $accountoshow == 'NotDefined')
 			{
-				print '<span class="error">'.$langs->trans("BankAccountNotDefined").'</span>';
+			    print '<span class="error">'.$langs->trans("BankAccountNotDefined").'</span>';
 			}
 			else print $accountoshow;
 			print "</td>";
 			if ($val['soclib'] == '') {
-				print "<td>" . $bankstatic->label . " - " . $reflabel . "</td>";
+				print "<td>" . $bank_code_journal->label . " - " . $val["ref"] . "</td>";
 			} else {
-				print "<td>" . $bankstatic->label . " - " . $val['soclib'] . "</td>";
+				print "<td>" . $bank_code_journal->label . " - " . $val['soclib'] . "</td>";
 			}
 			print "<td>" . $val["type_payment"] . "</td>";
 			print "<td align='right'>" . ($mt >= 0 ? price($mt) : '') . "</td>";
@@ -942,17 +867,17 @@ if (empty($action) || $action == 'view') {
 		if (is_array($tabtp[$key])) {
 			foreach ( $tabtp[$key] as $k => $mt ) {
 				if ($k != 'type') {
-					print '<tr class="oddeven">';
+					print "<tr " . $bc[$var] . ">";
 					print "<td><!-- Thirdparty bank.rowid=".$key." --></td>";
 					print "<td>" . $date . "</td>";
 					print "<td>" . $ref . "</td>";
 					print "<td>";
-					$accountoshow = length_accounta($k);
-					if (empty($accountoshow) || $accountoshow == 'NotDefined')
-					{
-						print '<span class="error">'.$langs->trans("ThirdpartyAccountNotDefined").'</span>';
-					}
-					else print $accountoshow;
+        			$accountoshow = length_accounta($k);
+        			if (empty($accountoshow) || $accountoshow == 'NotDefined')
+        			{
+        			    print '<span class="error">'.$langs->trans("ThirdpartyAccountNotDefined").'</span>';
+        			}
+        			else print $accountoshow;
 					print "</td>";
 					print "<td>" . $reflabel . ' ' . $val['soclib'] . "</td>";
 					print "<td>" . $val["type_payment"] . "</td>";
@@ -963,15 +888,15 @@ if (empty($action) || $action == 'view') {
 			}
 		} else {
 			foreach ( $tabbq[$key] as $k => $mt ) {
-				print '<tr class="oddeven">';
+				print "<tr " . $bc[$var] . ">";
 				print "<td><!-- Wait bank.rowid=".$key." --></td>";
 				print "<td>" . $date . "</td>";
 				print "<td>" . $ref . "</td>";
 				print "<td>";
-				if (empty($accountoshow) || $accountoshow == 'NotDefined')
-				{
-					print '<span class="error">'.$langs->trans("WaitAccountNotDefined").'</span>';
-				}
+			    if (empty($accountoshow) || $accountoshow == 'NotDefined')
+        		{
+        		    print '<span class="error">'.$langs->trans("WaitAccountNotDefined").'</span>';
+        		}
 				else print length_accountg($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE);
 				print "</td>";
 				print "<td>" . $reflabel . "</td>";
@@ -981,6 +906,7 @@ if (empty($action) || $action == 'view') {
 				print "</tr>";
 			}
 		}
+		$var = ! $var;
 	}

 	print "</table>";
--- a/htdocs/accountancy/journal/expensereportsjournal.php
+++ b/htdocs/accountancy/journal/expensereportsjournal.php
@@ -3,7 +3,7 @@
 * Copyright (C) 2007-2010	Jean Heimburger		<jean@tiaris.info>
 * Copyright (C) 2011		Juanjo Menent		<jmenent@2byte.es>
 * Copyright (C) 2012		Regis Houssin		<regis@dolibarr.fr>
- * Copyright (C) 2013-2017	Alexandre Spangaro	<aspangaro@zendsi.com>
+ * Copyright (C) 2013-2016	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>
 *
@@ -22,20 +22,22 @@
 */

 /**
- * \file		htdocs/accountancy/journal/expensereportsjournal.php
- * \ingroup		Advanced accountancy
- * \brief		Page with expense reports journal
+ * \file	htdocs/accountancy/journal/expensereportsjournal.php
+ * \ingroup	Advanced accountancy
+ * \brief	Page with expense reports journal
 */
 require '../../main.inc.php';
+
+// Class
 require_once DOL_DOCUMENT_ROOT . '/core/lib/report.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
 require_once DOL_DOCUMENT_ROOT . '/expensereport/class/expensereport.class.php';
 require_once DOL_DOCUMENT_ROOT . '/user/class/user.class.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/bookkeeping.class.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';

+// Langs
 $langs->load("compta");
 $langs->load("bills");
 $langs->load("other");
@@ -43,9 +45,6 @@ $langs->load("main");
 $langs->load("accountancy");
 $langs->load("trips");

-$id_journal = GETPOST('id_journal', 'int');
-$action = GETPOST('action','aZ09');
-
 $date_startmonth = GETPOST('date_startmonth');
 $date_startday = GETPOST('date_startday');
 $date_startyear = GETPOST('date_startyear');
@@ -59,15 +58,12 @@ $now = dol_now();
 if ($user->societe_id > 0)
 	accessforbidden();

+$action = GETPOST('action');
+
+
 /*
 * Actions
 */
- 
-// Get informations of journal
-$accountingjournalstatic = new AccountingJournal($db);
-$accountingjournalstatic->fetch($id_journal);
-$journal = $accountingjournalstatic->code;
-$journal_label = $accountingjournalstatic->label;

 $year_current = strftime("%Y", dol_now());
 $pastmonth = strftime("%m", dol_now()) - 1;
@@ -101,7 +97,7 @@ $sql .= " JOIN " . MAIN_DB_PREFIX . "expensereport as er ON er.rowid = erd.fk_ex
 $sql .= " JOIN " . MAIN_DB_PREFIX . "user as u ON u.rowid = er.fk_user_author";
 $sql .= " WHERE er.fk_statut > 0 ";
 $sql .= " AND erd.fk_code_ventilation > 0 ";
-$sql .= " AND er.entity IN (" . getEntity('expensereport', 0) . ")";  // We don't share object for accountancy
+$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) . "'";
 $sql .= " ORDER BY er.date_debut";
@@ -161,162 +157,161 @@ if ($action == 'writebookkeeping') {
 	{
 		$errorforline = 0;

-		$db->begin();
-
+	    $db->begin();
+	     
+        if (! $errorforline)
+        {
+    	    foreach ( $tabttc[$key] as $k => $mt ) {
+    			if ($mt) {
+        	        // get compte id and label
+        
+        			$bookkeeping = new BookKeeping($db);
+        			$bookkeeping->doc_date = $val["date"];
+        			$bookkeeping->doc_ref = $val["ref"];
+        			$bookkeeping->date_create = $now;
+        			$bookkeeping->doc_type = 'expense_report';
+        			$bookkeeping->fk_doc = $key;
+        			$bookkeeping->fk_docdet = $val["fk_expensereportdet"];
+        			$bookkeeping->code_tiers = $tabuser[$key]['user_accountancy_code'];
+        			$bookkeeping->label_compte = $tabuser[$key]['name'];
+        			$bookkeeping->numero_compte = $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT;
+        			$bookkeeping->montant = $mt;
+        			$bookkeeping->sens = ($mt >= 0) ? 'C' : 'D';
+        			$bookkeeping->debit = ($mt <= 0) ? $mt : 0;
+        			$bookkeeping->credit = ($mt > 0) ? $mt : 0;
+        			$bookkeeping->code_journal = $conf->global->ACCOUNTING_EXPENSEREPORT_JOURNAL;
+        			$bookkeeping->fk_user_author = $user->id;
+        
+        			$result = $bookkeeping->create($user);
+        			if ($result < 0) {
+        			    if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+        			    {
+        			        $error++;
+        			        $errorforline++;
+        			        //setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+        			    }
+        			    else
+        			    {
+        			        $error++;
+        			        $errorforline++;
+        			        setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+        			    }
+        			}
+    			}
+    		}
+        }
+        
+        if (! $errorforline)
+        {
+            // Fees
+    		foreach ( $tabht[$key] as $k => $mt ) {
+    			$accountingaccount = new AccountingAccount($db);
+    			$accountingaccount->fetch(null, $k, true);
+    			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->doc_ref = $val["ref"];
+    					$bookkeeping->date_create = $now;
+    					$bookkeeping->doc_type = 'expense_report';
+    					$bookkeeping->fk_doc = $key;
+    					$bookkeeping->fk_docdet = $val["fk_expensereportdet"];
+    					$bookkeeping->code_tiers = '';
+    					$bookkeeping->label_compte = $accountingaccount->label;
+    					$bookkeeping->numero_compte = $k;
+    					$bookkeeping->montant = $mt;
+    					$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
+    					$bookkeeping->debit = ($mt > 0) ? $mt : 0;
+    					$bookkeeping->credit = ($mt <= 0) ? $mt : 0;
+    					$bookkeeping->code_journal = $conf->global->ACCOUNTING_EXPENSEREPORT_JOURNAL;
+    					$bookkeeping->fk_user_author = $user->id;
+    
+    					$result = $bookkeeping->create($user);
+	        			if ($result < 0) {
+            			    if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+            			    {
+            			        $error++;
+            			        $errorforline++;
+            			        //setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+            			    }
+            			    else
+            			    {
+            			        $error++;
+            			        $errorforline++;
+            			        setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+            			    }
+	        			}
+    				}
+    			}
+    		}
+        }
+        
+        if (! $errorforline)
+        {
+            // VAT
+    		// var_dump($tabtva);
+    		foreach ( $tabtva[$key] as $k => $mt ) {
+    			if ($mt) {
+    				// get compte id and label
+    				$bookkeeping = new BookKeeping($db);
+    				$bookkeeping->doc_date = $val["date"];
+    				$bookkeeping->doc_ref = $val["ref"];
+    				$bookkeeping->date_create = $now;
+    				$bookkeeping->doc_type = 'expense_report';
+    				$bookkeeping->fk_doc = $key;
+    				$bookkeeping->fk_docdet = $val["fk_expensereportdet"];
+    				$bookkeeping->code_tiers = '';
+    				$bookkeeping->label_compte = $langs->trans("VAT"). ' '.$def_tva[$key];
+    				$bookkeeping->numero_compte = $k;
+    				$bookkeeping->montant = $mt;
+    				$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
+    				$bookkeeping->debit = ($mt > 0) ? $mt : 0;
+    				$bookkeeping->credit = ($mt <= 0) ? $mt : 0;
+    				$bookkeeping->code_journal = $conf->global->ACCOUNTING_EXPENSEREPORT_JOURNAL;
+    				$bookkeeping->fk_user_author = $user->id;
+    
+    				$result = $bookkeeping->create($user);
+    				if ($result < 0) {
+           			    if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+        			    {
+        			        $error++;
+        			        $errorforline++;
+        			        //setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+        			    }
+        			    else
+        			    {
+        			        $error++;
+        			        $errorforline++;
+        			        setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+        			    }
+    				}
+    			}
+    		}
+        }
+        
 		if (! $errorforline)
 		{
-			foreach ( $tabttc[$key] as $k => $mt ) {
-				if ($mt) {
-					// get compte id and label
-					$bookkeeping = new BookKeeping($db);
-					$bookkeeping->doc_date = $val["date"];
-					$bookkeeping->doc_ref = $val["ref"];
-					$bookkeeping->date_create = $now;
-					$bookkeeping->doc_type = 'expense_report';
-					$bookkeeping->fk_doc = $key;
-					$bookkeeping->fk_docdet = $val["fk_expensereportdet"];
-					$bookkeeping->code_tiers = $tabuser[$key]['user_accountancy_code'];
-					$bookkeeping->label_compte = $tabuser[$key]['name'];
-					$bookkeeping->numero_compte = $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT;
-					$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;
-
-					$result = $bookkeeping->create($user);
-					if ($result < 0) {
-						if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
-						{
-							$error++;
-							$errorforline++;
-							//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-						}
-						else
-						{
-							$error++;
-							$errorforline++;
-							setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
-						}
-					}
-				}
-			}
-		}
-
-		if (! $errorforline)
-		{
-			// Fees
-			foreach ( $tabht[$key] as $k => $mt ) {
-				$accountingaccount = new AccountingAccount($db);
-				$accountingaccount->fetch(null, $k, true);
-				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->doc_ref = $val["ref"];
-						$bookkeeping->date_create = $now;
-						$bookkeeping->doc_type = 'expense_report';
-						$bookkeeping->fk_doc = $key;
-						$bookkeeping->fk_docdet = $val["fk_expensereportdet"];
-						$bookkeeping->code_tiers = '';
-						$bookkeeping->label_compte = $accountingaccount->label;
-						$bookkeeping->numero_compte = $k;
-						$bookkeeping->montant = $mt;
-						$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
-						$bookkeeping->debit = ($mt > 0) ? $mt : 0;
-						$bookkeeping->credit = ($mt <= 0) ? $mt : 0;
-						$bookkeeping->code_journal = $journal;
-						$bookkeeping->journal_label = $journal_label;
-						$bookkeeping->fk_user_author = $user->id;
-
-						$result = $bookkeeping->create($user);
-						if ($result < 0) {
-							if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
-							{
-								$error++;
-								$errorforline++;
-								//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-							}
-							else
-							{
-								$error++;
-								$errorforline++;
-								setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
-							}
-						}
-					}
-				}
-			}
-		}
-
-		if (! $errorforline)
-		{
-			// VAT
-			// var_dump($tabtva);
-			foreach ( $tabtva[$key] as $k => $mt ) {
-				if ($mt) {
-					// get compte id and label
-					$bookkeeping = new BookKeeping($db);
-					$bookkeeping->doc_date = $val["date"];
-					$bookkeeping->doc_ref = $val["ref"];
-					$bookkeeping->date_create = $now;
-					$bookkeeping->doc_type = 'expense_report';
-					$bookkeeping->fk_doc = $key;
-					$bookkeeping->fk_docdet = $val["fk_expensereportdet"];
-					$bookkeeping->code_tiers = '';
-					$bookkeeping->label_compte = $langs->trans("VAT"). ' '.$def_tva[$key];
-					$bookkeeping->numero_compte = $k;
-					$bookkeeping->montant = $mt;
-					$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
-					$bookkeeping->debit = ($mt > 0) ? $mt : 0;
-					$bookkeeping->credit = ($mt <= 0) ? $mt : 0;
-					$bookkeeping->code_journal = $journal;
-					$bookkeeping->journal_label = $journal_label;
-					$bookkeeping->fk_user_author = $user->id;
-
-					$result = $bookkeeping->create($user);
-					if ($result < 0) {
-						if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
-						{
-							$error++;
-							$errorforline++;
-							//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-						}
-						else
-						{
-							$error++;
-							$errorforline++;
-							setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
-						}
-					}
-				}
-			}
-		}
-
-		if (! $errorforline)
-		{
-			$db->commit();
+		    $db->commit();
 		}
 		else
 		{
-			$db->rollback();
+		    $db->rollback();
 		}
+		
 	}

 	if (empty($error) && count($tabpay)) {
-		setEventMessages($langs->trans("GeneralLedgerIsWritten"), null, 'mesgs');
+	    setEventMessages($langs->trans("GeneralLedgerIsWritten"), null, 'mesgs');
 	}
 	elseif (count($tabpay) == $error)
 	{
-		setEventMessages($langs->trans("NoNewRecordSaved"), null, 'warnings');
+	    setEventMessages($langs->trans("NoNewRecordSaved"), null, 'warnings');
 	}
 	else
 	{
-		setEventMessages($langs->trans("GeneralLedgerSomeRecordWasNotRecorded"), null, 'warnings');
+	    setEventMessages($langs->trans("GeneralLedgerSomeRecordWasNotRecorded"), null, 'warnings');
 	}

 	$action='';
@@ -331,8 +326,9 @@ $form = new Form($db);
 $userstatic = new User($db);

 // Export
-/*if ($action == 'export_csv') {
+if ($action == 'export_csv') {
 	$sep = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV;
+	$journal = $conf->global->ACCOUNTING_EXPENSEREPORT_JOURNAL;

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

@@ -437,13 +433,12 @@ $userstatic = new User($db);
 		}
 	}
 }
-*/

 if (empty($action) || $action == 'view') {

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

-	$nom = $langs->trans("ExpenseReportsJournal") . ' - ' . $accountingjournalstatic->getNomUrl(1);
+	$nom = $langs->trans("ExpenseReportsJournal");
 	$nomlink = '';
 	$periodlink = '';
 	$exportlink = '';
@@ -452,9 +447,7 @@ if (empty($action) || $action == 'view') {

 	$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);

-	$varlink = 'id_journal=' . $id_journal;
-
-	journalHead($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''), '', $varlink);
+	report_header($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''));

 	/*if ($conf->global->ACCOUNTING_EXPORT_MODELCSV != 1 && $conf->global->ACCOUNTING_EXPORT_MODELCSV != 2) {
 		print '<input type="button" class="butActionRefused" style="float: right;" value="' . $langs->trans("Export") . '" disabled="disabled" title="' . $langs->trans('ExportNotSupported') . '"/>';
@@ -462,10 +455,10 @@ if (empty($action) || $action == 'view') {
 		print '<input type="button" class="butAction" style="float: right;" value="' . $langs->trans("Export") . '" onclick="launch_export();" />';
 	}*/

-	print '<div class="tabsAction">';
+    print '<div class="tabsAction">';
 	print '<input type="button" class="butAction" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
-	print '</div>';
-
+    print '</div>';
+    
 	print '
 	<script type="text/javascript">
 		function launch_export() {
@@ -497,6 +490,7 @@ if (empty($action) || $action == 'view') {
 	print "<td align='right'>" . $langs->trans("Credit") . "</td>";
 	print "</tr>\n";

+	$var = true;
 	$r = '';

 	$expensereportstatic = new ExpenseReport($db);
@@ -515,7 +509,7 @@ if (empty($action) || $action == 'view') {
 			$accountingaccount->fetch(null, $k, true);

 			if ($mt) {
-				print '<tr class="oddeven">';
+				print "<tr " . $bc[$var] . " >";
 				print "<td><!-- Fees --></td>";
 				print "<td>" . $date . "</td>";
 				print "<td>" . $expensereportstatic->getNomUrl(1) . "</td>";
@@ -541,7 +535,7 @@ if (empty($action) || $action == 'view') {
 		// VAT
 		foreach ( $tabtva[$key] as $k => $mt ) {
 			if ($mt) {
-				print '<tr class="oddeven">';
+				print "<tr " . $bc[$var] . " >";
 				print "<td><!-- VAT --></td>";
 				print "<td>" . $date . "</td>";
 				print "<td>" . $expensereportstatic->getNomUrl(1) . "</td>";
@@ -562,9 +556,9 @@ if (empty($action) || $action == 'view') {

 		// Third party
 		foreach ( $tabttc[$key] as $k => $mt ) {
-			print '<tr class="oddeven">';
-			print "<td><!-- Thirdparty --></td>";
-			print "<td>" . $date . "</td>";
+		    print "<tr " . $bc[$var] . ">";
+		    print "<td><!-- Thirdparty --></td>";
+		    print "<td>" . $date . "</td>";
 			print "<td>" . $expensereportstatic->getNomUrl(1) . "</td>";
 			$userstatic->id = $tabuser[$key]['id'];
 			$userstatic->name = $tabuser[$key]['name'];
@@ -572,15 +566,17 @@ if (empty($action) || $action == 'view') {
 			$accountoshow = length_accounta($k);
 			if (empty($accountoshow) || $accountoshow == 'NotDefined')
 			{
-				print '<span class="error">'.$langs->trans("ThirdpartyAccountNotDefined").'</span>';
+			    print '<span class="error">'.$langs->trans("ThirdpartyAccountNotDefined").'</span>';
 			}
 			else print $accountoshow;
 			print "</td>";
 			print "<td>" . $userstatic->getNomUrl(0, 'user', 16) . ' - ' . $langs->trans("Code_tiers") . "</td>";
 			print '<td align="right">' . ($mt < 0 ? - price(- $mt) : '') . "</td>";
 			print '<td align="right">' . ($mt >= 0 ? price($mt) : '') . "</td>";
-			print "</tr>";
+		    print "</tr>";
 		}
+		
+		$var = ! $var;
 	}

 	print "</table>";
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.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@dolibarr.fr>
- * Copyright (C) 2013-2015  Alexandre Spangaro	<aspangaro@zendsi.com>
+/* Copyright (C) 2007-2010	Laurent Destailleur	<eldy@users.sourceforge.net>
+ * Copyright (C) 2007-2010	Jean Heimburger		<jean@tiaris.info>
+ * Copyright (C) 2011		Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2012		Regis Houssin		<regis@dolibarr.fr>
+ * Copyright (C) 2013-2015  Alexandre Spangaro	<aspangaro.dolibarr@gmail.com>
 * Copyright (C) 2013-2016  Olivier Geffroy		<jeff@jeffinfo.com>
- * Copyright (C) 2013-2016  Florian Henry		<florian.henry@open-concept.pro>
+ * 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
@@ -22,29 +22,28 @@
 */

 /**
- * \file		htdocs/accountancy/journal/purchasesjournal.php
- * \ingroup		Advanced accountancy
- * \brief		Page with purchases journal
+ * \file htdocs/accountancy/journal/purchasesjournal.php
+ * \ingroup Advanced accountancy
+ * \brief Page with purchases journal
 */
 require '../../main.inc.php';
+
+// Class
 require_once DOL_DOCUMENT_ROOT . '/core/lib/report.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
 require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture.class.php';
 require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.class.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/bookkeeping.class.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';

+// Langs
 $langs->load("compta");
 $langs->load("bills");
 $langs->load("other");
 $langs->load("main");
 $langs->load("accountancy");

-$id_journal = GETPOST('id_journal', 'int');
-$action = GETPOST('action','aZ09');
-
 $date_startmonth = GETPOST('date_startmonth');
 $date_startday = GETPOST('date_startday');
 $date_startyear = GETPOST('date_startyear');
@@ -58,16 +57,13 @@ $now = dol_now();
 if ($user->societe_id > 0)
 	accessforbidden();

+$action = GETPOST('action');
+
+
 /*
 * Actions
 */

-// Get informations of journal
-$accountingjournalstatic = new AccountingJournal($db);
-$accountingjournalstatic->fetch($id_journal);
-$journal = $accountingjournalstatic->code;
-$journal_label = $accountingjournalstatic->label;
-
 $year_current = strftime("%Y", dol_now());
 $pastmonth = strftime("%m", dol_now()) - 1;
 $pastmonthyear = $year_current;
@@ -100,7 +96,7 @@ $sql .= " JOIN " . MAIN_DB_PREFIX . "facture_fourn as f ON f.rowid = fd.fk_factu
 $sql .= " JOIN " . MAIN_DB_PREFIX . "societe as s ON s.rowid = f.fk_soc";
 $sql .= " WHERE f.fk_statut > 0 ";
 $sql .= " AND fd.fk_code_ventilation > 0 ";
-$sql .= " AND f.entity IN (" . getEntity('facture_fourn', 0) . ")";  // We don't share object for accountancy
+$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 (0,1,2)";
 else
@@ -152,11 +148,11 @@ if ($result) {
 		$tabfac[$obj->rowid]["type"] = $obj->type;
 		$tabfac[$obj->rowid]["description"] = $obj->description;
 		//$tabfac[$obj->rowid]["fk_facturefourndet"] = $obj->fdid;
-
-		// Avoid warnings
-		if (! isset($tabttc[$obj->rowid][$compta_soc])) $tabttc[$obj->rowid][$compta_soc] = 0;
-		if (! isset($tabht[$obj->rowid][$compta_prod])) $tabht[$obj->rowid][$compta_prod] = 0;
-		if (! isset($tabtva[$obj->rowid][$compta_tva])) $tabtva[$obj->rowid][$compta_tva] = 0;
+		
+        // Avoid warnings
+        if (! isset($tabttc[$obj->rowid][$compta_soc])) $tabttc[$obj->rowid][$compta_soc] = 0;
+        if (! isset($tabht[$obj->rowid][$compta_prod])) $tabht[$obj->rowid][$compta_prod] = 0;
+        if (! isset($tabtva[$obj->rowid][$compta_tva])) $tabtva[$obj->rowid][$compta_tva] = 0;

 		$tabttc[$obj->rowid][$compta_soc] += $obj->total_ttc;
 		$tabht[$obj->rowid][$compta_prod] += $obj->total_ht;
@@ -181,10 +177,10 @@ if ($action == 'writebookkeeping') {

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

@@ -202,161 +198,160 @@ if ($action == 'writebookkeeping') {
 		$companystatic->code_fournisseur = $tabcompany[$key]['code_fournisseur'];
 		$companystatic->client = $tabcompany[$key]['code_client'];

-		if (! $errorforline)
-		{
-			foreach ( $tabttc[$key] as $k => $mt ) {
-				// get compte id and label
-				if ($mt) {
-					$bookkeeping = new BookKeeping($db);
-					$bookkeeping->doc_date = $val["date"];
-					$bookkeeping->doc_ref = $val["ref"];
-					$bookkeeping->date_create = $now;
-					$bookkeeping->doc_type = 'supplier_invoice';
-					$bookkeeping->fk_doc = $key;
-					$bookkeeping->fk_docdet = 0;    // Useless, can be several lines that are source of this record to add
-					$bookkeeping->code_tiers = $tabcompany[$key]['code_fournisseur'];
-					$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("Code_tiers");
-					$bookkeeping->numero_compte = $tabcompany[$key]['code_compta_fournisseur'];
-					$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;
-
-					$result = $bookkeeping->create($user);
-					if ($result < 0) {
-						if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
-						{
-							$error++;
-							$errorforline++;
-							//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-						}
-						else
-						{
-							$error++;
-							$errorforline++;
-							setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
-						}
-					}
-				}
-			}
-		}
-
+        if (! $errorforline)
+        {
+    		foreach ( $tabttc[$key] as $k => $mt ) {
+    			// get compte id and label
+    		    if ($mt) {
+        			$bookkeeping = new BookKeeping($db);
+        			$bookkeeping->doc_date = $val["date"];
+        			$bookkeeping->doc_ref = $val["ref"];
+        			$bookkeeping->date_create = $now;
+        			$bookkeeping->doc_type = 'supplier_invoice';
+        			$bookkeeping->fk_doc = $key;
+        			$bookkeeping->fk_docdet = 0;    // Useless, can be several lines that are source of this record to add
+        			$bookkeeping->code_tiers = $tabcompany[$key]['code_fournisseur'];
+        			$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("Code_tiers");
+        			$bookkeeping->numero_compte = $tabcompany[$key]['code_compta_fournisseur'];
+        			$bookkeeping->montant = $mt;
+        			$bookkeeping->sens = ($mt >= 0) ? 'C' : 'D';
+        			$bookkeeping->debit = ($mt <= 0) ? $mt : 0;
+        			$bookkeeping->credit = ($mt > 0) ? $mt : 0;
+        			$bookkeeping->code_journal = $conf->global->ACCOUNTING_PURCHASE_JOURNAL;
+        			$bookkeeping->fk_user_author = $user->id;
+        
+        			$result = $bookkeeping->create($user);
+           			if ($result < 0) {
+                        if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+                        {
+                            $error++;
+                            $errorforline++;
+                            //setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+                        }
+                        else
+                        {
+                            $error++;
+                            $errorforline++;
+                            setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+                        }
+        			}
+    		    }
+    		}
+        }
+        
 		// Product / Service
-		if (! $errorforline)
-		{
-			foreach ( $tabht[$key] as $k => $mt ) {
-				$accountingaccount = new AccountingAccount($db);
-				$accountingaccount->fetch(null, $k, true);
-				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->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->code_tiers = '';
-						$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $accountingaccount->label;
-						$bookkeeping->numero_compte = $k;
-						$bookkeeping->montant = $mt;
-						$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
-						$bookkeeping->debit = ($mt > 0) ? $mt : 0;
-						$bookkeeping->credit = ($mt <= 0) ? $mt : 0;
-						$bookkeeping->code_journal = $journal;
-						$bookkeeping->journal_label = $journal_label;
-						$bookkeeping->fk_user_author = $user->id;
-
-						$result = $bookkeeping->create($user);
-						if ($result < 0) {
-							if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
-							{
-								$error++;
-								$errorforline++;
-								//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-							}
-							else
-							{
-								$error++;
-								$errorforline++;
-								setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
-							}
-						}
-					}
-				}
-			}
-		}
-
+        if (! $errorforline)
+        {
+            foreach ( $tabht[$key] as $k => $mt ) {
+    			$accountingaccount = new AccountingAccount($db);
+    			$accountingaccount->fetch(null, $k, true);
+    			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->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->code_tiers = '';
+    					$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $accountingaccount->label;
+    					$bookkeeping->numero_compte = $k;
+    					$bookkeeping->montant = $mt;
+    					$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
+    					$bookkeeping->debit = ($mt > 0) ? $mt : 0;
+    					$bookkeeping->credit = ($mt <= 0) ? $mt : 0;
+    					$bookkeeping->code_journal = $conf->global->ACCOUNTING_PURCHASE_JOURNAL;
+    					$bookkeeping->fk_user_author = $user->id;
+    
+    					$result = $bookkeeping->create($user);
+    					if ($result < 0) {
+    					    if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+            			    {
+            			        $error++;
+            			        $errorforline++;
+            			        //setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+            			    }
+            			    else
+            			    {
+            			        $error++;
+            			        $errorforline++;
+            			        setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+            			    }
+    					}
+    				}
+    			}
+    		}
+        }
+        
 		// VAT
 		// var_dump($tabtva);
-		if (! $errorforline)
-		{
-			foreach ( $tabtva[$key] as $k => $mt ) {
-				if ($mt) {
-					// get compte id and label
-					$bookkeeping = new BookKeeping($db);
-					$bookkeeping->doc_date = $val["date"];
-					$bookkeeping->doc_ref = $val["ref"];
-					$bookkeeping->date_create = $now;
-					$bookkeeping->doc_type = 'supplier_invoice';
-					$bookkeeping->fk_doc = $key;
-					$bookkeeping->fk_docdet = 0;    // Useless, can be several lines that are source of this record to add
-					$bookkeeping->code_tiers = '';
-					$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("VAT"). ' '.$def_tva[$key];
-					$bookkeeping->numero_compte = $k;
-					$bookkeeping->montant = $mt;
-					$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
-					$bookkeeping->debit = ($mt > 0) ? $mt : 0;
-					$bookkeeping->credit = ($mt <= 0) ? $mt : 0;
-					$bookkeeping->code_journal = $journal;
-					$bookkeeping->journal_label = $journal_label;
-					$bookkeeping->fk_user_author = $user->id;
-
-					$result = $bookkeeping->create($user);
-					if ($result < 0) {
-						if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
-						{
-							$error++;
-							$errorforline++;
-							//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-						}
-						else
-						{
-							$error++;
-							$errorforline++;
-							setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
-						}
-					}
-				}
-			}
-		}
+        if (! $errorforline)
+        {
+            foreach ( $tabtva[$key] as $k => $mt ) {
+    			if ($mt) {
+    				// get compte id and label
+    				$bookkeeping = new BookKeeping($db);
+    				$bookkeeping->doc_date = $val["date"];
+    				$bookkeeping->doc_ref = $val["ref"];
+    				$bookkeeping->date_create = $now;
+    				$bookkeeping->doc_type = 'supplier_invoice';
+    				$bookkeeping->fk_doc = $key;
+    				$bookkeeping->fk_docdet = 0;    // Useless, can be several lines that are source of this record to add
+    				$bookkeeping->code_tiers = '';
+    				$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("VAT"). ' '.$def_tva[$key];
+    				$bookkeeping->numero_compte = $k;
+    				$bookkeeping->montant = $mt;
+    				$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
+    				$bookkeeping->debit = ($mt > 0) ? $mt : 0;
+    				$bookkeeping->credit = ($mt <= 0) ? $mt : 0;
+    				$bookkeeping->code_journal = $conf->global->ACCOUNTING_PURCHASE_JOURNAL;
+    				$bookkeeping->fk_user_author = $user->id;
+    
+    				$result = $bookkeeping->create($user);
+    				if ($result < 0) {
+    				    if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+    				    {
+    				        $error++;
+    				        $errorforline++;
+    				        //setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+    				    }
+    				    else
+    				    {
+    				        $error++;
+    				        $errorforline++;
+    				        setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+    				    }
+    				}
+    			}
+    		}
+        }

 		if (! $errorforline)
 		{
-			$db->commit();
+		    $db->commit();
 		}
 		else
 		{
-			$db->rollback();
+		    $db->rollback();
 		}
+		
 	}

 	if (empty($error) && count($tabpay)) {
-		setEventMessages($langs->trans("GeneralLedgerIsWritten"), null, 'mesgs');
+	    setEventMessages($langs->trans("GeneralLedgerIsWritten"), null, 'mesgs');
 	}
 	elseif (count($tabpay) == $error)
 	{
-		setEventMessages($langs->trans("NoNewRecordSaved"), null, 'warnings');
+	    setEventMessages($langs->trans("NoNewRecordSaved"), null, 'warnings');
 	}
 	else
 	{
-		setEventMessages($langs->trans("GeneralLedgerSomeRecordWasNotRecorded"), null, 'warnings');
+	    setEventMessages($langs->trans("GeneralLedgerSomeRecordWasNotRecorded"), null, 'warnings');
 	}
+	
 	$action='';
 }

@@ -369,7 +364,7 @@ $form = new Form($db);
 $companystatic = new Fournisseur($db);

 // Export
-/*if ($action == 'export_csv') {
+if ($action == 'export_csv') {
 	$sep = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV;
 	$journal = $conf->global->ACCOUNTING_PURCHASE_JOURNAL;

@@ -487,13 +482,12 @@ $companystatic = new Fournisseur($db);
 		}
 	}
 }
-*/

 if (empty($action) || $action == 'view') {

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

-	$nom = $langs->trans("PurchasesJournal") . ' - ' . $accountingjournalstatic->getNomUrl(1);
+	$nom = $langs->trans("PurchasesJournal");
 	$nomlink = '';
 	$periodlink = '';
 	$exportlink = '';
@@ -507,10 +501,8 @@ if (empty($action) || $action == 'view') {
 	}

 	$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);
-
-	$varlink = 'id_journal=' . $id_journal;
-
-	journalHead($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''), '', $varlink);
+	
+	report_header($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''));

 	/*if ($conf->global->ACCOUNTING_EXPORT_MODELCSV != 1 && $conf->global->ACCOUNTING_EXPORT_MODELCSV != 2) {
 		print '<input type="button" class="butActionRefused" style="float: right;" value="' . $langs->trans("Export") . '" disabled="disabled" title="' . $langs->trans('ExportNotSupported') . '"/>';
@@ -518,21 +510,21 @@ if (empty($action) || $action == 'view') {
 		print '<input type="button" class="butAction" style="float: right;" value="' . $langs->trans("Export") . '" onclick="launch_export();" />';
 	}*/

-	print '<div class="tabsAction">';
+    print '<div class="tabsAction">';
 	print '<input type="button" class="butAction" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
-	print '</div>';
-
+    print '</div>';
+    
 	print '
 	<script type="text/javascript">
 		function launch_export() {
-			$("div.fiche div.tabBar form input[name=\"action\"]").val("export_csv");
+		    $("div.fiche div.tabBar form input[name=\"action\"]").val("export_csv");
 			$("div.fiche div.tabBar form input[type=\"submit\"]").click();
-			$("div.fiche div.tabBar form input[name=\"action\"]").val("");
+		    $("div.fiche div.tabBar form input[name=\"action\"]").val("");
 		}
 		function writebookkeeping() {
-			$("div.fiche div.tabBar form input[name=\"action\"]").val("writebookkeeping");
+		    $("div.fiche div.tabBar form input[name=\"action\"]").val("writebookkeeping");
 			$("div.fiche div.tabBar form input[type=\"submit\"]").click();
-			$("div.fiche div.tabBar form input[name=\"action\"]").val("");
+		    $("div.fiche div.tabBar form input[name=\"action\"]").val("");
 		}
 	</script>';

@@ -544,13 +536,12 @@ if (empty($action) || $action == 'view') {
 	$i = 0;
 	print "<table class=\"noborder\" width=\"100%\">";
 	print "<tr class=\"liste_titre\">";
+	// /print "<td>".$langs->trans("JournalNum")."</td>";
 	print "<td></td>";
 	print "<td>" . $langs->trans("Date") . "</td>";
 	print "<td>" . $langs->trans("Piece") . ' (' . $langs->trans("InvoiceRef") . ")</td>";
 	print "<td>" . $langs->trans("AccountAccounting") . "</td>";
-	print "<td>" . $langs->trans("Type") . "</td>";
-	print "<td align='right'>" . $langs->trans("Debit") . "</td>";
-	print "<td align='right'>" . $langs->trans("Credit") . "</td>";
+	print "<t><td>" . $langs->trans("Type") . "</td><td align='right'>" . $langs->trans("Debit") . "</td><td align='right'>" . $langs->trans("Credit") . "</td>";
 	print "</tr>\n";

 	$r = '';
@@ -575,17 +566,17 @@ if (empty($action) || $action == 'view') {
 			$accountingaccount->fetch(null, $k, true);

 			if ($mt) {
-				print '<tr class="oddeven">';
+				print "<tr " . $bc[$var] . " >";
 				print "<td><!-- Product --></td>";
 				print "<td>" . $date . "</td>";
 				print "<td>" . $invoicestatic->getNomUrl(1) . "</td>";
 				print "<td>";
-				$accountoshow = length_accountg($k);
-				if (empty($accountoshow) || $accountoshow == 'NotDefined')
-				{
-					print '<span class="error">'.$langs->trans("ProductAccountNotDefined").'</span>';
-				}
-				else print $accountoshow;
+    			$accountoshow = length_accountg($k);
+    			if (empty($accountoshow) || $accountoshow == 'NotDefined')
+    			{
+    			    print '<span class="error">'.$langs->trans("ProductAccountNotDefined").'</span>';
+    			}
+    			else print $accountoshow;
 				print "</td>";
 				$companystatic->id = $tabcompany[$key]['id'];
 				$companystatic->name = $tabcompany[$key]['name'];
@@ -596,21 +587,20 @@ if (empty($action) || $action == 'view') {
 				print "</tr>";
 			}
 		}
-
 		// VAT
 		foreach ( $tabtva[$key] as $k => $mt ) {
 			if ($mt) {
-				print '<tr class="oddeven">';
+				print "<tr " . $bc[$var] . " >";
 				print "<td><!-- VAT --></td>";
 				print "<td>" . $date . "</td>";
 				print "<td>" . $invoicestatic->getNomUrl(1) . "</td>";
 				print "<td>";
-				$accountoshow = length_accountg($k);
-				if (empty($accountoshow) || $accountoshow == 'NotDefined')
-				{
-					print '<span class="error">'.$langs->trans("VatAccountNotDefined").'</span>';
-				}
-				else print $accountoshow;
+    			$accountoshow = length_accountg($k);
+    			if (empty($accountoshow) || $accountoshow == 'NotDefined')
+    			{
+    			    print '<span class="error">'.$langs->trans("VatAccountNotDefined").'</span>';
+    			}
+    			else print $accountoshow;
 				print "</td>";
 				print "<td>" . $companystatic->getNomUrl(0, 'supplier', 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("VAT"). ' '.$def_tva[$key]. "</td>";
 				print '<td align="right">' . ($mt >= 0 ? price($mt) : '') . "</td>";
@@ -621,9 +611,9 @@ if (empty($action) || $action == 'view') {

 		// Third party
 		foreach ( $tabttc[$key] as $k => $mt ) {
-			print '<tr class="oddeven">';
-			print "<td><!-- Thirdparty --></td>";
-			print "<td>" . $date . "</td>";
+		    print "<tr " . $bc[$var] . ">";
+		    print "<td><!-- Thirdparty --></td>";
+		    print "<td>" . $date . "</td>";
 			print "<td>" . $invoicestatic->getNomUrl(1) . "</td>";
 			$companystatic->id = $tabcompany[$key]['id'];
 			$companystatic->name = $tabcompany[$key]['name'];
@@ -631,10 +621,10 @@ if (empty($action) || $action == 'view') {
 			$accountoshow = length_accounta($k);
 			if (empty($accountoshow) || $accountoshow == 'NotDefined')
 			{
-				print '<span class="error">'.$langs->trans("ThirdpartyAccountNotDefined").'</span>';
+			    print '<span class="error">'.$langs->trans("ThirdpartyAccountNotDefined").'</span>';
 			}
 			else print $accountoshow;
-			print "</td>";
+            print "</td>";
 			print "<td>" . $companystatic->getNomUrl(0, 'supplier', 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("Code_tiers") . "</td>";
 			// print "</td><td>" . $langs->trans("ThirdParty");
 			// print ' (' . $companystatic->getNomUrl(0, 'supplier', 16) . ')';
@@ -643,6 +633,8 @@ if (empty($action) || $action == 'view') {
 			print '<td align="right">' . ($mt >= 0 ? price($mt) : '') . "</td>";
 		    print "</tr>";
 		}
+		
+		$var = ! $var;
 	}

 	print "</table>";
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -1,13 +1,13 @@
 <?php
-/* Copyright (C) 2007-2010  Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2007-2010  Jean Heimburger			<jean@tiaris.info>
- * Copyright (C) 2011	   Juanjo Menent			<jmenent@2byte.es>
- * Copyright (C) 2012	   Regis Houssin			<regis@dolibarr.fr>
- * Copyright (C) 2013	   Christophe Battarel		<christophe.battarel@altairis.fr>
- * Copyright (C) 2013-2017  Alexandre Spangaro		<aspangaro@zendsi.com>
- * Copyright (C) 2013-2016  Florian Henry			<florian.henry@open-concept.pro>
- * Copyright (C) 2013-2016  Olivier Geffroy			<jeff@jeffinfo.com>
- * Copyright (C) 2014	   Raphaël Doursenaud		<rdoursenaud@gpcsolutions.fr>
+/* Copyright (C) 2007-2010	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2007-2010	Jean Heimburger			<jean@tiaris.info>
+ * Copyright (C) 2011		Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2012		Regis Houssin			<regis@dolibarr.fr>
+ * Copyright (C) 2013		Christophe Battarel		<christophe.battarel@altairis.fr>
+ * Copyright (C) 2013-2016	Alexandre Spangaro		<aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2013-2016	Florian Henry			<florian.henry@open-concept.pro>
+ * Copyright (C) 2013-2016	Olivier Geffroy			<jeff@jeffinfo.com>
+ * Copyright (C) 2014		Raphaël Doursenaud		<rdoursenaud@gpcsolutions.fr>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -29,15 +29,17 @@
 * \brief		Page with sells journal
 */
 require '../../main.inc.php';
+
+// Class
 require_once DOL_DOCUMENT_ROOT . '/core/lib/report.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
 require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT . '/societe/class/client.class.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/bookkeeping.class.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';

+// Langs
 $langs->load("commercial");
 $langs->load("compta");
 $langs->load("bills");
@@ -45,9 +47,6 @@ $langs->load("other");
 $langs->load("main");
 $langs->load("accountancy");

-$id_journal = GETPOST('id_journal', 'int');
-$action = GETPOST('action','aZ09');
-
 $date_startmonth = GETPOST('date_startmonth');
 $date_startday = GETPOST('date_startday');
 $date_startyear = GETPOST('date_startyear');
@@ -61,23 +60,19 @@ $now = dol_now();
 if ($user->societe_id > 0)
 	accessforbidden();

+$action = GETPOST('action');
+

 /*
 * Actions
 */

-// Get informations of journal
-$accountingjournalstatic = new AccountingJournal($db);
-$accountingjournalstatic->fetch($id_journal);
-$journal = $accountingjournalstatic->code;
-$journal_label = $accountingjournalstatic->label;
-
 $year_current = strftime("%Y", dol_now());
 $pastmonth = strftime("%m", dol_now()) - 1;
 $pastmonthyear = $year_current;
 if ($pastmonth == 0) {
-	$pastmonth = 12;
-	$pastmonthyear --;
+    $pastmonth = 12;
+    $pastmonthyear --;
 }

 $date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear);
@@ -85,8 +80,8 @@ $date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear);

 if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 {
-	$date_start = dol_get_first_day($pastmonthyear, $pastmonth, false);
-	$date_end = dol_get_last_day($pastmonthyear, $pastmonth, false);
+    $date_start = dol_get_first_day($pastmonthyear, $pastmonth, false);
+    $date_end = dol_get_last_day($pastmonthyear, $pastmonth, false);
 }

 $p = explode(":", $conf->global->MAIN_INFO_SOCIETE_COUNTRY);
@@ -104,277 +99,274 @@ $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.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
+$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 . ")";
+    $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_STANDARD . "," . 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 fd.product_type IN (0,1)";
 if ($date_start && $date_end)
-	$sql .= " AND f.datef >= '" . $db->idate($date_start) . "' AND f.datef <= '" . $db->idate($date_end) . "'";
+    $sql .= " AND f.datef >= '" . $db->idate($date_start) . "' AND f.datef <= '" . $db->idate($date_end) . "'";
 $sql .= " ORDER BY f.datef";

 dol_syslog('accountancy/journal/sellsjournal.php', LOG_DEBUG);
 $result = $db->query($sql);
 if ($result) {
-	$tabfac = array ();
-	$tabht = array ();
-	$tabtva = array ();
-	$def_tva = array ();
-	$tabttc = array ();
-	$tabcompany = array ();
+    $tabfac = array ();
+    $tabht = array ();
+    $tabtva = array ();
+    $def_tva = array ();
+    $tabttc = array ();
+    $tabcompany = array ();

-	$num = $db->num_rows($result);
-	$i = 0;
+    $num = $db->num_rows($result);
+    $i = 0;

-	$cptcli = (! empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER)) ? $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER : $langs->trans("CodeNotDef");
+    $cptcli = (! empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER)) ? $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER : $langs->trans("CodeNotDef");
+    
+    while ( $i < $num ) {
+        $obj = $db->fetch_object($result);
+        
+        // les variables
+        $compta_soc = (! empty($obj->code_compta)) ? $obj->code_compta : $cptcli;

-	while ( $i < $num ) {
-		$obj = $db->fetch_object($result);
-
-		// les variables
-		$compta_soc = (! empty($obj->code_compta)) ? $obj->code_compta : $cptcli;
-
-		$compta_prod = $obj->compte;
-		if (empty($compta_prod)) {
-			if ($obj->product_type == 0)
-				$compta_prod = (! empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT)) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : $langs->trans("CodeNotDef");
-				else
-					$compta_prod = (! empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT)) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : $langs->trans("CodeNotDef");
-		}
-		$cpttva = (! empty($conf->global->ACCOUNTING_VAT_SOLD_ACCOUNT)) ? $conf->global->ACCOUNTING_VAT_SOLD_ACCOUNT : $langs->trans("CodeNotDef");
-		$compta_tva = (! empty($obj->account_tva) ? $obj->account_tva : $cpttva);
+        $compta_prod = $obj->compte;
+        if (empty($compta_prod)) {
+            if ($obj->product_type == 0)
+                $compta_prod = (! empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT)) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : $langs->trans("CodeNotDef");
+                else
+                    $compta_prod = (! empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT)) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : $langs->trans("CodeNotDef");
+        }
+        $cpttva = (! empty($conf->global->ACCOUNTING_VAT_SOLD_ACCOUNT)) ? $conf->global->ACCOUNTING_VAT_SOLD_ACCOUNT : $langs->trans("CodeNotDef");
+        $compta_tva = (! empty($obj->account_tva) ? $obj->account_tva : $cpttva);


-		//Define array for display vat tx
-		$def_tva[$obj->rowid]=price($obj->tva_tx);
+        //Define array for display vat tx
+        $def_tva[$obj->rowid]=price($obj->tva_tx);

-		// Situation invoices handling
-		$line = new FactureLigne($db);
-		$line->fetch($obj->fdid);
-		$prev_progress = $line->get_prev_progress($obj->fdid);
-		if ($obj->type == Facture::TYPE_SITUATION) {
-			// Avoid divide by 0
-			if ($obj->situation_percent == 0) {
-				$situation_ratio = 0;
-			} else {
-				$situation_ratio = ($obj->situation_percent - $prev_progress) / $obj->situation_percent;
-			}
-		} else {
-			$situation_ratio = 1;
-		}
+        // Situation invoices handling
+        $line = new FactureLigne($db);
+        $line->fetch($obj->fdid);
+        $prev_progress = $line->get_prev_progress($obj->fdid);
+        if ($obj->type == Facture::TYPE_SITUATION) {
+            // Avoid divide by 0
+            if ($obj->situation_percent == 0) {
+                $situation_ratio = 0;
+            } else {
+                $situation_ratio = ($obj->situation_percent - $prev_progress) / $obj->situation_percent;
+            }
+        } else {
+            $situation_ratio = 1;
+        }

-		// Invoice lines
-		$tabfac[$obj->rowid]["date"] = $db->jdate($obj->df);
-		$tabfac[$obj->rowid]["ref"] = $obj->facnumber;
-		$tabfac[$obj->rowid]["type"] = $obj->type;
-		$tabfac[$obj->rowid]["description"] = $obj->label_compte;
-		//$tabfac[$obj->rowid]["fk_facturedet"] = $obj->fdid;
+        // Invoice lines
+        $tabfac[$obj->rowid]["date"] = $db->jdate($obj->df);
+        $tabfac[$obj->rowid]["ref"] = $obj->facnumber;
+        $tabfac[$obj->rowid]["type"] = $obj->type;
+        $tabfac[$obj->rowid]["description"] = $obj->label_compte;
+        //$tabfac[$obj->rowid]["fk_facturedet"] = $obj->fdid;
+       
+        // Avoid warnings
+        if (! isset($tabttc[$obj->rowid][$compta_soc])) $tabttc[$obj->rowid][$compta_soc] = 0;
+        if (! isset($tabht[$obj->rowid][$compta_prod])) $tabht[$obj->rowid][$compta_prod] = 0;
+        if (! isset($tabtva[$obj->rowid][$compta_tva])) $tabtva[$obj->rowid][$compta_tva] = 0;

-		// Avoid warnings
-		if (! isset($tabttc[$obj->rowid][$compta_soc])) $tabttc[$obj->rowid][$compta_soc] = 0;
-		if (! isset($tabht[$obj->rowid][$compta_prod])) $tabht[$obj->rowid][$compta_prod] = 0;
-		if (! isset($tabtva[$obj->rowid][$compta_tva])) $tabtva[$obj->rowid][$compta_tva] = 0;
+        $tabttc[$obj->rowid][$compta_soc] += $obj->total_ttc * $situation_ratio;
+        $tabht[$obj->rowid][$compta_prod] += $obj->total_ht * $situation_ratio;
+        $tabtva[$obj->rowid][$compta_tva] += $obj->total_tva * $situation_ratio;
+        $tabcompany[$obj->rowid] = array (
+            'id' => $obj->socid,
+            'name' => $obj->name,
+            'code_client' => $obj->code_client,
+            'code_compta' => $compta_soc
+        );

-		$tabttc[$obj->rowid][$compta_soc] += $obj->total_ttc * $situation_ratio;
-		$tabht[$obj->rowid][$compta_prod] += $obj->total_ht * $situation_ratio;
-		$tabtva[$obj->rowid][$compta_tva] += $obj->total_tva * $situation_ratio;
-		$tabcompany[$obj->rowid] = array (
-			'id' => $obj->socid,
-			'name' => $obj->name,
-			'code_client' => $obj->code_client,
-			'code_compta' => $compta_soc
-		);
-
-		$i ++;
-	}
+        $i ++;
+    }
 } else {
-	dol_print_error($db);
+    dol_print_error($db);
 }

 // Bookkeeping Write
 if ($action == 'writebookkeeping') {
-	$now = dol_now();
-	$error = 0;
+    $now = dol_now();
+    $error = 0;

-	foreach ( $tabfac as $key => $val ) {   // Loop on each invoice
+    foreach ( $tabfac as $key => $val ) {   // Loop on each invoice
+         
+        $errorforline = 0;

-		$errorforline = 0;
+        $db->begin();

-		$db->begin();
+        $companystatic = new Societe($db);
+        $invoicestatic = new Facture($db);

-		$companystatic = new Societe($db);
-		$invoicestatic = new Facture($db);
-
-		$companystatic->id = $tabcompany[$key]['id'];
-		$companystatic->name = $tabcompany[$key]['name'];
+        $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 = $tabcompany[$key]['code_client'];
+        $companystatic->client = $tabcompany[$key]['code_client'];

-		$invoicestatic->id = $key;
-		$invoicestatic->ref = (string) $val["ref"];
+        $invoicestatic->id = $key;
+        $invoicestatic->ref = (string) $val["ref"];

-		// Thirdparty
-		if (! $errorforline)
-		{
-			foreach ( $tabttc[$key] as $k => $mt ) {
-				if ($mt) {
-					$bookkeeping = new BookKeeping($db);
-					$bookkeeping->doc_date = $val["date"];
-					$bookkeeping->doc_ref = $val["ref"];
-					$bookkeeping->date_create = $now;
-					$bookkeeping->doc_type = 'customer_invoice';
-					$bookkeeping->fk_doc = $key;
-					$bookkeeping->fk_docdet = 0;	// Useless, can be several lines that are source of this record to add
-					$bookkeeping->code_tiers = $tabcompany[$key]['code_client'];
-					$bookkeeping->numero_compte = $tabcompany[$key]['code_compta'];
-					// $bookkeeping->label_compte = $tabcompany[$key]['name'];
-					$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("Code_tiers");
-					$bookkeeping->montant = $mt;
-					$bookkeeping->sens = ($mt >= 0) ? 'D' : 'C';
-					$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;
+        // Thirdparty
+        if (! $errorforline)
+        {
+            foreach ( $tabttc[$key] as $k => $mt ) {
+                if ($mt) {
+                    $bookkeeping = new BookKeeping($db);
+                    $bookkeeping->doc_date = $val["date"];
+                    $bookkeeping->doc_ref = $val["ref"];
+                    $bookkeeping->date_create = $now;
+                    $bookkeeping->doc_type = 'customer_invoice';
+                    $bookkeeping->fk_doc = $key;
+                    $bookkeeping->fk_docdet = 0;    // Useless, can be several lines that are source of this record to add
+                    $bookkeeping->code_tiers = $tabcompany[$key]['code_client'];
+                    $bookkeeping->numero_compte = $tabcompany[$key]['code_compta'];
+                    // $bookkeeping->label_compte = $tabcompany[$key]['name'];
+                    $bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("Code_tiers");
+                    $bookkeeping->montant = $mt;
+                    $bookkeeping->sens = ($mt >= 0) ? 'D' : 'C';
+                    $bookkeeping->debit = ($mt >= 0) ? $mt : 0;
+                    $bookkeeping->credit = ($mt < 0) ? $mt : 0;
+                    $bookkeeping->code_journal = $conf->global->ACCOUNTING_SELL_JOURNAL;
+                    $bookkeeping->fk_user_author = $user->id;
+    
+                    $result = $bookkeeping->create($user);
+           			if ($result < 0) {
+                        if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+                        {
+                            $error++;
+                            $errorforline++;
+                            //setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+                        }
+                        else
+                        {
+                            $error++;
+                            $errorforline++;
+                            setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+                        }
+        			}
+                }
+            }
+        }
+        
+        // Product / Service
+        if (! $errorforline)
+        {
+            foreach ( $tabht[$key] as $k => $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->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->code_tiers = '';
+                        $bookkeeping->numero_compte = $k;
+                        $bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $accountingaccount->label;
+                        $bookkeeping->montant = $mt;
+                        $bookkeeping->sens = ($mt < 0) ? 'D' : 'C';
+                        $bookkeeping->debit = ($mt < 0) ? $mt : 0;
+                        $bookkeeping->credit = ($mt >= 0) ? $mt : 0;
+                        $bookkeeping->code_journal = $conf->global->ACCOUNTING_SELL_JOURNAL;
+                        $bookkeeping->fk_user_author = $user->id;
+    
+                        $result = $bookkeeping->create($user);
+            			if ($result < 0) {
+                            if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+                            {
+                                $error++;
+                                $errorforline++;
+                                //setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+                            }
+                            else
+                            {
+                                $error++;
+                                $errorforline++;
+                                setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+                            }
+            			}                        
+                    }
+                }
+            }
+        }
+        
+        // VAT
+        // var_dump($tabtva);
+        if (! $errorforline)
+        {
+            foreach ( $tabtva[$key] as $k => $mt ) {
+                if ($mt) {
+                    $bookkeeping = new BookKeeping($db);
+                    $bookkeeping->doc_date = $val["date"];
+                    $bookkeeping->doc_ref = $val["ref"];
+                    $bookkeeping->date_create = $now;
+                    $bookkeeping->doc_type = 'customer_invoice';
+                    $bookkeeping->fk_doc = $key;
+                    $bookkeeping->fk_docdet = 0;    // Useless, can be several lines that are source of this record to add
+                    $bookkeeping->code_tiers = '';
+                    $bookkeeping->numero_compte = $k;
+                    $bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("VAT").' '.$def_tva[$key];
+                    $bookkeeping->montant = $mt;
+                    $bookkeeping->sens = ($mt < 0) ? 'D' : 'C';
+                    $bookkeeping->debit = ($mt < 0) ? $mt : 0;
+                    $bookkeeping->credit = ($mt >= 0) ? $mt : 0;
+                    $bookkeeping->code_journal = $conf->global->ACCOUNTING_SELL_JOURNAL;
+                    $bookkeeping->fk_user_author = $user->id;
+    
+                    $result = $bookkeeping->create($user);
+                    if ($result < 0) {
+           			    if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+        			    {
+        			        $error++;
+        			        $errorforline++;
+        			        //setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+        			    }
+        			    else
+        			    {
+        			        $error++;
+        			        $errorforline++;
+        			        setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+        			    }
+                    }
+                }
+            }
+        }

-					$result = $bookkeeping->create($user);
-					if ($result < 0) {
-						if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
-						{
-							$error++;
-							$errorforline++;
-							//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-						}
-						else
-						{
-							$error++;
-							$errorforline++;
-							setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
-						}
-					}
-				}
-			}
-		}
+        if (! $errorforline)
+        {
+            $db->commit();
+        }
+        else
+        {
+            $db->rollback();
+        }

-		// Product / Service
-		if (! $errorforline)
-		{
-			foreach ( $tabht[$key] as $k => $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->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->code_tiers = '';
-						$bookkeeping->numero_compte = $k;
-						$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $accountingaccount->label;
-						$bookkeeping->montant = $mt;
-						$bookkeeping->sens = ($mt < 0) ? 'D' : 'C';
-						$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;
+    }

-						$result = $bookkeeping->create($user);
-						if ($result < 0) {
-							if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
-							{
-								$error++;
-								$errorforline++;
-								//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-							}
-							else
-							{
-								$error++;
-								$errorforline++;
-								setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
-							}
-						}
-					}
-				}
-			}
-		}
-
-		// VAT
-		// var_dump($tabtva);
-		if (! $errorforline)
-		{
-			foreach ( $tabtva[$key] as $k => $mt ) {
-				if ($mt) {
-					$bookkeeping = new BookKeeping($db);
-					$bookkeeping->doc_date = $val["date"];
-					$bookkeeping->doc_ref = $val["ref"];
-					$bookkeeping->date_create = $now;
-					$bookkeeping->doc_type = 'customer_invoice';
-					$bookkeeping->fk_doc = $key;
-					$bookkeeping->fk_docdet = 0;	// Useless, can be several lines that are source of this record to add
-					$bookkeeping->code_tiers = '';
-					$bookkeeping->numero_compte = $k;
-					$bookkeeping->label_compte = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("VAT").' '.$def_tva[$key];
-					$bookkeeping->montant = $mt;
-					$bookkeeping->sens = ($mt < 0) ? 'D' : 'C';
-					$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;
-
-					$result = $bookkeeping->create($user);
-					if ($result < 0) {
-		   				if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
-						{
-							$error++;
-							$errorforline++;
-							//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->doc_ref.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-						}
-						else
-						{
-							$error++;
-							$errorforline++;
-							setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
-						}
-					}
-				}
-			}
-		}
-
-		if (! $errorforline)
-		{
-			$db->commit();
-		}
-		else
-		{
-			$db->rollback();
-		}
-
-	}
-
-	if (empty($error) && count($tabpay) > 0) {
-		setEventMessages($langs->trans("GeneralLedgerIsWritten"), null, 'mesgs');
-	}
-	elseif (count($tabpay) == $error)
-	{
-		setEventMessages($langs->trans("NoNewRecordSaved"), null, 'warnings');
-	}
-	else
-	{
-		setEventMessages($langs->trans("GeneralLedgerSomeRecordWasNotRecorded"), null, 'warnings');
-	}
-	
-	$action='';
+    if (empty($error) && count($tabpay) > 0) {
+        setEventMessages($langs->trans("GeneralLedgerIsWritten"), null, 'mesgs');
+    }
+    elseif (count($tabpay) == $error)
+    {
+        setEventMessages($langs->trans("NoNewRecordSaved"), null, 'warnings');
+    }
+    else
+    {
+        setEventMessages($langs->trans("GeneralLedgerSomeRecordWasNotRecorded"), null, 'warnings');
+    }
+    
+    $action='';
 }


@@ -386,134 +378,133 @@ if ($action == 'writebookkeeping') {
 $form = new Form($db);

 // Export
-/*if ($action == 'export_csv') {
+if ($action == 'export_csv') {

-	$sep = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV;
-	$sell_journal = $conf->global->ACCOUNTING_SELL_JOURNAL;
+    $sep = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV;
+    $sell_journal = $conf->global->ACCOUNTING_SELL_JOURNAL;

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

-	$companystatic = new Client($db);
+    $companystatic = new Client($db);

-	// Model Cegid Expert Export
-	if ($conf->global->ACCOUNTING_EXPORT_MODELCSV == 2) {
-		$sep = ";";
+    // Model Cegid Expert Export
+    if ($conf->global->ACCOUNTING_EXPORT_MODELCSV == 2) {
+        $sep = ";";

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

-			$invoicestatic->id = $key;
-			$invoicestatic->ref = $val["ref"];
+            $invoicestatic->id = $key;
+            $invoicestatic->ref = $val["ref"];

-			$date = dol_print_date($val["date"], '%d%m%Y');
+            $date = dol_print_date($val["date"], '%d%m%Y');

-			foreach ( $tabttc[$key] as $k => $mt ) {
-				print $date . $sep;
-				print $sell_journal . $sep;
-				print length_accountg($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER) . $sep;
-				print length_accounta(html_entity_decode($k)) . $sep;
-				print ($mt < 0 ? 'C' : 'D') . $sep;
-				print ($mt <= 0 ? price(- $mt) : $mt) . $sep;
-				print dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("Code_tiers") . $sep;
-				print $val["ref"];
-				print "\n";
-			}
+            foreach ( $tabttc[$key] as $k => $mt ) {
+                print $date . $sep;
+                print $sell_journal . $sep;
+                print length_accountg($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER) . $sep;
+                print length_accounta(html_entity_decode($k)) . $sep;
+                print ($mt < 0 ? 'C' : 'D') . $sep;
+                print ($mt <= 0 ? price(- $mt) : $mt) . $sep;
+                print dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("Code_tiers") . $sep;
+                print $val["ref"];
+                print "\n";
+            }

-			// Product / Service
-			foreach ( $tabht[$key] as $k => $mt ) {
-				$accountingaccount_static = new AccountingAccount($db);
-				if ($accountingaccount_static->fetch(null, $k, true)) {
-					print $date . $sep;
-					print $sell_journal . $sep;
-					print length_accountg(html_entity_decode($k)) . $sep;
-					print $sep;
-					print ($mt < 0 ? 'D' : 'C') . $sep;
-					print ($mt <= 0 ? price(- $mt) : $mt) . $sep;
-					print dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $accountingaccount_static->label . $sep;
-					print $val["ref"];
-					print "\n";
-				}
-			}
+            // Product / Service
+            foreach ( $tabht[$key] as $k => $mt ) {
+                $accountingaccount_static = new AccountingAccount($db);
+                if ($accountingaccount_static->fetch(null, $k, true)) {
+                    print $date . $sep;
+                    print $sell_journal . $sep;
+                    print length_accountg(html_entity_decode($k)) . $sep;
+                    print $sep;
+                    print ($mt < 0 ? 'D' : 'C') . $sep;
+                    print ($mt <= 0 ? price(- $mt) : $mt) . $sep;
+                    print dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $accountingaccount_static->label . $sep;
+                    print $val["ref"];
+                    print "\n";
+                }
+            }

-			// TVA
-			foreach ( $tabtva[$key] as $k => $mt ) {
-				if ($mt) {
-					print $date . $sep;
-					print $sell_journal . $sep;
-					print length_accountg(html_entity_decode($k)) . $sep;
-					print $sep;
-					print ($mt < 0 ? 'D' : 'C') . $sep;
-					print ($mt <= 0 ? price(- $mt) : $mt) . $sep;
-					print dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("VAT") . $sep;
-					// print $langs->trans("VAT") . $sep;
-					print $val["ref"];
-					print "\n";
-				}
-			}
-		}
-	} elseif ($conf->global->ACCOUNTING_EXPORT_MODELCSV == 1) {
-		// Model Classic Export
-		foreach ( $tabfac as $key => $val ) {
-			$companystatic->id = $tabcompany[$key]['id'];
-			$companystatic->name = $tabcompany[$key]['name'];
-			$companystatic->client = $tabcompany[$key]['code_client'];
+            // TVA
+            foreach ( $tabtva[$key] as $k => $mt ) {
+                if ($mt) {
+                    print $date . $sep;
+                    print $sell_journal . $sep;
+                    print length_accountg(html_entity_decode($k)) . $sep;
+                    print $sep;
+                    print ($mt < 0 ? 'D' : 'C') . $sep;
+                    print ($mt <= 0 ? price(- $mt) : $mt) . $sep;
+                    print dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("VAT") . $sep;
+                    // print $langs->trans("VAT") . $sep;
+                    print $val["ref"];
+                    print "\n";
+                }
+            }
+        }
+    } elseif ($conf->global->ACCOUNTING_EXPORT_MODELCSV == 1) {
+        // Model Classic Export
+        foreach ( $tabfac as $key => $val ) {
+            $companystatic->id = $tabcompany[$key]['id'];
+            $companystatic->name = $tabcompany[$key]['name'];
+            $companystatic->client = $tabcompany[$key]['code_client'];

-			$invoicestatic->id = $key;
-			$invoicestatic->ref = $val["ref"];
+            $invoicestatic->id = $key;
+            $invoicestatic->ref = $val["ref"];

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

-			foreach ( $tabttc[$key] as $k => $mt ) {
-				print '"' . $date . '"' . $sep;
-				print '"' . $val["ref"] . '"' . $sep;
-				print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
-				print '"' . dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("Code_tiers") . '"' . $sep;
-				print '"' . ($mt >= 0 ? price($mt) : '') . '"' . $sep;
-				print '"' . ($mt < 0 ? price(- $mt) : '') . '"';
-				print "\n";
-			}
+            foreach ( $tabttc[$key] as $k => $mt ) {
+                print '"' . $date . '"' . $sep;
+                print '"' . $val["ref"] . '"' . $sep;
+                print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
+                print '"' . dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("Code_tiers") . '"' . $sep;
+                print '"' . ($mt >= 0 ? price($mt) : '') . '"' . $sep;
+                print '"' . ($mt < 0 ? price(- $mt) : '') . '"';
+                print "\n";
+            }

-			// Product / Service
-			foreach ( $tabht[$key] as $k => $mt ) {
-				$accountingaccount = new AccountingAccount($db);
-				$accountingaccount->fetch(null, $k, true);
+            // Product / Service
+            foreach ( $tabht[$key] as $k => $mt ) {
+                $accountingaccount = new AccountingAccount($db);
+                $accountingaccount->fetch(null, $k, true);

-				if ($mt) {
-					print '"' . $date . '"' . $sep;
-					print '"' . $val["ref"] . '"' . $sep;
-					print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
-					print '"' . dol_trunc($companystatic->name, 16) . ' - ' . dol_trunc($accountingaccount->label, 32) . '"' . $sep;
-					print '"' . ($mt < 0 ? price(- $mt) : '') . '"' . $sep;
-					print '"' . ($mt >= 0 ? price($mt) : '') . '"';
-					print "\n";
-				}
-			}
+                if ($mt) {
+                    print '"' . $date . '"' . $sep;
+                    print '"' . $val["ref"] . '"' . $sep;
+                    print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
+                    print '"' . dol_trunc($companystatic->name, 16) . ' - ' . dol_trunc($accountingaccount->label, 32) . '"' . $sep;
+                    print '"' . ($mt < 0 ? price(- $mt) : '') . '"' . $sep;
+                    print '"' . ($mt >= 0 ? price($mt) : '') . '"';
+                    print "\n";
+                }
+            }

-			// VAT
-			foreach ( $tabtva[$key] as $k => $mt ) {
-				if ($mt) {
-					print '"' . $date . '"' . $sep;
-					print '"' . $val["ref"] . '"' . $sep;
-					print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
-					print '"' . dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("VAT") . '"' . $sep;
-					print '"' . ($mt < 0 ? price(- $mt) : '') . '"' . $sep;
-					print '"' . ($mt >= 0 ? price($mt) : '') . '"';
-					print "\n";
-				}
-			}
-		}
-	}
+            // VAT
+            foreach ( $tabtva[$key] as $k => $mt ) {
+                if ($mt) {
+                    print '"' . $date . '"' . $sep;
+                    print '"' . $val["ref"] . '"' . $sep;
+                    print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
+                    print '"' . dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("VAT") . '"' . $sep;
+                    print '"' . ($mt < 0 ? price(- $mt) : '') . '"' . $sep;
+                    print '"' . ($mt >= 0 ? price($mt) : '') . '"';
+                    print "\n";
+                }
+            }
+        }
+    }
 }
-*/


 if (empty($action) || $action == 'view') {

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

-	$nom = $langs->trans("SellsJournal") . ' - ' . $accountingjournalstatic->getNomUrl(1);
+	$nom = $langs->trans("SellsJournal");
 	$nomlink = '';
 	$periodlink = '';
 	$exportlink = '';
@@ -525,31 +516,29 @@ if (empty($action) || $action == 'view') {
 	else
 		$description .= $langs->trans("DepositsAreIncluded");
 	$period = $form->select_date($date_start, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1);
-
-	$varlink = 'id_journal=' . $id_journal;
-
-	journalHead($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''), '', $varlink);
+	
+	report_header($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''));

 	/*if ($conf->global->ACCOUNTING_EXPORT_MODELCSV != 1 && $conf->global->ACCOUNTING_EXPORT_MODELCSV != 2) {
 		print '<input type="button" class="butActionRefused" style="float: right;" value="' . $langs->trans("Export") . '" disabled="disabled" title="' . $langs->trans('ExportNotSupported') . '"/>';
 	} else {
 		print '<input type="button" class="butAction" style="float: right;" value="' . $langs->trans("Export") . '" onclick="launch_export();" />';
 	}*/
-	print '<div class="tabsAction">';
+    print '<div class="tabsAction">';
 	print '<input type="button" class="butAction" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
-	print '</div>';
-
+    print '</div>';
+    
 	print '
 	<script type="text/javascript">
 		function launch_export() {
-			$("div.fiche div.tabBar form input[name=\"action\"]").val("export_csv");
+		    $("div.fiche div.tabBar form input[name=\"action\"]").val("export_csv");
 			$("div.fiche div.tabBar form input[type=\"submit\"]").click();
-			$("div.fiche div.tabBar form input[name=\"action\"]").val("");
+		    $("div.fiche div.tabBar form input[name=\"action\"]").val("");
 		}
 		function writebookkeeping() {
-			$("div.fiche div.tabBar form input[name=\"action\"]").val("writebookkeeping");
+		    $("div.fiche div.tabBar form input[name=\"action\"]").val("writebookkeeping");
 			$("div.fiche div.tabBar form input[type=\"submit\"]").click();
-			$("div.fiche div.tabBar form input[name=\"action\"]").val("");
+		    $("div.fiche div.tabBar form input[name=\"action\"]").val("");
 		}
 	</script>';

@@ -570,6 +559,7 @@ if (empty($action) || $action == 'view') {
 	print "<td align='right'>" . $langs->trans("Credit") . "</td>";
 	print "</tr>\n";

+	$var = true;
 	$r = '';

 	$invoicestatic = new Facture($db);
@@ -584,7 +574,7 @@ if (empty($action) || $action == 'view') {

 		// Third party
 		foreach ( $tabttc[$key] as $k => $mt ) {
-			print '<tr class="oddeven">';
+			print "<tr " . $bc[$var] . ">";
 			print "<td><!-- Thirdparty --></td>";
 			print "<td>" . $date . "</td>";
 			print "<td>" . $invoicestatic->getNomUrl(1) . "</td>";
@@ -596,16 +586,16 @@ if (empty($action) || $action == 'view') {
 			$accountoshow = length_accounta($k);
 			if (empty($accountoshow) || $accountoshow == 'NotDefined')
 			{
-				print '<span class="error">'.$langs->trans("ThirdpartyAccountNotDefined").'</span>';
+			    print '<span class="error">'.$langs->trans("ThirdpartyAccountNotDefined").'</span>';
 			}
 			else print $accountoshow;
 			// print "</td><td>" . $langs->trans("ThirdParty");
 			// print ' (' . $companystatic->getNomUrl(0, 'customer', 16) . ')';
 			print '</td>';
 			print "<td>" . $companystatic->getNomUrl(0, 'customer', 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("Code_tiers") . "</td>";
-			print "<td align='right'>" . ($mt >= 0 ? price($mt) : '') . "</td>";
+			print "</td><td align='right'>" . ($mt >= 0 ? price($mt) : '') . "</td>";
 			print "<td align='right'>" . ($mt < 0 ? price(- $mt) : '') . "</td>";
-			print "</tr>";
+		    print "</tr>";
 		}

 		// Product / Service
@@ -614,17 +604,17 @@ if (empty($action) || $action == 'view') {
 			$accountingaccount->fetch(null, $k, true);

 			if ($mt) {
-				print '<tr class="oddeven">';
+				print "<tr " . $bc[$var] . ">";
 				print "<td><!-- Product --></td>";
 				print "<td>" . $date . "</td>";
 				print "<td>" . $invoicestatic->getNomUrl(1) . "</td>";
 				print "<td>";
-				$accountoshow = length_accountg($k);
-				if (empty($accountoshow) || $accountoshow == 'NotDefined')
-				{
-					print '<span class="error">'.$langs->trans("ProductNotDefined").'</span>';
-				}
-				else print $accountoshow;
+    			$accountoshow = length_accountg($k);
+    			if (empty($accountoshow) || $accountoshow == 'NotDefined')
+    			{
+    			    print '<span class="error">'.$langs->trans("ProductNotDefined").'</span>';
+    			}
+    			else print $accountoshow;
 				print "</td>";
 				// print "<td>" . $accountingaccount->label . "</td>";
 				print "<td>" . $companystatic->getNomUrl(0, 'customer', 16) . ' - ' . $invoicestatic->ref . ' - ' . $accountingaccount->label . "</td>";
@@ -637,17 +627,17 @@ if (empty($action) || $action == 'view') {
 		// VAT
 		foreach ( $tabtva[$key] as $k => $mt ) {
 			if ($mt) {
-				print '<tr class="oddeven">';
+				print "<tr " . $bc[$var] . ">";
 				print "<td><!-- VAT --></td>";
 				print "<td>" . $date . "</td>";
 				print "<td>" . $invoicestatic->getNomUrl(1) . "</td>";
 				print "<td>";
-				$accountoshow = length_accountg($k);
-				if (empty($accountoshow) || $accountoshow == 'NotDefined')
-				{
-					print '<span class="error">'.$langs->trans("VATAccountNotDefined").'</span>';
-				}
-				else print $accountoshow;
+    			$accountoshow = length_accountg($k);
+    			if (empty($accountoshow) || $accountoshow == 'NotDefined')
+    			{
+    			    print '<span class="error">'.$langs->trans("VATAccountNotDefined").'</span>';
+    			}
+    			else print $accountoshow;
 				print "</td>";
 				print "<td>" . $companystatic->getNomUrl(0, 'customer', 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("VAT") . ' '.$def_tva[$key]. "</td>";
 				// print "<td>" . $langs->trans("VAT") . "</td>";
@@ -656,6 +646,8 @@ if (empty($action) || $action == 'view') {
 				print "</tr>";
 			}
 		}
+		
+		$var = ! $var;
 	}

 	print "</table>";
--- a/htdocs/accountancy/report/result.php
+++ b/htdocs/accountancy/report/result.php
@@ -35,7 +35,7 @@ $langs->load("accountancy");
 $langs->load("compta");

 $mesg = '';
-$action = GETPOST('action','aZ09');
+$action = GETPOST('action');
 $cat_id = GETPOST('account_category');
 $selectcpt = GETPOST('cpt_bk');
 $id = GETPOST('id', 'int');
@@ -127,6 +127,7 @@ if (!empty($cats))
 		$position = -1;
 		$code = -1;
 		foreach($cpts as $i => $cpt){
+			$var = ! $var;

 			$position = $cpt['position'];
 			$code = $cpt['code'];
@@ -148,7 +149,7 @@ if (!empty($cats))
 			}
 			$sommes[$code]['NP'] += $resultNP;
 			$sommes[$code]['N'] += $resultN;
-			print '<tr class="oddeven">';
+			print '<tr'. $bc[$var].'>';
 			print '<td>' . $cpt['account_number'] . '</td>';
 			print '<td>' . $cpt['name_cpt'] . '</td>';
 			print '<td>' . price($resultNP)  . '</td>';
--- a/htdocs/accountancy/supplier/card.php
+++ b/htdocs/accountancy/supplier/card.php
@@ -1,11 +1,11 @@
 <?php
 /* Copyright (C) 2004       Rodolphe Quiedeville  <rodolphe@quiedeville.org>
 * Copyright (C) 2005       Simon TOSSER          <simon@kornog-computing.com>
- * Copyright (C) 2013-2017  Alexandre Spangaro    <aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2013-2015  Alexandre Spangaro    <aspangaro.dolibarr@gmail.com>
 * Copyright (C) 2013-2014  Olivier Geffroy       <jeff@jeffinfo.com>
- * Copyright (C) 2013-2014  Florian Henry         <florian.henry@open-concept.pro>
- * Copyright (C) 2014       Juanjo Menent         <jmenent@2byte.es>
- * Copyright (C) 2015       Jean-François Ferry   <jfefe@aternatik.fr>
+ * Copyright (C) 2013-2014	Florian Henry	      <florian.henry@open-concept.pro>
+ * 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
@@ -30,7 +30,7 @@ require '../../main.inc.php';

 // Class
 require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';

 // Langs
 $langs->load("bills");
@@ -52,11 +52,11 @@ if ($user->societe_id > 0)
 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";
 		$sql .= " SET fk_code_ventilation = " . $codeventil;
 		$sql .= " WHERE rowid = " . $id;
-
+		
 		$resql = $db->query($sql);
 		if (! $resql) {
 			setEventMessages($db->lasterror(), null, 'errors');
@@ -85,7 +85,7 @@ if ($cancel == $langs->trans("Cancel")) {
 // Create
 $form = new Form($db);
 $facturefournisseur_static = new FactureFournisseur($db);
-$formaccounting = new FormAccounting($db);
+$formventilation = new FormVentilation($db);

 if (! empty($id)) {
 	$sql = "SELECT f.ref as facnumber, f.rowid as facid, l.fk_product, l.description, l.rowid, l.fk_code_ventilation, ";
@@ -96,7 +96,7 @@ if (! empty($id)) {
 	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON l.fk_code_ventilation = aa.rowid";
 	$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "facture_fourn as f ON f.rowid = l.fk_facture_fourn ";
 	$sql .= " WHERE f.fk_statut > 0 AND l.rowid = " . $id;
-	$sql .= " AND f.entity IN (" . getEntity('facture_fourn', 0) . ")";     // We don't share object for accountancy
+	$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);
@@ -107,41 +107,41 @@ if (! empty($id)) {
 		
 		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 load_fiche_titre($langs->trans('SuppliersVentilation'), '', 'title_setup');
-
+			
 			dol_fiche_head();
-
+			
 			print '<table class="border" width="100%">';
-
+			
 			// ref invoice
 			print '<tr><td>' . $langs->trans("BillsSuppliers") . '</td>';
 			$facturefournisseur_static->ref = $objp->facnumber;
 			$facturefournisseur_static->id = $objp->facid;
 			print '<td>' . $facturefournisseur_static->getNomUrl(1) . '</td>';
 			print '</tr>';
-
+			
 			print '<tr><td width="20%">' . $langs->trans("Line") . '</td>';
 			print '<td>' . stripslashes(nl2br($objp->description)) . '</td></tr>';
 			print '<tr><td width="20%">' . $langs->trans("ProductLabel") . '</td>';
 			print '<td>' . dol_trunc($objp->product_label, 24) . '</td>';
 			print '<tr><td width="20%">' . $langs->trans("Account") . '</td><td>';
-			print $formaccounting->select_account($objp->fk_code_ventilation, 'codeventil', 1);
+			print $formventilation->select_account($objp->fk_code_ventilation, 'codeventil', 1);
 			print '</td></tr>';
 			print '</table>';
-
+			
 			dol_fiche_end();
-
+			
 			print '<div class="center">';
 			print '<input class="button" type="submit" value="' . $langs->trans("Save") . '">';
 			print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
 			print '<input class="button" type="submit" name="cancel" value="' . $langs->trans("Cancel") . '">';
 			print '</div>';
-
+			
 			print '</form>';
 		} else {
 			print "Error";
--- a/htdocs/accountancy/supplier/index.php
+++ b/htdocs/accountancy/supplier/index.php
@@ -134,7 +134,7 @@ if ($action == 'validatehistory') {
 	$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.= " AND f.entity IN (" . getEntity("accountancy", 1) . ")";
 	$sql1.= ")";
 	
 	dol_syslog("htdocs/accountancy/customer/index.php fixaccountancycode", LOG_DEBUG);
@@ -204,7 +204,7 @@ $sql .= "  LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.rowid
 $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 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";

@@ -215,7 +215,8 @@ if ($resql) {

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

-		print '<tr class="oddeven"><td>' . length_accountg($row[0]) . '</td>';
+		$var = ! $var;
+		print '<tr ' . $bc[$var] . '><td>' . length_accountg($row[0]) . '</td>';
 		print '<td align="left">' . $row[1] . '</td>';
 		for($i = 2; $i <= 12; $i ++) {
 			print '<td align="right">' . price($row[$i]) . '</td>';
@@ -258,7 +259,7 @@ $sql .= "  LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.rowid
 $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 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";

@@ -269,7 +270,8 @@ if ($resql) {

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

-        print '<tr class="oddeven"><td>' . length_accountg($row[0]) . '</td>';
+        $var = ! $var;
+        print '<tr ' . $bc[$var] . '><td>' . length_accountg($row[0]) . '</td>';
        print '<td align="left">' . $row[1] . '</td>';
        for($i = 2; $i <= 12; $i ++) {
            print '<td align="right">' . price($row[$i]) . '</td>';
@@ -312,7 +314,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
    $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 ff.entity IN (" . getEntity("facture_fourn", 0) . ")";     // We don't share object for accountancy
    
    dol_syslog('/accountancy/supplier/index.php:: sql=' . $sql);
    $resql = $db->query($sql);
--- a/htdocs/accountancy/supplier/lines.php
+++ b/htdocs/accountancy/supplier/lines.php
@@ -1,9 +1,9 @@
 <?php
 /* Copyright (C) 2013-2016 Olivier Geffroy		<jeff@jeffinfo.com>
- * Copyright (C) 2013-2017 Alexandre Spangaro	<aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2013-2016 Alexandre Spangaro	<aspangaro.dolibarr@gmail.com>
 * Copyright (C) 2014-2015 Ari Elbaz (elarifr)	<github@accedinfo.com>  
 * Copyright (C) 2013-2016 Florian Henry		<florian.henry@open-concept.pro>
- * Copyright (C) 2014      Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2014	   Juanjo Menent		<jmenent@2byte.es>
 *   
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -27,7 +27,7 @@
 require '../../main.inc.php';

 // Class
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
 require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture.class.php';
 require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
@@ -44,7 +44,6 @@ $langs->load("productbatch");
 $account_parent = GETPOST('account_parent');
 $changeaccount = GETPOST('changeaccount');
 // Search Getpost
-$search_lineid = GETPOST('search_lineid', 'int');
 $search_ref = GETPOST('search_ref', 'alpha');
 $search_invoice = GETPOST('search_invoice', 'alpha');
 $search_label = GETPOST('search_label', 'alpha');
@@ -54,7 +53,7 @@ $search_account = GETPOST('search_account', 'alpha');
 $search_vat = GETPOST('search_vat', 'alpha');

 // 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);
+$limit = GETPOST('limit') ? 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');
@@ -76,7 +75,7 @@ if ($user->societe_id > 0)
 if (! $user->rights->accounting->bind->write)
 	accessforbidden();

-$formaccounting = new FormAccounting($db);
+$formventilation = new FormVentilation($db);


 /*
@@ -86,7 +85,6 @@ $formaccounting = new FormAccounting($db);
 // Purge search criteria
 if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
 {
-    $search_lineid = '';
 	$search_ref = '';
 	$search_invoice = '';
 	$search_label = '';
@@ -150,7 +148,7 @@ print '<script type="text/javascript">
 * Supplier Invoice lines
 */
 $sql = "SELECT f.rowid as facid, f.ref as facnumber, f.ref_supplier, f.libelle as invoice_label, f.datef,";
-$sql.= " l.rowid, l.fk_product, l.description, l.total_ht , l.qty, l.tva_tx, aa.label, aa.account_number, ";
+$sql.= " l.fk_product, l.description, l.total_ht , l.qty, l.rowid, l.tva_tx, aa.label, aa.account_number, ";
 $sql.= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.fk_product_type as type";
 $sql.= " FROM " . MAIN_DB_PREFIX . "facture_fourn as f";
 $sql.= " , " . MAIN_DB_PREFIX . "accounting_account as aa";
@@ -158,9 +156,6 @@ $sql.= " , " . MAIN_DB_PREFIX . "facture_fourn_det as l";
 $sql.= " LEFT JOIN " . MAIN_DB_PREFIX . "product as p ON p.rowid = l.fk_product";
 $sql.= " WHERE f.rowid = l.fk_facture_fourn and f.fk_statut >= 1 AND l.fk_code_ventilation <> 0 ";
 $sql.= " AND aa.rowid = l.fk_code_ventilation";
-if ($search_lineid) {
-    $sql .= natural_search("l.rowid", $search_lineid, 1);
-}
 if (strlen(trim($search_invoice))) {
 	$sql .= natural_search("f.ref", $search_invoice);
 }
@@ -182,7 +177,7 @@ if (strlen(trim($search_account))) {
 if (strlen(trim($search_vat))) {
 	$sql .= natural_search("l.tva_tx", $search_vat, 1);
 }
-$sql .= " AND f.entity IN (" . getEntity('facture_fourn', 0) . ")";  // We don't share object for accountancy
+$sql .= " AND f.entity IN (" . getEntity("facture_fourn", 0) . ")";  // We don't share object for accountancy

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

@@ -230,14 +225,13 @@ if ($result) {
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" 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.'">';
-	
+		
 	print_barre_liste($langs->trans("InvoiceLinesDone"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num_lines, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit);
 	
 	print $langs->trans("DescVentilDoneSupplier") . '<br>';
 	
 	print '<br><div class="inline-block divButAction">' . $langs->trans("ChangeAccount") . '<br>';
-	print $formaccounting->select_account(GETPOST('account_parent'), 'account_parent', 1);
+	print $formventilation->select_account(GETPOST('account_parent'), 'account_parent', 1);
 	print '<input type="submit" class="button valignmiddle" value="' . $langs->trans("ChangeBinding") . '" /></div>';
 	
 	$moreforfilter = '';
@@ -245,23 +239,6 @@ if ($result) {
    print '<div class="div-table-responsive">';
 	print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 	
-	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"></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>';
-	print '<td class="liste_titre" align="right"><input type="text" class="right flat maxwidth50" name="search_amount" value="' . dol_escape_htmltag($search_amount) . '"></td>';
-	print '<td class="liste_titre" align="center"><input type="text" class="right flat maxwidth50" name="search_vat" placeholder="%" size="1" value="' . dol_escape_htmltag($search_vat) . '"></td>';
-	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_account" value="' . dol_escape_htmltag($search_account) . '"></td>';
-    print '<td class="liste_titre" align="center">';
-    $searchpicto=$form->showFilterButtons();
-    print $searchpicto;
-    print '</td>';
-	print "</tr>\n";
-	
 	print '<tr class="liste_titre">';
 	print_liste_field_titre($langs->trans("LineId"), $_SERVER["PHP_SELF"], "l.rowid", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre($langs->trans("Invoice"), $_SERVER["PHP_SELF"], "f.ref", "", $param, '', $sortfield, $sortorder);
@@ -273,16 +250,33 @@ if ($result) {
 	print_liste_field_titre($langs->trans("Amount"), $_SERVER["PHP_SELF"], "l.total_ht", "", $param, 'align="right"', $sortfield, $sortorder);
 	print_liste_field_titre($langs->trans("VATRate"), $_SERVER["PHP_SELF"], "l.tva_tx", "", $param, 'align="center"', $sortfield, $sortorder);
 	print_liste_field_titre($langs->trans("Account"), $_SERVER["PHP_SELF"], "aa.account_number", "", $param, '', $sortfield, $sortorder);
-    $checkpicto=$form->showCheckAddButtons();
-	print_liste_field_titre($checkpicto, '', '', '', '', 'align="center"');
+	print_liste_field_titre('', '', '', '', '', 'align="center"');
+	print "</tr>\n";
+	
+	print '<tr class="liste_titre">';
+    print '<td class="liste_titre"></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"></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>';
+	print '<td class="liste_titre" align="right"><input type="text" class="flat maxwidth50" name="search_amount" value="' . dol_escape_htmltag($search_amount) . '"></td>';
+	print '<td class="liste_titre" align="center"><input type="text" class="flat maxwidth50" name="search_vat" size="1" value="' . dol_escape_htmltag($search_vat) . '"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_account" value="' . dol_escape_htmltag($search_account) . '"></td>';
+    print '<td class="liste_titre" align="center">';
+    $searchpitco=$form->showFilterAndCheckAddButtons(1);
+    print $searchpitco;
+    print '</td>';
 	print "</tr>\n";
 	
 	$facturefournisseur_static = new FactureFournisseur($db);
 	$product_static = new Product($db);
 	
-	while ($i < min($num_lines, $limit)) {
+	$var = True;
+	while ( $i < min($num_lines, $limit) ) {
 		$objp = $db->fetch_object($result);
-
+		$var = ! $var;
 		$codecompta = length_accountg($objp->account_number) . ' - ' . $objp->label;
 		
 		$facturefournisseur_static->ref = $objp->facnumber;
@@ -293,7 +287,7 @@ if ($result) {
 		$product_static->type = $objp->type;
 		$product_static->label = $objp->product_label;
 		
-		print '<tr class="oddeven">';
+		print '<tr '. $bc[$var].'>';
 		
 		print '<td>' . $objp->rowid . '</td>';
 		
@@ -326,7 +320,7 @@ if ($result) {
 		print img_edit();
 		print '</a></td>';
 		
-		print '<td class="center"><input type="checkbox" class="checkforaction" name="changeaccount[]" value="' . $objp->rowid . '"/></td>';
+		print '<td align="right"><input type="checkbox" class="checkforaction" name="changeaccount[]" value="' . $objp->rowid . '"/></td>';
 		
 		print "</tr>";
 		$i ++;
--- a/htdocs/accountancy/supplier/list.php
+++ b/htdocs/accountancy/supplier/list.php
@@ -1,10 +1,10 @@
 <?php
 /* Copyright (C) 2013-2014	Olivier Geffroy			<jeff@jeffinfo.com>
- * Copyright (C) 2013-2017	Alexandre Spangaro		<aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2013-2016	Alexandre Spangaro		<aspangaro.dolibarr@gmail.com>
 * Copyright (C) 2014-2015	Ari Elbaz (elarifr)		<github@accedinfo.com>
 * Copyright (C) 2013-2014	Florian Henry			<florian.henry@open-concept.pro>
 * Copyright (C) 2014		Juanjo Menent			<jmenent@2byte.es>s
- * Copyright (C) 2016		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
@@ -30,7 +30,7 @@ require '../../main.inc.php';
 // Class
 require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture.class.php';
 require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.product.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/html.formventilation.class.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';

@@ -52,7 +52,6 @@ $toselect = GETPOST('toselect', 'array');
 $mesCasesCochees = GETPOST('toselect', 'array');

 // Search Getpost
-$search_lineid = GETPOST('search_lineid', 'int');
 $search_invoice = GETPOST('search_invoice', 'alpha');
 $search_ref = GETPOST('search_ref', 'alpha');
 $search_label = GETPOST('search_label', 'alpha');
@@ -63,7 +62,7 @@ $search_vat = GETPOST('search_vat', 'alpha');
 $btn_ventil = GETPOST('ventil', 'alpha');

 // 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);
+$limit = GETPOST('limit') ? 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');
@@ -85,7 +84,7 @@ if ($user->societe_id > 0)
 if (! $user->rights->accounting->bind->write)
 	accessforbidden();

-$formaccounting = new FormAccounting($db);
+$formventilation = new FormVentilation($db);
 $accounting = new AccountingAccount($db);
 // TODO: we should need to check if result is a really exist accountaccount rowid.....
 $aarowid_s = $accounting->fetch('', $conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT, 1);
@@ -102,7 +101,6 @@ if (! GETPOST('confirmmassaction') && $massaction != 'presend' && $massaction !=
 // Purge search criteria
 if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All test are required to be compatible with all browsers
 {
-    $search_lineid = '';
    $search_ref = '';
    $search_invoice = '';    
    $search_label = '';
@@ -181,7 +179,7 @@ llxHeader('', $langs->trans("SuppliersVentilation"));

 // Supplier Invoice Lines
 $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, ";
+$sql.= " l.fk_product, l.description, l.total_ht as price, l.rowid, l.fk_code_ventilation, l.product_type as type_l, l.tva_tx as tva_tx_line, ";
 $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";
 $sql.= " FROM " . MAIN_DB_PREFIX . "facture_fourn as f";
@@ -193,9 +191,6 @@ $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_buy IS NULL OR p.accountancy_code_buy ='')";
 // Add search filter like
-if ($search_lineid) {
-    $sql .= natural_search("l.rowid", $search_lineid, 1);
-}
 if (strlen(trim($search_invoice))) {
    $sql .= natural_search("f.ref",$search_invoice);
 }
@@ -217,7 +212,7 @@ if (strlen(trim($search_account))) {
 if (strlen(trim($search_vat))) {
    $sql .= natural_search("l.tva_tx",$search_vat,1);
 }
-$sql .= " AND f.entity IN (" . getEntity('facture_fourn', 0) . ")";  // We don't share object for accountancy
+$sql .= " AND f.entity IN (" . getEntity("facture_fourn", 0) . ")";  // We don't share object for accountancy

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

@@ -238,11 +233,11 @@ if ($result) {
 	$i = 0;

 	$arrayofselected=is_array($toselect)?$toselect:array();
-
+	
 	$param='';
 	if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
 	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
-
+	
 	$arrayofmassactions =  array(
 	    'ventil'=>$langs->trans("Ventilate")
 	    //'presend'=>$langs->trans("SendByMail"),
@@ -251,7 +246,8 @@ if ($result) {
 	//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";
 	print '<input type="hidden" name="action" value="ventil">';
 	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -259,39 +255,19 @@ if ($result) {
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" 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.'">';
-
+	
+	//$center='<div align="center"><input type="submit" class="butAction" value="' . $langs->trans("Ventilate") . '" name="ventil"></div>';
+	
 	print_barre_liste($langs->trans("InvoiceLines"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num_lines, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit);

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

 	if ($msg) print $msg.'<br>';
-
+	
 	$moreforfilter = '';
-
+	
    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"></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>';
-	print '<td class="liste_titre" align="right"><input type="text" class="right flat maxwidth50" name="search_amount" value="' . dol_escape_htmltag($search_amount) . '"></td>';
-	print '<td class="liste_titre" align="right"><input type="text" class="right flat maxwidth50" name="search_vat" placeholder="%" size="1" value="' . dol_escape_htmltag($search_vat) . '"></td>';
-	print '<td class="liste_titre"></td>';
-	print '<td class="liste_titre"></td>';
-	print '<td align="center" class="liste_titre">';
-	$searchpicto=$form->showFilterButtons();
-	print $searchpicto;
-	print '</td>';
-	print '</tr>';
-
+	print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 	print '<tr class="liste_titre">';
 	print_liste_field_titre($langs->trans("LineId"), $_SERVER["PHP_SELF"], "l.rowid", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre($langs->trans("Invoice"), $_SERVER["PHP_SELF"], "f.ref", "", $param, '', $sortfield, $sortorder);
@@ -304,11 +280,28 @@ if ($result) {
 	print_liste_field_titre($langs->trans("VATRate"), $_SERVER["PHP_SELF"], "l.tva_tx", "", $param, 'align="right"', $sortfield, $sortorder);
 	print_liste_field_titre($langs->trans("AccountAccountingSuggest"), '', '', '', '', 'align="center"');
 	print_liste_field_titre($langs->trans("IntoAccount"), '', '', '', '', 'align="center"');
-	$checkpicto='';
-	if ($massactionbutton) $checkpicto=$form->showCheckAddButtons('checkforselect', 1);
-	print_liste_field_titre($checkpicto, '', '', '', '', 'align="center"');
+	print_liste_field_titre('', '', '', '', '', 'align="center"');
 	print "</tr>\n";

+	// We add search filter
+	print '<tr class="liste_titre">';
+	print '<td class="liste_titre"></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"></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>';
+	print '<td class="liste_titre" align="right"><input type="text" class="flat maxwidth50" name="search_amount" value="' . dol_escape_htmltag($search_amount) . '"></td>';
+	print '<td class="liste_titre" align="right"><input type="text" class="flat maxwidth50" name="search_vat" size="1" value="' . dol_escape_htmltag($search_vat) . '"></td>';
+	print '<td class="liste_titre"></td>';
+	print '<td class="liste_titre"></td>';
+	print '<td align="right" class="liste_titre">';
+	$searchpitco=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
+	print $searchpitco;
+	print '</td>';
+	print '</tr>';
+
 	$facturefourn_static = new FactureFournisseur($db);
 	$productfourn_static = new ProductFournisseur($db);
 	$form = new Form($db);
@@ -316,6 +309,7 @@ if ($result) {
 	$var = true;
 	while ( $i < min($num_lines, $limit) ) {
 		$objp = $db->fetch_object($result);
+		$var = ! $var;

 		// product_type: 0 = service ? 1 = product
 		// if product does not exist we use the value of product_type provided in facturedet to define if this is a product or service
@@ -328,7 +322,7 @@ if ($result) {
 		$productfourn_static->id = $objp->product_id;
 		$productfourn_static->type = $objp->type;
 		$productfourn_static->label = $objp->product_label;
-
+		
 		$facturefourn_static->ref = $objp->ref;
 		$facturefourn_static->id = $objp->facid;
 		$facturefourn_static->type = $objp->type;
@@ -346,38 +340,38 @@ if ($result) {
 				$objp->aarowid_suggest = $aarowid_p;
 		}
 		if ($objp->code_buy_l == -1) $objp->code_buy_l='';
-
+		
 		if (! empty($objp->code_buy)) {
 			$objp->code_buy_p = $objp->code_buy;       // Code on product
 		} else {
 			$code_buy_p_notset = 'color:orange';
 		}
 		if (empty($objp->code_buy_l) && empty($objp->code_buy_p)) $code_buy_p_notset = 'color:red';
-
+		
 		// $objp->code_buy_p is now code of product/service
 		// $objp->code_buy_l is now default code of product/service
 					
-		print '<tr class="oddeven">';
+		print '<tr '. $bc[$var].'>';

 		// Line id
 		print '<td>' . $objp->rowid . '</td>';
-
+		
 		// Ref Invoice
 		print '<td>' . $facturefourn_static->getNomUrl(1) . '</td>';

 		print '<td class="tdoverflowonsmartphone">';
 		print $objp->invoice_label;
 		print '</td>';
-
+		
 		print '<td align="center">' . dol_print_date($db->jdate($objp->datef), 'day') . '</td>';
-
+		
 		// Ref product
 		print '<td>';
 		if ($productfourn_static->id)
 			print $productfourn_static->getNomUrl(1);
 		if ($objp->product_label) print '<br>'.$objp->product_label;
        print '</td>';
-
+        
        // Description
 		print '<td>';
 		$text = dolGetFirstLineOfText(dol_string_nohtmltag($objp->description));
@@ -408,11 +402,11 @@ if ($result) {

 		// Suggested accounting account
 		print '<td align="center">';
-		print $formaccounting->select_account($objp->aarowid_suggest, 'codeventil'.$objp->rowid, 1, array(), 0, 0, 'maxwidth300 maxwidthonsmartphone', 'cachewithshowemptyone');
+		print $formventilation->select_account($objp->aarowid_suggest, 'codeventil'.$objp->rowid, 1, array(), 0, 0, 'maxwidth300 maxwidthonsmartphone', 'cachewithshowemptyone');
 		print '</td>';
-
+		
 		// Colonne choix ligne a ventiler
-		print '<td align="center">';
+		print '<td align="right">';
 		print '<input type="checkbox" class="flat checkforselect" name="toselect[]" value="' . $objp->rowid . "_" . $i . '"' . ($objp->aarowid ? "checked" : "") . '/>';
 		print '</td>';

--- a/htdocs/adherents/admin/adherent.php
+++ b/htdocs/adherents/admin/adherent.php
@@ -48,37 +48,6 @@ $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')
 {
@@ -147,81 +116,120 @@ print load_fiche_titre($langs->trans("MembersSetup"),$linkback,'title_setup');

 $head = member_admin_prepare_head();

-dol_fiche_head($head, 'general', $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">';
+dol_fiche_head($head, 'general', $langs->trans("Members"), 0, 'user');

 print load_fiche_titre($langs->trans("MemberMainOptions"),'','');
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Description").'</td>';
 print '<td>'.$langs->trans("Value").'</td>';
+print '<td align="center">'.$langs->trans("Action").'</td>';
 print "</tr>\n";
+$var=true;

 // 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);
+$var=!$var;
+print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="action" value="update">';
+print '<input type="hidden" name="constname" value="ADHERENT_LOGIN_NOT_REQUIRED">';
+print '<tr '.$bc[$var].'><td>'.$langs->trans("AdherentLoginRequired").'</td><td>';
+print $form->selectyesno('constvalue',(! empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)?0:1),1);
+print '</td><td align="center" width="80">';
+print '<input type="submit" class="button" value="'.$langs->trans("Update").'" name="Button">';
 print "</td></tr>\n";
+print '</form>';

 // Mail required for members
-print '<tr class="oddeven"><td>'.$langs->trans("AdherentMailRequired").'</td><td>';
-print $form->selectyesno('ADHERENT_MAIL_REQUIRED',(! empty($conf->global->ADHERENT_MAIL_REQUIRED)?$conf->global->ADHERENT_MAIL_REQUIRED:0),1);
+$var=!$var;
+print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="action" value="update">';
+print '<input type="hidden" name="constname" value="ADHERENT_MAIL_REQUIRED">';
+print '<tr '.$bc[$var].'><td>'.$langs->trans("AdherentMailRequired").'</td><td>';
+print $form->selectyesno('constvalue',(! empty($conf->global->ADHERENT_MAIL_REQUIRED)?$conf->global->ADHERENT_MAIL_REQUIRED:0),1);
+print '</td><td align="center" width="80">';
+print '<input type="submit" class="button" value="'.$langs->trans("Update").'" name="Button">';
 print "</td></tr>\n";
+print '</form>';

 // Send mail information is on by default
-print '<tr class="oddeven"><td>'.$langs->trans("MemberSendInformationByMailByDefault").'</td><td>';
-print $form->selectyesno('ADHERENT_DEFAULT_SENDINFOBYMAIL',(! empty($conf->global->ADHERENT_DEFAULT_SENDINFOBYMAIL)?$conf->global->ADHERENT_DEFAULT_SENDINFOBYMAIL:0),1);
+$var=!$var;
+print '<form action="adherent.php" method="POST">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="action" value="update">';
+print '<input type="hidden" name="constname" value="ADHERENT_DEFAULT_SENDINFOBYMAIL">';
+print '<tr '.$bc[$var].'><td>'.$langs->trans("MemberSendInformationByMailByDefault").'</td><td>';
+print $form->selectyesno('constvalue',(! empty($conf->global->ADHERENT_DEFAULT_SENDINFOBYMAIL)?$conf->global->ADHERENT_DEFAULT_SENDINFOBYMAIL:0),1);
+print '</td><td align="center" width="80">';
+print '<input type="submit" class="button" value="'.$langs->trans("Update").'" name="Button">';
 print "</td></tr>\n";
+print '</form>';

 // Insert subscription into bank account
-print '<tr class="oddeven"><td>'.$langs->trans("MoreActionsOnSubscription").'</td>';
+$var=!$var;
+print '<form action="adherent.php" method="POST">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="action" value="update">';
+print '<input type="hidden" name="constname" value="ADHERENT_BANK_USE">';
+print '<tr '.$bc[$var].'><td>'.$langs->trans("MoreActionsOnSubscription").'</td>';
 $arraychoices=array('0'=>$langs->trans("None"));
 if (! empty($conf->banque->enabled)) $arraychoices['bankdirect']=$langs->trans("MoreActionBankDirect");
 if (! empty($conf->banque->enabled) && ! empty($conf->societe->enabled) && ! empty($conf->facture->enabled)) $arraychoices['invoiceonly']=$langs->trans("MoreActionInvoiceOnly");
 if (! empty($conf->banque->enabled) && ! empty($conf->societe->enabled) && ! empty($conf->facture->enabled)) $arraychoices['bankviainvoice']=$langs->trans("MoreActionBankViaInvoice");
 print '<td>';
-print $form->selectarray('ADHERENT_BANK_USE',$arraychoices,$conf->global->ADHERENT_BANK_USE,0);
+print $form->selectarray('constvalue',$arraychoices,$conf->global->ADHERENT_BANK_USE,0);
+print '</td><td align="center" width="80">';
+print '<input type="submit" class="button" value="'.$langs->trans("Update").'" name="Button">';
 print '</td>';
 print "</tr>\n";
+print '</form>';

 // Use vat for invoice creation
 if ($conf->facture->enabled)
 {
-	print '<tr class="oddeven"><td>'.$langs->trans("VATToUseForSubscriptions").'</td>';
+	$var=!$var;
+	print '<form action="adherent.php" method="POST">';
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	print '<input type="hidden" name="action" value="update">';
+	print '<input type="hidden" name="constname" value="ADHERENT_VAT_FOR_SUBSCRIPTIONS">';
+	print '<tr '.$bc[$var].'><td>'.$langs->trans("VATToUseForSubscriptions").'</td>';
 	if (! empty($conf->banque->enabled))
 	{
 		print '<td>';
-		print $form->selectarray('ADHERENT_VAT_FOR_SUBSCRIPTIONS', array('0'=>$langs->trans("NoVatOnSubscription"),'defaultforfoundationcountry'=>$langs->trans("Default")), (empty($conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS)?'0':$conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS), 0);
+		print $form->selectarray('constvalue', array('0'=>$langs->trans("NoVatOnSubscription"),'defaultforfoundationcountry'=>$langs->trans("Default")), (empty($conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS)?'0':$conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS), 0);
+		print '</td><td align="center" width="80">';
+		print '<input type="submit" class="button" value="'.$langs->trans("Update").'" name="Button">';
 		print '</td>';
 	}
 	else
 	{
-		print '<td align="right">';
+		print '<td align="right" colspan="2">';
 		print $langs->trans("WarningModuleNotActive",$langs->transnoentities("Module85Name"));
 		print '</td>';
 	}
 	print "</tr>\n";
-	
+	print '</form>';
+
 	if (! empty($conf->product->enabled) || ! empty($conf->service->enabled))
 	{
-		print '<tr class="oddeven"><td>'.$langs->trans("ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS").'</td>';
+		$var=!$var;
+		print '<form action="adherent.php" method="POST">';
+		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		print '<input type="hidden" name="action" value="update">';
+		print '<input type="hidden" name="constname" value="ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS">';
+		print '<tr '.$bc[$var].'><td>'.$langs->trans("ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS").'</td>';
 		print '<td>';
-		$form->select_produits($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS, 'ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS');
+		$form->select_produits($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS, 'constvalue_ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS');
+		print '</td><td align="center" width="80">';
+		print '<input type="submit" class="button" value="'.$langs->trans("Update").'" name="Button">';
 		print '</td>';
 	}
 	print "</tr>\n";
+	print '</form>';
 }

 print '</table>';
-
-print '<center>';
-print '<input type="submit" class="button" value="'.$langs->trans("Update").'" name="Button">';
-print '</center>';
-
-print '</form>';
-
 print '<br>';


@@ -239,12 +247,13 @@ $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%';
+form_constantes($constantes);

-form_constantes($constantes, 0, $helptext);
+print '*'.$langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
+print '%DOL_MAIN_URL_ROOT%, %ID%, %FIRSTNAME%, %LASTNAME%, %FULLNAME%, %LOGIN%, %PASSWORD%, ';
+print '%COMPANY%, %ADDRESS%, %ZIP%, %TOWN%, %COUNTRY%, %EMAIL%, %BIRTH%, %PHOTO%, %TYPE%, ';
+print '%YEAR%, %MONTH%, %DAY%';
+print '<br>';

 print '<br>';

@@ -256,12 +265,13 @@ $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%';
+form_constantes($constantes);

-form_constantes($constantes, 0, $helptext);
+print '*'.$langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
+print '%DOL_MAIN_URL_ROOT%, %ID%, %FIRSTNAME%, %LASTNAME%, %FULLNAME%, %LOGIN%, %PASSWORD%, ';
+print '%COMPANY%, %ADDRESS%, %ZIP%, %TOWN%, %COUNTRY%, %EMAIL%, %BIRTH%, %PHOTO%, %TYPE%, ';
+print '%YEAR%, %MONTH%, %DAY%';
+print '<br>';

 print '<br>';

@@ -285,17 +295,13 @@ $constantes=array(

 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%';
+form_constantes($constantes);

-$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);
+print '*'.$langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
+print '%DOL_MAIN_URL_ROOT%, %ID%, %FIRSTNAME%, %LASTNAME%, %FULLNAME%, %LOGIN%, %PASSWORD%, ';
+print '%COMPANY%, %ADDRESS%, %ZIP%, %TOWN%, %COUNTRY%, %EMAIL%, %BIRTH%, %PHOTO%, %TYPE%, ';
+//print '%YEAR%, %MONTH%, %DAY%';	// Not supported
+print '<br>';

 dol_fiche_end();

--- a/htdocs/adherents/admin/adherent_extrafields.php
+++ b/htdocs/adherents/admin/adherent_extrafields.php
@@ -70,7 +70,7 @@ print load_fiche_titre($langs->trans("MembersSetup"),$linkback,'title_setup');

 $head = member_admin_prepare_head();

-dol_fiche_head($head, 'attributes', $langs->trans("Members"), -1, 'user');
+dol_fiche_head($head, 'attributes', $langs->trans("Members"), 0, 'user');

 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';

--- a/htdocs/adherents/admin/adherent_type_extrafields.php
+++ b/htdocs/adherents/admin/adherent_type_extrafields.php
@@ -73,7 +73,7 @@ print load_fiche_titre($langs->trans("MembersSetup"),$linkback,'title_setup');

 $head = member_admin_prepare_head();

-dol_fiche_head($head, 'attributes_type', $langs->trans("Members"), -1, 'user');
+dol_fiche_head($head, 'attributes_type', $langs->trans("Members"), 0, 'user');

 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';

--- a/htdocs/adherents/admin/public.php
+++ b/htdocs/adherents/admin/public.php
@@ -29,7 +29,6 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';

 $langs->load("members");
 $langs->load("admin");
@@ -50,15 +49,12 @@ if ($action == 'update')
 	$editamount=GETPOST('MEMBER_NEWFORM_EDITAMOUNT');
 	$payonline=GETPOST('MEMBER_NEWFORM_PAYONLINE');
 	$email=GETPOST('MEMBER_PAYONLINE_SENDEMAIL');
-        $forcetype=GETPOST('MEMBER_NEWFORM_FORCETYPE');

    $res=dolibarr_set_const($db, "MEMBER_ENABLE_PUBLIC",$public,'chaine',0,'',$conf->entity);
    $res=dolibarr_set_const($db, "MEMBER_NEWFORM_AMOUNT",$amount,'chaine',0,'',$conf->entity);
    $res=dolibarr_set_const($db, "MEMBER_NEWFORM_EDITAMOUNT",$editamount,'chaine',0,'',$conf->entity);
    $res=dolibarr_set_const($db, "MEMBER_NEWFORM_PAYONLINE",$payonline,'chaine',0,'',$conf->entity);
    $res=dolibarr_set_const($db, "MEMBER_PAYONLINE_SENDEMAIL",$email,'chaine',0,'',$conf->entity);
-    if ($forcetype < 0) $res=dolibarr_del_const($db, "MEMBER_NEWFORM_FORCETYPE",$conf->entity);
-    else                $res=dolibarr_set_const($db, "MEMBER_NEWFORM_FORCETYPE",$forcetype,'chaine',0,'',$conf->entity);

    if (! $res > 0) $error++;

@@ -92,9 +88,8 @@ $head = member_admin_prepare_head();

 print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 print '<input type="hidden" name="action" value="update">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';

-dol_fiche_head($head, 'public', $langs->trans("Members"), -1, 'user');
+dol_fiche_head($head, 'public', $langs->trans("Members"), 0, 'user');

 if ($conf->use_javascript_ajax)
 {
@@ -115,11 +110,16 @@ if ($conf->use_javascript_ajax)
                {
 					if (jQuery("#MEMBER_ENABLE_PUBLIC").val()==\'0\')
                    {
-                        jQuery("#trforcetype, #tramount, #tredit, #trpayment, #tremail").hide();
+                        jQuery("#tramount").hide();
+                        jQuery("#tredit").hide();
+                        jQuery("#trpayment").hide();
+                        jQuery("#tremail").hide();
                    }
                    if (jQuery("#MEMBER_ENABLE_PUBLIC").val()==\'1\')
                    {
-                        jQuery("#trforcetype, #tramount, #tredit, #trpayment").show();
+                        jQuery("#tramount").show();
+                        jQuery("#tredit").show();
+                        jQuery("#trpayment").show();
                        if (jQuery("#MEMBER_NEWFORM_PAYONLINE").val()==\'-1\') jQuery("#tremail").hide();
                        else jQuery("#tremail").show();
 					}
@@ -141,57 +141,63 @@ print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Parameter").'</td>';
 print '<td align="right">'.$langs->trans("Value").'</td>';
 print "</tr>\n";
+$var=true;

 // Allow public form
-print '<tr class="oddeven"><td>';
+$var=! $var;
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<tr '.$bc[$var].'><td>';
 print $langs->trans("EnablePublicSubscriptionForm");
 print '</td><td align="right">';
 print $form->selectyesno("MEMBER_ENABLE_PUBLIC",(! empty($conf->global->MEMBER_ENABLE_PUBLIC)?$conf->global->MEMBER_ENABLE_PUBLIC:0),1);
 print "</td></tr>\n";

-// Force Type
-$adht = new AdherentType($db);
-print '<tr class="oddeven drag" id="trforcetype"><td>';
-print $langs->trans("ForceMemberType");
-print '</td><td width="60" align="right">';
-$listofval = array(-1 => $langs->trans("Undefined"));
-$listofval += $adht->liste_array();
-$forcetype = $conf->global->MEMBER_NEWFORM_FORCETYPE ?: -1;
-print $form->selectarray("MEMBER_NEWFORM_FORCETYPE", $listofval, $forcetype, count($listetype)>1?1:0);
-print "</td></tr>\n";
+// Type
+/*$var=! $var;
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<tr '.$bc[$var].' class="drag"><td>';
+print $langs->trans("EnablePublicSubscriptionForm");
+print '</td><td width="60" align="center">';
+print $form->selectyesno("forcedate",$conf->global->MEMBER_NEWFORM_FORCETYPE,1);
+print "</td></tr>\n"; */

 // Amount
-print '<tr class="oddeven" id="tramount"><td>';
+$var=! $var;
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<tr '.$bc[$var].' id="tramount"><td>';
 print $langs->trans("DefaultAmount");
 print '</td><td align="right">';
 print '<input type="text" id="MEMBER_NEWFORM_AMOUNT" name="MEMBER_NEWFORM_AMOUNT" size="5" value="'.(! empty($conf->global->MEMBER_NEWFORM_AMOUNT)?$conf->global->MEMBER_NEWFORM_AMOUNT:'').'">';
 print "</td></tr>\n";

 // Can edit
-print '<tr class="oddeven" id="tredit"><td>';
+$var=! $var;
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<tr '.$bc[$var].' id="tredit"><td>';
 print $langs->trans("CanEditAmount");
 print '</td><td align="right">';
 print $form->selectyesno("MEMBER_NEWFORM_EDITAMOUNT",(! empty($conf->global->MEMBER_NEWFORM_EDITAMOUNT)?$conf->global->MEMBER_NEWFORM_EDITAMOUNT:0),1);
 print "</td></tr>\n";

-if (! empty($conf->paybox->enabled) || ! empty($conf->paypal->enabled) || ! empty($conf->stripe->enabled))
+if (! empty($conf->paybox->enabled) || ! empty($conf->paypal->enabled))
 {
 	// Jump to an online payment page
-	print '<tr class="oddeven" id="trpayment"><td>';
+	$var=! $var;
+	print '<tr '.$bc[$var].' id="trpayment"><td>';
 	print $langs->trans("MEMBER_NEWFORM_PAYONLINE");
 	print '</td><td align="right">';
 	$listofval=array();
 	if (! empty($conf->paybox->enabled)) $listofval['paybox']='Paybox';
 	if (! empty($conf->paypal->enabled)) $listofval['paypal']='PayPal';
-	if (! empty($conf->stripe->enabled)) $listofval['stripe']='Stripe';
 	print $form->selectarray("MEMBER_NEWFORM_PAYONLINE",$listofval,(! empty($conf->global->MEMBER_NEWFORM_PAYONLINE)?$conf->global->MEMBER_NEWFORM_PAYONLINE:''),1);
 	print "</td></tr>\n";
 }

-if (! empty($conf->paybox->enabled) || ! empty($conf->paypal->enabled) || ! empty($conf->stripe->enabled))
+if (! empty($conf->paybox->enabled) || ! empty($conf->paypal->enabled))
 {
    // Jump to an online payment page
-    print '<tr class="oddeven" id="tremail"><td>';
+    $var=! $var;
+    print '<tr '.$bc[$var].' id="tremail"><td>';
    print $langs->trans("MEMBER_PAYONLINE_SENDEMAIL");
    print '</td><td align="right">';
    print '<input type="text" id="MEMBER_PAYONLINE_SENDEMAIL" name="MEMBER_PAYONLINE_SENDEMAIL" size="24" value="'.(! empty($conf->global->MEMBER_PAYONLINE_SENDEMAIL)?$conf->global->MEMBER_PAYONLINE_SENDEMAIL:'').'">';
--- a/htdocs/adherents/agenda.php
+++ b/htdocs/adherents/agenda.php
@@ -36,7 +36,7 @@ require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
 $langs->load("companies");
 $langs->load("members");

-$id = GETPOST('id','int')?GETPOST('id','int'):GETPOST('rowid','int');
+$id = GETPOST('id','int');

 // Security check
 $result=restrictedArea($user,'adherent',$id);
@@ -85,20 +85,50 @@ if ($object->id > 0)
 	if (! empty($conf->notification->enabled)) $langs->load("mails");
 	$head = member_prepare_head($object);

-	dol_fiche_head($head, 'agenda', $langs->trans("Member"), -1, 'user');
+	dol_fiche_head($head, 'agenda', $langs->trans("Member"),0,'user');

 	$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/list.php">'.$langs->trans("BackToList").'</a>';
 	
 	dol_banner_tab($object, 'rowid', $linkback);
    
-	print '<div class="fichecenter">';
+    print '<div class="fichecenter">';
+    
+    print '<div class="underbanner clearboth"></div>';
+	print '<table class="border centpercent">';
+
+	// Login
+	if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
+	{
+	    print '<tr><td class="titlefield">'.$langs->trans("Login").' / '.$langs->trans("Id").'</td><td class="valeur">'.$object->login.'&nbsp;</td></tr>';
+	}
+
+	// Type
+	print '<tr><td class="titlefield">'.$langs->trans("Type").'</td><td class="valeur">'.$adht->getNomUrl(1)."</td></tr>\n";
+
+	// Morphy
+	print '<tr><td>'.$langs->trans("Nature").'</td><td class="valeur" >'.$object->getmorphylib().'</td>';
+	/*print '<td rowspan="'.$rowspan.'" align="center" valign="middle" width="25%">';
+	 print $form->showphoto('memberphoto',$member);
+	print '</td>';*/
+	print '</tr>';
+
+	// Company
+	print '<tr><td>'.$langs->trans("Company").'</td><td class="valeur">'.$object->societe.'</td></tr>';
+
+	// Civility
+	print '<tr><td>'.$langs->trans("UserTitle").'</td><td class="valeur">'.$object->getCivilityLabel().'&nbsp;</td>';
+	print '</tr>';
+
+	print '</table>';
+
 	
-	print '<div class="underbanner clearboth"></div>';
+	print '<br>';
 	
 	$object->info($id);
 	print dol_print_object_info($object, 1);
 	
-	print '</div>';	
+	
+	print '</div>';

 	dol_fiche_end();
 	
@@ -116,11 +146,30 @@ if ($object->id > 0)

    print '</div>';

+    print '<br>';
+
    $out='';

+    /*$objthirdparty=$object->thirdparty;
+    $objcon=new stdClass();
+
+    $permok=$user->rights->agenda->myactions->create;
+    if ((! empty($objthirdparty->id) || ! empty($objcon->id)) && $permok)
+    {
+        $out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
+        if (get_class($objthirdparty) == 'Societe') $out.='&amp;socid='.$objthirdparty->id;
+        $out.=(! empty($objcon->id)?'&amp;contactid='.$objcon->id:'').'&amp;backtopage=1&amp;percentage=-1">';
+    	$out.=$langs->trans("AddAnAction").' ';
+    	$out.=img_picto($langs->trans("AddAnAction"),'filenew');
+    	$out.="</a>";
+	}*/
+
    print load_fiche_titre($langs->trans("ActionsOnMember"),$out,'');

-    // List of actions
+    // List of todo actions
+    //show_actions_todo($conf,$langs,$db,$object);
+
+    // List of done actions
    show_actions_done($conf,$langs,$db,$object,null,0,'','');
 }

--- a/htdocs/adherents/canvas/actions_adherentcard_common.class.php
+++ b/htdocs/adherents/canvas/actions_adherentcard_common.class.php
@@ -182,7 +182,7 @@ abstract class ActionsAdherentCardCommon
            $this->object->old_name = $_POST["old_name"];
            $this->object->old_firstname = $_POST["old_firstname"];

-            $result = $this->object->delete(0, $user, 0);
+            $result = $this->object->delete();
            if ($result > 0)
            {
                header("Location: list.php");
@@ -424,7 +424,7 @@ abstract class ActionsAdherentCardCommon
            if ($resql)
            {
                $obj = $this->db->fetch_object($resql);
-
+            
                $this->object->country_code	=	$obj->code;
                $this->object->country		=	$langs->trans("Country".$obj->code)?$langs->trans("Country".$obj->code):$obj->libelle;
            }
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -96,7 +96,7 @@ if ($id > 0)
 	// Define variables to know what current user can do on properties of user linked to edited member
 	if ($object->user_id)
 	{
-		// $ User is the user who edits, $ object->user_id is the id of the related user in the edited member
+		// $ User is the user who edits, $ object->user_id is the id of the related user in the edited member  
 		$caneditfielduser=((($user->id == $object->user_id) && $user->rights->user->self->creer)
 				|| (($user->id != $object->user_id) && $user->rights->user->user->creer));
 		$caneditpassworduser=((($user->id == $object->user_id) && $user->rights->user->self->password)
@@ -213,7 +213,7 @@ if (empty($reshook))
 	{
 		if ($result > 0)
 		{
-			// User creation
+			// User creation 
 			$company = new Societe($db);
 			$result=$company->create_from_member($object,GETPOST('companyname'));

@@ -307,7 +307,7 @@ if (empty($reshook))
 			$object->phone       = trim($_POST["phone"]);
 			$object->phone_perso = trim($_POST["phone_perso"]);
 			$object->phone_mobile= trim($_POST["phone_mobile"]);
-			$object->email       = trim($_POST["member_email"]);
+			$object->email       = trim($_POST["email"]);
 			$object->skype       = trim($_POST["skype"]);
 			$object->birth       = $birthdate;

@@ -585,7 +585,7 @@ if (empty($reshook))

 	if ($user->rights->adherent->supprimer && $action == 'confirm_delete' && $confirm == 'yes')
 	{
-		$result=$object->delete($id, $user);
+		$result=$object->delete($id);
 		if ($result > 0)
 		{
 			if (! empty($backtopage))
@@ -714,7 +714,7 @@ if (empty($reshook))
 			}
 		}
 	}
-
+	
 	// Actions to build doc
 	$upload_dir = $conf->adherent->dir_output;
 	$permissioncreate=$user->rights->adherent->creer;
@@ -825,16 +825,6 @@ else
 			print '<tr><td><span class="fieldrequired">'.$langs->trans("Login").' / '.$langs->trans("Id").'</span></td><td><input type="text" name="member_login" class="maxwidth200" value="'.(isset($_POST["member_login"])?GETPOST("member_login", 'alpha', 2):$object->login).'"></td></tr>';
 		}

-		// Password
-		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-		{
-			require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
-			$generated_password=getRandomPassword(false);
-			print '<tr><td><span class="fieldrequired">'.$langs->trans("Password").'</span></td><td>';
-			print '<input size="30" maxsize="32" type="text" name="password" value="'.$generated_password.'">';
-			print '</td></tr>';
-		}
-
 		// Type
 		print '<tr><td class="fieldrequired">'.$langs->trans("MemberType").'</td><td>';
 		$listetype=$adht->liste_array();
@@ -872,6 +862,16 @@ else
 		// EMail
 		print '<tr><td>'.($conf->global->ADHERENT_MAIL_REQUIRED?'<span class="fieldrequired">':'').$langs->trans("EMail").($conf->global->ADHERENT_MAIL_REQUIRED?'</span>':'').'</td><td><input type="text" name="member_email" size="40" value="'.(GETPOST('member_email','alpha')?GETPOST('member_email','alpha'):$object->email).'"></td></tr>';

+		// Password
+		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
+		{
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
+			$generated_password=getRandomPassword(false);
+			print '<tr><td><span class="fieldrequired">'.$langs->trans("Password").'</span></td><td>';
+			print '<input size="30" maxsize="32" type="text" name="password" value="'.$generated_password.'">';
+			print '</td></tr>';
+		}
+
 		// Address
 		print '<tr><td class="tdtop">'.$langs->trans("Address").'</td><td>';
 		print '<textarea name="address" wrap="soft" class="quatrevingtpercent" rows="2">'.(GETPOST('address','alpha')?GETPOST('address','alpha'):$object->address).'</textarea>';
@@ -948,6 +948,20 @@ else
 			print $object->showOptionals($extrafields,'edit');
 		}

+		/*
+		 // Third party Dolibarr
+		if (! empty($conf->societe->enabled))
+		{
+		print '<tr><td>'.$langs->trans("LinkedToDolibarrThirdParty").'</td><td class="valeur">';
+		print $form->select_company($object->fk_soc,'socid','',1);
+		print '</td></tr>';
+		}
+
+		// Login Dolibarr
+		print '<tr><td>'.$langs->trans("LinkedToDolibarrUser").'</td><td class="valeur">';
+		print $form->select_dolusers($object->user_id, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
+		print '</td></tr>';
+		*/
        print '<tbody>';
 		print "</table>\n";

@@ -1047,19 +1061,14 @@ else
 		print '<table class="border" width="100%">';

 		// Ref
-		print '<tr><td class="titlefieldcreate">'.$langs->trans("Ref").'</td><td class="valeur">'.$object->id.'</td></tr>';
+		print '<tr><td class="titlefieldcreate">'.$langs->trans("Ref").'</td><td class="valeur" colspan="2">'.$object->id.'</td></tr>';

 		// Login
 		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
 		{
-			print '<tr><td><span class="fieldrequired">'.$langs->trans("Login").' / '.$langs->trans("Id").'</span></td><td><input type="text" name="login" class="maxwidth200" value="'.(isset($_POST["login"])?GETPOST("login",'alpha',2):$object->login).'"></td></tr>';
+			print '<tr><td><span class="fieldrequired">'.$langs->trans("Login").' / '.$langs->trans("Id").'</span></td><td colspan="2"><input type="text" name="login" class="maxwidth200" value="'.(isset($_POST["login"])?GETPOST("login",'alpha',2):$object->login).'"></td></tr>';
 		}

-	// Password
-		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-		{
-			print '<tr><td class="fieldrequired">'.$langs->trans("Password").'</td><td><input type="password" name="pass" class="maxwdith200" value="'.(isset($_POST["pass"])?GETPOST("pass",'',2):$object->pass).'"></td></tr>';
-		}
 		// Morphy
 		$morphys["phy"] = $langs->trans("Physical");
 		$morphys["mor"] = $langs->trans("Morale");
@@ -1081,7 +1090,7 @@ else
 		print "</td></tr>";

 		// Company
-		print '<tr><td id="tdcompany">'.$langs->trans("Company").'</td><td><input type="text" name="societe" class="minwidth100" value="'.(isset($_POST["societe"])?GETPOST("societe",'',2):$object->societe).'"></td></tr>';
+		print '<tr><td id="tdcompany">'.$langs->trans("Company").'</td><td><input type="text" name="societe" size="40" value="'.(isset($_POST["societe"])?GETPOST("societe",'',2):$object->societe).'"></td></tr>';

 		// Civility
 		print '<tr><td>'.$langs->trans("UserTitle").'</td><td>';
@@ -1090,11 +1099,11 @@ else
 		print '</tr>';

 		// Lastname
-		print '<tr><td id="tdlastname">'.$langs->trans("Lastname").'</td><td><input type="text" name="lastname" class="minwidth100" value="'.(isset($_POST["lastname"])?GETPOST("lastname",'',2):$object->lastname).'"></td>';
+		print '<tr><td id="tdlastname">'.$langs->trans("Lastname").'</td><td><input type="text" name="lastname" size="40" value="'.(isset($_POST["lastname"])?GETPOST("lastname",'',2):$object->lastname).'"></td>';
 		print '</tr>';

 		// Firstname
-		print '<tr><td id="tdfirstname">'.$langs->trans("Firstname").'</td><td><input type="text" name="firstname" class="minwidth100" value="'.(isset($_POST["firstname"])?GETPOST("firstname",'',3):$object->firstname).'"></td>';
+		print '<tr><td id="tdfirstname">'.$langs->trans("Firstname").'</td><td><input type="text" name="firstname" size="40" value="'.(isset($_POST["firstname"])?GETPOST("firstname",'',3):$object->firstname).'"></td>';
 		print '</tr>';

 		// Photo
@@ -1113,11 +1122,17 @@ else
 		print '</td></tr>';

 		// EMail
-		print '<tr><td>'.($conf->global->ADHERENT_MAIL_REQUIRED?'<span class="fieldrequired">':'').$langs->trans("EMail").($conf->global->ADHERENT_MAIL_REQUIRED?'</span>':'').'</td><td><input type="text" name="member_email" size="40" value="'.(isset($_POST["member_email"])?GETPOST("member_email",'',2):$object->email).'"></td></tr>';
+		print '<tr><td>'.($conf->global->ADHERENT_MAIL_REQUIRED?'<span class="fieldrequired">':'').$langs->trans("EMail").($conf->global->ADHERENT_MAIL_REQUIRED?'</span>':'').'</td><td><input type="text" name="email" size="40" value="'.(isset($_POST["email"])?GETPOST("email",'',2):$object->email).'"></td></tr>';
+
+		// Password
+		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
+		{
+			print '<tr><td class="fieldrequired">'.$langs->trans("Password").'</td><td><input type="password" name="pass" class="maxwdith200" value="'.(isset($_POST["pass"])?GETPOST("pass",'',2):$object->pass).'"></td></tr>';
+		}

 		// Address
 		print '<tr><td>'.$langs->trans("Address").'</td><td>';
-		print '<textarea name="address" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_2.'">'.(isset($_POST["address"])?GETPOST("address",'',2):$object->address).'</textarea>';
+		print '<textarea name="address" wrap="soft" class="quatrevingtpercent" rows="2">'.(isset($_POST["address"])?GETPOST("address",'',2):$object->address).'</textarea>';
 		print '</td></tr>';

 		// Zip / Town
@@ -1129,7 +1144,7 @@ else

 		// Country
 		//$object->country_id=$object->country_id?$object->country_id:$mysoc->country_id;    // In edit mode we don't force to company country if not defined
-		print '<tr><td>'.$langs->trans('Country').'</td><td>';
+		print '<tr><td width="25%">'.$langs->trans('Country').'</td><td>';
 		print $form->select_country(isset($_POST["country_id"])?$_POST["country_id"]:$object->country_id,'country_id');
 		if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
 		print '</td></tr>';
@@ -1154,7 +1169,7 @@ else
 	    // Skype
 	    if (! empty($conf->skype->enabled))
 	    {
-			    print '<tr><td>'.$langs->trans("Skype").'</td><td><input type="text" name="skype" class="minwidth100" value="'.(isset($_POST["skype"])?GETPOST("skype"):$object->skype).'"></td></tr>';
+			    print '<tr><td>'.$langs->trans("Skype").'</td><td><input type="text" name="skype" size="40" value="'.(isset($_POST["skype"])?GETPOST("skype"):$object->skype).'"></td></tr>';
 	    }

 		// Birthday
@@ -1171,7 +1186,7 @@ else
 		if (! empty( $conf->categorie->enabled ) && !empty( $user->rights->categorie->lire ))
 		{
 			print '<tr><td>' . fieldLabel('Categories', 'memcats') . '</td>';
-			print '<td>';
+			print '<td colspan="2">';
 			$cate_arbo = $form->select_all_categories(Categorie::TYPE_MEMBER, null, null, null, null, 1);
 			$c = new Categorie($db);
 			$cats = $c->containing($object->id, Categorie::TYPE_MEMBER);
@@ -1183,7 +1198,7 @@ else
 		}

 		// Other attributes
-		$parameters=array();
+		$parameters=array("colspan"=>2);
 		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
 		if (empty($reshook) && ! empty($extrafields->attribute_label))
 		{
@@ -1259,7 +1274,7 @@ else
 		 */
 		$head = member_prepare_head($object);

-		dol_fiche_head($head, 'general', $langs->trans("Member"), -1, 'user');
+		dol_fiche_head($head, 'general', $langs->trans("Member"), 0, 'user');

 		// Confirm create user
 		if ($action == 'create_user')
@@ -1402,12 +1417,12 @@ else
 		if (! empty($conf->societe->enabled)) $rowspan++;

 		$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/list.php">'.$langs->trans("BackToList").'</a>';
-
+		
 		dol_banner_tab($object, 'rowid', $linkback);
-
+        
        print '<div class="fichecenter">';
        print '<div class="fichehalfleft">';
-
+        
        print '<div class="underbanner clearboth"></div>';
 		print '<table class="border centpercent">';

@@ -1449,15 +1464,15 @@ else
 			}
 			print '</td></tr>';
 		}
-
+		
        print '</table>';
-
+        
        print '</div>';
        print '<div class="fichehalfright"><div class="ficheaddleft">';
-
+       
        print '<div class="underbanner clearboth"></div>';
        print '<table class="border tableforfield" width="100%">';
-
+		
 		// Birthday
 		print '<tr><td class="titlefield">'.$langs->trans("Birthday").'</td><td class="valeur">'.dol_print_date($object->birth,'day').'</td></tr>';

@@ -1473,8 +1488,13 @@ else
 			print '</td></tr>';
 		}

-    	// Other attributes
-    	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+		// Other attributes
+		$parameters=array('colspan'=>2);
+		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+		if (empty($reshook) && ! empty($extrafields->attribute_label))
+		{
+			print $object->showOptionals($extrafields, 'view', $parameters);
+		}

        // Date end subscription
        print '<tr><td>'.$langs->trans("SubscriptionEndDate").'</td><td class="valeur">';
@@ -1499,7 +1519,7 @@ else
 	        }
        }
        print '</td></tr>';
-
+		
 		// Third party Dolibarr
 		if (! empty($conf->societe->enabled))
 		{
@@ -1576,12 +1596,12 @@ else
        print '<div style="clear:both"></div>';

        dol_fiche_end();
-
-
+        
+        
 		/*
 		 * Hotbar
 		 */
-
+        
 		print '<div class="tabsAction">';
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
@@ -1597,7 +1617,7 @@ else
 				{
 					print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Modify").'</font></div>';
 				}
-
+	
 				// Validate
 				if ($object->statut == -1)
 				{
@@ -1610,7 +1630,7 @@ else
 						print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Validate").'</font></div>';
 					}
 				}
-
+	
 				// Reactivate
 				if ($object->statut == 0)
 				{
@@ -1623,7 +1643,7 @@ else
 						print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Reenable")."</font></div>";
 					}
 				}
-
+	
 				// Send card by email
 				if ($user->rights->adherent->creer)
 				{
@@ -1641,7 +1661,7 @@ else
 				{
 					print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("SendCardByMail")."</font></div>";
 				}
-
+	
 				// Terminate
 				if ($object->statut >= 1)
 				{
@@ -1654,7 +1674,7 @@ else
 						print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Resiliate")."</font></div>";
 					}
 				}
-
+	
 				// Create third party
 				if (! empty($conf->societe->enabled) && ! $object->fk_soc)
 				{
@@ -1668,7 +1688,7 @@ else
 						print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("CreateDolibarrThirdParty")."</font></div>";
 					}
 				}
-
+	
 				// Create user
 				if (! $user->societe_id && ! $object->user_id)
 				{
@@ -1682,7 +1702,7 @@ else
 						print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("CreateDolibarrLogin")."</font></div>";
 					}
 				}
-
+	
 				// Delete
 				if ($user->rights->adherent->supprimer)
 				{
@@ -1692,12 +1712,12 @@ else
 				{
 					print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Delete")."</font></div>";
 				}
-
+	
 				// Action SPIP
 				if (! empty($conf->mailmanspip->enabled) && ! empty($conf->global->ADHERENT_USE_SPIP))
 				{
 					$isinspip = $mailmanspip->is_in_spip($object);
-
+	
 					if ($isinspip == 1)
 					{
 						print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$object->id.'&action=del_spip">'.$langs->trans("DeleteIntoSpip")."</a></div>\n";
@@ -1707,7 +1727,7 @@ else
 						print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$object->id.'&action=add_spip">'.$langs->trans("AddIntoSpip")."</a></div>\n";
 					}
 				}
-
+	
 			}
 		}
 		print '</div>';
@@ -1717,11 +1737,11 @@ else
 			print '<br><br><font class="error">'.$langs->trans('SPIPConnectionFailed').': '.$mailmanspip->error.'</font>';
 		}

-
-
+		
+		
 		print '<div class="fichecenter"><div class="fichehalfleft">';
 		print '<a name="builddoc"></a>'; // ancre
-
+		
 		// Documents generes
 		$filename = dol_sanitizeFileName($object->ref);
 		//$filename =  'tmp_cards.php';
@@ -1733,15 +1753,15 @@ else

 		print $formfile->showdocuments('member', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $object->default_lang, '', $object);
 		$somethingshown = $formfile->numoffiles;
-
+		
 		// Show links to link elements
 		//$linktoelem = $form->showLinkToObjectBlock($object, null, array('subscription'));
 		//$somethingshown = $form->showLinkedObjectBlock($object, '');
-
+		
 		// Show links to link elements
 		/*$linktoelem = $form->showLinkToObjectBlock($object,array('order'));
 		 if ($linktoelem) print ($somethingshown?'':'<br>').$linktoelem;
-
+		
 		 // Link for paypal payment
 		 /*
 		 if (! empty($conf->paypal->enabled) && $object->statut != 0) {
@@ -1750,15 +1770,15 @@ else
 		 }
 		 */
 		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
-
+		
 		// List of actions on element
        /* Already in tab Agenda/Events
        include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
 		$formactions = new FormActions($db);
 		$somethingshown = $formactions->showactions($object, 'member', $socid);
 		*/
-		print '</div></div></div>';
-
+		print '</div></div></div>';		
+		
 	}
 }

--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -198,6 +198,9 @@ class Adherent extends CommonObject
 		$infos.= $langs->transnoentities("Town").": ".$this->town."\n";
 		$infos.= $langs->transnoentities("Country").": ".$this->country."\n";
 		$infos.= $langs->transnoentities("EMail").": ".$this->email."\n";
+        $infos.= $langs->transnoentities("PhonePro").": ".$this->phone."\n";
+        $infos.= $langs->transnoentities("PhonePerso").": ".$this->phone_perso."\n";
+        $infos.= $langs->transnoentities("PhoneMobile").": ".$this->phone_mobile."\n";
 		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
 		{
 		    $infos.= $langs->transnoentities("Login").": ".$this->login."\n";
@@ -209,23 +212,6 @@ class Adherent extends CommonObject

 		// Substitutions
 		$substitutionarray=array(
-				'__DOL_MAIN_URL_ROOT__'=>DOL_MAIN_URL_ROOT,
-				'__ID__'=>$msgishtml?dol_htmlentitiesbr($this->id):$this->id,
-				'__CIVILITY__'=>$this->getCivilityLabel(),
-				'__FIRSTNAME__'=>$msgishtml?dol_htmlentitiesbr($this->firstname):$this->firstname,
-				'__LASTNAME__'=>$msgishtml?dol_htmlentitiesbr($this->lastname):$this->lastname,
-				'__FULLNAME__'=>$msgishtml?dol_htmlentitiesbr($this->getFullName($langs)):$this->getFullName($langs),
-				'__COMPANY__'=>$msgishtml?dol_htmlentitiesbr($this->societe):$this->societe,
-				'__ADDRESS__'=>$msgishtml?dol_htmlentitiesbr($this->address):$this->address,
-				'__ZIP__'=>$msgishtml?dol_htmlentitiesbr($this->zip):$this->zip,
-				'__TOWN_'=>$msgishtml?dol_htmlentitiesbr($this->town):$this->town,
-				'__COUNTRY__'=>$msgishtml?dol_htmlentitiesbr($this->country):$this->country,
-				'__EMAIL__'=>$msgishtml?dol_htmlentitiesbr($this->email):$this->email,
-				'__BIRTH__'=>$msgishtml?dol_htmlentitiesbr($birthday):$birthday,
-				'__PHOTO__'=>$msgishtml?dol_htmlentitiesbr($this->photo):$this->photo,
-				'__LOGIN__'=>$msgishtml?dol_htmlentitiesbr($this->login):$this->login,
-				'__PASSWORD__'=>$msgishtml?dol_htmlentitiesbr($this->pass):$this->pass,
-				// For backward compatibility
 				'%DOL_MAIN_URL_ROOT%'=>DOL_MAIN_URL_ROOT,
 				'%ID%'=>$msgishtml?dol_htmlentitiesbr($this->id):$this->id,
 				'%CIVILITY%'=>$this->getCivilityLabel(),
@@ -242,6 +228,11 @@ class Adherent extends CommonObject
 				'%PHOTO%'=>$msgishtml?dol_htmlentitiesbr($this->photo):$this->photo,
 				'%LOGIN%'=>$msgishtml?dol_htmlentitiesbr($this->login):$this->login,
 				'%PASSWORD%'=>$msgishtml?dol_htmlentitiesbr($this->pass):$this->pass,
+                '%TYPE%'=>$msgishtml?dol_htmlentitiesbr($this->type):$this->type,
+                '%PHONE_PRO%'=>$msgishtml?dol_htmlentitiesbr($this->phone):$this->phone,
+                '%PHONE_PERSO%'=>$msgishtml?dol_htmlentitiesbr($this->phone_perso):$this->phone_perso,
+                '%PHONE_MOBILE%'=>$msgishtml?dol_htmlentitiesbr($this->phone_mobile):$this->phone_mobile,
+				// For backward compatibility
 				'%INFOS%'=>$msgishtml?dol_htmlentitiesbr($infos):$infos,
 				'%SOCIETE%'=>$msgishtml?dol_htmlentitiesbr($this->societe):$this->societe,
 				'%PRENOM%'=>$msgishtml?dol_htmlentitiesbr($this->firstname):$this->firstname,
@@ -250,10 +241,16 @@ class Adherent extends CommonObject
 				'%VILLE%'=>$msgishtml?dol_htmlentitiesbr($this->town):$this->town,
 				'%PAYS%'=>$msgishtml?dol_htmlentitiesbr($this->country):$this->country,
 		);
+		// Add extrafields as substitution key %EXTRA_XXX%
+		foreach($this->array_options as $key => $val)
+		{
+			$keyshort=preg_replace('/^(options|extra)_/','',$key);
+			$substitutionarray['%EXTRA_'.$keyshort.'%']=$val;
+		}

-		complete_substitutions_array($substitutionarray, $langs, $this);
+		complete_substitutions_array($substitutionarray, $langs);

-		return make_substitutions($text, $substitutionarray, $langs);
+		return make_substitutions($text,$substitutionarray);
 	}


@@ -345,7 +342,7 @@ class Adherent extends CommonObject
                {
                    // Add link to user
                    $sql = "UPDATE ".MAIN_DB_PREFIX."user SET";
-                    $sql.= " fk_member = ".$this->id;
+                    $sql.= " fk_member = '".$this->id."'";
                    $sql.= " WHERE rowid = ".$this->user_id;
                    dol_syslog(get_class($this)."::create", LOG_DEBUG);
                    $resql = $this->db->query($sql);
@@ -705,13 +702,11 @@ class Adherent extends CommonObject
     *  Fonction qui supprime l'adherent et les donnees associees
     *
     *  @param	int		$rowid		Id of member to delete
-     *	@param	User	$user		User object
-     *	@param	int		$notrigger	1=Does not execute triggers, 0= execute triggers
     *  @return	int					<0 if KO, 0=nothing to do, >0 if OK
     */
-    function delete($rowid, $user, $notrigger=0)
+    function delete($rowid)
    {
-        global $conf, $langs;
+        global $conf, $langs, $user;

        $result = 0;
 		$error=0;
@@ -722,14 +717,6 @@ class Adherent extends CommonObject

        $this->db->begin();

-        if (! $error && ! $notrigger)
-        {
-            // Call trigger
-            $result=$this->call_trigger('MEMBER_DELETE',$user);
-            if ($result < 0) $error++;
-            // End call triggers
-        }
-
        // Remove category
        $sql = "DELETE FROM ".MAIN_DB_PREFIX."categorie_member WHERE fk_member = ".$rowid;
        dol_syslog(get_class($this)."::delete", LOG_DEBUG);
@@ -797,6 +784,16 @@ class Adherent extends CommonObject
        	}
        }

+        if (! $error)
+        {
+            // Call trigger
+            $result=$this->call_trigger('MEMBER_DELETE',$user);
+            if ($result < 0) { $error++; }
+            // End call triggers
+        }
+
+
+
        if (! $error)
        {
        	$this->db->commit();
@@ -1099,7 +1096,7 @@ class Adherent extends CommonObject
        elseif ($ref || $fk_soc) {
        	$sql.= " AND d.entity IN (".getEntity().")";
        	if ($ref) $sql.= " AND d.rowid='".$this->db->escape($ref)."'";
-        	elseif ($fk_soc > 0) $sql.= " AND d.fk_soc=".$fk_soc;
+        	elseif ($fk_soc) $sql.= " AND d.fk_soc='".$fk_soc."'";
        }
        elseif ($ref_ext)
        {
@@ -1580,85 +1577,40 @@ class Adherent extends CommonObject
    /**
     *    	Return clicable name (with picto eventually)
     *
-     *		@param	int		$withpictoimg	0=No picto, 1=Include picto into link, 2=Only picto, -1=Include photo into link, -2=Only picto photo, -3=Only photo very small)
-     *		@param	int		$maxlen			length max label
-     *		@param	string	$option			Page for link
-     *      @param  string  $mode           ''=Show firstname and lastname, 'firstname'=Show only firstname, 'login'=Show login, 'ref'=Show ref
-     *      @param  string  $morecss        Add more css on link
+     *		@param	int		$withpicto		0=No picto, 1=Include picto into link, 2=Only picto
+     *		@param	int		$maxlen			length max libelle
+     *		@param	string	$option			Page lien
     *		@return	string					Chaine avec URL
     */
-    function getNomUrl($withpictoimg=0,$maxlen=0,$option='card',$mode='',$morecss='')
+    function getNomUrl($withpicto=0,$maxlen=0,$option='card')
    {
-        global $conf, $langs;
+        global $langs;

-        if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && $withpictoimg) $withpictoimg=0;
-
-        $result=''; $label='';
-        $link=''; $linkstart=''; $linkend='';
-
-        if (! empty($this->photo))
-        {
-            $label.= '<div class="photointooltip">';
-            $label.= Form::showphoto('memberphoto', $this, 80, 0, 0, 'photowithmargin photologintooltip', 'small', 0, 1);
-            $label.= '</div><div style="clear: both;"></div>';
-        }
-
-        $label.= '<div class="centpercent">';
-        $label.= '<u>' . $langs->trans("Member") . '</u>';
+        $result='';
+        $label = '<u>' . $langs->trans("ShowMember") . '</u>';
        if (! empty($this->ref))
            $label.= '<br><b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
        if (! empty($this->firstname) || ! empty($this->lastname))
            $label.= '<br><b>' . $langs->trans('Name') . ':</b> ' . $this->getFullName($langs);
-        $label.='</div>';
+        $linkclose = '" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';

+        $link=''; $linkend='';
        if ($option == 'card' || $option == 'category')
        {
-            $link = '<a href="'.DOL_URL_ROOT.'/adherents/card.php?rowid='.$this->id.'"';
+            $link = '<a href="'.DOL_URL_ROOT.'/adherents/card.php?rowid='.$this->id.$linkclose;
+            $linkend='</a>';
        }
        if ($option == 'subscription')
        {
-            $link = '<a href="'.DOL_URL_ROOT.'/adherents/subscription.php?rowid='.$this->id.'"';
+            $link = '<a href="'.DOL_URL_ROOT.'/adherents/subscription.php?rowid='.$this->id.$linkclose;
+            $linkend='</a>';
        }

-        $linkclose="";
-        if (empty($notooltip))
-        {
-            if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-            {
-                $langs->load("users");
-                $label=$langs->trans("ShowUser");
-                $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
-            }
-            $linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
-            $linkclose.= ' class="classfortooltip'.($morecss?' '.$morecss:'').'"';
-        }
-
-        $link.=$linkclose.'>';
-        $linkend='</a>';
-
-        //if ($withpictoimg == -1) $result.='<div class="nowrap">';
-        $result.=$link;
-        if ($withpictoimg)
-        {
-            $paddafterimage='';
-            if (abs($withpictoimg) == 1) $paddafterimage='style="margin-right: 3px;"';
-            // Only picto
-            if ($withpictoimg > 0) $picto='<div class="inline-block nopadding valignmiddle'.($morecss?' userimg'.$morecss:'').'">'.img_object('', 'user', $paddafterimage.' '.($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).'</div>';
-            // Picto must be a photo
-            else $picto='<div class="inline-block nopadding valignmiddle'.($morecss?' userimg'.$morecss:'').'"'.($paddafterimage?' '.$paddafterimage:'').'>'.Form::showphoto('memberphoto', $this, 0, 0, 0, 'userphoto'.($withpictoimg==-3?'small':''), 'mini', 0, 1).'</div>';
-            $result.=$picto;
-        }
-        if ($withpictoimg > -2 && $withpictoimg != 2)
-        {
-            if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $result.='<div class="inline-block nopadding valignmiddle'.((! isset($this->statut) || $this->statut)?'':' strikefordisabled').($morecss?' usertext'.$morecss:'').'">';
-            if ($mode == 'login') $result.=dol_trunc($this->login, $maxlen);
-            elseif ($mode == 'ref') $result.=$this->id;
-            else $result.=$this->getFullName($langs,'',($mode == 'firstname' ? 2 : -1),$maxlen);
-            if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $result.='</div>';
-        }
-        $result.=$linkend;
-        //if ($withpictoimg == -1) $result.='</div>';
+        $picto='user';

+        if ($withpicto) $result.=($link.img_object('', $picto, 'class="classfortooltip"').$linkend);
+        if ($withpicto && $withpicto != 2) $result.=' ';
+        $result.=$link.(($withpicto != 2) ? ($maxlen?dol_trunc($this->ref,$maxlen):$this->ref) : '').$linkend;
        return $result;
    }

@@ -1780,7 +1732,7 @@ class Adherent extends CommonObject
        $sql = "SELECT count(a.rowid) as nb";
        $sql.= " FROM ".MAIN_DB_PREFIX."adherent as a";
        $sql.= " WHERE a.statut > 0";
-        $sql.= " AND a.entity IN (".getEntity('adherent').")";
+        $sql.= " AND a.entity IN (".getEntity('adherent', 1).")";

        $resql=$this->db->query($sql);
        if ($resql)
@@ -1818,7 +1770,7 @@ class Adherent extends CommonObject
        $sql = "SELECT a.rowid, a.datefin, a.statut";
        $sql.= " FROM ".MAIN_DB_PREFIX."adherent as a";
        $sql.= " WHERE a.statut = 1";
-        $sql.= " AND a.entity IN (".getEntity('adherent').")";
+        $sql.= " AND a.entity IN (".getEntity('adherent', 1).")";
        $sql.= " AND (a.datefin IS NULL or a.datefin < '".$this->db->idate($now)."')";

        $resql=$this->db->query($sql);
@@ -1830,7 +1782,7 @@ class Adherent extends CommonObject
 	        $response->warning_delay=$conf->adherent->subscription->warning_delay/60/60/24;
 	        $response->label=$langs->trans("MembersWithSubscriptionToReceive");
 	        $response->url=DOL_URL_ROOT.'/adherents/list.php?mainmenu=members&amp;statut=1&amp;filter=outofdate';
-	        $response->img=img_object('',"user");
+	        $response->img=img_object($langs->trans("Members"),"user");

            $adherentstatic = new Adherent($this->db);

@@ -1873,16 +1825,18 @@ class Adherent extends CommonObject

        $langs->load("orders");

-		if (! dol_strlen($modele)) {
-
-		    $modele = 'standard';
-
-		    if ($this->modelpdf) {
-			    $modele = $this->modelpdf;
-		    } elseif (! empty($conf->global->ADHERENT_ADDON_PDF)) {
-			    $modele = $conf->global->ADHERENT_ADDON_PDF;
-		    }
-	    }
+        // Positionne le modele sur le nom du modele a utiliser
+        if (! dol_strlen($modele))
+        {
+            if (! empty($conf->global->ADHERENT_ADDON_PDF))
+            {
+                $modele = $conf->global->ADHERENT_ADDON_PDF;
+            }
+            else
+            {
+                $modele = 'standard';
+            }
+        }

        $modelpath = "core/modules/member/doc/";

--- a/htdocs/adherents/class/adherent_type.class.php
+++ b/htdocs/adherents/class/adherent_type.class.php
@@ -1,8 +1,8 @@
 <?php
-/* Copyright (C) 2002		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2004-2008	Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2009-2017	Regis Houssin			<regis.houssin@capnetworks.com>
- * Copyright (C) 2016		Charlie Benke			<charlie@patas-monkey.com>
+/* Copyright (C) 2002      Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2009      Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2016      Charlie Benke        <charlie@patas-monkey.com>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -36,13 +36,7 @@ class AdherentType extends CommonObject
 	public $table_element = 'adherent_type';
 	public $element = 'adherent_type';
 	public $picto = 'group';
-
-	/**
-	 * @var string
-	 * @deprecated Use label
-	 * @see label
-	 */
-	public $libelle;
+	
 	/** @var string Label */
 	public $label;
 	/**
@@ -87,13 +81,12 @@ class AdherentType extends CommonObject
        global $conf;

        $this->statut=(int) $this->statut;
-        $this->label=(!empty($this->libelle)?trim($this->libelle):trim($this->label));

        $sql = "INSERT INTO ".MAIN_DB_PREFIX."adherent_type (";
        $sql.= "libelle";
        $sql.= ", entity";
        $sql.= ") VALUES (";
-        $sql.= "'".$this->db->escape($this->label)."'";
+        $sql.= "'".$this->db->escape($this->libelle)."'";
        $sql.= ", ".$conf->entity;
        $sql.= ")";

@@ -124,17 +117,17 @@ class AdherentType extends CommonObject

    	$error=0;

-    	$this->label=(!empty($this->libelle)?trim($this->libelle):trim($this->label));
+        $this->libelle=trim($this->libelle);

        $sql = "UPDATE ".MAIN_DB_PREFIX."adherent_type ";
        $sql.= "SET ";
        $sql.= "statut = ".$this->statut.",";
-        $sql.= "libelle = '".$this->db->escape($this->label) ."',";
-        $sql.= "subscription = '".$this->db->escape($this->subscription)."',";
+        $sql.= "libelle = '".$this->db->escape($this->libelle) ."',";
+        $sql.= "subscription = '".$this->subscription."',";
        $sql.= "note = '".$this->db->escape($this->note)."',";
-        $sql.= "vote = '".$this->db->escape($this->vote)."',";
+        $sql.= "vote = '".$this->vote."',";
        $sql.= "mail_valid = '".$this->db->escape($this->mail_valid)."'";
-        $sql .= " WHERE rowid =".$this->id;
+        $sql.= " WHERE rowid =".$this->id;

        $result = $this->db->query($sql);
        if ($result)
@@ -252,7 +245,7 @@ class AdherentType extends CommonObject

        $sql = "SELECT rowid, libelle";
        $sql.= " FROM ".MAIN_DB_PREFIX."adherent_type";
-        $sql.= " WHERE entity = ".$conf->entity;
+	$sql.= " WHERE entity IN (".getEntity('adherent').")";

        $resql=$this->db->query($sql);
        if ($resql)
@@ -314,7 +307,7 @@ class AdherentType extends CommonObject
    {
    	return '';
    }
-
+    
    /**
     *     getMailOnValid
     *
--- a/htdocs/adherents/class/adherentstats.class.php
+++ b/htdocs/adherents/class/adherentstats.class.php
@@ -65,7 +65,7 @@ class AdherentStats extends Stats
 		$this->field='subscription';

 		$this->where.= " m.statut != 0";
-		$this->where.= " AND p.fk_adherent = m.rowid AND m.entity IN (".getEntity('adherent').")";
+		$this->where.= " AND p.fk_adherent = m.rowid AND m.entity IN (".getEntity('adherent', 1).")";
 		//if (!$user->rights->societe->client->voir && !$user->societe_id) $this->where .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
 		if($this->memberid)
 		{
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`Files and tools were moved into htdocs/modulebuilder/template`