date error in mapping

[mfinanz.git] / templates / webpages / yearend / form.html

diff --git a/templates/webpages/yearend/form.html b/templates/webpages/yearend/form.html
index d28dfc15537916fb945517396eab2d7566d7aabe..a596269723f63f279e4bcda4e019d84cc4e009f7 100644 (file)
--- a/templates/webpages/yearend/form.html
+++ b/templates/webpages/yearend/form.html
@@ -7,7 +7,7 @@
 
 [%- INCLUDE 'common/flash.html' %]
 
 
 [%- INCLUDE 'common/flash.html' %]
 

-[% IF carry_over_chart AND profit_chart AND loss_chart %] [% THEN %]
+[% IF carry_over_chart AND profit_chart AND (loss_chart OR SELF.defaults.yearend_method == 'simple') %] [% THEN %]

 <form id="filter" name="filter" method="post" action="controller.pl">
 <table>
   <tr>
 <form id="filter" name="filter" method="post" action="controller.pl">
 <table>
   <tr>


@@ -22,6 +22,16 @@
     <td align="right">[% 'Start date' | $T8 %]</td>
     <td>[% L.date_tag('cb_startdate', '', readonly=1) %]</td>
   </tr>
     <td align="right">[% 'Start date' | $T8 %]</td>
     <td>[% L.date_tag('cb_startdate', '', readonly=1) %]</td>
   </tr>

+  [% IF SELF.defaults.yearend_method == 'simple' %] [% THEN %]
+  <tr>
+    <td align="right">[% 'Year-end closing account' | $T8 %]</td>
+    <td>[% carry_over_chart.displayable_name | html %]</td>
+  </tr>
+  <tr>
+    <td align="right">[% 'Profit or loss carried forward account' | $T8 %]</td>
+    <td>[% profit_chart.displayable_name | html %]</td>
+  </tr>
+  [% ELSE %]

   <tr>
     <td align="right">[% 'Carry over account for year-end closing' | $T8 %]</td>
     <td>[% carry_over_chart.displayable_name | html %]</td>
   <tr>
     <td align="right">[% 'Carry over account for year-end closing' | $T8 %]</td>
     <td>[% carry_over_chart.displayable_name | html %]</td>


@@ -34,8 +44,11 @@
     <td align="right">[% 'Loss carried forward account' | $T8 %]</td>
     <td>[% loss_chart.displayable_name | html %]</td>
   </tr>
     <td align="right">[% 'Loss carried forward account' | $T8 %]</td>
     <td>[% loss_chart.displayable_name | html %]</td>
   </tr>

+  [% END %]

 </table>
 </form>
 </table>
 </form>

+[% ELSIF SELF.defaults.yearend_method == 'simple' %]
+  [% 'Please configure the year-end closing and the profit or loss carried forward accounts for year-end closing in the client configuration!' | $T8 %]

 [% ELSE %]
   [% 'Please configure the carry over and profit and loss accounts for year-end closing in the client configuration!' | $T8 %]
 [% END %]
 [% ELSE %]
   [% 'Please configure the carry over and profit and loss accounts for year-end closing in the client configuration!' | $T8 %]
 [% END %]