Laurent Destailleur 100fa1067e Merge remote-tracking branch 'origin/3.7' into develop ...

Conflicts:
	htdocs/compta/bank/virement.php
	htdocs/compta/facture/impayees.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/modules/modProjet.class.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/langs/en_GB/admin.lang
	htdocs/langs/es_AR/orders.lang
	htdocs/langs/es_AR/trips.lang
	htdocs/langs/es_CO/admin.lang
	htdocs/langs/es_CO/orders.lang
	htdocs/langs/es_CO/trips.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/main.lang
	htdocs/langs/pl_PL/interventions.lang
	htdocs/langs/pt_BR/trips.lang
	htdocs/langs/ro_RO/productbatch.lang
	htdocs/langs/ro_RO/trips.lang
	htdocs/main.inc.php
	htdocs/projet/element.php

2015-04-22 17:57:57 +02:00

..

accountancy.lang

Sync transifex

2015-03-13 22:02:53 +01:00

admin.lang

Sync transifex

2015-04-22 14:58:06 +02:00

agenda.lang

Sync from transifex

2015-04-02 13:28:20 +02:00

banks.lang

Sync transifex

2015-04-22 14:58:06 +02:00

bills.lang

Sync transifex

2015-04-22 14:58:06 +02:00

bookmarks.lang

Transifex sync for 3.6

2014-07-18 20:16:46 +02:00

boxes.lang

Sync transifex

2015-04-22 14:58:06 +02:00

cashdesk.lang

Sync from transifex

2014-08-01 02:01:51 +02:00

categories.lang

Sync from transifex

2015-04-02 13:28:20 +02:00

commercial.lang

Sync transifex

2015-03-13 22:02:53 +01:00

companies.lang

Sync transifex

2014-10-11 14:33:22 +02:00

compta.lang

Sync from transifex

2015-02-13 21:26:43 +01:00

contracts.lang

Sync transifex

2015-03-13 22:02:53 +01:00

cron.lang

Sync from transifex

2015-04-02 13:28:20 +02:00

deliveries.lang

Sync transifex

2015-01-12 18:59:46 +01:00

dict.lang

Sync transifex

2014-10-11 14:33:22 +02:00

donations.lang

Sync from transifex

2015-04-02 13:28:20 +02:00

ecm.lang

Sync from transifex

2015-02-13 21:26:43 +01:00

errors.lang

Sync transifex

2015-04-22 14:58:06 +02:00

exports.lang

Sync transifex

2014-10-11 14:33:22 +02:00

externalsite.lang

Sync transifex

2015-01-12 18:59:46 +01:00

ftp.lang

…

help.lang

Sync from transifex

2014-08-01 02:01:51 +02:00

holiday.lang

Sync from transifex

2014-11-30 16:20:58 +01:00

incoterm.lang

Sync transifex

2015-03-18 15:27:27 +01:00

install.lang

Sync transifex

2015-03-13 22:02:53 +01:00

interventions.lang

Sync transifex

2015-04-22 14:58:06 +02:00

languages.lang

Sync from transifex

2015-02-13 21:26:43 +01:00

ldap.lang

Sync from transifex

2014-08-01 02:01:51 +02:00

link.lang

Sync from transifex

2014-08-08 14:38:20 +02:00

mailmanspip.lang

Sync from transifex

2014-08-01 02:01:51 +02:00

mails.lang

Sync from transifex

2015-04-02 13:28:20 +02:00

main.lang

Sync transifex

2015-04-22 14:58:06 +02:00

margins.lang

Sync from transifex

2015-02-13 21:26:43 +01:00

members.lang

Sync from transifex

2014-12-15 10:31:40 +01:00

opensurvey.lang

Sync from transifex

2014-08-01 02:01:51 +02:00

orders.lang

Sync transifex

2015-04-22 14:58:06 +02:00

other.lang

Sync transifex

2015-04-22 14:58:06 +02:00

paybox.lang

Sync from transifex

2014-11-30 16:20:58 +01:00

paypal.lang

Sync from transifex

2014-08-01 02:01:51 +02:00

printing.lang

Sync transifex

2015-03-18 15:27:27 +01:00

printipp.lang

Sync transifex

2015-01-12 18:59:46 +01:00

productbatch.lang

Sync transifex

2015-04-22 14:58:06 +02:00

products.lang

Sync transifex

2015-04-22 14:58:06 +02:00

projects.lang

Sync transifex

2015-04-22 14:58:06 +02:00

propal.lang

Sync transifex

2014-10-11 14:33:22 +02:00

resource.lang

Sync transifex

2015-01-12 18:59:46 +01:00

salaries.lang

Sync transifex

2015-03-13 22:02:53 +01:00

sendings.lang

Sync from transifex

2015-04-02 13:28:20 +02:00

sms.lang

Sync transifex

2014-10-11 14:33:22 +02:00

stocks.lang

Sync transifex

2015-04-22 14:58:06 +02:00

suppliers.lang

Sync transifex

2015-04-22 14:58:06 +02:00

trips.lang

Sync transifex

2015-04-22 14:58:06 +02:00

users.lang

Sync from transifex

2014-11-30 16:20:58 +01:00

withdrawals.lang

Sync from transifex

2015-02-13 21:26:43 +01:00

workflow.lang

Sync from transifex

2015-02-13 21:26:43 +01:00