lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2013-02-15 10:42:50 +01:00
commit 71b814156b
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/compta/facture/class/facture.class.php
View File

@ -1829,6 +1829,8 @@ class Facture extends CommonInvoice
if ($error == 0) if ($error == 0)
{ {
$this->brouillon = 1;
$this->statut = 0;
$this->db->commit(); $this->db->commit();
return 1; return 1;
} }

2
htdocs/core/class/html.form.class.php
View File

@ -1180,7 +1180,7 @@ class Form
$sql.= ", pl.label as label_translated"; $sql.= ", pl.label as label_translated";
} }
// Price by quantity // Price by quantity
if (! empty($conf->global->PRODUIT_PRICE_BY_QTY)) if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY))
{ {
$sql.= ", (SELECT pp.rowid FROM ".MAIN_DB_PREFIX."product_price as pp WHERE pp.fk_product = p.rowid"; $sql.= ", (SELECT pp.rowid FROM ".MAIN_DB_PREFIX."product_price as pp WHERE pp.fk_product = p.rowid";
if ($price_level >= 1) $sql.= " AND price_level=".$price_level; if ($price_level >= 1) $sql.= " AND price_level=".$price_level;