Laurent Destailleur 14de1d66c0 Merge remote-tracking branch 'origin/3.5' into 3.6 ...

Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php

2014-06-29 23:56:23 +02:00

..

accountancy

Qual: remove PHP closing tag (again)

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

adherents

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

2014-06-28 14:53:28 +02:00

admin

Fix: Deprecated and no more used fields should not appear to user.

2014-06-21 18:08:32 +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

Shop - Bad language file ("boutique" instead of "shop") & add language key

2014-06-17 06:31:20 +02:00

cashdesk

Fix: security

2014-05-28 19:38:30 +02:00

categories

Divers

2014-06-16 06:17:46 +02:00

comm

Fix [ bug #1516 ] PRODUIT_CUSTOMER_PRICES don't take default price if

2014-06-29 17:39:54 +02:00

commande

Syntax

2014-06-29 17:43:22 +02:00

compta

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

2014-06-29 23:56:23 +02:00

conf

Qual: Better error message for LDAP connection

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

contact

Qual: remove PHP closing tag (again)

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

contrat

Qual: remove PHP closing tag (again)

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

core

Fix : Invoice PDF was not showing ref when created from a shipment. Now shows refs and dates of shipment and oreder related

2014-06-28 17:01: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

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

2014-06-20 15:26:02 +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: Add hidden option so we can restore old behaviour (duration is

2014-06-21 16:06:59 +02:00

fourn

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

2014-06-29 23:56:23 +02:00

ftp

Removed closing php tag

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

holiday

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

2014-06-28 14:53:28 +02:00

imports

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

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

includes

License violation: Missing source on min file.

2014-05-27 00:26:53 +02:00

install

Fix :: acount_parent must be an int - Final step

2014-06-29 07:02:13 +02:00

langs

Syn pt_BR from transifex

2014-06-26 01:51:17 +02:00

livraison

Qual: remove PHP closing tag (again)

2014-05-26 13:51:25 +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

Qual: remove PHP closing tag (again)

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

paybox

Removed closing php tag

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

paypal

Qual: remove PHP closing tag (again)

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

printipp

Removed closing php tag

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

product

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

2014-06-28 14:53:28 +02:00

projet

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

2014-06-25 20:22:25 +02:00

public

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

2014-06-09 15:30:41 +02:00

resource

Qual: remove PHP closing tag (again)

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

societe

Fix: Translation

2014-06-25 08:52:57 +02:00

support

Qual: remove PHP closing tag (again)

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

theme

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

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

user

Fix: doxygen

2014-06-20 13:07:15 +02:00

webservices

Qual: remove PHP closing tag (again)

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

.gitignore

…

cache.manifest

…

disabled.php

…

document.php

…

favicon.ico

…

filefunc.inc.php

Merge branch 'bug-1416' of github.com:marcosgdf/dolibarr into

2014-06-10 01:37:43 +02:00

index.php

Removed closing php tag

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

main.inc.php

Merge pull request #1679 from defrance69/patch-1

2014-06-23 20:28:53 +02:00

master.inc.php

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

2014-06-09 15:30:41 +02:00

robots.txt

…

viewimage.php

…