Laurent Destailleur 46e9b5d550 Merge branch 'develop' of https://github.com/grandoc/dolibarr into ... grandoc-develop Conflicts: htdocs/langs/ar_SA/admin.lang htdocs/langs/el_GR/admin.lang htdocs/langs/es_ES/admin.lang htdocs/langs/nl_NL/admin.lang htdocs/langs/tr_TR/admin.lang		2014-02-10 01:30:48 +01:00
..
action	Merge branch 'develop' of https://github.com/grandoc/dolibarr into	2014-02-10 01:30:48 +01:00
admin	Merge remote-tracking branch 'origin/3.4' into 3.5	2013-12-14 01:30:15 +01:00
mailing	Merge remote-tracking branch 'origin/3.5' into develop	2014-01-18 01:13:29 +01:00
propal	Removed some TODO	2014-02-06 20:45:50 +01:00
prospect	Fix: path to image must not be hardcoded but use dol_buildpath or img_picto with param src=1	2014-01-13 09:43:21 +01:00
address.php	Fix: security sql injection	2013-10-07 22:50:27 +02:00
contact.php	Fix: path to image must not be hardcoded but use dol_buildpath or img_picto with param src=1	2014-01-13 09:43:21 +01:00
fiche.php	Fix: W3C.	2014-01-06 17:17:57 +01:00
index.php	Merge remote-tracking branch 'origin/3.5' into develop	2014-01-20 02:42:37 +01:00
list.php	Fix: Pb with cache files for graphical boxes:	2014-01-31 18:48:57 +01:00
multiprix.php	Prepare move to other licence. For the moment all answers for licence	2013-01-16 15:36:08 +01:00
propal.php	New: Can create contract from an order.	2014-01-28 15:26:20 +01:00
recap-client.php	Prepare move to other licence. For the moment all answers for licence	2013-01-16 15:36:08 +01:00
remise.php	Qual: Removed useless methods	2013-06-16 21:31:21 +02:00
remx.php	Qual: Remove duplicate form instanciation.	2013-09-06 12:10:09 +02:00