Laurent Destailleur 11b1a2adac Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/journal/bankjournal.php htdocs/accountancy/journal/expensereportsjournal.php htdocs/accountancy/journal/purchasesjournal.php htdocs/accountancy/journal/sellsjournal.php htdocs/comm/propal/class/api_proposals.class.php htdocs/comm/propal/class/propal.class.php htdocs/compta/bank/index.php htdocs/compta/facture.php htdocs/core/class/html.form.class.php htdocs/includes/odtphp/Segment.php htdocs/langs/en_US/admin.lang htdocs/societe/soc.php		2017-05-05 14:49:25 +02:00
..
class	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-04-08 14:06:25 +02:00
various_payment	Replace usage of $bc[$var] with class="oddeven"	2017-04-14 11:22:48 +02:00
annuel.php	Replace usage of $bc[$var] with class="oddeven"	2017-04-14 11:22:48 +02:00
bankentries.php	Replace usage of $bc[$var] with class="oddeven"	2017-04-14 11:22:48 +02:00
bilan.php	Replace usage of $bc[$var] with class="oddeven"	2017-04-14 11:22:48 +02:00
budget.php	Replace usage of $bc[$var] with class="oddeven"	2017-04-14 11:22:48 +02:00
card.php	Remove accounting.lib.php	2017-05-01 21:12:52 +02:00
categ.php	Replace usage of $bc[$var] with class="oddeven"	2017-04-14 11:22:48 +02:00
document.php	Work on 6.0 look and feel	2017-03-28 21:04:38 +02:00
graph.php	Fix css	2017-03-03 15:32:34 +01:00
index.php	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-05-05 14:49:25 +02:00
info.php	Work on 6.0 look and feel	2017-03-28 21:04:38 +02:00
ligne.php	Work on look and feel v6	2017-04-07 18:38:55 +02:00
releve.php	Support of preview for pdf with several pages	2017-04-12 11:38:55 +02:00
transfer.php	Replace usage of $bc[$var] with class="oddeven"	2017-04-14 13:02:29 +02:00
treso.php	Replace usage of $bc[$var] with class="oddeven"	2017-04-14 11:22:48 +02:00