dolibarr/htdocs/comm
Laurent Destailleur 7f85d73001 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/adherents/card.php
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
	htdocs/contrat/card.php
	htdocs/expensereport/card.php
	htdocs/fichinter/list.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/commande/list.php
	htdocs/fourn/facture/card.php
	htdocs/fourn/paiement/card.php
	htdocs/livraison/card.php
	htdocs/modulebuilder/template/myobject_list.php
	htdocs/societe/rib.php
	htdocs/supplier_proposal/list.php
	htdocs/user/card.php
2017-10-18 19:51:29 +02:00
..
action Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-10-18 19:51:29 +02:00
admin NEW Can use translations into all substitutions (watermark, freetext...) 2017-04-17 23:54:09 +02:00
mailing Standardize substition keys. 2017-10-13 10:35:21 +02:00
propal Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-10-18 19:51:29 +02:00
prospect New: getEntity function use true $shared value by default 2017-05-30 18:50:54 +02:00
address.php USe second parameter in GETPOST 2017-09-15 10:50:50 +02:00
card.php USe second parameter in GETPOST 2017-09-15 10:50:50 +02:00
contact.php Fix translation done twice into field title of array 2017-08-02 13:31:53 +02:00
index.php New: getEntity function use true $shared value by default 2017-05-30 18:50:54 +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 USe second parameter in GETPOST 2017-09-15 10:50:50 +02:00
remx.php Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-10-13 22:01:56 +02:00