Laurent Destailleur 2b67da3f34 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 ...

Conflicts:
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php

2018-09-19 14:52:43 +02:00

..

doc

Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0

2018-09-19 14:52:43 +02:00

index.html

…

mod_commande_marbre.php

Fix regression db => this->db

2017-09-15 19:37:23 +02:00

mod_commande_saphir.php

Fix problem in type and customer code substitution in numbering module

2017-09-06 10:11:07 +02:00

modules_commande.php

…