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
..
action	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-04-15 17:02:05 +02:00
admin	NEW Can use translations into all substitutions (watermark, freetext...)	2017-04-17 23:54:09 +02:00
mailing	FIX #6698 #6742	2017-05-04 13:41:37 +02:00
propal	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-05-05 14:49:25 +02:00
prospect	Replace usage of $bc[$var] with class="oddeven"	2017-04-14 13:02:29 +02:00
address.php	Fix css and look 5.0	2017-01-22 12:13:32 +01:00
card.php	Fix regressions	2017-04-28 13:37:36 +02:00
contact.php	Replace usage of $bc[$var] with class="oddeven"	2017-04-14 11:22:48 +02:00
index.php	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-04-15 17:02:05 +02:00
multiprix.php	Fix css and look 5.0	2017-01-22 12:13:32 +01:00
recap-client.php	[Qual] Close database handler should be after Footer	2015-12-11 14:19:38 +01:00
remise.php	NEW Bulk actions available on supplier orders	2017-04-09 13:12:25 +02:00
remx.php	NEW Bulk actions available on supplier orders	2017-04-09 13:12:25 +02:00