Laurent Destailleur 1f5bea01f5 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/html.formother.class.php htdocs/core/lib/functions.lib.php htdocs/core/modules/commande/doc/pdf_einstein.modules.php htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php htdocs/core/modules/facture/doc/pdf_crabe.modules.php htdocs/core/modules/facture/doc/pdf_sponge.modules.php htdocs/core/modules/propale/doc/pdf_azur.modules.php htdocs/core/modules/propale/doc/pdf_cyan.modules.php htdocs/fourn/class/fournisseur.product.class.php htdocs/product/fournisseurs.php htdocs/user/card.php		2019-11-14 21:30:16 +01:00
..
api_supplier_invoices.class.php	Move Gnu.org to https	2019-09-23 21:55:30 +02:00
api_supplier_orders.class.php	Scrutinizer Auto-Fixes	2019-11-02 00:17:45 +00:00
fournisseur.class.php	replace deprecated user->societe_id by user->socid	2019-10-31 20:46:31 +01:00
fournisseur.commande.class.php	Scrutinizer Auto-Fixes	2019-11-13 18:37:08 +00:00
fournisseur.commande.dispatch.class.php	Look and feel v11	2019-11-01 23:58:14 +01:00
fournisseur.facture.class.php	Scrutinizer Auto-Fixes	2019-11-13 18:37:08 +00:00
fournisseur.product.class.php	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-11-14 21:30:16 +01:00
index.html
paiementfourn.class.php	Merge pull request #12265 from grandoc/new_branch_30_10_2019	2019-11-02 11:49:28 +01:00