lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
62,587 Commits 43 Branches 150 Tags 886 MiB
6bd0550bdd
Commit Graph

62587 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandre SPANGARO
f1b7b36a11 Fix : problem on column in customer to bind index 2017-10-05 05:38:02 +02:00
Alexandre SPANGARO
9993e796ee Merge remote-tracking branch 'uptream/develop' into 7.0-label_operation_on_general_ledger 2017-10-05 05:12:56 +02:00
Regis Houssin
8a79198769 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_ldap

Conflicts:
	htdocs/core/class/comment.class.php
 2017-10-04 20:00:39 +02:00
Laurent Destailleur
6540bc0061 Fix doxygen 2017-10-04 19:48:11 +02:00
Regis Houssin
1cee16a802 Fix: minimal num, maj and special character with value 0 not work 2017-10-04 18:32:52 +02:00
Rui Strecht
7b60d75579 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2017-10-04 16:07:54 +01:00
Neil Orley
0202f8d488 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-api 2017-10-04 16:51:22 +02:00
Laurent Destailleur
ded55f41fb Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2017-10-04 16:08:22 +02:00
Neil Orley
a3096b4e9d NEW Generates the document before downloading using REST API 
Generates the document before downloading using REST API
 2017-10-04 15:59:54 +02:00
Laurent Destailleur
69c47aa7d9 Fix sql error 2017-10-04 15:22:55 +02:00
Laurent Destailleur
13cb806436 FIX #7531 #7537 2017-10-04 15:18:15 +02:00
Laurent Destailleur
d28188d19d FIX Generation of invoice from bulk action "Bill Orders" 
Conflicts:
	htdocs/fourn/class/fournisseur.facture.class.php
 2017-10-04 14:31:52 +02:00
Laurent Destailleur
a74d6074a3 FIX Generation of invoice from bulk action "Bill Orders" 2017-10-04 14:27:10 +02:00
Laurent Destailleur
8e0da9bfeb Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/holiday/document.php
 2017-10-04 13:32:53 +02:00
Laurent Destailleur
10142522e0 Fix typo 2017-10-04 13:30:43 +02:00
Regis Houssin
c563c3d3ac Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap 2017-10-04 13:19:07 +02:00
Regis Houssin
537fc63da5 Fix: add by error 2017-10-04 13:18:48 +02:00
Laurent Destailleur
9b3826a54c Invert left and right (my own comment on left) 2017-10-04 13:17:16 +02:00
Laurent Destailleur
85606126a9 Standardize code for events 2017-10-04 12:58:13 +02:00
Regis Houssin
a259057dd3 Fix: Found non escaped string 2017-10-04 12:42:41 +02:00
Regis Houssin
fd2188a8c7 Fix: remove back quote 2017-10-04 12:25:08 +02:00
Rui Strecht
097438d7a3 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2017-10-04 11:22:35 +01:00
Regis Houssin
a124f47dcd Fix: PHPCS 2017-10-04 12:07:17 +02:00
Regis Houssin
66ad30feb0 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap 2017-10-04 11:23:50 +02:00
Regis Houssin
723bc4d436 NEW add ldap_rename for avoid password if ldap key changed 2017-10-04 11:22:41 +02:00
Laurent Destailleur
2dee81125a Hide comment feature for the moment 2017-10-04 11:18:31 +02:00
Laurent Destailleur
75a7e086b3 Merge pull request #7427 from atm-arnaud/NEW_comment_generic_element 
New comment generic element
 2017-10-04 11:13:39 +02:00
Laurent Destailleur
e7ac828cc7 Merge pull request #7551 from hregis/develop_bug_restapi 
Fix: refactorization of "getListForItem" function
 2017-10-04 10:59:55 +02:00
Laurent Destailleur
7f11138f19 Merge pull request #7555 from frederic34/patch-1 
can't clean search_type in holiday list
 2017-10-04 10:57:27 +02:00
Frédéric FRANCE
69314e08ac can't clean search_type in holiday list 2017-10-04 10:12:51 +02:00
Regis Houssin
59bf61f9b3 NEW add possibility to disabled the LDAP trigger 2017-10-04 09:22:18 +02:00
Regis Houssin
feea6246c2 NEW add possibility to hide LDAP tab for non admin 2017-10-04 09:13:41 +02:00
Regis Houssin
8d3ad9ddc8 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap 2017-10-04 08:43:07 +02:00
Laurent Destailleur
436ec93084 FIX is_erasable report bad value when thirdparty was not loaded 2017-10-04 03:22:41 +02:00
Laurent Destailleur
7cf4ec772a Restore original travis setup 2017-10-04 02:56:45 +02:00
Laurent Destailleur
a6cf934973 Add log 2017-10-04 02:46:01 +02:00
Laurent Destailleur
bd3a76ee84 Debug travis 2017-10-04 02:00:38 +02:00
Laurent Destailleur
5b8e9f7269 Debug travis 2017-10-04 01:53:55 +02:00
Laurent Destailleur
3a41f2bddb Fix test when numbering ref is only numeric char. 2017-10-04 01:27:19 +02:00
Laurent Destailleur
f380747e20 More accurate error code 2017-10-04 01:11:19 +02:00
Laurent Destailleur
c08f33507f More accurate error code 2017-10-04 00:51:25 +02:00
Laurent Destailleur
8794e54eba Try to fix phpunit 2017-10-03 22:52:57 +02:00
Laurent Destailleur
4c90e1c10d Add link to modules Ids 2017-10-03 21:13:28 +02:00
Rui Strecht
be5481f51a Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2017-10-03 18:44:43 +01:00
Regis Houssin
45de1ca21e Fix: check security 2017-10-03 19:09:46 +02:00
Regis Houssin
4537e5472b Fix: refactorization of "getListForItem" function 2017-10-03 19:01:54 +02:00
Laurent Destailleur
5ddd77c950 Fix We must use dol_escape_htmltag for input field not dol_htmlentities 2017-10-03 18:35:35 +02:00
Maxime Kohlhaas
37b1b161f9 Merge branch '5.0' of github.com:atm-maxime/dolibarr into fix_member_search_pgsql 2017-10-03 18:15:01 +02:00
Maxime Kohlhaas
123c9d2315 Better fix only if bdd is pgsql 2017-10-03 18:12:17 +02:00
Laurent Destailleur
eeb36464b7 Merge pull request #7524 from hregis/develop_mc 
Fix: command not found with escapeshellarg !
 2017-10-03 18:06:49 +02:00