bookyt_salary 0.4.0 → 0.5.0

data/app/controllers/salaries_controller.rb

@@ -18,10 +18,7 @@ class SalariesController < InvoicesController
   def select_employee
     # Allow pre-seeding some parameters
     salary_params = {
-      :customer_id    => current_tenant.company.id,
-      :state          => 'booked',
-      :duration_from  => Date.today,
-      :duration_to    => Date.today.in(30.days).to_date
+      :duration_from  => Date.today.beginning_of_month
     }
 
     # Set default parameters
@@ -32,12 +29,13 @@ class SalariesController < InvoicesController
 
   def new
     @salary = Salary.new(params[:salary])
+    @employee = @salary.employee
 
-    employment = @salary.employee.employments.current
-
-    @salary.amount = employment.salary_amount
-
-    # Line Items
+    # Deduced defaults
+    @salary.employer_id = current_tenant.company.id
+    month_name          = t('date.month_names')[@salary.duration_from.month]
+    @salary.title       = "Lohn #{month_name} - #{@salary.employee.vcard.full_name}"
+    @salary.duration_to = @salary.duration_from.end_of_month
 
     # Prebuild an empty attachment instance
     @salary.attachments.build
@@ -47,6 +45,11 @@ class SalariesController < InvoicesController
 
   def create
     @salary = Salary.new(params[:salary])
+    @salary.state = 'booked'
+
+    # Set @employee in case we redisplay the form partial
+    @employee = @salary.employee
+
     @salary.build_booking
 
     create!

data/app/models/salary.rb

@@ -6,19 +6,26 @@ class Salary < Invoice
   validates :employee, :employer, :presence => true
 
   def employer_id=(value)
-    customer_id = value
+    self.customer_id = value
+  end
+  def employer_id
+    customer_id
   end
 
   def employee_id=(value)
-    company_id = value
+    self.company_id = value
+  end
+  def employee_id
+    company_id
   end
       
+  def employment
+    employee.employments.current
+  end
+
   # States
   # ======
   STATES = ['booked', 'canceled', 'paid']
-  scope :by_state, lambda {|value|
-    where(:state => value) unless value == 'all'
-  }
 
   # String
   def to_s(format = :default)
@@ -74,27 +81,30 @@ class Salary < Invoice
     Account.find_by_code("5000")
   end
 
+  def amount
+    employment.salary_amount if employment
+  end
+
   # Build booking
   #
   # We need to ensure the order of creation as we depent on current balance.
   def build_booking(params = {}, template_code = nil)
     # Build and assign booking
-    super(params, 'salary:employee:ahv_iv_eo').save
-    super(params, 'salary:employer:ahv_iv_eo').save
-    super(params, 'salary:employee:alv').save
-    super(params, 'salary:employer:alv').save
-    super(params, 'salary:employee:nbu').save
-    super(params, 'salary:employer:nbu').save
-    super(params, 'salary:employer:bu').save
-    super(params, 'salary:employer:fak').save
-    super(params, 'salary:employer:vkb').save
-
-    super(params, 'salary:employee:ktg').save
-    super(params.merge(:person_id => employee.id), "salary:bvg").save
-
-    super(params, 'salary:invoice').save
-
-    super(params.merge(:person_id => employee.id), "salary:kz").save
-    super(params.merge(:person_id => employee.id), "salary:social:kz").save
+    super(params, 'salary:invoice')
+    super(params, 'salary:employee:ahv_iv_eo')
+    super(params, 'salary:employer:ahv_iv_eo')
+    super(params, 'salary:employee:alv')
+    super(params, 'salary:employer:alv')
+    super(params, 'salary:employee:nbu')
+    super(params, 'salary:employer:nbu')
+    super(params, 'salary:employer:bu')
+    super(params, 'salary:employer:fak')
+    super(params, 'salary:employer:vkb')
+
+    super(params, 'salary:employee:ktg')
+    super(params.merge(:person_id => employee.id), "salary:bvg")
+
+    super(params.merge(:person_id => employee.id), "salary:kz")
+    super(params.merge(:person_id => employee.id), "salary:social:kz")
   end
 end

data/app/views/salaries/_form.html.haml

@@ -1,21 +1,14 @@
 = semantic_form_for @salary do |f|
   = f.semantic_errors
   = f.inputs do
+    = f.input :employee_id, :as => :hidden
+    = f.input :employer_id, :as => :hidden
     = f.input :title
     = f.input :duration_from, :as => :date_field
     = f.input :duration_to, :as => :date_field
-    = f.input :amount, :input_html => {:size => 12}
     = f.input :remarks, :input_html => {:rows => 4}
 
-  = f.inputs t('title.line_items') do
-    %table#line_items
-      %thead
-        = render 'line_items/list_header', :invoice => resource
-      %tbody
-        = f.fields_for :line_items do |line_item|
-          = render 'line_items/form', :line_item => line_item
-      %tfoot
-        = render 'line_items/list_footer', :total_amount => resource.amount
+  = render 'employees/show_charge_rates'
 
   = f.buttons do
     = f.commit_button

data/app/views/salaries/index.html.haml

@@ -1 +1,8 @@
-= render :template => 'application/index'
+.contextual
+  = icon_link_to :new, {:action => :select_employee}
+
+%h2= t_title
+
+= paginated_section collection do
+  - if collection.any?
+    = render "list"

data/app/views/salaries/select_employee.html.haml

@@ -1,10 +1,11 @@
-%h2 Arbeitnehmer auswählen
+%h2= t_title
 
 = semantic_form_for @salary, :url => new_salary_path, :method => :get do |f|
   = f.semantic_errors
 
   = f.inputs do
     = f.input :employee, :as => :combobox
+    = f.input :duration_from, :discard_day => true, :start_year => Time.now.year - 2, :end_year => Time.now.year + 1, :include_blank => false
 
   = f.buttons do
     = f.commit_button

data/config/locales/de.yml

@@ -12,10 +12,9 @@ de:
         employer:      Arbeitgeber
         employee:      Arbeitnehmer
 
-  crud:
-    title:
-      day:
-        new: Abrechnung von %{day}
+  salaries:
+    select_employee:
+      title: Arbeitnehmer auswählen
 
   bookyt:
     main_navigation:

data/lib/bookyt_salary/version.rb

@@ -1,3 +1,3 @@
 module BookytSalary
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bookyt_salary
 version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: false
+  hash: 11
+  prerelease: 
   segments: 
   - 0
-  - 4
+  - 5
   - 0
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - "Simon H\xC3\xBCrlimann (CyT)"
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-21 00:00:00 +01:00
-default_executable: 
+date: 2011-12-21 00:00:00 Z
 dependencies: []
 
 description: This plugin extends bookyt with Salary functionality.
@@ -48,7 +47,6 @@ files:
 - lib/bookyt_salary/navigation.rb
 - lib/bookyt_salary/railtie.rb
 - lib/bookyt_salary/version.rb
-has_rdoc: true
 homepage: https://github.com/huerlisi/bookyt_salary
 licenses: []
 
@@ -78,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Salary plugin for bookyt