Laurent Destailleur 7149fd76c7 Merge remote-tracking branch 'origin/3.4' into 3.5 ...

Conflicts:
	htdocs/core/lib/functions2.lib.php

2014-01-25 16:28:21 +01:00

..

accountancy

…

adherents

Fix: No message if module mailman disabled

2014-01-23 09:19:56 +01:00

admin

Fix: if module invoice is disabled, option to automatically classify

2014-01-23 20:02:19 +01:00

asterisk

…

bookmarks

…

boutique

Doxygen

2013-11-20 12:55:13 +01:00

cashdesk

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

2013-12-24 16:28:27 +01:00

categories

Fix: doxygen

2014-01-15 03:08:11 +01:00

comm

Fix: Missing id

2014-01-22 03:20:18 +01:00

commande

Fix: if module invoice is disabled, option to automatically classify

2014-01-23 20:02:19 +01:00

compta

Fix: path to image must not be hardcoded but use dol_buildpath or img_picto with param src=1

2014-01-13 10:10:17 +01:00

conf

…

contact

Fix: path to image must not be hardcoded but use dol_buildpath or img_picto with param src=1.

2014-01-12 21:45:52 +01:00

contrat

Fix: path to image must not be hardcoded but use dol_buildpath or img_picto with param src=1

2014-01-13 10:10:17 +01:00

core

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

2014-01-25 16:28:21 +01:00

cron

Fix: path to image must not be hardcoded but use dol_buildpath or img_picto with param src=1

2014-01-13 10:10:17 +01:00

ecm

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

2013-12-08 00:42:36 +01:00

expedition

Fix: Missing test on id

2014-01-20 01:27:40 +01:00

exports

Removed some FIXME

2013-12-15 14:26:27 +01:00

externalsite

…

fichinter

Fix: path to image must not be hardcoded but use dol_buildpath or img_picto with param src=1

2014-01-13 10:10:17 +01:00

fourn

Fix: Error management when deleting a payment on supplier invoice.

2014-01-25 00:30:03 +01:00

ftp

FTP connections are resources

2013-11-07 21:48:45 +01:00

holiday

Fix: path to image must not be hardcoded but use dol_buildpath or img_picto with param src=1

2014-01-13 10:10:17 +01:00

imports

…

includes

Merge from 3.4

2014-01-20 02:21:30 +01:00

install

Code comments

2014-01-15 19:12:55 +01:00

langs

Trad: Add missing ca_ES and es_ES files

2014-01-23 17:05:07 +01:00

livraison

…

mailmanspip/class

…

margin

fix: doxygen

2013-12-16 14:16:01 +01:00

opensurvey

fix: minor syntax rules

2013-11-06 12:53:43 +01:00

paybox

…

paypal

Fix: Bad parameter that duplicate info.

2013-12-07 03:23:14 +01:00

printipp

…

product

Fix: Bad navigation into stock product tab

2014-01-23 16:00:15 +01:00

projet

Merge from 3.4

2014-01-20 02:21:30 +01:00

public

Fix: entity into public pages not set at correct place

2014-01-07 16:29:25 +01:00

societe

Fix: add civilite_id field in contact when create new third party.

2014-01-19 14:21:11 +01:00

support

Fix: Removed deprecated support links

2013-11-16 15:08:57 +01:00

theme

Merge from 3.4

2014-01-20 02:21:30 +01:00

user

Fix: Bad error management making rollback instead of commit

2014-01-23 09:20:06 +01:00

webservices

allow the webservice to create a private individual

2013-12-20 17:03:24 +01:00

.gitignore

Update gitignore

2013-12-09 01:41:48 +01:00

cache.manifest

…

disabled.php

…

document.php

…

favicon.ico

…

filefunc.inc.php

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

2013-12-31 16:13:12 +01:00

index.php

…

main.inc.php

typo

2014-01-21 18:55:45 +01:00

master.inc.php

Better error wording

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

robots.txt

…

viewimage.php

…