diff --git a/modules/EcmSales/EcmSale.php b/modules/EcmSales/EcmSale.php
index 67f1554b..374363ab 100644
--- a/modules/EcmSales/EcmSale.php
+++ b/modules/EcmSales/EcmSale.php
@@ -1059,6 +1059,16 @@ class EcmSale extends SugarBean
             $result_array[$i]['total_invoice'] = $total_invoice;
             $result_array[$i]['percent'] = $percent;
             $result_array[$i]['currency'] = $r['currency_id'];
+            $result_array[$i]['delivery_name'] = null; 
+            
+            if (strlen($r['shipping_address_name']) > 0) {
+                $result_array[$i]['delivery_name'] = $r['shipping_address_name'];
+                $d = $db->fetchByAssoc($db->query(sprintf("SELECT id, TRIM(name) FROM accounts WHERE name LIKE '%s' AND deleted=0", strtolower(trim($r['shipping_address_name'])))));
+                if ($d && $d['id']) {
+                    $result_array[$i]['delivery_id'] = $d['id']; 
+                }
+            }
+
 
             $i++;
             $sum_total_qty += $total_qty;
diff --git a/modules/EcmSales/tpls/ListNewSales.tpl b/modules/EcmSales/tpls/ListNewSales.tpl
index 7cc18504..225a464e 100644
--- a/modules/EcmSales/tpls/ListNewSales.tpl
+++ b/modules/EcmSales/tpls/ListNewSales.tpl
@@ -1,16 +1,15 @@
-<script type="text/javascript"
-        src="include/ECM/EcmMultiPdf/EcmMultiPdf.js"></script>
-<script type="text/javascript"
-        src="include/jQuery/jquery.blockUI.js"></script>
+<script type="text/javascript" src="include/ECM/EcmMultiPdf/EcmMultiPdf.js"></script>
+<script type="text/javascript" src="include/jQuery/jquery.blockUI.js"></script>
 <table cellspacing="0" cellpadding="0" border="0">
     <tr>
-        <td><img src="themes/Sugar/images/EcmProducts.gif"
-                 style="margin-top: 3px; margin-right: 3px;" alt="EcmProducts"
-                 width="16" border="0" height="16"></td>
-        <td><h2>{$MOD.LBL_LISTNEWSALES_NAME}</h2></td>
+        <td><img src="themes/Sugar/images/EcmProducts.gif" style="margin-top: 3px; margin-right: 3px;" alt="EcmProducts"
+                width="16" border="0" height="16"></td>
+        <td>
+            <h2>{$MOD.LBL_LISTNEWSALES_NAME}</h2>
+        </td>
     </tr>
 </table>
-<br/>
+<br />
 <form action="index.php?module=EcmSales&action=ListNewSales" method="get" name="SearchFormListNewSales">
     <ul class="tablist" style="width:100%;">
         <input type="hidden" name="module" value="EcmSales">
@@ -20,21 +19,21 @@
         </li>
     </ul>
     <table style="border-top: 0px none; margin-bottom: 4px;width:100%" class="tabForm" border="0" cellpadding="0"
-           cellspacing="0">
+        cellspacing="0">
         <tr>
             <td nowrap="">
                 Data wysyłki od
             </td>
             <td nowrap="">
                 <input type="text" maxlength="10" size="11" tabindex="" title=""
-                       value="{if $POST.date_send_from!=''}{$POST.date_send_from}{else}{$smarty.now|date_format:"%d.%m.%Y"}{/if}" id="date_send_from"
-                       name="date_send_from" autocomplete="off">
+                    value="{if $POST.date_send_from!=''}{$POST.date_send_from}{else}{$smarty.now|date_format:"%d.%m.%Y"}{/if}"
+                    id="date_send_from" name="date_send_from" autocomplete="off">
                 <img align="absmiddle" border="0" id="date_send_from_trigger" name="date_send_from_trigger"
-                     alt="Enter Date" src="themes/default/images/jscalendar.gif">
+                    alt="Enter Date" src="themes/default/images/jscalendar.gif">
                 <script type="text/javascript">
                     {literal}
-                    // musi być tu w pliku js nie chce działać
-                    Calendar.setup({
+                        // musi być tu w pliku js nie chce działać
+                        Calendar.setup({
                             inputField: "date_send_from",
                             daFormat: "%d.%m.%Y",
                             button: "date_send_from_trigger",
@@ -42,22 +41,21 @@
                             dateStr: "",
                             step: 1,
                             weekNumbers: false
-                        }
-                    );
+                        });
                     {/literal}
                 </script>
 
                 {$MOD.LBL_LISTNEWSALES_DATE_END}:
 
                 <input type="text" maxlength="10" size="11" tabindex="" title=""
-                       value="{if $POST.date_send_to!=''}{$POST.date_send_to}{else}{$smarty.now|date_format:"%d.%m.%Y"}{/if}" id="date_send_to"
-                       name="date_send_to" autocomplete="off">
+                    value="{if $POST.date_send_to!=''}{$POST.date_send_to}{else}{$smarty.now|date_format:"%d.%m.%Y"}{/if}"
+                    id="date_send_to" name="date_send_to" autocomplete="off">
                 <img align="absmiddle" border="0" id="date_send_to_trigger" name="date_send_to_trigger" alt="Enter Date"
-                     src="themes/default/images/jscalendar.gif">
+                    src="themes/default/images/jscalendar.gif">
                 <script type="text/javascript">
                     {literal}
-                    // musi być tu w pliku js nie chce działać
-                    Calendar.setup({
+                        // musi być tu w pliku js nie chce działać
+                        Calendar.setup({
                             inputField: "date_send_to",
                             daFormat: "%d.%m.%Y",
                             button: "date_send_to_trigger",
@@ -65,8 +63,7 @@
                             dateStr: "",
                             step: 1,
                             weekNumbers: false
-                        }
-                    );
+                        });
                     {/literal}
                 </script>
             </td>
@@ -74,7 +71,8 @@
             <td rowspan="2">
                 <select id="sale_type" name="sale_type[]" multiple="true">
                     {foreach from=$SALE_TYPES key="key" item="value" name="sale_types"}
-                        <option {if in_array($key, $SELECTED_TYPES)}selected="selected" {/if} value="{$key}">{$value}</option>
+                        <option {if in_array($key, $SELECTED_TYPES)}selected="selected" {/if} value="{$key}">{$value}
+                        </option>
                     {/foreach}
                 </select>
             </td>
@@ -82,7 +80,8 @@
             <td rowspan="2">
                 <select id="sale_status" name="sale_status[]" multiple="true">
                     {foreach from=$SALE_STATUSES key="key" item="value" name="sale_statuses"}
-                        <option {if in_array($key, $SELECTED_STATUSES)}selected="selected" {/if} value="{$key}">{$value}</option>
+                        <option {if in_array($key, $SELECTED_STATUSES)}selected="selected" {/if} value="{$key}">{$value}
+                        </option>
                     {/foreach}
                 </select>
             </td>
@@ -91,17 +90,17 @@
             </td>
             <td nowrap="">
                 <input type="text" title="" value="{if $POST.account_name!=''}{$POST.account_name}{/if}" size=""
-                       id="account_name" tabindex="" name="account_name">
+                    id="account_name" tabindex="" name="account_name">
                 <input type="hidden" value="{if $POST.account_id!=''}{$POST.account_id}{/if}" id="account_id"
-                       name="account_id">
+                    name="account_id">
                 <input type="button"
-                       onclick="{literal}open_popup(&quot;Accounts&quot;, 600, 400, &quot;&quot;, true, false, {&quot;call_back_function&quot;:&quot;set_return&quot;,&quot;form_name&quot;:&quot;SearchFormListNewSales&quot;,&quot;field_to_name_array&quot;:{&quot;id&quot;:&quot;account_id&quot;,&quot;name&quot;:&quot;account_name&quot;}}, &quot;single&quot;, true);{/literal}"
-                       value="Wybierz" class="button" accesskey="T" title="Select [Alt+T]" tabindex=""
-                       name="btn_account_name">
+                    onclick="{literal}open_popup(&quot;Accounts&quot;, 600, 400, &quot;&quot;, true, false, {&quot;call_back_function&quot;:&quot;set_return&quot;,&quot;form_name&quot;:&quot;SearchFormListNewSales&quot;,&quot;field_to_name_array&quot;:{&quot;id&quot;:&quot;account_id&quot;,&quot;name&quot;:&quot;account_name&quot;}}, &quot;single&quot;, true);{/literal}"
+                    value="Wybierz" class="button" accesskey="T" title="Select [Alt+T]" tabindex=""
+                    name="btn_account_name">
                 <button value="Wyczyść" onclick="this.form.account_name.value = ''; this.form.account_id.value = '';"
-                        class="button lastChild" accesskey="C" title="Wyczyść[Alt+C]" tabindex=""
-                        name="btn_clr_parent_name_basic" type="button"><img
-                            src="themes/default/images/id-ff-clear.png?s=bed8cd35065048ceebdc639ebe305e2c&amp;c=1">
+                    class="button lastChild" accesskey="C" title="Wyczyść[Alt+C]" tabindex=""
+                    name="btn_clr_parent_name_basic" type="button"><img
+                        src="themes/default/images/id-ff-clear.png?s=bed8cd35065048ceebdc639ebe305e2c&amp;c=1">
                 </button>
             </td>
 
@@ -118,14 +117,14 @@
             </td>
             <td nowrap="">
                 <input type="text" maxlength="10" size="11" tabindex="" title=""
-                       value="{if $POST.date_from!=''}{$POST.date_from}{/if}"
-                       id="date_from" name="date_from" autocomplete="off">
+                    value="{if $POST.date_from!=''}{$POST.date_from}{/if}" id="date_from" name="date_from"
+                    autocomplete="off">
                 <img align="absmiddle" border="0" id="date_from_trigger" name="date_from_trigger" alt="Enter Date"
-                     src="themes/default/images/jscalendar.gif">
+                    src="themes/default/images/jscalendar.gif">
                 <script type="text/javascript">
                     {literal}
-                    // musi być tu w pliku js nie chce działać
-                    Calendar.setup({
+                        // musi być tu w pliku js nie chce działać
+                        Calendar.setup({
                             inputField: "date_from",
                             daFormat: "%d.%m.%Y",
                             button: "date_from_trigger",
@@ -133,20 +132,18 @@
                             dateStr: "",
                             step: 1,
                             weekNumbers: false
-                        }
-                    );
+                        });
                     {/literal}
                 </script>
                 do:
                 <input type="text" maxlength="10" size="11" tabindex="" title=""
-                       value="{if $POST.date_to!=''}{$POST.date_to}{/if}"
-                       id="date_to" name="date_to" autocomplete="off">
+                    value="{if $POST.date_to!=''}{$POST.date_to}{/if}" id="date_to" name="date_to" autocomplete="off">
                 <img align="absmiddle" border="0" id="date_to_trigger" name="date_to_trigger" alt="Enter Date"
-                     src="themes/default/images/jscalendar.gif">
+                    src="themes/default/images/jscalendar.gif">
                 <script type="text/javascript">
                     {literal}
-                    // musi być tu w pliku js nie chce działać
-                    Calendar.setup({
+                        // musi być tu w pliku js nie chce działać
+                        Calendar.setup({
                             inputField: "date_to",
                             daFormat: "%d.%m.%Y",
                             button: "date_to_trigger",
@@ -154,8 +151,7 @@
                             dateStr: "",
                             step: 1,
                             weekNumbers: false
-                        }
-                    );
+                        });
                     {/literal}
                 </script>
             </td>
@@ -164,169 +160,180 @@
             </td>
             <td nowrap="">
                 <input type="text" value="{if $POST.parent_order_no!=''}{$POST.parent_order_no}{/if}"
-                       name="parent_order_no">
+                    name="parent_order_no">
             </td>
         </tr>
 
     </table>
 
-    <h3 style="color:red">{if $POST.date_send_from!='' && $POST.date_from!=''}Proszę wybrać date dostawy lub datę wysyłki{/if}</h3>
+    <h3 style="color:red">{if $POST.date_send_from!='' && $POST.date_from!=''}Proszę wybrać date dostawy lub datę
+        wysyłki{/if}</h3>
     <input type="hidden" id="idss" value="">
     <input type="submit" value="{$MOD.LBL_LISTNEWSALES_POST}" name="submit" class="button">
     <input type="button" onclick="location.href='index.php?module=EcmSales&amp;action=ListNewSales';"
-           value="{$MOD.LBL_LISTNEWSALES_CLEAR}" name="clear" class="button">
+        value="{$MOD.LBL_LISTNEWSALES_CLEAR}" name="clear" class="button">
     <input type="button" id="gets" class="button" name="gets" value="{$MOD.LBL_LISTNEWSALES_CREATE_PDFS}"
-           onclick="createMultiPdf()">
+        onclick="createMultiPdf()">
     <input type="button" id="products_list" class="button" name="products_list"
-           value="{$MOD.LBL_LISTNEWSALES_PRODUCT_SUMMARY}" onclick="getSelected(); getList();">
+        value="{$MOD.LBL_LISTNEWSALES_PRODUCT_SUMMARY}" onclick="getSelected(); getList();">
     <input type="button" id="products_list" class="button" name="products_list"
-           value="{$MOD.LBL_LISTNEWSALES_PRODUCT_SUMMARY} 2" onclick="getSelected(); getList2();">
+        value="{$MOD.LBL_LISTNEWSALES_PRODUCT_SUMMARY} 2" onclick="getSelected(); getList2();">
     <input type="button" id="products_list" class="button" name="products_list" value="Lista komponentów"
-           onclick="getSelected(); getList3();">
+        onclick="getSelected(); getList3();">
     <br>{if $LINK!=''}<a href="https://95.50.148.50/crm/pdftmp/{$LINK}">{$LINK}</a>{/if}
 
     <table cellspacing="0" cellpadding="0" border="0" style="width:100%;" id="myTable" class="tablesorter">
         <thead>
-        <tr>
-            <th><input type="checkbox" name="selectall" id="selectall"></th>
-            <th>{$MOD.LBL_LISTNEWSALES_POS}</th>
-            <th>{$MOD.LBL_LISTNEWSALES_NUMBER}</th>
-            <th>{$MOD.LBL_LISTNEWSALES_DESCRIPTION}</th>
-            <th>{$MOD.LBL_LISTNEWSALES_PARENT_NAME}</th>
-            <th>{$MOD.LBL_LISTNEWSALES_DELIVERY_DATE}</th>
-            <th></th>
-            <th>Termin wysyłki</th>
-            <th>{$MOD.LBL_LISTNEWSALES_QUANTITY}</th>
-            <th>{$MOD.LBL_LISTNEWSALES_TOTAL_NETTO}</th>
-            <th>{$MOD.LBL_LISTNEWSALES_TOTAL_VAT}</th>
-            <th>{$MOD.LBL_LISTNEWSALES_TOTAL_BRUTTO}</th>
-            <th>{$MOD.LBL_LISTNEWSALES_TOTAL_INVOICE}</th>
-            <th>{$MOD.LBL_LISTNEWSALES_PERCENT}</th>
-            <th>{$MOD.LBL_LISTNEWSALES_CURRENCY}</th>
-            <th>{$MOD.LBL_LISTNEWSALES_PRINTED}</th>
-            <td>&nbsp;</td>
-        </tr>
+            <tr>
+                <th><input type="checkbox" name="selectall" id="selectall"></th>
+                <th>{$MOD.LBL_LISTNEWSALES_POS}</th>
+                <th>{$MOD.LBL_LISTNEWSALES_NUMBER}</th>
+                <th>{$MOD.LBL_LISTNEWSALES_DESCRIPTION}</th>
+                <th>{$MOD.LBL_LISTNEWSALES_PARENT_NAME}</th>
+                <th>{$MOD.LBL_LISTNEWSALES_DELIVERY_DATE}</th>
+                <th></th>
+                <th>Termin wysyłki</th>
+                <th>{$MOD.LBL_LISTNEWSALES_QUANTITY}</th>
+                <th>{$MOD.LBL_LISTNEWSALES_TOTAL_NETTO}</th>
+                <th>{$MOD.LBL_LISTNEWSALES_TOTAL_VAT}</th>
+                <th>{$MOD.LBL_LISTNEWSALES_TOTAL_BRUTTO}</th>
+                <th>{$MOD.LBL_LISTNEWSALES_TOTAL_INVOICE}</th>
+                <th>{$MOD.LBL_LISTNEWSALES_PERCENT}</th>
+                <th>{$MOD.LBL_LISTNEWSALES_CURRENCY}</th>
+                <th>{$MOD.LBL_LISTNEWSALES_PRINTED}</th>
+                <td>&nbsp;</td>
+            </tr>
         </thead>
         <tbody>
-        {foreach from=$POSITION_LIST key="key" item="item" name="components"}
-            {if $item.id!=''}
-                <tr style="vertical-align:top;">
-                    <td><input type="checkbox" value="{$item.id}" class="make_pdf" id="make_pdf_{$item.position}"
-                               name="selectedid[]"></td>
-                    <td>{$item.position}</td>
-                    <td data-price="{$item.number}"><a
+            {foreach from=$POSITION_LIST key="key" item="item" name="components"}
+                {if $item.id!=''}
+                    <tr style="vertical-align:top;">
+                        <td><input type="checkbox" value="{$item.id}" class="make_pdf" id="make_pdf_{$item.position}"
+                                name="selectedid[]"></td>
+                        <td>{$item.position}</td>
+                        <td data-price="{$item.number}"><a
                                 href="index.php?module=EcmSales&action=DetailView&record={$item.id}">{$item.document_no}</a>
-                    </td>
-                    <td></td>
-                    <td>
-                        <a href="index.php?module=Accounts&action=DetailView&record={$item.parent_id}">{$item.parent_name}</a>
-                    </td>
-                    <td>{$item.delivery_date}</td>
-                    <td><input type="checkbox" {if $item.send_accepted==true}checked="checked" {/if}
-                               disabled="disabled"></td>
-                    <td>{$item.send_date} </td>
-                    <td style="text-align: right">{$item.quantity}</td>
-                    <td data-total="{$item.total_netto}"
-                        style="text-align: right">{$item.total_netto|number_format:2:".":","}</td>
-                    <td data-total="{$item.total_vat}"
-                        style="text-align: right">{$item.total_vat|number_format:2:".":","}</td>
-                    <td data-total="{$item.total_brutto}"
-                        style="text-align: right">{$item.total_brutto|number_format:2:".":","}</td>
-                    <td data-total="{$item.total_invoice}"
-                        style="text-align: right">{$item.total_invoice|number_format:2:".":","}</td>
-                    <td style="text-align: right">{$item.percent}<a style="cursor:pointer;"
-                                                                    onclick="{literal}if(document.getElementById('div{/literal}{$item.id}{literal}').style.display=='none'){document.getElementById('div{/literal}{$item.id}{literal}').style.display='block';}else{document.getElementById('{/literal}div{$item.id}{literal}').style.display='none';}{/literal} "><img
+                        </td>
+                        <td></td>
+                        <td>
+                            <a
+                                href="index.php?module=Accounts&action=DetailView&record={$item.parent_id}">{$item.parent_name}</a>
+                            {if $item.delivery_name}
+                                {if $item.delivery_id}
+                                    &nbsp;(<a
+                                        href="index.php?module=Accounts&action=DetailView&record={$item.delivery_id}">{$item.delivery_name}</a>)
+                                {else}
+                                    &nbsp;({$item.delivery_name})
+                                {/if}
+                            {/if}
+                        </td>
+                        <td>{$item.delivery_date}</td>
+                        <td><input type="checkbox" {if $item.send_accepted==true}checked="checked" {/if} disabled="disabled">
+                        </td>
+                        <td>{$item.send_date} </td>
+                        <td style="text-align: right">{$item.quantity}</td>
+                        <td data-total="{$item.total_netto}" style="text-align: right">
+                            {$item.total_netto|number_format:2:".":","}</td>
+                        <td data-total="{$item.total_vat}" style="text-align: right">{$item.total_vat|number_format:2:".":","}
+                        </td>
+                        <td data-total="{$item.total_brutto}" style="text-align: right">
+                            {$item.total_brutto|number_format:2:".":","}</td>
+                        <td data-total="{$item.total_invoice}" style="text-align: right">
+                            {$item.total_invoice|number_format:2:".":","}</td>
+                        <td style="text-align: right">{$item.percent}<a style="cursor:pointer;"
+                                onclick="{literal}if(document.getElementById('div{/literal}{$item.id}{literal}').style.display=='none'){document.getElementById('div{/literal}{$item.id}{literal}').style.display='block';}else{document.getElementById('{/literal}div{$item.id}{literal}').style.display='none';}{/literal} "><img
                                     border="0" src="modules/EcmQuotes/images/search.gif"></a>
-                        <div style="display:none; border: 1px solid #cccccc;background-color:#e6e6e6;padding:3px;"
-                             id="div{$item.id}">
-                            <table cellspacing="0" cellpadding="3" border="0">
-                                <tbody>
-                                <tr>
-                                    <td width="40%"><strong>Index</strong></td>
-                                    <td><strong>Order</strong></td>
-                                    <td><strong>WZ</strong></td>
-                                    <td><strong>ETA</strong></td>
-                                </tr>
-                                {foreach from=$item.products key="ki" item="va" name="products"}
-                                    {if $va.code!=''}
-                                        <tr style="color:black;">
-                                            <td style="color:black;"><a
-                                                        href="index.php?module=EcmProducts&amp;action=DetailView&amp;record={$va.id}">{$va.code}</a>
-                                            </td>
-                                            {if $va.order>$va.wz}
-                                                <td style="color:red;">{$va.order|number_format:2:".":","}</td>
-                                                <td style="color:red;">{$va.wz|number_format:2:".":","}</td>
-                                            {else}
-                                                <td style="color:black;">{$va.order|number_format:2:".":","}</td>
-                                                <td style="color:black;">{$va.wz|number_format:2:".":","}</td>
-                                            {/if}
-                                            <td style="color:black;"></td>
+                            <div style="display:none; border: 1px solid #cccccc;background-color:#e6e6e6;padding:3px;"
+                                id="div{$item.id}">
+                                <table cellspacing="0" cellpadding="3" border="0">
+                                    <tbody>
+                                        <tr>
+                                            <td width="40%"><strong>Index</strong></td>
+                                            <td><strong>Order</strong></td>
+                                            <td><strong>WZ</strong></td>
+                                            <td><strong>ETA</strong></td>
                                         </tr>
-                                    {/if}
-                                {/foreach}
+                                        {foreach from=$item.products key="ki" item="va" name="products"}
+                                            {if $va.code!=''}
+                                                <tr style="color:black;">
+                                                    <td style="color:black;"><a
+                                                            href="index.php?module=EcmProducts&amp;action=DetailView&amp;record={$va.id}">{$va.code}</a>
+                                                    </td>
+                                                    {if $va.order>$va.wz}
+                                                        <td style="color:red;">{$va.order|number_format:2:".":","}</td>
+                                                        <td style="color:red;">{$va.wz|number_format:2:".":","}</td>
+                                                    {else}
+                                                        <td style="color:black;">{$va.order|number_format:2:".":","}</td>
+                                                        <td style="color:black;">{$va.wz|number_format:2:".":","}</td>
+                                                    {/if}
+                                                    <td style="color:black;"></td>
+                                                </tr>
+                                            {/if}
+                                        {/foreach}
 
-                                <tr style="color:black;font-weight:bold">
-                                    <td>Total</td>
-                                    <td>{$item.products.order_total|number_format:2:".":","}</td>
-                                    <td>{$item.products.wz_total|number_format:2:".":","}</td>
-                                </tr>
-                                <tr>
-                                    <td></td>
-                                    <td></td>
-                                    <td>
-                                        <span style="color:red;font-weight:bold">{$item.products.minus|number_format:2:".":","}</span>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td></td>
-                                    <td></td>
-                                    <td>
-                                        <span style="color:green;font-weight:bold">{$item.products.plus|number_format:2:".":","}</span>
-                                    </td>
-                                </tr>
-                                </tbody>
-                            </table>
-                        </div>
-                    </td>
-                    <td style="text-align: right">{$CURRENCIES[$item.currency]}</td>
-                    <td></td>
-                    <td>
-                        {if $item.type!='gratis'}
-                            {if $item.fv_switch=='yes'}<img border="0" id="convert_to_invoice_{$item.id}"
-                                                            src="modules/EcmSales/images/convert_disabled.gif"
-                                                            title="{$item.fv_name}" style="cursor:pointer;"
-                                                            onClick="{literal}javascript:window.open('index.php?module=EcmInvoiceOuts&action=DetailView&record={/literal}{$item.fv_id}{literal}','_newtab');{/literal} "  />'{/if}
-                            {if $item.fv_switch=='no'}<img border="0" id="convert_to_invoice_{$item.id}"
-                                                           src="modules/EcmSales/images/convert_enabled.gif"
-                                                           title="Create Invoice"
-                                                           onClick="{literal}javascript:window.open('index.php?module=EcmInvoiceOuts&action=EditView&isWZ=true&wz_record={/literal}{$item.fv_id}{literal}','_newtab');{/literal}"
-                                                           style="cursor:pointer;" />{/if}
-                            {if $item.wz_switch=='disabled'}<img src="modules/EcmSales/images/create_wz_disabled.gif"
-                                                                 title="{$item.wz_name}"
-                                                                 onclick="{literal}window.open('index.php?module=EcmStockDocOuts&action=DetailView&record={/literal}{$item.wz_id}{literal}','_newtab');{/literal}"
-                                                                 style="cursor: pointer;" border="0">&nbsp;{/if}
-                            {if $item.wz_switch=='enabled'}<img src="modules/EcmSales/images/create_wz_enabled.gif"
-                                                                title="{$MOD.LBL_LISTNEWSALES_CREATEWZ}"
-                                                                onclick="{literal}javascript:window.open('index.php?module=EcmStockDocOuts&amp;action=EditView&parent_doc_type=EcmSales&parent_doc_id={/literal}{$item.id}{literal}','_newtab');{/literal}"
-                                                                style="cursor: pointer;" border="0">{/if}
-                        {else}
-                            {if $item.rw_switch=='disabled'}<img src="modules/EcmSales/images/create_wz_disabled.gif"
-                                                                 title="{$item.rw_name}"
-                                                                 onclick="{literal}window.open('index.php?module=EcmStockDocInsideOuts&action=DetailView&record={/literal}{$item.rw_id}{literal}','_newtab');{/literal}"
-                                                                 style="cursor: pointer;" border="0">&nbsp;{/if}
-                            {if $item.rw_switch=='enabled'}<img src="modules/EcmSales/images/create_wz_enabled.gif"
-                                                                title="{$MOD.LBL_LISTNEWSALES_CREATERW}"
-                                                                onclick="{literal}javascript:window.open('index.php?module=EcmStockDocInsideOuts&amp;action=EditView&parent_doc_type=EcmSales&parent_doc_id={/literal}{$item.id}{literal}','_newtab');{/literal}"
-                                                                style="cursor: pointer;" border="0">{/if}
-                        {/if}
-                        <img src="modules/EcmSales/images/pdf.gif" title="Preview Sale"
-                             onclick="{literal}EcmPreviewPDF('index.php?module=EcmSales&action=previewPDF&method=I&record={$item.id}&to_pdf=1',{zoom:75,toolbar:1});{/literal}"
-                             style="cursor: pointer;" border="0">
-                    </td>
-                </tr>
+                                        <tr style="color:black;font-weight:bold">
+                                            <td>Total</td>
+                                            <td>{$item.products.order_total|number_format:2:".":","}</td>
+                                            <td>{$item.products.wz_total|number_format:2:".":","}</td>
+                                        </tr>
+                                        <tr>
+                                            <td></td>
+                                            <td></td>
+                                            <td>
+                                                <span
+                                                    style="color:red;font-weight:bold">{$item.products.minus|number_format:2:".":","}</span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td></td>
+                                            <td></td>
+                                            <td>
+                                                <span
+                                                    style="color:green;font-weight:bold">{$item.products.plus|number_format:2:".":","}</span>
+                                            </td>
+                                        </tr>
+                                    </tbody>
+                                </table>
+                            </div>
+                        </td>
+                        <td style="text-align: right">{$CURRENCIES[$item.currency]}</td>
+                        <td></td>
+                        <td>
+                            {if $item.type!='gratis'}
+                                {if $item.fv_switch=='yes'}<img border="0" id="convert_to_invoice_{$item.id}"
+                                        src="modules/EcmSales/images/convert_disabled.gif" title="{$item.fv_name}"
+                                        style="cursor:pointer;"
+                                        onClick="{literal}javascript:window.open('index.php?module=EcmInvoiceOuts&action=DetailView&record={/literal}{$item.fv_id}{literal}','_newtab');{/literal} " />'{/if}
+                    {if $item.fv_switch=='no'}<img border="0" id="convert_to_invoice_{$item.id}"
+                        src="modules/EcmSales/images/convert_enabled.gif" title="Create Invoice"
+                        onClick="{literal}javascript:window.open('index.php?module=EcmInvoiceOuts&action=EditView&isWZ=true&wz_record={/literal}{$item.fv_id}{literal}','_newtab');{/literal}"
+                        style="cursor:pointer;" />{/if}
+                    {if $item.wz_switch=='disabled'}<img src="modules/EcmSales/images/create_wz_disabled.gif"
+                        title="{$item.wz_name}"
+                        onclick="{literal}window.open('index.php?module=EcmStockDocOuts&action=DetailView&record={/literal}{$item.wz_id}{literal}','_newtab');{/literal}"
+                        style="cursor: pointer;" border="0">&nbsp;{/if}
+                    {if $item.wz_switch=='enabled'}<img src="modules/EcmSales/images/create_wz_enabled.gif"
+                        title="{$MOD.LBL_LISTNEWSALES_CREATEWZ}"
+                        onclick="{literal}javascript:window.open('index.php?module=EcmStockDocOuts&amp;action=EditView&parent_doc_type=EcmSales&parent_doc_id={/literal}{$item.id}{literal}','_newtab');{/literal}"
+                        style="cursor: pointer;" border="0">{/if}
+                    {else}
+                    {if $item.rw_switch=='disabled'}<img src="modules/EcmSales/images/create_wz_disabled.gif"
+                        title="{$item.rw_name}"
+                        onclick="{literal}window.open('index.php?module=EcmStockDocInsideOuts&action=DetailView&record={/literal}{$item.rw_id}{literal}','_newtab');{/literal}"
+                        style="cursor: pointer;" border="0">&nbsp;{/if}
+                    {if $item.rw_switch=='enabled'}<img src="modules/EcmSales/images/create_wz_enabled.gif"
+                        title="{$MOD.LBL_LISTNEWSALES_CREATERW}"
+                        onclick="{literal}javascript:window.open('index.php?module=EcmStockDocInsideOuts&amp;action=EditView&parent_doc_type=EcmSales&parent_doc_id={/literal}{$item.id}{literal}','_newtab');{/literal}"
+                        style="cursor: pointer;" border="0">{/if}
+                    {/if}
+                    <img src="modules/EcmSales/images/pdf.gif" title="Preview Sale"
+                        onclick="{literal}EcmPreviewPDF('index.php?module=EcmSales&action=previewPDF&method=I&record={$item.id}&to_pdf=1',{zoom:75,toolbar:1});{/literal}"
+                        style="cursor: pointer;" border="0">
+                </td>
+            </tr>
             {/if}
 
-        {/foreach}
+            {/foreach}
         </tbody>
         <tr style="vertical-align:top;">
             <td></td>
@@ -343,56 +350,58 @@
             <td style="text-align: right">{$POSITION_LIST.total_brutto|number_format:2:".":","}</td>
             <td style="text-align: right">{$POSITION_LIST.total_invoice|number_format:2:".":","}</td>
             <td style="text-align: right">{$POSITION_LIST.total_percent|string_format:"%.2f"}%<a style="cursor:pointer;"
-                                                                                                 onclick="{literal}if(document.getElementById('div_all').style.display=='none'){document.getElementById('div_all').style.display='block';}else{document.getElementById('div_all').style.display='none';}{/literal}"><img
-                            border="0" src="modules/EcmQuotes/images/search.gif"></a>
+                    onclick="{literal}if(document.getElementById('div_all').style.display=='none'){document.getElementById('div_all').style.display='block';}else{document.getElementById('div_all').style.display='none';}{/literal}"><img
+                        border="0" src="modules/EcmQuotes/images/search.gif"></a>
                 <div style="display:none; border: 1px solid #cccccc;background-color:#e6e6e6;padding:3px;" id="div_all">
                     <table cellspacing="0" cellpadding="3" border="0">
                         <tbody>
-                        <tr>
-                            <td width="40%"><strong>Index</strong></td>
-                            <td><strong>Order</strong></td>
-                            <td><strong>WZ</strong></td>
-                            <td><strong>ETA</strong></td>
-                            {foreach from=$POSITION_LIST.total_product key="ki" item="va" name="products"}
-                            {if $va.code!=''}
+                            <tr>
+                                <td width="40%"><strong>Index</strong></td>
+                                <td><strong>Order</strong></td>
+                                <td><strong>WZ</strong></td>
+                                <td><strong>ETA</strong></td>
+                                {foreach from=$POSITION_LIST.total_product key="ki" item="va" name="products"}
+                                {if $va.code!=''}
 
 
-                        <tr style="color:black;">
-                            <td style="color:black;"><a
-                                        href="index.php?module=EcmProducts&amp;action=DetailView&amp;record={$va.id}">{$va.code}</a>
-                            </td>
-                            {if $va.order>$va.wz}
-                                <td style="color:red;">{$va.order|number_format:2:".":","}</td>
-                                <td style="color:red;">{$va.wz|number_format:2:".":","}</td>
-                            {else}
-                                <td style="color:black;">{$va.order|number_format:2:".":","}</td>
-                                <td style="color:black;">{$va.wz|number_format:2:".":","}</td>
-                            {/if}
-                            <td style="color:black;"></td>
-                        </tr>
-                        {/if}
-                        {/foreach}
-                        <tr style="color:black;font-weight:bold">
-                            <td>Total</td>
-                            <td>{$POSITION_LIST.total_product.order_total|number_format:2:".":","}</td>
-                            <td>{$POSITION_LIST.total_product.wz_total|number_format:2:".":","}</td>
-                        </tr>
-                        <tr>
-                            <td></td>
-                            <td></td>
-                            <td>
-                                <span style="color:red;font-weight:bold">{$POSITION_LIST.total_product.minus|number_format:2:".":","}</span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td></td>
-                            <td></td>
-                            <td>
-                                <span style="color:green;font-weight:bold">{$POSITION_LIST.total_product.plus|number_format:2:".":","}</span>
-                            </td>
-                        </tr>
-                        </tbody>
-                    </table>
-                </div>
+                                            <tr style="color:black;">
+                                                <td style="color:black;"><a
+                                                        href="index.php?module=EcmProducts&amp;action=DetailView&amp;record={$va.id}">{$va.code}</a>
+                                                </td>
+                                                {if $va.order>$va.wz}
+                                                    <td style="color:red;">{$va.order|number_format:2:".":","}</td>
+                                                    <td style="color:red;">{$va.wz|number_format:2:".":","}</td>
+                                                {else}
+                                                    <td style="color:black;">{$va.order|number_format:2:".":","}</td>
+                                                    <td style="color:black;">{$va.wz|number_format:2:".":","}</td>
+                                                {/if}
+                                                <td style="color:black;"></td>
+                                            </tr>
+                                        {/if}
+                                    {/foreach}
+                                    <tr style="color:black;font-weight:bold">
+                                        <td>Total</td>
+                                        <td>{$POSITION_LIST.total_product.order_total|number_format:2:".":","}</td>
+                                        <td>{$POSITION_LIST.total_product.wz_total|number_format:2:".":","}</td>
+                                    </tr>
+                                    <tr>
+                                        <td></td>
+                                        <td></td>
+                                        <td>
+                                            <span
+                                                style="color:red;font-weight:bold">{$POSITION_LIST.total_product.minus|number_format:2:".":","}</span>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td></td>
+                                        <td></td>
+                                        <td>
+                                            <span
+                                                style="color:green;font-weight:bold">{$POSITION_LIST.total_product.plus|number_format:2:".":","}</span>
+                                        </td>
+                                    </tr>
+                                </tbody>
+                            </table>
+                        </div>
 
-    </table>
\ No newline at end of file
+        </table>
\ No newline at end of file