Merge pull request #2 from Dolibarr/develop

Update from master

.github/CONTRIBUTING.md

@@ -141,7 +141,7 @@ Translations done on transifex are available in the next major release.
 
 Note: Sometimes, the source text (english) is modified. In such a case, the translation is reset. Transifex assume that if the original source
 has changed, the translation is surely no more correct so must be done again. But old translation is not lost and you can use the tab "History"
-to retreive all old translation of a source text, and restore the translation in one click with no need to retranslate it if there is no need to. 
+to retrieve all old translation of a source text, and restore the translation in one click with no need to retranslate it if there is no need to.
 
 
 ### Resources

.travis.yml

@@ -124,13 +124,13 @@ install:
   if [ "$TRAVIS_PHP_VERSION" = '5.6' ] || [ "$TRAVIS_PHP_VERSION" = '7.0' ] || [ "$TRAVIS_PHP_VERSION" = '7.1' ] \
      [ "$TRAVIS_PHP_VERSION" = '7.2' ] || [ "$TRAVIS_PHP_VERSION" = '7.3' ] || [ "$TRAVIS_PHP_VERSION" = '7.4' ]; then
     composer -n require phpunit/phpunit ^5 \
-                        php-parallel-lint/php-parallel-lint ^0 \
+                        php-parallel-lint/php-parallel-lint ^1 \
                         php-parallel-lint/php-console-highlighter ^0 \
                         squizlabs/php_codesniffer ^3
   fi
   if [ "$TRAVIS_PHP_VERSION" = 'nightly' ]; then
       composer -n require --ignore-platform-reqs phpunit/phpunit ^5 \
-                                                 php-parallel-lint/php-parallel-lint ^1 \
+                                                 php-parallel-lint/php-parallel-lint ^1.2 \
                                                  php-parallel-lint/php-console-highlighter ^0 \
                                                  squizlabs/php_codesniffer ^3
     fi
@@ -428,7 +428,7 @@ script:
 
 after_script:
 - |
-  echo "After script - Output lines of dolibarr.log"
+  echo "After script - Output last lines of dolibarr.log"
   ls $TRAVIS_BUILD_DIR/documents
   #cat $TRAVIS_BUILD_DIR/documents/dolibarr.log
   sudo tail -n 50 $TRAVIS_BUILD_DIR/documents/dolibarr.log

ChangeLog

@@ -7,26 +7,240 @@ English Dolibarr ChangeLog
 For users:
 NEW: Add module "Credit transfer SEPA" to manage payment of vendors using bank credit transfer SEPA files.
 NEW: Module Reception (for a more accurate management of your receptions) moved from experimental to stable.
+NEW: Several security issues after a private bug bounty campaign. 
+NEW: #15065 Fix formatting
+NEW: #15065 Put the product label in bold in the PDF templates if configured
+NEW: Accountancy - Add chart of sub accounts
+NEW: Accountancy - Add options to disable binding on sales, purchases & expense reports independently of the modules
+NEW: Accountancy balance - Add a input to show subtotal by group
+NEW: Accountancy - Move to real ledger, real journals, menu disposition
+NEW: Accountancy - On transfers, select the periodicity by default
+NEW: Add 2 rules for emailcollector: Message send/not sent from Dolibarr
+NEW: Add a counter of number of words of pages in website module
+NEW: add alert before change thirdparty in takepos
+NEW: Add a page to list Stock at a given date.
+NEW: Add a start date to begin binding in accountancy
+NEW: Add a stat page to list popularity of products on invoices
+NEW: Add calendar selection for agenda view
+NEW: add class for ticket edition (pdf or odt)
+NEW: Add column payment term into list of supplier invoices.
+NEW: Add column quantity in product margin page
+NEW: Add column vat rate in page to define accounting account on product/service
+NEW: Add common list function for available app/module page
+NEW: add costprice in fields of products list
+NEW: ADDED IMPORT TOOL FOR CUSTOMER ORDER, PO, PROPOSAL MODULE, SUPPLIER INVOICE
+NEW: Added incoterms to substitution array
+NEW: Add employee in expense report binding page
+NEW: Add export for various payment
+NEW: add extra fields labels and values in mail on create ticket
+NEW: Add extrafields support on ECM module
+NEW: Add filter rules "is answer" and "is not answer" in email collector
+NEW: Add focus when editing on product/stock/product.php Close #14548
+NEW: add formConfirm hook on product page
+NEW: add free text on each terminal of cash desk
+NEW: Add function dolButtonToOpenUrlInDialogPopup() to be able to open
+NEW: Add global search for customer payments and vendor payments
+NEW: Add global search for miscellaneous payments
+NEW: Add helper function for table headers with numbers
+NEW: add hooks on stats pages
+NEW: Add link to edit property from search result of website pages
+NEW: Add link to reset qty on supplier dispatch page
+NEW: add MAIN_EMAILCOLLECTOR_MAIL_WITHOUT_HEADER const to remove header in email collector
+NEW: Add Manufacturing Orders into the automatic ECM
+NEW: add margin info in invoice list
+NEW: Add mass action to set category on a list of website pages.
+NEW: Add mass deletion for events
+NEW: Add __MEMBER_TYPE__ substitution key
+NEW: Add message in error_log after detection of SQL or script injection
+NEW: Add module Credit transfer SEPA to manage payment of supplier using
+NEW: Add more filters on monthly statement list
+NEW: Add option TAKEPOS_CAN_FORCE_BANK_ACCOUNT_DURING_PAYMENT
+NEW: Add option to define a default warehouse at user level
+NEW: Add option to include products without alert in replenish
+NEW: add order by lastname and firstname by default in get sales representatives
+NEW: Add param to not show links when output tags
+NEW: Add PDF document templates for warehouses (list of stock)
+NEW: Add property cssview when declaring fields of an object
+NEW: Add prospect status managment for the contact with managment of custom icon
+NEW: Add public note on products. This also partially fix the #14342
+NEW: Add quick dropdown menu in top right menu (MAIN_USE_TOP_MENU_QUICKADD_DROPDOWN)
+NEW: add region in export companies and contacts
+NEW: add rights on margin info on invoice list
+NEW: Add search param for close date on order list
+NEW: add send context for ticket
+NEW: Add show preview for mail attachement on form mail
+NEW: add state origin for product
+NEW: add State/Province origin for products
+NEW: Add the workflow interaction close intervention on closing ticket
+NEW: Add third order printer to TakePOS
+NEW: add tracking number in list and search_all items
+NEW: add two hooks printFieldListFrom and printFieldSearchParam
+NEW: Add __TYPE__ substitution key
+NEW: Add validation of MX domain for emails
+NEW: add vcard for aderent and user
+NEW: add week number for month view in agenda
+NEW: Algeria data (tva and forme_juridique)
+NEW: Allow click on all header numbers on commerce area
+NEW: Allow to reopen interventions (green button)
+NEW: Allow zero quality on supplier/vendor order line
+NEW: Appearance tab in TakePOS with more visual parameters
+NEW: Better currency rate editor
+NEW: Calculate the virtual stock in transverse mode ( not on getEntity('commande'), ... but on getEntity('stock') )
+NEW: Can add event to log into blockedlog module with a constant.
+NEW: Can build vendor invoice from vendor orders
+NEW: Can change a product in line of recurring invoice or contract
+NEW: Can change size of logo on PDF documents
+NEW: Can change VAT rate of all lines of a draft object in one step.
+NEW: Can define date range of validity of a login during creation
+NEW: Can disable, from edit page, the whole web site
+NEW: can edit and set sales representatives directly on thirdparty card
+NEW: Can edit the list of sending email profiles.
+NEW: Can enable/disable users in bulk actions
+NEW: Can filter on accounting system ref in export of chart of account
+NEW: Can filter on container type, language and tags in the list of pages
+NEW: Can force the antivirus from conf file or autoprepend ini setup.
+NEW: Can hide eatby, sellby dates with option PRODUCT_DISABLE_SELLBY and PRODUCT_DISABLE_EATBY
+NEW: Can import proposals, sales orders, supplier invoices
+NEW: can set a dedicated SMTP config for sending email from public ticket interface
+NEW: Can set tags/categories to website pages.
+NEW: Can set type of price without tax per default for new sale price creation
+NEW: Can use desired stock of a given warehouse for replenishment
+NEW: Can use THEME_DARKMODEENABLED=2 for a preview of theme in dark mode
+NEW: change thirdparty with barcode scan in takepos
+NEW: Common behavior for monthly leave list view
+NEW: conf to allow show full arbo in warehouse getnomurl
+NEW: convert all subscription in datetime
+NEW: create thirdparty customer from TAKEPOS
+NEW: Date shipment from order accepts hours
+NEW: Declinaison price level compatibility
+NEW: Delayed payment in TakePOS
+NEW: Development of module Recruitment
+NEW: display date range if exist in takepos
+NEW: display resiliate status in takepos for member
+NEW: display stat for BOM on "object referent"/linked Object product tab
+NEW: edit and update a ticket
+NEW: edit or delete dispatched lines
+NEW: Email configuration - Allow auto signed certificat when smtp ssl activated
+NEW: enable free emails input with select2
+NEW: endpoint getContacts and Clean results
+NEW: Events in agenda for contact
+NEW: Field to link website page to an other object
+NEW: Fill ECM src object fields in dol_add_file_process
+NEW: filter on progress column in task list
+NEW: filter product list by country and/or state/province
+NEW: format tickets sent by mail in public interface
+NEW: add juridical status for Algeria
+NEW: form to add customer/supplier into categories
+NEW: Framework is ready for CSRF token protection on explicit GET URLs.
+NEW: get all child recursively
+NEW: Get contacts list of a given order
+NEW: helper functions for export with phpspreadsheet
+NEW: hide closed contract lines
+NEW: hide label in pdf for variants
+NEW: Hook on propal card
+NEW: If specific help page is available, we change color of icon
+NEW: Include the tag editor of page as a popup into website editor
+NEW: Introduce constant FACTUREFOURN_REUSE_NOTES_ON_CREATE_FROM
+NEW: Introducing new modal boxes in TakePOS
+NEW: Keep takepos terminal when login/logout
+NEW: Link on balance to the ledger
+NEW: MAIN_EMAILCOLLECTOR_MAIL_WITHOUT_HEADER const in email collector
+NEW: manage errors on update extra fields in ticket card
+NEW: mass-actions for the event list view
+NEW: Module Intracomm report
+NEW: More filter for "View change logs"
+NEW: multicurrency total in takepos
+NEW: multiselect type and date to date filter
+NEW: Nature of product is now a dictionay
+NEW: new line template: hidden conf to fill service dates from the last service line
+NEW: PDF model storm for delivery
+NEW: possibilty to group payments by mode and show their subtotal
+NEW: Print payment method and change in TakePOS
+NEW: Priority and transparency from external calendar events
+NEW: Products Import/Export 'default warehouse' and 'use batch number' fields
+NEW: Purchase price table: Added filterable table columns
+NEW: rate editor for multicurrency
+NEW: ref_ext field for Commande lines, order lines, Attributes and Combinations, Invoice lines, payments, order lines
+NEW: remove new lines in mail on add ticket message
+NEW: restrict thirdparty to customer in takepos
+NEW: Allow to edit "demand reason" field though API
+NEW: Rule "email to" accept wildcard *
+NEW: Save filter of the project homepage
+NEW: Select-able columns on customer invoice paymnet list
+NEW: Select-able columns on miscellaneous payments + more data columns
+NEW: Select-able columns on social taxes list
+NEW: Select-able columns on supplier invoice payment list
+NEW: send context and remove new lines on create ticket
+NEW: set entity when creating invoice on takepos
+NEW: Show available stock in TakePOS
+NEW: Show category filter on lists only when user have rights to read categories
+NEW: Show header number and make it clickable in warehouse arean, payment area, shipment area
+NEW: Show image of user in the combo select of users
+NEW: Show label on batch card
+NEW: Show line number on intervention card (via MAIN_VIEW_LINE_NUMBER)
+NEW: show links for select and multi-select in category extra field
+NEW: Show module and permission ids on user/group rights (only admin)
+NEW: Show place from events on import calender
+NEW: Show references in contract form on interventions
+NEW: Show tags and status in search list of website pages
+NEW: Show user on external calender events (when found)
+NEW: subject title with company name instead of application title in ticket message
+NEW: Support for Samba4 AD
+NEW: TakePOS connector compatibility with RECEIPT PRINTERS module
+NEW: TakePOS Gift Receipt
+NEW: TakePOS Multicurrency compatibility
+NEW: The global header of a website can also have dynamic content
+NEW: Third-Party Import new fields: mother company,outstanding debt limit,bank account,incoterms
+NEW: Thirdparty module : box on customer/supplier tab for invoice outsantding amount late
+NEW: ticket classification on create from email collector
+NEW: Ticket message notifications when edited from public interface
+NEW: translate classification labels in ticket
+NEW: triggers create, modify, delete
+NEW: VAT for Algeria
+NEW: Use preselect third-party from list on new card
+NEW: Vat report - Invert constant to show by default zero vat in reports
+NEW: website page fields selection
+NEW: Weighing Scale compatibility with TakePOS connector
+NEW: When creating a user from a member linked to a thirdparty, you can choose to create if as external or internal user
+NEW: Add clone functionality on miscellaneous payment
 
+For developers:
+NEW: Can use dynamic code into the 'enabled' property of DAO fields
+NEW: API Can update a payment
+NEW: api get member by thirdparty
+NEW: API get thirdparty by barcode
+NEW: API get users by email / login
+NEW: fetch contact by email with REST API
+NEW: field ref_ext in llx_commandedet
+NEW: fields ref_ext for Attributes and Combinations
+NEW: get state by REST API
+NEW: get state dictionnary by REST API
+NEW: Improve Product API for variant products
+NEW: Oauth SCOPE for Admin SDK
+NEW: Retrieve discount from invoice from API
+NEW: standardizes API thirdparties by email like other object
+NEW: thirdparty REST API: endpoint to set price level
+NEW: Use new category API for project list view
+NEW: Triggers Attributes and Attributes values
+NEW: Add hooks on newpayment page to allow external payment modules
 
 WARNING:
 
 Following changes may create regressions for some external modules, but were necessary to make Dolibarr better:
-* Properties ->contactid have been renamed into ->contact_id
+* The object "livraison" has been renamed into "delivery" (directory, class, keys, methods with livraison in name ...).
-* Properties ->titre have been renamed into ->title 
+* All properties ->contactid have been renamed into ->contact_id
-* Property $paiementid in API 'api_supplier_invoices.php' has been renamed into into $payment_mode_id (english)
+* All properties ->titre have been renamed into ->title
-* The deprecated subsitution key __SIGNATURE__ has been removed. Replace with __USER_SIGNATURE__ if you used the old syntax in
+* Property $paiementid in API 'api_supplier_invoices.php' has been renamed into into $payment_mode_id
-  your email templates. 
-* The hidden option HOLIDAY_MORE_PUBLIC_HOLIDAYS has been removed. Use instead the dictionary table if you need to define custom
-  days of holiday.
 * Property 'num_paiement' has been renamed 'num_payment' everywhere for better code consistency.
+* The deprecated subsitution key __SIGNATURE__ has been removed. Use __USER_SIGNATURE__ if you used the old syntax in your email templates.
+* The hidden option HOLIDAY_MORE_PUBLIC_HOLIDAYS has been removed. Use instead the dictionary table if you need to define custom days of holiday.
 * If you build a class that implement CommonObject to use the incoterm properties or methods (->fk_incoterm, ->label_incoterm, ->location_incoterm),
   you must now also include declaration of the Trait 'CommonIncoterm' in your class. All incoterm functions were moved into this Trait.
 * The GETPOST(..., 'alpha') has now the same behaviour than GETPOST(..., 'alphanohtml') so no html will be allowed. Use GETPOST(..., 'restricthtml') to accept HTML.
-* If you have links in your code with '&action=delete' as a parameter, you must also add '&token='.newToken() as another parameter to avoid CSRF protection errors.
+* If you have links in your code with '&action=add', '&action=update', '&action=delete' as a parameter, you must also add '&token='.newToken() as another parameter to avoid CSRF protection errors.
-* The API addPayment for api_invoice has evolved to accept amount into a foreign currency. You must provide array(amount=>X,mutlicurrency_ammount=>Y) instead of amount.
+* The API addPayment for api_invoice has evolved to accept amount into a foreign currency. You must provide array(amount=>X,mutlicurrency_ammount=>Y) instead of simple amount.
 * The method select_thirdparty(), deprecated since 3.8, into html.form.class.php has been removed.
-* Depreciate all methods with name valide(). Use instead methods validate().
+* Depreciate all methods with name ->valide(). Use instead methods ->validate().
 
 
 ***** ChangeLog for 12.0.3 compared to 12.0.2 *****
@@ -3387,7 +3601,7 @@ Following changes may create regression for some external modules, but were nece
   entities and to review completely the rights of the groups and the users.
 * Use getEntity('xxx') instead getEntity('xxx', 1) and use getEntity('xxx', 0) instead getEntity('xxx')
 * Some other change were done in the way we read permission of a user when module multicompany is enabled. You can
-  retreive the old behavior by adding constant MULTICOMPANY_BACKWARD_COMPATIBILITY to 1.
+  retrieve the old behavior by adding constant MULTICOMPANY_BACKWARD_COMPATIBILITY to 1.
 * The hook formObjectOptions was not implemented correctly in previous version. Sometimes, you had to return output
 content by doing a print into function, sometimes by returning content into "resprint". This has been fixed to follow
 hook specifications so you must return output into "resprint".
@@ -6133,7 +6347,7 @@ For users:
 - Fix: [Bug #958] LocalTax2 for Spain fails on Suppliers
 - Fix: [ bug #972 ] Auto completion contact field do not take account the min caract number before search
 - Fix: [ bug #971 ] html.form.class.php select_contact with autocomplete do not exclude id from exclude array
-- Fix: Expedition creation, can retreive product from other expedition
+- Fix: Expedition creation, can retrieve product from other expedition
 
 For translators:
 - Update language files.

build/rpm/dolibarr_fedora.spec

@@ -181,6 +181,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/datapolicy
 %_datadir/dolibarr/htdocs/dav
 %_datadir/dolibarr/htdocs/debugbar
+%_datadir/dolibarr/htdocs/delivery
 %_datadir/dolibarr/htdocs/don
 %_datadir/dolibarr/htdocs/ecm
 %_datadir/dolibarr/htdocs/emailcollector
@@ -198,7 +199,6 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/install
 %_datadir/dolibarr/htdocs/intracommreport
 %_datadir/dolibarr/htdocs/langs/HOWTO-Translation.txt
-%_datadir/dolibarr/htdocs/livraison
 %_datadir/dolibarr/htdocs/loan
 %_datadir/dolibarr/htdocs/mailmanspip
 %_datadir/dolibarr/htdocs/margin

build/rpm/dolibarr_generic.spec

@@ -261,6 +261,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/datapolicy
 %_datadir/dolibarr/htdocs/dav
 %_datadir/dolibarr/htdocs/debugbar
+%_datadir/dolibarr/htdocs/delivery
 %_datadir/dolibarr/htdocs/don
 %_datadir/dolibarr/htdocs/ecm
 %_datadir/dolibarr/htdocs/emailcollector
@@ -278,7 +279,6 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/install
 %_datadir/dolibarr/htdocs/intracommreport
 %_datadir/dolibarr/htdocs/langs/HOWTO-Translation.txt
-%_datadir/dolibarr/htdocs/livraison
 %_datadir/dolibarr/htdocs/loan
 %_datadir/dolibarr/htdocs/mailmanspip
 %_datadir/dolibarr/htdocs/margin

build/rpm/dolibarr_mandriva.spec

@@ -177,6 +177,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/custom
 %_datadir/dolibarr/htdocs/datapolicy
 %_datadir/dolibarr/htdocs/dav
+%_datadir/dolibarr/htdocs/delivery
 %_datadir/dolibarr/htdocs/debugbar
 %_datadir/dolibarr/htdocs/don
 %_datadir/dolibarr/htdocs/ecm
@@ -195,7 +196,6 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/install
 %_datadir/dolibarr/htdocs/intracommreport
 %_datadir/dolibarr/htdocs/langs/HOWTO-Translation.txt
-%_datadir/dolibarr/htdocs/livraison
 %_datadir/dolibarr/htdocs/loan
 %_datadir/dolibarr/htdocs/mailmanspip
 %_datadir/dolibarr/htdocs/margin

build/rpm/dolibarr_opensuse.spec

@@ -189,6 +189,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/datapolicy
 %_datadir/dolibarr/htdocs/dav
 %_datadir/dolibarr/htdocs/debugbar
+%_datadir/dolibarr/htdocs/delivery
 %_datadir/dolibarr/htdocs/don
 %_datadir/dolibarr/htdocs/ecm
 %_datadir/dolibarr/htdocs/emailcollector
@@ -206,7 +207,6 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/install
 %_datadir/dolibarr/htdocs/intracommreport
 %_datadir/dolibarr/htdocs/langs/HOWTO-Translation.txt
-%_datadir/dolibarr/htdocs/livraison
 %_datadir/dolibarr/htdocs/loan
 %_datadir/dolibarr/htdocs/mailmanspip
 %_datadir/dolibarr/htdocs/margin

dev/examples/zapier/.editorconfig

@@ -0,0 +1,21 @@
+# EditorConfig is awesome: https://editorconfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+charset = utf-8
+end_of_line = lf
+
+[*.js]
+indent_style = space
+indent_size = 4
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+indent_style = space
+indent_size = 2
+insert_final_newline = true
+trim_trailing_whitespace = false

dev/examples/zapier/.gitignore

@@ -5,3 +5,4 @@ node_modules
 .environment
 .env
 .zapierapprc
+package-lock.json

dev/examples/zapier/README.md

@@ -0,0 +1,48 @@
+# HOW TO BUILD
+
+## DEVELOPPER ACCOUNT
+
+At first, you need to have a Zapier developper acoount, create it here [Zapier Platform](https://developer.zapier.com/)
+
+## BUILD INTEGRATION
+
+### Install Node.js
+
+An easy option to get set up with Node.js is to visit [https://nodejs.org/en/download/](https://nodejs.org/en/download/) and download the official installer for your OS. If you're installing with a package manager it's even easier.
+
+After installation, confirm that Node.js is ready to use:
+  `node --version`
+
+### Install the Zapier CLI
+
+Next let's install the Zapier CLI tools. The CLI will allow you to build your app, deploy it to the Zapier platform, do local testing, manage users and testers, view remote logs, collaborate with your team, and more:
+
+  `cd dev/exemples/zapier`
+
+  `npm install -g zapier-platform-cli` to install the CLI globally
+
+  `zapier --version` to return version of the CLI
+
+### Run Zapier Login
+
+Let's configure authentication between your dev environment and the Zapier platform. You'll use the email address and password you use to log in to the Zapier application.
+
+  `zapier --version`
+
+This command will set up a .zapierrc file in your home directory.
+
+### Install the Project
+
+In zapier exemple directory, run:
+
+  `npm install`
+
+### Deploying your App
+
+Let's deploy it! When you're ready to try your code out on the Zapier platform use the push command. Only you will be able to see the app until you invite testers.
+
+  `zapier push`
+
+### More info
+
+You will find original tutorial here : [https://zapier.com/developer/start/introduction](https://zapier.com/developer/start/introduction)

dev/examples/zapier/package-lock.json

@@ -1,405 +0,0 @@
-{
-  "name": "Dolibarr",
-  "version": "1.0.2",
-  "lockfileVersion": 1,
-  "requires": true,
-  "dependencies": {
-    "@types/node": {
-      "version": "8.10.20",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.20.tgz",
-      "integrity": "sha512-M7x8+5D1k/CuA6jhiwuSCmE8sbUWJF0wYsjcig9WrXvwUI5ArEoUBdOXpV4JcEMrLp02/QbDjw+kI+vQeKyQgg==",
-      "optional": true
-    },
-    "asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
-    },
-    "balanced-match": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-      "dev": true
-    },
-    "bluebird": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz",
-      "integrity": "sha1-eRQg1/VR7qKJdFOop3ZT+WYG1nw="
-    },
-    "brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "requires": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "browser-stdout": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
-      "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
-      "dev": true
-    },
-    "combined-stream": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz",
-      "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=",
-      "requires": {
-        "delayed-stream": "~1.0.0"
-      }
-    },
-    "commander": {
-      "version": "2.15.1",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz",
-      "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==",
-      "dev": true
-    },
-    "concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-      "dev": true
-    },
-    "content-disposition": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz",
-      "integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ="
-    },
-    "debug": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-      "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-      "dev": true,
-      "requires": {
-        "ms": "2.0.0"
-      }
-    },
-    "delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
-    },
-    "diff": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
-      "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
-      "dev": true
-    },
-    "dotenv": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-5.0.1.tgz",
-      "integrity": "sha512-4As8uPrjfwb7VXC+WnLCbXK7y+Ueb2B3zgNCePYfhxS1PYeaO1YTeplffTEcbfLhvFNGLAz90VvJs9yomG7bow=="
-    },
-    "encoding": {
-      "version": "0.1.12",
-      "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz",
-      "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=",
-      "requires": {
-        "iconv-lite": "~0.4.13"
-      }
-    },
-    "escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-      "dev": true
-    },
-    "form-data": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz",
-      "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=",
-      "requires": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "1.0.6",
-        "mime-types": "^2.1.12"
-      }
-    },
-    "fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-      "dev": true
-    },
-    "glob": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-      "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-      "dev": true,
-      "requires": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      }
-    },
-    "growl": {
-      "version": "1.10.5",
-      "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
-      "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==",
-      "dev": true
-    },
-    "has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true
-    },
-    "he": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz",
-      "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=",
-      "dev": true
-    },
-    "iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-      "requires": {
-        "safer-buffer": ">= 2.1.2 < 3"
-      }
-    },
-    "inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "dev": true,
-      "requires": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-      "dev": true
-    },
-    "is-stream": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
-    },
-    "json-tryparse": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/json-tryparse/-/json-tryparse-1.0.5.tgz",
-      "integrity": "sha1-Khy6CLTjEjNo+p+2o01GQwBFeyc="
-    },
-    "jsonschema": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/jsonschema/-/jsonschema-1.1.1.tgz",
-      "integrity": "sha1-PO3o4+QR03eHLu+8n98mODy8Ptk="
-    },
-    "lodash": {
-      "version": "4.17.11",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
-      "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="
-    },
-    "mime-db": {
-      "version": "1.38.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.38.0.tgz",
-      "integrity": "sha512-bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg=="
-    },
-    "mime-types": {
-      "version": "2.1.22",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.22.tgz",
-      "integrity": "sha512-aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog==",
-      "requires": {
-        "mime-db": "~1.38.0"
-      }
-    },
-    "minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-      "dev": true,
-      "requires": {
-        "brace-expansion": "^1.1.7"
-      }
-    },
-    "minimist": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-      "dev": true
-    },
-    "mkdirp": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-      "dev": true,
-      "requires": {
-        "minimist": "0.0.8"
-      }
-    },
-    "mocha": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-5.2.0.tgz",
-      "integrity": "sha512-2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ==",
-      "dev": true,
-      "requires": {
-        "browser-stdout": "1.3.1",
-        "commander": "2.15.1",
-        "debug": "3.1.0",
-        "diff": "3.5.0",
-        "escape-string-regexp": "1.0.5",
-        "glob": "7.1.2",
-        "growl": "1.10.5",
-        "he": "1.1.1",
-        "minimatch": "3.0.4",
-        "mkdirp": "0.5.1",
-        "supports-color": "5.4.0"
-      }
-    },
-    "ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true
-    },
-    "node-fetch": {
-      "version": "1.7.1",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.1.tgz",
-      "integrity": "sha512-j8XsFGCLw79vWXkZtMSmmLaOk9z5SQ9bV/tkbZVCqvgwzrjAGq66igobLofHtF63NvMTp2WjytpsNTGKa+XRIQ==",
-      "requires": {
-        "encoding": "^0.1.11",
-        "is-stream": "^1.0.1"
-      }
-    },
-    "oauth-sign": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="
-    },
-    "once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "dev": true,
-      "requires": {
-        "wrappy": "1"
-      }
-    },
-    "path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-      "dev": true
-    },
-    "safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
-    },
-    "semver": {
-      "version": "5.6.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
-      "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg=="
-    },
-    "should": {
-      "version": "13.2.3",
-      "resolved": "https://registry.npmjs.org/should/-/should-13.2.3.tgz",
-      "integrity": "sha512-ggLesLtu2xp+ZxI+ysJTmNjh2U0TsC+rQ/pfED9bUZZ4DKefP27D+7YJVVTvKsmjLpIi9jAa7itwDGkDDmt1GQ==",
-      "dev": true,
-      "requires": {
-        "should-equal": "^2.0.0",
-        "should-format": "^3.0.3",
-        "should-type": "^1.4.0",
-        "should-type-adaptors": "^1.0.1",
-        "should-util": "^1.0.0"
-      }
-    },
-    "should-equal": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/should-equal/-/should-equal-2.0.0.tgz",
-      "integrity": "sha512-ZP36TMrK9euEuWQYBig9W55WPC7uo37qzAEmbjHz4gfyuXrEUgF8cUvQVO+w+d3OMfPvSRQJ22lSm8MQJ43LTA==",
-      "dev": true,
-      "requires": {
-        "should-type": "^1.4.0"
-      }
-    },
-    "should-format": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/should-format/-/should-format-3.0.3.tgz",
-      "integrity": "sha1-m/yPdPo5IFxT04w01xcwPidxJPE=",
-      "dev": true,
-      "requires": {
-        "should-type": "^1.3.0",
-        "should-type-adaptors": "^1.0.1"
-      }
-    },
-    "should-type": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/should-type/-/should-type-1.4.0.tgz",
-      "integrity": "sha1-B1bYzoRt/QmEOmlHcZ36DUz/XPM=",
-      "dev": true
-    },
-    "should-type-adaptors": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/should-type-adaptors/-/should-type-adaptors-1.1.0.tgz",
-      "integrity": "sha512-JA4hdoLnN+kebEp2Vs8eBe9g7uy0zbRo+RMcU0EsNy+R+k049Ki+N5tT5Jagst2g7EAja+euFuoXFCa8vIklfA==",
-      "dev": true,
-      "requires": {
-        "should-type": "^1.3.0",
-        "should-util": "^1.0.0"
-      }
-    },
-    "should-util": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/should-util/-/should-util-1.0.0.tgz",
-      "integrity": "sha1-yYzaN0qmsZDfi6h8mInCtNtiAGM=",
-      "dev": true
-    },
-    "supports-color": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
-      "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
-      "dev": true,
-      "requires": {
-        "has-flag": "^3.0.0"
-      }
-    },
-    "wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-      "dev": true
-    },
-    "zapier-platform-core": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/zapier-platform-core/-/zapier-platform-core-8.0.1.tgz",
-      "integrity": "sha512-vuAe7JkFQ88AeQ//NwwNEh8ZjiZr30GRWtwYo7Wo/nx1cqZwq+CRc9zJU2WRrhJfJOtOOTUF6w+pArBTtMOC5A==",
-      "requires": {
-        "@types/node": "8.10.20",
-        "bluebird": "3.5.0",
-        "content-disposition": "0.5.2",
-        "dotenv": "5.0.1",
-        "form-data": "2.3.2",
-        "lodash": "4.17.11",
-        "node-fetch": "1.7.1",
-        "oauth-sign": "0.9.0",
-        "semver": "5.6.0",
-        "zapier-platform-schema": "8.0.1"
-      }
-    },
-    "zapier-platform-schema": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/zapier-platform-schema/-/zapier-platform-schema-8.0.1.tgz",
-      "integrity": "sha512-97KJ0xVLtpU4BiXVaMTPQpiA0T6CQIEzWfzAWwJAWbu5336+6DMFUzDWN4bANBeD3CIsRHHPcZkP8n/17U05ag==",
-      "requires": {
-        "jsonschema": "1.1.1",
-        "lodash": "4.17.10"
-      },
-      "dependencies": {
-        "lodash": {
-          "version": "4.17.10",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz",
-          "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg=="
-        }
-      }
-    }
-  }
-}

dev/examples/zapier/package.json

@@ -1,9 +1,9 @@
 {
-  "name": "Dolibarr",
+  "name": "dolibarr",
   "version": "1.0.0",
   "description": "An app for connecting Dolibarr to the Zapier platform.",
   "repository": "Dolibarr/dolibarr",
-  "homepage": "https://www.dolibarr.fr/",
+  "homepage": "https://www.dolibarr.org/",
   "author": "Frédéric France <frederic.france@netlogic.fr>",
   "license": "BSD-3-Clause",
   "main": "index.js",

dev/initdata/purge-data.php

@@ -120,8 +120,8 @@ $sqls=array(
         "DELETE FROM ".MAIN_DB_PREFIX."expedition where date_creation < '__DATE__'",
     ),
     'delivery'=>array(
-        "DELETE FROM ".MAIN_DB_PREFIX."livraisondet WHERE fk_livraison IN (select rowid FROM ".MAIN_DB_PREFIX."livraison where date_creation < '__DATE__')",
+        "DELETE FROM ".MAIN_DB_PREFIX."deliverydet WHERE fk_delivery IN (select rowid FROM ".MAIN_DB_PREFIX."delivery where date_creation < '__DATE__')",
-        "DELETE FROM ".MAIN_DB_PREFIX."livraison where date_creation < '__DATE__'",
+        "DELETE FROM ".MAIN_DB_PREFIX."delivery where date_creation < '__DATE__'",
     ),
     'contract'=>array(
         "DELETE FROM ".MAIN_DB_PREFIX."contratdet_extrafields WHERE fk_object IN (select rowid FROM ".MAIN_DB_PREFIX."contratdet WHERE fk_contrat IN (select rowid FROM ".MAIN_DB_PREFIX."contrat where datec < '__DATE__'))",

htdocs/accountancy/admin/card.php

@@ -210,7 +210,7 @@ if ($action == 'create') {
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="add">';
 
-	dol_fiche_head();
+	print dol_get_fiche_head();
 
 	print '<table class="border centpercent">';
 
@@ -252,7 +252,7 @@ if ($action == 'create') {
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input class="button" type="submit" value="'.$langs->trans("Save").'">';
@@ -272,7 +272,7 @@ if ($action == 'create') {
 		// Edit mode
 		if ($action == 'update')
 		{
-			dol_fiche_head($head, 'card', $langs->trans('AccountAccounting'), 0, 'billr');
+			print dol_get_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="'.newToken().'">';
@@ -314,7 +314,7 @@ if ($action == 'create') {
 
 			print '</table>';
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 
 			print '<div class="center">';
 			print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
@@ -327,7 +327,7 @@ if ($action == 'create') {
 			// View mode
 			$linkback = '<a href="'.DOL_URL_ROOT.'/accountancy/admin/account.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-			dol_fiche_head($head, 'card', $langs->trans('AccountAccounting'), -1, 'billr');
+			print dol_get_fiche_head($head, 'card', $langs->trans('AccountAccounting'), -1, 'billr');
 
 			dol_banner_tab($object, 'ref', $linkback, 1, 'account_number', 'ref');
 
@@ -364,7 +364,7 @@ if ($action == 'create') {
 
 			print '</div>';
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 
 			/*
 			 * Actions buttons

htdocs/accountancy/admin/categories.php

@@ -102,7 +102,7 @@ print '<form name="add" action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="display">';
 
-dol_fiche_head();
+print dol_get_fiche_head();
 
 print '<table class="border centpercent">';
 
@@ -146,7 +146,7 @@ if (!empty($cat_id))
 
 print '</table>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '</form>';
 

htdocs/accountancy/admin/fiscalyear_card.php

@@ -159,7 +159,7 @@ if ($action == 'create')
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="add">';
 
-	dol_fiche_head();
+	print dol_get_fiche_head();
 
 	print '<table class="border centpercent">';
 
@@ -187,7 +187,7 @@ if ($action == 'create')
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input class="button" type="submit" value="'.$langs->trans("Save").'">';
@@ -202,7 +202,7 @@ if ($action == 'create')
 		$head = fiscalyear_prepare_head($object);
 
 		if ($action == 'edit') {
-			dol_fiche_head($head, 'card', $langs->trans("Fiscalyear"), 0, 'cron');
+			print dol_get_fiche_head($head, 'card', $langs->trans("Fiscalyear"), 0, 'cron');
 
 			print '<form name="update" action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
 			print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -248,7 +248,7 @@ if ($action == 'create')
 
 			print '</form>';
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 		} else {
 			/*
 			 * Confirm delete
@@ -257,7 +257,7 @@ if ($action == 'create')
 				print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id, $langs->trans("DeleteFiscalYear"), $langs->trans("ConfirmDeleteFiscalYear"), "confirm_delete");
 			}
 
-			dol_fiche_head($head, 'card', $langs->trans("Fiscalyear"), 0, 'cron');
+			print dol_get_fiche_head($head, 'card', $langs->trans("Fiscalyear"), 0, 'cron');
 
 			print '<table class="border centpercent">';
 
@@ -296,7 +296,7 @@ if ($action == 'create')
 
 			print "</table>";
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 
 			if (!empty($user->rights->accounting->fiscalyear->write))
 			{

htdocs/accountancy/admin/fiscalyear_info.php

@@ -49,7 +49,7 @@ if ($id) {
 
 	$head = fiscalyear_prepare_head($object);
 
-	dol_fiche_head($head, 'info', $langs->trans("Fiscalyear"), 0, 'cron');
+	print dol_get_fiche_head($head, 'info', $langs->trans("Fiscalyear"), 0, 'cron');
 
 	print '<table width="100%"><tr><td>';
 	dol_print_object_info($object);

htdocs/accountancy/bookkeeping/card.php

@@ -351,7 +351,7 @@ if ($action == 'create')
 	print '<input type="hidden" name="next_num_mvt" value="'.$next_num_mvt.'">'."\n";
 	print '<input type="hidden" name="mode" value="_tmp">'."\n";
 
-	dol_fiche_head();
+	print dol_get_fiche_head();
 
 	print '<table class="border centpercent">';
 
@@ -386,7 +386,7 @@ if ($action == 'create')
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" class="button" value="'.$langs->trans("Create").'">';
@@ -415,7 +415,7 @@ if ($action == 'create')
 		$head[$h][2] = 'transaction';
 		$h++;
 
-		dol_fiche_head($head, 'transaction', '', -1);
+		print dol_get_fiche_head($head, 'transaction', '', -1);
 
 		//dol_banner_tab($object, '', $backlink);
 
@@ -573,7 +573,7 @@ if ($action == 'create')
 
 		print '</div></div><!-ee-->';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		print '<div style="clear:both"></div>';
 
@@ -719,7 +719,7 @@ if ($action == 'create')
 	}
 }
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();

htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php

@@ -135,13 +135,13 @@ $head = societe_prepare_head($object);
 
 dol_htmloutput_mesg(is_numeric($error) ? '' : $error, $errors, 'error');
 
-dol_fiche_head($head, 'lettering_customer', $langs->trans("ThirdParty"), 0, 'company');
+print dol_get_fiche_head($head, 'lettering_customer', $langs->trans("ThirdParty"), 0, 'company');
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
 dol_banner_tab($object, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom', '', '', 0, '', '', 'arearefnobottom');
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 $sql = "SELECT bk.rowid, bk.doc_date, bk.doc_type, bk.doc_ref, ";
 $sql .= " bk.subledger_account, bk.numero_compte , bk.label_compte, bk.debit, ";

htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php

@@ -134,13 +134,13 @@ $head = societe_prepare_head($object);
 
 dol_htmloutput_mesg(is_numeric($error) ? '' : $error, $errors, 'error');
 
-dol_fiche_head($head, 'lettering_supplier', $langs->trans("ThirdParty"), 0, 'company');
+print dol_get_fiche_head($head, 'lettering_supplier', $langs->trans("ThirdParty"), 0, 'company');
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
 dol_banner_tab($object, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom', '', '', 0, '', '', 'arearefnobottom');
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 $sql = "SELECT bk.rowid, bk.doc_date, bk.doc_type, bk.doc_ref, ";
 $sql .= " bk.subledger_account, bk.numero_compte , bk.label_compte, bk.debit, ";

htdocs/accountancy/class/accountingaccount.class.php

@@ -453,21 +453,22 @@ class AccountingAccount extends CommonObject
 	 */
     public function getNomUrl($withpicto = 0, $withlabel = 0, $nourl = 0, $moretitle = '', $notooltip = 0, $save_lastsearch_value = -1, $withcompletelabel = 0, $option = '')
 	{
-		global $langs, $conf, $user;
+		global $langs, $conf;
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
 
 		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
 
 		$result = '';
 
+		$url = '';
 		if (empty($option) || $option == 'ledger') {
-			$url = DOL_URL_ROOT . '/accountancy/bookkeeping/listbyaccount.php?search_accountancy_code_start=' . $this->account_number . '&search_accountancy_code_end=' . $this->account_number;
+			$url = DOL_URL_ROOT.'/accountancy/bookkeeping/listbyaccount.php?search_accountancy_code_start='.urlencode($this->account_number).'&search_accountancy_code_end='.urlencode($this->account_number);
 			$labelurl = $langs->trans("ShowAccountingAccountInLedger");
 		} elseif ($option == 'journals') {
-			$url = DOL_URL_ROOT . '/accountancy/bookkeeping/list.php?search_accountancy_code_start=' . $this->account_number . '&search_accountancy_code_end=' . $this->account_number;
+			$url = DOL_URL_ROOT.'/accountancy/bookkeeping/list.php?search_accountancy_code_start='.urlencode($this->account_number).'&search_accountancy_code_end='.urlencode($this->account_number);
 			$labelurl = $langs->trans("ShowAccountingAccountInJournals");
 		} elseif ($option == 'accountcard') {
-			$url = DOL_URL_ROOT . '/accountancy/admin/card.php?id=' . $this->id;
+			$url = DOL_URL_ROOT.'/accountancy/admin/card.php?id='.urlencode($this->id);
 			$labelurl = $langs->trans("ShowAccountingAccount");
 		}
 

htdocs/accountancy/customer/card.php

@@ -119,7 +119,7 @@ if (!empty($id)) {
 
 			print load_fiche_titre($langs->trans('CustomersVentilation'), '', 'title_accountancy');
 
-			dol_fiche_head();
+			print dol_get_fiche_head();
 
 			print '<table class="border centpercent">';
 
@@ -137,7 +137,7 @@ if (!empty($id)) {
 			print '</td></tr>';
 			print '</table>';
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 
 			print '<div class="center">';
 			print '<input class="button" type="submit" value="'.$langs->trans("Save").'">';

htdocs/accountancy/expensereport/card.php

@@ -121,7 +121,7 @@ if (!empty($id)) {
 
 			print load_fiche_titre($langs->trans('ExpenseReportsVentilation'), '', 'title_accountancy');
 
-			dol_fiche_head();
+			print dol_get_fiche_head();
 
 			print '<table class="border centpercent">';
 
@@ -146,7 +146,7 @@ if (!empty($id)) {
 			print '</td></tr>';
 			print '</table>';
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 
 			print '<div class="center">';
 			print '<input class="button" type="submit" value="'.$langs->trans("Save").'">';

htdocs/accountancy/journal/bankjournal.php

@@ -339,7 +339,7 @@ if ($result) {
 					$tabpay[$obj->rowid]["soclib"] = $chargestatic->getNomUrl(1, 30);
 					$tabpay[$obj->rowid]["paymentscid"] = $chargestatic->id;
 
-					// Retreive the accounting code of the social contribution of the payment from link of payment.
+					// Retrieve the accounting code of the social contribution of the payment from link of payment.
 					// Note: We have the social contribution id, it can be faster to get accounting code from social contribution id.
 					$sqlmid = 'SELECT cchgsoc.accountancy_code';
 					$sqlmid .= " FROM ".MAIN_DB_PREFIX."c_chargesociales cchgsoc";

htdocs/accountancy/supplier/card.php

@@ -121,7 +121,7 @@ if (!empty($id)) {
 
 			print load_fiche_titre($langs->trans('SuppliersVentilation'), '', 'title_accountancy');
 
-			dol_fiche_head();
+			print dol_get_fiche_head();
 
 			print '<table class="border centpercent">';
 
@@ -141,7 +141,7 @@ if (!empty($id)) {
 			print '</td></tr>';
 			print '</table>';
 
-			dol_fiche_end();
+			print dol_get_fiche_end();
 
 			print '<div class="center">';
 			print '<input class="button" type="submit" value="'.$langs->trans("Save").'">';

htdocs/adherents/admin/adherent.php

@@ -132,7 +132,7 @@ 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 dol_get_fiche_head($head, 'general', $langs->trans("Members"), -1, 'user');
 
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -246,7 +246,7 @@ $helptext .= '__YEAR__, __MONTH__, __DAY__';
 
 form_constantes($constantes, 0, $helptext);
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();

htdocs/adherents/admin/adherent_emails.php

@@ -119,7 +119,7 @@ print load_fiche_titre($langs->trans("MembersSetup"), $linkback, 'title_setup');
 
 $head = member_admin_prepare_head();
 
-dol_fiche_head($head, 'emails', $langs->trans("Members"), -1, 'user');
+print dol_get_fiche_head($head, 'emails', $langs->trans("Members"), -1, 'user');
 
 // TODO Use global form
 //print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
@@ -136,7 +136,7 @@ form_constantes($constantes, 0, $helptext);
 //print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Update").'" name="update"></div>';
 //print '</form>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();

htdocs/adherents/admin/adherent_extrafields.php

@@ -70,11 +70,11 @@ 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');
+print dol_get_fiche_head($head, 'attributes', $langs->trans("Members"), -1, 'user');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons

htdocs/adherents/admin/adherent_type_extrafields.php

@@ -73,11 +73,11 @@ 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');
+print dol_get_fiche_head($head, 'attributes_type', $langs->trans("Members"), -1, 'user');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons

htdocs/adherents/admin/website.php

@@ -94,7 +94,7 @@ print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 print '<input type="hidden" name="action" value="update">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 
-dol_fiche_head($head, 'website', $langs->trans("Members"), -1, 'user');
+print dol_get_fiche_head($head, 'website', $langs->trans("Members"), -1, 'user');
 
 if ($conf->use_javascript_ajax) {
     print "\n".'<script type="text/javascript" language="javascript">';
@@ -208,7 +208,7 @@ if (!empty($conf->global->MEMBER_ENABLE_PUBLIC)) {
 }
 
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '</form>';
 

htdocs/adherents/agenda.php

@@ -118,7 +118,7 @@ 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');
+	print dol_get_fiche_head($head, 'agenda', $langs->trans("Member"), -1, 'user');
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
@@ -133,7 +133,7 @@ if ($object->id > 0) {
 
 	print '</div>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 
     //print '<div class="tabsAction">';

htdocs/adherents/card.php

@@ -4,7 +4,7 @@
  * Copyright (C) 2004-2012  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2018  Regis Houssin           <regis.houssin@inodbox.com>
  * Copyright (C) 2012       Marcos García           <marcosgdf@gmail.com>
- * Copyright (C) 2012-2018  Philippe Grand          <philippe.grand@atoo-net.com>
+ * Copyright (C) 2012-2020  Philippe Grand          <philippe.grand@atoo-net.com>
  * Copyright (C) 2015-2018  Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
  *
@@ -833,7 +833,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		print '<input type="hidden" name="socid" value="'.$socid.'">';
 		if ($backtopage) print '<input type="hidden" name="backtopage" value="'.($backtopage != '1' ? $backtopage : $_SERVER["HTTP_REFERER"]).'">';
 
-		dol_fiche_head('');
+		print dol_get_fiche_head('');
 
 		print '<table class="border centpercent">';
 		print '<tbody>';
@@ -969,7 +969,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		print '<tbody>';
 		print "</table>\n";
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		print '<div class="center">';
 		print '<input type="submit" name="button" class="button" value="'.$langs->trans("AddMember").'">';
@@ -1058,7 +1058,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		print '<input type="hidden" name="statut" value="'.$object->statut.'" />';
 		if ($backtopage) print '<input type="hidden" name="backtopage" value="'.($backtopage != '1' ? $backtopage : $_SERVER["HTTP_REFERER"]).'">';
 
-		dol_fiche_head($head, 'general', $langs->trans("Member"), 0, 'user');
+		print dol_get_fiche_head($head, 'general', $langs->trans("Member"), 0, 'user');
 
 		print '<table class="border centpercent">';
 
@@ -1229,7 +1229,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
 
 		print '</table>';
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		print '<div class="center">';
 		print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
@@ -1268,7 +1268,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		 */
 		$head = member_prepare_head($object);
 
-		dol_fiche_head($head, 'general', $langs->trans("Member"), -1, 'user');
+		print dol_get_fiche_head($head, 'general', $langs->trans("Member"), -1, 'user');
 
 		// Confirm create user
 		if ($action == 'create_user') {
@@ -1608,7 +1608,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		print "</div></div></div>\n";
 		print '<div style="clear:both"></div>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 
 		/*

htdocs/adherents/class/adherent.class.php

@@ -1320,7 +1320,7 @@ class Adherent extends CommonObject
 
 				$this->model_pdf = $obj->model_pdf;
 
-				// Retreive all extrafield
+				// Retrieve all extrafield
 				// fetch optionals attributes and labels
 				if ($fetch_optionals) {
 					$this->fetch_optionals();

htdocs/adherents/document.php

@@ -100,7 +100,7 @@ if ($id > 0) {
 
 		$head = member_prepare_head($object);
 
-		dol_fiche_head($head, 'document', $langs->trans("Member"), -1, 'user');
+		print dol_get_fiche_head($head, 'document', $langs->trans("Member"), -1, 'user');
 
     	$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
@@ -145,7 +145,7 @@ if ($id > 0) {
 
 		print '</div>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		$modulepart = 'member';
 		$permission = $user->rights->adherent->creer;

htdocs/adherents/index.php

@@ -285,6 +285,7 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 $max = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
 
 $sql = "SELECT a.rowid, a.statut, a.lastname, a.firstname, a.societe as company, a.fk_soc,";
+$sql .= " a.gender, a.email, a.photo, a.morphy,";
 $sql .= " a.tms as datem, datefin as date_end_subscription,";
 $sql .= " ta.rowid as typeid, ta.libelle as label, ta.subscription";
 $sql .= " FROM ".MAIN_DB_PREFIX."adherent as a, ".MAIN_DB_PREFIX."adherent_type as ta";
@@ -307,8 +308,13 @@ if ($resql) {
 			$obj = $db->fetch_object($resql);
 			print '<tr class="oddeven">';
 			$staticmember->id = $obj->rowid;
+			$staticmember->ref = $obj->rowid;
 			$staticmember->lastname = $obj->lastname;
 			$staticmember->firstname = $obj->firstname;
+			$staticmember->gender = $obj->gender;
+			$staticmember->email = $obj->email;
+			$staticmember->photo = $obj->photo;
+			$staticmember->morphy = $obj->morphy;
 			if (!empty($obj->fk_soc)) {
 				$staticmember->fk_soc = $obj->fk_soc;
 				$staticmember->fetch_thirdparty();
@@ -316,10 +322,9 @@ if ($resql) {
 			} else {
 				$staticmember->name = $obj->company;
 			}
-			$staticmember->ref = $staticmember->getFullName($langs);
 			$statictype->id = $obj->typeid;
 			$statictype->label = $obj->label;
-			print '<td class="nowraponall">'.$staticmember->getNomUrl(1, 32).'</td>';
+			print '<td class="nowraponall">'.$staticmember->getNomUrl(-1, 32).'</td>';
 			print '<td>'.$statictype->getNomUrl(1, 32).'</td>';
 			print '<td>'.dol_print_date($db->jdate($obj->datem), 'dayhour').'</td>';
 			print '<td class="right">'.$staticmember->LibStatut($obj->statut, ($obj->subscription == 'yes' ? 1 : 0), $db->jdate($obj->date_end_subscription), 3).'</td>';
@@ -340,7 +345,8 @@ if ($resql) {
 $max = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
 
 $sql = "SELECT a.rowid, a.statut, a.lastname, a.firstname, a.societe as company, a.fk_soc,";
-$sql .= " datefin as date_end_subscription,";
+$sql .= " a.gender, a.email, a.photo, a.morphy,";
+$sql .= " a.datefin as date_end_subscription,";
 $sql .= " c.rowid as cid, c.tms as datem, c.datec as datec, c.dateadh as date_start, c.datef as date_end, c.subscription";
 $sql .= " FROM ".MAIN_DB_PREFIX."adherent as a, ".MAIN_DB_PREFIX."subscription as c";
 $sql .= " WHERE a.entity IN (".getEntity('adherent').")";
@@ -364,8 +370,13 @@ if ($resql) {
 			$subscriptionstatic->id = $obj->cid;
 			$subscriptionstatic->ref = $obj->cid;
 			$staticmember->id = $obj->rowid;
+			$staticmember->ref = $obj->rowid;
 			$staticmember->lastname = $obj->lastname;
 			$staticmember->firstname = $obj->firstname;
+			$staticmember->gender = $obj->gender;
+			$staticmember->email = $obj->email;
+			$staticmember->photo = $obj->photo;
+			$staticmember->morphy = $obj->morphy;
 			if (!empty($obj->fk_soc)) {
 				$staticmember->fk_soc = $obj->fk_soc;
 				$staticmember->fetch_thirdparty();
@@ -373,9 +384,8 @@ if ($resql) {
 			} else {
 				$staticmember->name = $obj->company;
 			}
-			$staticmember->ref = $staticmember->getFullName($langs);
 			print '<td class="nowraponall">'.$subscriptionstatic->getNomUrl(1).'</td>';
-			print '<td class="nowraponall">'.$staticmember->getNomUrl(1, 32, 'subscription').'</td>';
+			print '<td class="nowraponall">'.$staticmember->getNomUrl(-1, 32, 'subscription').'</td>';
 			print '<td class="nowraponall">'.get_date_range($db->jdate($obj->date_start), $db->jdate($obj->date_end)).'</td>';
 			print '<td class="right">'.price($obj->subscription).'</td>';
 			//print '<td class="right">'.$staticmember->LibStatut($obj->statut,($obj->subscription=='yes'?1:0),$db->jdate($obj->date_end_subscription),5).'</td>';

htdocs/adherents/ldap.php

@@ -84,7 +84,7 @@ llxHeader('', $langs->trans("Member"), 'EN:Module_Foundations|FR:Module_Adh&eacu
 
 $head = member_prepare_head($object);
 
-dol_fiche_head($head, 'ldap', $langs->trans("Member"), 0, 'user');
+print dol_get_fiche_head($head, 'ldap', $langs->trans("Member"), 0, 'user');
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/adherents/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
@@ -128,7 +128,7 @@ print '</table>';
 
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 /*
  * Barre d'actions

htdocs/adherents/list.php

@@ -656,6 +656,7 @@ while ($i < min($num, $limit)) {
 	$memberstatic->datefin = $datefin;
 	$memberstatic->socid = $obj->fk_soc;
 	$memberstatic->photo = $obj->photo;
+	$memberstatic->email = $obj->email;
 	$memberstatic->morphy = $obj->morphy;
 	$memberstatic->note_public = $obj->note_public;
 	$memberstatic->note_private = $obj->note_private;
@@ -725,12 +726,10 @@ while ($i < min($num, $limit)) {
 	if (!empty($arrayfields['d.morphy']['checked'])) {
 		print '<td class="center">';
 		$s = '';
-		if ($obj->morphy == 'phy')
+		if ($obj->morphy == 'phy') {
-		{
 			$s .= '<span class="customer-back" title="'.$langs->trans("Physical").'">'.dol_substr($langs->trans("Physical"), 0, 1).'</span>';
 		}
-		if ($obj->morphy == 'mor')
+		if ($obj->morphy == 'mor') {
-		{
 			$s .= '<span class="vendor-back" title="'.$langs->trans("Moral").'">'.dol_substr($langs->trans("Moral"), 0, 1).'</span>';
 		}
 		print $s;

htdocs/adherents/note.php

@@ -66,7 +66,7 @@ $form = new Form($db);
 if ($id) {
 	$head = member_prepare_head($object);
 
-	dol_fiche_head($head, 'note', $langs->trans("Member"), -1, 'user');
+	print dol_get_fiche_head($head, 'note', $langs->trans("Member"), -1, 'user');
 
 	print "<form method=\"post\" action=\"".$_SERVER['PHP_SELF']."\">";
 	print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -112,7 +112,7 @@ if ($id) {
     include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
 
 
-    dol_fiche_end();
+    print dol_get_fiche_end();
 }
 
 // End of page

htdocs/adherents/stats/byproperties.php

@@ -128,7 +128,7 @@ if ($resql) {
 
 $head = member_stats_prepare_head($adh);
 
-dol_fiche_head($head, 'statsbyproperties', $langs->trans("Statistics"), -1, 'user');
+print dol_get_fiche_head($head, 'statsbyproperties', $langs->trans("Statistics"), -1, 'user');
 
 
 // Print title
@@ -173,7 +173,7 @@ foreach ($data as $val) {
 print '</table>';
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();

htdocs/adherents/stats/geo.php

@@ -196,7 +196,7 @@ if ($mode) {
 
 $head = member_stats_prepare_head($adh);
 
-dol_fiche_head($head, $tab, $langs->trans("Statistics"), -1, 'user');
+print dol_get_fiche_head($head, $tab, $langs->trans("Statistics"), -1, 'user');
 
 
 // Print title
@@ -299,7 +299,7 @@ if ($mode) {
 }
 
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();

htdocs/adherents/stats/index.php

@@ -133,7 +133,7 @@ if (!$mesg) {
 
 $head = member_stats_prepare_head($adh);
 
-dol_fiche_head($head, 'statssubscription', $langs->trans("Statistics"), -1, 'user');
+print dol_get_fiche_head($head, 'statssubscription', $langs->trans("Statistics"), -1, 'user');
 
 
 print '<div class="fichecenter"><div class="fichethirdleft">';
@@ -219,7 +219,7 @@ print '</div></div></div>';
 print '<div style="clear:both"></div>';
 
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();

htdocs/adherents/subscription.php

@@ -76,26 +76,26 @@ $defaultdelay = 1;
 $defaultdelayunit = 'y';
 
 if ($rowid) {
-    // Load member
+	// Load member
-    $result = $object->fetch($rowid);
+	$result = $object->fetch($rowid);
 
-    // Define variables to know what current user can do on users
+	// Define variables to know what current user can do on users
-    $canadduser = ($user->admin || $user->rights->user->user->creer);
+	$canadduser = ($user->admin || $user->rights->user->user->creer);
-    // Define variables to know what current user can do on properties of user linked to edited member
+	// Define variables to know what current user can do on properties of user linked to edited member
-    if ($object->user_id) {
+	if ($object->user_id) {
-        // $user is the user editing, $object->user_id is the user's id linked to the edited member
+		// $user is the user editing, $object->user_id is the user's id linked to the edited member
-        $caneditfielduser = ((($user->id == $object->user_id) && $user->rights->user->self->creer)
+		$caneditfielduser = ((($user->id == $object->user_id) && $user->rights->user->self->creer)
-        || (($user->id != $object->user_id) && $user->rights->user->user->creer));
+		|| (($user->id != $object->user_id) && $user->rights->user->user->creer));
-        $caneditpassworduser = ((($user->id == $object->user_id) && $user->rights->user->self->password)
+		$caneditpassworduser = ((($user->id == $object->user_id) && $user->rights->user->self->password)
-        || (($user->id != $object->user_id) && $user->rights->user->user->password));
+		|| (($user->id != $object->user_id) && $user->rights->user->user->password));
-    }
+	}
 }
 
 // Define variables to know what current user can do on members
 $canaddmember = $user->rights->adherent->creer;
 // Define variables to know what current user can do on properties of a member
 if ($rowid) {
-    $caneditfieldmember = $user->rights->adherent->creer;
+	$caneditfieldmember = $user->rights->adherent->creer;
 }
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
@@ -130,242 +130,242 @@ if ($action == 'confirm_create_thirdparty' && $confirm == 'yes' && $user->rights
 }
 
 if ($action == 'setuserid' && ($user->rights->user->self->creer || $user->rights->user->user->creer)) {
-    $error = 0;
+	$error = 0;
-    if (empty($user->rights->user->user->creer)) {    // If can edit only itself user, we can link to itself only
+	if (empty($user->rights->user->user->creer)) {    // If can edit only itself user, we can link to itself only
 		if ($_POST["userid"] != $user->id && $_POST["userid"] != $object->user_id) {
-            $error++;
+			$error++;
-            setEventMessages($langs->trans("ErrorUserPermissionAllowsToLinksToItselfOnly"), null, 'errors');
+			setEventMessages($langs->trans("ErrorUserPermissionAllowsToLinksToItselfOnly"), null, 'errors');
 		}
-    }
+	}
 
-    if (!$error) {
+	if (!$error) {
-        if ($_POST["userid"] != $object->user_id) {  // If link differs from currently in database
+		if ($_POST["userid"] != $object->user_id) {  // If link differs from currently in database
 			$result = $object->setUserId($_POST["userid"]);
-            if ($result < 0) dol_print_error('', $object->error);
+			if ($result < 0) dol_print_error('', $object->error);
-            $_POST['action'] = '';
+			$_POST['action'] = '';
-            $action = '';
+			$action = '';
-        }
+		}
-    }
+	}
 }
 
 if ($action == 'setsocid') {
-    $error = 0;
+	$error = 0;
-    if (!$error) {
+	if (!$error) {
-        if (GETPOST('socid', 'int') != $object->fk_soc) {    // If link differs from currently in database
+		if (GETPOST('socid', 'int') != $object->fk_soc) {    // If link differs from currently in database
 			$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."adherent";
-            $sql .= " WHERE fk_soc = '".GETPOST('socid', 'int')."'";
+			$sql .= " WHERE fk_soc = '".GETPOST('socid', 'int')."'";
-            $resql = $db->query($sql);
+			$resql = $db->query($sql);
-            if ($resql) {
+			if ($resql) {
-                $obj = $db->fetch_object($resql);
+				$obj = $db->fetch_object($resql);
-                if ($obj && $obj->rowid > 0) {
+				if ($obj && $obj->rowid > 0) {
-                    $othermember = new Adherent($db);
+					$othermember = new Adherent($db);
-                    $othermember->fetch($obj->rowid);
+					$othermember->fetch($obj->rowid);
-                    $thirdparty = new Societe($db);
+					$thirdparty = new Societe($db);
-                    $thirdparty->fetch(GETPOST('socid', 'int'));
+					$thirdparty->fetch(GETPOST('socid', 'int'));
-                    $error++;
+					$error++;
-	                setEventMessages($langs->trans("ErrorMemberIsAlreadyLinkedToThisThirdParty", $othermember->getFullName($langs), $othermember->login, $thirdparty->name), null, 'errors');
+					setEventMessages($langs->trans("ErrorMemberIsAlreadyLinkedToThisThirdParty", $othermember->getFullName($langs), $othermember->login, $thirdparty->name), null, 'errors');
-                }
+				}
-            }
+			}
 
-            if (!$error) {
+			if (!$error) {
-                $result = $object->setThirdPartyId(GETPOST('socid', 'int'));
+				$result = $object->setThirdPartyId(GETPOST('socid', 'int'));
-                if ($result < 0) dol_print_error('', $object->error);
+				if ($result < 0) dol_print_error('', $object->error);
-                $_POST['action'] = '';
+				$_POST['action'] = '';
-                $action = '';
+				$action = '';
-            }
+			}
-        }
+		}
-    }
+	}
 }
 
 if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !$_POST["cancel"]) {
-    $error = 0;
+	$error = 0;
 
-    $langs->load("banks");
+	$langs->load("banks");
 
-    $result = $object->fetch($rowid);
+	$result = $object->fetch($rowid);
-    $result = $adht->fetch($object->typeid);
+	$result = $adht->fetch($object->typeid);
 
-    // Subscription informations
+	// Subscription informations
-    $datesubscription = 0;
+	$datesubscription = 0;
-    $datesubend = 0;
+	$datesubend = 0;
-    $paymentdate = 0;
+	$paymentdate = 0;
-    if ($_POST["reyear"] && $_POST["remonth"] && $_POST["reday"]) {
+	if ($_POST["reyear"] && $_POST["remonth"] && $_POST["reday"]) {
-        $datesubscription = dol_mktime(0, 0, 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]);
+		$datesubscription = dol_mktime(0, 0, 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]);
-    }
+	}
-    if ($_POST["endyear"] && $_POST["endmonth"] && $_POST["endday"]) {
+	if ($_POST["endyear"] && $_POST["endmonth"] && $_POST["endday"]) {
-        $datesubend = dol_mktime(0, 0, 0, $_POST["endmonth"], $_POST["endday"], $_POST["endyear"]);
+		$datesubend = dol_mktime(0, 0, 0, $_POST["endmonth"], $_POST["endday"], $_POST["endyear"]);
-    }
+	}
-    if ($_POST["paymentyear"] && $_POST["paymentmonth"] && $_POST["paymentday"]) {
+	if ($_POST["paymentyear"] && $_POST["paymentmonth"] && $_POST["paymentday"]) {
-        $paymentdate = dol_mktime(0, 0, 0, $_POST["paymentmonth"], $_POST["paymentday"], $_POST["paymentyear"]);
+		$paymentdate = dol_mktime(0, 0, 0, $_POST["paymentmonth"], $_POST["paymentday"], $_POST["paymentyear"]);
-    }
+	}
-    $amount = price2num(GETPOST("subscription", 'alpha')); // Amount of subscription
+	$amount = price2num(GETPOST("subscription", 'alpha')); // Amount of subscription
-    $label = $_POST["label"];
+	$label = $_POST["label"];
 
-    // Payment informations
+	// Payment informations
-    $accountid = $_POST["accountid"];
+	$accountid = $_POST["accountid"];
-    $operation = $_POST["operation"]; // Payment mode
+	$operation = $_POST["operation"]; // Payment mode
-    $num_chq = GETPOST("num_chq", "alphanohtml");
+	$num_chq = GETPOST("num_chq", "alphanohtml");
-    $emetteur_nom = $_POST["chqemetteur"];
+	$emetteur_nom = $_POST["chqemetteur"];
-    $emetteur_banque = $_POST["chqbank"];
+	$emetteur_banque = $_POST["chqbank"];
-    $option = $_POST["paymentsave"];
+	$option = $_POST["paymentsave"];
-    if (empty($option)) $option = 'none';
+	if (empty($option)) $option = 'none';
-    $sendalsoemail = GETPOST("sendmail", 'alpha');
+	$sendalsoemail = GETPOST("sendmail", 'alpha');
 
-    // Check parameters
+	// Check parameters
-    if (!$datesubscription) {
+	if (!$datesubscription) {
-        $error++;
+		$error++;
-        $langs->load("errors");
+		$langs->load("errors");
-        $errmsg = $langs->trans("ErrorBadDateFormat", $langs->transnoentitiesnoconv("DateSubscription"));
+		$errmsg = $langs->trans("ErrorBadDateFormat", $langs->transnoentitiesnoconv("DateSubscription"));
-        setEventMessages($errmsg, null, 'errors');
+		setEventMessages($errmsg, null, 'errors');
-        $action = 'addsubscription';
+		$action = 'addsubscription';
-    }
+	}
-    if (GETPOST('end') && !$datesubend) {
+	if (GETPOST('end') && !$datesubend) {
-        $error++;
+		$error++;
-        $langs->load("errors");
+		$langs->load("errors");
-        $errmsg = $langs->trans("ErrorBadDateFormat", $langs->transnoentitiesnoconv("DateEndSubscription"));
+		$errmsg = $langs->trans("ErrorBadDateFormat", $langs->transnoentitiesnoconv("DateEndSubscription"));
-        setEventMessages($errmsg, null, 'errors');
+		setEventMessages($errmsg, null, 'errors');
-        $action = 'addsubscription';
+		$action = 'addsubscription';
-    }
+	}
-    if (!$datesubend) {
+	if (!$datesubend) {
-        $datesubend = dol_time_plus_duree(dol_time_plus_duree($datesubscription, $defaultdelay, $defaultdelayunit), -1, 'd');
+		$datesubend = dol_time_plus_duree(dol_time_plus_duree($datesubscription, $defaultdelay, $defaultdelayunit), -1, 'd');
-    }
+	}
-    if (($option == 'bankviainvoice' || $option == 'bankdirect') && !$paymentdate) {
+	if (($option == 'bankviainvoice' || $option == 'bankdirect') && !$paymentdate) {
-        $error++;
+		$error++;
-        $errmsg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DatePayment"));
+		$errmsg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DatePayment"));
-        setEventMessages($errmsg, null, 'errors');
+		setEventMessages($errmsg, null, 'errors');
-        $action = 'addsubscription';
+		$action = 'addsubscription';
-    }
+	}
 
-    // Check if a payment is mandatory or not
+	// Check if a payment is mandatory or not
-    if (!$error && $adht->subscription) {	// Member type need subscriptions
+	if (!$error && $adht->subscription) {	// Member type need subscriptions
 		if (!is_numeric($amount)) {
-            // If field is '' or not a numeric value
+			// If field is '' or not a numeric value
-            $errmsg = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount"));
+			$errmsg = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount"));
-        	setEventMessages($errmsg, null, 'errors');
+			setEventMessages($errmsg, null, 'errors');
-            $error++;
+			$error++;
-            $action = 'addsubscription';
+			$action = 'addsubscription';
 		} else {
-            if (!empty($conf->banque->enabled) && $_POST["paymentsave"] != 'none') {
+			if (!empty($conf->banque->enabled) && $_POST["paymentsave"] != 'none') {
-                if ($_POST["subscription"]) {
+				if ($_POST["subscription"]) {
-                    if (!$_POST["label"])     $errmsg = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Label"));
+					if (!$_POST["label"])     $errmsg = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Label"));
-                    if ($_POST["paymentsave"] != 'invoiceonly' && !$_POST["operation"]) $errmsg = $langs->trans("ErrorFieldRequired", $langs->transnoentities("PaymentMode"));
+					if ($_POST["paymentsave"] != 'invoiceonly' && !$_POST["operation"]) $errmsg = $langs->trans("ErrorFieldRequired", $langs->transnoentities("PaymentMode"));
-                    if ($_POST["paymentsave"] != 'invoiceonly' && !($_POST["accountid"] > 0)) $errmsg = $langs->trans("ErrorFieldRequired", $langs->transnoentities("FinancialAccount"));
+					if ($_POST["paymentsave"] != 'invoiceonly' && !($_POST["accountid"] > 0)) $errmsg = $langs->trans("ErrorFieldRequired", $langs->transnoentities("FinancialAccount"));
-                } else {
+				} else {
-                    if ($_POST["accountid"])   $errmsg = $langs->trans("ErrorDoNotProvideAccountsIfNullAmount");
+					if ($_POST["accountid"])   $errmsg = $langs->trans("ErrorDoNotProvideAccountsIfNullAmount");
-                }
+				}
-                if ($errmsg) {
+				if ($errmsg) {
-                	$error++;
+					$error++;
-        			setEventMessages($errmsg, null, 'errors');
+					setEventMessages($errmsg, null, 'errors');
-        			$error++;
+					$error++;
-                	$action = 'addsubscription';
+					$action = 'addsubscription';
-                }
+				}
-            }
+			}
-        }
+		}
-    }
+	}
 
-    // Record the subscription then complementary actions
+	// Record the subscription then complementary actions
-    if (!$error && $action == 'subscription') {
+	if (!$error && $action == 'subscription') {
-        $db->begin();
+		$db->begin();
 
-        // Create subscription
+		// Create subscription
-        $crowid = $object->subscription($datesubscription, $amount, $accountid, $operation, $label, $num_chq, $emetteur_nom, $emetteur_banque, $datesubend);
+		$crowid = $object->subscription($datesubscription, $amount, $accountid, $operation, $label, $num_chq, $emetteur_nom, $emetteur_banque, $datesubend);
-        if ($crowid <= 0) {
+		if ($crowid <= 0) {
-            $error++;
+			$error++;
-            $errmsg = $object->error;
+			$errmsg = $object->error;
-	        setEventMessages($object->error, $object->errors, 'errors');
+			setEventMessages($object->error, $object->errors, 'errors');
-        }
+		}
 
-        if (!$error) {
+		if (!$error) {
-        	$result = $object->subscriptionComplementaryActions($crowid, $option, $accountid, $datesubscription, $paymentdate, $operation, $label, $amount, $num_chq, $emetteur_nom, $emetteur_banque);
+			$result = $object->subscriptionComplementaryActions($crowid, $option, $accountid, $datesubscription, $paymentdate, $operation, $label, $amount, $num_chq, $emetteur_nom, $emetteur_banque);
 			if ($result < 0) {
 				$error++;
 				setEventMessages($object->error, $object->errors, 'errors');
 			} else {
 				// If an invoice was created, it is into $object->invoice
 			}
-        }
+		}
 
-        if (!$error) {
+		if (!$error) {
-            $db->commit();
+			$db->commit();
-        } else {
+		} else {
-            $db->rollback();
+			$db->rollback();
-            $action = 'addsubscription';
+			$action = 'addsubscription';
-        }
+		}
 
-        if (!$error) {
+		if (!$error) {
-        	setEventMessages("SubscriptionRecorded", null, 'mesgs');
+			setEventMessages("SubscriptionRecorded", null, 'mesgs');
-        }
+		}
 
-        // Send email
+		// Send email
-        if (!$error) {
+		if (!$error) {
-            // Send confirmation Email
+			// Send confirmation Email
-            if ($object->email && $sendalsoemail) {   // $object is 'Adherent'
+			if ($object->email && $sendalsoemail) {   // $object is 'Adherent'
 				$subject = '';
-            	$msg = '';
+				$msg = '';
 
-            	// Send subscription email
+				// Send subscription email
-            	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+				include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-            	$formmail = new FormMail($db);
+				$formmail = new FormMail($db);
-            	// Set output language
+				// Set output language
-            	$outputlangs = new Translate('', $conf);
+				$outputlangs = new Translate('', $conf);
-            	$outputlangs->setDefaultLang(empty($object->thirdparty->default_lang) ? $mysoc->default_lang : $object->thirdparty->default_lang);
+				$outputlangs->setDefaultLang(empty($object->thirdparty->default_lang) ? $mysoc->default_lang : $object->thirdparty->default_lang);
-            	// Load traductions files required by page
+				// Load traductions files required by page
-            	$outputlangs->loadLangs(array("main", "members"));
+				$outputlangs->loadLangs(array("main", "members"));
 
-            	// Get email content from template
+				// Get email content from template
-            	$arraydefaultmessage = null;
+				$arraydefaultmessage = null;
-            	$labeltouse = $conf->global->ADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION;
+				$labeltouse = $conf->global->ADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION;
 
-            	if (!empty($labeltouse)) $arraydefaultmessage = $formmail->getEMailTemplate($db, 'member', $user, $outputlangs, 0, 1, $labeltouse);
+				if (!empty($labeltouse)) $arraydefaultmessage = $formmail->getEMailTemplate($db, 'member', $user, $outputlangs, 0, 1, $labeltouse);
 
-            	if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
+				if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
-            		$subject = $arraydefaultmessage->topic;
+					$subject = $arraydefaultmessage->topic;
-            		$msg     = $arraydefaultmessage->content;
+					$msg     = $arraydefaultmessage->content;
-            	}
+				}
 
-            	$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
+				$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
-            	complete_substitutions_array($substitutionarray, $outputlangs, $object);
+				complete_substitutions_array($substitutionarray, $outputlangs, $object);
-            	$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
+				$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
-            	$texttosend = make_substitutions(dol_concatdesc($msg, $adht->getMailOnSubscription()), $substitutionarray, $outputlangs);
+				$texttosend = make_substitutions(dol_concatdesc($msg, $adht->getMailOnSubscription()), $substitutionarray, $outputlangs);
 
-                // Attach a file ?
+				// Attach a file ?
-                $file = '';
+				$file = '';
-                $listofpaths = array();
+				$listofpaths = array();
-                $listofnames = array();
+				$listofnames = array();
-                $listofmimes = array();
+				$listofmimes = array();
-                if (is_object($object->invoice)) {
+				if (is_object($object->invoice)) {
-                	$invoicediroutput = $conf->facture->dir_output;
+					$invoicediroutput = $conf->facture->dir_output;
-                	$fileparams = dol_most_recent_file($invoicediroutput.'/'.$object->invoice->ref, preg_quote($object->invoice->ref, '/').'[^\-]+');
+					$fileparams = dol_most_recent_file($invoicediroutput.'/'.$object->invoice->ref, preg_quote($object->invoice->ref, '/').'[^\-]+');
-                	$file = $fileparams['fullname'];
+					$file = $fileparams['fullname'];
 
-                	$listofpaths = array($file);
+					$listofpaths = array($file);
-                	$listofnames = array(basename($file));
+					$listofnames = array(basename($file));
-                	$listofmimes = array(dol_mimetype($file));
+					$listofmimes = array(dol_mimetype($file));
-                }
+				}
 
-                $moreinheader = 'X-Dolibarr-Info: send_an_email by adherents/subscription.php'."\r\n";
+				$moreinheader = 'X-Dolibarr-Info: send_an_email by adherents/subscription.php'."\r\n";
 
-                $result = $object->send_an_email($texttosend, $subjecttosend, $listofpaths, $listofmimes, $listofnames, "", "", 0, -1, '', $moreinheader);
+				$result = $object->send_an_email($texttosend, $subjecttosend, $listofpaths, $listofmimes, $listofnames, "", "", 0, -1, '', $moreinheader);
-                if ($result < 0) {
+				if ($result < 0) {
-                	$errmsg = $object->error;
+					$errmsg = $object->error;
-                	setEventMessages($object->error, $object->errors, 'errors');
+					setEventMessages($object->error, $object->errors, 'errors');
-                } else {
+				} else {
-                	setEventMessages($langs->trans("EmailSentToMember", $object->email), null, 'mesgs');
+					setEventMessages($langs->trans("EmailSentToMember", $object->email), null, 'mesgs');
-                }
+				}
-            } else {
+			} else {
-            	setEventMessages($langs->trans("NoEmailSentToMember"), null, 'mesgs');
+				setEventMessages($langs->trans("NoEmailSentToMember"), null, 'mesgs');
-            }
+			}
-        }
+		}
 
-        // Clean some POST vars
+		// Clean some POST vars
-        if (!$error) {
+		if (!$error) {
-            $_POST["subscription"] = '';
+			$_POST["subscription"] = '';
-            $_POST["accountid"] = '';
+			$_POST["accountid"] = '';
-            $_POST["operation"] = '';
+			$_POST["operation"] = '';
-            $_POST["label"] = '';
+			$_POST["label"] = '';
-            $_POST["num_chq"] = '';
+			$_POST["num_chq"] = '';
-        }
+		}
-    }
+	}
 }
 
 
@@ -393,32 +393,32 @@ if ($optioncss != '')     $param .= '&optioncss='.urlencode($optioncss);
 
 
 if ($rowid > 0) {
-    $res = $object->fetch($rowid);
+	$res = $object->fetch($rowid);
-    if ($res < 0) { dol_print_error($db, $object->error); exit; }
+	if ($res < 0) { dol_print_error($db, $object->error); exit; }
 
-    $adht->fetch($object->typeid);
+	$adht->fetch($object->typeid);
 
-    $head = member_prepare_head($object);
+	$head = member_prepare_head($object);
 
-    $rowspan = 10;
+	$rowspan = 10;
-    if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) $rowspan++;
+	if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) $rowspan++;
-    if (!empty($conf->societe->enabled)) $rowspan++;
+	if (!empty($conf->societe->enabled)) $rowspan++;
 
-    print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+	print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="rowid" value="'.$object->id.'">';
+	print '<input type="hidden" name="rowid" value="'.$object->id.'">';
 
-    dol_fiche_head($head, 'subscription', $langs->trans("Member"), -1, 'user');
+	print dol_get_fiche_head($head, 'subscription', $langs->trans("Member"), -1, 'user');
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/adherents/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    dol_banner_tab($object, 'rowid', $linkback);
+	dol_banner_tab($object, 'rowid', $linkback);
 
-    print '<div class="fichecenter">';
+	print '<div class="fichecenter">';
-    print '<div class="fichehalfleft">';
+	print '<div class="fichehalfleft">';
 
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="underbanner clearboth"></div>';
-    print '<table class="border centpercent tableforfield">';
+	print '<table class="border centpercent tableforfield">';
 
 	// Login
 	if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
@@ -443,20 +443,20 @@ if ($rowid > 0) {
 	if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
 		print '<tr><td>'.$langs->trans("Password").'</td><td>'.preg_replace('/./i', '*', $object->pass);
 		if ((!empty($object->pass) || !empty($object->pass_crypted)) && empty($object->user_id)) {
-		    $langs->load("errors");
+			$langs->load("errors");
-		    $htmltext = $langs->trans("WarningPasswordSetWithNoAccount");
+			$htmltext = $langs->trans("WarningPasswordSetWithNoAccount");
-		    print ' '.$form->textwithpicto('', $htmltext, 1, 'warning');
+			print ' '.$form->textwithpicto('', $htmltext, 1, 'warning');
 		}
 		print '</td></tr>';
 	}
 
-    print '</table>';
+	print '</table>';
 
-    print '</div>';
+	print '</div>';
-    print '<div class="fichehalfright"><div class="ficheaddleft">';
+	print '<div class="fichehalfright"><div class="ficheaddleft">';
 
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="underbanner clearboth"></div>';
-    print '<table class="border tableforfield" width="100%">';
+	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>';
@@ -472,25 +472,25 @@ if ($rowid > 0) {
 		print '</td></tr>';
 	}
 
-    // Other attributes
+	// Other attributes
-    $cols = 2;
+	$cols = 2;
-    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
 	// Date end subscription
 	print '<tr><td>'.$langs->trans("SubscriptionEndDate").'</td><td class="valeur">';
 	if ($object->datefin) {
-	    print dol_print_date($object->datefin, 'day');
+		print dol_print_date($object->datefin, 'day');
-	    if ($object->hasDelay()) {
+		if ($object->hasDelay()) {
-	        print " ".img_warning($langs->trans("Late"));
+			print " ".img_warning($langs->trans("Late"));
-	    }
+		}
 	} else {
-	    if (!$adht->subscription) {
+		if (!$adht->subscription) {
-	        print $langs->trans("SubscriptionNotRecorded");
+			print $langs->trans("SubscriptionNotRecorded");
-	        if ($object->statut > 0) print " ".img_warning($langs->trans("Late")); // Display a delay picto only if it is not a draft and is not canceled
+			if ($object->statut > 0) print " ".img_warning($langs->trans("Late")); // Display a delay picto only if it is not a draft and is not canceled
-	    } else {
+		} else {
-	        print $langs->trans("SubscriptionNotReceived");
+			print $langs->trans("SubscriptionNotReceived");
-	        if ($object->statut > 0) print " ".img_warning($langs->trans("Late")); // Display a delay picto only if it is not a draft and is not canceled
+			if ($object->statut > 0) print " ".img_warning($langs->trans("Late")); // Display a delay picto only if it is not a draft and is not canceled
-	    }
+		}
 	}
 	print '</td></tr>';
 
@@ -555,7 +555,7 @@ if ($rowid > 0) {
 	print "</div></div></div>\n";
     print '<div style="clear:both"></div>';
 
-    dol_fiche_end();
+    print dol_get_fiche_end();
 
     print '</form>';
 
@@ -660,71 +660,71 @@ if ($rowid > 0) {
 							$accountstatic->accountancy_journal = $accountingjournal->getNomUrl(0, 1, 1, '', 1);
 						}
 
-                        $accountstatic->ref = $objp->ref;
+						$accountstatic->ref = $objp->ref;
-                        print $accountstatic->getNomUrl(1);
+						print $accountstatic->getNomUrl(1);
-                    } else {
+					} else {
-                        print '&nbsp;';
+						print '&nbsp;';
-                    }
+					}
-                    print '</td>';
+					print '</td>';
-                }
+				}
-                print "</tr>";
+				print "</tr>";
-                $i++;
+				$i++;
-            }
+			}
 
-            if (empty($num)) {
+			if (empty($num)) {
-                $colspan = 6;
+				$colspan = 6;
-                if (!empty($conf->banque->enabled)) $colspan++;
+				if (!empty($conf->banque->enabled)) $colspan++;
-                print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
+				print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
-            }
+			}
 
-            print "</table>";
+			print "</table>";
-        } else {
+		} else {
-            dol_print_error($db);
+			dol_print_error($db);
-        }
+		}
-    }
+	}
 
 
-    if (($action != 'addsubscription' && $action != 'create_thirdparty')) {
+	if (($action != 'addsubscription' && $action != 'create_thirdparty')) {
-	    // Shon online payment link
+		// Shon online payment link
-	    $useonlinepayment = (!empty($conf->paypal->enabled) || !empty($conf->stripe->enabled) || !empty($conf->paybox->enabled));
+		$useonlinepayment = (!empty($conf->paypal->enabled) || !empty($conf->stripe->enabled) || !empty($conf->paybox->enabled));
 
-	    if ($useonlinepayment) {
+		if ($useonlinepayment) {
-	    	print '<br>';
+			print '<br>';
 
-	    	require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
-	    	print showOnlinePaymentUrl('membersubscription', $object->ref);
+			print showOnlinePaymentUrl('membersubscription', $object->ref);
-	    	print '<br>';
+			print '<br>';
-	    }
+		}
-    }
+	}
 
-    /*
+	/*
      * Add new subscription form
      */
-    if (($action == 'addsubscription' || $action == 'create_thirdparty') && $user->rights->adherent->cotisation->creer) {
+	if (($action == 'addsubscription' || $action == 'create_thirdparty') && $user->rights->adherent->cotisation->creer) {
-        print '<br>';
+		print '<br>';
 
-        print load_fiche_titre($langs->trans("NewCotisation"));
+		print load_fiche_titre($langs->trans("NewCotisation"));
 
-        // Define default choice for complementary actions
+		// Define default choice for complementary actions
-        $bankdirect = 0; // 1 means option by default is write to bank direct with no invoice
+		$bankdirect = 0; // 1 means option by default is write to bank direct with no invoice
-        $invoiceonly = 0; // 1 means option by default is invoice only
+		$invoiceonly = 0; // 1 means option by default is invoice only
-        $bankviainvoice = 0; // 1 means option by default is write to bank via invoice
+		$bankviainvoice = 0; // 1 means option by default is write to bank via invoice
-        if (GETPOST('paymentsave')) {
+		if (GETPOST('paymentsave')) {
-        	if (GETPOST('paymentsave') == 'bankdirect')     $bankdirect = 1;
+			if (GETPOST('paymentsave') == 'bankdirect')     $bankdirect = 1;
-        	if (GETPOST('paymentsave') == 'invoiceonly')    $invoiceonly = 1;
+			if (GETPOST('paymentsave') == 'invoiceonly')    $invoiceonly = 1;
-        	if (GETPOST('paymentsave') == 'bankviainvoice') $bankviainvoice = 1;
+			if (GETPOST('paymentsave') == 'bankviainvoice') $bankviainvoice = 1;
-        } else {
+		} else {
-        	if (!empty($conf->global->ADHERENT_BANK_USE) && $conf->global->ADHERENT_BANK_USE == 'bankviainvoice' && !empty($conf->banque->enabled) && !empty($conf->societe->enabled) && !empty($conf->facture->enabled)) $bankviainvoice = 1;
+			if (!empty($conf->global->ADHERENT_BANK_USE) && $conf->global->ADHERENT_BANK_USE == 'bankviainvoice' && !empty($conf->banque->enabled) && !empty($conf->societe->enabled) && !empty($conf->facture->enabled)) $bankviainvoice = 1;
-        	elseif (!empty($conf->global->ADHERENT_BANK_USE) && $conf->global->ADHERENT_BANK_USE == 'bankdirect' && !empty($conf->banque->enabled)) $bankdirect = 1;
+			elseif (!empty($conf->global->ADHERENT_BANK_USE) && $conf->global->ADHERENT_BANK_USE == 'bankdirect' && !empty($conf->banque->enabled)) $bankdirect = 1;
-        	elseif (!empty($conf->global->ADHERENT_BANK_USE) && $conf->global->ADHERENT_BANK_USE == 'invoiceonly' && !empty($conf->banque->enabled) && !empty($conf->societe->enabled) && !empty($conf->facture->enabled)) $invoiceonly = 1;
+			elseif (!empty($conf->global->ADHERENT_BANK_USE) && $conf->global->ADHERENT_BANK_USE == 'invoiceonly' && !empty($conf->banque->enabled) && !empty($conf->societe->enabled) && !empty($conf->facture->enabled)) $invoiceonly = 1;
-        }
+		}
 
-        print "\n\n<!-- Form add subscription -->\n";
+		print "\n\n<!-- Form add subscription -->\n";
 
-        if ($conf->use_javascript_ajax) {
+		if ($conf->use_javascript_ajax) {
-        	//var_dump($bankdirect.'-'.$bankviainvoice.'-'.$invoiceonly.'-'.empty($conf->global->ADHERENT_BANK_USE));
+			//var_dump($bankdirect.'-'.$bankviainvoice.'-'.$invoiceonly.'-'.empty($conf->global->ADHERENT_BANK_USE));
-            print "\n".'<script type="text/javascript" language="javascript">';
+			print "\n".'<script type="text/javascript" language="javascript">';
-            print '$(document).ready(function () {
+			print '$(document).ready(function () {
                         $(".bankswitchclass, .bankswitchclass2").'.(($bankdirect || $bankviainvoice) ? 'show()' : 'hide()').';
                         $("#none, #invoiceonly").click(function() {
                             $(".bankswitchclass").hide();
@@ -750,10 +750,10 @@ if ($rowid > 0) {
                             }
                         });
                         ';
-            if (GETPOST('paymentsave')) print '$("#'.GETPOST('paymentsave').'").prop("checked",true);';
+			if (GETPOST('paymentsave')) print '$("#'.GETPOST('paymentsave').'").prop("checked",true);';
-    	    print '});';
+			print '});';
-            print '</script>'."\n";
+			print '</script>'."\n";
-        }
+		}
 
 
 		// Confirm create third party
@@ -778,16 +778,16 @@ if ($rowid > 0) {
 			if (!empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)) {
 				$tmpcompany = new Societe($db);
 				$tmpcompany->name = $companyname;
-                $tmpcompany->get_codeclient($tmpcompany, 0);
+				$tmpcompany->get_codeclient($tmpcompany, 0);
 				$customercode = $tmpcompany->code_client;
 				$formquestion[] = array(
-                    'label' => $langs->trans("CustomerCode"),
+					'label' => $langs->trans("CustomerCode"),
-                    'type' => 'text',
+					'type' => 'text',
-                    'name' => 'customercode',
+					'name' => 'customercode',
-                    'value' => $customercode,
+					'value' => $customercode,
-                    'morecss' => 'minwidth300',
+					'morecss' => 'minwidth300',
-                    'moreattr' => 'maxlength="128"',
+					'moreattr' => 'maxlength="128"',
-                );
+				);
 			}
 			// @todo Add other extrafields mandatory for thirdparty creation
 
@@ -795,99 +795,99 @@ if ($rowid > 0) {
 		}
 
 
-        print '<form name="subscription" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+		print '<form name="subscription" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-        print '<input type="hidden" name="token" value="'.newToken().'">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
-        print '<input type="hidden" name="action" value="subscription">';
+		print '<input type="hidden" name="action" value="subscription">';
-        print '<input type="hidden" name="rowid" value="'.$rowid.'">';
+		print '<input type="hidden" name="rowid" value="'.$rowid.'">';
-        print '<input type="hidden" name="memberlabel" id="memberlabel" value="'.dol_escape_htmltag($object->getFullName($langs)).'">';
+		print '<input type="hidden" name="memberlabel" id="memberlabel" value="'.dol_escape_htmltag($object->getFullName($langs)).'">';
-        print '<input type="hidden" name="thirdpartylabel" id="thirdpartylabel" value="'.dol_escape_htmltag($object->company).'">';
+		print '<input type="hidden" name="thirdpartylabel" id="thirdpartylabel" value="'.dol_escape_htmltag($object->company).'">';
 
-		dol_fiche_head('');
+		print dol_get_fiche_head('');
 
 		print "<table class=\"border\" width=\"100%\">\n";
-        print '<tbody>';
+		print '<tbody>';
 
 		$today = dol_now();
-        $datefrom = 0;
+		$datefrom = 0;
-        $dateto = 0;
+		$dateto = 0;
-        $paymentdate = -1;
+		$paymentdate = -1;
 
-        // Date payment
+		// Date payment
-        if (GETPOST('paymentyear') && GETPOST('paymentmonth') && GETPOST('paymentday')) {
+		if (GETPOST('paymentyear') && GETPOST('paymentmonth') && GETPOST('paymentday')) {
-            $paymentdate = dol_mktime(0, 0, 0, GETPOST('paymentmonth'), GETPOST('paymentday'), GETPOST('paymentyear'));
+			$paymentdate = dol_mktime(0, 0, 0, GETPOST('paymentmonth'), GETPOST('paymentday'), GETPOST('paymentyear'));
-        }
+		}
 
-        print '<tr>';
+		print '<tr>';
-        // Date start subscription
+		// Date start subscription
-        print '<td class="fieldrequired">'.$langs->trans("DateSubscription").'</td><td>';
+		print '<td class="fieldrequired">'.$langs->trans("DateSubscription").'</td><td>';
-        if (GETPOST('reday')) {
+		if (GETPOST('reday')) {
-            $datefrom = dol_mktime(0, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
+			$datefrom = dol_mktime(0, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
-        }
+		}
-        if (!$datefrom) {
+		if (!$datefrom) {
-        	$datefrom = $object->datevalid;
+			$datefrom = $object->datevalid;
-        	if ($object->datefin > 0) {
+			if ($object->datefin > 0) {
-                $datefrom = dol_time_plus_duree($object->datefin, 1, 'd');
+				$datefrom = dol_time_plus_duree($object->datefin, 1, 'd');
-            }
+			}
-        }
+		}
-        print $form->selectDate($datefrom, '', '', '', '', "subscription", 1, 1);
+		print $form->selectDate($datefrom, '', '', '', '', "subscription", 1, 1);
-        print "</td></tr>";
+		print "</td></tr>";
 
-        // Date end subscription
+		// Date end subscription
-        if (GETPOST('endday')) {
+		if (GETPOST('endday')) {
-            $dateto = dol_mktime(0, 0, 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear'));
+			$dateto = dol_mktime(0, 0, 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear'));
-        }
+		}
-        if (!$dateto) {
+		if (!$dateto) {
-            $dateto = -1; // By default, no date is suggested
+			$dateto = -1; // By default, no date is suggested
-        }
+		}
-        print '<tr><td>'.$langs->trans("DateEndSubscription").'</td><td>';
+		print '<tr><td>'.$langs->trans("DateEndSubscription").'</td><td>';
-        print $form->selectDate($dateto, 'end', '', '', '', "subscription", 1, 0);
+		print $form->selectDate($dateto, 'end', '', '', '', "subscription", 1, 0);
-        print "</td></tr>";
+		print "</td></tr>";
 
-        if ($adht->subscription) {
+		if ($adht->subscription) {
-            // Amount
+			// Amount
-            print '<tr><td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input type="text" name="subscription" size="6" value="'.GETPOST('subscription').'"> '.$langs->trans("Currency".$conf->currency).'</td></tr>';
+			print '<tr><td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input type="text" name="subscription" size="6" value="'.GETPOST('subscription').'"> '.$langs->trans("Currency".$conf->currency).'</td></tr>';
 
-            // Label
+			// Label
-            print '<tr><td>'.$langs->trans("Label").'</td>';
+			print '<tr><td>'.$langs->trans("Label").'</td>';
-            print '<td><input name="label" type="text" size="32" value="';
+			print '<td><input name="label" type="text" size="32" value="';
-            if (empty($conf->global->MEMBER_NO_DEFAULT_LABEL)) print $langs->trans("Subscription").' '.dol_print_date(($datefrom ? $datefrom : time()), "%Y");
+			if (empty($conf->global->MEMBER_NO_DEFAULT_LABEL)) print $langs->trans("Subscription").' '.dol_print_date(($datefrom ? $datefrom : time()), "%Y");
-            print '"></td></tr>';
+			print '"></td></tr>';
 
-            // Complementary action
+			// Complementary action
-            if ((!empty($conf->banque->enabled) || !empty($conf->facture->enabled)) && empty($conf->global->ADHERENT_SUBSCRIPTION_HIDECOMPLEMENTARYACTIONS)) {
+			if ((!empty($conf->banque->enabled) || !empty($conf->facture->enabled)) && empty($conf->global->ADHERENT_SUBSCRIPTION_HIDECOMPLEMENTARYACTIONS)) {
-                $company = new Societe($db);
+				$company = new Societe($db);
-                if ($object->fk_soc) {
+				if ($object->fk_soc) {
-                    $result = $company->fetch($object->fk_soc);
+					$result = $company->fetch($object->fk_soc);
-                }
+				}
 
-                // Title payments
+				// Title payments
-                //print '<tr><td colspan="2"><b>'.$langs->trans("Payment").'</b></td></tr>';
+				//print '<tr><td colspan="2"><b>'.$langs->trans("Payment").'</b></td></tr>';
 
-                // No more action
+				// No more action
-                print '<tr><td class="tdtop fieldrequired">'.$langs->trans('MoreActions');
+				print '<tr><td class="tdtop fieldrequired">'.$langs->trans('MoreActions');
-                print '</td>';
+				print '</td>';
-                print '<td>';
+				print '<td>';
-                print '<input type="radio" class="moreaction" id="none" name="paymentsave" value="none"'.(empty($bankdirect) && empty($invoiceonly) && empty($bankviainvoice) ? ' checked' : '').'> '.$langs->trans("None").'<br>';
+				print '<input type="radio" class="moreaction" id="none" name="paymentsave" value="none"'.(empty($bankdirect) && empty($invoiceonly) && empty($bankviainvoice) ? ' checked' : '').'> '.$langs->trans("None").'<br>';
-                // Add entry into bank accoun
+				// Add entry into bank accoun
-                if (!empty($conf->banque->enabled)) {
+				if (!empty($conf->banque->enabled)) {
-                    print '<input type="radio" class="moreaction" id="bankdirect" name="paymentsave" value="bankdirect"'.(!empty($bankdirect) ? ' checked' : '');
+					print '<input type="radio" class="moreaction" id="bankdirect" name="paymentsave" value="bankdirect"'.(!empty($bankdirect) ? ' checked' : '');
-                    print '> '.$langs->trans("MoreActionBankDirect").'<br>';
+					print '> '.$langs->trans("MoreActionBankDirect").'<br>';
-                }
+				}
-                // Add invoice with no payments
+				// Add invoice with no payments
-                if (!empty($conf->societe->enabled) && !empty($conf->facture->enabled)) {
+				if (!empty($conf->societe->enabled) && !empty($conf->facture->enabled)) {
-                    print '<input type="radio" class="moreaction" id="invoiceonly" name="paymentsave" value="invoiceonly"'.(!empty($invoiceonly) ? ' checked' : '');
+					print '<input type="radio" class="moreaction" id="invoiceonly" name="paymentsave" value="invoiceonly"'.(!empty($invoiceonly) ? ' checked' : '');
-                    //if (empty($object->fk_soc)) print ' disabled';
+					//if (empty($object->fk_soc)) print ' disabled';
-                    print '> '.$langs->trans("MoreActionInvoiceOnly");
+					print '> '.$langs->trans("MoreActionInvoiceOnly");
-                    if ($object->fk_soc) print ' ('.$langs->trans("ThirdParty").': '.$company->getNomUrl(1).')';
+					if ($object->fk_soc) print ' ('.$langs->trans("ThirdParty").': '.$company->getNomUrl(1).')';
-                    else {
+					else {
-                    	print ' (';
+						print ' (';
-                    	if (empty($object->fk_soc)) print img_warning($langs->trans("NoThirdPartyAssociatedToMember"));
+						if (empty($object->fk_soc)) print img_warning($langs->trans("NoThirdPartyAssociatedToMember"));
-                    	print $langs->trans("NoThirdPartyAssociatedToMember");
+						print $langs->trans("NoThirdPartyAssociatedToMember");
-                    	print ' - <a href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&amp;action=create_thirdparty">';
+						print ' - <a href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&amp;action=create_thirdparty">';
-                    	print $langs->trans("CreateDolibarrThirdParty");
+						print $langs->trans("CreateDolibarrThirdParty");
-                    	print '</a>)';
+						print '</a>)';
-                    }
+					}
-                    if (empty($conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS) || $conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS != 'defaultforfoundationcountry') print '. <span class="opacitymedium">'.$langs->trans("NoVatOnSubscription", 0).'</span>';
+					if (empty($conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS) || $conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS != 'defaultforfoundationcountry') print '. <span class="opacitymedium">'.$langs->trans("NoVatOnSubscription", 0).'</span>';
 					if (!empty($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS) && (!empty($conf->product->enabled) || !empty($conf->service->enabled))) {
 						$prodtmp = new Product($db);
 						$result = $prodtmp->fetch($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS);
@@ -896,23 +896,23 @@ if ($rowid > 0) {
 						}
 						print '. '.$langs->transnoentitiesnoconv("ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS", $prodtmp->getNomUrl(1)); // must use noentitiesnoconv to avoid to encode html into getNomUrl of product
 					}
-                    print '<br>';
+					print '<br>';
-                }
+				}
-                // Add invoice with payments
+				// Add invoice with payments
-                if (!empty($conf->banque->enabled) && !empty($conf->societe->enabled) && !empty($conf->facture->enabled)) {
+				if (!empty($conf->banque->enabled) && !empty($conf->societe->enabled) && !empty($conf->facture->enabled)) {
-                    print '<input type="radio" class="moreaction" id="bankviainvoice" name="paymentsave" value="bankviainvoice"'.(!empty($bankviainvoice) ? ' checked' : '');
+					print '<input type="radio" class="moreaction" id="bankviainvoice" name="paymentsave" value="bankviainvoice"'.(!empty($bankviainvoice) ? ' checked' : '');
-                    //if (empty($object->fk_soc)) print ' disabled';
+					//if (empty($object->fk_soc)) print ' disabled';
-                    print '> '.$langs->trans("MoreActionBankViaInvoice");
+					print '> '.$langs->trans("MoreActionBankViaInvoice");
-                    if ($object->fk_soc) print ' ('.$langs->trans("ThirdParty").': '.$company->getNomUrl(1).')';
+					if ($object->fk_soc) print ' ('.$langs->trans("ThirdParty").': '.$company->getNomUrl(1).')';
-                    else {
+					else {
-                    	print ' (';
+						print ' (';
-                    	if (empty($object->fk_soc)) print img_warning($langs->trans("NoThirdPartyAssociatedToMember"));
+						if (empty($object->fk_soc)) print img_warning($langs->trans("NoThirdPartyAssociatedToMember"));
-                    	print $langs->trans("NoThirdPartyAssociatedToMember");
+						print $langs->trans("NoThirdPartyAssociatedToMember");
-                    	print ' - <a href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&amp;action=create_thirdparty">';
+						print ' - <a href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&amp;action=create_thirdparty">';
-                    	print $langs->trans("CreateDolibarrThirdParty");
+						print $langs->trans("CreateDolibarrThirdParty");
-                    	print '</a>)';
+						print '</a>)';
-                    }
+					}
-                    if (empty($conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS) || $conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS != 'defaultforfoundationcountry') print '. <span class="opacitymedium">'.$langs->trans("NoVatOnSubscription", 0).'</span>';
+					if (empty($conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS) || $conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS != 'defaultforfoundationcountry') print '. <span class="opacitymedium">'.$langs->trans("NoVatOnSubscription", 0).'</span>';
 					if (!empty($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS) && (!empty($conf->product->enabled) || !empty($conf->service->enabled))) {
 						$prodtmp = new Product($db);
 						$result = $prodtmp->fetch($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS);
@@ -927,7 +927,7 @@ if ($rowid > 0) {
 
                 // Bank account
                 print '<tr class="bankswitchclass"><td class="fieldrequired">'.$langs->trans("FinancialAccount").'</td><td>';
-                $form->select_comptes(GETPOST('accountid'), 'accountid', 0, '', 1);
+                $form->select_comptes(GETPOST('accountid'), 'accountid', 0, '', 2);
                 print "</td></tr>\n";
 
                 // Payment mode
@@ -1020,7 +1020,7 @@ if ($rowid > 0) {
         print '</tbody>';
         print '</table>';
 
-        dol_fiche_end();
+        print dol_get_fiche_end();
 
         print '<div class="center">';
         print '<input type="submit" class="button" name="add" value="'.$langs->trans("AddSubscription").'">';

htdocs/adherents/subscription/card.php

@@ -170,7 +170,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'edit') {
 	print "<input type=\"hidden\" name=\"rowid\" value=\"$rowid\">";
 	print "<input type=\"hidden\" name=\"fk_bank\" value=\"".$object->fk_bank."\">";
 
-	dol_fiche_head($head, 'general', $langs->trans("Subscription"), 0, 'payment');
+	print dol_get_fiche_head($head, 'general', $langs->trans("Subscription"), 0, 'payment');
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/subscription/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
@@ -232,7 +232,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'edit') {
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" class="button" name="submit" value="'.$langs->trans("Save").'">';
@@ -256,7 +256,7 @@ if ($rowid && $action != 'edit') {
 
 	$head = subscription_prepare_head($object);
 
-	dol_fiche_head($head, 'general', $langs->trans("Subscription"), -1, 'payment');
+	print dol_get_fiche_head($head, 'general', $langs->trans("Subscription"), -1, 'payment');
 
 	// Confirmation to delete subscription
 	if ($action == 'delete') {
@@ -335,7 +335,7 @@ if ($rowid && $action != 'edit') {
 
 	print '</form>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	/*
      * Barre d'actions

htdocs/adherents/subscription/info.php

@@ -51,7 +51,7 @@ $result = $object->fetch($rowid);
 
 $head = subscription_prepare_head($object);
 
-dol_fiche_head($head, 'info', $langs->trans("Subscription"), -1, 'payment');
+print dol_get_fiche_head($head, 'info', $langs->trans("Subscription"), -1, 'payment');
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/adherents/subscription/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
@@ -72,7 +72,7 @@ print '</td></tr></table>';
 print '</div>';
 
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();

htdocs/adherents/subscription/list.php

@@ -142,6 +142,7 @@ $now = dol_now();
 
 // List of subscriptions
 $sql = "SELECT d.rowid, d.login, d.firstname, d.lastname, d.societe, d.photo, d.statut,";
+$sql .= " d.gender, d.email, d.morphy,";
 $sql .= " c.rowid as crowid, c.fk_type, c.subscription,";
 $sql .= " c.dateadh, c.datef, c.datec as date_creation, c.tms as date_update,";
 $sql .= " c.fk_bank as bank, c.note,";
@@ -151,8 +152,7 @@ $sql .= " JOIN ".MAIN_DB_PREFIX."subscription as c on d.rowid = c.fk_adherent";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."adherent_extrafields as ef on (d.rowid = ef.fk_object)";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON c.fk_bank=b.rowid";
 $sql .= " WHERE d.entity IN (".getEntity('adherent').")";
-if (isset($date_select) && $date_select != '')
+if (isset($date_select) && $date_select != '') {
-{
     $sql .= " AND c.dateadh >= '".((int) $date_select)."-01-01 00:00:00'";
     $sql .= " AND c.dateadh < '".((int) $date_select + 1)."-01-01 00:00:00'";
 }
@@ -403,6 +403,9 @@ while ($i < min($num, $limit)) {
 	$adherent->statut = $obj->statut;
 	$adherent->login = $obj->login;
 	$adherent->photo = $obj->photo;
+	$adherent->gender = $obj->gender;
+	$adherent->morphy = $obj->morphy;
+	$adherent->email = $obj->email;
 	$adherent->typeid = $obj->type;
 
 	$typeid = ($obj->fk_type > 0 ? $obj->fk_type : $adherent->typeid);

htdocs/adherents/type.php

@@ -207,7 +207,7 @@ llxHeader('', $langs->trans("MembersTypeSetup"), 'EN:Module_Foundations|FR:Modul
 
 // List of members type
 if (!$rowid && $action != 'create' && $action != 'edit') {
-	//dol_fiche_head('');
+	//print dol_get_fiche_head('');
 
 	$sql = "SELECT d.rowid, d.libelle as label, d.subscription, d.vote, d.statut as status, d.morphy";
 	$sql .= " FROM ".MAIN_DB_PREFIX."adherent_type as d";
@@ -308,7 +308,7 @@ if ($action == 'create') {
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="add">';
 
-	dol_fiche_head('');
+	print dol_get_fiche_head('');
 
 	print '<table class="border centpercent">';
 	print '<tbody>';
@@ -358,7 +358,7 @@ if ($action == 'create') {
 	print '<tbody>';
 	print "</table>\n";
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" name="button" class="button" value="'.$langs->trans("Add").'">';
@@ -389,7 +389,7 @@ if ($rowid > 0) {
 
 		$head = member_type_prepare_head($object);
 
-		dol_fiche_head($head, 'card', $langs->trans("MemberType"), -1, 'group');
+		print dol_get_fiche_head($head, 'card', $langs->trans("MemberType"), -1, 'group');
 
 		$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/type.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
@@ -433,7 +433,7 @@ if ($rowid > 0) {
 		print '</table>';
 		print '</div>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		/*
 		 * Buttons
@@ -710,7 +710,7 @@ if ($rowid > 0) {
 		print '<input type="hidden" name="rowid" value="'.$object->id.'">';
 		print '<input type="hidden" name="action" value="update">';
 
-		dol_fiche_head($head, 'card', $langs->trans("MemberType"), 0, 'group');
+		print dol_get_fiche_head($head, 'card', $langs->trans("MemberType"), 0, 'group');
 
 		print '<table class="border centpercent">';
 
@@ -759,7 +759,7 @@ if ($rowid > 0) {
 
 		print '</table>';
 
-		dol_fiche_end();
+		print dol_get_fiche_end();
 
 		print '<div class="center">';
 		print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';

htdocs/adherents/type_ldap.php

@@ -86,7 +86,7 @@ $form = new Form($db);
 
 $head = member_type_prepare_head($object);
 
-dol_fiche_head($head, 'ldap', $langs->trans("MemberType"), -1, 'group');
+print dol_get_fiche_head($head, 'ldap', $langs->trans("MemberType"), -1, 'group');
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/adherents/type.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
@@ -114,7 +114,7 @@ print '</table>';
 
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 /*
  * Action bar

htdocs/adherents/type_translation.php

@@ -160,13 +160,13 @@ if (!empty($object->multilangs)) {
 }
 
 
-dol_fiche_head($head, 'translation', $titre, 0, 'group');
+print dol_get_fiche_head($head, 'translation', $titre, 0, 'group');
 
 $linkback = '<a href="'.dol_buildpath('/adherents/type.php', 1).'">'.$langs->trans("BackToList").'</a>';
 
 dol_banner_tab($object, 'rowid', $linkback);
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 
@@ -258,7 +258,7 @@ if ($action == 'add' && $user->rights->adherent->configurer) {
 	print '<input type="hidden" name="action" value="vadd">';
 	print '<input type="hidden" name="rowid" value="'.GETPOST("rowid", 'int').'">';
 
-	dol_fiche_head();
+	print dol_get_fiche_head();
 
 	print '<table class="border centpercent">';
 	print '<tr><td class="tdtop titlefieldcreate fieldrequired">'.$langs->trans('Language').'</td><td>';
@@ -272,7 +272,7 @@ if ($action == 'add' && $user->rights->adherent->configurer) {
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';

htdocs/admin/accountant.php

@@ -82,7 +82,7 @@ print load_fiche_titre($langs->trans("CompanyFoundation"), '', 'title_setup');
 
 $head = company_admin_prepare_head();
 
-dol_fiche_head($head, 'accountant', $langs->trans("Company"), -1, 'company');
+print dol_get_fiche_head($head, 'accountant', $langs->trans("Company"), -1, 'company');
 
 $form = new Form($db);
 $formother = new FormOther($db);

htdocs/admin/agenda.php

@@ -132,7 +132,7 @@ $param .= '&search_event='.urlencode($search_event);
 
 $head = agenda_prepare_head();
 
-dol_fiche_head($head, 'autoactions', $langs->trans("Agenda"), -1, 'action');
+print dol_get_fiche_head($head, 'autoactions', $langs->trans("Agenda"), -1, 'action');
 
 print '<span class="opacitymedium">'.$langs->trans("AgendaAutoActionDesc")." ".$langs->trans("OnlyActiveElementsAreShown", 'modules.php').'</span><br>';
 print "<br>\n";
@@ -197,7 +197,7 @@ if (!empty($triggers))
 print '</table>';
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<div class="center">';
 print '<input type="submit" name="save" class="button" value="'.$langs->trans("Save").'">';

htdocs/admin/agenda_extrafields.php

@@ -74,11 +74,11 @@ print load_fiche_titre($langs->trans("AgendaSetup"), $linkback, 'title_setup');
 
 $head = agenda_prepare_head();
 
-dol_fiche_head($head, 'attributes', $langs->trans("Agenda"), -1, 'action');
+print dol_get_fiche_head($head, 'attributes', $langs->trans("Agenda"), -1, 'action');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons

htdocs/admin/agenda_extsites.php

@@ -136,7 +136,7 @@ print '<input type="hidden" name="action" value="save">';
 
 $head = agenda_prepare_head();
 
-dol_fiche_head($head, 'extsites', $langs->trans("Agenda"), -1, 'action');
+print dol_get_fiche_head($head, 'extsites', $langs->trans("Agenda"), -1, 'action');
 
 print '<span class="opacitymedium">'.$langs->trans("AgendaExtSitesDesc")."</span><br>\n";
 print "<br>\n";
@@ -224,7 +224,7 @@ while ($i <= $MAXAGENDA)
 
 print '</table>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<div class="center">';
 print '<input type="submit" id="save" name="save" class="button hideifnotset" value="'.$langs->trans("Save").'">';

htdocs/admin/agenda_other.php

@@ -175,7 +175,7 @@ print load_fiche_titre($langs->trans("AgendaSetup"), $linkback, 'title_setup');
 
 $head = agenda_prepare_head();
 
-dol_fiche_head($head, 'other', $langs->trans("Agenda"), -1, 'action');
+print dol_get_fiche_head($head, 'other', $langs->trans("Agenda"), -1, 'action');
 
 
 /*
@@ -376,7 +376,7 @@ print '</td></tr>'."\n";
 
 print '</table>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<div class="center"><input class="button" type="submit" name="save" value="'.dol_escape_htmltag($langs->trans("Save")).'"></div>';
 

htdocs/admin/agenda_reminder.php

@@ -166,7 +166,7 @@ print load_fiche_titre($langs->trans("AgendaSetup"), $linkback, 'title_setup');
 
 $head = agenda_prepare_head();
 
-dol_fiche_head($head, 'reminders', $langs->trans("Agenda"), -1, 'action');
+print dol_get_fiche_head($head, 'reminders', $langs->trans("Agenda"), -1, 'action');
 
 print '<form action="'.$_SERVER["PHP_SELF"].'" name="agenda">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -229,7 +229,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL == 2)
 
 print '</table>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 //print '<div class="center"><input class="button" type="submit" name="save" value="'.dol_escape_htmltag($langs->trans("Save")).'"></div>';
 

htdocs/admin/agenda_xcal.php

@@ -80,7 +80,7 @@ print '<input type="hidden" name="token" value="'.newToken().'">';
 
 $head = agenda_prepare_head();
 
-dol_fiche_head($head, 'xcal', $langs->trans("Agenda"), -1, 'action');
+print dol_get_fiche_head($head, 'xcal', $langs->trans("Agenda"), -1, 'action');
 
 print '<span class="opacitymedium">'.$langs->trans("AgendaSetupOtherDesc")."</span><br>\n";
 print "<br>\n";
@@ -135,7 +135,7 @@ print "</tr>";
 
 print '</table>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<div class="center">';
 print "<input type=\"submit\" name=\"save\" class=\"button\" value=\"".$langs->trans("Save")."\">";

htdocs/admin/bank.php

@@ -215,7 +215,7 @@ print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="save">';
 
 $head = bank_admin_prepare_head(null);
-dol_fiche_head($head, 'general', $langs->trans("BankSetupModule"), -1, 'account');
+print dol_get_fiche_head($head, 'general', $langs->trans("BankSetupModule"), -1, 'account');
 
 //Show bank account order
 print load_fiche_titre($langs->trans("BankOrderShow"), '', '');
@@ -495,7 +495,7 @@ if ($conf->global->BANK_REPORT_LAST_NUM_RELEVE) {
 
 print "</tr>\n";
 print '</table>';
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<div class="center">';
 print '<input type="submit" id="save" name="save" class="button hideifnotset" value="'.$langs->trans("Save").'">';

htdocs/admin/bank_extrafields.php

@@ -71,11 +71,11 @@ print load_fiche_titre($langs->trans("BankSetupModule"), $linkback, 'title_setup
 
 $head = bank_admin_prepare_head(null);
 
-dol_fiche_head($head, 'attributes', $langs->trans("BankSetupModule"), -1, 'account');
+print dol_get_fiche_head($head, 'attributes', $langs->trans("BankSetupModule"), -1, 'account');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons

htdocs/admin/bom.php

@@ -181,7 +181,7 @@ print load_fiche_titre($langs->trans("BOMsSetup"), $linkback, 'title_setup');
 
 $head = bomAdminPrepareHead();
 
-dol_fiche_head($head, 'settings', $langs->trans("BOMs"), -1, 'bom');
+print dol_get_fiche_head($head, 'settings', $langs->trans("BOMs"), -1, 'bom');
 
 /*
  * BOMs Numbering model

htdocs/admin/bom_extrafields.php

@@ -70,11 +70,11 @@ print load_fiche_titre($langs->trans("BOMsSetup"), $linkback, 'title_setup');
 
 $head = bomAdminPrepareHead();
 
-dol_fiche_head($head, 'bom_extrafields', $langs->trans("ExtraFields"), -1, 'account');
+print dol_get_fiche_head($head, 'bom_extrafields', $langs->trans("ExtraFields"), -1, 'account');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons

htdocs/admin/chequereceipts.php

@@ -99,7 +99,7 @@ $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_valu
 print load_fiche_titre($langs->trans("BankSetupModule"), $linkback, 'title_setup');
 
 $head = bank_admin_prepare_head(null);
-dol_fiche_head($head, 'checkreceipts', $langs->trans("BankSetupModule"), -1, 'account');
+print dol_get_fiche_head($head, 'checkreceipts', $langs->trans("BankSetupModule"), -1, 'account');
 
 /*
  *  Numbering module
@@ -266,7 +266,7 @@ print "<br>";
 
 print '</table>'."\n";
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '</form>';
 

htdocs/admin/commande.php

@@ -246,7 +246,7 @@ print load_fiche_titre($langs->trans("OrdersSetup"), $linkback, 'title_setup');
 
 $head = order_admin_prepare_head();
 
-dol_fiche_head($head, 'general', $langs->trans("Orders"), -1, 'order');
+print dol_get_fiche_head($head, 'general', $langs->trans("Orders"), -1, 'order');
 
 /*
  * Orders Numbering model

htdocs/admin/commande_fournisseur_dispatch_extrafields.php

@@ -79,11 +79,11 @@ print "<br>\n";
 
 $head = reception_admin_prepare_head();
 
-dol_fiche_head($head, 'attributeslines_reception', $langs->trans("Receptions"), -1, 'sending');
+print dol_get_fiche_head($head, 'attributeslines_reception', $langs->trans("Receptions"), -1, 'sending');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons

htdocs/admin/company.php

@@ -88,9 +88,9 @@ if (($action == 'update' && !GETPOST("cancel", 'alpha'))
 		dolibarr_del_const($db, "MAIN_INFO_SOCIETE_STATE", $conf->entity);
 	}
 
-    $db->begin();
+	$db->begin();
 
-    dolibarr_set_const($db, "MAIN_INFO_SOCIETE_NOM", GETPOST("nom", 'nohtml'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_NOM", GETPOST("nom", 'nohtml'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_ADDRESS", GETPOST("MAIN_INFO_SOCIETE_ADDRESS", 'nohtml'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_TOWN", GETPOST("MAIN_INFO_SOCIETE_TOWN", 'nohtml'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_ZIP", GETPOST("MAIN_INFO_SOCIETE_ZIP", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
@@ -141,8 +141,8 @@ if (($action == 'update' && !GETPOST("cancel", 'alpha'))
 						// Create thumbs of logo (Note that PDF use original file and not thumbs)
 						if ($isimage > 0)
 						{
-						    // Create thumbs
+							// Create thumbs
-						    //$object->addThumbs($newfile);    // We can't use addThumbs here yet because we need name of generated thumbs to add them into constants. TODO Check if need such constants. We should be able to retreive value with get...
+							//$object->addThumbs($newfile);    // We can't use addThumbs here yet because we need name of generated thumbs to add them into constants. TODO Check if need such constants. We should be able to retrieve value with get...
 
 							// Create small thumb, Used on logon for example
 							$imgThumbSmall = vignette($dirforimage.$original_file, $maxwidthsmall, $maxheightsmall, '_small', $quality);
@@ -269,8 +269,8 @@ if ($action == 'addthumb' || $action == 'addthumbsquarred')  // Regenerate thumb
 
 			$reg = array();
 
-		    // Create thumbs
+			// Create thumbs
-			//$object->addThumbs($newfile);    // We can't use addThumbs here yet because we need name of generated thumbs to add them into constants. TODO Check if need such constants. We should be able to retreive value with get...
+			//$object->addThumbs($newfile);    // We can't use addThumbs here yet because we need name of generated thumbs to add them into constants. TODO Check if need such constants. We should be able to retrieve value with get...
 
 			// Create small thumb. Used on logon for example
 			$imgThumbSmall = vignette($conf->mycompany->dir_output.'/logos/'.$_GET["file"], $maxwidthsmall, $maxheightsmall, '_small', $quality);
@@ -373,7 +373,7 @@ print load_fiche_titre($langs->trans("CompanyFoundation"), '', 'title_setup');
 
 $head = company_admin_prepare_head();
 
-dol_fiche_head($head, 'company', $langs->trans("Company"), -1, 'company');
+print dol_get_fiche_head($head, 'company', $langs->trans("Company"), -1, 'company');
 
 print '<span class="opacitymedium">'.$langs->trans("CompanyFundationDesc", $langs->transnoentities("Save"))."</span><br>\n";
 print "<br>\n";
@@ -777,8 +777,8 @@ if ($mysoc->useLocalTax(2))
 	$tooltiphelp = ($tooltiphelp != "LocalTax2IsUsedExample" ? "<i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax2IsUsedExample", $mysoc->country_code)."</i>\n" : "");
 	if (!isOnlyOneLocalTax(2))
 	{
-	    print '<br><label for="lt2">'.$langs->trans("LTRate").'</label>: ';
+		print '<br><label for="lt2">'.$langs->trans("LTRate").'</label>: ';
-	    $formcompany->select_localtax(2, $conf->global->MAIN_INFO_VALUE_LOCALTAX2, "lt2");
+		$formcompany->select_localtax(2, $conf->global->MAIN_INFO_VALUE_LOCALTAX2, "lt2");
 	}
 	print '<br><label for="clt2">'.$langs->trans("CalcLocaltax").'</label>: ';
 	print $form->selectarray("clt2", $opcions, $conf->global->MAIN_INFO_LOCALTAX_CALC2);

htdocs/admin/confexped.php

@@ -67,12 +67,12 @@ if ($action == 'disable_sending')
 if ($action == 'activate_delivery')
 {
 	dolibarr_set_const($db, "MAIN_SUBMODULE_EXPEDITION", "1", 'chaine', 0, '', $conf->entity); // We must also enable this
-	dolibarr_set_const($db, "MAIN_SUBMODULE_LIVRAISON", "1", 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_SUBMODULE_DELIVERY", "1", 'chaine', 0, '', $conf->entity);
 	header("Location: confexped.php");
 	exit;
 } elseif ($action == 'disable_delivery')
 {
-	dolibarr_del_const($db, "MAIN_SUBMODULE_LIVRAISON", $conf->entity);
+	dolibarr_del_const($db, "MAIN_SUBMODULE_DELIVERY", $conf->entity);
 	header("Location: confexped.php");
 	exit;
 }
@@ -92,7 +92,7 @@ print load_fiche_titre($langs->trans("SendingsSetup"), $linkback, 'title_setup')
 print '<br>';
 $head = expedition_admin_prepare_head();
 
-dol_fiche_head($head, 'general', $langs->trans("Sendings"), -1, 'shipment');
+print dol_get_fiche_head($head, 'general', $langs->trans("Sendings"), -1, 'shipment');
 
 // Miscellaneous parameters
 
@@ -121,7 +121,7 @@ else
 print "</td>";
 print '</tr>';
 
-// Bon de livraison activation/desactivation
+// Delivery note activate/deactivate Bon de livraison activation/desactivation
 print '<tr>';
 print '<td>';
 print $langs->trans("DeliveriesOrderAbility");
@@ -131,7 +131,7 @@ print '<td>';
 print '</td>';
 print '<td class="center">';
 
-if (empty($conf->global->MAIN_SUBMODULE_LIVRAISON))
+if (empty($conf->global->MAIN_SUBMODULE_DELIVERY))
 {
 	print '<a href="confexped.php?action=activate_delivery">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 } else {

htdocs/admin/contract.php

@@ -178,7 +178,7 @@ print load_fiche_titre($langs->trans("ContractsSetup"), $linkback, 'title_setup'
 
 $head = contract_admin_prepare_head();
 
-dol_fiche_head($head, 'contract', $langs->trans("Contracts"), -1, 'contract');
+print dol_get_fiche_head($head, 'contract', $langs->trans("Contracts"), -1, 'contract');
 
 /*
  * Contracts Numbering model
@@ -488,7 +488,7 @@ print '</div>';
 
 print '</form>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();

htdocs/admin/dav.php

@@ -69,7 +69,7 @@ print '<input type="hidden" name="token" value="'.newToken().'">';
 
 $head = dav_admin_prepare_head();
 
-dol_fiche_head($head, 'webdav', '', -1, 'action');
+print dol_get_fiche_head($head, 'webdav', '', -1, 'action');
 
 if ($action == 'edit')
 {
@@ -148,7 +148,7 @@ if ($action == 'edit')
 }
 
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 /*print '<div class="center">';
 print "<input type=\"submit\" name=\"save\" class=\"button\" value=\"".$langs->trans("Save")."\">";

htdocs/admin/defaultvalues.php

@@ -224,7 +224,7 @@ print '<input type="hidden" name="page" value="'.$page.'">';
 
 $head = defaultvalues_prepare_head();
 
-dol_fiche_head($head, $mode, '', -1, '');
+print dol_get_fiche_head($head, $mode, '', -1, '');
 
 if ($mode == 'sortorder')
 {
@@ -401,7 +401,7 @@ if ($result)
 print '</table>';
 print '</div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print "</form>\n";
 

htdocs/admin/delivery.php

@@ -24,15 +24,15 @@
  */
 
 /**
- *      \file       htdocs/admin/livraison.php
+ *      \file       htdocs/admin/delivery.php
- *      \ingroup    livraison
+ *      \ingroup    delivery
- *      \brief      Page d'administration/configuration du module Livraison
+ *      \brief      age to setup extra fields of delivery
  */
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/expedition.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/livraison/class/livraison.class.php';
+require_once DOL_DOCUMENT_ROOT.'/delivery/class/delivery.class.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array("admin", "sendings", "deliveries", "other"));
@@ -87,7 +87,7 @@ if ($action == 'specimen')
 {
     $modele = GETPOST('module', 'alpha');
 
-    $sending = new Livraison($db);
+    $sending = new Delivery($db);
     $sending->initAsSpecimen();
 
     // Search template files
@@ -95,7 +95,7 @@ if ($action == 'specimen')
     $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
     foreach ($dirmodels as $reldir)
     {
-        $file = dol_buildpath($reldir."core/modules/livraison/doc/pdf_".$modele.".modules.php", 0);
+        $file = dol_buildpath($reldir."core/modules/delivery/doc/pdf_".$modele.".modules.php", 0);
         if (file_exists($file))
         {
             $filefound = 1;
@@ -112,7 +112,7 @@ if ($action == 'specimen')
 
         if ($module->write_file($sending, $langs) > 0)
         {
-            header("Location: ".DOL_URL_ROOT."/document.php?modulepart=livraison&file=SPECIMEN.pdf");
+            header("Location: ".DOL_URL_ROOT."/document.php?modulepart=delivery&file=SPECIMEN.pdf");
             return;
         } else {
             setEventMessages($module->error, $module->errors, 'errors');
@@ -134,17 +134,17 @@ if ($action == 'del')
     $ret = delDocumentModel($value, $type);
     if ($ret > 0)
     {
-        if ($conf->global->LIVRAISON_ADDON_PDF == "$value") dolibarr_del_const($db, 'LIVRAISON_ADDON_PDF', $conf->entity);
+        if ($conf->global->DELIVERY_ADDON_PDF == "$value") dolibarr_del_const($db, 'DELIVERY_ADDON_PDF', $conf->entity);
     }
 }
 
 if ($action == 'setdoc')
 {
-    if (dolibarr_set_const($db, "LIVRAISON_ADDON_PDF", $value, 'chaine', 0, '', $conf->entity))
+    if (dolibarr_set_const($db, "DELIVERY_ADDON_PDF", $value, 'chaine', 0, '', $conf->entity))
     {
         // La constante qui a ete lue en avant du nouveau set
         // on passe donc par une variable pour avoir un affichage coherent
-        $conf->global->LIVRAISON_ADDON_PDF = $value;
+        $conf->global->DELIVERY_ADDON_PDF = $value;
     }
 
     // On active le modele
@@ -160,7 +160,7 @@ if ($action == 'setmod')
     // TODO Verifier si module numerotation choisi peut etre active
     // par appel methode canBeActivated
 
-    dolibarr_set_const($db, "LIVRAISON_ADDON_NUMBER", $value, 'chaine', 0, '', $conf->entity);
+    dolibarr_set_const($db, "DELIVERY_ADDON_NUMBER", $value, 'chaine', 0, '', $conf->entity);
 }
 
 
@@ -179,7 +179,7 @@ print load_fiche_titre($langs->trans("SendingsSetup"), $linkback, 'title_setup')
 print '<br>';
 $head = expedition_admin_prepare_head();
 
-dol_fiche_head($head, 'receivings', $langs->trans("Receivings"), -1, 'shipment');
+print dol_get_fiche_head($head, 'receivings', $langs->trans("Receivings"), -1, 'shipment');
 
 
 // Delivery numbering model
@@ -199,7 +199,7 @@ clearstatcache();
 
 foreach ($dirmodels as $reldir)
 {
-    $dir = dol_buildpath($reldir."core/modules/livraison/");
+    $dir = dol_buildpath($reldir."core/modules/delivery/");
 
     if (is_dir($dir))
     {
@@ -208,8 +208,7 @@ foreach ($dirmodels as $reldir)
         {
             while (($file = readdir($handle)) !== false)
             {
-                if (substr($file, 0, 14) == 'mod_livraison_' && substr($file, dol_strlen($file) - 3, 3) == 'php')
+            	if (preg_match('/^mod_delivery_([a-z0-9_]*)\.php$/', $file)) {
-                {
                     $file = substr($file, 0, dol_strlen($file) - 4);
 
                     require_once $dir.$file.'.php';
@@ -222,8 +221,7 @@ foreach ($dirmodels as $reldir)
 						if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
 						if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
 
-
+                        print '<tr class="oddeven"><td>'.$module->name."</td><td>\n";
-                        print '<tr class="oddeven"><td>'.$module->nom."</td><td>\n";
                         print $module->info();
                         print '</td>';
 
@@ -237,7 +235,7 @@ foreach ($dirmodels as $reldir)
                         print '</td>'."\n";
 
                         print '<td class="center">';
-                        if ($conf->global->LIVRAISON_ADDON_NUMBER == "$file")
+                        if ($conf->global->DELIVERY_ADDON_NUMBER == "$file")
                         {
                             print img_picto($langs->trans("Activated"), 'switch_on');
                         } else {
@@ -245,13 +243,13 @@ foreach ($dirmodels as $reldir)
                         }
                         print '</td>';
 
-                        $livraison = new Livraison($db);
+                        $delivery = new Delivery($db);
-                        $livraison->initAsSpecimen();
+                        $delivery->initAsSpecimen();
 
                         // Info
                         $htmltooltip = '';
                         $htmltooltip .= ''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
-                        $nextval = $module->getNextValue($mysoc, $livraison);
+                        $nextval = $module->getNextValue($mysoc, $delivery);
                         if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
                             $htmltooltip .= ''.$langs->trans("NextValue").': ';
                             if ($nextval) {
@@ -323,7 +321,7 @@ clearstatcache();
 
 foreach ($dirmodels as $reldir)
 {
-    $dir = dol_buildpath($reldir."core/modules/livraison/doc/");
+    $dir = dol_buildpath($reldir."core/modules/delivery/doc/");
 
     if (is_dir($dir))
     {
@@ -378,7 +376,7 @@ foreach ($dirmodels as $reldir)
 
 		    				// Default
 		    				print "<td align=\"center\">";
-		    				if ($conf->global->LIVRAISON_ADDON_PDF == "$name")
+		    				if ($conf->global->DELIVERY_ADDON_PDF == "$name")
 		    				{
 		    					print img_picto($langs->trans("Default"), 'on');
 		    				} else {

htdocs/admin/delivery_extrafields.php

@@ -22,9 +22,9 @@
  */
 
 /**
- *      \file       htdocs/admin/livraison_extrafields.php
+ *      \file       htdocs/admin/delivery_extrafields.php
- *		\ingroup    livraison
+ *		\ingroup    delivery
- *		\brief      Page to setup extra fields of livraison
+ *		\brief      Page to setup extra fields of delivery
  */
 
 require '../main.inc.php';
@@ -49,7 +49,7 @@ foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoenti
 
 $action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
-$elementtype = 'livraison'; //Must be the $table_element of the class that manage extrafield
+$elementtype = 'delivery'; //Must be the $table_element of the class that manage extrafield
 
 if (!$user->admin) accessforbidden();
 
@@ -76,11 +76,11 @@ print "<br>\n";
 
 $head = expedition_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes_receivings', $langs->trans("Receivings"), -1, 'shipment');
+print dol_get_fiche_head($head, 'attributes_receivings', $langs->trans("Receivings"), -1, 'shipment');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons

htdocs/admin/deliverydet_extrafields.php

@@ -24,9 +24,9 @@
  */
 
 /**
- *      \file       htdocs/admin/livraisondet_extrafields.php
+ *      \file       htdocs/admin/deliverydet_extrafields.php
- *		\ingroup    livraison
+ *		\ingroup    delivery
- *		\brief      Page to setup extra fields of livraison
+ *		\brief      Page to setup extra fields of delivery
  */
 
 require '../main.inc.php';
@@ -50,7 +50,7 @@ foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoenti
 
 $action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
-$elementtype = 'livraisondet'; //Must be the $table_element of the class that manage extrafield
+$elementtype = 'deliverydet'; //Must be the $table_element of the class that manage extrafield
 
 if (!$user->admin) accessforbidden();
 
@@ -77,11 +77,11 @@ print "<br>\n";
 
 $head = expedition_admin_prepare_head();
 
-dol_fiche_head($head, 'attributeslines_receivings', $langs->trans("Receivings"), -1, 'shipment');
+print dol_get_fiche_head($head, 'attributeslines_receivings', $langs->trans("Receivings"), -1, 'shipment');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons

htdocs/admin/dict.php

@@ -11,7 +11,7 @@
  * Copyright (C) 2011-2019	Alexandre Spangaro		<aspangaro@open-dsi.fr>
  * Copyright (C) 2015		Ferran Marcet			<fmarcet@2byte.es>
  * Copyright (C) 2016		Raphaël Doursenaud		<rdoursenaud@gpcsolutions.fr>
- * Copyright (C) 2019       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-2020  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2020		Open-Dsi				<support@open-dsi.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -746,8 +746,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
 			setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities("Country")), null, 'errors');
 		}
 	}
-	if ($id == 3 && !is_numeric($_POST["code"]))
+	if (($id == 3 || $id == 42) && !is_numeric($_POST["code"])) {
-	{
 	   	$ok = 0;
 	   	setEventMessages($langs->transnoentities("ErrorFieldMustBeANumeric", $langs->transnoentities("Code")), null, 'errors');
 	}
@@ -879,7 +878,11 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
 
 			$i++;
 		}
-		$sql .= " WHERE ".$rowidcol." = ".(int) $db->escape($rowid);
+		if (in_array($rowidcol, array('code', 'code_iso'))) {
+			$sql .= " WHERE ".$rowidcol." = '".$db->escape($rowid)."'";
+		} else {
+			$sql .= " WHERE ".$rowidcol." = ".((int) $rowid);
+		}
 		if (in_array('entity', $listfieldmodify)) $sql .= " AND entity = '".getEntity($tabname[$id])."'";
 
 		dol_syslog("actionmodify", LOG_DEBUG);

htdocs/admin/ecm.php

@@ -73,7 +73,7 @@ print '<br>';
 
 $head = ecm_admin_prepare_head();
 
-dol_fiche_head($head, 'ecm', $langs->trans("ECM"), -1, 'ecm');
+print dol_get_fiche_head($head, 'ecm', $langs->trans("ECM"), -1, 'ecm');
 
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';

htdocs/admin/ecm_directories_extrafields.php

@@ -80,11 +80,11 @@ print "<br>\n";
 
 $head = ecm_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes_ecm_directories', $langs->trans("ECM"), -1, 'ecm');
+print dol_get_fiche_head($head, 'attributes_ecm_directories', $langs->trans("ECM"), -1, 'ecm');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons

htdocs/admin/ecm_files_extrafields.php

@@ -80,11 +80,11 @@ print "<br>\n";
 
 $head = ecm_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes_ecm_files', $langs->trans("ECM"), -1, 'ecm');
+print dol_get_fiche_head($head, 'attributes_ecm_files', $langs->trans("ECM"), -1, 'ecm');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons

htdocs/admin/emailcollector_card.php

@@ -247,7 +247,7 @@ if ($action == 'create') {
 	print '<input type="hidden" name="action" value="add">';
 	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 
-	dol_fiche_head(array(), '');
+	print dol_get_fiche_head(array(), '');
 
 	print '<table class="border centpercent tableforfield">'."\n";
 
@@ -261,7 +261,7 @@ if ($action == 'create') {
 
 	print '</table>'."\n";
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" class="button" name="add" value="'.dol_escape_htmltag($langs->trans("Create")).'">';
@@ -283,7 +283,7 @@ if (($id || $ref) && $action == 'edit')
 	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 	print '<input type="hidden" name="id" value="'.$object->id.'">';
 
-	dol_fiche_head();
+	print dol_get_fiche_head();
 
 	print '<table class="border centpercent tableforfield">'."\n";
 
@@ -295,7 +295,7 @@ if (($id || $ref) && $action == 'edit')
 
 	print '</table>';
 
-	dol_fiche_end();
+	print dol_get_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").'">';
@@ -313,7 +313,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	$object->fetchActions();
 
 	$head = emailcollectorPrepareHead($object);
-	dol_fiche_head($head, 'card', $langs->trans("EmailCollector"), -1, 'email');
+	print dol_get_fiche_head($head, 'card', $langs->trans("EmailCollector"), -1, 'email');
 
 	$formconfirm = '';
 
@@ -655,7 +655,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	print '<div class="clearboth"></div><br>';
 
-	dol_fiche_end();
+	print dol_get_fiche_end();
 
 	// Buttons for actions
 	if ($action != 'presend' && $action != 'editline') {

htdocs/admin/events.php

@@ -102,7 +102,7 @@ print '<input type="hidden" name="action" value="save">';
 
 $head = security_prepare_head();
 
-dol_fiche_head($head, 'audit', '', -1);
+print dol_get_fiche_head($head, 'audit', '', -1);
 
 print '<table class="noborder" width="100%">';
 print "<tr class=\"liste_titre\">";
@@ -125,7 +125,7 @@ foreach ($eventstolog as $key => $arr)
 }
 print '</table>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<div class="center">';
 print "<input type=\"submit\" name=\"save\" class=\"button\" value=\"".$langs->trans("Save")."\">";

htdocs/admin/expedition.php

@@ -184,7 +184,7 @@ print load_fiche_titre($langs->trans("SendingsSetup"), $linkback, 'title_setup')
 print '<br>';
 $head = expedition_admin_prepare_head();
 
-dol_fiche_head($head, 'shipment', $langs->trans("Sendings"), -1, 'shipment');
+print dol_get_fiche_head($head, 'shipment', $langs->trans("Sendings"), -1, 'shipment');
 
 // Shipment numbering model
 
@@ -212,8 +212,7 @@ foreach ($dirmodels as $reldir)
 		{
 			while (($file = readdir($handle)) !== false)
 			{
-				if (substr($file, 0, 15) == 'mod_expedition_' && substr($file, dol_strlen($file) - 3, 3) == 'php')
+				if (preg_match('/^mod_expedition_([a-z0-9_]*)\.php$/', $file)) {
-				{
 					$file = substr($file, 0, dol_strlen($file) - 4);
 
 					require_once $dir.$file.'.php';
@@ -226,7 +225,7 @@ foreach ($dirmodels as $reldir)
 						if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
 						if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
 
-						print '<tr><td>'.$module->nom."</td>\n";
+						print '<tr><td>'.$module->name."</td>\n";
 						print '<td>';
 						print $module->info();
 						print '</td>';

htdocs/admin/expedition_extrafields.php

@@ -76,11 +76,11 @@ print "<br>\n";
 
 $head = expedition_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes_shipment', $langs->trans("Sendings"), -1, 'shipment');
+print dol_get_fiche_head($head, 'attributes_shipment', $langs->trans("Sendings"), -1, 'shipment');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons

htdocs/admin/expeditiondet_extrafields.php

@@ -77,11 +77,11 @@ print "<br>\n";
 
 $head = expedition_admin_prepare_head();
 
-dol_fiche_head($head, 'attributeslines_shipment', $langs->trans("Sendings"), -1, 'shipment');
+print dol_get_fiche_head($head, 'attributeslines_shipment', $langs->trans("Sendings"), -1, 'shipment');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons

htdocs/admin/expensereport.php

@@ -187,7 +187,7 @@ print load_fiche_titre($langs->trans("ExpenseReportsSetup"), $linkback, 'title_s
 
 $head = expensereport_admin_prepare_head();
 
-dol_fiche_head($head, 'expensereport', $langs->trans("ExpenseReports"), -1, 'trip');
+print dol_get_fiche_head($head, 'expensereport', $langs->trans("ExpenseReports"), -1, 'trip');
 
 /*
  * Expense report numbering model
@@ -480,7 +480,7 @@ print '</div>';
 
 print '</form>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();

htdocs/admin/expensereport_extrafields.php

@@ -70,11 +70,11 @@ print load_fiche_titre($langs->trans("ExpenseReportsSetup"), $linkback, 'title_s
 
 $head = expensereport_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes', $langs->trans("ExpenseReports"), -1, 'trip');
+print dol_get_fiche_head($head, 'attributes', $langs->trans("ExpenseReports"), -1, 'trip');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons

htdocs/admin/expensereport_ik.php

@@ -95,7 +95,7 @@ $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_valu
 print load_fiche_titre($langs->trans("ExpenseReportsSetup"), $linkback, 'title_setup');
 
 $head = expensereport_admin_prepare_head();
-dol_fiche_head($head, 'expenseik', $langs->trans("ExpenseReportsIk"), -1, 'trip');
+print dol_get_fiche_head($head, 'expenseik', $langs->trans("ExpenseReportsIk"), -1, 'trip');
 
 echo '<span class="opacitymedium">'.$langs->trans('ExpenseReportIkDesc').'</span>';
 print '<br><br>';
@@ -180,7 +180,7 @@ foreach ($rangesbycateg as $fk_c_exp_tax_cat => $Tab)
 echo '</table>';
 echo '</form>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();

htdocs/admin/expensereport_rules.php

@@ -151,7 +151,7 @@ $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_valu
 print load_fiche_titre($langs->trans("ExpenseReportsSetup"), $linkback, 'title_setup');
 
 $head = expensereport_admin_prepare_head();
-dol_fiche_head($head, 'expenserules', $langs->trans("ExpenseReportsRules"), -1, 'trip');
+print dol_get_fiche_head($head, 'expenserules', $langs->trans("ExpenseReportsRules"), -1, 'trip');
 
 echo '<span class="opacitymedium">'.$langs->trans('ExpenseReportRulesDesc').'</span>';
 print '<br><br>';
@@ -338,7 +338,7 @@ echo '<script type="text/javascript"> $(function() {
 
 }); </script>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();

htdocs/admin/export.php

@@ -71,7 +71,7 @@ $head[$h][1] = $langs->trans("Setup");
 $head[$h][2] = 'setup';
 $h++;
 
-dol_fiche_head($head, 'setup', $langs->trans("ExportsArea"), -1, "technic");
+print dol_get_fiche_head($head, 'setup', $langs->trans("ExportsArea"), -1, "technic");
 
 print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -103,7 +103,7 @@ print '</table>';
 
 print '</form>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();

htdocs/admin/facture.php

@@ -245,7 +245,7 @@ $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_valu
 print load_fiche_titre($langs->trans("BillsSetup"), $linkback, 'title_setup');
 
 $head = invoice_admin_prepare_head();
-dol_fiche_head($head, 'general', $langs->trans("Invoices"), -1, 'invoice');
+print dol_get_fiche_head($head, 'general', $langs->trans("Invoices"), -1, 'invoice');
 
 /*
  *  Numbering module
@@ -802,7 +802,7 @@ print '</table>';
 print "</div>\n";
 
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();

htdocs/admin/facture_situation.php

@@ -71,7 +71,7 @@ $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_valu
 print load_fiche_titre($langs->trans("BillsSetup"), $linkback, 'title_setup');
 
 $head = invoice_admin_prepare_head();
-dol_fiche_head($head, 'situation', $langs->trans("InvoiceSituation"), -1, 'invoice');
+print dol_get_fiche_head($head, 'situation', $langs->trans("InvoiceSituation"), -1, 'invoice');
 
 
 print '<span class="opacitymedium">'.$langs->trans("InvoiceFirstSituationDesc").'</span><br><br>';
@@ -104,12 +104,7 @@ $arrayAvailableType = array(
 	Facture::TYPE_SITUATION => $langs->trans("InvoiceSituation"),
 	Facture::TYPE_STANDARD.'+'.Facture::TYPE_SITUATION => $langs->trans("InvoiceSituation").' + '.$langs->trans("InvoiceStandard"),
 );
-$selected = array();
+$selected = $conf->global->$confkey;
-$implodeglue = '+';
-if (!empty($conf->global->{$confkey}) && !is_array($conf->global->{$confkey})) {
-	$selected = explode('+', $conf->global->{$confkey});
-}
-
 $curentInput = (empty($inputCount) ? 1 : ($inputCount + 1));
 $formSelectInvoiceType = $form->selectarray('value'.$curentInput, $arrayAvailableType, $selected, 1);
 _printInputFormPart($confkey, $langs->trans('AllowedInvoiceForRetainedWarranty'), '', array(), $formSelectInvoiceType);
@@ -145,7 +140,7 @@ _updateBtn();
 
 print '</form>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();

htdocs/admin/fichinter.php

@@ -240,7 +240,7 @@ print load_fiche_titre($langs->trans("InterventionsSetup"), $linkback, 'title_se
 
 $head = fichinter_admin_prepare_head();
 
-dol_fiche_head($head, 'ficheinter', $langs->trans("Interventions"), -1, 'intervention');
+print dol_get_fiche_head($head, 'ficheinter', $langs->trans("Interventions"), -1, 'intervention');
 
 // Interventions numbering model
 

htdocs/admin/holiday.php

@@ -177,7 +177,7 @@ print load_fiche_titre($langs->trans("HolidaySetup"), $linkback, 'title_setup');
 
 $head = holiday_admin_prepare_head();
 
-dol_fiche_head($head, 'holiday', $langs->trans("Holidays"), -1, 'holiday');
+print dol_get_fiche_head($head, 'holiday', $langs->trans("Holidays"), -1, 'holiday');
 
 /*
  * Holiday Numbering model
@@ -282,7 +282,7 @@ print '<br>';
 
 
 if ($conf->global->MAIN_FEATURES_LEVEL < 2) {
-	dol_fiche_end();
+	print dol_get_fiche_end();
 	// End of page
 	llxFooter();
 	$db->close();
@@ -501,7 +501,7 @@ print '</form>';
 
 
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();

htdocs/admin/holiday_extrafields.php

@@ -70,11 +70,11 @@ print load_fiche_titre($langs->trans("HolidaySetup"), $linkback, 'title_setup');
 
 $head = holiday_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes', $langs->trans("Holidays"), -1, 'holiday');
+print dol_get_fiche_head($head, 'attributes', $langs->trans("Holidays"), -1, 'holiday');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 
 // Buttons

htdocs/admin/import.php

@@ -70,7 +70,7 @@ $head[$h][1] = $langs->trans("Setup");
 $head[$h][2] = 'setup';
 $h++;
 
-dol_fiche_head($head, 'setup', $langs->trans("ImportArea"), -1, "technic");
+print dol_get_fiche_head($head, 'setup', $langs->trans("ImportArea"), -1, "technic");
 
 print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -93,7 +93,7 @@ print '</table>';
 
 print '</form>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 // End of page
 llxFooter();

htdocs/admin/ldap.php

@@ -108,7 +108,7 @@ $form = new Form($db);
 print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?action=setvalue">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 
-dol_fiche_head($head, 'ldap', $langs->trans("LDAPSetup"), -1);
+print dol_get_fiche_head($head, 'ldap', $langs->trans("LDAPSetup"), -1);
 
 print '<table class="noborder centpercent">';
 
@@ -251,7 +251,7 @@ print '</td><td>'.$langs->trans('Password').' (ex: secret)</td></tr>';
 
 print '</table>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></div>';
 

htdocs/admin/ldap_contacts.php

@@ -105,7 +105,7 @@ if (!function_exists("ldap_connect"))
 	setEventMessages($langs->trans("LDAPFunctionsNotAvailableOnPHP"), null, 'errors');
 }
 
-dol_fiche_head($head, 'contacts', $langs->trans("LDAPSetup"), -1);
+print dol_get_fiche_head($head, 'contacts', $langs->trans("LDAPSetup"), -1);
 
 
 print $langs->trans("LDAPDescContact").'<br>';
@@ -246,7 +246,7 @@ print '</table>';
 
 print info_admin($langs->trans("LDAPDescValues"));
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></div>';
 

htdocs/admin/ldap_groups.php

@@ -95,7 +95,7 @@ if (!function_exists("ldap_connect"))
 	setEventMessages($langs->trans("LDAPFunctionsNotAvailableOnPHP"), null, 'errors');
 }
 
-dol_fiche_head($head, 'groups', $langs->trans("LDAPSetup"), -1);
+print dol_get_fiche_head($head, 'groups', $langs->trans("LDAPSetup"), -1);
 
 
 print $langs->trans("LDAPDescGroups").'<br>';
@@ -180,7 +180,7 @@ print '</table>';
 
 print info_admin($langs->trans("LDAPDescValues"));
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></div>';
 

htdocs/admin/ldap_members.php

@@ -125,7 +125,7 @@ if (!function_exists("ldap_connect"))
 print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?action=setvalue">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 
-dol_fiche_head($head, 'members', $langs->trans("LDAPSetup"), -1);
+print dol_get_fiche_head($head, 'members', $langs->trans("LDAPSetup"), -1);
 
 
 print $langs->trans("LDAPDescMembers").'<br>';
@@ -366,7 +366,7 @@ print '</table>';
 
 print info_admin($langs->trans("LDAPDescValues"));
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></div>';
 

htdocs/admin/ldap_members_types.php

@@ -93,7 +93,7 @@ if (!function_exists("ldap_connect"))
 	setEventMessages($langs->trans("LDAPFunctionsNotAvailableOnPHP"), null, 'errors');
 }
 
-dol_fiche_head($head, 'memberstypes', $langs->trans("LDAPSetup"), -1);
+print dol_get_fiche_head($head, 'memberstypes', $langs->trans("LDAPSetup"), -1);
 
 
 print $langs->trans("LDAPDescMembersTypes").'<br>';
@@ -162,7 +162,7 @@ print '</table>';
 
 print info_admin($langs->trans("LDAPDescValues"));
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></div>';
 

htdocs/admin/ldap_users.php

@@ -121,7 +121,7 @@ print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?action=setvalue">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 
 
-dol_fiche_head($head, 'users', $langs->trans("LDAPSetup"), -1);
+print dol_get_fiche_head($head, 'users', $langs->trans("LDAPSetup"), -1);
 
 print $langs->trans("LDAPDescUsers").'<br>';
 print '<br>';
@@ -336,7 +336,7 @@ print '</table>';
 
 print info_admin($langs->trans("LDAPDescValues"));
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></div>';
 

htdocs/admin/limits.php

@@ -125,7 +125,7 @@ if (!empty($conf->multicurrency->enabled) && !empty($conf->global->MULTICURRENCY
 	if (!empty($aCurrencies) && count($aCurrencies) > 1)
 	{
 		$head = multicurrencyLimitPrepareHead($aCurrencies);
-		dol_fiche_head($head, $currencycode, '', -1, "multicurrency");
+		print dol_get_fiche_head($head, $currencycode, '', -1, "multicurrency");
 	}
 }
 
@@ -201,7 +201,7 @@ if (!empty($conf->multicurrency->enabled) && !empty($conf->global->MULTICURRENCY
 {
 	if (!empty($aCurrencies) && count($aCurrencies) > 1)
 	{
-		dol_fiche_end();
+		print dol_get_fiche_end();
 	}
 }
 

htdocs/admin/mailman.php

@@ -153,7 +153,7 @@ if (!empty($conf->global->ADHERENT_USE_MAILMAN))
     print '<input type="hidden" name="token" value="'.newToken().'">';
     print '<input type="hidden" name="action" value="update">';
 
-    dol_fiche_head($head, 'mailman', $langs->trans("Setup"), -1, 'user');
+    print dol_get_fiche_head($head, 'mailman', $langs->trans("Setup"), -1, 'user');
 
     //$link=img_picto($langs->trans("Active"),'tick').' ';
     $link = '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=unset&token='.newToken().'&value=0&name=ADHERENT_USE_MAILMAN">';
@@ -198,13 +198,13 @@ if (!empty($conf->global->ADHERENT_USE_MAILMAN))
     print '*'.$langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
     print '%LISTE%, %MAILMAN_ADMINPW%, %EMAIL% <br>';
 
-    dol_fiche_end();
+    print dol_get_fiche_end();
 
     print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Update").'" name="update"></div>';
 
     print '</form>';
 } else {
-    dol_fiche_head($head, 'mailman', $langs->trans("Setup"), 0, 'user');
+    print dol_get_fiche_head($head, 'mailman', $langs->trans("Setup"), 0, 'user');
 
     $link = '<a href="'.$_SERVER["PHP_SELF"].'?action=set&token='.newToken().'&value=1&name=ADHERENT_USE_MAILMAN">';
     //$link.=img_$langs->trans("Activate")
@@ -212,7 +212,7 @@ if (!empty($conf->global->ADHERENT_USE_MAILMAN))
     $link .= '</a>';
     print load_fiche_titre($langs->trans('MailmanTitle'), $link, '');
 
-    dol_fiche_end();
+    print dol_get_fiche_end();
 }