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

14706 Commits

Author SHA1 Message Date
Philippe GRAND
af37b08da3 Merge remote-tracking branch 'upstream/develop' into new_branch_07_09_2018 2018-09-07 14:48:43 +02:00
Laurent Destailleur
e5058a251d Use colored gradient background on login page 2018-09-07 12:27:08 +02:00
Philippe GRAND
97c740f510 Merge branch 'develop' of github.com:grandoc/dolibarr into develop 2018-09-06 19:28:10 +02:00
Philippe GRAND
e9c2a475bc fix merge 2018-09-06 19:27:28 +02:00
Laurent Destailleur
f7c87a9ad3 Clean cron init 2018-09-05 22:46:08 +02:00
Laurent Destailleur
2a471df828 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-05 20:42:55 +02:00
Laurent Destailleur
ed31eec5ee Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-09-05 20:40:19 +02:00
Laurent Destailleur
dfea391c88 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/lib/pdf.lib.php
 2018-09-05 20:39:38 +02:00
Laurent Destailleur
4ac67e6409 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-05 20:31:10 +02:00
Laurent Destailleur
cb89942bfb Add option capture on input file for photo 2018-09-05 16:03:10 +02:00
Laurent Destailleur
3650dc3ec9 FIX #8452 2018-09-05 15:25:47 +02:00
Laurent Destailleur
ab8155f170 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/card.php
	htdocs/filefunc.inc.php
 2018-09-04 21:35:43 +02:00
Philippe Grand
c32c67ca57
Merge branch 'develop' into develop 2018-09-04 16:58:59 +02:00
Philippe GRAND
50a26aaf16 fix merge 2018-09-04 14:33:34 +02:00
Philippe GRAND
42565e722e Standardize and update code 2018-09-04 13:37:00 +02:00
Philippe GRAND
0492492df1 fix merge 2018-09-04 12:30:06 +02:00
Laurent Destailleur
f2ec94e9fd FIX #9353 Bug: html error - div inside span on graphs 2018-09-04 11:13:54 +02:00
Laurent Destailleur
c59b0f95e6 FIX #9403 2018-09-04 10:10:47 +02:00
Laurent Destailleur
252335318f
Update pdf.lib.php 2018-09-04 09:57:01 +02:00
Marc de Lima Lucio
e285b42a18 FIX: PDF address: handle when contact thirdparty different from document thirdparty 2018-09-03 17:57:30 +02:00
Laurent Destailleur
540999faa5 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/core/lib/company.lib.php
 2018-09-03 14:06:51 +02:00
Laurent Destailleur
6641a05744 Fix missing class 2018-09-03 11:59:19 +02:00
Philippe GRAND
4fba7cdf45 fix : Class Contact not found in htdocs/core/lib/company.lib.php on line 1496 2018-09-03 09:45:06 +02:00
Philippe GRAND
7a0c19485e fix merge 2018-09-03 09:34:08 +02:00
Regis Houssin
912c05774b FIX remove deprecated triggers USER_LOG* 2018-09-03 09:30:36 +02:00
Laurent Destailleur
a68f5cad77 Fix syntax error 2018-09-02 17:18:19 +02:00
Laurent Destailleur
887a40cf1d Remove TODO 2018-09-02 16:46:01 +02:00
Laurent Destailleur
0bf850c1ea Fix phpcs 2018-09-02 16:26:00 +02:00
Laurent Destailleur
3baaa2e975 Fix syntax error 2018-09-02 16:18:08 +02:00
Laurent Destailleur
ddd6ac296c Fix missing class 2018-09-02 16:09:40 +02:00
Laurent Destailleur
5488bfe1fe
Merge pull request #9018 from all3kcis/patch-10 
Enable auto update PDF on update note
 2018-09-02 16:01:22 +02:00
Laurent Destailleur
dda0c5699e
Update actions_setnotes.inc.php 2018-09-02 15:59:09 +02:00
Laurent Destailleur
e661eff329 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-02 15:48:43 +02:00
Laurent Destailleur
3d3edb19d8 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	.travis.yml
	htdocs/langs/en_US/commercial.lang
 2018-09-02 15:48:26 +02:00
Laurent Destailleur
76d6affb27 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	.travis.yml
 2018-09-02 15:46:09 +02:00
Laurent Destailleur
b34731afb4
Merge pull request #9385 from frederic34/patch-15 
Update html_cerfafr.modules.php
 2018-09-02 15:38:19 +02:00
Laurent Destailleur
91809de1c3
Merge pull request #9383 from frederic34/patch-13 
Update doc_generic_user_odt.modules.php
 2018-09-02 15:35:54 +02:00
Philippe GRAND
3de16a145e Standardize and update code 2018-09-02 11:08:41 +02:00
Philippe GRAND
5cd9557318 Standardize and Update code 2018-09-01 23:12:20 +02:00
Philippe GRAND
ae2df6be11 Standardize and Update code 2018-09-01 23:04:46 +02:00
Philippe GRAND
7b0d3c32ab Standardize and Update code 2018-09-01 22:55:10 +02:00
Philippe GRAND
5d273960dc fix conflict 2018-09-01 22:40:38 +02:00
Frédéric FRANCE
49a1e33fc9
Update html_cerfafr.modules.php 2018-09-01 16:23:30 +02:00
Laurent Destailleur
c8912d6a4f
Merge pull request #9242 from frederic34/camelCaps 
mark non camelCaps function
 2018-09-01 15:37:56 +02:00
Frédéric FRANCE
ae52b737b3
Update doc_generic_user_odt.modules.php 2018-09-01 15:29:41 +02:00
Philippe GRAND
f77dd2ebc7 Standardize and update code 2018-09-01 15:13:59 +02:00
Laurent Destailleur
2301ecf1dc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-01 14:51:20 +02:00
Philippe GRAND
8d7dfaf98c Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2018-09-01 14:49:42 +02:00
Laurent Destailleur
fe7a0c894f
Merge pull request #9368 from atm-ph/fix_7.0_search_company_by_code 
Fix search company by code
 2018-09-01 14:42:32 +02:00
Laurent Destailleur
945e925399
Update html.form.class.php 2018-09-01 14:41:44 +02:00