1. 06 Mar, 2023 8 commits
    • Romain Courteaud's avatar
      062f4840
    • Alain Takoudjou's avatar
      Support multiple open order line with the same effective_date. · d75f1e67
      Alain Takoudjou authored
      If 2 lines have the same effective date (catalog has a 1 second precision),
      always return the validate and open first.
      
      Commit: 02d06501
      
      Changes applied from history:
      
      http://git.erp5.org/gitweb/erp5.git/history/refs/heads/interaction-drop:/product/ERP5/Document/SubscriptionItem.py?js=1
      d75f1e67
    • Rafael Monnerat's avatar
      Apply commit to Support use category for total price calculation. · 32d19a01
      Rafael Monnerat authored
      Original commit from : Lukasz Nowak <luke@nexedi.com>
                             3e45ec35
      32d19a01
    • Romain Courteaud's avatar
      Proxy role is needed to access the site message context. · 1932c820
      Romain Courteaud authored
      Conflicts:
      	bt5/erp5_crm/bt/revision
      1932c820
    • Gabriel Monnerat's avatar
      erp5_stripe: Use activity to store stripe session in ERP5 · ce9ec7b6
      Gabriel Monnerat authored
      Creating Stripe Payment Session and HTTP Exchange in the same transaction can raise conflict errors and when it happens, we already created the session on the Stripe side.
      
      With this, when this happens, we receive one useless webhook to inform that the session has expired.
      
      Also, batch_mode was removed because we only use it in tests. The tests were updated to use like in production.
      
      This change will probably avoid the issue below:
      
      ```
      ------
      2023-03-01 13:03:33,503 INFO Tracking queuing message: activity=SQLDict, object_path=/erp5/stripe_payment_session_module/20230301-1B990F0, method_id=immediateReindexObject, args=(), kw={}, activity_kw={'group_id': '', 'serialization_tag': '/erp5/stripe_payment_session_module/20230301-1B990F0', 'alternate_method_id': 'alternateReindexObject', 'group_method_id': 'portal_catalog/catalogObjectList'}, user_name=...
      ------
      2023-03-01 13:03:33,516 INFO Tracking queuing message: activity=SQLDict, object_path=/erp5/system_event_module/20230301-9DDE8DD8, method_id=immediateReindexObject, args=(), kw={}, activity_kw={'group_id': '', 'serialization_tag': '/erp5/system_event_module/20230301-9DDE8DD8', 'alternate_method_id': 'alternateReindexObject', 'group_method_id': 'portal_catalog/catalogObjectList'}, user_name=...
      ------
      2023-03-01 13:03:33,549 INFO ZPublisher.Conflict ReadConflictError at ......_startStripePaymentSession: database read conflict error (oid 0x06be91ef, serial this txn started with 0x03eec0ca6bdaf611 2023-03-01 10:50:25.278590, serial currently committed 0x03eec0d78f096a55 2023-03-01 11:03:33.524245) (12 conflicts (0 unresolved) since startup at Tue Jan 17 03:21:57 2023)
      ------
      2023-03-01 13:03:35,057 INFO Tracking queuing message: activity=SQLDict, object_path=/erp5/stripe_payment_session_module/20230301-1E233DB, method_id=immediateReindexObject, args=(), kw={}, activity_kw={'group_id': '', 'serialization_tag': '/erp5/stripe_payment_session_module/20230301-1E233DB', 'alternate_method_id': 'alternateReindexObject', 'group_method_id': 'portal_catalog/catalogObjectList'}, user_name=...
      ------
      2023-03-01 13:03:35,066 INFO Tracking queuing message: activity=SQLDict, object_path=/erp5/system_event_module/20230301-5C3B7E3, method_id=immediateReindexObject, args=(), kw={}, activity_kw={'group_id': '', 'serialization_tag': '/erp5/system_event_module/20230301-5C3B7E3', 'alternate_method_id': 'alternateReindexObject', 'group_method_id': 'portal_catalog/catalogObjectList'}, user_name=...
      ```
      
      See merge request nexedi/erp5!1747
      ce9ec7b6
    • Kazuhiko Shiozaki's avatar
    • Kazuhiko Shiozaki's avatar
      erp5_core: remove Guard Role field in Worklist_view, as it should be defined... · 92bfa7e1
      Kazuhiko Shiozaki authored
      erp5_core: remove Guard Role field in Worklist_view, as it should be defined in predicate listbox at the bottom.
      92bfa7e1
    • Gabriel Monnerat's avatar
      erp5_stripe: Use activity to store stripe session in ERP5 · ec4a3f9d
      Gabriel Monnerat authored
      Creating Stripe Payment Session and HTTP Exchange in the same transaction can raise conflict errors and when it happens, we already created the session on the Stripe side.
      
      With this, when this happens, we receive one useless webhook to inform that the session has expired.
      
      Also, batch_mode was removed because we only use it in tests. The tests were updated to use like in production.
      ec4a3f9d
  2. 05 Mar, 2023 1 commit
  3. 03 Mar, 2023 31 commits