lucabook 0.2.17 → 0.2.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b204a2ed70889d0750a6883de424ceb3b7e335cce99262eb98e288db6962cbd
-  data.tar.gz: e19db20331a4edce1ea02ffb47495c3f849f74ba0bf78b13c7cf0562207fc0d2
+  metadata.gz: d25b3a6c62980682db52a5553ce26cafdcb36e80e9657a302a8413e1e92b565b
+  data.tar.gz: e82a86c04d13aa6addef398afd85755a7a54ce437d1e9415ce3f98bf1b28f914
 SHA512:
-  metadata.gz: 16800a60362abcc56adb26ed60611a98a5ec5c3545143b4a0c4a379aac3988952e733dac19bf5c2188ce9e7c244dff1b4d6269635a226eeda51ec85c4ab2178f
-  data.tar.gz: f60f61de1a1c18df3db8c1bc5278ae084089137b15ee88f198ff17c6418917c6adebb634820dcd9979b42a9ecf7e902329c7bb14fb950f5270154492a2b0d8b2
+  metadata.gz: 652c00f982977bbb619bfc834c312dbbb06f2ada524e1824869c04ef4ed09e3fadd5aee2b082fc3944cda4eaf7bfd18fd041a80582fe57f67cc88d13197b60a6
+  data.tar.gz: 422dedf33b9a9bd53ac8502613ae4a27c3c10730e2ac65841fddd9e424d9435a2cb92118700f9571dceea09b54b1f9a1538b9c76facfed87542832e2ce4ba939

data/exe/luca-book

@@ -12,20 +12,21 @@ module LucaCmd
         LucaBook::Import.import_json(STDIN.read)
       else
         puts 'Usage: luca-book import -c import_config'
+        exit 1
       end
     end
 
     def self.list(args, params)
+      args = LucaCmd.gen_range(params[:n] || 1) if args.empty?
       if params['code']
         LucaBook::List.term(*args, code: params['code']).list_on_code.to_yaml
-      elsif args.length > 0
-        LucaBook::List.term(*args).list_journals.to_yaml
       else
-        # TODO: define default function
+        LucaBook::List.term(*args).list_journals.to_yaml
       end
     end
 
     def self.stats(args, params)
+      args = LucaCmd.gen_range(params[:n]) if args.empty?
       LucaBook::State.term(*args).stats(params[:level])
     end
   end
@@ -34,13 +35,24 @@ module LucaCmd
     def self.balancesheet(args, params)
       level = params[:level] || 2
       legal = params[:legal] || false
+      args = LucaCmd.gen_range(params[:n] || 1) if args.empty?
       LucaBook::State.term(*args).bs(level, legal: legal)
     end
 
     def self.profitloss(args, params)
+      args = LucaCmd.gen_range(params[:n]) if args.empty?
       LucaBook::State.term(*args).pl.to_yaml
     end
   end
+
+  module_function
+
+  def gen_range(count)
+    count ||= 3
+    today = Date.today
+    start = today.prev_month(count - 1)
+    [start.year, start.month, today.year, today.month]
+  end
 end
 
 def new_pj(args = nil, params = {})
@@ -57,7 +69,7 @@ when /journals?/, 'j'
   case subcmd
   when 'import'
     OptionParser.new do |opt|
-      opt.banner = 'Usage: luca-book journals import filepath'
+      opt.banner = 'Usage: luca-book journals import [options] filepath'
       opt.on('-c', '--config VAL', 'import definition'){ |v| params['config'] = v }
       opt.on('-j', '--json', 'import via json format'){ |_v| params['json'] = true }
       args = opt.parse!(ARGV)
@@ -65,23 +77,32 @@ when /journals?/, 'j'
     end
   when 'list'
     OptionParser.new do |opt|
-      opt.banner = 'Usage: luca-book journals list [year month]'
+      opt.banner = 'Usage: luca-book journals list [options] [YYYY M]'
       opt.on('-c', '--code VAL', 'search with code') { |v| params['code'] = v }
+      opt.on('-n VAL', 'report count') { |v| params[:n] = v.to_i }
       opt.on_tail('List records. If you specify code and/or month, search on each criteria.')
       args = opt.parse!(ARGV)
       LucaCmd::Journal.list(args, params)
     end
   when 'stats'
     OptionParser.new do |opt|
-      opt.banner = 'Usage: luca-book reports bs'
-      opt.on('-l', '--level VAL', 'account level') { |v| params[:level] = v.to_i }
+      opt.banner = 'Usage: luca-book journals stats [options] [YYYY M]'
+      opt.on('-n VAL', 'report count') { |v| params[:n] = v.to_i }
       args = opt.parse!(ARGV)
       LucaCmd::Journal.stats(args, params)
     end
+  else
+    puts 'Proper subcommand needed.'
+    puts
+    puts 'Usage: luca-book (j|journal[s]) subcommand [options] [YYYY M YYYY M]'
+    puts '  import: import journals from JSON/TSV'
+    puts '  list: list journals'
+    puts '  stats: list account statistics'
+    exit 1
   end
 when 'new'
   OptionParser.new do |opt|
-    opt.banner = 'Usage: luca-book new Dir'
+    opt.banner = 'Usage: luca-book new [options] Dir'
     opt.on('-c', '--country VAL', 'specify country code') { |v| params['coountry'] = v }
     args = opt.parse(ARGV)
     new_pj(args, params)
@@ -91,7 +112,7 @@ when /reports?/, 'r'
   case subcmd
   when 'bs'
     OptionParser.new do |opt|
-      opt.banner = 'Usage: luca-book reports bs'
+      opt.banner = 'Usage: luca-book reports bs [options] [YYYY M]'
       opt.on('-l', '--level VAL', 'account level') { |v| params[:level] = v.to_i }
       opt.on('--legal', 'show legal mandatory account') { |_v| params[:legal] = true }
       args = opt.parse!(ARGV)
@@ -99,15 +120,24 @@ when /reports?/, 'r'
     end
   when 'pl'
     OptionParser.new do |opt|
-      opt.banner = 'Usage: luca-book reports pl'
+      opt.banner = 'Usage: luca-book reports pl [options] [YYYY M YYYY M]'
+      opt.on('-n VAL', 'report count') { |v| params[:n] = v.to_i }
       args = opt.parse!(ARGV)
       LucaCmd::Report.profitloss(args, params)
     end
+  else
+    puts 'Proper subcommand needed.'
+    puts
+    puts 'Usage: luca-book (r|report[s]) (bs|pl) [options] YYYY M'
+    puts '  bs: show balance sheet'
+    puts '  pl: show statement of income'
+    exit 1
   end
-when '--help'
-  puts 'Usage: luca-book subcommand'
+else
+  puts 'Proper subcommand needed.'
+  puts
+  puts 'Usage: luca-book (j[ournals]|r[eports]) subcommand'
   puts '  journals: operate journal records'
   puts '  reports: show reports'
-else
-  puts 'Invalid subcommand'
+  exit 1
 end

data/lib/luca_book/state.rb

@@ -47,9 +47,9 @@ module LucaBook
       reports = [].tap do |r|
         while date <= last_date do
           diff, count = accumulate_month(date.year, date.month)
-          r << diff
-          counts << count
-          date = date.next_month
+          r << diff.tap { |c| c['_d'] = date.to_s }
+          counts << count.tap { |c| c['_d'] = date.to_s }
+          date = Date.new(date.next_month.year, date.next_month.month, -1)
         end
       end
       new reports, counts
@@ -87,16 +87,18 @@ module LucaBook
       @statement ||= @data
       @statement.map do |report|
         {}.tap do |h|
-          report.each { |k, v| h[@dict.dig(k, :label)] = v }
+          report.each { |k, v| h[@dict.dig(k, :label) || k] = v }
         end
       end
     end
 
     def stats(level = nil)
-      keys = @count.map(&:keys).flatten.uniq.sort
+      keys = @count.map(&:keys).flatten.push('_t').uniq.sort
       @count.map! do |data|
+        sum = 0
         keys.each do |k|
           data[k] ||= 0
+          sum += data[k] if /^[^_]/.match(k)
           next if level.nil? || k.length <= level
 
           if data[k[0, level]]
@@ -106,6 +108,7 @@ module LucaBook
           end
         end
         data.select! { |k, _v| k.length <= level } if level
+        data['_t'] = sum
         data.sort.to_h
       end
       keys.map! { |k| k[0, level] }.uniq.select! { |k| k.length <= level } if level
@@ -147,7 +150,7 @@ module LucaBook
           case k
           when /^[0-4].*/
             res[:debit] << { k => v }
-          when /^[5-9H].*/
+          when /^[5-9].*/
             res[:credit] << { k => v }
           end
         end
@@ -155,8 +158,9 @@ module LucaBook
     end
 
     def pl
-      @statement = @data.map { |data| data.select { |k, _v| /^[A-H].+/.match(k) } }
+      @statement = @data.map { |data| data.select { |k, _v| /^[A-H_].+/.match(k) } }
       @statement << @statement.each_with_object({}) { |item, h| item.each { |k, v| h[k].nil? ? h[k] = v : h[k] += v } }
+                      .tap { |h| h['_d'] = 'Total' }
       self
     end
 
@@ -169,12 +173,6 @@ module LucaBook
     #
     def self.total_subaccount(report)
       {}.tap do |res|
-        res['10'] = sum_matched(report, /^[123][0-9A-Z]{2,}/)
-        res['40'] = sum_matched(report, /^[4][0-9A-Z]{2,}/)
-        res['50'] = sum_matched(report, /^[56][0-9A-Z]{2,}/)
-        res['70'] = sum_matched(report, /^[78][0-9A-Z]{2,}/)
-        res['8ZZ'] = res['50'] + res['70']
-        res['9ZZ'] = sum_matched(report, /^[9][0-9A-Z]{2,}/)
         res['A0'] = sum_matched(report, /^[A][0-9A-Z]{2,}/)
         res['B0'] = sum_matched(report, /^[B][0-9A-Z]{2,}/)
         res['BA'] = res['A0'] - res['B0']
@@ -184,12 +182,22 @@ module LucaBook
         res['E0'] = sum_matched(report, /^[E][0-9A-Z]{2,}/)
         res['EA'] = res['CA'] + res['D0'] - res['E0']
         res['F0'] = sum_matched(report, /^[F][0-9A-Z]{2,}/)
-        res['G0'] = sum_matched(report, /^[G][0-9A-Z]{2,}/)
+        res['G0'] = sum_matched(report, /^[G][0-9][0-9A-Z]{1,}/)
         res['GA'] = res['EA'] + res['F0'] - res['G0']
-        res['HA'] = res['GA'] - sum_matched(report, /^[H][0-9A-Z]{2,}/)
+        res['H0'] = sum_matched(report, /^[H][0-9][0-9A-Z]{1,}/)
+        res['HA'] = res['GA'] - res['H0']
+
+        res['9142'] = (report['9142'] || 0) + res['HA']
+        res['10'] = sum_matched(report, /^[123][0-9A-Z]{2,}/)
+        res['40'] = sum_matched(report, /^[4][0-9A-Z]{2,}/)
+        res['50'] = sum_matched(report, /^[56][0-9A-Z]{2,}/)
+        res['70'] = sum_matched(report, /^[78][0-9A-Z]{2,}/)
+        res['8ZZ'] = res['50'] + res['70']
+        res['9ZZ'] = sum_matched(report, /^[9][0-9A-Z]{2,}/)
 
         res['1'] = res['10'] + res['40']
         res['5'] = res['8ZZ'] + res['9ZZ'] + res['HA']
+        res['_d'] = report['_d']
 
         report.each do |k, v|
           if k.length >= 4

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

@@ -115,6 +115,11 @@ C1O	外注費
 C1P	Depreciation
 C1Q	Miscellaneous
 C1R	貸倒引当金繰入
+C1S	支払報酬
+C1T	研修費
+C1U	採用費
+C1V	業務委託費
+C1W	会議費
 CA	Operating profit/loss
 D0	営業外収益
 D11	Interest income
@@ -139,4 +144,6 @@ G11	固定資産売却損
 G12	固定資産除却損
 G13	災害損失
 GA	Income before taxes
+H0	Income Taxes
+H11	Income Taxes Current
 HA	Net Income/Loss

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

@@ -1,5 +1,5 @@
 code	label	xbrl_id	consumption_tax	income_tax
-1	資産合計
+1	資産合計	jppfs_cor:AssetsAbstract
 10	流動資産	jppfs_cor:CurrentAssetsAbstract
 10XX	UNSETTLED_IMPORT
 110	現金及び預金	jppfs_cor:CashAndDeposits
@@ -55,7 +55,7 @@ code	label	xbrl_id	consumption_tax	income_tax
 442	創立費	jppfs_cor:DeferredOrganisationExpensesDA
 442	新株発行費	jppfs_cor:StockIssuanceCostDA
 443	社債発行費	jppfs_cor:BondIssuanceCostDA
-5	負債・純資産合計
+5	負債・純資産合計	jppfs_cor:LiabilitiesAndNetAssets
 50	流動負債	jppfs_cor:CurrentLiabilitiesAbstract
 50XX	UNSETTLED_IMPORT
 510	支払手形	jppfs_cor:NotePayableTrade
@@ -74,25 +74,24 @@ code	label	xbrl_id	consumption_tax	income_tax
 712	長期借入金	jppfs_cor:LongTermLoansPayable
 713	退職給付引当金	jppfs_cor:ProvisionForRetirementBenefits
 714	繰延税金負債	jppfs_cor:DeferredTaxLiabilities
-8ZZ	負債合計
-90	純資産	jppfs_cor:NetAssetsAbstract
+8ZZ	負債合計	jppfs_cor:LiabilitiesAbstract
 91	株主資本	jppfs_cor:ShareholdersAbstract
 911	資本金	jppfs_cor:CapitalStock
-912	新株式申込証拠金
+912	新株式申込証拠金	jppfs_cor:DepositForSubscriptionsToShares
 913	資本剰余金	jppfs_cor:LegalCapitalSurplus
-9131	資本準備金
-9132	その他資本剰余金
+9131	資本準備金	jppfs_cor:LegalCapitalSurplus
+9132	その他資本剰余金	jppfs_cor:OtherCapitalSurplus
 914	利益剰余金	jppfs_cor:RetainedEarnings
-9141	利益準備金
-9142	その他利益剰余金
+9141	利益準備金	jppfs_cor:LegalRetainedEarnings
+9142	その他利益剰余金	jppfs_cor:OtherRetainedEarningsAbstract
 915	自己株式	jppfs_cor:TreasuryStock
-916	自己株式申込証拠金
+916	自己株式申込証拠金	jppfs_cor:DepositForSubscriptionsToTreasuryStock
 92	評価換算差額等	jppfs_cor:ValuationAndTranslationAdjustments
 921	有価証券評価差額金	jppfs_cor:ValuationDifferenceOnAvailableForSaleSecurities
 922	為替換算調整勘定	jppfs_cor:ForeignCurrencyTranslationAdjustment
 93	新株予約権	jppfs_cor:SubscriptionRightsToShares
 940	非支配株主持分	jppfs_cor:NonControllingInterests
-9ZZ	純資産合計
+9ZZ	純資産合計	jppfs_cor:NetAssetsAbstract
 A0	売上	jppfs_cor:NetSalesAbstract
 A11	売上高	jppfs_cor:NetSales
 B0	売上原価	jppfs_cor:CostOfSalesAbstract
@@ -130,7 +129,11 @@ C1O	外注費	jppfs_cor:SubcontructExpensesSGA
 C1P	減価償却費	jppfs_cor:DepreciationSGA
 C1Q	雑費	jppfs_cor:MiscellaneousExpensesSGA
 C1R	貸倒引当金繰入	jppfs_cor:ProvisionOfAllowanceForDebtfulAccountsSGA
-C1S	支払報酬
+C1S	支払報酬	jppfs_cor:CompensationsSGA
+C1T	研修費	jppfs_cor:TrainingExpensesSGA
+C1U	採用費	jppfs_cor:RecruitingExpensesSGA
+C1V	業務委託費	jppfs_cor:BusinessConsignmentExpensesSGA
+C1W	会議費	jppfs_cor:ConferenceExpensesSGA
 CA	営業利益	jppfs_cor:OperatingIncome
 D0	営業外収益	jppfs_cor:NonOperatingIncomeAbstract
 D11	受取利息	jppfs_cor:InterestIncomeNOI
@@ -154,5 +157,7 @@ G0	特別損失	jppfs_cor:ExtraordinaryLossAbstract
 G11	固定資産売却損	jppfs_cor:LossOnSalesOfNoncurrentAssetsEL
 G12	固定資産除却損	jppfs_cor:LossOnRetirementOfNoncurrentAssetsEL
 G13	災害損失	jppfs_cor:LossOnDisasterEL
-GA	税引前純利益	jppfs_cor:IncomeBeforeIncomeTaxes
+GA	税引前利益	jppfs_cor:IncomeBeforeIncomeTaxes
+H0	法人税等	jppfs_cor:IncomeTaxes
+H11	法人税、住民税及び事業税	jppfs_cor:IncomeTaxesCurrent
 HA	当期利益	jppfs_cor:ProfitLoss

data/lib/luca_book/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lucabook
 version: !ruby/object:Gem::Version
-  version: 0.2.17
+  version: 0.2.18
 platform: ruby
 authors:
 - Chuma Takahiro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-18 00:00:00.000000000 Z
+date: 2020-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lucarecord
@@ -84,7 +84,6 @@ files:
 - lib/luca_book/import.rb
 - lib/luca_book/journal.rb
 - lib/luca_book/list.rb
-- lib/luca_book/report.rb
 - lib/luca_book/setup.rb
 - lib/luca_book/state.rb
 - lib/luca_book/templates/base-jp.xbrl.erb

data/lib/luca_book/report.rb

@@ -1,3 +0,0 @@
-# move to LucaBook::State
-class LucaBookReport
-end