lucabook 0.3.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b14674db9c7c07b4e523d4603f98e745ab680951822041666e7d957409aabfaf
-  data.tar.gz: 1a62eb8f39388727ab65bfa1f5242ac84a8c482a051715e944215d126b7bf93f
+  metadata.gz: fe62638b0f400b25938ba7515e0f33089fa2d8044e07622ef03333bc478159cb
+  data.tar.gz: 79b319cb365b2ee19e340d4abb4496e25aec430c021063409bd239de5443abad
 SHA512:
-  metadata.gz: 6f5005cc3efbc02170c73418e760a5ac39b87480fbdc78caf5cc5f2604ab009ea8cf6437a90473a675c8716e77de2d6eefeb77b0a7ee0de3337016ee78d7e83d
-  data.tar.gz: ed2ef276ea1e82f8c074fcde7ab2a9ee7fe29ea952098e58ac486f65b8ddc22a1e87218f0ecc6cee19e56832fd1acd14f7945adfefa6931bf93db7ec0532adc4
+  metadata.gz: d3cd9de1187394edda17a34c2aeeb7ea4c1804097084ad264ae685af17821df373ff607a5ef2d95797792e800740838a476550190636eaf94515266d6974280d
+  data.tar.gz: 9864cdeacb8220c049fbca8a7ac1bbf1214085343cf454a99714a83758f7c261990a997e41a27c7ea4d5ba3c9cf87bcb53b1da22bfa0dcc940a0f27211770f98

data/exe/luca-book

@@ -78,20 +78,42 @@ class LucaCmd
     def self.balancesheet(args, params)
       level = params[:level] || 3
       legal = params[:legal] || false
-      args = gen_range(params[:n] || 1) if args.empty?
-      render(LucaBook::State.range(*args).bs(level, legal: legal), params)
+      render(LucaBook::State.range(*parse_range_args(args, params)).bs(level, legal: legal), params)
     end
 
     def self.profitloss(args, params)
       level = params[:level] || 2
-      args = gen_range(params[:n]) if args.empty?
-      render(LucaBook::State.range(*args).pl(level), params)
+      render(LucaBook::State.range(*parse_range_args(args, params)).pl(level), params)
     end
 
     def self.report_mail(args, params)
       level = params[:level] || 3
-      args = gen_range(params[:n] || 12) if args.empty?
-      render(LucaBook::State.range(*args).report_mail(level), params)
+      render(LucaBook::State.range(*parse_range_args(args, params)).report_mail(level), params)
+    end
+  end
+
+  def self.parse_range_args(args, params)
+    case args.length
+    when 4
+      args
+    when 2
+      if params[:financialyear]
+        date = Date.new(args[0].to_i, args[1].to_i)
+        r = LucaBook::Util.current_fy(date, to: date)
+        [r[0].year, r[0].month, r[1].year, r[1].month]
+      else
+        args
+      end
+    when 0
+      if params[:n]
+        gen_range(params[:n])
+      elsif params[:financialyear]
+        date = Date.today
+        r = LucaBook::Util.current_fy(date)
+        [r[0].year, r[0].month, date.year, date.month]
+      else
+        [Date.today.year, Date.today.month]
+      end
     end
   end
 
@@ -223,6 +245,7 @@ when /reports?/, 'r'
     OptionParser.new do |opt|
       opt.banner = 'Usage: luca-book r[eports] bs [options] [YYYY M]'
       opt.on('-l', '--level VAL', 'account level') { |v| params[:level] = v.to_i }
+      opt.on('--fy', 'adjust start date to Financial Year') { |_v| params[:financialyear] = true }
       opt.on('--legal', 'show legal mandatory account') { |_v| params[:legal] = true }
       opt.on('--nu', 'show table in nushell') { |_v| params[:output] = 'nu' }
       opt.on('-o', '--output VAL', 'output serialized data') { |v| params[:output] = v }
@@ -233,6 +256,7 @@ when /reports?/, 'r'
     OptionParser.new do |opt|
       opt.banner = 'Usage: luca-book r[eports] pl [options] [YYYY M YYYY M]'
       opt.on('-l', '--level VAL', 'account level') { |v| params[:level] = v.to_i }
+      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('-o', '--output VAL', 'output serialized data') { |v| params[:output] = v }
@@ -243,6 +267,7 @@ when /reports?/, 'r'
     OptionParser.new do |opt|
       opt.banner = 'Usage: luca-book r[eports] mail [options] [YYYY M YYYY M]'
       opt.on('-l', '--level VAL', 'account level') { |v| params[:level] = v.to_i }
+      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 }
       args = opt.parse!(ARGV)
       LucaCmd::Report.report_mail(args, params)

data/lib/luca_book/accumulator.rb

@@ -74,17 +74,41 @@ module LucaBook
 
       # for assert purpose
       #
-      def gross(start_year, start_month, end_year = nil, end_month = nil, code:  nil, date_range: nil, rows: 4, recursive: false)
+      # header: { customer: 'some-customer' }
+      #
+      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
         end
+        scan_headers = header&.map { |k, v|
+          [:customer, :editor].include?(k) ? [ "x-#{k.to_s}", v ] : nil
+        }&.compact&.to_h
 
         end_year ||= start_year
         end_month ||= start_month
         sum = { debit: {}, credit: {}, debit_count: {}, credit_count: {} }
         idx_memo = []
-        term(start_year, start_month, end_year, end_month, code, 'journals') do |f, _path|
+
+        enm = if scan_headers.nil? || scan_headers.empty?
+                term(start_year, start_month, end_year, end_month, code, 'journals')
+              else
+                Enumerator.new do |y|
+                  term(start_year, start_month, end_year, end_month, code, 'journals') do |f, path|
+                    4.times { f.gets } # skip to headers
+                    CSV.new(f, headers: false, col_sep: "\t", encoding: 'UTF-8')
+                      .each do |line|
+                      break if line.empty?
+
+                      if scan_headers.keys.include? line[0]
+                        f.rewind
+                        y << [f, path]
+                      end
+                    end
+                  end
+                end
+              end
+        enm.each do |f, _path|
           CSV.new(f, headers: false, col_sep: "\t", encoding: 'UTF-8')
             .each_with_index do |row, i|
             break if i >= rows
@@ -142,8 +166,8 @@ module LucaBook
 
       # netting vouchers in specified term
       #
-      def net(start_year, start_month, end_year = nil, end_month = nil, code: nil, date_range: nil, recursive: false)
-        g = gross(start_year, start_month, end_year, end_month, code: code, date_range: date_range, recursive: recursive)
+      def net(start_year, start_month, end_year = nil, end_month = nil, code: nil, date_range: nil, recursive: false, header: nil)
+        g = gross(start_year, start_month, end_year, end_month, code: code, date_range: date_range, recursive: recursive, header: header)
         idx = (g[:debit].keys + g[:credit].keys).uniq.sort
         count = {}
         diff = {}.tap do |sum|

data/lib/luca_book/import.rb

@@ -54,6 +54,12 @@ module LucaBook
         d['debit'].each { |h| h['code'] = code_map.dig(h['label']) || DEBIT_DEFAULT }
         d['credit'].each { |h| h['code'] = code_map.dig(h['label']) || CREDIT_DEFAULT }
 
+        LucaBook::Journal::ACCEPTED_HEADERS.each do |header|
+          next if d[header].nil?
+          d['headers'] ||= {}
+          d['headers'][header] = d[header]
+          d[header].delete
+        end
         LucaBook::Journal.create(d)
       end
     end

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

@@ -19,7 +19,7 @@ code	label	xbrl_id	consumption_tax	income_tax
 1502	未収法人税			
 1503	未収都道府県住民税			
 1504	未収地方事業税			
-1505	未収市民税			
+1505	未収市町村住民税			
 160	棚卸資産	jppfs_cor:Inventories
 161	商品	jppfs_cor:Merchandize
 162	製品	jppfs_cor:FinishedGoods
@@ -85,8 +85,8 @@ code	label	xbrl_id	consumption_tax	income_tax
 515	未払法人税等	jppfs_cor:IncomeTaxesPayable
 5151	未払法人税			
 5152	未払地方事業税			
-5153	未払都道府県民税			
-5154	未払市民税			
+5153	未払都道府県住民税			
+5154	未払市町村住民税			
 516	未払消費税等	jppfs_cor:AccruedConsumptionTaxes
 517	未払費用	jppfs_cor:AccruedExpenses
 518	前受金	jppfs_cor:AdvancesReceived
@@ -191,4 +191,8 @@ G13	災害損失	jppfs_cor:LossOnDisasterEL
 GA	税引前利益	jppfs_cor:IncomeBeforeIncomeTaxes
 H0	法人税等	jppfs_cor:IncomeTaxes
 H11	法人税、住民税及び事業税	jppfs_cor:IncomeTaxesCurrent
+H111	法人税
+H112	都道府県住民税
+H113	市町村住民税
+H114	地方事業税
 HA	当期利益	jppfs_cor:ProfitLoss

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

@@ -19,7 +19,7 @@ code	label	xbrl_id	consumption_tax	income_tax
 1502	未収法人税			
 1503	未収都道府県住民税			
 1504	未収地方事業税			
-1505	未収市民税			
+1505	未収市町村住民税			
 160	棚卸資産			
 161	商品	jpfr-t-cte:Merchandise		
 162	製品	jpfr-t-cte:FinishedGoods		
@@ -85,8 +85,8 @@ code	label	xbrl_id	consumption_tax	income_tax
 515	未払法人税等	jpfr-t-cte:IncomeTaxesPayable		
 5151	未払法人税			
 5152	未払地方事業税			
-5153	未払都道府県民税			
-5154	未払市民税			
+5153	未払都道府県住民税			
+5154	未払市町村住民税			
 516	未払消費税等	jpfr-t-cte:AccruedConsumptionTaxes		
 517	未払費用	jpfr-t-cte:AccruedExpenses		
 518	前受金	jpfr-t-cte:AdvancesReceived		
@@ -191,4 +191,8 @@ G13	災害損失	jpfr-t-cte:LossOnDisasterEL
 GA	税引前利益	jpfr-t-cte:IncomeBeforeIncomeTaxes		
 H0	法人税等	jpfr-t-cte:IncomeTaxes		
 H11	法人税、住民税及び事業税	jpfr-t-cte:IncomeTaxesCurrent		
+H111	法人税
+H112	都道府県住民税
+H113	市町村住民税
+H114	地方事業税
 HA	当期利益	jpfr-t-cte:NetIncome		

data/lib/luca_book/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lucabook
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Chuma Takahiro
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-17 00:00:00.000000000 Z
+date: 2022-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lucarecord