Laurent Destailleur 8d1fdec8cf Merge remote-tracking branch 'origin/3.5' into develop ...

Conflicts:
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/expedition/doc/pdf_merou.modules.php
	htdocs/core/modules/modProduct.class.php
	htdocs/fourn/commande/fiche.php
	htdocs/projet/fiche.php

2014-06-20 15:26:02 +02:00

..

ajax

Qual: remove PHP closing tag (again)

2014-05-26 13:51:25 +02:00

boxes

Qual: remove PHP closing tag (again)

2014-05-26 13:51:25 +02:00

class

Merge remote-tracking branch 'origin/3.5' into develop

2014-06-20 15:26:02 +02:00

db

Fix: edit form

2014-05-29 19:56:15 +02:00

filemanagerdol

Qual: remove PHP closing tag (again)

2014-05-26 13:51:25 +02:00

js

Merge remote-tracking branch 'origin/3.5' into develop

2014-06-20 15:26:02 +02:00

lib

Merge remote-tracking branch 'origin/3.5' into develop

2014-06-20 15:26:02 +02:00

login

Removed closing php tag

2014-05-03 18:18:44 +02:00

menus

Fix: Menu entries not visible

2014-06-20 12:01:14 +02:00

modules

Merge remote-tracking branch 'origin/3.5' into develop

2014-06-20 15:26:02 +02:00

tpl

Fix: For supplier order/invoice, deselect product when free line is

2014-06-09 14:58:58 +02:00

triggers

Removed closing php tag

2014-05-03 18:18:44 +02:00

actions_extrafields.inc.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

actions_sendmails.inc.php

Fix: Sending email from thirdparty must add event into agenda if option

2013-09-25 21:36:40 +02:00

actions_setnotes.inc.php

Qual: Mutualize code for actions of editing notes

2014-01-11 13:33:30 +01:00

antispamimage.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

datepicker.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

doxygen.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

get_menudiv.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

index.php

…

photos_resize.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

search_page.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

tools.php

Removed closing php tag

2014-05-03 18:18:44 +02:00