Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
// Copyright (c) 2021, Frappe and contributors
// For license information, please see license.txt

frappe.ui.form.on('Delivery Area', {
// refresh: function(frm) {

// }
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
{
"autoname": "field:name_area",
"creation": "2021-08-19 11:08:13.356735",
"doctype": "DocType",
"editable_grid": 1,
"engine": "InnoDB",
"field_order": [
"name_area",
"creation_date",
"delivery_area_detail"
],
"fields": [
{
"fieldname": "name_area",
"fieldtype": "Data",
"in_list_view": 1,
"label": "Name Area",
"reqd": 1,
"unique": 1
},
{
"fieldname": "creation_date",
"fieldtype": "Date",
"in_list_view": 1,
"label": "Creation Date",
"reqd": 1
},
{
"fieldname": "delivery_area_detail",
"fieldtype": "Table",
"label": "Delivery Area Detail",
"options": "Delivery Area Detail",
"reqd": 1
}
],
"modified": "2021-08-19 11:08:13.356735",
"modified_by": "Administrator",
"module": "Account status",
"name": "Delivery Area",
"owner": "Administrator",
"permissions": [
{
"create": 1,
"delete": 1,
"email": 1,
"export": 1,
"print": 1,
"read": 1,
"report": 1,
"role": "System Manager",
"share": 1,
"write": 1
}
],
"quick_entry": 1,
"sort_field": "modified",
"sort_order": "DESC",
"track_changes": 1
}
10 changes: 10 additions & 0 deletions leaf_develop/account_status/doctype/delivery_area/delivery_area.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2021, Frappe and contributors
# For license information, please see license.txt

from __future__ import unicode_literals
# import frappe
from frappe.model.document import Document

class DeliveryArea(Document):
pass
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2021, Frappe and Contributors
# See license.txt
from __future__ import unicode_literals

# import frappe
import unittest

class TestDeliveryArea(unittest.TestCase):
pass
Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
{
"creation": "2021-08-19 11:07:19.650383",
"doctype": "DocType",
"editable_grid": 1,
"engine": "InnoDB",
"field_order": [
"item",
"item_code",
"item_name"
],
"fields": [
{
"fieldname": "item",
"fieldtype": "Link",
"in_list_view": 1,
"label": "Item",
"options": "Item"
},
{
"fetch_from": "item.item_code",
"fieldname": "item_code",
"fieldtype": "Data",
"in_list_view": 1,
"label": "Item Code",
"read_only": 1
},
{
"fetch_from": "item.item_name",
"fieldname": "item_name",
"fieldtype": "Data",
"in_list_view": 1,
"label": "Item Name",
"read_only": 1
}
],
"istable": 1,
"modified": "2021-08-19 11:16:03.148140",
"modified_by": "Administrator",
"module": "Account status",
"name": "Delivery Area Detail",
"owner": "Administrator",
"permissions": [],
"quick_entry": 1,
"sort_field": "modified",
"sort_order": "DESC",
"track_changes": 1
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2021, Frappe and contributors
# For license information, please see license.txt

from __future__ import unicode_literals
# import frappe
from frappe.model.document import Document

class DeliveryAreaDetail(Document):
pass
Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
// Copyright (c) 2021, Frappe and contributors
// For license information, please see license.txt

frappe.ui.form.on('Dispatch Control', {
// refresh: function(frm) {

// }
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
{
"autoname": "DIS-CONT-.YYYY.-.########",
"creation": "2021-08-20 11:03:46.148909",
"doctype": "DocType",
"editable_grid": 1,
"engine": "InnoDB",
"field_order": [
"sale_invoice",
"customer",
"delivery_area",
"creation_date",
"items"
],
"fields": [
{
"fieldname": "sale_invoice",
"fieldtype": "Link",
"in_list_view": 1,
"label": "Sale Invoice",
"options": "Sales Invoice",
"reqd": 1
},
{
"fetch_from": "sale_invoice.customer",
"fieldname": "customer",
"fieldtype": "Data",
"label": "Customer",
"read_only": 1
},
{
"fieldname": "delivery_area",
"fieldtype": "Link",
"in_list_view": 1,
"label": "Delivery Area",
"options": "Delivery Area",
"reqd": 1
},
{
"fieldname": "creation_date",
"fieldtype": "Date",
"in_list_view": 1,
"label": "Creation Date",
"reqd": 1
},
{
"fieldname": "items",
"fieldtype": "Table",
"label": "Items",
"options": "Dispatch Control Detail",
"reqd": 1
}
],
"modified": "2021-08-20 11:54:17.655840",
"modified_by": "Administrator",
"module": "Account status",
"name": "Dispatch Control",
"owner": "Administrator",
"permissions": [
{
"create": 1,
"delete": 1,
"email": 1,
"export": 1,
"print": 1,
"read": 1,
"report": 1,
"role": "System Manager",
"share": 1,
"write": 1
}
],
"quick_entry": 1,
"sort_field": "modified",
"sort_order": "DESC",
"track_changes": 1
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2021, Frappe and contributors
# For license information, please see license.txt

from __future__ import unicode_literals
# import frappe
from frappe.model.document import Document

class DispatchControl(Document):
pass
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2021, Frappe and Contributors
# See license.txt
from __future__ import unicode_literals

# import frappe
import unittest

class TestDispatchControl(unittest.TestCase):
pass
Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
{
"creation": "2021-08-20 10:59:40.421089",
"doctype": "DocType",
"editable_grid": 1,
"engine": "InnoDB",
"field_order": [
"item",
"item_code",
"item_name",
"qty",
"status"
],
"fields": [
{
"fieldname": "item",
"fieldtype": "Link",
"in_list_view": 1,
"label": "Item",
"options": "Item"
},
{
"fetch_from": "item.item_code",
"fieldname": "item_code",
"fieldtype": "Data",
"in_list_view": 1,
"label": "Item Code",
"read_only": 1
},
{
"fetch_from": "item.item_name",
"fieldname": "item_name",
"fieldtype": "Data",
"in_list_view": 1,
"label": "Item Name",
"read_only": 1
},
{
"fieldname": "status",
"fieldtype": "Select",
"label": "Status",
"options": "Open\nClosed"
},
{
"fieldname": "qty",
"fieldtype": "Int",
"in_list_view": 1,
"label": "Quantity"
}
],
"istable": 1,
"modified": "2021-08-23 12:07:35.668120",
"modified_by": "Administrator",
"module": "Account status",
"name": "Dispatch Control Detail",
"owner": "Administrator",
"permissions": [],
"quick_entry": 1,
"sort_field": "modified",
"sort_order": "DESC",
"track_changes": 1
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2021, Frappe and contributors
# For license information, please see license.txt

from __future__ import unicode_literals
# import frappe
from frappe.model.document import Document

class DispatchControlDetail(Document):
pass
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ def apply_changes(self, total_price):

def material_request(self):
products = frappe.get_all("Inventory Item", ["item", "quantity"], filters = {"parent": self.name})
warehouse = frappe.get_all("Patient Warehouse", ["name_warehouse", "to_warehouse"])
warehouse = frappe.get_all("Patient Warehouse", ["name_warehouse", "to_warehouse", "from_warehouse"])

if len(warehouse) == 0:
frappe.throw("There is no Patient Warehouse to assign, create a new one.")
Expand All @@ -55,7 +55,7 @@ def material_request(self):
})
doc.save()

self.make_stock_entry(warehouse[0].name_warehouse, warehouse[0].to_warehouse, products)
self.make_stock_entry(warehouse[0].from_warehouse, warehouse[0].to_warehouse, products)

def make_stock_entry(self, from_warehoouse, to_warehouse, products):
material_transfer = frappe.get_all("Stock Entry Type", ["name"], filters = {"name": "Material Transfer"})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"engine": "InnoDB",
"field_order": [
"name_warehouse",
"from_warehouse",
"to_warehouse"
],
"fields": [
Expand All @@ -24,9 +25,16 @@
"label": "Default Target Warehouse",
"options": "Warehouse",
"reqd": 1
},
{
"fieldname": "from_warehouse",
"fieldtype": "Link",
"label": "Default Source Warehouse",
"options": "Warehouse",
"reqd": 1
}
],
"modified": "2021-08-18 08:23:26.913751",
"modified": "2021-08-23 08:41:22.048295",
"modified_by": "Administrator",
"module": "Account status",
"name": "Patient Warehouse",
Expand Down
10 changes: 10 additions & 0 deletions leaf_develop/config/account_status.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,16 @@ def get_data():
"type": "doctype",
"name": "Patient Warehouse",
"onboard": 1,
},
{
"type": "doctype",
"name": "Delivery Area",
"onboard": 1,
},
{
"type": "doctype",
"name": "Dispatch Control",
"onboard": 1,
}
]
},
Expand Down