invoicing 0.2.0 → 0.2.1

data/History.txt

@@ -1,3 +1,13 @@
+== 0.2.1
+
+* 2 minor enhancements:
+  * Added option to LedgerItem#account_summary which enables inclusion of open/pending
+    ledger items in the summary
+  * Improved robustness and documentation for test suite
+* 2 bugfixes:
+  * Compatibility with recent versions of ActiveRecord
+  * Cleaned up unnecessary gem dependencies (mocha, uuid)
+
 == 0.2.0 2009-04-20
 
 * 4 major enhancements:

data/README.rdoc

@@ -20,6 +20,9 @@ Please see {the website}[http://ept.github.com/invoicing/] for an introduction
 to using Invoicing, and check the
 {API reference}[http://invoicing.rubyforge.org/doc/] for in-depth details.
 
+If you're interested in contributing to the invoicing gem itself, please see the file
+{HACKING.md}[http://github.com/ept/invoicing/blob/master/HACKING.md].
+
 == FEATURES
 
 * TODO

data/Rakefile

@@ -1,4 +1,4 @@
-%w[rubygems rake rake/clean fileutils newgem rubigen].each { |f| require f }
+%w[rubygems rake rake/clean fileutils newgem rubigen hoe].each { |f| require f }
 require File.dirname(__FILE__) + '/lib/invoicing'
 
 # Hoe calls Ruby with the "-w" set by default; unfortunately, ActiveRecord (at version 2.2.2
@@ -6,16 +6,21 @@ require File.dirname(__FILE__) + '/lib/invoicing'
 # the output. Comment out the following four lines to see those warnings.
 class Hoe
   RUBY_FLAGS = ENV['RUBY_FLAGS'] || "-I#{%w(lib test).join(File::PATH_SEPARATOR)}" +
-      (RUBY_DEBUG ? " #{RUBY_DEBUG}" : '')
+      ((defined?(RUBY_DEBUG) && RUBY_DEBUG) ? " #{RUBY_DEBUG}" : '')
 end
 
 # Generate all the Rake tasks
 # Run 'rake -T' to see list of generated tasks (from gem root directory)
-$hoe = Hoe.new('invoicing', Invoicing::VERSION) do |p|
-  p.developer('Martin Kleppmann', 'rubyforge@eptcomputing.com')
+$hoe = Hoe.spec 'invoicing' do |p|
+  p.version = Invoicing::VERSION
+  p.developer 'Martin Kleppmann', 'rubyforge@eptcomputing.com'
+
+  p.summary = p.paragraphs_of('README.rdoc', 3).join
+  p.description = p.paragraphs_of('README.rdoc', 3..5).join("\n\n")
   p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")
   p.post_install_message = 'PostInstall.txt'
   p.rubyforge_name = p.name
+
   p.extra_deps = [
     ['activerecord', '>= 2.1.0'],
     ['builder', '>= 2.0']
@@ -28,6 +33,7 @@ $hoe = Hoe.new('invoicing', Invoicing::VERSION) do |p|
   p.test_globs = %w[test/*_test.rb] # do not include test/models/*.rb
   p.clean_globs |= %w[**/.DS_Store tmp *.log coverage]
   p.rsync_args = '-av --delete --ignore-errors'
+  p.remote_rdoc_dir = 'doc'
 end
 
 require 'newgem/tasks' # load /tasks/*.rake

data/lib/invoicing.rb

@@ -1,3 +1,6 @@
+$:.unshift(File.dirname(__FILE__)) unless
+  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
+
 require 'activerecord'
 
 require 'invoicing/class_info'  # load first because other modules depend on this

data/lib/invoicing/countries/uk.rb

@@ -3,12 +3,24 @@ module Invoicing
     module UK
       # Extremely simplistic implementation of UK VAT. This needs to be fixed.
       class VAT
+        def tax_rate(params)
+          params[:model_object].send(:tax_rate)
+        end
+        
+        def tax_factor(params)
+          BigDecimal('1') + tax_rate(params).rate
+        end
+        
+        def tax_percent(params)
+          BigDecimal('100') * tax_rate(params).rate
+        end
+        
         def apply_tax(params)
-          params[:value] * BigDecimal('1.15')
+          params[:value] * tax_factor(params)
         end
         
         def remove_tax(params)
-          params[:value] / BigDecimal('1.15')
+          params[:value] / tax_factor(params)
         end
         
         def tax_info(params)
@@ -16,7 +28,7 @@ module Invoicing
         end
         
         def tax_details(params)
-          "(including VAT at 15%)"
+          "(including VAT at #{tax_percent(params).to_s}%)"
         end
       end
     end

data/lib/invoicing/ledger_item.rb

@@ -430,6 +430,8 @@ module Invoicing
         # Make sure ledger_item association is assigned -- the CurrencyValue
         # getters depend on it to fetch the currency
         info.set(line, :ledger_item, self)
+        line.valid? # Ensure any before_validation hooks are called
+        
         net_amount = info.get(line, :net_amount)
         tax_amount = info.get(line, :tax_amount)
         net_total += net_amount unless net_amount.nil?
@@ -615,7 +617,13 @@ module Invoicing
       #
       # If +other_id+ is +nil+, this method aggregates the accounts of +self_id+ with *all* other
       # parties.
-      def account_summary(self_id, other_id=nil)
+      #
+      # Also accepts options:
+      #
+      # <tt>:with_status</tt>:: List of ledger item status strings; only ledger items whose status
+      #                         is one of these will be taken into account. Default:
+      #                         <tt>["closed", "cleared"]</tt>.
+      def account_summary(self_id, other_id=nil, options={})
         info = ledger_item_class_info
         self_id = self_id.to_i
         other_id = [nil, ''].include?(other_id) ? nil : other_id.to_i
@@ -623,7 +631,7 @@ module Invoicing
         if other_id.nil?
           result = {}
           # Sum over all others, grouped by currency
-          account_summaries(self_id).each_pair do |other_id, hash|
+          account_summaries(self_id, options).each_pair do |other_id, hash|
             hash.each_pair do |currency, summary|
               if result[currency]
                 result[currency] += summary
@@ -638,7 +646,7 @@ module Invoicing
           conditions = {info.method(:sender_id)    => [self_id, other_id],
                         info.method(:recipient_id) => [self_id, other_id]}
           with_scope(:find => {:conditions => conditions}) do
-            account_summaries(self_id)[other_id] || {}
+            account_summaries(self_id, options)[other_id] || {}
           end
         end
       end
@@ -661,7 +669,13 @@ module Invoicing
       #   q3_2008 = ['issue_date >= ? AND issue_date < ?', DateTime.parse('2008-07-01'), DateTime.parse('2008-10-01')]
       #   LedgerItem.scoped(:conditions => q3_2008).account_summaries(1)
       #
-      def account_summaries(self_id)
+      #
+      # Also accepts options:
+      #
+      # <tt>:with_status</tt>:: List of ledger item status strings; only ledger items whose status
+      #                         is one of these will be taken into account. Default:
+      #                         <tt>["closed", "cleared"]</tt>.
+      def account_summaries(self_id, options={})
         info = ledger_item_class_info
         ext = Invoicing::ConnectionAdapterExt
         scope = scope(:find)
@@ -681,8 +695,9 @@ module Invoicing
         sender_is_self    = merge_conditions({info.method(:sender_id)    => self_id})
         recipient_is_self = merge_conditions({info.method(:recipient_id) => self_id})
         other_id_column = ext.conditional_function(sender_is_self, cols[:recipient_id], cols[:sender_id])
-        filter_conditions = "#{cols[:status]} IN ('closed','cleared') AND (#{sender_is_self} OR #{recipient_is_self})"
-        
+        accept_status = sanitize_sql_hash_for_conditions(info.method(:status) => (options[:with_status] || %w(closed cleared)))
+        filter_conditions = "#{accept_status} AND (#{sender_is_self} OR #{recipient_is_self})"
+
         sql = "SELECT #{other_id_column} AS other_id, #{cols[:currency]} AS currency, " + 
           "SUM(#{ext.conditional_function(debit_when_sent,      cols[:total_amount], 0)}) AS sales, " +
           "SUM(#{ext.conditional_function(debit_when_received,  cols[:total_amount], 0)}) AS purchase_payments, " +

data/lib/invoicing/ledger_item/render_html.rb

@@ -190,7 +190,8 @@ module Invoicing
         end
         
         def default_identifier_label
-          "Invoice no.:"
+          label = (factor == BigDecimal('-1')) ? invoke_credit_note_label : invoke_invoice_label
+          "#{label} no.:"
         end
         
         def default_issue_date_label

data/lib/invoicing/ledger_item/render_ubl.rb

@@ -90,7 +90,7 @@ module Invoicing
             invoice.cbc :ID, identifier
             invoice.cbc :UUID, uuid if uuid
             
-            issue_date_formatted, issue_time_formatted = (issue_date || Time.now).in_time_zone.xmlschema.split('T')
+            issue_date_formatted, issue_time_formatted = date_and_time(issue_date || Time.now)
             invoice.cbc :IssueDate, issue_date_formatted
             invoice.cbc :IssueTime, issue_time_formatted
             
@@ -173,8 +173,8 @@ module Invoicing
         #   <cbc:EndDate>2008-07-02</cbc:EndDate>
         #   <cbc:EndTime>01:02:03+02:00</cbc:EndTime>
         def build_period(xml, start_datetime, end_datetime)
-          start_date, start_time = start_datetime.in_time_zone.xmlschema.split('T')
-          end_date, end_time = end_datetime.in_time_zone.xmlschema.split('T')
+          start_date, start_time = date_and_time(start_datetime)
+          end_date, end_time = date_and_time(end_datetime)
           xml.cbc :StartDate, start_date
           xml.cbc :StartTime, start_time
           xml.cbc :EndDate, end_date
@@ -247,7 +247,10 @@ module Invoicing
           quantity_tag = [:Invoice, :SelfBilledInvoice].include?(doc_type) ? :InvoicedQuantity : :CreditedQuantity
           invoice_line.cbc quantity_tag, quantity_of(line_item) if quantity_of(line_item)
           invoice_line.cbc :LineExtensionAmount, (factor*net_amount_of(line_item)).to_s, :currencyID => currency
-          invoice_line.cbc :TaxPointDate, tax_point_of(line_item).in_time_zone.strftime('%Y-%m-%d') if tax_point_of(line_item)
+          if tax_point_of(line_item)
+            tax_point_date, tax_point_time = date_and_time(tax_point_of(line_item))
+            invoice_line.cbc :TaxPointDate, tax_point_date
+          end
           
           invoice_line.cac :TaxTotal do |tax_total|
             tax_total.cbc :TaxAmount, (factor*tax_amount_of(line_item)).to_s, :currencyID => currency
@@ -263,6 +266,14 @@ module Invoicing
             
           #cac:Price
         end
+
+        private
+
+        # Returns an array of two strings, <tt>[date, time]</tt> in the format specified by UBL,
+        # for a given datetime value.
+        def date_and_time(value)
+          value.in_time_zone(Time.zone || 'Etc/UTC').xmlschema.split('T')
+        end
       end
     end
   end

data/lib/invoicing/line_item.rb

@@ -149,6 +149,8 @@ module Invoicing
           # Set the 'amount' columns to act as currency values
           acts_as_currency_value(info.method(:net_amount), info.method(:tax_amount))
           
+          before_validation :calculate_tax_amount
+          
           extend Invoicing::FindSubclasses
           
           # Dynamically created named scopes
@@ -192,6 +194,11 @@ module Invoicing
       ledger_item.send(:ledger_item_class_info).get(ledger_item, :currency)
     end
     
+    def calculate_tax_amount
+      return unless respond_to? :net_amount_taxed
+      self.tax_amount = net_amount_taxed - net_amount
+    end
+    
     # The sum of +net_amount+ and +tax_amount+.
     def gross_amount
       net_amount = line_item_class_info.get(self, :net_amount)
@@ -212,6 +219,8 @@ module Invoicing
         raise RuntimeError, "You need to define an association like 'belongs_to :ledger_item' on #{self.class.name}. If you " +
           "have defined the association with a different name, pass the option :ledger_item => :your_association_name to " +
           "acts_as_line_item."
+      elsif method_name =~ /^amount/
+        send("net_#{method_name}", *args)
       else
         super
       end

data/lib/invoicing/tax_rate.rb

@@ -2,8 +2,21 @@ module Invoicing
   module TaxRate
     module ActMethods
       def acts_as_tax_rate(*args)
+        Invoicing::ClassInfo.acts_as(Invoicing::TaxRate, self, args)
+        info = tax_rate_class_info
         
+        if info.previous_info.nil? # Called for the first time?
+          # Import TimeDependent functionality
+          acts_as_time_dependent :value => :rate
+        end
       end
     end
+    
+    # Stores state in the ActiveRecord class object
+    class ClassInfo < Invoicing::ClassInfo::Base #:nodoc:
+      def initialize(model_class, previous_info, args)
+        super
+      end
+    end    
   end
 end

data/lib/invoicing/version.rb

@@ -2,7 +2,7 @@ module Invoicing
   module Version
     MAJOR   = 0
     MINOR   = 2
-    BUILD   = 0
+    BUILD   = 1
 
     def to_a 
       [MAJOR, MINOR, BUILD]

data/test/connection_adapter_ext_test.rb

@@ -9,11 +9,19 @@ class ConnectionAdapterExtTest < Test::Unit::TestCase
   end
   
   def using_database(database_type)
-    begin
-      ActiveRecord::Base.establish_connection(TEST_DB_CONFIG[database_type.to_sym])
+    if database_type.to_sym == database_used_for_testing
+      # If the test is for the main database type of this test suite, just run it
       yield
-    ensure
-      connect_to_testing_database
+
+    elsif test_in_all_databases
+      # Run the test having connected to the requested database type, or skip it
+      # if we're not trying to test all database types
+      begin
+        ActiveRecord::Base.establish_connection(TEST_DB_CONFIG[database_type.to_sym])
+        yield
+      ensure
+        connect_to_testing_database
+      end
     end
   end  
 
@@ -68,4 +76,4 @@ class ConnectionAdapterExtTest < Test::Unit::TestCase
     end
   end
 
-end
+end

data/test/ledger_item_test.rb

@@ -218,11 +218,11 @@ class LedgerItemTest < Test::Unit::TestCase
   
   def test_uuid_gem_not_present
     begin
-      real_uuid = Object.send(:remove_const, :UUID)
+      real_uuid = Object.send(:remove_const, :UUID) rescue nil
       UUIDNotPresentLedgerItem.acts_as_ledger_item(LedgerItemMethods::RENAMED_METHODS)
       assert_nil UUIDNotPresentLedgerItem.new.get_class_info.uuid_generator
     ensure
-      Object.send(:const_set, :UUID, real_uuid)
+      Object.send(:const_set, :UUID, real_uuid) unless real_uuid.nil?
     end
   end
   
@@ -362,7 +362,17 @@ class LedgerItemTest < Test::Unit::TestCase
     assert_equal BigDecimal('0.00'),       summary[:GBP].purchase_payments
     assert_equal BigDecimal('-666807.63'), summary[:GBP].balance
   end
-  
+
+  def test_account_summary_with_include_open_option
+    summary = MyLedgerItem.account_summary(1, nil, :with_status => %w(open closed cleared))
+    assert_equal [:GBP], summary.keys
+    assert_equal BigDecimal('269.00'),     summary[:GBP].sales
+    assert_equal BigDecimal('666808.63'),  summary[:GBP].purchases
+    assert_equal BigDecimal('256.50'),     summary[:GBP].sale_receipts
+    assert_equal BigDecimal('0.00'),       summary[:GBP].purchase_payments
+    assert_equal BigDecimal('-666796.13'), summary[:GBP].balance
+  end
+
   def test_account_summary_to_s
     assert_equal "sales = £257.50; purchases = £666,808.63; sale_receipts = £256.50; " +
       "purchase_payments = £0.00; balance = −£666,807.63", MyLedgerItem.account_summary(1)[:GBP].to_s

data/test/line_item_test.rb

@@ -99,11 +99,11 @@ class LineItemTest < Test::Unit::TestCase
   
   def test_uuid_gem_not_present
     begin
-      real_uuid = Object.send(:remove_const, :UUID)
+      real_uuid = Object.send(:remove_const, :UUID) rescue nil
       UUIDNotPresentLineItem.acts_as_line_item(LineItemMethods::RENAMED_METHODS)
       assert_nil UUIDNotPresentLineItem.new.get_class_info.uuid_generator
     ensure
-      Object.send(:const_set, :UUID, real_uuid)
+      Object.send(:const_set, :UUID, real_uuid) unless real_uuid.nil?
     end
   end
 

data/test/ref-output/creditnote3.html

@@ -38,7 +38,7 @@
 </table>
 <table class="invoice metadata">
     <tr class="identifier">
-        <th>Invoice no.:</th>
+        <th>Credit Note no.:</th>
         <td>putain!</td>
     </tr>
     <tr class="issue-date">

data/test/render_html_test.rb

@@ -28,6 +28,7 @@ class RenderHTMLTest < Test::Unit::TestCase
     expected[0] = "<h1>INVOICE</h1>"
     expected[3] = "        <th class=\"recipient\">Customer</th>"
     expected[4] = "        <th class=\"sender\">Supplier</th>"
+    expected[40] = "        <th>INVOICE no.:</th>"
     rendered = MyInvoice.find(1).render_html {|i|
       i.invoice_label{ "INVOICE" }
       i.sender_label "Supplier"

data/test/render_ubl_test.rb

@@ -7,20 +7,32 @@ class RenderUBLTest < Test::Unit::TestCase
   def reference_output(filename)
     IO.readlines(File.join(File.dirname(__FILE__), 'ref-output', filename)).join
   end
-  
+
+  # Compares two strings, each being a serialised XML document, while ignoring
+  # the order of attributes within elements.
+  # TODO: this could generate much nicer error messages on failure.
+  def assert_equivalent_xml(doc1, doc2)
+    doc1, doc2 = [doc1, doc2].map do |doc|
+      doc.gsub(/(<[^\s>]+\s+)([^>]+)(>)/) do |match|
+        $1.to_s + $2.to_s.split(/\s+/).sort.join(' ') + $3.to_s
+      end
+    end
+    assert_equal doc1, doc2
+  end
+
   def test_render_ubl_invoice
-    assert_equal reference_output('invoice1.xml'), MyInvoice.find(1).render_ubl
+    assert_equivalent_xml reference_output('invoice1.xml'), MyInvoice.find(1).render_ubl
   end
   
   def test_render_ubl_self_billed_invoice
-    assert_equal reference_output('invoice2.xml'), MyInvoice.find(2).render_ubl
+    assert_equivalent_xml reference_output('invoice2.xml'), MyInvoice.find(2).render_ubl
   end
   
   def test_render_ubl_credit_note
     #File.open(File.join(File.dirname(__FILE__), 'ref-output', 'debug3.xml'), 'w') do |f|
     #  f.syswrite(MyCreditNote.find(3).render_ubl)
     #end
-    assert_equal reference_output('creditnote3.xml'),  MyCreditNote.find(3).render_ubl
+    assert_equivalent_xml reference_output('creditnote3.xml'),  MyCreditNote.find(3).render_ubl
   end
   
   def test_cannot_render_unknown_ledger_item_subtype

data/test/test_helper.rb

@@ -3,7 +3,6 @@ require 'rubygems'
 require 'activerecord'
 require 'activesupport'
 require 'flexmock/test_unit'
-require 'mocha'
 
 $: << File.join(File.dirname(__FILE__), '..', 'lib')
 
@@ -11,20 +10,45 @@ ActiveSupport::Dependencies.load_paths << File.join(File.dirname(__FILE__), 'mod
 
 require 'invoicing'
 
+# Overridden by ../../config/database.yml if it exists.
 TEST_DB_CONFIG = {
   :postgresql => {:adapter => "postgresql", :host => "localhost", :database => "invoicing_test",
-    :username => "postgres", :password => ""},
+    :username => "invoicing", :password => "password"},
   :mysql => {:adapter => "mysql", :host => "localhost", :database => "invoicing_test",
-    :username => "root", :password => ""},
-  :sqlite3 => {:adapter => "sqlite3", :database => Tempfile.new('invoicing_sqlite').path}
+    :username => "root", :password => ""}
 }
+TEST_DB_CONFIG_FILE = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'config', 'database.yml'))
+
+def database_used_for_testing
+  (ENV['DATABASE'] || :mysql).to_sym
+end
+
+def test_in_all_databases
+  !!ENV['TEST_ALL_DATABASES']
+end
 
 def connect_to_testing_database
-  ActiveRecord::Base.establish_connection(TEST_DB_CONFIG[(ENV['DATABASE'] || :mysql).to_sym])
+  db_config = TEST_DB_CONFIG[database_used_for_testing]
+  db_config_from_file = false
+  
+  if File.exists? TEST_DB_CONFIG_FILE
+    yaml = YAML::load File.open(TEST_DB_CONFIG_FILE)
+    if yaml && yaml['test'] && (yaml['test']['adapter'].to_s == database_used_for_testing.to_s)
+      db_config = yaml['test']
+      db_config_from_file = true
+    end
+  end
+
+  puts "Connecting to #{database_used_for_testing} with config #{db_config.inspect}" +
+    (db_config_from_file ? " from #{TEST_DB_CONFIG_FILE}" : "")
+  ActiveRecord::Base.establish_connection(db_config)
 end
 
 connect_to_testing_database
 
+require 'setup'
+
+
 ENV['TZ'] = 'Etc/UTC' # timezone of values in database
 ActiveRecord::Base.default_timezone = :utc # timezone of created_at and updated_at
 Time.zone = 'Etc/UTC' # timezone for output (when using Time#in_time_zone)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: invoicing
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Martin Kleppmann
@@ -30,7 +30,7 @@ cert_chain:
   jT4Qh3sYJbvqWGFAQcuOIf4spvpNiA==
   -----END CERTIFICATE-----
 
-date: 2009-04-20 00:00:00 +01:00
+date: 2009-08-26 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -71,7 +71,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.0
+        version: 2.3.2
     version: 
 description: This is a framework for generating and displaying invoices (ideal for commercial Rails apps). It allows for flexible business logic; provides tools for tax handling, commission calculation etc. It aims to be both developer-friendly and accountant-friendly.  The Ruby Invoicing Framework is based on {ActiveRecord}[http://api.rubyonrails.org/classes/ActiveRecord/Base.html].  Please see {the website}[http://ept.github.com/invoicing/] for an introduction to using Invoicing, and check the {API reference}[http://invoicing.rubyforge.org/doc/] for in-depth details.
 email: 
@@ -84,7 +84,6 @@ extra_rdoc_files:
 - History.txt
 - Manifest.txt
 - PostInstall.txt
-- README.rdoc
 files: 
 - History.txt
 - LICENSE
@@ -149,11 +148,11 @@ files:
 - test/test_helper.rb
 - test/time_dependent_test.rb
 has_rdoc: true
-homepage: "{Ruby Invoicing Framework website}[http://ept.github.com/invoicing/]"
+homepage: 
 post_install_message: PostInstall.txt
 rdoc_options: 
 - --main
-- README.rdoc
+- README.txt
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -174,7 +173,7 @@ rubyforge_project: invoicing
 rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
-summary: This is a framework for generating and displaying invoices (ideal for commercial Rails apps)
+summary: This is a framework for generating and displaying invoices (ideal for commercial Rails apps). It allows for flexible business logic; provides tools for tax handling, commission calculation etc. It aims to be both developer-friendly and accountant-friendly.
 test_files: 
 - test/cached_record_test.rb
 - test/class_info_test.rb

metadata.gz.sig

@@ -1,3 +1,4 @@
-�	-T�"Q�;�!�嬈�C��4�H�`=�s��g^�(�v�PD��aOe<�QY
-3�i!f�\gA}������]:�:c��gܣ���y��S,�3m�.9R(�}Z� �4Ҿ�� ?N/�x_�����E#���s�O�9��)wC�מ�B�H�K=P6�J�%��z�>"?�ї#N)��P��w;W�_�ѯ���`z��}��Cv
-�hJ�ڐ��V��w���Ac����$Uۘ}��ޮ��v&ͭ�y"�
+�9V��g贵��QV�
+Ĺ���!�2ګ��iw���X��"�NBz�#��P��m�r%����iJ��e0wA���|��j���+=X.��v����_��%��bà
+�MQ�����/����e��ْ�NQ�6[�m��5vc��$0�
+Te�kX{%v���Җ|��P3��–������(��oTYE�dg��و��ќK�7��h-HB�	�ZH,ư��c����&Wx����5A���A�t7i}���