lucabook 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0aada3e712bc8c2ecd96ea0cfe499565d7c6c036decb8b0a29f90bddaf65d9b8
-  data.tar.gz: e7ab9a0d301a86f80b9dcd74140bbf596bfdb6ce73c11cf8aef0b4e6413e7fa7
+  metadata.gz: 33c275cc53bc4538109f607fcfac3cb8ae5014863037c58ff6a74903cf6dc862
+  data.tar.gz: 6b51180e7d5501cc94d030859ff4ad12508fc1aa68a848f5d78e89bf06f1a2c4
 SHA512:
-  metadata.gz: 2a5588460f50c3ac0613c16977c1b0849fdf279c25ca18f435d1dfa62e1ad31ef69647774e95a1e01f7255158604f445e61900fd9f992be6775299b2dd5f2d28
-  data.tar.gz: 0a666d47c831e4f8bfa0adf5c064c544de2c2c55d45c4c407dc1e3cd62ecaa5e9f6034ba65925ac936e7375b93ef38094932f43bd99af96dbedabf3fae4a7aaa
+  metadata.gz: c2d2db06519f28374a632f9ec8e697af1e52cb73f46042cb1b14ab3404441cc3fe3395c59d39cb4b50dad1d571f5a4cec8f1824d864ea00a6958ee832f10b12c
+  data.tar.gz: 45e5306fdd26e9fa9a2e3850a4674cbe552a5a612e3b57f98319d3e0d67687bfd6a2bf3c3dffc0bba5722ceadef3b3fb43a2846faa281d02eeaee66c97cadff0

data/exe/luca-book

@@ -27,9 +27,9 @@ class LucaCmd
       params[:col_order] = %w(date diff balance counter_code note code id no)
       if params['code']
         if params['headers']
-          render(LucaBook::ListByHeader.term(*args, code: params['code'], header: params['headers']).list_by_code, params)
+          render(LucaBook::ListByHeader.term(*parse_range_args(args, params), code: params['code'], header: params['headers']).list_by_code, params)
         else
-          render(LucaBook::List.term(*args, code: params['code'], recursive: params[:recursive]).list_by_code(params[:recursive]), params)
+          render(LucaBook::List.term(*parse_range_args(args, params), code: params['code'], recursive: params[:recursive]).list_by_code(params[:recursive]), params)
         end
       elsif params['render']
         puts LucaBook::List.term(*args).render_html(params['render'])
@@ -195,6 +195,7 @@ when /journals?/, 'j'
       opt.on('-c', '--code VAL', 'filter with code or label') { |v| params['code'] = v }
       opt.on('-r', '--recursive', 'include subaccounts') { |_v| params[:recursive] = true }
       opt.on('--customer', 'categorize by x-customer header') { |_v| params['headers'] = 'x-customer' }
+      opt.on('--fy', 'adjust start date to Financial Year') { |_v| params[:financialyear] = true }
       opt.on('-n VAL', 'report count') { |v| params[:n] = v.to_i }
       opt.on('--nu', 'show table in nushell') { |_v| params[:output] = 'nu' }
       opt.on('--explore', 'explore table in nushell') { |_v| params[:output] = 'explore' }

data/lib/luca_book/accumulator.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'luca_book/util'
+require 'luca_support/code'
 require 'luca_support/const'
 
 module LucaBook
@@ -79,7 +80,21 @@ module LucaBook
       def gross(start_year, start_month, end_year = nil, end_month = nil, code:  nil, date_range: nil, rows: 4, recursive: false, header: nil)
         if ! date_range.nil?
           raise if date_range.class != Range
-          # TODO: date based range search
+
+          start_year = date_range.first.year
+          start_month = date_range.first.month
+          end_year = date_range.last.year
+          end_month = date_range.last.month
+          date_bound = {
+            start: {
+              month: "#{start_year}#{LucaSupport::Code.encode_month(start_month)}",
+              day: LucaSupport::Code.encode_date(date_range.first)
+            },
+            end: {
+              month: "#{end_year}#{LucaSupport::Code.encode_month(end_month)}",
+              day: LucaSupport::Code.encode_date(date_range.last)
+            }
+          }
         end
         scan_headers = header&.map { |k, v|
           [:customer, :editor].include?(k) ? [ "x-#{k.to_s}", v ] : nil
@@ -108,7 +123,15 @@ module LucaBook
                   end
                 end
               end
-        enm.each do |f, _path|
+        enm.each do |f, path|
+          if date_bound
+            if path[0] == date_bound[:start][:month]
+              next if path[1][0] < date_bound[:start][:day]
+            elsif path[0] == date_bound[:end][:month]
+              next if path[1][0] > date_bound[:end][:day]
+            end
+          end
+
           CSV.new(f, headers: false, col_sep: "\t", encoding: 'UTF-8')
             .each_with_index do |row, i|
             break if i >= rows
@@ -183,7 +206,7 @@ module LucaBook
       # Override LucaRecord::IO.load_data
       #
       def load_data(io, path = nil)
-        io
+        [io, path]
       end
     end
 

data/lib/luca_book/setup.rb

@@ -38,7 +38,7 @@ module LucaBook
         csv << ['code', 'label', 'balance']
         csv << ['_date', '2020-1-1']
         CSV.open("#{__dir__}/templates/#{dict}", 'r', col_sep: "\t", encoding: 'UTF-8').each do |row|
-          csv << row if /^[1-9]/.match(row[0])
+          csv << row[0, 1] if /^[1-9]/.match(row[0])
         end
       end
     end

data/lib/luca_book/templates/dict-jp.tsv

@@ -41,8 +41,11 @@ code	label	xbrl_id	consumption_tax	income_tax
 1858	仮払地方税付加価値割			
 1859	仮払地方税法人税割			
 185A	仮払地方税均等割			
-185B	仮払消費税
+185B	仮払消費税			
 185C	仮払地方消費税
+185D	仮払市民税法人税割			
+185E	仮払市民税均等割			
+185F	仮払所得税			
 30	固定資産	jpfr-t-cte:NoncurrentAssets		
 31	有形固定資産	jpfr-t-cte:PropertyPlantAndEquipment		
 311	建物	jpfr-t-cte:Buildings		
@@ -164,7 +167,9 @@ C1S	支払報酬	jpfr-t-cte:CompensationsSGA
 C1T	研修費	jpfr-etax-t-cte:RecruitmentEducationExpense		
 C1U	採用費			
 C1V	業務委託費			
-C1W	会議費			
+C1W	会議費	jpfr-etax-t-cte:ConventionExpense		
+C1X	寄付金	jpfr-etax-t-cte:Donation		
+C1X1	指定寄付金			
 CA	営業利益	jpfr-t-cte:OperatingIncome		
 D0	営業外収益	jpfr-t-cte:NonOperatingIncome		
 D11	受取利息	jpfr-t-cte:InterestIncomeNOI		
@@ -195,4 +200,6 @@ H111	法人税
 H112	都道府県住民税
 H113	市町村住民税
 H114	地方事業税
+H115	所得税税額控除			
+H116	外国税			
 HA	当期利益	jpfr-t-cte:NetIncome		

data/lib/luca_book/util.rb

@@ -15,7 +15,7 @@ module LucaBook
       [d - c, { debit: d, credit: c }]
     end
 
-    # items assumed as bellows:
+    # items assumed:
     #   [{ code: '113', amount: 1000 }, ... ]
     #
     def diff_by_code(items, code)
@@ -48,7 +48,7 @@ module LucaBook
       start_month = LucaSupport::CONST.config['fy_start']
       start_year = date.month >= start_month ? date.year : date.year - 1
       @start_date = Date.new(start_year, start_month, 1)
-      @end_date = Date.new(start_year + 1, start_month - 1, -1)
+      @end_date = @start_date.next_year.prev_day
       @end_date = [to, @end_date].min if to
       [@start_date, @end_date]
     end

data/lib/luca_book/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LucaBook
-  VERSION = '0.5.2'
+  VERSION = '0.5.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lucabook
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Chuma Takahiro
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-02-05 00:00:00.000000000 Z
+date: 2024-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lucarecord