Skip to content

erp5
erp5
Commit a51637b5 authored by Jérome Perrin's avatar Jérome Perrin
Browse files
Options

accounting_l10n_fr: do not export transactions with no lines in FEC 

This does not validate against the schema:

   Element 'ecriture': Missing child element(s). Expected is ( ligne ).
parent c70c791b
Hide whitespace changes
Inline Side-by-side
Showing with 213 additions and 31 deletions
bt5/erp5_accounting_l10n_fr/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr/AccountingTransaction_getFECXMLAccountingTransactionLineList.py 0 → 100644
View file @ a51637b5
line_list = []
for line in context.contentValues(
portal_type=context.getPortalAccountingMovementTypeList()):
has_amount = True
if side == 'source':
account = line.getSourceValue(portal_type='Account')
if test_compta_demat_compatibility:
has_amount = bool(
line.getSourceTotalAssetPrice()
if line.hasSourceTotalAssetPrice() else line.getQuantity())
else:
assert side == 'destination'
account = line.getDestinationValue(portal_type='Account')
if test_compta_demat_compatibility:
has_amount = bool(
line.getDestinationTotalAssetPrice()
if line.hasDestinationTotalAssetPrice() else line.getQuantity())
if account is not None and has_amount:
line_list.append(line)
return line_list
bt5/erp5_accounting_l10n_fr/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr/AccountingTransaction_getFECXMLAccountingTransactionLineList.xml 0 → 100644
View file @ a51637b5
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="_reconstructor" module="copy_reg"/>
</klass>
<tuple>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
<global name="object" module="__builtin__"/>
<none/>
</tuple>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary>
<item>
<key> <string>name_container</string> </key>
<value> <string>container</string> </value>
</item>
<item>
<key> <string>name_context</string> </key>
<value> <string>context</string> </value>
</item>
<item>
<key> <string>name_m_self</string> </key>
<value> <string>script</string> </value>
</item>
<item>
<key> <string>name_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>side, test_compta_demat_compatibility</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>AccountingTransaction_getFECXMLAccountingTransactionLineList</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_accounting_l10n_fr/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr/AccountingTransaction_viewAsDestinationFECXML.zpt
View file @ a51637b5
<ecriture xmlns:tal="http://xml.zope.org/namespaces/tal">
<ecriture
xmlns:tal="http://xml.zope.org/namespaces/tal"
tal:define="line_list python:context.AccountingTransaction_getFECXMLAccountingTransactionLineList('destination', options['test_compta_demat_compatibility'])"
tal:condition="line_list">
<EcritureNum tal:content="context/getDestinationReference">Specific Reference</EcritureNum>
<EcritureDate tal:content="python: context.getStopDate().strftime('%Y-%m-%d')">Specific Date</EcritureDate>
<EcritureLib tal:content="context/getTitle">Title</EcritureLib>
......@@ -7,9 +10,8 @@
<tal:block tal:replace="nothing"><EcritureLet></EcritureLet>
<DateLet></DateLet></tal:block>
<ValidDate tal:content="python: context.AccountingTransaction_getDeliverDate().strftime('%Y-%m-%d')">Modification Date</ValidDate>
<tal:block tal:repeat="line python:context.contentValues(portal_type=context.getPortalAccountingMovementTypeList())"><ligne
tal:define="account python:line.getDestinationValue(portal_type='Account')"
tal:condition="python: account is not None and ((line.getDestinationTotalAssetPrice() if line.hasDestinationTotalAssetPrice() else line.getQuantity()) or not options['test_compta_demat_compatibility'])">
<tal:block tal:repeat="line line_list"><ligne
tal:define="account python:line.getDestinationValue(portal_type='Account')">
<CompteNum tal:content="account/Account_getGapId">Reference Compte (Account_getGapId)</CompteNum>
<CompteLib tal:content="line/Movement_getDestinationCompteLib">Translated Title Compte</CompteLib>
<tal:block tal:condition="python: account.getAccountType() in ('asset/receivable', 'liability/payable')"
......
bt5/erp5_accounting_l10n_fr/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr/AccountingTransaction_viewAsSourceFECXML.zpt
View file @ a51637b5
<ecriture xmlns:tal="http://xml.zope.org/namespaces/tal">
<ecriture
xmlns:tal="http://xml.zope.org/namespaces/tal"
tal:define="line_list python:context.AccountingTransaction_getFECXMLAccountingTransactionLineList('source', options['test_compta_demat_compatibility'])"
tal:condition="line_list">
<EcritureNum tal:content="context/getSourceReference">Specific Reference</EcritureNum>
<EcritureDate tal:content="python: context.getStartDate().strftime('%Y-%m-%d')">Specific Date</EcritureDate>
<EcritureLib tal:content="context/getTitle">Title</EcritureLib>
......@@ -7,9 +10,8 @@
<tal:block tal:replace="nothing"><EcritureLet></EcritureLet>
<DateLet></DateLet></tal:block>
<ValidDate tal:content="python: context.AccountingTransaction_getDeliverDate().strftime('%Y-%m-%d')">Modification Date</ValidDate>
<tal:block tal:repeat="line python:context.contentValues(portal_type=context.getPortalAccountingMovementTypeList())"><ligne
tal:define="account python:line.getSourceValue(portal_type='Account')"
tal:condition="python: account is not None and ((line.getSourceTotalAssetPrice() if line.hasSourceTotalAssetPrice() else line.getQuantity()) or not options['test_compta_demat_compatibility'])">
<tal:block tal:repeat="line line_list"><ligne
tal:define="account python:line.getSourceValue(portal_type='Account')">
<CompteNum tal:content="account/Account_getGapId">Reference Compte (Account_getGapId)</CompteNum>
<CompteLib tal:content="line/Movement_getSourceCompteLib">Translated Title Compte</CompteLib>
<tal:block tal:condition="python: account.getAccountType() in ('asset/receivable', 'liability/payable')"
......
bt5/erp5_accounting_l10n_fr/TestTemplateItem/portal_components/test.erp5.testAccounting_l10n_fr.py
View file @ a51637b5
......@@ -31,7 +31,6 @@
"""
import six
import unittest
import zipfile
if six.PY2:
from email import message_from_string as message_from_bytes
......@@ -46,6 +45,7 @@ from AccessControl.SecurityManagement import newSecurityManager
from erp5.component.test.testAccounting import AccountingTestCase
class TestAccounting_l10n_fr(AccountingTestCase):
"""Test Accounting L10N FR
"""
......@@ -405,7 +405,29 @@ class TestAccounting_l10n_fr(AccountingTestCase):
def test_ValidDate(self):
account_module = self.portal.account_module
invoice = self._makeOne(
invoice_source = self._makeOne(
portal_type='Purchase Invoice Transaction',
title='Premiere Ecriture',
simulation_state='delivered',
reference='1',
source_section_value=self.organisation_module.supplier,
stop_date=DateTime(2014, 2, 2),
lines=(dict(source_value=account_module.payable,
source_debit=132.00),
dict(source_value=account_module.refundable_vat,
source_credit=22.00),
dict(source_value=account_module.goods_purchase,
source_credit=110.00)))
assert invoice_source.workflow_history['accounting_workflow'][-1]['action'] == 'deliver'
invoice_source.workflow_history['accounting_workflow'][-1]['time'] = DateTime(2001, 2, 3)
tree = etree.fromstring(
invoice_source.AccountingTransaction_viewAsSourceFECXML(
test_compta_demat_compatibility=True))
self.assertEqual(tree.xpath('//ValidDate/text()'), ['2001-02-03'])
invoice_destination = self._makeOne(
portal_type='Purchase Invoice Transaction',
title='Premiere Ecriture',
simulation_state='delivered',
......@@ -419,15 +441,11 @@ class TestAccounting_l10n_fr(AccountingTestCase):
dict(destination_value=account_module.goods_purchase,
destination_credit=110.00)))
assert invoice.workflow_history['accounting_workflow'][-1]['action'] == 'deliver'
invoice.workflow_history['accounting_workflow'][-1]['time'] = DateTime(2001, 2, 3)
assert invoice_destination.workflow_history['accounting_workflow'][-1]['action'] == 'deliver'
invoice_destination.workflow_history['accounting_workflow'][-1]['time'] = DateTime(2001, 2, 3)
tree = etree.fromstring(
invoice.AccountingTransaction_viewAsSourceFECXML(
test_compta_demat_compatibility=True))
self.assertEqual(tree.xpath('//ValidDate/text()'), ['2001-02-03'])
tree = etree.fromstring(
invoice.AccountingTransaction_viewAsDestinationFECXML(
invoice_destination.AccountingTransaction_viewAsDestinationFECXML(
test_compta_demat_compatibility=True))
self.assertEqual(tree.xpath('//ValidDate/text()'), ['2001-02-03'])
......@@ -551,9 +569,92 @@ class TestAccounting_l10n_fr(AccountingTestCase):
'//ecriture/PieceRef[text()="source"]/../ligne/Credit/text()'),
['0.00', '40.00', '200.00'])
def test_SkipEmptyTransactions(self):
# Don't include transactions without lines, because they are
# reported as invalid by Test Compta Demat
account_module = self.portal.account_module
self._makeOne(
portal_type='Purchase Invoice Transaction',
title='destination 0',
simulation_state='delivered',
reference='destination_0_lines',
source_section_value=self.organisation_module.supplier,
stop_date=DateTime(2014, 2, 2),
lines=(
dict(
destination_value=account_module.payable, destination_debit=0.00),
dict(
destination_value=account_module.payable,
destination_debit=10000.00,
destination_asset_debit=0.00),
dict(
destination_value=account_module.refundable_vat,
destination_credit=0.00),
dict(
destination_value=account_module.refundable_vat,
destination_credit=10000.00,
destination_asset_credit=0.00)))
self._makeOne(
portal_type='Purchase Invoice Transaction',
title='destination no',
simulation_state='delivered',
reference='destination_no_lines',
source_section_value=self.organisation_module.supplier,
stop_date=DateTime(2014, 2, 2),
lines=())
self._makeOne(
portal_type='Sale Invoice Transaction',
title='source 0',
simulation_state='delivered',
reference='source_0_lines',
destination_section_value=self.organisation_module.client_2,
start_date=DateTime(2014, 3, 1),
lines=(
dict(source_value=account_module.receivable, source_debit=0.00),
dict(source_value=account_module.collected_vat, source_credit=0.00)))
self._makeOne(
portal_type='Sale Invoice Transaction',
title='source no',
simulation_state='delivered',
reference='source_no_lines',
destination_section_value=self.organisation_module.client_2,
start_date=DateTime(2014, 3, 1),
lines=())
self.tic()
self.portal.accounting_module.AccountingTransactionModule_viewFrenchAccountingTransactionFile(
section_category='group/demo_group',
section_category_strict=False,
at_date=DateTime(2014, 12, 31),
simulation_state=['delivered'])
self.tic()
tree = etree.fromstring(self.getFECFromMailMessage())
self.validateFECXML(tree)
self.assertEqual(tree.xpath('//ecriture'), [])
def test_PieceRefDefaultValue(self):
account_module = self.portal.account_module
invoice = self._makeOne(
invoice_source = self._makeOne(
portal_type='Purchase Invoice Transaction',
title='Premiere Ecriture',
simulation_state='delivered',
source_section_value=self.organisation_module.supplier,
stop_date=DateTime(2014, 2, 2),
lines=(
dict(
source_value=account_module.payable, source_debit=132.00),
dict(
source_value=account_module.refundable_vat,
source_credit=22.00),
dict(
source_value=account_module.goods_purchase,
source_credit=110.00)))
invoice_source.setSourceReference('source_reference')
invoice_destination = self._makeOne(
portal_type='Purchase Invoice Transaction',
title='Premiere Ecriture',
simulation_state='delivered',
......@@ -568,16 +669,14 @@ class TestAccounting_l10n_fr(AccountingTestCase):
dict(
destination_value=account_module.goods_purchase,
destination_credit=110.00)))
invoice.setSourceReference('source_reference')
invoice.setDestinationReference('destination_reference')
invoice_destination.setDestinationReference('destination_reference')
tree = etree.fromstring(
invoice.AccountingTransaction_viewAsSourceFECXML(
invoice_source.AccountingTransaction_viewAsSourceFECXML(
test_compta_demat_compatibility=True))
self.assertEqual(tree.xpath('//EcritureNum/text()'), ['source_reference'])
self.assertEqual(tree.xpath('//PieceRef/text()'), ['source_reference'])
tree = etree.fromstring(
invoice.AccountingTransaction_viewAsDestinationFECXML(
invoice_destination.AccountingTransaction_viewAsDestinationFECXML(
test_compta_demat_compatibility=True))
self.assertEqual(
tree.xpath('//EcritureNum/text()'), ['destination_reference'])
......@@ -585,12 +684,12 @@ class TestAccounting_l10n_fr(AccountingTestCase):
tree.xpath('//PieceRef/text()'), ['destination_reference'])
tree = etree.fromstring(
invoice.AccountingTransaction_viewAsSourceFECXML(
invoice_source.AccountingTransaction_viewAsSourceFECXML(
test_compta_demat_compatibility=False))
self.assertEqual(tree.xpath('//EcritureNum/text()'), ['source_reference'])
self.assertEqual([n.text for n in tree.xpath('//PieceRef')], [None])
tree = etree.fromstring(
invoice.AccountingTransaction_viewAsDestinationFECXML(
invoice_destination.AccountingTransaction_viewAsDestinationFECXML(
test_compta_demat_compatibility=False))
self.assertEqual(
tree.xpath('//EcritureNum/text()'), ['destination_reference'])
......@@ -661,9 +760,3 @@ class TestAccounting_l10n_fr(AccountingTestCase):
tree.xpath(
'//ecriture/PieceRef[text()="source"]/../ligne/Credit/text()'),
['0.00', '345.00'])
def test_suite():
suite = unittest.TestSuite()
suite.addTest(unittest.makeSuite(TestAccounting_l10n_fr))
return suite
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7