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

..

ajax

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

2017-06-18 21:13:48 +02:00

class

FIX Maxi debug of permission for users external or restricted to sales

2017-12-18 16:13:05 +01:00

commande

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

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

facture

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

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

js

Fix for 'lessone' mode

2017-09-26 15:44:40 +02:00

paiement

Standardize code

2017-11-23 15:22:32 +01:00

product

Fix for #7697

2017-12-01 19:29:29 +01:00

card.php

Fix filters on surveys

2017-11-24 10:00:46 +01:00

contact.php

Fix translation done twice into field title of array

2017-08-02 13:31:53 +02:00

index.php

FIX security vulnerability reported by ADLab of Venustech

2017-12-21 12:52:19 +01:00

recap-fourn.php

Replace usage of $bc[$var] with class="oddeven"

2017-04-14 11:22:48 +02:00