Commit Graph

89109 Commits

Author SHA1 Message Date
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
435edf999b Fix: label of product not always visible after a search 2019-09-27 11:05:44 +02:00
Marc de Lima Lucio
13f5decdf7 FIX: shipping card: missing user error messages when classifying closed or billed 2019-09-27 11:00:17 +02:00
Laurent Destailleur
cd295662d6 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-09-27 10:21:28 +02:00
Laurent Destailleur
8c3c7fd857 Fix remove + of categ on product thumb 2019-09-27 10:21:14 +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
Frédéric FRANCE
03086026b8
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-27 08:06:13 +02:00
Frédéric FRANCE
5eb0fb462b
Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-27 07:59:02 +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
d4364dd44e
Merge pull request #11956 from atm-john/10.0_fix_top_menu_size
FIX top menu right padding
2019-09-26 23:39:23 +02:00
Laurent Destailleur
5d7e542d37
Merge pull request #11970 from aspangaro/10.0_colspan
FIX colspan on VAT quadri report
2019-09-26 23:29:09 +02:00
Alexandre SPANGARO
b52e5d51e3 FIX colspan on VAT quadri report 2019-09-26 22:01:59 +02:00
JC Prieto
cdb6e7f9a6
Fix moved to fetch_line()
Fix moved to fetch_line()
2019-09-26 20:34:28 +02:00
Laurent Destailleur
2e1decc57e Use css instead of hard coded style 2019-09-26 17:41:37 +02:00
Laurent Destailleur
33754f1951 Update demo 2019-09-26 14:36:23 +02:00
Laurent Destailleur
24e5b6ab79 Fix default filename of dump 2019-09-26 14:35:50 +02:00
Laurent Destailleur
aa5f35f14f Fix image on ticket 2019-09-26 14:28:34 +02:00
Laurent Destailleur
0e5d0a7784 Add data for tickets 2019-09-26 14:14:01 +02:00
Laurent Destailleur
b0615d477e Update demo 2019-09-26 13:58:43 +02:00
Laurent Destailleur
280219843e Update demo 2019-09-26 13:58:30 +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 De Coninck
040e7bdfdf working solution about filtering the contacs of one company 2019-09-25 18:24:36 +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
JC Prieto
0893926189
Update expedition.class.php
Clear lines before fech them.
2019-09-25 12:49:19 +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
Tim Otte
b673c88fab Fixed sql error 2019-09-25 10:25:00 +02:00
Frédéric FRANCE
41cb628d05
Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-25 08:06:44 +02:00
Ferran Marcet
1c9c72ced7 Qual: Clean code on sellist extrafields. Translate if query has only one field 2019-09-24 17:52:11 +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
Ferran Marcet
a8cc11d232 Merge branch 'developup' into develop 2019-09-24 13:38:11 +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
John Botella
5417dc0356 Fix top menu right padding 2019-09-24 13:11:40 +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