luca-jp 0.2.3 → 0.9.0

data/lib/luca/jp/uchiwake.rb

@@ -41,18 +41,23 @@ module Luca #:nodoc:
 
         @有価証券 = @bs_data.each.with_object({}) do |(k, v), h|
           next unless account_codes.include?(k.to_s)
-          next unless readable(v || 0) > 0
+          next if v.nil? || v <= 0
 
+          inc = debit_amount(k, @start_date.year, @start_date.month, @end_date.year, @end_date.month) || 0
+          dec = credit_amount(k, @start_date.year, @start_date.month, @end_date.year, @end_date.month) || 0
           h[k] = {
             name: self.class.dict.dig(k)[:label],
-            amount: readable(v)
+            amount: readable(v),
+            diff: readable(inc - dec)
           }
+          STDERR.puts "勘定科目内訳書（有価証券）異動の追記が必要： #{h[k][:name]}" unless (inc - dec).zero?
+
           metadata = uchiwake_account_config(k).first
           if metadata && metadata['name']
             h[k][:name] = metadata['name'][0..9] if metadata['name']
             h[k][:security_purpose] = metadata['security_purpose']
             h[k][:security_genre] = metadata['security_genre']
-            h[k][:security_units] = metadata['security_units']
+            h[k][:security_units] = (h[k][:amount].nil? || h[k][:amount].zero?) ? 0 : metadata['security_units']
             h[k][:note] = metadata['note']
           end
           h[k][:security_purpose] ||= 'その他' if /^332/.match(k.to_s)

data/lib/luca/jp/util.rb

@@ -89,6 +89,23 @@ module Luca
       def eltax_config(key)
         config.dig('jp', 'eltax', key)
       end
+
+      def tokyo23?
+        @report_category == '23ku'
+      end
+
+      def 期首期末残高(code)
+        pre = readable(@start_balance.dig(code))
+        post = readable(@bs_data.dig(code))
+        [readable(pre), readable(post)]
+      end
+
+      def 純資産期中増減(code)
+        inc = credit_amount(code, @start_date.year, @start_date.month, @end_date.year, @end_date.month)
+        dec = debit_amount(code, @start_date.year, @start_date.month, @end_date.year, @end_date.month)
+
+        [readable(dec), readable(inc)]
+      end
     end
   end
 end

data/lib/luca/jp/version.rb

@@ -2,6 +2,6 @@
 
 module Luca
   module Jp
-    VERSION = '0.2.3'
+    VERSION = '0.9.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: luca-jp
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.9.0
 platform: ruby
 authors:
 - Chuma Takahiro
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-29 00:00:00.000000000 Z
+date: 2022-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lucabook
@@ -68,7 +68,7 @@ dependencies:
         version: 12.3.3
 description: 'JP tax extension for Luca
 
-'
+  '
 email:
 - co.chuma@gmail.com
 executables:
@@ -124,7 +124,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/chumaltd/luca-jp/tree/main
   source_code_uri: https://github.com/chumaltd/luca-jp/tree/main
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -139,8 +139,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
-signing_key: 
+rubygems_version: 3.2.5
+signing_key:
 specification_version: 4
 summary: JP tax extension for Luca
 test_files: []