mirror of
https://github.com/frappe/books.git
synced 2025-01-24 15:48:25 +00:00
fix: minor fixes
- empty date import issue - rename payment amount to allocated amount - increase tooltip distance threshold
This commit is contained in:
parent
2f6ecff36b
commit
37de2675cd
@ -37,7 +37,7 @@ export default {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
fieldname: 'amount',
|
fieldname: 'amount',
|
||||||
label: t`Amount`,
|
label: t`Allocated Amount`,
|
||||||
fieldtype: 'Currency',
|
fieldtype: 'Currency',
|
||||||
formula: (row, doc) => {
|
formula: (row, doc) => {
|
||||||
return (
|
return (
|
||||||
|
@ -163,7 +163,7 @@ export default {
|
|||||||
bottom: { type: Number, default: 0 },
|
bottom: { type: Number, default: 0 },
|
||||||
left: { type: Number, default: 55 },
|
left: { type: Number, default: 55 },
|
||||||
extendGridX: { type: Number, default: -20 },
|
extendGridX: { type: Number, default: -20 },
|
||||||
tooltipDispDistThreshold: { type: Number, default: 20 },
|
tooltipDispDistThreshold: { type: Number, default: 40 },
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
fontStyle() {
|
fontStyle() {
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import { Doc, Map, Field, FieldType } from '@/types/model';
|
import { Doc, Field, FieldType, Map } from '@/types/model';
|
||||||
import frappe from 'frappe';
|
import frappe from 'frappe';
|
||||||
import { isNameAutoSet } from 'frappe/model/naming';
|
import { isNameAutoSet } from 'frappe/model/naming';
|
||||||
import { parseCSV } from './csvParser';
|
import { parseCSV } from './csvParser';
|
||||||
@ -50,6 +50,9 @@ interface TemplateField {
|
|||||||
function formatValue(value: string, fieldtype: FieldType): unknown {
|
function formatValue(value: string, fieldtype: FieldType): unknown {
|
||||||
switch (fieldtype) {
|
switch (fieldtype) {
|
||||||
case FieldType.Date:
|
case FieldType.Date:
|
||||||
|
if (value === '') {
|
||||||
|
return '';
|
||||||
|
}
|
||||||
return new Date(value);
|
return new Date(value);
|
||||||
case FieldType.Currency:
|
case FieldType.Currency:
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
|
Loading…
x
Reference in New Issue
Block a user