Laurent Destailleur be8e48b265 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ...

Conflicts:
	htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
	htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
	htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
	htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
	htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php

2018-10-31 15:38:29 +01:00

..

doc

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

2018-10-31 15:38:29 +01:00

task

Start to introduce common substitution rules for odt substitutions

2018-02-24 13:41:01 +01:00

index.html

…

mod_project_simple.php

Fix regression db => this->db

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

mod_project_universal.php

…

modules_project.php

…