dolibarr/htdocs/supplier_proposal
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 [Qual] comments should be in english 2015-12-22 09:37:27 +01:00
class Fix var not initialized 2016-06-28 02:36:40 +02:00
tpl FIX Creating a supplier order from proposal order 2016-06-04 02:39:13 +02:00
card.php Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-08-28 02:40:20 +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 Uniformize code 2016-08-24 19:38:34 +02:00
note.php NEW Removed deprecated CommonObject::client property. Please use CommonObject::thirdparty instead 2016-04-17 15:24:22 +02:00