Commit Graph

68865 Commits

Author SHA1 Message Date
atm-quentin
37a4a0c488 fix for travis 2018-07-31 10:02:36 +02:00
Alexandre SPANGARO
0509a176ca Merge branch 'develop' into 9.0_a3 2018-07-31 07:47:43 +02:00
Alexandre SPANGARO
b0e2e69ed0 New : Add project on salaries 2018-07-31 07:45:03 +02:00
Philippe GRAND
d673848028 standardize 2018-07-30 17:28:44 +02:00
ATM-Nicolas
1536bbc65e FIX : Keep same project when creating shipping from order 2018-07-30 15:16:53 +02:00
Philippe GRAND
fb565b15c5 standardize 2018-07-29 19:16:28 +02:00
Philippe GRAND
d1f100b0c9 standardize 2018-07-29 17:17:29 +02:00
tarrsalah
8278a9fa52 FIX filter supplier invoice list by societe name. 2018-07-29 13:18:05 +01:00
Philippe GRAND
de70bf983e standardize 2018-07-29 13:40:35 +02:00
Philippe GRAND
69feb3af14 standardize 2018-07-29 11:33:52 +02:00
Philippe GRAND
892174cbf8 standardize 2018-07-29 10:29:12 +02:00
Frédéric FRANCE
7dada7ae8e fix #8820 2018-07-29 09:15:42 +02:00
Philippe GRAND
36ea20b7d4 standardize 2018-07-28 18:03:14 +02:00
Philippe GRAND
9cc40fcb21 standardize 2018-07-28 17:26:56 +02:00
Philippe GRAND
f17275845d standardize 2018-07-28 14:29:28 +02:00
Philippe GRAND
5a4524451c standardize 2018-07-28 14:02:33 +02:00
Philippe GRAND
541e919ae0 Clean and update code 2018-07-27 14:49:33 +02:00
Regis Houssin
e1877625a0 FIX clean code 2018-07-27 13:42:44 +02:00
Laurent Destailleur
8ab03c469a Fix migration 2018-07-27 13:42:32 +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
Laurent Destailleur
894f484de8 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-07-27 12:34:02 +02:00
Laurent Destailleur
83ae27d122 FIX Deletion of files in migration 2018-07-27 12:33:36 +02:00
Philippe GRAND
4eacad52f2 Clean and update code 2018-07-27 10:06:56 +02:00
Frédéric FRANCE
7186589e1c trim trailing 2018-07-26 20:21:33 +02:00
Frédéric FRANCE
b90d125fda trim trailing 2018-07-26 20:19:52 +02:00
Frédéric FRANCE
526ea496ee trim trailing 2018-07-26 19:26:03 +02:00
Frédéric FRANCE
6cb0fb10d6 trim trailing 2018-07-26 19:05:34 +02:00
Frédéric FRANCE
f8e7d71ae8 trim trailing 2018-07-26 18:33:00 +02:00
Frédéric FRANCE
8312d95174 trim trailing 2018-07-26 18:22:16 +02:00
Frédéric FRANCE
c991a4d204 trim trailing 2018-07-26 18:05:20 +02:00
Frédéric FRANCE
39f5641fed trim trailing 2018-07-26 17:33:36 +02:00
Frédéric FRANCE
a0a5d33641 test include 2018-07-26 17:30:53 +02:00
atm-quentin
1297470c99 FIX project overview (can use any fields as fk_projet) 2018-07-26 15:05:32 +02:00
Frédéric FRANCE
fa2de55109 test include 2018-07-26 11:50:54 +02:00
Frédéric FRANCE
3f4db55614 test include 2018-07-26 11:34:51 +02:00
Frédéric FRANCE
aaf4f06686 test include 2018-07-26 11:10:48 +02:00
Frédéric FRANCE
0952cf5e2b fix no link in order list 2018-07-26 10:43:50 +02:00
Frédéric FRANCE
2dd907a8e1 extrafield totalizable 2018-07-26 09:41:44 +02:00
Philippe GRAND
efa6ad0659 Clean and update code 2018-07-25 19:05:40 +02:00
Regis Houssin
e48eec583d FIX compatibility with multicompany transverse mode 2018-07-25 17:00:49 +02:00
Philippe GRAND
ff04cb64c0 Clean and update code 2018-07-25 15:36:50 +02:00
Philippe GRAND
7d5464cfbc Clean and update code 2018-07-25 15:25:23 +02:00
Frédéric FRANCE
53469ee424 Update card-rec.php 2018-07-25 11:45:52 +02:00
gauthier
c95d6271a9 FIX : missing hook to edit sql 2018-07-25 11:15:13 +02:00
Frédéric FRANCE
950bc816a2 Update website.php 2018-07-25 10:17:01 +02:00
Frédéric FRANCE
08c4baad24 Update list.php 2018-07-25 10:15:34 +02:00
Frédéric FRANCE
cddb82f9be Update element_resource.php 2018-07-25 10:11:44 +02:00
Frédéric FRANCE
843192c73b Update websiteaccount_card.php 2018-07-25 10:10:16 +02:00
Frédéric FRANCE
f79415e740 Update payment.php 2018-07-25 10:08:01 +02:00
Frédéric FRANCE
c7ad6c9a7c Update card-rec.php 2018-07-25 10:04:44 +02:00