Skip to content

fix: total gold weight and making charge #426

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
MhmdSinanKT wants to merge 2 commits into from
Closed

fix: total gold weight and making charge #426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d191468
fix: total gold weight and making charge
MhmdSinanKT Jan 22, 2025
6d4844e
fix: dynamic calculations in jewellery receipt
MhmdSinanKT Jan 22, 2025
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
6 changes: 3 additions & 3 deletions aumms/aumms/doctype/jewellery_item_receipt/jewellery_item_receipt.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
{
"fieldname": "net_weight",
"fieldtype": "Float",
"label": "Total Weight",
"label": "Gross Weight",
"read_only": 1
},
{
Expand Down Expand Up @@ -105,7 +105,7 @@
"read_only": 1
},
{
"default": "0",
"default": "1",
"fieldname": "has_stone",
"fieldtype": "Check",
"label": "Has Stone"
Expand Down Expand Up @@ -233,7 +233,7 @@
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
"modified": "2025-01-20 12:56:15.072112",
"modified": "2025-01-22 09:21:41.168582",
"modified_by": "Administrator",
"module": "AuMMS",
"name": "Jewellery Item Receipt",
Expand Down
57 changes: 40 additions & 17 deletions aumms/aumms/doctype/jewellery_receipt/jewellery_receipt.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,28 +107,46 @@ frappe.ui.form.on("Jewellery Receipt", {
if (quantity < cur_items_len) {
frm.doc.item_details.splice(quantity);
} else {
for (var i = cur_items_len; i < quantity; i++) {
let row = frm.add_child("item_details", {
item_category: frm.doc.item_category,
item_type: frm.doc.item_type,
item_group: frm.doc.item_group,
purity: frm.doc.purity,
board_rate: frm.doc.board_rate,
frappe.db
.get_value(
"Item Sub Category",
frm.doc.item_sub_category,
"making_charge_in_percentage"
)
.then((r) => {
console.log("here1");
console.log(cur_items_len);
console.log(quantity);


for (var i = cur_items_len; i < quantity; i++) {
console.log("loop");

frm.add_child("item_details", {
item_category: frm.doc.item_category,
item_type: frm.doc.item_type,
item_group: frm.doc.item_group,
purity: frm.doc.purity,
board_rate: frm.doc.board_rate,
making_chargein_percentage: r.message.making_charge_in_percentage,
});
frm.refresh_fields()
}
});
}

}

frm.refresh_field("item_details");
},
});
frappe.ui.form.on("Jewellery Item Receipt", {
form_render: function (frm, cdt, cdn) {
let d = locals[cdt][cdn];
if (d.has_stone) {
let net_weight = d.gold_weight + d.stone_weight;
frappe.model.set_value(cdt, cdn, "net_weight", net_weight);
}
},
// form_render: function (frm, cdt, cdn) {
// let d = locals[cdt][cdn];
// if (d.has_stone) {
// let net_weight = d.gold_weight + d.stone_weight;
// frappe.model.set_value(cdt, cdn, "net_weight", net_weight);
// }
// }, kept for future reference
stone_weight: function (frm, cdt, cdn) {
let d = locals[cdt][cdn];
if (d.single_stone) {
Expand All @@ -154,7 +172,7 @@ frappe.ui.form.on("Jewellery Item Receipt", {
},
gold_weight: function (frm, cdt, cdn) {
let d = locals[cdt][cdn];
if (!d.has_stone) {
if (!d.has_stone || !d.stone_charge) {
let net_weight = d.gold_weight;
frappe.model.set_value(cdt, cdn, "net_weight", net_weight);
let amount_without_making_charge = d.gold_weight * frm.doc.board_rate;
Expand All @@ -170,6 +188,7 @@ frappe.ui.form.on("Jewellery Item Receipt", {
d.amount_without_making_charge * (d.making_chargein_percentage / 100);
frappe.model.set_value(cdt, cdn, "making_charge", making_charge);
}
frm.call("calculate_item_details")
},
making_chargein_percentage: function (frm, cdt, cdn) {
let d = locals[cdt][cdn];
Expand Down Expand Up @@ -219,13 +238,17 @@ frappe.ui.form.on("Jewellery Item Receipt", {
else row.stone_charge = row.rate * row.stone_weight;

row.stone = "";
row.stone_uom = "";
row.stone_uom = "Gram";
row.stone_weight = "";
row.rate = "";

frm.refresh_field("item_wise_stone_details");
frm.refresh_field("item_details");
frm.call("calculate_item_details")
},
board_rate: function(frm) {
frm.call("calculate_item_details")
}
});

let create_multi_stone = function (frm, cdt, cdn) {
Expand Down
10 changes: 9 additions & 1 deletion aumms/aumms/doctype/jewellery_receipt/jewellery_receipt.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"board_rate",
"date",
"quantity",
"total_gold_weight",
"section_break_vxux",
"item_details",
"item_wise_stone_details",
Expand Down Expand Up @@ -130,12 +131,19 @@
"label": "Item Sub Category",
"options": "Item Sub Category",
"reqd": 1
},
{
"fieldname": "total_gold_weight",
"fieldtype": "Float",
"label": "Total Gold Weight",
"precision": "2",
"read_only": 1
}
],
"index_web_pages_for_search": 1,
"is_submittable": 1,
"links": [],
"modified": "2025-01-20 14:25:31.637164",
"modified": "2025-01-22 09:17:51.048655",
"modified_by": "Administrator",
"module": "AuMMS",
"name": "Jewellery Receipt",
Expand Down
7 changes: 7 additions & 0 deletions aumms/aumms/doctype/jewellery_receipt/jewellery_receipt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,12 @@ def autoname(self):

def validate(self):
self.validate_date()

def before_save(self):
total_gold_weight = 0
for item in self.item_details:
total_gold_weight += item.gold_weight
self.total_gold_weight = total_gold_weight

def on_submit(self):
self.create_item()
Expand Down Expand Up @@ -90,6 +96,7 @@ def create_purchase_receipt(self):
purchase_receipt.submit()
frappe.msgprint('Purchase Receipt created.', indicator="green", alert=1)

@frappe.whitelist()
def calculate_item_details(self):
for item_detail in self.get("item_details"):
board_rate = self.board_rate or 0
Expand Down
Loading