Commit Graph

76991 Commits

Author SHA1 Message Date
Laurent Destailleur
0b69bf9957 FIX #11553 2019-07-25 18:17:17 +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
Laurent Destailleur
ff215d9b04
Merge pull request #11547 from ptibogxiv/patch-198
Fix display civility in contact card
2019-07-25 17:47:02 +02:00
Laurent Destailleur
95be7ad82a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-07-25 17:46:58 +02:00
Laurent Destailleur
111c0dcadd Comment 2019-07-25 17:46:48 +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
2dc2af7c41
Merge pull request #11552 from aspangaro/10.0_FEC
Presentation nowrap on amount
2019-07-25 17:35:36 +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
Laurent Destailleur
1d7885bc0c FIX We should remove property comments only for project and task api. 2019-07-25 16:58:24 +02:00
Laurent Destailleur
e88ca8ae89 Fix migration 2019-07-25 15:07:24 +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
Laurent Destailleur
151075402f css 2019-07-24 17:15:25 +02:00
Laurent Destailleur
389976699c Fix responsive 2019-07-24 16:29:50 +02:00
Laurent Destailleur
907ba62054 Sync transifex 2019-07-24 14:59:03 +02:00
ptibogxiv
c219b62b10
Update contact.class.php 2019-07-24 13:23:24 +02:00
ptibogxiv
ba60e99b45
Update card.php 2019-07-24 13:22:41 +02:00
Alexandre SPANGARO
323d2df210 Presentation nowrap on amount 2019-07-24 10:42:00 +02:00
Alexandre SPANGARO
3921f706e2 Presentation nowrap on amount 2019-07-24 09:01:11 +02:00
Alexandre SPANGARO
2162f2331d Try to fix travis 2019-07-24 06:57:42 +02:00
Laurent Destailleur
be13d5e471 FIX The new feature to attach document on lines was not correclty
enabled.
2019-07-23 14:49:09 +02:00
Laurent Destailleur
9ddb8a5b0b Fix tooltip to say closed project are not visibles 2019-07-23 14:41:29 +02:00
ptibogxiv
f959341aa8
Update card.php 2019-07-23 14:30:12 +02:00
ptibogxiv
57db12ccdb
Update card.php 2019-07-23 14:10:13 +02:00
ptibogxiv
cc10f5e684
Update card.php 2019-07-23 14:06:51 +02:00
ptibogxiv
46d0137d30
FIx display civility in contact card 2019-07-23 14:04:54 +02:00
Laurent Destailleur
239b7d56b4 Fix compatibility with plugins using old jquery 2019-07-23 13:31:00 +02:00
Laurent Destailleur
8aaa716e33 Fix missing title 2019-07-23 13:05:33 +02:00
Laurent Destailleur
c96ad85126 Add hidden option to avoid experimental to use export files feature 2019-07-23 12:34:17 +02:00
atm-josselin
0a1f4b7931 FIX : correct error in files with multiple spaces 2019-07-23 09:45:17 +02:00
Laurent Destailleur
559a902405 FIX summary of time spent in preview tab of projects 2019-07-23 03:39:35 +02:00
Laurent Destailleur
2dccaef1cd Fix message 2019-07-23 03:39:07 +02:00
Laurent Destailleur
d6d5a93225 Fix css 2019-07-23 03:15:06 +02:00
Laurent Destailleur
a33ac665bb Fix phpcs 2019-07-22 22:07:04 +02:00
Laurent Destailleur
9f95b10d0e Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/comm/action/list.php
	htdocs/comm/action/peruser.php
	htdocs/compta/prelevement/card.php
	htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
2019-07-22 19:11:27 +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