Laurent Destailleur 0d1d68d5d9 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 ...

Conflicts:
	htdocs/admin/dict.php
	htdocs/product/price.php

2016-12-19 02:34:29 +01:00

..

accountancy

Fix #5973: EBP export uses simple cote instead of double cote

2016-11-11 14:06:33 +01:00

adherents

FIX #5849 Verification du champ Societe sur une modification adherent

2016-10-16 13:19:36 +02:00

admin

Merge pull request #6166 from atm-gauthier/3.9_fix_wrong_test

2016-12-18 10:58:32 +01:00

api

Allow HTTP POST request for login API method.

2016-11-22 23:44:10 +01:00

asterisk

…

barcode

…

bookmarks

Fix for option MAIN_OPTIMIZEFORTEXTBROWSER

2016-07-31 13:07:55 +02:00

cashdesk

Fix minor css

2016-09-09 09:21:27 +02:00

categories

Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0

2016-10-16 19:02:36 +02:00

comm

Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0

2016-12-18 02:16:40 +01:00

commande

FIX Some statistics not compatible with multicompany module.

2016-12-03 19:14:16 +01:00

compta

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

2016-12-11 02:51:32 +01:00

conf

Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0

2016-12-16 13:53:34 +01:00

contact

Fix count of contact was not complete

2016-11-06 17:20:21 +01:00

contrat

Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0

2016-12-07 11:54:41 +01:00

core

Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0

2016-12-19 02:34:29 +01:00

cron

Fix security hole. Add quick and fast hack to fix it

2016-11-29 17:08:44 +01:00

custom

…

don

Fix missing tab

2016-11-07 04:02:16 +01:00

ecm

FIX: #5779

2016-10-04 00:56:35 +02:00

expedition

Fix: Need declare $user for call trigger

2016-10-18 10:52:07 +02:00

expensereport

Corrupted data must be fixed by repair not by code hack.

2016-12-03 19:50:52 +01:00

exports

FIX in export. Error when using a separate extrafields.

2016-12-06 11:52:07 +01:00

externalsite

…

fichinter

Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0

2016-12-07 11:54:41 +01:00

fourn

FIX if a supplier price reference is changed after creating an order, we

2016-12-13 13:22:24 +01:00

ftp

Better explanation for ftp module setup to avoid error with FTPS/SFTP.

2016-10-15 02:11:49 +02:00

holiday

Add log

2016-10-03 12:40:04 +02:00

hrm

Fix hrm module

2016-08-31 18:57:27 +02:00

imports

…

includes

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

2016-12-11 02:34:59 +01:00

install

FIX javascript xss injection and a translation

2016-12-15 11:55:33 +01:00

langs

Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0

2016-12-18 02:16:40 +01:00

livraison

…

loan

Fix: Add another key for bank rather than to modify one

2016-10-16 06:50:13 +02:00

mailmanspip

…

margin

Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0

2016-10-29 19:00:43 +02:00

multicurrency/class

Fix get multicurrency rowid from code must be filtered by entity

2016-10-25 12:45:23 +02:00

opensurvey

On non public page, access with a bad fetch id can return error

2016-09-12 02:50:50 +02:00

paybox

…

paypal

…

printing

FIX #5512

2016-07-27 19:36:17 +02:00

product

FIX : HT and TTC price should always be displayed together

2016-12-14 15:50:50 +01:00

projet

FIX Export of opportunity status must be code, not id.

2016-12-06 14:05:43 +01:00

public

FIX #6010

2016-11-22 21:06:44 +01:00

resource

Merge branch '4.0' of https://github.com/Dolibarr/dolibarr.git into 4.0

2016-08-18 08:49:54 +02:00

societe

Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0

2016-11-28 16:40:57 +01:00

supplier_proposal

FIX: Setting supplier as client when accept a supplier proposal

2016-12-14 18:35:59 +01:00

support

…

theme

Fix option unique of extrafields not saved

2016-10-11 12:20:14 +02:00

user

FIX Must use external link into a forged email content.

2016-11-08 23:18:43 +01:00

webservices

Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0

2016-09-02 22:37:01 +02:00

websites

Fix edit of page in module website

2016-08-08 19:09:37 +02:00

.gitignore

…

cache.manifest

…

disabled.php

…

document.php

…

favicon.ico

…

filefunc.inc.php

Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0

2016-12-16 13:53:34 +01:00

index.php

FIX bad permission to see contract on home page

2016-12-03 18:20:57 +01:00

main.inc.php

FIX javascript xss injection and a translation

2016-12-15 11:55:33 +01:00

master.inc.php

FIX Security to restrict email sending was not efficient

2016-12-16 13:46:39 +01:00

robots.txt

…

viewimage.php

Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0

2016-11-11 15:03:05 +01:00