has_accounts_engine 2.0.0 → 2.0.1

data/app/controllers/accounts_controller.rb

@@ -22,6 +22,11 @@ class AccountsController < HasAccountsController
     end
     @bookings = @bookings
     @carry_booking = @bookings.all.first
+    @saldo = @account.saldo(@carry_booking, false)
+
+    if @account.is_profit_account? && params[:by_value_period] && params[:by_value_period][:to]
+      @saldo -= @account.saldo(Date.parse(params[:by_value_period][:from]), false)
+    end
 
     show!
   end

data/app/views/accounts/_edit_bookings.html.haml

@@ -1,15 +1,16 @@
 - url_params = {:controller => 'accounts', :action => 'show', :id => params[:account_id] || params[:id]}
-= paginated_section @bookings, :params => url_params.merge(:query => params[:query]) do
-  = simple_form_for :bookings, :url => update_bookings_account_path do |f|
-    %table.table.table-striped
-      %thead
-        %tr
-          %th= t_attr :value_date, Booking
-          %th= t_attr :title, Booking
-          %th= t_attr :amount, Booking
-          %th= t_attr :debit_account, Booking
-          %th= t_attr :credit_account, Booking
-      %tbody
-        = render :partial => 'edit_booking', :collection => @bookings, :locals => {:f => f}
+= simple_form_for :bookings, :url => update_bookings_account_path do |f|
+  %table.table.table-striped
+    %thead
+      %tr
+        %th= t_attr :value_date, Booking
+        %th= t_attr :title, Booking
+        %th= t_attr :amount, Booking
+        %th= t_attr :debit_account, Booking
+        %th= t_attr :credit_account, Booking
+    %tbody
+      = render :partial => 'edit_booking', :collection => @bookings, :locals => {:f => f}
 
-    = f.button :submit
+  = f.button :submit
+
+= paginate @bookings, :params => url_params.merge(:query => params[:query]) do

data/app/views/accounts/_show.html.haml

@@ -2,9 +2,11 @@
   %ul.nav.nav-tabs
     %li.active= link_to t_title(:journal, Account), '#tab-bookings', {:data => {:toggle => 'tab'}}
     %li= link_to t_title(:info, Account), '#tab-info', {:data => {:toggle => 'tab'}}
-    - if defined?(Attachment)
+    - if resource.respond_to? :attachments
       %li= link_to t_title(:list, Attachment), '#tab-attachments', {:data => {:toggle => 'tab'}}
 
 .tab-content
   #tab-bookings.tab-pane.active= render 'show_bookings'
   #tab-info.tab-pane= render "form"
+  - if resource.respond_to? :attachments
+    #tab-attachments.tab-pane= render 'show_attachments'

data/app/views/accounts/_show_bookings.html.haml

@@ -3,7 +3,6 @@
 %table.table.table-striped.bookings.collection
   %thead
     = render 'accounts/booking_list_header'
-    - @saldo = @account.saldo(@carry_booking, false)
   %tbody
     = render 'accounts/carry_booking' unless @saldo == 0
 
@@ -15,5 +14,3 @@
       = render 'accounts/booking_item'
   %tfoot
     = render 'accounts/booking_list_footer' unless @bookings.empty?
-= paginate @bookings
-

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

@@ -23,8 +23,8 @@
 
   .row-fluid
     .span12
-      //= f.input :reference_type, :as => :hidden, :input_html => {:value => 'Invoice'}
-      //= f.association :reference, :collection => suggested_invoices_for_booking(@booking, :include_all => true), :as => :combobox, :include_blank => true
+      = f.input :reference_type, :as => :hidden, :input_html => {:value => 'Invoice'}
+      = f.association :reference, :collection => suggested_invoices_for_booking(@booking, :include_all => true), :as => :combobox, :include_blank => true
 
   .form-actions
     = f.button :submit

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

@@ -11,6 +11,4 @@
   %tbody
     = render collection, :item_action => (item_action ||= nil)
 
-= paginate collection
-
 = render 'bookings/sidebar'

data/app/views/bookings/_new_form.html.haml

@@ -1,5 +1,8 @@
 = simple_form_for @booking, :url => select_bookings_path do |f|
   = hidden_field_tag :stage, 'select'
-  = f.input :title, :input_html => {'data-autofocus' => true}
-  = f.input :value_date, :as => :date_field, :input_html => {:size => 10, :style => 'text-align: right'}
-  = f.button :submit
+  .row-fluid
+    .span8= f.input :title, :input_html => {'data-autofocus' => true}
+    .span4= f.input :value_date, :as => :date_field, :input_html => {:size => 10, :style => 'text-align: right'}
+
+  .form-actions
+    = f.button :submit

data/app/views/bookings/_simple_form.html.haml

@@ -21,5 +21,5 @@
     .span12
       = f.input :comments, :input_html => {:rows => 4}
 
-  = f.button :submit
-
+  .form-actions
+    = f.button :submit

data/config/locales/de.yml

@@ -13,6 +13,7 @@ de:
         title:          Titel
         saldo:          Saldo
         account_type:   Kontentyp
+        tag_list:       Tags
       account_type:
         name:           Name
         title:          Titel

data/lib/has_accounts_engine/version.rb

@@ -1,3 +1,3 @@
 module HasAccountsEngine
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: has_accounts_engine
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-12 00:00:00.000000000 Z
+date: 2014-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails