Merge pull request #1995 from atm-maxime/3.4

Fix : actioncomme report was not filtering by entity...

.gitattributes

@@ -1,28 +0,0 @@
-# Set default behaviour, in case users don't have core.autocrlf set.
-# More info: https://help.github.com/articles/dealing-with-line-endings
-* text=auto
-
-
-# Explicitly declare text files we want to always be normalized and converted 
-# to native line endings on checkout.
-*.php text eol=lf
-*.pl text eol=lf
-*.sql text eol=lf
-*.htm text eol=lf
-*.html text eol=lf
-*.js text eol=lf
-*.css text eol=lf
-*.lang text eol=lf
-*.txt text eol=lf
-*.md text eol=lf
-
-# Denote all files that are truly binary and should not be modified.
-*.bmp binary
-*.ico binary
-*.png binary
-*.jpg binary
-*.odt binary
-*.odf binary
-*.frm binary
-*.MYD binary
-*.MYI binary

.gitignore

@@ -13,7 +13,3 @@ dolibarr_install.log
 doxygen_warnings.log
 /.project
 .DS_Store
-.idea
-*.iml
-Thumbs.db
-

.travis.yml

@@ -6,7 +6,7 @@
 notifications:
   email:
     on_success: never # [always|never|change] default: change
-    on_failure: change # [always|never|change] default: always
+    on_failure: always # [always|never|change] default: always
     
 services:
  - memcached # will start memcached
@@ -14,10 +14,8 @@ services:
 # This will tell travis to run phpunit
 language: php
 php:
-# - "5.2" is not supported because pyrus to install PHP_Codesniffer is not available
  - "5.3"
  - "5.4"
- - "5.5" 
 
 env:
  - DB=mysql
@@ -27,14 +25,8 @@ before_script:
  - echo Start travis
  - echo Current dir is `pwd`
  - echo Home dir is `echo ~`
- - export PHPV=`phpenv version-name`
- - echo PHP version $PHPV 
-# - echo Update composer
+ - echo Update composer
 # - ~/.phpenv/versions/$(phpenv version-name)/bin/composer.phar self-update 
- - echo Install phpcs then show installed rules
- - pyrus install pear/PHP_CodeSniffer
- - phpenv rehash
- - phpcs -i
  - echo Create dir $(pwd)/htdocs/documents
  - sudo mkdir -p $(pwd)/htdocs/documents/admin/temp;
  - sudo touch $(pwd)/htdocs/documents/dolibarr.log;
@@ -44,19 +36,17 @@ before_script:
  - find $(pwd)/htdocs/documents -type d -exec ls -alt {} \;
  - echo Edit php.ini file
  - echo 'date.timezone = "Europe/Paris"' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
+ - echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
 # - echo "extension = memcache.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
  - echo "extension = memcached.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
- - sh -c "if [ '$PHPV' = '5.3' ]; then echo 'extension = apc.so' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi"
- - sh -c "if [ '$PHPV' = '5.4' ]; then echo 'extension = apc.so' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi"
- - sh -c "if [ '$PHPV' = '5.3' ]; then echo 'zend_extension_ts = xdebug.so' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi"
- - sh -c "if [ '$PHPV' = '5.4' ]; then echo 'zend_extension_ts = xdebug.so' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi"
+ - echo "zend_extension_ts = xdebug.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
  - cat ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
  - echo Init database
  - sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'DROP DATABASE IF EXISTS myapp_test;' -U postgres; fi"
  - sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'CREATE DATABASE myapp_test;' -U postgres; fi"
  - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'DROP DATABASE IF EXISTS myapp_test;'; fi"
  - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'CREATE DATABASE IF NOT EXISTS myapp_test;'; fi"
- - sh -c "if [ '$DB' = 'mysql' ]; then mysql -D myapp_test < $(pwd)/dev/initdata/mysqldump_dolibarr_3.5.0.sql; fi"
+ - sh -c "if [ '$DB' = 'mysql' ]; then mysql -D myapp_test < $(pwd)/dev/initdata/mysqldump_dolibarr_3.4.0.sql; fi"
  - echo Create config file htdocs/conf/conf.php
  - echo '<?php ' > htdocs/conf/conf.php
  - sh -c "if [ '$DB' = 'pgsql' ]; then echo '$'dolibarr_main_db_type=\'pgsql\'';' >> htdocs/conf/conf.php; fi"
@@ -72,7 +62,7 @@ before_script:
  - echo Show conf.php content
  - cat htdocs/conf/conf.php
  - echo Install apache server
- - sudo apt-get update
+ - sudo apt-get update > /dev/null
  - sudo apt-get install -y --force-yes apache2 libapache2-mod-php5 php5-curl php5-mysql php5-pgsql php5-intl
  - sudo sed -i -e "s,/var/www,$(pwd)/htdocs,g" /etc/apache2/sites-available/default
  - echo Show default virtual host
@@ -83,19 +73,13 @@ before_script:
  
 
 
+# Omitting "script:" will default to phpunit
+# use the $DB env variable to determine the phpunit.xml to use
+#script: phpunit -d memory_limit=-1 --configuration test/phpunit/phpunittest.xml --coverage-text test/phpunit/AllTests.php
+#script: phpunit -d memory_limit=-1 --configuration test/phpunit/phpunittest.xml --coverage-text test/phpunit/BuildDocTest.php
+#script: phpunit -d memory_limit=-1 --configuration test/phpunit/phpunittest.xml test/phpunit/WebservicesOtherTest.php
 script: 
- - cd htdocs/install
- - date
- - php upgrade.php 3.4.0 3.5.0 > upgrade.log
- - php upgrade2.php 3.4.0 3.5.0 > upgrade2.log
-# - cat upgrade.log
-# - cat upgrade2.log
- - cd ../..
- - date
-# - phpcs -p --warning-severity=0 -s --report-summary --standard=dev/codesniffer/ruleset.xml --tab-width=4 --ignore=/build/html/,/dev/vagrant/,/documents/,/includes/,/test/report/ htdocs/core/class/dolgraph.class.php 2>&1
- - phpcs -p --warning-severity=0 -s --report-checkstyle --report-summary --standard=dev/codesniffer/ruleset.xml --tab-width=4 --ignore=/build/html/,/dev/vagrant/,/documents/,/includes/,/test/report/ . 2>&1
- - date
-# - phpunit -d memory_limit=-1 --configuration test/phpunit/phpunittest.xml --coverage-text test/phpunit/BuildDocTest.php
+# - phpcs -s --report-summary --standard=dev/codesniffer/ruleset.xml --tab-width=4 --ignore=/build/html/,/documents/,/includes/,/test/report/ .
  - phpunit -d memory_limit=-1 --configuration test/phpunit/phpunittest.xml test/phpunit/AllTests.php
 
 after_script:

.tx/config

@@ -1,304 +0,0 @@
-[main]
-host = https://www.transifex.com
-lang_map = uz: uz_UZ
-
-[dolibarr.admin]
-file_filter = htdocs/langs/<lang>/admin.lang
-source_file = htdocs/langs/en_US/admin.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.agenda]
-file_filter = htdocs/langs/<lang>/agenda.lang
-source_file = htdocs/langs/en_US/agenda.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.banks]
-file_filter = htdocs/langs/<lang>/banks.lang
-source_file = htdocs/langs/en_US/banks.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.bills]
-file_filter = htdocs/langs/<lang>/bills.lang
-source_file = htdocs/langs/en_US/bills.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.bookmarks]
-file_filter = htdocs/langs/<lang>/bookmarks.lang
-source_file = htdocs/langs/en_US/bookmarks.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.boxes]
-file_filter = htdocs/langs/<lang>/boxes.lang
-source_file = htdocs/langs/en_US/boxes.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.cashdesk]
-file_filter = htdocs/langs/<lang>/cashdesk.lang
-source_file = htdocs/langs/en_US/cashdesk.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.categories]
-file_filter = htdocs/langs/<lang>/categories.lang
-source_file = htdocs/langs/en_US/categories.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.commercial]
-file_filter = htdocs/langs/<lang>/commercial.lang
-source_file = htdocs/langs/en_US/commercial.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.companies]
-file_filter = htdocs/langs/<lang>/companies.lang
-source_file = htdocs/langs/en_US/companies.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.compta]
-file_filter = htdocs/langs/<lang>/compta.lang
-source_file = htdocs/langs/en_US/compta.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.contracts]
-file_filter = htdocs/langs/<lang>/contracts.lang
-source_file = htdocs/langs/en_US/contracts.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.cron]
-file_filter = htdocs/langs/<lang>/cron.lang
-source_file = htdocs/langs/en_US/cron.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.deliveries]
-file_filter = htdocs/langs/<lang>/deliveries.lang
-source_file = htdocs/langs/en_US/deliveries.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.dict]
-file_filter = htdocs/langs/<lang>/dict.lang
-source_file = htdocs/langs/en_US/dict.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.donations]
-file_filter = htdocs/langs/<lang>/donations.lang
-source_file = htdocs/langs/en_US/donations.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.ecm]
-file_filter = htdocs/langs/<lang>/ecm.lang
-source_file = htdocs/langs/en_US/ecm.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.errors]
-file_filter = htdocs/langs/<lang>/errors.lang
-source_file = htdocs/langs/en_US/errors.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.exports]
-file_filter = htdocs/langs/<lang>/exports.lang
-source_file = htdocs/langs/en_US/exports.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.externalsite]
-file_filter = htdocs/langs/<lang>/externalsite.lang
-source_file = htdocs/langs/en_US/externalsite.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.ftp]
-file_filter = htdocs/langs/<lang>/ftp.lang
-source_file = htdocs/langs/en_US/ftp.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.help]
-file_filter = htdocs/langs/<lang>/help.lang
-source_file = htdocs/langs/en_US/help.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.holiday]
-file_filter = htdocs/langs/<lang>/holiday.lang
-source_file = htdocs/langs/en_US/holiday.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.install]
-file_filter = htdocs/langs/<lang>/install.lang
-source_file = htdocs/langs/en_US/install.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.interventions]
-file_filter = htdocs/langs/<lang>/interventions.lang
-source_file = htdocs/langs/en_US/interventions.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.languages]
-file_filter = htdocs/langs/<lang>/languages.lang
-source_file = htdocs/langs/en_US/languages.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.ldap]
-file_filter = htdocs/langs/<lang>/ldap.lang
-source_file = htdocs/langs/en_US/ldap.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.mailmanspip]
-file_filter = htdocs/langs/<lang>/mailmanspip.lang
-source_file = htdocs/langs/en_US/mailmanspip.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.mails]
-file_filter = htdocs/langs/<lang>/mails.lang
-source_file = htdocs/langs/en_US/mails.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.main]
-file_filter = htdocs/langs/<lang>/main.lang
-source_file = htdocs/langs/en_US/main.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.margins]
-file_filter = htdocs/langs/<lang>/margins.lang
-source_file = htdocs/langs/en_US/margins.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.members]
-file_filter = htdocs/langs/<lang>/members.lang
-source_file = htdocs/langs/en_US/members.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.opensurvey]
-file_filter = htdocs/langs/<lang>/opensurvey.lang
-source_file = htdocs/langs/en_US/opensurvey.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.orders]
-file_filter = htdocs/langs/<lang>/orders.lang
-source_file = htdocs/langs/en_US/orders.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.oscommerce]
-file_filter = htdocs/langs/<lang>/oscommerce.lang
-source_file = htdocs/langs/en_US/oscommerce.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.other]
-file_filter = htdocs/langs/<lang>/other.lang
-source_file = htdocs/langs/en_US/other.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.paybox]
-file_filter = htdocs/langs/<lang>/paybox.lang
-source_file = htdocs/langs/en_US/paybox.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.paypal]
-file_filter = htdocs/langs/<lang>/paypal.lang
-source_file = htdocs/langs/en_US/paypal.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.products]
-file_filter = htdocs/langs/<lang>/products.lang
-source_file = htdocs/langs/en_US/products.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.projects]
-file_filter = htdocs/langs/<lang>/projects.lang
-source_file = htdocs/langs/en_US/projects.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.propal]
-file_filter = htdocs/langs/<lang>/propal.lang
-source_file = htdocs/langs/en_US/propal.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.sendings]
-file_filter = htdocs/langs/<lang>/sendings.lang
-source_file = htdocs/langs/en_US/sendings.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.shop]
-file_filter = htdocs/langs/<lang>/shop.lang
-source_file = htdocs/langs/en_US/shop.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.sms]
-file_filter = htdocs/langs/<lang>/sms.lang
-source_file = htdocs/langs/en_US/sms.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.stocks]
-file_filter = htdocs/langs/<lang>/stocks.lang
-source_file = htdocs/langs/en_US/stocks.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.suppliers]
-file_filter = htdocs/langs/<lang>/suppliers.lang
-source_file = htdocs/langs/en_US/suppliers.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.trips]
-file_filter = htdocs/langs/<lang>/trips.lang
-source_file = htdocs/langs/en_US/trips.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.users]
-file_filter = htdocs/langs/<lang>/users.lang
-source_file = htdocs/langs/en_US/users.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.withdrawals]
-file_filter = htdocs/langs/<lang>/withdrawals.lang
-source_file = htdocs/langs/en_US/withdrawals.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.workflow]
-file_filter = htdocs/langs/<lang>/workflow.lang
-source_file = htdocs/langs/en_US/workflow.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-

COPYRIGHT

@@ -38,7 +38,7 @@ jQuery jqueryFileTree 1.0.1	    GPL and MIT	Licence			Yes				JS library for colo
 jQuery jquerytreeview 1.4.1	    MIT	Licence			 		Yes				JS library for color picker with not defined list of colors
 jQuery Layout         1.3.0		GPL and MIT Licence			Yes				JS library plugin Layout (RC-29.15)
 jQuery Mobile	      1.3		GPL and MIT Licence			Yes				JS library for smartphone (not used)
-jQuery TableDnD       0.6		GPL and MIT Licence			Yes				JS library plugin TableDnD (to reorder table rows)
+jQuery TableDnD       0.5		GPL and MIT Licence			Yes				JS library plugin TableDnD (to reorder table rows)
 jQuery Timepicker     1.1.0		GPL and MIT Licence			Yes				JS library Timepicker addon for Datepicker
 jQuery Tiptip         1.3		GPL and MIT Licence			Yes				JS library for tooltips
 JSGantt               1.2		BSD Licence					Yes				JS library (to build Gantt reports)

ChangeLog

@@ -2,344 +2,6 @@
 English Dolibarr ChangeLog
 --------------------------------------------------------------
 
-***** ChangeLog for 3.5.5 compared to 3.5.4 *****
-Fix: Holiday module was broken. Initializaion of amount of holidays failed.
-Fix: [ bug #1523 ] suite bug #1334 : filtre et ordre de tri conjoints ne s'appliquent pas.
-Fix: Fusion PDF button on unpaid invoice is no more displayed.
-Fix: Unpaid invoice launch fusion PDF action even if it is only search (with enter keyboard input instead of lens click).
-Fix: Pb when showing log list of holiday module with some mysql versions.
-Fix: Error with bad timezone pushed by some browsers.
-Fix: shipping list SQL request was not filtering on shipping element
-Fix: debian package provided by dolibarr team must use embedded libraries.
-Fix: [ bug #1528 ] Leopard Services numeration module description is not translated.
-Fix: [ bug #1523 ] suite bug #1334 : filtre et ordre de tri conjoints ne s'appliquent pas.
-Fix: [ bug #1534 ] Unknown error when deleting a product photo under special circumstances.
-Fix: Update impayees.php
-Fix: Link product, In list view and label product.
-Fix: visible task into area "time" for "My task" must limit task to tasks i am assigned to.
-Fix: When disabled, all fields to add time into task line must be disabled.
-Fix: Missing include files.lib.php in some pages to use dol_delete_recursive.
-Fix: [ bug #1558 ] Product/service edit page title shows new Ref instead of old ref.
-Fix: [ bug #1553 ] Saving User displays setup removes menu.
-Fix: [ bug #1544 ] Can remove date from invoice.
-Fix: list event view lost type event filter.
-Fix: Add code save on create event.
-Fix: SQL injection.
-Fix: [ bug #1589 ] Menu type in "Edit menu" page is not translated
-Fix: [ bug #1591 ] Linked object block shows Total HT/TTC even if not having permission to read them
-Fix: [ bug #1577 ] When creating new Private individual third, selected third type is ignored
-Fix: [ bug #1555 ] Update accountancy code of products does not throw PRODUCT_MODIFY trigger
-Fix: [ bug #1548 ] Supplier payment card shows type in French
-Fix: [ bug #1546 ] Incorrect page number when searching in the list of bank transactions
-
-***** ChangeLog for 3.5.4 compared to 3.5.3 *****
-Fix: Hide title of event when agenda module disabled.
-Fix: When using option MAIN_MAIL_ALLOW_SENDMAIL_F, a mail was sent to sender.
-Fix: Question about warehouse must not be done when module stock is disabled.
-Fix: Option STOCK_SUPPORTS_SERVICES was not correctly implemented
-     (missing test at some places).
-Fix: Renaming a project with uplaoded files failed.
-Fix: [ bug #1476 ] Invoice creation form loses invoice date when there is a validation error.
-Fix: [ bug #1431 ] Reception and Send supplier order box has a weird top margin.
-Fix: [ bug #1428 ] "Nothing" is shown in the middle of the screen in a supplier order.
-Fix: The object deliverycompany was not used anymore and output of
-     details for delivery reports was lost during 3.5. Rewrite code to
-     restore feature.
-Fix: [ bug #1445 ] html fix : missing </tr>
-Fix: [ bug #1415 ] Intervention document model name and suppliers model names is not shown
-     properly in module configuration
-Fix: [ bug #1416 ] Supplier order does not list document models in the select box of the 
-     supplier order card
-Fix: [ bug #1443 ] Payment conditions is erased after editing supplier invoice label or 
-     limit date for payment
-Fix: Filter on status was not visible when selected from url.
-Fix: Filtering on status was last when asking to sort.
-Fix: [ bug #1432 ] Trigger SHIPPING_CREATE ignores interception on error.
-Fix: [ bug #1449 ] Trigger ORDER_CREATE, LINEORDER_DELETE, LINEORDER_UPDATE and LINEORDER_INSERT ignore interception on error.
-Fix: [ bug #1450 ] Several Customer order's triggers do not report the error from the trigger handler.
-Fix: [ bug #1451 ] Interrupted order clone through trigger, loads nonexistent order.
-Fix: [ bug #1454 ] Mention de bas de page erroné
-Fix: Do not display dictionnay for non activated module 
-Fix: Link element from element project pages
-Fix: [ bug #1509 ] Expedition admin free text & watermark submit error
-Fix: [ bug #1349 ] AJAX contact selector does not work fine in Project card
-Fix: [ bug #1452 ] variable used but not defined
-Fix: If multiprice level is used the VAT on addline is not correct
-Fix: [ bug #1254 ] Error when using "Enter" on qty input box of a product (on supplier order part)
-Fix: [ bug #1462, 1468, 1480, 1483, 1490, 1497] $this instead of $object
-Fix: [ bug #1455 ] outstanding amount
-Fix: [ bug #1425 ] LINEBILL_SUPPLIER_DELETE failure trigger leads to an endless loop
-Fix: [ bug #1460 ] Several supplier order triggers do not show error messages
-Fix: [ bug #1461 ] LINEORDER_SUPPLIER_CREATE does not intercept supplier order line insertion
-Fix: [ bug #1484 ] BILL_SUPPLIER_PAYED trigger action does not intercept failure under some circumstances
-Fix: [ bug #1482 ] Several supplier invoice triggers do not show trigger error messages
-Fix: [ bug #1486 ] LINEBILL_SUPPLIER_CREATE and LINEBILL_SUPPLIER_UPDATE triggers do not intercept trigger action
-Fix: [ bug #1522 ] Element list into associate object into project are no more filterd by project thirdparty
-Fix: [ bug #1526 ] Thumbs of files uploaded with dots in their names do not load correctly
-Fix: Import ProfId1 to siren and ProfId2 to siret
-
-***** ChangeLog for 3.5.3 compared to 3.5.2 *****
-Fix: Error on field accountancy code for export profile of invoices.
-Fix: [ bug #1351 ] VIES verification link broken.
-Fix: [ bug #1352 ] Removing a shipping does not remove the delivery.
-Fix: Option MAIN_INVERT_SENDER_RECIPIENT broken with typhon template.
-Fix: Can disable features with PHPEXCEL (no DLSF compatible).
-Fix: Can disable features with CKEDITOR. 
-Fix: Pb of records not correctly cleaned when module marge is
-     uninstalled (conflict between 'margin' and 'margins').
-Fix: [ bug #1341 ] Lastname not added by file or direct input in mass e-mailing.
-Fix: [ bug #1357 ] Invoice creator state not printed in generated invoice documents.
-Fix: Suppliers invoice mask fails using {tttt} in numbering.
-Fix: [ bug #1350 ] pdf template name for typhon was not correctly set when enabling module.
-Fix: Navigation on notes for shipments was not working.
-Fix: [ bug #1353 ] Email notifications, wrong URL.
-Fix: [ bug #1362 ] Note is not saved.
-Fix: tr/td balance.
-Fix: [ bug #1360 ] note indicator for member tab.
-Fix: Nb of notes and doc not visible onto tasks.
-Fix: [ bug #1372 ] Margin calculation does not work in proposals.
-Fix: [ bug #1381 ] PHP Warning when listing stock transactions page.
-Fix: [ bug #1367 ] "Show invoice" link after a POS sell throws an error.
-Fix: TCPDF error file not found in member card generation.
-Fix: [ bug #1380 ] Customer invoices are not grouped in company results report.
-Fix: [ bug #1393 ] PHP Warning when creating a supplier invoice.
-Fix: [ bug #1399 ] [pgsql] Silent warning when setting a propal as "facturée" in propal.php
-Fix: When number reach 9999 with default numbering module, next number
-     will be 10000 instead of 0000 and error.
-Fix: element page on project give wrong href link.
-Fix: [ bug #1397 ] Filter by supplier orders with status Draft does not filter.
-Fix: [ bug #1388 ] Wrong date when invoicing several orders.
-Fix: [ bug #1411 ] Unable to set an expedition note if invoices module is not enabled.
-Fix: [ bug #1407 ] Rouget pdf overlapped when using tracking number and public notes.
-Fix: [ bug #1405 ] Rouget PDF expedition incorrect when two expeditions under the same commande
-Fix: [ bug #1434 ] Muscadet supplier order document model linked objects overlap the text
-
-***** ChangeLog for 3.5.2 compared to 3.5.1 *****
-Fix: Can't add user for a task.
-Fix: Autoselect of warehouse if there is only one warehouse.
-Fix: Install of odt template for project and tasks.
-Fix: [ bug #1318 ] Problem with enter key when adding an existing
-     product to a customer invoice.
-Fix: [ bug #1307 ] Quotes get removed from several inputs.
-Fix: [ bug #1317 ] Removing a category does not remove all child categories
-Fix: [ bug #1312 ] Call to undefined function _()
-Fix: Restore build for obs and launchpad.
-Fix: deleting files into backup system tools.
-Fix: Dump using php not not include lock on tables that are deleted.
-Fix: Fixed a problem with bank accounts sharing across entities.
-Fix: fields into group by of sql requests for module margins must be
-     same than fields into select.
-Fix: When select_date is called with '' as preselected date,
-     automatic user date was not correctly et (We must set a date into PHP
-     server timezone area)
-Fix: First param of select_date must always be forged with a dolibarr
-     date function and not time().
-Fix: fix can't add line with product in supplier order
-Fix: [bug #1309]   
-Fix: Solve pb of too many embedded tables     
-Fix: [ bug #1306 ] Fatal error when adding an external calendar
-Fix: A fix to manage automatic creation of code for import.
-Fix: Try to add code to provide easy way to fix warning on timezone not
-     defined.
-Fix: Several fix into workflow/condition for invoice payments or convert
-     into discount.
-Fix: Option MAIN_PDF_DASH_BETWEEN_LINES was not working when tcpdf was
-     making a pagebreak higher than 2 pages.     
-Fix: form to add images should not show link form.
-Fix: Correction when adding order line with price as '0'.
-Fix: [ bug #1283 ] ROUGET Shipment PDF.
-Fix: [ bug #1300 ]
-Fix: Miscellaneous problems on task tabs (withproject parameter lost and
-     download fails).
-Fix: Avoid home project page to hung when too many tasks opened.
-Fix: bug #1295: Error when creating an agenda extrafield with a number as reference
-Fix: Translation of number for pt_PT.
-Fix: Error on ajax_constantonoff function.
-Fix: [ bug #1323 ] problème pour générer un odt depuis les taches dans projet.
-Fix: Can not make withdrawals 
-
-***** ChangeLog for 3.5.1 compared to 3.5.0 *****
-Fix: Do not report trigger errors twice.
-Fix: Error when creating event was not reported.
-Fix: Bug of import of agenda when using https link
-Fix: Field nature not saved correctly
-Fix: Substitution of extra field was ko for order
-Fix: Bad translation of date format for pt_BR.
-Fix: priority field of agenda record is smallint.
-Fix: Missing loading of lang in some pages.
-Fix: Write note in invoice when using pos module.
-Fix: Link to paypal was invalid into email text.
-Fix: ref and date of supplier invoice.
-Fix: Check on bank account.
-Fix: Problem with file upload and download.
-Fix: Page load not ending when large number of thirdparies. We 
-     added option MAIN_DISABLE_AJAX_COMBOX to disable javascript
-     combo feature that is root cause of problem.
-Fix: [ bug #1231 ] PDF always generated in interventions
-Fix: Be sure there is no duplicate default rib.
-Fix: Enable extrafields for customer order, proposal and invoice lines. This feature
-     was developed for 3.5 but was disabled (hidden) because of a bug not possible to
-     fix enough quickly for 3.5.0 release. 
-Fix: user right on Holiday for month report nor working.
-Fix: [ bug #1250 ] "Supplier Ref. product" sidebar search box does not work
-Fix: Bad space in predefined messages. 
-Fix: [ bug #1256 ] Signature was not added for email sent from thirdparty page.
-Fix: Action event SHIPPING_VALIDATE is not implemented
-Fix: The customer code was set to uppercase when using numbering module leopard. We
-     must keep data safe of any change.
-Fix: [ bug #1291 ] Loading actions extrafields fails.
-Fix: [ bug #1123 ] Paid deposit invoices are always shown as partially paid when fully paid
-Fix: Corrected project contact types translation.
-Fix: [ bug #1206 ] PMP price is bad calculated.
-Fix: [ bug #520 ] Product statistics and detailed lists are wrong.
-Fix: [ bug #1240 ] traduction.
-Fix: [ bug #1238 ] When creating accompte with a %, free product are used for calculation.
-Fix: [ bug #1280 ] service with not end of date was tagged as expired.
-Fix: [ bug #1295 ] Error when creating an agenda extrafield with a number as reference.
-Fix: [ bug #1306 ] Fatal error when adding an external calendar.
-New: Added es_CL language
-Fix: Margin tabs bad data show
-Fix: [ bug #1318 ] Problem with enter key when adding an existing product to a customer invoice.
-Fix: [ bug #1410 ] Add customer order line asks for required Unit Price but doesn't interrupt the creation of the line
-
-***** ChangeLog for 3.5 compared to 3.4.* *****
-For users:
-- New: Add hidden option BANK_DISABLE_DIRECT_INPUT.
-- New: More options to select status of users into select user list.
-- New: [ task #862 ] Add ODT on shipments.
-- New: [ task #149 ] Add # of notes and attachments in tabs.
-- New: Can edit customer ref at any time.
-- New: [ task #877 ] Reorganize menus.
-- New: [ task #858 ] Holiday module: note on manual holiday assignation.
-- New: [ task #892 ] Add hidden option in thirdparty customer/supplier module to hide non active
-  companies in select_company method.
-- New: [ task #531 ] Add a workload field on tasks.
-- New: Add graph of bank account input/output into input-output report page.
-- New: Add script export-bank-receipts.php
-- New: Add option "filter=bank" onto script rebuild_merge_pdf.php to merge PDF that
-  has one payment on a specific bank account.*
-- New: [ task #901 ] Add Extrafield on Fiche Inter.
-- New: Show process id in all command line scripts.
-- New: Module mailman can subscribe/unsubscribe to ML according to categories or type of member.
-- New: Add object_hour and object_date_rfc as substitution tag for open document generation.
-- New: Add options to send an email when paypal or paybox payment is done.
-- New: Clone product/service composition.
-- New: Add option ADHERENT_LOGIN_NOT_REQUIRED.
-- New: Add a cron module to define scheduled jobs.
-- New: Add new graphical boxes (customer and supplier invoices and orders per month).
-- New: [ task #286 ] Enhance rounding function of prices to allow round of sum instead of sum of rounding.
-- New: Can add an event automatically when a project is create. 
-- New: Add option MAIN_GENERATE_DOCUMENT_WITH_PICTURE.
-- New: Add option excludethirdparties and onlythirdparties into merge pdf scripts.
-- New: [ task #925 ] Add ODT document generation for Tasks in project module.
-- New: [ task #924 ] Add numbering rule on task.
-- New: [ task #165 ] Add import/export of multiprices.
-- New: Add Maghreb regions and departments.
-- New: A more responsive design for statistic box of home page.
-- New: [ task #1005 ] Adapting to Spanish legislation bill numbering
-- New: [ task #1011 ] Now supplier order and invoice deal with payment terms and mode.
-- New: [ task #1014 ] Add option to recursively add parent category.
-- New: [ task #1016 ] Can define a specific numbering for deposits.
-- New: [ task #918 ] Stock replenishment.
-- New : Add pdf link into supplier invoice list and supplier order list.
-- New : Genrate auto the PDF for supplier invoice.
-- New : Add category into filter webservice thirdparty method getListOfThirdParties.
-- New : Allow to define margin or mark rate during quoting, ordering, invoicing.
-- New : User permissions on margin module.
-- New : Add ref supplier into muscadet model/
-- New : Add ability to copy contact address to clipboard.
-- New: Can use tag {mm} before {yy} even when there is a reset into numbering masks.
-- New: [ task #1060 ] Register fields localtax(1|2)_type into details tables.
-- New: [ task #923 ] Localtax support for ODT templates. 
-- New: [ task #90 ] Barcode search.
-- New: Add hidden option MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS.
-- New: Can send an email from thirdparty card.
-- New: Can cancel holidays that were previously validated.
-- New: Can choose contact on event (action com) creation, and filtered by thirdparty.
-- New: Add hidden option MAIN_FORCE_DEFAULT_STATE_ID.
-- New: Add page to make mass stock movement.
-- New: Add field oustanding limit into thirdparty properties.
-- New: Can enter a vat payment of zero.
-- New: Add path to installed dir of external modules + Name and web of module provider.
-- New: Add option to use a specific mask for uploaded filename.
-- New: Can attach external links to objects as we can attach files.
-- Qual: Implement same rule for return value of all command line scripts (0 when success, <>0 if error).
-- Fix: [ bug #992 ] Proforma invoices don't have a separated numeric count.
-- Fix: [ bug #1022 ] correct margin calculation for credit notes.
-- Fix: Better management of using ajax for upload form (to solve problem when enabling ajax jquery multifile upload in some cases).
-- Fix: Lost stats filters into year selection.
-- Fix: Some config data are shared between suppliers orders and suppliers invoices
-
-New experimental module:
-- New: [ task #157 ] Add a Skype button (adherents / third parties / contacts)
-
-For translators:
-- Qual: Normalized sort order of all languages files with English reference files.
-- New: Add language code files for South Africa, France new Caledonia, Vietnam.
-- New: Translate string for email to change password.
-
-For developers:
-- New: DolGraph can build graph with three lines.
-- New: DolGraph accept a parameter to cache data of graph getNbByMonthWithPrevYear.
-- New: Can enable tuning info with option MAIN_SHOW_TUNING_INFO.
-- New: Show version of client lib used by mysql drivers.
-- New: Add function to get content of an url (using all dolibarr setup like timeout, proxies...)
-- New: Upgrade lib of TCPDF to 6.0
-- New: Upgrade jquery flot library to 0.8.1
-- New: Add property "hidden" into module descriptors to allow to hide a module according to
-  some dynamic conditions.
-- New: Add option MAIN_MOTD_SETUPPAGE to add a content onto setup page. Also content for
-  MAIN_MOTD_SETUPPAGE, MAIN_MOTD_SETUPPAGE, MAIN_HOME now accept "|langfile" into translation
-  key to use a specific language file.
-- New: Make some changes to allow usage of several alternative $dolibarr_main_url_root variables.
-- Qual: All nowrap properties are now using CSS class nowrap.
-- Qual: Move hard coded code of module mailmanspip into trigger.
-- New: Into POST forms, if you can add a parameter DOL_AUTOSET_COOKIE with a value that is list name,
-  separated by a coma, of other POST parameters, Dolibarr will automatically save this parameters
-  into user cookies.
-- New: Add hook addHomeSetup.
-- New: Add trigger CATEGORY_LINK and CATEGORY_UNLINK.
-- New: A trigger can return an array of error strings instead of one error string.
-- New: Add method to use a dictionary as a combo box.
-- New: Add update method for web service product.
-- Fix also several bugs with old code. 
-
-WARNING: Following change may create regression for some external modules, but was necessary to make
-Dolibarr better:
-
-1) We started to clean hooks code. 
-If your hook want to modify value of $actions, it's role of your hook to modify it. Dolibarr 
-hook code will no more decide this for your module. If your action class for hook was returning
-a string or an array, instead your module must set $actionclassinstance->results (to return array) 
-or $actionclassinstance->resprints (to return string) to return same thing. The return value must 
-be replaced by a "return 0";
-Goal is to fix old compatibility code that does not match hook specifications: 
- http://wiki.dolibarr.org/index.php/Hooks_system   
-
-2) If you implemented hook printTopRightMenu, check that output does not include '<td>' tags any more.
-All content added must be tagged by a '<div>' with css class="login_block_elem"
-
-3) Some methods object->addline used a first parameter that was object->id, some not. Of course
-this was not a good practice, since object->id is already known, there is no need to provide id as 
-parameter. All methods addline in this case were modified to remove this parameter. 
-
-4) Method ->classer_facturee() is deprecated. It must be replace with ->classifyBilled().
-
-5) Property ->tel on objects is now ->phone
-
-6) Trigger LINEPROPAL_MODIFY is renamed into LINEPROPAL_UPDATE and
-   Trigger CONTRACT_LINE_DELETE rnamed into LINECONTRACT_DELETE to match naming rules.
-
-
-
-***** ChangeLog for 3.4.3 compared to 3.4.2 *****
-Fix: Bad get of localtaxes into contracts add lines
-
-***** ChangeLog for 3.4.3 compared to 3.4.2 *****
-Fix: Warning into bank conciliation feature.
-Fix: Bad get of localtaxes into contracts add lines.
-Fix: Add a limit into list to avoid browser to hang when database is too large.
-Fix: [ bug #1212 ] 'jqueryFileTree.php' directory traversal vulnerability
 
 ***** ChangeLog for 3.4.3 compared to 3.4.2 *****
 Fix: Warning into bank conciliation feature.

README-FR

@@ -123,6 +123,6 @@ Voici un liste de fonctionnalites pas encore gérées par Dolibarr:
 - Dolibarr ne gère qu'une seule monnaie à la fois (mono-devise).
 - Dolibarr ne gère en standard qu'une société/institution/association mère (mono-société). Pour en gérer plusieurs (comme vos filiales), il faut, soit faire plusieurs installations de Dolibarr, soit installer le module MultiCompany qui permet de gérer n société/institutions/associations dans une seule instance par une isolation logique des données.
 - Dolibarr ne contient pas de module de Gestion de la paie.
-- Les tâches du module de gestion de projets n'ont pas de dépendance entre elle.
+- Les taches du module de gestion de projets n'ont pas de dépendance entre elle.
 - Dolibarr ne contient pas de Webmail.
 - Dolibarr ne fait pas le café (pas encore). 

README.md

@@ -2,7 +2,6 @@
 
 Dolibarr ERP & CRM is a modern software to manage your company or foundation activity (contacts, suppliers, invoices, orders, stocks, agenda, ...).It's an opensource software (wrote with PHP language) designed for small and medium companies, foundation and freelances. You can freely install, use and distribute it as a standalone application or as a web application to use it from every internet access and media.
 
-![ScreenShot](http://www.dolibarr.org/images/dolibarr_screenshot1_640x480.png)
 
 
 ## LICENSE
@@ -13,7 +12,7 @@ Dolibarr is released under the terms of the GNU General Public License as publis
 
 ## INSTALL
 
-If you have no technical knowledge, and you are looking for an autoinstaller to install Dolibarr ERP/CRM in few clicks, you must download DoliWamp (the all-in-one package of Dolibarr for Windows), DoliDeb (the all-in-one package of Dolibarr for Debian or Ubuntu) or DoliRpm (the all-in-one package of Dolibarr for Fedora, Redhat, Opensuse, Mandriva or Mageia).
+If you have no technical knowledge, and you are looking for an autoinstaller to install Dolibarr ERP/CRM in few clicks, you must download DoliWamp (the all-in-one package of Dolibarr for Windows), DoliDeb (the all-in-one package of Dolibarr for Debian or Ubuntu) or DoliRpm (the all-in-one package of Dolibarr for Fedora, Redhat, Opensue, Mandriva or Mageia).
 
 You can download this at: [Official website] (http://www.dolibarr.org/downloads/)
 
@@ -76,63 +75,60 @@ See ChangeLog file found into package.
 
 ### Main modules/features:
 
-- Customers, Prospects or Suppliers directory.
-- Products and services catalog.
-- Bank accounts management.
-- Orders management.
-- Commercial proposals management.
-- Contracts management.
-- Invoices management.
-- Payments management.
-- Standing orders management.
-- Stock management.
-- Shipping management.
-- PDF or ODT generation for invoice, proposals, orders...
-- Agenda with ical,vcal export for third tools integration.
-- EDM (Electronic Document Management).
-- Foundations members management.
-- Employee's holidays management.
-- Mass Emailing.
-- Realize surveys.
-- Point of Sale.
+- Customers, Prospects or Suppliers directory
+- Products and services catalog
+- Stock management
+- Bank accounts management
+- Orders management with PDF export
+- Commercial proposals management
+- Contracts management
+- Invoices management
+- Payments management
+- Standing orders management
+- Shipping management
+- Agenda with ical,vcal export for third tools integration
+- EDM (Electronic Document Management)
+- Foundations members management
+- Employee's holidays management
+- Mass Emailing
+- Realize surveys
+- Point of Sale
 
 ### Other modules:
 
-- Bookmarks management.
-- Donations management.
-- Reporting.
-- Data export/import.
-- Third parties or products categories. 
-- LDAP connectivity.
-- ClickToDial integration.
-- RSS integration.
-- Can be extended with a lot of other external modules available onto DoliStore.com.
+- Bookmarks management
+- Donations management
+- Reporting
+- Data export/import tools
+- LDAP connectivity
+- Third parties or products categories 
+- ClickToDial phone numbers
+- RSS integration
 
 ### Miscellaneous:
 
 - Multi-user, with several permissions levels for each feature.
+- Serveral 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 menu and permissions).
 - Very user friendly and easy to use.
-- Highly customizable: Enable only modules you need, 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.2.1, MySql 4.1 or PostgreSQL 8.1.
-- Compatible with all Cloud solutions that match MySql, PHP or PostgreSQL prerequisites.
-- An easy to understand, maintain and code interfaces with your own system information (PHP with no heavy frameworks, trigger and hook architecture).
-- Support countries specific features:
-   Spanish Tax RE and ISPF.
-   French NPR VAT rate (VAT called "Non Perçue Récupérable" for DOM-TOM).
-   Canadian double taxes (federal/province) and other countries using cumulative VAT.
-   Tunisian tax stamp.  
-   Compatible with European directives (2006/112/CE ... 2010/45/UE) (http://europa.eu/legislation_summaries/taxation/l31057_en.htm)
-   ...
+- Optional WYSIWYG forms, optional Ajax forms.
+- Several skins.
+- Code is highly customizable (a lot of use of modules and submodules).
+- Works with Mysql 4.1 or higher, or PostgreSql 8.14 or higher.
+- Works with PHP 5.0 or higher.
+- An easy to understand and maintain code (PHP with no heavy frameworks).
+- A trigger architecture to allow you to make Dolibarr business events run PHP code to update your own information system.
+- "NPR VAT Rate" (French particularity for managing VAT in DOM-TOM called "Non Perçue Récupérable").
+
 
 
 ## WHAT DOLIBARR CAN'T DO YET (TODO LIST)
 
 This is features that Dolibarr does not support completely yet:
 
-- No double party accountancy (only bank and treasury management).
+- No double party accountancy (only bank management).
 - Dolibarr manage one currency at once (mono-currency).
-- Dolibarr manage one master activity (mono-company). If you want to manage several companies or foundations, you must install several time the software (on same server or not). Another solution is to extend Dolibarr with the addon Module MultiCompany that allows to manage several companies in one Dolibarr instance (one database but with a logical isolation of datas).
-- Tasks on module project can't have dependencies between each other.
+- Dolibarr manage one master company/foundation (mono-company). If you want to manage several companies or foundations, you must install several time the software (on same server or not). Another solution is to extend Dolibarr with the addon Module MultiCompany that allows to manage several companies in one Dolibarr instance (one database but with a logical isolation of datas).
 - Dolibarr does not contains Payroll module.
+- Tasks on module project can't have dependencies between each other.
 - Dolibarr does not include any Webmail.
 - Dolibarr can't do coffee (not yet).

build.xml

@@ -3,7 +3,7 @@
 
 <!-- Exclude/ignore paths -->
  <property name="ignorepaths" value="${basedir}/htdocs/conf,${basedir}/htdocs/core/filemanagerdol,${basedir}/htdocs/includes" />
- <property name="ignoreregexp" value="**/PEAR/*,**/NET/*,**/HTTP/*,**/zendgdata/*,**/reportico/*" />
+ <property name="ignoreregexp" value="**/PEAR/*,**/NET/*,**/HTTP/*" />
  
  <target name="clean">
   <!-- Clean up -->
@@ -46,7 +46,7 @@
    				--exclude '${basedir}/htdocs/conf'
    				--exclude '${basedir}/htdocs/core/filemanagerdol'
    				--exclude '${basedir}/htdocs/includes'
-   				--exclude '**/PEAR/*,**/NET/*,**/HTTP/*,**/zendgdata/*,**/reportico/*'
+   				--exclude '**/PEAR/*,**/NET/*,**/HTTP/*'
    				--min-tokens 70
    				--min-lines 20 
    				htdocs
@@ -61,7 +61,7 @@
    				--exclude '${basedir}/htdocs/conf'
    				--exclude '${basedir}/htdocs/core/filemanagerdol'
    				--exclude '${basedir}/htdocs/includes'
-   				--exclude '**/PEAR/*,**/NET/*,**/HTTP/*,**/zendgdata/*,**/reportico/*'
+   				--exclude '**/PEAR/*,**/NET/*,**/HTTP/*'
    				htdocs
    				" />
   </exec>
@@ -78,11 +78,18 @@
                 "/>
   </exec>
  </target>
+
+ <!-- Generate Doxygen documentation -->
+ <target name="doxygen" description="Dolibarr documentation" >
+  <exec executable="doxygen" dir="${basedir}" failonerror="false">
+   <arg value="${basedir}/build/doxygen/jenkins_doxygen.doxyfile"/>
+  </exec>
+ </target>
  
  <!-- Run unit tests and generate junit.xml and clover.xml -->
  <target name="phpunit">
   <exec executable="phpunit" dir="${basedir}" failonerror="true">
-   <arg line="	--configuration ${basedir}/test/phpunit/phpunittest.xml
+   <arg line="	--configuration ${basedir}/test/phpunit/jenkins_phpunittest.xml
 				--log-junit ${basedir}/hudson/logs/junit.xml
 				--coverage-clover ${basedir}/hudson/coverage/clover.xml
   				--coverage-html ${basedir}/hudson/coverage/
@@ -91,12 +98,5 @@
   </exec>
  </target>
 
- <!-- Generate Doxygen documentation -->
- <target name="doxygen" description="Dolibarr documentation" >
-  <exec executable="doxygen" dir="${basedir}" failonerror="false">
-   <arg value="${basedir}/build/doxygen/jenkins_doxygen.doxyfile"/>
-  </exec>
- </target>
-
  <target name="hudson" depends="clean,phpunit,phpcs,parallelTasks"/>
 </project>

build/aps/Limitations of APS Support in the Panel_fichiers/highlight.js

@@ -1,64 +1,64 @@
-function last(href)
-{
-  var ret = href.split("/");
-  return ret[ret.length-1];
-}
-
-function StopProcess()
-{
-LeftFrame = parent.TOC.document.location.href;
-LeftFrame = last(LeftFrame);
-if (LeftFrame == "dhtml_search.htm") return 1
-else return 0;
-}
-
-
-
-function highlightTOC(str) {
-    
-	
-		
-		 
-	
-    if (StopProcess()) return;
-    try {
-		
-    str = str || parent.BODY.document.location.href;
-    uri = last(str);
-    list = parent.TOC.document.getElementsByTagName("a");
-    for(i=0; i<list.length; i++)
-    {
-      if (last(list[i].href) == uri)
-	{
-        list[i].style.backgroundColor = "#6697cc";
-        list[i].style.padding = "2px";
-        list[i].style.color = "#ffffff";
-		
-	} else {
-		list[i].style.backgroundColor = "#ffffff";
-        list[i].style.color = "#003380";
-	  }
-    }
-    } catch (e) {}
-}
-
-function FindCorrectTOCPage()
-{
-if (StopProcess()) return;
-//Updated on 30.04.2008
-list = parent.BODY.document.getElementsByTagName("a") || document.getElementsByTagName("a");
-    for(i=0; i<list.length; i++)
-    {
-      if (list[i].target == "TOC")
-	{
-
-		if (last(list[i].href) != last(parent.TOC.document.location.href))
-			{
-				parent.TOC.document.location.href = list[i].href;
-				return;
-			}
-	}
-    }
-
-
-}
+function last(href)
+{
+  var ret = href.split("/");
+  return ret[ret.length-1];
+}
+
+function StopProcess()
+{
+LeftFrame = parent.TOC.document.location.href;
+LeftFrame = last(LeftFrame);
+if (LeftFrame == "dhtml_search.htm") return 1
+else return 0;
+}
+
+
+
+function highlightTOC(str) {
+    
+	
+		
+		 
+	
+    if (StopProcess()) return;
+    try {
+		
+    str = str || parent.BODY.document.location.href;
+    uri = last(str);
+    list = parent.TOC.document.getElementsByTagName("a");
+    for(i=0; i<list.length; i++)
+    {
+      if (last(list[i].href) == uri)
+	{
+        list[i].style.backgroundColor = "#6697cc";
+        list[i].style.padding = "2px";
+        list[i].style.color = "#ffffff";
+		
+	} else {
+		list[i].style.backgroundColor = "#ffffff";
+        list[i].style.color = "#003380";
+	  }
+    }
+    } catch (e) {}
+}
+
+function FindCorrectTOCPage()
+{
+if (StopProcess()) return;
+//Updated on 30.04.2008
+list = parent.BODY.document.getElementsByTagName("a") || document.getElementsByTagName("a");
+    for(i=0; i<list.length; i++)
+    {
+      if (list[i].target == "TOC")
+	{
+
+		if (last(list[i].href) != last(parent.TOC.document.location.href))
+			{
+				parent.TOC.document.location.href = list[i].href;
+				return;
+			}
+	}
+    }
+
+
+}

build/aps/Limitations of APS Support in the Panel_fichiers/prettify.js

@@ -1026,7 +1026,7 @@ window['_pr_isIE6'] = function () {
     fallthroughStylePatterns.push(
         // TODO(mikesamuel): recognize non-latin letters and numerals in idents
         [PR_COMMENT,     /^.*?\*.*/],
-		[PR_VAR, /^\$[a-z]{1}[a-z_]+/i, null],
+		[PR_VAR, /^\$[a-z]{1}[a-z_]+/i, null],
 		[PR_LITERAL,     /^@[a-z_$][a-z_$@0-9]*/i, null],
         [PR_TYPE,        /^@?[A-Z]+[a-z][A-Za-z_$@0-9]*/, null],
         [PR_PLAIN,       /^[a-z_$][a-z_$@0-9]*/i, null],
@@ -1254,7 +1254,7 @@ window['_pr_isIE6'] = function () {
           [
 		   [PR_PLAIN,       /^[^<?]+/],
            [PR_DECLARATION, /^<!\w[^>]*(?:>|$)/],
-           [PR_COMMENT,     /^<\!--[\s\S]*?(?:-\->|$)/],
+           [PR_COMMENT,     /^<\!--[\s\S]*?(?:-\->|$)/],
            // Unescaped content in an unknown language
            ['lang-',        /^<\?([\s\S]+?)(?:\?>|$)/],
            ['lang-',        /^<%([\s\S]+?)(?:%>|$)/],

build/debian/README.howto

@@ -7,62 +7,21 @@ This directory contains files used by makepack-dolibarr.pl
 script to build a package, ready to be distributed,
 with format .DEB (for Debian, Ubuntu, ...).
 
-
-
-##### Prepare linux env to work
-
 # To build a debian package, you need first
-# With Ubuntu 12.04
-# apt-get install debhelper dpkg-source gpg lintian git-buildpackage pkg-php-tools schroot sbuild dh-linktree dh-make-php
-# With Debian 7
-# apt-get install debhelper dpkg gnupg lintian git-buildpackage pkg-php-tools schroot sbuild dh-linktree dh-make-php
+# apt-get -i debhelper dpkg-source gpg lintian
 
 
-# To generate gpg key for email used into changelog
-* Check your existing keys/emails
-> gpg --list-key
-* Generate a new one, if none exists for email you use as author
-> gpg --gen-key							Generate a GPG key (-> pubring.gpg + secring.gpg)
-Files are saved int .gnupg directory
-* Create a file ~/.gpb.conf by
-> cat >~/.gbp.conf <<END
-[DEFAULT]
-pristine-tar = True
-
-[git-buildpackage]
-sign-tags = True
-export-dir = ../build-area/
-
-[git-import-orig]
-filter-pristine-tar = True
-END
-
-
-# To use Alioth.debian.org
-* Create an account login
-* Update your ~/.ssh/config file to add:
-Host svn.debian.org git.debian.org bzr.debian.org hg.debian.org darcs.debian.org arch.debian.org
-	User eldy-guest
-	IdentityFile ~/.ssh/id_rsa
-* Check login on page https://alioth.debian.org/users/login
-Ex: https://alioth.debian.org/users/eldy-guest
-* Setup your ssh as described into page: http://wiki.debian.org/Alioth/SSH
-* Ask to be included into project collab-maint: http://alioth.debian.org/projects/collab-maint/
-
-
-
-##### Some interesting command to know
-
-# To translate .po files
+# This is standard command to work on Debian packaging:
+#
+# gpg --gen-key                          Generate a GPG key (-> pubring.gpg + secring.gpg)
+#
 # debconf-updatepo					     		To run into po dir to regenate templates.pot
 # podebconf-report-po --from email@email.com	To send email to ask translations
 # Edit manually file XX.po and remove all lines "#, fuzzy" when translation is complete
-# msgfmt -v -c -o /dev/null XX.po		 		To have status of translation for language XX
- 
-# To check package integrity
+# msgfmt -v -c -o /dev/null XX.po		 		To have status of translation for language XX 
+#
 # lintian --pedantic -E -I package.deb   To test a package   
-
-# To manipulate packages
+#
 # dpkg -l                                List all packages
 # dpkg -b                                To build binary only package
 # dpkg -c package.deb                    List content of package
@@ -71,16 +30,13 @@ Ex: https://alioth.debian.org/users/eldy-guest
 # dpkg-reconfigure -plow package		 Reconfigure package
 # dpkg -L packagename                    List content of installed package 
 # dpkg -r packagename                    Remove config files and interactive saved answers
-# dpkg -s packagename                    Give status of installed package
 # dpkg --purge                           Remove config files and interactive saved answers
 #
 # dpkg-buildpackage -us -uc              Build a source and binary package
 #
 # gdebi package.deb						 Install a package + dependencies
 
-
-
-##### Global view of submit new package to Debian:
+To submit a package to Debian:
 
 - Post an ITP with reportbugs :
 > reportbug -B debian --email username@domain.tld wnpp
@@ -99,155 +55,3 @@ See page http://www.debian.org/devel/wnpp/#l1 for example of ITP requests conten
 - Once package is uploaded, following URL are available:
 http://packages.qa.debian.org/package.html
 http://bugs.debian.org/package
-
-
-
-##### Testing a package into unstable env
-
-Check you have a mysql server available from another interface than localhost
-Uncomment line if required and restart mysql
-bind-address = 127.0.0.1
-
-Create a chroot called "unstable-amd64-sbuild"
-> sudo sbuild-createchroot --keyring= unstable /srv/chroot/unstable http://ftp.uk.debian.org/debian
-
-Pour lister les env chroot
-> schroot -l
-
-Puis pour se connecter et préparer l'environnement 
-> schroot -c name_of_chroot
-> vi /usr/sbin/policy-rc.d     and replace return code 101 (not allowed) into 0 (ok)
-> apt-get install links mysql-client
-
-Pour tester un package
-> cp *.deb /srv/chroot/unstable/tmp
-> sudo schroot -c name_of_chroot
-> dpkg -i dolibarr*.deb
-> apt-get install -f
-
-
-
-
-
-##### Create/Maintain TCPDF package
-
-To update tcpdf package:
-
-* You can git clone tcpdf
-> git clone git.debian.org:/git/collab-maint/tcpdf.git [tcpdf-debian]
-or better
-> mkdir gitdebian
-> cd gitdebian
-> gbp-clone git.debian.org:/git/collab-maint/tcpdf.git
-
-* You can then create a PHP project from Eclipse called tcpdf-debian
-from git clone dir and make link to git.
- 
-* If local branch upstream and pristine-tar does not exists, create it
-from origin/upstream and origin/pristine.
-
-* Into root dir, launch:
-> debian/get-orig-source.sh
-
-* Staying into git root directory, run
-> git-import-orig -vv ../tcpdf_x.y.z+dfsg.orig.tar.xz
-
-Note: If there was errors solved manually, you may need to make a git commit
-
-* Add an entry into debian/changelog
-> dch -v x.y.z-1 "My comment" will add entry.
-For example: dch -v x.y.z-1 "New upstream release." for a new version
-
-Warning: Date must have format reported by "date -R"
-Warning: Name and email must match value into debian/control file (Entry added here is used by next step).
-
-* We try to build package
-> rm -fr ../build-area
-> git-buildpackage -us -uc
-
-Note: You can use git-buildpackage -us -uc --git-ignore-new if you want to test build with uncommited file
-Note: Package is built into directory ../build-area
-
-* If package .deb is ok:
-Note: If there was errors managed manually, you may need to make a git commit but do not use option "amend" previous commit
-> git-buildpackage --git-tag-only --git-retag
-> git push --all ou git push origin --all
-> git push --tags
-
-* Compilation is then done by a debian developer and sent
-> sbuild ...
-> dput ...
-
-* Go into page. You should see new package into unstable.
-http://packages.qa.debian.org/t/tcpdf.html
-
-* Package will be into release when test will be moved as stable.
-
-
-
-##### Update but tracker system
-To set status of a bug to pending
-> bts tag 728235 +pending
-
-
-
-##### Create/Maintain dolibarr package
-
-To update dolibarr debian package
-
-* You can git clone debian git repo
-> git clone git.debian.org:/git/collab-maint/dolibarr.git [dolibarr-debian]
-or better
-> cd ~; mkdir git-debian; cd git-debian
-> gbp-clone git.debian.org:/git/collab-maint/dolibarr.git
-
-* You can then create a PHP project from Eclipse called dolibarr-debian
-from git clone dir and make link to git.
-
-* If local branch upstream and pristine-tar does not exists, create it
-from origin/upstream and origin/pristine.
-
-* If new upstream is available onto sourceforge, launch:
-> debian/get-orig-source.sh
-
-* Staying into git root directory, run
-> git-import-orig -vv ../dolibarr-3.3.4.tgz
-
-Note: If there was errors solved manually after get-orig-sources.sh, you may need to make a git commit
-
-* Add an entry into debian/changelog
-> dch -v x.y.z-1 "My comment" will add entry.
-For example: dch -v x.y.z-1 "New upstream release." for a new version
-Then modify changelog to replace "unstable" with "UNRELEASED".
-
-Warning: Date must have format reported by "date -R"
-Warning: Name and email must match value into debian/control file (Entry added here is used by next step).
-
-* We try to build package
-> rm -fr ../build-area
-> git-buildpackage -us -uc
-
-Note: You can use git-buildpackage -us -uc --git-ignore-new if you want to test build with uncommited file
-Note: Package is built into directory ../build-area
-
-* Test package (see dedicated chapter to test it with debian unstable env)
-
-* If package .deb is ok:
-Note: If there was errors managed manually, you may need to make a git commit but do not use option "amend" previous commit
-> git-buildpackage --git-tag-only --git-retag
-> git push --all ou git push origin --all
-> git push --tags
-
-* Compilation is then done by a debian developer and sent
-> sbuild ...
-> dput ...
-
-* Package arrives into FTPmaster taskboard with status NEW (pending upload). You can view it at:
-http://ftp-master.debian.org/new/
- 
-* Once package is validated, you should see it into area unstable at:
-http://packages.qa.debian.org
-
-* Package will be into release when test will be moved as stable.
-
-

build/debian/apache.conf

@@ -0,0 +1,75 @@
+# Apache config file for Dolibarr
+
+<IfModule mod_alias.c>
+Alias /dolibarr /usr/share/dolibarr/htdocs
+</IfModule>
+
+# You can also use dolibarr as a VirtualHost
+# <VirtualHost *:*>
+#     ServerName mydolibarrhostname.com
+#     ServerAdmin root@example.com
+#     DocumentRoot /usr/share/dolibarr/
+#     ErrorLog logs/ldap.example.com-error.log
+#     CustomLog logs/ldap.example.com-access.log common
+# </VirtualHost>
+
+# Directory for web pages
+<DirectoryMatch /usr/share/dolibarr>
+  Order deny,allow
+  Allow from all
+  DirectoryIndex index.php
+  Options +FollowSymLinks +Indexes
+
+  ErrorDocument 401 /public/error-401.php
+  ErrorDocument 404 /public/error-404.php
+
+  <IfModule mod_php4.c>
+    php_flag magic_quotes_gpc Off
+    php_flag register_globals Off
+  </IfModule>
+
+  <IfModule mod_php5.c>
+    php_flag magic_quotes_gpc Off
+    php_flag register_globals Off
+  </IfModule>
+
+
+    # OPTIMIZE: To use cache on static pages (A259200 = 1 month).
+    # Note that you must also enable the module mod_expires.
+    #ExpiresActive On
+    #ExpiresByType image/x-icon A2592000
+    #ExpiresByType image/gif A2592000
+    #ExpiresByType image/png A2592000
+    #ExpiresByType image/jpeg A2592000
+    #ExpiresByType text/css A2592000
+    #ExpiresByType text/javascript A2592000
+    #ExpiresByType application/x-javascript A2592000
+    #ExpiresByType application/javascript A2592000
+
+</DirectoryMatch>
+
+# Directory for public pages
+<DirectoryMatch /usr/share/dolibarr/htdocs/public>
+    AllowOverride All
+    Order deny,allow
+    Allow from all
+</DirectoryMatch>
+
+# Config files
+<DirectoryMatch /etc/dolibarr>
+	AllowOverride All
+    Order deny,allow
+    Allow from all
+</DirectoryMatch>
+
+# Directory for data files
+<DirectoryMatch /usr/share/dolibarr/documents>
+    AllowOverride All
+    Order deny,allow
+    Allow from all
+</DirectoryMatch>
+<DirectoryMatch /var/lib/dolibarr/documents>
+    AllowOverride All
+    Order deny,allow
+    Allow from all
+</DirectoryMatch>

build/debian/apache/.htaccess

@@ -1,7 +0,0 @@
-<IfVersion >= 2.3>
-Require all denied
-</IfVersion>
-<IfVersion < 2.3>
-Order deny,allow
-Deny from all
-</IfVersion>

build/debian/apache/dolibarr.conf

@@ -1,42 +0,0 @@
-# Apache config file for Dolibarr
-<IfModule mod_alias.c>
-Alias /dolibarr /usr/share/dolibarr/htdocs
-</IfModule>
-
-# You can also use dolibarr as a VirtualHost
-# <VirtualHost *:*>
-#     ServerName mydolibarrhostname.com
-#     ServerAdmin root@example.com
-#     DocumentRoot /usr/share/dolibarr/
-#     ErrorLog logs/ldap.example.com-error.log
-#     CustomLog logs/ldap.example.com-access.log common
-# </VirtualHost>
-
-# Directory for web pages
-<Directory /usr/share/dolibarr/htdocs>
-    Order deny,allow
-    Allow from all
-
-    DirectoryIndex index.php
-    Options +FollowSymLinks +Indexes
-
-    ErrorDocument 401 /dolibarr/public/error-401.php
-    ErrorDocument 404 /dolibarr/public/error-404.php
-
-    <IfModule mod_php5.c>
-      php_flag magic_quotes_gpc Off
-      php_flag register_globals Off
-    </IfModule>
-
-    # OPTIMIZE: To use cache on static pages (A259200 = 1 month).
-    # Note that you must also enable the module mod_expires.
-    #ExpiresActive On
-    #ExpiresByType image/x-icon A2592000
-    #ExpiresByType image/gif A2592000
-    #ExpiresByType image/png A2592000
-    #ExpiresByType image/jpeg A2592000
-    #ExpiresByType text/css A2592000
-    #ExpiresByType text/javascript A2592000
-    #ExpiresByType application/x-javascript A2592000
-    #ExpiresByType application/javascript A2592000
-</Directory>

build/debian/changelog

@@ -1,62 +1,20 @@
-dolibarr (3.5.5-3) unstable; urgency=low
-
-  [ Laurent Destailleur (eldy) ]
-  * New upstream release.
-    
- -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Tue, 8 July 2014 12:00:00 +0100     
-
-dolibarr (3.5.4-3) unstable; urgency=low
-
-  [ Laurent Destailleur (eldy) ]
-  * New upstream release.
-    
- -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Tue, 1 July 2014 12:00:00 +0100     
-
-dolibarr (3.5.3-3) unstable; urgency=low
-
-  [ Laurent Destailleur (eldy) ]
-  * New upstream release.
-    
- -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Fri, 2 May 2014 12:00:00 +0100     
-
-dolibarr (3.5.2-3) unstable; urgency=low
-
-  [ Laurent Destailleur (eldy) ]
-  * New upstream release.
-    
- -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Fri, 14 March 2014 12:00:00 +0100     
-
-dolibarr (3.5.1-3) unstable; urgency=low
-
-  [ Laurent Destailleur (eldy) ]
-  * New upstream release.
-    
- -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Fri, 7 Feb 2014 12:00:00 +0100     
-
-dolibarr (3.5.0-3) unstable; urgency=low
-
-  [ Laurent Destailleur (eldy) ]
-  * New upstream release.
-    
- -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Fri, 31 Jan 2014 12:00:00 +0100     
-
-dolibarr (3.4.2-3) unstable; urgency=low
+dolibarr (3.4.2) unstable; urgency=low
 
   [ Laurent Destailleur (eldy) ]
   * Maintenance release.
     
  -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Mon, 30 Dec 2013 12:00:00 +0100     
 
-dolibarr (3.4.1-3) unstable; urgency=low
+dolibarr (3.4.1) unstable; urgency=low
 
   [ Laurent Destailleur (eldy) ]
   * Maintenance release.
     
- -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Mon, 27 Apr 2013 12:00:00 +0100     
+ -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Mon, 22 Apr 2013 12:00:00 +0100     
 
-dolibarr (3.4.0-3) unstable; urgency=low
+dolibarr (3.4.0) unstable; urgency=low
 
   [ Laurent Destailleur (eldy) ]
-  * Maintenance release.
+  * New upstream release.
     
- -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Mon, 22 Apr 2013 12:00:00 +0100
+ -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Mon, 22 Apr 2013 12:00:00 +0100

build/debian/control

@@ -1,48 +1,41 @@
 Source: dolibarr
+Maintainer: Laurent Destailleur (eldy) <eldy@users.sourceforge.net>
+Uploaders: Laurent Destailleur (eldy) <eldy@users.sourceforge.net>
+Standards-Version: 3.9.2
 Section: web
 Priority: optional
-Maintainer: Laurent Destailleur (eldy) <eldy@users.sourceforge.net>
-# Uploaders: Laurent Destailleur (eldy) <eldy@users.sourceforge.net>		# Only if differs from Maintainer
-Standards-Version: 3.9.4
 Homepage: http://www.dolibarr.org
-Build-Depends: debhelper (>= 9), po-debconf
-# This package need at least debian 7 or ubuntu 13.04 or any distribution based on this version
+Build-Depends: debhelper (>= 7), po-debconf, dpatch
+Comments: This package need at least debian 7 or ubuntu 13.04 or any distribution based on this version
  
 Package: dolibarr
-Architecture: all
 Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | php5,
-    php5-cli, 
-# Required PHP extensions
-    php5-mysql | php5-mysqli, php5-curl, php5-gd, php5-ldap, php5-geoip,
-# Required PHP libraries
-    php-pear, php-mail-mime, 
-#    php-tcpdf, libfpdi-php, libfpdf-tpl-php, php-fpdf,
-#    libphp-adodb,
-#    libnusoap-php,
-#    libphp-pclzip,
-# Required javascript libraries
-#    libjs-jquery, libjs-jquery-ui, libjs-flot, ckeditor,
-# Misc dependencies
-#    fonts-dejavu-core | ttf-dejavu-core,
+    php5-mysql | php5-mysqli, 
+    php5-cli, php5-curl, php5-gd, php5-ldap, php-pear, php-mail-mime, php5-geoip,
+	libphp-adodb,
+    libnusoap-php,
+    libphp-pclzip,
+    libfpdi-php, libfpdf-tpl-php, php-fpdf,
+    libjs-jquery, libjs-jquery-ui, libjs-flot, ckeditor,
+    ttf-dejavu-core,
     xdg-utils,
     mysql-server,
     ${misc:Depends},
     ${perl:Depends}
-Recommends: mysql-client, apache2 | lighttpd | httpd
+Recommends: apache2 | lighttpd | httpd, mysql-client
 Suggests: www-browser
-Description: Web based software to manage a company or foundation
+Architecture: all
+Description: Web based software to manage a small company or foundation
  Dolibarr ERP & CRM is an easy to use open source/free software for small 
  and medium companies, foundations or freelances. It includes different 
  features for Enterprise Resource Planning (ERP) and Customer Relationship
  Management (CRM) but also for different other activities.
- .
  It's a web software you can install as a standalone program or on any web
  hosting provider to use it from anywhere with any web browser.
  .
- Dolibarr was designed to be easy to use. Only the features that you need
- are visible, depending on which modules were activated.
- .
- This is an example of most common used modules:
+ Dolibarr was designed to be easy to use. Only features you need are 
+ visible, depending on which module were activated.
+ Most common used modules are:
  .
  Customers, Suppliers or Prospects directory,
  Contacts directory,
@@ -66,6 +59,6 @@ Description: Web based software to manage a company or foundation
  Wizards to export and import data,
  LDAP connectivity,
  PDF exports,
- And a lot more modules...
+ And a lot of more modules...
  .
- You can also add external modules from third parties or develop yours.
+ You can also add third parties external modules or develop yours.

build/debian/copyright

@@ -61,7 +61,7 @@ License: GPL-3+
 Files: htdocs/includes/adodbtime/*
 Copyright: 2003-2005, John Lim
            unknown, jackbbs
-License: BSD-3-Clause
+License: BSD
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:
@@ -272,7 +272,7 @@ Comment:
 
 Files: htdocs/includes/jquery/plugins/flot/*
 Copyright: Flot team
-License: Public-Domain
+License: Public Domain
  This work is not subject to copyright in any jurisdiction
 Comment:
  Those files are not shipped in the binary package because we configure

build/debian/dolibarr.install

@@ -1,13 +1,12 @@
-debian/dolibarr.desktop usr/share/applications/
-debian/dolibarr.xpm usr/share/pixmaps/
-debian/apache/.htaccess var/lib/dolibarr/documents/
-debian/apache/dolibarr.conf etc/apache2/conf-available/
-debian/lighttpd/50-dolibarr.conf etc/lighttpd/conf-available/
-debian/install.forced.php.install etc/dolibarr/
-htdocs usr/share/dolibarr/
-scripts usr/share/dolibarr/
-changelog usr/share/doc/dolibarr/
-README usr/share/doc/dolibarr/
-doc/install usr/share/doc/dolibarr/
-doc/user usr/share/doc/dolibarr/
-doc/index.html usr/share/doc/dolibarr/
+debian/dolibarr.desktop usr/share/applications
+debian/dolibarr.xpm usr/share/pixmaps
+README usr/share/doc/dolibarr
+doc/install usr/share/doc/dolibarr
+doc/user usr/share/doc/dolibarr
+doc/index.html usr/share/doc/dolibarr
+build/debian/apache.conf etc/dolibarr
+build/debian/lighttpd.conf etc/dolibarr
+build usr/share/dolibarr
+dev usr/share/dolibarr
+htdocs usr/share/dolibarr
+scripts usr/share/dolibarr

build/debian/dolibarr.lintian-overrides

@@ -1,7 +1 @@
-# We want a www-data group-writable /var/lib/dolibarr/documents/
-dolibarr: non-standard-dir-perm var/lib/dolibarr/documents/ 2775 != 0755
-# We depend on xdg-utils providing xdg-open and we use that to open an URL
-dolibarr: desktop-command-not-in-package usr/share/applications/dolibarr.desktop xdg-open
-# We use <IfVersion> to include the correct configuration for each apache version
-dolibarr: apache2-deprecated-auth-config Order
-dolibarr: apache2-deprecated-auth-config Allow
+# No overrided lintian rules is this version.

build/debian/dolibarr.postinst

@@ -13,52 +13,27 @@ set -e
 #          <conflicting-package> <version>
 # for details, see /usr/share/doc/packaging-manual/
 
-if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
-	# Needs to be run outside of functions to have access to parameters
-	. /usr/share/apache2/apache2-maintscript-helper
-fi
 
-setup_empty_conf() {
-	echo Create empty file $config		
-    mkdir -p /etc/dolibarr
-    touch /etc/dolibarr/conf.php
-    chown root:www-data /etc/dolibarr/conf.php
-    chmod 664 /etc/dolibarr/conf.php
-}
 
-is_new_upstream_version() {
-    # $1 can be empty (not installed) and will result in a true value
-    # for the check
-    old_version=$(echo "$1" | sed -e 's/-[^-]*$//' -e 's/^[0-9]*://')
-    new_version=$(dpkg-query -f '${Version}' -W dolibarr | \
-		  sed -e 's/-[^-]*$//' -e 's/^[0-9]*://')
-    test "$old_version" != "$new_version"
-}
 
-enable_install_upgrade_wizard() {
-	echo Enable install wizard by removing install.lock file if present
-    rm -f /var/lib/dolibarr/documents/install.lock
-}
-
-apache_install() {
-	webserver=$1
-	if which a2enconf >/dev/null 2>&1 ;then
-		# a2enconf exists for ubuntu only
-		a2enconf dolibarr
-	else 
-		if [ -d /etc/$webserver/conf.d ] && [ ! -e /etc/$webserver/conf.d/dolibarr.conf ]; then
-			echo "Add link for Apache config file"
-			ln -s /etc/$webserver/conf-available/dolibarr.conf /etc/$webserver/conf.d/dolibarr.conf
+lighttpd_install() {
+	if [ ! -f /etc/lighttpd/conf-available/50-dolibarr.conf ] ; then
+		if which lighty-enable-mod >/dev/null 2>&1 ; then
+			echo "Add link for Lighttpd config file"
+			ln -fs /etc/dolibarr/lighttpd.conf /etc/lighttpd/conf-available/50-dolibarr.conf
+			# We enabled it
+			lighty-enable-mod dolibarr fastcgi-php
+		else
+			echo "Lighttpd not installed, skipping"
 		fi
 	fi
 }
 
-lighttpd_install() {
-	if which lighty-enable-mod >/dev/null 2>&1 ; then
-		echo "Enable lighttpd link for dolibarr config file"
-		lighty-enable-mod dolibarr fastcgi-php
-	else
-		echo "Lighttpd not installed, skipping"
+apache_install() {
+	webserver=$1
+	if [ -d /etc/$webserver/conf.d ] && [ ! -e /etc/$webserver/conf.d/dolibarr.conf ]; then
+		echo "Add link for Apache config file"
+		ln -fs /etc/dolibarr/apache.conf /etc/$webserver/conf.d/dolibarr.conf
 	fi
 }
 
@@ -74,40 +49,24 @@ echo Run the dolibarr postinst script
 
 # Define vars
 docdir='/var/lib/dolibarr/documents'
-installfileorig="/etc/dolibarr/install.forced.php.install"
+installfileorig="/usr/share/dolibarr/build/debian/install.forced.php.install"
 installconfig="/etc/dolibarr/install.forced.php"
 config="/etc/dolibarr/conf.php"
 
 
 case "$1" in
 	configure)
-		if [ -z "$2" ]; then
-			echo First install
-		    #setup_empty_conf
-		else
-			echo This is not a first install
-		fi
-
-		# Apache 2 setup
-		if which a2enmod >/dev/null 2>&1 ;then
-			a2enmod alias
-		fi
-		
-		apache_install
-		lighttpd_install
-		
+	
 		# Remove lock file
-		if is_new_upstream_version "$2"; then
-		    enable_install_upgrade_wizard
-		fi
-				
+		rm -f $docdir/install.lock
+
         # Create document directory for uploaded data files
         mkdir -p $docdir
         chown -R www-data:www-data $docdir
         chmod -R 775 $docdir
         chmod -R g+s $docdir
 
-		# Copy install config file (with matching Debian values) into target directory
+		# Copy install config file (with matching Debian) values into target directory
 		superuserlogin=''
 		superuserpassword=''
 		if [ -f /etc/mysql/debian.cnf ] ; then
@@ -128,22 +87,25 @@ case "$1" in
 		if [ ! -s $config ] || ! grep -q "File generated by" $config
 		then
 			# Create an empty conf.php with permission to web server
-			setup_empty_conf
+			echo Create empty file $config		
+			touch $config
+	    	chmod -R 660 $config
+			chown -R root:www-data $config
 		else
 			# 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
-			##grep -q -c "dolibarr_lib_PHPEXCEL_PATH" $config || echo "<?php \$dolibarr_lib_PHPEXCEL_PATH=''; ?>" >> $config
-			##grep -q -c "dolibarr_lib_TCPDF_PATH" $config    || echo "<?php \$dolibarr_lib_TCPDF_PATH=''; ?>" >> $config
-			#grep -q -c "dolibarr_js_CKEDITOR" $config       || [ ! -d "/usr/share/javascript/ckeditor" ]  || echo "<?php \$dolibarr_js_CKEDITOR='/javascript/ckeditor'; ?>" >> $config
-			#grep -q -c "dolibarr_js_JQUERY" $config         || [ ! -d "/usr/share/javascript/jquery" ]    || echo "<?php \$dolibarr_js_JQUERY='/javascript/jquery'; ?>" >> $config
-			#grep -q -c "dolibarr_js_JQUERY_UI" $config      || [ ! -d "/usr/share/javascript/jquery-ui" ] || echo "<?php \$dolibarr_js_JQUERY_UI='/javascript/jquery-ui'; ?>" >> $config
-			#grep -q -c "dolibarr_js_JQUERY_FLOT" $config    || [ ! -d "/usr/share/javascript/flot" ]      || echo "<?php \$dolibarr_js_JQUERY_FLOT='/javascript/flot'; ?>" >> $config
-			#grep -q -c "dolibarr_font_DOL_DEFAULT_TTF_BOLD" $config || echo "<?php \$dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf'; ?>" >> $config			
+			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
+			#grep -q -c "dolibarr_lib_PHPEXCEL_PATH" $config || echo "<?php \$dolibarr_lib_PHPEXCEL_PATH=''; ?>" >> $config
+			#grep -q -c "dolibarr_lib_TCPDF_PATH" $config    || echo "<?php \$dolibarr_lib_TCPDF_PATH=''; ?>" >> $config
+			grep -q -c "dolibarr_js_CKEDITOR" $config       || [ ! -d "/usr/share/javascript/ckeditor" ]  || echo "<?php \$dolibarr_js_CKEDITOR='/javascript/ckeditor'; ?>" >> $config
+			grep -q -c "dolibarr_js_JQUERY" $config         || [ ! -d "/usr/share/javascript/jquery" ]    || echo "<?php \$dolibarr_js_JQUERY='/javascript/jquery'; ?>" >> $config
+			grep -q -c "dolibarr_js_JQUERY_UI" $config      || [ ! -d "/usr/share/javascript/jquery-ui" ] || echo "<?php \$dolibarr_js_JQUERY_UI='/javascript/jquery-ui'; ?>" >> $config
+			grep -q -c "dolibarr_js_JQUERY_FLOT" $config    || [ ! -d "/usr/share/javascript/flot" ]      || echo "<?php \$dolibarr_js_JQUERY_FLOT='/javascript/flot'; ?>" >> $config
+			grep -q -c "dolibarr_font_DOL_DEFAULT_TTF_BOLD" $config || echo "<?php \$dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf'; ?>" >> $config			
 		fi
 	
 		db_get dolibarr/reconfigure-webserver

build/debian/dolibarr.postrm

@@ -177,19 +177,18 @@ case "$1" in
 			    passopt="--password='"`echo "$dbadmpass" | sed -e "s/'/'"'"'"'"'"'"'/g"`"'"
 			fi
 			mysqlcmd="mysql $hostopt $passopt -u $dbadmin"
-			mysqlcmdnopass="mysql $hostopt -u $dbadmin"
-			
+
 		    # Now run the drop user
 			if eval $mysqlcmd -f -e "\"DROP USER '$dbuser'@'localhost';\"" ; then
 				echo postrm Database login $dbuser@localhost removed
 			else
-			    error="Unable to run $mysqlcmdnopass -f -e \"DROP USER '$dbuser'@'localhost';\""
+			    error="Unable to run $mysqlcmd -f -e \"DROP USER '$dbuser'@'localhost';\""
 				echo postrm $error
 			fi
 			if eval $mysqlcmd -f -e "\"DROP USER '$dbuser'@'%';\"" ; then
 				echo postrm Database login $dbuser@% removed
 			else
-			    error="Unable to run $mysqlcmdnopass -f -e \"DROP USER '$dbuser'@'%';\""
+			    error="Unable to run $mysqlcmd -f -e \"DROP USER '$dbuser'@'%';\""
 				echo postrm $error
 			fi
 

build/debian/get-orig-source.sh

@@ -8,20 +8,16 @@ echo "tmpdir = $tmpdir"
 if [ -n "$1" ]; then
     uscan_opts="--download-version=$1"
 fi
-#uscan --noconf --force-download --no-symlink --verbose --destdir=$tmpdir $uscan_opts
+uscan --noconf --force-download --no-symlink --verbose --destdir=$tmpdir $uscan_opts
 
 cd $tmpdir
 
-# Other method to download (comment uscan if you use this)
-wget http://www.dolibarr.org/files/stable/standard/dolibarr-3.5.4.tgz
-
-# Rename file to add +dfsg
 tgzfile=$(echo *.tgz)
 version=$(echo "$tgzfile" | perl -pi -e 's/^dolibarr-//; s/\.tgz$//; s/_/./g; s/\+nmu1//; ')
 
 cd - >/dev/null
 
 mv $tmpdir/dolibarr-${version}.tgz ../
-echo "File ../dolibarr-${version}.tgz is ready for git-import-orig"
+echo "File ../dolibarr-${version}.tgz is ready for git-import"
 
 rm -rf $tmpdir

build/debian/install.forced.php.install

@@ -27,20 +27,20 @@ $force_install_lockinstall='444';
 
 // Value to overwrite path to use shared libraries/fonts instead of embedded one.
 // If we enable/disable libraries declaration during install, we must also check they are 
-// - 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';
-//$force_dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip';
-//$force_dolibarr_lib_PHPEXCEL_PATH='';	// Use '' or 'disabled'
-//$force_dolibarr_js_CKEDITOR='/javascript/ckeditor';	// Use '/javascript/ckeditor' or 'disabled'
-//$force_dolibarr_js_JQUERY='/javascript/jquery';
-//$force_dolibarr_js_JQUERY_UI='/javascript/jquery-ui';
-//$force_dolibarr_js_JQUERY_FLOT='/javascript/flot';
-//$force_dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf';
+// not removed from package (see in rules file),
+// declared into dependencies (see 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';
+$force_dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip';
+$force_dolibarr_lib_PHPEXCEL_PATH='';
+$force_dolibarr_js_CKEDITOR='/javascript/ckeditor';
+$force_dolibarr_js_JQUERY='/javascript/jquery';
+$force_dolibarr_js_JQUERY_UI='/javascript/jquery-ui';
+$force_dolibarr_js_JQUERY_FLOT='/javascript/flot';
+$force_dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf';
 
 ?>

build/debian/patches/00list

@@ -0,0 +1 @@
+install.dpatch

build/debian/patches/install.dpatch

@@ -1,17 +1,17 @@
-Description: Enable /etc/dolibarr/conf.php so that we use packaged libraries
- Update some PHP include files to refer to /etc/dolibarr/conf.php
- instead of the in-tree conf/conf.php.
- .
- /etc/dolibarr/conf.php configures Dolibarr to use packaged libraries
- instead of the embedded ones.
-Author: Laurent Destailleur <eldy@users.sourceforge.net>
-Forwarded: not-needed
-Last-Update: 2013-07-29
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/htdocs/filefunc.inc.php
-+++ b/htdocs/filefunc.inc.php
-@@ -63,8 +63,8 @@ $conffiletoshowshort = "conf.php";
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## install.patch by <eldy@users.sourceforge.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Updates htdocs/filefunc.inc.php
+## DP: Updates htdocs/install/inc.php
+## DP: Updates htdocs/support/inc.php
+
+@DPATCH@
+
+
+--- old/htdocs/filefunc.inc.php 2011-09-03 02:32:48.666952000 +0200
++++ new/htdocs/filefunc.inc.php	2011-09-03 02:33:00.510952001 +0200
+@@ -63,8 +63,8 @@
  $conffile = "conf/conf.php";
  $conffiletoshow = "htdocs/conf/conf.php";
  // For debian/redhat like systems
@@ -22,9 +22,9 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
  
  // Include configuration
---- a/htdocs/install/inc.php
-+++ b/htdocs/install/inc.php
-@@ -73,8 +73,8 @@ $conffiletoshowshort = "conf.php";
+--- old/htdocs/install/inc.php	2011-09-03 02:33:26.450952000 +0200
++++ new/htdocs/install/inc.php	2011-09-03 02:33:36.286952001 +0200
+@@ -71,8 +71,8 @@
  $conffile = "../conf/conf.php";
  $conffiletoshow = "htdocs/conf/conf.php";
  // For debian/redhat like systems
@@ -35,9 +35,9 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
  
  if (! defined('DONOTLOADCONF') && file_exists($conffile))
---- a/htdocs/support/inc.php
-+++ b/htdocs/support/inc.php
-@@ -69,8 +69,8 @@ $conffiletoshowshort = "conf.php";
+--- old/htdocs/support/inc.php	2011-09-03 02:34:39.606952000 +0200
++++ new/htdocs/support/inc.php	2011-09-03 02:33:59.814952000 +0200
+@@ -69,8 +69,8 @@
  $conffile = "../conf/conf.php";
  $conffiletoshow = "htdocs/conf/conf.php";
  // For debian/redhat like systems

build/debian/patches/series

@@ -1 +0,0 @@
-use-etc-dolibarr-conf.patch

build/debian/po/fr.po

@@ -17,8 +17,8 @@ msgstr ""
 "Report-Msgid-Bugs-To: dolibarr@packages.debian.org\n"
 "POT-Creation-Date: 2013-04-23 12:16+0200\n"
 "PO-Revision-Date: 2011-07-29 22:45+0100\n"
-"Last-Translator: Laurent Destailleur (eldy) <eldy@users.sourceforge.net>\n"
-"Language-Team: Laurent Destailleur (eldy) <eldy@users.sourceforge.net>\n"
+"Last-Translator: Laurent Destailleur <eldy@users.sourceforge.net>\n"
+"Language-Team: Laurent Destailleur <eldy@users.sourceforge.net>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"

build/debian/rules

@@ -7,11 +7,29 @@ export DH_OPTIONS=-v
 #export DH_COMPAT=7    # This is the debhelper compatability version to use, now defined into compat file
 
 
-%:
+# use dpatch
+include /usr/share/dpatch/dpatch.make
+
+
+configure:
+	dh $@
+
+build: patch
+	dh $@
+
+build-arch: patch
+	dh $@
+
+build-indep: patch
+	dh $@
+
+binary:
+	dh $@
+
+binary-indep:
 	dh $@
 	
-override_dh_install:
-	dh_install
+clean:
 	# Delete files
 	rm -f  .buildpath
 	rm -fr .cache
@@ -72,45 +90,35 @@ override_dh_install:
 	rm -fr build/rpm
 	rm -fr build/zip
 	
-	# clean from all PHP embedded libraries (we use package dependencies instead)
-#	rm -fr htdocs/includes/adodbtime
+	# clean from all embedded libraries (we use package dependencies instead)
+	rm -fr htdocs/includes/adodbtime
+	rm -fr htdocs/includes/ckeditor
 #	rm -fr htdocs/includes/fpdfi
-#	rm -fr htdocs/includes/geoip
-#	rm -fr htdocs/includes/nusoap
-#	rm -fr htdocs/includes/odtphp/zip/pclzip
-	# clean from all JS-CSS embedded libraries (we use package dependencies instead)
-#	rm -fr htdocs/includes/ckeditor
-#	rm -fr htdocs/includes/jquery/js
-#	rm -fr htdocs/includes/jquery/css
-#	rm -fr htdocs/includes/jquery/plugins/flot
-	# clean from all embedded fonts (we use package dependencies instead)
-#	rm -fr htdocs/includes/fonts
-
-	# clean from useless files
+	rm -fr htdocs/includes/fonts
+	rm -fr htdocs/includes/geoip
+	rm -fr htdocs/includes/nusoap
+	rm -fr htdocs/includes/odtphp/zip/pclzip
+	rm -fr htdocs/includes/phpmailer
+	rm -fr htdocs/includes/jquery/css
+	rm -fr htdocs/includes/jquery/js
+	rm -fr htdocs/includes/jquery/plugins/flot
+	rm -fr htdocs/includes/jquery/plugins/jstree
+	rm -fr htdocs/includes/jquery/plugins/lightbox
 	rm -fr htdocs/includes/jquery/plugins/multiselect
 	rm -fr htdocs/includes/phpexcel/PHPExcel/Shared/PDF
 	rm -fr htdocs/includes/phpexcel/PHPExcel/Shared/PCLZip
 	rm -fr htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33
 	rm -fr htdocs/includes/tcpdf/fonts/freefont-20100919
 	rm -fr htdocs/includes/tcpdf/fonts/utils
+
 	# clean from files to avoid warning of missing dependencies
 	rm -fr htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree.py
 
-	# Licence files are already included into copyright file.
-	rm -f  htdocs/includes/jquery/plugins/flot/LICENSE.txt
-	rm -f  htdocs/includes/phpexcel/license.txt
+	# Licence files are included into copyright file.
+	rm -fr htdocs/includes/phpexcel/license.txt
 	rm -f  htdocs/includes/tcpdf/LICENSE.TXT
 
-	# Drop unwanted executable permissions
-	find debian/dolibarr/usr/share/dolibarr/htdocs -type f -print0 | \
-	     xargs -0 chmod 644
-	# Add missing executable permissions
-	find debian/dolibarr/usr/share/dolibarr/scripts -type f -name '*.php' -print0 | \
-	     xargs -0 chmod 755
+	dh $@
 
-override_dh_fixperms:
-	dh_fixperms
-	# Give rights to the webserver on the upload directory
-	chown www-data:www-data debian/dolibarr/var/lib/dolibarr/documents
-	chmod 2775 debian/dolibarr/var/lib/dolibarr/documents
-	
+binary-arch:
+	

build/debian/source/format

@@ -1 +1 @@
-3.0 (quilt)
+3.0 (native)

build/doxygen/dolibarr-doxygen-build.pl

@@ -30,25 +30,8 @@ if (! -s $CONFFILE)
     exit 1;   
 }
 
-$SOURCE="../..";
-
-# Get version $MAJOR, $MINOR and $BUILD
-$result = open( IN, "< " . $SOURCE . "/htdocs/filefunc.inc.php" );
-if ( !$result ) { die "Error: Can't open descriptor file " . $SOURCE . "/htdocs/filefunc.inc.php\n"; }
-while (<IN>) {
-	if ( $_ =~ /define\('DOL_VERSION','([\d\.a-z\-]+)'\)/ ) { $PROJVERSION = $1; break; }
-}
-close IN;
-($MAJOR,$MINOR,$BUILD)=split(/\./,$PROJVERSION,3);
-if ($MINOR eq '') { die "Error can't detect version into ".$SOURCE . "/htdocs/filefunc.inc.php"; }
-
-
-$version=$MAJOR.".".$MINOR.".".$BUILD;
-
-
-print "Running doxygen for version ".$version.", please wait...\n";
-print "cat $CONFFILE | sed -e 's/x\.y\.z/".$version."/' | doxygen $OPTIONS - 2>&1\n";
-$result=`cat $CONFFILE | sed -e 's/x\.y\.z/$version/' | doxygen $OPTIONS - 2>&1`;
+print "Running doxygen, please wait...\n";
+$result=`doxygen $OPTIONS $CONFFILE 2>&1`;
 
 print $result;
 

build/doxygen/dolibarr-doxygen.doxyfile

@@ -31,7 +31,7 @@ PROJECT_NAME = dolibarr
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER = x.y.z
+PROJECT_NUMBER = 3.4.1
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.

build/doxygen/doxygen_header.html

@@ -35,15 +35,15 @@ File added into doxygen generated documentation
 				<div class="bannergroupmybanner">
 
 				<div class="banneritemmybanner">
-<script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
-<!-- BAN_728x90_DOXYGEN -->
-<ins class="adsbygoogle"
-     style="display:inline-block;width:728px;height:90px"
-     data-ad-client="ca-pub-1465985984238664"
-     data-ad-slot="4297390217"></ins>
-<script>
-(adsbygoogle = window.adsbygoogle || []).push({});
+<script type="text/javascript"><!--
+google_ad_client = "pub-1071905880519467";
+/* PUBBANDEAUDOLIBARR */
+google_ad_slot = "1421205532";
+google_ad_width = 468;
+google_ad_height = 60;
+//-->
 </script>
+<script type="text/javascript" src="http://pagead2.googlesyndication.com/pagead/show_ads.js"></script>
 				<div class="clr"></div>
 				</div>
 

build/exe/doliwamp/UsedPort.cpp

@@ -10,8 +10,8 @@
 //---------------------------------------------------------------------------
 // 06/09/09	1.0		Laurent Destailleur	   Creation
 //---------------------------------------------------------------------------
-#define PROG	 "UsedPort"
-#define VERSION "1.0"
+#define PROG	"UsedPort"
+#define VERSION	"1.0"
 
 // If GNU GCC CYGWIN: _WIN32 to defined manually,  __GNUC__ is defined,     _MSC_VER not defined
 // If GNU GCC MINGW:  _WIN32 automaticaly defined, __GNUC__ is defined,     _MSC_VER not defined

build/exe/doliwamp/doliwamp.iss

@@ -17,9 +17,9 @@
 ; ----- Change this -----
 AppName=DoliWamp
 ; DoliWamp-x.x.x or DoliWamp-x.x.x-alpha or DoliWamp-x.x.x-beta or DoliWamp-x.x.x-rc or DoliWamp-x.x.x
-AppVerName=DoliWamp-3.5.5
+AppVerName=DoliWamp-3.4.2
 ; DoliWamp-x.x x or DoliWamp-x.x.x-alpha or DoliWamp-x.x.x-beta or DoliWamp-x.x.x-rc or DoliWamp-x.x.x
-OutputBaseFilename=DoliWamp-3.5.5
+OutputBaseFilename=DoliWamp-3.4.2
 ; ----- End of change
 ;OutputManifestFile=build\doliwampbuild.log
 ; Define full path from which all relative path are defined

build/exe/doliwamp/php.ini.install

@@ -603,7 +603,7 @@ upload_max_filesize = 2M
 ;;;;;;;;;;;;;;;;;;
 
 ; Whether to allow the treatment of URLs (like http:// or ftp://) as files.
-allow_url_fopen = On
+allow_url_fopen = Off
 
 ; Whether to allow include/require to open URLs (like http:// or ftp://) as files.
 allow_url_include = Off

build/makepack-dolibarr.pl

@@ -349,9 +349,8 @@ if ($nboftargetok) {
 	    	mkdir "$BUILDROOT/$PROJECT";
 	    	print "Copy $SOURCE into $BUILDROOT/$PROJECT\n";
 	    	$ret=`cp -pr "$SOURCE" "$BUILDROOT/$PROJECT"`;
-
-	    	print "Copy $SOURCE/build/debian/apache/.htaccess into $BUILDROOT/$PROJECT/build/debian/apache/.htaccess\n";
-	    	$ret=`cp -pr "$SOURCE/build/debian/apache/.htaccess" "$BUILDROOT/$PROJECT/build/debian/apache/.htaccess"`;
+	    	#print "Copy $SOURCE/build/debian/apache/.htaccess into $BUILDROOT/$PROJECT/build/debian/apache/.htaccess\n";
+	    	#$ret=`cp -pr "$SOURCE/build/debian/apache/.htaccess" "$BUILDROOT/$PROJECT/build/debian/apache/.htaccess"`;
 	    }
 	    print "Clean $BUILDROOT\n";
 	    $ret=`rm -f  $BUILDROOT/$PROJECT/.buildpath`;
@@ -434,7 +433,6 @@ if ($nboftargetok) {
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/nltechno*`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/pos*`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/public/test`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/teclib*`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/test`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/Thumbs.db $BUILDROOT/$PROJECT/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/*/Thumbs.db`;
 	    $ret=`rm -f  $BUILDROOT/$PROJECT/.cvsignore $BUILDROOT/$PROJECT/*/.cvsignore $BUILDROOT/$PROJECT/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.cvsignore`;
@@ -443,8 +441,8 @@ if ($nboftargetok) {
         $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree.pl`;    # Avoid errors into rpmlint
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/template`;  # Package not valid for most linux distributions (errors reported into compile.js). Package should be embed by modules to avoid problems.
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpmailer`;                # Package not valid for most linux distributions (errors reported into file LICENSE). Package should be embed by modules to avoid problems.
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/adapters`;		# Keep this removal in case we embed libraries
-        #$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/_source`;		# _source must be kept into tarball
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/_source`;		# Keep this removal in case we embed libraries
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/adapters`;	# Keep this removal in case we embed libraries
    	    
 	    $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/multiselect/MIT-LICENSE.txt`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nusoap/lib/Mail`;
@@ -506,17 +504,15 @@ if ($nboftargetok) {
     		$cmd="cp -pr \"$BUILDROOT/$PROJECT/\" \"$BUILDROOT/$FILENAMETGZ\"";
             $ret=`$cmd`;
 
-		    $ret=`rm -fr $BUILDROOT/$FILENAMETGZ/build/exe`;
-			$ret=`rm -fr $BUILDROOT/$FILENAMETGZ/htdocs/includes/ckeditor/_source`;	# We can't remove it with exclude file, we need it for some tarball packages
-			
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/build/exe`;
+
     		print "Compress $FILENAMETGZ into $FILENAMETGZ.tgz...\n";
-   		    $cmd="tar --exclude-vcs --exclude-from \"$BUILDROOT/$PROJECT/build/tgz/tar_exclude.txt\" --directory \"$BUILDROOT\" --mode=go-w --group=500 --owner=500 -czvf \"$BUILDROOT/$FILENAMETGZ.tgz\" $FILENAMETGZ";
-   		    print "$cmd\n";
+   		    $cmd="tar --exclude-vcs --exclude-from \"$BUILDROOT/$PROJECT/build/tgz/tar_exclude.txt\" --directory \"$BUILDROOT\" --mode=go-w --group=500 --owner=500 -czvf \"$FILENAMETGZ.tgz\" $FILENAMETGZ";
    		    $ret=`$cmd`;
 
     		# Move to final dir
-       		print "Move $BUILDROOT/$FILENAMETGZ.tgz to $NEWDESTI/$FILENAMETGZ.tgz\n";
-       		$ret=`mv "$BUILDROOT/$FILENAMETGZ.tgz" "$NEWDESTI/$FILENAMETGZ.tgz"`;
+       		print "Move $FILENAMETGZ.tgz to $NEWDESTI/$FILENAMETGZ.tgz\n";
+       		$ret=`mv "$FILENAMETGZ.tgz" "$NEWDESTI/$FILENAMETGZ.tgz"`;
     		next;
     	}
 
@@ -535,9 +531,6 @@ if ($nboftargetok) {
     		$cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMEXZ\"";
             $ret=`$cmd`;
 
-		    $ret=`rm -fr $BUILDROOT/$FILENAMEXZ/build/exe`;
-			$ret=`rm -fr $BUILDROOT/$FILENAMEXZ/htdocs/includes/ckeditor/_source`;	# We can't remove it with exclude file, we need it for some tarball packages
-			
     		print "Compress $FILENAMEXZ into $FILENAMEXZ.xz...\n";
  
             print "Go to directory $BUILDROOT\n";
@@ -569,9 +562,6 @@ if ($nboftargetok) {
     		$cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMEZIP\"";
             $ret=`$cmd`;
 
-		    $ret=`rm -fr $BUILDROOT/$FILENAMEZIP/build/exe`;
-			$ret=`rm -fr $BUILDROOT/$FILENAMEZIP/htdocs/includes/ckeditor/_source`;	# We can't remove it with exclude file, we need it for some tarball packages
-
     		print "Compress $FILENAMEZIP into $FILENAMEZIP.zip...\n";
  
             print "Go to directory $BUILDROOT\n";
@@ -697,8 +687,8 @@ if ($nboftargetok) {
 			print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$PROJECT.tmp\n";
 			$cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$PROJECT.tmp\"";
 			$ret=`$cmd`;
-			$cmd="cp -pr \"$BUILDROOT/$PROJECT/build/debian/apache/.htaccess\" \"$BUILDROOT/$PROJECT.tmp/build/debian/apache/.htaccess\"";
-			$ret=`$cmd`;
+			#$cmd="cp -pr \"$BUILDROOT/$PROJECT/build/debian/apache/.htaccess\" \"$BUILDROOT/$PROJECT.tmp/build/debian/apache/.htaccess\"";
+			#$ret=`$cmd`;
 
  			print "Remove other files\n";
             $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/README-FR`;
@@ -758,9 +748,9 @@ if ($nboftargetok) {
             $ret=`cp -fr "$SOURCE/build/debian/patches"        "$BUILDROOT/$PROJECT.tmp/debian"`;
             $ret=`cp -fr "$SOURCE/build/debian/po"             "$BUILDROOT/$PROJECT.tmp/debian"`;
             $ret=`cp -fr "$SOURCE/build/debian/source"         "$BUILDROOT/$PROJECT.tmp/debian"`;
-            $ret=`cp -fr "$SOURCE/build/debian/apache"         "$BUILDROOT/$PROJECT.tmp/debian/apache"`;
-            $ret=`cp -f  "$SOURCE/build/debian/apache/.htaccess" "$BUILDROOT/$PROJECT.tmp/debian/apache"`;
-            $ret=`cp -fr "$SOURCE/build/debian/lighttpd"       "$BUILDROOT/$PROJECT.tmp/debian/lighttpd"`;
+            #$ret=`cp -fr "$SOURCE/build/debian/apache"         "$BUILDROOT/$PROJECT.tmp/debian/apache"`;
+            #$ret=`cp -f  "$SOURCE/build/debian/apache/.htaccess" "$BUILDROOT/$PROJECT.tmp/debian/apache"`;
+            #$ret=`cp -fr "$SOURCE/build/debian/lighttpd"       "$BUILDROOT/$PROJECT.tmp/debian/lighttpd"`;
             # Add files also required to build binary package
             $ret=`cp -f  "$SOURCE/build/debian/dolibarr.config"         "$BUILDROOT/$PROJECT.tmp/debian"`;
             $ret=`cp -f  "$SOURCE/build/debian/dolibarr.postinst"       "$BUILDROOT/$PROJECT.tmp/debian"`;
@@ -958,15 +948,12 @@ if ($nboftargetok) {
     		"$DESTI/standard/$FILENAMETGZ.tgz"=>'Dolibarr ERP-CRM',
     		"$DESTI/standard/$FILENAMETGZ.zip"=>'Dolibarr ERP-CRM'
     	);
-    	use POSIX qw/strftime/;
     	foreach my $file (sort keys %filestoscan)
     	{
     		$found=0;
     		my $filesize = -s $file;
-    		my $filedate = (stat $file)[9];
     		print $file." ".($filesize?"(found)":"(not found)");
     		print ($filesize?" - ".$filesize:"");
-    		print ($filedate?" - ".strftime("%Y-%m-%d %H:%M:%S",localtime($filedate)):"");
     		print "\n";
     	}
 

build/makepack-dolibarrmodule.pl

@@ -2,15 +2,13 @@
 #----------------------------------------------------------------------------
 # \file         build/makepack-dolibarrmodule.pl
 # \brief        Package builder (tgz, zip, rpm, deb, exe)
-# \author       (c)2005-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
+# \author       (c)2005-2006 Laurent Destailleur  <eldy@users.sourceforge.net>
 #----------------------------------------------------------------------------
 
 use Cwd;
-$OWNER="ldestailleur";
-$GROUP="ldestailleur";
 
 
-@LISTETARGET=("ZIP");   # Possible packages
+@LISTETARGET=("TGZ");   # Possible packages
 %REQUIREMENTTARGET=(    # Tool requirement for each package
 "TGZ"=>"tar",
 "ZIP"=>"7z"
@@ -20,8 +18,8 @@ $GROUP="ldestailleur";
 
 
 use vars qw/ $REVISION $VERSION /;
-$REVISION='1.0';
-$VERSION="3.5 (build $REVISION)";
+$REVISION='1.20';
+$VERSION="1.0 (build $REVISION)";
 
 
 
@@ -37,9 +35,9 @@ if ("$^O" =~ /linux/i || (-d "/etc" && -d "/var" && "$^O" !~ /cygwin/i)) { $OS='
 elsif (-d "/etc" && -d "/Users") { $OS='macosx'; $CR=''; }
 elsif ("$^O" =~ /cygwin/i || "$^O" =~ /win32/i) { $OS='windows'; $CR="\r"; }
 if (! $OS) {
-    print "$PROG.$Extension was not able to detect your OS.\n";
+    print "makepack-dolbarrmodule.pl was not able to detect your OS.\n";
 	print "Can't continue.\n";
-	print "$PROG.$Extension aborted.\n";
+	print "makepack-dolibarrmodule.pl aborted.\n";
     sleep 2;
 	exit 1;
 }
@@ -59,7 +57,7 @@ if ($OS =~ /windows/) {
 if (! $TEMP || ! -d $TEMP) {
     print "Error: A temporary directory can not be find.\n";
     print "Check that TEMP or TMP environment variable is set correctly.\n";
-	print "$PROG.$Extension aborted.\n";
+	print "makepack-dolibarrmodule.pl aborted.\n";
     sleep 2;
     exit 2;
 } 
@@ -88,6 +86,18 @@ print "Source directory: $SOURCE\n";
 print "Target directory: $NEWDESTI\n";
 
 
+# Ask and set version $MAJOR, $MINOR and $BUILD
+print "Enter value for version: ";
+$PROJVERSION=<STDIN>;
+chomp($PROJVERSION);
+($MAJOR,$MINOR,$BUILD)=split(/\./,$PROJVERSION,3);
+if ($MINOR eq '')
+{
+    print "Enter value for minor version: ";
+    $MINOR=<STDIN>;
+    chomp($MINOR);
+}
+
 # Ask module
 print "Enter name for your module (mymodule, mywonderfulmondule, ... or 'all') : ";
 $PROJECTINPUT=<STDIN>;
@@ -118,8 +128,6 @@ else
 # Loop on each projects
 foreach my $PROJECT (@PROJECTLIST) {
 	
-	$PROJECTLC=lc($PROJECT);
-	
 	if (! -f "makepack-".$PROJECT.".conf")
 	{
 	    print "Error: can't open conf file makepack-".$PROJECT.".conf\n";
@@ -131,28 +139,9 @@ foreach my $PROJECT (@PROJECTLIST) {
 	    exit 2;
 	}
 	
-	# Get version $MAJOR, $MINOR and $BUILD
-	print "Version detected for module ".$PROJECT.": ";
-	$result=open(IN,"<".$SOURCE."/htdocs/".$PROJECTLC."/core/modules/mod".$PROJECT.".class.php");
-	if (! $result) { die "Error: Can't open descriptor file ".$SOURCE."/htdocs/".$PROJECTLC."/core/modules/mod".$PROJECT.".class.php for reading.\n"; }
-    while(<IN>)
-    {
-    	if ($_ =~ /this->version\s*=\s*'([\d\.]+)'/) { $PROJVERSION=$1; break; }
-    }
-    close IN;
-	print $PROJVERSION."\n";
-
-	($MAJOR,$MINOR,$BUILD)=split(/\./,$PROJVERSION,3);
-	if ($MINOR eq '')
-	{
-	    print "Enter value for minor version for module ".$PROJECT.": ";
-	    $MINOR=<STDIN>;
-	    chomp($MINOR);
-	}
-		
-	$FILENAME="$PROJECTLC";
-	$FILENAMETGZ="module_$PROJECTLC-$MAJOR.$MINOR".($BUILD ne ''?".$BUILD":"");
-	$FILENAMEZIP="module_$PROJECTLC-$MAJOR.$MINOR".($BUILD ne ''?".$BUILD":"");
+	$FILENAME="$PROJECT";
+	$FILENAMETGZ="module_$PROJECT-$MAJOR.$MINOR".($BUILD ne ''?".$BUILD":"");
+	$FILENAMEZIP="module_$PROJECT-$MAJOR.$MINOR".($BUILD ne ''?".$BUILD":"");
 	if (-d "/usr/src/redhat") {
 	    # redhat
 	    $RPMDIR="/usr/src/redhat";
@@ -239,66 +228,54 @@ foreach my $PROJECT (@PROJECTLIST) {
 		    	$ret=`rm -fr "$BUILDROOT"`;
 	
 		    	mkdir "$BUILDROOT";
-		    	mkdir "$BUILDROOT/$PROJECTLC";
+		    	mkdir "$BUILDROOT/$PROJECT";
 		    	
 				$result=open(IN,"<makepack-".$PROJECT.".conf");
 				if (! $result) { die "Error: Can't open conf file makepack-".$PROJECT.".conf for reading.\n"; }
 			    while(<IN>)
 			    {
-			    	$entry=$_;
-			    	
-			    	if ($entry =~ /^#/) { next; }	# Do not process comments
+			    	if ($_ =~ /^#/) { next; }	# Do not process comments
 					
-					$entry =~ s/\n//;
-
-			    	if ($entry =~ /^!(.*)$/)		# Exclude so remove file/dir
+					$_ =~ s/\n//;
+			    	$_ =~ /^(.*)\/[^\/]+/;
+			    	print "Create directory $BUILDROOT/$PROJECT/$1\n";
+			    	$ret=`mkdir -p "$BUILDROOT/$PROJECT/$1"`;
+			    	if ($_ !~ /version\-/)
 			    	{
-			    		print "Remove $BUILDROOT/$PROJECTLC/$1\n";
-			    		$ret=`rm -fr "$BUILDROOT/$PROJECTLC/"$1`;
-		    		    if ($? != 0) { die "Failed to delete a file to exclude declared into makepack-".$PROJECT.".conf file (Fails on line ".$entry.")\n"; }
-		    		    next; 
+			    	    print "Copy $SOURCE/$_ into $BUILDROOT/$PROJECT/$_\n";
+		    		    $ret=`cp -pr "$SOURCE/$_" "$BUILDROOT/$PROJECT/$_"`;
 			    	}
-					
-					$entry =~ /^(.*)\/[^\/]+/;
-			    	print "Create directory $BUILDROOT/$PROJECTLC/$1\n";
-			    	$ret=`mkdir -p "$BUILDROOT/$PROJECTLC/$1"`;
-			    	if ($entry !~ /version\-/)
-			    	{
-			    	    print "Copy $SOURCE/$entry into $BUILDROOT/$PROJECTLC/$entry\n";
-		    		    $ret=`cp -pr "$SOURCE/$entry" "$BUILDROOT/$PROJECTLC/$entry"`;
-		    		    if ($? != 0) { die "Failed to make copy of a file declared into makepack-".$PROJECT.".conf file (Fails on line ".$entry.")\n"; } 
-			    	}
-			    	
 				}	
 				close IN;
 				
 				@timearray=localtime(time());
 				$fulldate=($timearray[5]+1900).'-'.($timearray[4]+1).'-'.$timearray[3].' '.$timearray[2].':'.$timearray[1];
-				open(VF,">$BUILDROOT/$PROJECTLC/build/version-".$PROJECTLC.".txt");
+				open(VF,">$BUILDROOT/$PROJECT/build/version-".$PROJECT.".txt");
 		
-				print "Create version file $BUILDROOT/$PROJECTLC/build/version-".$PROJECTLC.".txt with date ".$fulldate."\n";
-				$ret=`mkdir -p "$BUILDROOT/$PROJECTLC/build"`;
+				print "Create version file $BUILDROOT/$PROJECT/build/version-".$PROJECT.".txt with date ".$fulldate."\n";
+				$ret=`mkdir -p "$BUILDROOT/$PROJECT/build"`;
 				print VF "Version: ".$MAJOR.".".$MINOR.($BUILD ne ''?".$BUILD":"")."\n";
 				print VF "Build  : ".$fulldate."\n";
 				close VF;
 		    }
 		    print "Clean $BUILDROOT\n";
-		    $ret=`rm -fr $BUILDROOT/$PROJECTLC/.cache`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECTLC/.project`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECTLC/.settings`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECTLC/index.php`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECTLC/build/html`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECTLC/documents`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECTLC/document`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECTLC/htdocs/conf/conf.php.mysql`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECTLC/htdocs/conf/conf.php.old`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECTLC/htdocs/conf/conf.php.postgres`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECTLC/htdocs/conf/conf*sav*`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECTLC/htdocs/custom`;
-	        $ret=`rm -fr $BUILDROOT/$PROJECTLC/htdocs/custom2`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECTLC/test`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECTLC/Thumbs.db $BUILDROOT/$PROJECTLC/*/Thumbs.db $BUILDROOT/$PROJECTLC/*/*/Thumbs.db $BUILDROOT/$PROJECTLC/*/*/*/Thumbs.db $BUILDROOT/$PROJECTLC/*/*/*/*/Thumbs.db`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECTLC/CVS* $BUILDROOT/$PROJECTLC/*/CVS* $BUILDROOT/$PROJECTLC/*/*/CVS* $BUILDROOT/$PROJECTLC/*/*/*/CVS* $BUILDROOT/$PROJECTLC/*/*/*/*/CVS* $BUILDROOT/$PROJECTLC/*/*/*/*/*/CVS*`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/.cache`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/.project`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/.settings`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/index.php`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/build/html`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/documents`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/document`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.mysql`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.old`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.postgres`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf*sav*`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom`;
+	        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom2`;
+	        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/theme/bureau2crea`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/test`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/Thumbs.db $BUILDROOT/$PROJECT/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/*/Thumbs.db`;
+		    $ret=`rm -fr $BUILDROOT/$PROJECT/CVS* $BUILDROOT/$PROJECT/*/CVS* $BUILDROOT/$PROJECT/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/CVS*`;
 		}    
 	    
 	    # Build package for each target
@@ -336,9 +313,9 @@ foreach my $PROJECT (@PROJECTLIST) {
 	    		unlink "$NEWDESTI/$FILENAMEZIP.zip";
 	    		print "Compress $FILENAMEZIP into $FILENAMEZIP.zip...\n";
 	
-	            print "Go to directory $BUILDROOT/$PROJECTLC\n";
+	            print "Go to directory $BUILDROOT/$PROJECT\n";
 	     		$olddir=getcwd();
-	     		chdir("$BUILDROOT/$PROJECTLC");
+	     		chdir("$BUILDROOT/$PROJECT");
 	    		$cmd= "7z a -r -tzip -mx $BUILDROOT/$FILENAMEZIP.zip *";
 				print $cmd."\n";
 				$ret= `$cmd`;
@@ -346,7 +323,6 @@ foreach my $PROJECT (@PROJECTLIST) {
 	
 	            print "Move $FILENAMEZIP.zip to $NEWDESTI/$FILENAMEZIP.zip\n";
 	            $ret=`mv "$BUILDROOT/$FILENAMEZIP.zip" "$NEWDESTI/$FILENAMEZIP.zip"`;
-	            $ret=`chown $OWNER.$GROUP "$NEWDESTI/$FILENAMEZIP.zip"`;
 	    		next;
 	    	}
 	    

build/makepack-howto.txt

@@ -10,17 +10,18 @@ beta version of Dolibarr, step by step.
 - Check all files are commited.
 - Update version/info in /ChangeLog
 - Update version number with x.y.z-w in htdocs/filefunc.inc.php
+- Update version number with x.y.z-w in build/makepack-dolibarr.pl
 - Update version number with x.y.z-w in build/debian/changelog
 - Update version number with x.y.z-w in build/exe/doliwamp/doliwamp.iss
 - Update version number with x.y.z-w in build/rpm/*.spec
-- Update version number with x.y     in build/doxygen/dolibarr-doxygen.doxyfile
+- Update version number with x.y.z   in build/doxygen/dolibarr-doxygen.doxyfile
+- Update version number with x.y.z   in build/perl/virtualmin/dolibarr.pl
 - Commit all changes.
 - Add a Tag (x.y.betaz_YYYYMMDD) and push it: git push --tags
 - Create a branch (x.y).
 
 - Run makepack-dolibarr.pl to generate all packages.
-- Move build files into www.dolibarr.org web site
-  (/home/dolibarr/wwwroot/files/lastbuild).
+- Move build files into www.dolibarr.org web site (/home/dolibarr/wwwroot/files).
 
 - Post a news on dolibarr.org/dolibarr.fr
 - Send mail on mailings-list
@@ -33,20 +34,21 @@ complete release of Dolibarr, step by step.
 - Check all files are commited.
 - Update version/info in ChangeLog
 - Update version number with x.y.z in htdocs/filefunc.inc.php
+- Update version number with x.y.z in build/makepack-dolibarr.pl
 - Update version number with x.y.z in build/debian/changelog
 - Update version number with x.y.z in build/exe/doliwamp/doliwamp.iss
 - Update version number with x.y.z in build/rpm/*.spec
+- Update PAD files.
 - Commit all changes.
 - Add a Tag (x.y.z)
 
 - Build Dolibarr and DoliWamp packages with makepack-dolibarr.pl
 - Check content of built packages.
-- Move build files into www.dolibarr.org web site
-  (/home/dolibarr/wwwroot/files/stable).
-- Run makepack-dolibarr.pl again with option to publish files on 
-  sourceforge.
-- Edit symbolic links in directory "/home/dolibarr/wwwroot/files/stable/xxx"
-  on server to point to new files (used by some web sites).
+- Move build files (tgz+exe+deb+rpm...), ChangeLog and PAD files
+  into www.dolibarr.org web site (/home/dolibarr/wwwroot/files).
+- Edit symbolic links in directory "/home/dolibarr/wwwroot/files" on server to
+  point to new files (used by PAD descriptor).
+- Upload files dolibarr.*.tgz and doliwamp.*.exe on sourceforge.
 
 - Send mail on mailings-list
 - Send news on OpenSource web sites (if major beta or release)

build/obs/README

@@ -23,23 +23,13 @@ To submit a snapshot for building, we should have a service file with content
   <service name="download_src_package">
     <param name="host">www.dolibarr.org</param>
     <param name="protocol">http</param>
-    <param name="path">/files/stable/package_rpm_generic/dolibarr-x.y.z-3.src.rpm</param>
+    <param name="path">/files/stable/package_rpm_generic/dolibarr-3.3.2-3.src.rpm</param>
   </service>
 </services>
 
-How to have such a service file created automatically ?
-Click on "Add file", then select mode "Upload From: Remote URL"
-Enter the Remote URL that should looks like this: http://www.dolibarr.org/files/stable/package_rpm_generic/dolibarr-x.y.v-3.src.rpm
+How to have such a service ?
+Try to make "Add file" and select Remote URL and enter http://www.dolibarr.org/files/stable/package_rpm_generic/dolibarr-3.3.2-3.src.rpm
 
 Then add into advanded - attributes
-OBS:Screenshots http://www.dolibarr.org/images/dolibarr_screenshot1.png
-OBS:QualityCategory Testing
-
-
-# Move project into official directory
-- Enter a bug to ask to be a maintener of a category or to add a new one.
-For example: https://bugzilla.novell.com/show_bug.cgi?id=848083 to be a maintener of category
-https://build.opensuse.org/project/show/Application:ERP
-- Once done, go into project, category, subproject and enter a subproject for your application.
-Fo example: Dolibarr
-- Then go onto project into your home and ask a publish to the category/you project your created. 
+OBS:Screenshots http://www.dolibarr.org/images/phocagallery/dolibarr_screenshot1.png
+OBS:QualityCategory Testing

build/pad/DoliWamp.pml

@@ -4,10 +4,10 @@
 	<CompanyName />
 	<Program_Info>
 		<Program_Name>DoliWamp</Program_Name>
-		<Program_Version>3.5.0</Program_Version>
-		<Program_Release_Month>01</Program_Release_Month>
-		<Program_Release_Day>01</Program_Release_Day>
-		<Program_Release_Year>2014</Program_Release_Year>
+		<Program_Version>3.3.0</Program_Version>
+		<Program_Release_Month>08</Program_Release_Month>
+		<Program_Release_Day>10</Program_Release_Day>
+		<Program_Release_Year>2012</Program_Release_Year>
 		<Program_Cost_Dollars />
 		<Program_Cost_Other_Code />
 		<Program_Cost_Other />

build/pad/Dolibarr developpers.cml

@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<PADGEN_CML>
-	<AppVerInfo>PADGen 3.1.1.47</AppVerInfo>
-	<Company_Info>
-		<Company_Name>Dolibarr team</Company_Name>
-		<Address_1>11 rue raymond Queneau</Address_1>
-		<Address_2 />
-		<City_Town>Rueil Malmaison</City_Town>
-		<State_Province />
-		<Zip_Postal_Code>92500</Zip_Postal_Code>
-		<Country>FRANCE</Country>
-		<Company_WebSite_URL>http://www.dolibarr.org</Company_WebSite_URL>
-		<Contact_Info>
-			<Author_First_Name>Dolibarr team</Author_First_Name>
-			<Author_Last_Name>Dolibarr team</Author_Last_Name>
-			<Author_Email>dolibarr-dev@nongnu.org</Author_Email>
-			<Contact_First_Name>Dolibarr team</Contact_First_Name>
-			<Contact_Last_Name>Dolibarr team</Contact_Last_Name>
-			<Contact_Email>dolibarr-dev@nongnu.org</Contact_Email>
-		</Contact_Info>
-		<Support_Info>
-			<Sales_Email>dolibarr-dev@nongnu.org</Sales_Email>
-			<Support_Email>dolibarr-dev@nongnu.org</Support_Email>
-			<General_Email>dolibarr-dev@nongnu.org</General_Email>
-			<Sales_Phone />
-			<Support_Phone />
-			<General_Phone />
-			<Fax_Phone />
-		</Support_Info>
-	</Company_Info>
-</PADGEN_CML>
+<?xml version="1.0" encoding="UTF-8" ?>
+<PADGEN_CML>
+	<AppVerInfo>PADGen 3.1.1.47</AppVerInfo>
+	<Company_Info>
+		<Company_Name>Dolibarr team</Company_Name>
+		<Address_1>11 rue raymond Queneau</Address_1>
+		<Address_2 />
+		<City_Town>Rueil Malmaison</City_Town>
+		<State_Province />
+		<Zip_Postal_Code>92500</Zip_Postal_Code>
+		<Country>FRANCE</Country>
+		<Company_WebSite_URL>http://www.dolibarr.org</Company_WebSite_URL>
+		<Contact_Info>
+			<Author_First_Name>Dolibarr team</Author_First_Name>
+			<Author_Last_Name>Dolibarr team</Author_Last_Name>
+			<Author_Email>dolibarr-dev@nongnu.org</Author_Email>
+			<Contact_First_Name>Dolibarr team</Contact_First_Name>
+			<Contact_Last_Name>Dolibarr team</Contact_Last_Name>
+			<Contact_Email>dolibarr-dev@nongnu.org</Contact_Email>
+		</Contact_Info>
+		<Support_Info>
+			<Sales_Email>dolibarr-dev@nongnu.org</Sales_Email>
+			<Support_Email>dolibarr-dev@nongnu.org</Support_Email>
+			<General_Email>dolibarr-dev@nongnu.org</General_Email>
+			<Sales_Phone />
+			<Support_Phone />
+			<General_Phone />
+			<Fax_Phone />
+		</Support_Info>
+	</Company_Info>
+</PADGEN_CML>

build/pad/Dolibarr.pml

@@ -4,10 +4,10 @@
 	<CompanyName />
 	<Program_Info>
 		<Program_Name>Dolibarr</Program_Name>
-		<Program_Version>3.5.0</Program_Version>
-		<Program_Release_Month>01</Program_Release_Month>
-		<Program_Release_Day>01</Program_Release_Day>
-		<Program_Release_Year>2014</Program_Release_Year>
+		<Program_Version>3.3.0</Program_Version>
+		<Program_Release_Month>08</Program_Release_Month>
+		<Program_Release_Day>10</Program_Release_Day>
+		<Program_Release_Year>2012</Program_Release_Year>
 		<Program_Cost_Dollars />
 		<Program_Cost_Other_Code />
 		<Program_Cost_Other />

build/pad/NLTechno.cml

@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<PADGEN_CML>
-	<AppVerInfo>PADGen 3.1.1.47</AppVerInfo>
-	<Company_Info>
-		<Company_Name>NLTechno</Company_Name>
-		<Address_1>11 Rue raymond Queneau</Address_1>
-		<Address_2 />
-		<City_Town>Rueil Malmaison</City_Town>
-		<State_Province />
-		<Zip_Postal_Code>92500</Zip_Postal_Code>
-		<Country>FRANCE</Country>
-		<Company_WebSite_URL>http://www.nltechno.com</Company_WebSite_URL>
-		<Contact_Info>
-			<Author_First_Name>NLTechno</Author_First_Name>
-			<Author_Last_Name>NLTechno</Author_Last_Name>
-			<Author_Email>dolibarr@nltechno.com</Author_Email>
-			<Contact_First_Name>NLTechno</Contact_First_Name>
-			<Contact_Last_Name>NLTechno</Contact_Last_Name>
-			<Contact_Email>dolibarr@nltechno.com</Contact_Email>
-		</Contact_Info>
-		<Support_Info>
-			<Sales_Email>dolibarr@nltechno.com</Sales_Email>
-			<Support_Email>dolibarr@nltechno.com</Support_Email>
-			<General_Email>dolibarr@nltechno.com</General_Email>
-			<Sales_Phone />
-			<Support_Phone />
-			<General_Phone />
-			<Fax_Phone />
-		</Support_Info>
-	</Company_Info>
-</PADGEN_CML>
+<?xml version="1.0" encoding="UTF-8" ?>
+<PADGEN_CML>
+	<AppVerInfo>PADGen 3.1.1.47</AppVerInfo>
+	<Company_Info>
+		<Company_Name>NLTechno</Company_Name>
+		<Address_1>11 Rue raymond Queneau</Address_1>
+		<Address_2 />
+		<City_Town>Rueil Malmaison</City_Town>
+		<State_Province />
+		<Zip_Postal_Code>92500</Zip_Postal_Code>
+		<Country>FRANCE</Country>
+		<Company_WebSite_URL>http://www.nltechno.com</Company_WebSite_URL>
+		<Contact_Info>
+			<Author_First_Name>NLTechno</Author_First_Name>
+			<Author_Last_Name>NLTechno</Author_Last_Name>
+			<Author_Email>dolibarr@nltechno.com</Author_Email>
+			<Contact_First_Name>NLTechno</Contact_First_Name>
+			<Contact_Last_Name>NLTechno</Contact_Last_Name>
+			<Contact_Email>dolibarr@nltechno.com</Contact_Email>
+		</Contact_Info>
+		<Support_Info>
+			<Sales_Email>dolibarr@nltechno.com</Sales_Email>
+			<Support_Email>dolibarr@nltechno.com</Support_Email>
+			<General_Email>dolibarr@nltechno.com</General_Email>
+			<Sales_Phone />
+			<Support_Phone />
+			<General_Phone />
+			<Fax_Phone />
+		</Support_Info>
+	</Company_Info>
+</PADGEN_CML>

build/pad/pad_dolibarr.xml

@@ -34,7 +34,7 @@
 	</Company_Info>
 	<Program_Info>
 		<Program_Name>Dolibarr</Program_Name>
-		<Program_Version>3.5</Program_Version>
+		<Program_Version>3.4</Program_Version>
 		<Program_Release_Month>01</Program_Release_Month>
 		<Program_Release_Day>01</Program_Release_Day>
 		<Program_Release_Year>2014</Program_Release_Year>

build/pad/pad_doliwamp.xml

@@ -17,15 +17,15 @@
 		<Contact_Info>
 			<Author_First_Name>NLTechno</Author_First_Name>
 			<Author_Last_Name>NLTechno</Author_Last_Name>
-			<Author_Email>contact@nltechno.com</Author_Email>
+			<Author_Email>dolibarr@nltechno.com</Author_Email>
 			<Contact_First_Name>NLTechno</Contact_First_Name>
 			<Contact_Last_Name>NLTechno</Contact_Last_Name>
-			<Contact_Email>contact@nltechno.com</Contact_Email>
+			<Contact_Email>dolibarr@nltechno.com</Contact_Email>
 		</Contact_Info>
 		<Support_Info>
-			<Sales_Email>support@nltechno.com</Sales_Email>
-			<Support_Email>support@nltechno.com</Support_Email>
-			<General_Email>support@nltechno.com</General_Email>
+			<Sales_Email>dolibarr@nltechno.com</Sales_Email>
+			<Support_Email>dolibarr@nltechno.com</Support_Email>
+			<General_Email>dolibarr@nltechno.com</General_Email>
 			<Sales_Phone />
 			<Support_Phone />
 			<General_Phone />
@@ -34,7 +34,7 @@
 	</Company_Info>
 	<Program_Info>
 		<Program_Name>DoliWamp</Program_Name>
-		<Program_Version>3.5</Program_Version>
+		<Program_Version>3.4</Program_Version>
 		<Program_Release_Month>01</Program_Release_Month>
 		<Program_Release_Day>01</Program_Release_Day>
 		<Program_Release_Year>2014</Program_Release_Year>

build/perl/virtualmin/dolibarr.pl

@@ -30,7 +30,7 @@ return "Regis Houssin";
 # script_dolibarr_versions()
 sub script_dolibarr_versions
 {
-return ( "3.5.3", "3.5.2", "3.5.1", "3.5.0", "3.4.1", "3.4.0", "3.3.3", "3.3.2", "3.3.1", "3.3.0", "3.2.1", "3.1.1" );
+return ( "3.4.1", "3.4.0", "3.3.3", "3.3.2", "3.3.1", "3.3.0", "3.2.1", "3.1.1" );
 }
 
 sub script_dolibarr_category

build/rpm/README

@@ -19,8 +19,8 @@ with format RPM (for Redhat, OpenSuse, Mandriva, ...).
 #
 # On Fedora
 # rpm -i --test dolibarr-...rpm     To list dependencies of RPM   
-# yum -v install dolibarr-...rpm       To install package and dependencies   
-# yum -v erase dolibarr                To remove package
+# yum install dolibarr-...rpm       To install package and dependencies   
+# yum erase dolibarr                To remove package
 # chcon -R -h -t httpd_sys_script_rw_t /file					To add temporary context rw for httpd on /file    
 # semanage fcontext -a -t httpd_sys_script_rw_t "/dir/(.*)?" 	To add persistent context rw for httpd on /dir (this add file_contexts.local)
 # restorecon -R -v /file			Restore values into files (cancel chcon, validate semanage)    

build/rpm/dolibarr_fedora.spec

@@ -103,7 +103,6 @@ cui hai bisogno ed essere facile da usare.
 %{__cp} -pr build/tgz/*     $RPM_BUILD_ROOT%{_datadir}/%{name}/build/tgz
 %{__cp} -pr htdocs  $RPM_BUILD_ROOT%{_datadir}/%{name}
 %{__cp} -pr scripts $RPM_BUILD_ROOT%{_datadir}/%{name}
-%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/includes/ckeditor/_source  
 %{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/includes/adodbtime  
 %{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/includes/nusoap
 %{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/includes/fonts
@@ -118,9 +117,9 @@ do
   lang2=`expr substr $lang 4 2 | tr "[:upper:]" "[:lower:]"`; 
   echo "%dir %{_datadir}/%{name}/htdocs/langs/${lang}" >> %{name}.lang
   if [ "$lang1" = "$lang2" ] ; then
-    echo "%lang(${lang1}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
+	echo "%lang(${lang1}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
   else
-    echo "%lang(${lang}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
+	echo "%lang(${lang}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
   fi
 done >>%{name}.lang
 
@@ -239,20 +238,20 @@ echo Create document directory $docdir
 export config=%{_sysconfdir}/dolibarr/conf.php
 if [ -s $config ] && grep -q "File generated by" $config
 then 
-  # 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
-  #grep -q -c "dolibarr_lib_PHPEXCEL_PATH" $config || echo "<?php \$dolibarr_lib_PHPEXCEL_PATH=''; ?>" >> $config
-  #grep -q -c "dolibarr_lib_TCPDF_PATH" $config    || echo "<?php \$dolibarr_lib_TCPDF_PATH=''; ?>" >> $config
-  grep -q -c "dolibarr_js_CKEDITOR" $config        || [ ! -d "/usr/share/javascript/ckeditor" ]  || echo "<?php \$dolibarr_js_CKEDITOR='/javascript/ckeditor'; ?>" >> $config
-  grep -q -c "dolibarr_js_JQUERY" $config          || [ ! -d "/usr/share/javascript/jquery" ]    || echo "<?php \$dolibarr_js_JQUERY='/javascript/jquery'; ?>" >> $config
-  grep -q -c "dolibarr_js_JQUERY_UI" $config       || [ ! -d "/usr/share/javascript/jquery-ui" ] || echo "<?php \$dolibarr_js_JQUERY_UI='/javascript/jquery-ui'; ?>" >> $config
-  grep -q -c "dolibarr_js_JQUERY_FLOT" $config     || [ ! -d "/usr/share/javascript/flot" ]      || echo "<?php \$dolibarr_js_JQUERY_FLOT='/javascript/flot'; ?>" >> $config
-  grep -q -c "dolibarr_font_DOL_DEFAULT_TTF_BOLD" $config || echo "<?php \$dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/dejavu/DejaVuSans-Bold.ttf'; ?>" >> $config
+	# 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
+	#grep -q -c "dolibarr_lib_PHPEXCEL_PATH" $config || echo "<?php \$dolibarr_lib_PHPEXCEL_PATH=''; ?>" >> $config
+	#grep -q -c "dolibarr_lib_TCPDF_PATH" $config    || echo "<?php \$dolibarr_lib_TCPDF_PATH=''; ?>" >> $config
+	grep -q -c "dolibarr_js_CKEDITOR" $config       || [ ! -d "/usr/share/javascript/ckeditor" ]  || echo "<?php \$dolibarr_js_CKEDITOR='/javascript/ckeditor'; ?>" >> $config
+	grep -q -c "dolibarr_js_JQUERY" $config         || [ ! -d "/usr/share/javascript/jquery" ]    || echo "<?php \$dolibarr_js_JQUERY='/javascript/jquery'; ?>" >> $config
+	grep -q -c "dolibarr_js_JQUERY_UI" $config      || [ ! -d "/usr/share/javascript/jquery-ui" ] || echo "<?php \$dolibarr_js_JQUERY_UI='/javascript/jquery-ui'; ?>" >> $config
+	grep -q -c "dolibarr_js_JQUERY_FLOT" $config    || [ ! -d "/usr/share/javascript/flot" ]      || echo "<?php \$dolibarr_js_JQUERY_FLOT='/javascript/flot'; ?>" >> $config
+	grep -q -c "dolibarr_font_DOL_DEFAULT_TTF_BOLD" $config || echo "<?php \$dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/dejavu/DejaVuSans-Bold.ttf'; ?>" >> $config			
 fi
 
 # Create config for SE Linux
@@ -265,13 +264,13 @@ restorecon -R -v /var/lib/dolibarr
 
 # Create a config link dolibarr.conf
 if [ ! -L $apachelink ]; then
-  apachelinkdir=`dirname $apachelink`
-  if [ -d $apachelinkdir ]; then
-    echo Create dolibarr web server config link from %{_sysconfdir}/dolibarr/apache.conf to $apachelink
-    ln -fs %{_sysconfdir}/dolibarr/apache.conf $apachelink
-  else
-    echo Do not create link $apachelink - web server conf dir $apachelinkdir not found. web server package may not be installed
-  fi
+    apachelinkdir=`dirname $apachelink`
+    if [ -d $apachelinkdir ]; then
+        echo Create dolibarr web server config link from %{_sysconfdir}/dolibarr/apache.conf to $apachelink
+        ln -fs %{_sysconfdir}/dolibarr/apache.conf $apachelink
+    else
+        echo Do not create link $apachelink - web server conf dir $apachelinkdir not found. web server package may not be installed
+    fi
 fi
 
 echo Set permission to $apacheuser:$apachegroup on /var/lib/dolibarr
@@ -303,48 +302,33 @@ echo
 
 if [ "x$1" = "x0" ] ;
 then
-  # Remove
-  echo "Removed package"
+	# Remove
+	echo "Removed package"
 
-  # Define vars
-  export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
-  
-  # Remove apache link
-  if [ -L $apachelink ] ;
-  then
-    echo "Delete apache config link for Dolibarr ($apachelink)"
-    %{__rm} -f $apachelink
-    status=purge
-  fi
-  
-  # Restart web servers if required
-  if [ "x$status" = "xpurge" ] ;
-  then
-    # Restart web server
-    echo Restart web server
-    /sbin/service httpd restart
-  fi
+	# Define vars
+	export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
+	
+	# Remove apache link
+	if [ -L $apachelink ] ;
+	then
+	    echo "Delete apache config link for Dolibarr ($apachelink)"
+	    %{__rm} -f $apachelink
+	    status=purge
+	fi
+	
+	# Restart web servers if required
+	if [ "x$status" = "xpurge" ] ;
+	then
+	    # Restart web server
+	    echo Restart web server
+	    /sbin/service httpd restart
+	fi
 else
-  # Upgrade
-  echo "No remove action done (this is an upgrade)"
+	# Upgrade
+	echo "No remove ation done (this is an upgrade)"
 fi
 
 # version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
 %changelog
-* Tue Jul 8 2014 Laurent Destailleur 3.5.5-0.3
-- Upstream release
-
-* Tue Jul 1 2014 Laurent Destailleur 3.5.4-0.3
-- Upstream release
-
-* Fri May 2 2014 Laurent Destailleur 3.5.3-0.3
-- Upstream release
-
-* Fri Feb 14 2014 Laurent Destailleur 3.5.2-0.3
-- Upstream release
-
-* Fri Feb 7 2014 Laurent Destailleur 3.5.1-0.3
-- Upstream release
-
-* Mon Dec 30 2013 Laurent Destailleur 3.5.0-0.3
+* Mon Dec 30 2013 Laurent Destailleur 3.4.2-0.3
 - Initial version (#723326)

build/rpm/dolibarr_generic.spec

@@ -166,7 +166,6 @@ cui hai bisogno ed essere facile da usare.
 %{__cp} -pr build/tgz/*     $RPM_BUILD_ROOT%{_datadir}/%{name}/build/tgz
 %{__cp} -pr htdocs  $RPM_BUILD_ROOT%{_datadir}/%{name}
 %{__cp} -pr scripts $RPM_BUILD_ROOT%{_datadir}/%{name}
-%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/includes/ckeditor/_source  
 %if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version}
 %{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/includes/adodbtime  
 %{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/includes/nusoap
@@ -191,9 +190,9 @@ do
   lang2=`expr substr $lang 4 2 | tr "[:upper:]" "[:lower:]"`; 
   echo "%dir %{_datadir}/%{name}/htdocs/langs/${lang}" >> %{name}.lang
   if [ "$lang1" = "$lang2" ] ; then
-    echo "%lang(${lang1}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
+	echo "%lang(${lang1}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
   else
-    echo "%lang(${lang}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
+	echo "%lang(${lang}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
   fi
 done >>%{name}.lang
 
@@ -306,11 +305,6 @@ done >>%{name}.lang
 %post
 
 echo Run post script of packager dolibarr_generic.spec
-echo Detected constant fedora=0%{?fedora}
-echo Detected constant rhel_version=0%{?rhel_version}
-echo Detected constant centos_version=0%{?centos_version}
-echo Detected constant mdkversion=0%{?mdkversion}
-echo Detected constant suse_version=0%{?suse_version}
 
 # Define vars
 export docdir="/var/lib/dolibarr/documents"
@@ -329,28 +323,28 @@ export installconfig="%{_sysconfdir}/dolibarr/install.forced.php"
 # Detect OS
 os='unknown';
 if [ -d %{_sysconfdir}/httpd/conf.d ]; then
-  export os='fedora-redhat';
-  export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
-  export apacheuser='apache';
-  export apachegroup='apache';
+    export os='fedora-redhat';
+    export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
+    export apacheuser='apache';
+    export apachegroup='apache';
 fi
 if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^wwwrun /etc/passwd | wc -l` -ge 1 ]; then
-  export os='opensuse';
-  export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
-  export apacheuser='wwwrun';
-  export apachegroup='www';
+    export os='opensuse';
+    export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
+    export apacheuser='wwwrun';
+    export apachegroup='www';
 fi
 if [ -d %{_sysconfdir}/httpd/conf.d -a `grep -i "^mageia\|mandriva" /etc/issue | wc -l` -ge 1 ]; then
-  export os='mageia-mandriva';
-  export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
-  export apacheuser='apache';
-  export apachegroup='apache';
+    export os='mageia-mandriva';
+    export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
+    export apacheuser='apache';
+    export apachegroup='apache';
 fi
 if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^www-data /etc/passwd | wc -l` -ge 1 ]; then
-  export os='ubuntu-debian';
-  export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
-  export apacheuser='www-data';
-  export apachegroup='www-data';
+    export os='ubuntu-debian';
+    export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
+    export apacheuser='www-data';
+    export apachegroup='www-data';
 fi
 echo OS detected: $os
 %endif
@@ -369,16 +363,16 @@ echo Create document directory $docdir
 # Create install.forced.php into Dolibarr install directory
 if [ "x$os" = "xubuntu-debian" ]
 then
-  superuserlogin=''
-  superuserpassword=''
-  if [ -f %{_sysconfdir}/mysql/debian.cnf ] ; then
-    # Load superuser login and pass
-    superuserlogin=$(/bin/grep --max-count=1 "user" %{_sysconfdir}/mysql/debian.cnf | /bin/sed -e 's/^user[ =]*//g')
-    superuserpassword=$(/bin/grep --max-count=1 "password" %{_sysconfdir}/mysql/debian.cnf | /bin/sed -e 's/^password[ =]*//g')
-  fi
-  echo Mysql superuser found to use is $superuserlogin
-  %{__cat} /usr/share/dolibarr/build/rpm/install.forced.php.generic | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $installconfig
-  %{__chmod} -R 660 $installconfig
+	superuserlogin=''
+	superuserpassword=''
+	if [ -f %{_sysconfdir}/mysql/debian.cnf ] ; then
+	    # Load superuser login and pass
+	    superuserlogin=$(/bin/grep --max-count=1 "user" %{_sysconfdir}/mysql/debian.cnf | /bin/sed -e 's/^user[ =]*//g')
+	    superuserpassword=$(/bin/grep --max-count=1 "password" %{_sysconfdir}/mysql/debian.cnf | /bin/sed -e 's/^password[ =]*//g')
+	fi
+	echo Mysql superuser found to use is $superuserlogin
+	%{__cat} /usr/share/dolibarr/build/rpm/install.forced.php.generic | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $installconfig
+	%{__chmod} -R 660 $installconfig
 fi
 %endif
 
@@ -389,29 +383,29 @@ fi
 export config=%{_sysconfdir}/dolibarr/conf.php
 if [ -s $config ] && grep -q "File generated by" $config
 then
-  # 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
-  #grep -q -c "dolibarr_lib_PHPEXCEL_PATH" $config || echo "<?php \$dolibarr_lib_PHPEXCEL_PATH=''; ?>" >> $config
-  #grep -q -c "dolibarr_lib_TCPDF_PATH" $config    || echo "<?php \$dolibarr_lib_TCPDF_PATH=''; ?>" >> $config
-  grep -q -c "dolibarr_js_CKEDITOR" $config        || [ ! -d "/usr/share/javascript/ckeditor" ]  || echo "<?php \$dolibarr_js_CKEDITOR='/javascript/ckeditor'; ?>" >> $config
-  grep -q -c "dolibarr_js_JQUERY" $config          || [ ! -d "/usr/share/javascript/jquery" ]    || echo "<?php \$dolibarr_js_JQUERY='/javascript/jquery'; ?>" >> $config
-  grep -q -c "dolibarr_js_JQUERY_UI" $config       || [ ! -d "/usr/share/javascript/jquery-ui" ] || echo "<?php \$dolibarr_js_JQUERY_UI='/javascript/jquery-ui'; ?>" >> $config
-  grep -q -c "dolibarr_js_JQUERY_FLOT" $config     || [ ! -d "/usr/share/javascript/flot" ]      || echo "<?php \$dolibarr_js_JQUERY_FLOT='/javascript/flot'; ?>" >> $config
+	# 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
+	#grep -q -c "dolibarr_lib_PHPEXCEL_PATH" $config || echo "<?php \$dolibarr_lib_PHPEXCEL_PATH=''; ?>" >> $config
+	#grep -q -c "dolibarr_lib_TCPDF_PATH" $config    || echo "<?php \$dolibarr_lib_TCPDF_PATH=''; ?>" >> $config
+	grep -q -c "dolibarr_js_CKEDITOR" $config       || [ ! -d "/usr/share/javascript/ckeditor" ]  || echo "<?php \$dolibarr_js_CKEDITOR='/javascript/ckeditor'; ?>" >> $config
+	grep -q -c "dolibarr_js_JQUERY" $config         || [ ! -d "/usr/share/javascript/jquery" ]    || echo "<?php \$dolibarr_js_JQUERY='/javascript/jquery'; ?>" >> $config
+	grep -q -c "dolibarr_js_JQUERY_UI" $config      || [ ! -d "/usr/share/javascript/jquery-ui" ] || echo "<?php \$dolibarr_js_JQUERY_UI='/javascript/jquery-ui'; ?>" >> $config
+	grep -q -c "dolibarr_js_JQUERY_FLOT" $config    || [ ! -d "/usr/share/javascript/flot" ]      || echo "<?php \$dolibarr_js_JQUERY_FLOT='/javascript/flot'; ?>" >> $config
 %if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version}
-  grep -q -c "dolibarr_font_DOL_DEFAULT_TTF_BOLD" $config || echo "<?php \$dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/dejavu/DejaVuSans-Bold.ttf'; ?>" >> $config
+	grep -q -c "dolibarr_font_DOL_DEFAULT_TTF_BOLD" $config || echo "<?php \$dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/dejavu/DejaVuSans-Bold.ttf'; ?>" >> $config
 %else
 %if 0%{?mdkversion}
-  grep -q -c "dolibarr_font_DOL_DEFAULT_TTF_BOLD" $config || echo "<?php \$dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/TTF/dejavu/DejaVuSans-Bold.ttf'; ?>" >> $config
+	grep -q -c "dolibarr_font_DOL_DEFAULT_TTF_BOLD" $config || echo "<?php \$dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/TTF/dejavu/DejaVuSans-Bold.ttf'; ?>" >> $config
 %else
 %if 0%{?suse_version}
-  grep -q -c "dolibarr_font_DOL_DEFAULT_TTF_BOLD" $config || echo "<?php \$dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/truetype/DejaVuSans-Bold.ttf'; ?>" >> $config
+	grep -q -c "dolibarr_font_DOL_DEFAULT_TTF_BOLD" $config || echo "<?php \$dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/truetype/DejaVuSans-Bold.ttf'; ?>" >> $config			
 %else
-  grep -q -c "dolibarr_font_DOL_DEFAULT_TTF_BOLD" $config || echo "<?php \$dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf'; ?>" >> $config
+	grep -q -c "dolibarr_font_DOL_DEFAULT_TTF_BOLD" $config || echo "<?php \$dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf'; ?>" >> $config
 %endif
 %endif
 %endif
@@ -424,12 +418,12 @@ if [ "x$os" = "xfedora-redhat" -a -s /sbin/restorecon ]; then
 %endif
 %if 0%{?mdkversion} || 0%{?suse_version}
 %else
-  echo Add SE Linux permissions for dolibarr
-  # semanage add records into /etc/selinux/targeted/contexts/files/file_contexts.local
-  semanage fcontext -a -t httpd_sys_script_rw_t "/etc/dolibarr(/.*?)"
-  semanage fcontext -a -t httpd_sys_script_rw_t "/var/lib/dolibarr(/.*?)"
-  restorecon -R -v /etc/dolibarr
-  restorecon -R -v /var/lib/dolibarr
+    echo Add SE Linux permissions for dolibarr
+    # semanage add records into /etc/selinux/targeted/contexts/files/file_contexts.local
+    semanage fcontext -a -t httpd_sys_script_rw_t "/etc/dolibarr(/.*?)"
+    semanage fcontext -a -t httpd_sys_script_rw_t "/var/lib/dolibarr(/.*?)"
+    restorecon -R -v /etc/dolibarr
+    restorecon -R -v /var/lib/dolibarr
 %endif
 %if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?mdkversion} || 0%{?suse_version}
 %else
@@ -438,13 +432,13 @@ fi
 
 # Create a config link dolibarr.conf
 if [ ! -L $apachelink ]; then
-  apachelinkdir=`dirname $apachelink`
-  if [ -d $apachelinkdir ]; then
-    echo Create dolibarr web server config link from %{_sysconfdir}/dolibarr/apache.conf to $apachelink
-      ln -fs %{_sysconfdir}/dolibarr/apache.conf $apachelink
-  else
-    echo Do not create link $apachelink - web server conf dir $apachelinkdir not found. web server package may not be installed
-  fi
+    apachelinkdir=`dirname $apachelink`
+    if [ -d $apachelinkdir ]; then
+        echo Create dolibarr web server config link from %{_sysconfdir}/dolibarr/apache.conf to $apachelink
+        ln -fs %{_sysconfdir}/dolibarr/apache.conf $apachelink
+    else
+        echo Do not create link $apachelink - web server conf dir $apachelinkdir not found. web server package may not be installed
+    fi
 fi
 
 echo Set permission to $apacheuser:$apachegroup on /var/lib/dolibarr
@@ -457,33 +451,30 @@ echo Restart web server
 /sbin/service httpd restart
 %else
 if [ -f %{_sysconfdir}/init.d/httpd ]; then
-  %{_sysconfdir}/init.d/httpd restart
+    %{_sysconfdir}/init.d/httpd restart
 fi
 if [ -f %{_sysconfdir}/init.d/apache2 ]; then
-  %{_sysconfdir}/init.d/apache2 restart
+    %{_sysconfdir}/init.d/apache2 restart
 fi
 %endif
 
 # Restart mysql server
 echo Restart mysql server
 %if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?mdkversion}
-  /sbin/service mysqld restart
+	/sbin/service mysqld restart
 %else
 %if 0%{?suse_version}
 if [ -f /etc/init.d/mysqld ]; then
-  /sbin/service mysqld restart
-  #/etc/init.d/mysqld restart
-fi
-if [ -f /etc/init.d/mysql ]; then
-  /sbin/service mysql restart
-  #/etc/init.d/mysql restart
+    /etc/init.d/mysqld restart
+else
+	/sbin/service mysql restart
 fi
 %else
 if [ -f /etc/init.d/mysqld ]; then
-  /etc/init.d/mysqld restart
+    /etc/init.d/mysqld restart
 fi
 if [ -f /etc/init.d/mysql ]; then
-  /etc/init.d/mysql restart
+    /etc/init.d/mysql restart
 fi
 %endif
 %endif
@@ -506,81 +497,66 @@ echo
 
 if [ "x$1" = "x0" ] ;
 then
-  # Remove
-  echo "Removed package"
+	# Remove
+	echo "Removed package"
 
-  # Define vars
-  os='unknown';
-  %if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?mdkversion}
-  export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
-  %else
-  %if 0%{?suse_version}
-  export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
-  %else
-  if [ -d %{_sysconfdir}/httpd/conf.d ]; then
-    export os='fedora-redhat';
-    export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
-  fi
-  if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^wwwrun /etc/passwd | wc -l` -ge 1 ]; then
-    export os='opensuse';
-    export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
-  fi
-  if [ -d %{_sysconfdir}/httpd/conf.d -a `grep -i "^mageia\|mandriva" /etc/issue | wc -l` -ge 1 ]; then
-    export os='mageia-mandriva';
-    export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
-  fi
-  if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^www-data /etc/passwd | wc -l` -ge 1 ]; then
-    export os='ubuntu-debian';
-    export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
-  fi
-  %endif
-  %endif
-  
-  # Remove apache link
-  if [ -L $apachelink ] ;
-  then
-    echo "Delete apache config link for Dolibarr ($apachelink)"
-    %{__rm} -f $apachelink
-    status=purge
-  fi
-  
-  # Restart web servers if required
-  if [ "x$status" = "xpurge" ] ;
-  then
-    # Restart web server
-    echo Restart web server
-    %if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?mdkversion}
-      /sbin/service httpd restart
-    %else
-      if [ -f %{_sysconfdir}/init.d/httpd ]; then
-        %{_sysconfdir}/init.d/httpd restart
-      fi
-      if [ -f %{_sysconfdir}/init.d/apache2 ]; then
-        %{_sysconfdir}/init.d/apache2 restart
-      fi
-      %endif
-  fi
+	# Define vars
+	os='unknown';
+	%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?mdkversion}
+	export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
+	%else
+	%if 0%{?suse_version}
+	export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
+	%else
+	if [ -d %{_sysconfdir}/httpd/conf.d ]; then
+	    export os='fedora-redhat';
+	    export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
+	fi
+	if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^wwwrun /etc/passwd | wc -l` -ge 1 ]; then
+	    export os='opensuse';
+	    export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
+	fi
+	if [ -d %{_sysconfdir}/httpd/conf.d -a `grep -i "^mageia\|mandriva" /etc/issue | wc -l` -ge 1 ]; then
+	    export os='mageia-mandriva';
+	    export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
+	fi
+	if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^www-data /etc/passwd | wc -l` -ge 1 ]; then
+	    export os='ubuntu-debian';
+	    export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
+	fi
+	%endif
+	%endif
+	
+	# Remove apache link
+	if [ -L $apachelink ] ;
+	then
+	    echo "Delete apache config link for Dolibarr ($apachelink)"
+	    %{__rm} -f $apachelink
+	    status=purge
+	fi
+	
+	# Restart web servers if required
+	if [ "x$status" = "xpurge" ] ;
+	then
+	    # Restart web server
+	    echo Restart web server
+		%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?mdkversion}
+	    /sbin/service httpd restart
+		%else
+	    if [ -f %{_sysconfdir}/init.d/httpd ]; then
+	        %{_sysconfdir}/init.d/httpd restart
+	    fi
+	    if [ -f %{_sysconfdir}/init.d/apache2 ]; then
+	        %{_sysconfdir}/init.d/apache2 restart
+	    fi
+	    %endif
+	fi
 else
-  # Upgrade
-  echo "No remove action done (this is an upgrade)"
+	# Upgrade
+	echo "No remove ation done (this is an upgrade)"
 fi
 
 # version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
 %changelog
-* Tue Jul 8 2014 Laurent Destailleur 3.5.5-0.3
-- Upstream release
-
-* Tue Jul 1 2014 Laurent Destailleur 3.5.4-0.3
-- Upstream release
-
-* Fri May 2 2014 Laurent Destailleur 3.5.3-0.3
-- Upstream release
-
-* Fri Feb 14 2014 Laurent Destailleur 3.5.2-0.3
-- Upstream release
-
-* Fri Feb 7 2014 Laurent Destailleur 3.5.1-0.3
-- Upstream release
-
-* Mon Dec 30 2013 Laurent Destailleur 3.5.0-0.3
+* Mon Dec 30 2013 Laurent Destailleur 3.4.2-0.3
 - Initial version (#723326)

build/rpm/dolibarr_mandriva.spec

@@ -102,7 +102,6 @@ cui hai bisogno ed essere facile da usare.
 %{__cp} -pr build/tgz/*     $RPM_BUILD_ROOT%{_datadir}/%{name}/build/tgz
 %{__cp} -pr htdocs  $RPM_BUILD_ROOT%{_datadir}/%{name}
 %{__cp} -pr scripts $RPM_BUILD_ROOT%{_datadir}/%{name}
-%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/includes/ckeditor/_source  
 %{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/includes/fonts
 
 # Lang
@@ -115,9 +114,9 @@ do
   lang2=`expr substr $lang 4 2 | tr "[:upper:]" "[:lower:]"`; 
   echo "%dir %{_datadir}/%{name}/htdocs/langs/${lang}" >> %{name}.lang
   if [ "$lang1" = "$lang2" ] ; then
-    echo "%lang(${lang1}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
+	echo "%lang(${lang1}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
   else
-    echo "%lang(${lang}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
+	echo "%lang(${lang}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
   fi
 done >>%{name}.lang
 
@@ -236,31 +235,31 @@ echo Create document directory $docdir
 export config=%{_sysconfdir}/dolibarr/conf.php
 if [ -s $config ] && grep -q "File generated by" $config
 then 
-  # 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
-  #grep -q -c "dolibarr_lib_PHPEXCEL_PATH" $config || echo "<?php \$dolibarr_lib_PHPEXCEL_PATH=''; ?>" >> $config
-  #grep -q -c "dolibarr_lib_TCPDF_PATH" $config    || echo "<?php \$dolibarr_lib_TCPDF_PATH=''; ?>" >> $config
-  grep -q -c "dolibarr_js_CKEDITOR" $config        || [ ! -d "/usr/share/javascript/ckeditor" ]  || echo "<?php \$dolibarr_js_CKEDITOR='/javascript/ckeditor'; ?>" >> $config
-  grep -q -c "dolibarr_js_JQUERY" $config          || [ ! -d "/usr/share/javascript/jquery" ]    || echo "<?php \$dolibarr_js_JQUERY='/javascript/jquery'; ?>" >> $config
-  grep -q -c "dolibarr_js_JQUERY_UI" $config       || [ ! -d "/usr/share/javascript/jquery-ui" ] || echo "<?php \$dolibarr_js_JQUERY_UI='/javascript/jquery-ui'; ?>" >> $config
-  grep -q -c "dolibarr_js_JQUERY_FLOT" $config     || [ ! -d "/usr/share/javascript/flot" ]      || echo "<?php \$dolibarr_js_JQUERY_FLOT='/javascript/flot'; ?>" >> $config
-  grep -q -c "dolibarr_font_DOL_DEFAULT_TTF_BOLD" $config || echo "<?php \$dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/TTF/dejavu/DejaVuSans-Bold.ttf'; ?>" >> $config
+	# 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
+	#grep -q -c "dolibarr_lib_PHPEXCEL_PATH" $config || echo "<?php \$dolibarr_lib_PHPEXCEL_PATH=''; ?>" >> $config
+	#grep -q -c "dolibarr_lib_TCPDF_PATH" $config    || echo "<?php \$dolibarr_lib_TCPDF_PATH=''; ?>" >> $config
+	grep -q -c "dolibarr_js_CKEDITOR" $config       || [ ! -d "/usr/share/javascript/ckeditor" ]  || echo "<?php \$dolibarr_js_CKEDITOR='/javascript/ckeditor'; ?>" >> $config
+	grep -q -c "dolibarr_js_JQUERY" $config         || [ ! -d "/usr/share/javascript/jquery" ]    || echo "<?php \$dolibarr_js_JQUERY='/javascript/jquery'; ?>" >> $config
+	grep -q -c "dolibarr_js_JQUERY_UI" $config      || [ ! -d "/usr/share/javascript/jquery-ui" ] || echo "<?php \$dolibarr_js_JQUERY_UI='/javascript/jquery-ui'; ?>" >> $config
+	grep -q -c "dolibarr_js_JQUERY_FLOT" $config    || [ ! -d "/usr/share/javascript/flot" ]      || echo "<?php \$dolibarr_js_JQUERY_FLOT='/javascript/flot'; ?>" >> $config
+	grep -q -c "dolibarr_font_DOL_DEFAULT_TTF_BOLD" $config || echo "<?php \$dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/TTF/dejavu/DejaVuSans-Bold.ttf'; ?>" >> $config			
 fi
 
 # Create a config link dolibarr.conf
 if [ ! -L $apachelink ]; then
-  apachelinkdir=`dirname $apachelink`
-  if [ -d $apachelinkdir ]; then
-    echo Create dolibarr web server config link from %{_sysconfdir}/dolibarr/apache.conf to $apachelink
-    ln -fs %{_sysconfdir}/dolibarr/apache.conf $apachelink
-  else
-    echo Do not create link $apachelink - web server conf dir $apachelinkdir not found. web server package may not be installed
-  fi
+    apachelinkdir=`dirname $apachelink`
+    if [ -d $apachelinkdir ]; then
+        echo Create dolibarr web server config link from %{_sysconfdir}/dolibarr/apache.conf to $apachelink
+        ln -fs %{_sysconfdir}/dolibarr/apache.conf $apachelink
+    else
+        echo Do not create link $apachelink - web server conf dir $apachelinkdir not found. web server package may not be installed
+    fi
 fi
 
 echo Set permission to $apacheuser:$apachegroup on /var/lib/dolibarr
@@ -270,19 +269,19 @@ echo Set permission to $apacheuser:$apachegroup on /var/lib/dolibarr
 # Restart web server
 echo Restart web server
 if [ -f %{_sysconfdir}/init.d/httpd ]; then
-  %{_sysconfdir}/init.d/httpd restart
+    %{_sysconfdir}/init.d/httpd restart
 fi
 if [ -f %{_sysconfdir}/init.d/apache2 ]; then
-  %{_sysconfdir}/init.d/apache2 restart
+    %{_sysconfdir}/init.d/apache2 restart
 fi
 
 # Restart mysql
 echo Restart mysql
 if [ -f /etc/init.d/mysqld ]; then
-  /etc/init.d/mysqld restart
+    /etc/init.d/mysqld restart
 fi
 if [ -f /etc/init.d/mysql ]; then
-  /etc/init.d/mysql restart
+    /etc/init.d/mysql restart
 fi
 
 # Show result
@@ -302,54 +301,39 @@ echo
 
 if [ "x$1" = "x0" ] ;
 then
-  # Remove
-  echo "Removed package"
+	# Remove
+	echo "Removed package"
 
-  # Define vars
-  export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
-  
-  # Remove apache link
-  if [ -L $apachelink ] ;
-  then
-    echo "Delete apache config link for Dolibarr ($apachelink)"
-    %{__rm} -f $apachelink
-    status=purge
-  fi
-  
-  # Restart web servers if required
-  if [ "x$status" = "xpurge" ] ;
-  then
-    # Restart web server
-    echo Restart web server
-    if [ -f %{_sysconfdir}/init.d/httpd ]; then
-      %{_sysconfdir}/init.d/httpd restart
-    fi
-    if [ -f %{_sysconfdir}/init.d/apache2 ]; then
-      %{_sysconfdir}/init.d/apache2 restart
-    fi
-  fi
+	# Define vars
+	export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf"
+	
+	# Remove apache link
+	if [ -L $apachelink ] ;
+	then
+	    echo "Delete apache config link for Dolibarr ($apachelink)"
+	    %{__rm} -f $apachelink
+	    status=purge
+	fi
+	
+	# Restart web servers if required
+	if [ "x$status" = "xpurge" ] ;
+	then
+	    # Restart web server
+	    echo Restart web server
+	    if [ -f %{_sysconfdir}/init.d/httpd ]; then
+	        %{_sysconfdir}/init.d/httpd restart
+	    fi
+	    if [ -f %{_sysconfdir}/init.d/apache2 ]; then
+	        %{_sysconfdir}/init.d/apache2 restart
+	    fi
+	fi
 else
-  # Upgrade
-  echo "No remove action done (this is an upgrade)"
+	# Upgrade
+	echo "No remove ation done (this is an upgrade)"
 fi
 
 
 # version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
 %changelog
-* Tue Jul 8 2014 Laurent Destailleur 3.5.5-0.3
-- Upstream release
-
-* Tue Jul 1 2014 Laurent Destailleur 3.5.4-0.3
-- Upstream release
-
-* Fri May 2 2014 Laurent Destailleur 3.5.3-0.3
-- Upstream release
-
-* Fri Feb 14 2014 Laurent Destailleur 3.5.2-0.3
-- Upstream release
-
-* Fri Feb 7 2014 Laurent Destailleur 3.5.1-0.3
-- Upstream release
-
-* Mon Dec 30 2013 Laurent Destailleur 3.5.0-0.3
+* Mon Dec 30 2013 Laurent Destailleur 3.4.2-0.3
 - Initial version (#723326)

build/rpm/dolibarr_opensuse.spec

@@ -103,7 +103,6 @@ cui hai bisogno ed essere facile da usare.
 %{__cp} -pr build/tgz/*     $RPM_BUILD_ROOT%{_datadir}/%{name}/build/tgz
 %{__cp} -pr htdocs  $RPM_BUILD_ROOT%{_datadir}/%{name}
 %{__cp} -pr scripts $RPM_BUILD_ROOT%{_datadir}/%{name}
-%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/includes/ckeditor/_source  
 %{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/includes/fonts
 
 # Lang
@@ -116,9 +115,9 @@ do
   lang2=`expr substr $lang 4 2 | tr "[:upper:]" "[:lower:]"`; 
   echo "%dir %{_datadir}/%{name}/htdocs/langs/${lang}" >> %{name}.lang
   if [ "$lang1" = "$lang2" ] ; then
-    echo "%lang(${lang1}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
+	echo "%lang(${lang1}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
   else
-    echo "%lang(${lang}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
+	echo "%lang(${lang}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang"
   fi
 done >>%{name}.lang
 
@@ -247,31 +246,31 @@ echo Create document directory $docdir
 export config=%{_sysconfdir}/dolibarr/conf.php
 if [ -s $config ] && grep -q "File generated by" $config
 then 
-  # 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
-  #grep -q -c "dolibarr_lib_PHPEXCEL_PATH" $config || echo "<?php \$dolibarr_lib_PHPEXCEL_PATH=''; ?>" >> $config
-  #grep -q -c "dolibarr_lib_TCPDF_PATH" $config    || echo "<?php \$dolibarr_lib_TCPDF_PATH=''; ?>" >> $config
-  grep -q -c "dolibarr_js_CKEDITOR" $config        || [ ! -d "/usr/share/javascript/ckeditor" ]  || echo "<?php \$dolibarr_js_CKEDITOR='/javascript/ckeditor'; ?>" >> $config
-  grep -q -c "dolibarr_js_JQUERY" $config          || [ ! -d "/usr/share/javascript/jquery" ]    || echo "<?php \$dolibarr_js_JQUERY='/javascript/jquery'; ?>" >> $config
-  grep -q -c "dolibarr_js_JQUERY_UI" $config       || [ ! -d "/usr/share/javascript/jquery-ui" ] || echo "<?php \$dolibarr_js_JQUERY_UI='/javascript/jquery-ui'; ?>" >> $config
-  grep -q -c "dolibarr_js_JQUERY_FLOT" $config     || [ ! -d "/usr/share/javascript/flot" ]      || echo "<?php \$dolibarr_js_JQUERY_FLOT='/javascript/flot'; ?>" >> $config
-  grep -q -c "dolibarr_font_DOL_DEFAULT_TTF_BOLD" $config || echo "<?php \$dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/truetype/DejaVuSans-Bold.ttf'; ?>" >> $config      
+	# 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
+	#grep -q -c "dolibarr_lib_PHPEXCEL_PATH" $config || echo "<?php \$dolibarr_lib_PHPEXCEL_PATH=''; ?>" >> $config
+	#grep -q -c "dolibarr_lib_TCPDF_PATH" $config    || echo "<?php \$dolibarr_lib_TCPDF_PATH=''; ?>" >> $config
+	grep -q -c "dolibarr_js_CKEDITOR" $config       || [ ! -d "/usr/share/javascript/ckeditor" ]  || echo "<?php \$dolibarr_js_CKEDITOR='/javascript/ckeditor'; ?>" >> $config
+	grep -q -c "dolibarr_js_JQUERY" $config         || [ ! -d "/usr/share/javascript/jquery" ]    || echo "<?php \$dolibarr_js_JQUERY='/javascript/jquery'; ?>" >> $config
+	grep -q -c "dolibarr_js_JQUERY_UI" $config      || [ ! -d "/usr/share/javascript/jquery-ui" ] || echo "<?php \$dolibarr_js_JQUERY_UI='/javascript/jquery-ui'; ?>" >> $config
+	grep -q -c "dolibarr_js_JQUERY_FLOT" $config    || [ ! -d "/usr/share/javascript/flot" ]      || echo "<?php \$dolibarr_js_JQUERY_FLOT='/javascript/flot'; ?>" >> $config
+	grep -q -c "dolibarr_font_DOL_DEFAULT_TTF_BOLD" $config || echo "<?php \$dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/truetype/DejaVuSans-Bold.ttf'; ?>" >> $config			
 fi
 
 # Create a config link dolibarr.conf
 if [ ! -L $apachelink ]; then
-  apachelinkdir=`dirname $apachelink`
-  if [ -d $apachelinkdir ]; then
-    echo Create dolibarr web server config link from %{_sysconfdir}/dolibarr/apache.conf to $apachelink
-    ln -fs %{_sysconfdir}/dolibarr/apache.conf $apachelink
-  else
-    echo Do not create link $apachelink - web server conf dir $apachelinkdir not found. web server package may not be installed
-  fi
+    apachelinkdir=`dirname $apachelink`
+    if [ -d $apachelinkdir ]; then
+        echo Create dolibarr web server config link from %{_sysconfdir}/dolibarr/apache.conf to $apachelink
+        ln -fs %{_sysconfdir}/dolibarr/apache.conf $apachelink
+    else
+        echo Do not create link $apachelink - web server conf dir $apachelinkdir not found. web server package may not be installed
+    fi
 fi
 
 echo Set permission to $apacheuser:$apachegroup on /var/lib/dolibarr
@@ -281,19 +280,18 @@ echo Set permission to $apacheuser:$apachegroup on /var/lib/dolibarr
 # Restart web server
 echo Restart web server
 if [ -f %{_sysconfdir}/init.d/httpd ]; then
-  %{_sysconfdir}/init.d/httpd restart
+    %{_sysconfdir}/init.d/httpd restart
 fi
 if [ -f %{_sysconfdir}/init.d/apache2 ]; then
-  %{_sysconfdir}/init.d/apache2 restart
+    %{_sysconfdir}/init.d/apache2 restart
 fi
 
 # Restart mysql
 echo Restart mysql
 if [ -f /etc/init.d/mysqld ]; then
-  /sbin/service mysqld restart
-fi
-if [ -f /etc/init.d/mysql ]; then
-  /sbin/service mysql restart
+    /etc/init.d/mysqld restart
+else
+	/sbin/service mysql restart
 fi
 
 # Show result
@@ -313,54 +311,39 @@ echo
 
 if [ "x$1" = "x0" ] ;
 then
-  # Remove
-  echo "Removed package"
-  
-  # Define vars
-  export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
-  
-  # Remove apache link
-  if [ -L $apachelink ] ;
-  then
-    echo "Delete apache config link for Dolibarr ($apachelink)"
-    %{__rm} -f $apachelink
-    status=purge
-  fi
-  
-  # Restart web servers if required
-  if [ "x$status" = "xpurge" ] ;
-  then
-    # Restart web server
-    echo Restart web server
-    if [ -f %{_sysconfdir}/init.d/httpd ]; then
-      %{_sysconfdir}/init.d/httpd restart
-    fi
-    if [ -f %{_sysconfdir}/init.d/apache2 ]; then
-      %{_sysconfdir}/init.d/apache2 restart
-    fi
-  fi
+	# Remove
+	echo "Removed package"
+	
+	# Define vars
+	export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf"
+	
+	# Remove apache link
+	if [ -L $apachelink ] ;
+	then
+	    echo "Delete apache config link for Dolibarr ($apachelink)"
+	    %{__rm} -f $apachelink
+	    status=purge
+	fi
+	
+	# Restart web servers if required
+	if [ "x$status" = "xpurge" ] ;
+	then
+	    # Restart web server
+	    echo Restart web server
+	    if [ -f %{_sysconfdir}/init.d/httpd ]; then
+	        %{_sysconfdir}/init.d/httpd restart
+	    fi
+	    if [ -f %{_sysconfdir}/init.d/apache2 ]; then
+	        %{_sysconfdir}/init.d/apache2 restart
+	    fi
+	fi
 else
-  # Upgrade
-  echo "No remove action done (this is an upgrade)"
+	# Upgrade
+	echo "No remove ation done (this is an upgrade)"
 fi
 
 
 # version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
 %changelog
-* Tue Jul 8 2014 Laurent Destailleur 3.5.5-0.3
-- Upstream release
-
-* Tue Jul 1 2014 Laurent Destailleur 3.5.4-0.3
-- Upstream release
-
-* Fri May 2 2014 Laurent Destailleur 3.5.3-0.3
-- Upstream release
-
-* Fri Feb 14 2014 Laurent Destailleur 3.5.2-0.3
-- Upstream release
-
-* Fri Feb 7 2014 Laurent Destailleur 3.5.1-0.3
-- Upstream release
-
-* Mon Dec 30 2013 Laurent Destailleur 3.5.0-0.3
+* Mon Dec 30 2013 Laurent Destailleur 3.4.2-0.3
 - Initial version (#723326)

build/sitemap/README

@@ -1,6 +0,0 @@
-# Format of sitemap file is available at
-# http://www.sitemaps.org/protocol.html
-
-# To build a sitemap from urllist-bing.txt, run 
-# google-sitemapgen --config=config-bing.xml --testing
-

build/sitemap/config-bing.xml

@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  sitemap_gen.py example configuration script
-
-  This file specifies a set of sample input parameters for the
-  sitemap_gen.py client.
-
-  You should copy this file into "config.xml" and modify it for
-  your server.
-
-
-  ********************************************************* -->
-
-
-<!-- ** MODIFY **
-  The "site" node describes your basic web site.
-
-  Required attributes:
-    base_url   - the top-level URL of the site being mapped
-    store_into - the webserver path to the desired output file.
-                 This should end in '.xml' or '.xml.gz'
-                 (the script will create this file)
-
-  Optional attributes:
-    verbose    - an integer from 0 (quiet) to 3 (noisy) for
-                 how much diagnostic output the script gives
-    suppress_search_engine_notify="1"
-               - disables notifying search engines about the new map
-                 (same as the "testing" command-line argument.)
-    default_encoding
-               - names a character encoding to use for URLs and
-                 file paths.  (Example: "UTF-8")
--->
-<site
-  base_url="http://wiki.dolibarr.org/"
-  store_into="sitemap-wiki-bing.xml.gz"
-  verbose="1"
-  >
-
-  <!-- ********************************************************
-          INPUTS
-
-  All the various nodes in this section control where the script
-  looks to find URLs.
-
-  MODIFY or DELETE these entries as appropriate for your server.
-  ********************************************************* -->
-
-  <!-- ** MODIFY or DELETE **
-    "url" nodes specify individual URLs to include in the map.
-
-    Required attributes:
-      href       - the URL
-
-    Optional attributes:
-      lastmod    - timestamp of last modification (ISO8601 format)
-      changefreq - how often content at this URL is usually updated
-      priority   - value 0.0 to 1.0 of relative importance in your site
-  -->
-  <!-- 
-  <url  href="http://www.example.com/stats?q=name"  />
-  <url
-     href="http://www.example.com/stats?q=age"
-     lastmod="2004-11-14T01:00:00-07:00"
-     changefreq="yearly"
-     priority="0.3"
-  />
-  -->
-
-  <!-- ** MODIFY or DELETE **
-    "urllist" nodes name text files with lists of URLs.
-    An example file "example_urllist.txt" is provided.
-
-    Required attributes:
-      path       - path to the file
-
-    Optional attributes:
-      encoding   - encoding of the file if not US-ASCII
-  -->
-  <urllist  path="urllist-wiki.txt"  encoding="UTF-8"  />
-
-  <!-- ** MODIFY or DELETE **
-    "directory" nodes tell the script to walk the file system
-    and include all files and directories in the Sitemap.
-
-    Required attributes:
-      path       - path to begin walking from
-      url        - URL equivalent of that path
-
-    Optional attributes:
-      default_file - name of the index or default file for directory URLs
-  -->
-  <!-- 
-  <directory  path="/var/www/icons"    url="http://www.example.com/images/" />
-  <directory
-     path="/var/www/docroot"
-     url="http://www.example.com/"
-     default_file="index.html"
-  />
-  -->
-
-  <!-- ** MODIFY or DELETE **
-    "accesslog" nodes tell the script to scan webserver log files to
-    extract URLs on your site.  Both Common Logfile Format (Apache's default
-    logfile) and Extended Logfile Format (IIS's default logfile) can be read.
-
-    Required attributes:
-      path       - path to the file
-
-    Optional attributes:
-      encoding   - encoding of the file if not US-ASCII
-  -->
-  <!-- 
-  <accesslog  path="/etc/httpd/logs/access.log"       encoding="UTF-8"  />
-  <accesslog  path="/etc/httpd/logs/access.log.0"     encoding="UTF-8"  />
-  <accesslog  path="/etc/httpd/logs/access.log.1.gz"  encoding="UTF-8"  />
-  -->
-
-  <!-- ** MODIFY or DELETE **
-    "sitemap" nodes tell the script to scan other Sitemap files.  This can
-    be useful to aggregate the results of multiple runs of this script into
-    a single Sitemap.
-
-    Required attributes:
-      path       - path to the file
-  -->
-  <!-- 
-  <sitemap    path="/var/www/docroot/subpath/sitemap.xml" />
-  -->
-
-  <!-- ********************************************************
-          FILTERS
-
-  Filters specify wild-card patterns that the script compares
-  against all URLs it finds.  Filters can be used to exclude
-  certain URLs from your Sitemap, for instance if you have
-  hidden content that you hope the search engines don't find.
-
-  Filters can be either type="wildcard", which means standard
-  path wildcards (* and ?) are used to compare against URLs,
-  or type="regexp", which means regular expressions are used
-  to compare.
-
-  Filters are applied in the order specified in this file.
-
-  An action="drop" filter causes exclusion of matching URLs.
-  An action="pass" filter causes inclusion of matching URLs,
-  shortcutting any other later filters that might also match.
-  If no filter at all matches a URL, the URL will be included.
-  Together you can build up fairly complex rules.
-
-  The default action is "drop".
-  The default type is "wildcard".
-
-  You can MODIFY or DELETE these entries as appropriate for
-  your site.  However, unlike above, the example entries in
-  this section are not contrived and may be useful to you as
-  they are.
-  ********************************************************* -->
-
-  <!-- Exclude URLs that end with a '~'   (IE: emacs backup files)      -->
-  <filter  action="drop"  type="wildcard"  pattern="*~"           />
-
-  <!-- Exclude URLs within UNIX-style hidden files or directories       -->
-  <filter  action="drop"  type="regexp"    pattern="/\.[^/]*"     />
-
-  <filter  action="drop"  type="regexp"  pattern="title="           />
-
-</site>

build/sitemap/urllist-wiki.txt

@@ -1 +0,0 @@
-http://wiki.dolibarr.org/

build/tgz/tar_exclude.txt

@@ -1,6 +1,3 @@
-*~
-.#*
-Thumbs.db
 build/exe
 build/html
 dev/dbmodel
@@ -10,10 +7,58 @@ dev/initdata
 dev/iso-normes
 dev/licence
 dev/load
+dev/skeletons/*socpeople*
+dev/spec
+dev/test
+dev/uml
+dev/xdebug
+doc/dev/dolibarr-phpdoc
+doc/dev/barcode
+doc/dev/compta
+doc/dev/dbmodel
+doc/dev/normes
+doc/dev/html
+doc/dev/iso-normes
+doc/flyer
+doc/font
+doc/rollup
+doc/tshirts
+doc/wiki
+document
+documents
 htdocs/conf/conf.php
 htdocs/conf/conf.php.mysql
 htdocs/conf/conf.php.old
 htdocs/conf/conf.php.postgres
+htdocs/avoir
+htdocs/custom
+htdocs/custom2
+htdocs/customleave
+htdocs/customgoogle
+htdocs/document
+htdocs/documents
+htdocs/includes/fckeditor/_samples
+htdocs/includes/fckeditor/_testcases
+htdocs/includes/nusoap/samples
+htdocs/includes/tcpdf/fonts/utils
+htdocs/includes/tcpdf/fonts/free*.ctg.z
+htdocs/includes/tcpdf/fonts/free*.z
+mssql
+test
+CVS
+*~
+.#*
+.buildpath
+.cache
+.cvsignore
+.gitignore
+.externalToolBuilders
+.htaccess
+.settings
+.project
+.travis.yml
+Thumbs.db
+data_dev.sql
 doli*.tar.gz
 doli*.tgz
 doli*.exe
@@ -21,4 +66,5 @@ doli*.rpm
 doli*.deb
 doli*.zip
 cvschangelogbuilder_dolibarr*
-dolibarr_install.log
+doxygen_warnings.log
+dolibarr_install.log

build/zip/zip_exclude.txt

@@ -1,19 +1,65 @@
-*~
-*.#*
-Thumbs.db
-*/build/exe
-*/build/html
+*/build
 */dev/dbmodel/*
 */dev/fpdf/*
 */dev/initdemo/*
-*/dev/initdata/*
 */dev/iso-normes/*
 */dev/licence/*
 */dev/load/*
+*/dev/test/*
+*/dev/uml/*
+*/dev/xdebug/*
+*/doc/dev/dolibarr-phpdoc/*
+*/doc/dev/barcode/*
+*/doc/dev/compta/*
+*/doc/dev/dbmodel/*
+*/doc/dev/normes/*
+*/doc/dev/html/*
+*/doc/dev/iso-normes/*
+*/doc/flyer/*
+*/doc/font/*
+*/doc/rollup/*
+*/doc/tshirt/*
+*/doc/wiki/*
+*/document/*
+*/documents/*
+*/htdocs/avoir/*
 */htdocs/conf/conf.php
 */htdocs/conf/conf.php.mysql
 */htdocs/conf/conf.php.old
 */htdocs/conf/conf.php.postgres
+*/htdocs/custom/*
+*/htdocs/custom2/*
+*/htdocs/document/*
+*/htdocs/documents/*
+*/htdocs/includes/ckeditor/_source
+*/htdocs/includes/ckeditor/*_source.js
+*/htdocs/includes/fckeditor/_samples/*
+*/htdocs/includes/fckeditor/_testcases/*
+*/htdocs/includes/nusoap/samples/*
+*/htdocs/includes/phplot5/doc/*
+*/htdocs/includes/phplot5/examples/*
+*/htdocs/includes/scriptaculous/test/*
+*/htdocs/includes/treemenu/docs/*
+*/htdocs/includes/treemenu/images/*
+*/htdocs/includes/treemenu/imagesAlt/*
+*/htdocs/includes/treemenu/imagesAlt2/*
+*/htdocs/includes/tcpdf/fonts/utils/*
+*/htdocs/includes/tcpdf/fonts/free*.ctg.z
+*/htdocs/includes/tcpdf/fonts/free*.z
+*/test
+*/CVS/*
+*~
+*.#*
+*.buildpath*
+*.cache*
+*.cvsignore*
+*.gitignore*
+*.htaccess*
+*.settings*
+*.project*
+*.travis.yml*
+Thumbs.db
+data_dev.sql
 dolibarr*.tar.gz
 dolibarr*.tgz
 dolibarr*.exe
@@ -21,4 +67,5 @@ dolibarr*.rpm
 dolibarr*.deb
 dolibarr*.zip
 cvschangelogbuilder_dolibarr*
-dolibarr_install.log
+doxygen_warnings.log
+dolibarr_install.log

dev/codesniffer/jenkins_ruleset.xml

@@ -0,0 +1,247 @@
+<?xml version="1.0"?>
+<!DOCTYPE ruleset SYSTEM "ruleset.dtd">
+<ruleset name="Dolibarr">
+	<description>Dolibarr coding standard.</description>
+
+	<!-- List of all tests -->
+
+    <rule ref="Generic.CodeAnalysis.EmptyStatement" />
+ 
+	<rule ref="Generic.CodeAnalysis.EmptyStatement.NotAllowed">
+		<severity>0</severity>
+	</rule>
+	<rule ref="Generic.CodeAnalysis.EmptyStatement.NotAllowedWarning">
+		<severity>0</severity>
+	</rule>
+
+    <!-- <rule ref="Generic.CodeAnalysis.ForLoopShouldBeWhileLoop" /> -->
+
+    <rule ref="Generic.CodeAnalysis.ForLoopWithTestFunctionCall" />
+
+    <rule ref="Generic.CodeAnalysis.JumbledIncrementer" />
+
+    <rule ref="Generic.CodeAnalysis.UnconditionalIfStatement" />
+
+    <rule ref="Generic.CodeAnalysis.UnnecessaryFinalModifier" />
+
+    <rule ref="Generic.CodeAnalysis.UnusedFunctionParameter" />
+    <rule ref="Generic.CodeAnalysis.UnusedFunctionParameter.Found">
+		<severity>0</severity>
+    </rule>
+
+    <rule ref="Generic.CodeAnalysis.UselessOverridingMethod" />
+    
+    <!--
+    <rule ref="Generic.Commenting.Todo" />
+    -->
+
+	<!-- Warning if action on same line than if -->
+	<!--
+		<rule ref="Generic.ControlStructures.InlineControlStructure">
+		<properties> <property name="error" value="false"/> </properties>
+		</rule>
+	-->
+
+	<!-- Lines can be 85 chars long, but never show errors -->
+	<rule ref="Generic.Files.LineLength">
+		<properties>
+			<property name="lineLimit" value="1000" />
+			<property name="absoluteLineLimit" value="0" />
+		</properties>
+	</rule>
+
+	<!-- Use Unix newlines -->
+	<rule ref="Generic.Files.LineEndings">
+		<properties>
+			<property name="eolChar" value="\n" />
+		</properties>
+	</rule>
+
+    <!-- To disallow several statements on same line -->
+	<!-- <rule ref="Generic.Formatting.DisallowMultipleStatements" /> -->
+
+	<!-- Have 2 chars padding maximum and always show as errors -->
+	<!--
+		<rule ref="Generic.Formatting.MultipleStatementAlignment">
+		<properties> <property name="maxPadding" value="2"/> <property
+		name="ignoreMultiLine" value="true"/> </properties> </rule>
+	-->
+
+	<rule ref="Generic.Formatting.SpaceAfterCast" />
+
+    <rule ref="Generic.Functions.CallTimePassByReference" />
+
+	<rule ref="Generic.Functions.FunctionCallArgumentSpacing" />
+	<rule ref="Generic.Functions.FunctionCallArgumentSpacing.NoSpaceAfterComma">
+		<severity>0</severity>
+	</rule>
+	<rule ref="Generic.Functions.FunctionCallArgumentSpacing.NoSpaceBeforeEquals">
+		<severity>0</severity>
+	</rule>
+	<rule ref="Generic.Functions.FunctionCallArgumentSpacing.NoSpaceAfterEquals">
+		<severity>0</severity>
+	</rule>
+	<rule ref="Generic.Functions.FunctionCallArgumentSpacing.TooMuchSpaceAfterComma">
+		<severity>0</severity>
+	</rule>
+
+    <!-- Tweaks to metrics -->
+    <rule ref="Generic.Metrics.CyclomaticComplexity">
+        <properties>
+            <property name="complexity" value="80" />
+            <property name="absoluteComplexity" value="200" />
+        </properties>
+    </rule>
+    <rule ref="Generic.Metrics.NestingLevel">
+        <properties>
+            <property name="nestingLevel" value="10" />
+            <property name="absoluteNestingLevel" value="50" />
+        </properties>
+    </rule>
+
+	<rule ref="Generic.NamingConventions.ConstructorName" />
+	<!-- Check if we use PHP4 constructor instead of __construct() -->
+	<rule ref="Generic.NamingConventions.ConstructorName.OldStyle" />
+
+	<rule ref="Generic.NamingConventions.UpperCaseConstantName" />
+
+    <rule ref="Generic.PHP.DeprecatedFunctions" />
+    <rule ref="Generic.PHP.DeprecatedFunctions.Deprecated">
+        <severity>0</severity>
+    </rule>
+	
+	<rule ref="Generic.PHP.DisallowShortOpenTag" />
+
+    <rule ref="Generic.PHP.ForbiddenFunctions" />
+
+    <!-- Warning when using @ before functions -->
+    <!-- <rule ref="Generic.PHP.NoSilencedErrors" /> -->
+
+	<!-- Say if null, true, false must be uppercase -->
+	<!-- <rule ref="Generic.PHP.UpperCaseConstant" /> -->
+
+	<rule ref="Generic.Strings.UnnecessaryStringConcat" />
+
+	<rule ref="Generic.Strings.UnnecessaryStringConcat.Found">
+        <severity>0</severity>
+	</rule>
+    
+    <rule ref="Generic.VersionControl.SubversionProperties" />
+
+	<!-- Disallow usage of tab -->
+	<!--  <rule ref="Generic.WhiteSpace.DisallowTabIndent" /> -->
+
+	<!-- Check indent are done with spaces and wiht correct number -->
+	<!-- Disabled as this does not support tab -->
+	<!-- <rule ref="Generic.WhiteSpace.ScopeIndent" /> -->
+
+	<rule ref="PEAR.Classes.ClassDeclaration" />
+
+    <!-- Check for duplicate class names -->
+    <!-- <rule ref="Generic.Classes.DuplicateClassName" /> -->
+
+    <rule ref="PEAR.Commenting.ClassComment" />
+    <rule ref="PEAR.Commenting.ClassComment.MissingTag">
+        <severity>0</severity>
+    </rule>
+    
+    <!-- 
+    <rule ref="PEAR.Commenting.FileComment" />
+    <rule ref="PEAR.Commenting.FileComment.WrongStyle">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.FileComment.MissingVersion">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.FileComment.MissingTag">
+        <severity>0</severity>
+    </rule>
+    -->
+    <rule ref="PEAR.Commenting.FunctionComment.WrongStyle">
+        <severity>0</severity>
+    </rule>
+    
+    <rule ref="PEAR.Commenting.FunctionComment.Empty">
+        <severity>5</severity>
+    </rule>
+    
+    <rule ref="PEAR.Commenting.FunctionComment" />
+    <rule ref="PEAR.Commenting.FunctionComment.SpacingBeforeParamType">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.FunctionComment.SpacingAfterLongType">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.FunctionComment.SpacingAfterLongName">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.FunctionComment.SpacingAfterParams">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.FunctionComment.ParameterCommentsNotAligned">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.FunctionComment.ParameterNamesNotAligned">
+        <severity>0</severity>
+    </rule>
+
+    <rule ref="PEAR.Commenting.InlineComment" />
+
+	<!-- <rule ref="PEAR.ControlStructures.ControlSignature" /> -->
+
+	<!-- <rule ref="PEAR.ControlStructures.MultiLineCondition" /> -->
+
+	<!-- Test if () are removed for includes -->
+	<!-- <rule ref="PEAR.Files.IncludingFile"/> -->
+
+	<rule ref="PEAR.Formatting.MultiLineAssignment" />
+
+	<rule ref="PEAR.Functions.FunctionCallSignature" />
+
+	<rule ref="PEAR.Functions.FunctionCallSignature.Indent">
+	    <severity>0</severity>
+	</rule>
+	
+	<rule ref="PEAR.Functions.ValidDefaultValue" />
+
+	<rule ref="PEAR.NamingConventions.ValidClassName" />
+	<rule ref="PEAR.NamingConventions.ValidClassName.Invalid">
+        <severity>0</severity>
+	</rule>
+	
+	<rule ref="PEAR.NamingConventions.ValidClassName.StartWithCaptial">
+        <severity>0</severity>
+	</rule>
+
+	<rule ref="PEAR.NamingConventions.ValidFunctionName" />
+	<rule ref="PEAR.NamingConventions.ValidFunctionName.FunctionNameInvalid">
+        <severity>0</severity>
+	</rule>
+	<rule ref="PEAR.NamingConventions.ValidFunctionName.FunctionNoCaptial">
+        <severity>0</severity>
+	</rule>
+	<rule ref="PEAR.NamingConventions.ValidFunctionName.NotCamelCaps">
+        <severity>0</severity>
+	</rule>
+	<rule ref="PEAR.NamingConventions.ValidFunctionName.PrivateNoUnderscore">
+        <severity>0</severity>
+	</rule>
+
+	<rule ref="PEAR.NamingConventions.ValidVariableName" />
+
+	<rule ref="PEAR.WhiteSpace.ObjectOperatorIndent" />
+
+	<!-- Need to be commented to be disabled
+	<rule ref="PEAR.WhiteSpace.ScopeClosingBrace">
+        <severity>0</severity>
+    </rule>
+	
+    <rule ref="PEAR.WhiteSpace.ScopeClosingBrace.Line">
+        <severity>0</severity>
+    </rule>
+	-->
+    
+    <!-- Already found as a Generic rule -->
+	<!-- <rule ref="PEAR.WhiteSpace.ScopeIndent" /> -->
+
+</ruleset>

dev/codesniffer/ruleset.xml

@@ -5,11 +5,7 @@
 
 	<!-- List of all tests -->
 
-	<rule ref="Internal.NoCodeFound">
-		<severity>0</severity>
-	</rule>
-
-	<rule ref="Generic.CodeAnalysis.EmptyStatement" />
+    <rule ref="Generic.CodeAnalysis.EmptyStatement" />
  
 	<rule ref="Generic.CodeAnalysis.EmptyStatement.NotAllowed">
 		<severity>0</severity>
@@ -215,14 +211,10 @@
         <severity>0</severity>
 	</rule>
 	
-	<rule ref="PEAR.NamingConventions.ValidClassName.StartWithCapital">
-        <severity>0</severity>
-	</rule>
-	<!-- some phpcs have a typo error in rule, so we add it too -->
 	<rule ref="PEAR.NamingConventions.ValidClassName.StartWithCaptial">
         <severity>0</severity>
 	</rule>
-	
+
 	<rule ref="PEAR.NamingConventions.ValidFunctionName" />
 	<rule ref="PEAR.NamingConventions.ValidFunctionName.FunctionNameInvalid">
         <severity>0</severity>

dev/dolibarr_changes.txt

@@ -25,19 +25,18 @@ Replace call to serialize_val with no bugged value
 
 TCPDF:
 ------
-* Removed all fonts except 
-    dejavusans* (used by greek, arab, persan, romanian, turkish), 
-    freemono* (russian), 
-    cid*+msungstdlight+stsongstdlight+uni2cid* (chinese), 
-    helvetica* (all other languages),
-    zapfdingbats.php (for special chars like form checkboxes)
-* Removed useless directories (examples, tools)
-* Fix
- 	// initialize subsetchars
-	$subsetchars = array();
-into
-	// initialize subsetchars
-	$subsetchars = array_fill(0, 256, true);
+* To be compatible with FPDF, replace line
+public function MultiCell($w, $h, $txt, $border=0, $align='J', $fill=false, $ln=1, $x='', $y='', $reseth=true, $stretch=0, $ishtml=false, $autopadding=true, $maxh=0, $valign='T', $fitcell=false) {
+by
+public function MultiCell($w, $h, $txt, $border=0, $align='J', $fill=false, $ln=1, $x='', $y='', $reseth=true, $stretch=0, $ishtml=false, $autopadding=false, $maxh=0, $valign='T', $fitcell=false) {
+
+* Removed all fonts except dejavu* (used by greek, arab, persan, romanian, turkish), freemono* (russian), stsongstdlight* (chinese), helvetica* (all other) and useless directories (fonts/utils, docs, cache, images)
+
+* Replace in tcpdf_config.php
+define ('K_PATH_CACHE', K_PATH_MAIN.'cache/');
+with
+define ('K_PATH_CACHE', DOL_DATA_ROOT.'/admin/temp/');
+dol_mkdir(K_PATH_CACHE);
 
 
 JSGANTT:

dev/findutf8bomincludes.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+#
+# Checks if files contains UTF-8 BOM
+# in dolibarr includes tree excluding
+# git repository
+#
+# Raphaël Doursenaud - rdoursenaud@gpcsolutions.fr
+grep -rlI \
+--exclude-dir='.git' \
+$'\xEF\xBB\xBF' htdocs/includes

dev/fixdosfiles.sh

@@ -16,13 +16,13 @@ fi
 # To detec
 if [ "x$1" = "xlist" ]
 then
-	find . \( -iname "*.php" -o -iname "*.sh" -o -iname "*.cml" -o -iname "*.css" -o -iname "*.js" -o -iname "*.lang" -o -iname "*.pl" -o -iname "*.txt" \) -exec file "{}" + | grep -v 'htdocs\/includes' | grep CRLF
+	find . \( -iname "*.php" -o -iname "*.sh" -o -iname "*.pl" -o -iname "*.lang" -o -iname "*.txt" \) -exec file "{}" + | grep -v 'htdocs\/includes' | grep CRLF
 fi
 
 # To convert
 if [ "x$1" = "xfix" ]
 then
-	for fic in `find . \( -iname "*.php" -o -iname "*.sh" -o -iname "*.cml" -o -iname "*.css" -o -iname "*.js" -o -iname "*.lang" -o -iname "*.pl" -o -iname "*.txt" \) -exec file "{}" + | grep -v 'htdocs\/includes' | grep CRLF | awk -F':' '{ print $1 }' `
+	for fic in `find . \( -iname "*.php" -o -iname "*.sh" -o -iname "*.pl" -o -iname "*.lang" -o -iname "*.txt" \) -exec file "{}" + | grep -v 'htdocs\/includes' | grep CRLF | awk -F':' '{ print $1 }' `
 	do
 		echo "Fix file $fic"
 		dos2unix $fic

dev/fixnotabfiles.sh

@@ -1,26 +0,0 @@
-#!/bin/sh
-#------------------------------------------------------
-# Script to find files that are not Unix encoded
-#
-# Laurent Destailleur - eldy@users.sourceforge.net
-#------------------------------------------------------
-# Usage: fixnotabfiles.sh [list|fix]
-#------------------------------------------------------
-
-# Syntax
-if [ "x$1" != "xlist" -a "x$1" != "xfix" ]
-then
-	echo "Usage: fixnotabfiles.sh [list|fix]"
-fi
-
-# To detec
-if [ "x$1" = "xlist" ]
-then
-	find build \( -iname "*.sh" -o -iname "*.spec" \) -exec grep -l -P '\t' {} \;
-fi
-
-# To convert
-if [ "x$1" = "xfix" ]
-then
-	echo Feature not implemented. Please fix files manually.
-fi

dev/initdata/generate-commande.php

@@ -186,7 +186,7 @@ for ($s = 0 ; $s < GEN_NUMBER_COMMANDE ; $s++)
                 $prodid = rand(1, $num_prods);
                 $product=new Product($db);
                 $result=$product->fetch($prodids[$prodid]);
-                $result=$com->addline($product->description, $product->price, rand(1,5), 0, 0, 0, $prodids[$prodid], 0, 0, 0,  $product->price_base_type, $product->price_ttc, '', '', $product->type);
+                $result=$com->addline($com->id, $product->description, $product->price, 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);

dev/initdata/generate-facture.php

@@ -112,12 +112,8 @@ while ($i < GEN_NUMBER_FACTURE && $result >= 0)
 				$prodid = rand(1, $num_prods);
 				$product=new Product($db);
 				$result=$product->fetch($prodids[$prodid]);
-				$result=$facture->addline($product->description, $product->price, 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);
-                }
-                $xnbp++;
+				$result=$facture->addline($facture->id,$product->description,$product->price, rand(1,5), 0, 0, 0, $prodids[$prodid], 0, '', '', 0, 0, '', $product->price_base_type, $product->price_ttc, $product->type);
+				$xnbp++;
 			}
 
 			print " OK with ref ".$facture->ref."\n";;

dev/initdata/generate-propale.php

@@ -143,9 +143,7 @@ while ($i < GEN_NUMBER_PROPAL && $result >= 0)
 		while ($xnbp < $nbp)
 		{
 			$prodid = rand(1, $num_prods);
-			$product=new Product($db);
-			$result=$product->fetch($prodids[$prodid]);
-			$result=$propal->addline($product->description, $product->price, rand(1,5), 0, 0, 0, $prodids[$prodid], 0);
+			$result=$propal->addline($propal->id, 'Description '.$xnbp, '100', rand(1,5), '19.6', 0, 0, $prodids[$prodid], 0);
 			if ($result < 0)
 			{
 				dol_print_error($db,$propal->error);

dev/initdata/generate-societe.php

@@ -99,8 +99,8 @@ for ($s = 0 ; $s < GEN_NUMBER_SOCIETE ; $s++)
     $soc->country_id=1;
     $soc->country_code='FR';
 	// Un client sur 3 a une remise de 5%
-    $user_remise=rand(1,3); if ($user_remise==3) $soc->remise_percent=5;
-	print "> client=".$soc->client.", fournisseur=".$soc->fournisseur.", remise=".$soc->remise_percent."\n";
+    $user_remise=rand(1,3); if ($user_remise==3) $soc->remise_client=5;
+	print "> client=".$soc->client.", fournisseur=".$soc->fournisseur.", remise=".$soc->remise_client."\n";
 	$soc->note='Company created by the script generate-societe.php';
     $socid = $soc->create();
 

dev/initdata/savedemo.sh

@@ -171,14 +171,12 @@ export list="
     --ignore-table=$base.llx_abonne_extrafields 
     --ignore-table=$base.llx_abonne_type
     --ignore-table=$base.llx_abonnement 
-	--ignore-table=$base.llx_bootstrap
 	--ignore-table=$base.llx_bt_namemap
 	--ignore-table=$base.llx_bt_speedlimit
 	--ignore-table=$base.llx_bt_summary
 	--ignore-table=$base.llx_bt_timestamps
 	--ignore-table=$base.llx_bt_webseedfiles
 	--ignore-table=$base.llx_dolicloud_customers
-	--ignore-table=$base.llx_dolicloud_stats
 	--ignore-table=$base.llx_c_dolicloud_plans
 	--ignore-table=$base.llx_cabinetmed_c_banques
 	--ignore-table=$base.llx_cabinetmed_c_ccam
@@ -191,15 +189,9 @@ export list="
 	--ignore-table=$base.llx_cabinetmed_motifcons
 	--ignore-table=$base.llx_cabinetmed_patient
 	--ignore-table=$base.llx_cabinetmed_societe
-	--ignore-table=$base.llx_fournisseur_ca
-	--ignore-table=$base.llx_google_maps
-	--ignore-table=$base.llx_pos_paiement_ticket
-	--ignore-table=$base.llx_pos_places
-	--ignore-table=$base.llx_pos_ticket
 	--ignore-table=$base.llx_publi_c_contact_list 
 	--ignore-table=$base.llx_publi_c_dnd_list
-	--ignore-table=$base.llx_publi_c_method_list
-	--ignore-table=$base.llx_ultimatepdf 
+	--ignore-table=$base.llx_publi_c_method_list 
 	" 
 echo "mysqldump -P$port -u$admin -p***** $list $base > $mydir/$dumpfile"
 mysqldump -P$port -u$admin $passwd $list $base > $mydir/$dumpfile

dev/iso-normes/countries_iso-3166_en.txt

@@ -10,7 +10,7 @@
 # ISO-3166 alpha 3: http://en.wikipedia.org/wiki/ISO_3166-1_alpha-3
 
 AFGHANISTAN;AF
-ÅLAND ISLANDS;AX
+<EFBFBD>LAND ISLANDS;AX
 ALBANIA;AL
 ALGERIA;DZ
 AMERICAN SAMOA;AS
@@ -62,7 +62,7 @@ CONGO;CG
 CONGO, THE DEMOCRATIC REPUBLIC OF THE;CD
 COOK ISLANDS;CK
 COSTA RICA;CR
-CÔTE D'IVOIRE;CI
+C<EFBFBD>TE D'IVOIRE;CI
 CROATIA;HR
 CUBA;CU
 CYPRUS;CY
@@ -192,7 +192,7 @@ REUNION;RE
 ROMANIA;RO
 RUSSIAN FEDERATION;RU
 RWANDA;RW
-SAINT BARTHÉLEMY;BL
+SAINT BARTH<EFBFBD>LEMY;BL
 SAINT HELENA;SH
 SAINT KITTS AND NEVIS;KN
 SAINT LUCIA;LC

dev/iso-normes/countries_iso-3166_fr.txt

@@ -11,118 +11,118 @@
 
 AFGHANISTAN;AF
 AFRIQUE DU SUD;ZA
-ÅLAND, ÎLES;AX
+<EFBFBD>LAND, <EFBFBD>LES;AX
 ALBANIE;AL
-ALGÉRIE;DZ
+ALG<EFBFBD>RIE;DZ
 ALLEMAGNE;DE
 ANDORRE;AD
 ANGOLA;AO
 ANGUILLA;AI
 ANTARCTIQUE;AQ
 ANTIGUA-ET-BARBUDA;AG
-ANTILLES NÉERLANDAISES;AN
+ANTILLES N<EFBFBD>ERLANDAISES;AN
 ARABIE SAOUDITE;SA
 ARGENTINE;AR
-ARMÉNIE;AM
+ARM<EFBFBD>NIE;AM
 ARUBA;AW
 AUSTRALIE;AU
 AUTRICHE;AT
-AZERBAÏDJAN;AZ
+AZERBA<EFBFBD>DJAN;AZ
 BAHAMAS;BS
-BAHREÏN;BH
+BAHRE<EFBFBD>N;BH
 BANGLADESH;BD
 BARBADE;BB
-BÉLARUS;BY
+B<EFBFBD>LARUS;BY
 BELGIQUE;BE
 BELIZE;BZ
-BÉNIN;BJ
+B<EFBFBD>NIN;BJ
 BERMUDES;BM
 BHOUTAN;BT
 BOLIVIE;BO
-BOSNIE-HERZÉGOVINE;BA
+BOSNIE-HERZ<EFBFBD>GOVINE;BA
 BOTSWANA;BW
-BOUVET, ÎLE;BV
-BRÉSIL;BR
-BRUNÉI DARUSSALAM;BN
+BOUVET, <EFBFBD>LE;BV
+BR<EFBFBD>SIL;BR
+BRUN<EFBFBD>I DARUSSALAM;BN
 BULGARIE;BG
 BURKINA FASO;BF
 BURUNDI;BI
-CAÏMANES, ÎLES;KY
+CA<EFBFBD>MANES, <EFBFBD>LES;KY
 CAMBODGE;KH
 CAMEROUN;CM
 CANADA;CA
 CAP-VERT;CV
-CENTRAFRICAINE, RÉPUBLIQUE;CF
+CENTRAFRICAINE, R<EFBFBD>PUBLIQUE;CF
 CHILI;CL
 CHINE;CN
-CHRISTMAS, ÎLE;CX
+CHRISTMAS, <EFBFBD>LE;CX
 CHYPRE;CY
-COCOS (KEELING), ÎLES;CC
+COCOS (KEELING), <EFBFBD>LES;CC
 COLOMBIE;CO
 COMORES;KM
 CONGO;CG
-CONGO, LA RÉPUBLIQUE DÉMOCRATIQUE DU;CD
-COOK, ÎLES;CK
-CORÉE, RÉPUBLIQUE DE;KR
-CORÉE, RÉPUBLIQUE POPULAIRE DÉMOCRATIQUE DE;KP
+CONGO, LA R<EFBFBD>PUBLIQUE D<EFBFBD>MOCRATIQUE DU;CD
+COOK, <EFBFBD>LES;CK
+COR<EFBFBD>E, R<EFBFBD>PUBLIQUE DE;KR
+COR<EFBFBD>E, R<EFBFBD>PUBLIQUE POPULAIRE D<EFBFBD>MOCRATIQUE DE;KP
 COSTA RICA;CR
-CÔTE D'IVOIRE;CI
+C<EFBFBD>TE D'IVOIRE;CI
 CROATIE;HR
 CUBA;CU
 DANEMARK;DK
 DJIBOUTI;DJ
-DOMINICAINE, RÉPUBLIQUE;DO
+DOMINICAINE, R<EFBFBD>PUBLIQUE;DO
 DOMINIQUE;DM
-ÉGYPTE;EG
+<EFBFBD>GYPTE;EG
 EL SALVADOR;SV
-ÉMIRATS ARABES UNIS;AE
-ÉQUATEUR;EC
-ÉRYTHRÉE;ER
+<EFBFBD>MIRATS ARABES UNIS;AE
+<EFBFBD>QUATEUR;EC
+<EFBFBD>RYTHR<EFBFBD>E;ER
 ESPAGNE;ES
 ESTONIE;EE
-ÉTATS-UNIS;US
-ÉTHIOPIE;ET
-FALKLAND, ÎLES (MALVINAS);FK
-FÉROÉ, ÎLES;FO
+<EFBFBD>TATS-UNIS;US
+<EFBFBD>THIOPIE;ET
+FALKLAND, <EFBFBD>LES (MALVINAS);FK
+F<EFBFBD>RO<EFBFBD>, <EFBFBD>LES;FO
 FIDJI;FJ
 FINLANDE;FI
 FRANCE;FR
 GABON;GA
 GAMBIE;GM
-GÉORGIE;GE
-GÉORGIE DU SUD ET LES ÎLES SANDWICH DU SUD;GS
+G<EFBFBD>ORGIE;GE
+G<EFBFBD>ORGIE DU SUD ET LES <EFBFBD>LES SANDWICH DU SUD;GS
 GHANA;GH
 GIBRALTAR;GI
-GRÈCE;GR
+GR<EFBFBD>CE;GR
 GRENADE;GD
 GROENLAND;GL
 GUADELOUPE;GP
 GUAM;GU
 GUATEMALA;GT
 GUERNESEY;GG
-GUINÉE;GN
-GUINÉE-BISSAU;GW
-GUINÉE ÉQUATORIALE;GQ
+GUIN<EFBFBD>E;GN
+GUIN<EFBFBD>E-BISSAU;GW
+GUIN<EFBFBD>E <EFBFBD>QUATORIALE;GQ
 GUYANA;GY
-GUYANE FRANÇAISE;GF
-HAÏTI;HT
-HEARD, ÎLE ET MCDONALD, ÎLES;HM
+GUYANE FRAN<EFBFBD>AISE;GF
+HA<EFBFBD>TI;HT
+HEARD, <EFBFBD>LE ET MCDONALD, <EFBFBD>LES;HM
 HONDURAS;HN
 HONG-KONG;HK
 HONGRIE;HU
-ÎLE DE MAN;IM
-ÎLES MINEURES ÉLOIGNÉES DES ÉTATS-UNIS;UM
-ÎLES VIERGES BRITANNIQUES;VG
-ÎLES VIERGES DES ÉTATS-UNIS;VI
+<EFBFBD>LE DE MAN;IM
+<EFBFBD>LES MINEURES <EFBFBD>LOIGN<EFBFBD>ES DES <EFBFBD>TATS-UNIS;UM
+<EFBFBD>LES VIERGES BRITANNIQUES;VG
+<EFBFBD>LES VIERGES DES <EFBFBD>TATS-UNIS;VI
 INDE;IN
-INDONÉSIE;ID
-IRAN, RÉPUBLIQUE ISLAMIQUE D';IR
+INDON<EFBFBD>SIE;ID
+IRAN, R<EFBFBD>PUBLIQUE ISLAMIQUE D';IR
 IRAQ;IQ
 IRLANDE;IE
 ISLANDE;IS
-ISRAËL;IL
+ISRA<EFBFBD>L;IL
 ITALIE;IT
-JAMAÏQUE;JM
+JAMA<EFBFBD>QUE;JM
 JAPON;JP
 JERSEY;JE
 JORDANIE;JO
@@ -130,120 +130,120 @@ KAZAKHSTAN;KZ
 KENYA;KE
 KIRGHIZISTAN;KG
 KIRIBATI;KI
-KOWEÏT;KW
-LAO, RÉPUBLIQUE DÉMOCRATIQUE POPULAIRE;LA
+KOWE<EFBFBD>T;KW
+LAO, R<EFBFBD>PUBLIQUE D<EFBFBD>MOCRATIQUE POPULAIRE;LA
 LESOTHO;LS
 LETTONIE;LV
 LIBAN;LB
-LIBÉRIA;LR
+LIB<EFBFBD>RIA;LR
 LIBYENNE, JAMAHIRIYA ARABE;LY
 LIECHTENSTEIN;LI
 LITUANIE;LT
 LUXEMBOURG;LU
 MACAO;MO
-MACÉDOINE, L'EX-RÉPUBLIQUE YOUGOSLAVE DE;MK
+MAC<EFBFBD>DOINE, L'EX-R<EFBFBD>PUBLIQUE YOUGOSLAVE DE;MK
 MADAGASCAR;MG
 MALAISIE;MY
 MALAWI;MW
 MALDIVES;MV
 MALI;ML
 MALTE;MT
-MARIANNES DU NORD, ÎLES;MP
+MARIANNES DU NORD, <EFBFBD>LES;MP
 MAROC;MA
-MARSHALL, ÎLES;MH
+MARSHALL, <EFBFBD>LES;MH
 MARTINIQUE;MQ
 MAURICE;MU
 MAURITANIE;MR
 MAYOTTE;YT
 MEXIQUE;MX
-MICRONÉSIE, ÉTATS FÉDÉRÉS DE;FM
-MOLDOVA, RÉPUBLIQUE DE;MD
+MICRON<EFBFBD>SIE, <EFBFBD>TATS F<EFBFBD>D<EFBFBD>R<EFBFBD>S DE;FM
+MOLDOVA, R<EFBFBD>PUBLIQUE DE;MD
 MONACO;MC
 MONGOLIE;MN
-MONTÉNÉGRO;ME
+MONT<EFBFBD>N<EFBFBD>GRO;ME
 MONTSERRAT;MS
 MOZAMBIQUE;MZ
 MYANMAR;MM
 NAMIBIE;NA
 NAURU;NR
-NÉPAL;NP
+N<EFBFBD>PAL;NP
 NICARAGUA;NI
 NIGER;NE
-NIGÉRIA;NG
-NIUÉ;NU
-NORFOLK, ÎLE;NF
-NORVÈGE;NO
-NOUVELLE-CALÉDONIE;NC
-NOUVELLE-ZÉLANDE;NZ
-OCÉAN INDIEN, TERRITOIRE BRITANNIQUE DE L';IO
+NIG<EFBFBD>RIA;NG
+NIU<EFBFBD>;NU
+NORFOLK, <EFBFBD>LE;NF
+NORV<EFBFBD>GE;NO
+NOUVELLE-CAL<EFBFBD>DONIE;NC
+NOUVELLE-Z<EFBFBD>LANDE;NZ
+OC<EFBFBD>AN INDIEN, TERRITOIRE BRITANNIQUE DE L';IO
 OMAN;OM
 OUGANDA;UG
-OUZBÉKISTAN;UZ
+OUZB<EFBFBD>KISTAN;UZ
 PAKISTAN;PK
 PALAOS;PW
-PALESTINIEN OCCUPÉ, TERRITOIRE;PS
+PALESTINIEN OCCUP<EFBFBD>, TERRITOIRE;PS
 PANAMA;PA
-PAPOUASIE-NOUVELLE-GUINÉE;PG
+PAPOUASIE-NOUVELLE-GUIN<EFBFBD>E;PG
 PARAGUAY;PY
 PAYS-BAS;NL
-PÉROU;PE
+P<EFBFBD>ROU;PE
 PHILIPPINES;PH
 PITCAIRN;PN
 POLOGNE;PL
-POLYNÉSIE FRANÇAISE;PF
+POLYN<EFBFBD>SIE FRAN<EFBFBD>AISE;PF
 PORTO RICO;PR
 PORTUGAL;PT
 QATAR;QA
-RÉUNION;RE
+R<EFBFBD>UNION;RE
 ROUMANIE;RO
 ROYAUME-UNI;GB
-RUSSIE, FÉDÉRATION DE;RU
+RUSSIE, F<EFBFBD>D<EFBFBD>RATION DE;RU
 RWANDA;RW
 SAHARA OCCIDENTAL;EH
-SAINT-BARTHÉLEMY;BL
-SAINTE-HÉLÈNE;SH
+SAINT-BARTH<EFBFBD>LEMY;BL
+SAINTE-H<EFBFBD>L<EFBFBD>NE;SH
 SAINTE-LUCIE;LC
 SAINT-KITTS-ET-NEVIS;KN
 SAINT-MARIN;SM
 SAINT-MARTIN;MF
 SAINT-PIERRE-ET-MIQUELON;PM
-SAINT-SIÈGE (ÉTAT DE LA CITÉ DU VATICAN);VA
+SAINT-SI<EFBFBD>GE (<EFBFBD>TAT DE LA CIT<EFBFBD> DU VATICAN);VA
 SAINT-VINCENT-ET-LES GRENADINES;VC
-SALOMON, ÎLES;SB
+SALOMON, <EFBFBD>LES;SB
 SAMOA;WS
-SAMOA AMÉRICAINES;AS
-SAO TOMÉ-ET-PRINCIPE;ST
-SÉNÉGAL;SN
+SAMOA AM<EFBFBD>RICAINES;AS
+SAO TOM<EFBFBD>-ET-PRINCIPE;ST
+S<EFBFBD>N<EFBFBD>GAL;SN
 SERBIE;RS
 SEYCHELLES;SC
 SIERRA LEONE;SL
 SINGAPOUR;SG
 SLOVAQUIE;SK
-SLOVÉNIE;SI
+SLOV<EFBFBD>NIE;SI
 SOMALIE;SO
 SOUDAN;SD
 SRI LANKA;LK
-SUÈDE;SE
+SU<EFBFBD>DE;SE
 SUISSE;CH
 SURINAME;SR
-SVALBARD ET ÎLE JAN MAYEN;SJ
+SVALBARD ET <EFBFBD>LE JAN MAYEN;SJ
 SWAZILAND;SZ
-SYRIENNE, RÉPUBLIQUE ARABE;SY
+SYRIENNE, R<EFBFBD>PUBLIQUE ARABE;SY
 TADJIKISTAN;TJ
-TAÏWAN, PROVINCE DE CHINE;TW
-TANZANIE, RÉPUBLIQUE-UNIE DE;TZ
+TA<EFBFBD>WAN, PROVINCE DE CHINE;TW
+TANZANIE, R<EFBFBD>PUBLIQUE-UNIE DE;TZ
 TCHAD;TD
-TCHÈQUE, RÉPUBLIQUE;CZ
-TERRES AUSTRALES FRANÇAISES;TF
-THAÏLANDE;TH
+TCH<EFBFBD>QUE, R<EFBFBD>PUBLIQUE;CZ
+TERRES AUSTRALES FRAN<EFBFBD>AISES;TF
+THA<EFBFBD>LANDE;TH
 TIMOR-LESTE;TL
 TOGO;TG
 TOKELAU;TK
 TONGA;TO
-TRINITÉ-ET-TOBAGO;TT
+TRINIT<EFBFBD>-ET-TOBAGO;TT
 TUNISIE;TN
-TURKMÉNISTAN;TM
-TURKS ET CAÏQUES, ÎLES;TC
+TURKM<EFBFBD>NISTAN;TM
+TURKS ET CA<EFBFBD>QUES, <EFBFBD>LES;TC
 TURQUIE;TR
 TUVALU;TV
 UKRAINE;UA
@@ -252,6 +252,6 @@ VANUATU;VU
 VENEZUELA;VE
 VIET NAM;VN
 WALLIS ET FUTUNA;WF
-YÉMEN;YE
+Y<EFBFBD>MEN;YE
 ZAMBIE;ZM
 ZIMBABWE;ZW

dev/iso-normes/currencies_iso-4217.txt

@@ -135,7 +135,7 @@ SKK,Slovak Koruna,2
 SLL,Sierra Leone Leone,2
 SOS,Somali Shilling,2
 SRD,Surinam Dollar,2
-STD,São Tome and Principe Dobra,2
+STD,S<EFBFBD>o Tome and Principe Dobra,2
 SVC,El Salvador Colon,2
 SYP,Syrian Pound,2
 SZL,Swaziland Lilangeni,2

dev/iso-normes/locales.txt

@@ -1,9 +1,2 @@
 
-For languages:
-http://demo.icu-project.org/icu-bin/locexp?d_=fr
-
-For format number:
-http://en.wikipedia.org/wiki/Decimal_mark
-
-For date format:
-http://en.wikipedia.org/wiki/Date_format_by_country
+See page http://demo.icu-project.org/icu-bin/locexp?d_=fr

dev/iso-normes/vat_number_names.txt

@@ -1 +0,0 @@
-http://en.wikipedia.org/wiki/VAT_identification_number

dev/resize_window.sh

@@ -8,7 +8,7 @@
 # Syntax
 if [ "x$1" = "x" ]
 then
-	echo "resize_windows.sh (list|0x99999999) [1280 1024]"
+	echo "resize_windows.sh (list|0x99999999)"
 fi
 
 # To list all windows
@@ -20,19 +20,7 @@ fi
 # To resize a specific window
 if [ "x$1" != "xlist" -a "x$1" != "x" ]
 then
-	if [ "x$2" = "x" ]
-	then
-		width=1280
-	else
-		width=$2
-	fi
-	if [ "x$3" = "x" ]
-	then
-		height=1024
-	else
-		height=$3
-	fi
-	wmctrl -i -r $1 -e 0,0,0,$width,$height
-	echo Size of windows $1 modified to $width x $height
+	wmctrl -i -r $1 -e 0,0,0,1280,1024
+	echo Size of windows $1 modified
 fi
 

dev/skeletons/modMyModule.class.php

@@ -77,7 +77,7 @@ class modMyModule extends DolibarrModules
 		//							'login' => 0,                                    	// Set this to 1 if module has its own login method directory (core/login)
 		//							'substitutions' => 0,                            	// Set this to 1 if module has its own substitution function file (core/substitutions)
 		//							'menus' => 0,                                    	// Set this to 1 if module has its own menus handler directory (core/menus)
-		//							'theme' => 0,                                    	// Set this to 1 if module has its own theme directory (theme)
+		//							'theme' => 0,                                    	// Set this to 1 if module has its own theme directory (core/theme)
 		//                        	'tpl' => 0,                                      	// Set this to 1 if module overwrite template dir (core/tpl)
 		//							'barcode' => 0,                                  	// Set this to 1 if module has its own barcode directory (core/modules/barcode)
 		//							'models' => 0,                                   	// Set this to 1 if module has its own models directory (core/modules/xxx)
@@ -97,10 +97,8 @@ class modMyModule extends DolibarrModules
 		$this->config_page_url = array("mysetuppage.php@mymodule");
 
 		// Dependencies
-		$this->hidden = false;			// A condition to hide module
 		$this->depends = array();		// List of modules id that must be enabled if this module is enabled
 		$this->requiredby = array();	// List of modules id to disable if this one is disabled
-		$this->conflictwith = array();	// List of modules id this module is in conflict with
 		$this->phpmin = array(5,0);					// Minimum version of PHP required by module
 		$this->need_dolibarr_version = array(3,0);	// Minimum version of Dolibarr required by module
 		$this->langfiles = array("mylangfile@mymodule");
@@ -244,7 +242,7 @@ class modMyModule extends DolibarrModules
 	{
 		$sql = array();
 
-		$result=$this->_load_tables('/mymodule/sql/');
+		$result=$this->load_tables();
 
 		return $this->_init($sql, $options);
 	}
@@ -264,6 +262,19 @@ class modMyModule extends DolibarrModules
 		return $this->_remove($sql, $options);
 	}
 
+
+	/**
+	 *		Create tables, keys and data required by module
+	 * 		Files llx_table1.sql, llx_table1.key.sql llx_data.sql with create table, create keys
+	 * 		and create data commands must be stored in directory /mymodule/sql/
+	 *		This function is called by this->init
+	 *
+	 * 		@return		int		<=0 if KO, >0 if OK
+	 */
+	function load_tables()
+	{
+		return $this->_load_tables('/mymodule/sql/');
+	}
 }
 
-?>
+?>

dev/skeletons/skeleton_page.php

@@ -37,10 +37,12 @@
 
 // Change this following line to use the correct relative path (../, ../../, etc)
 $res=0;
-if (! $res && file_exists("../main.inc.php")) $res=@include '../main.inc.php';					// to work if your module directory is into dolibarr root htdocs directory
-if (! $res && file_exists("../../main.inc.php")) $res=@include '../../main.inc.php';			// to work if your module directory is into a subdir of root htdocs directory
+if (! $res && file_exists("../main.inc.php")) $res=@include '../main.inc.php';
+if (! $res && file_exists("../../main.inc.php")) $res=@include '../../main.inc.php';
+if (! $res && file_exists("../../../main.inc.php")) $res=@include '../../../main.inc.php';
 if (! $res && file_exists("../../../dolibarr/htdocs/main.inc.php")) $res=@include '../../../dolibarr/htdocs/main.inc.php';     // Used on dev env only
 if (! $res && file_exists("../../../../dolibarr/htdocs/main.inc.php")) $res=@include '../../../../dolibarr/htdocs/main.inc.php';   // Used on dev env only
+if (! $res && file_exists("../../../../../dolibarr/htdocs/main.inc.php")) $res=@include '../../../../../dolibarr/htdocs/main.inc.php';   // Used on dev env only
 if (! $res) die("Include of main fails");
 // Change this following line to use the correct relative path from htdocs
 dol_include_once('/module/class/skeleton_class.class.php');

dev/skeletons/skeleton_script.php

@@ -31,10 +31,10 @@ $path=dirname(__FILE__).'/';
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
     echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-	exit(-1);
+    exit;
 }
 
-// Global variables
+// Init global variables
 $version='1.0';
 $error=0;
 
@@ -57,10 +57,10 @@ if (! $result > 0) { dol_print_error('',$user->error); exit; }
 $user->getrights();
 
 
-print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
+print "***** ".$script_file." (".$version.") *****\n";
 if (! isset($argv[1])) {	// Check parameters
     print "Usage: ".$script_file." param1 param2 ...\n";
-	exit(-1);
+    exit;
 }
 print '--- start'."\n";
 print 'Argument 1='.$argv[1]."\n";
@@ -163,5 +163,5 @@ else
 
 $db->close();	// Close $db database opened handler
 
-exit($error);
-?>
+return $error;
+?>

dev/translation/autotranslator.class.php

@@ -154,14 +154,14 @@ class autoTranslator
 		if (isset($this->_translatedFiles[$file]) && count($this->_translatedFiles[$file])>0)
 		{
 			$fp = fopen($destPath, 'a');
-			fwrite($fp, "\n");
-			fwrite($fp, "\n");
-			fwrite($fp, "// START - Lines generated via autotranslator.php tool (".$this->_time.").\n");
-			fwrite($fp, "// Reference language: ".$this->_refLang." -> ".$my_destlang."\n");
+			fwrite($fp, "\r\n");
+			fwrite($fp, "\r\n");
+			fwrite($fp, "// START - Lines generated via autotranslator.php tool (".$this->_time.").\r\n");
+			fwrite($fp, "// Reference language: ".$this->_refLang." -> ".$my_destlang."\r\n");
 			foreach( $this->_translatedFiles[$file] as $line) {
-				fwrite($fp, $line . "\n");
+				fwrite($fp, $line . "\r\n");
 			}
-			fwrite($fp, "// STOP - Lines generated via autotranslator.php tool (".$this->_time_end.").\n");
+			fwrite($fp, "// STOP - Lines generated via autotranslator.php tool (".$this->_time_end.").\r\n");
 			fclose($fp);
 		}
 		return;
@@ -177,11 +177,11 @@ class autoTranslator
 	private function createTranslationFile($path,$my_destlang)
 	{
 		$fp = fopen($path, 'w+');
-		fwrite($fp, "/*\n");
-		fwrite($fp, " * Language code: {$my_destlang}\n");
-		fwrite($fp, " * Automatic generated via autotranslator.php tool\n");
-		fwrite($fp, " * Generation date " . $this->_time. "\n");
-		fwrite($fp, " */\n");
+		fwrite($fp, "/*\r\n");
+		fwrite($fp, " * Language code: {$my_destlang}\r\n");
+		fwrite($fp, " * Automatic generated via autotranslator.php tool\r\n");
+		fwrite($fp, " * Generation date " . $this->_time. "\r\n");
+		fwrite($fp, " */\r\n");
 		fclose($fp);
 		return;
 	}

dev/translation/txpull.sh

@@ -1,32 +0,0 @@
-#!/bin/sh
-#------------------------------------------------------
-# Script to pull language files to Transifex
-#
-# Laurent Destailleur - eldy@users.sourceforge.net
-#------------------------------------------------------
-# Usage: txpull.sh (all|xx_XX) [-r dolibarr.file] [-f]
-#------------------------------------------------------
-
-# Syntax
-if [ "x$1" = "x" ]
-then
-	echo "This pull remote transifex files to local dir."
-	echo "Note:  If you pull a language file (not source), file will be skipped if local file is newer."
-	echo "       Using -f will overwrite local file (does not work with 'all')."
-	echo "Usage: txpull.sh (all|xx_XX) [-r dolibarr.file] [-f]"
-	exit
-fi
-
-
-if [ "x$1" = "xall" ]
-then
-	for fic in ar_SA bg_BG ca_ES cs_CZ da_DK de_DE el_GR es_ES et_EE fa_IR fi_FI fr_FR he_IL hu_HU is_IS it_IT ja_JP ko_KR lv_LV nb_NO nl_NL pl_PL pt_PT ro_RO ru_RU ru_UA sk_SK sl_SI sv_SE tr_TR uz_UZ vi_VN zh_CN zh_TW
-	do
-		echo "tx pull -l $fic $2 $3"
-		tx pull -l $fic $2 $3
-	done
-else
-	echo "tx pull -l $1 $2 $3 $4"
-	tx pull -l $1 $2 $3 $4
-fi
-

dev/translation/txpush.sh

@@ -1,37 +0,0 @@
-#!/bin/sh
-#------------------------------------------------------
-# Script to push language files to Transifex
-#
-# Laurent Destailleur - eldy@users.sourceforge.net
-#------------------------------------------------------
-# Usage: txpush.sh (source|all|xx_XX) [-r dolibarr.file] [-f]
-#------------------------------------------------------
-
-# Syntax
-if [ "x$1" = "x" ]
-then
-	echo "This push local files to transifex."
-	echo "Note:  If you push a language file (not source), file will be skipped if transifex file is newer."
-	echo "       Using -f will overwrite translation but not memory."
-	echo "Usage: txpush.sh (source|all|xx_XX) [-r dolibarr.file] [-f] [--no-interactive]"
-	exit
-fi
-
-
-if [ "x$1" = "xall" ]
-then
-	for fic in ar_SA bg_BG ca_ES cs_CZ da_DK de_DE el_GR es_ES et_EE fa_IR fi_FI fr_FR he_IL hu_HU is_IS it_IT ja_JP ko_KR lv_LV nb_NO nl_NL pl_PL pt_PT ro_RO ru_RU ru_UA sk_SK sl_SI sv_SE tr_TR uz_UZ vi_VN zh_CN zh_TW
-	do
-		echo "tx push --skip -t -l $fic $2 $3"
-		tx push --skip -t -l $fic $2 $3
-	done
-else
-if [ "x$1" = "xsource" ]
-then
-	echo "tx push -s $2 $3"
-	tx push -s $2 $3 
-else
-	echo "tx push --skip -t -l $1 $2 $3 $4"
-	tx push --skip -t -l $1 $2 $3 $4
-fi
-fi

htdocs/.gitignore

@@ -2,7 +2,6 @@
 /custom*
 /extensions*
 /nltechno*
-/teclib*
 /bootstrap*
 /google*
 /multicompany*

htdocs/adherents/admin/adherent.php

@@ -102,8 +102,6 @@ if ($action == 'unset')
  * View
  */
 
-$form = new Form($db);
-
 $help_url='EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros';
 
 llxHeader('',$langs->trans("MembersSetup"),$help_url);
@@ -129,19 +127,23 @@ print '<td>'.$langs->trans("Value").'</td>';
 print '<td align="center">'.$langs->trans("Action").'</td>';
 print "</tr>\n";
 $var=true;
+$form = new Form($db);
 
 // Login/Pass required for members
-$var=!$var;
-print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<input type="hidden" name="action" value="update">';
-print '<input type="hidden" name="constname" value="ADHERENT_LOGIN_NOT_REQUIRED">';
-print '<tr '.$bc[$var].'><td>'.$langs->trans("AdherentLoginRequired").'</td><td>';
-print $form->selectyesno('constvalue',(! empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)?0:1),1);
-print '</td><td align="center" width="80">';
-print '<input type="submit" class="button" value="'.$langs->trans("Update").'" name="Button">';
-print "</td></tr>\n";
-print '</form>';
+if ($conf->global->MAIN_FEATURES_LEVEL > 0)
+{
+    $var=!$var;
+    print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<input type="hidden" name="action" value="update">';
+    print '<input type="hidden" name="constname" value="ADHERENT_LOGIN_NOT_REQUIRED">';
+    print '<tr '.$bc[$var].'><td>'.$langs->trans("AdherentLoginRequired").'</td><td>';
+    print $form->selectyesno('constvalue',(! empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)?0:1),1);
+    print '</td><td align="center" width="80">';
+    print '<input type="submit" class="button" value="'.$langs->trans("Update").'" name="Button">';
+    print "</td></tr>\n";
+    print '</form>';
+}
 
 // Mail required for members
 $var=!$var;
@@ -295,4 +297,4 @@ dol_fiche_end();
 llxFooter();
 
 $db->close();
-?>
+?>

htdocs/adherents/admin/adherent_extrafields.php

@@ -50,7 +50,7 @@ if (!$user->admin) accessforbidden();
  * Actions
  */
 
-require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
+require DOL_DOCUMENT_ROOT.'/core/admin_extrafields.inc.php';
 
 
 

htdocs/adherents/admin/adherent_type_extrafields.php

@@ -51,7 +51,7 @@ if (!$user->admin) accessforbidden();
  * Actions
  */
 
-require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
+require DOL_DOCUMENT_ROOT.'/core/admin_extrafields.inc.php';
 
 
 

htdocs/adherents/admin/mailman.php

@@ -5,7 +5,7 @@
  * Copyright (C) 2004      Sebastien Di Cintio  <sdicintio@ressource-toi.org>
  * Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
  * Copyright (C) 2005-2011 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2011-2013 Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2011 	   Juanjo Menent		<jmenent@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,15 +22,14 @@
  */
 
 /**
- *   	\file       htdocs/admin/mailman.php
+ *   	\file       htdocs/adherents/admin/mailman.php
  *		\ingroup    mailmanspip
  *		\brief      Page to setup the module MailmanSpip (Mailman)
  */
 
-require '../main.inc.php';
+require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/mailmanspip.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 
 $langs->load("admin");
 $langs->load("members");
@@ -59,18 +58,18 @@ if ($action == 'update' || $action == 'add')
 		$consttype=$_POST["consttype"][$key];
 		$constnote=$_POST["constnote"][$key];
 		$res=dolibarr_set_const($db,$constname,$constvalue,$type[$consttype],0,$constnote,$conf->entity);
-
+	
 		if (! $res > 0) $error++;
 	}
-
- 	if (! $error)
-    {
-        setEventMessage($langs->trans("SetupSaved"));
-    }
-    else
-    {
-        setEventMessage($langs->trans("Error"),'errors');
-    }
+	
+	if (! $error)
+	{
+		$mesg = '<div class="ok">'.$langs->trans("SetupSaved").'</div>';
+	}
+	else
+	{
+		$mesg = '<div class="error">'.$langs->trans("Error").'</div>';
+	}
 }
 
 // Action activation d'un sous module du module adherent
@@ -99,7 +98,7 @@ if (($action == 'testsubscribe' || $action == 'testunsubscribe') && ! empty($con
     if (! isValidEmail($email))
     {
         $langs->load("errors");
-        setEventMessage($langs->trans("ErrorBadEMail",$email),'errors');
+        $mesg='<div class="error">'.$langs->trans("ErrorBadEMail",$email).'</div>';
     }
     else
     {
@@ -115,28 +114,28 @@ if (($action == 'testsubscribe' || $action == 'testunsubscribe') && ! empty($con
         if ($action == 'testsubscribe')
         {
             $result=$mailmanspip->add_to_mailman($object);
-			if ($result < 0)
-			{
-				$error++;
-				setEventMessage($mailmanspip->error,'errors');
-			}
-			else
-			{
-				setEventMessage($langs->trans("MailmanCreationSuccess"));
-			}
+            if ($result < 0)
+            {
+                $error++;
+                $mesg='<div class="error">'.$mailmanspip->error.'</div>';
+            }
+            else
+            {
+                $mesg='MailmanCreationSuccess';
+            }
         }
         if ($action == 'testunsubscribe')
         {
             $result=$mailmanspip->del_to_mailman($object);
-        			if ($result < 0)
-			{
-				$error++;
-				setEventMessage($mailmanspip->error,'errors');
-			}
-			else
-			{
-				setEventMessage($langs->trans("MailmanDeletionSuccess"));
-			}
+            if ($result < 0)
+            {
+                $error++;
+                $mesg='<div class="error">'.$mailmanspip->error.'</div>';
+            }
+            else
+            {
+                $mesg='MailmanDeletionSuccess';
+            }
         }
     }
 }
@@ -154,10 +153,15 @@ llxHeader('',$langs->trans("MailmanSpipSetup"),$help_url);
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print_fiche_titre($langs->trans("MailmanSpipSetup"),$linkback,'setup');
 
+
 $head = mailmanspip_admin_prepare_head();
 
 dol_fiche_head($head, 'mailman', $langs->trans("Setup"), 0, 'user');
 
+
+dol_htmloutput_mesg($mesg);
+
+
 $var=!$var;
 if (! empty($conf->global->ADHERENT_USE_MAILMAN))
 {
@@ -177,12 +181,11 @@ if (! empty($conf->global->ADHERENT_USE_MAILMAN))
     print_fiche_titre($langs->trans('MailmanTitle'), $lien,'');
 
     print '<br>';
-
+    
     // JQuery activity
     print '<script type="text/javascript">
     var i1=0;
     var i2=0;
-    var i3=0;
     jQuery(document).ready(function(){
         jQuery("#exampleclick1").click(function(event){
             if (i1 == 0) { jQuery("#example1").show(); i1=1; }
@@ -192,11 +195,7 @@ if (! empty($conf->global->ADHERENT_USE_MAILMAN))
             if (i2 == 0) { jQuery("#example2").show(); i2=1; }
             else if (i2 == 1)  { jQuery("#example2").hide(); i2=0; }
             });
-        jQuery("#exampleclick3").click(function(){
-            if (i3 == 0) { jQuery("#example3").show(); i3=1; }
-            else if (i3 == 1)  { jQuery("#example3").hide(); i3=0; }
-            });
-	});
+    });
     </script>';
 
     form_constantes($constantes,1);

htdocs/adherents/admin/spip.php

@@ -5,7 +5,7 @@
  * Copyright (C) 2004      Sebastien Di Cintio  <sdicintio@ressource-toi.org>
  * Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
  * Copyright (C) 2005-2011 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2011-2013 Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2011 	   Juanjo Menent		<jmenent@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,15 +22,14 @@
  */
 
 /**
- *   	\file       htdocs/admin/spip.php
+ *   	\file       htdocs/adherents/admin/spip.php
  *		\ingroup    mailmanspip
  *		\brief      Page to setup the module MailmanSpip (SPIP)
  */
 
-require '../main.inc.php';
+require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/mailmanspip.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 
 $langs->load("admin");
 $langs->load("members");
@@ -70,11 +69,11 @@ if ($action == 'update' || $action == 'add')
 
 	if (! $error)
 	{
-		setEventMessage($langs->trans("SetupSaved"));
+		$mesg = '<div class="ok">'.$langs->trans("SetupSaved").'</div>';
 	}
 	else
 	{
-		setEventMessage($langs->trans("Error"),'errors');
+		$mesg = '<div class="error">'.$langs->trans("Error").'</div>';
 	}
 }
 
@@ -117,6 +116,9 @@ $head = mailmanspip_admin_prepare_head();
 
 dol_fiche_head($head, 'spip', $langs->trans("Setup"), 0, 'user');
 
+
+dol_htmloutput_mesg($mesg);
+
 /*
  * Spip
  */

htdocs/adherents/canvas/actions_adherentcard_common.class.php

@@ -17,13 +17,14 @@
  */
 
 /**
- *	\file       htdocs/adherents/canvas/actions_adherentcard_common.class.php
- *	\ingroup    adherent
+ *	\file       htdocs/contact/canvas/actions_adherentcard_common.class.php
+ *	\ingroup    thirdparty
  *	\brief      Fichier de la classe Adherent card controller (common)
  */
 
 /**
- *	Class to maage members using default canvas
+ *	\class      ActionsAdherentCardCommon
+ *	\brief      Classe permettant la gestion des adherents par defaut
  */
 abstract class ActionsAdherentCardCommon
 {

htdocs/adherents/card_subscriptions.php

@@ -368,7 +368,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'cotisation' && ! $
                 	$vattouse=get_default_tva($mysoc, $mysoc, $idprodsubscription);
                 }
                 //print xx".$vattouse." - ".$mysoc." - ".$customer;exit;
-                $result=$invoice->addline($label,0,1,$vattouse,0,0,$idprodsubscription,0,$datecotisation,$datesubend,0,0,'','TTC',$cotisation,1);
+                $result=$invoice->addline($invoice->id,$label,0,1,$vattouse,0,0,$idprodsubscription,0,$datecotisation,$datesubend,0,0,'','TTC',$cotisation,1);
                 if ($result <= 0)
                 {
                     $errmsg=$invoice->error;
@@ -528,7 +528,7 @@ if ($rowid)
     print '<tr><td>'.$langs->trans("UserTitle").'</td><td class="valeur">'.$object->getCivilityLabel().'&nbsp;</td>';
     print '</tr>';
 
-    // Lastname
+    // Name
     print '<tr><td>'.$langs->trans("Lastname").'</td><td class="valeur">'.$object->lastname.'&nbsp;</td>';
     print '</tr>';
 
@@ -536,9 +536,6 @@ if ($rowid)
     print '<tr><td>'.$langs->trans("Firstname").'</td><td class="valeur">'.$object->firstname.'&nbsp;</td>';
     print '</tr>';
 
-    // EMail
-    print '<tr><td>'.$langs->trans("EMail").'</td><td class="valeur">'.dol_print_email($object->email,0,$object->fk_soc,1).'</td></tr>';
-
     // Status
     print '<tr><td>'.$langs->trans("Status").'</td><td class="valeur">'.$object->getLibStatut(4).'</td></tr>';
 
@@ -700,7 +697,7 @@ if ($rowid)
             {
                 $objp = $db->fetch_object($result);
                 $var=!$var;
-                print "<tr ".$bc[$var].">";
+                print "<tr $bc[$var]>";
                 $cotisationstatic->ref=$objp->crowid;
                 $cotisationstatic->id=$objp->crowid;
                 print '<td>'.$cotisationstatic->getNomUrl(1).'</td>';
@@ -813,8 +810,7 @@ if ($rowid)
 			$name = $object->getFullName($langs);
 			if (! empty($name))
 			{
-				if ($object->morphy == 'mor' && ! empty($object->societe)) $name=$object->societe.' ('.$name.')';
-				else if ($object->societe) $name.=' ('.$object->societe.')';
+				if ($object->societe) $name.=' ('.$object->societe.')';
 			}
 			else
 			{
@@ -824,7 +820,8 @@ if ($rowid)
 			// Create a form array
 			$formquestion=array(array('label' => $langs->trans("NameToCreate"), 'type' => 'text', 'name' => 'companyname', 'value' => $name));
 
-			print $form->formconfirm($_SERVER["PHP_SELF"]."?rowid=".$object->id,$langs->trans("CreateDolibarrThirdParty"),$langs->trans("ConfirmCreateThirdParty"),"confirm_create_thirdparty",$formquestion,1);
+			$ret=$form->form_confirm($_SERVER["PHP_SELF"]."?rowid=".$object->id,$langs->trans("CreateDolibarrThirdParty"),$langs->trans("ConfirmCreateThirdParty"),"confirm_create_thirdparty",$formquestion,1);
+			if ($ret == 'html') print '<br>';
 		}
 
 

htdocs/adherents/cartes/carte.php

@@ -107,7 +107,8 @@ if ((! empty($foruserid) || ! empty($foruserlogin) || ! empty($mode)) && ! $mesg
             '%MONTH%'=>$month,
             '%DAY%'=>$day,
             '%DOL_MAIN_URL_ROOT%'=>DOL_MAIN_URL_ROOT,
-            '%SERVER%'=>"http://".$_SERVER["SERVER_NAME"]."/"
+            '%SERVER%'=>"http://".$_SERVER["SERVER_NAME"]."/",	
+            '%SOCIETE%'=>$objp->company
             );
             complete_substitutions_array($substitutionarray, $langs);
 
@@ -203,7 +204,7 @@ if ((! empty($foruserid) || ! empty($foruserlogin) || ! empty($mode)) && ! $mesg
     	dol_print_error($db);
     }
 
-    if (! $mesg)
+    if (! $mesg) 
     {
     	$db->close();
     	exit;

htdocs/adherents/class/adherent.class.php

@@ -27,6 +27,8 @@
  */
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/adherents/class/cotisation.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
 
@@ -65,7 +67,6 @@ class Adherent extends CommonObject
     var $country;
 
     var $email;
-    var $skype;
     var $phone;
     var $phone_perso;
     var $phone_mobile;
@@ -267,9 +268,6 @@ class Adherent extends CommonObject
 
         $now=dol_now();
 
-        // Clean parameters
-        $this->import_key = trim($this->import_key);
-
         // Check parameters
         if (! empty($conf->global->ADHERENT_MAIL_REQUIRED) && ! isValidEMail($this->email))
         {
@@ -291,7 +289,7 @@ class Adherent extends CommonObject
 
         // Insert member
         $sql = "INSERT INTO ".MAIN_DB_PREFIX."adherent";
-        $sql.= " (datec,login,fk_user_author,fk_user_mod,fk_user_valid,morphy,fk_adherent_type,entity,import_key)";
+        $sql.= " (datec,login,fk_user_author,fk_user_mod,fk_user_valid,morphy,fk_adherent_type,entity)";
         $sql.= " VALUES (";
         $sql.= " '".$this->db->idate($this->datec)."'";
         $sql.= ", ".($this->login?"'".$this->db->escape($this->login)."'":"null");
@@ -299,7 +297,6 @@ class Adherent extends CommonObject
         $sql.= ", null, null, '".$this->morphy."'";
         $sql.= ", '".$this->typeid."'";
         $sql.= ", ".$conf->entity;
-        $sql.= ", ".(! empty($this->import_key) ? "'".$this->import_key."'":"null");
         $sql.= ")";
 
         dol_syslog(get_class($this)."::create sql=".$sql);
@@ -431,7 +428,6 @@ class Adherent extends CommonObject
         $sql.= ", country=".($this->country_id>0?"'".$this->country_id."'":"null");
         $sql.= ", state_id=".($this->state_id>0?"'".$this->state_id."'":"null");
         $sql.= ", email='".$this->email."'";
-        $sql.= ", skype='".$this->skype."'";
         $sql.= ", phone="   .($this->phone?"'".$this->db->escape($this->phone)."'":"null");
         $sql.= ", phone_perso="  .($this->phone_perso?"'".$this->db->escape($this->phone_perso)."'":"null");
         $sql.= ", phone_mobile=" .($this->phone_mobile?"'".$this->db->escape($this->phone_mobile)."'":"null");
@@ -528,7 +524,6 @@ class Adherent extends CommonObject
                         $luser->societe_id=$this->societe;
 
                         $luser->email=$this->email;
-                        $luser->skype=$this->skype;
                         $luser->office_phone=$this->phone;
                         $luser->user_mobile=$this->phone_mobile;
 
@@ -567,8 +562,7 @@ class Adherent extends CommonObject
                         $lthirdparty->zip=$this->zip;
                         $lthirdparty->town=$this->town;
                         $lthirdparty->email=$this->email;
-                        $lthirdparty->skype=$this->skype;
-                        $lthirdparty->phone=$this->phone;
+                        $lthirdparty->tel=$this->phone;
                         $lthirdparty->state_id=$this->state_id;
                         $lthirdparty->country_id=$this->country_id;
                         $lthirdparty->country_id=$this->country_id;
@@ -1006,36 +1000,6 @@ class Adherent extends CommonObject
         }
     }
 
-    /**
-     *	Method to load member from its name
-     *
-     *	@param	string	$firstname	Firstname
-     *	@param	string	$lastname	Lastname
-     *	@return	void
-     */
-    function fetch_name($firstname,$lastname)
-    {
-    	global $conf;
-
-    	$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."adherent";
-    	$sql.= " WHERE firstname='".$this->db->escape($firstname)."'";
-    	$sql.= " AND lastname='".$this->db->escape($lastname)."'";
-    	$sql.= " AND entity = ".$conf->entity;
-
-    	$resql=$this->db->query($sql);
-    	if ($resql)
-    	{
-    		if ($this->db->num_rows($resql))
-    		{
-    			$obj = $this->db->fetch_object($resql);
-    			$this->fetch($obj->rowid);
-    		}
-    	}
-    	else
-    	{
-    		dol_print_error($this->db);
-    	}
-    }
 
     /**
      *	Load member from database
@@ -1043,15 +1007,14 @@ class Adherent extends CommonObject
      *	@param	int		$rowid      Id of object to load
      * 	@param	string	$ref		To load member from its ref
      * 	@param	int		$fk_soc		To load member from its link to third party
-     * 	@param	int		$ref_ext	External reference
      *	@return int         		>0 if OK, 0 if not found, <0 if KO
      */
-    function fetch($rowid,$ref='',$fk_soc='',$ref_ext='')
+    function fetch($rowid,$ref='',$fk_soc='')
     {
         global $langs;
 
         $sql = "SELECT d.rowid, d.ref_ext, d.civilite, d.firstname, d.lastname, d.societe as company, d.fk_soc, d.statut, d.public, d.address, d.zip, d.town, d.note,";
-        $sql.= " d.email, d.skype, d.phone, d.phone_perso, d.phone_mobile, d.login, d.pass,";
+        $sql.= " d.email, d.phone, d.phone_perso, d.phone_mobile, d.login, d.pass,";
         $sql.= " d.photo, d.fk_adherent_type, d.morphy, d.entity,";
         $sql.= " d.datec as datec,";
         $sql.= " d.tms as datem,";
@@ -1072,13 +1035,9 @@ class Adherent extends CommonObject
         if ($rowid) $sql.= " AND d.rowid=".$rowid;
         elseif ($ref || $fk_soc) {
         	$sql.= " AND d.entity IN (".getEntity().")";
-        	if ($ref) $sql.= " AND d.rowid='".$this->db->escape($ref)."'";
+        	if ($ref) $sql.= " AND d.rowid='".$ref."'";
         	elseif ($fk_soc) $sql.= " AND d.fk_soc='".$fk_soc."'";
         }
-        elseif ($ref_ext)
-        {
-        	$sql.= " AND d.ref_ext='".$this->db->escape($ref_ext)."'";
-        }
 
         dol_syslog(get_class($this)."::fetch sql=".$sql);
         $resql=$this->db->query($sql);
@@ -1119,7 +1078,6 @@ class Adherent extends CommonObject
                 $this->phone_perso		= $obj->phone_perso;
                 $this->phone_mobile		= $obj->phone_mobile;
                 $this->email			= $obj->email;
-                $this->skype			= $obj->skype;
 
                 $this->photo			= $obj->photo;
                 $this->statut			= $obj->statut;
@@ -1143,10 +1101,12 @@ class Adherent extends CommonObject
 
                 // Retreive all extrafield for thirdparty
                 // fetch optionals attributes and labels
-                require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+                require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php');
                 $extrafields=new ExtraFields($this->db);
                 $extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
-                $this->fetch_optionals($this->id,$extralabels);
+                if (count($extralabels)>0) {
+                	$this->fetch_optionals($this->id,$extralabels);
+                }
 
                 // Load other properties
                 $result=$this->fetch_subscriptions();
@@ -1180,8 +1140,6 @@ class Adherent extends CommonObject
     {
         global $langs;
 
-		require_once DOL_DOCUMENT_ROOT.'/adherents/class/cotisation.class.php';
-
         $sql = "SELECT c.rowid, c.fk_adherent, c.cotisation, c.note, c.fk_bank,";
         $sql.= " c.tms as datem,";
         $sql.= " c.datec as datec,";
@@ -1251,8 +1209,6 @@ class Adherent extends CommonObject
     {
         global $conf,$langs,$user;
 
-		require_once DOL_DOCUMENT_ROOT.'/adherents/class/cotisation.class.php';
-
 		$error=0;
 
         // Clean parameters
@@ -1344,7 +1300,7 @@ class Adherent extends CommonObject
 
         $sql = "UPDATE ".MAIN_DB_PREFIX."adherent SET";
         $sql.= " statut = 1";
-        $sql.= ", datevalid = '".$this->db->idate($now)."'";
+        $sql.= ", datevalid = ".$this->db->idate($now);
         $sql.= ", fk_user_valid=".$user->id;
         $sql.= " WHERE rowid = ".$this->id;
 
@@ -1424,7 +1380,8 @@ class Adherent extends CommonObject
 
 
     /**
-     *  Function to add member into external tools mailing-list, spip, etc.
+     *  Fonction qui ajoute l'adherent aux abonnements automatiques mailing-list, spip, etc.
+     *  TODO Move this into member creation trigger (trigger of mailmanspip module)
      *
      *  @return		int		<0 if KO, >0 if OK
      */
@@ -1443,7 +1400,7 @@ class Adherent extends CommonObject
             $result=$mailmanspip->add_to_mailman($this);
             if ($result < 0)
             {
-            	if (! empty($mailmanspip->error)) $this->errors[]=$mailmanspip->error;
+            	$this->error=$mailmanspip->error;
                 $err+=1;
             }
             foreach ($mailmanspip->mladded_ko as $tmplist => $tmpemail)
@@ -1464,7 +1421,7 @@ class Adherent extends CommonObject
             $result=$mailmanspip->add_to_spip($this);
             if ($result < 0)
             {
-            	$this->errors[]=$mailmanspip->error;
+            	$this->error=$mailmanspip->error;
             	$err+=1;
             }
         }
@@ -1480,7 +1437,8 @@ class Adherent extends CommonObject
 
 
     /**
-     *  Function to delete a member from external tools like mailing-list, spip, etc.
+     *  Fonction qui supprime l'adherent des abonnements automatiques mailing-list, spip, etc.
+     *  TODO Move this into member deletion trigger (trigger of mailmanspip module)
      *
      *  @return     int     <0 if KO, >0 if OK
      */
@@ -1499,7 +1457,7 @@ class Adherent extends CommonObject
             $result=$mailmanspip->del_to_mailman($this);
             if ($result < 0)
             {
-                if (! empty($mailmanspip->error)) $this->errors[]=$mailmanspip->error;
+                $this->error=$mailmanspip->error;
                 $err+=1;
             }
 
@@ -1520,7 +1478,6 @@ class Adherent extends CommonObject
             $result=$mailmanspip->del_to_spip($this);
             if ($result < 0)
             {
-            	$this->errors[]=$mailmanspip->error;
                 $err+=1;
             }
         }
@@ -1545,7 +1502,7 @@ class Adherent extends CommonObject
     {
     	global $langs;
     	$langs->load("dict");
-
+    	
     	$code=(! empty($this->civilite_id)?$this->civilite_id:(! empty($this->civility_id)?$this->civility_id:''));
     	if (empty($code)) return '';
     	return $langs->getLabelFromKey($this->db, "Civility".$code, "c_civilite", "code", "civilite", $code);
@@ -1706,7 +1663,6 @@ class Adherent extends CommonObject
             {
                 $this->nb["members"]=$obj->nb;
             }
-            $this->db->free($resql);
             return 1;
         }
         else
@@ -1787,7 +1743,6 @@ class Adherent extends CommonObject
         $this->country = 'France';
         $this->morphy = 1;
         $this->email = 'specimen@specimen.com';
-        $this->skype = 'tom.hanson';
         $this->phone        = '0999999999';
         $this->phone_perso  = '0999999998';
         $this->phone_mobile = '0999999997';
@@ -1859,7 +1814,6 @@ class Adherent extends CommonObject
         if ($this->town && ! empty($conf->global->LDAP_MEMBER_FIELD_TOWN))        $info[$conf->global->LDAP_MEMBER_FIELD_TOWN] = $this->town;
         if ($this->country_code && ! empty($conf->global->LDAP_MEMBER_FIELD_COUNTRY))     $info[$conf->global->LDAP_MEMBER_FIELD_COUNTRY] = $this->country_code;
         if ($this->email && ! empty($conf->global->LDAP_MEMBER_FIELD_MAIL))       $info[$conf->global->LDAP_MEMBER_FIELD_MAIL] = $this->email;
-        if ($this->skype && ! empty($conf->global->LDAP_MEMBER_FIELD_SKYPE))       $info[$conf->global->LDAP_MEMBER_FIELD_SKYPE] = $this->skype;
         if ($this->phone && ! empty($conf->global->LDAP_MEMBER_FIELD_PHONE))      $info[$conf->global->LDAP_MEMBER_FIELD_PHONE] = $this->phone;
         if ($this->phone_perso && ! empty($conf->global->LDAP_MEMBER_FIELD_PHONE_PERSO)) $info[$conf->global->LDAP_MEMBER_FIELD_PHONE_PERSO] = $this->phone_perso;
         if ($this->phone_mobile && ! empty($conf->global->LDAP_MEMBER_FIELD_MOBILE)) $info[$conf->global->LDAP_MEMBER_FIELD_MOBILE] = $this->phone_mobile;