dolibarr/htdocs/expedition
Laurent Destailleur cf0f458a51 Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/dispatch.php
	htdocs/langs/el_GR/projects.lang
	htdocs/langs/en_GB/bills.lang
	htdocs/langs/en_GB/main.lang
	htdocs/langs/en_GB/orders.lang
	htdocs/langs/es_AR/bills.lang
	htdocs/langs/es_CO/admin.lang
	htdocs/langs/es_CO/main.lang
	htdocs/langs/es_ES/bills.lang
	htdocs/langs/es_ES/projects.lang
	htdocs/langs/fa_IR/categories.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/bills.lang
	htdocs/langs/fr_FR/other.lang
	htdocs/langs/fr_FR/projects.lang
	htdocs/langs/lv_LV/bills.lang
	htdocs/langs/nb_NO/bills.lang
	htdocs/langs/pl_PL/bills.lang
	htdocs/langs/pl_PL/mails.lang
	htdocs/langs/pl_PL/projects.lang
	htdocs/langs/ro_RO/bills.lang
	htdocs/langs/ro_RO/products.lang
	htdocs/langs/ro_RO/projects.lang
	htdocs/langs/ru_RU/bills.lang
	htdocs/langs/ru_RU/projects.lang
	htdocs/langs/sl_SI/main.lang
	htdocs/langs/tr_TR/bills.lang
	htdocs/langs/tr_TR/projects.lang
	htdocs/langs/vi_VN/bills.lang
2015-04-02 13:57:20 +02:00
..
class Merge remote-tracking branch 'origin/3.7' into develop 2015-04-02 13:57:20 +02:00
stats Removed closing php tag 2014-05-03 18:18:44 +02:00
tpl Tooltip and lib for file cache 2015-01-24 21:46:05 +01:00
card.php NEW: Enhancement of module 'Notification by Email'. Show nb of 2015-03-18 21:44:57 +01:00
contact.php Qual: Renamed all files & links "liste.php" into "list.php" 2014-09-18 20:33:37 +02:00
index.php Fix: Maxi debug of module productbatch. 2014-12-05 16:04:37 +01:00
list.php Tooltip everywhere 2015-01-30 16:40:33 +01:00
note.php Bad width 2015-01-23 18:41:53 +01:00
shipment.php Merge branch 'develop' into constants 2015-03-30 02:36:46 +02:00