rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-04-12 02:02:31 +02:00
Code Issues Releases Activity

(bug) empty advanced accounting code

Browse Source
This commit is contained in:
Sylvain 2023-03-06 13:05:33 +01:00
parent 3bbca47d19
commit dbd88f9889
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -1,5 +1,7 @@
# Changelog Fab-manager # Changelog Fab-manager
- Fix a bug: empty advanced accounting code is not defaulted to the general setting
## v5.8.1 2023 March 03 ## v5.8.1 2023 March 03
- Fix a bug: unable to reserve an event - Fix a bug: unable to reserve an event

6
app/services/accounting/accounting_code_service.rb
View File

@ -44,7 +44,7 @@ class Accounting::AccountingCodeService
if type == :code if type == :code
item_code = Setting.get('advanced_accounting') ? invoice_item.object.reservable.advanced_accounting&.send(section) : nil item_code = Setting.get('advanced_accounting') ? invoice_item.object.reservable.advanced_accounting&.send(section) : nil
return Setting.get("accounting_#{invoice_item.object.reservable_type}_code") if item_code.nil? && section == :code return Setting.get("accounting_#{invoice_item.object.reservable_type}_code") if item_code.blank? && section == :code
item_code item_code
else else
@ -58,7 +58,7 @@ class Accounting::AccountingCodeService
if type == :code if type == :code
item_code = Setting.get('advanced_accounting') ? invoice_item.object.plan.advanced_accounting&.send(section) : nil item_code = Setting.get('advanced_accounting') ? invoice_item.object.plan.advanced_accounting&.send(section) : nil
return Setting.get('accounting_subscription_code') if item_code.nil? && section == :code return Setting.get('accounting_subscription_code') if item_code.blank? && section == :code
item_code item_code
else else
@ -72,7 +72,7 @@ class Accounting::AccountingCodeService
if type == :code if type == :code
item_code = Setting.get('advanced_accounting') ? invoice_item.object.orderable.advanced_accounting&.send(section) : nil item_code = Setting.get('advanced_accounting') ? invoice_item.object.orderable.advanced_accounting&.send(section) : nil
return Setting.get('accounting_Product_code') if item_code.nil? && section == :code return Setting.get('accounting_Product_code') if item_code.blank? && section == :code
item_code item_code
else else

14
test/services/accounting_service_test.rb
View File

@ -17,8 +17,16 @@ class AccountingServiceTest < ActionDispatch::IntegrationTest
# enable the VAT # enable the VAT
Setting.set('invoice_VAT-active', true) Setting.set('invoice_VAT-active', true)
Setting.set('invoice_VAT-rate', 19.6) Setting.set('invoice_VAT-rate', '19.6')
# enable advanced accounting on the plan
Setting.set('advanced_accounting', true)
plan.update(advanced_accounting_attributes: {
code: '7021',
analytical_section: 'PL21'
})
# book and pay
post '/api/local_payment/confirm_payment', params: { post '/api/local_payment/confirm_payment', params: {
customer_id: @vlonchamp.id, customer_id: @vlonchamp.id,
coupon_code: 'GIME3EUR', coupon_code: 'GIME3EUR',
@ -73,11 +81,13 @@ class AccountingServiceTest < ActionDispatch::IntegrationTest
assert_not_nil item_machine assert_not_nil item_machine
assert_equal invoice.main_item.net_amount, item_machine&.credit assert_equal invoice.main_item.net_amount, item_machine&.credit
assert_equal Setting.get('accounting_sales_journal_code'), item_machine&.journal_code assert_equal Setting.get('accounting_sales_journal_code'), item_machine&.journal_code
# Check the subscription line # Check the subscription line
item_suscription = lines.find { |l| l.account_code == Setting.get('accounting_subscription_code') } item_suscription = lines.find { |l| l.account_code == '7021' }
assert_not_nil item_suscription assert_not_nil item_suscription
assert_equal invoice.other_items.last.net_amount, item_suscription&.credit assert_equal invoice.other_items.last.net_amount, item_suscription&.credit
assert_equal Setting.get('accounting_sales_journal_code'), item_suscription&.journal_code assert_equal Setting.get('accounting_sales_journal_code'), item_suscription&.journal_code
assert_equal '7021', item_suscription&.account_code
# Check the VAT line # Check the VAT line
vat_service = VatHistoryService.new vat_service = VatHistoryService.new