Laurent Destailleur f0c75388cb Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/commande/class/api_commande.class.php
	htdocs/compta/facture/class/api_invoice.class.php
	htdocs/product/class/api_product.class.php
	htdocs/societe/class/api_contact.class.php
	htdocs/societe/class/api_thirdparty.class.php

2016-08-02 17:43:12 +02:00

..

blockUI.js

…

datepicker.js.php

Removed closing php tag

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

dst.js

Corrected Timezone detection by using jstz external library

2015-06-16 21:19:58 +02:00

editinplace.js

A fix to make editinplace working better

2016-07-28 15:29:46 +02:00

index.html

Removed index.php and replaced them with blank index.html as it is more appropriate

2014-07-12 23:18:57 +02:00

jnotify.js

…

lib_batch.js

New add shipping and dispatching from/to multiple warehouses

2015-12-18 18:00:31 +01:00

lib_head.js.php

FIX #5534

2016-07-27 18:49:34 +02:00

lib_photosresize.js

Merge tab to upload photo and other files to same tab. This reduce

2015-06-19 11:19:13 +02:00

lib_rare.js

…

select2_locale.js.php

Translation for one char

2016-05-12 19:55:36 +02:00

timepicker.js.php

Removed closing php tag

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

timesheet.js

FIX #5521

2016-08-01 15:53:51 +02:00