bookyt_salary 0.23.3 → 0.24.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 66c84e540bf3b3b16672e7568b4253b6c338f974
4
- data.tar.gz: 8ba88a07284f68abe0bc8f4ac18a62bfcaf44e58
3
+ metadata.gz: 9331a23bfb3b4c1eeec051bfcef8f760a6328d4b
4
+ data.tar.gz: ac27c190609516f509dd52e7192a757de311d7bf
5
5
  SHA512:
6
- metadata.gz: 3625e8a2a26bbec62c9cff3449c0cc5449882c860524f26b0b3da30553c4fce69ca55e4c553a2f90868b408386f33a86b3af55a20baefb3a9c6afcbb240d3392
7
- data.tar.gz: 0388734a47c56d5ac8b7ad30375ee91c150024b76a4bde6cd18da632c579e437abdd2c0ee399bcae621a483c88e8cfe942c3ea782720bbb9efdb4af2719c35ff
6
+ metadata.gz: 5f5d6c75e26ea59857578522e5c9e4241364afdbc4fd4dd0d5fb1c1dd92777c3f3852ea6bd0a8c42ee68847c44cb53de8f2fc8b4f6133ba6faf88bb85b2fcdbe
7
+ data.tar.gz: 898a6705edbfa9aa9857bb896c4cf9f68d7a002025a4a56c59972fabf0e54ea4c076e444cc322515b5fced64a06f44e5c33a84a9f7f9a7a06552c13250020617
@@ -1,8 +1,8 @@
1
- %tr.salary_item.nested-form-item
2
- %td= salary_item.text_field :position, :required => true, :style => 'width: 3em', :autocomplete => "off"
3
- %td= salary_item.select :salary_booking_template_id, SalaryBookingTemplate.all.map{|template| [template.title, template.id]}, {:include_blank => true, :required => true}, :class => 'combobox'
4
- %td= salary_item.text_field :times, :required => true, :style => 'width: 3em', :autocomplete => "off"
5
- %td= salary_item.text_field :price, :required => true, :style => 'width: 5em', :autocomplete => "off"
6
- %td.action_links
1
+ .row-fluid.nested-form-item.line_item[salary_item.object]
2
+ .span1= salary_item.text_field :position, :required => true, :autocomplete => "off"
3
+ .span7= salary_item.select :salary_booking_template_id, SalaryBookingTemplate.all.map{|template| [template.title, template.id]}, {:include_blank => true, :required => true}, :class => 'combobox'
4
+ .span1= salary_item.text_field :times, :required => true, :autocomplete => "off"
5
+ .span2.currency= salary_item.text_field :price, :required => true, :autocomplete => "off"
6
+ .span1.action_links
7
7
  = salary_item.hidden_field :_destroy
8
8
  = list_link_to :delete, '#', :class => 'delete-nested-form-item'
@@ -0,0 +1,3 @@
1
+ .span12.line_item_total
2
+ = link_to t('new_position', scope: 'line_items'), [:new_salary_item, resource.persisted? ? resource : resource.class.name.underscore.pluralize.to_sym], :remote => true, :class => 'btn'
3
+
@@ -1,7 +1,8 @@
1
1
  %h3= t_title(:list, SalaryItem)
2
- %table.table.salary_items.collection.nested-form-container
3
- %thead
4
- = render 'salary_items/list_header', :template => f.object
5
- %tbody.sortable
2
+ #salary_items.nested-form-container
3
+ = render 'salary_items/list_header'
4
+ .list.sortable
6
5
  = f.fields_for :salary_items do |salary_item|
7
- = render 'salary_items/form', :salary_item => salary_item, :template => f.object
6
+ = render 'salary_items/form', :salary_item => salary_item
7
+ .row-fluid.line_item
8
+ = render 'salary_items/list_footer'
@@ -1,6 +1,5 @@
1
- %tr
2
- %th{:style => 'padding: 2px; width: 3em'}= t_attr(:position, SalaryItem)
3
- %th{:style => 'padding: 2px'}= t_attr(:salary_booking_template, SalaryItem)
4
- %th{:style => 'padding: 2px; width: 3em'}= t_attr(:times, SalaryItem)
5
- %th{:style => 'padding: 2px; width: 3em'}= t_attr(:price, SalaryItem)
6
- %th.action_links= link_to t_action(:more), [:new_salary_item, template.persisted? ? template : template.class.name.underscore.pluralize.to_sym], :remote => true, :class => 'icon-add-text'
1
+ .row-fluid.head
2
+ .span1= t_attr(:position, SalaryItem)
3
+ .span7= t_attr(:salary_booking_template, SalaryItem)
4
+ .span1= t_attr(:times, SalaryItem)
5
+ .span2.currency= t_attr(:price, SalaryItem)
@@ -1,2 +1,2 @@
1
- $('.salary_items.collection tbody').append('<%=j render 'salary_item_form' %>');
1
+ $('#salary_items .list').append('<%=j render 'salary_item_form' %>');
2
2
  initializeBehaviours();
@@ -1,48 +1,71 @@
1
1
  # encoding: UTF-8
2
2
 
3
+ # Salaries
4
+ # ========
5
+ outside_capital = AccountType.find_by_name('outside_capital')
6
+ costs = AccountType.find_by_name('costs')
7
+
8
+ # Accounts
9
+ Account.create!([
10
+ {:code => "2020", :title => "Kreditoren Sozialversicherungen", :account_type => outside_capital},
11
+ {:code => "2050", :title => "Offene Lohnforderungen", :account_type => outside_capital},
12
+ {:code => "5000", :title => "Lohnaufwand", :account_type => costs},
13
+ {:code => "5700", :title => "Sozialversicherungaufwand", :account_type => costs},
14
+ {:code => "5800", :title => "Übriger Personalaufwand", :account_type => costs},
15
+ ])
16
+
17
+ # Booking Templates
18
+ BookingTemplate.create!([
19
+ {:code => "salary:invoice", :title => "Monatslohn", :credit_account => Account.find_by_code("2050"), :debit_account => Account.find_by_code("5000"), :amount => 1, :amount_relates_to => 'reference_amount'},
20
+ {:code => "salary:cancel", :title => "Storno", :credit_account => Account.find_by_code("5000"), :debit_account => Account.find_by_code("2050"), :amount => 1, :amount_relates_to => 'reference_amount'},
21
+
22
+ {:code => "salary:cash_payment", :title => "Barzahlung Lohn", :credit_account => Account.find_by_code("1000"), :debit_account => Account.find_by_code("2050"), :amount => 1, :amount_relates_to => 'reference_balance'},
23
+ {:code => "salary:bank_payment", :title => "Bankzahlung Lohn", :credit_account => Account.find_by_code("1020"), :debit_account => Account.find_by_code("2050")},
24
+ ])
25
+
3
26
  # SalaryBookingTemplates
4
27
  SalaryBookingTemplate.create!([
5
- {:code => '1000', :title => 'Monatslohn', :debit_account => Account.find_by_code('2050'), :credit_account => Account.find_by_code('5000'), :salary_declaration_code => '1', :include_in_saldo_list => 'Bruttolohn, AHV, UVG, UVGZ, KTG, Quellensteuer, Nettolohn', :amount => '', :amount_relates_to => ''},
6
- {:code => '1005', :title => 'Stundenlohn', :debit_account => Account.find_by_code('2050'), :credit_account => Account.find_by_code('5000'), :salary_declaration_code => '1', :include_in_saldo_list => 'Bruttolohn, AHV, UVG, UVGZ, KTG, Quellensteuer, Nettolohn', :amount => '', :amount_relates_to => ''},
7
- {:code => '1061', :title => 'Überstunden 125%', :debit_account => Account.find_by_code('2050'), :credit_account => Account.find_by_code('5000'), :salary_declaration_code => '1', :include_in_saldo_list => 'Bruttolohn, AHV, UVG, UVGZ, KTG, Quellensteuer, Nettolohn', :amount => '', :amount_relates_to => ''},
8
- {:code => '1073', :title => 'Sonntagszulage', :debit_account => Account.find_by_code('2050'), :credit_account => Account.find_by_code('5000'), :salary_declaration_code => '1', :include_in_saldo_list => 'Bruttolohn, AHV, UVG, UVGZ, KTG, Quellensteuer, Nettolohn', :amount => '', :amount_relates_to => ''},
9
- {:code => '1100', :title => 'Baustellenzulage', :debit_account => Account.find_by_code('2050'), :credit_account => Account.find_by_code('5000'), :salary_declaration_code => '1', :include_in_saldo_list => 'Bruttolohn, AHV, UVG, UVGZ, KTG, Quellensteuer, Nettolohn', :amount => '', :amount_relates_to => ''},
10
- {:code => '1160', :title => 'Ferienvergütung', :debit_account => Account.find_by_code('2050'), :credit_account => Account.find_by_code('5000'), :salary_declaration_code => '1', :include_in_saldo_list => 'Bruttolohn, AHV, UVG, UVGZ, KTG, Quellensteuer, Nettolohn', :amount => '', :amount_relates_to => ''},
11
- {:code => '1161', :title => 'Feiertagsentschädigung', :debit_account => Account.find_by_code('2050'), :credit_account => Account.find_by_code('5000'), :salary_declaration_code => '1', :include_in_saldo_list => 'Bruttolohn, AHV, UVG, UVGZ, KTG, Quellensteuer, Nettolohn', :amount => '', :amount_relates_to => ''},
12
- {:code => '1200', :title => '13. Monatslohn', :debit_account => Account.find_by_code('2050'), :credit_account => Account.find_by_code('5000'), :salary_declaration_code => '1', :include_in_saldo_list => 'Bruttolohn, AHV, UVG, UVGZ, KTG, Quellensteuer, Nettolohn', :amount => '', :amount_relates_to => ''},
13
- {:code => '1201', :title => 'Gratifikation', :debit_account => Account.find_by_code('2050'), :credit_account => Account.find_by_code('5000'), :salary_declaration_code => '3', :include_in_saldo_list => 'Bruttolohn, AHV, UVG, UVGZ, KTG, Quellensteuer, Nettolohn', :amount => '', :amount_relates_to => ''},
14
- {:code => '1202', :title => 'Weihnachtszulage', :debit_account => Account.find_by_code('2050'), :credit_account => Account.find_by_code('5000'), :salary_declaration_code => '3', :include_in_saldo_list => 'Bruttolohn, AHV, UVG, UVGZ, KTG, Quellensteuer, Nettolohn', :amount => '', :amount_relates_to => ''},
15
- {:code => '1300', :title => 'Lohn bei Unfall', :debit_account => Account.find_by_code('2050'), :credit_account => Account.find_by_code('5000'), :salary_declaration_code => '1', :include_in_saldo_list => 'Bruttolohn, AHV, UVG, UVGZ, KTG, Quellensteuer, Nettolohn', :amount => '', :amount_relates_to => ''},
16
- {:code => '1301', :title => 'Lohn bei Krankheit', :debit_account => Account.find_by_code('2050'), :credit_account => Account.find_by_code('5000'), :salary_declaration_code => '1', :include_in_saldo_list => 'Bruttolohn, AHV, UVG, UVGZ, KTG, Quellensteuer, Nettolohn', :amount => '', :amount_relates_to => ''},
17
- {:code => '1302', :title => 'Lohn bei Militärdienst/Zivilschutz', :debit_account => Account.find_by_code('2050'), :credit_account => Account.find_by_code('5000'), :salary_declaration_code => '1', :include_in_saldo_list => 'Bruttolohn, AHV, UVG, UVGZ, KTG, Quellensteuer, Nettolohn', :amount => '', :amount_relates_to => ''},
18
- {:code => '1303', :title => 'Lohn bei Aus- und Weiterbildung', :debit_account => Account.find_by_code('2050'), :credit_account => Account.find_by_code('5000'), :salary_declaration_code => '1', :include_in_saldo_list => 'Bruttolohn, AHV, UVG, UVGZ, KTG, Quellensteuer, Nettolohn', :amount => '', :amount_relates_to => ''},
19
- {:code => '1900', :title => 'Gratisverpflegung', :debit_account => Account.find_by_code('2050'), :credit_account => Account.find_by_code('5000'), :salary_declaration_code => '2.1', :include_in_saldo_list => 'Bruttolohn, AHV, UVG, UVGZ, KTG, Quellensteuer, Nettolohn', :amount => '', :amount_relates_to => ''},
20
- {:code => '1910', :title => 'Privatanteil Geschäftswagen', :debit_account => Account.find_by_code('2050'), :credit_account => Account.find_by_code('5000'), :salary_declaration_code => '2.2', :include_in_saldo_list => 'Bruttolohn, AHV, UVG, UVGZ, KTG, Quellensteuer, Nettolohn', :amount => '', :amount_relates_to => ''},
21
- {:code => '1980', :title => 'Weiterbildung (Lohnausweis)', :debit_account => Account.find_by_code('2050'), :credit_account => Account.find_by_code('5000'), :salary_declaration_code => '13.3', :include_in_saldo_list => 'Bruttolohn, AHV, UVG, UVGZ, KTG, Quellensteuer, Nettolohn', :amount => '', :amount_relates_to => ''},
22
- {:code => '2000', :title => 'EO-Taggeld', :debit_account => Account.find_by_code('2050'), :credit_account => Account.find_by_code('5000'), :salary_declaration_code => '1', :include_in_saldo_list => 'Bruttolohn, AHV, KTG, Quellensteuer, Nettolohn', :amount => '', :amount_relates_to => ''},
28
+ {:code => '1000', :title => 'Monatslohn', :credit_account => Account.find_by_code('2050'), :debit_account => Account.find_by_code('5000'), :salary_declaration_code => '1', :include_in_saldo_list => 'Bruttolohn, AHV, UVG, UVGZ, KTG, Quellensteuer, Nettolohn', :amount => '', :amount_relates_to => ''},
29
+ {:code => '1005', :title => 'Stundenlohn', :credit_account => Account.find_by_code('2050'), :debit_account => Account.find_by_code('5000'), :salary_declaration_code => '1', :include_in_saldo_list => 'Bruttolohn, AHV, UVG, UVGZ, KTG, Quellensteuer, Nettolohn', :amount => '', :amount_relates_to => ''},
30
+ {:code => '1061', :title => 'Überstunden 125%', :credit_account => Account.find_by_code('2050'), :debit_account => Account.find_by_code('5000'), :salary_declaration_code => '1', :include_in_saldo_list => 'Bruttolohn, AHV, UVG, UVGZ, KTG, Quellensteuer, Nettolohn', :amount => '', :amount_relates_to => ''},
31
+ {:code => '1073', :title => 'Sonntagszulage', :credit_account => Account.find_by_code('2050'), :debit_account => Account.find_by_code('5000'), :salary_declaration_code => '1', :include_in_saldo_list => 'Bruttolohn, AHV, UVG, UVGZ, KTG, Quellensteuer, Nettolohn', :amount => '', :amount_relates_to => ''},
32
+ {:code => '1100', :title => 'Baustellenzulage', :credit_account => Account.find_by_code('2050'), :debit_account => Account.find_by_code('5000'), :salary_declaration_code => '1', :include_in_saldo_list => 'Bruttolohn, AHV, UVG, UVGZ, KTG, Quellensteuer, Nettolohn', :amount => '', :amount_relates_to => ''},
33
+ {:code => '1160', :title => 'Ferienvergütung', :credit_account => Account.find_by_code('2050'), :debit_account => Account.find_by_code('5000'), :salary_declaration_code => '1', :include_in_saldo_list => 'Bruttolohn, AHV, UVG, UVGZ, KTG, Quellensteuer, Nettolohn', :amount => '', :amount_relates_to => ''},
34
+ {:code => '1161', :title => 'Feiertagsentschädigung', :credit_account => Account.find_by_code('2050'), :debit_account => Account.find_by_code('5000'), :salary_declaration_code => '1', :include_in_saldo_list => 'Bruttolohn, AHV, UVG, UVGZ, KTG, Quellensteuer, Nettolohn', :amount => '', :amount_relates_to => ''},
35
+ {:code => '1200', :title => '13. Monatslohn', :credit_account => Account.find_by_code('2050'), :debit_account => Account.find_by_code('5000'), :salary_declaration_code => '1', :include_in_saldo_list => 'Bruttolohn, AHV, UVG, UVGZ, KTG, Quellensteuer, Nettolohn', :amount => '', :amount_relates_to => ''},
36
+ {:code => '1201', :title => 'Gratifikation', :credit_account => Account.find_by_code('2050'), :debit_account => Account.find_by_code('5000'), :salary_declaration_code => '3', :include_in_saldo_list => 'Bruttolohn, AHV, UVG, UVGZ, KTG, Quellensteuer, Nettolohn', :amount => '', :amount_relates_to => ''},
37
+ {:code => '1202', :title => 'Weihnachtszulage', :credit_account => Account.find_by_code('2050'), :debit_account => Account.find_by_code('5000'), :salary_declaration_code => '3', :include_in_saldo_list => 'Bruttolohn, AHV, UVG, UVGZ, KTG, Quellensteuer, Nettolohn', :amount => '', :amount_relates_to => ''},
38
+ {:code => '1300', :title => 'Lohn bei Unfall', :credit_account => Account.find_by_code('2050'), :debit_account => Account.find_by_code('5000'), :salary_declaration_code => '1', :include_in_saldo_list => 'Bruttolohn, AHV, UVG, UVGZ, KTG, Quellensteuer, Nettolohn', :amount => '', :amount_relates_to => ''},
39
+ {:code => '1301', :title => 'Lohn bei Krankheit', :credit_account => Account.find_by_code('2050'), :debit_account => Account.find_by_code('5000'), :salary_declaration_code => '1', :include_in_saldo_list => 'Bruttolohn, AHV, UVG, UVGZ, KTG, Quellensteuer, Nettolohn', :amount => '', :amount_relates_to => ''},
40
+ {:code => '1302', :title => 'Lohn bei Militärdienst/Zivilschutz', :credit_account => Account.find_by_code('2050'), :debit_account => Account.find_by_code('5000'), :salary_declaration_code => '1', :include_in_saldo_list => 'Bruttolohn, AHV, UVG, UVGZ, KTG, Quellensteuer, Nettolohn', :amount => '', :amount_relates_to => ''},
41
+ {:code => '1303', :title => 'Lohn bei Aus- und Weiterbildung', :credit_account => Account.find_by_code('2050'), :debit_account => Account.find_by_code('5000'), :salary_declaration_code => '1', :include_in_saldo_list => 'Bruttolohn, AHV, UVG, UVGZ, KTG, Quellensteuer, Nettolohn', :amount => '', :amount_relates_to => ''},
42
+ {:code => '1900', :title => 'Gratisverpflegung', :credit_account => Account.find_by_code('2050'), :debit_account => Account.find_by_code('5000'), :salary_declaration_code => '2.1', :include_in_saldo_list => 'Bruttolohn, AHV, UVG, UVGZ, KTG, Quellensteuer, Nettolohn', :amount => '', :amount_relates_to => ''},
43
+ {:code => '1910', :title => 'Privatanteil Geschäftswagen', :credit_account => Account.find_by_code('2050'), :debit_account => Account.find_by_code('5000'), :salary_declaration_code => '2.2', :include_in_saldo_list => 'Bruttolohn, AHV, UVG, UVGZ, KTG, Quellensteuer, Nettolohn', :amount => '', :amount_relates_to => ''},
44
+ {:code => '1980', :title => 'Weiterbildung (Lohnausweis)', :credit_account => Account.find_by_code('2050'), :debit_account => Account.find_by_code('5000'), :salary_declaration_code => '13.3', :include_in_saldo_list => 'Bruttolohn, AHV, UVG, UVGZ, KTG, Quellensteuer, Nettolohn', :amount => '', :amount_relates_to => ''},
45
+ {:code => '2000', :title => 'EO-Taggeld', :credit_account => Account.find_by_code('2050'), :debit_account => Account.find_by_code('5000'), :salary_declaration_code => '1', :include_in_saldo_list => 'Bruttolohn, AHV, KTG, Quellensteuer, Nettolohn', :amount => '', :amount_relates_to => ''},
23
46
  {:code => '2035', :title => 'Kranken-Taggeld', :salary_declaration_code => '1', :include_in_saldo_list => 'Bruttolohn, Quellensteuer, Nettolohn', :amount => '', :amount_relates_to => ''},
24
- {:code => '2040', :title => 'Mutterschaftsentschädigung', :debit_account => Account.find_by_code('2050'), :credit_account => Account.find_by_code('5000'), :salary_declaration_code => '1', :include_in_saldo_list => 'Bruttolohn, AHV, KTG, Quellensteuer, Nettolohn', :amount => '', :amount_relates_to => ''},
25
- {:code => '3000', :title => 'Kinderzulage', :debit_account => Account.find_by_code('2050'), :credit_account => Account.find_by_code('5000'), :salary_declaration_code => '1', :include_in_saldo_list => 'Bruttolohn, Quellensteuer, Nettolohn', :amount => '300', :amount_relates_to => ''},
47
+ {:code => '2040', :title => 'Mutterschaftsentschädigung', :credit_account => Account.find_by_code('2050'), :debit_account => Account.find_by_code('5000'), :salary_declaration_code => '1', :include_in_saldo_list => 'Bruttolohn, AHV, KTG, Quellensteuer, Nettolohn', :amount => '', :amount_relates_to => ''},
48
+ {:code => '3000', :title => 'Kinderzulage', :credit_account => Account.find_by_code('2050'), :debit_account => Account.find_by_code('5000'), :salary_declaration_code => '1', :include_in_saldo_list => 'Bruttolohn, Quellensteuer, Nettolohn', :amount => '300', :amount_relates_to => ''},
26
49
  {:code => '5000', :title => 'Bruttolohn', :salary_declaration_code => '', :include_in_saldo_list => '', :amount => '', :amount_relates_to => 'Bruttolohn'},
27
- {:code => '5010', :title => 'AHV-Beitrag', :debit_account => Account.find_by_code('5000'), :credit_account => Account.find_by_code('2050'), :salary_declaration_code => '9', :include_in_saldo_list => 'Nettolohn', :amount => '5.15%', :amount_relates_to => 'AHV'},
28
- {:code => '5020', :title => 'ALV-Beitrag', :debit_account => Account.find_by_code('5000'), :credit_account => Account.find_by_code('2050'), :salary_declaration_code => '9', :include_in_saldo_list => 'Quellensteuer, Nettolohn', :amount => '1.1%', :amount_relates_to => 'AHV'},
29
- {:code => '5030', :title => 'ALVZ-Beitrag', :debit_account => Account.find_by_code('5000'), :credit_account => Account.find_by_code('2050'), :salary_declaration_code => '9', :include_in_saldo_list => 'Nettolohn', :amount => '0.5%', :amount_relates_to => 'AHV'},
30
- {:code => '5040', :title => 'NBUV-Beitrag', :debit_account => Account.find_by_code('5000'), :credit_account => Account.find_by_code('2050'), :salary_declaration_code => '9', :include_in_saldo_list => 'Nettolohn', :amount => '0.71%', :amount_relates_to => 'AHV'},
31
- {:code => '5041', :title => 'UVGZ-Beitrag A1', :debit_account => Account.find_by_code('5000'), :credit_account => Account.find_by_code('2050'), :salary_declaration_code => '', :include_in_saldo_list => 'Nettolohn', :amount => '', :amount_relates_to => 'UVG'},
32
- {:code => '5042', :title => 'UVGZ-Beitrag A2', :debit_account => Account.find_by_code('5000'), :credit_account => Account.find_by_code('2050'), :salary_declaration_code => '', :include_in_saldo_list => 'Nettolohn', :amount => '', :amount_relates_to => 'UVG'},
33
- {:code => '5045', :title => 'KTG-Beitrag A1', :debit_account => Account.find_by_code('5000'), :credit_account => Account.find_by_code('2050'), :salary_declaration_code => '', :include_in_saldo_list => 'Nettolohn', :amount => '', :amount_relates_to => 'KTG'},
34
- {:code => '5046', :title => 'KTG-Beitrag A2', :debit_account => Account.find_by_code('5000'), :credit_account => Account.find_by_code('2050'), :salary_declaration_code => '', :include_in_saldo_list => 'Nettolohn', :amount => '', :amount_relates_to => 'KTG'},
35
- {:code => '5048', :title => 'KTG-Beitrag B1', :debit_account => Account.find_by_code('5000'), :credit_account => Account.find_by_code('2050'), :salary_declaration_code => '', :include_in_saldo_list => 'Nettolohn', :amount => '', :amount_relates_to => 'KTG'},
36
- {:code => '5050', :title => 'BVG-Beitrag', :debit_account => Account.find_by_code('5000'), :credit_account => Account.find_by_code('2050'), :salary_declaration_code => '10.1', :include_in_saldo_list => 'Nettolohn', :amount => '', :amount_relates_to => ''},
37
- {:code => '5051', :title => 'BVG-Einkaufs-Beiträge', :debit_account => Account.find_by_code('5000'), :credit_account => Account.find_by_code('2050'), :salary_declaration_code => '10.2', :include_in_saldo_list => 'Nettolohn', :amount => '', :amount_relates_to => ''},
38
- {:code => '5060', :title => 'Quellensteuerabzug', :debit_account => Account.find_by_code('5000'), :credit_account => Account.find_by_code('2050'), :salary_declaration_code => '12', :include_in_saldo_list => 'Nettolohn', :amount => '', :amount_relates_to => ''},
39
- {:code => '6000', :title => 'Reisespesen', :debit_account => Account.find_by_code('2050'), :credit_account => Account.find_by_code('5800'), :salary_declaration_code => '13.1.1', :include_in_saldo_list => 'Nettolohn', :amount => '', :amount_relates_to => ''},
40
- {:code => '6001', :title => 'Autospesen', :debit_account => Account.find_by_code('2050'), :credit_account => Account.find_by_code('5800'), :salary_declaration_code => '13.1.1', :include_in_saldo_list => 'Nettolohn', :amount => '', :amount_relates_to => ''},
41
- {:code => '6002', :title => 'Verpflegungsspesen', :debit_account => Account.find_by_code('2050'), :credit_account => Account.find_by_code('5800'), :salary_declaration_code => '13.1.1', :include_in_saldo_list => 'Nettolohn', :amount => '', :amount_relates_to => ''},
42
- {:code => '6070', :title => 'Übrige Pauschalspesen', :debit_account => Account.find_by_code('2050'), :credit_account => Account.find_by_code('5800'), :salary_declaration_code => '13.2.3', :include_in_saldo_list => 'Nettolohn', :amount => '', :amount_relates_to => ''},
50
+ {:code => '5010', :title => 'AHV-Beitrag', :credit_account => Account.find_by_code('5000'), :debit_account => Account.find_by_code('2050'), :salary_declaration_code => '9', :include_in_saldo_list => 'Nettolohn', :amount => '5.15%', :amount_relates_to => 'AHV'},
51
+ {:code => '5020', :title => 'ALV-Beitrag', :credit_account => Account.find_by_code('5000'), :debit_account => Account.find_by_code('2050'), :salary_declaration_code => '9', :include_in_saldo_list => 'Quellensteuer, Nettolohn', :amount => '1.1%', :amount_relates_to => 'AHV'},
52
+ {:code => '5030', :title => 'ALVZ-Beitrag', :credit_account => Account.find_by_code('5000'), :debit_account => Account.find_by_code('2050'), :salary_declaration_code => '9', :include_in_saldo_list => 'Nettolohn', :amount => '0.5%', :amount_relates_to => 'AHV'},
53
+ {:code => '5040', :title => 'NBUV-Beitrag', :credit_account => Account.find_by_code('5000'), :debit_account => Account.find_by_code('2050'), :salary_declaration_code => '9', :include_in_saldo_list => 'Nettolohn', :amount => '0.71%', :amount_relates_to => 'AHV'},
54
+ {:code => '5041', :title => 'UVGZ-Beitrag A1', :credit_account => Account.find_by_code('5000'), :debit_account => Account.find_by_code('2050'), :salary_declaration_code => '', :include_in_saldo_list => 'Nettolohn', :amount => '', :amount_relates_to => 'UVG'},
55
+ {:code => '5042', :title => 'UVGZ-Beitrag A2', :credit_account => Account.find_by_code('5000'), :debit_account => Account.find_by_code('2050'), :salary_declaration_code => '', :include_in_saldo_list => 'Nettolohn', :amount => '', :amount_relates_to => 'UVG'},
56
+ {:code => '5045', :title => 'KTG-Beitrag A1', :credit_account => Account.find_by_code('5000'), :debit_account => Account.find_by_code('2050'), :salary_declaration_code => '', :include_in_saldo_list => 'Nettolohn', :amount => '', :amount_relates_to => 'KTG'},
57
+ {:code => '5046', :title => 'KTG-Beitrag A2', :credit_account => Account.find_by_code('5000'), :debit_account => Account.find_by_code('2050'), :salary_declaration_code => '', :include_in_saldo_list => 'Nettolohn', :amount => '', :amount_relates_to => 'KTG'},
58
+ {:code => '5048', :title => 'KTG-Beitrag B1', :credit_account => Account.find_by_code('5000'), :debit_account => Account.find_by_code('2050'), :salary_declaration_code => '', :include_in_saldo_list => 'Nettolohn', :amount => '', :amount_relates_to => 'KTG'},
59
+ {:code => '5050', :title => 'BVG-Beitrag', :credit_account => Account.find_by_code('5000'), :debit_account => Account.find_by_code('2050'), :salary_declaration_code => '10.1', :include_in_saldo_list => 'Nettolohn', :amount => '', :amount_relates_to => ''},
60
+ {:code => '5051', :title => 'BVG-Einkaufs-Beiträge', :credit_account => Account.find_by_code('5000'), :debit_account => Account.find_by_code('2050'), :salary_declaration_code => '10.2', :include_in_saldo_list => 'Nettolohn', :amount => '', :amount_relates_to => ''},
61
+ {:code => '5060', :title => 'Quellensteuerabzug', :credit_account => Account.find_by_code('5000'), :debit_account => Account.find_by_code('2050'), :salary_declaration_code => '12', :include_in_saldo_list => 'Nettolohn', :amount => '', :amount_relates_to => ''},
62
+ {:code => '6000', :title => 'Reisespesen', :credit_account => Account.find_by_code('2050'), :debit_account => Account.find_by_code('5800'), :salary_declaration_code => '13.1.1', :include_in_saldo_list => 'Nettolohn', :amount => '', :amount_relates_to => ''},
63
+ {:code => '6001', :title => 'Autospesen', :credit_account => Account.find_by_code('2050'), :debit_account => Account.find_by_code('5800'), :salary_declaration_code => '13.1.1', :include_in_saldo_list => 'Nettolohn', :amount => '', :amount_relates_to => ''},
64
+ {:code => '6002', :title => 'Verpflegungsspesen', :credit_account => Account.find_by_code('2050'), :debit_account => Account.find_by_code('5800'), :salary_declaration_code => '13.1.1', :include_in_saldo_list => 'Nettolohn', :amount => '', :amount_relates_to => ''},
65
+ {:code => '6070', :title => 'Übrige Pauschalspesen', :credit_account => Account.find_by_code('2050'), :debit_account => Account.find_by_code('5800'), :salary_declaration_code => '13.2.3', :include_in_saldo_list => 'Nettolohn', :amount => '', :amount_relates_to => ''},
43
66
  {:code => '6500', :title => 'Nettolohn', :salary_declaration_code => '', :include_in_saldo_list => 'Auszahlung', :amount => '', :amount_relates_to => 'Nettolohn'},
44
- {:code => '6510', :title => 'Vorauszahlung', :debit_account => Account.find_by_code('1020'), :credit_account => Account.find_by_code('2050'), :salary_declaration_code => '', :include_in_saldo_list => 'Auszahlung', :amount => '', :amount_relates_to => ''},
45
- {:code => '6600', :title => 'Auszahlung', :debit_account => Account.find_by_code('1020'), :credit_account => Account.find_by_code('2050'), :salary_declaration_code => '', :include_in_saldo_list => '', :amount => '', :amount_relates_to => 'Auszahlung'},
67
+ {:code => '6510', :title => 'Vorauszahlung', :credit_account => Account.find_by_code('1020'), :debit_account => Account.find_by_code('2050'), :salary_declaration_code => '', :include_in_saldo_list => 'Auszahlung', :amount => '', :amount_relates_to => ''},
68
+ {:code => '6600', :title => 'Auszahlung', :credit_account => Account.find_by_code('1020'), :debit_account => Account.find_by_code('2050'), :salary_declaration_code => '', :include_in_saldo_list => '', :amount => '', :amount_relates_to => 'Auszahlung'},
46
69
  ])
47
70
 
48
71
  # SalaryTemplate
@@ -1,3 +1,3 @@
1
1
  module BookytSalary
2
- VERSION = '0.23.3'
2
+ VERSION = '0.24.0'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bookyt_salary
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.23.3
4
+ version: 0.24.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Simon Hürlimann (CyT)
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-03-19 00:00:00.000000000 Z
11
+ date: 2016-08-15 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -72,6 +72,7 @@ files:
72
72
  - app/views/salary_booking_templates/_salary_booking_template.html.haml
73
73
  - app/views/salary_items/_form.html.haml
74
74
  - app/views/salary_items/_line_item.html.haml
75
+ - app/views/salary_items/_list_footer.html.haml
75
76
  - app/views/salary_items/_list_form.html.haml
76
77
  - app/views/salary_items/_list_header.html.haml
77
78
  - app/views/salary_reports/salary_declaration.html.haml
@@ -100,7 +101,6 @@ files:
100
101
  - db/migrate/20120201104444_switch_to_translated_saldo_inclusion_flags.rb
101
102
  - db/migrate/20120201125113_switch_line_items_to_translated_saldo_inclusion_flags.rb
102
103
  - db/migrate/20120503120833_add_leave_day_columns_to_salaries.rb
103
- - db/seeds.rb
104
104
  - db/seeds/locales/de-CH.rb
105
105
  - lib/bookyt_salary.rb
106
106
  - lib/bookyt_salary/navigation.rb
@@ -1,62 +0,0 @@
1
- # encoding: UTF-8
2
-
3
- # Salaries
4
- # ========
5
- outside_capital = AccountType.find_by_name('outside_capital')
6
- costs = AccountType.find_by_name('costs')
7
-
8
- # Accounts
9
- Account.create!([
10
- {:code => "2020", :title => "Kreditoren Sozialversicherungen", :account_type => outside_capital},
11
- {:code => "2050", :title => "Offene Lohnforderungen", :account_type => outside_capital},
12
- {:code => "5000", :title => "Lohnaufwand", :account_type => costs},
13
- {:code => "5700", :title => "Sozialversicherungaufwand", :account_type => costs},
14
- ])
15
-
16
- # Booking Templates
17
- BookingTemplate.create!([
18
- {:code => "salary:invoice", :title => "Monatslohn", :debit_account => Account.find_by_code("2050"), :credit_account => Account.find_by_code("5000"), :amount => 1, :amount_relates_to => 'reference_amount'},
19
- {:code => "salary:cancel", :title => "Storno", :debit_account => Account.find_by_code("5000"), :credit_account => Account.find_by_code("2050"), :amount => 1, :amount_relates_to => 'reference_amount'},
20
-
21
- {:code => "salary:cash_payment", :title => "Barzahlung Lohn", :debit_account => Account.find_by_code("1000"), :credit_account => Account.find_by_code("2050"), :amount => 1, :amount_relates_to => 'reference_balance'},
22
- {:code => "salary:bank_payment", :title => "Bankzahlung Lohn", :debit_account => Account.find_by_code("1020"), :credit_account => Account.find_by_code("2050")},
23
- ])
24
-
25
- # Charge Rates
26
- ChargeRate.create!([
27
- {:code => 'salary:both:ahv_iv_eo', :title => "AHV/IV/EO", :duration_from => '2007-01-01', :rate => 5.05},
28
- {:code => 'salary:both:ahv_iv_eo', :title => "AHV/IV/EO", :duration_from => '2011-01-01', :rate => 5.15},
29
-
30
- {:code => 'salary:both:alv', :title => "ALV", :duration_from => '2007-01-01', :rate => 1},
31
- {:code => 'salary:both:alv', :title => "ALV", :duration_from => '2011-01-01', :rate => 1.1},
32
-
33
- {:code => 'salary:both:alv_solidarity', :title => "ALV Solidaritätsprozent", :duration_from => '2011-01-01', :rate => 1},
34
-
35
- {:code => 'salary:employer:bu', :title => "BU", :duration_from => '2007-01-01', :duration_to => '2014-01-01', :rate => 0.071},
36
-
37
- {:code => 'salary:employee:nbu', :title => "NBU", :duration_from => '2010-07-01', :duration_to => '2014-01-01', :rate => 0.951},
38
- {:code => 'salary:employer:nbu', :title => "NBU", :duration_from => '2010-07-01', :duration_to => '2014-01-01', :rate => 0},
39
-
40
- {:code => 'salary:employer:fak', :title => "FAK", :duration_from => '2007-01-01', :rate => 1.6},
41
- {:code => 'salary:employer:fak', :title => "FAK", :duration_from => '2010-01-01', :rate => 1.4},
42
-
43
- {:code => 'salary:employer:vkb', :title => "VKB", :duration_from => '2007-01-01', :rate => 3 * 0.101},
44
- {:code => 'salary:employer:vkb', :title => "VKB", :duration_from => '2011-01-01', :rate => 3 * 0.13},
45
- ])
46
-
47
- ChargeBookingTemplate.create!([
48
- {:code => "salary:employee:ahv_iv_eo", :charge_rate_code => 'salary:both:ahv_iv_eo', :title => "AHV/IV/EO Arbeitnehmer", :debit_account => Account.find_by_code("2020"), :credit_account => Account.find_by_code("2050"), :amount_relates_to => 'reference_amount'},
49
- {:code => "salary:employer:ahv_iv_eo", :charge_rate_code => 'salary:both:ahv_iv_eo', :title => "AHV/IV/EO Arbeitgeber", :debit_account => Account.find_by_code("2020"), :credit_account => Account.find_by_code("5700"), :amount_relates_to => 'reference_amount'},
50
-
51
- {:code => "salary:employee:alv", :charge_rate_code => 'salary:both:alv', :title => "ALV Arbeitnehmer", :debit_account => Account.find_by_code("2020"), :credit_account => Account.find_by_code("2050"), :amount_relates_to => 'reference_amount'},
52
- {:code => "salary:employer:alv", :charge_rate_code => 'salary:both:alv', :title => "ALV Arbeitgeber", :debit_account => Account.find_by_code("2020"), :credit_account => Account.find_by_code("5700"), :amount_relates_to => 'reference_amount'},
53
-
54
- {:code => "salary:employer:bu", :charge_rate_code => 'salary:employer:bu', :title => "BU Arbeitgeber", :debit_account => Account.find_by_code("2020"), :credit_account => Account.find_by_code("5700"), :amount_relates_to => 'reference_amount'},
55
-
56
- {:code => "salary:employee:nbu", :charge_rate_code => 'salary:employee:nbu', :title => "NBU Arbeitnehmer", :debit_account => Account.find_by_code("2020"), :credit_account => Account.find_by_code("2050"), :amount_relates_to => 'reference_amount'},
57
- {:code => "salary:employer:nbu", :charge_rate_code => 'salary:employer:nbu', :title => "NBU Arbeitgeber", :debit_account => Account.find_by_code("2020"), :credit_account => Account.find_by_code("5700"), :amount_relates_to => 'reference_amount'},
58
-
59
- {:code => "salary:employer:fak", :charge_rate_code => 'salary:employer:fak', :title => "FAK Arbeitgeber", :debit_account => Account.find_by_code("2020"), :credit_account => Account.find_by_code("5700"), :amount_relates_to => 'reference_amount'},
60
-
61
- {:code => "salary:employer:vkb", :charge_rate_code => 'salary:employer:vkb', :title => "VKB Arbeitgeber", :debit_account => Account.find_by_code("2020"), :credit_account => Account.find_by_code("5700"), :amount_relates_to => 'reference_amount'},
62
- ])