fix(Sales): picking deliver address not possible

tine20 · Jun 21, 2022 · d3530da · d3530da
1 parent c1f5e49
commit d3530da
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/tine20/Sales/js/AddressSearchCombo.js b/tine20/Sales/js/AddressSearchCombo.js
@@ -35,12 +35,14 @@ Tine.Sales.AddressSearchCombo = Ext.extend(Tine.Tinebase.widgets.form.RecordPick
 
     checkState: function(editDialog, record) {
         const mc = editDialog?.recordClass?.getModelConfiguration();
-        const type = _.get(mc, `fields.${this.fieldName}.config.type`, 'billing');
+        const type = this.type || _.get(mc, `fields.${this.fieldName}.config.type`, 'billing');
 
         const customerField = editDialog.getForm().findField('customer_id') || editDialog.getForm().findField('customer')
         const customer = customerField?.selectedRecord;
         const customer_id = customer?.json?.original_id || customer?.id;
 
+        this.setDisabled(!customer_id);
+
         if (this.customer_id && this.customer_id !== customer_id) {
             // handle customer changes
             this.clearValue();
@@ -56,7 +58,6 @@ Tine.Sales.AddressSearchCombo = Ext.extend(Tine.Tinebase.widgets.form.RecordPick
         }
         this.customer_id = customer_id;
 
-        this.setDisabled(!customer_id);
         if (! customer_id) {
             this.clearValue();
         } else {