Laurent Destailleur ff8969073c Merge remote-tracking branch 'origin/3.7' into 3.8 ...

Conflicts:
	htdocs/contrat/class/contrat.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/main.inc.php

2015-07-28 18:57:13 +02:00

..

accounting.lib.php

Move my address email to new one

2015-07-15 20:30:33 +02:00

admin.lib.php

Doxygen doc

2015-07-27 17:09:16 +02:00

agenda.lib.php

Fix filter can be empty

2015-07-21 13:38:24 +02:00

ajax.lib.php

NEW Add opportunity amount on project card.

2015-06-29 16:57:32 +02:00

askpricesupplier.lib.php

NEW: Add module "Supplier commercial proposals" to requests

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

bank.lib.php

Move my address email to new one

2015-07-15 20:30:33 +02:00

barcode.lib.php

Scrutinizer Auto-Fixes

2015-04-06 10:25:30 +00:00

categories.lib.php

Added missing translation of categories' "Translation" tab

2015-05-05 11:24:04 +02:00

company.lib.php

Move my address email to new one

2015-07-15 20:30:33 +02:00

contact.lib.php

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

2015-06-23 18:34:39 +02:00

contract.lib.php

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

2015-02-19 00:01:26 +01:00

cron.lib.php

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

2015-02-19 00:01:26 +01:00

date.lib.php

Fix timezone problem with external calendar import.

2015-07-28 18:12:45 +02:00

doc.lib.php

…

donation.lib.php

Move my address email to new one

2015-07-15 20:30:33 +02:00

ecm.lib.php

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

2014-12-22 03:14:22 +01:00

emailing.lib.php

PHPDoc and misc fixes for several folders

2015-02-10 11:38:13 +01:00

expensereport.lib.php

New: ER add badge on tab document

2015-05-01 08:46:37 +02:00

fichinter.lib.php

…

files.lib.php

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

2015-07-19 12:26:31 +02:00

fiscalyear.lib.php

Move my address email to new one

2015-07-15 20:30:33 +02:00

format_cards.lib.php

Fix label L7163 X spacing

2015-05-03 10:08:32 +02:00

fourn.lib.php

Correction complete_head

2015-06-18 15:16:28 +02:00

functions2.lib.php

Doxygen doc

2015-07-27 17:09:16 +02:00

functions_ch.lib.php

…

functions.lib.php

Fix timezone problem with external calendar import.

2015-07-28 18:12:45 +02:00

functionsnumtoword.lib.php

Better test

2015-04-17 22:48:39 +02:00

geturl.lib.php

Fix bad parameter for PUT method

2015-06-07 03:39:43 +02:00

holiday.lib.php

NEW Can upload files on leave requests. Use more standard permissions.

2015-06-27 11:45:23 +02:00

images.lib.php

FIX #2987: removed dead function moneyMeter()

2015-06-11 10:57:08 +02:00

import.lib.php

…

index.html

…

invoice2.lib.php

…

invoice.lib.php

…

json.lib.php

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

2015-07-28 18:57:13 +02:00

ldap.lib.php

…

loan.lib.php

Move my address email to new one

2015-07-15 20:30:33 +02:00

mailmanspip.lib.php

…

member.lib.php

Move my address email to new one

2015-07-15 20:30:33 +02:00

memory.lib.php

fix syntax errors

2015-04-18 18:07:41 +02:00

order.lib.php

Merge branch 'misc' of https://github.com/marcosgdf/dolibarr into

2015-02-18 22:54:02 +01:00

payments.lib.php

…

pdf.lib.php

Several fixes. Fix #2927

2015-07-13 11:22:18 +02:00

prelevement.lib.php

Debug withdraw module

2015-06-21 17:05:49 +02:00

price.lib.php

Fix tests for ES

2015-04-26 16:45:24 +02:00

product.lib.php

Merge tab to upload photo and other files to same tab. This reduce

2015-06-19 11:19:13 +02:00

project.lib.php

Fix bad closing td

2015-07-28 12:49:29 +02:00

propal.lib.php

…

report.lib.php

Convert " " to \t to match custom coding conventions

2015-06-30 15:53:58 -05:00

resource.lib.php

…

salaries.lib.php

NEW: Add tab document on salaries payment

2015-05-28 07:33:50 +02:00

security2.lib.php

uniformize code

2015-06-27 02:19:46 +02:00

security.lib.php

Fix dbt_select

2015-07-16 10:59:00 +02:00

sendings.lib.php

Fix: missing getEntity function

2015-04-19 03:05:37 +02:00

stock.lib.php

…

tax.lib.php

Fix: Show vat_by_thirdparty when module accounting is on

2015-07-15 23:24:28 +02:00

treeview.lib.php

Debug statistics of project module

2015-07-05 22:04:30 +02:00

trip.lib.php

PHPDoc and misc fixes for several folders

2015-02-10 13:17:37 +01:00

usergroups.lib.php

Fix #3183 Make sure FormOther class is included.

2015-07-10 15:20:41 +02:00

ws.lib.php

…

xcal.lib.php

…