diff --git a/pdf/invoice.tpl b/pdf/invoice.tpl index 32dd0ec6e..6993d0a8c 100755 --- a/pdf/invoice.tpl +++ b/pdf/invoice.tpl @@ -98,12 +98,12 @@ - + {if !$tax_excluded_display} - - {/if} - - + + {/if} + + @@ -111,11 +111,11 @@ {cycle values='#FFF,#DDD' assign=bgcolor} - + {if !$tax_excluded_display} - + {/if} - {foreach $order_detail.customizedDatas as $customization} - - + - - - - + + + + + + {/foreach} {/foreach} {/foreach}
{l s='Product / Reference' pdf='true'}{l s='Unit Price' pdf='true'}
{l s='(Tax Excl.)' pdf='true'}
{l s='Unit Price' pdf='true'}{l s='Discount' pdf='true'}{l s='Unit Price' pdf='true'}
{l s='(Tax Excl.)' pdf='true'}
{l s='Unit Price' pdf='true'}{l s='Discount' pdf='true'} {l s='Qty' pdf='true'} {l s='Total' pdf='true'}
{$order_detail.product_name} + {displayPrice currency=$order->id_currency price=$order_detail.unit_price_tax_excl} - {if $tax_excluded_display} @@ -125,13 +125,13 @@ {/if} - {if (isset($order_detail.reduction_amount) && $order_detail.reduction_amount > 0)} - -{displayPrice currency=$order->id_currency price=$order_detail.reduction_amount} - {else if (isset($order_detail.reduction_percent) && $order_detail.reduction_percent > 0)} - -{$order_detail.reduction_percent}% - {else} - -- - {/if} + {if (isset($order_detail.reduction_amount) && $order_detail.reduction_amount > 0)} + -{displayPrice currency=$order->id_currency price=$order_detail.reduction_amount} + {else if (isset($order_detail.reduction_percent) && $order_detail.reduction_percent > 0)} + -{$order_detail.reduction_percent}% + {else} + -- + {/if} {$order_detail.product_quantity} @@ -142,25 +142,27 @@ {/if}
- {foreach $customization.datas as $customization_types} -
- {foreach $customization_types as $customization_infos name=custo_foreach} - {$customization_infos.name}: {$customization_infos.value} - {if !$smarty.foreach.custo_foreach.last}
- {else} -
 
- {/if} + {foreach $order_detail.customizedDatas as $customizationPerAddress} + {foreach $customizationPerAddress as $customizationId => $customization} +
+ {foreach $customization.datas as $customization_types} +
+ {foreach $customization_types as $customization_infos name=custo_foreach} + {$customization_infos.name}: {$customization_infos.value} + {if !$smarty.foreach.custo_foreach.last}
+ {else} +
 
+ {/if} + {/foreach} +
{/foreach} - - {/foreach} -
({$customization.quantity})
({$customization.quantity})
@@ -248,20 +250,20 @@ {if isset($order_invoice->note) && $order_invoice->note}
 
- - - - + + + +
{$order_invoice->note|nl2br}
{$order_invoice->note|nl2br}
{/if} {if isset($HOOK_DISPLAY_PDF)}
 
- - - - + + + +
{$HOOK_DISPLAY_PDF}
{$HOOK_DISPLAY_PDF}
{/if}