FIX [ bug #3426 ] Unable to create an invoice from a contract with extrafields

Close #3426

Fix #3289 Salaries module shows amounts with currency symbol unlike t…

Grandoc fix 27082015

This reverts commit 2527ae26.

Fix: disable hook for avoid errors when object langs is disable

Conflicts:
	htdocs/core/lib/date.lib.php

FIX [ bug #3321 ] Users with certain permissions were shown a "forbidden access" page even if they had the rights

Fix: place the form outside the table for avoid errors

FIX [ bug #3321 ] Users with certain permissions were shown a "forbidden access" page even if they had the rights

Close #3321

Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/class/facture.class.php

Conflicts:
	htdocs/compta/facture/class/facture.class.php

FIX [ bug #3211 ] Error about sold to pay (Montant encours)

marcosgdf-bug-3313

Conflicts:
	ChangeLog

Conflicts:
	ChangeLog

Rowid was missing on expedition line so no origin id when creating an invoice

FIX : Display country name instead of country id (display country id …

Fix: [ bug #3206 ] PropaleLigne, OrderLine and FactureLigne given to triggers through update function does not contain all the information

Fix: missing entity in cache files names

Update llx_c_type_resource.sql

Error create table, missing incremet type element