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

Conflicts:
	htdocs/compta/bank/card.php
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
	htdocs/core/tpl/admin_extrafields_view.tpl.php
	htdocs/langs/de_DE/admin.lang

2018-04-12 13:31:14 +02:00

..

accountancy.lang

Sync transifex

2018-04-11 13:26:23 +02:00

admin.lang

Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop

2018-04-12 13:31:14 +02:00

agenda.lang

Sync transifex

2018-04-11 13:26:23 +02:00

banks.lang

Sync transifex

2018-01-14 12:45:26 +01:00

bills.lang

Sync transifex

2018-04-11 13:26:23 +02:00

bookmarks.lang

…

boxes.lang

Sync transifex

2017-11-28 12:32:23 +01:00

cashdesk.lang

…

categories.lang

…

commercial.lang

Sync transifex

2018-01-14 12:45:26 +01:00

companies.lang

Sync transifex

2018-04-11 13:26:23 +02:00

compta.lang

Sync transifex

2018-04-11 13:26:23 +02:00

contracts.lang

Sync transifex

2018-01-14 12:45:26 +01:00

cron.lang

Sync transifex

2018-04-11 13:26:23 +02:00

deliveries.lang

…

dict.lang

Sync transifex

2018-01-14 12:45:26 +01:00

donations.lang

sync transifex

2018-02-06 01:17:50 +01:00

ecm.lang

sync transifex

2018-02-06 01:17:50 +01:00

errors.lang

Sync transifex

2018-04-11 13:26:23 +02:00

exports.lang

…

externalsite.lang

…

ftp.lang

…

help.lang

…

holiday.lang

Sync transifex

2018-04-11 13:26:23 +02:00

hrm.lang

…

install.lang

Sync transifex

2018-01-14 12:45:26 +01:00

interventions.lang

Sync transifex

2018-01-14 12:45:26 +01:00

languages.lang

sync transifex

2018-02-06 01:17:50 +01:00

ldap.lang

Sync transifex

2018-01-14 12:45:26 +01:00

link.lang

…

loan.lang

Sync transifex

2018-04-11 13:26:23 +02:00

mailmanspip.lang

…

mails.lang

Sync transifex

2018-04-11 13:26:23 +02:00

main.lang

Sync transifex

2018-04-11 13:26:23 +02:00

margins.lang

Sync transifex

2018-04-11 13:26:23 +02:00

members.lang

Sync transifex

2018-04-11 13:26:23 +02:00

modulebuilder.lang

Sync transifex

2018-04-11 13:26:23 +02:00

multicurrency.lang

Sync transifex

2018-01-14 12:45:26 +01:00

oauth.lang

…

opensurvey.lang

Sync transifex

2018-01-14 12:45:26 +01:00

orders.lang

Sync transifex

2018-01-14 12:45:26 +01:00

other.lang

Sync transifex

2018-04-11 13:26:23 +02:00

paybox.lang

Sync transifex

2017-12-02 15:20:59 +01:00

paypal.lang

Sync transifex

2018-04-11 13:26:23 +02:00

printing.lang

Sync transifex

2017-12-02 15:20:59 +01:00

productbatch.lang

Sync transifex

2018-01-14 12:45:26 +01:00

products.lang

Sync transifex

2018-04-11 13:26:23 +02:00

projects.lang

Sync transifex

2018-04-11 13:26:23 +02:00

propal.lang

Sync transifex

2018-04-11 13:26:23 +02:00

receiptprinter.lang

…

resource.lang

…

salaries.lang

Sync transifex

2018-04-11 13:26:23 +02:00

sendings.lang

Sync transifex

2018-01-14 12:45:26 +01:00

sms.lang

Sync transifex

2018-01-14 12:45:26 +01:00

stocks.lang

Sync transifex

2018-04-11 13:26:23 +02:00

stripe.lang

Sync transifex

2018-04-11 13:26:23 +02:00

supplier_proposal.lang

…

suppliers.lang

Sync transifex

2018-01-14 12:45:26 +01:00

trips.lang

Sync transifex

2018-04-11 13:26:23 +02:00

users.lang

Sync transifex

2018-04-11 13:26:23 +02:00

website.lang

Sync transifex

2018-04-11 13:26:23 +02:00

withdrawals.lang

Sync transifex

2018-04-11 13:26:23 +02:00

workflow.lang

sync transifex

2018-02-06 01:17:50 +01:00