X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fca.pl;h=4bef1d2ee147c0fa1ce7e3920659f8433ba2094a;hb=049e49fea3e4a3c7c78d7aebf055936b3cab40c5;hp=66a6a6a3d241cffcef13a6fa9faf502680491ddb;hpb=ed4ab03f2d6411f0860f820504736b64430bd39a;p=kivitendo-erp.git

diff --git a/bin/mozilla/ca.pl b/bin/mozilla/ca.pl
index 66a6a6a3d..4bef1d2ee 100644
--- a/bin/mozilla/ca.pl
+++ b/bin/mozilla/ca.pl
@@ -35,6 +35,7 @@
 use POSIX qw(strftime);
 
 use SL::CA;
+use SL::DB::Default;
 use SL::ReportGenerator;
 
 require "bin/mozilla/reportgenerator.pl";
@@ -84,7 +85,8 @@ sub chart_of_accounts {
 
   $form->{title} = $locale->text('Chart of Accounts');
 
-  if ($main::eur) {
+  if ( $::instance_conf->get_accounting_method eq 'cash' ) {
+    # $form->{method} can probably be made redundant now that we have get_accounting_method
     $form->{method} = "cash";
   }
 
@@ -106,6 +108,7 @@ sub chart_of_accounts {
                        'std_column_visibility' => 1,
     );
   $report->set_options_from_form();
+  $locale->set_numberformat_wo_thousands_separator(\%myconfig) if lc($report->{options}->{output_format}) eq 'csv';
 
   $report->set_columns(%column_defs);
   $report->set_column_order(@columns);
@@ -147,242 +150,17 @@ sub chart_of_accounts {
 }
 
 sub list {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-  my $locale   = $main::locale;
-
-  $main::auth->assert('report');
-
-  $form->{title} = $locale->text('List Transactions');
-  $form->{title} .= " - " . $locale->text('Account') . " $form->{accno}";
-  my $year = (localtime)[5] + 1900;
+  $::lxdebug->enter_sub;
+  $::auth->assert('report');
 
-  # get departments
-  $form->all_departments(\%myconfig);
-  if (@{ $form->{all_departments} }) {
-    $form->{selectdepartment} = "<option>\n";
+  $::form->{title} = $::locale->text('List Transactions') . " - " . $::locale->text('Account') . " $::form->{accno}" . " - " . $::form->{description};
 
-    map {
-      $form->{selectdepartment} .=
-        "<option>$_->{description}--$_->{id}\n"
-    } (@{ $form->{all_departments} });
-  }
-
-  my $department = qq|
-        <tr>
-	  <th align=right nowrap>| . $locale->text('Department') . qq|</th>
-	  <td colspan=3><select name=department>$form->{selectdepartment}</select></td>
-	</tr>
-| if $form->{selectdepartment};
-  my $accrual = ($main::eur) ? ""        : "checked";
-  my $cash    = ($main::eur) ? "checked" : "";
-
-  my $name_1    = "fromdate";
-  my $id_1      = "fromdate";
-  my $value_1   = "$form->{fromdate}";
-  my $trigger_1 = "trigger1";
-  my $name_2    = "todate";
-  my $id_2      = "todate";
-  my $value_2   = "";
-  my $trigger_2 = "trigger2";
-
-  my ($button1, $button1_2, $button2, $button2_2, $jsscript);
-
-  # with JavaScript Calendar
-  if ($form->{jsscript}) {
-    if ($name_1 eq "") {
-
-      $button1 = qq|
-         <input name=$name_2 id=$id_2 size=11 title="$myconfig{dateformat}" onBlur=\"check_right_date_format(this)\">|;
-      $button1_2 = qq|
-        <input type=button name=$name_2 id="$trigger_2" value=|
-        . $locale->text('button') . qq|>|;
-
-      #write Trigger
-      $jsscript =
-        Form->write_trigger(\%myconfig, "1", "$name_2", "BR", "$trigger_2");
-    } else {
-      $button1 = qq|
-         <input name=$name_1 id=$id_1 size=11 title="$myconfig{dateformat}" onBlur=\"check_right_date_format(this)\" value="$value_1">|;
-      $button1_2 = qq|
-        <input type=button name=$name_1 id="$trigger_1" value=|
-        . $locale->text('button') . qq|>|;
-      $button2 = qq|
-         <input name=$name_2 id=$id_2 size=11 title="$myconfig{dateformat}" onBlur=\"check_right_date_format(this)\">|;
-      $button2_2 = qq|
-         <input type=button name=$name_2 id="$trigger_2" value=|
-        . $locale->text('button') . qq|>
-       |;
-
-      #write Trigger
-      $jsscript =
-        Form->write_trigger(\%myconfig, "2", "$name_1", "BR", "$trigger_1",
-                            "$name_2", "BL", "$trigger_2");
-    }
-  } else {
+  $::form->header;
+  print $::form->parse_html_template('ca/list', {
+    year => DateTime->today->year,
+  });
 
-    # without JavaScript Calendar
-    if ($name_1 eq "") {
-      $button1 =
-        qq|<input name=$name_2 id=$id_2 size=11 title="$myconfig{dateformat}" onBlur=\"check_right_date_format(this)\">|;
-    } else {
-      $button1 =
-        qq|<input name=$name_1 id=$id_1 size=11 title="$myconfig{dateformat}" value="$value_1" onBlur=\"check_right_date_format(this)\">|;
-      $button2 =
-        qq|<input name=$name_2 id=$id_2 size=11 title="$myconfig{dateformat}" onBlur=\"check_right_date_format(this)\">|;
-    }
-  }
-  $form->{javascript} .= qq|<script type="text/javascript" src="js/common.js"></script>|;
-  $form->header;
-  my $onload = qq|focus()|;
-  $onload .= qq|;setupDateFormat('|. $myconfig{dateformat} .qq|', '|. $locale->text("Falsches Datumsformat!") .qq|')|;
-  $onload .= qq|;setupPoints('|. $myconfig{numberformat} .qq|', '|. $locale->text("wrongformat") .qq|')|;
-
-
-  $form->header;
-
-  $form->{description} =~ s/\"/&quot;/g;
-
-  print qq|
-<body onLoad="$onload">
-
-<form method=post action=$form->{script}>
-
-<input type=hidden name=accno value=$form->{accno}>
-<input type=hidden name=description value="$form->{description}">
-<input type=hidden name=sort value=transdate>
-<input type=hidden name=eur value=$main::eur>
-<input type=hidden name=accounttype value=$form->{accounttype}>
-
-<table border=0 width=100%>
-  <tr>
-    <th class=listtop>$form->{title}</th>
-  </tr>
-
-</table>
-<table>
-	<tr>
-	  <th align=left><input name=reporttype class=radio type=radio value="custom" checked> |
-      . $locale->text('Customized Report') . qq|</th>
-	</tr>
-	<tr>
-	  <th colspan=1>| . $locale->text('Year') . qq|</th>
-	  <td><input name=year size=11 title="|
-      . $locale->text('YYYY') . qq|" value="$year"></td>
-	</tr>
-|;
-
-    our $checked;
-    print qq|
-	<tr>
-		<td align=right>
-<b> | . $locale->text('Yearly') . qq|</b> </td>
-		<th align=left>| . $locale->text('Quarterly') . qq|</th>
-		<th align=left colspan=3>| . $locale->text('Monthly') . qq|</th>
-	</tr>
-	<tr>
-		<td align=right>&nbsp; <input name=duetyp class=radio type=radio value="13"
-$checked></td>
-		<td><input name=duetyp class=radio type=radio value="A" $checked >&nbsp;1. |
-      . $locale->text('Quarter') . qq|</td>
-|;
-    $checked = "checked";
-    print qq|
-		<td><input name=duetyp class=radio type=radio value="1" $checked >&nbsp;|
-      . $locale->text('January') . qq|</td>
-|;
-    $checked = "";
-    print qq|
-		<td><input name=duetyp class=radio type=radio value="5" $checked >&nbsp;|
-      . $locale->text('May') . qq|</td>
-		<td><input name=duetyp class=radio type=radio value="9" $checked >&nbsp;|
-      . $locale->text('September') . qq|</td>
-
-	</tr>
-	<tr>
-		<td align= right>&nbsp;</td>
-		<td><input name=duetyp class=radio type=radio value="B" $checked>&nbsp;2. |
-      . $locale->text('Quarter') . qq|</td>
-		<td><input name=duetyp class=radio type=radio value="2" $checked >&nbsp;|
-      . $locale->text('February') . qq|</td>
-		<td><input name=duetyp class=radio type=radio value="6" $checked >&nbsp;|
-      . $locale->text('June') . qq|</td>
-		<td><input name=duetyp class=radio type=radio value="10" $checked >&nbsp;|
-      . $locale->text('October') . qq|</td>
-	</tr>
-	<tr>
-		<td> &nbsp;</td>
-		<td><input name=duetyp class=radio type=radio value="C" $checked>&nbsp;3. |
-      . $locale->text('Quarter') . qq|</td>
-		<td><input name=duetyp class=radio type=radio value="3" $checked >&nbsp;|
-      . $locale->text('March') . qq|</td>
-		<td><input name=duetyp class=radio type=radio value="7" $checked >&nbsp;|
-      . $locale->text('July') . qq|</td>
-		<td><input name=duetyp class=radio type=radio value="11" $checked >&nbsp;|
-      . $locale->text('November') . qq|</td>
-
-	</tr>
-	<tr>
-		<td> &nbsp;</td>
-		<td><input name=duetyp class=radio type=radio value="D" $checked>&nbsp;4. |
-      . $locale->text('Quarter') . qq|&nbsp;</td>
-		<td><input name=duetyp class=radio type=radio value="4" $checked >&nbsp;|
-      . $locale->text('April') . qq|</td>
-		<td><input name=duetyp class=radio type=radio value="8" $checked >&nbsp;|
-      . $locale->text('August') . qq|</td>
-		<td><input name=duetyp class=radio type=radio value="12" $checked >&nbsp;|
-      . $locale->text('December') . qq|</td>
-
-	</tr>
-	<tr>
-   		<td colspan=5><hr size=3 noshade></td>
-	</tr>
-	<tr>
-          <th align=left><input name=reporttype class=radio type=radio value="free" $checked> |
-      . $locale->text('Free report period') . qq|</th>
-	  <td align=left colspan=4>| . $locale->text('From') . qq|&nbsp;
-	      $button1
-              $button1_2&nbsp;
-	      | . $locale->text('Bis') . qq|&nbsp;
-	      $button2
-              $button2_2
-          </td>
-        </tr>
-	<tr>
-   		<td colspan=5><hr size=3 noshade></td>
-	</tr>
-	<tr>
-	  <th align=leftt>| . $locale->text('Method') . qq|</th>
-	  <td colspan=3><input name=method class=radio type=radio value=accrual $accrual>|
-      . $locale->text('Accrual') . qq|
-	  &nbsp;<input name=method class=radio type=radio value=cash $cash>|
-      . $locale->text('EUR') . qq|</td>
-	</tr>
-        <tr>
-         <th align=right colspan=4>|
-      . $locale->text('Decimalplaces')
-      . qq|</th>
-             <td><input name=decimalplaces size=3 value="2"></td>
-         </tr>
-         <tr>
-            <td><input name="subtotal" class=checkbox type=checkbox value=1> | . $locale->text('Subtotal') . qq|</td>
-         </tr>
-
-$jsscript
-  <tr><td colspan=5 ><hr size=3 noshade></td></tr>
-</table>
-
-<br><input class=submit type=submit name=action value="|
-    . $locale->text('List Transactions') . qq|">
-</form>
-
-</body>
-</html>
-|;
-
-  $main::lxdebug->leave_sub();
+  $::lxdebug->leave_sub;
 }
 
 sub format_debit_credit {
@@ -409,6 +187,7 @@ sub list_transactions {
   my $form     = $main::form;
   my %myconfig = %main::myconfig;
   my $locale   = $main::locale;
+  my $defaults = SL::DB::Default->get;
 
   $main::auth->assert('report');
 
@@ -554,7 +333,7 @@ sub list_transactions {
   $form->{print_date} = $locale->text('Create Date') . " " . $locale->date(\%myconfig, $form->current_date(\%myconfig), 0);
   push (@options, $form->{print_date});
 
-  $form->{company} = $locale->text('Company') . " " . $myconfig{company};
+  $form->{company} = $locale->text('Company') . " " . $defaults->company;
   push (@options, $form->{company});
 
   my @columns     = qw(transdate reference description gegenkonto debit credit ustkonto ustrate balance);
@@ -564,19 +343,19 @@ sub list_transactions {
     'description' => { 'text' => $locale->text('Description'), },
     'debit'       => { 'text' => $locale->text('Debit'), },
     'credit'      => { 'text' => $locale->text('Credit'), },
-    'gegenkonto'     => { 'text' => $locale->text('Gegenkonto'), },
-    'ustkonto'     => { 'text' => $locale->text('USt-Konto'), },
-    'balance'          => { 'text' => $locale->text('Balance'), },
+    'gegenkonto'  => { 'text' => $locale->text('Gegenkonto'), },
+    'ustkonto'    => { 'text' => $locale->text('USt-Konto'), },
+    'balance'     => { 'text' => $locale->text('Balance'), },
     'ustrate'     => { 'text' => $locale->text('Satz %'), },
  );
 
-  my @hidden_variables = qw(accno fromdate todate description accounttype l_heading subtotal department projectnumber project_id sort);
+  my @hidden_variables = qw(accno fromdate todate description accounttype l_heading subtotal department projectnumber project_id sort method);
 
   my $link = build_std_url('action=list_transactions', grep { $form->{$_} } @hidden_variables);
 
   $form->{callback} = $link . '&sort=' . E($form->{sort});
 
-  my %column_alignment = map { $_ => 'right' } qw(debit credit);
+  my %column_alignment = map { $_ => 'right' } qw(debit credit balance);
 
   my @custom_headers = ();
  # Zeile 1:
@@ -622,6 +401,7 @@ sub list_transactions {
                        'std_column_visibility' => 1,
     );
   $report->set_options_from_form();
+  $locale->set_numberformat_wo_thousands_separator(\%myconfig) if lc($report->{options}->{output_format}) eq 'csv';
 
   $report->set_columns(%column_defs);
   $report->set_column_order(@columns);