Merge

Update ChangeLog for 4.0.6
2017-05-29 21:29:17 +02:00 · 2017-05-29 21:27:35 +02:00 · 2017-05-29 21:27:22 +02:00 · 2017-05-29 21:16:37 +02:00 · 2017-05-20 21:38:14 +02:00 · 2017-05-20 21:11:31 +02:00
4411 changed files with 136462 additions and 212903 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,6 @@ php:
 - '5.5'
 - '5.6'
 - '7.0'
- '7.1'
 - nightly

 addons:
@@ -51,7 +50,6 @@ env:
 matrix:
  fast_finish: true
  allow_failures:
-  - php: 7.1
  - php: nightly
  # FIXME
  #- env: DB=postgresql
@@ -98,7 +96,7 @@ install:
  if [ "$TRAVIS_PHP_VERSION" = '5.3' ] || [ "$TRAVIS_PHP_VERSION" = '5.4' ] || [ "$TRAVIS_PHP_VERSION" = '5.5' ]; then
    composer -n require phpunit/phpunit ^4
  fi
-  if [ "$TRAVIS_PHP_VERSION" = '5.6' ] || [ "$TRAVIS_PHP_VERSION" = '7.0' ] || [ "$TRAVIS_PHP_VERSION" = '7.1' ] || [ "$TRAVIS_PHP_VERSION" = 'nightly' ]; then
+  if [ "$TRAVIS_PHP_VERSION" = '5.6' ] || [ "$TRAVIS_PHP_VERSION" = '7.0' ] || [ "$TRAVIS_PHP_VERSION" = 'nightly' ]; then
    composer -n require phpunit/phpunit ^5
  fi
  echo
@@ -138,7 +136,7 @@ before_script:
    echo 'extension = apc.so' >> ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php.ini
    echo
    echo "Enabling Memcached for PHP <= 5.4"
-    #   Documentation says it should be available for all PHP versions but it's not for 5.5 and 5.6, 7.0, 7.1 and nightly!
+    #   Documentation says it should be available for all PHP versions but it's not for 5.5 and 5.6, 7.0 and nightly!
    echo 'extension = memcached.so' >> ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php.ini
  fi
  phpenv rehash
@@ -210,7 +208,7 @@ before_script:
  echo "Setting up Apache + FPM"
  # enable php-fpm
  cp ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php-fpm.conf.default ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php-fpm.conf
-  if [ "$TRAVIS_PHP_VERSION" = '7.0' ] || [ "$TRAVIS_PHP_VERSION" = '7.1' ] || [ "$TRAVIS_PHP_VERSION" = 'nightly' ]; then
+  if [ "$TRAVIS_PHP_VERSION" = '7.0' ] || [ "$TRAVIS_PHP_VERSION" = 'nightly' ]; then
    # Copy the included pool
    cp ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php-fpm.d/www.conf.default ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php-fpm.d/www.conf
  fi
@@ -259,7 +257,7 @@ script:
  # Ensure we catch errors
  set -e
  # Exclusions are defined in the ruleset.xml file
-  phpcs -s -n -p -d memory_limit=-1 --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 .
+  phpcs -s -n -p -d memory_limit=-1 --colors --tab-width=4 --standard=dev/codesniffer/ruleset.xml --encoding=utf-8 .
  set +e
  echo

@@ -289,13 +287,10 @@ script:
  php upgrade.php 3.9.0 4.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade390400.log
  php upgrade2.php 3.9.0 4.0.0 MAIN_MODULE_API,MAIN_MODULE_SUPPLIERPROPOSAL > $TRAVIS_BUILD_DIR/upgrade390400-2.log
  php step5.php 3.9.0 4.0.0 > $TRAVIS_BUILD_DIR/upgrade390400-3.log
-  php upgrade.php 4.0.0 5.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade400500.log
-  php upgrade2.php 4.0.0 5.0.0 MAIN_MODULE_API,MAIN_MODULE_SUPPLIERPROPOSAL > $TRAVIS_BUILD_DIR/upgrade400500-2.log
-  php step5.php 4.0.0 5.0.0 > $TRAVIS_BUILD_DIR/upgrade400500-3.log
  cd -
  set +e
  echo
-  #cat $TRAVIS_BUILD_DIR/upgrade400500-2.log
+  #cat $TRAVIS_BUILD_DIR/upgrade390400-2.log
  #cat /tmp/dolibarr_install.log
  
 - |
--- a/3
+++ b/3
@@ -38,6 +38,7 @@ jQuery UI              1.11.4        GPL and MIT License         Yes
 jQuery select2         3.5.2         GPL and Apache License      Yes             JS library plugin for sexier multiselect
 jQuery blockUI         2.70.0        GPL and MIT License         Yes             JS library plugin blockUI (to use ajax popups)
 jQuery Colorpicker     1.1           MIT License                 Yes             JS library for color picker for a defined list of colors
+jQuery DataTables      1.9.4         BSD                         Yes             JS library for tables output
 jQuery FileUpload      5.0.3         GPL and MIT License         Yes             JS library to upload files
 jQuery Flot            0.8.3         MIT License                 Yes             JS library to build graph
 jQuery JCrop           0.9.8         GPL and MIT License         Yes             JS library plugin Crop (to crop images)
@@ -51,7 +52,7 @@ jQuery Mobile          1.3.0         GPL and MIT License         Yes
 jQuery TableDnD        0.6           GPL and MIT License         Yes             JS library plugin TableDnD (to reorder table rows)
 jQuery Timepicker      1.1.0         GPL and MIT License         Yes             JS library Timepicker addon for Datepicker
 jQuery Tiptip          1.3           GPL and MIT License         Yes             JS library for tooltips
-jsGanttImproved        1.7.5.2       BSD License                 Yes             JS library (to build Gantt reports)
+jsGantt                1.2           BSD License                 Yes             JS library (to build Gantt reports)
 JsTimezoneDetect       1.0.6         MIT License                 Yes             JS library to detect user timezone

 For licenses compatibility informations:
--- a/296
+++ b/296
@@ -2,221 +2,37 @@
 English Dolibarr ChangeLog
 --------------------------------------------------------------

+WARNING: 

-***** ChangeLog for 5.0.2 compared to 5.0.1 *****
-FIX: #6468 + Fix missing translation
-FIX: #6517 #6525 Autocompletion of thirdparty after n chars not implemented
+Do not try to make any Dolibarr upgrade if you are running Mysql version 5.5.40.
+Mysql version 5.5.40 has a very critical bug making your data beeing definitely lost.
+You may also experience troubles with Mysql 5.5.41/42/43 with error "Lost connection" during
+migration.
+Upgrading to any other version or any other database system is abolutely required BEFORE trying
+make a Dolibarr upgrade.
+
+
+***** ChangeLog for 4.0.6 to 4.0.5 *****
 FIX: #6613 Default subject for Supplier proposal emails is filled with a non-existing key
-FIX: #6614
-FIX: #6619 Template invoices list do not respect restricted thirdparty user rights
-FIX: #6621 Documents tab shows greyed out upload form even if the option to show actions not available is disabled
 FIX: #6623 User card shows "Return to list" link even if the user has no rights to list users
 FIX: #6636 Complete fix
 FIX: #6669 User with no permission to edit customer invoices can see a edit button in project entry
 FIX: #6671 Cannot remove thirdparty type with "#" in its name
 FIX: #6673 Missing "nature" table header in thirdparty list
 FIX: #6675 Restricted user with no agenda permissions can see a button to create appointment in thirdparty contact list
+FIX: #6677 Expired contracts dashboard box does not show the name of the thirdparty
 FIX: #6679 User with restricted supplier invoice permissions can edit project, payment conditions, payment mode
 FIX: #6680 User with restricted supplier invoice permissions sees "reopen" button even if he has no permission to do it
-FIX: #6718 Bug: Discount amount is not locally formatted in CommonObject View
-FIX: #6767 serious critical error, no login possible with postgresql and ipv6.
-FIX: #6795 #6796
-FIX: Add option MAIN_MAIL_USE_MULTI_PART to include text content into HTML email and add option MAIN_MAIL_ADD_INLINE_IMAGES_IF_IN_MEDIAS to restore the inline images feature.
-FIX: ajax autocomplete on clone
-FIX: A non admin user can not download files attached to user.
-FIX: Can't download delivery receipts (function dol_check_secure_access_document)
-FIX: complete hourly rate when not defined into table of time spent
+FIX: #6813
+FIX: Correction with author and validator user on orders
+FIX: doactions hook missing in invoice model page
 FIX: dont get empty "Incoterms : - " string if no incoterm
 FIX: dont lose supplier ref if no supplier price in database
-FIX: Enter a direct bank transaction
-FIX: extrafield css for boolean type
 FIX: forgotten parameter for right multicompany use
-FIX: Found duplicate line when it is not.
 FIX: global $dateSelector isn't the good one, then date selector on objectline_create tpl was hidden
-FIX: Journal code of bank must be visible of accountaing module on.
-FIX: length_accounta return variable name
 FIX: limit+1 dosn't show Total line
-FIX: No filter on company when showing the link to elements.
-FIX: overwrapping of weight/volume on rouget template
-FIX: Several bugs in accounting module.
-FIX: shared bank account with multicompany not visible in invoice setup
-FIX: spaces not allowed into vat code
-FIX: supplier default condition not retrieved on create
 FIX: supplier order line were always created with rang = 0

-***** ChangeLog for 5.0.1 compared to 5.0.0 *****
-FIX: #6503: SQL error in "Last pending payment invoices"
-FIX: #6505 Project elements page shows greyed-out links even if the option to show actions not available is disabled
-FIX: #6507: Statistics counter show wrong total Contract numbers when the user does not have full access
-FIX: #6533 #6590
-FIX: #6535
-FIX: bank account not visible on payment card
-FIX: colspan
-FIX: Data lost during merge of thirdparties
-FIX: Detection of color brightness
-FIX: Filter on date lost after submit on time spent page
-FIX: forgottent fk_unit field on llx_supplier_propaldet
-FIX: list of projects
-FIX: LOG_ERROR does not exists. Use LOG_ERR.
-FIX: Missing total on project overview.
-FIX: multicurrency management on supplier order/invoice
-FIX: Notification sending was broken.
-FIX: origin & origin id on supplier order line
-FIX: param php doc
-FIX: Picto of project on dol_banner and box
-FIX: Some errors when downloading files.
- 
-***** ChangeLog for 5.0.0 compared to 4.0.* *****
-For users:
-NEW: Add module mulicurrency.
-NEW: Add module accoutancy expert (double party accountancy). 
-NEW: Better responsive design, above all on smartphone.
-NEW: #5801 More complete change to allow to disable supplier invoice document generation.
-NEW: #5830 Can choose a generic email or use remail in the mail from field.
-NEW: #5896 More complete data on event sent by email (name in title, emails list in details)
-NEW: Add a better icon to show when "run" in cron jobs is disabled.
-NEW: Add account statement into fields of bank account transaction list.
-NEW: Add a direct debit mandate PDF template.
-NEW: add clone contract feature.
-NEW: Add color regarding stock even on ajax autocompleter product selector.
-NEW: Add date into list of print jobs for Google Print.
-NEW: add field and filters on turnover by third party report.
-NEW: Add last activation date as info in module list.
-NEW: add option to limit stock product by warehouse.
-NEW: Add missing unique key on table llx_links.
-NEW: Add option "Hide images in Top menu".
-NEW: Add option PROJECT_LINES_PERWEEK_SHOW_THIRDPARTY to show thirdparty on page to submit time.
-NEW: Add option "Stock can be negative". Off by default.
-NEW: Add option SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED.
-NEW: Add hidden option to include parent products too in stats of orders (not supported in rest of app yet).
-NEW: Add Panama datas.
-NEW: Add ressource extrafields.
-NEW: add restrictions on standard exports (agenda, order, deplacement, facture, fournisseur, societe, propal, expedition)
-NEW: Add substitution keys __SHIPPINGTRACKNUM__, __SHIPPINGTRACKNUMURL__ into shipping email template.
-NEW: Add status Done on interventions.
-NEW: Add system tool "Files integrity checker" to detect modified files for packaged versions.
-NEW: Add tooltip in payment term edition in dictionnary.
-NEW: Add type "url" as possible extrafield.
-NEW: Add workflow to calculated supplier order status on stock dispatch.
-NEW: Add workflow to classifed propal bill on invoice validation.
-NEW: allow to save a parent warehouse.
-NEW: Better filtering of automatic/manually inserted events.
-NEW: Bill orders from order list.
-NEW: Can add event from the card listing events.
-NEW: Can change thirdparty when cloning a project.
-NEW: Can create expense report for someone else (advanced permission). 
-NEW: Can clone an expense report.
-NEW: Can edit a label for each price segment when using several segment prices for products.
-NEW: Can filter on fields on admin translation page.
-NEW: Can filter on project/task ref/label on the "new time consumed" page.
-NEW: Can filter on status on objects on the "statistics" pages.
-NEW: Can filter on type of leave requests in list.
-NEW: Can generate SEPA mandate for each bank account of your customers.
-NEW: Can see/make bank conciliation from bank transaction list.
-NEW: Can edit RUM number of a customer bank account.
-NEW: Can link template invoice to other objects. Generated invoices will be linked to same objects (example: contracts).
-NEW: Can renamed attached files on some documents tabs (like products and expense reports).
-NEW: Can see/edit the customer ref of a shipment.
-NEW: Can select fields/extrafields on contract list + Mass delete action.
-NEW: Can select fields on expense report list. Can make mass delete.
-NEW: Can select fields to show on list of bank transaction.
-NEW: Can set to paid automatically social or fiscal taxes after a payment was recorded.
-NEW: Can sort on status of recurring invoice in list of template invoices.
-NEW: Can use native php and dolibarr object on pages of module website.
-NEW: Checkbox 'close order to "Everything received" automatically if all products are received' is visible on supplier orders.
-NEW: conf to allow payments on different thirdparties bills but same parent company.
-NEW: Consumption view on thirdparty total line and total HT by element.
-NEW: Display bookkeeping by accounting account - Bookkeeping ordered by accounting account - Link with customers and suppliers invoices - Sub Total by accounting account - Ability to display more than 25 lines and filter by customer/supplier, invoice and accounting account
-NEW: Each user can select its landing page (on tab "user display setup").
-NEW: Editing translation GUI become easier with tool to search existing translation.
-NEW: Error code of each email sent is visible in list of email targets
-NEW: Export thirdparty with payment terms and mode.
-NEW: filter actiontype on thirdparty tab.
-NEW: filter by supplier and fk_warehouse on replenishment page.
-NEW: Filters can accept generic search key like __DAY__, __MONTH__, __YEAR__ replaced with current day, month year before making the search.
-NEW: Function "crop" images available on project, product and holiday attachment tab.
-NEW: function to display full path to current warehouse.
-NEW: Generation of document is available on member card.
-NEW: Introduce mass action "delete" on sales orders.
-NEW: Introduce option MAIN_DEFAULT_PAYMENT_TERM_ID to set default payment term on company level.
-NEW: introduce option PROJECT_DISABLE_PRIVATE_PROJECT and PROJECT_DISABLE_PUBLIC_PROJECT.
-NEW: Link between objects can be done on both side and on all objects.
-NEW: More filter on bank transaction list.
-NEW: Mutualize mass action. So "Send by email" is also available on orders.
-NEW: New set of icon for status easier to understand.
-NEW: option "Current/Next" for limit payment date (in payment term dictionary setup) to use a specific day of current month or jump to same day of next month.
-NEW: Option DOC_SHOW_FIRST_SALES_REP shows name of "user buyer or saler" on PDF.
-NEW: Option MAIN_INFO_SOCIETE_MAIL_ALIASES to be able to use several identities into the "email from".
-NEW: Pagination available on list of users.
-NEW: Phone formatting for Canada. Add dol_print_phone into phpunit tests.
-NEW: Reduce nb of picto visible after reference of an object into lists, merging preview and download.
-NEW: Reduce space lost on EDM module.
-NEW: Reopen a paid bill is a user advanced permission.
-NEW: can set a default bank account on thirdparty card.
-NEW: Show photo of contacts on thirdparty card.
-NEW: Show subtotal into list of linked elements.
-NEW: Show total line (planned workload and time spent) on list of tasks.
-NEW: Start to introduce search filters on dictionnaries for vat list.
-NEW: Support extrafields for expense reports.
-NEW: Support extrafields on product lot.
-NEW: Support free bottom text and watermark on expense report template.
-NEW: Support mass actions for proposals
-NEW: Table with list of lots/serial can be viewed (module product batch).
-NEW: The autofill zip/town table option is on by default.
-NEW: the count of linked files on card includes external links.
-NEW: Usage of vat code seems ok everywhere.
-NEW: User date of employment added.
-NEW: Use small photo of user on all user links.
-NEW: Use new archi to select fields into list of time spent.
-NEW: Available substitution key (__INVOICE_MONTH__, __INVOICE_PREVIOUS_MONTH__, ...) to use into note text of recurring invoices.
-
-For developers:
-NEW: Add ORDER_MODIFY trigger on each order modification.
-NEW: Trigger on delete stock
-NEW: The getURLContent return more information on success and error.
-NEW: Uniformize code and correct deal with triggers
-NEW: REST API explorer. Can create invoice and orders with lines.
-NEW: Add a lot of API REST: expense reports, orders, commercial proposals, projects, agenda events, users, invoices, ...
-NEW: Default collation for mysql is now utf8_unicode_ci
-NEW: Can use any filter on all REST API to list.
-NEW: ckeditor accept a parameter to disable all html filtering.
-NEW: Complete table llx_ecm_files with field generated_or_uploaded
-NEW: Enhance function setValueFrom so we can use it for "edit in form" feature.
-NEW: getNomUrl displays full path to warehouse
-NEW: Hook formObjectOptions
-NEW: hook in element overview
-NEW: Hook on stock product card
-NEW: param socid find_min_price_product_fournisseur() function
-NEW: More phpunit tests
-
-WARNING: 
-
-Following changes may create regression for some external modules, but were necessary to make
-Dolibarr better:
- Function delete of class Facture (invoice) need the object $user as first parameter. Also you must
-  check you make a fetch on object before calling the delete.
- The old driver of "mysql" has been removed. Dolibarr use the new one (mysqli) by default.
- Remove not used function calculate_byte(). Use dol_print_size() instead.
- Function pdf_getTotalQty is now deprecated. Not used by Dolibarr core.
- Method commande->deleteline($lineid) has been replaced with commande->deleteline($user, $lineid).
- Method expensereport->delete(id, user) has been replaced with ->delete(user)
-  Method warehouse->delete(id) has been replace with ->delete(user)
-  This is to follow good practice to make a fetch on object before deleting it.
- The form to add a product to a draft proposal/order/invoice, from the product card, is hidden by default.
-  It was not commonly used and usage generates some problems (cost price for margin calculation not entered, vat setting).  
-  Set constant PRODUCT_ADD_FORM_ADD_TO to retrieve it.
- The javascript "datatables" library was previously provided into Dolibarr sources, but it was not used by application.
-  So there is no reason to maintain its compatibility with other dolibarr components. If an external module need this 
-  library, this external module must embed the library in his own sources/packages.
- Trigger name SUPPLIER_PROPOSAL_CREATE has been renamed into PROPOSAL_SUPPLIER_CREATE.
- A new paramater sqlfilters was introduced to allow filter on any fields int the REST API. Few old parameters,
-  no more required, were also removed. Use this new one if you were using one of them.
- The trigger that activate or close a contract line is run on a contract line, not on contract.
- Method commande->set_availability(user, availability_id) removed from commande class, use method commande->availability(availability_id, notrigger).
-
-Dolibarr 5.0 was frozen before PHP 7.1 was released. Unit tests are successful on PHP 7.1 but we don't have enough
-feedback to confirm all application is compatible. Current officiel supported PHP versions are PHP 5.3 to 7.0.
-

 ***** ChangeLog for 4.0.5 to 4.0.4 *****
 FIX: #6234
@@ -381,40 +197,43 @@ FIX: Vat not visible in dictionnary

 ***** ChangeLog for 4.0.0 compared to 3.9.* *****
 For users:
-NEW: Add recurring invoice feature and automatic generation of invoices.
+
+NEW: Add reccuring invoice feature and automatic generation of invoices.
 NEW: Add module "Loan" as stable.
-NEW: Add module "Supplier commercial proposal" (price request) with stable status.
-NEW: Can select dynamicaly number of lines to show on page on product, shipment, contact, orders, thirdparties. 
-NEW: Can select fields to show on list also for list of customer orders, supplier orders, shipments, proposals and invoices.
-NEW: Show into badge on tab head, the number of dedicated contacts for all objects.
+NEW: Add module "Supplier commercial proposal" (price request) is set to stable status.
+NEW: Experimental module Accountancy Expert
+NEW: Experimental module Multicurency
+NEW: Show into badge on tab head the number of dedicated contacts for all objects.
 NEW: Add a checkbox to select/unselect all lines on page that support mass actions (like invoice list page)
-NEW: Add a new method for margin calculation. Added margin on "cost price" in addition to margin on WAP price and margin on "best supplier price".
+NEW: Add a new method for margin calculation. Added margin on "cost price" to margin on WAP price and margin on "best supplier price".
 NEW: Add an explanation message on shipment page to explain you can't make shipment if order is not validated
 NEW: Add date_rum into table of thirdparty bank account.
 NEW: The probability of lead/opportunity can be defined per lead.
 NEW: Added Malta VAT into migration script
+NEW: #4972 Translated Charges sociales (type 0) and Charges sociales (type 1) in reports page
 NEW: Add Expense report into accountancy report
 NEW: Add Expense report to approve into workboard 
-NEW: Selection of boxes is moved on top of home page
-NEW: Add filter on a keyword, status and nature into list of modules.
+NEW: Selection of boxes is move on top of home page
+NEW: Add filter on a keyword, status and nature into list of modules
 NEW: Add hidden option BANK_DISABLE_CHECK_DEPOSIT to disable check deposit feature.
-NEW: Add hidden option MAIN_PUBLIC_NOTE_IN_ADDRESS
+NEW: Add option MAIN_PUBLIC_NOTE_IN_ADDRESS
+NEW: add html id/class to locate value in the DOM html
 NEW: Add index on invoice status 
-NEW: Add constant MAIN_LOGTOHTML to 0 into setup by default to save time when we need to make debug on hosted instance.
+NEW: Add constant MAIN_LOGTOHTML to 0 into other setup by default to save time when we need to make debug on hosted instance.
 NEW: Add list of billed
 NEW: Add minimum stock and desired stock into import/export profiles. 
-NEW: Add state into thirdparty export fields.
+NEW: Add state into thirdparty export fields
 NEW: Add more trackable events (create, submit and receive supplier order).
-NEW: Add hidden option MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN
+NEW: Add option MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN
 NEW: Add picto on module list to show warning and if module is an external module.
-NEW: Add product type filter on turnover report
+NEW: add product type filter on turnover report
 NEW: Add state into list of fields available for personalized fields of thirdparties
 NEW: Add statistics for interventions module
 NEW: Add statistics on number of projets on home page
-NEW: Add statistics and late records into dashboard for supplier proposals.
+NEW: Add stats and late records into dashboard for supplier proposals.
 NEW: Add the admin info on combo of type of contact
-NEW: Add the event BILL_PAYED to the list of supported events for module notification.
-NEW: Add total weight and volume on PDF. 
+NEW: Add the event BILL_PAYED to list of supported events for module notification.
+NEW: Add total weight and volume on PDF 
 NEW: Add hidden option to hide column qty ordered on shipments.
 NEW: Add view of virtual stock into product list (when appropriate)
 NEW: Add warning on tasks when they are late (add also the warning tolerance parameter)
@@ -424,15 +243,19 @@ NEW: allow a document to be linked to project from another customer on config
 NEW: allow project to be shared across entities (for multicompany module)
 NEW: All variant of ckeditor config can be tested into the setup page of module.
 NEW: Can change dynamically number of records visible into lists.
-NEW: Can change type of extrafields (for some combinations only).
-NEW: Can define number of first and last line to import into import wizard.
+NEW: Can change type of extrafields for some combinations.
+NEW: Can define number of first and last line into import wizard.
 NEW: Can edit next execution date of a cron job.
 NEW: Can edit value date of a vat payment after recording it.
-NEW: Can filter modules on publisher.
-NEW: Can filter on employee status when building emailing from users.
-NEW: Can reopen an closed shipment.
-NEW: Can search on shipments into the quick search box.
-NEW: Can select language from a combo list on page to overwrite a translation.
+NEW: Can filter modules on publisher
+NEW: Can filter on employee status when building emailing from users
+NEW: Can reopen an closed shipment
+NEW: Can search on shipments into the quick search box
+NEW: Can select dynamicaly number of lines to show on page on product, shipment, contact, orders, thirdparties 
+NEW: Can select fields to show on supplier orders list.
+NEW: Can select fields to show on list also for list of customer orders, shipments and invoices.
+NEW: Can select fields to show on proposal lists.
+NEW: Can select language from combo list on page to overwrite a translation
 NEW: Can select number of lines on page list for projects and tasks.
 NEW: Can use ^ and $ (to say start with or end with like regex syntax) into search fields when search field is text. Bonus: ^$ can filter all lines with field not defined.
 NEW: Clean and enhance code for cron engine
@@ -454,35 +277,33 @@ NEW: Into GED module, filename is truncated only if there is not enough space in
 NEW: Introduce a predefined job to run database backup
 NEW: Introduce option MAIN_WEIGHT_DEFAULT_UNIT and MAIN_VOLUME_DEFAULT_UNIT to force output unit for weight and volume.
 NEW: Introduce position of records into dictionnary of type of contacts
-NEW: Link on a user in leave page reach to leave tab of user.
-NEW: List of user in agenda view per user show photo thumb.
+NEW: Link on user in leave context reach to leave tab.
+NEW: List of user in agenda view per user show photo thumb
 NEW: Margins module - Check/update buying price on invoice lines
 NEW: Merge all admin tools (system and module admin tools) into same entry "Admin tools", so now things are clear: All features restricted to an admin user is inside "setup" (for setup) or "admin tools" (for action tools) instead of 3 different entries.
 NEW: Merge all boxes "related objects" into one. This save a lot of room on most card and avoid often horizontal scoll.
 NEW: Moved code that deals with bank categories to BankCateg. Created BankCateg::fetchAll function
-NEW: Move HRM dictionary from module to core dictionaries.
+NEW: Move Expense report menu from module to menu files
+NEW: Move HRM dictionary from module to core dictionaries
 NEW: Mutualize code to manage email substitution variables. Show available variables into page to edit email templates.
 NEW: Mutualize code: Use one call of function "addThumbs", when possible, to generate thumbs files instead of several call of "vignette" function.
 NEW: On translation admin page, admin can overwrite a translation value.
-NEW: Option MAIN_LIST_FILTER_ON_DAY is supported on proposal list.
-NEW: Add reputation field for price supplier.
+NEW: Option MAIN_LIST_FILTER_ON_DAY is supported on proposal list
+NEW: Add reputation field for price supplier
+NEW: Rest API token is no more reset at each call. We can reset it with param reset=1 on login call.
 NEW: Selection of fields is available on member list.
 NEW: Show a badge with number of withdraw requests done on the withdraw tab of invoice.
-NEW: Add option to show detail per warehouse into reassort.
-NEW: Show total number of modules into the module list.
+NEW: Add option to show detail per warehouse into reassort
+NEW: Show total number of modules into the module list
 NEW: Survey system has now a status like other objects. You can close or reopen a survey.
-NEW: The note on time spent can be entered when using the "view per day".
-NEW: Use ellipsis truncation on too large left menu text.
+NEW: The note on time spent can be entered when using the view per day.
+NEW: Use ellipsis truncation on too large left menu text
 NEW: When a new field to show into lists is selected, the form is automatically submited and field added.
 NEW: When creating a template invoice from a draft invoice, if there is link to contract on draft invoice, link is kept on template invoice.
 NEW: When emailing is not sent completely, show progression.
-NEW: Experimental module Accountancy Expert.
-NEW: Experimental module Multicurency

 For developers:
-NEW: Add entity field in llx_societe_remise_except and llx_societe_remise.
-NEW: Rest API token is no more reset at each call. We can reset it with param reset=1 on login call.
-NEW: Add html id/class to locate value in the DOM html
+
 NEW: Add a css class style called 'reposition', so when clicking on a link with this class will move scrollbarr to be placed at same page location.
 NEW: TimeZone can be supplied to mktime
 NEW: hook in shipment card
@@ -502,9 +323,8 @@ NEW: Removed deprecated CommonObject::client property. Please use CommonObject::
 NEW: Removed unused FormOrder::selectSourcesCommande function
 NEW: Renamed ActionComm::add function to ActionComm::create
 NEW: Rename Form::select_date to Form::selectDate and Form::form_date to Form::formDate
-NEW: Rename path for generic media files
+NEW: Rename path for generiN
 NEW: More phpunit tests. Include some REST API into automatic tests.
-NEW: Move Expense report menu from module to menu files.


 WARNING: 
@@ -1405,7 +1225,7 @@ NEW: add hook in send mail
 NEW: Add hooks on list of members to allow an external module to add more fields into list view.
 NEW: Add hooks to allow an external module to complete list of events into calendar views.
 NEW: Add opportunity amount on project card.
-NEW: Add option THEME_TOPMENU_DISABLE_IMAGE to disable images into menu eldy.
+NEW: Add option THEME_ELDY_DISABLE_IMAGE to disable images into menu eldy.
 NEW: add PDF icon on linked element into project
 NEW: add "productpricecard" hook and uniformize code
 NEW: Add ref and label of project into export
--- a/13
+++ b/13
@@ -1,19 +1,14 @@
 FROM php:5.6-apache

-RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libldap2-dev \
+RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev \
 	&& rm -rf /var/lib/apt/lists/* \
 	&& docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
-	&& docker-php-ext-install gd \
-	&& docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
-        && docker-php-ext-install ldap \
-        && docker-php-ext-install mysqli \
-        && apt-get purge -y libpng12-dev libjpeg-dev libldap2-dev
+	&& docker-php-ext-install gd
+
+RUN docker-php-ext-install mysqli

 COPY htdocs/ /var/www/html/

 RUN chown -hR www-data:www-data /var/www/html

-VOLUME /var/www/html/conf
-VOLUME /var/www/html/documents
-
 EXPOSE 80
--- a/README-FR.md
+++ b/README-FR.md
@@ -25,7 +25,7 @@ OpenSuse, Mandriva ou Mageia).
 Vous pouvez les télécharger depuis la rubrique *download* du portail officiel: 
 https://www.dolibarr.org/

-Si vous avez déjà installé un serveur Web avec PHP et une base de donnée (MariaDb/MySql/PostgreSql),
+Si vous avez déjà installé un serveur Web avec PHP et une base de donnée (Mysql),
 vous pouvez installer Dolibarr avec cette version de la manière suivante:

 - Copier le répertoire "dolibarr" et son contenu dans la racine de votre serveur
@@ -54,10 +54,19 @@ Pour mettre a jour Dolibarr depuis une vieille version vers celle ci:
 - Ecraser les vieux fichiers dans le vieux repertoire 'dolibarr' par les fichiers
  fournis dans ce nouveau package.
  
- Au prochain accès, Dolibarr proposera la page de "mise a jour" des données (si necessaire).
-  Si un fichier install.lock existe pour vérouiller le processus de mise à jour, il sera demandé de le supprimer manuellement (vous devriez trouver le fichier install.lock dans le répertoire utilisé pour stocker les documents générés ou transféré sur le serveur. Dans la plupart des cas, c'est le répertoire appelé "documents") 
+- Si vous venez d'une version x.y.z vers x.y.w (seul le 3eme chiffre varie),
+  il n'y a pas besoin de migration de données.
  
-*Note: Le processus de migration peut etre lancé manuellement et plusieurs fois, sans risque, en appelant la page /install/*
+- Si vous venez d'une beta ou d'un version x.y.z vers une autre ou les numeros x
+  ou y varient, vous devez appelez la page "install/" de migration dans votre 
+  navigateur (ceci doit se faire automatiquement au premier accès de l'application).
+  Ce sera une URL du genre:
+   http://localhost/dolibarr/htdocs/install/index.php
+  ou
+   http://yourdolibarrhost/install/index.php
+
+  Ensuite, choisir l'option de "mise a jour" en rapport avec votre cas.
+  Note: Le processus de migration peut etre lance plusieurs fois sans risque.
  

 ## CE QUI EST NOUVEAU
@@ -77,13 +86,11 @@ Voir fichier ChangeLog.
 - Gestion des factures clients/fournisseurs et paiements
 - Gestion des virements bancaires SEPA
 - Gestion des comptes bancaires
- Calendrier/Agenda partagé (avec export ical, vcal) 
+- Agenda partagé
 - Suivi des opportunités et/ou projets (suivi de rentabilité incluant les factures, notes de frais, temps consommé valorisé, ...)
 - Gestion de contrats de services
 - Gestion de stock
 - Gestion des expéditions
- Gestion des demandes de congès
- Gestion des notes de frais
 - GED (Gestion Electronique de Documents)
 - EMailings de masse
 - Réalisation de sondages
@@ -110,8 +117,8 @@ Voir fichier ChangeLog.
 - Application simple à utiliser.
 - Plusieurs thèmes visuels.
 - Code simple et facilement personnalisable.
- Requiert PHP et MariaDb, Mysql ou Postgresql (Voir versions exactes sur http://wiki.dolibarr.org/index.php/Prérequis). 
- Compatible avec toutes les offres Cloud du marché respectant les prérequis de base de données et PHP.
+- Requiert PHP et Mysql ou Postgresql (Voir versions exactes sur http://wiki.dolibarr.org/index.php/Prérequis). 
+- Compatible avec toutes les offres Cloud du marché respectant les prérequis MySQL et PHP ou Postgresql.
 - Export PDF de tous les éléments (factures, propositions commerciales, commandes, bons expéditions, etc...)


--- a/README.md
+++ b/README.md
@@ -36,7 +36,7 @@ If you have low technical skills and you're looking to install Dolibarr ERP/CRM

 ### Advanced setup

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

 - Uncompress the downloaded archive
 - Copy directory "dolibarr" and all its files inside your web server root, or copy directory anywhere and set up your web server to use "dolibarr/htdocs" as root for a new web server virtual host (second choice need to be server administrator)
@@ -60,10 +60,10 @@ You can use a Web server and a supported database (MariaDb, MySql or Postgresql)
 ## UPGRADING

 - Overwrite all old files from 'dolibarr' directory with files provided into the new version's package.
- At first next access, Dolibarr will redirect your to the "install/" page to make the upgrade process.
-  If a file install.lock exists to lock any run of upgrade process, the application will ask you to remove the file manually (you should find the install.lock file into the directory used to store generated and uploaded documents, in most cases, it is the directory called "documents").
+- If you're upgrading from version x.y.z to x.y.w (only third number differs), there is no need to run any migration process.
+- If you're upgrading from a beta version or from any version x.y.z to any other where x or y number differs, you must call the Dolibarr "install/" page in your browser (this should be done automatically at first dolibarr access) and follow the upgrade process.

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

 ## WHAT'S NEW

@@ -80,18 +80,17 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
 - Invoices and payment management
 - Standing orders management (European SEPA)
 - Bank accounts management
- Shared calendar/agenda (with ical and vcal export for third party tools integration)
- Opportunities and/or project management
+- Shared calendar
+- Opportunities and/or project management (following project benefit including invoices, expense reports, time spent, ...)
 - Projects management
 - Contracts management
 - Stock management
 - Shipping management
 - Interventions management
- Employee's leave requests management
- Expense reports
- Timesheets
+- Agenda with ical and vcal export for third party tools integration
 - Electronic Document Management (EDM)
 - Foundations members management
+- Employee's holidays management
 - Mass emailing
 - Surveys
 - Point of Sale
@@ -120,7 +119,7 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
 - Can manage several currencies by adding external module multi-currency.
 - Very user friendly and easy to use
 - Highly customizable: enable only the modules you need, add user personalized fields, choose your skin, several menu managers (can be used by internal users as a back-office with a particular menu, or by external users as a front-office with another one)
- Works with PHP 5.3+ and MariaDB 5.0.3+, MySQL 5.0.3+ or PostgreSQL 8.1.4+ (See requirements on the [Wiki](http://wiki.dolibarr.org/index.php/Prerequisite))
+- Works with PHP 5.3+ and MySQL 4.1+ or PostgreSQL 8.1. (See requirements on the [Wiki](http://wiki.dolibarr.org/index.php/Prerequisite))
 - Compatible with all Cloud solutions that match MySQL, PHP or PostgreSQL prerequisites.
 - An easy to understand, maintain and code interfaces with your own information system (PHP with no heavy framework; trigger and hook architecture)
 - Support for country specific features:
@@ -148,7 +147,7 @@ These are features that Dolibarr does **not** yet fully support:

 ## DOCUMENTATION

-Administrator, user, developer and translator's documentations are available along with other community resources on the [Wiki](https://wiki.dolibarr.org).
+Administrator, user, developer and translator's documentations are available along with other community resources on the [Wiki](http://wiki.dolibarr.org).

 ## CONTRIBUTING

--- a/build/README-FR
+++ b/build/README-FR
@@ -0,0 +1,78 @@
+README (French)
+################################
+Building packages
+################################
+
+Les sous repertoires du repertoire "build" contiennent tous les fichiers
+requis pour packager Dolibarr de maniere automatisee.
+On trouve plusieurs outils:
+
+- Pour construire un package Dolibarr complet, il suffit de
+> Editer la version dans le fichier makepack-dolibarr.pl  
+> Lancer la commande perl makepack-dolibarr.pl
+
+- Pour construire un package d'une traduction, il suffit de lancer le script
+> perl makepack-dolibarrlang.pl
+
+- Pour construire un package d'un theme, il suffit de lancer le script
+> perl makepack-dolibarrtheme.pl
+
+- Pour construire un package d'un module, il suffit de lancer le script
+> perl makepack-dolibarrmodule.pl
+
+- Pour construire un package DoliWamp autoexe:
+> Installer InnoSetup (http://www.jrsoftware.org)
+> Installer WampServer dans "C:\Program Files\Wamp" (http://www.wampserver.com)
+> Installer les addon WampServer afin d'y mettre les versions:
+   Apache2.2.6, Mysql5.0.45, Php5.2.5
+> Modifier dans le fichier build/exe/doliwamp.iss la variable SourceDir
+  afin d'y mettre le repository Dolibarr.
+> Modifier AppVerName et OutputBaseFilename.
+> Lancer innosetup, ouvrir le fichier build/exe/doliwamp.iss et cliquer sur
+  le bouton "Compile". Le fichier .exe sera fabrique dans le repertoire build.
+
+- Pour generer la documentation developpeur, lancer le script
+> perl dolybarr-doxygen-build.pl
+
+
+Note: 
+
+Le repertoire build et tout ce qu'il contient n'est absolument pas requis
+pour faire fonctionner Dolibarr. Ils ne servent qu'a la generation des
+packages. Certains packages, une fois construit, n'incluent par le repertoire
+"build".
+
+On trouve dans le repertoire "build", les sous-repertoires utilises par
+l'outil makepack-dolibarr.pl:
+
+* deb:
+Fichier de config pour construire un package Debian.
+
+* rpm:
+Fichier de config pour construire un package Redhat ou Mandrake.
+
+* tgz:
+Fichier de config pour construire un package tgz.
+
+* exe:
+Fichier de config pour construire un package exe pour Windows des sources 
+ou pour construire l'assistant d'installation complet DoliWamp.
+
+* zip:
+Fichier de config pour construire un package zip.
+
+* live:
+Fichier pour fabriquer un live CD de demo de Dolibarr.
+
+* patch:
+Fichier exemple de generation de fichier patch pour diffusion d'une
+modification de Dolibarr.
+
+* doap:
+Fichier descriptif DOAP pour promouvoir/decrire la version de Dolibarr.
+
+* pad:
+Fichier descriptif PAD pour promouvoir/decrire la version de Dolibarr.
+
+* dmg:
+Fichier de config pour construire un package dmg DoliMamp pour Mac OS X
--- a/build/composer/README
+++ b/build/composer/README
@@ -1,19 +1,10 @@

-* To list packages 
+To test upgrade of a lib with composer:

-composer show -i
+composer update --no-dev --no-autoloader --dry-run ccampbell/chromephp

-* To test upgrade of a lib with composer:
-
-Remove entry in composer.lock
-Edit composer.json to change version to "x.y.z"
-composer -v update --root-reqs --no-dev --no-autoloader --dry-run ccampbell/chromephp
-
-* To upgrade a lib with composer:
-
-Remove entry in composer.lock
-Edit composer.json to change version to "x.y.z"
-composer -v update --root-reqs --no-dev --no-autoloader ccampbell/chromephp
+To upgrade a lib with composer:

+composer update --no-dev --no-autoloader ccampbell/chromephp


--- a/build/debian/README.howto
+++ b/build/debian/README.howto
@@ -73,8 +73,7 @@ Ex: https://alioth.debian.org/users/eldy-guest
 # msgfmt -v -c -o /dev/null XX.po		 		To have status of translation for language XX
 
 # To check package integrity
-# lintian --pedantic -E -I package.deb   To test a binary package   
-# lintian --pedantic -E -I package.dsc   To test a source package   
+# lintian --pedantic -E -I package.deb   To test a package   

 # To manipulate packages
 # dpkg -l                                List all packages
@@ -155,10 +154,8 @@ tag 729538 -moreinfo
 ##### Testing a package into unstable env

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

 Create a chroot called "unstable-amd64-sbuild".
 Chroot env is stored into /srv/chroot directory.
@@ -173,8 +170,6 @@ Puis pour se connecter et préparer l'environnement
 > schroot -c name_of_chroot
 > cat /etc/debian_chroot       to check which debian branch we are into
 > vi /usr/sbin/policy-rc.d     and replace return code 101 (not allowed) into 0 (ok)
-> apt-get update
-> apt-get upgrade
 > apt-get install links mysql-client

 To test a package
@@ -182,15 +177,15 @@ To test a package
 > cp ../build-area/* /srv/chroot/unstable/tmp
 > sudo schroot -c name_of_chroot
 > cd /tmp
-> lintian --no-tag-display-limit --pedantic -E -I dolibarr*.deb
-> lintian --no-tag-display-limit --pedantic -E -I dolibarr*.dsc
+> lintian --pedantic -E -I dolibarr*.deb
+> lintian --pedantic -E -I dolibarr*.dsc
 > dpkg -i dolibarr*.deb  ou   pour avoir des traces: dpkg -D77777 -i dolibarr*.deb
 > apt-get install -f

 If there is a problem launching apache, because port is already used, change it into your chroot install with
 > vi /etc/apache2/ports.conf
 Then restart.
-Then you can call/test dolibarr with http://localhost:port/dolibarr/ . It can be also called FROM HOST (port must be a not used port on host).
+Then you can call/test dolibarr with http://localhost:port/dolibarr/ (It can be also called from host).



@@ -293,25 +288,16 @@ from origin/upstream and origin/pristine.
 > debian/get-orig-source.sh
 If script fails with error Bad certificate, you can set "export PERL_LWP_SSL_VERIFY_HOSTNAME=0" to solve this.

-* Edit orig.tar.gz file to remove 
- debian
+* Edit tgz file to remove 
 - htdocs/includes/ckeditor
- htdocs/includes/jquery/css
- htdocs/includes/jquery/js
- htdocs/includes/jquery/plugins/flot
- htdocs/includes/jquery/plugins/multiselect
- htdocs/includes/jquery/plugins/datatables
- htdocs/includes/jszip
- htdocs/includes/mike42
- htdocs/includes/phpexcel or htdocs/includes/phpoffice
- htdocs/includes/restler/framework/Luracast/Restler/explorer
- htdocs/includes/swiftmailer
- htdocs/includes/tcpdf or htdocs/includes/tecnickcom
+- htdocs/includes/jquery/plugins/datatables/extras/TableTools/swf
+- htdocs/includes/phpexcel
+- htdocs/includes/tcpdf
 And rename file into 
 dolibarr-x.y.z+dfsgw.tgz
 (x.y.z = version, w start from 1 and is increased for each new git-import-orig already done)

-* Staying into projet gitted root directory, run
+* Staying into git root directory, run
 > git-import-orig -vv ../dolibarr-x.y.z+dfsgw.tgz --debian-branch=[master|jessie] --upstream-branch=[upstream|upstream-3.5.x]
 and enter version when requested with format
 x.y.z+dfsgw
@@ -338,7 +324,7 @@ To update dolibarr debian package when only files into debian has changed:
 To update dolibarr debian package when only files not into debian has changed:

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

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

@@ -355,7 +341,7 @@ Note: Package is built into directory ../build-area
 Note: To compare 2 packages: debdiff package1.dsc package2.dsc

 * Test package (see dedicated chapter to test it with debian unstable env)
-> sudo rm /srv/chroot/unstable/tmp/* >/dev/null 2>&1; cp ../build-area/* /srv/chroot/unstable/tmp
+> cp ../build-area/* /srv/chroot/unstable/tmp
 See rest of process into dedicated chapter "To test a package" to test it with debian unstable env

 * If package .deb is ok:
--- a/build/debian/conf.php.install
+++ b/build/debian/conf.php.install
@@ -100,8 +100,9 @@ $dolibarr_main_db_pass='';
 # This parameter contains the name of the driver used to access your
 # Dolibarr database.
 # Default value: none
-# Possible values: mysqli, pgsql
+# Possible values: mysql, mysqli, pgsql
 # Examples:
+# $dolibarr_main_db_type='mysql';
 # $dolibarr_main_db_type='mysqli';
 # $dolibarr_main_db_type='pgsql';
 #
--- a/build/debian/control
+++ b/build/debian/control
@@ -10,14 +10,13 @@ Build-Depends: debhelper (>= 9), po-debconf
 
 Package: dolibarr
 Architecture: all
-# For debian 7 or 8 or 9
-Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | php5 | libapache2-mod-php | libapache2-mod-phpfilter | php-cgi | php-fpm | php,
-    php5-cli | php-cli,
+Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | php5,
+    php5-cli, 
 # Required PHP extensions
-    php5-mysql | php5-mysqli | php-mysql | php-mysqli, php5-curl | php-curl, php5-gd | php-gd, php5-ldap | php-gd,
+    php5-mysql | php5-mysqli, php5-curl, php5-gd, php5-ldap,
 # Required PHP libraries
    php-pear, php-mail-mime, 
-#    php-tcpdf,
+#    php-tcpdf, libfpdi-php,
 #    libfpdf-tpl-php, php-fpdf,
 #    libphp-adodb,
 #    libnusoap-php,
@@ -27,13 +26,11 @@ Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm |
 # Misc dependencies
 #    fonts-dejavu-core | ttf-dejavu-core,
    xdg-utils,
-    mariadb-client | virtual-mysql-client,
+    mysql-server,
+    mysql-client,
    ${misc:Depends},
    ${perl:Depends}
-Recommends: apache2 | lighttpd | httpd,
-    mariadb-server | virtual-mysql-server,
-# Required PHP extensions for debian 9 but we can't add them into a Depends, it does not exists on debian 7 and 8
-    php-xml, php-mbstring
+Recommends: apache2 | lighttpd | httpd
 Suggests: www-browser, php5-geoip
 Description: Web based software to manage a company or foundation
 Dolibarr ERP & CRM is an easy to use open source/free software package for 
--- a/build/debian/copyright
+++ b/build/debian/copyright
@@ -197,6 +197,9 @@ License: GPL-2+
 On Debian systems, the full text of the GNU General Public
 License version 2 can be found in the file
 `/usr/share/common-licenses/GPL-2'.
+Comment:
+ Those files are not shipped in the binary package as we
+ configure Dolibarr to use the library packaged in "libfpdi-php".

 Files: htdocs/includes/geoip/*
 Copyright: 2007 MaxMind LLC
--- a/build/debian/dolibarr.postinst
+++ b/build/debian/dolibarr.postinst
@@ -61,7 +61,7 @@ apache_install() {
 	# Enable dolibarr conf
 	if which a2enconf >/dev/null 2>&1 ;then
 		# a2enconf exists for ubuntu only
-		echo "Enable link for Apache config file with a2enconf"
+		echo "Enable link for Apache config file with a3enconf"
 		a2enconf dolibarr
 	else 
 		if [ -d /etc/$webserver/conf.d ] && [ ! -e /etc/$webserver/conf.d/dolibarr.conf ]; then
@@ -147,6 +147,7 @@ case "$1" in
 			# File already exist. We add params not found.
 			#echo Add new params to overwrite path to use shared libraries/fonts
 			#grep -q -c "dolibarr_lib_ADODB_PATH" $config    || [ ! -d "/usr/share/php/adodb" ]  || echo "<?php \$dolibarr_lib_ADODB_PATH='/usr/share/php/adodb'; ?>" >> $config
+			#grep -q -c "dolibarr_lib_FPDI_PATH" $config     || [ ! -d "/usr/share/php/fpdi" ]   || echo "<?php \$dolibarr_lib_FPDI_PATH='/usr/share/php/fpdi'; ?>" >> $config
 			##grep -q -c "dolibarr_lib_GEOIP_PATH" $config    || echo "<?php \$dolibarr_lib_GEOIP_PATH=''; ?>" >> $config
 			#grep -q -c "dolibarr_lib_NUSOAP_PATH" $config   || [ ! -d "/usr/share/php/nusoap" ] || echo "<?php \$dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap'; ?>" >> $config
 			#grep -q -c "dolibarr_lib_ODTPHP_PATHTOPCLZIP" $config || [ ! -d "/usr/share/php/libphp-pclzip" ]  || echo "<?php \$dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip'; ?>" >> $config
--- a/build/debian/install.forced.php.install
+++ b/build/debian/install.forced.php.install
@@ -7,7 +7,7 @@
 //

 $force_install_packager='deb';
-$force_install_noedit=1;
+$force_install_noedit=2;
 $force_install_message='KeepDefaultValuesDeb';
 #$force_install_main_data_root='/usr/share/dolibarr/documents';
 $force_install_main_data_root='/var/lib/dolibarr/documents';
@@ -30,6 +30,8 @@ $force_install_lockinstall='444';
 // - not removed from package (see rm in rules file),
 // - declared into dependencies (see Depends in control file)
 //$force_dolibarr_lib_TCPDF_PATH='';
+//$force_dolibarr_lib_FPDF_PATH='/usr/share/php/fpdf';
+//$force_dolibarr_lib_FPDI_PATH='/usr/share/php/fpdi';
 //$force_dolibarr_lib_ADODB_PATH='/usr/share/php/adodb';
 //$force_dolibarr_lib_GEOIP_PATH='';
 //$force_dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap';
--- a/build/debian/rules
+++ b/build/debian/rules
@@ -79,6 +79,7 @@ override_dh_install:
 	
 	# clean from all PHP embedded libraries (we use package dependencies instead)
 #	rm -fr htdocs/includes/adodbtime
+#	rm -fr htdocs/includes/fpdfi
 #	rm -fr htdocs/includes/geoip
 #	rm -fr htdocs/includes/nusoap
 #	rm -fr htdocs/includes/odtphp/zip/pclzip
--- a/build/generate_filelist_xml.php
+++ b/build/generate_filelist_xml.php
@@ -65,8 +65,6 @@ fputs($fp, '<checksum_list version="'.$release.'">'."\n");

 fputs($fp, '<dolibarr_htdocs_dir>'."\n");

-$checksumconcat=array();
-
 $dir_iterator1 = new RecursiveDirectoryIterator(dirname(__FILE__).'/../htdocs/');
 $iterator1 = new RecursiveIteratorIterator($dir_iterator1);
 // need to ignore document custom etc
@@ -83,22 +81,12 @@ foreach ($files as $file) {
        $needtoclose=1;
    }
    if (filetype($file)=="file") {
-        $md5=md5_file($file);
-        $checksumconcat[]=$md5;
-        fputs($fp, '<md5file name="'.basename($file).'">'.$md5.'</md5file>'."\n");
+        fputs($fp, '<md5file name="'.basename($file).'">'.md5_file($file).'</md5file>'."\n");
    }
 }
 fputs($fp, '</dir>'."\n");
 fputs($fp, '</dolibarr_htdocs_dir>'."\n");

-asort($checksumconcat); // Sort list of checksum
-//var_dump($checksumconcat);
-fputs($fp, '<dolibarr_htdocs_dir_checksum>'."\n");
-fputs($fp, md5(join(',',$checksumconcat))."\n");
-fputs($fp, '</dolibarr_htdocs_dir_checksum>'."\n");
-
-
-$checksumconcat=array();

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

@@ -118,18 +106,12 @@ foreach ($files as $file) {
        $needtoclose=1;
    }
    if (filetype($file)=="file") {
-        $md5=md5_file($file);
-        $checksumconcat[]=$md5;
-        fputs($fp, '<md5file name="'.basename($file).'">'.$md5.'</md5file>'."\n");
+        fputs($fp, '<md5file name="'.basename($file).'">'.md5_file($file).'</md5file>'."\n");
    }
 }
 fputs($fp, '</dir>'."\n");
 fputs($fp, '</dolibarr_script_dir>'."\n");

-asort($checksumconcat); // Sort list of checksum
-fputs($fp, '<dolibarr_script_dir_checksum>'."\n");
-fputs($fp, md5(join(',',$checksumconcat))."\n");
-fputs($fp, '</dolibarr_script_dir_checksum>'."\n");

 fputs($fp, '</checksum_list>'."\n");
 fclose($fp);
--- a/build/launchpad/README
+++ b/build/launchpad/README
@@ -73,8 +73,6 @@ If you want to build/test package locally:
    bzr commit -m "Upstream version x.y"
    bzr push

-
-
 # Init debian dir repository into launchpad (when repository for sources does not exist)
 #----------------------------------
 -  Create debian directory and upload it onto bzr branch lp:~yourlogin/+junk/debian-[dev|stable]
@@ -106,13 +104,12 @@ If you want to build/test package locally:
    bzr push lp:~yourlogin/+junk/debian-[dev|stable]


-
 # Define a recipe into launchpad (a rule to build packages into a PPA)
 #----------------------------------
- Create a file dolibarr-[beta|stable].recipe with content
+- Create a file dolibarr.recipe with content
    cd bzr
-    vi dolibarr-[beta|stable].recipe
-    	For beta/dev:
+    vi dolibarr.recipe
+    	For dev:
 	    # bzr-builder format 0.3 deb-version {debupstream}-0~{revno}
 		lp:dolibarr
 		merge packaging lp:~yourlogin/+junk/debian-dev
@@ -122,7 +119,7 @@ If you want to build/test package locally:
 		merge packaging lp:~yourlogin/+junk/debian-stable
 - Run command
    cd bzr
-    bzr dailydeb dolibarr-[beta|stable].recipe working-dir
+    bzr dailydeb dolibarr.recipe working-dir
  This will create a directory "working-dir" with dolibarr sources and will add sources from ~yourlogin/+junk/debian-[dev|stable]
 - Test package sources
    sudo pbuilder build <working-dir>/<project>_<version>.dsc
--- a/build/live/Howto.txt
+++ b/build/live/Howto.txt
@@ -0,0 +1,74 @@
+Howto (English)
+##################################################
+Building a live CD/USB
+##################################################
+
+This is all steps to follow to build a live CD/USB demo of Dolibarr using
+SLAX distribution.
+
+1) Download SLAX (www.slax.org) as a zip file.
+
+2) Unzip file on a directory on any USB key with at least 512Mo free (even
+if you want to build a CD live).
+
+3) Download following modules from SLAX web sites and put files
+into the /slax/modules directory:
+apr-1.2.12-i486-1.lzm
+apr-util-1.2.12-i486-1.lzm
+cairomm-1.4.8-i686.lzm
+cli-ftp-pack.lzm
+codecs-essential-20071007.lzm
+firefox-2.0.0.14.lzm
+ghostscript-8.62-i486-5.lzm
+gimp-2.4.5-i486-1sl.lzm
+gparted-0.3.7-i486-1as.lzm
+grsync.lzm
+httpd-2.2.8-i486-1.lzm
+libsigc++-2.0.18-i686.lzm
+mysql-5.0.51b-i486-1.lzm
+php-5.2.6-i486-1.lzm
+printmodule-s6.lzm
+Save_by_Pastrugno-0.1.lzm
+telnet-1.5.lzm
+
+4) Copy dolibarr files into path
+\slax\changes\var\www\htdocs\dolibarr
+
+5) Run the script 
+> /boot/bootinst.bat
+or
+> /boot/bootinst.sh
+and answer yes to overwrite the MBR of the disk of your USB key.
+
+6) Boot on USB key (Change your BIOS setup if required).
+
+7) After boot, run the script 
+> mysql_install_db --user=mysql
+This will create mysql empty system database.
+
+8) Edit the file /etc/httpd/httpd.conf to uncomment the line
+with PHP activation.
+Include /etc/httpd/mod_php.conf
+
+9) Edit \slax\changes\etc\httpd\php.ini file to disabled features where librairies does not
+exists. You can comment lines:
+;extension=gd.so
+;extension=mhash.so
+;extension=snmp.so
+
+10) Personalized your desktop.
+Add a link to application
+"firefox http://localhost/dolibarr/htdocs/index.php"
+Add a link to application
+"/var/www/htdocs/dolibarr/dev/initdemo/initdemo.sh"
+Add a link to application
+"/var/www/htdocs/dolibarr/dev/initdemo/removedemo.sh"
+
+11) Reboot again on your USB key.
+
+12) Now you can run Dolibarr install process
+http://localhost/dolibarr/htdocs/install/index.php
+or copy USB key content to build another one quickly.
+or build a CD with command (TODO).
+
+
--- a/build/live/README
+++ b/build/live/README
@@ -0,0 +1,7 @@
+README (English)
+##################################################
+Building a live CD/USB
+##################################################
+
+This directory contains files and docs used to build
+a live CD or USB demo of Dolibarr.
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -509,6 +509,7 @@ if ($nboftargetok) {
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/documents`;

 		# Removed known external modules to avoid any error when packaging from env where external modules are tested 
+	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom/*`;	# For custom we want to keep dir
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/allscreens*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/ancotec*`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/cabinetmed*`;
@@ -517,6 +518,7 @@ if ($nboftargetok) {
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/dolimed*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/dolimod*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/factory*`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/forceproject*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/lead*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/management*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/multicompany*`;
@@ -553,7 +555,6 @@ if ($nboftargetok) {
        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/mike42/escpos-php/doc`;
        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/mike42/escpos-php/example`;
        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/mike42/escpos-php/test`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/mobiledetect/mobiledetectlib/.gitmodules`;
        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nusoap/lib/Mail`;
        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nusoap/samples`;
        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/php-iban/docs`;
@@ -574,10 +575,6 @@ if ($nboftargetok) {
        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/tools`;
        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/LICENSE.TXT`;
        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/savant`;
-        
-        print "Remove subdir of custom dir\n";
-   	    print "find $BUILDROOT/$PROJECT/htdocs/custom/* -type d -exec rm -fr {} \\;\n";
-   	    $ret=`find $BUILDROOT/$PROJECT/htdocs/custom/* -type d -exec rm -fr {} \\; >/dev/null 2>&1`;	# For custom we want to keep dir
 	}

 	# Build package for each target
--- a/build/makepack-howto.txt
+++ b/build/makepack-howto.txt
@@ -12,7 +12,6 @@ beta version of Dolibarr, step by step.
 To generate a changelog of a major new version x.y.0 (from develop repo), you can do "cd ~/git/dolibarr; git log `diff -u <(git rev-list --first-parent x.(y-1).0)  <(git rev-list --first-parent develop) | sed -ne 's/^ //p' | head -1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
 To generate a changelog of a major new version x.y.0 (from x.y repo), you can do "cd ~/git/dolibarr_x.y; git log `diff -u <(git rev-list --first-parent x.(y-1).0)  <(git rev-list --first-parent x.y.0) | sed -ne 's/^ //p' | head -1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
 To generate a changelog of a maintenance version x.y.z, you can do "cd ~/git/dolibarr_x.y; git log x.y.z-1.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
- To know number of lines changes: git diff --shortstat A B
 - Update version number with x.y.z-w in htdocs/filefunc.inc.php
 - Commit all changes.

@@ -36,7 +35,6 @@ complete release of Dolibarr, step by step.
 To generate a changelog of a major new version x.y.0 (from develop repo), you can do "cd ~/git/dolibarr; git log `diff -u <(git rev-list --first-parent x.(y-1).0)  <(git rev-list --first-parent develop) | sed -ne 's/^ //p' | head -1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
 To generate a changelog of a major new version x.y.0 (from x.y repo), you can do "cd ~/git/dolibarr_x.y; git log `diff -u <(git rev-list --first-parent x.(y-1).0)  <(git rev-list --first-parent x.y.0) | sed -ne 's/^ //p' | head -1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
 To generate a changelog of a maintenance version x.y.z, you can do "cd ~/git/dolibarr_x.y; git log x.y.z-1.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
- To know number of lines changes: git diff --shortstat A B
 - Update version number with x.y.z in htdocs/filefunc.inc.php
 - Commit all changes.

--- a/build/obs/README
+++ b/build/obs/README
@@ -36,7 +36,7 @@ Go into project you want to update. It mught be:

 Once logged, click on "Add file" in section "Source Files", then select mode "Upload From: Remote URL"
 Keep empty for "Filename", choose "Remote URL" and enter into last field, URL that should looks like this:
-http://www.dolibarr.org/files/stable/package_rpm_generic/dolibarr-x.y.v-0.4.src.rpm
+http://www.dolibarr.org/files/stable/package_rpm_generic/dolibarr-x.y.v-0.3.src.rpm

 Then add into Advanded - Attributes
 OBS:Screenshots http://www.dolibarr.org/images/dolibarr_screenshot1.png
--- a/build/rpm/dolibarr_fedora.spec
+++ b/build/rpm/dolibarr_fedora.spec
@@ -173,7 +173,6 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/contrat
 %_datadir/dolibarr/htdocs/core
 %_datadir/dolibarr/htdocs/cron
-%_datadir/dolibarr/htdocs/custom
 %_datadir/dolibarr/htdocs/don
 %_datadir/dolibarr/htdocs/ecm
 %_datadir/dolibarr/htdocs/expedition
--- a/build/rpm/dolibarr_generic.spec
+++ b/build/rpm/dolibarr_generic.spec
@@ -253,7 +253,6 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/contrat
 %_datadir/dolibarr/htdocs/core
 %_datadir/dolibarr/htdocs/cron
-%_datadir/dolibarr/htdocs/custom
 %_datadir/dolibarr/htdocs/don
 %_datadir/dolibarr/htdocs/ecm
 %_datadir/dolibarr/htdocs/expedition
--- a/build/rpm/dolibarr_mandriva.spec
+++ b/build/rpm/dolibarr_mandriva.spec
@@ -170,7 +170,6 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/contrat
 %_datadir/dolibarr/htdocs/core
 %_datadir/dolibarr/htdocs/cron
-%_datadir/dolibarr/htdocs/custom
 %_datadir/dolibarr/htdocs/don
 %_datadir/dolibarr/htdocs/ecm
 %_datadir/dolibarr/htdocs/expedition
--- a/build/rpm/dolibarr_opensuse.spec
+++ b/build/rpm/dolibarr_opensuse.spec
@@ -181,7 +181,6 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/contrat
 %_datadir/dolibarr/htdocs/core
 %_datadir/dolibarr/htdocs/cron
-%_datadir/dolibarr/htdocs/custom
 %_datadir/dolibarr/htdocs/don
 %_datadir/dolibarr/htdocs/ecm
 %_datadir/dolibarr/htdocs/expedition
--- a/composer.json
+++ b/composer.json
@@ -2,22 +2,14 @@
    "name": "dolibarr/dolibarr",
    "type": "project",
    "description": "Dolibarr ERP & CRM is a modern and easy to use web software to manage your business",
-    "keywords": [
-	    "erp",
-   		"crm",
-    	"invoice",
-    	"sme",
-    	"proposal",
-    	"order",
-    	"stock",
-    	"agenda"
-    ],
-    "homepage": "https://www.dolibarr.org",
+    "keywords": ["erp","crm","invoice","sme","proposal","order","stock"],
+    "homepage": "http://www.dolibarr.org",
    "license": "GPL-3.0+",
    "support": {
        "issues": "https://github.com/Dolibarr/dolibarr/issues",
-        "forum": "https://www.dolibarr.org/forum",
-        "wiki": "https://wiki.dolibarr.org",
+        "forum": "http://www.dolibarr.org/forum",
+        "wiki": "http://wiki.dolibarr.org",
+        "irc": "irc://chat.freenode.net/dolibarr",
        "source": "https://github.com/Dolibarr/dolibarr"
    },
    "config": {
@@ -27,7 +19,7 @@
        "php": ">=5.3.0",
        "ext-curl": "*",
        "ccampbell/chromephp": "4.1.0",
-        "ckeditor/ckeditor": "4.5.9",
+        "ckeditor/ckeditor": "dev-full/stable",
        "mike42/escpos-php": "1.2.1",
        "mobiledetect/mobiledetectlib": "2.8.17",
        "phpoffice/phpexcel": "1.8.1",
@@ -38,8 +30,7 @@
        "jakub-onderka/php-parallel-lint": "^0",
        "jakub-onderka/php-console-highlighter": "^0",
        "phpunit/phpunit": "^4",
-        "squizlabs/php_codesniffer": "^2",
-        "phpunit/phpunit-selenium": "^2"
+        "squizlabs/php_codesniffer": "^2"
    },
    "suggest": {
        "ext-mysqlnd": "To use with MySQL or MariaDB",
@@ -55,6 +46,7 @@
        "ext-soap": "Native SOAP",
        "ext-zip": "ODT and Excel support",
        "ext-xml": "Excel support",
-        "firephp/firephp-core": "Logging to Firebug console support"
+        "firephp/firephp-core": "Logging to Firebug console support",
+        "raven/raven": "Sentry logging server support"
    }
 }
--- a/composer.lock
+++ b/composer.lock
--- a/dev/README
+++ b/dev/README
@@ -7,7 +7,7 @@ provided with a standard release.


 There is also some documentation on Dolibarr Wiki:
-https://wiki.dolibarr.org/
+http://wiki.dolibarr.org/
 and
-https://doxygen.dolibarr.org/
+http://www.dolibarr.org/html_doxygen/index.html

--- a/dev/resources/cliparts/commons.svg
+++ b/dev/resources/cliparts/commons.svg
--- a/dev/setup/codesniffer/README
+++ b/dev/setup/codesniffer/README
--- a/dev/setup/codesniffer/php.ini
+++ b/dev/setup/codesniffer/php.ini
--- a/dev/setup/codesniffer/ruleset.dtd
+++ b/dev/setup/codesniffer/ruleset.dtd
--- a/dev/setup/codesniffer/ruleset.xml
+++ b/dev/setup/codesniffer/ruleset.xml
@@ -9,7 +9,6 @@
 	<exclude-pattern type="relative">htdocs/includes</exclude-pattern>
 	<exclude-pattern type="relative">htdocs/conf.php</exclude-pattern>
 	<exclude-pattern type="relative">*/nltechno*</exclude-pattern>
-	<exclude-pattern type="relative">*/htdocs/includes</exclude-pattern>

 		<!-- List of all tests -->

@@ -188,9 +187,7 @@
        <severity>0</severity>
    </rule>
    
-    <rule ref="PEAR.Commenting.ClassComment.MissingTag">
-		<severity>0</severity>
-    </rule>
+    <rule ref="PEAR.Commenting.ClassComment.MissingTag" />

    <rule ref="PEAR.Commenting.ClassComment.MissingAuthorTag">
        <severity>0</severity>
--- a/dev/setup/codetemplates/README
+++ b/dev/setup/codetemplates/README
--- a/dev/setup/codetemplates/codetemplates.dtd
+++ b/dev/setup/codetemplates/codetemplates.dtd
--- a/dev/setup/codetemplates/codetemplates.xml
+++ b/dev/setup/codetemplates/codetemplates.xml
--- a/dev/resources/dbmodel/dolibarr.uml
+++ b/dev/resources/dbmodel/dolibarr.uml
--- a/dev/resources/dbmodel/dolibarr.umldi
+++ b/dev/resources/dbmodel/dolibarr.umldi
--- a/dev/resources/dbmodel/dolibarr_schema.mwb
+++ b/dev/resources/dbmodel/dolibarr_schema.mwb
--- a/dev/tools/detectnotabfiles.sh
+++ b/dev/tools/detectnotabfiles.sh
--- a/dev/examples/code/README
+++ b/dev/examples/code/README
--- a/dev/examples/code/create_invoice.php
+++ b/dev/examples/code/create_invoice.php
--- a/dev/examples/code/create_order.php
+++ b/dev/examples/code/create_order.php
--- a/dev/examples/code/create_product.php
+++ b/dev/examples/code/create_product.php
--- a/dev/examples/code/create_user.php
+++ b/dev/examples/code/create_user.php
--- a/dev/examples/code/get_contracts.php
+++ b/dev/examples/code/get_contracts.php
--- a/dev/tools/fixaltlanguages.sh
+++ b/dev/tools/fixaltlanguages.sh
@@ -42,15 +42,11 @@ then
        then
        	aaupper="US"
        fi
-        if [ $aaupper = "EL" ]
-        then
-        	aaupper="GR"
-        fi        
    	bblower=`echo $dirshort | nawk -F"_" '{ print tolower($2) }'`
    	if [ "$aa" != "$bblower" -a "$dirshort" != "en_US" ]
    	then
    	    reflang="htdocs/langs/"$aa"_"$aaupper
-    	    if [ -d $reflang -a $aa"_"$bb != $aa"_"$aaupper ]
+    	    if [ -d $reflang ]
    	    then
 		    	echo "***** Process language "$aa"_"$bb" - Search original into "$reflang
    			echo $dirshort is an alternative language of $reflang
--- a/dev/tools/fixdosfiles.sh
+++ b/dev/tools/fixdosfiles.sh
@@ -17,14 +17,14 @@ fi
 # To detec
 if [ "x$1" = "xlist" ]
 then
-	find . \( -iname "functions" -o -iname "*.md" -o -iname "*.html" -o -iname "*.htm" -o -iname "*.php" -o -iname "*.sh" -o -iname "*.cml" -o -iname "*.css" -o -iname "*.js" -o -iname "*.lang" -o -iname "*.pl" -o -iname "*.sql" -o -iname "*.txt" -o -iname "*.xml" -o -iname "*.pml" \) -exec file "{}" + | grep CRLF
+	find . \( -iname "functions" -o -iname "*.md" -o -iname "*.html" -o -iname "*.htm" -o -iname "*.php" -o -iname "*.sh" -o -iname "*.cml" -o -iname "*.css" -o -iname "*.js" -o -iname "*.lang" -o -iname "*.pl" -o -iname "*.sql" -o -iname "*.txt" -o -iname "*.xml" \) -exec file "{}" + | grep CRLF
 #	find . \( -iname "*.md" -o -iname "*.html" -o -iname "*.htm" -o -iname "*.php" -o -iname "*.sh" -o -iname "*.cml" -o -iname "*.css" -o -iname "*.js" -o -iname "*.lang" -o -iname "*.pl" -o -iname "*.sql" -o -iname "*.txt" -o -iname "*.xml" \) -exec file "{}" + | grep -v 'htdocs\/includes' | grep CRLF
 fi

 # To convert
 if [ "x$1" = "xfix" ]
 then
-	for fic in `find . \( -iname "functions" -o -iname "*.md" -o -iname "*.html" -o -iname "*.htm" -o -iname "*.php" -o -iname "*.sh" -o -iname "*.cml" -o -iname "*.css" -o -iname "*.js" -o -iname "*.lang" -o -iname "*.pl" -o -iname "*.sql" -o -iname "*.txt" -o -iname "*.xml" -o -iname "*.pml" \) -exec file "{}" + | grep CRLF | awk -F':' '{ print $1 }' `
+	for fic in `find . \( -iname "functions" -o -iname "*.md" -o -iname "*.html" -o -iname "*.htm" -o -iname "*.php" -o -iname "*.sh" -o -iname "*.cml" -o -iname "*.css" -o -iname "*.js" -o -iname "*.lang" -o -iname "*.pl" -o -iname "*.sql" -o -iname "*.txt" -o -iname "*.xml" \) -exec file "{}" + | grep CRLF | awk -F':' '{ print $1 }' `
 	do
 		echo "Fix file $fic"
 		dos2unix "$fic"
--- a/dev/tools/fixduplicatelangkey.sh
+++ b/dev/tools/fixduplicatelangkey.sh
@@ -14,7 +14,6 @@ fi

 if [ "x$1" = "xlist" ]
 then
-	echo "Search duplicate keys into en_US lang files (there is no cross file check)"
 	for file in `find htdocs/langs/en_US -name *.lang -type f`
 	do
 	    dupes=$(
--- a/dev/tools/fixduplicatelanglines.sh
+++ b/dev/tools/fixduplicatelanglines.sh
@@ -16,7 +16,6 @@ fi
 # To detect
 if [ "x$1" = "xlist" ]
 then
-	echo "Search duplicate line for lang en_US"
    for file in `find htdocs/langs/en_US -type f -name *.lang`
    do
        if [ `sort "$file" | grep -v '^$' | uniq -d | wc -l` -gt 0 ]
@@ -30,7 +29,6 @@ fi
 # To fix
 if [ "x$1" = "xfix" ]
 then
-	echo "Fix duplicate line for lang en_US"
    for file in `find htdocs/langs/en_US -type f -name *.lang`
    do
    	awk -i inplace ' !x[$0]++' "$file"
--- a/dev/tools/fixperms.sh
+++ b/dev/tools/fixperms.sh
--- a/dev/tools/fixutf8bomfiles.sh
+++ b/dev/tools/fixutf8bomfiles.sh
--- a/dev/examples/ical/event_recu.txt
+++ b/dev/examples/ical/event_recu.txt
--- a/dev/initdata/generate-invoice.php
+++ b/dev/initdata/generate-invoice.php
@@ -41,59 +41,8 @@ require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php");
 * Parameters
 */

-define(GEN_NUMBER_FACTURE, 1);
-$year = 2016;
-$dates = array (mktime(12,0,0,1,3,$year),
-    mktime(12,0,0,1,9,$year),
-    mktime(12,0,0,2,13,$year),
-    mktime(12,0,0,2,23,$year),
-    mktime(12,0,0,3,30,$year),
-    mktime(12,0,0,4,3,$year),
-    mktime(12,0,0,4,3,$year),
-    mktime(12,0,0,5,9,$year),
-    mktime(12,0,0,5,1,$year),
-    mktime(12,0,0,5,13,$year),
-    mktime(12,0,0,5,19,$year),
-    mktime(12,0,0,5,23,$year),
-    mktime(12,0,0,6,3,$year),
-    mktime(12,0,0,6,19,$year),
-    mktime(12,0,0,6,24,$year),
-    mktime(12,0,0,7,3,$year),
-    mktime(12,0,0,7,9,$year),
-    mktime(12,0,0,7,23,$year),
-    mktime(12,0,0,7,30,$year),
-    mktime(12,0,0,8,9,$year),
-    mktime(12,0,0,9,23,$year),
-    mktime(12,0,0,10,3,$year),
-    mktime(12,0,0,11,12,$year),
-    mktime(12,0,0,11,13,$year),
-    mktime(12,0,0,1,3,($year - 1)),
-    mktime(12,0,0,1,9,($year - 1)),
-    mktime(12,0,0,2,13,($year - 1)),
-    mktime(12,0,0,2,23,($year - 1)),
-    mktime(12,0,0,3,30,($year - 1)),
-    mktime(12,0,0,4,3,($year - 1)),
-    mktime(12,0,0,4,3,($year - 1)),
-    mktime(12,0,0,5,9,($year - 1)),
-    mktime(12,0,0,5,1,($year - 1)),
-    mktime(12,0,0,5,13,($year - 1)),
-    mktime(12,0,0,5,19,($year - 1)),
-    mktime(12,0,0,5,23,($year - 1)),
-    mktime(12,0,0,6,3,($year - 1)),
-    mktime(12,0,0,6,19,($year - 1)),
-    mktime(12,0,0,6,24,($year - 1)),
-    mktime(12,0,0,7,3,($year - 1)),
-    mktime(12,0,0,7,9,($year - 1)),
-    mktime(12,0,0,7,23,($year - 1)),
-    mktime(12,0,0,7,30,($year - 1)),
-    mktime(12,0,0,8,9,($year - 1)),
-    mktime(12,0,0,9,23,($year - 1)),
-    mktime(12,0,0,10,3,($year - 1)),
-    mktime(12,0,0,11,12,$year),
-    mktime(12,0,0,11,13,$year),
-    mktime(12,0,0,12,12,$year),
-    mktime(12,0,0,12,13,$year),
-);
+define(GEN_NUMBER_FACTURE, 5);
+

 $ret=$user->fetch('','admin');
 if (! $ret > 0)
@@ -105,15 +54,16 @@ $user->getrights();


 $socids = array();
-$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe WHERE client in (1, 3)";
+$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe WHERE client=1";
 $resql = $db->query($sql);
 if ($resql)
 {
-	$num_thirdparties = $db->num_rows($resql);
+	$num_socs = $db->num_rows($resql);
 	$i = 0;
-	while ($i < $num_thirdparties)
+	while ($i < $num_socs)
 	{
 		$i++;
+
 		$row = $db->fetch_row($resql);
 		$socids[$i] = $row[0];
 	}
@@ -129,6 +79,7 @@ if ($resql)
 	while ($i < $num_prods)
 	{
 		$i++;
+
 		$row = $db->fetch_row($resql);
 		$prodids[$i] = $row[0];
 	}
@@ -139,22 +90,20 @@ $result=0;
 while ($i < GEN_NUMBER_FACTURE && $result >= 0)
 {
 	$i++;
-	$socid = mt_rand(1, $num_thirdparties);
+	$socid = mt_rand(1, $num_socs);

 	print "Invoice ".$i." for socid ".$socid;

-	$object = new Facture($db);
-	$object->socid = $socids[$socid];
-	$object->date = $dates[mt_rand(1, count($dates)-1)];
-	$object->cond_reglement_id = 3;
-	$object->mode_reglement_id = 3;
+	$facture = new Facture($db);
+	$facture->date = time();
+	$facture->cond_reglement_id = 3;
+	$facture->mode_reglement_id = 3;

-    $fuser = new User($db);
-    $fuser->fetch(mt_rand(1,2));
-    $fuser->getRights();
-    
-	$result=$object->create($fuser);
+	$result=$facture->create($user);
 	if ($result >= 0)
+	{
+		$result=$facture->validate($user);
+		if ($result)
 		{
 			$nbp = mt_rand(2, 5);
 			$xnbp = 0;
@@ -163,7 +112,7 @@ while ($i < GEN_NUMBER_FACTURE && $result >= 0)
 				$prodid = mt_rand(1, $num_prods);
 				$product=new Product($db);
 				$result=$product->fetch($prodids[$prodid]);
-			$result=$object->addline($product->description, $product->price, mt_rand(1,5), 0, 0, 0, $prodids[$prodid], 0, '', '', 0, 0, '', $product->price_base_type, $product->price_ttc, $product->type);
+				$result=$facture->addline($product->description, $product->price, mt_rand(1,5), 0, 0, 0, $prodids[$prodid], 0, '', '', 0, 0, '', $product->price_base_type, $product->price_ttc, $product->type);
 			    if ($result < 0)
                {
                    dol_print_error($db,$propal->error);
@@ -171,19 +120,16 @@ while ($i < GEN_NUMBER_FACTURE && $result >= 0)
                $xnbp++;
 			}

-	    $result=$object->validate($fuser);
-		if ($result)
-		{
-			print " OK with ref ".$object->ref."\n";;
+			print " OK with ref ".$facture->ref."\n";;
 		}
 		else
 		{
-			dol_print_error($db,$object->error);
+			dol_print_error($db,$facture->error);
 		}
 	}
 	else
 	{
-		dol_print_error($db,$object->error);
+		dol_print_error($db,$facture->error);
 	}

 }
--- a/dev/initdata/generate-order.php
+++ b/dev/initdata/generate-order.php
@@ -40,7 +40,6 @@ include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 include_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
-require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php");


 /*
@@ -48,58 +47,7 @@ require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php");
 */

 define(GEN_NUMBER_COMMANDE, 10);
-$year = 2016;
-$dates = array (mktime(12,0,0,1,3,$year),
-    mktime(12,0,0,1,9,$year),
-    mktime(12,0,0,2,13,$year),
-    mktime(12,0,0,2,23,$year),
-    mktime(12,0,0,3,30,$year),
-    mktime(12,0,0,4,3,$year),
-    mktime(12,0,0,4,3,$year),
-    mktime(12,0,0,5,9,$year),
-    mktime(12,0,0,5,1,$year),
-    mktime(12,0,0,5,13,$year),
-    mktime(12,0,0,5,19,$year),
-    mktime(12,0,0,5,23,$year),
-    mktime(12,0,0,6,3,$year),
-    mktime(12,0,0,6,19,$year),
-    mktime(12,0,0,6,24,$year),
-    mktime(12,0,0,7,3,$year),
-    mktime(12,0,0,7,9,$year),
-    mktime(12,0,0,7,23,$year),
-    mktime(12,0,0,7,30,$year),
-    mktime(12,0,0,8,9,$year),
-    mktime(12,0,0,9,23,$year),
-    mktime(12,0,0,10,3,$year),
-    mktime(12,0,0,11,12,$year),
-    mktime(12,0,0,11,13,$year),
-    mktime(12,0,0,1,3,($year - 1)),
-    mktime(12,0,0,1,9,($year - 1)),
-    mktime(12,0,0,2,13,($year - 1)),
-    mktime(12,0,0,2,23,($year - 1)),
-    mktime(12,0,0,3,30,($year - 1)),
-    mktime(12,0,0,4,3,($year - 1)),
-    mktime(12,0,0,4,3,($year - 1)),
-    mktime(12,0,0,5,9,($year - 1)),
-    mktime(12,0,0,5,1,($year - 1)),
-    mktime(12,0,0,5,13,($year - 1)),
-    mktime(12,0,0,5,19,($year - 1)),
-    mktime(12,0,0,5,23,($year - 1)),
-    mktime(12,0,0,6,3,($year - 1)),
-    mktime(12,0,0,6,19,($year - 1)),
-    mktime(12,0,0,6,24,($year - 1)),
-    mktime(12,0,0,7,3,($year - 1)),
-    mktime(12,0,0,7,9,($year - 1)),
-    mktime(12,0,0,7,23,($year - 1)),
-    mktime(12,0,0,7,30,($year - 1)),
-    mktime(12,0,0,8,9,($year - 1)),
-    mktime(12,0,0,9,23,($year - 1)),
-    mktime(12,0,0,10,3,($year - 1)),
-    mktime(12,0,0,11,12,$year),
-    mktime(12,0,0,11,13,$year),
-    mktime(12,0,0,12,12,$year),
-    mktime(12,0,0,12,13,$year),
-);
+

 $ret=$user->fetch('','admin');
 if ($ret <= 0)
@@ -109,34 +57,34 @@ if ($ret <= 0)
 }
 $user->getrights();

-$societesid = array();
-$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe where client in (1, 3)";
-$resql=$db->query($sql);
-if ($resql) {
-	$num_thirdparties = $db->num_rows($resql);
-	$i = 0;
-	while ($i < $num_thirdparties) {
-		$i++;
-	    $row = $db->fetch_row($resql);
-		$societesid[$i] = $row[0];
-	}
-}
-else { print "err"; }

-$commandesid = array();
-$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."commande";
+$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe"; $societesid = array();
 $resql=$db->query($sql);
 if ($resql) {
 	$num = $db->num_rows($resql);
 	$i = 0;
 	while ($i < $num) {
-		$i++;
 		$row = $db->fetch_row($resql);
-		$commandesid[$i] = $row[0];
+		$societesid[$i] = $row[0];
+		$i++;
 	}
 }
 else { print "err"; }

+$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."commande"; $commandesid = array();
+$resql=$db->query($sql);
+if ($resql) {
+	$num = $db->num_rows($resql);
+	$i = 0;
+	while ($i < $num) {
+		$row = $db->fetch_row($resql);
+		$commandesid[$i] = $row[0];
+		$i++;
+	}
+}
+else { print "err"; }
+
+
 $prodids = array();
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."product WHERE tosell=1";
 $resql = $db->query($sql);
@@ -154,6 +102,59 @@ if ($resql)
 }


+$dates = array (mktime(12,0,0,1,3,2003),
+	  mktime(12,0,0,1,9,2003),
+	  mktime(12,0,0,2,13,2003),
+	  mktime(12,0,0,2,23,2003),
+	  mktime(12,0,0,3,30,2003),
+	  mktime(12,0,0,4,3,2003),
+	  mktime(12,0,0,4,3,2003),
+	  mktime(12,0,0,5,9,2003),
+	  mktime(12,0,0,5,1,2003),
+	  mktime(12,0,0,5,13,2003),
+	  mktime(12,0,0,5,19,2003),
+	  mktime(12,0,0,5,23,2003),
+	  mktime(12,0,0,6,3,2003),
+	  mktime(12,0,0,6,19,2003),
+	  mktime(12,0,0,6,24,2003),
+	  mktime(12,0,0,7,3,2003),
+	  mktime(12,0,0,7,9,2003),
+	  mktime(12,0,0,7,23,2003),
+	  mktime(12,0,0,7,30,2003),
+	  mktime(12,0,0,8,9,2003),
+	  mktime(12,0,0,9,23,2003),
+	  mktime(12,0,0,10,3,2003),
+	  mktime(12,0,0,11,12,2003),
+	  mktime(12,0,0,11,13,2003),
+	  mktime(12,0,0,1,3,2002),
+	  mktime(12,0,0,1,9,2002),
+	  mktime(12,0,0,2,13,2002),
+	  mktime(12,0,0,2,23,2002),
+	  mktime(12,0,0,3,30,2002),
+	  mktime(12,0,0,4,3,2002),
+	  mktime(12,0,0,4,3,2002),
+	  mktime(12,0,0,5,9,2002),
+	  mktime(12,0,0,5,1,2002),
+	  mktime(12,0,0,5,13,2002),
+	  mktime(12,0,0,5,19,2002),
+	  mktime(12,0,0,5,23,2002),
+	  mktime(12,0,0,6,3,2002),
+	  mktime(12,0,0,6,19,2002),
+	  mktime(12,0,0,6,24,2002),
+	  mktime(12,0,0,7,3,2002),
+	  mktime(12,0,0,7,9,2002),
+	  mktime(12,0,0,7,23,2002),
+	  mktime(12,0,0,7,30,2002),
+	  mktime(12,0,0,8,9,2002),
+	  mktime(12,0,0,9,23,2002),
+	  mktime(12,0,0,10,3,2002),
+	  mktime(12,0,0,11,12,2003),
+	  mktime(12,0,0,11,13,2003),
+	  mktime(12,0,0,12,12,2003),
+	  mktime(12,0,0,12,13,2003),
+	  );
+
+require(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php");


 print "Build ".GEN_NUMBER_COMMANDE." orders\n";
@@ -161,29 +162,22 @@ for ($s = 0 ; $s < GEN_NUMBER_COMMANDE ; $s++)
 {
    print "Process order ".$s."\n";

-    $object = new Commande($db);
+    $com = new Commande($db);

-    $object->socid          = $societesid[mt_rand(1, $num_thirdparties)];
-    $object->date_commande  = $dates[mt_rand(1, count($dates)-1)];
-    $object->note           = 'My small comment about this order. Hum. Nothing.';
-    $object->source         = 1;
-    $object->fk_project     = 0;
-    $object->remise_percent = 0;
-    $object->shipping_method_id = mt_rand(1, 2);
-    $object->cond_reglement_id = mt_rand(0, 2);
-    $object->more_reglement_id = mt_rand(0, 7);
-    $object->availability_id = mt_rand(0, 1);
-    
-    $listofuserid=array(12,13,16);
-    
-    $fuser = new User($db);
-    $fuser->fetch($listofuserid[mt_rand(0,2)]);
-    $fuser->getRights();
+    $com->socid         = 4;
+    $com->date_commande  = $dates[mt_rand(1, count($dates)-1)];
+    $com->note           = 'A comment';
+    $com->source         = 1;
+    $com->fk_project     = 0;
+    $com->remise_percent = 0;

    $db->begin();

-    $result=$object->create($fuser);
+    $result=$com->create($user);
 	if ($result >= 0)
+	{
+		$result=$com->valid($user);
+		if ($result > 0)
 		{
            $nbp = mt_rand(2, 5);
            $xnbp = 0;
@@ -192,32 +186,29 @@ for ($s = 0 ; $s < GEN_NUMBER_COMMANDE ; $s++)
                $prodid = mt_rand(1, $num_prods);
                $product=new Product($db);
                $result=$product->fetch($prodids[$prodid]);
-            $result=$object->addline($product->description, $product->price, mt_rand(1,5), 0, 0, 0, $prodids[$prodid], 0, 0, 0,  $product->price_base_type, $product->price_ttc, '', '', $product->type);
-            if ($result <= 0)
+                $result=$com->addline($product->description, $product->price, mt_rand(1,5), 0, 0, 0, $prodids[$prodid], 0, 0, 0,  $product->price_base_type, $product->price_ttc, '', '', $product->type);
+                if ($result < 0)
                {
-                dol_print_error($db,$object->error);
+                    dol_print_error($db,$propal->error);
                }
                $xnbp++;
            }

-	    $result=$object->valid($fuser);
-		if ($result > 0)
-		{
            $db->commit();
-            print " OK with ref ".$object->ref."\n";
+            print " OK with ref ".$com->ref."\n";
 		}
 		else
 		{
            print " KO\n";
 		    $db->rollback();
-		    dol_print_error($db,$object->error);
+		    dol_print_error($db,$com->error);
 		}
 	}
 	else
 	{
        print " KO\n";
 	    $db->rollback();
-	    dol_print_error($db,$object->error);
+	    dol_print_error($db,$com->error);
 	}
 }

--- a/dev/initdata/generate-proposal.php
+++ b/dev/initdata/generate-proposal.php
@@ -43,59 +43,8 @@ require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php");
 * Parameters
 */

-define(GEN_NUMBER_PROPAL, 10);
-$year = 2016;
-$dates = array (mktime(12,0,0,1,3,$year),
-    mktime(12,0,0,1,9,$year),
-    mktime(12,0,0,2,13,$year),
-    mktime(12,0,0,2,23,$year),
-    mktime(12,0,0,3,30,$year),
-    mktime(12,0,0,4,3,$year),
-    mktime(12,0,0,4,3,$year),
-    mktime(12,0,0,5,9,$year),
-    mktime(12,0,0,5,1,$year),
-    mktime(12,0,0,5,13,$year),
-    mktime(12,0,0,5,19,$year),
-    mktime(12,0,0,5,23,$year),
-    mktime(12,0,0,6,3,$year),
-    mktime(12,0,0,6,19,$year),
-    mktime(12,0,0,6,24,$year),
-    mktime(12,0,0,7,3,$year),
-    mktime(12,0,0,7,9,$year),
-    mktime(12,0,0,7,23,$year),
-    mktime(12,0,0,7,30,$year),
-    mktime(12,0,0,8,9,$year),
-    mktime(12,0,0,9,23,$year),
-    mktime(12,0,0,10,3,$year),
-    mktime(12,0,0,11,12,$year),
-    mktime(12,0,0,11,13,$year),
-    mktime(12,0,0,1,3,($year - 1)),
-    mktime(12,0,0,1,9,($year - 1)),
-    mktime(12,0,0,2,13,($year - 1)),
-    mktime(12,0,0,2,23,($year - 1)),
-    mktime(12,0,0,3,30,($year - 1)),
-    mktime(12,0,0,4,3,($year - 1)),
-    mktime(12,0,0,4,3,($year - 1)),
-    mktime(12,0,0,5,9,($year - 1)),
-    mktime(12,0,0,5,1,($year - 1)),
-    mktime(12,0,0,5,13,($year - 1)),
-    mktime(12,0,0,5,19,($year - 1)),
-    mktime(12,0,0,5,23,($year - 1)),
-    mktime(12,0,0,6,3,($year - 1)),
-    mktime(12,0,0,6,19,($year - 1)),
-    mktime(12,0,0,6,24,($year - 1)),
-    mktime(12,0,0,7,3,($year - 1)),
-    mktime(12,0,0,7,9,($year - 1)),
-    mktime(12,0,0,7,23,($year - 1)),
-    mktime(12,0,0,7,30,($year - 1)),
-    mktime(12,0,0,8,9,($year - 1)),
-    mktime(12,0,0,9,23,($year - 1)),
-    mktime(12,0,0,10,3,($year - 1)),
-    mktime(12,0,0,11,12,$year),
-    mktime(12,0,0,11,13,$year),
-    mktime(12,0,0,12,12,$year),
-    mktime(12,0,0,12,13,$year),
-);
+define(GEN_NUMBER_PROPAL, 5);
+

 $ret=$user->fetch('','admin');
 if (! $ret > 0)
@@ -107,15 +56,16 @@ $user->getrights();


 $socids = array();
-$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe WHERE client in (1,3)";
+$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe WHERE client=1";
 $resql = $db->query($sql);
 if ($resql)
 {
-	$num_thirdparties = $db->num_rows($resql);
+	$num_socs = $db->num_rows($resql);
 	$i = 0;
-	while ($i < $num_thirdparties)
+	while ($i < $num_socs)
 	{
 		$i++;
+
 		$row = $db->fetch_row($resql);
 		$socids[$i] = $row[0];
 	}
@@ -131,6 +81,7 @@ if ($resql)
 	while ($i < $num_conts)
 	{
 		$i++;
+
 		$row = $db->fetch_row($resql);
 		$contids[$row[1]][0] = $row[0]; // A ameliorer
 	}
@@ -146,6 +97,7 @@ if ($resql)
 	while ($i < $num_prods)
 	{
 		$i++;
+
 		$row = $db->fetch_row($resql);
 		$prodids[$i] = $row[0];
 	}
@@ -165,25 +117,27 @@ $result=0;
 while ($i < GEN_NUMBER_PROPAL && $result >= 0)
 {
 	$i++;
-	$socid = mt_rand(1, $num_thirdparties);
+	$socid = mt_rand(1, $num_socs);
 	print "Proposal ".$i." for socid ".$socid;

 	$soc = new Societe($db);


-	$object = new Propal($db);
+	$propal = new Propal($db);

-    $fuser = new User($db);
-    $fuser->fetch(mt_rand(1,2));
-    $fuser->getRights();
+	$obj = $conf->global->PROPALE_ADDON;
+	$modPropale = new $obj;
+	$numpr = $modPropale->getNextValue($soc,$propal);

-	$object->contactid = $contids[$socids[$socid]][0];
-	$object->socid = $socids[$socid];
-	$object->datep = $dates[mt_rand(1, count($dates)-1)];
-	$object->cond_reglement_id = 3;
-	$object->mode_reglement_id = 3;
+	$propal->ref = $numpr;
+	$propal->contactid = $contids[$socids[$socid]][0];
+	$propal->socid = $socids[$socid];
+	$propal->datep = time();
+	$propal->cond_reglement_id = 3;
+	$propal->mode_reglement_id = 3;
+	$propal->author = $user->id;

-	$result=$object->create($fuser);
+	$result=$propal->create($user);
 	if ($result >= 0)
 	{
 		$nbp = mt_rand(2, 5);
@@ -193,30 +147,18 @@ while ($i < GEN_NUMBER_PROPAL && $result >= 0)
 			$prodid = mt_rand(1, $num_prods);
 			$product=new Product($db);
 			$result=$product->fetch($prodids[$prodid]);
-			$result=$object->addline($product->description, $product->price, mt_rand(1,5), 0, 0, 0, $prodids[$prodid], 0);
+			$result=$propal->addline($product->description, $product->price, mt_rand(1,5), 0, 0, 0, $prodids[$prodid], 0);
 			if ($result < 0)
 			{
-				dol_print_error($db,$object->error);
+				dol_print_error($db,$propal->error);
 			}
 			$xnbp++;
 		}
-		
-		$result=$object->valid($fuser);
-		if ($result > 0)
-		{
-		    $db->commit();
-		    print " OK with ref ".$object->ref."\n";
+		print " OK with ref ".$propal->ref."\n";
 	}
 	else
 	{
-		    print " KO\n";
-		    $db->rollback();
-		    dol_print_error($db,$object->error);
-		}
-	}
-	else
-	{
-		dol_print_error($db,$object->error);
+		dol_print_error($db,$propal->error);
 	}

 }
--- a/dev/initdata/import-products.php
+++ b/dev/initdata/import-products.php
@@ -1,7 +1,6 @@
 #!/usr/bin/env php
 <?php
 /* Copyright (C) 2016 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2016 Juanjo Menent        <jmenent@2byte.es>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -57,7 +56,7 @@ $error=0;

@set_time_limit(0);
 print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
-dol_syslog($script_file." launched with arg ".implode(',',$argv));
+dol_syslog($script_file." launched with arg ".join(',',$argv));

 $mode = $argv[1];
 $filepath = $argv[2];
--- a/dev/initdata/import-thirdparties.php
+++ b/dev/initdata/import-thirdparties.php
@@ -1,7 +1,6 @@
 #!/usr/bin/env php
 <?php
 /* Copyright (C) 2016 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2016 Juanjo Menent        <jmenent@2byte.es>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -57,7 +56,7 @@ $error=0;

@set_time_limit(0);
 print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
-dol_syslog($script_file." launched with arg ".implode(',',$argv));
+dol_syslog($script_file." launched with arg ".join(',',$argv));

 $mode = $argv[1];
 $filepath = $argv[2];
--- a/dev/initdata/import-users.php
+++ b/dev/initdata/import-users.php
@@ -1,7 +1,6 @@
 #!/usr/bin/env php
 <?php
 /* Copyright (C) 2016 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2016 Juanjo Menent        <jmenent@2byte.es>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -57,7 +56,7 @@ $error=0;

@set_time_limit(0);
 print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
-dol_syslog($script_file." launched with arg ".implode(',',$argv));
+dol_syslog($script_file." launched with arg ".join(',',$argv));

 $mode = $argv[1];
 $filepath = $argv[2];
--- a/dev/initdata/purge-data.php
+++ b/dev/initdata/purge-data.php
@@ -1,7 +1,7 @@
 #!/usr/bin/env php
 <?php
 /* Copyright (C) 2016 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2016 Juanjo Menent        <jmenent@2byte.es>
+ *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 3 of the License, or
@@ -146,7 +146,7 @@ $sqls=array(

@set_time_limit(0);
 print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
-dol_syslog($script_file." launched with arg ".implode(',',$argv));
+dol_syslog($script_file." launched with arg ".join(',',$argv));

 $mode = $argv[1];
 $option = $argv[2];
@@ -154,14 +154,14 @@ $option = $argv[2];
 if (empty($mode) || ! in_array($mode,array('test','confirm'))) {
    print "Usage:  $script_file (test|confirm) (all|option)\n";
    print "\n";
-    print "option can be ".implode(',',array_keys($sqls))."\n";
+    print "option can be ".join(',',array_keys($sqls))."\n";
    exit(-1);
 }

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

--- a/dev/initdemo/README
+++ b/dev/initdemo/README
@@ -1,23 +1,17 @@
 README
 ------

-Scripts in this directory can be used to reload or save a demo database.
-Install of package "dialog" is required.
+*** Demo

-
-*** Init demo
-
-The script initdemo.sh will erase current database with data into mysqldump_dolibarr_x.y.z.sql and copy files into documents_demo into officiel document directory.
+Scripts in this directory can be used to reinit a demo database.
+WARNING: This will erase current database with data into initdemo.sql.

 Do a chmod 700 initdemo.sh
 then run ./initdemo.sh to launch Graphic User Interface.

-
-*** Save demo
-
-The script savedemo.sh will save current database into a database dump file.
+Install of package "dialog" is required.


-*** Update demo
+*** Other

-The goal of script updatedemo.php is to update dates into the demo data so samples are up to date.
+Other scripts into initdata can be used to load data test.
--- a/dev/initdemo/documents_demo/societe/19/SEPA
+++ b/dev/initdemo/documents_demo/societe/19/SEPA
--- a/dev/initdemo/dolibarr-mysql2pgsql.pl
+++ b/dev/initdemo/dolibarr-mysql2pgsql.pl
--- a/dev/initdemo/mysqldump_dolibarr_5.0.0.sql
+++ b/dev/initdemo/mysqldump_dolibarr_5.0.0.sql
--- a/dev/initdemo/removeconfdemo.sh
+++ b/dev/initdemo/removeconfdemo.sh
--- a/dev/resources/iso-normes/GURULABS-RPM-GUIDE-v1.0.PDF
+++ b/dev/resources/iso-normes/GURULABS-RPM-GUIDE-v1.0.PDF
--- a/dev/resources/iso-normes/address_format.txt
+++ b/dev/resources/iso-normes/address_format.txt
--- a/dev/resources/iso-normes/banknumber_format.txt
+++ b/dev/resources/iso-normes/banknumber_format.txt
--- a/dev/resources/iso-normes/barcode_EAN13.txt
+++ b/dev/resources/iso-normes/barcode_EAN13.txt
--- a/dev/resources/iso-normes/countries_iso-3166_en.txt
+++ b/dev/resources/iso-normes/countries_iso-3166_en.txt
--- a/dev/resources/iso-normes/countries_iso-3166_fr.txt
+++ b/dev/resources/iso-normes/countries_iso-3166_fr.txt
--- a/dev/resources/iso-normes/currencies_iso-4217.txt
+++ b/dev/resources/iso-normes/currencies_iso-4217.txt
--- a/dev/resources/iso-normes/fichier_norme_AFB-CFONB.pdf
+++ b/dev/resources/iso-normes/fichier_norme_AFB-CFONB.pdf
--- a/dev/resources/iso-normes/format_FEC-Lien_outil_de_test_agréé.pdf
+++ b/dev/resources/iso-normes/format_FEC-Lien_outil_de_test_agréé.pdf
--- a/dev/resources/iso-normes/format_FEC.pdf
+++ b/dev/resources/iso-normes/format_FEC.pdf
--- a/dev/resources/iso-normes/iban_iso-13616.txt
+++ b/dev/resources/iso-normes/iban_iso-13616.txt
--- a/dev/resources/iso-normes/languages_iso-639.txt
+++ b/dev/resources/iso-normes/languages_iso-639.txt
--- a/dev/resources/iso-normes/locales.txt
+++ b/dev/resources/iso-normes/locales.txt
--- a/dev/resources/iso-normes/vat_number_names.txt
+++ b/dev/resources/iso-normes/vat_number_names.txt
--- a/dev/resources/iso-normes/world_tax_rates.txt
+++ b/dev/resources/iso-normes/world_tax_rates.txt
--- a/dev/resources/iso-normes/xmlexport.txt
+++ b/dev/resources/iso-normes/xmlexport.txt
--- a/dev/examples/ldap/README
+++ b/dev/examples/ldap/README
--- a/dev/examples/ldap/ldapadd_sample1.txt
+++ b/dev/examples/ldap/ldapadd_sample1.txt
--- a/dev/examples/ldap/ldapadd_sample2.txt
+++ b/dev/examples/ldap/ldapadd_sample2.txt
--- a/dev/examples/ldap/ldapadd_sample3.txt
+++ b/dev/examples/ldap/ldapadd_sample3.txt
--- a/dev/examples/ldap/ldapdelete_sample1.txt
+++ b/dev/examples/ldap/ldapdelete_sample1.txt
--- a/dev/examples/ldap/ldapdelete_sample3.txt
+++ b/dev/examples/ldap/ldapdelete_sample3.txt
--- a/dev/examples/ldap/ldapmodify_sample1.txt
+++ b/dev/examples/ldap/ldapmodify_sample1.txt
--- a/dev/examples/ldap/ldapsearch_sample1.txt
+++ b/dev/examples/ldap/ldapsearch_sample1.txt
--- a/dev/examples/ldap/setup_example_activedirectory.jpg
+++ b/dev/examples/ldap/setup_example_activedirectory.jpg
--- a/dev/resources/licence/Links
+++ b/dev/resources/licence/Links
--- a/dev/resources/licence/quick-guide-gplv3-compatibility.png
+++ b/dev/resources/licence/quick-guide-gplv3-compatibility.png
--- a/dev/examples/mail/README
+++ b/dev/examples/mail/README
--- a/dev/examples/mail/dolibarr_mail_attachement.txt
+++ b/dev/examples/mail/dolibarr_mail_attachement.txt
--- a/dev/examples/mail/dolibarr_mail_attachementHTML.txt
+++ b/dev/examples/mail/dolibarr_mail_attachementHTML.txt
--- a/dev/examples/mail/dolibarr_mail_attachementwithimageHTML.txt
+++ b/dev/examples/mail/dolibarr_mail_attachementwithimageHTML.txt
--- a/dev/examples/mail/dolibarr_mail_simple.txt
+++ b/dev/examples/mail/dolibarr_mail_simple.txt
--- a/dev/examples/mail/dolibarr_mail_simpleHTML.txt
+++ b/dev/examples/mail/dolibarr_mail_simpleHTML.txt
--- a/dev/examples/mail/dolibarr_mail_universal.txt
+++ b/dev/examples/mail/dolibarr_mail_universal.txt
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Laurent Destailleur	ef83a0c15e	Merge	2017-05-29 21:29:17 +02:00
Laurent Destailleur	8edce66c08	Update ChangeLog for 4.0.6	2017-05-29 21:27:35 +02:00
Laurent Destailleur	eea6461369	Update ChangeLog for 4.0.6	2017-05-29 21:27:22 +02:00
Laurent Destailleur	f21ec76bc0	Exclude dir	2017-05-29 21:16:37 +02:00
Laurent Destailleur	86cbf7e35f	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0	2017-05-20 21:38:14 +02:00
Laurent Destailleur	2a9c6d9387	Complete ignore file	2017-05-20 21:11:31 +02:00
Laurent Destailleur	59517a1fa0	Merge pull request #6855 from olsesacl/#6813 FIX: #6813 No numbering model for supplier proposal module	2017-05-18 17:58:10 +02:00
Laurent Destailleur	d4fd222251	Merge pull request #6851 from atm-arnaud/FIX_hook_doactions_invoice_model FIX doactions hook missing in invoice model page	2017-05-18 17:51:09 +02:00
Sergio Sanchis Climent	1a98886aa3	FIX: #6813	2017-05-17 00:42:29 +02:00
arnaud	c9738aa7ea	FIX doactions hook missing in invoice model page	2017-05-16 11:34:00 +02:00
Laurent Destailleur	dec602a27b	Merge pull request #6838 from atm-ph/fix_invoice_credit_note_standalone Fix feature INVOICE_CREDIT_NOTE_STANDALONE doesn't work	2017-05-13 19:45:42 +02:00
Laurent Destailleur	419c15ee8e	Fix escaping class	2017-05-12 15:28:10 +02:00
phf	b092b6861a	Fix feature INVOICE_CREDIT_NOTE_STANDALONE doesn't work	2017-05-11 12:48:47 +02:00
Laurent Destailleur	ef5fd503cd	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0	2017-05-10 23:43:08 +02:00
Laurent Destailleur	b2e9d4cc21	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0	2017-05-10 23:42:49 +02:00
Laurent Destailleur	d7b142beb7	Merge pull request #6830 from jfefe/patch-12 Fix #6504: CVE-2017-7886	2017-05-10 23:41:19 +02:00
Laurent Destailleur	61a4382bd8	Merge pull request #6814 from fmarcet/3.9 FIX: Correction with author and validator user on orders	2017-05-10 23:11:21 +02:00
jfefe	d410a320d7	WIP #6504 : CVE-2017-7886 'defaultlang' attribute was not filtered before database request which cause an SQL injection.	2017-05-10 20:32:54 +02:00
Ferran Marcet	dbcb60433b	FIX: Correction with author and validator user on orders	2017-05-09 13:31:20 +02:00
Laurent Destailleur	4b42a5fd86	Merge pull request #6775 from marcosgdf/bug-6677 FIX #6677 Expired contracts dashboard box does not show the name of the thirdparty	2017-05-05 17:05:06 +02:00
Marcos García de La Fuente	d658a833c9	FIX #6677 Expired contracts dashboard box does not show the name of the thirdparty Close #6677	2017-05-01 12:05:52 +02:00