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

..

blockUI.js

Prepare move to other licence. For the moment all answers for licence

2013-01-16 15:36:08 +01:00

datepicker.js.php

Removed closing php tag

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

dst.js

Prepare move to other licence. For the moment all answers for licence

2013-01-16 15:36:08 +01:00

editinplace.js

Prepare move to other licence. For the moment all answers for licence

2013-01-16 15:36:08 +01:00

index.php

…

jnotify.js

Prepare move to other licence. For the moment all answers for licence

2013-01-16 15:36:08 +01:00

lib_batch.js

- add batch management on supplier dispatch product

2014-03-15 10:28:01 +01:00

lib_head.js

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

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

lib_photosresize.js

Fix: Image always fit into window when using cropping feature even if

2014-03-18 23:24:00 +01:00

lib_rare.js

Simplified JS

2013-09-05 16:37:23 +02:00

timepicker.js.php

Removed closing php tag

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