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 2015-06-19 11:27:59 +02:00
commit 5376c771d7
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/accountancy/journal/sellsjournal.php
View File

@ -141,7 +141,7 @@ if ($result) {
// Situation invoices handling // Situation invoices handling
$line = new FactureLigne($db); $line = new FactureLigne($db);
$line->fetch($obj->id); $line->fetch($obj->rowid);
$prev_progress = $line->get_prev_progress(); $prev_progress = $line->get_prev_progress();
if ($obj->situation_percent == 0) { // Avoid divide by 0 if ($obj->situation_percent == 0) { // Avoid divide by 0
$situation_ratio = 0; $situation_ratio = 0;

2
htdocs/product/composition/card.php
View File

@ -290,7 +290,7 @@ if ($id > 0 || ! empty($ref))
} }
else else
{ {
print '<tr clas="impair">'; print '<tr class="impair">';
print '<td colspan="3">'.$langs->trans("None").'</td>'; print '<td colspan="3">'.$langs->trans("None").'</td>';
print '</tr>'; print '</tr>';
} }