Commit Graph

72940 Commits

Author SHA1 Message Date
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
8b81702dd7 Fix API 404 errors 2019-07-26 13:23:42 +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
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
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
6e3fad8f83 Fix phpcs 2019-07-25 17:42:44 +02:00
Laurent Destailleur
27c6bfe9db
Merge pull request #11548 from aspangaro/9.0pa
FIX FEC Format - Missing date_creation in general ledger when you add a new transaction
2019-07-25 17:37:05 +02:00
Laurent Destailleur
2f08715d5a
Merge pull request #11559 from atm-florianm/FIX_product.lib.php_needed_for_pdf_generation
FIX: tk9877 - PDF rouget requires product.lib.php
2019-07-25 17:34:25 +02:00
Florian Mortgat
65e9d8f239 FIX: tk9877 - PDF rouget requires product.lib.php (otherwise measuring_units_string() is not defined) 2019-07-25 11:14:59 +02:00
Alexandre SPANGARO
2162f2331d Try to fix travis 2019-07-24 06:57:42 +02:00
atm-josselin
0a1f4b7931 FIX : correct error in files with multiple spaces 2019-07-23 09:45:17 +02:00
Laurent Destailleur
47ec88c8b5 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-07-22 19:06:57 +02:00
Laurent Destailleur
5dcf4d6646 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-07-22 19:06:48 +02:00
Laurent Destailleur
b4e0c5ef6c Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-07-22 18:51:32 +02:00
Laurent Destailleur
4c4a0b796e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2019-07-22 18:50:59 +02:00
Laurent Destailleur
891eaf50e1 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2019-07-22 18:50:49 +02:00
Laurent Destailleur
f39f710fd9
Merge pull request #11538 from atm-maxime/fix_agenda_list_filter
Fix lost filter in action list
2019-07-22 18:44:22 +02:00
Laurent Destailleur
45ea80a336
Merge pull request #11530 from atm-florianm/FIX_if_MAIN_USE_COMPANY_NAME_OF_CONTACT_set_socobject_is_a_contact
FIX: extrafield loading bug due to assumption that an object is a thi…
2019-07-22 18:43:51 +02:00
Laurent Destailleur
56851f475e
Merge pull request #11529 from atm-ph/fix_9.0_missing_hook
Fix missing hook
2019-07-22 18:41:55 +02:00
Laurent Destailleur
9c2527535b
Merge pull request #11536 from atm-florian/9.0
fix warining message
2019-07-22 18:33:23 +02:00
Laurent Destailleur
a872b7d42f
Merge pull request #11532 from atm-gauthier/6.0_fix_phone_search
FIX : search by phone pro
2019-07-22 18:30:07 +02:00
Alexandre SPANGARO
7bdfd83288 FIX FEC Format - Missing date_creation in general ledger when you add a new transaction 2019-07-22 15:15:08 +02:00
Regis Houssin
6409cc06ae FIX duplicate on the check (TODO field $onetrtd not used ?) 2019-07-22 11:44:56 +02:00
Maxime Kohlhaas
7ec8b48b18 Fix lost filter in action list 2019-07-21 22:21:11 +02:00
florian HENRY
b046bcc197 fix warning php 2019-07-20 15:19:25 +02:00
florian HENRY
d03d79222e fix warning php 2019-07-20 15:15:48 +02:00
florian HENRY
d88fec52bf fix warining message 2019-07-20 15:07:59 +02:00
gauthier
cd7d3f1a36 FIX : search by phone pro 2019-07-19 15:41:44 +02:00
Laurent Destailleur
98ae66b387 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-07-19 13:31:25 +02:00
Laurent Destailleur
1f308915ee Fix trans 2019-07-19 13:23:17 +02:00
Florian Mortgat
b100cdb9db FIX: extrafield loading bug due to assumption that an object is a third party while it may be a contact if MAIN_USE_COMPANY_NAME_OF_CONTACT is set. 2019-07-19 11:58:21 +02:00
atm-ph
a03bb00254 Fix missing hook 2019-07-19 11:26:21 +02:00
Laurent Destailleur
9b8b3b1ffc
Merge pull request #11527 from atm-ph/fix_9.0_missing_trigger
Fix missing trigger call
2019-07-19 04:06:35 +02:00
Laurent Destailleur
e5801c0b68
Update bonprelevement.class.php 2019-07-19 04:06:22 +02:00
atm-ph
fcd95ce073 Fix missing trigger call 2019-07-18 18:07:17 +02:00
Laurent Destailleur
5e204f0f67 Merge 2019-07-18 17:51:32 +02:00
Laurent Destailleur
b044d95acf Merge 2019-07-18 17:50:15 +02:00
Laurent Destailleur
b0baba3293
Merge pull request #11526 from atm-ph/fix_9.0_missing_hook
Fix missing hook then can't interact with actions
2019-07-18 17:24:08 +02:00
Laurent Destailleur
b3182f65bc
Update create.php 2019-07-18 17:23:52 +02:00
Laurent Destailleur
e548872133
Update prelevement.php 2019-07-18 17:23:05 +02:00
Laurent Destailleur
a20a121558
Merge pull request #11522 from atm-john/9.0_fix_action_list_contact_assigned
FIX: socpeople assigned list in action com list
2019-07-18 17:20:41 +02:00
atm-ph
984fe98342 Fix missing hook 2019-07-18 16:12:42 +02:00
atm-ph
c961a397c4 Fix missing hook then can't interact with actions 2019-07-18 15:40:50 +02:00
John Botella
b5d348356d Fix socpeople assigned list in action com list 2019-07-17 16:49:41 +02:00
Laurent Destailleur
a3b746bcb9
Merge pull request #11517 from hregis/9.0_bug2
FIX better compatibility with Multicompany
2019-07-16 17:10:47 +03:00
Laurent Destailleur
77300e1210
Merge pull request #11518 from ATM-Marc/FIX_9.0_propal_clone_hook
FIX: propal createFrom hook: undefined parameter attached
2019-07-16 17:04:53 +03:00
Laurent Destailleur
a03a8da2fd
Merge pull request #11519 from atm-gauthier/8.0_fix_addline_cmdfourn_qty_inf_0
FIX : we need to be able to add freeline with qty between 0 & 1 in su…
2019-07-16 17:02:59 +03:00