has_accounts_engine 1.1.2 → 2.0.0

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

@@ -2,7 +2,7 @@
   %th= t_attr :date, Booking
   %th= t_attr :text, Booking
   %th= t_attr :reference, Booking
-  %th.currency= t_attr :credit_account, Booking
   %th.currency= t_attr :debit_account, Booking
+  %th.currency= t_attr :credit_account, Booking
   %th.currency= t_attr :balance, Booking
   %th.action-links.count-3

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

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

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

@@ -8,7 +8,7 @@
       = f.select :reference_id, suggested_invoices_for_booking(f.object), :include_blank => true, :style => 'width: 98%', :class => 'combobox'
     %td.span1= f.text_field :amount, :style => 'width: 94%'
 
-    %td.span1= f.association :credit_account, :collection => accounts_as_collection(Account.all), :as => :combobox, :style => 'width: 94%', :wrapper => :inline
     %td.span1= f.association :debit_account, :collection => accounts_as_collection(Account.all), :as => :combobox, :style => 'width: 94%', :wrapper => :inline
+    %td.span1= f.association :credit_account, :collection => accounts_as_collection(Account.all), :as => :combobox, :style => 'width: 94%', :wrapper => :inline
 
     %td{:style => 'display:none'}= f.hidden_field :id

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

@@ -7,8 +7,8 @@
           %th= t_attr :value_date, Booking
           %th= t_attr :title, Booking
           %th= t_attr :amount, Booking
-          %th= t_attr :credit_account, Booking
           %th= t_attr :debit_account, Booking
+          %th= t_attr :credit_account, Booking
       %tbody
         = render :partial => 'edit_booking', :collection => @bookings, :locals => {:f => f}
 

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

@@ -1,8 +1,9 @@
 .tabbable
-  %ul.nav.nav-tabs  
+  %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'}}
-    %li= link_to t_title(:list, Attachment), '#tab-attachments', {:data => {:toggle => 'tab'}}
+    - if defined?(Attachment)
+      %li= link_to t_title(:list, Attachment), '#tab-attachments', {:data => {:toggle => 'tab'}}
 
 .tab-content
   #tab-bookings.tab-pane.active= render 'show_bookings'

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

@@ -10,8 +10,8 @@
     - for @booking in @bookings
       - amount = @booking.amount
       - amount = -(amount) if @account.is_liability_account?
-      - @saldo -= amount if @booking.debit_account == @account
-      - @saldo += amount if @booking.credit_account == @account
+      - @saldo += amount if @booking.debit_account == @account
+      - @saldo -= amount if @booking.credit_account == @account
       = render 'accounts/booking_item'
   %tfoot
     = render 'accounts/booking_list_footer' unless @bookings.empty?

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

@@ -1,6 +1,6 @@
 .contextual
-  = icon_link_to 'only_credit_bookings', url_for(:only_credit_bookings => true) unless params[:only_credit_bookings]
   = icon_link_to 'only_debit_bookings', url_for(:only_debit_bookings => true) unless params[:only_debit_bookings]
+  = icon_link_to 'only_credit_bookings', url_for(:only_credit_bookings => true) unless params[:only_credit_bookings]
   = icon_link_to 'all_bookings', @account if params[:only_credit_bookings] || params[:only_debit_bookings]
   = contextual_links_for
 

data/app/views/booking_templates/_booking_template.html.haml

@@ -6,7 +6,7 @@
     - if booking_template.comments.present?
       %hr{:style => "height: 1px; margin: 0"}/
       %i= booking_template.comments
-  %td= link_to booking_template.credit_account.code, account_path(booking_template.credit_account), :title => booking_template.credit_account.title unless booking_template.credit_account.nil?
   %td= link_to booking_template.debit_account.code, account_path(booking_template.debit_account), :title => booking_template.debit_account.title unless booking_template.debit_account.nil?
+  %td= link_to booking_template.credit_account.code, account_path(booking_template.credit_account), :title => booking_template.credit_account.title unless booking_template.credit_account.nil?
   %td.currency= amount_to_s(booking_template)
   %td= t(booking_template.amount_relates_to, :scope => 'booking_template.relation') if booking_template.amount_relates_to.present?

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

@@ -5,10 +5,10 @@
     .span6
       = f.input :code
   .row-fluid
-    .span6
-      = f.association :credit_account, :as => :combobox, :collection => accounts_as_collection, :input_html => {:class => 'span6'}
     .span6
       = f.association :debit_account, :as => :combobox, :collection => accounts_as_collection, :input_html => {:class => 'span6'}
+    .span6
+      = f.association :credit_account, :as => :combobox, :collection => accounts_as_collection, :input_html => {:class => 'span6'}
   .row-fluid
     .span6
       = f.input :amount

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

@@ -2,8 +2,8 @@
   %thead
     %tr
       %th= t_attr :title, BookingTemplate
-      %th= t_attr :credit_account, BookingTemplate
       %th= t_attr :debit_account, BookingTemplate
+      %th= t_attr :credit_account, BookingTemplate
       %th.currency= t_attr 'amount', BookingTemplate
       %th= t_attr :amount_relates_to, BookingTemplate
       %th.action-links

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

@@ -8,8 +8,8 @@
       %hr{:style => "height: 1px; margin: 0"}/
       %i= booking.comments
   %td= link_to booking.reference.to_s(:reference), booking.reference unless booking.reference.nil?
-  %td= link_to booking.credit_account.code, account_path(booking.credit_account), :title => booking.credit_account.title unless booking.credit_account.nil?
   %td= link_to booking.debit_account.code, account_path(booking.debit_account), :title => booking.debit_account.title unless booking.debit_account.nil?
+  %td= link_to booking.credit_account.code, account_path(booking.credit_account), :title => booking.credit_account.title unless booking.credit_account.nil?
   %td.currency= currency_fmt(booking.amount)
   %td.action-links
     = list_link_for(:edit, booking)

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

@@ -7,14 +7,15 @@
   .row-fluid
     .span6
       = f.input :amount, :as => :string
-    .span6
-      = f.input :code
+    - if @booking.respond_to? :code
+      .span6
+        = f.input :code
 
   .row-fluid
-    .span6
-      = f.association :credit_account, :collection => accounts_as_collection(Account.all), :as => :combobox
     .span6
       = f.association :debit_account, :collection => accounts_as_collection(Account.all), :as => :combobox
+    .span6
+      = f.association :credit_account, :collection => accounts_as_collection(Account.all), :as => :combobox
 
   .row-fluid
     .span12
@@ -22,7 +23,7 @@
 
   .row-fluid
     .span12
-      = f.input :reference_type, :as => :hidden, :input_html => {:value => 'Invoice'}
+      //= 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

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

@@ -4,8 +4,8 @@
       %th= t_attr :valuta
       %th= t_attr :title
       %th= t_attr :reference
-      %th= t_attr :credit_account
       %th= t_attr :debit_account
+      %th= t_attr :credit_account
       %th.currency= t_attr 'amount'
       %th.action-links
   %tbody

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

@@ -1,6 +1 @@
 - filter_name = :by_value_period
-- content_for :sidebar do
-  - filters = current_tenant.fiscal_years.reverse.map do |period|
-    - value = {"from" => period[:from].to_s(:db), "to" => period[:to].to_s(:db)}
-    - {:value => value, :title => period[:to].year}
-  = boot_nav_filter(filter_name, [{:title => :all, :value => nil}] + filters)

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

@@ -12,10 +12,10 @@
       = f.input :code
 
   .row-fluid
-    .span6
-      = f.association :credit_account, :collection => accounts_as_collection(Account.all), :as => :combobox
     .span6
       = f.association :debit_account, :collection => accounts_as_collection(Account.all), :as => :combobox
+    .span6
+      = f.association :credit_account, :collection => accounts_as_collection(Account.all), :as => :combobox
 
   .row-fluid
     .span12

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

@@ -0,0 +1,5 @@
+= simple_form_for resource do |f|
+
+  = f.inputs
+
+  = f.button :submit

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

@@ -0,0 +1,15 @@
+- @attributes ||= collection.first.attribute_names - ['id', 'created_at', 'updated_at']
+%table.table.table-striped{:class => "#{collection.first.class.to_s.downcase.pluralize} collection"}
+  %thead
+    %tr
+      - @attributes.each do |field|
+        %th= t_attr field, collection.first.class
+      %th.action-links
+  %tbody
+    - collection.each do |r|
+      %tr
+        - @attributes.each do |field|
+          %td= r.send(field) if r.respond_to?(field)
+        %td.action-links
+          = list_link_for(:edit, r)
+          = list_link_for(:delete, r)

data/app/views/has_accounts/_search_form.html.haml

@@ -0,0 +1,6 @@
+.search-form
+  = form_tag params, :method => :get, :class => 'form-search' do
+    = text_field '', :by_text, :autocomplete => 'off', 'data-autofocus' => true, :class => 'search-query input-medium'
+    = button_tag :class => 'btn' do
+      %i.icon-search
+      = t_action('filter')

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

@@ -0,0 +1,2 @@
+.form-view
+  = render "form"

data/app/views/has_accounts/_show_attachments.html.haml

@@ -0,0 +1,9 @@
+- @attachments = resource.attachments
+- if @attachments.empty?
+  = boot_no_entry_alert
+  .attachments.collection
+- else
+  = render 'attachments/list', :collection => @attachments
+
+.form-actions
+  = icon_link_to :new, [:new, resource, :attachment], :remote => true

data/app/views/has_accounts/_sidebar.html.haml

@@ -0,0 +1,8 @@
+%ul.nav.nav-list
+  %li.nav-header= t('bookyt.main_navigation.accounting')
+  %li= link_to t_title(:new, Booking), new_booking_path
+  - BookingTemplate.where(:type => nil).limit(5).each do |template|
+    %li= link_to template, [:new_booking, template]
+
+  %li.nav-header Infos
+  %li= link_to t_title(:index, Account), accounts_path

data/app/views/has_accounts/create.js.erb

@@ -0,0 +1,3 @@
+$('#new_<%= resource_class.model_name.underscore %>').remove();
+$('.<%= resource_class.model_name.tableize %>.collection tr:first-child').after('<%=j render resource %>');
+initializeBehaviours();

data/app/views/has_accounts/destroy.js.erb

@@ -0,0 +1,2 @@
+$('#<%= "#{resource_class.model_name.underscore}_#{resource.id}" %>').remove();
+initializeBehaviours();

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

@@ -0,0 +1,5 @@
+= contextual_links
+
+= boot_page_title
+
+= render 'form'

data/app/views/has_accounts/edit.js.erb

@@ -0,0 +1,3 @@
+$('#new_<%= resource_class.model_name.underscore %>').remove();
+$('.<%= resource_class.model_name.tableize %>.collection').before('<%=j render "form" %>');
+initializeBehaviours();

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

@@ -0,0 +1,6 @@
+= contextual_links
+
+= boot_page_title
+
+= paginate collection
+= render "list"

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

@@ -0,0 +1,5 @@
+= contextual_links
+
+= boot_page_title
+
+= render 'form'

data/app/views/has_accounts/new.js.erb

@@ -0,0 +1,3 @@
+$('#new_<%= resource.class.name.underscore %>').remove();
+$('.<%= resource_class.model_name.tableize %>.collection').before('<%=j render "form" %>');
+initializeBehaviours();

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

@@ -0,0 +1,5 @@
+= contextual_links
+
+= boot_page_title
+
+= render "show"

data/app/views/has_accounts/show_modal.js.erb

@@ -0,0 +1,7 @@
+$('.modal').remove();
+$('body').append('<%=j render "show_modal" %>');
+$('.modal').modal('show');
+
+addComboboxBehaviour();
+addAutofocusBehaviour();
+$('.modal .select2').select2();

data/app/views/has_accounts/update.js.erb

@@ -0,0 +1,3 @@
+$('#<%= resource.class.name.underscore %>_form').remove();
+$('#<%= "#{resource.class.name.underscore}_#{resource.to_param}" %>').replaceWith('<%=escape_javascript render resource %>');
+initializeBehaviours();

data/app/views/layouts/has_accounts_engine.html.haml

@@ -0,0 +1,48 @@
+!!!
+%html
+  %head
+    %meta{:charset => 'utf-8'}/
+    = favicon_link_tag 'favicon.ico'
+
+    = stylesheet_link_tag 'has_accounts_engine/application', :media => 'all'
+    = javascript_include_tag "has_accounts_engine/application"
+
+    = csrf_meta_tag
+    %title
+      - if current_user
+        = "#{content_for :page_title} - #{t('application.title')}"
+      - else
+        = "#{content_for :page_title} - #{t('application.title')}"
+
+  %body
+    .navbar.navbar-fixed-top
+      .navbar-inner
+        .container-fluid
+          = link_to root_path, :class => 'brand' do
+            = t('application.title')
+
+          .brand(style="margin-left: 1em")
+
+    #content.container-fluid
+      - if notice
+        = boot_alert(notice, 'success')
+      - if alert
+        = boot_alert(alert, 'error')
+      .row-fluid
+        - if user_signed_in?
+          #sidebar.span2
+            = render 'has_accounts/sidebar'
+          .span10
+            .content
+              = yield
+        - else
+          .offset3.span6= yield
+
+    #footer
+      .container
+        %p.pull-right
+          = link_to "Deutsch", :locale => 'de-CH'
+          = link_to "English", :locale => 'en'
+        %p
+          Bookyt is built by <a href="http://cyt.ch" target="_blank">CyT GmbH</a>.
+          Code licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank">GNU AGPL 3</a>.

data/config/locales/de.yml

@@ -3,8 +3,6 @@ de:
   activerecord:
     models:
       account:          Konto
-      bank_account:     Bankkonto
-      bank:             Bank
       account_type:     Kontentyp
       booking:          Buchung
       booking_template: Buchungsvorlage
@@ -15,14 +13,6 @@ de:
         title:          Titel
         saldo:          Saldo
         account_type:   Kontentyp
-      bank_account:
-        number:         Kontokorrent-Nr.
-        iban:           IBAN
-        pc_id:          VESR-Teilnehmer-Nr.
-        esr_id:         VESR-Identifikations-Nr.
-      bank:
-        clearing:       Clearing-Nr.
-        swift:          SWIFT-Nr.
       account_type:
         name:           Name
         title:          Titel
@@ -32,8 +22,8 @@ de:
         title:          Titel
         amount:         Betrag
         comments:       Bemerkungen
-        credit_account: Soll
-        debit_account:  Haben
+        credit_account: Haben
+        debit_account:  Soll
         reference:      Referenz
         reference_type: Referenz Typ
         reference_id:   Referenz ID
@@ -45,36 +35,23 @@ de:
         valuta:         Valuta
         value:          Betrag
       booking_template:
-        amount_relates_to: "Relativ zu"
-        charge_rate_code: Abgabesatz
-        credit_account: Soll
-        debit_account: Haben
-        reference: Referenz
-        value_date: Valutadatum
-
-  form:
-    bank:
-      money_transfer: Bankverbindung
+        amount_relates_to: Relativ zu
+        charge_rate_code:  Abgabesatz
+        credit_account:    Haben
+        debit_account:     Soll
+        reference:         Referenz
+        value_date:        Valutadatum
 
   # Title customizations
   accounts:
     index:
       title:            Kontenplan
     edit_bookings:
-      title: Buchungen
+      title:            Buchungen
     info:
-      title: Kontodaten
+      title:            Kontodaten
     journal:
-      title: Auszug
-  attachments:
-    list:
-      title: Dokumente
-  bank_accounts:
-    index:
-      title:            Bankkonti
-  banks:
-    index:
-      title:            Banken
+      title:            Auszug
   account_types:
     index:
       title:            Kontentypen
@@ -86,6 +63,6 @@ de:
 
   crud:
     action:
-      copy:             Kopieren
-      only_credit_bookings: "Nur Soll"
-      only_debit_bookings: "Nur Haben"
+      copy:                 Kopieren
+      only_credit_bookings: Nur Soll
+      only_debit_bookings:  Nur Haben