Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
75,319 Commits 36 Branches 189 Tags
2bc93b9748604e474ee7d0f0e6421c424f996746
Commit Graph

6736 Commits

Author SHA1 Message Date
Laurent Destailleur
f9686c47af Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/fr_FR/members.lang
	htdocs/langs/fr_FR/stocks.lang
	htdocs/website/index.php
 2019-01-23 19:22:42 +01:00
Laurent Destailleur
e33f102dc2 FIX Edit of virtualhost 2019-01-23 14:57:43 +01:00
Laurent Destailleur
8fba387673 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-22 10:39:18 +01:00
Laurent Destailleur
3cca0df28e Support getFormatedCustomerRef into contract list 2019-01-22 10:39:06 +01:00
Günter Lukas
1cf786acff Fix #10278 
Fix #10278
 2019-01-22 00:09:36 +01:00
Laurent Destailleur
eba8a8f34d Merge pull request #10376 from atm-maxime/fix_extrafields_computed 
Compute value of computed extrafield on fetch, not on show
 2019-01-21 23:41:06 +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
Laurent Destailleur
8950720fb5 NEW Add getFormatedCustomerRef and getFormatedSupplierRef methods 2019-01-21 15:22:35 +01:00
Maxime Kohlhaas
23438b1f48 Compute extrafields after having set all others 2019-01-21 14:40:33 +01:00
Maxime Kohlhaas
f50de03585 Merge branch 'develop' of github.com:atm-maxime/dolibarr into fix_extrafields_computed 2019-01-21 14:36:23 +01:00
Maxime Kohlhaas
a2f5c72b54 Merge branch '8.0' of github.com:atm-maxime/dolibarr into fix_extrafields_computed 2019-01-21 14:33:25 +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
844643c37d Merge pull request #10375 from grandoc/new_branch_19_01_2019 
update with html5 compliant code
 2019-01-20 19:48:32 +01:00
Maxime Kohlhaas
c0b0d5484c Compute value of computed extrafield on fetch, not on show 2019-01-19 17:14:56 +01:00
Laurent Destailleur
300889f53a # WARNING: head commit changed in the meantime 
Fix
 2019-01-19 13:22:38 +01:00
Laurent Destailleur
2bbaae88d6 Fix standardize 'createfromclone' param when cloning 2019-01-19 12:46:38 +01:00
Philippe GRAND
29fdad144d update with html5 compliant code 2019-01-19 12:40:17 +01:00
wdammak
191900d258 Update stats.class.php 
Fix div/0 warnings
 2019-01-19 11:35:16 +01:00
wdammak
13e7d18291 Update stats.class.php 
Fix div/0 warnings
 2019-01-19 11:33:56 +01:00
wdammak
9f60c208ca Update stats.class.php 
Fix div/0 warnings
 2019-01-18 22:25:51 +01:00
Laurent Destailleur
d6b0f852c5 Work on invoicing time spent 2019-01-15 21:01:01 +01:00
Laurent Destailleur
f8ca44e42c NEW Preview of images into the filemanager component 2019-01-15 15:48:28 +01:00
Laurent Destailleur
d929d93376 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-08 14:19:35 +01:00
Laurent Destailleur
acc665a9f1 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/class/html.form.class.php
 2019-01-08 14:16:23 +01:00
Laurent Destailleur
1ee0d42408 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-01-08 14:08:22 +01:00
Laurent Destailleur
9a6c3ac3df FIX Selection of email recipient with option MAIN_OPTIMIZEFORTEXTBROWSER 2019-01-08 14:05:07 +01:00
Laurent Destailleur
3d4879c538 Code comment 2019-01-06 05:16:50 +01:00
Laurent Destailleur
6e078105ab Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
 2019-01-06 01:22:10 +01:00
Laurent Destailleur
c9e6074551 Code clean 2019-01-05 15:14:06 +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
dbbfdd984a Fix emailcollector can't be used without syntax rules 2019-01-03 11:47:27 +01:00
Laurent Destailleur
8b380489f2 Update commonobject.class.php 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2019-01-02 19:55:51 +01:00
Laurent Destailleur
85d60b93d6 Update commonobject.class.php 2019-01-02 19:53:59 +01:00
Günter Lukas
2857447aee Update commonobject.class.php 2018-12-30 00:20:38 +01:00
ldestailleur
7b91c14cb3 FIX sql error when resetting payment mode / term 2018-12-28 23:14:41 +01:00
ldestailleur
c0eef25b31 FIX Can set payment mode to empty on thirdparty page 2018-12-28 23:14:36 +01:00
ldestailleur
2fef2b633a FIX sql error when resetting payment mode / term 2018-12-28 23:13:39 +01:00
ldestailleur
8ad06463e0 FIX Can set payment mode to empty on thirdparty page 2018-12-28 23:06:04 +01:00
Laurent Destailleur
64de31ef67 Clean log 2018-12-27 06:09:27 +01:00
Laurent Destailleur
deba3249f8 FIX Bad trigger name 2018-12-27 06:09:03 +01:00
Laurent Destailleur
8ab2ef0cf0 Add log 2018-12-27 06:08:48 +01:00
Laurent Destailleur
fb813fcfb1 Clean log 2018-12-27 06:06:32 +01:00
Laurent Destailleur
88ad059f25 FIX Bad trigger name 2018-12-27 06:04:55 +01:00
Laurent Destailleur
0ffefd71f3 Add log 2018-12-27 05:58:27 +01:00
Laurent Destailleur
eda3a5bc8c FIX Init of email topic when using a template 2018-12-27 05:18:16 +01:00
Laurent Destailleur
0f76279a03 FIX Missing token and style 2018-12-27 03:46:14 +01:00
Laurent Destailleur
791b2f485a FIX Missing token and style 2018-12-27 03:45:30 +01:00
Laurent Destailleur
5c516fdae2 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
 2018-12-26 19:43:01 +01:00
Laurent Destailleur
35debd06fb List of events show user firstname by default 2018-12-23 01:28:36 +01:00