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

Conflicts:
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/modules/expedition/modules_expedition.php
	htdocs/core/modules/modContrat.class.php
	htdocs/expedition/class/expedition.class.php

2015-05-07 13:35:09 +02:00

..

accountancy.lang

Sync transifex

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

admin.lang

Merge remote-tracking branch 'origin/3.7' into develop

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

agenda.lang

Sync from transifex

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

askpricesupplier.lang

NEW: Add module "Supplier commercial proposals" to requests

2015-03-04 17:54:43 +01: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

…

boxes.lang

Sync translation

2015-05-03 15:37:15 +02:00

cashdesk.lang

…

categories.lang

FIX bad calculation for stock value

2015-05-04 22:04:58 +02:00

commercial.lang

Enhance tools to make transifex sync

2015-03-14 02:37:18 +01:00

companies.lang

Sync transifex

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

compta.lang

Sync transifex

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

contracts.lang

Enhance tools to make transifex sync

2015-03-14 02:37:18 +01:00

cron.lang

Sync transifex

2015-04-08 21:35:27 +02:00

deliveries.lang

Sync translation

2015-05-03 15:37:15 +02:00

dict.lang

Sync translation

2015-05-03 15:37:15 +02:00

donations.lang

Sync transifex

2015-04-22 14:58:06 +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 lang

2015-02-20 20:20:12 +01:00

externalsite.lang

Sync from transifex

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

ftp.lang

Sync translation

2015-05-03 15:37:15 +02:00

help.lang

Sync translation

2015-05-03 15:37:15 +02:00

holiday.lang

Sync transifex

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

incoterm.lang

Sync transifex

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

install.lang

Sync transifex

2015-04-22 14:58:06 +02: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

…

link.lang

…

loan.lang

Correct lot of bugs

2014-11-10 06:08:50 +01:00

mailmanspip.lang

Sync translation

2015-05-03 15:37:15 +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

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

opensurvey.lang

Sync translation

2015-05-03 15:37:15 +02:00

orders.lang

Sync transifex

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

other.lang

NEW Add a new component to select categories/tags from the main edit

2015-05-03 15:51:55 +02:00

paybox.lang

Sync from transifex

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

paypal.lang

Sync translation

2015-05-03 15:37:15 +02:00

printing.lang

Sync transifex

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

printipp.lang

Sync from transifex

2014-12-15 10:31:40 +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-11-09 19:16:41 +01:00

resource.lang

Sync from transifex

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

salaries.lang

Sync translation

2015-05-03 15:37:15 +02:00

sendings.lang

Sync from transifex

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

sms.lang

…

stocks.lang

Sync transifex

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

suppliers.lang

Sync from transifex

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

trips.lang

Sync translation

2015-05-03 15:37:15 +02:00

users.lang

Sync transifex

2015-01-12 18:59:46 +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