diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index ee98cf98264..219887ebee5 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -1929,7 +1929,7 @@ if ($action == 'update_extras')
$ret = $extrafields->setOptionalsFromPost($extralabels,$object,GETPOST('attribute'));
if ($ret < 0) $error++;
- if (! $error)
+ if (! $error)
{
// Actions on extra fields (by external module or standard code)
// FIXME le hook fait double emploi avec le trigger !!
@@ -1946,7 +1946,7 @@ if ($action == 'update_extras')
}
else if ($reshook < 0) $error++;
}
-
+
if ($error) $action = 'edit_extras';
}
@@ -2320,8 +2320,9 @@ if ($action == 'create')
print $langs->trans('OutstandingBill');
print '
';
print price($outstandigBills);
- if (price($outstandigBills)>price($soc->outstanding_limit)) print img_warning($langs->trans("OutstandingBillReached"));
- print ' / '.price($soc->outstanding_limit).' | ';
+ if ($outstandigBills > $soc->outstanding_limit) print img_warning($langs->trans("OutstandingBillReached"));
+ print ' / '.price($soc->outstanding_limit);
+ print '';
print '';
}
@@ -3444,9 +3445,9 @@ else if ($id > 0 || ! empty($ref))
print '';
print '';
print '';
-
+
print $extrafields->showInputField($key,$value);
-
+
print '';
print '';
}
@@ -3792,7 +3793,7 @@ else if ($id > 0 || ! empty($ref))
print '';
print '';
}
-
+
$i++;
}
print '';
@@ -3804,10 +3805,10 @@ else if ($id > 0 || ! empty($ref))
{
dol_print_error($db);
}
-
+
print '';
}
-
+
// Link for paypal payment
if (! empty($conf->paypal->enabled) && $object->statut != 0)
{
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 3b902be93f7..556bbe97041 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -2820,9 +2820,9 @@ class Societe extends CommonObject
$this->db->begin();
$now=dol_now();
-
+
$outstanding = price2num($this->outstanding_limit);
-
+
// Positionne l'encours de facturaiton
$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET ";
$sql.= " outstanding_limit=".$outstanding;
@@ -2843,13 +2843,13 @@ class Societe extends CommonObject
}
/**
- * return amount of bill not paid
+ * Return amount of bill not paid
*
- * @return boolean Yes or no
+ * @return int Amount in debt for thirdparty
*/
function get_OutstandingBill()
{
- /* Accurate value of remain to pay is to sum remaintopay for each invoice
+ /* Accurate value of remain to pay is to sum remaintopay for each invoice
$paiement = $invoice->getSommePaiement();
$creditnotes=$invoice->getSumCreditNotesUsed();
$deposits=$invoice->getSumDepositsUsed();
@@ -2857,7 +2857,7 @@ class Societe extends CommonObject
$remaintopay=price2num($invoice->total_ttc - $paiement - $creditnotes - $deposits,'MT');
*/
$sql = "SELECT sum(total) as amount FROM ".MAIN_DB_PREFIX."facture as f";
- $sql .= " WHERE fk_soc = ". $this->id;
+ $sql .= " WHERE fk_soc = ". $this->id;
$sql .= " AND paye = 0";
$sql .= " AND fk_statut <> 0";
@@ -2873,9 +2873,9 @@ class Societe extends CommonObject
}
/**
- * Return label of status customer is prospect/customer
+ * Return label of status customer is prospect/customer
*
- * @return string Libelle
+ * @return string Label
*/
function getLibCustProspStatut()
{