dolibarr/htdocs/supplier_proposal
Laurent Destailleur 1fbf233f95 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
	htdocs/contact/list.php
	htdocs/contrat/list.php
	htdocs/expedition/list.php
	htdocs/expensereport/list.php
	htdocs/fichinter/list.php
	htdocs/fourn/commande/list.php
	htdocs/product/reassort.php
	htdocs/product/reassortlot.php
	htdocs/product/stock/list.php
	htdocs/societe/list.php
	htdocs/supplier_proposal/list.php
	htdocs/theme/eldy/style.css.php
2016-09-12 01:50:38 +02:00
..
admin [Qual] comments should be in english 2015-12-22 09:37:27 +01:00
class sql syntax 2016-09-02 21:48:02 +02:00
tpl FIX Creating a supplier order from proposal order 2016-06-04 02:39:13 +02:00
card.php Fix #5712 2016-09-11 23:01:04 +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 '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-09-12 01:50: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