Laurent Destailleur eab44f62b1 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/core/actions_builddoc.inc.php
	htdocs/core/class/html.form.class.php
	htdocs/core/tpl/admin_extrafields_add.tpl.php
	htdocs/core/tpl/admin_extrafields_edit.tpl.php
	htdocs/core/tpl/admin_extrafields_view.tpl.php
	htdocs/core/tpl/notes.tpl.php
	htdocs/main.inc.php
	htdocs/product/inventory/tpl/inventory.tpl.php
	htdocs/societe/tpl/linesalesrepresentative.tpl.php

2017-12-21 14:35:33 +01:00

..

admin

Merge remote-tracking branch 'uptream/develop' into 7.0-7

2017-12-09 06:14:34 +01:00

bookkeeping

FIX : Various payment

2017-12-11 07:03:37 +01:00

class

FIX : Various payment

2017-12-11 07:03:37 +01:00

customer

Look and feel v6

2017-11-29 18:13:22 +01:00

expensereport

Look and feel v6

2017-11-29 18:13:22 +01:00

journal

FIX : Various payment

2017-12-11 07:03:37 +01:00

supplier

Look and feel v6

2017-11-29 18:13:22 +01:00

tpl

FIX security vulnerability reported by ADLab of Venustech

2017-12-21 13:32:16 +01:00

index.html

…

index.php

Fix size of image by using fa picto

2017-11-07 00:18:55 +01:00