luca-jp 0.18.0 → 0.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a98448036b1788b2abc23519ad4cfc8e0cd0396514575adf8bd7503f88a28cf
-  data.tar.gz: a02f5398a24dc46f4b0a635eafcb2b0f6416198cffc99381f96503b1a7bd3822
+  metadata.gz: b480588d30ad8662d44c2ab3f2c0575fa91250b2b24928d4ccc089f1fee34f48
+  data.tar.gz: 3843a90218ddccc9969d80ec955783a799e3095b6a1a01abe870632a3831f356
 SHA512:
-  metadata.gz: 2bb9826708254e146de42058bcea099f4c50bf2f27e5101f549fffc7f5aa284b55131ccd634305fc2b05d0a1d7b303aecc2148f336ec64836a1fdc5a136f8c30
-  data.tar.gz: cd0f64837e95bf6d6291fac1ac8f7160acd9e303cb2c09a2500f202a63b725809a8dd3d1bfd353dcc19934edfee65841f94278e040cd0c5b1caa698bfac849d0
+  metadata.gz: 6a87556ce0b2da2c016624df23efa9e73d00816e0682713596841426d95be8a13b256e6b6ae848b3e6ef16ac10ef9b0e6763b964f6f2cf5a8f14057a6bb52add
+  data.tar.gz: f3dd2de0bc8686bc7643ade70cb584a1e8e5e3d3c9c6019249e8cbcff07ee85c36ac65465df408bc7cb82611624201988f3b42c277ee392128f961238206c1cb

data/exe/luca-jp

@@ -37,14 +37,14 @@ class LucaCmd
       puts JSON.dump(accounts)
     else
       Luca::Jp::Util.eltax_config('reports').each do |report|
-        File.open("chihouzei-#{report['jichitai_code']}#{report['jimusho_code']}.xml", 'w') { |f| f.puts(Luca::Jp::Chihouzei.range(*auto_range(args, params)).kani(report))}
+        File.open("chihouzei-#{report['jichitai_code']}#{report['jimusho_code']}.xml", 'w') { |f| f.puts(Luca::Jp::Chihouzei.range(*auto_range(args, params)).kani(report, ext_config: ext_config))}
       end
     end
   end
 
   def self.urikake(args, params)
     date = "#{args[0]}-#{args[1]}-1"
-    Luca::Jp::Urikake.new(date).report(params[:total], params[:encode])
+    Luca::Jp::Urikake.new(date).report(params[:encode])
   end
 
   def self.auto_range(args, params)
@@ -111,7 +111,6 @@ when 'c', /chihou?zei/
 when /urikake/
   OptionParser.new do |opt|
     opt.banner = 'Usage: luca-jp urikake [options] yyyy mm'
-    opt.on('--total VAL', '売掛金総額') { |v| params[:total] = v&.to_i }
     opt.on('--utf8', 'UTF-8でファイル生成') { |_v| params[:encode] = 'UTF-8' }
     args = opt.parse!(ARGV)
     LucaCmd.check_dir('invoices', ext_conf: EXT_CONF) do

data/lib/luca/jp/aoiro.rb

@@ -737,10 +737,6 @@ module Luca
         [@事業税中間納付, 確定事業税].min
       end
 
-      def 期末未納事業税
-        readable(@bs_data['5152']) || 0
-      end
-
       def 別表五一期首差引金額
         [
           @当期還付法人税,

data/lib/luca/jp/chihouzei.rb

@@ -40,7 +40,7 @@ module Luca
         @地方特別法人事業税中間納付 = prepaid_tax('1854', @jimusho_name)
         @所得割中間納付 = prepaid_tax('1855', @jimusho_name)
         @法人税割中間納付 = prepaid_tax(
-          @report_category == 'city' ? '185D' :'1859',
+          @report_category == 'city' ? '185D' : '1859',
           @jimusho_name
         )
         @均等割中間納付 = prepaid_tax(

data/lib/luca/jp/common.rb

@@ -132,7 +132,7 @@ module Luca
         期末資本準備金 = LucaSupport::Code.readable(@bs_data.dig('9131')||0)
 
         ([
-          (寄付金算定所得 * 2.5 / 100).floor,
+          ([寄付金算定所得, 0].max * 2.5 / 100).floor,
           ([期末資本金, 期末資本準備金].compact.sum * 2.5 / 1000).floor
         ].compact.sum / 4).floor
       end

data/lib/luca/jp/uchiwake.rb

@@ -41,10 +41,11 @@ module Luca #:nodoc:
 
         @有価証券 = @bs_data.each.with_object({}) do |(k, v), h|
           next unless account_codes.include?(k.to_s)
-          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
+          next if v.nil? || (v <= 0 && inc <= 0 && dec <= 0)
+
           h[k] = {
             name: self.class.dict.dig(k)[:label],
             amount: readable(v),

data/lib/luca/jp/urikake.rb

@@ -11,38 +11,37 @@ module Luca
     class Urikake < LucaDeal::Invoice
       @dirname = 'invoices'
 
-      def report(total = nil, encoding = nil)
+      def report(encoding = nil)
         listed_amount = 0
         encoding ||= 'SJIS'
+        customers, total = list
         str = CSV.generate(String.new, headers: false, col_sep: ',', encoding: encoding) do |f|
-          list.map do |invoice|
-            amount = readable(invoice.dig('subtotal', 0, 'items') + invoice.dig('subtotal', 0, 'tax'))
+          customers.map do |c|
+            amount = readable(c['unsettled'])
             listed_amount += amount
-            f << ['3', '0', '売掛金', invoice.dig('customer', 'name'), invoice.dig('customer', 'address'), amount, nil ]
+            f << ['3', '0', '売掛金', c['customer'], c['address'], amount, nil ]
           end
-          if total
+          if total - listed_amount > 0
             f << ['3', '0', '売掛金', 'その他', nil, total - listed_amount, nil ]
-            f << ['3', '1', nil, nil, nil, total, nil ]
-          else
-            f << ['3', '1', nil, nil, nil, listed_amount, nil ]
           end
+          f << ['3', '1', nil, nil, nil, total, nil ]
         end
         File.open('HOI030_3.0.csv', 'w') { |f| f.write(str) }
       end
 
       def list
-        invoices = self.class.asof(@date.year, @date.month)
-                     .map { |dat, _path| dat }
-                     .sort_by { |invoice| invoice.dig('subtotal', 0, 'items') }
+        customers = self.class.report(@date, detail: true)
+                     .sort_by { |customer| customer['unsettled'] }
                      .reverse
+        total = customers.inject(0) { |sum, customer| sum + customer['unsettled'] }
 
-        reports = invoices.filter { |invoice| 500_000 <= invoice['subtotal'].inject(0) { |sum, i| sum + i['items'] + i['tax'] } }
-        return reports if reports.length >= 5
+        reports = customers.filter { |customer| 500_000 <= customer['unsettled'] }
+        return [reports, total] if reports.length >= 5
 
-        additional = invoices
-                       .filter { |invoice| 500_000 > invoice['subtotal'].inject(0) { |sum, i| sum + i['items'] + i['tax'] } }
+        additional = customers
+                       .filter { |customer| 500_000 > customer['unsettled'] }
                        .take(5 - reports.length)
-        reports.concat(additional)
+        [reports.concat(additional), total]
       end
     end
   end

data/lib/luca/jp/version.rb

@@ -2,6 +2,6 @@
 
 module Luca
   module Jp
-    VERSION = '0.18.0'
+    VERSION = '0.18.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: luca-jp
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.18.1
 platform: ruby
 authors:
 - Chuma Takahiro
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-04-09 00:00:00.000000000 Z
+date: 2024-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lucabook
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.3
+- !ruby/object:Gem::Dependency
+  name: lucadeal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.5
 - !ruby/object:Gem::Dependency
   name: lucasalary
   requirement: !ruby/object:Gem::Requirement