Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision aecdcab3

Von Hans Peter Schlaepfer vor fast 6 Jahren hinzugefügt

  • ID aecdcab36f764aca1253d496107c70034ec5e160
  • Vorgänger 9d0fc9cc
  • Nachfolger 97a566ba

Neues kivitendo Design Aenderungen in templates/webpages/reconciliation/..

Unterschiede anzeigen:

templates/webpages/reconciliation/_linked_transactions.html
6 6
[% SET debug = 0 %]
7 7

  
8 8
[% IF !SELF.LINKED_TRANSACTIONS.size %]
9
  <tbody class="listrow">
10
    <td colspan="11"><p class="message_hint">[% 'No data was found.' | $T8 %]</p></td>
9
  <tbody>
10
    <td colspan="11"><p class="message message_hint">[% 'No data was found.' | $T8 %]</p></td>
11 11
  </tbody>
12 12
[% ELSE %]
13 13
  [% FOREACH link = SELF.LINKED_TRANSACTIONS %]
14 14
    [% IF link.type == 'Link' %]
15
      <tbody class="listrow">
15
      <tbody>
16 16
        [% FOREACH bt = link.BT %]
17 17
          <tr>
18 18
            [% IF loop.count == 1 %]
19
              <td rowspan=[% link.BT.size + link.BB.size %] style="valign:center;">
19
              <td rowspan="[% link.BT.size + link.BB.size %]" class="button">
20 20
                [% L.button_tag('delete_reconciliation(' _ link.rec_group  _ ')', LxERP.t8("X")) %]
21 21
              </td>
22 22
            [% END %]
......
24 24
            <td><img width="16px" height="16px" src="image/bank-building.jpg"></td>
25 25
            <td>[% 'Bank Transaction' | $T8 %]</td>
26 26
            [% IF debug %]<td>[% HTML.escape(bt.id) %]</td>[% END %]
27
            <td align="right" class="[% HTML.escape(bt.class) %]">[% HTML.escape(bt.transdate_as_date) %]</td>
28
            <td align="right" class="[% HTML.escape(bt.class) %]">[% HTML.escape(bt.amount_as_number) %]</td>
27
            <td class="date right [% HTML.escape(bt.class) %]">[% HTML.escape(bt.transdate_as_date) %]</td>
28
            <td class="numeric right [% HTML.escape(bt.class) %]">[% HTML.escape(bt.amount_as_number) %]</td>
29 29
            <td></td>
30 30
            <td>[% HTML.escape(bt.remote_name) %]</td>
31 31
            <td>[% HTML.escape(bt.purpose) %]</td>
......
39 39
            <td><div class="icon16 general-ledger--reports--journal"></div></td>
40 40
            <td>[% 'Acc Transaction' | $T8 %]</td>
41 41
            [% IF debug %]<td>[% HTML.escape(bb.acc_trans_id) %]</td>[% END %]
42
            <td align="right" class="[% HTML.escape(bb.class) %]">[% HTML.escape(bb.transdate_as_date) %]</td>
42
            <td class="date right [% HTML.escape(bb.class) %]">[% HTML.escape(bb.transdate_as_date) %]</td>
43 43
            <td></td>
44
            <td align="right" class="[% HTML.escape(bb.class) %]">[% LxERP.format_amount(-1 * bb.amount, 2) %]</td>
44
            <td class="numeric right [% HTML.escape(bb.class) %]">[% LxERP.format_amount(-1 * bb.amount, 2) %]</td>
45 45
            <td>[% HTML.escape(bb.record.customer.name) %][% HTML.escape(bb.record.vendor.name) %][% HTML.escape(bb.record.description) %]</td>
46 46
            <td>[% bb.record.link %] [% HTML.escape(bb.source) %] [% HTML.escape(bb.memo) %]</td>
47 47
            <td></td>
......
61 61
            <td><img width="16px" height="16px" src="image/bank-building.jpg"></td>
62 62
            <td>[% 'Bank Transaction' | $T8 %]</td>
63 63
            [% IF debug %]<td>[% HTML.escape(bt.id) %]</td>[% END %]
64
            <td align="right">[% HTML.escape(bt.transdate_as_date) %]</td>
65
            <td align="right">[% HTML.escape(bt.amount_as_number) %]</td>
64
            <td class="date right">[% HTML.escape(bt.transdate_as_date) %]</td>
65
            <td class="numeric right">[% HTML.escape(bt.amount_as_number) %]</td>
66 66
            <td></td>
67 67
            <td>[% HTML.escape(bt.remote_name) %]</td>
68 68
            <td>[% HTML.escape(bt.purpose) %]</td>
......
80 80
            <td><div class="icon16 general-ledger--reports--journal"></div></td>
81 81
            <td>[% 'Acc Transaction' | $T8 %]</td>
82 82
            [% IF debug %]<td>[% HTML.escape(bb.acc_trans_id) %]</td>[% END %]
83
            <td align="right">[% HTML.escape(bb.transdate_as_date) %]</td>
83
            <td class="date right">[% HTML.escape(bb.transdate_as_date) %]</td>
84 84
            <td></td>
85
            <td align="right">[% LxERP.format_amount(-1 * bb.amount, 2) %]</td>
85
            <td class="numeric right">[% LxERP.format_amount(-1 * bb.amount, 2) %]</td>
86 86
            <td>[% HTML.escape(bb.record.customer.name) %][% HTML.escape(bb.record.vendor.name) %][% HTML.escape(bb.record.description) %]</td>
87 87
            <td>[% bb.record.link %] [% HTML.escape(bb.source) %] [% HTML.escape(bb.memo) %]</td>
88 88
            <td></td>
templates/webpages/reconciliation/assigning_table.html
1 1
[%- USE HTML -%][%- USE LxERP -%][%- USE L -%][%- USE T8 -%]
2 2

  
3 3
[% IF SELF.ELEMENTS.size %]
4
<table>
4
<table class="tbl-horizontal test">
5 5
  <thead>
6
    <tr class="listheading">
6
    <tr>
7 7
      <th></th>
8 8
      <th>[% 'ID' | $T8 %]</th>
9 9
      <th>[% 'Type' | $T8 %]</th>
......
12 12
      <th>[% 'Amount BB' | $T8 %]</th>
13 13
    </tr>
14 14
  </thead>
15
  <!-- PENDENT: tbody#assigned_elements war in der foreach-Schlaufe, was falsch ist. Ueberpruefen -->
16
  <tbody id="assigned_elements">
15 17
  [% FOREACH element = SELF.ELEMENTS %]
16
    <tbody id="assigned_elements">
17
      <tr class="listrow" id='element[% element.type %][% element.id %]'>
18
       <td><a href=# onclick="delete_element('[% element.id %]', '[% element.type %]')">x</a></td>
19
       <td>[% HTML.escape(element.id) %]</td>
20
       <td>[% IF element.type == 'BT' %][% 'Bank transaction' | $T8 %][% ELSE %][% 'Acc transaction' | $T8 %][% END %]</td>
21
       <td>[% HTML.escape(element.transdate_as_date) %]</td>
22
       <td align="right">[% IF element.type == 'BT' %][% HTML.escape(element.amount_as_number) %][% END %]</td>
23
       <td align="right">[% IF element.type == 'BB' %][% LxERP.format_amount(-1 * element.amount, 2) %][% END %]</td>
24
      </tr>
25
    </tbody>
26
  [% END %]
27
  <tbody>
28
    <tr class="listrow">
29
      <td class="listtotal top_border"></td>
30
      <td class="listtotal top_border"></td>
31
      <td class="listtotal top_border"></td>
32
      <td class="listtotal top_border"></td>
33
      <td class="listtotal top_border">[% bt_sum %]</td>
34
      <td class="listtotal top_border">[% bb_sum %]</td>
18
    <tr id="element[% element.type %][% element.id %]">
19
     <td><a href="#" onclick='delete_element("[% element.id %]", "[% element.type %]")'>x</a></td>
20
     <td>[% HTML.escape(element.id) %]</td>
21
     <td>[% IF element.type == 'BT' %][% 'Bank transaction' | $T8 %][% ELSE %][% 'Acc transaction' | $T8 %][% END %]</td>
22
     <td>[% HTML.escape(element.transdate_as_date) %]</td>
23
     <td class="numeric right">[% IF element.type == 'BT' %][% HTML.escape(element.amount_as_number) %][% END %]</td>
24
     <td class="numeric right">[% IF element.type == 'BB' %][% LxERP.format_amount(-1 * element.amount, 2) %][% END %]</td>
35 25
    </tr>
26
  [% END %]
36 27
  </tbody>
28
  <tfoot>
29
    <tr>
30
      <td></td>
31
      <td></td>
32
      <td></td>
33
      <td></td>
34
      <td class="numeric">[% bt_sum %]</td>
35
      <td class="numeric">[% bb_sum %]</td>
36
    </tr>
37
  </tfoot>
37 38
</table>
38 39
  [% UNLESS errors %]
39 40
   [% L.button_tag("submit_with_action('reconcile')", LxERP.t8("Reconcile")) %]
templates/webpages/reconciliation/form.html
3 3
[%- USE LxERP %]
4 4
[%- USE L %]
5 5

  
6
<style type="text/css">
7
<!--
8
html, body {
9
  height: 100%;
10
}
11
.top_border {
12
  border-top: solid black;
13
  border-width: 4px;
14
}
15
.bottom_border {
16
  border-bottom: solid black;
17
  border-width: 4px;
18
}
19
#content.html-menu { height: 100%; }
20
.out_of_balance {
21
  color: #888888;
22
}
23
-->
24
</style>
6
<h1>[% title %]</h1>
25 7

  
26
<div class="listtop">[% title %]</div>
27 8
[%- INCLUDE 'common/flash.html' %]
28 9

  
29
<form id="reconciliation_form" method="post" action="controller.pl" style="height:100%" id="filter_form">
30
  <table>
10
<form id="reconciliation_form" method="post" action="controller.pl" id="filter_form">
11

  
12
  <table class="tbl-horizontal test">
13
    <tbody>
31 14
    <tr>
32
     <th align="right">[% 'Bank account' | $T8 %]</th>
15
     <th>[% 'Bank account' | $T8 %]</th>
33 16
     <td>[% L.select_tag('filter.local_bank_account_id:number',
34 17
                          SELF.BANK_ACCOUNTS,
35 18
                          default=FORM.filter.local_bank_account_id_number,
......
40 23
    </tr>
41 24

  
42 25
    <tr>
43
     <th align="right">[% 'From' | $T8 %]</th>
26
     <th>[% 'From' | $T8 %]</th>
44 27
     <td>[% L.date_tag('filter.fromdate:date::ge', FORM.filter.fromdate_date__ge, onchange='filter_table();') %]</td>
45
     <th align="right">[% 'to (date)' | $T8 %]</th>
28
     <th>[% 'to (date)' | $T8 %]</th>
46 29
     <td>[% L.date_tag('filter.todate:date::le', FORM.filter.todate_date__le, onchange='filter_table();') %]</td>
47 30
    </tr>
48 31

  
49 32
    <tr>
50
     <th align="right">[% 'Cleared/uncleared only' | $T8 %]</th>
33
     <th>[% 'Cleared/uncleared only' | $T8 %]</th>
51 34
     <td>[% L.select_tag('filter.cleared:eq_ignore_empty', SELF.cleared, value_key = 'value', title_key = 'title', default=FORM.filter.cleared_eq_ignore_empty, onchange='filter_table();') %]</td>
52 35
    </tr>
53 36

  
54 37
    <tr>
55
     <th align="right">[% 'Show Stornos' | $T8 %]</th>
38
     <th>[% 'Show Stornos' | $T8 %]</th>
56 39
     <td>[% L.checkbox_tag('filter.show_stornos', checked=FORM.filter.show_stornos, value='1', onchange='filter_table();') %]</td>
57 40
    </tr>
58 41

  
59 42
    <tr>
60
     <th align="right">[% 'Absolute BT Balance' | $T8 %]</th>
61
     <td class='absolut_bt_balance'>[% LxERP.format_amount(SELF.absolut_bt_balance, 2) %]</td>
43
     <th>[% 'Absolute BT Balance' | $T8 %]</th>
44
     <td class="absolut_bt_balance">[% LxERP.format_amount(SELF.absolut_bt_balance, 2) %]</td>
62 45
    </tr>
63 46

  
64 47
    <tr>
65
     <th align="right">[% 'Absolute BB Balance' | $T8 %]</th>
66
     <td class='absolut_bb_balance'>[% LxERP.format_amount(-1 * SELF.absolut_bb_balance, 2) %]</td>
48
     <th>[% 'Absolute BB Balance' | $T8 %]</th>
49
     <td class="absolut_bb_balance">[% LxERP.format_amount(-1 * SELF.absolut_bb_balance, 2) %]</td>
67 50
    </tr>
68 51

  
69 52
    <tr>
70
     <th align="right">[% 'BT Balance' | $T8 %]</th>
71
     <td class='bt_balance'>[% LxERP.format_amount(SELF.bt_balance, 2) %]</td>
53
     <th>[% 'BT Balance' | $T8 %]</th>
54
     <td class="bt_balance">[% LxERP.format_amount(SELF.bt_balance, 2) %]</td>
72 55
    </tr>
73 56

  
74 57
    <tr>
75
     <th align="right">[% 'BB Balance' | $T8 %]</th>
76
     <td class='bb_balance'>[% LxERP.format_amount(-1 * SELF.bb_balance, 2) %]</td>
58
     <th>[% 'BB Balance' | $T8 %]</th>
59
     <td class="bb_balance">[% LxERP.format_amount(-1 * SELF.bb_balance, 2) %]</td>
77 60
    </tr>
61
    </tbody>
78 62
  </table>
79 63

  
80 64
  <div id="reconc_tabs" class="tabwidget" style="height:100%">
81 65
    <ul>
82
      <li><a href="#overview" onclick="load_overview();">[% 'Overview' | $T8 %]</a></li>
83
      <li><a href="#automatic" onclick="load_proposals();">[% 'Proposals' | $T8 %]</a></li>
66
      <li><a href="#overview" onclick='load_overview();'>[% 'Overview' | $T8 %]</a></li>
67
      <li><a href="#automatic" onclick='load_proposals();'>[% 'Proposals' | $T8 %]</a></li>
84 68
    </ul>
85 69

  
86 70
    <div id="overview" style="height:calc(100% - 60px);overflow: auto;">
87 71
    [%- IF ui_tab == 0 %]
88
    [% PROCESS "reconciliation/tabs/overview.html" %]
72
      [% PROCESS "reconciliation/tabs/overview.html" %]
89 73
    [%- END %]</div>
90 74
    <div id="automatic" style="height:calc(100% - 60px);overflow: auto;">
91 75
    [%- IF ui_tab == 1 %]
92
    [% PROCESS "reconciliation/tabs/automatic.html" %]
93
    [%- END %]    </div>
76
      [% PROCESS "reconciliation/tabs/automatic.html" %]
77
    [%- END %]</div>
94 78
  </div>
95 79

  
96 80
</form>
templates/webpages/reconciliation/proposals.html
7 7

  
8 8
[% IF !SELF.PROPOSALS.size %]
9 9
  <tbody class="listrow">
10
    <td colspan="11"><p class="message_hint">[% 'No data was found.' | $T8 %]</p></td>
10
    <td colspan="11"><p class="message message_hint">[% 'No data was found.' | $T8 %]</p></td>
11 11
  </tbody>
12 12
[% ELSE %]
13 13
  [% FOREACH proposal = SELF.PROPOSALS %]
templates/webpages/reconciliation/search.html
1
[%- USE T8 %]
2
[%- USE HTML %]
3
[%- USE L %]
4
[%- USE LxERP %]
1
[% USE T8 %]
2
[% USE HTML %]
3
[% USE L %]
4
[% USE LxERP %]
5 5

  
6
<h1>[% 'Reconciliation of bank accounts' | $T8 %]</h1>
6 7
<form method="post" action="controller.pl" id="search_form">
7 8

  
8
<div class="listtop">[% 'Choose bank account for reconciliation' | $T8 %]</div>
9

  
10
<p>
11
 <table>
12
  <tr>
13
   <th align="right">[% 'Bank account' | $T8 %]</th>
14
   <td>[% L.select_tag('filter.local_bank_account_id:number', SELF.BANK_ACCOUNTS, title_key='displayable_name', with_empty=0, style='width:450px') %]</td>
15
  </tr>
16

  
17
  <tr>
18
   <th align="right">[% 'From' | $T8 %]</th>
19
   <td>[% L.date_tag('filter.fromdate:date::ge') %]</td>
20
  </tr>
21

  
22
  <tr>
23
   <th align="right">[% 'to (date)' | $T8 %]</th>
24
   <td>[% L.date_tag('filter.todate:date::le') %]</td>
25
  </tr>
26

  
27
  <tr>
28
   <th align="right">[% 'Cleared/uncleared only' | $T8 %]</th>
29
   <td>[% L.select_tag('filter.cleared:eq_ignore_empty', SELF.cleared, value_key = 'value', title_key = 'title', default = 'FALSE' ) %]</td>
30
  </tr>
31

  
32
  <tr>
33
   <th align="right">[% 'Show Stornos' | $T8 %]</th>
34
   <td>[% L.checkbox_tag('filter.show_stornos', value='1') %]</td>
35
  </tr>
36
 </table>
37
</p>
9
<div class="wrapper">
10
  <table class="tbl-horizontal">
11
    <caption>[% 'Choose bank account for reconciliation' | $T8 %]</caption>
12
    <tbody>
13
      <tr>
14
       <th>[% 'Bank account' | $T8 %]</th>
15
       <td>[% L.select_tag('filter.local_bank_account_id:number', SELF.BANK_ACCOUNTS, title_key='displayable_name', with_empty=0, class='wi-wide') %]</td>
16
      </tr>
17
      <tr>
18
       <th>[% 'From' | $T8 %]</th>
19
       <td><span class="wi-date">[% L.date_tag('filter.fromdate:date::ge') %]</span></td>
20
      </tr>
21
      <tr>
22
       <th>[% 'to (date)' | $T8 %]</th>
23
       <td><span class="wi-date">[% L.date_tag('filter.todate:date::le') %]</span></td>
24
      </tr>
25
      <tr>
26
       <th>[% 'Cleared/uncleared only' | $T8 %]</th>
27
       <td>[% L.select_tag('filter.cleared:eq_ignore_empty', SELF.cleared, value_key = 'value', title_key = 'title', default = 'FALSE', class='wi-wide' ) %]</td>
28
      </tr>
29
      <tr>
30
       <th>[% 'Show Stornos' | $T8 %]</th>
31
       <td>[% L.checkbox_tag('filter.show_stornos', value='1') %]</td>
32
      </tr>
33
    </tbody>
34
   </table>
35
</div>
38 36
</form>
templates/webpages/reconciliation/tabs/automatic.html
1
[%- USE T8 %]
2
[%- USE HTML %]
3
[%- USE LxERP %]
4
[%- USE L %]
1
[% USE T8 %]
2
[% USE HTML %]
3
[% USE LxERP %]
4
[% USE L %]
5 5

  
6 6
[% SET debug = 0 %]
7 7

  
8 8
<table width=100% id="proposal_table">
9 9
  <thead>
10
    <tr class="listheading">
10
    <tr>
11 11
      <th>[% L.checkbox_tag('proposal_check_all') %]</th>
12 12

  
13 13
      <th></th>
templates/webpages/reconciliation/tabs/overview.html
1
[%- USE T8 %]
2
[%- USE HTML %]
3
[%- USE LxERP %]
4
[%- USE L %]
1
[% USE T8 %]
2
[% USE HTML %]
3
[% USE LxERP %]
4
[% USE L %]
5 5

  
6 6
[% SET debug = 0 %]
7 7

  
8 8
  <div style="height:500px; overflow:auto;">
9 9
    <table width=99% id="link_table">
10 10
      <thead>
11
        <tr class="listheading">
11
        <tr>
12 12
          <th></th>
13 13

  
14 14
          <th></th>
......
33 33
          <td class="top_border"></td>
34 34
          <td class="top_border"></td>
35 35
          <td class="top_border"></td>
36
          <td class="bt_balance top_border" align="right">[% LxERP.format_amount(SELF.bt_balance, 2) %]</td>
37
          <td class="bb_balance top_border" align="right">[% LxERP.format_amount(-1 * SELF.bb_balance, 2) %]</td>
36
          <td class="bt_balance top_border">[% LxERP.format_amount(SELF.bt_balance, 2) %]</td>
37
          <td class="bb_balance top_border">[% LxERP.format_amount(-1 * SELF.bb_balance, 2) %]</td>
38 38
          <td class="top_border"></td>
39 39
          <td class="top_border"></td>
40 40
          <td class="top_border"></td>

Auch abrufbar als: Unified diff