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

Conflicts:
	htdocs/compta/facture.php
	htdocs/compta/facture/fiche-rec.php
	htdocs/contact/list.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/facture/card.php
	htdocs/societe/list.php
	htdocs/user/document.php

2017-04-11 11:43:54 +02:00

..

accountancy

Fix regression

2017-03-28 21:09:15 +02:00

adherents

Fix events create from member card not linked to member

2017-03-30 11:51:07 +02:00

admin

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

2017-04-11 11:43:54 +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-03-31 18:31:54 +02:00

commande

Several fixes on multicurrency

2017-03-23 12:44:20 +01:00

compta

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

2017-04-11 11:43:54 +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

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

2017-04-11 11:43:54 +02:00

contrat

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

2017-03-21 19:20:14 +01:00

core

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

2017-04-11 11:43:54 +02:00

cron

Fix parameters

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

custom

…

don

Fix css and look 5.0

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

ecm

Fix css and look 5.0

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

expedition

Fix fetch shipment object on cancel modification

2017-03-25 16:17:43 +01:00

expensereport

Fix with on smartphone

2017-03-21 17:58:41 +01:00

exports

FIX LOG_ERROR does not exists. Use LOG_ERR.

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

externalsite

…

fichinter

Fix several bugs

2017-01-22 13:19:07 +01:00

fourn

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

2017-04-11 11:43:54 +02:00

ftp

…

holiday

Fix : Display of textarea in holiday card

2017-03-25 07:26:26 +01:00

hrm

…

imports

…

includes

FIX Rename api_key into DOLAPIKEY to allow to use it on http header.

2017-01-22 20:55:26 +01:00

install

FIX complete hourly rate when not defined into table of time spent

2017-04-05 15:24:41 +02:00

langs

Fix translation

2017-04-08 14:02:07 +02:00

livraison

…

loan

Fix css and look 5.0

2017-01-22 12:13:32 +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

Better log

2017-04-06 10:56:37 +02:00

projet

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

2017-03-21 19:20:14 +01:00

public

Fix css

2017-02-01 20:55:30 +01:00

resource

Fix responsive design

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

societe

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

2017-04-11 11:43:54 +02:00

supplier_proposal

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

2017-04-11 11:43:54 +02:00

support

Fix link should be https

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

theme

Fix : Missing picture for module multicurrency in md theme

2017-03-24 06:50:07 +01:00

user

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

2017-04-11 11:43:54 +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

Prepare 5.0.2

2017-04-04 13:01:53 +02:00

index.php

Fix loading of language file

2017-02-28 21:15:39 +01:00

main.inc.php

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

2017-03-21 19:20:14 +01:00

master.inc.php

…

robots.txt

…

viewimage.php

…