Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge remote-tracking branch 'origin/3.5' into develop

Browse Source 
Conflicts:
	htdocs/comm/propal.php
	htdocs/comm/propal/list.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/core/lib/functions.lib.php
	htdocs/expedition/note.php
	htdocs/fourn/commande/liste.php
	htdocs/fourn/facture/fiche.php
	htdocs/main.inc.php
	htdocs/projet/tasks/index.php
	htdocs/theme/eldy/style.css.php
This commit is contained in:
Laurent Destailleur
2014-05-29 19:20:48 +02:00
parent f5a530e5d5 48bbcc6f4a
commit ccca46f380
34 changed files with 269 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/commande/class/commande.class.php
View File

@@ -1387,7 +1387,7 @@ class Commande extends CommonOrder
$extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
$this->fetch_optionals($this->id,$extralabels);
$this->db->free();
$this->db->free($result);
/*
* Lines