Skip to content
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

fix: overriding po #24022

Merged
merged 11 commits into from
Dec 8, 2020
Merged

fix: overriding po #24022

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e29fd41
fix: overriding po
AfshanKhan Nov 28, 2020
c3af55a
fix: po
AfshanKhan Nov 28, 2020
cb2aa38
Merge branch 'develop' into fix-overriding-po
AfshanKhan Nov 30, 2020
01e8e36
Merge branch 'develop' into fix-overriding-po
AfshanKhan Dec 3, 2020
5546ae2
fix: refactor condition
AfshanKhan Dec 3, 2020
6dd3717
fix: condition
AfshanKhan Dec 3, 2020
a6951c5
fix: missing code
AfshanKhan Dec 3, 2020
9455ecd
Merge branch 'develop' into fix-overriding-po
AfshanKhan Dec 3, 2020
1ed22bc
Merge branch 'develop' into fix-overriding-po
AfshanKhan Dec 4, 2020
2a71235
Merge branch 'develop' into fix-overriding-po
AfshanKhan Dec 4, 2020
d8693a0
Merge branch 'develop' into fix-overriding-po
AfshanKhan Dec 7, 2020
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
12 changes: 10 additions & 2 deletions erpnext/controllers/selling_controller.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ def validate(self):
self.validate_max_discount()
self.validate_selling_price()
self.set_qty_as_per_stock_uom()
self.set_po_nos()
self.set_po_nos(for_validate=True)
self.set_gross_profit()
set_default_income_account_for_item(self)
self.set_customer_address()
Expand Down Expand Up @@ -370,20 +370,28 @@ def update_stock_ledger(self):
}))
self.make_sl_entries(sl_entries)

def set_po_nos(self):
def set_po_nos(self, for_validate=False):
if self.doctype == 'Sales Invoice' and hasattr(self, "items"):
if for_validate and self.po_no:
return
self.set_pos_for_sales_invoice()
if self.doctype == 'Delivery Note' and hasattr(self, "items"):
if for_validate and self.po_no:
return
self.set_pos_for_delivery_note()

def set_pos_for_sales_invoice(self):
po_nos = []
if self.po_no:
po_nos.append(self.po_no)
self.get_po_nos('Sales Order', 'sales_order', po_nos)
self.get_po_nos('Delivery Note', 'delivery_note', po_nos)
self.po_no = ', '.join(list(set(x.strip() for x in ','.join(po_nos).split(','))))

def set_pos_for_delivery_note(self):
po_nos = []
if self.po_no:
po_nos.append(self.po_no)
self.get_po_nos('Sales Order', 'against_sales_order', po_nos)
self.get_po_nos('Sales Invoice', 'against_sales_invoice', po_nos)
self.po_no = ', '.join(list(set(x.strip() for x in ','.join(po_nos).split(','))))
Expand Down