Erstes Update zur USTVA Anpassung an 16%/19%.

- Kennziffern 81,811, 51,511 werden 2006 und 2007 unterstützt.
- HTML testscript für selenium IDE

diff --git a/SL/USTVA.pm b/SL/USTVA.pm
index 09f5683..55122a6 100644 (file)
--- a/SL/USTVA.pm
+++ b/SL/USTVA.pm
@@ -597,6 +597,27 @@ sub ustva {
   &get_accounts_ustva($dbh, $last_period, $form->{fromdate}, $form->{todate},
                       $form, $category);
 
+
+  # 16%/19% Umstelung
+  # Umordnen der Kennziffern und abfangen von Fehlern 
+
+#  $form->header;
+#  print $form->{81};
+
+  if ( $form->{year} < 2007) {
+    $form->{35} += $form->{81};
+    $form->{36} += $form->{811};
+    $form->{95} += $form->{89};
+    $form->{98} += $form->{891};
+    map { delete $form->{$_} } qw(81 811 89 891);
+  } else {
+    $form->{35} += $form->{51};
+    $form->{36} += $form->{511};
+    $form->{95} += $form->{97};
+    $form->{98} += $form->{971};
+    map { delete $form->{$_} } qw(51 511 97 971);
+  }
+
   #
   # Berechnung der USTVA Formularfelder laut Bogen 207
   #
@@ -705,15 +726,25 @@ sub get_accounts_ustva {
       select amount from ar where id = ac.trans_id  
      )
    ) AS amount,
-   c.pos_ustva
+   tk.pos_ustva
    FROM acc_trans ac
-   JOIN chart c ON (c.id = ac.chart_id)
-   --JOIN ar ON (ar.id = ac.trans_id)
-   where 
+   LEFT JOIN chart c ON (c.id = ac.chart_id)
+   LEFT JOIN ar ON (ar.id = ac.trans_id)
+   LEFT JOIN taxkeys tk ON (
+     tk.id = (
+       SELECT id FROM taxkeys 
+       WHERE chart_id=ac.chart_id 
+         AND taxkey_id=ac.taxkey 
+         
+         AND startdate <= COALESCE(ar.deliverydate, ar.transdate)
+       ORDER BY startdate DESC LIMIT 1
+     )
+   )
+   WHERE 
      1=1 
      -- Here no where, please. All Transactions ever should be
      -- testet if they are paied in the USTVA report period.
-   GROUP BY c.pos_ustva
+   GROUP BY tk.pos_ustva
 
  UNION -- alle Ausgaben AP erfassen
 

diff --git a/bin/mozilla/ustva.pl b/bin/mozilla/ustva.pl
index de1de62..2368545 100644 (file)
--- a/bin/mozilla/ustva.pl
+++ b/bin/mozilla/ustva.pl
@@ -535,7 +535,12 @@ sub generate_ustva {
 
   # init some form vars
   my @anmeldungszeitraum =
-    qw('0401' '0402' '0403' '0404' '0405' '0405' '0406' '0407' '0408' '0409' '0410' '0411' '0412' '0441' '0442' '0443' '0444');
+    qw('0401' '0402' '0403' 
+       '0404' '0405' '0406' 
+       '0407' '0408' '0409' 
+       '0410' '0411' '0412' 
+       '0441' '0442' '0443' '0444');
+
   foreach my $item (@anmeldungszeitraum) {
     $form->{$item} = "";
   }
@@ -662,7 +667,8 @@ sub generate_ustva {
       };
     }
 
-
+  # Kontrollvariable für die Templates 
+  $form->{'year2007'} = ($form->{year} >= 2007 ) ? "1":"0";
 
 
   # Get the USTVA

diff --git a/sql/Pg-upgrade2/ustva_setup_2007.sql b/sql/Pg-upgrade2/ustva_setup_2007.sql
new file mode 100644 (file)
index 0000000..6126636
--- /dev/null
+++ b/sql/Pg-upgrade2/ustva_setup_2007.sql
@@ -0,0 +1,35 @@
+-- @tag: ustva_setup_2007
+-- @description: Aktualisierung des SKR03 für 2006
+-- @depends: customer_vendor_taxzone_id  
+
+update taxkeys set pos_ustva='81' where startdate='2007-01-01' 
+  AND pos_ustva ='51'
+  AND
+  EXISTS ( -- update only for SKR03
+    SELECT coa FROM defaults 
+      WHERE defaults.coa='Germany-DATEV-SKR03EU'
+  );
+
+
+UPDATE taxkeys SET pos_ustva='511' 
+  WHERE startdate='1970-01-01' 
+  AND chart_id = (select id from chart where accno ='1775')
+  AND
+  EXISTS ( -- update only for SKR03
+    SELECT coa FROM defaults 
+      WHERE defaults.coa='Germany-DATEV-SKR03EU'
+  );  
+
+
+INSERT INTO taxkeys (
+  chart_id, tax_id, taxkey_id, pos_ustva, startdate)
+  SELECT chart.id, tax.id, taxkey_id, '811', '2007-01-01'
+  FROM chart
+  LEFT JOIN tax ON (chart.id = tax.chart_id)
+  WHERE chart.accno = '1776'
+  AND
+  EXISTS ( -- update only for SKR03
+    SELECT coa FROM defaults 
+      WHERE defaults.coa='Germany-DATEV-SKR03EU'
+  )
+;

diff --git a/t/selenium/incomming/ustva-IST-Inland.html b/t/selenium/incomming/ustva-IST-Inland.html
new file mode 100644 (file)
index 0000000..38725de
--- /dev/null
+++ b/t/selenium/incomming/ustva-IST-Inland.html
@@ -0,0 +1,877 @@
+<!-- Made for Selenium IDE the great Firefox Extension  -->
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>ustva-IST-Inland</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">ustva-IST-Inland</td></tr>
+</thead><tbody>
+<!--Create new database-->
+<tr>
+       <td>open</td>
+       <td>/erp-unstable.orig/admin.pl</td>
+       <td></td>
+</tr>
+<tr>
+       <td>assertTitle</td>
+       <td>Lx-Office ERP 2.4.1 Administration -</td>
+       <td></td>
+</tr>
+<tr>
+       <td>clickAndWait</td>
+       <td>document.forms[0].action[0]</td>
+       <td></td>
+</tr>
+<tr>
+       <td>assertTitle</td>
+       <td>Lx-Office ERP Administration -</td>
+       <td></td>
+</tr>
+<tr>
+       <td>clickAndWait</td>
+       <td>document.forms[0].action[2]</td>
+       <td></td>
+</tr>
+<tr>
+       <td>assertTitle</td>
+       <td>Lx-Office ERP / Datenbankadministration -</td>
+       <td></td>
+</tr>
+<tr>
+       <td>type</td>
+       <td>dbuser</td>
+       <td>lxoffice</td>
+</tr>
+<tr>
+       <td>type</td>
+       <td>dbpasswd</td>
+       <td>1qayxsw2</td>
+</tr>
+<tr>
+       <td>clickAndWait</td>
+       <td>action</td>
+       <td></td>
+</tr>
+<tr>
+       <td>assertTitle</td>
+       <td>Lx-Office ERP Datenbankadministration / Datenbank anlegen -</td>
+       <td></td>
+</tr>
+<tr>
+       <td>click</td>
+       <td>document.forms[0].chart[2]</td>
+       <td></td>
+</tr>
+<tr>
+       <td>type</td>
+       <td>db</td>
+       <td>skr03-2</td>
+</tr>
+<tr>
+       <td>clickAndWait</td>
+       <td>action</td>
+       <td></td>
+</tr>
+<tr>
+       <td>clickAndWait</td>
+       <td>action</td>
+       <td></td>
+</tr>
+<!--Login-->
+<tr>
+       <td>assertTitle</td>
+       <td>Lx-Office ERP Administration -</td>
+       <td></td>
+</tr>
+<tr>
+       <td>type</td>
+       <td>login</td>
+       <td>demo</td>
+</tr>
+<tr>
+       <td>type</td>
+       <td>password</td>
+       <td>demo</td>
+</tr>
+<tr>
+       <td>clickAndWait</td>
+       <td>document.forms[1].action</td>
+       <td></td>
+</tr>
+<!--Datenbankaktualisierung-->
+<tr>
+       <td>assertTitle</td>
+       <td>Datenbankaktualisierung - Lx-Office Version 2.4.1 - -</td>
+       <td></td>
+</tr>
+<tr>
+       <td>clickAndWait</td>
+       <td>//input[@value='Weiter']</td>
+       <td></td>
+</tr>
+<tr>
+       <td>assertTitle</td>
+       <td>Lx-Office Version 2.4.1 - - skr03-2</td>
+       <td></td>
+</tr>
+<!--Testkunde anlegen-->
+<tr>
+       <td>selectFrame</td>
+       <td>relative=up</td>
+       <td></td>
+</tr>
+<tr>
+       <td>click</td>
+       <td>link=Kunde erfassen</td>
+       <td></td>
+</tr>
+<tr>
+       <td>pause</td>
+       <td>5000</td>
+       <td></td>
+</tr>
+<tr>
+       <td>selectFrame</td>
+       <td>main_window</td>
+       <td></td>
+</tr>
+<tr>
+       <td>type</td>
+       <td>name</td>
+       <td>Testkunde</td>
+</tr>
+<tr>
+       <td>clickAndWait</td>
+       <td>action</td>
+       <td></td>
+</tr>
+<tr>
+       <td>selectFrame</td>
+       <td>relative=up</td>
+       <td></td>
+</tr>
+<!--Testware anlegen-->
+<tr>
+       <td>clickAndWait</td>
+       <td>link=Ware erfassen</td>
+       <td></td>
+</tr>
+<tr>
+       <td>pause</td>
+       <td>5000</td>
+       <td></td>
+</tr>
+<tr>
+       <td>selectFrame</td>
+       <td>main_window</td>
+       <td></td>
+</tr>
+<tr>
+       <td>type</td>
+       <td>description</td>
+       <td>Testware</td>
+</tr>
+<tr>
+       <td>select</td>
+       <td>buchungsgruppen_id</td>
+       <td>label=Standard 16%/19%</td>
+</tr>
+<tr>
+       <td>type</td>
+       <td>sellprice</td>
+       <td>100</td>
+</tr>
+<tr>
+       <td>clickAndWait</td>
+       <td>document.ic.action[1]</td>
+       <td></td>
+</tr>
+<!--1. Rechnung-->
+<!--03-2007 Rechnungsdatum-->
+<!--Kein Lieferdatum-->
+<!--03-2007 Zahlungsdatum-->
+<tr>
+       <td>selectFrame</td>
+       <td>relative=up</td>
+       <td></td>
+</tr>
+<tr>
+       <td>click</td>
+       <td>link=Rechnung erfassen</td>
+       <td></td>
+</tr>
+<tr>
+       <td>pause</td>
+       <td>5000</td>
+       <td></td>
+</tr>
+<tr>
+       <td>selectFrame</td>
+       <td>main_window</td>
+       <td></td>
+</tr>
+<tr>
+       <td>selectWindow</td>
+       <td>main_window</td>
+       <td></td>
+</tr>
+<tr>
+       <td>type</td>
+       <td>invnumber</td>
+       <td>1</td>
+</tr>
+<tr>
+       <td>type</td>
+       <td>partnumber_1</td>
+       <td>1</td>
+</tr>
+<tr>
+       <td>type</td>
+       <td>invdate</td>
+       <td>1.3.2007</td>
+</tr>
+<tr>
+       <td>type</td>
+       <td>datepaid_1</td>
+       <td>10.3.2007</td>
+</tr>
+<tr>
+       <td>type</td>
+       <td>source_1</td>
+       <td>1</td>
+</tr>
+<tr>
+       <td>type</td>
+       <td>memo_1</td>
+       <td>1</td>
+</tr>
+<tr>
+       <td>type</td>
+       <td>paid_1</td>
+       <td>119</td>
+</tr>
+<tr>
+       <td>clickAndWait</td>
+       <td>document.invoice.action[6]</td>
+       <td></td>
+</tr>
+<tr>
+       <td>clickAndWait</td>
+       <td>document.invoice.action[6]</td>
+       <td></td>
+</tr>
+<!--2. Rechnung: -->
+<!--11-2006 Rechnungsdatum-->
+<!--Kein Lieferdatum-->
+<!--01-2007 Zahlungsdatum-->
+<tr>
+       <td>selectFrame</td>
+       <td>relative=up</td>
+       <td></td>
+</tr>
+<tr>
+       <td>click</td>
+       <td>link=Rechnung erfassen</td>
+       <td></td>
+</tr>
+<tr>
+       <td>pause</td>
+       <td>5000</td>
+       <td></td>
+</tr>
+<tr>
+       <td>selectFrame</td>
+       <td>main_window</td>
+       <td></td>
+</tr>
+<tr>
+       <td>type</td>
+       <td>invnumber</td>
+       <td>2</td>
+</tr>
+<tr>
+       <td>type</td>
+       <td>invdate</td>
+       <td>11.11.2006</td>
+</tr>
+<tr>
+       <td>type</td>
+       <td>datepaid_1</td>
+       <td>20.11.2006</td>
+</tr>
+<tr>
+       <td>type</td>
+       <td>partnumber_1</td>
+       <td>1</td>
+</tr>
+<tr>
+       <td>type</td>
+       <td>source_1</td>
+       <td>4</td>
+</tr>
+<tr>
+       <td>type</td>
+       <td>memo_1</td>
+       <td>4</td>
+</tr>
+<tr>
+       <td>type</td>
+       <td>paid_1</td>
+       <td>116</td>
+</tr>
+<tr>
+       <td>clickAndWait</td>
+       <td>document.invoice.action[6]</td>
+       <td></td>
+</tr>
+<tr>
+       <td>clickAndWait</td>
+       <td>document.invoice.action[6]</td>
+       <td></td>
+</tr>
+<!---->
+<!--3. Rechnung: -->
+<!--12-2006 Rechnungsdatum-->
+<!--12-2006 Lieferdatum-->
+<!--12-2006 Zahlungsdatum-->
+<tr>
+       <td>selectFrame</td>
+       <td>relative=up</td>
+       <td></td>
+</tr>
+<tr>
+       <td>click</td>
+       <td>link=Rechnung erfassen</td>
+       <td></td>
+</tr>
+<tr>
+       <td>pause</td>
+       <td>3000</td>
+       <td></td>
+</tr>
+<tr>
+       <td>selectFrame</td>
+       <td>main_window</td>
+       <td></td>
+</tr>
+<tr>
+       <td>type</td>
+       <td>invnumber</td>
+       <td>3</td>
+</tr>
+<tr>
+       <td>type</td>
+       <td>duedate</td>
+       <td>10.12.2006</td>
+</tr>
+<tr>
+       <td>type</td>
+       <td>partnumber_1</td>
+       <td>1</td>
+</tr>
+<tr>
+       <td>clickAndWait</td>
+       <td>update_button</td>
+       <td></td>
+</tr>
+<tr>
+       <td>verifyTextPresent</td>
+       <td>Umsatzsteuer 19%</td>
+       <td></td>
+</tr>
+<tr>
+       <td>verifyTextPresent</td>
+       <td>19,00</td>
+       <td></td>
+</tr>
+<tr>
+       <td>type</td>
+       <td>deliverydate</td>
+       <td>15.12.2006</td>
+</tr>
+<tr>
+       <td>clickAndWait</td>
+       <td>update_button</td>
+       <td></td>
+</tr>
+<tr>
+       <td>verifyTextPresent</td>
+       <td>Umsatzsteuer 16%</td>
+       <td></td>
+</tr>
+<tr>
+       <td>verifyTextPresent</td>
+       <td>16,00</td>
+       <td></td>
+</tr>
+<tr>
+       <td>type</td>
+       <td>datepaid_1</td>
+       <td>20.12.2006</td>
+</tr>
+<tr>
+       <td>type</td>
+       <td>source_1</td>
+       <td>4</td>
+</tr>
+<tr>
+       <td>type</td>
+       <td>memo_1</td>
+       <td>4</td>
+</tr>
+<tr>
+       <td>type</td>
+       <td>paid_1</td>
+       <td>116</td>
+</tr>
+<tr>
+       <td>clickAndWait</td>
+       <td>document.invoice.action[6]</td>
+       <td></td>
+</tr>
+<!--4. Rechnung: -->
+<!--08-2006 Rechnungsdatum-->
+<!--09-2006 Lieferdatum-->
+<!--02-2007 Zahlungsdatum-->
+<tr>
+       <td>selectFrame</td>
+       <td>relative=up</td>
+       <td></td>
+</tr>
+<tr>
+       <td>click</td>
+       <td>link=Rechnung erfassen</td>
+       <td></td>
+</tr>
+<tr>
+       <td>pause</td>
+       <td>3000</td>
+       <td></td>
+</tr>
+<tr>
+       <td>selectFrame</td>
+       <td>main_window</td>
+       <td></td>
+</tr>
+<tr>
+       <td>type</td>
+       <td>invnumber</td>
+       <td>4</td>
+</tr>
+<tr>
+       <td>type</td>
+       <td>invdate</td>
+       <td>8.08.2006</td>
+</tr>
+<tr>
+       <td>type</td>
+       <td>deliverydate</td>
+       <td>10.09.2006</td>
+</tr>
+<tr>
+       <td>type</td>
+       <td>partnumber_1</td>
+       <td>1</td>
+</tr>
+<tr>
+       <td>clickAndWait</td>
+       <td>update_button</td>
+       <td></td>
+</tr>
+<tr>
+       <td>verifyText</td>
+       <td>//tr[6]/td/table/tbody/tr/td[2]/table/tbody/tr[2]/td</td>
+       <td>16,00</td>
+</tr>
+<tr>
+       <td>type</td>
+       <td>datepaid_1</td>
+       <td>2.2.2007</td>
+</tr>
+<tr>
+       <td>type</td>
+       <td>source_1</td>
+       <td>7</td>
+</tr>
+<tr>
+       <td>type</td>
+       <td>memo_1</td>
+       <td>7</td>
+</tr>
+<tr>
+       <td>type</td>
+       <td>paid_1</td>
+       <td>116</td>
+</tr>
+<tr>
+       <td>clickAndWait</td>
+       <td>document.invoice.action[6]</td>
+       <td></td>
+</tr>
+<!--5. Rechnung: -->
+<!--06-2006 Rechnungsdatum-->
+<!--01-2007 Lieferdatum-->
+<!--07-2006 Zahlungsdatum-->
+<tr>
+       <td>selectFrame</td>
+       <td>relative=up</td>
+       <td></td>
+</tr>
+<tr>
+       <td>click</td>
+       <td>link=Rechnung erfassen</td>
+       <td></td>
+</tr>
+<tr>
+       <td>pause</td>
+       <td>3000</td>
+       <td></td>
+</tr>
+<tr>
+       <td>selectFrame</td>
+       <td>main_window</td>
+       <td></td>
+</tr>
+<tr>
+       <td>type</td>
+       <td>invnumber</td>
+       <td>5</td>
+</tr>
+<tr>
+       <td>type</td>
+       <td>invdate</td>
+       <td>10.06.2006</td>
+</tr>
+<tr>
+       <td>type</td>
+       <td>deliverydate</td>
+       <td>13.1.2007</td>
+</tr>
+<tr>
+       <td>type</td>
+       <td>partnumber_1</td>
+       <td>1</td>
+</tr>
+<tr>
+       <td>type</td>
+       <td>datepaid_1</td>
+       <td>12.7.2006</td>
+</tr>
+<tr>
+       <td>type</td>
+       <td>source_1</td>
+       <td>45</td>
+</tr>
+<tr>
+       <td>type</td>
+       <td>memo_1</td>
+       <td>44</td>
+</tr>
+<tr>
+       <td>type</td>
+       <td>paid_1</td>
+       <td>119</td>
+</tr>
+<tr>
+       <td>clickAndWait</td>
+       <td>document.invoice.action[6]</td>
+       <td></td>
+</tr>
+<tr>
+       <td>clickAndWait</td>
+       <td>document.invoice.action[6]</td>
+       <td></td>
+</tr>
+<!---->
+<!--########################-->
+<!--USTVA Tests-->
+<!--########################-->
+<!--1. Test -->
+<!--03-2007 Rechnungsdatum-->
+<!--Kein Lieferdatum-->
+<!--03-2007 Zahlungsdatum-->
+<!--Rechnung 1-->
+<!--USTVA2007-03-IST-->
+<tr>
+       <td>selectFrame</td>
+       <td>relative=up</td>
+       <td></td>
+</tr>
+<tr>
+       <td>click</td>
+       <td>link=UStVa</td>
+       <td></td>
+</tr>
+<tr>
+       <td>pause</td>
+       <td>3000</td>
+       <td></td>
+</tr>
+<tr>
+       <td>selectFrame</td>
+       <td>main_window</td>
+       <td></td>
+</tr>
+<tr>
+       <td>select</td>
+       <td>year</td>
+       <td>label=2007</td>
+</tr>
+<tr>
+       <td>select</td>
+       <td>zeitraum</td>
+       <td>label=März</td>
+</tr>
+<tr>
+       <td>clickAndWait</td>
+       <td>action</td>
+       <td></td>
+</tr>
+<tr>
+       <td>verifyText</td>
+       <td>//tr[9]/td[2]</td>
+       <td>(Spalte 81)</td>
+</tr>
+<tr>
+       <td>verifyText</td>
+       <td>//tr[9]/td[3]</td>
+       <td>100</td>
+</tr>
+<tr>
+       <td>verifyText</td>
+       <td>//tr[9]/td[5]</td>
+       <td>19,00</td>
+</tr>
+<tr>
+       <td>selectFrame</td>
+       <td>relative=up</td>
+       <td></td>
+</tr>
+<!--2. Test-->
+<!--11-2006 Rechnungsdatum-->
+<!--Kein Lieferdatum-->
+<!--11-2006 Zahlungsdatum-->
+<!--USTVA-11-2006-IST-->
+<tr>
+       <td>selectFrame</td>
+       <td>relative=up</td>
+       <td></td>
+</tr>
+<tr>
+       <td>click</td>
+       <td>link=UStVa</td>
+       <td></td>
+</tr>
+<tr>
+       <td>pause</td>
+       <td>3000</td>
+       <td></td>
+</tr>
+<tr>
+       <td>selectFrame</td>
+       <td>main_window</td>
+       <td></td>
+</tr>
+<tr>
+       <td>select</td>
+       <td>zeitraum</td>
+       <td>label=November</td>
+</tr>
+<tr>
+       <td>clickAndWait</td>
+       <td>action</td>
+       <td></td>
+</tr>
+<tr>
+       <td>verifyText</td>
+       <td>//tr[9]/td[2]</td>
+       <td>(Spalte 51)</td>
+</tr>
+<tr>
+       <td>verifyText</td>
+       <td>//tr[9]/td[3]</td>
+       <td>100</td>
+</tr>
+<tr>
+       <td>verifyText</td>
+       <td>//tr[9]/td[5]</td>
+       <td>16,00</td>
+</tr>
+<!---->
+<!--3. Test Rechnung 3-->
+<!--12-2006 Rechnungsdatum-->
+<!--12-2006 Lieferdatum-->
+<!--12-2006 Zahlungsdatum-->
+<!--USTVA2006-12-IST-->
+<tr>
+       <td>selectFrame</td>
+       <td>relative=up</td>
+       <td></td>
+</tr>
+<tr>
+       <td>click</td>
+       <td>link=UStVa</td>
+       <td></td>
+</tr>
+<tr>
+       <td>pause</td>
+       <td>3000</td>
+       <td></td>
+</tr>
+<tr>
+       <td>selectFrame</td>
+       <td>main_window</td>
+       <td></td>
+</tr>
+<tr>
+       <td>select</td>
+       <td>year</td>
+       <td>label=2006</td>
+</tr>
+<tr>
+       <td>select</td>
+       <td>zeitraum</td>
+       <td>label=Dezember</td>
+</tr>
+<tr>
+       <td>clickAndWait</td>
+       <td>action</td>
+       <td></td>
+</tr>
+<tr>
+       <td>verifyText</td>
+       <td>//tr[9]/td[2]</td>
+       <td>(Spalte 51)</td>
+</tr>
+<tr>
+       <td>verifyText</td>
+       <td>//tr[9]/td[3]</td>
+       <td>100</td>
+</tr>
+<tr>
+       <td>verifyText</td>
+       <td>//tr[9]/td[5]</td>
+       <td>16,00</td>
+</tr>
+<!--4. Test-->
+<!--4. Rechnung-->
+<!--08-2006 Rechnungsdatum-->
+<!--09-2006 Lieferdatum-->
+<!--02-2007 Zahlungsdatum-->
+<tr>
+       <td>selectFrame</td>
+       <td>relative=up</td>
+       <td></td>
+</tr>
+<tr>
+       <td>click</td>
+       <td>link=UStVa</td>
+       <td></td>
+</tr>
+<tr>
+       <td>pause</td>
+       <td>3000</td>
+       <td></td>
+</tr>
+<tr>
+       <td>selectFrame</td>
+       <td>main_window</td>
+       <td></td>
+</tr>
+<tr>
+       <td>select</td>
+       <td>year</td>
+       <td>label=2007</td>
+</tr>
+<tr>
+       <td>select</td>
+       <td>zeitraum</td>
+       <td>label=Februar</td>
+</tr>
+<tr>
+       <td>clickAndWait</td>
+       <td>action</td>
+       <td></td>
+</tr>
+<tr>
+       <td>verifyText</td>
+       <td>//tr[11]/td[2]</td>
+       <td>35</td>
+</tr>
+<tr>
+       <td>verifyText</td>
+       <td>//tr[11]/td[3]</td>
+       <td>100</td>
+</tr>
+<tr>
+       <td>verifyText</td>
+       <td>//tr[11]/td[4]</td>
+       <td>36</td>
+</tr>
+<tr>
+       <td>verifyText</td>
+       <td>//tr[11]/td[5]</td>
+       <td>16,00</td>
+</tr>
+<!--5. Test-->
+<!--5. Rechnung: -->
+<!--06-2006 Rechnungsdatum-->
+<!--01-2007 Lieferdatum-->
+<!--07-2006 Zahlungsdatum-->
+<tr>
+       <td>selectFrame</td>
+       <td>relative=up</td>
+       <td></td>
+</tr>
+<tr>
+       <td>click</td>
+       <td>link=UStVa</td>
+       <td></td>
+</tr>
+<tr>
+       <td>pause</td>
+       <td>3000</td>
+       <td></td>
+</tr>
+<tr>
+       <td>selectFrame</td>
+       <td>main_window</td>
+       <td></td>
+</tr>
+<tr>
+       <td>select</td>
+       <td>zeitraum</td>
+       <td>label=Juli</td>
+</tr>
+<tr>
+       <td>clickAndWait</td>
+       <td>action</td>
+       <td></td>
+</tr>
+<tr>
+       <td>verifyText</td>
+       <td>//tr[11]/td[2]</td>
+       <td>35</td>
+</tr>
+<tr>
+       <td>verifyText</td>
+       <td>//tr[11]/td[3]</td>
+       <td>100</td>
+</tr>
+<tr>
+       <td>verifyText</td>
+       <td>//tr[11]/td[4]</td>
+       <td>36</td>
+</tr>
+<tr>
+       <td>verifyText</td>
+       <td>//tr[11]/td[5]</td>
+       <td>19,00</td>
+</tr>
+
+</tbody></table>
+</body>
+</html>

diff --git a/templates/German-ustva.html b/templates/German-ustva.html
index 4217062..550b2e7 100644 (file)
--- a/templates/German-ustva.html
+++ b/templates/German-ustva.html
@@ -138,6 +138,7 @@ Vorsteuerabzug. </b><br />Ums
       <td class="text"><b class="h4">Steuerpflichtige Ums&auml;tze</b></td>
       <td colspan="4"></td>
     </tr>
+<%if not year2007%>
     <tr>
       <td class="text2">zum Steuersatz von 16 v.H.</td>
       <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>51<span class="nodis">)</span></td>
@@ -145,6 +146,17 @@ Vorsteuerabzug. </b><br />Ums
       <td class="spalte"><span class="nodis">(Spalte 51 rechts)</span></td>
       <td class="betrag"><%511%></td>
     </tr>
+<%end year2007%>
+<%if year2007%>
+    <tr>
+      <td class="text2">zum Steuersatz von 19 v.H.</td>
+      <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>81<span class="nodis">)</span></td>
+      <td class="betrag ausfuellen" width="70"><%81%><br></td>
+      <td class="spalte"><span class="nodis">(Spalte 81 rechts)</span></td>
+      <td class="betrag"><%811%></td>
+    </tr>    
+<%end year2007%>
+
     <tr>
       <td class="text">zum Steuersatz von 7 v.H.</td>
       <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>86<span class="nodis">)</span></td>
@@ -186,7 +198,7 @@ Vorsteuerabzug. </b><br />Ums
       <td class="spalte"><span class="nodis"></span></td>
       <td class="betrag"></td>
     </tr>
-
+<%if not year2007%>
     <tr>
       <td class="text">Steuerpflichtige zum Steuersatz von 16 v.H.</td>
       <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>97<span class="nodis">)</span></td>
@@ -194,6 +206,16 @@ Vorsteuerabzug. </b><br />Ums
       <td class="spalte"><span class="nodis">(Spalte 97 rechts)</span></td>
       <td class="betrag"><%971%></td>
     </tr>
+<%end if year2007%>
+<%if year2007%>
+    <tr>
+      <td class="text">Steuerpflichtige zum Steuersatz von 19 v.H.</td>
+      <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>89<span class="nodis">)</span></td>
+      <td class="betrag ausfuellen"><%89%><br></td>
+      <td class="spalte"><span class="nodis">(Spalte 89 rechts)</span></td>
+      <td class="betrag"><%891%></td>
+    </tr>
+<%end if year2007%>
     <tr>
       <td class="text2">zum Steuersatz von 7 v.H.</td>
       <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>93<span class="nodis">)</span></td>

diff --git a/templates/webpages/dbupgrade/ustva_setup_2007_error_master.html b/templates/webpages/dbupgrade/ustva_setup_2007_error_master.html
new file mode 100644 (file)
index 0000000..d62657e
--- /dev/null
+++ b/templates/webpages/dbupgrade/ustva_setup_2007_error_master.html
@@ -0,0 +1,5 @@
+<p><b><translate>Error</translate>:</b> <TMPL_VAR message></p>
+
+<form>
+<input type="button" onclick="history.back()" value="<translate>Back</translate>">
+</form>