From: Sven Schöling <s.schoeling@linet-services.de>
Date: Wed, 3 Mar 2010 10:46:16 +0000 (+0100)
Subject: Merge branch 'master' of ssh://lx-office/~/lx-office-erp
X-Git-Tag: release-2.6.1beta1~44^2~12
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/37d1a0102c52284ab503391f4333545829d904af?hp=b71b35308c2f7c628666e4a69e6c3b90cefc5ed0

Merge branch 'master' of ssh://lx-office/~/lx-office-erp
---

diff --git a/bin/mozilla/ct.pl b/bin/mozilla/ct.pl
index 8abe73a12..b0f72b43a 100644
--- a/bin/mozilla/ct.pl
+++ b/bin/mozilla/ct.pl
@@ -659,20 +659,19 @@ sub get_shipto {
 }
 
 sub get_delivery {
-  $main::lxdebug->enter_sub();
+  $::lxdebug->enter_sub;
 
-  $main::auth->assert('customer_vendor_edit');
-  $main::auth->assert('sales_all_edit');
+  $::auth->assert('customer_vendor_edit');
+  $::auth->assert('sales_all_edit');
 
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
+  CT->get_delivery(\%::myconfig, $::form );
 
-  CT->get_delivery(\%myconfig, \%$form );
-  $form->{IS_CUSTOMER} = $form->{db} eq 'customer';
-
-  print $form->ajax_response_header(), $form->parse_html_template('ct/get_delivery');
+  print $::form->ajax_response_header,
+        $::form->parse_html_template('ct/get_delivery', {
+          is_customer =>  $::form->{db} eq 'customer',
+        });
 
-  $main::lxdebug->leave_sub();
+  $::lxdebug->leave_sub;
 }
 
 sub delete_shipto {
diff --git a/templates/webpages/ct/get_delivery_de.html b/templates/webpages/ct/get_delivery_de.html
index ddfd0750a..b7b1823c7 100644
--- a/templates/webpages/ct/get_delivery_de.html
+++ b/templates/webpages/ct/get_delivery_de.html
@@ -11,13 +11,17 @@
           <th class="listheading">Beschreibung</th>
           <th class="listheading">Menge</th>
           <th class="listheading">Einheit</th>
+[%- IF is_customer %]
           <th class="listheading">Verkaufspreis</th>
+[%- ELSE %]
+          <th class="listheading">Einkaufspreis</th>
+[%- END %]
         </tr>
 [%- FOREACH row = DELIVERY %]
         <tr class="listrow[% loop.count % 2 %]">
           <td>[% HTML.escape(row.shiptoname) UNLESS loop.prev.shiptoname == row.shiptoname %]&nbsp;</td>
-          <td>[% IF row.id %]<a href='[% IF IS_CUSTOMER %]is[% ELSE %]ir[% END %].pl?action=edit&id=[% HTML.escape(row.id) %]'>[% END %][% HTML.escape(row.invnumber)   || '&nbsp;' %][% IF row.id %]</a>[% END %]</td>
-          <td>[% IF row.oe_id %]<a href='oe.pl?action=edit&type=sales_order&vc=customer&id=[% HTML.escape(row.oe_id) %]'>[% END %][% HTML.escape(row.ordnumber)   || '&nbsp;' %][% IF row.oe_id %]</a>[% END %]</td>
+          <td>[% IF row.id %]<a href='[% IF is_customer %]is[% ELSE %]ir[% END %].pl?action=edit&id=[% HTML.escape(row.id) %]'>[% END %][% HTML.escape(row.invnumber)   || '&nbsp;' %][% IF row.id %]</a>[% END %]</td>
+          <td>[% IF row.oe_id %]<a href='oe.pl?action=edit&type=[% IF is_customer %]sales_order[% ELSE %]purchase_order[% END %]&vc=customer&id=[% HTML.escape(row.oe_id) %]'>[% END %][% HTML.escape(row.ordnumber)   || '&nbsp;' %][% IF row.oe_id %]</a>[% END %]</td>
           <td>[% HTML.escape(row.transdate)   || '&nbsp;' %]</td>
           <td>[% HTML.escape(row.description) || '&nbsp;' %]</td>
           <td>[% HTML.escape(row.qty)         || '&nbsp;' %]</td>
diff --git a/templates/webpages/ct/get_delivery_master.html b/templates/webpages/ct/get_delivery_master.html
index 0ca76e103..1d1833c62 100644
--- a/templates/webpages/ct/get_delivery_master.html
+++ b/templates/webpages/ct/get_delivery_master.html
@@ -11,13 +11,17 @@
           <th class="listheading"><translate>Description</translate></th>
           <th class="listheading"><translate>Qty</translate></th>
           <th class="listheading"><translate>Unit</translate></th>
+[%- IF is_customer %]
           <th class="listheading"><translate>Sell Price</translate></th>
+[%- ELSE %]
+          <th class="listheading"><translate>Last Cost</translate></th>
+[%- END %]
         </tr>
 [%- FOREACH row = DELIVERY %]
         <tr class="listrow[% loop.count % 2 %]">
           <td>[% HTML.escape(row.shiptoname) UNLESS loop.prev.shiptoname == row.shiptoname %]&nbsp;</td>
-          <td>[% IF row.id %]<a href='[% IF IS_CUSTOMER %]is[% ELSE %]ir[% END %].pl?action=edit&id=[% HTML.escape(row.id) %]'>[% END %][% HTML.escape(row.invnumber)   || '&nbsp;' %][% IF row.id %]</a>[% END %]</td>
-          <td>[% IF row.oe_id %]<a href='oe.pl?action=edit&type=sales_order&vc=customer&id=[% HTML.escape(row.oe_id) %]'>[% END %][% HTML.escape(row.ordnumber)   || '&nbsp;' %][% IF row.oe_id %]</a>[% END %]</td>
+          <td>[% IF row.id %]<a href='[% IF is_customer %]is[% ELSE %]ir[% END %].pl?action=edit&id=[% HTML.escape(row.id) %]'>[% END %][% HTML.escape(row.invnumber)   || '&nbsp;' %][% IF row.id %]</a>[% END %]</td>
+          <td>[% IF row.oe_id %]<a href='oe.pl?action=edit&type=[% IF is_customer %]sales_order[% ELSE %]purchase_order[% END %]&vc=customer&id=[% HTML.escape(row.oe_id) %]'>[% END %][% HTML.escape(row.ordnumber)   || '&nbsp;' %][% IF row.oe_id %]</a>[% END %]</td>
           <td>[% HTML.escape(row.transdate)   || '&nbsp;' %]</td>
           <td>[% HTML.escape(row.description) || '&nbsp;' %]</td>
           <td>[% HTML.escape(row.qty)         || '&nbsp;' %]</td>