Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
78,589 Commits 36 Branches 189 Tags
594d9e321e8c7753932ca8ee98491036a3b51ec9
Commit Graph

5262 Commits

Author SHA1 Message Date
Frédéric FRANCE
496fa9b0fb PSR2.Files.EndFileNewline.TooMany 2019-01-27 14:10:35 +01:00
Frédéric FRANCE
7ee086b402 PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Frédéric FRANCE
6e91b3cefc PSR2 usage of else if is discouraged 2019-01-27 10:49:34 +01:00
Laurent Destailleur
462c1f9c1a Merge pull request #10413 from mapiolca/patch-8 
Add date_livraison substitution
 2019-01-26 15:38:00 +01:00
Pierre Ardoin
6fdbded588 Update functions.lib.php 2019-01-26 14:40:00 +01:00
Laurent Destailleur
fd192f10c4 Merge pull request #10341 from hregis/8.0_bug 
FIX security broken with Multicompany
 2019-01-26 14:28:13 +01:00
Pierre Ardoin
78f8607d41 Add date_livraison substitution 
Complete the substitution for supplier orders.
 2019-01-25 13:15:24 +01:00
Laurent Destailleur
e860d664d7 Fix substitution of __REF_CLIENT__ 2019-01-23 11:54:20 +01:00
Laurent Destailleur
8104b7fa2d look and feel v10 2019-01-22 15:40:51 +01:00
Laurent Destailleur
42743027d4 Merge branch 'develop' into objectline_etc 2019-01-21 18:04:48 +01:00
torvista
9b1cf648dc more validation fixes 2019-01-21 16:19:31 +01:00
torvista
07b2bb6715 Swap of align/valign/border/width for css 
Removal of type="text/javascript"
 2019-01-20 23:36:39 +01:00
Laurent Destailleur
7493ba018a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/8.0.0-9.0.0.sql
 2019-01-20 20:38:26 +01:00
Laurent Destailleur
3ddfcbe3bb Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	.travis.yml
	dev/setup/codesniffer/ruleset.xml
 2019-01-20 20:36:45 +01:00
Regis Houssin
d5b66eeffb FIX $user is already in parameters 2019-01-19 18:12:48 +01:00
Laurent Destailleur
4ffd7de9f7 doc 2019-01-19 16:15:05 +01:00
Laurent Destailleur
f311deb405 Fix hash for gol_getprefix must not contains special char. 2019-01-19 16:14:45 +01:00
Philippe GRAND
29fdad144d update with html5 compliant code 2019-01-19 12:40:17 +01:00
Laurent Destailleur
05cc5b6398 Show duration of jobs 2019-01-17 17:50:21 +01:00
gauthier
d997309bcb FIX : if(!method_exists(dol_loginfunction)) 2019-01-17 14:49:30 +01:00
Regis Houssin
c4b9bdd569 FIX remove var_dump 2019-01-16 19:15:02 +01:00
Regis Houssin
45a7e03562 FIX a user can always read its own card 2019-01-16 19:13:21 +01:00
Laurent Destailleur
3a8afafabd Merge pull request #10027 from atm-quentin/NEW_manage_multicompany_for_invoice 
New manage multicompany for invoice
 2019-01-16 18:51:01 +01:00
Laurent Destailleur
e7943ae844 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-16 16:48:52 +01:00
Laurent Destailleur
d3828130ab Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/adherents/class/adherent.class.php
 2019-01-16 16:48:21 +01:00
Laurent Destailleur
a72d92006b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-16 13:57:33 +01:00
Laurent Destailleur
638be67f96 Fix tooltip 2019-01-16 13:56:13 +01:00
Laurent Destailleur
c357cb8c4e Clean code 2019-01-16 12:42:54 +01:00
atm-quentin
013c078c8b Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_manage_multicompany_for_invoice 2019-01-16 10:52:46 +01:00
Laurent Destailleur
1f87b8bb18 FIX Position of price symbol (before) for nl_NL 2019-01-16 01:54:08 +01:00
ptibogxiv
c96f349c21 update head with schedule 2019-01-15 14:55:15 +01:00
Regis Houssin
7c9d85d091 FIX problem with multicompany transverse mode 
Signed-off-by: Regis Houssin <regis.houssin@inodbox.com>
 2019-01-15 12:18:04 +01:00
Laurent Destailleur
126e02798a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/cashdesk.lang
	htdocs/langs/fr_FR/cashdesk.lang
 2019-01-07 19:49:15 +01:00
Laurent Destailleur
1306918eb0 FIX #10299 2019-01-07 16:03:55 +01:00
AXeL-dev
66e1df753e run_sql function: support for numbers in database prefix 2019-01-07 09:33:24 +01:00
ldestailleur
451b3e30cc Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/company.lib.php
	htdocs/core/lib/functions.lib.php
	htdocs/langs/en_US/cashdesk.lang
 2019-01-04 19:36:20 +01:00
ldestailleur
5638ac8f4d FIX title on picto no more visible 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2019-01-04 15:25:14 +01:00
ldestailleur
b4fc4b0178 FIX title on picto no more visible 2019-01-04 15:22:59 +01:00
ldestailleur
ab9fe1a757 Add option to use fontawesome 5 with fontawesome 4 2019-01-03 21:14:59 +01:00
ldestailleur
7c1ed5b913 FIX #9972 #10297 2019-01-03 13:28:35 +01:00
ldestailleur
7cb3b8dfec Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-02 19:42:26 +01:00
ldestailleur
bc00fb177a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-02 19:42:15 +01:00
ldestailleur
a9e8e13bb6 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	ChangeLog
	htdocs/user/param_ihm.php
 2019-01-02 19:41:39 +01:00
ldestailleur
3d8479291d Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-01-02 19:39:35 +01:00
Laurent Destailleur
422e18ee8e Merge pull request #10268 from hregis/develop_upgrade 
FIX remove old unused and deprecated function "getStaticMember"
 2019-01-02 19:37:49 +01:00
ldestailleur
8645a7f524 FIX Interface regression for bind people. Fix option 
MAIN_OPTIMIZEFORTEXTBROWSER
 2019-01-02 18:58:45 +01:00
Laurent Destailleur
294107bba0 FIX vars for substitution must be null if not applicable (and not '') 2018-12-27 05:07:11 +01:00
Laurent Destailleur
6a708666b2 FIX vars for substitution must be null if not applicable (and not '') 2018-12-27 05:06:37 +01:00
Regis Houssin
4ee09c9d5b FIX remove old unused and deprecated function 2018-12-25 07:58:32 +01:00
Laurent Destailleur
35debd06fb List of events show user firstname by default 2018-12-23 01:28:36 +01:00