Commit Graph

77418 Commits

Author SHA1 Message Date
Laurent Destailleur
1fc4db28c6
Merge pull request #11577 from Vaadasch/patch-2
Change 0 and 1 to FALSE and TRUE for pgsql
2019-07-30 19:34:34 +02:00
Laurent Destailleur
5cbde99871
Merge pull request #11579 from atm-maxime/new_withdraw_date_rum
NEW Can edit date or RUM mandate
2019-07-30 16:04:57 +02:00
Laurent Destailleur
a7a2e483c9
Update paymentmodes.php 2019-07-30 16:01:26 +02:00
Laurent Destailleur
334e1a6737
Merge pull request #11583 from aspangaro/11.0_LDcompta
NEW Accountancy Add export model LDCompta V9 & higher
2019-07-30 15:59:43 +02:00
Laurent Destailleur
6c49ab2049
Merge pull request #11588 from joseplluis/patch-8
FIX: resource tpls directories
2019-07-30 15:50:56 +02:00
Laurent Destailleur
a978372383
Merge pull request #11594 from ptibogxiv/patch-201
Fix php error with const
2019-07-30 15:42:10 +02:00
ptibogxiv
5880d549fb
Fix php error with const 2019-07-30 11:55:46 +02:00
Laurent Destailleur
10344d9c34 Try to use the new scrutinizer engine 2019-07-30 02:24:04 +02:00
Josep Lluís
567c4bf97b
FIX: resource tpls directories
search resource tpls also in custom modules directories
2019-07-29 18:17:48 +02:00
Alexandre SPANGARO
96380f01c6 Test in progress 2019-07-29 15:41:53 +02:00
Laurent Destailleur
11e3aa5860 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-29 11:07:11 +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
56f124844c Test in progress 2019-07-29 10:04:28 +02:00
Laurent Destailleur
ecc0b4ed32 Add prefixsession in event table 2019-07-29 02:16:21 +02:00
Laurent Destailleur
db461792a0 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-29 01:36:35 +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
Laurent Destailleur
4e26eefe6e Fix field not mandatory 2019-07-28 22:57:07 +02:00
Laurent Destailleur
9a7113f4f5 FIX Update the file index table when we validate/rename a ref. 2019-07-28 22:26:55 +02:00
Maxime Kohlhaas
3cc2c91e31 Use date_rum if defined 2019-07-28 22:26:19 +02:00
Laurent Destailleur
1f3e509603 Show message when a redirect is done. 2019-07-28 21:24:42 +02:00
Vaadasch
02d6c1a334
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-28 17:51:15 +02:00
Maxime Kohlhaas
be6ad7b6a4 New : can define RUM date on third bank account 2019-07-28 17:10:37 +02:00
Laurent Destailleur
9f7d118f6f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-27 02:40:56 +02:00
Laurent Destailleur
2867e31a63 Fix CSS 2019-07-27 01:13:39 +02:00
Laurent Destailleur
4ed7571a3f Merge 2019-07-26 16:36:39 +02:00
Laurent Destailleur
1646f426c5 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-07-26 16:33:55 +02:00
Laurent Destailleur
471a947e8a FIX Attachment was lost when we validate an expense report
Conflicts:
	htdocs/expensereport/class/expensereport.class.php
2019-07-26 16:33:32 +02:00
Laurent Destailleur
97c950badb FIX Attachment was lost when we validate an expense report 2019-07-26 16:30:16 +02:00
Laurent Destailleur
fac8d93a08 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-07-26 13:24:08 +02:00
Laurent Destailleur
8b81702dd7 Fix API 404 errors 2019-07-26 13:23:42 +02:00
Laurent Destailleur
9789932f01 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-07-26 13:18:00 +02:00
Laurent Destailleur
1ca3c6e3ae Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-07-26 13:17:47 +02:00
Laurent Destailleur
c61f8e965d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-07-26 13:16:59 +02:00
Laurent Destailleur
e92c6c87a0 FIX API return 404 sometimes even if API exists 2019-07-26 13:16:49 +02:00
Laurent Destailleur
3101d52283
Merge pull request #11528 from prietojc/10.0
Fix: Use special_code=4 for Takepos
2019-07-25 18:31:53 +02:00
Laurent Destailleur
3a740313fe
Merge branch '10.0' into 10.0 2019-07-25 18:31:26 +02:00
Laurent Destailleur
0b69bf9957 FIX #11553 2019-07-25 18:17:17 +02:00
Laurent Destailleur
0d79905b0a
Merge pull request #11539 from hregis/9.0_bug2
FIX duplicate on the check (TODO field $onetrtd not used ?)
2019-07-25 17:56:42 +02:00
Laurent Destailleur
a46bfc7a29 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/project.lib.php
2019-07-25 17:54:14 +02:00
Laurent Destailleur
4a8377e4fd Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-07-25 17:52:40 +02:00
Laurent Destailleur
8241bc414a Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/core/lib/files.lib.php
2019-07-25 17:52:17 +02:00
Laurent Destailleur
fe9ddd7649 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
	htdocs/core/lib/files.lib.php
2019-07-25 17:50:07 +02:00
Laurent Destailleur
e8932335aa
Merge pull request #11544 from atm-josselin/FIX_upload_file_with_multiple_spaces
FIX : correct error in files with multiple spaces
2019-07-25 17:48:26 +02:00
Laurent Destailleur
96a90e735c Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-07-25 17:47:13 +02:00