Laurent Destailleur ccca46f380 Merge remote-tracking branch 'origin/3.5' into develop ...

Conflicts:
	htdocs/comm/propal.php
	htdocs/comm/propal/list.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/core/lib/functions.lib.php
	htdocs/expedition/note.php
	htdocs/fourn/commande/liste.php
	htdocs/fourn/facture/fiche.php
	htdocs/main.inc.php
	htdocs/projet/tasks/index.php
	htdocs/theme/eldy/style.css.php

2014-05-29 19:20:48 +02:00

..

admin.lib.php

Removed closing php tag

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

agenda.lib.php

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

2014-05-29 19:20:48 +02:00

ajax.lib.php

Add showempty into combobox

2014-05-13 11:40:19 +02:00

bank.lib.php

Removed closing php tag

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

barcode.lib.php

Qual: remove PHP closing tag (again)

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

categories.lib.php

Removed closing php tag

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

company.lib.php

Properties "civilite_id" were renamed into "civility_id".

2014-05-05 00:23:09 +02:00

contact.lib.php

Removed closing php tag

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

contract.lib.php

Qual: remove PHP closing tag (again)

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

cron.lib.php

Qual: Removed missing variable from function call

2014-04-23 18:23:59 +02:00

date.lib.php

Removed closing php tag

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

doc.lib.php

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

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

ecm.lib.php

Removed closing php tag

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

emailing.lib.php

Removed closing php tag

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

fichinter.lib.php

Qual: remove PHP closing tag (again)

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

files.lib.php

Removed closing php tag

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

format_cards.lib.php

Removed closing php tag

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

fourn.lib.php

Qual: remove PHP closing tag (again)

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

functions2.lib.php

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

2014-05-21 20:30:07 +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.5' into develop

2014-05-29 19:20:48 +02:00

geturl.lib.php

Fix: The way we tested if a ref/id already exists was wrong. Introduce a

2014-05-13 10:12:45 +02:00

holiday.lib.php

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

2013-01-16 15:36:08 +01: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.php

…

invoice2.lib.php

Qual: remove PHP closing tag (again)

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

invoice.lib.php

Removed closing php tag

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

json.lib.php

Fix: json

2013-10-11 18:33:21 +02:00

ldap.lib.php

Removed closing php tag

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

mailmanspip.lib.php

Qual: remove PHP closing tag (again)

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

member.lib.php

Qual: remove PHP closing tag (again)

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

memory.lib.php

Removed closing php tag

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

order.lib.php

Removed closing php tag

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

payments.lib.php

Fixed (again) quality code control checks

2014-01-02 16:41:23 +01:00

pdf.lib.php

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

2014-05-29 19:20:48 +02:00

prelevement.lib.php

Removed closing php tag

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

price.lib.php

Fix: The rounding mode is now forced when provided explicitly and no

2014-05-13 13:22:29 +02:00

product.lib.php

Fix: Preview feature

2014-04-30 13:50:25 +02:00

project.lib.php

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

2014-05-10 19:53:06 +02:00

propal.lib.php

Removed closing php tag

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

report.lib.php

Removed closing php tag

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

resource.lib.php

Fix: checkstyle errors

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

security2.lib.php

Fix: favicon must use dol_buildpath and not hardcoded path

2014-05-24 18:29:22 +02:00

security.lib.php

Fix: [ bug #1403 ] suppression d'une fiche produit impossible

2014-05-26 23:12:47 +02:00

sendings.lib.php

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

2014-05-06 23:58:17 +02:00

stock.lib.php

Removed closing php tag

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

tax.lib.php

Qual: remove PHP closing tag (again)

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

treeview.lib.php

Qual: remove PHP closing tag (again)

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

trip.lib.php

Fix: wrong EOL

2013-01-26 10:38:11 +01:00

usergroups.lib.php

Qual: Removed missing variable from function call

2014-04-23 18:24:01 +02:00

ws.lib.php

Removed closing php tag

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

xcal.lib.php

Removed closing php tag

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