lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
69,454 Commits 43 Branches 150 Tags 886 MiB
fa61ebeb9d
Commit Graph

69454 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
fa61ebeb9d
Merge pull request #9547 from grandoc/new_branch_17_09_2018 
Standardize and update code
 2018-09-18 14:57:50 +02:00
Laurent Destailleur
609c0c8b90
Merge pull request #9544 from ptibogxiv/patch-63 
fix html
 2018-09-18 14:57:26 +02:00
Laurent Destailleur
867850eadb
Merge pull request #9525 from frederic34/patch-9 
reduce complexity societe class
 2018-09-18 14:56:51 +02:00
Laurent Destailleur
1a1219ee2a Trans 2018-09-18 14:52:50 +02:00
Laurent Destailleur
a8ecec68e7 css 2018-09-18 11:58:26 +02:00
Laurent Destailleur
e07ce644e8 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/admin.lib.php
	htdocs/langs/en_US/admin.lang
 2018-09-18 11:49:35 +02:00
Laurent Destailleur
2d8eb034e3 FIX Maxi debug to allow to load chart of account with multicompany 2018-09-17 21:02:07 +02:00
Philippe GRAND
d1a27b33fb Standardize and update code 2018-09-17 17:28:05 +02:00
Laurent Destailleur
1e36aba35f Trans 
Conflicts:
	htdocs/langs/en_US/admin.lang
 2018-09-17 16:42:44 +02:00
Laurent Destailleur
2f06e58237 css 2018-09-17 16:31:58 +02:00
Philippe GRAND
b06516180b Standardize and update code 2018-09-17 15:06:41 +02:00
Philippe GRAND
cc5a8eb7d9 Merge remote-tracking branch 'upstream/develop' into new_branch_17_09_2018 2018-09-17 15:03:27 +02:00
Laurent Destailleur
98f26bfcfb NEW Can set 2 url in url field of thirdparty 2018-09-17 14:31:30 +02:00
Laurent Destailleur
3fc3cc4688 Fix missing email in popup 2018-09-17 14:17:10 +02:00
Laurent Destailleur
d717e28338 Trans 2018-09-17 14:15:30 +02:00
Laurent Destailleur
d872beb499 Fix css 2018-09-17 12:59:43 +02:00
Philippe GRAND
cd796bf682 Standardize and update code 2018-09-17 12:29:21 +02:00
Philippe GRAND
2a0ed0f14c Merge remote-tracking branch 'upstream/develop' into new_branch_17_09_2018 2018-09-17 12:27:36 +02:00
Laurent Destailleur
a75629e8e9 CSS 2018-09-17 12:25:49 +02:00
Laurent Destailleur
f3ce7cb5a5 Quick hack to provide help to fix pb of undesirable files 2018-09-17 10:40:42 +02:00
Philippe GRAND
484b36c5aa Standardize and update code 2018-09-17 09:31:32 +02:00
Philippe GRAND
01ea6aee6c Merge remote-tracking branch 'upstream/develop' into new_branch_17_09_2018 2018-09-17 09:25:42 +02:00
Laurent Destailleur
0bf540b3c1 Fix regression in edition of date 2018-09-17 09:17:11 +02:00
Philippe GRAND
a1b15f170e Standardize and update code 2018-09-17 09:00:23 +02:00
Laurent Destailleur
797de131a6 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-17 02:26:15 +02:00
Laurent Destailleur
f3f18bf8cb Fix sql 2018-09-17 02:23:11 +02:00
ptibogxiv
38b23d2be4
Update charge.php 2018-09-16 22:55:50 +02:00
ptibogxiv
8c32ffd2e2
fix html 2018-09-16 22:36:58 +02:00
Laurent Destailleur
7fb2b1a769 Fix reset extrafields that must be unique when cloning 2018-09-16 22:30:13 +02:00
Laurent Destailleur
9415486059 Unique extrafields are reset when cloning contract 2018-09-16 22:13:29 +02:00
Laurent Destailleur
eeb919dcda Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-16 14:24:13 +02:00
Laurent Destailleur
055a0b2859 Merge branch '8.0' of github.com:Dolibarr/dolibarr into 8.0 2018-09-16 13:29:13 +02:00
Laurent Destailleur
79b15b81f2 Fix list of tasks on time consumed 2018-09-16 13:28:37 +02:00
Laurent Destailleur
ab0f842db6 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-16 12:55:44 +02:00
Laurent Destailleur
cc4fbfc3ef Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2018-09-16 12:54:39 +02:00
Laurent Destailleur
9c4f582f5c Merge 2018-09-16 12:52:11 +02:00
Laurent Destailleur
d06785e91a Fix responsive 2018-09-16 12:48:36 +02:00
Laurent Destailleur
74a9c680df FIX "Other ..." link so the "Back to" link works. 2018-09-16 12:27:56 +02:00
Laurent Destailleur
4151ca49eb Fix position of menu 2018-09-16 12:15:33 +02:00
Laurent Destailleur
f7c2bd877a Comment dead code 2018-09-16 10:39:30 +02:00
Laurent Destailleur
10c6bc44ca Fix scrutinizer 2018-09-16 10:28:41 +02:00
Laurent Destailleur
d6ee00f2e7 Fix constructors does not need return value 2018-09-16 10:22:23 +02:00
Laurent Destailleur
e90a60d4ee Remove warnings 2018-09-16 10:09:19 +02:00
Laurent Destailleur
d9ffba72f0 Fix use fetch_object instead of fetch_array 2018-09-16 10:03:47 +02:00
Laurent Destailleur
2527127859 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-16 09:50:30 +02:00
Laurent Destailleur
eebd329c7c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/DolibarrModules.class.php
	htdocs/core/modules/modAgenda.class.php
	htdocs/core/modules/modFacture.class.php
	htdocs/langs/en_US/admin.lang
	htdocs/langs/en_US/main.lang
	htdocs/stripe/transaction.php
 2018-09-16 09:50:13 +02:00
Laurent Destailleur
a0bcf999c5 FIX #9043 2018-09-16 09:45:33 +02:00
Laurent Destailleur
a6d4185d6b FIX #9043 2018-09-16 09:44:52 +02:00
Laurent Destailleur
55e7989552 FIX #9043 2018-09-16 09:42:30 +02:00
Laurent Destailleur
2c8064967b Code comment 2018-09-16 09:31:06 +02:00