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

Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/core/class/dolgraph.class.php
	htdocs/langs/en_AU/main.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/main.lang
	htdocs/langs/fr_FR/other.lang

2015-03-16 18:30:30 +01:00

..

accountancy.lang

FIXED Accountancy clean code

2015-02-03 06:39:44 +01:00

admin.lang

Some fixes into translation and permissions

2015-03-09 21:20:56 +01:00

agenda.lang

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

2015-02-10 21:33:43 +01:00

askpricesupplier.lang

NEW: Add module "Supplier commercial proposals" to requests

2015-03-04 17:54:43 +01:00

banks.lang

Merge pull request #2364 from daamien/patch-2

2015-02-20 18:58:10 +01:00

bills.lang

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

2015-03-16 18:30:30 +01:00

bookmarks.lang

…

boxes.lang

Uniformize and clean boxes behaviour and translation.

2014-10-27 21:48:28 +01:00

cashdesk.lang

…

categories.lang

Fix: Removed duplicate entrie into language files

2014-11-30 14:51:57 +01:00

commercial.lang

Work on timesheet module

2015-03-04 00:53:35 +01:00

companies.lang

Trans: Same verb

2014-10-17 13:07:23 +02:00

compta.lang

Typo

2015-02-07 15:21:30 +01:00

contracts.lang

Fix missing translation

2015-03-09 19:28:38 +01:00

cron.lang

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

2015-02-18 22:04:26 +01:00

deliveries.lang

Update deliveries.lang

2014-10-23 18:42:02 +02:00

dict.lang

Fix: cents for indian ruppes are calle paisa and paise.

2014-09-15 22:43:49 +02:00

donations.lang

Merge branch '1698' of github.com:aspangaro/dolibarr into aspangaro-1698

2014-11-22 15:44:59 +01:00

ecm.lang

Missing entries

2015-02-01 01:43:36 +01:00

errors.lang

NEW: Implement option SUPPLIER_ORDER_USE_DISPATCH_STATUS to add a status

2015-03-08 02:08:26 +01:00

exports.lang

Fix: Missing field tobuy into service export.

2014-08-29 20:26:27 +02:00

externalsite.lang

#1704 Untranslatable token in externalsite module admin

2014-11-20 06:34:50 +01:00

ftp.lang

…

help.lang

…

holiday.lang

Fixed [ bug #1691 ] Don't think the ID should be displayed in holiday module

2014-11-28 01:02:44 +01:00

install.lang

Introduce a protection to avoid migration if database has critical bugs

2015-02-14 12:24:16 +01:00

interventions.lang

Missing search table for interventions

2014-11-03 17:48:10 +01:00

languages.lang

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

2014-12-16 01:56:44 +01:00

ldap.lang

…

link.lang

…

mailmanspip.lang

…

mails.lang

Try to find a solution to fight against spam sending from dolibarr when

2014-11-29 13:50:41 +01:00

main.lang

NEW: Implement option SUPPLIER_ORDER_USE_DISPATCH_STATUS to add a status

2015-03-08 02:08:26 +01:00

margins.lang

[ task #1793 ] Create new permission to restrict commercial agent margin to logged user

2015-01-18 16:42:11 +01:00

members.lang

Fixed: When invoice is created from subscription, the accountancy code

2014-12-01 13:26:05 +01:00

opensurvey.lang

…

orders.lang

NEW: Add search box for supplier order search.

2015-03-10 13:25:25 +01:00

other.lang

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

2015-03-13 17:46:31 +01:00

paybox.lang

Fixed: Untranslatable tokens

2014-11-22 00:45:04 +01:00

paypal.lang

…

printing.lang

Work on batch module. Add batch, eatby and sellby into movement table.

2015-02-12 15:23:31 +01:00

productbatch.lang

Enhance tools to make transifex sync

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

products.lang

Fix typo

2015-02-25 23:04:13 +01:00

projects.lang

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

2015-03-16 18:30:30 +01:00

propal.lang

Better error management and better error message for reporting upload or

2014-10-18 14:56:06 +02:00

resource.lang

Fixed: Missing hook init

2014-12-07 15:14:24 +01:00

salaries.lang

NEW: Add current salary on list of payment

2015-03-10 09:29:24 +01:00

sendings.lang

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

2015-02-16 20:59:04 +01:00

sms.lang

…

stocks.lang

Fix: Several bugs int replenishment feature.

2015-03-01 16:05:20 +01:00

suppliers.lang

Remove duplicate entry

2015-03-13 13:51:35 +01:00

trips.lang

Finished new module to manage expense reports !

2015-02-22 13:16:49 +01:00

users.lang

Fix: Removed duplicate entrie into language files

2014-11-30 14:51:57 +01:00

withdrawals.lang

Fixed: Typo

2014-12-14 22:26:58 +01:00

workflow.lang

Because this is a legal issue (OPCA), i added the hidden constant for

2014-12-25 12:08:35 +01:00