Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
82,240 Commits 36 Branches 189 Tags
f94b3e55b980e9bec05352cb15a2bc338fb746e4
Commit Graph

6147 Commits

Author SHA1 Message Date
Philippe Grand
ccdae4c597 Update html.formadvtargetemailing.class.php 2018-08-18 19:15:25 +02:00
Philippe GRAND
c8c8af55a0 Typo 2018-08-18 15:56:23 +02:00
Philippe GRAND
da951e61f2 Update and standardize code 2018-08-17 22:29:21 +02:00
Philippe GRAND
c48211ad70 Update and standardize code 2018-08-17 19:31:22 +02:00
Frédéric FRANCE
71d3af8b07 Update propal.class.php 2018-08-17 13:44:07 +02:00
Laurent Destailleur
4e02b134da Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2018-08-16 14:50:04 +02:00
Laurent Destailleur
2719c4eb43 Fix escape 2018-08-16 01:01:38 +02:00
Laurent Destailleur
4b7889b295 Fix left join broken 2018-08-16 01:00:38 +02:00
Frédéric FRANCE
54a078149a function declaration 2018-08-15 17:34:35 +02:00
Laurent Destailleur
5a1a6ac095 Fix error message 2018-08-15 14:42:03 +02:00
Frédéric FRANCE
7bb781eea8 function declaration 2018-08-15 14:28:34 +02:00
Frédéric FRANCE
850ac34020 mark non camelCaps function 2018-08-13 17:26:32 +02:00
Frédéric FRANCE
82e8efe792 Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-12 20:14:14 +02:00
Laurent Destailleur
9fc5d39d07 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-12 20:09:36 +02:00
Laurent Destailleur
dc8c4402ee Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-12 20:09:22 +02:00
Laurent Destailleur
0a1c6e7194 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/compta/facture/list.php
	htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
 2018-08-12 20:08:20 +02:00
Frédéric FRANCE
6113b536a0 remove superfluous spaces 2018-08-12 19:59:39 +02:00
Laurent Destailleur
30b4d88428 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/product/reassort.php
	htdocs/societe/list.php
 2018-08-12 19:23:45 +02:00
Laurent Destailleur
61a5be6e2a Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-08-12 19:19:21 +02:00
Laurent Destailleur
b81b6b651f Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-08-12 19:17:26 +02:00
Frédéric FRANCE
6f74ecceaf Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-12 18:21:59 +02:00
Laurent Destailleur
3d4d42462c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-08-12 16:30:21 +02:00
Laurent Destailleur
12e21b4886 FIX update extrafields 2018-08-12 16:29:26 +02:00
Laurent Destailleur
9b50bc2197 Fix css 2018-08-09 19:29:48 +02:00
Laurent Destailleur
61d7629ab1 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
 2018-08-08 17:44:22 +02:00
Juanjo Menent
ca7666793b Merge pull request #9213 from fmarcet/develop 
New: Sales representative column on Propal List
 2018-08-08 11:11:20 +02:00
Frédéric FRANCE
9025c452ef Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-07 16:40:03 +02:00
Philippe GRAND
68de0ba93b clean and update code 2018-08-07 10:56:59 +02:00
Ferran Marcet
c74ffade7d New: Sales representative column on Propal List 2018-08-07 10:05:50 +02:00
Philippe GRAND
948647f3f9 comment translation 2018-08-04 14:17:51 +02:00
Laurent Destailleur
b01f07efda Merge branch 'develop' into FIX_project_overview 2018-08-02 18:43:55 +02:00
Juanjo Menent
b8efe3b239 Merge pull request #9172 from grandoc/new_branch_28_07_2018 
standardize
 2018-08-02 11:27:02 +02:00
Juanjo Menent
37a9a2df56 Merge pull request #9167 from frederic34/include 
Include and co are statements
 2018-08-02 11:03:44 +02:00
Philippe GRAND
d1f100b0c9 standardize 2018-07-29 17:17:29 +02:00
Philippe GRAND
de70bf983e standardize 2018-07-29 13:40:35 +02:00
Laurent Destailleur
7af42c66cc Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/comm/propal/list.php
 2018-07-27 12:54:45 +02:00
Frédéric FRANCE
b90d125fda trim trailing 2018-07-26 20:19:52 +02:00
Frédéric FRANCE
a0a5d33641 test include 2018-07-26 17:30:53 +02:00
Frédéric FRANCE
2dd907a8e1 extrafield totalizable 2018-07-26 09:41:44 +02:00
Laurent Destailleur
e024ea9c05 Merge pull request #9146 from grandoc/new_branch_24_07_2018 
Clean and update code
 2018-07-24 21:41:12 +02:00
Philippe
d7f58d0087 FIX search on ref project on propal list 2018-07-24 20:28:49 +02:00
Laurent Destailleur
dc2fec8f57 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-24 19:37:04 +02:00
Laurent Destailleur
d871b8964f Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-07-24 19:23:40 +02:00
Laurent Destailleur
20f178fdfe Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/core/lib/functions.lib.php
 2018-07-24 19:22:00 +02:00
Philippe GRAND
2a6f050e32 Clean and update code 2018-07-24 18:28:56 +02:00
Philippe GRAND
442ffb95ba clean and update code 2018-07-23 17:57:11 +02:00
Laurent Destailleur
19bb8a5091 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/accountancy.lang
 2018-07-18 14:12:28 +02:00
Laurent Destailleur
4beca8d989 Fix restore look and feel 2018-07-18 13:00:38 +02:00
Philippe Grand
e913d854d0 Fix PR 2018-07-16 11:00:39 +02:00
Laurent Destailleur
387abf2da8 Merge pull request #9057 from inoveaconseil/checkRightOnLink 
ADD Check right on link
 2018-07-16 09:31:21 +02:00