Laurent Destailleur b81de35703 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 ...

Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/compta/sociales/class/chargesociales.class.php
	htdocs/contrat/class/contrat.class.php

2017-05-12 15:44:09 +02:00

..

accountancy

FIX Several bugs in accounting module.

2017-04-29 15:16:36 +02:00

adherents

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

2017-05-12 15:44:09 +02:00

admin

Fix error management in adding translation key

2017-04-27 12:48:13 +02:00

api

Fix #6365

2017-02-03 11:42:49 +01:00

asterisk

…

barcode

…

bookmarks

Merge branch '5.0' into 5.0_bug2

2017-01-27 00:36:27 +01:00

cashdesk

FIX Combo list of VAT is wrong on POS

2017-01-24 14:33:49 +01:00

categories

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

2017-03-31 18:31:54 +02:00

comm

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

2017-05-12 15:44:09 +02:00

commande

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

2017-05-12 15:44:09 +02:00

compta

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

2017-05-12 15:44:09 +02:00

conf

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

2016-12-26 12:42:23 +01:00

contact

FIX Better sanitizing of search all parameter.

2017-05-09 19:36:10 +02:00

contrat

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

2017-05-12 15:44:09 +02:00

core

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

2017-05-10 23:47:33 +02:00

cron

Fix parameters

2017-02-27 00:22:11 +01:00

custom

…

don

FIX Better sanitizing of search all parameter.

2017-05-09 19:36:10 +02:00

ecm

Fix css and look 5.0

2017-01-22 12:13:32 +01:00

expedition

FIX Better sanitizing of search all parameter.

2017-05-09 19:36:10 +02:00

expensereport

Fix label "total for this page" on last page.

2017-05-10 11:57:59 +02:00

exports

FIX LOG_ERROR does not exists. Use LOG_ERR.

2017-03-18 11:48:02 +01:00

externalsite

…

fichinter

Fix label "total for this page" on last page.

2017-05-10 11:57:59 +02:00

fourn

Add fk_facture_fourn element to fetch lines objects

2017-05-10 22:45:41 +02:00

ftp

…

holiday

FIX Better sanitizing of search all parameter.

2017-05-09 19:36:10 +02:00

hrm

Fix half day for leave request.

2017-03-23 10:52:09 +01:00

imports

…

includes

Fix doxygen

2017-04-29 01:01:12 +02:00

install

FIX New vat code not correctly implemented if "1 price per customer".

2017-05-12 13:12:17 +02:00

langs

Fix company id for US

2017-05-12 11:26:24 +02:00

livraison

…

loan

Fix security escapment

2017-03-26 01:57:09 +01:00

mailmanspip

…

margin

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

2017-01-28 15:12:14 +01:00

multicurrency/class

…

opensurvey

Fix pagination when MAIN_DISABLE_FULL_SCANLIST is on

2017-01-15 20:49:20 +01:00

paybox

…

paypal

…

printing

Fix several problems into OAuth2 module.

2017-01-06 19:58:46 +01:00

product

FIX New vat code not correctly implemented if "1 price per customer".

2017-05-12 13:12:17 +02:00

projet

Fix label "total for this page" on last page.

2017-05-10 11:57:59 +02:00

public

Fix recurring invoices generation when using the cron url

2017-05-10 00:58:48 +11:00

resource

Fix responsive design

2017-02-23 01:29:35 +01:00

societe

FIX Link to files on bank account tab broken with multicompany

2017-05-10 19:08:07 +02:00

supplier_proposal

FIX Better sanitizing of search all parameter.

2017-05-09 19:36:10 +02:00

support

Fix link should be https

2017-01-07 15:18:57 +01:00

theme

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

2017-05-12 15:44:09 +02:00

user

FIX Better sanitizing of search all parameter.

2017-05-09 19:36:10 +02:00

webservices

…

websites

Fix css and look 5.0

2017-01-22 12:13:32 +01:00

.gitignore

…

cache.manifest

…

document.php

…

favicon.ico

…

filefunc.inc.php

Merge pull request #6816 from Gecka-Apps/5.0-fixes

2017-05-10 14:52:23 +02:00

index.php

FIX XSS

2017-05-10 11:48:45 +02:00

main.inc.php

FIX Better sanitizing of search all parameter.

2017-05-09 19:36:10 +02:00

master.inc.php

…

robots.txt

…

viewimage.php

…