bookyt_salary 0.2.0 → 0.2.1

data/app/assets/stylesheets/bookyt_salary.sass

@@ -1,60 +0,0 @@
-@import blueprint/grid
-
-// Grid
-$blueprint-grid-columns: 24
-$blueprint-grid-width: 30px
-$blueprint-grid-margin: 10px
-
-
-// Column widths
-$column_small_form: 10
-
-// Cash up styling
-#cash_register_new,
-#new_day
-  +column(12)
-
-#cash_register_new
-  ul
-    width: 50%
-    float: left
-    &.second
-      li
-        width: 141px
-        float: right
-    label
-      width: 45px
-      float: left
-    input
-      width: 90px
-  #cash
-    float: left
-    color: red
-    text-decoration: underline
-    font-weight: bold
-  #result
-    width: 100%
-    margin-top: 10px
-    padding-top: 10px
-    border-top: 1px solid black
-    label
-      font-weight: bold
-      margin-right: 15px
-    input
-      width: 100%
-    li:first-child
-      margin-bottom: 10px
-
-#new_day
-  label
-    width: 160px
-  input
-    width: 100px
-    float: right
-    &#day_submit
-      width: 100%
-
-#day_edit
-  table
-    th
-      padding-right: 20px

data/app/controllers/salaries_controller.rb

@@ -0,0 +1,44 @@
+class SalariesController < AuthorizedController
+  # Filter/Search
+  # =============
+  has_scope :by_state
+  has_scope :by_value_period, :using => [:from, :to], :default => proc { |c| c.session[:has_scope] }
+  has_scope :by_employee_id
+
+  # Actions
+  # =======
+  def statistics
+    index!
+  end
+
+  def new
+    # 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
+    }
+
+    # Set default parameters
+    salary_params.merge!(params[:salary]) if params[:salary]
+
+    @salary = Salary.new(salary_params)
+
+    # Prebuild an empty attachment instance
+    @salary.attachments.build
+
+    new!
+  end
+
+  def create
+    @salary = Salary.new(params[:salary])
+    @salary.build_booking
+
+    create!
+  end
+
+  def payslip
+    show!
+  end
+end

data/app/models/salary.rb

@@ -0,0 +1,79 @@
+class Salary < Invoice
+  # String
+  def to_s(format = :default)
+    "%s (%s / %s - %s)" % [title, company, duration_from ? I18n::localize(duration_from) : '', duration_to ? I18n::localize(duration_to) : '']
+  end
+
+  # 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
+
+    salary_invoice_booking.amount
+  end
+
+  def bvg_amount
+    bookings.by_text("BVG").sum(: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 ahv_amount
+    result = amount
+    result += bookings.where(:title => "Kinderzulage").sum(:amount)
+
+    result
+  end
+
+  # Assignment proxies
+  def duration_from=(value)
+    write_attribute(:duration_from, value)
+
+    value_as_date = self.duration_from
+    # Calculate value and due dates
+    date = Date.new(value_as_date.year, value_as_date.month, 1).in(1.month).ago(1.day)
+    self.value_date ||= date
+    self.due_date   ||= date
+  end
+
+  # Filter/Search
+  # =============
+  scope :by_value_period, lambda {|from, to| where("date(value_date) BETWEEN ? AND ?", from, to) }
+  scope :by_employee_id, lambda {|value| where(:company_id => value)}
+
+  # Bookings
+  # ========
+  def self.direct_account
+    Account.find_by_code("5000")
+  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 => company.id), "salary:bvg").save
+
+    super(params, 'salary:invoice').save
+
+    super(params.merge(:person_id => company.id), "salary:kz").save
+    super(params.merge(:person_id => company.id), "salary:social:kz").save
+  end
+end

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

@@ -0,0 +1,14 @@
+= semantic_form_for @salary, :remote => true do |f|
+  = f.semantic_errors
+  = f.inputs do
+    = f.input :state, :collection => invoice_states_as_collection
+    = f.input :customer_id, :as => :hidden
+    = f.input :company_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.buttons do
+    = f.commit_button

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

@@ -0,0 +1,12 @@
+%table.list#salaries_list
+  %tr
+    %th= t_attr :value_date, Invoice
+    %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 :net_amount, Salary
+    %th.currency= t_attr :balance, Invoice
+    %th.action-links
+
+  = render @salaries

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

@@ -0,0 +1,10 @@
+%tr[salary]
+  %td= salary.value_date
+  %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.net_amount)
+  %td.currency= currency_fmt(salary.balance(Date.today, Account.find_by_code('2050')))
+  %td.action-links
+    = list_link_for(:edit, salary)

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

@@ -0,0 +1,25 @@
+%h3= t('salary_certificate')
+
+= paginated_section collection do
+  %table.list
+    %tr
+      %th= t_attr :company, Invoice
+      %th.currency= t_attr :amount, Salary
+      %th.currency= t_attr :social_amount, Salary
+      %th.currency= t_attr :bvg_amount, Salary
+      %th.currency= t_attr :net_amount, Salary
+
+    - for salary in @salaries
+      %tr
+        %td= salary.company
+        %td.currency= link_to currency_fmt(salary.ahv_amount), salary, "data-href-container" => 'tr'
+        %td.currency= currency_fmt(salary.social_amount)
+        %td.currency= currency_fmt(salary.bvg_amount)
+        %td.currency= currency_fmt(salary.net_amount)
+
+    %tr
+      %th= t('bookyt.total')
+      %th.currency= currency_fmt(@salaries.sum(&:ahv_amount))
+      %th.currency= currency_fmt(@salaries.sum(&:social_amount))
+      %th.currency= currency_fmt(@salaries.sum(&:bvg_amount))
+      %th.currency= currency_fmt(@salaries.sum(&:net_amount))

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

@@ -0,0 +1,40 @@
+.contextual
+  = icon_link_to :pdf, :format => :pdf
+  = icon_link_to :show
+
+%h1= resource.title
+.box
+  %table{:style => "width: 100%"}
+    %tr
+      %th= t_attr(:customer, Invoice)
+      %td= link_to(full_address(resource.customer.vcard, ', '), resource.customer)
+      %th= t_attr(:company, Invoice)
+      %td= link_to(full_address(resource.company.vcard, ', '), resource.company)
+    %tr
+      %th= t_attr(:state, Invoice)
+      %td#invoice_state=t resource.state, :scope => 'invoice.state'
+    %tr
+      %th= t_attr(:duration_from, Invoice)
+      %td= l(resource.duration_from) if resource.duration_from
+      %th= t_attr(:duration_to, Invoice)
+      %td= l(resource.duration_to) if resource.duration_to
+
+.contextual
+  = form_tag new_direct_booking_path(:direct_booking => {:reference_id => resource.id, :reference_type => resource_class.base_class}), :method => :get, :remote => true do
+    = collection_select :direct_booking, :booking_template_id, BookingTemplate.by_type(resource_class.name.underscore), :id, :title
+    = submit_tag t_action('new')
+
+%h3= Account.find_by_code("2050").title
+- @direct_account = Account.find_by_code("2050")
+#salary_payment_booking_list
+  = render 'direct_bookings/list', :reference => resource
+
+%h3= Account.find_by_code("5000").title
+- @direct_account = Account.find_by_code("5000")
+#salary_payment_booking_list
+  = render 'direct_bookings/list', :reference => resource
+
+%h3= Account.find_by_code("5700").title
+- @direct_account = Account.find_by_code("5700")
+#salary_booking_list
+  = render 'direct_bookings/list', :reference => resource

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

@@ -0,0 +1,41 @@
+.contextual
+  = icon_link_to :pdf, :format => :pdf
+  = icon_link_to :payslip
+  = contextual_links_for
+
+%h1= resource.title
+.box
+  %table{:style => "width: 100%"}
+    %tr
+      %th= t_attr(:customer)
+      %td= link_to(full_address(resource.customer.vcard, ', '), resource.customer)
+      %th= t_attr(:company)
+      %td= link_to(full_address(resource.company.vcard, ', '), resource.company)
+    %tr
+      %th= t_attr(:amount)
+      %td= currency_fmt(resource.amount)
+    %tr
+      %th= t_attr(:duration_from, Invoice)
+      %td= l(resource.duration_from) if resource.duration_from
+      %th= t_attr(:duration_to, Invoice)
+      %td= l(resource.duration_to) if resource.duration_to
+
+.contextual
+  = form_tag new_direct_booking_path(:direct_booking => {:reference_id => resource.id, :reference_type => resource_class.base_class}), :method => :get, :remote => true do
+    = collection_select :direct_booking, :booking_template_id, BookingTemplate.by_type(resource_class.name.underscore), :id, :title
+    = submit_tag t_action('new')
+
+- @direct_account = Account.find_by_code("2050")
+%h3= link_to @direct_account.title, @direct_account
+#salary_payment_booking_list
+  = render 'direct_bookings/list', :reference => resource
+
+- @direct_account = Account.find_by_code("5000")
+%h3= link_to @direct_account.title, @direct_account
+#salary_payment_booking_list
+  = render 'direct_bookings/list', :reference => resource
+
+- @direct_account = Account.find_by_code("5700")
+%h3= link_to @direct_account.title, @direct_account
+#salary_booking_list
+  = render 'direct_bookings/list', :reference => resource

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

@@ -0,0 +1,6 @@
+.contextual
+  = icon_link_to :index
+
+%h2= t_title
+
+= render 'salary_certificate'

data/db/seeds.rb

@@ -1,5 +1,8 @@
 # Salaries
 # ========
+outside_capital = AccountType.find_by_code('outside_capital')
+costs           = AccountType.find_by_code('costs')
+
 # Accounts
 Account.create!([
   {:code => "2020", :title => "Kreditoren Sozialversicherungen", :account_type => outside_capital},

data/lib/bookyt_salary/version.rb

@@ -1,3 +1,3 @@
 module BookytSalary
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bookyt_salary
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
+  hash: 21
+  prerelease: 
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - "Simon H\xC3\xBCrlimann (CyT)"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-19 00:00:00 +02:00
+date: 2011-10-19 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -29,17 +29,15 @@ extra_rdoc_files: []
 
 files: 
 - app/assets/stylesheets/bookyt_salary.sass
-- app/controllers/days_controller.rb
-- app/models/day.rb
-- app/views/days/_calculate.html.haml
-- app/views/days/_complete_form.html.haml
-- app/views/days/_day.html.haml
-- app/views/days/_form.html.haml
-- app/views/days/calculate_cash.js.erb
-- app/views/days/edit.html.haml
-- app/views/days/index.html.haml
-- app/views/days/new.html.haml
-- app/views/days/show.html.haml
+- app/controllers/salaries_controller.rb
+- app/models/salary.rb
+- app/views/salaries/_form.html.haml
+- app/views/salaries/_list.html.haml
+- app/views/salaries/_salary.html.haml
+- app/views/salaries/_salary_certificate.html.haml
+- app/views/salaries/payslip.html.haml
+- app/views/salaries/show.html.haml
+- app/views/salaries/statistics.html.haml
 - config/locales/de.yml
 - config/routes.rb
 - db/seeds.rb
@@ -77,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Salary plugin for bookyt

data/app/controllers/days_controller.rb

@@ -1,15 +0,0 @@
-class DaysController < AuthorizedController
-  def create
-    # Create and redirect to index
-    create! {days_path}
-  end
-
-  # AJAX methods
-  def calculate_cash
-    bills = params[:cash_register].select { |key, value| key.to_f > 5 }
-    mint = params[:cash_register].select { |key, value| key.to_f <= 5 }
-
-    @cash = bills.map { |a| a[0].to_f * a[1].to_f }.sum
-    @cash += mint.map { |a| a[1].to_f }.sum
-  end
-end

data/app/models/day.rb

@@ -1,23 +0,0 @@
-class Day < ActiveRecord::Base
-  # Associations
-  validates_date :date
-
-  # Scopes
-  default_scope :order => 'date DESC'
-
-  # Helpers
-  def to_s
-    "%s: brutto %0.2f, netto %0.2f" % [date, gross_turnover, net_turnover]
-  end
-
-  # Callbacks
-  after_create :create_bookings
-
-  private
-  def create_bookings
-    BookingTemplate.create_booking('day:cash', :amount => cash, :value_date => date)
-    BookingTemplate.create_booking('day:card turnover', :amount => card_turnover, :value_date => date)
-    BookingTemplate.create_booking('day:expenses', :amount => expenses, :value_date => date)
-    BookingTemplate.create_booking('day:credit_turnover', :amount => credit_turnover, :value_date => date)
-  end
-end

data/app/views/days/_calculate.html.haml

@@ -1,21 +0,0 @@
-= form_for @register, :remote => true, :as =>:cash_register, :url => {:action => 'calculate_cash'}, :html => {:class => 'formtastic cash_register_new'} do |f|
-  %ul.first
-    - for i in [ 200, 100, 50, 20, 10 ]
-      %li
-        %label
-          = h i
-          x
-        = f.text_field i, :type => 'number'
-  %ul.second
-    - for i in [ 5, 2, 1, 0.5, 0.2, 0.1, 0.05 ]
-      %li
-        %label
-          = h i
-        = f.text_field i, :type => 'number'
-  %ul#result
-    %li
-      %label
-        = t('activerecord.attributes.day.total') + ':'
-      #cash
-    %li
-      = submit_tag t('activerecord.attributes.day.calculate')

data/app/views/days/_complete_form.html.haml

@@ -1,3 +0,0 @@
-= render 'calculate'
-
-= render 'form'

data/app/views/days/_day.html.haml

@@ -1,13 +0,0 @@
-%tr[day]
-  %td= day.date
-  %td.currency= currency_fmt(day.cash)
-  %td.currency= currency_fmt(day.card_turnover)
-  %td.currency= currency_fmt(day.gross_turnover)
-  %td.currency= currency_fmt(day.net_turnover)
-  %td.currency= currency_fmt(day.client_count)
-  %td.currency= currency_fmt(day.expenses)
-  %td.currency= currency_fmt(day.credit_turnover)
-  %td.currency= currency_fmt(day.discount)
-  %td.action-links
-    = list_link_for(:edit, day)
-    = list_link_for(:delete, day)

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

@@ -1,15 +0,0 @@
-= semantic_form_for @day do |f|
-  = f.semantic_errors
-  = f.inputs do
-    = f.input :date, :as => :date_field, :input_html => {"data-autofocus" => true, :size => 10, :style => 'text-align: right'}
-    = f.input :cash, :input_html => {:size => 12, :style => 'text-align: right'}
-    = f.input :card_turnover, :input_html => {:size => 12, :style => 'text-align: right'}
-    = f.input :gross_turnover, :input_html => {:size => 12, :style => 'text-align: right'}
-    = f.input :net_turnover, :input_html => {:size => 12, :style => 'text-align: right'}
-    = f.input :client_count, :input_html => {:size => 12, :style => 'text-align: right'}
-    = f.input :expenses, :input_html => {:size => 12, :style => 'text-align: right'}
-    = f.input :credit_turnover, :input_html => {:size => 12, :style => 'text-align: right'}
-    = f.input :discount, :input_html => {:size => 12, :style => 'text-align: right'}
-
-  = f.buttons do
-    = f.commit_button

data/app/views/days/calculate_cash.js.erb

@@ -1 +0,0 @@
-$('#cash').html(<%=j @cash.to_s %>)

data/app/views/days/edit.html.haml

@@ -1,5 +0,0 @@
-= contextual_links
-
-%h2= t_title
-
-= render 'form'

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

@@ -1,19 +0,0 @@
-= contextual_links
-
-%h2= t_title
-
-= paginated_section @accounts, :params => {:query => params[:query]} do
-  %table.list#days_list
-    %tr
-      %th= t_attr :date
-      %th.currency= t_attr :cash
-      %th.currency= t_attr :card_turnover
-      %th.currency= t_attr :gross_turnover
-      %th.currency= t_attr :net_turnover
-      %th.currency= t_attr :client_count
-      %th.currency= t_attr :expenses
-      %th.currency= t_attr :credit_turnover
-      %th.currency= t_attr :discount
-      %th.action-links
-
-    = render @days

data/app/views/days/new.html.haml

@@ -1,5 +0,0 @@
-= contextual_links
-
-%h1= t('crud.title.day.new', :day => @day.date)
-
-= render 'complete_form'

data/app/views/days/show.html.haml

@@ -1,35 +0,0 @@
-= contextual_links
-
-%h1= @days
-
-%table
-  %tr
-    %th= t_attr :date
-    %td= @day.date.to_date
-  %tr
-    %th= t_attr :cash
-    %td= @day.cash
-  %tr
-    %th= t_attr :card_turnover
-    %td= @day.card_turnover
-  %tr
-    %th= t_attr :gross_turnover
-    %td= @day.gross_turnover
-  %tr
-    %th= t_attr :net_turnover
-    %td= @day.net_turnover
-  %tr
-    %th= t_attr :client_count
-    %td= @day.client_count
-  %tr
-    %th= t_attr :product_count
-    %td= @day.product_count
-  %tr
-    %th= t_attr :expenses
-    %td= @day.expenses
-  %tr
-    %th= t_attr :credit_turnover
-    %td= @day.credit_turnover
-  %tr
-    %th= t_attr :discount
-    %td= @day.discount