bookyt_salary 0.14.2 → 0.14.3

data/app/helpers/salary_booking_template_helper.rb

@@ -1,5 +1,12 @@
 module SalaryBookingTemplateHelper
   def saldo_inclusion_flag_collection
-    SalaryBookingTemplate.saldo_inclusion_flags.map{|flag| [t_attr('saldo_inclusion_flags.' + flag), flag]}
+    SalaryBookingTemplate.saldo_inclusion_flags.map{|flag| [t('activerecord.attributes.salary_booking_template.saldo_inclusion_flags.' + flag), flag]}
+  end
+
+  def amount_relates_to_collection
+    saldo_inclusion_flags = SalaryBookingTemplate.saldo_inclusion_flags.map{|flag| [t('activerecord.attributes.salary_booking_template.saldo_inclusion_flags.' + flag), flag]}
+    booking_templates = SalaryBookingTemplate.all.map{|template| [template.title, template.id]}
+
+    return saldo_inclusion_flags + booking_templates
   end
 end

data/app/models/salary.rb

@@ -39,29 +39,21 @@ class Salary < Invoice
 
   # Calculations
   def net_amount
-    salary_invoice_booking = bookings.where(:debit_account_id => Account.find_by_code('2050').id).first
-    return 0.0 unless salary_invoice_booking
+    # TODO: hardcoded salary_booking_template
+    line_item = line_items.where(:code => '6500').first
 
-    salary_invoice_booking.amount
-  end
+    return 0.0 unless line_item
 
-  def bvg_amount
-    bookings.by_text("BVG").sum(:amount)
+    line_item.accounted_amount
   end
 
-  def social_amount
-    result = bookings.by_text("AHV/IV/EO Arbeitnehmer").sum(:amount)
-    result += bookings.by_text("ALV Arbeitnehmer").sum(:amount)
-    result += bookings.by_text("NBU Arbeitnehmer").sum(:amount)
-
-    result
-  end
+  def gross_amount
+    # TODO: hardcoded salary_booking_template
+    line_item = line_items.where(:code => '5000').first
 
-  def ahv_amount
-    result = amount
-    result += bookings.where(:title => "Kinderzulage").sum(:amount)
+    return 0.0 unless line_item
 
-    result
+    line_item.accounted_amount
   end
 
   # Assignment proxies

data/app/models/salary_booking_template.rb

@@ -1,7 +1,7 @@
 class SalaryBookingTemplate < BookingTemplate
   # Obligation flags
   def self.saldo_inclusion_flags
-    ['gross_income', 'net_income', 'ahv', 'uvg', 'uvgz', 'ktg', 'deduction_at_source']
+    ['gross_income', 'net_income', 'payment', 'ahv', 'uvg', 'uvgz', 'ktg', 'deduction_at_source']
   end
 
   def to_s

data/app/prawn/payslip_document.rb

@@ -27,6 +27,7 @@ class PayslipDocument < LetterDocument
       cells.borders = []
       cells.padding_bottom = 2
       cells.padding_top = 2
+      columns(0).padding_left = 0
 
       # Columns
       columns(2..4).align = :right
@@ -34,7 +35,7 @@ class PayslipDocument < LetterDocument
       # Saldo styling
       saldo_rows.each do |index|
         row(index).font_style = :bold
-        row(index).padding_bottom = 8
+        row(index).padding_bottom = 10
       end
 
       # Header styling

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

@@ -6,7 +6,7 @@
     %th= t_attr :company, Invoice
     %th= t_attr :title, Invoice
     %th= t_attr :due_date, Invoice
-    %th.currency= t_attr :amount, Salary
+    %th.currency= t_attr :gross_amount, Salary
     %th.currency= t_attr :net_amount, Salary
     %th.currency= t_attr :balance, Invoice
     %th.action-links

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

@@ -3,8 +3,8 @@
   %td= link_to salary.company, salary.company
   %td= link_to salary.title, salary, {'data-href-container' => 'tr'}
   %td= salary.due_date
-  %td.currency= currency_fmt(salary.amount)
+  %td.currency= currency_fmt(salary.gross_amount)
   %td.currency= currency_fmt(salary.net_amount)
-  %td.currency= currency_fmt(salary.balance(Date.today, Account.find_by_code('2050')))
+  %td.currency= currency_fmt(salary.balance(nil, Account.find_by_code('2050')))
   %td.action-links
     = list_link_for(:edit, salary)

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

@@ -9,7 +9,7 @@
       .span8= f.input :debit_account, :as => :combobox, :collection => accounts_as_collection
     .row
       .span8= f.input :amount
-      .span8= f.input :amount_relates_to
+      .span8= f.input :amount_relates_to, :collection => amount_relates_to_collection
     .row
       .span16= f.input :comments, :input_html => {:rows => 2, :class => 'span12'}
 

data/app/views/salary_booking_templates/_list.html.haml

@@ -7,7 +7,7 @@
     %th.currency= t_attr 'amount', SalaryBookingTemplate
     %th= t_attr :amount_relates_to, SalaryBookingTemplate
     - SalaryBookingTemplate.saldo_inclusion_flags.each do |flag|
-      %th= t_attr('saldo_inclusion_flags.' + flag, SalaryBookingTemplate)
+      %th= t('activerecord.attributes.salary_booking_template.saldo_inclusion_flags.' + flag)
     %th.right= t_attr :salary_declaration_code, SalaryBookingTemplate
 
   = render @salary_booking_templates

data/app/views/salary_booking_templates/_salary_booking_template.html.haml

@@ -8,7 +8,7 @@
   %td= link_to salary_booking_template.credit_account.code, account_path(salary_booking_template.credit_account), :title => salary_booking_template.credit_account.title unless salary_booking_template.credit_account.nil?
   %td= link_to salary_booking_template.debit_account.code, account_path(salary_booking_template.debit_account), :title => salary_booking_template.debit_account.title unless salary_booking_template.debit_account.nil?
   %td.currency= salary_booking_template.amount
-  %td= t_attr('saldo_inclusion_flags.' + salary_booking_template.amount_relates_to) if salary_booking_template.amount_relates_to.present?
+  %td= t('activerecord.attributes.salary_booking_template.saldo_inclusion_flags.' + salary_booking_template.amount_relates_to) if salary_booking_template.amount_relates_to.present?
   - SalaryBookingTemplate.saldo_inclusion_flags.each do |flag|
     %td= salary_booking_template.include_in_saldo_list.include?(flag) ? '<span class="label success">Ja</span>'.html_safe : ""
   %td.right= salary_booking_template.salary_declaration_code

data/app/views/salary_items/_list_form.html.haml

@@ -1,5 +1,5 @@
 = f.inputs t_title(:list, SalaryItem) do
-  %table#salary_items
+  %table#salary_items.nested-form-container
     %thead
       = render 'salary_items/list_header', :template => f.object
     %tbody.sortable

data/config/locales/bookyt_salary.de.yml

@@ -7,19 +7,19 @@ de:
 
     attributes:
       salary:
-        amount:        Bruttolohn
+        gross_amount:  Bruttolohn
         net_amount:    Nettolohn
-        bvg_amount:    BVG
-        social_amount: AHV/IV/EO/ALV/NBU
         employer:      Arbeitgeber
         employee:      Arbeitnehmer
       salary_booking_template:
         saldo_inclusion_flags:
-          ahv:                 AHV/ALV/IV/EO
-          ktg:                 Krankentaggeld-Versicherung (KTG)
+          ahv:                 AHV
+          ktg:                 KTG
           gross_income:        Bruttolohn
-          uvg:                 Unfall-Versicherung (UVG)
-          uvgz:                Unfallzusatz-Versicherung (UVGZ)
+          net_income:          Nettolohn
+          payment:             Auszahlung
+          uvg:                 UVG
+          uvgz:                UVGZ
           deduction_at_source: Quellensteuer
         include_in_saldo_list:   Pflichtigkeit
         salary_declaration_code: Lohnausweis

data/lib/bookyt_salary/version.rb

@@ -1,3 +1,3 @@
 module BookytSalary
-  VERSION = '0.14.2'
+  VERSION = '0.14.3'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bookyt_salary
 version: !ruby/object:Gem::Version 
-  hash: 35
+  hash: 33
   prerelease: 
   segments: 
   - 0
   - 14
-  - 2
-  version: 0.14.2
+  - 3
+  version: 0.14.3
 platform: ruby
 authors: 
 - "Simon H\xC3\xBCrlimann (CyT)"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-28 00:00:00 +01:00
+date: 2012-01-30 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency