Commit Graph

77064 Commits

Author SHA1 Message Date
Laurent Destailleur
d495f7969f FIX #11412 2019-08-01 13:11:20 +02:00
Laurent Destailleur
ac715b5147 Upgrade Stripe lib to 6.41 to support SetupIntent 2019-08-01 12:53:17 +02:00
Laurent Destailleur
8f2e781df6 FIX #11537 2019-08-01 12:42:12 +02:00
Laurent Destailleur
5022d83e2a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-08-01 12:41:02 +02:00
Laurent Destailleur
b8de18596a FIX #11543 2019-08-01 12:40:51 +02:00
Laurent Destailleur
73b72f5cd8
Merge pull request #11550 from hregis/10.0_ldap
FIX missing filter by current contact
2019-08-01 12:27:11 +02:00
Laurent Destailleur
5eb8f05061 FIX #11584 2019-08-01 12:23:02 +02:00
Laurent Destailleur
12b530c418 FIX Setup of TakePos was not possible after a clean install 2019-08-01 11:27:35 +02:00
Laurent Destailleur
192fb45ce7 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/accountancy/bookkeeping/card.php
	htdocs/accountancy/bookkeeping/list.php
	htdocs/adherents/card.php
	htdocs/compta/sociales/list.php
	htdocs/compta/sociales/payments.php
	htdocs/core/modules/import/import_csv.modules.php
	htdocs/core/modules/import/import_xlsx.modules.php
	htdocs/holiday/class/holiday.class.php
	htdocs/viewimage.php
2019-07-30 20:55:15 +02:00
Laurent Destailleur
cb07d80681 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-07-30 20:37:55 +02:00
Laurent Destailleur
5f2439bf0a Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-07-30 20:37:44 +02:00
Laurent Destailleur
0ab16b739a Add more log and phpunit 2019-07-30 20:37:07 +02:00
Laurent Destailleur
9e622fe042
Merge pull request #11572 from atm-maxime/fix_holiday_update_solde
Fix holiday counter auto update
2019-07-30 20:12:30 +02:00
Laurent Destailleur
ea92ba2a78
Update holiday.class.php 2019-07-30 20:11:43 +02:00
Laurent Destailleur
00a4359508 FIX list of balance of leaves 2019-07-30 19:56:10 +02:00
Vaadasch
23bca6f4cd Change "DOCUMENT_URI" to "PHP_SELF"
DOCUMENT_URI works with Apache. To be compliant with Nginx and probably some others, use PHP_SELF
2019-07-30 19:40:28 +02:00
Vaadasch
1600ecc9ec Change 0 and 1 to FALSE and TRUE for pgsql
0 and 1 are read as False and True by Mysql, but not by PGsql.
FALSE and TRUE are correctly read by both => changing
2019-07-30 19:35:03 +02:00
Laurent Destailleur
e54c6fb5e2 FIX #11460 FIX #11492 FIX #11576 FIX #11590 2019-07-30 19:30:56 +02:00
Laurent Destailleur
d3b6411458 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-07-30 18:15:19 +02:00
Laurent Destailleur
a871aa818b FIX #11460 FIX #11492 FIX #11576 FIX #11590 2019-07-30 18:15:04 +02:00
Laurent Destailleur
a5e0dd56f4
Merge pull request #11580 from aspangaro/9.0_FEC
FIX FEC Format - Save translation of the journal label in database & nowrap on amount
2019-07-30 16:10:32 +02:00
Laurent Destailleur
78b92291a7
Merge pull request #11582 from aspangaro/10.0_adh
FIX Language key
2019-07-30 15:58:46 +02:00
Laurent Destailleur
941b2c5325
Merge pull request #11581 from aspangaro/9.0_adh
FIX Language key
2019-07-30 15:58:30 +02:00
Laurent Destailleur
c080878083
Merge pull request #11585 from ATM-Marc/FIX_9.0_expedition_printObjectLine_loop
FIX: expedition card: infinite loop for printObjectLine hook if return > 0
2019-07-30 15:58:09 +02:00
Laurent Destailleur
24695a9112
Merge pull request #11595 from ATM-Marc/FIX_8.0_import_bad_categories
FIX: categories import: prevent mismatch between category type and object type
2019-07-30 15:56:36 +02:00
Laurent Destailleur
bb885cadf2
Merge pull request #11563 from atm-quentin/FIX_sociales_redirect_index
FIX wrong path sociales/index.php doesnt exist anymore
2019-07-30 15:43:42 +02:00
ptibogxiv
5b1a89bf94 Fix php error with const 2019-07-30 15:42:37 +02:00
Laurent Destailleur
7889c64438
Merge pull request #11589 from ptibogxiv/patch-200
FIX  stripe webhook ID constant set
2019-07-30 15:41:32 +02:00
Laurent Destailleur
5ef5c5521f
Merge pull request #11597 from atm-florianm/8.0-FIX_missing_prefix_replacement_in_database_function_initialization
FIX issue #9300: install error with PostgreSQL using custom table prefix
2019-07-30 15:38:22 +02:00
Laurent Destailleur
db69a07bc4 FIX Option THIRDPARTY_SUGGEST_ALSO_ADDRESS_CREATION 2019-07-30 15:21:26 +02:00
Marc de Lima Lucio
703506c0e2 FIX: import filter error 2019-07-30 14:11:21 +02:00
Florian Mortgat
de293c4ef2 FIX issue #9300: install error with PostgreSQL when using custom table prefix 2019-07-30 14:09:03 +02:00
Laurent Destailleur
6aefa648e7 FIX CVE-2019-11199 2019-07-30 14:00:43 +02:00
Marc de Lima Lucio
449ef92007 FIX: categories import: prevent mismatch between category type and object type 2019-07-30 12:31:03 +02:00
ptibogxiv
d2bc3ac1ef
FIX stripe webhook ID constant set 2019-07-29 18:34:21 +02:00
Marc de Lima Lucio
87fc3c3968 FIX: expedition card: infinite loop for printObjectLine hook if return > 0 2019-07-29 13:56:35 +02:00
Laurent Destailleur
7931f0b422 Fix sql error 2019-07-29 11:06:39 +02:00
Laurent Destailleur
f825711206 Code comment 2019-07-29 11:01:29 +02:00
Laurent Destailleur
a5e3adc6f1 Fix travis 2019-07-29 10:51:17 +02:00
Alexandre SPANGARO
cededd97d2 FIX Language key 2019-07-29 08:52:08 +02:00
Alexandre SPANGARO
7a9f2b43c5 FIX Language key 2019-07-29 07:05:18 +02:00
Alexandre SPANGARO
bb168d7f54 Merge branch '9.0' into 9.0_FEC 2019-07-29 06:54:48 +02:00
Alexandre SPANGARO
cd22cc70c8 FIX FEC Format - Save translation of the journal 2019-07-29 06:41:51 +02:00
Laurent Destailleur
79bb9d951f Fix phpcs 2019-07-29 01:36:05 +02:00
Laurent Destailleur
406375bfc4 Fix error management 2019-07-29 01:17:53 +02:00
Laurent Destailleur
3112f2b1c5 Fix error level 2019-07-29 01:13:49 +02:00
Laurent Destailleur
9ca4d65965 Fix stripe error management 2019-07-29 01:12:03 +02:00
Laurent Destailleur
a63a6a5853 FIX Online payment 2019-07-28 23:49:05 +02:00
Alexandre SPANGARO
a2fc3689da Nowrap on amount 2019-07-28 22:59:43 +02:00
Laurent Destailleur
4e26eefe6e Fix field not mandatory 2019-07-28 22:57:07 +02:00