Commit Graph

77521 Commits

Author SHA1 Message Date
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
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
ptibogxiv
d2bc3ac1ef
FIX stripe webhook ID constant set 2019-07-29 18:34:21 +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
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
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
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
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
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
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
Vaadasch
fd11dc782c
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-28 00:32:29 +02:00
Maxime Kohlhaas
37ad5308e6 Fix holiday counter auto update 2019-07-27 19:19:13 +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
Josep Lluís
a412a99263
FIX: move doActions hook before standard actions
Move doActions hook before standard actions in element resources
2019-07-26 17:51:54 +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
ptibogxiv
e464e2e1b8
Fix application_fee name stripe.class.php
stripe changes name without change API :/

application_fee_amount for amount application_fee for %
2019-07-26 14:16:28 +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
Juanjo Menent
f67f99099c NEW: Add hidden option SUPPLIER_ORDER_CAN_UPDATE_BUYINGPRICE_DURING_RECEIPT for add possibility to update supplier buying price in the reception on a supplier order 2019-07-26 12:45:46 +02:00
Juanjo Menent
38bb046abb NEW: Add hidden option SUPPLIER_ORDER_CAN_UPDATE_BUYINGPRICE_DURING_RECEIPT for add possibility to update supplier buying price in the reception on a supplier order 2019-07-26 12:38:49 +02:00
atm-quentin
f7c739bba9 FIX wrong path sociales/index.php doesnt exist anymore 2019-07-26 12:12:08 +02:00
Juanjo Menent
d58c713621 Merge remote-tracking branch 'upstream/develop' into develop 2019-07-26 11:30:22 +02:00