Commit Graph

78852 Commits

Author SHA1 Message Date
Laurent Destailleur
72ea1a2867
Merge pull request #11927 from OPEN-DSI/fix-fournisseur-product-display-histo-tooltip
FIX dol_print_date format in buying price tooltip
2019-09-27 12:25:26 +02:00
Laurent Destailleur
29c8ef6c27
Merge pull request #11947 from atm-john/develop_dashboard_global_stat_basic_auto_removed
New : dashboard global stat basic auto removed
2019-09-27 12:22:24 +02:00
Laurent Destailleur
13473be6e9
Merge pull request #11923 from frederic34/patch-14
Update box_contacts.php to see email
2019-09-27 12:16:06 +02:00
Laurent Destailleur
138b494b98
Merge pull request #11936 from aspangaro/11.0_translation
Translate and some fix
2019-09-27 12:15:50 +02:00
Laurent Destailleur
8ffd69fc21
Merge pull request #11926 from com4WEB/patch-2
Update README.md
2019-09-27 12:15:17 +02:00
Laurent Destailleur
0aea902681
Merge pull request #11958 from altatof/clipboard
NEW : add MAIN_SHOW_COMPANY_NAME_IN_BANNER_ADDRESS constant
2019-09-27 12:14:09 +02:00
Laurent Destailleur
881c90ab74
Merge pull request #11953 from grandoc/new_branch_24_09_2019
add missing translation
2019-09-27 11:56:01 +02:00
Laurent Destailleur
f96c9c3bb5 FIX #11931 #11963 2019-09-27 11:51:34 +02:00
Laurent Destailleur
6c3d191727 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-27 11:39:12 +02:00
Laurent Destailleur
99ed34b6a4 Fix escape db 2019-09-27 11:39:02 +02:00
Laurent Destailleur
6fbb5c0db7
Merge pull request #11963 from aspangaro/11.0_fa_icon
#11931 NEW Add fa_icon "tools" for load_fiche_titre
2019-09-27 11:38:44 +02:00
Laurent Destailleur
f15a88b0d4
Merge pull request #11945 from atm-john/develop_dashboard_global_stat_basic
New : Add basic stats to dashboard
2019-09-27 11:33:34 +02:00
Laurent Destailleur
e03667dc75
Merge pull request #11939 from frederic34/patch-17
fix badge linked resources on fichinter
2019-09-27 11:32:27 +02:00
Laurent Destailleur
41101d3dbe
Merge pull request #11955 from bafbes/abb100078
fix:forgotten test condition
2019-09-27 11:30:03 +02:00
Alexandre SPANGARO
4610f4391f Merge branch 'develop' into 11.0_fa_icon 2019-09-27 11:29:39 +02:00
Laurent Destailleur
148afcaca8
Merge pull request #11964 from hregis/8.0_mc2
FIX getObjectSid is only for Active Directory
2019-09-27 11:25:14 +02:00
Laurent Destailleur
017a3e10cc
Merge pull request #11965 from frederic34/patch-13
closedir only if $handle is ressource
2019-09-27 11:13:12 +02:00
Laurent Destailleur
2b6b1a3e1c Fix syntax error 2019-09-27 11:12:21 +02:00
Laurent Destailleur
cae8fd087c Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-27 11:08:05 +02:00
Laurent Destailleur
31c227f718 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-27 10:19:44 +02:00
Laurent Destailleur
64a7bbe0fd Move ajax file 2019-09-27 10:19:27 +02:00
Laurent Destailleur
5d0d3b3908 Description on 2 lines max 2019-09-27 09:57:48 +02:00
Laurent Destailleur
211d4ec78e
Merge pull request #11949 from frederic34/boxinfos
add infos missing in box
2019-09-26 23:43:40 +02:00
Laurent Destailleur
2e1decc57e Use css instead of hard coded style 2019-09-26 17:41:37 +02:00
Laurent Destailleur
72f9073337 Clean vat code samples to have cleaner rules for rowid. 2019-09-26 12:44:44 +02:00
Laurent Destailleur
9d90b31c20 css 2019-09-26 12:17:14 +02:00
Frédéric FRANCE
55e340c60b
closedir only if $handle is ressource 2019-09-25 21:47:43 +02:00
Regis Houssin
ffe866f96f FIX getObjectSid is only for Active Directory 2019-09-25 19:24:07 +02:00
Laurent Destailleur
b71f79ea4f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-25 15:48:54 +02:00
Laurent Destailleur
7d91649520 NEW Add extrafields in export of expense report (and holiday) 2019-09-25 15:48:44 +02:00
Alexandre SPANGARO
f4929c5315 NEW Add fa_icon "tools" for load_fiche_titre 2019-09-25 15:24:52 +02:00
Laurent Destailleur
ba1275332d Fix thousand separator for fr_NC 2019-09-25 13:03:43 +02:00
altairis
c59e26457d add MAIN_SHOW_COMPANY_NAME_IN_BANNER_ADDRESS constant 2019-09-25 12:18:19 +02:00
Juanjo Menent
b838ab0c31 Fix search by ref 2019-09-25 12:13:27 +02:00
John Botella
1712a094a5 Merge branch 'develop_dashboard_global_stat_basic' of github.com:atm-john/dolibarr into develop_dashboard_global_stat_basic_auto_removed 2019-09-25 11:25:13 +02:00
John Botella
6eb6bb72ad Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_dashboard_global_stat_basic 2019-09-25 11:23:34 +02:00
Laurent Destailleur
b3c49f2ec8 End of dev for extrafields on holiday 2019-09-24 16:26:15 +02:00
Laurent Destailleur
961f2b5165 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/categories/viewcat.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/takepos/invoice.php
2019-09-24 14:25:02 +02:00
Laurent Destailleur
5838fa1229 Fix az09 -> aZ09 2019-09-24 14:20:45 +02:00
Laurent Destailleur
19c78d42e9 Fix az09 -> aZ09 2019-09-24 14:20:29 +02:00
Laurent Destailleur
db334a3b94 FIX Var not enough sanitized 2019-09-24 14:16:24 +02:00
Laurent Destailleur
c53be23122 FIX Filtering the HTTP Header "Accept-Language". 2019-09-24 13:54:52 +02:00
Laurent Destailleur
9cfe1262bd FIX Force downlaod of file with .noexe as octet-stream mime type 2019-09-24 13:30:04 +02:00
Laurent Destailleur
b5c5cc42fc Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-09-24 12:43:54 +02:00
Laurent Destailleur
6431e8e16d FIX SQL injection on qty 2019-09-24 12:43:44 +02:00
Laurent Destailleur
7b3e64d67f NEW Support of Extrafields on Leave requests. 2019-09-24 12:01:18 +02:00
Abbes Bahfir
1ca531239e fix:forgotten test condition 2019-09-24 09:40:19 +01:00
Juanjo Menent
c97bd14278 FIX TakePOS no invoice validation control and good payment translate 2019-09-24 10:08:48 +02:00
Philippe GRAND
7ec43e8b59 add missing translation 2019-09-24 09:54:57 +02:00
Alexandre SPANGARO
1b099733f5 Merge remote-tracking branch 'upstream/develop' into 11.0_translation 2019-09-24 08:42:57 +02:00