[Lx-office-svn] kivitendo ERP, branch payment updated. release-3.1.0-738-gde7f1fb

[G. R. <m.b...@li...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "kivitendo ERP".

The branch payment has been updated
       via  de7f1fb9e6df2ac26c3dc28cfaf4e51dfd428a87 (commit)
       via  c35a4ea5ebccfe68d2c5febb44966817de7920ce (commit)
      from  921c80b70b6729218946051af363ad76f0afa832 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit de7f1fb9e6df2ac26c3dc28cfaf4e51dfd428a87
Author: G. Richardson <inf...@ki...>
Date:   Wed Dec 10 17:25:08 2014 +0100

    Alternativer Zahlungscontroller - Einkauf verbessert
    
    * Lieferant statt Kunde anzeigen im Menü Header anzeigen
    * skonto_percent in Skonto Information richtig verwenden

commit c35a4ea5ebccfe68d2c5febb44966817de7920ce
Author: G. Richardson <inf...@ki...>
Date:   Wed Dec 10 17:22:57 2014 +0100

    Payment helper - percent_storno für EK korrigiert

-----------------------------------------------------------------------

Summary of changes:
 SL/DB/Helper/Payment.pm                        | 4 ++--
 templates/webpages/payments/_invoice_list.html | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

Full change list:
diff --git a/SL/DB/Helper/Payment.pm b/SL/DB/Helper/Payment.pm
index 4f6e34d..f417ac9 100644
--- a/SL/DB/Helper/Payment.pm
+++ b/SL/DB/Helper/Payment.pm
@@ -343,8 +343,8 @@ sub percent_skonto {
     $percent_skonto = $self->payment_terms->percent_skonto;
   } else {
     return undef unless ref $self->vendor->payment_terms;
-    return undef unless $self->vendor->payment_terms->terms_skonto > 0;
-    $percent_skonto = $self->vendor->payment_terms->terms_skonto / 100;
+    return undef unless $self->vendor->payment_terms->percent_skonto > 0;
+    $percent_skonto = $self->vendor->payment_terms->percent_skonto;
   };
 
   return $percent_skonto;
diff --git a/templates/webpages/payments/_invoice_list.html b/templates/webpages/payments/_invoice_list.html
index 30091a5..20bbf5b 100644
--- a/templates/webpages/payments/_invoice_list.html
+++ b/templates/webpages/payments/_invoice_list.html
@@ -6,7 +6,7 @@
  <tr class="listheading">
   <th>[%- LxERP.t8("Invoice number") %]</th>
   <th>[%- LxERP.t8("Type") %]</th>
-  <th>[%- LxERP.t8("Customer") %]</th>
+  <th>[%- IF vc == 'customer' %] [%- LxERP.t8("Customer") %] [%- ELSE %] [%- LxERP.t8("Vendor") %] [%- END %]</th>
   <th>[%- LxERP.t8("Amount") %]</th>
   <th>[%- LxERP.t8("Paid") %]</th>
   <th>[%- LxERP.t8("Open") %]</th>
@@ -40,7 +40,7 @@
   <td align="right" >  [% L.input_tag('pay_amount_' _ loop.count, LxERP.format_amount(invoice.invoice_amount_suggestion, 2), size=10) %]</td>
   <td> [% L.select_tag('payment_type_' _ loop.count, invoice.payment_select_options, value_key => 'payment_type', title_key => 'display', id => 'payment_type_' _ loop.count, class => 'payment_type_selector' ) %]</td>
   <td> [% L.button_tag("pay_invoice(" _ loop.count _ ")", LxERP.t8("Pay amount")) %]</td>
-  <td align="left" [%- IF invoice.within_skonto_period %]style="background-color: LightGreen"[%- END %]>[%- IF invoice.skonto_date %][% LxERP.format_amount(invoice.payment_terms.percent_skonto * 100, 2) %] % = [% LxERP.format_amount(invoice.skonto_amount,2) %] [% LxERP.t8("Valid until") %] [% invoice.skonto_date.to_kivitendo %] ([% invoice.remaining_skonto_days %]) [%- END %]</td>
+  <td align="left" [%- IF invoice.within_skonto_period %]style="background-color: LightGreen"[%- END %]>[%- IF invoice.skonto_date %][% LxERP.format_amount(invoice.percent_skonto * 100, 2) %] % = [% LxERP.format_amount(invoice.skonto_amount,2) %] [% LxERP.t8("Valid until") %] [% invoice.skonto_date.to_kivitendo %] ([% invoice.remaining_skonto_days %]) [%- END %]</td>
   <td> [% L.button_tag("hide_row(" _ loop.count _ ")", LxERP.t8("hide")) %] </td>
   </tr>
 


hooks/post-receive
-- 
kivitendo ERP