Laurent Destailleur a7cec18081 Merge remote-tracking branch 'origin/3.6' into 3.7 ...

Conflicts:
	htdocs/categories/fiche.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/install/upgrade2.php
	htdocs/product/liste.php

2015-06-14 17:11:36 +02:00

..

accounting.lib.php

Removed unused code, misc corrections and corrected PHPDoc problems.

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

admin.lib.php

Fixed: Bad function/picto for information messages (not a star)

2014-11-28 19:49:42 +01:00

agenda.lib.php

Fix bad merge

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

ajax.lib.php

Fix the data-role parameter

2015-04-15 18:14:26 +02:00

bank.lib.php

PHPDoc and misc fixes for several folders

2015-02-10 13:17:37 +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

Fix Return value is always utf8 encoded and without entities.

2015-06-07 02:47:28 +02:00

contact.lib.php

PHPDoc and misc fixes for several folders

2015-02-10 13:32:00 +01:00

contract.lib.php

PHPDoc and misc fixes for several folders

2015-02-10 13:32:00 +01:00

cron.lib.php

PHPDoc and misc fixes for several folders

2015-02-10 13:41:59 +01:00

date.lib.php

Fix pb into date management.

2015-02-03 11:25:51 +01:00

doc.lib.php

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

2014-05-07 19:30:19 +02:00

ecm.lib.php

Fixed: Var no declared

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

emailing.lib.php

PHPDoc and misc fixes for several folders

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

fichinter.lib.php

Use span class="badge" for notes.

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

files.lib.php

Qual: Uniformize code and fix a ton of bugs.

2014-10-27 03:24:45 +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

Removed closing php tag

2014-05-03 18:18:44 +02:00

fourn.lib.php

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

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

functions2.lib.php

FIX Better management error into the color conversion functions

2015-06-12 14:37:27 +02:00

functions_ch.lib.php

Prepare move to other licence. For the moment all answers for licence

2013-01-16 15:36:08 +01:00

functions.lib.php

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

2015-06-14 17:11:36 +02: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

Removed closing php tag

2014-05-03 18:18:44 +02:00

import.lib.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

index.html

Removed index.php and replaced them with blank index.html as it is more appropriate

2014-07-12 23:18:57 +02:00

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

Work on multi user for events.

2014-09-23 16:15:15 +02: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

Qual: remove PHP closing tag (again)

2014-05-26 13:51:25 +02:00

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

Remove test code and restore prod code.

2015-01-31 13:00:51 +01:00

prelevement.lib.php

PHPDoc and misc fixes for several folders

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

price.lib.php

Fix: management of vat type 2, 4 and 6 is now ok.

2015-04-11 22:51:53 +02: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

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

2015-04-12 12:03:59 +02: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

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

2015-06-14 17:11:36 +02:00

resource.lib.php

Fix: checkstyle errors

2014-05-14 12:19:45 +02:00

security2.lib.php

Fix: A little clean of dol_hash usage.

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

security.lib.php

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

2015-05-25 18:08:23 +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 branch 'misc' of https://github.com/marcosgdf/dolibarr into

2015-02-18 22:54:02 +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

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

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

ws.lib.php

Fix: doxygen

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

xcal.lib.php

Removed closing php tag

2014-05-03 18:18:44 +02:00