Laurent Destailleur fac28f9589 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/commande/card.php htdocs/compta/facture.php htdocs/compta/sociales/charges.php htdocs/core/boxes/modules_boxes.php htdocs/core/class/commonobject.class.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/fourn/commande/card.php htdocs/fourn/facture/card.php		2016-08-28 02:40:20 +02:00
..
admin	Merge pull request #5613 from atm-florian/40_accountancy	2016-08-11 20:47:02 +02:00
bookkeeping	Indentation dolibarr style	2016-07-11 10:24:06 +02:00
class	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop	2016-08-28 02:40:20 +02:00
customer	fix list	2016-08-08 15:31:06 +02:00
journal	fix export	2016-08-10 17:22:58 +02:00
report	Fix stuff in accoutancy	2016-06-29 16:54:37 +02:00
supplier	fix list	2016-08-08 15:31:06 +02:00
tpl	Add : new param accounting export	2016-07-07 11:48:22 +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