dolibarr/htdocs/supplier_proposal
Laurent Destailleur 100312aac2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/adherents/class/cotisation.class.php
2016-09-26 01:32:50 +02:00
..
admin [Qual] comments should be in english 2015-12-22 09:37:27 +01:00
class Correct travis & typo "Execuete" 2016-09-24 07:18:38 +02:00
tpl FIX Creating a supplier order from proposal order 2016-06-04 02:39:13 +02:00
card.php Uniformize code 2016-09-26 00:10:29 +02:00
document.php FIX The include file for action on files should not be a template file 2016-04-02 14:16:16 +02:00
index.php Fix several bugs on css, translation or look 2016-01-01 23:44:23 +01:00
info.php
list.php Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-12 02:05:38 +02:00
note.php Fix missing information on main supplier proposal card, not on note tab. 2016-09-10 17:35:08 +02:00