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

Merge branch 'develop' into fix-diff-value

Browse Source
This commit is contained in:
Sagar Sharma 2023-01-11 14:01:51 +05:30 committed by GitHub
commit 887ae1c434
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/doctype/payment_entry/payment_entry.py
View File

@ -247,7 +247,7 @@ class PaymentEntry(AccountsController):
self.set_target_exchange_rate(ref_doc) self.set_target_exchange_rate(ref_doc)
def set_source_exchange_rate(self, ref_doc=None): 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: if self.paid_from_account_currency == self.company_currency:
self.source_exchange_rate = 1 self.source_exchange_rate = 1
else: else:

6
erpnext/buying/doctype/purchase_order/test_purchase_order.py
View File

@ -743,9 +743,9 @@ class TestPurchaseOrder(FrappeTestCase):
pe = get_payment_entry("Purchase Order", po_doc.name) pe = get_payment_entry("Purchase Order", po_doc.name)
pe.mode_of_payment = "Cash" pe.mode_of_payment = "Cash"
pe.paid_from = "Cash - _TC" pe.paid_from = "Cash - _TC"
pe.source_exchange_rate = 80 pe.source_exchange_rate = 1
pe.target_exchange_rate = 1 pe.target_exchange_rate = 80
pe.paid_amount = po_doc.grand_total pe.paid_amount = po_doc.base_grand_total
pe.save(ignore_permissions=True) pe.save(ignore_permissions=True)
pe.submit() pe.submit()

5
erpnext/buying/doctype/request_for_quotation/request_for_quotation.py
View File

@ -216,6 +216,7 @@ class RequestforQuotation(BuyingController):
recipients=data.email_id, recipients=data.email_id,
sender=sender, sender=sender,
attachments=attachments, attachments=attachments,
print_format=self.meta.default_print_format or "Standard",
send_email=True, send_email=True,
doctype=self.doctype, doctype=self.doctype,
name=self.name, name=self.name,
@ -224,9 +225,7 @@ class RequestforQuotation(BuyingController):
frappe.msgprint(_("Email Sent to Supplier {0}").format(data.supplier)) frappe.msgprint(_("Email Sent to Supplier {0}").format(data.supplier))
def get_attachments(self): def get_attachments(self):
attachments = [d.name for d in get_attachments(self.doctype, self.name)] return [d.name for d in get_attachments(self.doctype, self.name)]
attachments.append(frappe.attach_print(self.doctype, self.name, doc=self))
return attachments
def update_rfq_supplier_status(self, sup_name=None): def update_rfq_supplier_status(self, sup_name=None):
for supplier in self.suppliers: for supplier in self.suppliers:

2
erpnext/public/js/controllers/transaction.js
View File

@ -1691,7 +1691,7 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
var valid = true; var valid = true;
$.each(["company", "customer"], function(i, fieldname) { $.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]) { if (!me.frm.doc[fieldname]) {
frappe.msgprint(__("Please specify") + ": " + frappe.msgprint(__("Please specify") + ": " +
frappe.meta.get_label(me.frm.doc.doctype, fieldname, me.frm.doc.name) + frappe.meta.get_label(me.frm.doc.doctype, fieldname, me.frm.doc.name) +