Laurent Destailleur 01fbee0e06 Merge branch 'develop-patch34' of https://github.com/aspangaro/dolibarr ... into aspangaro-develop-patch34 Conflicts: htdocs/comm/action/class/actioncomm.class.php		2015-06-19 11:27:15 +02:00
..
action	Merge branch 'develop-patch34' of https://github.com/aspangaro/dolibarr	2015-06-19 11:27:15 +02:00
admin	Change generic and setup image title	2015-04-18 23:13:48 +02:00
askpricesupplier	Fix: ereg more simple	2015-06-11 09:21:44 +02:00
mailing	Merge remote-tracking branch 'origin/3.7' into develop	2015-06-05 18:31:53 +02:00
propal	NEW Can filter proposal on a tag of a product	2015-06-08 15:07:37 +02:00
prospect	Rename alternative name	2015-06-16 12:04:11 +02:00
address.php	Replace <center> tags	2014-11-25 20:13:43 +01:00
card.php	Rename alternative name	2015-06-16 12:04:11 +02:00
contact.php	Uniformize code: property "nom" for thirdparty is aliased into "name"	2014-10-04 17:20:17 +02:00
index.php	Merge pull request #2673 from aternatik/fix_getentity	2015-05-07 00:48:19 +02:00
list.php	NEW Enhance prototype, project list and proposal list with new hook to	2015-06-16 19:36:44 +02:00
multiprix.php	Removed closing php tag	2014-05-03 18:18:44 +02:00
propal.php	Fix: ereg more simple	2015-06-11 09:21:44 +02:00
recap-client.php	Uniformize code: property "nom" for thirdparty is aliased into "name"	2014-10-04 17:20:17 +02:00
remise.php	Replace <center> tags	2014-11-25 20:13:43 +01:00
remx.php	Merge remote-tracking branch 'origin/3.7' into develop	2015-02-19 00:01:26 +01:00