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
..
accountancy.lang
admin.lang	Sync from transifex	2015-04-02 13:28:20 +02:00
agenda.lang	Sync from transifex	2015-04-02 13:28:20 +02:00
banks.lang
bills.lang	Sync from transifex	2015-04-02 13:28:20 +02:00
bookmarks.lang
boxes.lang
cashdesk.lang
categories.lang	Sync from transifex	2015-04-02 13:28:20 +02:00
commercial.lang
companies.lang
compta.lang
contracts.lang
cron.lang	Sync from transifex	2015-04-02 13:28:20 +02:00
deliveries.lang
dict.lang
donations.lang	Sync from transifex	2015-04-02 13:28:20 +02:00
ecm.lang
errors.lang	Sync from transifex	2015-04-02 13:28:20 +02:00
exports.lang
externalsite.lang
ftp.lang
help.lang
holiday.lang
incoterm.lang	Sync transifex	2015-03-18 15:27:27 +01:00
install.lang
interventions.lang
languages.lang
ldap.lang
link.lang
mailmanspip.lang
mails.lang	Sync from transifex	2015-04-02 13:28:20 +02:00
main.lang	Sync from transifex	2015-04-02 13:28:20 +02:00
margins.lang
members.lang
opensurvey.lang
orders.lang	Sync from transifex	2015-04-02 13:28:20 +02:00
other.lang	Sync from transifex	2015-04-02 13:28:20 +02:00
paybox.lang
paypal.lang
printing.lang	Sync transifex	2015-03-18 15:27:27 +01:00
printipp.lang
productbatch.lang
products.lang	Sync from transifex	2015-04-02 13:28:20 +02:00
projects.lang	Sync from transifex	2015-04-02 13:28:20 +02:00
propal.lang
resource.lang
salaries.lang
sendings.lang	Sync from transifex	2015-04-02 13:28:20 +02:00
sms.lang
stocks.lang
suppliers.lang	Sync from transifex	2015-04-02 13:28:20 +02:00
trips.lang
users.lang
withdrawals.lang
workflow.lang