Merge pull request #10823 from joseplluis/patch-4

FIX: free product description not printed on receipt
This commit is contained in:
Laurent Destailleur 2019-03-14 14:21:48 +01:00 committed by GitHub
commit 77c69aa155
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -3,6 +3,7 @@
* Copyright (C) 2011 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2012 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2018 Andreu Bisquerra <jove@bisquerra.com>
* Copyright (C) 2019 Josep Lluís Amador <joseplluis@lliuretic.cat>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -84,7 +85,9 @@ print $object->ref;
{
?>
<tr>
<td><?php echo $line->product_label;?></td>
<td><?php if (!empty($line->product_label)) echo $line->product_label;
else echo $line->description;?>
</td>
<td align="right"><?php echo $line->qty;?></td>
<td align="right"><?php echo $line->total_ttc/$line->qty;?></td>
<td align="right"><?php echo price($line->total_ttc);?></td>