Conflicts:
	htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php
	htdocs/core/modules/commande/doc/pdf_proforma.modules.php

FIX finished parameters not used

Fix: missing model selected

Fix: 3.9 Problem of rowspan in edit mode on user card

Fix: beware with merges in conflict !!

FIX SQL syntax error in export

FIX: Not showing sellprice properly on product list

FIX # Bad function name setEventMessagess call on project delete

FIX Missing language file loading

[fix]: define  to avoid issue with external pdf models

12

the vat for customer was not correctly set.

SQL error when ordering product list