dolibarr/htdocs/contrat
Laurent Destailleur b1c2198154 Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
	htdocs/core/ajax/selectsearchbox.php
	htdocs/core/lib/price.lib.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/core/modules/modCommande.class.php
	htdocs/core/modules/modFacture.class.php
	htdocs/projet/list.php
	htdocs/societe/list.php
2016-04-07 20:01:52 +02:00
..
admin [Qual] comments should be in english 2015-12-22 09:37:27 +01:00
class Merge remote-tracking branch 'origin/3.9' into develop 2016-04-07 20:01:52 +02:00
tpl NEW Merge all boxes "related objects" into one. This save a lot of room 2016-03-30 19:18:31 +02:00
card.php Uniformize code and css 2016-04-01 16:18:45 +02:00
contact.php Code was corrupted with very bad commits. I restore files manually. 2016-03-25 15:53:44 +01: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 Merge remote-tracking branch 'origin/3.8' into develop 2015-11-02 19:31:42 +01:00
info.php [Qual] Close database handler should be after Footer 2015-12-11 14:19:38 +01:00
list.php Keep empty if field value has no value. 2016-04-04 13:26:48 +02:00
note.php Code was corrupted with very bad commits. I restore files manually. 2016-03-25 15:53:44 +01:00
services.php Code was corrupted with very bad commits. I restore files manually. 2016-03-25 15:53:44 +01:00