africompta 1.9.11 → 1.9.13.pre.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '08243c15dad8df272891c62ea2faf14f74da98ac'
-  data.tar.gz: cae8035c25a7289f8cd3901d81dd6470b17ccc7d
+  metadata.gz: cf1e7e270ef30a5fd52246f899bfd0c9bfbab96c
+  data.tar.gz: 0d18e6a07b37e389df418e8fcb2c14b644a05b19
 SHA512:
-  metadata.gz: 98b9ecec86b7f200b922c36556bfb9ac2cc8f416e71b43260cdaeca5d31522a38b4e810ef2e6a0ed0b3494ddf7fa1aaaedf3c33bf1c3dcc6d55876a97ff9df14
-  data.tar.gz: ec678fd7608c2391ea85791fb6da89fab6c0acbff3bf538b1755390199bff3b6370604adadc36373e20bbbc415a2a17d4c5860e22e9d1c39169a782f1f2ec5ee
+  metadata.gz: 57effd88a25338b06af9db2ce8b199d4344cf778d7577ffaf05fab5dcce975bd9f4a787386b7870cc70f9aaacf0ca58187af5296550aa0282ef25181d964165d
+  data.tar.gz: e11724471549d4a8b199a4076f1a430dfdba4850e5ac4d6232312ea9809861b07eadb2cca413603621ed8ccc25629d86310d0708467ff20f6df8d66b621dd1df

data/.gitignore

@@ -16,5 +16,6 @@ test/*db
 test/data*
 test/thread*
 /*gem
+.ruby-version
 
 afri_compta.conf

data/Gemfile.lock

@@ -1,10 +1,3 @@
-PATH
-  remote: .
-  specs:
-    africompta (1.9.10)
-      prawn (= 1.0.0)
-      qooxview (= 1.9.10)
-
 PATH
   remote: ../HelperClasses
   specs:
@@ -13,58 +6,68 @@ PATH
 PATH
   remote: ../QooxView
   specs:
-    qooxview (1.9.10)
-      activemodel (= 3.1.1)
-      activerecord (= 3.1.1)
-      activesupport (= 3.1.1)
-      arel (= 2.2.1)
+    qooxview (1.9.11)
+      activemodel (= 5.1.0)
+      activerecord (= 5.1.0)
+      activesupport (= 5.1.0)
+      arel (= 8.0)
       chunky_png (= 1.3.4)
       docsplit (= 0.7.6)
       gettext (= 3.0.0)
       helper_classes (= 0.3.5)
-      i18n (= 0.6.0)
+      i18n (= 0.7.0)
       iconv (= 1.0.3)
       iniparse (= 1.4.0)
       json (= 2.1.0)
       locale (= 2.0.8)
       multi_json (= 1.0.3)
-      net-ldap (= 0.5.1)
+      net-ldap (= 0.16)
       rqrcode (= 0.4.2)
       rqrcode-with-patches (= 0.5.4)
       rubyzip (= 1.1.7)
       serialport (= 1.3.1)
       sqlite3 (= 1.3.10)
+      test-unit (= 3.2.3)
       text (= 1.2.3)
 
+PATH
+  remote: .
+  specs:
+    africompta (1.9.11)
+      prawn (= 1.0.0)
+      qooxview (= 1.9.11)
+
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (3.1.1)
-      activesupport (= 3.1.1)
-      builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.1)
-      activemodel (= 3.1.1)
-      activesupport (= 3.1.1)
-      arel (~> 2.2.1)
-      tzinfo (~> 0.3.29)
-    activesupport (3.1.1)
-      multi_json (~> 1.0)
-    arel (2.2.1)
-    builder (3.0.4)
+    activemodel (5.1.0)
+      activesupport (= 5.1.0)
+    activerecord (5.1.0)
+      activemodel (= 5.1.0)
+      activesupport (= 5.1.0)
+      arel (~> 8.0)
+    activesupport (5.1.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    arel (8.0.0)
     chunky_png (1.3.4)
+    concurrent-ruby (1.0.5)
     docsplit (0.7.6)
     gettext (3.0.0)
       locale (>= 2.0.5)
       text
-    i18n (0.6.0)
+    i18n (0.7.0)
     iconv (1.0.3)
     iniparse (1.4.0)
     json (2.1.0)
     locale (2.0.8)
+    minitest (5.10.2)
     multi_json (1.0.3)
-    net-ldap (0.5.1)
-    pdf-core (0.2.5)
+    net-ldap (0.16.0)
+    pdf-core (0.2.2)
+    power_assert (1.0.2)
     prawn (1.0.0)
       pdf-core (~> 0.2.2)
       ttfunk (~> 1.1.1)
@@ -74,9 +77,13 @@ GEM
     rubyzip (1.1.7)
     serialport (1.3.1)
     sqlite3 (1.3.10)
+    test-unit (3.2.3)
+      power_assert
     text (1.2.3)
+    thread_safe (0.3.6)
     ttfunk (1.1.1)
-    tzinfo (0.3.53)
+    tzinfo (1.2.3)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
@@ -85,3 +92,6 @@ DEPENDENCIES
   africompta!
   helper_classes!
   qooxview!
+
+BUNDLED WITH
+   1.15.0

data/africompta.gemspec

@@ -1,14 +1,14 @@
 Gem::Specification.new do |s|
   s.name = 'africompta'
-  s.version = '1.9.11'
-  s.date = '2015-06-20'
+  s.version = '1.9.13-10'
+  s.date = '2017-10-30'
   s.summary = 'Africompta-module for QooxView'
   s.description = 'With this module you can have a simple accounting-system.
 It is based on http://github.com/ineiti/QooxView and adds Entities to handle
 accounts and movements. For the standalone counterpart (which uses the same database),
 see http://github.com/ineiti/AfriCompta_client .'
   s.authors = ['Linus Gasser']
-  s.email = 'ineiti@linusetviviane.ch'
+  s.email = 'ineiti.blue'
 
   s.files         = `if [ -d '.git' ]; then git ls-files -z; fi`.split("\x0")
   s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }

data/lib/africompta/entities/account.rb

@@ -177,7 +177,7 @@ class Accounts < Entities
     years = Hash.new(0)
     acc.movements.each { |mov|
       if not mov.desc =~ /^-- Sum of/
-        y, m, d = mov.date.to_s.split('-').collect { |d| d.to_i }
+        y, m, _ = mov.date.to_s.split('-').collect { |d| d.to_i }
         dputs(5) { "Date of #{mov.desc} is #{mov.date}" }
         m < month_start and y -= 1
         years[y] += 1
@@ -207,7 +207,7 @@ class Accounts < Entities
   def move_movements(acc, years, month_start)
     acc.movements.each { |mov|
       dputs(5) { 'Start of each' }
-      y, m, d = mov.date.to_s.split('-').collect { |d| d.to_i }
+      y, m, _ = mov.date.to_s.split('-').collect { |d| d.to_i }
       dputs(5) { "Date of #{mov.desc} is #{mov.date}" }
       m < month_start and y -= 1
       if years.has_key? y
@@ -455,7 +455,7 @@ class Accounts < Entities
   def load
     super
     if Accounts.search_by_name('Root').count == 0
-      dputs(0) { "Didn't find 'Root' in database - creating base" }
+      dputs(1) { "Didn't find 'Root' in database - creating base" }
       Accounts.init
     end
   end
@@ -473,6 +473,18 @@ class Accounts < Entities
     a.rev_index = a.id
   end
 
+  def migration_3(m)
+    # dp "Migrating #{m.inspect}"
+    if m.id == 1 && m.account_id != nil
+      dp 'Root-account has parent...'
+      m.account_id = 0
+      m.name = 'Root'
+      m.desc = 'Root'
+      m.global_id = Digest::MD5.hexdigest((rand 2**128).to_s).to_s + '-1'
+      m.total = 0.0
+    end
+  end
+
   def listp_path
     dputs(3) { 'Being called' }
     Accounts.search_all.select { |a| !a.deleted }.collect { |a| [a.id, a.path] }.
@@ -513,7 +525,7 @@ class Accounts < Entities
         #dputs(3) { "Looking at #{row}" }
         @check_progress += progress_step
 
-        id_, acc_id_, name_, desc_, gid_, tot_, mult_, ind_, revind_, del_, keep_, = row
+        _, acc_id_, name_, desc_, gid_, tot_, mult_, _, _, del_, keep_, = row
         parent = if acc_id_
                    acc_id_ == 0 ? '' :
                        db.execute("select * from compta_accounts where id=#{acc_id_}").first[4]
@@ -756,7 +768,7 @@ class Account < Entity
     set_child_multiplier_total(multiplier, total)
   end
 
-  # Sort first regarding inverse date (newest first), then description, 
+  # Sort first regarding inverse date (newest first), then description,
   # and finally the value
   def movements(from = nil, to = nil)
     dputs(5) { 'Account::movements' }
@@ -775,7 +787,7 @@ class Account < Entity
       end
       if ret == 0
         ret = a.rev_index <=> b.rev_index
-=begin        
+=begin
         if a.desc and b.desc
           ret = a.desc <=> b.desc
         end
@@ -834,7 +846,7 @@ class Account < Entity
     }
     self
   end
-
+  
   def accounts
     # Some hand-optimized stuff. This would be written shorter like this:
     # Accounts.matches_by_account_id( self.id )
@@ -853,7 +865,7 @@ class Account < Entity
     Accounts.match_by_id(self.account_id)
   end
 
-  def account= (a)
+  def account=(a)
     self.account_id = a.class == Account ? a.id : a
   end
 
@@ -861,7 +873,7 @@ class Account < Entity
     account
   end
 
-  def parent= (a)
+  def parent=(a)
     self.account = a
   end
 

data/lib/africompta/views/compta/edit_movements.rb

@@ -107,7 +107,8 @@ class ComptaEditMovements < View
   end
 
   def update_accounts()
-    reply(:empty_nonlists, [:account_archive, :account_src, :account_dst]) +
+    if AccountRoot.actual
+      reply(:empty_nonlists, [:account_archive, :account_src, :account_dst]) +
         reply(:update_silent, :account_archive =>
                                 [[AccountRoot.actual.id, 'Actual']].concat(
                                     if archive = AccountRoot.archive
@@ -119,6 +120,7 @@ class ComptaEditMovements < View
         update_list(AccountRoot.actual, AccountRoot.actual) +
         reply(:update, :account_src => AccountRoot.actual.listp_path,
               :account_dst => AccountRoot.actual.listp_path)
+    end
   end
 
   def rpc_update_view(session)
@@ -164,4 +166,3 @@ class ComptaEditMovements < View
     return str.delete('^0123456789.,-').gsub(/,/, '.').to_f
   end
 end
-

data/test/ac_account.rb

@@ -29,6 +29,8 @@ class TC_Account < Test::Unit::TestCase
 
   def test_path
     assert_equal 'Root::Cash', @cash.path
+    assert_equal 0, @root.account_id
+    assert_equal nil, @root.account
   end
 
   def test_del_account
@@ -61,12 +63,12 @@ class TC_Account < Test::Unit::TestCase
     Accounts.create_path('Test')
     Accounts.dump true
     count_mov, bad_mov, count_acc, bad_acc = AccountRoot.clean
-    assert_equal [4, 0, 19, 1],
+    assert_equal [4, 0, 18, 1],
                  [count_mov, bad_mov, count_acc, bad_acc]
 
     Accounts.dump
     count_mov, bad_mov, count_acc, bad_acc = AccountRoot.clean
-    assert_equal [4, 0, 19, 0],
+    assert_equal [4, 0, 18, 0],
                  [count_mov, bad_mov, count_acc, bad_acc]
   end
 
@@ -146,7 +148,7 @@ class TC_Account < Test::Unit::TestCase
           Movements.create("Mov for #{src}_#{sub} - #{mov}", date, 100 * src,
                            accs[src][sub], @cash)
         }
-        assert_equal -300 * src, accs[src][sub].total
+        assert_equal( -300 * src, accs[src][sub].total)
       }
     }
 
@@ -157,7 +159,7 @@ class TC_Account < Test::Unit::TestCase
     dp line
   end
 
-  def test_report_man
+  def tes_report_man
     SQLite.dbs_close_all
     FileUtils.cp('db.man', 'data2/compta.db')
     SQLite.dbs_open_load
@@ -173,4 +175,10 @@ class TC_Account < Test::Unit::TestCase
     line = report.print_account_monthly(reportAccount, Date.new(2014, 6), 1, 1)
     dp line
   end
+
+  def test_add_account
+    subacc = Accounts.create_path("Root::Test")
+    Entities.reload
+    assert_equal 6, Accounts.search_all_.count
+  end
 end

data/test/ac_africompta.rb

@@ -10,6 +10,10 @@ class TC_AfriCompta < Test::Unit::TestCase
     dputs(2) { 'Resetting SQLite' }
     SQLite.dbs_close_all
     dputs(2) { 'Putting testGestion' }
+    begin
+      Dir.mkdir('data')
+    rescue Errno::EEXIST
+    end
     FileUtils.cp('db.testGestion', 'data/compta.db')
     SQLite.dbs_open_load_migrate
 

data/test/ac_movement.rb

@@ -25,6 +25,13 @@ class TC_Movement < Test::Unit::TestCase
   def teardown
   end
 
+  def test_rm_add
+    m = Movements.create('test', Date.today, 1000, @cash, @lending)
+    m.delete
+    Movements.create('test', Date.today, 1000, @cash, @lending)
+    assert_equal 2040, @cash.total.to_i
+  end
+
   def test_move
     value_cash = @cash.total.to_f
     value_lending = @lending.total.to_f

data/test/test.rb

@@ -12,21 +12,27 @@ DEBUG_LVL=1
 require 'QooxView'
 require 'africompta'
 
-Permission.add( 'default', 'View,Welcome' )
-Permission.add( 'admin', '.*', '.*' )
-Permission.add( 'internet', 'Internet,PersonShow', 'default' )
-Permission.add( 'student', '', 'internet' )
-Permission.add( 'professor', '', 'student' )
-Permission.add( 'secretary', 'PersonModify', 'professor' )
+Permission.add('default', 'View,Welcome')
+Permission.add('admin', '.*', '.*')
+Permission.add('internet', 'Internet,PersonShow', 'default')
+Permission.add('student', '', 'internet')
+Permission.add('professor', '', 'student')
+Permission.add('secretary', 'PersonModify', 'professor')
 
-qooxView = QooxView.init( '../Entities', '../Views' )
+qooxView = QooxView.init('../Entities', '../Views')
 
-tests = %w( africompta account movement sqlite )
+tests = Dir.glob('ac_*.rb')
+# tests = %w( africompta account movement sqlite )
 #tests = %w( africompta )
 tests = %w( account )
 #tests = %w( merge )
-tests.each{|t|
-  require_relative "ac_#{t}"
+dp tests
+tests.each { |t|
+  begin
+    require_relative "ac_#{t}"
+  rescue LoadError => e
+    require_relative t
+  end
 }
 
 # Fails test_archive_sum_up

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: africompta
 version: !ruby/object:Gem::Version
-  version: 1.9.11
+  version: 1.9.13.pre.10
 platform: ruby
 authors:
 - Linus Gasser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-20 00:00:00.000000000 Z
+date: 2017-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: qooxview
@@ -43,7 +43,7 @@ description: |-
   It is based on http://github.com/ineiti/QooxView and adds Entities to handle
   accounts and movements. For the standalone counterpart (which uses the same database),
   see http://github.com/ineiti/AfriCompta_client .
-email: ineiti@linusetviviane.ch
+email: ineiti.blue
 executables:
 - afri_compta.rb
 - africompta.sh
@@ -109,12 +109,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Africompta-module for QooxView