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 |
|
Frédéric FRANCE
|
cac596037f
|
Update card.php
|
2018-07-25 09:50:04 +02:00 |
|
Frédéric FRANCE
|
b87c3b80af
|
code cleaning
|
2018-07-25 09:36:34 +02:00 |
|
Laurent Destailleur
|
cfb0f2df05
|
Merge pull request #9149 from OPEN-DSI/fix_propal_list
FIX search on ref project on propal list
|
2018-07-24 21:42:02 +02:00 |
|
Laurent Destailleur
|
0c0c9269d5
|
Merge pull request #9148 from hregis/develop_api
FIX clean code
|
2018-07-24 21:41:41 +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 |
|
Regis Houssin
|
ff733c5ad7
|
FIX clean code
|
2018-07-24 20:10:27 +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
|
7821e21e5b
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2018-07-24 19:23:51 +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
|
927727edf3
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
|
2018-07-24 19:22:12 +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 |
|
Laurent Destailleur
|
f672e8bf02
|
Fix trans
|
2018-07-24 19:12:35 +02:00 |
|
Regis Houssin
|
b7dfc99882
|
Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0_price
|
2018-07-24 18:58:23 +02:00 |
|
Philippe GRAND
|
2a6f050e32
|
Clean and update code
|
2018-07-24 18:28:56 +02:00 |
|
Laurent Destailleur
|
f50aa03187
|
Merge pull request #9112 from atm-gauthier/FIX_multientity_replenish
FIX: stock replenish with multientity
|
2018-07-24 18:10:00 +02:00 |
|
Laurent Destailleur
|
e9eb8da61b
|
Update replenish.php
|
2018-07-24 18:09:50 +02:00 |
|
Laurent Destailleur
|
77c121b15c
|
Merge pull request #9099 from ATM-Nicolas/7.0
NEW Set contactCivName substitution key
|
2018-07-24 18:02:21 +02:00 |
|