Laurent Destailleur 6d84036f66 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/comm/action/index.php
	htdocs/contact/list.php
	htdocs/core/class/html.form.class.php
	htdocs/expensereport/card.php
	htdocs/install/doctemplates/shipment/template_shipment.odt
	htdocs/public/payment/newpayment.php

2018-12-01 19:23:06 +01:00

..

admin

FIX change my deprecated email

2018-10-27 14:43:12 +02:00

ajax

FIX change my deprecated email

2018-10-27 14:43:12 +02:00

canvas

FIX change my deprecated email

2018-10-27 14:43:12 +02:00

class

Merge pull request #9896 from hregis/develop_email

2018-11-11 17:35:35 +01:00

composition

FIX change my deprecated email

2018-10-27 14:43:12 +02:00

dynamic_price

Fix security on GETPOST('action'). Param must be sanitized.

2018-11-05 20:29:07 +01:00

inventory

Fix filter on extrafields

2018-11-07 12:49:17 +01:00

stats

FIX change my deprecated email

2018-10-27 14:43:12 +02:00

stock

fix #9475

2018-12-01 16:17:52 +01:00

agenda.php

FIX change my deprecated email

2018-10-27 14:43:12 +02:00

card.php

FIX change my deprecated email

2018-10-27 14:43:12 +02:00

document.php

FIX change my deprecated email

2018-10-27 14:43:12 +02:00

fournisseurs.php

Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email

2018-11-09 15:37:29 +01:00

index.php

FIX change my deprecated email

2018-10-27 14:43:12 +02:00

list.php

Update list.php

2018-11-29 13:44:42 +01:00

note.php

FIX change my deprecated email

2018-10-27 14:43:12 +02:00

popuprop.php

FIX change my deprecated email

2018-10-27 14:43:12 +02:00

price.php

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

2018-12-01 19:23:06 +01:00

reassort.php

FIX change my deprecated email

2018-10-27 14:43:12 +02:00

reassortlot.php

FIX change my deprecated email

2018-10-27 14:43:12 +02:00

traduction.php

FIX change my deprecated email

2018-10-27 14:43:12 +02:00