Skip to content

Commit

Permalink
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into d…
Browse files Browse the repository at this point in the history
…evelop
  • Loading branch information
eldy committed Nov 2, 2015
2 parents d0d4c5e + 89f23b2 commit e12a38d
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions htdocs/core/class/commonobject.class.php
Expand Up @@ -1391,6 +1391,8 @@ function setPaymentMethods($id)
if ($this->db->query($sql))
{
$this->mode_reglement_id = $id;
// for supplier
if (get_class($this) == 'Fournisseur') $this->mode_reglement_supplier_id = $id;
return 1;
}
else
Expand Down Expand Up @@ -1431,6 +1433,8 @@ function setPaymentTerms($id)
if ($this->db->query($sql))
{
$this->cond_reglement_id = $id;
// for supplier
if (get_class($this) == 'Fournisseur') $this->cond_reglement_supplier_id = $id;
$this->cond_reglement = $id; // for compatibility
return 1;
}
Expand Down

0 comments on commit e12a38d

Please sign in to comment.