Merge branch 'develop' into fix-diff-value
This commit is contained in:
commit
887ae1c434
@ -247,7 +247,7 @@ class PaymentEntry(AccountsController):
|
||||
self.set_target_exchange_rate(ref_doc)
|
||||
|
||||
def set_source_exchange_rate(self, ref_doc=None):
|
||||
if self.paid_from and not self.source_exchange_rate:
|
||||
if self.paid_from:
|
||||
if self.paid_from_account_currency == self.company_currency:
|
||||
self.source_exchange_rate = 1
|
||||
else:
|
||||
|
@ -743,9 +743,9 @@ class TestPurchaseOrder(FrappeTestCase):
|
||||
pe = get_payment_entry("Purchase Order", po_doc.name)
|
||||
pe.mode_of_payment = "Cash"
|
||||
pe.paid_from = "Cash - _TC"
|
||||
pe.source_exchange_rate = 80
|
||||
pe.target_exchange_rate = 1
|
||||
pe.paid_amount = po_doc.grand_total
|
||||
pe.source_exchange_rate = 1
|
||||
pe.target_exchange_rate = 80
|
||||
pe.paid_amount = po_doc.base_grand_total
|
||||
pe.save(ignore_permissions=True)
|
||||
pe.submit()
|
||||
|
||||
|
@ -216,6 +216,7 @@ class RequestforQuotation(BuyingController):
|
||||
recipients=data.email_id,
|
||||
sender=sender,
|
||||
attachments=attachments,
|
||||
print_format=self.meta.default_print_format or "Standard",
|
||||
send_email=True,
|
||||
doctype=self.doctype,
|
||||
name=self.name,
|
||||
@ -224,9 +225,7 @@ class RequestforQuotation(BuyingController):
|
||||
frappe.msgprint(_("Email Sent to Supplier {0}").format(data.supplier))
|
||||
|
||||
def get_attachments(self):
|
||||
attachments = [d.name for d in get_attachments(self.doctype, self.name)]
|
||||
attachments.append(frappe.attach_print(self.doctype, self.name, doc=self))
|
||||
return attachments
|
||||
return [d.name for d in get_attachments(self.doctype, self.name)]
|
||||
|
||||
def update_rfq_supplier_status(self, sup_name=None):
|
||||
for supplier in self.suppliers:
|
||||
|
@ -1691,7 +1691,7 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
|
||||
var valid = true;
|
||||
|
||||
$.each(["company", "customer"], function(i, fieldname) {
|
||||
if(frappe.meta.has_field(me.frm.doc.doctype, fieldname) && me.frm.doc.doctype != "Purchase Order") {
|
||||
if(frappe.meta.has_field(me.frm.doc.doctype, fieldname) && !["Purchase Order","Purchase Invoice"].includes(me.frm.doc.doctype)) {
|
||||
if (!me.frm.doc[fieldname]) {
|
||||
frappe.msgprint(__("Please specify") + ": " +
|
||||
frappe.meta.get_label(me.frm.doc.doctype, fieldname, me.frm.doc.name) +
|
||||
|
Loading…
x
Reference in New Issue
Block a user