tweak(Sales Documents) Reversal process streamlined UI

tine-groupware · Sep 13, 2024 · 1d25a6e · 1d25a6e
1 parent e77b600
commit 1d25a6e
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 16 deletions.
diff --git a/tine20/Sales/Config.php b/tine20/Sales/Config.php
@@ -488,12 +488,13 @@ class Sales_Config extends Tinebase_Config_Abstract
                     ],
                     [
                         'id' => Sales_Model_Document_Abstract::STATUS_REVERSAL,
-                        //_('Reversal (booked, open)')
-                        'value' => 'Reversal (booked, open)',
+                        //_('Reversal (booked, closed)')
+                        'value' => 'Reversal (booked, closed)',
                         'icon' => null,
                         Sales_Model_Document_Status::FLD_BOOKED => true,
-                        Sales_Model_Document_Status::FLD_CLOSED => false,
+                        Sales_Model_Document_Status::FLD_CLOSED => true,
                         Sales_Model_Document_Status::FLD_REVERSAL => true,
+                        Sales_Model_Document_Status::FLD_IS_USER_TYPE => false,
                         'system' => true
                     ],
                 ],
@@ -575,12 +576,13 @@ class Sales_Config extends Tinebase_Config_Abstract
                         'system' => true
                     ], [
                         'id' => Sales_Model_Document_Abstract::STATUS_REVERSAL,
-                        //_('Reversal (booked, open)')
-                        'value' => 'Reversal (booked, open)',
+                        //_('Reversal (booked, closed)')
+                        'value' => 'Reversal (booked, closed)',
                         'icon' => null,
                         Sales_Model_Document_Status::FLD_BOOKED => true,
-                        Sales_Model_Document_Status::FLD_CLOSED => false,
+                        Sales_Model_Document_Status::FLD_CLOSED => true,
                         Sales_Model_Document_Status::FLD_REVERSAL => true,
+                        Sales_Model_Document_Status::FLD_IS_USER_TYPE => false,
                         'system' => true
                     ],
                 ],
@@ -693,12 +695,13 @@ class Sales_Config extends Tinebase_Config_Abstract
                         'system' => true
                     ], [
                         'id' => Sales_Model_Document_Abstract::STATUS_REVERSAL,
-                        //_('Reversal (booked, open)')
-                        'value' => 'Reversal (booked, open)',
+                        //_('Reversal (booked, closed)')
+                        'value' => 'Reversal (booked, closed)',
                         'icon' => null,
                         Sales_Model_Document_Status::FLD_BOOKED => true,
-                        Sales_Model_Document_Status::FLD_CLOSED => false,
+                        Sales_Model_Document_Status::FLD_CLOSED => true,
                         Sales_Model_Document_Status::FLD_REVERSAL => true,
+                        Sales_Model_Document_Status::FLD_IS_USER_TYPE => false,
                         'system' => true
                     ],
                 ],

diff --git a/tine20/Sales/Model/Document/Abstract.php b/tine20/Sales/Model/Document/Abstract.php
@@ -23,7 +23,7 @@ abstract class Sales_Model_Document_Abstract extends Tinebase_Record_NewAbstract
 {
     public const MODEL_NAME_PART = 'Document_Abstract'; // als konkrete document_types gibt es Offer, Order, Delivery, Invoice (keine Gutschrift!)
 
-    public const STATUS_REVERSAL = 'reversal';
+    public const STATUS_REVERSAL = 'REVERSAL';
 
     public const FLD_ID = 'id';
     public const FLD_DOCUMENT_NUMBER = 'document_number'; // kommt aus incrementable, in config einstellen welches incrementable fuer dieses model da ist!

diff --git a/tine20/Sales/Model/Document/Status.php b/tine20/Sales/Model/Document/Status.php
@@ -21,10 +21,12 @@ class Sales_Model_Document_Status extends Tinebase_Config_KeyFieldRecord
     public const FLD_BOOKED = 'booked';
     public const FLD_CLOSED = 'closed';
     public const FLD_REVERSAL = 'reversal';
+    public const FLD_IS_USER_TYPE = 'is_user_type';
 
     protected $_additionalValidators = [
         self::FLD_BOOKED => ['allowEmpty' => true ],
         self::FLD_CLOSED => ['allowEmpty' => true ],
         self::FLD_REVERSAL => ['allowEmpty' => true ],
+        self::FLD_IS_USER_TYPE => ['allowEmpty' => true ],
     ];
 }
diff --git a/tine20/Tinebase/js/widgets/keyfield/ComboBox.js b/tine20/Tinebase/js/widgets/keyfield/ComboBox.js
@@ -70,12 +70,7 @@ Tine.Tinebase.widgets.keyfield.ComboBox = Ext.extend(Ext.form.ComboBox, {
         }
 
         this.store = Tine.Tinebase.widgets.keyfield.StoreMgr.get(this.app, this.keyFieldName);
-
-        // filter for userType if records contain is_user_type (NOTE: keyFieldRecord Models are not announce yet)
-        if(this.store.getAt(0)?.json.hasOwnProperty('is_user_type')) {
-            this.store.filterBy((r) => {return !!+r.json.is_user_type});
-        }
-
+
         if (this.sortBy) {
             this.store.sort(this.sortBy);
         }
@@ -158,6 +153,12 @@ Tine.Tinebase.widgets.keyfield.ComboBox = Ext.extend(Ext.form.ComboBox, {
     },
 
     doQuery: function() {
+
+        // filter for userType if records contain is_user_type (NOTE: keyFieldRecord Models are not announce yet)
+        this.store.filterBy((r) => {
+            return ! (r.json.hasOwnProperty('is_user_type') && +r.json.is_user_type === 0)
+        });
+
         this.onLoad();
     }
 });