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

..

accounting.lib.php

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

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

admin.lib.php

Better organisation of entries into security setup area

2015-01-12 13:20:27 +01:00

agenda.lib.php

Fix bad merge

2015-03-13 14:37:27 +01:00

ajax.lib.php

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

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

askpricesupplier.lib.php

NEW: Add module "Supplier commercial proposals" to requests

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

bank.lib.php

NEW: [T1758] Merge bank card & account card

2015-03-02 22:44:11 +01:00

barcode.lib.php

Fixed a lot of bugs into PrintIPP module. Seems to be stable enough now

2014-12-04 13:20:56 +01:00

categories.lib.php

Typo

2014-08-30 05:30:37 +02:00

company.lib.php

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

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

contact.lib.php

PHPDoc and misc fixes for several folders

2015-02-10 13:32:00 +01: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

Several bug fixes from scrutinizer

2015-03-14 14:55:41 +01:00

doc.lib.php

…

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

Finished new module to manage expense reports !

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

fichinter.lib.php

Use span class="badge" for notes.

2014-10-19 19:57:42 +02:00

files.lib.php

Tooltip and lib for file cache

2015-01-24 21:46:05 +01:00

fiscalyear.lib.php

Removed unused code, misc corrections and corrected PHPDoc problems.

2015-02-10 10:25:59 +01:00

format_cards.lib.php

…

fourn.lib.php

Translation

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

functions2.lib.php

NEW: Add module "Supplier commercial proposals" to requests

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

functions_ch.lib.php

…

functions.lib.php

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

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

functionsnumtoword.lib.php

Fix phpcs

2015-02-02 15:43:22 +01:00

geturl.lib.php

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

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

holiday.lib.php

Fix: phpcheckstyle from phpcs 1.5.5 (closing tags and & char on

2014-09-27 17:13:15 +02:00

images.lib.php

…

import.lib.php

…

index.html

…

invoice2.lib.php

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

2014-11-05 16:37:07 +01:00

invoice.lib.php

Fixed a lot of bugs into PrintIPP module. Seems to be stable enough now

2014-12-04 13:20:56 +01:00

json.lib.php

Scrutinizer Auto-Fixes

2015-03-06 02:10:01 +00:00

ldap.lib.php

Fixed a lot of bugs into PrintIPP module. Seems to be stable enough now

2014-12-04 13:20:56 +01:00

mailmanspip.lib.php

…

member.lib.php

Misc Adherents PHPDoc corrections

2015-02-10 10:45:48 +01:00

memory.lib.php

PHPDoc and misc fixes for Admin

2015-02-10 10:52:48 +01: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

Qual: Renamed all files & links "fiche.php" into "card.php"

2014-09-18 21:18:25 +02:00

pdf.lib.php

Merge pull request #2415 from aspangaro/develop-patch16

2015-03-04 23:07:46 +01:00

prelevement.lib.php

PHPDoc and misc fixes for several folders

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

price.lib.php

Regression solved

2015-01-18 21:04:39 +01:00

product.lib.php

Fixed: Location for file storage from tab attached files was not at same

2015-02-06 21:26:41 +01:00

project.lib.php

Work on new timesheet page

2015-03-05 21:47:50 +01:00

propal.lib.php

Fixed a lot of bugs into PrintIPP module. Seems to be stable enough now

2014-12-04 13:20:56 +01:00

report.lib.php

Fix: doxygen

2014-11-15 18:30:37 +01:00

resource.lib.php

…

security2.lib.php

Fix: A little clean of dol_hash usage.

2014-10-18 16:08:15 +02:00

security.lib.php

Fix: A little clean of dol_hash usage.

2014-10-18 16:08:15 +02:00

sendings.lib.php

The badge was missing for shipment

2015-01-23 18:39:40 +01:00

stock.lib.php

Qual: Renamed all files & links "fiche.php" into "card.php"

2014-09-18 21:18:25 +02:00

tax.lib.php

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

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

treeview.lib.php

Fix: doxygen

2014-09-27 16:00:11 +02:00

trip.lib.php

PHPDoc and misc fixes for several folders

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

usergroups.lib.php

Fix: PHPCS

2014-12-05 17:44:47 +01:00

ws.lib.php

Fix: doxygen

2014-09-27 16:00:11 +02:00

xcal.lib.php

…