Skip to content

S
slapos.core
Commit fb057235 authored by Rafael Monnerat's avatar Rafael Monnerat
Browse files
Options

slapos_accounting: Drop action to create reversal sale invoice transaction 

  Accountant should create the proper document rather them use this workarround action.
parent f87a2bc2
Pipeline #36445 failed with stage
    in 0 seconds
    Hide whitespace changes
    Inline Side-by-side
    Showing with 0 additions and 632 deletions
    master/bt5/slapos_accounting/ActionTemplateItem/portal_types/Sale%20Invoice%20Transaction/create_slapos_reversal.xml deleted 100644 → 0
    View file @ f87a2bc2
    <?xml version="1.0"?>
    <ZopeData>
    <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
    <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>action</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
    </value>
    </item>
    <item>
    <key> <string>categories</string> </key>
    <value>
    <tuple>
    <string>action_type/object_jio_action</string>
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>category</string> </key>
    <value> <string>object_jio_action</string> </value>
    </item>
    <item>
    <key> <string>condition</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
    </value>
    </item>
    <item>
    <key> <string>description</string> </key>
    <value>
    <none/>
    </value>
    </item>
    <item>
    <key> <string>icon</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>id</string> </key>
    <value> <string>create_slapos_reversal</string> </value>
    </item>
    <item>
    <key> <string>permissions</string> </key>
    <value>
    <tuple>
    <string>View</string>
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>priority</string> </key>
    <value> <float>14.0</float> </value>
    </item>
    <item>
    <key> <string>title</string> </key>
    <value> <string>Create SlapOS Reversal Transaction</string> </value>
    </item>
    <item>
    <key> <string>visible</string> </key>
    <value> <int>1</int> </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    <record id="2" aka="AAAAAAAAAAI=">
    <pickle>
    <global name="Expression" module="Products.CMFCore.Expression"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>text</string> </key>
    <value> <string>string:${object_url}/SaleInvoiceTransaction_viewCancelPaymentAndCreateReversalTransactionDialog</string> </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    <record id="3" aka="AAAAAAAAAAM=">
    <pickle>
    <global name="Expression" module="Products.CMFCore.Expression"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>text</string> </key>
    <value> <string>python: object.getSimulationState() in (\'stopped\', ) and (not object.SaleInvoiceTransaction_isLettered()) and portal.Base_checkPermission(\'accounting_module\', \'Add portal content\')</string> </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/SaleInvoiceTransaction_createReversalSaleInvoiceTransaction.py deleted 100644 → 0
    View file @ f87a2bc2
    """ Create a reversal transaction from current transaction. """
    from zExceptions import Unauthorized
    if REQUEST is not None:
    raise Unauthorized
    portal = context.getPortalObject()
    # Check that we are in state that we are waiting for user manual payment
    assert context.getPortalType() == 'Sale Invoice Transaction'
    assert context.getSimulationState() in ('stopped', 'delivered')
    assert context.getTotalPrice() != 0
    # Dont create if the invoice is already paid
    assert not context.SaleInvoiceTransaction_isLettered()
    payment = portal.portal_catalog.getResultValue(
    portal_type="Payment Transaction",
    simulation_state="started",
    default_causality_uid=context.getUid()
    )
    if payment is not None:
    raise ValueError("Payment Transaction is waiting for confirmation!")
    # Should be safe now to fix everything
    reversal_transaction = context.Base_createCloneDocument(batch_mode=1)
    reversal_transaction.edit(
    title="Reversal Transaction for %s" % context.getTitle(),
    causality_value=context,
    description="Reversal Transaction for %s" % context.getTitle(),
    specialise_value=portal.sale_trade_condition_module.slapos_manual_accounting_trade_condition,
    )
    for line in reversal_transaction.getMovementList():
    line.edit(quantity=(-line.getQuantity()))
    reversal_transaction.confirm(comment="Automatic because of reversal creation")
    reversal_transaction.stop(comment="Automatic because of reversal creation")
    if batch_mode:
    return reversal_transaction
    message = context.Base_translateString("Reversal Transaction created.")
    return reversal_transaction.Base_redirect(
    keep_items={'portal_status_message': message})
    master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/SaleInvoiceTransaction_createReversalSaleInvoiceTransaction.xml deleted 100644 → 0
    View file @ f87a2bc2
    <?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>batch_mode=False, REQUEST=None, **kw</string> </value>
    </item>
    <item>
    <key> <string>id</string> </key>
    <value> <string>SaleInvoiceTransaction_createReversalSaleInvoiceTransaction</string> </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/SaleInvoiceTransaction_viewCancelPaymentAndCreateReversalTransactionDialog.xml deleted 100644 → 0
    View file @ f87a2bc2
    <?xml version="1.0"?>
    <ZopeData>
    <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
    <global name="ERP5 Form" module="erp5.portal_type"/>
    </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/>
    </value>
    </item>
    </dictionary>
    </state>
    </object>
    </value>
    </item>
    <item>
    <key> <string>_objects</string> </key>
    <value>
    <tuple/>
    </value>
    </item>
    <item>
    <key> <string>action</string> </key>
    <value> <string>SaleInvoiceTransaction_createReversalSaleInvoiceTransaction</string> </value>
    </item>
    <item>
    <key> <string>action_title</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>description</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>edit_order</string> </key>
    <value>
    <list/>
    </value>
    </item>
    <item>
    <key> <string>encoding</string> </key>
    <value> <string>UTF-8</string> </value>
    </item>
    <item>
    <key> <string>enctype</string> </key>
    <value> <string>multipart/form-data</string> </value>
    </item>
    <item>
    <key> <string>group_list</string> </key>
    <value>
    <list>
    <string>left</string>
    <string>right</string>
    <string>center</string>
    <string>bottom</string>
    <string>hidden</string>
    </list>
    </value>
    </item>
    <item>
    <key> <string>groups</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>bottom</string> </key>
    <value>
    <list/>
    </value>
    </item>
    <item>
    <key> <string>center</string> </key>
    <value>
    <list/>
    </value>
    </item>
    <item>
    <key> <string>hidden</string> </key>
    <value>
    <list/>
    </value>
    </item>
    <item>
    <key> <string>left</string> </key>
    <value>
    <list/>
    </value>
    </item>
    <item>
    <key> <string>right</string> </key>
    <value>
    <list/>
    </value>
    </item>
    </dictionary>
    </value>
    </item>
    <item>
    <key> <string>id</string> </key>
    <value> <string>SaleInvoiceTransaction_viewCancelPaymentAndCreateReversalTransactionDialog</string> </value>
    </item>
    <item>
    <key> <string>method</string> </key>
    <value> <string>POST</string> </value>
    </item>
    <item>
    <key> <string>name</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>pt</string> </key>
    <value> <string>form_dialog</string> </value>
    </item>
    <item>
    <key> <string>row_length</string> </key>
    <value> <int>4</int> </value>
    </item>
    <item>
    <key> <string>stored_encoding</string> </key>
    <value> <string>UTF-8</string> </value>
    </item>
    <item>
    <key> <string>title</string> </key>
    <value> <string>Create Reversal Transactions</string> </value>
    </item>
    <item>
    <key> <string>unicode_mode</string> </key>
    <value> <int>0</int> </value>
    </item>
    <item>
    <key> <string>update_action</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>update_action_title</string> </key>
    <value> <string></string> </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    master/bt5/slapos_accounting/TestTemplateItem/portal_components/test.erp5.testSlapOSAccountingSkins.py
    View file @ fb057235
    ......@@ -115,252 +115,6 @@ class TestSlapOSAccounting(SlapOSTestCaseMixin):
    reference="TESTOSO-%s" % new_id,
    )
    def createSaleInvoiceTransactionForReversal(self, destination_section=None, price=2, payment_mode="payzen"):
    new_title = self.generateNewId()
    new_reference = self.generateNewId()
    new_source_reference = self.generateNewId()
    new_destination_reference = self.generateNewId()
    invoice = self.portal.accounting_module.newContent(
    portal_type="Sale Invoice Transaction",
    title=new_title,
    start_date=DateTime(),
    reference=new_reference,
    source_reference=new_source_reference,
    destination_reference=new_destination_reference,
    destination_section=destination_section,
    payment_mode=payment_mode,
    ledger='automated',
    specialise="sale_trade_condition_module/slapos_aggregated_trade_condition",
    created_by_builder=1 # to prevent init script to create lines
    )
    self.portal.portal_workflow._jumpToStateFor(invoice, 'stopped')
    invoice.newContent(
    title="",
    portal_type="Invoice Line",
    quantity=-2,
    price=price,
    )
    invoice.newContent(
    portal_type="Sale Invoice Transaction Line",
    source="account_module/receivable",
    quantity=-3,
    )
    return invoice
    #################################################################
    # SaleInvoiceTransaction_createReversalSaleInvoiceTransaction
    #################################################################
    def test_SaleInvoiceTransaction_createReversalSaleInvoiceTransaction_redirect_payzen(self):
    sale_invoice_transaction = self.createSaleInvoiceTransactionForReversal(payment_mode='payzen')
    self.tic()
    redirect = sale_invoice_transaction.SaleInvoiceTransaction_createReversalSaleInvoiceTransaction()
    self.assertTrue(
    redirect.endswith(
    '?portal_status_message=Reversal%20Transaction%20created.'),
    "%s doesn't end with expected response" % redirect)
    def test_SaleInvoiceTransaction_createReversalSaleInvoiceTransaction_redirect_wechat(self):
    sale_invoice_transaction = self.createSaleInvoiceTransactionForReversal(payment_mode='wechat')
    self.tic()
    redirect = sale_invoice_transaction.SaleInvoiceTransaction_createReversalSaleInvoiceTransaction()
    self.assertTrue(
    redirect.endswith(
    '?portal_status_message=Reversal%20Transaction%20created.'),
    "%s doesn't end with expected response" % redirect)
    #################################################################
    # SaleInvoiceTransaction_createReversalSaleInvoiceTransaction
    #################################################################
    @withAbort
    def test_createReversalSaleInvoiceTransaction_bad_portal_type(self):
    self.assertRaises(
    AssertionError,
    self.portal.SaleInvoiceTransaction_createReversalSaleInvoiceTransaction,
    batch_mode=1)
    @withAbort
    def test_createReversalSaleInvoiceTransaction_zero_price(self, payment_mode='payzen'):
    invoice = self.createSaleInvoiceTransactionForReversal(payment_mode=payment_mode)
    invoice.manage_delObjects(invoice.contentIds())
    self.tic()
    self.assertRaises(
    AssertionError,
    invoice.SaleInvoiceTransaction_createReversalSaleInvoiceTransaction,
    batch_mode=1)
    @withAbort
    def test_createReversalSaleInvoiceTransaction_paid(self, payment_mode='payzen'):
    invoice = self.createSaleInvoiceTransactionForReversal(payment_mode=payment_mode)
    line = invoice.contentValues(portal_type="Sale Invoice Transaction Line")[0]
    line.edit(grouping_reference="azerty")
    self.tic()
    self.assertRaises(
    AssertionError,
    invoice.SaleInvoiceTransaction_createReversalSaleInvoiceTransaction,
    batch_mode=1)
    @withAbort
    def test_createReversalSaleInvoiceTransaction_registered_payment(self, payment_mode='payzen'):
    invoice = self.createSaleInvoiceTransactionForReversal(payment_mode=payment_mode)
    payment = self.portal.accounting_module.newContent(
    portal_type="Payment Transaction",
    payment_mode=payment_mode,
    causality_value=invoice,
    destination=invoice.getDestination(),
    destination_section=invoice.getDestinationSection(),
    created_by_builder=1 # to prevent init script to create lines
    )
    self.portal.portal_workflow._jumpToStateFor(payment, 'started')
    system_preference = self.portal.portal_preferences.slapos_default_system_preference
    older_integration_site = system_preference.getPreferredPayzenIntegrationSite()
    integration_site = self.createIntegrationPayzenSite()
    system_preference.setPreferredPayzenIntegrationSite(
    integration_site.getRelativeUrl()
    )
    try:
    self.tic()
    payment.PaymentTransaction_generatePayzenId()
    self.assertRaises(
    ValueError,
    invoice.SaleInvoiceTransaction_createReversalSaleInvoiceTransaction,
    batch_mode=1)
    finally:
    self.portal.portal_integrations.manage_delObjects(
    ids=[integration_site.getId()])
    system_preference.setPreferredPayzenIntegrationSite(
    older_integration_site
    )
    @withAbort
    def test_createReversalSaleInvoiceTransaction_ok(self, payment_mode='payzen'):
    invoice = self.createSaleInvoiceTransactionForReversal(payment_mode=payment_mode)
    self.tic()
    reversale_invoice = invoice.\
    SaleInvoiceTransaction_createReversalSaleInvoiceTransaction(batch_mode=1)
    self.assertEqual(invoice.getPaymentMode(""), payment_mode)
    self.assertEqual(reversale_invoice.getTitle(),
    "Reversal Transaction for %s" % invoice.getTitle())
    self.assertEqual(reversale_invoice.getDescription(),
    "Reversal Transaction for %s" % invoice.getTitle())
    self.assertEqual(reversale_invoice.getCausality(),
    invoice.getRelativeUrl())
    self.assertEqual(reversale_invoice.getSimulationState(), "stopped")
    self.assertEqual(invoice.getSimulationState(), "stopped")
    invoice_line_id = invoice.contentValues(portal_type="Invoice Line")[0].getId()
    transaction_line_id = invoice.contentValues(
    portal_type="Sale Invoice Transaction Line")[0].getId()
    self.assertEqual(invoice[invoice_line_id].getQuantity(),
    -reversale_invoice[invoice_line_id].getQuantity())
    self.assertEqual(reversale_invoice[invoice_line_id].getQuantity(), 2)
    self.assertEqual(invoice[transaction_line_id].getQuantity(),
    -reversale_invoice[transaction_line_id].getQuantity())
    self.assertEqual(reversale_invoice[transaction_line_id].getQuantity(), 3)
    self.assertEqual(len(invoice.getMovementList()), 2)
    # Both invoice should have a grouping reference
    self.assertNotEqual(invoice[transaction_line_id].getGroupingReference(""),
    "")
    self.assertEqual(
    invoice[transaction_line_id].getGroupingReference("1"),
    reversale_invoice[transaction_line_id].getGroupingReference("2"))
    # All references should be regenerated
    self.assertNotEqual(invoice.getReference(""),
    reversale_invoice.getReference(""))
    self.assertNotEqual(invoice.getSourceReference(""),
    reversale_invoice.getSourceReference(""))
    self.assertNotEqual(invoice.getDestinationReference(""),
    reversale_invoice.getDestinationReference(""))
    self.assertTrue(invoice.SaleInvoiceTransaction_isLettered())
    self.assertTrue(reversale_invoice.SaleInvoiceTransaction_isLettered())
    # Another trade condition
    self.assertEqual(
    reversale_invoice.getSpecialise(),
    "sale_trade_condition_module/slapos_manual_accounting_trade_condition")
    self.tic()
    @withAbort
    def test_createReversalSaleInvoiceTransaction_ok_dont_autocancel(self, payment_mode='payzen'):
    invoice = self.createSaleInvoiceTransactionForReversal(payment_mode=payment_mode)
    payment = self.portal.accounting_module.newContent(
    portal_type="Payment Transaction",
    payment_mode=payment_mode,
    causality_value=invoice,
    destination=invoice.getDestination(),
    destination_section=invoice.getDestinationSection(),
    created_by_builder=1 # to prevent init script to create lines
    )
    self.portal.portal_workflow._jumpToStateFor(payment, 'started')
    self.tic()
    self.assertRaises(
    ValueError,
    invoice.SaleInvoiceTransaction_createReversalSaleInvoiceTransaction,
    batch_mode=1)
    @withAbort
    def test_createReversalSaleInvoiceTransaction_wechat_zero_price(self):
    self.test_createReversalSaleInvoiceTransaction_zero_price(payment_mode='wechat')
    @withAbort
    def test_createReversalSaleInvoiceTransaction_wechat_paid(self):
    self.test_createReversalSaleInvoiceTransaction_paid(payment_mode='wechat')
    @withAbort
    def test_createReversalSaleInvoiceTransaction_wechat_registered_payment(self):
    invoice = self.createSaleInvoiceTransactionForReversal(payment_mode='wechat')
    payment = self.portal.accounting_module.newContent(
    portal_type="Payment Transaction",
    payment_mode='wechat',
    causality_value=invoice,
    destination=invoice.getDestination(),
    destination_section=invoice.getDestinationSection(),
    created_by_builder=1 # to prevent init script to create lines
    )
    self.portal.portal_workflow._jumpToStateFor(payment, 'started')
    system_preference = self.portal.portal_preferences.slapos_default_system_preference
    older_integration_site = system_preference.getPreferredWechatIntegrationSite()
    integration_site = self.createIntegrationWechatSite()
    system_preference.setPreferredWechatIntegrationSite(
    integration_site.getRelativeUrl()
    )
    self.tic()
    try:
    payment.PaymentTransaction_generateWechatId()
    self.assertRaises(
    ValueError,
    invoice.SaleInvoiceTransaction_createReversalSaleInvoiceTransaction,
    batch_mode=1)
    finally:
    self.portal.portal_integrations.manage_delObjects(
    ids=[integration_site.getId()])
    system_preference.setPreferredWechatIntegrationSite(
    older_integration_site
    )
    @withAbort
    def test_createReversalSaleInvoiceTransaction_wechat_ok(self):
    self.test_createReversalSaleInvoiceTransaction_ok(payment_mode='wechat')
    @withAbort
    def test_createReversalSaleInvoiceTransaction_wechat_ok_dont_autocancel(self):
    self.test_createReversalSaleInvoiceTransaction_ok_dont_autocancel(payment_mode='wechat')
    #################################################################
    # AccountingTransaction_getPaymentState
    #################################################################
    ......@@ -400,30 +154,6 @@ class TestSlapOSAccounting(SlapOSTestCaseMixin):
    invoice.start()
    self.assertEqual("Ongoing", invoice.AccountingTransaction_getPaymentState())
    @withAbort
    def test_AccountingTransaction_getPaymentState_payzen_reversed_payment(self):
    invoice = self.createStoppedSaleInvoiceTransaction()
    self.tic()
    reversal = invoice.SaleInvoiceTransaction_createReversalSaleInvoiceTransaction(
    batch_mode=1
    )
    self.tic()
    self.assertEqual("Paid", invoice.AccountingTransaction_getPaymentState())
    self.assertEqual(0, invoice.getTotalPrice() + reversal.getTotalPrice())
    self.assertTrue(invoice.SaleInvoiceTransaction_isLettered())
    self.assertTrue(reversal.SaleInvoiceTransaction_isLettered())
    @withAbort
    def test_AccountingTransaction_getPaymentState_wechat_reversed_payment(self):
    invoice = self.createStoppedSaleInvoiceTransaction(payment_mode='wechat')
    self.tic()
    reversal = invoice.SaleInvoiceTransaction_createReversalSaleInvoiceTransaction(
    batch_mode=1
    )
    self.tic()
    self.assertEqual("Paid", invoice.AccountingTransaction_getPaymentState())
    self.assertEqual(0, invoice.getTotalPrice() + reversal.getTotalPrice())
    def test_AccountingTransaction_getPaymentState_payzen_free_payment(self):
    invoice = self.createStoppedSaleInvoiceTransaction(price=0)
    self.tic()
    ......
    master/bt5/slapos_accounting/bt/template_action_path_list
    View file @ fb057235
    ......@@ -13,7 +13,6 @@ Payment Transaction | related_payzen_event
    Person | create_slapos_deposit
    Person | create_slapos_payment_transaction
    Root Applied Rule Causality Causality Movement Group | view
    Sale Invoice Transaction | create_slapos_reversal
    Sale Packing List | jump_related_aggregated_packing_list
    SlapOS Accounting Quantity Updating Order Builder | view
    SlapOS Accounting Quantity Updating Order Builder | view_predicate_group
    ......
    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