Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #13850 from netchampfaris/msgprint-to-alert

Browse Source 
Change msgprint to alert
This commit is contained in:
Prateeksha Singh 2018-05-01 18:52:49 +05:30 committed by GitHub
commit 99be9d17d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/doctype/journal_entry/journal_entry.py
View File

@ -82,7 +82,7 @@ class JournalEntry(AccountsController):
d.reference_type = '' d.reference_type = ''
d.reference_name = '' d.reference_name = ''
d.db_update() d.db_update()
def unlink_asset_reference(self): def unlink_asset_reference(self):
for d in self.get("accounts"): for d in self.get("accounts"):
if d.reference_type=="Asset" and d.reference_name: if d.reference_type=="Asset" and d.reference_name:
@ -125,7 +125,7 @@ class JournalEntry(AccountsController):
if (d.party_type == 'Customer' and flt(d.credit) > 0) or \ if (d.party_type == 'Customer' and flt(d.credit) > 0) or \
(d.party_type == 'Supplier' and flt(d.debit) > 0): (d.party_type == 'Supplier' and flt(d.debit) > 0):
if d.is_advance=="No": if d.is_advance=="No":
msgprint(_("Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.").format(d.idx, d.account)) msgprint(_("Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.").format(d.idx, d.account), alert=1)
elif d.reference_type in ("Sales Order", "Purchase Order") and d.is_advance != "Yes": elif d.reference_type in ("Sales Order", "Purchase Order") and d.is_advance != "Yes":
frappe.throw(_("Row {0}: Payment against Sales/Purchase Order should always be marked as advance").format(d.idx)) frappe.throw(_("Row {0}: Payment against Sales/Purchase Order should always be marked as advance").format(d.idx))

8
erpnext/manufacturing/doctype/production_order/production_order.py
View File

@ -64,7 +64,7 @@ class ProductionOrder(Document):
so.name, so_item.delivery_date, so.project so.name, so_item.delivery_date, so.project
from from
`tabSales Order` so, `tabSales Order Item` so_item, `tabPacked Item` packed_item `tabSales Order` so, `tabSales Order Item` so_item, `tabPacked Item` packed_item
where so.name=%s where so.name=%s
and so.name=so_item.parent and so.name=so_item.parent
and so.name=packed_item.parent and so.name=packed_item.parent
and so_item.item_code = packed_item.parent_item and so_item.item_code = packed_item.parent_item
@ -88,7 +88,7 @@ class ProductionOrder(Document):
self.wip_warehouse = frappe.db.get_single_value("Manufacturing Settings", "default_wip_warehouse") self.wip_warehouse = frappe.db.get_single_value("Manufacturing Settings", "default_wip_warehouse")
if not self.fg_warehouse: if not self.fg_warehouse:
self.fg_warehouse = frappe.db.get_single_value("Manufacturing Settings", "default_fg_warehouse") self.fg_warehouse = frappe.db.get_single_value("Manufacturing Settings", "default_fg_warehouse")
def validate_warehouse_belongs_to_company(self): def validate_warehouse_belongs_to_company(self):
warehouses = [self.fg_warehouse, self.wip_warehouse] warehouses = [self.fg_warehouse, self.wip_warehouse]
for d in self.get("required_items"): for d in self.get("required_items"):
@ -524,7 +524,7 @@ def get_item_details(item, project = None):
if not res["bom_no"]: if not res["bom_no"]:
if project: if project:
res = get_item_details(item) res = get_item_details(item)
frappe.msgprint(_("Default BOM not found for Item {0} and Project {1}").format(item, project)) frappe.msgprint(_("Default BOM not found for Item {0} and Project {1}").format(item, project), alert=1)
else: else:
frappe.throw(_("Default BOM for {0} not found").format(item)) frappe.throw(_("Default BOM for {0} not found").format(item))
@ -642,5 +642,5 @@ def query_sales_order(production_item):
select distinct so.name from `tabSales Order` so, `tabPacked Item` pi_item select distinct so.name from `tabSales Order` so, `tabPacked Item` pi_item
where pi_item.parent=so.name and pi_item.item_code=%s and so.docstatus=1 where pi_item.parent=so.name and pi_item.item_code=%s and so.docstatus=1
""", (production_item, production_item)) """, (production_item, production_item))
return out return out