Commit Graph

13 Commits

Author SHA1 Message Date
Laurent Destailleur
3ebfb23407 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	.travis.yml
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/product/fournisseurs.php
	htdocs/ticket/class/ticket.class.php
2018-08-29 20:22:50 +02:00
Laurent Destailleur
b5c2383f65 Fix type of invoice encoded twice 2018-08-28 18:34:53 +02:00
Laurent Destailleur
d2d28ab109 Fix trans 2018-08-28 18:28:09 +02:00
Laurent Destailleur
651ba74007 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-16 15:45:50 +02:00
Laurent Destailleur
37e16b5ff2 Trans 2018-07-16 11:55:59 +02:00
Laurent Destailleur
41605ed4a7 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.form.class.php
2018-07-16 11:29:47 +02:00
Laurent Destailleur
d3cc2c81eb Better detail for time elapsed 2018-07-16 11:14:39 +02:00
Laurent Destailleur
a45ac4519a Fix translation 2018-07-15 18:03:31 +02:00
Laurent Destailleur
c871e81a52 Trans 2018-06-23 00:15:57 +02:00
Laurent Destailleur
7562c13fad The about page is now a README.md file 2018-06-11 09:32:41 +02:00
Laurent Destailleur
ab5ed6a3b5 Fix rename of ticket language file 2018-06-11 09:31:31 +02:00
Laurent Destailleur
ac721b46bc Trans 2018-06-06 11:16:42 +02:00
Laurent Destailleur
87d073b5cd Fix conflict with external ticketsup module 2018-06-04 21:49:29 +02:00