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

Minor fixes

Browse Source
This commit is contained in:
Nabin Hait 2015-07-17 16:54:25 +05:30
parent 623ed57663
commit 6b25708b7a
5 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/controllers/accounts_controller.py
View File

@ -26,7 +26,7 @@ class AccountsController(TransactionBase):
self.validate_return_doc() self.validate_return_doc()
self.set_total_in_words() self.set_total_in_words()
if not self.is_return: if self.doctype in ("Sales Invoice", "Purchase Invoice") and not self.is_return:
self.validate_due_date() self.validate_due_date()
if self.meta.get_field("is_recurring"): if self.meta.get_field("is_recurring"):

1
erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
View File

@ -71,7 +71,6 @@ class PurchaseReceipt(BuyingController):
def validate_purchase_return(self): def validate_purchase_return(self):
for d in self.get("items"): for d in self.get("items"):
print flt(d.rejected_qty)
if self.is_return and flt(d.rejected_qty) != 0: if self.is_return and flt(d.rejected_qty) != 0:
frappe.throw(_("Row #{0}: Rejected Qty can not be entered in Purchase Return").format(d.idx)) frappe.throw(_("Row #{0}: Rejected Qty can not be entered in Purchase Return").format(d.idx))

1
erpnext/stock/doctype/stock_entry/stock_entry.py
View File

@ -51,7 +51,6 @@ class StockEntry(StockController):
self.get_stock_and_rate() self.get_stock_and_rate()
self.validate_bom() self.validate_bom()
self.validate_finished_goods() self.validate_finished_goods()
self.validate_return_reference_doc()
self.validate_with_material_request() self.validate_with_material_request()
self.validate_valuation_rate() self.validate_valuation_rate()
self.set_total_incoming_outgoing_value() self.set_total_incoming_outgoing_value()

2
erpnext/stock/doctype/stock_entry/test_stock_entry.py
View File

@ -12,7 +12,7 @@ from erpnext.stock.doctype.stock_ledger_entry.stock_ledger_entry import StockFre
from erpnext.stock.doctype.purchase_receipt.purchase_receipt import make_purchase_invoice from erpnext.stock.doctype.purchase_receipt.purchase_receipt import make_purchase_invoice
from erpnext.stock.stock_ledger import get_previous_sle from erpnext.stock.stock_ledger import get_previous_sle
from erpnext.selling.doctype.sales_order.test_sales_order import make_sales_order, create_dn_against_so from erpnext.selling.doctype.sales_order.test_sales_order import make_sales_order, create_dn_against_so
from erpnext.stock.doctype.stock_entry.stock_entry import make_return_jv, NotUpdateStockError from erpnext.stock.doctype.stock_entry.stock_entry import NotUpdateStockError
from erpnext.stock.doctype.stock_reconciliation.test_stock_reconciliation import create_stock_reconciliation from erpnext.stock.doctype.stock_reconciliation.test_stock_reconciliation import create_stock_reconciliation
def get_sle(**args): def get_sle(**args):

2
erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py
View File

@ -107,8 +107,6 @@ def create_stock_reconciliation(**args):
"valuation_rate": args.rate "valuation_rate": args.rate
}) })
sr.insert()
sr.submit() sr.submit()
return sr return sr