accounting/books
2
0
Fork 0
mirror of https://github.com/frappe/books.git synced 2025-02-02 12:08:27 +00:00
Code Issues Releases Activity

fix: unit conversion related schema names

Browse Source
This commit is contained in:
18alantom 2023-02-21 14:24:35 +05:30
parent 7a51cef5c3
commit ef073ec770
7 changed files with 111 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
models/types.ts
View File

@ -11,7 +11,7 @@ export enum ModelNameEnum {
Defaults = 'Defaults', Defaults = 'Defaults',
Item = 'Item', Item = 'Item',
UOM = 'UOM', UOM = 'UOM',
UOMConversionFactor = 'UOMConversionFactor', UOMConversionItem = 'UOMConversionItem',
JournalEntry = 'JournalEntry', JournalEntry = 'JournalEntry',
JournalEntryAccount = 'JournalEntryAccount', JournalEntryAccount = 'JournalEntryAccount',
Misc = 'Misc', Misc = 'Misc',

78
schemas/app/InvoiceItem.json
View File

@ -17,41 +17,45 @@
"label": "Description", "label": "Description",
"fieldtype": "Text" "fieldtype": "Text"
}, },
{
"fieldname": "rate",
"label": "Rate",
"fieldtype": "Currency",
"required": true
},
{
"fieldname": "transferUnit",
"label": "Transfer Unit",
"fieldtype": "Link",
"target": "UOM",
"placeholder": "Unit"
},
{
"fieldname": "transferQuantity",
"label": "Qty. in Transfer Unit",
"fieldtype": "Float",
"required": true
},
{
"fieldname": "unit",
"label": "Stock Unit",
"fieldtype": "Link",
"target": "UOM",
"default": "Unit",
"placeholder": "Unit",
"readOnly": true
},
{ {
"fieldname": "quantity", "fieldname": "quantity",
"label": "Quantity", "label": "Qty. in Stock Unit",
"fieldtype": "Float", "fieldtype": "Float",
"required": true, "required": true,
"default": 1 "default": 1
}, },
{ {
"fieldname": "transferQty", "fieldname": "unitConversionFactor",
"label": "Qty as per Stock UOM",
"fieldtype": "Float",
"required": true
},
{
"fieldname": "stockUOM",
"label": "Stock UOM",
"fieldtype": "Data",
"readOnly": true
},
{
"fieldname": "uom",
"label": "UOM",
"fieldtype": "Link",
"target": "UOM"
},
{
"fieldname": "UOMConversionFactor",
"label": "Conversion Factor", "label": "Conversion Factor",
"fieldtype": "Float", "fieldtype": "Float",
"required": "true"
},
{
"fieldname": "rate",
"label": "Rate",
"fieldtype": "Currency",
"required": true "required": true
}, },
{ {
@ -119,17 +123,7 @@
"readOnly": true "readOnly": true
} }
], ],
"tableFields": [ "tableFields": ["item", "tax", "quantity", "rate", "amount"],
"item",
"tax",
"stockUOM",
"uom",
"UOMConversionFactor",
"transferQty",
"quantity",
"rate",
"amount"
],
"keywordFields": ["item", "tax"], "keywordFields": ["item", "tax"],
"quickEditFields": [ "quickEditFields": [
"item", "item",
@ -137,12 +131,12 @@
"description", "description",
"hsnCode", "hsnCode",
"tax", "tax",
"stockUOM",
"uom",
"UOMConversionFactor",
"transferQty",
"quantity",
"rate", "rate",
"transferUnit",
"transferQuantity",
"unit",
"quantity",
"unitConversionFactor",
"amount", "amount",
"setItemDiscountAmount", "setItemDiscountAmount",
"itemDiscountAmount", "itemDiscountAmount",

10
schemas/app/Item.json
View File

@ -128,8 +128,18 @@
"fieldname": "trackItem", "fieldname": "trackItem",
"label": "Track Item", "label": "Track Item",
"fieldtype": "Check", "fieldtype": "Check",
<<<<<<< HEAD
"default": false, "default": false,
"section": "Inventory" "section": "Inventory"
=======
"default": false
},
{
"fieldname": "uomConversions",
"label": "UOM Conversions",
"fieldtype": "Table",
"target": "UOMConversionItem"
>>>>>>> f5cca273 (fix: unit conversion related schema names)
} }
], ],
"quickEditFields": [ "quickEditFields": [

58
schemas/app/inventory/StockMovementItem.json
View File

@ -27,35 +27,39 @@
"create": true "create": true
}, },
{ {
"fieldname": "transferQty", "fieldname": "transferUnit",
"label": "Qty as per Stock UOM", "label": "Transfer Unit",
"fieldtype": "Link",
"target": "UOM",
"placeholder": "Unit"
},
{
"fieldname": "transferQuantity",
"label": "Qty. in Transfer Unit",
"fieldtype": "Float", "fieldtype": "Float",
"required": true "required": true
}, },
{
"fieldname": "unit",
"label": "Stock Unit",
"fieldtype": "Link",
"target": "UOM",
"default": "Unit",
"placeholder": "Unit",
"readOnly": true
},
{ {
"fieldname": "quantity", "fieldname": "quantity",
"label": "Quantity", "label": "Qty. in Stock Unit",
"fieldtype": "Float", "fieldtype": "Float",
"required": true, "required": true,
"default": 1 "default": 1
}, },
{ {
"fieldname": "stockUOM", "fieldname": "unitConversionFactor",
"label": "Stock UOM",
"fieldtype": "Data",
"readOnly": true
},
{
"fieldname": "uom",
"label": "UOM",
"fieldtype": "Link",
"target": "UOM"
},
{
"fieldname": "UOMConversionFactor",
"label": "Conversion Factor", "label": "Conversion Factor",
"fieldtype": "Float", "fieldtype": "Float",
"required": "true" "required": true
}, },
{ {
"fieldname": "rate", "fieldname": "rate",
@ -70,27 +74,17 @@
"readOnly": true "readOnly": true
} }
], ],
"tableFields": [ "tableFields": ["item", "fromLocation", "toLocation", "quantity", "rate"],
"item",
"fromLocation",
"toLocation",
"stockUOM",
"uom",
"UOMConversionFactor",
"transferQty",
"quantity",
"rate"
],
"keywordFields": ["item"], "keywordFields": ["item"],
"quickEditFields": [ "quickEditFields": [
"item", "item",
"fromLocation", "fromLocation",
"toLocation", "toLocation",
"stockUOM", "transferUnit",
"uom", "transferQuantity",
"UOMConversionFactor", "unit",
"transferQty",
"quantity", "quantity",
"unitConversionFactor",
"rate", "rate",
"amount" "amount"
] ]

75
schemas/app/inventory/StockTransferItem.json
View File

@ -17,36 +17,40 @@
"target": "Location", "target": "Location",
"required": true "required": true
}, },
{
"fieldname": "transferUnit",
"label": "Transfer Unit",
"fieldtype": "Link",
"target": "UOM",
"placeholder": "Unit"
},
{
"fieldname": "transferQuantity",
"label": "Qty. in Transfer Unit",
"fieldtype": "Float",
"required": true
},
{
"fieldname": "unit",
"label": "Stock Unit",
"fieldtype": "Link",
"target": "UOM",
"default": "Unit",
"placeholder": "Unit",
"readOnly": true
},
{ {
"fieldname": "quantity", "fieldname": "quantity",
"label": "Quantity", "label": "Qty. in Stock Unit",
"fieldtype": "Float", "fieldtype": "Float",
"required": true, "required": true,
"default": 1 "default": 1
}, },
{ {
"fieldname": "transferQty", "fieldname": "unitConversionFactor",
"label": "Qty as per Stock UOM",
"fieldtype": "Float",
"required": true
},
{
"fieldname": "stockUOM",
"label": "Stock UOM",
"fieldtype": "Data",
"readOnly": true
},
{
"fieldname": "uom",
"label": "UOM",
"fieldtype": "Link",
"target": "UOM"
},
{
"fieldname": "UOMConversionFactor",
"label": "Conversion Factor", "label": "Conversion Factor",
"fieldtype": "Float", "fieldtype": "Float",
"required": "true" "required": true
}, },
{ {
"fieldname": "rate", "fieldname": "rate",
@ -60,14 +64,6 @@
"fieldtype": "Currency", "fieldtype": "Currency",
"readOnly": true "readOnly": true
}, },
{
"fieldname": "unit",
"label": "Unit Type",
"fieldtype": "Link",
"target": "UOM",
"default": "Unit",
"placeholder": "Unit Type"
},
{ {
"fieldname": "description", "fieldname": "description",
"label": "Description", "label": "Description",
@ -81,28 +77,17 @@
"placeholder": "HSN/SAC Code" "placeholder": "HSN/SAC Code"
} }
], ],
"tableFields": [ "tableFields": ["item", "location", "quantity", "rate", "amount"],
"item",
"location",
"stockUOM",
"uom",
"UOMConversionFactor",
"transferQty",
"quantity",
"rate",
"amount"
],
"quickEditFields": [ "quickEditFields": [
"item", "item",
"transferUnit",
"transferQuantity",
"unit", "unit",
"quantity",
"unitConversionFactor",
"description", "description",
"hsnCode", "hsnCode",
"location", "location",
"stockUOM",
"uom",
"UOMConversionFactor",
"transferQty",
"quantity",
"rate", "rate",
"amount" "amount"
] ]

11
schemas/app/UOMConversionFactor.json → schemas/app/inventory/UOMConversionItem.json
View File

@ -1,6 +1,6 @@
{ {
"name": "UOMConversionFactor", "name": "UOMConversionItem",
"label": "UOM Conversion Factor", "label": "UOM Conversion Item",
"isChild": true, "isChild": true,
"fields": [ "fields": [
{ {
@ -12,13 +12,12 @@
"required": true "required": true
}, },
{ {
"fieldname": "value", "fieldname": "conversionFactor",
"label": "Value", "label": "Conversion Factor",
"fieldtype": "Float", "fieldtype": "Float",
"default": 1, "default": 1,
"required": true "required": true
} }
], ],
"tableFields": ["uom", "value"], "tableFields": ["uom", "conversionFactor"]
"quickEditFields": ["uom", "value"]
} }

4
schemas/schemas.ts
View File

@ -37,7 +37,7 @@ import Tax from './app/Tax.json';
import TaxDetail from './app/TaxDetail.json'; import TaxDetail from './app/TaxDetail.json';
import TaxSummary from './app/TaxSummary.json'; import TaxSummary from './app/TaxSummary.json';
import UOM from './app/UOM.json'; import UOM from './app/UOM.json';
import UOMConversionFactor from './app/UOMConversionFactor.json' import UOMConversionItem from './app/inventory/UOMConversionItem.json';
import PatchRun from './core/PatchRun.json'; import PatchRun from './core/PatchRun.json';
import SingleValue from './core/SingleValue.json'; import SingleValue from './core/SingleValue.json';
import SystemSettings from './core/SystemSettings.json'; import SystemSettings from './core/SystemSettings.json';
@ -82,7 +82,7 @@ export const appSchemas: Schema[] | SchemaStub[] = [
Address as Schema, Address as Schema,
Item as Schema, Item as Schema,
UOM as Schema, UOM as Schema,
UOMConversionFactor as Schema, UOMConversionItem as Schema,
Payment as Schema, Payment as Schema,
PaymentFor as Schema, PaymentFor as Schema,