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

Conflicts:
	ChangeLog
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	build/exe/doliwamp/doliwamp.iss
	build/perl/virtualmin/dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/compta/paiement_charge.php
	htdocs/compta/sociales/charges.php
	htdocs/core/db/mysql.class.php
	htdocs/filefunc.inc.php
	htdocs/societe/class/societe.class.php

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

..

admin.lib.php

Removed closing php tag

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

agenda.lib.php

Removed closing php tag

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

ajax.lib.php

New: Merge free product and predefined product area to enter new

2014-05-05 17:59:43 +02:00

bank.lib.php

Removed closing php tag

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

barcode.lib.php

Fix: convert line delimiters

2013-06-24 17:34:22 +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

Fix: Preview feature

2014-04-30 13:50: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

Removed closing php tag

2014-05-03 18:18:44 +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

Fix: Preview feature

2014-04-30 13:50: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

Fix: Preview feature

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

functions2.lib.php

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

2014-05-06 23:58:17 +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

New: The combo list of juridical status is now sorted

2014-05-04 23:46:36 +02:00

geturl.lib.php

Removed closing php tag

2014-05-03 18:18:44 +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

Fix: Bad date ranges

2013-07-15 21:49:54 +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

New: Module mailman can subscribe/unsubscribe to ML according to

2013-06-05 15:44:42 +02:00

member.lib.php

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

2014-05-06 23:58:17 +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-06 23:58:17 +02:00

prelevement.lib.php

Removed closing php tag

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

price.lib.php

Qual: Wrong type in method documentation

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

product.lib.php

Fix: Preview feature

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

project.lib.php

Removed closing php tag

2014-05-03 18:18:44 +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

security2.lib.php

Removed closing php tag

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

security.lib.php

Removed closing php tag

2014-05-03 18:18:44 +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

Fix: Preview feature

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

treeview.lib.php

Doc

2014-04-08 23:28:26 +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