merge dev

This commit is contained in:
Jay_Makwana
2019-11-16 16:33:19 +05:30
53 changed files with 172 additions and 20254 deletions

View File

@@ -142,7 +142,6 @@
v-model="newEstimate.reference_number"
:invalid="$v.newEstimate.reference_number.$error"
icon="hashtag"
type="number"
@input="$v.newEstimate.reference_number.$touch()"
/>
<div v-if="$v.newEstimate.reference_number.$error" class="text-danger">{{ $tc('validation.ref_number_maxlength') }}</div>
@@ -384,7 +383,7 @@ export default {
maxLength: maxLength(255)
},
reference_number: {
maxLength: maxLength(10)
maxLength: maxLength(255)
}
},
selectedCustomer: {

View File

@@ -305,12 +305,12 @@ export default {
quantity: {
required,
minValue: minValue(1),
maxLength: maxLength(10)
maxLength: maxLength(20)
},
price: {
required,
minValue: minValue(1),
maxLength: maxLength(10)
maxLength: maxLength(20)
},
discount_val: {
between: between(0, this.maxDiscount)

View File

@@ -34,7 +34,7 @@
</v-dropdown>
</div>
</div>
<div class="estimate-si debar">
<div class="estimate-sidebar">
<base-loader v-if="isSearching" />
<div v-else class="side-header">
<base-input