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

Conflicts:
	htdocs/compta/facture.php
	htdocs/core/modules/modAgenda.class.php
	htdocs/core/modules/modProduct.class.php
	htdocs/fourn/commande/liste.php

2014-05-18 11:52:52 +02:00

..

accountancy

Removed closing php tag

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

adherents

Fix: Bad syntax of vars

2014-05-12 12:10:52 +02:00

admin

Add dictionary to define type of resources

2014-05-10 22:07:12 +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

Fix: Missing form init

2014-05-11 18:55:18 +02:00

categories

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

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

comm

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

2014-05-18 11:52:52 +02:00

commande

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

2014-05-18 11:52:52 +02:00

compta

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

2014-05-18 11:52:52 +02:00

conf

Qual: Better error message for LDAP connection

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

contact

Fix: We must never use 'alpha' as second parameter of GETPOST when field

2014-05-10 02:21:04 +02:00

contrat

Missing include contrat.class.php

2014-05-14 14:17:15 +02:00

core

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

2014-05-18 11:52:52 +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

Add possibility to change package dimension after shipping creation

2014-05-14 17:20:11 +02:00

exports

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

2014-05-18 11:52:52 +02:00

externalsite

Removed closing php tag

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

fichinter

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

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

fourn

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

2014-05-18 11:52:52 +02:00

ftp

Removed closing php tag

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

holiday

Removed useless translation key

2014-05-10 15:50:32 +02:00

imports

Fix: [ bug #1384 ] Wrong name for import products and product prices

2014-05-11 17:52:16 +02:00

includes

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

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

install

Fix initdata 3.6 for CommandeFournisseurTest.php run correctly

2014-05-14 14:17:03 +02:00

langs

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

2014-05-18 11:52:52 +02:00

livraison

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

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

mailmanspip/class

Removed closing php tag

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

margin

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

2014-05-18 11:52:52 +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 remote-tracking branch 'origin/3.5' into develop

2014-05-18 11:52:52 +02:00

projet

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

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

public

Fix: Email html format was missing br.

2014-05-07 10:05:32 +02:00

resource

Fix: Modules into core should never, by definition, activate hooks

2014-05-14 12:14:18 +02:00

societe

fix llx_societe.datea call in request

2014-05-13 19:32:04 +02:00

support

Removed closing php tag

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

theme

More info into comment

2014-05-13 18:30:51 +02:00

user

Removed closing php tag

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

webservices

Fix: When creating an invoice, we must first create it as draft and then

2014-05-13 14:24:27 +02:00

.gitignore

…

cache.manifest

…

disabled.php

…

document.php

…

favicon.ico

…

filefunc.inc.php

Fix: Missing to set version to beta

2014-05-14 14:09:57 +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

…

robots.txt

…

viewimage.php

…