Commit Graph

14507 Commits

Author SHA1 Message Date
Philippe GRAND
80b7229174 Standardize and update code 2018-08-23 11:34:55 +02:00
Philippe GRAND
9e900e583d Merge branch 'new_branch_21_08_2018' of github.com:grandoc/dolibarr into new_branch_21_08_2018 2018-08-23 11:13:54 +02:00
Philippe GRAND
aafa16afa5 Update and standardize code 2018-08-23 11:11:46 +02:00
Philippe Grand
e09f7bedd0
Update commonobject.class.php 2018-08-23 09:57:19 +02:00
Philippe GRAND
504b0e3d16 Update and standardize code 2018-08-22 18:34:50 +02:00
Philippe GRAND
95349365ba Update and standardize code 2018-08-22 11:39:37 +02:00
Philippe GRAND
0ffad50974 Update and standardize code 2018-08-22 11:24:31 +02:00
Philippe GRAND
d91b1fd895 Update and standardize code 2018-08-22 11:06:34 +02:00
Philippe GRAND
29f15b4ae6 Update and standardize code 2018-08-22 10:51:55 +02:00
Philippe GRAND
a669830427 Update and standardize code 2018-08-22 10:37:16 +02:00
Laurent Destailleur
db3c17668e Fix coding style 2018-08-21 19:08:11 +02:00
Laurent Destailleur
3f4714416d Clean comment 2018-08-21 18:58:10 +02:00
Laurent Destailleur
f8b3ec7b87 Fix PHPCS 2018-08-21 18:57:34 +02:00
Laurent Destailleur
21a9fd625f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-21 14:15:22 +02:00
Laurent Destailleur
5f6c165fb6 Module builder is stable 2018-08-21 14:14:27 +02:00
Laurent Destailleur
0799970804
Merge pull request #9248 from frederic34/FunctionDeclaration
function declaration
2018-08-21 13:41:56 +02:00
Laurent Destailleur
289f194641
Merge pull request #9058 from defrance/patch-123
New : Add total price on dashboard
2018-08-21 13:33:33 +02:00
Laurent Destailleur
a414aeb29e
Merge pull request #9266 from frederic34/patch-21
Update propal.lib.php
2018-08-21 12:53:37 +02:00
Laurent Destailleur
866f9c4cf7
Merge pull request #9259 from frederic34/patch-18
Update actions_printing.inc.php
2018-08-21 12:52:54 +02:00
Laurent Destailleur
b40e32b8c3
Merge pull request #9264 from grandoc/new_branch_17_08_2018
standardize code
2018-08-21 12:52:34 +02:00
Laurent Destailleur
26d34422b0 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-19 03:01:26 +02:00
Laurent Destailleur
795b2f3d58 FIX Delete file on smartphone 2018-08-19 03:00:11 +02:00
Laurent Destailleur
d8365e9260 Module DAV 2018-08-19 02:17:12 +02:00
Frédéric FRANCE
391995c09b
Update propal.lib.php 2018-08-18 17:26:42 +02:00
Philippe GRAND
c48211ad70 Update and standardize code 2018-08-17 19:31:22 +02:00
Philippe GRAND
edb566501d Update and standardize code 2018-08-17 18:54:41 +02:00
Philippe GRAND
78e9e05f95 Update and standardize code 2018-08-17 18:35:51 +02:00
Frédéric FRANCE
3afcf50d07
Update actions_printing.inc.php 2018-08-17 11:21:02 +02:00
Laurent Destailleur
ab22c9d0de Work on import 2018-08-16 21:48:16 +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
4c52384609 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-08-16 14:48:42 +02:00
Laurent Destailleur
0c654bd452 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-08-16 14:47:56 +02:00
Laurent Destailleur
f7da76e1c0 Use session cache for stats 2018-08-16 14:24:59 +02:00
Laurent Destailleur
b515511ad6
Merge branch 'develop' into FunctionDeclaration 2018-08-16 00:52:55 +02:00
Laurent Destailleur
3b245f1b30
Merge pull request #9247 from frederic34/missingReturn
return comment
2018-08-16 00:35:39 +02:00
Frédéric FRANCE
69a7af88e7
function declaration 2018-08-15 18:14:02 +02:00
Frédéric FRANCE
54a078149a
function declaration 2018-08-15 17:34:35 +02:00
Frédéric FRANCE
7bb781eea8
function declaration 2018-08-15 14:28:34 +02:00
Laurent Destailleur
ec56ad752c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/filefunc.inc.php
2018-08-15 14:26:38 +02:00
Laurent Destailleur
37ca3ff230 Fix separator 2018-08-14 20:51:24 +02:00
Frédéric FRANCE
d25fa61998
return comment 2018-08-14 13:14:55 +02:00
Frédéric FRANCE
a0a6afc224
return comment 2018-08-14 12:23:10 +02:00
florian HENRY
20309665e6 fix : ODT project substitution 2018-08-14 10:45:08 +02:00
Frédéric FRANCE
0b5a87a443
Update modules_holiday.php 2018-08-13 17:25:41 +02:00
Laurent Destailleur
33f0172603 Fix select zip/town 2018-08-13 16:44:49 +02:00
Laurent Destailleur
d92096f74a Fix menu payment not required if only module bank on 2018-08-13 02:04:38 +02:00
Laurent Destailleur
6a8ed56c3d Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-13 01:23:43 +02:00
Laurent Destailleur
31c42c9a32 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
	htdocs/societe/canvas/actions_card_common.class.php
2018-08-13 01:23:03 +02:00
Laurent Destailleur
21555a7435 Fix firstname/lastname 2018-08-13 01:10:51 +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