has_accounts_engine 3.0.0.beta9 → 3.0.0.beta10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd618f603dc4a6369b51bc9982e172e91c5aaf37
-  data.tar.gz: 43362f423192b3a02f4766020fda66722a4ddaf2
+  metadata.gz: 76006e88be871b79e33bca9f8ceb7780218bd15f
+  data.tar.gz: 0483ee9a50458ca0897698df090732c5af74c3ab
 SHA512:
-  metadata.gz: 4a8654b27c30dd1d596765b30ffb8ad049a6d06f657e76184fc4475360751f5312f483fc02ca7807602d25e0e2a652e7f2fa15c56cc16e2983b47ecefdd801f8
-  data.tar.gz: 14b406c444741c80b8151f9363b44cc75f4f882bbfa99fb0e3d890c1425fc54877865fc6db4d7af12353cdccc9d2a78403407606f58f1312b2d4356352dbf64a
+  metadata.gz: 20442b5840215e0e66941993bc216fd527a83314f23666f230edcc3a8a3bc0acdc8b39f1a80f1d157a53dda619ebd2e35ec490dc2f36442940d6b19d6293c8ad
+  data.tar.gz: 3e6e6282189af1eff23eb6124c1399293054067c8811ba38edea850205c91ef0c40a9a261426752878c474f6e11d06790eb7653d6cc415133af20a7c98d8bc8b

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

@@ -1,5 +1,6 @@
 %tr[@booking]
   %td= @booking.value_date
+  %td= @booking.code
   %td
     = link_to @booking.title, @booking, {'data-href-container' => 'tr'}
     - if @booking.comments.present?

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

@@ -1,5 +1,6 @@
 %tr
   %th= t_attr :date, Booking
+  %th= t_attr :code, Booking
   %th= t_attr :text, Booking
   %th= t_attr :reference, Booking
   %th.currency= t_attr :debit_account, Booking

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

@@ -1,5 +1,5 @@
 %tr#booking_list_saldo{:style => "border-top: double 2px black"}
-  %td{:colspan => "2"}
+  %td{:colspan => "3"}
     Kontostand (per #{@bookings.last.value_date})
   %td
   %td

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

@@ -1,6 +1,6 @@
 - credit_turnover, debit_turnover = @account.turnover(@bookings)
 %tr#booking_list_turnover{:style => "border-top: double 2px black"}
-  %td{:colspan => "3"}
+  %td{:colspan => "4"}
     Umsatz (#{h @bookings.first.value_date} bis #{h @bookings.last.value_date})
   %td{:style => "text-align: right"}= currency_fmt(debit_turnover)
   %td{:style => "text-align: right"}= currency_fmt(credit_turnover)

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

@@ -1,5 +1,6 @@
 %tr{:id => "carry_booking"}
   %td= @carry_booking.value_date
+  %td
   %td
     = t('bookyt.carry_booking')
   %td

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

@@ -2,8 +2,9 @@
 
 %tr[booking]
   %td= booking.value_date
+  %td= booking.code
   %td.subject
-    = link_to booking.title, item_action.call(booking), 'data-remote' => true, 'data-table-key' => '13'
+    = link_to booking.title, item_action.call(booking), 'data-table-key' => '13'
     - if booking.comments.present?
       %div
         %i= booking.comments

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

@@ -2,6 +2,7 @@
 %tr[booking]
   = simple_fields_for booking, :wrapper => 'table' do |f|
     %td= f.input :value_date, :as => 'date_field', :label => false
+    %td= f.input :code, :label => false
     %td
       = f.input :title, :input_html => {'data-autofocus' => true}
       = f.input :comments, :rows => 2

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

@@ -3,6 +3,7 @@
     %thead
       %tr
         %th.valute_date= t_attr :valuta
+        %th.code= t_attr :code
         %th.title= t_attr :title
         %th.reference= t_attr :reference
         %th.debit_account= t_attr :debit_account
@@ -12,4 +13,5 @@
     %tbody
       = render collection, :item_action => (item_action ||= nil)
 
+= paginate collection if defined?(paginate)
 = render 'bookings/sidebar'

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

@@ -3,16 +3,17 @@
 = boot_page_title
 
 = simple_form_for '', :method => :get, remote: true do |f|
-  .row-fluid
-    .span6= f.input :by_text, label: t(:by_text, scope: 'bookings.search'), required: false
-  .row-fluid
-    .span3= f.input 'by_amount[from]', label: t(:by_amount_from, scope: 'bookings.search'), required: false
-    .span3= f.input 'by_amount[to]', label: t(:by_amount_to, scope: 'bookings.search'), required: false
-    .span3= f.input 'by_date[from]', label: t(:by_date_from, scope: 'bookings.search'), required: false
-    .span3= f.input 'by_date[to]', label: t(:by_date_to, scope: 'bookings.search'), required: false
+  .container-fluid
+    .row-fluid
+      .span6= f.input :by_text, label: t(:by_text, scope: 'bookings.search'), required: false
+    .row-fluid
+      .span3= f.input 'by_amount[from]', label: t(:by_amount_from, scope: 'bookings.search'), required: false
+      .span3= f.input 'by_amount[to]', label: t(:by_amount_to, scope: 'bookings.search'), required: false
+      .span3= f.input 'by_date[from]', label: t(:by_date_from, scope: 'bookings.search'), required: false, input_html: { value: try_parse_date(params[:by_date][:from]) }
+      .span3= f.input 'by_date[to]', label: t(:by_date_to, scope: 'bookings.search'), required: false, input_html: { value: try_parse_date(params[:by_date][:to]) }
 
   .form-actions
     = f.button :submit, t_action(:search)
 
-= paginate collection if defined?(paginate)
-= render 'list'
+.index
+  = render 'list'

data/app/views/bookings/index.js.erb

@@ -1,2 +1,2 @@
-$('.collection').html('<%=escape_javascript render collection %>');
+$('.index').html('<%=escape_javascript render "list" %>');
 initializeBehaviours();

data/lib/has_accounts_engine/version.rb

@@ -1,3 +1,3 @@
 module HasAccountsEngine
-  VERSION = "3.0.0.beta9"
+  VERSION = "3.0.0.beta10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: has_accounts_engine
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta9
+  version: 3.0.0.beta10
 platform: ruby
 authors:
 - Simon Hürlimann (CyT)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-02 00:00:00.000000000 Z
+date: 2015-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails