rock_books 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebc94a9d98f612b4c8c13ed48739004619b4bc4d82d484314f50001d6ee784b6
-  data.tar.gz: c565f0945fbecc80f4af87afc67f57a9d73e293e95f096a02c1bdbcc2e7a1afb
+  metadata.gz: ba9e80afcb8f6644e9fa3cc629a4cac6d723843d1609bab54641c77b779fba89
+  data.tar.gz: db3b9f6979da2408202715737fedf5f69b55d44657622364706d7597eac827bf
 SHA512:
-  metadata.gz: 514102c4e924ee1890a3f0233b7584c63e9a988595e562b7387e2ed696e41ffffd3b48e72fd939442edeef5a146fd473bb9fe0ea2e657d3b3d57bedc748d8472
-  data.tar.gz: 67b889a280ed577daa98358b4a927d83bf9339a35d8e9106aa3127776a6028bda7108a55cd7ee3c4164217e8213728c4d742be44b55317e583d7d604151f1a48
+  metadata.gz: de4ffe3cbf12789ffa874565e7e60299290e3cc8888a41a2756f0ef7b405152997286f2d4a0b9dd2c00aeb75afc8d2bb10245ae7e747492b14c9da4393948d79
+  data.tar.gz: c19a5de4f323c6d50a6a684f87b38e3f12dab1cc55accbeed9ec8560521f02932bf8b6b8788069807496d37e4ff3c6d89056fc16cfcddf87f1c14d1af8e002da

data/RELEASE_NOTES.md

@@ -1,3 +1,11 @@
+### v0.9.0
+
+* Center generated index.html's content.
+* Improve report headings.
+* Fix index.html hyperlinks to resource (receipts, invoices, statements, worksheets) directories.
+* Fix cases where split journal entries were not included in the journal report.
+
+
 ### v0.8.0
 
 * Add metadata to PDF and HTML reports
@@ -38,7 +46,7 @@ using the prawn gem for PDF and simple ERB templating for HTML.
 * Add receipt hyperlinks to HTML output.
 
 
-## v0.4.0
+### v0.4.0
 
 * Sort unused receipts alphanumerically.
 * Add 'x' receipts option for reporting both missing and unused receipts.
@@ -46,7 +54,7 @@ using the prawn gem for PDF and simple ERB templating for HTML.
 * Improve Receipts report.
 
 
-## v0.3.0
+### v0.3.0
 
 * Added ability to report unused receipts.
 * Errors now include more context information.
@@ -54,12 +62,12 @@ using the prawn gem for PDF and simple ERB templating for HTML.
 * Change license from MIT to Apache 2.
 
 
-## v0.2.1
+### v0.2.1
 
 * Add help text to readme.
 
 
-## v0.2.0
+### v0.2.0
 
 * Add instruction manual, modify readme.
 * Overhaul generated index.html.
@@ -67,18 +75,18 @@ using the prawn gem for PDF and simple ERB templating for HTML.
 * Add validation of transaction dates to ensure within configured date range.
 * Make report hash / OpenStruct keys consistently symbols.
 
-## v0.1.6
+### v0.1.6
 
 * Fixed PDF output; PDF files were corrupt because cupsfilter starting sending
 output to stderr at some point.
 
 
-## v0.1.4, v0.1.5
+### v0.1.4, v0.1.5
 
 * Intermediate unsatisfactory fixes, these versions were published but yanked. 
 
 
-## v0.1.3
+### v0.1.3
 
 * Report output now goes to separate txt, html, and pdf subdirectories.
 * Add vendor.yml to exclude generated report files from language reporting.
@@ -93,17 +101,17 @@ output to stderr at some point.
 * Add 'from_string' methods to Journal and ChartOfAccounts.
 
 
-## v0.1.2
+### v0.1.2
 
 * Improve error message when the needed directories do not exist. 
 
 
-## v0.1.1
+### v0.1.1
 
 * Fix startup error.
 
 
-## v0.1.0
+### v0.1.0
 
 * First release.
 

data/lib/rock_books/reports/data/bs_is_section_data.rb

@@ -19,7 +19,9 @@ class BsIsSectionData
     totals = journals_acct_totals.select { |code, _amount| codes.include?(code) }
     need_to_reverse_sign = %i{liability equity income}.include?(type)
     if need_to_reverse_sign
-      totals.keys.each { |code| totals[code] = -totals[code] }
+      totals.keys.each do |code|
+        totals[code] = -totals[code] unless totals[code] == 0.0
+      end
     end
     totals
   end

data/lib/rock_books/reports/data/journal_data.rb

@@ -25,6 +25,7 @@ class JournalData
       name: journal.chart_of_accounts.name_for_code(journal.account_code),
       title: journal.title,
       short_name: journal.short_name,
+      debit_or_credit: journal.debit_or_credit,
       start_date: context.chart_of_accounts.start_date,
       end_date: context.chart_of_accounts.end_date,
       entries: entries,

data/lib/rock_books/reports/helpers/text_report_helper.rb

@@ -112,7 +112,9 @@ module TextReportHelper
 
   # e.g. "Generated at 2021-01-09 18:22:18 by RockBooks version 0.7.1"
   def generation_info_display_string
-    "Reports Generated at #{DateTime.now.strftime('%Y-%m-%d %H:%M:%S')} by RockBooks version #{RockBooks::VERSION}"
+    now = Time.now
+    timestamp = "#{now} (#{now.utc})"
+    center("Generated at #{timestamp}") + "\n" + center("by RockBooks version #{RockBooks::VERSION}")
   end
 
 
@@ -130,7 +132,7 @@ module TextReportHelper
       fn_format_multidoc_entry: method(:format_multidoc_entry),
       fn_section_heading: method(:section_heading),
       fn_total_with_ok_or_discrepancy: method(:total_with_ok_or_discrepancy),
-      generated: "Generated at #{DateTime.now.strftime('%Y-%m-%d %H:%M:%S')} by RockBooks version #{RockBooks::VERSION}",
+      generated: generation_info_display_string,
       line_item_format_string: line_item_format_string,
       short_name_format_string: SHORT_NAME_FORMAT_STRING,
       start_date: start_date,

data/lib/rock_books/reports/index_html_page.rb

@@ -19,7 +19,9 @@ module RockBooks
     end
 
     def generate
-      ErbHelper.render_hashes('html/index.html.erb', data, template_presentation_context)
+      webized_generate_message_lines = template_presentation_context[:generated].split("\n")
+      presentation_context = template_presentation_context.merge( { generated: webized_generate_message_lines})
+      ErbHelper.render_hashes('html/index.html.erb', data, presentation_context)
     end
   end
 end

data/lib/rock_books/reports/journal_report.rb

@@ -24,18 +24,25 @@ class JournalReport
   end
 
 
+  private def format_date_and_account_amount(date, acct_amount)
+    "#{date}  #{format_acct_amount(acct_amount)}\n"
+  end
+
+
   private def format_entry_first_acct_amount(entry)
-    entry.date.to_s \
-         + '  ' \
-         + format_acct_amount(entry.acct_amounts.last) \
-         + "\n"
+    format_date_and_account_amount(entry.date, entry.acct_amounts.first)
+  end
+
+
+  private def format_entry_last_acct_amount(entry)
+    format_date_and_account_amount(entry.date, entry.acct_amounts.last)
   end
 
 
   # Formats an entry like this, with entry description added on additional line(s) if it exists:
   # 2018-05-21   $120.00   701  Office Supplies
   private def format_entry_no_split(entry)
-    output = format_entry_first_acct_amount(entry)
+    output = format_entry_last_acct_amount(entry)
 
     if entry.description && entry.description.length > 0
       output += entry.description
@@ -48,7 +55,8 @@ class JournalReport
   # 2018-05-21   $120.00   95.00     701  Office Supplies
   #                        25.00     751  Gift to Customer
   private def format_entry_with_split(entry)
-    output = format_entry_first_acct_amount(entry)
+    output = StringIO.new
+    output << format_entry_first_acct_amount(entry)
     indent = ' ' * 12
 
     entry.acct_amounts[1..-1].each do |acct_amount|
@@ -58,6 +66,8 @@ class JournalReport
     if entry.description && entry.description.length > 0
       output << entry.description
     end
+
+    output.string
   end
 
 

data/lib/rock_books/reports/templates/html/index.html.erb

@@ -15,6 +15,13 @@
         padding: 36px;
         background-color: #88c1f7;
         color: #01182d;
+        max-width: 1024px;
+        float: none !important;
+        margin: 0 auto !important;
+      }
+
+      .top_heading {
+          text-align: center;
       }
 
       h2 {
@@ -32,10 +39,16 @@
 
   <body>
 
-    <h1><%= entity %></h1>
-    <h1><%= accounting_period %></h1>
-    <p class="muted"><%= generated %></p>
-<!--    <p class="muted">Reports Generated at <%#= DateTime.now.strftime('%Y-%m-%d %H:%M:%S') %> by RockBooks version <%#=RockBooks::VERSION %></p>-->
+    <h1 class="top_heading"><%= entity %></h1>
+    <h1 class="top_heading">Financial Statements, Reports, and Source Data</h1>
+    <h1 class="top_heading"><%= accounting_period %></h1>
+    <br />
+    <br />
+    <h4 class="top_heading"><%= generated[0] %></h4>
+    <h4 class="top_heading"><%= generated[1] %> (<a href="https://github.com/keithrbennett/rock_books">https://github.com/keithrbennett/rock_books</a>)</h4>
+    <h4 class="top_heading">Open Source Software Provided by <a href="https://www.bbs-software.com/">Bennett Business Solutions, Inc.</a></h4>
+    <br />
+    <br />
 
     <h2>Financial Statements</h2>
     <div id="financial-statements">
@@ -48,9 +61,10 @@
     <div id="supporting-documents" style="display: inline ">
       <%
         subdir_link = ->(name, caption) do
-          dir_name = File.expand_path(File.join(Dir.pwd, name))
-          if Dir.exist?(dir_name)
-            %Q{<a href=#{dir_name} class="btn btn-primary">#{caption}</a>}
+          link_dir_name = File.join('..', '..', name)
+          test_dir_name = name
+          if Dir.exist?(test_dir_name)
+            %Q{<a href=#{link_dir_name} class="btn btn-primary">#{caption}</a>}
           end
         end
       %>

data/lib/rock_books/reports/templates/text/balance_sheet.txt.erb

@@ -1,6 +1,7 @@
 <%= banner_line %>
 <%= fn_center.(entity || 'Unspecified Entity') %>
 <%= fn_center.("Balance Sheet for Period Ending #{end_date}") %>
+
 <%= fn_center.(generated) %>
 <%= banner_line %>
 

data/lib/rock_books/reports/templates/text/income_statement.txt.erb

@@ -1,6 +1,7 @@
 <%= banner_line %>
 <%= fn_center.(entity || 'Unspecified Entity') %>
 <%= fn_center.("Income Statement -- #{accounting_period}") %>
+
 <%= fn_center.(generated) %>
 <%= banner_line %>
 

data/lib/rock_books/reports/templates/text/journal.txt.erb

@@ -2,12 +2,15 @@
 <%= fn_center.(entity || 'Unspecified Entity') %>
 <%= fn_center.(title) %>
 <%= fn_center.(accounting_period) %>
+
 <% if code && name -%>
 <%= fn_center.("Account: #{name} (#{code})") %>
 <% end -%>
 <% if short_name -%>
 <%= fn_center.("Journal Short Name: #{short_name}") %>
+<%= fn_center.("Amounts shown are #{debit_or_credit}s to specified accounts (negate for #{short_name})") %>
 <% end -%>
+
 <%= fn_center.(generated) %>
 <%= banner_line %>
 

data/lib/rock_books/reports/templates/text/multidoc_txn_by_account_report.txt.erb

@@ -2,6 +2,7 @@
 <%= fn_center.(entity || 'Unspecified Entity') %>
 <%= fn_center.('Multi Document Transaction Report by Account') %>
 <%= fn_center.(accounting_period) %>
+
 <%= fn_center.(generated) %>
 
 <%= fn_center.('Source Documents') %>

data/lib/rock_books/reports/templates/text/multidoc_txn_report.txt.erb

@@ -2,6 +2,7 @@
 <%= fn_center.(entity || 'Unspecified Entity') %>
 <%= fn_center.('Multi Document Transaction Report') %>
 <%= fn_center.(accounting_period) %>
+
 <%= fn_center.(generated) %>
 
 <%= fn_center.('Source Documents') %>

data/lib/rock_books/reports/templates/text/receipts_report.txt.erb

@@ -5,6 +5,7 @@ end -%>
 <%= fn_center.(entity || 'Unspecified Entity') %>
 <%= fn_center.('Receipts Report') %>
 <%= fn_center.(accounting_period) %>
+
 <%= fn_center.(generated) %>
 <%= banner_line %>
 

data/lib/rock_books/reports/templates/text/tx_one_account.txt.erb

@@ -3,6 +3,7 @@
 <%= fn_center.("Transactions for Account #{account_string}") %>
 <%= fn_center.(sprintf("Total: %.2f", total)) %>
 <%= fn_center.(accounting_period) %>
+
 <%= fn_center.(generated) %>
 <%= banner_line %>
 

data/lib/rock_books/version.rb

@@ -1,4 +1,4 @@
 module RockBooks
-  VERSION = '0.8.0'
+  VERSION = '0.9.0'
   PROJECT_URL = 'https://github.com/keithrbennett/rock_books'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rock_books
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Keith Bennett
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-10 00:00:00.000000000 Z
+date: 2021-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amazing_print