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

..

accountancy

Removed closing php tag

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

adherents

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

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

admin

New: The combo list of juridical status is now sorted

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

asterisk

Removed closing php tag

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

barcode

Removed closing php tag

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

bookmarks

Removed closing php tag

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

boutique

Removed closing php tag

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

cashdesk

Removed closing php tag

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

categories

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

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

comm

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

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

commande

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

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

compta

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

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

conf

Qual: Better error message for LDAP connection

2014-04-27 14:16:29 +02:00

contact

escape all $id used in sql queries

2014-05-06 00:06:54 +02:00

contrat

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

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

core

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

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

cron

Removed closing php tag

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

ecm

Removed closing php tag

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

expedition

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

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

exports

Removed closing php tag

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

externalsite

Removed closing php tag

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

fichinter

Removed closing php tag

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

fourn

Finished task to merge form of free product and predefined product.

2014-05-06 18:31:39 +02:00

ftp

Removed closing php tag

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

holiday

Removed closing php tag

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

imports

Removed closing php tag

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

includes

Updated ADOdb Date Time Library to v0.32

2014-05-03 19:51:32 +02:00

install

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

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

langs

Merge pull request #1574 from marcosgdf/usability

2014-05-06 10:12:28 +02:00

livraison

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

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

mailmanspip/class

Removed closing php tag

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

margin

Removed closing php tag

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

opensurvey

Removed closing php tag

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

paybox

Removed closing php tag

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

paypal

Removed closing php tag

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

printipp

Removed closing php tag

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

product

Merge pull request #1539 from defrance69/patch-7

2014-05-04 19:15:21 +02:00

projet

Removed closing php tag

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

public

Properties "civilite_id" were renamed into "civility_id".

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

societe

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

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

support

Removed closing php tag

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

theme

Removed closing php tag

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

user

Removed closing php tag

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

webservices

Properties "civilite_id" were renamed into "civility_id".

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

.gitignore

Update ignore file

2013-12-10 22:58:39 +01:00

cache.manifest

…

disabled.php

…

document.php

Fix: Pb of file upload and download.

2014-02-08 02:02:01 +01:00

favicon.ico

…

filefunc.inc.php

Prepare version 3.5.3

2014-05-06 16:09:13 +02:00

index.php

Removed closing php tag

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

main.inc.php

Merge 2 tests. Remove checkstyle errors.

2014-05-06 10:44:15 +02:00

master.inc.php

Better error wording

2013-11-29 17:23:42 +01:00

robots.txt

…

viewimage.php

Work on barcode number generation.

2014-01-30 18:21:04 +01:00