Merge branch 'frappe:master' into batch-wise-item

This commit is contained in:
Akshay
2023-02-17 10:58:05 +05:30
committed by GitHub
70 changed files with 3205 additions and 2004 deletions
+3 -2
View File
@@ -1,6 +1,6 @@
import { DateTime } from 'luxon';
import { AccountRootType } from 'models/baseModels/Account/types';
import { BaseField, RawValue } from 'schemas/types';
import { BaseField, FieldType, RawValue } from 'schemas/types';
export type ExportExtention = 'csv' | 'json';
@@ -24,7 +24,8 @@ export interface ReportRow {
foldedBelow?: boolean;
}
export type ReportData = ReportRow[];
export interface ColumnField extends BaseField {
export interface ColumnField extends Omit<BaseField, 'fieldtype'> {
fieldtype: FieldType;
align?: 'left' | 'right' | 'center';
width?: number;
}