Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision e0d47e23

Von Udo Spallek vor fast 18 Jahren hinzugefügt

  • ID e0d47e23c8ef3863f7c2387e49e2207f9140f0db
  • Vorgänger 1c1d2aee
  • Nachfolger b24e7e44

Ueberarbeitet r1807: System-> Kontenuebersicht-> Konten anzeigen.
Bitte testen.

Unterschiede anzeigen:

SL/CA.pm
86 86
      c.pos_eur,
87 87
      c.valid_from,
88 88
      c.datevautomatik,
89
      ( SELECT comma(taxkey_id)
90
        FROM taxkeys tk
91
        WHERE tk.chart_id = c.id
92
          AND c.taxkey_id = tk.taxkey_id
93
        ORDER BY c.id
94
      ) AS taxkey_id,
89
--      ( SELECT comma(taxkey_id)
90
--        FROM taxkeys tk
91
--        WHERE tk.chart_id = c.id
92
--          AND c.taxkey_id = tk.taxkey_id
93
--        ORDER BY c.id
94
--      ) AS taxkey_id,
95

  
96
      ( SELECT comma(taxkey)
97
        FROM tax tx
98
        WHERE tx.id in (
99
          SELECT tk.tax_id from taxkeys tk 
100
          WHERE tk.chart_id = c.id
101
        ) 
102
        ORDER BY c.accno
103
      ) AS taxkey,
95 104

  
96 105
      ( SELECT comma(taxdescription)
97 106
        FROM tax tx
98 107
        WHERE tx.id in (
99 108
          SELECT tk.tax_id from taxkeys tk 
100
          WHERE tk.chart_id = (
101
            SELECT id from chart 
102
            WHERE chart.accno='0027' -- Beispielkonto aus dem SKR03
103
          )
109
          WHERE tk.chart_id = c.id
104 110
        ) 
105 111
        ORDER BY c.accno
106 112
      ) AS taxdescription,
113
      
114
      ( SELECT comma(taxnumber)
115
        FROM tax tx
116
        WHERE tx.id in (
117
          SELECT tk.tax_id from taxkeys tk 
118
          WHERE tk.chart_id = c.id
119
        ) 
120
        ORDER BY c.accno
121
      ) AS taxaccount,
107 122

  
108 123
      ( SELECT comma(tk.pos_ustva)
109 124
        FROM taxkeys tk
bin/mozilla/am.pl
575 575
      $ca->{link} .= qq|[| . $link . qq|] |;
576 576
    }
577 577
    
578
    $ca->{startdate} =~ s/,/<br>/og;
579
    $ca->{tk_ustva}  =~ s/,/<br>/og;
580

  
581
    $ca->{taxkey_id}  =~ s/,/<br>/og;
582
    $ca->{taxdescription}  =~ s/,/<br>/og;
583

  
578
    $ca->{startdate}      =~ s/,/<br>/og;
579
    $ca->{tk_ustva}       =~ s/,/<br>/og;
580
    $ca->{taxkey}         =~ s/,/<br>/og;
581
    $ca->{taxaccount}     =~ s/,/<br>/og;
582
    $ca->{taxdescription} =~ s/,/<br>/og;
584 583
    $ca->{datevautomatik} = ($ca->{datevautomatik}) ? $locale->text('On'):q{};
585 584

  
586 585
    $ca->{category} = ($ca->{category} eq 'A') ? $locale->text('Account Category A')
locale/de/all
484 484
  'Fee'                         => 'Geb?hr',
485 485
  'File locked!'                => 'Datei gesperrt!',
486 486
  'Folgekonto'                  => 'Folgekonto',
487
  'Following Account'           => 'Folgekonto',
487
  'Following Account'           => 'Folge-<br />konto',
488 488
  'For each unit there\'s either no or exactly one base unit. If you chose a base unit then you also have to chose a factor. That way the new unit will be defined as a multiple of the base unit. The base unit must be the &quot;smaller&quot; one. A factor may not be less than 1. Therefore you may define &quot;kg&quot; with the base unit &quot;g&quot; and a factor of &quot;1&quot;, but not the other way round.' => 'Einheiten haben entweder keine oder genau eine Basiseinheit, von der sie ein Vielfaches sind. Wenn Sie eine Basiseinheit ausw&auml;hlen, dann m&uuml;ssen Sie auch einen Faktor eingeben. Sie m&uuml;ssen Einheiten als ein Vielfaches einer kleineren Einheit eingeben. So ist die Definition von &quot;kg&quot; mit der Basiseinheit &quot;g&quot; und dem Faktor 1000 zul&auml;ssig, die Definition von &quot;g&quot; mit der Basiseinheit &quot;kg&quot; und dem Faktor &quot;0,001&quot; hingegen nicht.',
489 489
  'Foreign Exchange Gain'       => 'Wechselkursertr?ge',
490 490
  'Foreign Exchange Loss'       => 'Wechselkursaufwendungen',
......
988 988
  'Tax number'                  => 'Steuernummer',
989 989
  'Tax paid'                    => 'Vorsteuer',
990 990
  'Taxable'                     => 'Steuerpflichtig',
991
  'Taxaccount'                  => 'Steuer Konto',
991 992
  'Taxation'                    => 'Versteuerungs Verfahren',
992
  'Taxdescription'              => 'Beschreibung',
993
  'Taxdescription'              => 'Steuerkonto<br />Beschreibung',
993 994
  'Taxkey'                      => 'Steuerschl?ssel',
994 995
  'Tel'                         => 'Tel',
995 996
  'Tel.'                        => 'Telefon',
templates/webpages/am/list_accounts_de.html
2 2

  
3 3
    <table border="0" cellpadding="3" cellspacing="3" width="100%">
4 4
      <tr>
5
        <th class="listtop" colspan="12"><TMPL_VAR title ESCAPE=HTML></th>
5
        <th class="listtop" colspan="14"><TMPL_VAR title ESCAPE=HTML></th>
6 6
      </tr>
7
      <tr height=5></tr>
8
      <tr class=listheading>
7
      <tr height="5"></tr>
8
      <tr class="listheading">
9 9
        <th colspan="3"><b>Kontonummer</b></th>
10
        <th colspan="8"><b>Beschreibung</b></a></th>
10
        <th colspan="9"><b>Beschreibung</b></a></th>
11 11
        <th rowspan="3">Haben</th>
12 12
        <th rowspan="3">Soll</th>
13 13
      </tr>  
14
      <tr class=listheading>
14
      <tr class="listheading">
15 15
        <th colspan="3"><b>Kontenart</b></th>
16 16
        
17
        <th colspan="8">Verkn?pfungen</th>
17
        <th colspan="9">Verkn?pfungen</th>
18 18
      </tr>
19
      <tr class=listheading>
19
      <tr class="listheading">
20 20
        <th>Steuerschl?ssel</th>
21
        <th>Beschreibung</th>
21
        <th>Steuer Konto</th>
22
        <th>Steuerkonto<br />Beschreibung</th>
22 23
        <th>G?ltig ab</th>
23 24
        <th>tk_ustva</th>
24 25
        <th>UStVA</th>
......
26 27
        <th>Bilanz</th>
27 28
        <th>E/?R</th>
28 29
        <th>Datev</th>
30
        <th>Folge-<br />konto</th>
29 31
        <th>G?ltig ab</th>
30
        <th>Folgekonto</th>
31 32
      </tr>
32 33

  
33 34
<TMPL_LOOP CA>
34 35

  
35 36
  <TMPL_IF heading>
36 37

  
37
      <tr class=listheading>
38
        <td colspan="3" abbr="Kontonummer">
38
      <tr class="listheading">
39
        <td colspan="3">
39 40
          <a href=<TMPL_VAR link_edit_account> >
40 41
            <TMPL_VAR accno>
41 42
          </a>
42 43
        </td>
43
        <td colspan="6">
44
          <a href=<TMPL_VAR description> >
44
        <td colspan="9">
45
          <a href="<TMPL_VAR description>" >
45 46
            <TMPL_VAR accno>
46 47
          </a>
47 48
        </td>
......
51 52

  
52 53
  
53 54
    <TMPL_IF __odd__>
54
        <tr valign=top class=listrow1>
55
        <tr valign="top" class="listrow1">
55 56
    <TMPL_ELSE>
56 57
        
57
        <tr valign=top class=listrow0>
58
        <tr valign="top" class="listrow0">
58 59
    </TMPL_IF>
59 60

  
60
          <td colspan="3" abbr="Kontonummer"><b>
61
          <td colspan="3"><b>
61 62
            <a href="<TMPL_VAR link_edit_account>" ><TMPL_VAR accno></a>
62 63
          </td>
63
          <td colspan="8"><b><TMPL_VAR description ESCAPE=HTML>&nbsp;</b></td>
64
          <td colspan="9"><b><TMPL_VAR description ESCAPE=HTML>&nbsp;</b></td>
64 65
          <td rowspan="3" align=right><TMPL_VAR debit>&nbsp;</td>
65 66
          <td rowspan="3" align=right><TMPL_VAR credit>&nbsp;</td>
66 67
  
67 68
        </tr> 
68 69
                                 
69 70
    <TMPL_IF __odd__>
70
        <tr valign=top class=listrow1>
71
        <tr valign="top" class="listrow1">
71 72
    <TMPL_ELSE>
72
        <tr valign=top class=listrow0>
73
        <tr valign="top" class="listrow0">
73 74
    </TMPL_IF>
74 75

  
75 76
          <td colspan="3"><b><TMPL_VAR category ESCAPE=HTML>&nbsp;</b></td>
76
          <td colspan="8"><TMPL_VAR link>&nbsp;</td>
77
          <td colspan="9"><TMPL_VAR link>&nbsp;</td>
77 78
        </tr>                                
78 79

  
79 80
    <TMPL_IF __odd__>
80
        <tr valign=top class=listrow1>
81
        <tr class="listrow1">
81 82
    <TMPL_ELSE>
82
        <tr valign=top class=listrow0>
83
        <tr class="listrow0">
83 84
    </TMPL_IF>
84 85

  
85
          <td><TMPL_VAR taxkey_id                  >&nbsp;</td>
86
          <td nowrap="nowrap"><TMPL_VAR taxdescription             >&nbsp;</td>
87
          <td><TMPL_VAR startdate                  >&nbsp;</td>
88
          <td><TMPL_VAR tk_ustva                   >&nbsp;</td>
86
          <td valign="top"><TMPL_VAR taxkey                     >&nbsp;</td>
87
          <td valign="top"><TMPL_VAR taxaccount                 >&nbsp;</td>
88
          <td valign="top"><TMPL_VAR taxdescription             >&nbsp;</td>
89
          <td valign="top"><TMPL_VAR startdate                  >&nbsp;</td>
90
          <td valign="top"><TMPL_VAR tk_ustva                   >&nbsp;</td>
89 91

  
90
          <td><TMPL_VAR pos_ustva       ESCAPE=HTML>&nbsp;</td>
91
          <td><TMPL_VAR pos_bwa         ESCAPE=HTML>&nbsp;</td>
92
          <td><TMPL_VAR pos_bilanz      ESCAPE=HTML>&nbsp;</td>
93
          <td><TMPL_VAR pos_eur         ESCAPE=HTML>&nbsp;</td>
94
          <td><TMPL_VAR datevautomatik  ESCAPE=HTML>&nbsp;</td>
95
          <td><TMPL_VAR valid_from      ESCAPE=HTML>&nbsp;</td>
96
          <td><TMPL_VAR new_account     ESCAPE=HTML>&nbsp;</td>
92
          <td valign="center"><TMPL_VAR pos_ustva       ESCAPE=HTML>&nbsp;</td>
93
          <td valign="center"><TMPL_VAR pos_bwa         ESCAPE=HTML>&nbsp;</td>
94
          <td valign="center"><TMPL_VAR pos_bilanz      ESCAPE=HTML>&nbsp;</td>
95
          <td valign="center"><TMPL_VAR pos_eur         ESCAPE=HTML>&nbsp;</td>
96
          <td valign="center"><TMPL_VAR datevautomatik  ESCAPE=HTML>&nbsp;</td>
97
          <td valign="center"><TMPL_VAR new_account     ESCAPE=HTML>&nbsp;</td>
98
          <td valign="center"><TMPL_VAR valid_from      ESCAPE=HTML>&nbsp;</td>
97 99

  
98 100
        </tr>
101
        <tr>
102
          <td colspan="14">&nbsp;</td>
103
        </tr>
99 104
  </TMPL_IF>
100 105

  
101 106

  
102 107
</TMPL_LOOP>
103 108

  
104 109
      <tr>
105
        <td colspan=14><hr size=3 noshade></td>
110
        <td colspan="14"><hr size="3" noshade="noshade"></td>
106 111
      </tr>
107 112
    </table>
108 113
      
templates/webpages/am/list_accounts_master.html
2 2

  
3 3
    <table border="0" cellpadding="3" cellspacing="3" width="100%">
4 4
      <tr>
5
        <th class="listtop" colspan="12"><TMPL_VAR title ESCAPE=HTML></th>
5
        <th class="listtop" colspan="14"><TMPL_VAR title ESCAPE=HTML></th>
6 6
      </tr>
7
      <tr height=5></tr>
8
      <tr class=listheading>
7
      <tr height="5"></tr>
8
      <tr class="listheading">
9 9
        <th colspan="3"><b><translate>Account Number</translate></b></th>
10
        <th colspan="8"><b><translate>Description</translate></b></a></th>
10
        <th colspan="9"><b><translate>Description</translate></b></a></th>
11 11
        <th rowspan="3"><translate>Credit</translate></th>
12 12
        <th rowspan="3"><translate>Debit</translate></th>
13 13
      </tr>  
14
      <tr class=listheading>
14
      <tr class="listheading">
15 15
        <th colspan="3"><b><translate>category</translate></b></th>
16 16
        
17
        <th colspan="8"><translate>Link</translate></th>
17
        <th colspan="9"><translate>Link</translate></th>
18 18
      </tr>
19
      <tr class=listheading>
19
      <tr class="listheading">
20 20
        <th><translate>Taxkey</translate></th>
21
        <th><translate>Taxaccount</translate></th>
21 22
        <th><translate>Taxdescription</translate></th>
22 23
        <th><translate>Startdate</translate></th>
23 24
        <th><translate>tk_ustva</translate></th>
......
26 27
        <th><translate>pos_bilanz</translate></th>
27 28
        <th><translate>pos_eur</translate></th>
28 29
        <th><translate>Datev</translate></th>
29
        <th><translate>valid_from</translate></th>
30 30
        <th><translate>Following Account</translate></th>
31
        <th><translate>valid_from</translate></th>
31 32
      </tr>
32 33

  
33 34
<TMPL_LOOP CA>
34 35

  
35 36
  <TMPL_IF heading>
36 37

  
37
      <tr class=listheading>
38
        <td colspan="3" abbr="<translate>Account Number</translate>">
38
      <tr class="listheading">
39
        <td colspan="3">
39 40
          <a href=<TMPL_VAR link_edit_account> >
40 41
            <TMPL_VAR accno>
41 42
          </a>
42 43
        </td>
43
        <td colspan="6">
44
          <a href=<TMPL_VAR description> >
44
        <td colspan="9">
45
          <a href="<TMPL_VAR description>" >
45 46
            <TMPL_VAR accno>
46 47
          </a>
47 48
        </td>
......
51 52

  
52 53
  
53 54
    <TMPL_IF __odd__>
54
        <tr valign=top class=listrow1>
55
        <tr valign="top" class="listrow1">
55 56
    <TMPL_ELSE>
56 57
        
57
        <tr valign=top class=listrow0>
58
        <tr valign="top" class="listrow0">
58 59
    </TMPL_IF>
59 60

  
60
          <td colspan="3" abbr="<translate>Account Number</translate>"><b>
61
          <td colspan="3"><b>
61 62
            <a href="<TMPL_VAR link_edit_account>" ><TMPL_VAR accno></a>
62 63
          </td>
63
          <td colspan="8"><b><TMPL_VAR description ESCAPE=HTML>&nbsp;</b></td>
64
          <td colspan="9"><b><TMPL_VAR description ESCAPE=HTML>&nbsp;</b></td>
64 65
          <td rowspan="3" align=right><TMPL_VAR debit>&nbsp;</td>
65 66
          <td rowspan="3" align=right><TMPL_VAR credit>&nbsp;</td>
66 67
  
67 68
        </tr> 
68 69
                                 
69 70
    <TMPL_IF __odd__>
70
        <tr valign=top class=listrow1>
71
        <tr valign="top" class="listrow1">
71 72
    <TMPL_ELSE>
72
        <tr valign=top class=listrow0>
73
        <tr valign="top" class="listrow0">
73 74
    </TMPL_IF>
74 75

  
75 76
          <td colspan="3"><b><TMPL_VAR category ESCAPE=HTML>&nbsp;</b></td>
76
          <td colspan="8"><TMPL_VAR link>&nbsp;</td>
77
          <td colspan="9"><TMPL_VAR link>&nbsp;</td>
77 78
        </tr>                                
78 79

  
79 80
    <TMPL_IF __odd__>
80
        <tr valign=top class=listrow1>
81
        <tr class="listrow1">
81 82
    <TMPL_ELSE>
82
        <tr valign=top class=listrow0>
83
        <tr class="listrow0">
83 84
    </TMPL_IF>
84 85

  
85
          <td><TMPL_VAR taxkey_id                  >&nbsp;</td>
86
          <td nowrap="nowrap"><TMPL_VAR taxdescription             >&nbsp;</td>
87
          <td><TMPL_VAR startdate                  >&nbsp;</td>
88
          <td><TMPL_VAR tk_ustva                   >&nbsp;</td>
86
          <td valign="top"><TMPL_VAR taxkey                     >&nbsp;</td>
87
          <td valign="top"><TMPL_VAR taxaccount                 >&nbsp;</td>
88
          <td valign="top"><TMPL_VAR taxdescription             >&nbsp;</td>
89
          <td valign="top"><TMPL_VAR startdate                  >&nbsp;</td>
90
          <td valign="top"><TMPL_VAR tk_ustva                   >&nbsp;</td>
89 91

  
90
          <td><TMPL_VAR pos_ustva       ESCAPE=HTML>&nbsp;</td>
91
          <td><TMPL_VAR pos_bwa         ESCAPE=HTML>&nbsp;</td>
92
          <td><TMPL_VAR pos_bilanz      ESCAPE=HTML>&nbsp;</td>
93
          <td><TMPL_VAR pos_eur         ESCAPE=HTML>&nbsp;</td>
94
          <td><TMPL_VAR datevautomatik  ESCAPE=HTML>&nbsp;</td>
95
          <td><TMPL_VAR valid_from      ESCAPE=HTML>&nbsp;</td>
96
          <td><TMPL_VAR new_account     ESCAPE=HTML>&nbsp;</td>
92
          <td valign="center"><TMPL_VAR pos_ustva       ESCAPE=HTML>&nbsp;</td>
93
          <td valign="center"><TMPL_VAR pos_bwa         ESCAPE=HTML>&nbsp;</td>
94
          <td valign="center"><TMPL_VAR pos_bilanz      ESCAPE=HTML>&nbsp;</td>
95
          <td valign="center"><TMPL_VAR pos_eur         ESCAPE=HTML>&nbsp;</td>
96
          <td valign="center"><TMPL_VAR datevautomatik  ESCAPE=HTML>&nbsp;</td>
97
          <td valign="center"><TMPL_VAR new_account     ESCAPE=HTML>&nbsp;</td>
98
          <td valign="center"><TMPL_VAR valid_from      ESCAPE=HTML>&nbsp;</td>
97 99

  
98 100
        </tr>
101
        <tr>
102
          <td colspan="14">&nbsp;</td>
103
        </tr>
99 104
  </TMPL_IF>
100 105

  
101 106

  
102 107
</TMPL_LOOP>
103 108

  
104 109
      <tr>
105
        <td colspan=14><hr size=3 noshade></td>
110
        <td colspan="14"><hr size="3" noshade="noshade"></td>
106 111
      </tr>
107 112
    </table>
108 113
      

Auch abrufbar als: Unified diff