Laurent Destailleur b675b9b610 Merge remote-tracking branch 'origin/3.5' into develop ... Conflicts: htdocs/comm/action/fiche.php htdocs/core/class/conf.class.php htdocs/core/class/html.form.class.php htdocs/core/lib/company.lib.php htdocs/core/modules/commande/doc/pdf_einstein.modules.php htdocs/fourn/facture/fiche.php htdocs/langs/en_US/admin.lang htdocs/margin/agentMargins.php htdocs/margin/customerMargins.php htdocs/margin/productMargins.php htdocs/projet/tasks/task.php		2014-03-31 00:44:45 +02:00
..
action	Merge remote-tracking branch 'origin/3.5' into develop	2014-03-31 00:44:45 +02:00
admin	Corrected proposals extrafield admin page translation	2014-03-11 12:38:11 +01:00
mailing	Fix: Use correct syntax of date into sql requests (with quotes)	2014-03-15 23:12:00 +01:00
propal	Merge remote-tracking branch 'origin/3.5' into develop	2014-03-13 09:20:05 +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	New: Add form search customer order on commercial main page.	2014-02-25 18:33:04 +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	Merge remote-tracking branch 'origin/3.5' into develop	2014-03-03 19:38:02 +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