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

Conflicts:
	ChangeLog
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/product/doc/pdf_standard.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
	htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
	htdocs/filefunc.inc.php

2019-05-09 12:27:14 +02:00

..

doc

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

2019-05-09 12:27:14 +02:00

index.html

Removed index.php and replaced them with blank index.html as it is more appropriate

2014-07-12 23:18:57 +02:00

mod_commande_marbre.php

replace @public by @var

2019-04-18 18:41:02 +02:00

mod_commande_saphir.php

Update mod_commande_saphir.php

2019-04-20 09:34:23 +02:00

modules_commande.php

Work on BOM module

2019-03-04 13:30:43 +01:00