Merge branch 'develop' into print-format-fix
This commit is contained in:
Deepesh Garg
GitHub
commit
e86f6d0738
@ -5,7 +5,7 @@ import frappe
|
||||
from erpnext.hooks import regional_overrides
|
||||
from frappe.utils import getdate
|
||||
|
||||
__version__ = '12.2.0'
|
||||
__version__ = '12.0.0-dev'
|
||||
|
||||
def get_default_company(user=None):
|
||||
'''Get default company for user'''
|
||||
|
||||
@ -7,7 +7,20 @@ frappe.ui.form.on('Bank', {
|
||||
},
|
||||
refresh: function(frm) {
|
||||
add_fields_to_mapping_table(frm);
|
||||
|
||||
frappe.dynamic_link = { doc: frm.doc, fieldname: 'name', doctype: 'Bank' };
|
||||
|
||||
frm.toggle_display(['address_html','contact_html'], !frm.doc.__islocal);
|
||||
|
||||
if (frm.doc.__islocal) {
|
||||
frm.set_df_property('address_and_contact', 'hidden', 1);
|
||||
frappe.contacts.clear_address_and_contact(frm);
|
||||
}
|
||||
else {
|
||||
frm.set_df_property('address_and_contact', 'hidden', 0);
|
||||
frappe.contacts.render_address_and_contact(frm);
|
||||
}
|
||||
},
|
||||
});
|
||||
|
||||
|
||||
|
||||
@ -1,224 +1,137 @@
|
||||
{
|
||||
"allow_copy": 0,
|
||||
"allow_events_in_timeline": 0,
|
||||
"allow_guest_to_view": 0,
|
||||
"allow_import": 0,
|
||||
"allow_rename": 0,
|
||||
"actions": [],
|
||||
"allow_import": 1,
|
||||
"allow_rename": 1,
|
||||
"autoname": "field:bank_name",
|
||||
"beta": 0,
|
||||
"creation": "2018-04-07 16:59:59.496668",
|
||||
"custom": 0,
|
||||
"docstatus": 0,
|
||||
"doctype": "DocType",
|
||||
"document_type": "",
|
||||
"document_type": "Setup",
|
||||
"editable_grid": 1,
|
||||
"engine": "InnoDB",
|
||||
"field_order": [
|
||||
"bank_details_section",
|
||||
"bank_name",
|
||||
"swift_number",
|
||||
"column_break_1",
|
||||
"branch_code",
|
||||
"website",
|
||||
"address_and_contact",
|
||||
"address_html",
|
||||
"column_break_13",
|
||||
"contact_html",
|
||||
"data_import_configuration_section",
|
||||
"bank_transaction_mapping",
|
||||
"section_break_4",
|
||||
"plaid_access_token"
|
||||
],
|
||||
"fields": [
|
||||
{
|
||||
"allow_bulk_edit": 0,
|
||||
"allow_in_quick_entry": 0,
|
||||
"allow_on_submit": 0,
|
||||
"bold": 0,
|
||||
"collapsible": 0,
|
||||
"columns": 0,
|
||||
"fieldname": "bank_name",
|
||||
"fieldtype": "Data",
|
||||
"hidden": 0,
|
||||
"ignore_user_permissions": 0,
|
||||
"ignore_xss_filter": 0,
|
||||
"in_filter": 0,
|
||||
"in_global_search": 0,
|
||||
"in_list_view": 1,
|
||||
"in_standard_filter": 0,
|
||||
"label": "Bank Name",
|
||||
"length": 0,
|
||||
"no_copy": 0,
|
||||
"permlevel": 0,
|
||||
"precision": "",
|
||||
"print_hide": 0,
|
||||
"print_hide_if_no_value": 0,
|
||||
"read_only": 0,
|
||||
"remember_last_selected_value": 0,
|
||||
"report_hide": 0,
|
||||
"reqd": 1,
|
||||
"search_index": 0,
|
||||
"set_only_once": 0,
|
||||
"translatable": 0,
|
||||
"unique": 1
|
||||
},
|
||||
{
|
||||
"allow_bulk_edit": 0,
|
||||
"allow_in_quick_entry": 0,
|
||||
"allow_on_submit": 0,
|
||||
"bold": 0,
|
||||
"fieldname": "bank_details_section",
|
||||
"fieldtype": "Section Break",
|
||||
"label": "Bank Details"
|
||||
},
|
||||
{
|
||||
"allow_in_quick_entry": 1,
|
||||
"fieldname": "swift_number",
|
||||
"fieldtype": "Data",
|
||||
"in_list_view": 1,
|
||||
"in_standard_filter": 1,
|
||||
"label": "SWIFT number",
|
||||
"unique": 1
|
||||
},
|
||||
{
|
||||
"fieldname": "column_break_1",
|
||||
"fieldtype": "Column Break",
|
||||
"search_index": 1
|
||||
},
|
||||
{
|
||||
"allow_in_quick_entry": 1,
|
||||
"fieldname": "branch_code",
|
||||
"fieldtype": "Data",
|
||||
"in_list_view": 1,
|
||||
"in_standard_filter": 1,
|
||||
"label": "Branch Code",
|
||||
"unique": 1
|
||||
},
|
||||
{
|
||||
"fieldname": "address_and_contact",
|
||||
"fieldtype": "Section Break",
|
||||
"label": "Address and Contact",
|
||||
"options": "fa fa-map-marker"
|
||||
},
|
||||
{
|
||||
"fieldname": "address_html",
|
||||
"fieldtype": "HTML",
|
||||
"label": "Address HTML"
|
||||
},
|
||||
{
|
||||
"fieldname": "website",
|
||||
"fieldtype": "Data",
|
||||
"label": "Website"
|
||||
},
|
||||
{
|
||||
"fieldname": "column_break_13",
|
||||
"fieldtype": "Column Break"
|
||||
},
|
||||
{
|
||||
"fieldname": "contact_html",
|
||||
"fieldtype": "HTML",
|
||||
"label": "Contact HTML"
|
||||
},
|
||||
{
|
||||
"collapsible": 1,
|
||||
"columns": 0,
|
||||
"fieldname": "data_import_configuration_section",
|
||||
"fieldtype": "Section Break",
|
||||
"hidden": 0,
|
||||
"ignore_user_permissions": 0,
|
||||
"ignore_xss_filter": 0,
|
||||
"in_filter": 0,
|
||||
"in_global_search": 0,
|
||||
"in_list_view": 0,
|
||||
"in_standard_filter": 0,
|
||||
"label": "Data Import Configuration",
|
||||
"length": 0,
|
||||
"no_copy": 0,
|
||||
"permlevel": 0,
|
||||
"precision": "",
|
||||
"print_hide": 0,
|
||||
"print_hide_if_no_value": 0,
|
||||
"read_only": 0,
|
||||
"remember_last_selected_value": 0,
|
||||
"report_hide": 0,
|
||||
"reqd": 0,
|
||||
"search_index": 0,
|
||||
"set_only_once": 0,
|
||||
"translatable": 0,
|
||||
"unique": 0
|
||||
"label": "Data Import Configuration"
|
||||
},
|
||||
{
|
||||
"allow_bulk_edit": 0,
|
||||
"allow_in_quick_entry": 0,
|
||||
"allow_on_submit": 0,
|
||||
"bold": 0,
|
||||
"collapsible": 0,
|
||||
"columns": 0,
|
||||
"fieldname": "bank_transaction_mapping",
|
||||
"fieldtype": "Table",
|
||||
"hidden": 0,
|
||||
"ignore_user_permissions": 0,
|
||||
"ignore_xss_filter": 0,
|
||||
"in_filter": 0,
|
||||
"in_global_search": 0,
|
||||
"in_list_view": 0,
|
||||
"in_standard_filter": 0,
|
||||
"label": "Bank Transaction Mapping",
|
||||
"length": 0,
|
||||
"no_copy": 0,
|
||||
"options": "Bank Transaction Mapping",
|
||||
"permlevel": 0,
|
||||
"precision": "",
|
||||
"print_hide": 0,
|
||||
"print_hide_if_no_value": 0,
|
||||
"read_only": 0,
|
||||
"remember_last_selected_value": 0,
|
||||
"report_hide": 0,
|
||||
"reqd": 0,
|
||||
"search_index": 0,
|
||||
"set_only_once": 0,
|
||||
"translatable": 0,
|
||||
"unique": 0
|
||||
"options": "Bank Transaction Mapping"
|
||||
},
|
||||
{
|
||||
"allow_bulk_edit": 0,
|
||||
"allow_in_quick_entry": 0,
|
||||
"allow_on_submit": 0,
|
||||
"bold": 0,
|
||||
"collapsible": 0,
|
||||
"columns": 0,
|
||||
"fieldname": "section_break_4",
|
||||
"fieldtype": "Section Break",
|
||||
"hidden": 0,
|
||||
"ignore_user_permissions": 0,
|
||||
"ignore_xss_filter": 0,
|
||||
"in_filter": 0,
|
||||
"in_global_search": 0,
|
||||
"in_list_view": 0,
|
||||
"in_standard_filter": 0,
|
||||
"length": 0,
|
||||
"no_copy": 0,
|
||||
"permlevel": 0,
|
||||
"precision": "",
|
||||
"print_hide": 0,
|
||||
"print_hide_if_no_value": 0,
|
||||
"read_only": 0,
|
||||
"remember_last_selected_value": 0,
|
||||
"report_hide": 0,
|
||||
"reqd": 0,
|
||||
"search_index": 0,
|
||||
"set_only_once": 0,
|
||||
"translatable": 0,
|
||||
"unique": 0
|
||||
"fieldtype": "Section Break"
|
||||
},
|
||||
{
|
||||
"allow_bulk_edit": 0,
|
||||
"allow_in_quick_entry": 0,
|
||||
"allow_on_submit": 0,
|
||||
"bold": 0,
|
||||
"collapsible": 0,
|
||||
"columns": 0,
|
||||
"fieldname": "plaid_access_token",
|
||||
"fieldtype": "Data",
|
||||
"hidden": 1,
|
||||
"ignore_user_permissions": 0,
|
||||
"ignore_xss_filter": 0,
|
||||
"in_filter": 0,
|
||||
"in_global_search": 0,
|
||||
"in_list_view": 0,
|
||||
"in_standard_filter": 0,
|
||||
"label": "Plaid Access Token",
|
||||
"length": 0,
|
||||
"no_copy": 1,
|
||||
"permlevel": 0,
|
||||
"precision": "",
|
||||
"print_hide": 0,
|
||||
"print_hide_if_no_value": 0,
|
||||
"read_only": 1,
|
||||
"remember_last_selected_value": 0,
|
||||
"report_hide": 0,
|
||||
"reqd": 0,
|
||||
"search_index": 0,
|
||||
"set_only_once": 0,
|
||||
"translatable": 0,
|
||||
"unique": 0
|
||||
"read_only": 1
|
||||
}
|
||||
],
|
||||
"has_web_view": 0,
|
||||
"hide_heading": 0,
|
||||
"hide_toolbar": 0,
|
||||
"idx": 0,
|
||||
"image_view": 0,
|
||||
"in_create": 0,
|
||||
"is_submittable": 0,
|
||||
"issingle": 0,
|
||||
"istable": 0,
|
||||
"max_attachments": 0,
|
||||
"modified": "2018-11-27 16:12:13.938776",
|
||||
"links": [],
|
||||
"modified": "2020-03-25 21:22:33.496264",
|
||||
"modified_by": "Administrator",
|
||||
"module": "Accounts",
|
||||
"name": "Bank",
|
||||
"name_case": "",
|
||||
"owner": "Administrator",
|
||||
"permissions": [
|
||||
{
|
||||
"amend": 0,
|
||||
"cancel": 0,
|
||||
"create": 1,
|
||||
"delete": 1,
|
||||
"email": 1,
|
||||
"export": 1,
|
||||
"if_owner": 0,
|
||||
"import": 0,
|
||||
"permlevel": 0,
|
||||
"print": 1,
|
||||
"read": 1,
|
||||
"report": 1,
|
||||
"role": "System Manager",
|
||||
"set_user_permissions": 0,
|
||||
"share": 1,
|
||||
"submit": 0,
|
||||
"write": 1
|
||||
}
|
||||
],
|
||||
"quick_entry": 1,
|
||||
"read_only": 0,
|
||||
"read_only_onload": 0,
|
||||
"show_name_in_global_search": 0,
|
||||
"sort_field": "modified",
|
||||
"sort_order": "DESC",
|
||||
"track_changes": 1,
|
||||
"track_seen": 0,
|
||||
"track_views": 0
|
||||
"track_changes": 1
|
||||
}
|
||||
@ -5,6 +5,12 @@
|
||||
from __future__ import unicode_literals
|
||||
import frappe
|
||||
from frappe.model.document import Document
|
||||
from frappe.contacts.address_and_contact import load_address_and_contact, delete_contact_and_address
|
||||
|
||||
class Bank(Document):
|
||||
pass
|
||||
def onload(self):
|
||||
"""Load address and contacts in `__onload`"""
|
||||
load_address_and_contact(self)
|
||||
|
||||
def on_trash(self):
|
||||
delete_contact_and_address('Bank', self.name)
|
||||
@ -24,8 +24,6 @@
|
||||
"iban",
|
||||
"column_break_12",
|
||||
"bank_account_no",
|
||||
"branch_code",
|
||||
"swift_number",
|
||||
"address_and_contact",
|
||||
"address_html",
|
||||
"website",
|
||||
@ -145,17 +143,6 @@
|
||||
"label": "Bank Account No",
|
||||
"length": 30
|
||||
},
|
||||
{
|
||||
"fieldname": "branch_code",
|
||||
"fieldtype": "Data",
|
||||
"in_list_view": 1,
|
||||
"label": "Branch Code"
|
||||
},
|
||||
{
|
||||
"fieldname": "swift_number",
|
||||
"fieldtype": "Data",
|
||||
"label": "SWIFT number"
|
||||
},
|
||||
{
|
||||
"fieldname": "address_and_contact",
|
||||
"fieldtype": "Section Break",
|
||||
@ -213,7 +200,7 @@
|
||||
}
|
||||
],
|
||||
"links": [],
|
||||
"modified": "2020-01-29 20:42:26.458316",
|
||||
"modified": "2020-01-30 20:42:26.458316",
|
||||
"modified_by": "Administrator",
|
||||
"module": "Accounts",
|
||||
"name": "Bank Account",
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
cur_frm.add_fetch('bank_account','account','account');
|
||||
cur_frm.add_fetch('bank_account','bank_account_no','bank_account_no');
|
||||
cur_frm.add_fetch('bank_account','iban','iban');
|
||||
cur_frm.add_fetch('bank_account','branch_code','branch_code');
|
||||
cur_frm.add_fetch('bank_account','swift_number','swift_number');
|
||||
cur_frm.add_fetch('bank','branch_code','branch_code');
|
||||
cur_frm.add_fetch('bank','swift_number','swift_number');
|
||||
|
||||
frappe.ui.form.on('Bank Guarantee', {
|
||||
setup: function(frm) {
|
||||
|
||||
@ -33,7 +33,9 @@ frappe.ui.form.on('Payment Entry', {
|
||||
frm.set_query("party_bank_account", function() {
|
||||
return {
|
||||
filters: {
|
||||
"is_company_account":0
|
||||
"is_company_account":0,
|
||||
party_type: frm.doc.party_type,
|
||||
party: frm.doc.party
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
@ -839,7 +839,7 @@
|
||||
"bold": 0,
|
||||
"collapsible": 0,
|
||||
"columns": 0,
|
||||
"fetch_from": "bank_account.branch_code",
|
||||
"fetch_from": "bank.branch_code",
|
||||
"fieldname": "branch_code",
|
||||
"fieldtype": "Read Only",
|
||||
"hidden": 0,
|
||||
@ -873,7 +873,7 @@
|
||||
"bold": 0,
|
||||
"collapsible": 0,
|
||||
"columns": 0,
|
||||
"fetch_from": "bank_account.swift_number",
|
||||
"fetch_from": "bank.swift_number",
|
||||
"fieldname": "swift_number",
|
||||
"fieldtype": "Read Only",
|
||||
"hidden": 0,
|
||||
|
||||
@ -131,7 +131,7 @@ def get_gl_entries(filters):
|
||||
gl_entries = frappe.db.sql(
|
||||
"""
|
||||
select
|
||||
posting_date, account, party_type, party,
|
||||
name as gl_entry, posting_date, account, party_type, party,
|
||||
voucher_type, voucher_no, cost_center, project,
|
||||
against_voucher_type, against_voucher, account_currency,
|
||||
remarks, against, is_opening {select_fields}
|
||||
@ -362,6 +362,12 @@ def get_columns(filters):
|
||||
currency = get_company_currency(company)
|
||||
|
||||
columns = [
|
||||
{
|
||||
"fieldname": "gl_entry",
|
||||
"fieldtype": "Link",
|
||||
"options": "GL Entry",
|
||||
"hidden": 1
|
||||
},
|
||||
{
|
||||
"label": _("Posting Date"),
|
||||
"fieldname": "posting_date",
|
||||
|
||||
@ -6,18 +6,13 @@ from __future__ import unicode_literals
|
||||
|
||||
import frappe
|
||||
from frappe.utils.make_random import get_random
|
||||
from erpnext.assets.doctype.asset.asset import make_purchase_invoice, make_sales_invoice
|
||||
from erpnext.assets.doctype.asset.asset import make_sales_invoice
|
||||
from erpnext.assets.doctype.asset.depreciation import post_depreciation_entries, scrap_asset
|
||||
|
||||
|
||||
def work():
|
||||
frappe.set_user(frappe.db.get_global('demo_accounts_user'))
|
||||
|
||||
asset_list = make_asset_purchase_entry()
|
||||
|
||||
if not asset_list:
|
||||
# fixed_asset.work() already run
|
||||
return
|
||||
|
||||
# Enable booking asset depreciation entry automatically
|
||||
frappe.db.set_value("Accounts Settings", None, "book_asset_depreciation_entry_automatically", 1)
|
||||
|
||||
@ -33,19 +28,6 @@ def work():
|
||||
# Sell a random asset
|
||||
sell_an_asset()
|
||||
|
||||
def make_asset_purchase_entry():
|
||||
asset_list = frappe.get_all("Asset", filters={"purchase_invoice": ["in", ("", None)]},
|
||||
fields=["name", "item_code", "gross_purchase_amount", "company", "purchase_date"])
|
||||
|
||||
# make purchase invoice
|
||||
for asset in asset_list:
|
||||
pi = make_purchase_invoice(asset.name, asset.item_code, asset.gross_purchase_amount,
|
||||
asset.company, asset.purchase_date)
|
||||
pi.supplier = get_random("Supplier")
|
||||
pi.save()
|
||||
pi.submit()
|
||||
|
||||
return asset_list
|
||||
|
||||
def sell_an_asset():
|
||||
asset = get_random_asset()
|
||||
@ -56,6 +38,7 @@ def sell_an_asset():
|
||||
si.save()
|
||||
si.submit()
|
||||
|
||||
|
||||
def get_random_asset():
|
||||
return frappe.db.sql(""" select name, item_code, value_after_depreciation, gross_purchase_amount
|
||||
from `tabAsset`
|
||||
|
||||
@ -273,11 +273,11 @@ class TestLoan(unittest.TestCase):
|
||||
|
||||
penalty_amount = (accrued_interest_amount * 4 * 25) / (100 * days_in_year(get_datetime(first_date).year))
|
||||
|
||||
lia = frappe.get_all("Loan Interest Accrual", fields=["is_paid"],
|
||||
filters={"loan": loan.name}, order_by="posting_date")
|
||||
lia1 = frappe.get_value("Loan Interest Accrual", {"loan": loan.name, "is_paid": 1}, 'name')
|
||||
lia2 = frappe.get_value("Loan Interest Accrual", {"loan": loan.name, "is_paid": 0}, 'name')
|
||||
|
||||
self.assertTrue(lia[0].get('is_paid'))
|
||||
self.assertFalse(lia[1].get('is_paid'))
|
||||
self.assertTrue(lia1)
|
||||
self.assertTrue(lia2)
|
||||
|
||||
def test_security_shortfall(self):
|
||||
pledges = []
|
||||
|
||||
@ -658,4 +658,5 @@ erpnext.patches.v12_0.set_permission_einvoicing
|
||||
erpnext.patches.v12_0.set_published_in_hub_tracked_item
|
||||
erpnext.patches.v12_0.set_job_offer_applicant_email
|
||||
erpnext.patches.v12_0.create_irs_1099_field_united_states
|
||||
erpnext.patches.v12_0.move_bank_account_swift_number_to_bank
|
||||
erpnext.patches.v12_0.rename_bank_reconciliation_fields # 2020-01-22
|
||||
|
||||
@ -0,0 +1,14 @@
|
||||
from __future__ import unicode_literals
|
||||
import frappe
|
||||
|
||||
def execute():
|
||||
frappe.reload_doc('accounts', 'doctype', 'bank', force=1)
|
||||
|
||||
frappe.db.sql("""
|
||||
UPDATE `tabBank` b, `tabBank Account` ba
|
||||
SET b.swift_number = ba.swift_number, b.branch_code = ba.branch_code
|
||||
WHERE b.name = ba.bank
|
||||
""")
|
||||
|
||||
frappe.reload_doc('accounts', 'doctype', 'bank_account')
|
||||
frappe.reload_doc('accounts', 'doctype', 'payment_request')
|
||||
@ -4,7 +4,7 @@
|
||||
erpnext.TransactionController = erpnext.taxes_and_totals.extend({
|
||||
setup: function() {
|
||||
this._super();
|
||||
frappe.flags.hide_serial_batch_dialog = false;
|
||||
frappe.flags.hide_serial_batch_dialog = true;
|
||||
frappe.ui.form.on(this.frm.doctype + " Item", "rate", function(frm, cdt, cdn) {
|
||||
var item = frappe.get_doc(cdt, cdn);
|
||||
var has_margin_field = frappe.meta.has_field(cdt, 'margin_type');
|
||||
@ -165,6 +165,16 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
|
||||
return (doc.rule_applied) ? "green" : "red";
|
||||
});
|
||||
}
|
||||
|
||||
let batch_no_field = this.frm.get_docfield("items", "batch_no");
|
||||
if (batch_no_field) {
|
||||
batch_no_field.get_route_options_for_new_doc = function(row) {
|
||||
return {
|
||||
"item": row.doc.item_code
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
},
|
||||
onload: function() {
|
||||
var me = this;
|
||||
@ -519,6 +529,15 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
|
||||
}
|
||||
},
|
||||
() => me.toggle_conversion_factor(item),
|
||||
() => {
|
||||
if (show_batch_dialog)
|
||||
return frappe.db.get_value("Item", item.item_code, ["has_batch_no", "has_serial_no"])
|
||||
.then((r) => {
|
||||
if(r.message.has_batch_no || r.message.has_serial_no) {
|
||||
frappe.flags.hide_serial_batch_dialog = false;
|
||||
}
|
||||
});
|
||||
},
|
||||
() => {
|
||||
if(show_batch_dialog && !frappe.flags.hide_serial_batch_dialog) {
|
||||
var d = locals[cdt][cdn];
|
||||
@ -528,7 +547,9 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
|
||||
|
||||
erpnext.show_serial_batch_selector(me.frm, d, (item) => {
|
||||
me.frm.script_manager.trigger('qty', item.doctype, item.name);
|
||||
});
|
||||
if (!me.frm.doc.set_warehouse)
|
||||
me.frm.script_manager.trigger('warehouse', item.doctype, item.name);
|
||||
}, undefined, !frappe.flags.hide_serial_batch_dialog);
|
||||
}
|
||||
},
|
||||
() => me.conversion_factor(doc, cdt, cdn, true),
|
||||
|
||||
@ -1,23 +1,25 @@
|
||||
frappe.provide('frappe.ui.form');
|
||||
|
||||
erpnext.doctypes_with_dimensions = ["GL Entry", "Sales Invoice", "Purchase Invoice", "Payment Entry", "Asset",
|
||||
let default_dimensions = {};
|
||||
|
||||
let doctypes_with_dimensions = ["GL Entry", "Sales Invoice", "Purchase Invoice", "Payment Entry", "Asset",
|
||||
"Expense Claim", "Stock Entry", "Budget", "Payroll Entry", "Delivery Note", "Shipping Rule", "Loyalty Program",
|
||||
"Fee Schedule", "Fee Structure", "Stock Reconciliation", "Travel Request", "Fees", "POS Profile", "Opening Invoice Creation Tool",
|
||||
"Subscription", "Purchase Order", "Journal Entry", "Material Request", "Purchase Receipt", "Landed Cost Item", "Asset"];
|
||||
|
||||
erpnext.child_docs = ["Sales Invoice Item", "Purchase Invoice Item", "Purchase Order Item", "Journal Entry Account",
|
||||
let child_docs = ["Sales Invoice Item", "Purchase Invoice Item", "Purchase Order Item", "Journal Entry Account",
|
||||
"Material Request Item", "Delivery Note Item", "Purchase Receipt Item", "Stock Entry Detail", "Payment Entry Deduction",
|
||||
"Landed Cost Item", "Asset Value Adjustment", "Opening Invoice Creation Tool Item", "Subscription Plan"];
|
||||
|
||||
frappe.call({
|
||||
method: "erpnext.accounts.doctype.accounting_dimension.accounting_dimension.get_dimension_filters",
|
||||
callback: function(r){
|
||||
callback: function(r) {
|
||||
erpnext.dimension_filters = r.message[0];
|
||||
erpnext.default_dimensions = r.message[1];
|
||||
default_dimensions = r.message[1];
|
||||
}
|
||||
});
|
||||
|
||||
erpnext.doctypes_with_dimensions.forEach((doctype) => {
|
||||
doctypes_with_dimensions.forEach((doctype) => {
|
||||
frappe.ui.form.on(doctype, {
|
||||
onload: function(frm) {
|
||||
erpnext.dimension_filters.forEach((dimension) => {
|
||||
@ -27,41 +29,40 @@ erpnext.doctypes_with_dimensions.forEach((doctype) => {
|
||||
"is_group": 0
|
||||
});
|
||||
}
|
||||
|
||||
if (Object.keys(erpnext.default_dimensions).length > 0) {
|
||||
if (frappe.meta.has_field(doctype, dimension['fieldname'])) {
|
||||
if (frm.is_new() && frappe.meta.has_field(doctype, 'company') && frm.doc.company) {
|
||||
frm.set_value(dimension['fieldname'], erpnext.default_dimensions[frm.doc.company][dimension['document_type']]);
|
||||
}
|
||||
}
|
||||
|
||||
if (frm.doc.items && frm.doc.items.length && frm.doc.docstatus === 0
|
||||
&& (!frm.doc.items[0][dimension['fieldname']])) {
|
||||
frm.doc.items[0][dimension['fieldname']] = erpnext.default_dimensions[frm.doc.company][dimension['document_type']];
|
||||
}
|
||||
|
||||
if (frm.doc.accounts && frm.doc.accounts.length && frm.doc.docstatus === 0
|
||||
&& (!frm.doc.items[0][dimension['fieldname']])) {
|
||||
frm.doc.accounts[0][dimension['fieldname']] = erpnext.default_dimensions[frm.doc.company][dimension['document_type']];
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
},
|
||||
|
||||
company: function(frm) {
|
||||
if(frm.doc.company && (Object.keys(erpnext.default_dimensions).length > 0)) {
|
||||
if(frm.doc.company && (Object.keys(default_dimensions || {}).length > 0)
|
||||
&& default_dimensions[frm.doc.company]) {
|
||||
frm.trigger('update_dimension');
|
||||
}
|
||||
},
|
||||
|
||||
update_dimension: function(frm) {
|
||||
erpnext.dimension_filters.forEach((dimension) => {
|
||||
if (frm.is_new()) {
|
||||
if (frm.doc.company && Object.keys(default_dimensions || {}).length > 0
|
||||
&& default_dimensions[frm.doc.company]) {
|
||||
|
||||
if (frappe.meta.has_field(doctype, dimension['fieldname'])) {
|
||||
frm.set_value(dimension['fieldname'], erpnext.default_dimensions[frm.doc.company][dimension['document_type']]);
|
||||
frm.set_value(dimension['fieldname'],
|
||||
default_dimensions[frm.doc.company][dimension['document_type']]);
|
||||
}
|
||||
|
||||
$.each(frm.doc.items || frm.doc.accounts || [], function(i, row) {
|
||||
frappe.model.set_value(row.doctype, row.name, dimension['fieldname'],
|
||||
default_dimensions[frm.doc.company][dimension['document_type']])
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
},
|
||||
});
|
||||
});
|
||||
|
||||
erpnext.child_docs.forEach((doctype) => {
|
||||
child_docs.forEach((doctype) => {
|
||||
frappe.ui.form.on(doctype, {
|
||||
items_add: function(frm, cdt, cdn) {
|
||||
erpnext.dimension_filters.forEach((dimension) => {
|
||||
@ -77,14 +78,6 @@ erpnext.child_docs.forEach((doctype) => {
|
||||
});
|
||||
},
|
||||
|
||||
company: function(frm) {
|
||||
if(frm.doc.company) {
|
||||
erpnext.dimension_filters.forEach((dimension) => {
|
||||
frm.set_value(dimension['fieldname'], erpnext.default_dimensions[frm.doc.company][dimension['document_type']]);
|
||||
});
|
||||
}
|
||||
},
|
||||
|
||||
items_add: function(frm, cdt, cdn) {
|
||||
erpnext.dimension_filters.forEach((dimension) => {
|
||||
var row = frappe.get_doc(cdt, cdn);
|
||||
|
||||
@ -5,14 +5,13 @@ erpnext.SerialNoBatchSelector = Class.extend({
|
||||
this.show_dialog = show_dialog;
|
||||
// frm, item, warehouse_details, has_batch, oldest
|
||||
let d = this.item;
|
||||
if (d && d.has_batch_no && (!d.batch_no || this.show_dialog)) {
|
||||
this.has_batch = 1;
|
||||
this.setup();
|
||||
this.has_batch = 0; this.has_serial_no = 0;
|
||||
|
||||
if (d && d.has_batch_no && (!d.batch_no || this.show_dialog)) this.has_batch = 1;
|
||||
// !(this.show_dialog == false) ensures that show_dialog is implictly true, even when undefined
|
||||
} else if(d && d.has_serial_no && !(this.show_dialog == false)) {
|
||||
this.has_batch = 0;
|
||||
if(d && d.has_serial_no && !(this.show_dialog == false)) this.has_serial_no = 1;
|
||||
|
||||
this.setup();
|
||||
}
|
||||
},
|
||||
|
||||
setup: function() {
|
||||
@ -36,16 +35,16 @@ erpnext.SerialNoBatchSelector = Class.extend({
|
||||
label: __('Item Code'),
|
||||
default: me.item_code
|
||||
},
|
||||
{fieldtype:'Column Break'},
|
||||
{
|
||||
fieldname: 'warehouse',
|
||||
fieldtype:'Link',
|
||||
options: 'Warehouse',
|
||||
reqd: me.has_batch && !me.has_serial_no ? 0 : 1,
|
||||
label: __(me.warehouse_details.type),
|
||||
default: me.warehouse_details.name,
|
||||
default: typeof me.warehouse_details.name == "string" ? me.warehouse_details.name : '',
|
||||
onchange: function(e) {
|
||||
|
||||
if(me.has_batch) {
|
||||
if(me.has_batch && !me.has_serial_no) {
|
||||
fields = fields.concat(me.get_batch_fields());
|
||||
} else {
|
||||
fields = fields.concat(me.get_serial_no_fields());
|
||||
@ -74,15 +73,16 @@ erpnext.SerialNoBatchSelector = Class.extend({
|
||||
{
|
||||
fieldname: 'qty',
|
||||
fieldtype:'Float',
|
||||
read_only: me.has_batch,
|
||||
label: __(me.has_batch ? 'Total Qty' : 'Qty'),
|
||||
read_only: me.has_batch && !me.has_serial_no,
|
||||
label: __(me.has_batch && !me.has_serial_no ? 'Total Qty' : 'Qty'),
|
||||
default: 0
|
||||
},
|
||||
{
|
||||
fieldname: 'auto_fetch_button',
|
||||
fieldtype:'Button',
|
||||
hidden: me.has_batch,
|
||||
label: __('Fetch based on FIFO'),
|
||||
hidden: me.has_batch && !me.has_serial_no,
|
||||
label: __('Auto Fetch'),
|
||||
description: __('Fetch Serial Numbers based on FIFO'),
|
||||
click: () => {
|
||||
let qty = this.dialog.fields_dict.qty.get_value();
|
||||
let numbers = frappe.call({
|
||||
@ -90,7 +90,7 @@ erpnext.SerialNoBatchSelector = Class.extend({
|
||||
args: {
|
||||
qty: qty,
|
||||
item_code: me.item_code,
|
||||
warehouse: me.warehouse_details.name,
|
||||
warehouse: typeof me.warehouse_details.name == "string" ? me.warehouse_details.name : '',
|
||||
batch_no: me.item.batch_no || null
|
||||
}
|
||||
});
|
||||
@ -109,10 +109,12 @@ erpnext.SerialNoBatchSelector = Class.extend({
|
||||
}
|
||||
];
|
||||
|
||||
if (this.has_batch) {
|
||||
if (this.has_batch && !this.has_serial_no) {
|
||||
title = __("Select Batch Numbers");
|
||||
fields = fields.concat(this.get_batch_fields());
|
||||
} else {
|
||||
// if only serial no OR
|
||||
// if both batch_no & serial_no then only select serial_no and auto set batches nos
|
||||
title = __("Select Serial Numbers");
|
||||
fields = fields.concat(this.get_serial_no_fields());
|
||||
}
|
||||
@ -122,25 +124,31 @@ erpnext.SerialNoBatchSelector = Class.extend({
|
||||
fields: fields
|
||||
});
|
||||
|
||||
if (this.item.serial_no) {
|
||||
this.dialog.fields_dict.serial_no.set_value(this.item.serial_no);
|
||||
}
|
||||
|
||||
this.dialog.set_primary_action(__('Insert'), function() {
|
||||
me.values = me.dialog.get_values();
|
||||
if(me.validate()) {
|
||||
me.set_items();
|
||||
me.dialog.hide();
|
||||
frappe.run_serially([
|
||||
() => me.update_batch_items(),
|
||||
() => me.update_serial_no_item(),
|
||||
() => me.update_batch_serial_no_items(),
|
||||
() => {
|
||||
refresh_field("items");
|
||||
if (me.callback) {
|
||||
return me.callback(me.item);
|
||||
}
|
||||
},
|
||||
() => me.dialog.hide()
|
||||
])
|
||||
}
|
||||
});
|
||||
|
||||
if(this.show_dialog) {
|
||||
let d = this.item;
|
||||
if (d.has_serial_no && d.serial_no) {
|
||||
this.dialog.set_value('serial_no', d.serial_no);
|
||||
if (this.item.serial_no) {
|
||||
this.dialog.fields_dict.serial_no.set_value(this.item.serial_no);
|
||||
}
|
||||
|
||||
if (d.has_batch_no && d.batch_no) {
|
||||
if (this.has_batch && !this.has_serial_no && d.batch_no) {
|
||||
this.frm.doc.items.forEach(data => {
|
||||
if(data.item_code == d.item_code) {
|
||||
this.dialog.fields_dict.batches.df.data.push({
|
||||
@ -155,7 +163,7 @@ erpnext.SerialNoBatchSelector = Class.extend({
|
||||
}
|
||||
}
|
||||
|
||||
if (this.has_batch) {
|
||||
if (this.has_batch && !this.has_serial_no) {
|
||||
this.update_total_qty();
|
||||
}
|
||||
|
||||
@ -174,7 +182,7 @@ erpnext.SerialNoBatchSelector = Class.extend({
|
||||
frappe.throw(__("Please select a warehouse"));
|
||||
return false;
|
||||
}
|
||||
if(this.has_batch) {
|
||||
if(this.has_batch && !this.has_serial_no) {
|
||||
if(values.batches.length === 0 || !values.batches) {
|
||||
frappe.throw(__("Please select batches for batched item "
|
||||
+ values.item_code));
|
||||
@ -193,34 +201,23 @@ erpnext.SerialNoBatchSelector = Class.extend({
|
||||
} else {
|
||||
let serial_nos = values.serial_no || '';
|
||||
if (!serial_nos || !serial_nos.replace(/\s/g, '').length) {
|
||||
if (!this.show_dialog) {
|
||||
frappe.throw(__("Please enter serial numbers for serialized item "
|
||||
+ values.item_code));
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
},
|
||||
|
||||
set_items: function() {
|
||||
var me = this;
|
||||
if(this.has_batch) {
|
||||
update_batch_items() {
|
||||
// clones an items if muliple batches are selected.
|
||||
if(this.has_batch && !this.has_serial_no) {
|
||||
this.values.batches.map((batch, i) => {
|
||||
let batch_no = batch.batch_no;
|
||||
let row = '';
|
||||
|
||||
if (i !== 0 && !this.batch_exists(batch_no)) {
|
||||
row = this.frm.add_child("items", {
|
||||
'item_code': this.item.item_code,
|
||||
'item_name': this.item.item_name,
|
||||
'price_list_rate': this.item.price_list_rate,
|
||||
'rate': this.item.rate,
|
||||
'qty': batch.selected_qty,
|
||||
'batch_no': batch_no,
|
||||
'actual_qty': this.item.actual_qty,
|
||||
'discount_percentage': this.item.discount_percentage
|
||||
});
|
||||
row = this.frm.add_child("items", { ...this.item });
|
||||
} else {
|
||||
row = this.frm.doc.items.find(i => i.batch_no === batch_no);
|
||||
}
|
||||
@ -228,16 +225,59 @@ erpnext.SerialNoBatchSelector = Class.extend({
|
||||
if (!row) {
|
||||
row = this.item;
|
||||
}
|
||||
|
||||
// this ensures that qty & batch no is set
|
||||
this.map_row_values(row, batch, 'batch_no',
|
||||
'selected_qty', this.values.warehouse);
|
||||
});
|
||||
} else {
|
||||
}
|
||||
},
|
||||
|
||||
update_serial_no_item() {
|
||||
// just updates serial no for the item
|
||||
if(this.has_serial_no && !this.has_batch) {
|
||||
this.map_row_values(this.item, this.values, 'serial_no', 'qty');
|
||||
}
|
||||
},
|
||||
|
||||
refresh_field("items");
|
||||
this.callback && this.callback(this.item);
|
||||
update_batch_serial_no_items() {
|
||||
// if serial no selected is from different batches, adds new rows for each batch.
|
||||
if(this.has_batch && this.has_serial_no) {
|
||||
const selected_serial_nos = this.values.serial_no.split(/\n/g).filter(s => s);
|
||||
|
||||
return frappe.db.get_list("Serial No", {
|
||||
filters: { 'name': ["in", selected_serial_nos]},
|
||||
fields: ["batch_no", "name"]
|
||||
}).then((data) => {
|
||||
// data = [{batch_no: 'batch-1', name: "SR-001"},
|
||||
// {batch_no: 'batch-2', name: "SR-003"}, {batch_no: 'batch-2', name: "SR-004"}]
|
||||
const batch_serial_map = data.reduce((acc, d) => {
|
||||
if (!acc[d['batch_no']]) acc[d['batch_no']] = [];
|
||||
acc[d['batch_no']].push(d['name'])
|
||||
return acc
|
||||
}, {})
|
||||
// batch_serial_map = { "batch-1": ['SR-001'], "batch-2": ["SR-003", "SR-004"]}
|
||||
Object.keys(batch_serial_map).map((batch_no, i) => {
|
||||
let row = '';
|
||||
const serial_no = batch_serial_map[batch_no];
|
||||
if (i == 0) {
|
||||
row = this.item;
|
||||
this.map_row_values(row, {qty: serial_no.length, batch_no: batch_no}, 'batch_no',
|
||||
'qty', this.values.warehouse);
|
||||
} else if (!this.batch_exists(batch_no)) {
|
||||
row = this.frm.add_child("items", { ...this.item });
|
||||
row.batch_no = batch_no;
|
||||
} else {
|
||||
row = this.frm.doc.items.find(i => i.batch_no === batch_no);
|
||||
}
|
||||
const values = {
|
||||
'qty': serial_no.length,
|
||||
'serial_no': serial_no.join('\n')
|
||||
}
|
||||
this.map_row_values(row, values, 'serial_no',
|
||||
'qty', this.values.warehouse);
|
||||
});
|
||||
})
|
||||
}
|
||||
},
|
||||
|
||||
batch_exists: function(batch) {
|
||||
@ -287,7 +327,7 @@ erpnext.SerialNoBatchSelector = Class.extend({
|
||||
return {
|
||||
filters: {
|
||||
item_code: me.item_code,
|
||||
warehouse: me.warehouse || me.warehouse_details.name
|
||||
warehouse: me.warehouse || typeof me.warehouse_details.name == "string" ? me.warehouse_details.name : ''
|
||||
},
|
||||
query: 'erpnext.controllers.queries.get_batch_no'
|
||||
};
|
||||
@ -313,11 +353,15 @@ erpnext.SerialNoBatchSelector = Class.extend({
|
||||
frappe.throw(__(`Batch ${val} already selected.`));
|
||||
return;
|
||||
}
|
||||
|
||||
let batch_number = me.item.batch_no ||
|
||||
this.grid_row.on_grid_fields_dict.batch_no.get_value();
|
||||
|
||||
if (me.warehouse_details.name) {
|
||||
frappe.call({
|
||||
method: 'erpnext.stock.doctype.batch.batch.get_batch_qty',
|
||||
args: {
|
||||
batch_no: me.item.batch_no,
|
||||
batch_no: batch_number,
|
||||
warehouse: me.warehouse_details.name,
|
||||
item_code: me.item_code
|
||||
},
|
||||
@ -444,7 +488,7 @@ erpnext.SerialNoBatchSelector = Class.extend({
|
||||
{
|
||||
fieldname: 'serial_no',
|
||||
fieldtype: 'Small Text',
|
||||
label: __(me.has_batch ? 'Selected Batch Numbers' : 'Selected Serial Numbers'),
|
||||
label: __(me.has_batch && !me.has_serial_no ? 'Selected Batch Numbers' : 'Selected Serial Numbers'),
|
||||
onchange: function() {
|
||||
me.serial_list = this.get_value()
|
||||
.replace(/\n/g, ' ').match(/\S+/g) || [];
|
||||
|
||||
@ -109,7 +109,7 @@ def get_transactions(filters, as_dict=1):
|
||||
WHERE gl.company = %(company)s
|
||||
AND DATE(gl.posting_date) >= %(from_date)s
|
||||
AND DATE(gl.posting_date) <= %(to_date)s
|
||||
ORDER BY 'Belegdatum', gl.voucher_no""", filters, as_dict=as_dict, as_utf8=1)
|
||||
ORDER BY 'Belegdatum', gl.voucher_no""", filters, as_dict=as_dict)
|
||||
|
||||
return gl_entries
|
||||
|
||||
@ -160,7 +160,7 @@ def get_customers(filters):
|
||||
and ccl.company = par.company
|
||||
|
||||
WHERE par.company = %(company)s
|
||||
AND par.parenttype = 'Customer'""", filters, as_dict=1, as_utf8=1)
|
||||
AND par.parenttype = 'Customer'""", filters, as_dict=1)
|
||||
|
||||
|
||||
def get_suppliers(filters):
|
||||
@ -217,7 +217,7 @@ def get_suppliers(filters):
|
||||
and con.is_primary_contact = '1'
|
||||
|
||||
WHERE par.company = %(company)s
|
||||
AND par.parenttype = 'Supplier'""", filters, as_dict=1, as_utf8=1)
|
||||
AND par.parenttype = 'Supplier'""", filters, as_dict=1)
|
||||
|
||||
|
||||
def get_account_names(filters):
|
||||
|
||||
@ -54,8 +54,8 @@ class Gstr1Report(object):
|
||||
return self.columns, self.data
|
||||
|
||||
def get_data(self):
|
||||
if self.filters.get("type_of_business") == "B2C Small":
|
||||
self.get_b2cs_data()
|
||||
if self.filters.get("type_of_business") in ("B2C Small", "B2C Large"):
|
||||
self.get_b2c_data()
|
||||
else:
|
||||
for inv, items_based_on_rate in self.items_based_on_tax_rate.items():
|
||||
invoice_details = self.invoices.get(inv)
|
||||
@ -69,7 +69,7 @@ class Gstr1Report(object):
|
||||
if taxable_value:
|
||||
self.data.append(row)
|
||||
|
||||
def get_b2cs_data(self):
|
||||
def get_b2c_data(self):
|
||||
b2cs_output = {}
|
||||
|
||||
for inv, items_based_on_rate in self.items_based_on_tax_rate.items():
|
||||
@ -84,7 +84,10 @@ class Gstr1Report(object):
|
||||
"rate": "",
|
||||
"taxable_value": 0,
|
||||
"cess_amount": 0,
|
||||
"type": ""
|
||||
"type": "",
|
||||
"invoice_number": invoice_details.get("invoice_number"),
|
||||
"posting_date": invoice_details.get("posting_date"),
|
||||
"invoice_value": invoice_details.get("base_grand_total"),
|
||||
})
|
||||
|
||||
row = b2cs_output.get((rate, place_of_supply, ecommerce_gstin))
|
||||
@ -164,7 +167,7 @@ class Gstr1Report(object):
|
||||
frappe.throw(_("Please set B2C Limit in GST Settings."))
|
||||
|
||||
if self.filters.get("type_of_business") == "B2C Large":
|
||||
conditions += """ and SUBSTR(place_of_supply, 1, 2) != SUBSTR(company_gstin, 1, 2)
|
||||
conditions += """ and ifnull(SUBSTR(place_of_supply, 1, 2),'') != ifnull(SUBSTR(company_gstin, 1, 2),'')
|
||||
and grand_total > {0} and is_return != 1 and gst_category ='Unregistered' """.format(flt(b2c_limit))
|
||||
|
||||
elif self.filters.get("type_of_business") == "B2C Small":
|
||||
@ -581,6 +584,11 @@ def get_b2b_json(res, gstin):
|
||||
if not gst_in: continue
|
||||
|
||||
for number, invoice in iteritems(res[gst_in]):
|
||||
if not invoice[0]["place_of_supply"]:
|
||||
frappe.throw(_("""{0} not entered in Invoice {1}.
|
||||
Please update and try again""").format(frappe.bold("Place Of Supply"),
|
||||
frappe.bold(invoice[0]['invoice_number'])))
|
||||
|
||||
inv_item = get_basic_invoice_detail(invoice[0])
|
||||
inv_item["pos"] = "%02d" % int(invoice[0]["place_of_supply"].split('-')[0])
|
||||
inv_item["rchrg"] = invoice[0]["reverse_charge"]
|
||||
@ -606,6 +614,9 @@ def get_b2cs_json(data, gstin):
|
||||
|
||||
out = []
|
||||
for d in data:
|
||||
if not d.get("place_of_supply"):
|
||||
frappe.throw(_("""{0} not entered in some invoices.
|
||||
Please update and try again""").format(frappe.bold("Place Of Supply")))
|
||||
|
||||
pos = d.get('place_of_supply').split('-')[0]
|
||||
tax_details = {}
|
||||
@ -642,6 +653,10 @@ def get_b2cs_json(data, gstin):
|
||||
def get_b2cl_json(res, gstin):
|
||||
out = []
|
||||
for pos in res:
|
||||
if not pos:
|
||||
frappe.throw(_("""{0} not entered in some invoices.
|
||||
Please update and try again""").format(frappe.bold("Place Of Supply")))
|
||||
|
||||
b2cl_item, inv = {"pos": "%02d" % int(pos.split('-')[0]), "inv": []}, []
|
||||
|
||||
for row in res[pos]:
|
||||
|
||||
@ -268,9 +268,11 @@ def make_quotation(source_name, target_doc=None):
|
||||
target_doc.run_method("set_other_charges")
|
||||
target_doc.run_method("calculate_taxes_and_totals")
|
||||
|
||||
price_list = frappe.get_value("Customer", source_name, 'default_price_list')
|
||||
price_list, currency = frappe.db.get_value("Customer", {'name': source_name}, ['default_price_list', 'default_currency'])
|
||||
if price_list:
|
||||
target_doc.selling_price_list = price_list
|
||||
if currency:
|
||||
target_doc.currency = currency
|
||||
|
||||
return target_doc
|
||||
|
||||
|
||||
@ -413,15 +413,20 @@ erpnext.selling.SellingController = erpnext.TransactionController.extend({
|
||||
*/
|
||||
set_batch_number: function(cdt, cdn) {
|
||||
const doc = frappe.get_doc(cdt, cdn);
|
||||
if (doc && doc.has_batch_no) {
|
||||
if (doc && doc.has_batch_no && doc.warehouse) {
|
||||
this._set_batch_number(doc);
|
||||
}
|
||||
},
|
||||
|
||||
_set_batch_number: function(doc) {
|
||||
let args = {'item_code': doc.item_code, 'warehouse': doc.warehouse, 'qty': flt(doc.qty) * flt(doc.conversion_factor)};
|
||||
if (doc.has_serial_no && doc.serial_no) {
|
||||
args['serial_no'] = doc.serial_no
|
||||
}
|
||||
|
||||
return frappe.call({
|
||||
method: 'erpnext.stock.doctype.batch.batch.get_batch_no',
|
||||
args: {'item_code': doc.item_code, 'warehouse': doc.warehouse, 'qty': flt(doc.qty) * flt(doc.conversion_factor)},
|
||||
args: args,
|
||||
callback: function(r) {
|
||||
if(r.message) {
|
||||
frappe.model.set_value(doc.doctype, doc.name, 'batch_no', r.message);
|
||||
|
||||
@ -157,6 +157,7 @@
|
||||
{
|
||||
"fieldname": "parent_company",
|
||||
"fieldtype": "Link",
|
||||
"ignore_user_permissions": 1,
|
||||
"in_list_view": 1,
|
||||
"label": "Parent Company",
|
||||
"options": "Company"
|
||||
@ -277,6 +278,7 @@
|
||||
"depends_on": "eval:doc.create_chart_of_accounts_based_on===\"Existing Company\"",
|
||||
"fieldname": "existing_company",
|
||||
"fieldtype": "Link",
|
||||
"ignore_user_permissions": 1,
|
||||
"label": "Existing Company ",
|
||||
"no_copy": 1,
|
||||
"options": "Company"
|
||||
@ -728,7 +730,7 @@
|
||||
"image_field": "company_logo",
|
||||
"is_tree": 1,
|
||||
"links": [],
|
||||
"modified": "2020-03-18 18:09:53.534211",
|
||||
"modified": "2020-03-21 18:09:53.534211",
|
||||
"modified_by": "Administrator",
|
||||
"module": "Setup",
|
||||
"name": "Company",
|
||||
|
||||
@ -122,8 +122,11 @@ class Batch(Document):
|
||||
self.expiry_date = add_days(self.manufacturing_date, shelf_life_in_days)
|
||||
|
||||
if has_expiry_date and not self.expiry_date:
|
||||
frappe.msgprint(_('Expiry date is mandatory for selected item.'))
|
||||
frappe.throw(_("Set item's shelf life in days, to set expiry based on manufacturing date plus shelf-life."))
|
||||
frappe.throw(msg=_("Please set {0} for Batched Item {1}, which is used to set {2} on Submit.") \
|
||||
.format(frappe.bold("Shelf Life in Days"),
|
||||
frappe.utils.get_link_to_form("Item", self.item),
|
||||
frappe.bold("Batch Expiry Date")),
|
||||
title=_("Expiry Date Mandatory"))
|
||||
|
||||
def get_name_from_naming_series(self):
|
||||
"""
|
||||
|
||||
@ -238,7 +238,7 @@ class DeliveryTrip(Document):
|
||||
try:
|
||||
directions = maps_client.directions(**directions_data)
|
||||
except Exception as e:
|
||||
frappe.throw(_(e))
|
||||
frappe.throw(_(str(e)))
|
||||
|
||||
return directions[0] if directions else False
|
||||
|
||||
|
||||
@ -343,7 +343,8 @@
|
||||
{
|
||||
"fieldname": "shelf_life_in_days",
|
||||
"fieldtype": "Int",
|
||||
"label": "Shelf Life In Days"
|
||||
"label": "Shelf Life In Days",
|
||||
"mandatory_depends_on": "eval:doc.has_batch_no && doc.has_expiry_date"
|
||||
},
|
||||
{
|
||||
"default": "2099-12-31",
|
||||
@ -1045,7 +1046,7 @@
|
||||
"image_field": "image",
|
||||
"links": [],
|
||||
"max_attachments": 1,
|
||||
"modified": "2020-01-02 19:13:59.295963",
|
||||
"modified": "2020-03-24 16:14:36.950677",
|
||||
"modified_by": "Administrator",
|
||||
"module": "Stock",
|
||||
"name": "Item",
|
||||
|
||||
@ -523,12 +523,15 @@ def get_delivery_note_serial_no(item_code, qty, delivery_note):
|
||||
return serial_nos
|
||||
|
||||
@frappe.whitelist()
|
||||
def auto_fetch_serial_number(qty, item_code, warehouse, batch_no=None):
|
||||
serial_numbers = frappe.get_list("Serial No", filters={
|
||||
def auto_fetch_serial_number(qty, item_code, warehouse, batch_nos=None):
|
||||
import json
|
||||
filters = {
|
||||
"item_code": item_code,
|
||||
"warehouse": warehouse,
|
||||
"batch_no": batch_no,
|
||||
"delivery_document_no": "",
|
||||
"sales_invoice": ""
|
||||
}, limit=qty, order_by="creation")
|
||||
}
|
||||
if batch_nos: filters["batch_no"] = ["in", json.loads(batch_nos)]
|
||||
|
||||
serial_numbers = frappe.get_list("Serial No", filters=filters, limit=qty, order_by="creation")
|
||||
return [item['name'] for item in serial_numbers]
|
||||
|
||||
@ -60,7 +60,8 @@ frappe.ui.form.on('Stock Entry', {
|
||||
}
|
||||
}
|
||||
|
||||
if(item.s_warehouse) filters["warehouse"] = item.s_warehouse;
|
||||
filters["warehouse"] = item.s_warehouse || item.t_warehouse;
|
||||
|
||||
return {
|
||||
query : "erpnext.controllers.queries.get_batch_no",
|
||||
filters: filters
|
||||
@ -964,7 +965,7 @@ erpnext.stock.select_batch_and_serial_no = (frm, item) => {
|
||||
}
|
||||
}
|
||||
|
||||
if(item && !item.has_serial_no && item.has_batch_no) return;
|
||||
if(item && !item.has_serial_no && !item.has_batch_no) return;
|
||||
if (frm.doc.purpose === 'Material Receipt') return;
|
||||
|
||||
frappe.require("assets/erpnext/js/utils/serial_no_batch_selector.js", function() {
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
{
|
||||
"actions": [],
|
||||
"autoname": "hash",
|
||||
"creation": "2013-03-29 18:22:12",
|
||||
"doctype": "DocType",
|
||||
@ -479,8 +480,7 @@
|
||||
"fieldname": "project",
|
||||
"fieldtype": "Link",
|
||||
"label": "Project",
|
||||
"options": "Project",
|
||||
"read_only": 1
|
||||
"options": "Project"
|
||||
},
|
||||
{
|
||||
"fieldname": "po_detail",
|
||||
@ -494,7 +494,8 @@
|
||||
],
|
||||
"idx": 1,
|
||||
"istable": 1,
|
||||
"modified": "2019-08-20 14:01:02.319754",
|
||||
"links": [],
|
||||
"modified": "2020-03-19 12:34:09.836295",
|
||||
"modified_by": "Administrator",
|
||||
"module": "Stock",
|
||||
"name": "Stock Entry Detail",
|
||||
|
||||
@ -7,6 +7,8 @@ import frappe
|
||||
|
||||
def create_test_contact_and_address():
|
||||
frappe.db.sql('delete from tabContact')
|
||||
frappe.db.sql('delete from `tabContact Email`')
|
||||
frappe.db.sql('delete from `tabContact Phone`')
|
||||
frappe.db.sql('delete from tabAddress')
|
||||
frappe.db.sql('delete from `tabDynamic Link`')
|
||||
|
||||
|
||||
@ -5,7 +5,7 @@ from __future__ import unicode_literals
|
||||
import frappe
|
||||
import frappe.share
|
||||
from frappe import _
|
||||
from frappe.utils import cstr, now_datetime, cint, flt, get_time
|
||||
from frappe.utils import cstr, now_datetime, cint, flt, get_time, get_link_to_form
|
||||
from erpnext.controllers.status_updater import StatusUpdater
|
||||
|
||||
from six import string_types
|
||||
@ -123,8 +123,11 @@ class TransactionBase(StatusUpdater):
|
||||
ref_rate = frappe.db.get_value(ref_dt + " Item", d.get(ref_link_field), "rate")
|
||||
|
||||
if abs(flt(d.rate - ref_rate, d.precision("rate"))) >= .01:
|
||||
frappe.throw(_("Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ")
|
||||
frappe.msgprint(_("Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ")
|
||||
.format(d.idx, ref_dt, d.get(ref_dn_field), d.rate, ref_rate))
|
||||
frappe.throw(_("To allow different rates, disable the {0} checkbox in {1}.")
|
||||
.format(frappe.bold("Maintain Same Rate Throughout Sales Cycle"),
|
||||
get_link_to_form("Selling Settings", "Selling Settings", frappe.bold("Selling Settings"))))
|
||||
|
||||
def get_link_filters(self, for_doctype):
|
||||
if hasattr(self, "prev_link_mapper") and self.prev_link_mapper.get(for_doctype):
|
||||
|
||||
Loading…
Reference in New Issue
Block a user