bookyt_salary 0.6.0 → 0.7.0

data/app/controllers/salaries_controller.rb

@@ -43,6 +43,9 @@ class SalariesController < InvoicesController
     @salary.title       = "Lohn #{month_name} #{@salary.duration_from.year} - #{@salary.employee.vcard.full_name}"
     @salary.duration_to = @salary.duration_from.end_of_month
 
+    # Prebuild line items
+    @salary.build_line_items
+
     # Prebuild an empty attachment instance
     @salary.attachments.build
 

data/app/models/salary.rb

@@ -75,6 +75,16 @@ class Salary < Invoice
     self.due_date   ||= date
   end
 
+  # Line Items
+  def build_line_items
+    template = SalaryTemplate.where(:person_id => employee.id).first
+    template.salary_booking_templates.each do |booking_template|
+      line_item = line_items.build(:date => self.value_date)
+      line_item.booking_template = booking_template
+    end
+  end
+
+
   # Filter/Search
   # =============
   scope :by_value_period, lambda {|from, to| where("date(value_date) BETWEEN ? AND ?", from, to) }
@@ -101,33 +111,4 @@ class Salary < Invoice
   def self.default_debit_account
     self.direct_account
   end
-
-  # Bookings
-  # ========
-  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: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:employee:bvg")
-
-    super(params.merge(:person_id => employee.id), "salary:employee:kz")
-    super(params.merge(:person_id => employee.id), "salary:social:kz")
-  end
 end

data/app/models/salary_template.rb

@@ -1,4 +1,4 @@
 class SalaryTemplate < ActiveRecord::Base
   belongs_to :person
-  has_and_belongs_to_many :salary_booking_template
+  has_and_belongs_to_many :salary_booking_templates
 end

data/lib/bookyt_salary/version.rb

@@ -1,3 +1,3 @@
 module BookytSalary
-  VERSION = '0.6.0'
+  VERSION = '0.7.0'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bookyt_salary
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 3
   prerelease: 
   segments: 
   - 0
-  - 6
+  - 7
   - 0
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors: 
 - "Simon H\xC3\xBCrlimann (CyT)"