bookyt_salary 0.16.6 → 0.16.7
Sign up to get free protection for your applications and to get access to all the features.
- data/app/views/salaries/_form.html.haml +5 -5
- data/app/views/salaries/_list.html.haml +1 -1
- data/app/views/salaries/select_employee.html.haml +2 -2
- data/app/views/salaries/show.html.haml +2 -3
- data/app/views/salary_booking_templates/_form.html.haml +9 -9
- data/app/views/salary_booking_templates/_list.html.haml +1 -1
- data/app/views/salary_booking_templates/statistics.html.haml +1 -1
- data/app/views/salary_items/_list_form.html.haml +1 -1
- data/app/views/salary_reports/yearly_ahv_statement.html.haml +1 -1
- data/app/views/salary_templates/_form.html.haml +3 -3
- data/app/views/salary_templates/_list.html.haml +1 -1
- data/lib/bookyt_salary/navigation.rb +1 -1
- data/lib/bookyt_salary/version.rb +1 -1
- metadata +4 -4
|
@@ -5,13 +5,13 @@
|
|
|
5
5
|
= f.input :employer_id, :as => :hidden
|
|
6
6
|
= f.input :state, :as => :hidden
|
|
7
7
|
.row
|
|
8
|
-
.
|
|
8
|
+
.span12= f.input :title, :input_html => {:class => 'span12'}
|
|
9
9
|
.row
|
|
10
|
-
.
|
|
11
|
-
.
|
|
10
|
+
.span6= f.input :duration_from, :as => :date_field
|
|
11
|
+
.span6= f.input :duration_to, :as => :date_field
|
|
12
12
|
.row
|
|
13
|
-
.
|
|
14
|
-
.
|
|
13
|
+
.span12= f.input :text, :input_html => {:rows => 4, :class => 'span12'}
|
|
14
|
+
.span12= f.input :remarks, :input_html => {:rows => 4, :class => 'span12'}
|
|
15
15
|
|
|
16
16
|
= render 'line_items/list_form', :f => f, :invoice => resource
|
|
17
17
|
|
|
@@ -5,9 +5,9 @@
|
|
|
5
5
|
|
|
6
6
|
= f.inputs do
|
|
7
7
|
.row
|
|
8
|
-
.
|
|
8
|
+
.span6= f.input :employee, :as => :combobox
|
|
9
9
|
.row
|
|
10
|
-
.
|
|
10
|
+
.span6= f.input :duration_from, :as => :date_field
|
|
11
11
|
|
|
12
12
|
= f.buttons do
|
|
13
13
|
= f.commit_button
|
|
@@ -2,8 +2,7 @@
|
|
|
2
2
|
= icon_link_to(:payslip, {:action => :payslip, :format => :pdf}, :target => '_blank')
|
|
3
3
|
= contextual_links_for
|
|
4
4
|
|
|
5
|
-
|
|
6
|
-
%h1= resource.title
|
|
5
|
+
=boot_page_title
|
|
7
6
|
|
|
8
7
|
- bookings = Booking.by_reference(resource)
|
|
9
8
|
- credit_accounts = bookings.select('credit_account_id').group('credit_account_id').map{|account| account.credit_account}
|
|
@@ -18,4 +17,4 @@
|
|
|
18
17
|
.tab-content
|
|
19
18
|
#tab-main.active= render "form"
|
|
20
19
|
- accounts.each do |account|
|
|
21
|
-
%div{:id => "tab-account-#{account.id}"}= render 'direct_bookings/show', :reference => resource, :direct_account => account
|
|
20
|
+
%div.tab-pane{:id => "tab-account-#{account.id}"}= render 'direct_bookings/show', :reference => resource, :direct_account => account
|
|
@@ -2,22 +2,22 @@
|
|
|
2
2
|
= f.semantic_errors
|
|
3
3
|
= f.inputs do
|
|
4
4
|
.row
|
|
5
|
-
.
|
|
6
|
-
.
|
|
5
|
+
.span6= f.input :title, :input_html => {"data-autofocus" => true}
|
|
6
|
+
.span6= f.input :code
|
|
7
7
|
.row
|
|
8
|
-
.
|
|
9
|
-
.
|
|
8
|
+
.span6= f.input :credit_account, :as => :combobox, :collection => accounts_as_collection
|
|
9
|
+
.span6= f.input :debit_account, :as => :combobox, :collection => accounts_as_collection
|
|
10
10
|
.row
|
|
11
|
-
.
|
|
12
|
-
.
|
|
11
|
+
.span6= f.input :amount
|
|
12
|
+
.span6= f.input :amount_relates_to, :collection => amount_relates_to_collection
|
|
13
13
|
.row
|
|
14
|
-
.
|
|
14
|
+
.span12= f.input :comments, :input_html => {:rows => 2, :class => 'span12'}
|
|
15
15
|
|
|
16
16
|
.row
|
|
17
|
-
.
|
|
17
|
+
.span12= f.input :include_in_saldo_list, :input_html => {:class => 'span12'}
|
|
18
18
|
|
|
19
19
|
.row
|
|
20
|
-
.
|
|
20
|
+
.span6= f.input :salary_declaration_code
|
|
21
21
|
|
|
22
22
|
= f.buttons do
|
|
23
23
|
= f.commit_button
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
= f.inputs t_title(:list, SalaryItem) do
|
|
2
|
-
%table.
|
|
2
|
+
%table.table.table-striped.salary_items.collection.nested-form-container
|
|
3
3
|
%thead
|
|
4
4
|
= render 'salary_items/list_header', :template => f.object
|
|
5
5
|
%tbody.sortable
|
|
@@ -2,10 +2,10 @@
|
|
|
2
2
|
= f.semantic_errors
|
|
3
3
|
= f.inputs do
|
|
4
4
|
.row
|
|
5
|
-
.
|
|
6
|
-
.
|
|
5
|
+
.span6= f.input :title, :input_html => {"data-autofocus" => true}
|
|
6
|
+
.span6= f.input :person, :as => :combobox, :collection => Employee.all
|
|
7
7
|
.row
|
|
8
|
-
.
|
|
8
|
+
.span12= f.input :remarks, :input_html => {:rows => 2, :class => 'span12'}
|
|
9
9
|
|
|
10
10
|
= render 'salary_items/list_form', :f => f
|
|
11
11
|
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
module BookytSalary
|
|
2
2
|
module Navigation
|
|
3
3
|
def setup_bookyt_salary(navigation)
|
|
4
|
-
navigation.item :salaries, t_title(:index, Salary),
|
|
4
|
+
navigation.item :salaries, t_title(:index, Salary), "#",
|
|
5
5
|
:if => Proc.new { user_signed_in? } do |salaries|
|
|
6
6
|
salaries.item :salary_list, t_title(:index, Salary), salaries_path, :highlights_on => /\/salaries($|\/[0-9]*($|\/.*))/
|
|
7
7
|
salaries.item :new_salary, t_title(:new, Salary), select_employee_salaries_path
|
metadata
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: bookyt_salary
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
hash:
|
|
4
|
+
hash: 81
|
|
5
5
|
prerelease:
|
|
6
6
|
segments:
|
|
7
7
|
- 0
|
|
8
8
|
- 16
|
|
9
|
-
-
|
|
10
|
-
version: 0.16.
|
|
9
|
+
- 7
|
|
10
|
+
version: 0.16.7
|
|
11
11
|
platform: ruby
|
|
12
12
|
authors:
|
|
13
13
|
- "Simon H\xC3\xBCrlimann (CyT)"
|
|
@@ -15,7 +15,7 @@ autorequire:
|
|
|
15
15
|
bindir: bin
|
|
16
16
|
cert_chain: []
|
|
17
17
|
|
|
18
|
-
date: 2012-03-
|
|
18
|
+
date: 2012-03-26 00:00:00 Z
|
|
19
19
|
dependencies:
|
|
20
20
|
- !ruby/object:Gem::Dependency
|
|
21
21
|
name: rails
|