aspangaro a8ead1d44c Merge remote-tracking branch 'Upstream/3.9' into 3.9-p11 ...

Correct conflicts:
	htdocs/core/menus/standard/eldy.lib.php

2016-02-15 06:31:34 +01:00

..

accountancy

add accountancy balance

2016-02-09 19:20:03 +01:00

adherents

default sort should be from A to Z

2016-02-10 12:15:22 +01:00

admin

Merge pull request #4589 from frederic34/patch-8

2016-02-15 00:34:22 +01:00

api

…

asterisk

FIX Removed hard coded parameters for asterisk setup

2015-12-13 15:21:46 +01:00

barcode

I continue bug war week-end

2016-01-09 00:44:06 +01:00

bookmarks

Merge remote-tracking branch 'origin/3.8' into 3.9

2016-01-23 11:45:39 +01:00

cashdesk

Fix css

2016-01-28 12:44:04 +01:00

categories

Fix text color for category tags

2016-01-10 00:11:49 +01:00

comm

Merge remote-tracking branch 'origin/3.8' into 3.9

2016-02-15 01:37:23 +01:00

commande

Return bad late or not status for order

2016-02-09 14:29:12 +01:00

compta

Fix button create template must be visible only if amount is != 0

2016-02-11 10:39:01 +01:00

conf

Fix no ?> at end of php files

2016-01-02 00:32:22 +01:00

contact

Fix sql error when extrafields on contact

2016-02-05 10:56:45 +01:00

contrat

Merge remote-tracking branch 'origin/3.8' into 3.9

2016-01-30 15:59:40 +01:00

core

Merge remote-tracking branch 'Upstream/3.9' into 3.9-p11

2016-02-15 06:31:34 +01:00

cron

FIX #4314

2016-01-08 15:45:23 +01:00

custom

Prepare 3.9

2016-02-06 15:55:05 +01:00

don

Fix select2 component go over parent container so we introduce option to

2016-01-08 23:17:45 +01:00

ecm

[Qual] Close database handler should be after Footer

2015-12-11 19:37:12 +01:00

expedition

Merge remote-tracking branch 'origin/3.8' into 3.9

2016-02-15 01:37:23 +01:00

expensereport

FIX No project fields if module disabled

2016-02-02 15:09:01 +01:00

exports

FIX #4597 PHP 7 Uniform Variable Syntax

2016-02-11 20:01:51 +01:00

externalsite

…

fichinter

FIX Selection of project must no show closed project

2016-01-28 12:19:13 +01:00

fourn

Fix style on payment page

2016-02-05 12:46:41 +01:00

ftp

…

holiday

Merge remote-tracking branch 'origin/3.8' into 3.9

2016-01-23 11:45:39 +01:00

hrm

Fix: When a payment mode was disabled, it was not visible on old

2015-12-21 13:56:59 +01:00

imports

FIX #4597 PHP 7 Uniform Variable Syntax

2016-02-11 20:01:51 +01:00

includes

Prepare 3.9

2016-02-06 15:55:05 +01:00

install

Update 3.8.0-3.9.0.sql

2016-02-12 10:34:21 +01:00

langs

Correct problem of merging for language file

2016-02-11 06:49:49 +01:00

livraison

FIX Bug: Delivery order and date are not displayed #4372

2016-01-13 20:41:32 +01:00

loan

Fix: When a payment mode was disabled, it was not visible on old

2015-12-21 13:56:59 +01:00

mailmanspip

…

margin

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

2015-12-27 19:15:20 +01:00

opensurvey

Merge remote-tracking branch 'origin/3.8' into 3.9

2016-01-22 03:25:30 +01:00

paybox

[Qual] Uniformize code

2015-12-12 10:59:02 +01:00

paypal

[Qual] Uniformize code

2015-12-12 10:59:02 +01:00

printing

…

product

Merge remote-tracking branch 'origin/3.8' into 3.9

2016-02-15 01:37:23 +01:00

projet

FIX Bad filter on opportunities

2016-02-06 15:09:57 +01:00

public

FIX #4314

2016-01-08 15:45:23 +01:00

resource

fix travis

2015-12-28 11:47:12 +01:00

societe

Merge remote-tracking branch 'origin/3.8' into 3.9

2016-02-15 01:37:23 +01:00

supplier_proposal

Fix several bugs on css, translation or look

2016-01-01 23:44:23 +01:00

support

Fix first install on debian.

2016-02-06 17:19:57 +01:00

theme

Fix: previous and next arrow

2016-02-10 17:45:26 +01:00

user

FIX The search on user/group was not using new code. Fiels used for

2016-02-07 02:55:56 +01:00

webservices

[Qual] Uniformize code

2015-12-21 22:59:12 +01:00

.gitignore

Add ignore

2016-01-08 13:06:38 +01:00

cache.manifest

…

disabled.php

…

document.php

…

favicon.ico

…

filefunc.inc.php

Prepare 3.8.4

2016-02-14 20:12:47 +01:00

index.php

Fix bad management of option SOCIETE_DISABLE_PROSPECTS and

2016-01-14 12:49:23 +01:00

main.inc.php

Merge

2016-02-05 12:18:50 +01:00

master.inc.php

…

robots.txt

…

viewimage.php

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

2016-01-08 14:49:00 +01:00