Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into dev…

…elop

ChangeLog

@@ -3,6 +3,7 @@ English Dolibarr ChangeLog
 --------------------------------------------------------------
 
 
+
 ***** ChangeLog for 7.0.0 compared to 6.0.* *****
 
 For developers:
@@ -12,13 +13,50 @@ NEW: complete_head_from_modules() in ldap_prepare_head()
 WARNING: 
 
 Following changes may create regressions for some external modules, but were necessary to make Dolibarr better:
-* The methode "cloture" on contact were renamed into "closeAll".
+* The methode "cloture" on contract were renamed into "closeAll".
 * The substitution key for reference of object is now __REF__ whatever is the object (it replaces __ORDERREF__, 
   __PROPALREF__, ...)
+* The substition key __SIGNATURE__ was renamed into __USER_SIGNATURE__ to standardize naming conventions. 
+* Substitution keys with syntax %XXX% were renamed into __XXX__ to match others.
 * Some REST API to access the dictionary (country, town, ...) were moved into a common API. 
 * Page bank/index.php and bank/bankentries.php were renamed into bank/list.php and bank/bankentries_list.php to
   follow page naming conventions (so default filter/sort order features can also work).
-
+* The trigger ORDER_SUPPLIER_STATUS_ONPROCESS was renamed into ORDER_SUPPLIER_STATUS_ORDERED
+* The trigger ORDER_SUPPLIER_STATUS_RECEIVED_ALL was renamed into ORDER_SUPPLIER_STATUS_RECEIVED_COMPLETELY
+
+
+***** ChangeLog for 6.0.2 compared to 6.0.1 *****
+FIX: #7148
+FIX: #7288
+FIX: #7366 renaming table with pgsql
+FIX: #7435 Can't add payment term
+FIX: #7461
+FIX: #7464
+FIX: #7471
+FIX: #7473 Mass update of vat rates and other bugs on localtax
+FIX: #7475
+FIX: #7486 Empty value for multicurrency rate must be forbidden
+FIX: #7490
+FIX: #7505
+FIX: #7510 Bug: extrafield content disappear when generate pdf within intervention
+FIX: #7514
+FIX: #7531 #7537
+FIX: #7541
+FIX: #7546
+FIX: #7550
+FIX: #7554
+FIX: #7567
+FIX: Accountancy export model for Agiris Isacompta
+FIX: Allow create shipping if STOCK_SUPPORTS_SERVICES option is enabled
+FIX: Bad preview on scroping when special file names
+FIX: Generation of invoice from bulk action "Bill Orders"
+FIX: Implementation of a Luracast recommandation for the REST api server (#7370)
+FIX: Missing space in request
+FIX: Only modified values must be modified
+FIX: replenish if line test GETPOST on line 0
+FIX: Stripe not working on live mode
+FIX: wrong basePath in the swagger view
+FIX: Implementation of a Luracast recommandation for the REST api server
 
 ***** ChangeLog for 6.0.1 compared to 6.0.* *****
 FIX: #7000 Dashboard link for late pending payment supplier invoices do not work

dev/initdemo/savedemo.sh

@@ -187,6 +187,7 @@ export list="
 	--ignore-table=$base.llx_bt_webseedfiles
 	--ignore-table=$base.llx_c_civilite
 	--ignore-table=$base.llx_c_dolicloud_plans
+	--ignore-table=$base.llx_c_pays
 	--ignore-table=$base.llx_c_source
 	--ignore-table=$base.llx_cabinetmed_c_banques
 	--ignore-table=$base.llx_cabinetmed_c_ccam

dev/resources/sepa/text.txt

@@ -0,0 +1,2 @@
+To test a SEPA file:
+http://www.mesfluxdepaiement.fr/testez-vos-fichiers-sepa

dev/translation/txpush.sh

@@ -15,7 +15,7 @@ then
 	echo "This push local files to transifex for project $project."
 	echo "Note:  If you push a language file (not source), file will be skipped if transifex file is newer."
 	echo "       Using -f will overwrite translation but not memory."
-	echo "Usage: ./dev/translation/txpush.sh (source|xx_XX|all) [-r dolibarr.file] [-f] [--no-interactive]"
+	echo "Usage: ./dev/translation/txpush.sh (source|xx_XX|all) [-r ".$project.".file] [-f] [--no-interactive]"
 	exit
 fi