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
..
2018-10-19 14:27:15 +02:00
2018-10-30 15:28:11 +01:00
2018-10-14 17:07:38 +02:00
2018-10-23 17:16:46 +02:00
2018-10-09 14:34:25 +02:00
2018-10-23 17:16:46 +02:00
2018-10-30 14:29:26 +01:00
2018-10-30 12:41:56 +01:00
2018-10-24 13:30:54 +02:00
2018-10-08 00:52:21 +02:00
2018-10-31 15:38:29 +01:00
2018-09-18 23:48:02 +02:00
2018-10-24 02:24:47 +02:00
2018-10-16 18:41:50 +02:00
2018-10-30 14:59:48 +01:00
2018-10-30 21:15:52 +01:00
2018-09-04 09:37:51 +02:00
2018-09-04 10:53:42 +02:00
2018-10-31 11:38:04 +01:00
2018-10-31 11:38:04 +01:00
2018-10-28 09:22:55 +01:00
2018-10-09 17:06:08 +02:00
2018-10-29 18:28:19 +01:00
2018-09-01 17:50:13 +02:00
2018-09-01 17:50:13 +02:00
2018-10-28 10:25:56 +01:00
2018-10-26 16:21:01 +02:00
2018-10-12 20:28:26 +02:00
2018-10-27 11:46:12 +02:00
2018-10-19 14:27:15 +02:00
2018-10-12 19:01:01 +02:00
2018-09-16 12:27:56 +02:00
2018-10-24 02:58:29 +02:00
2018-09-14 13:07:27 +02:00
2018-10-09 14:24:41 +02:00
2018-10-12 21:11:40 +02:00
2018-09-06 14:49:48 +02:00