nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-02 19:59:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'responsive' of github.com:webnotes/erpnext into responsive

Browse Source 
Conflicts:
	buying/doctype/purchase_order_item/purchase_order_item.txt
This commit is contained in:
Anand Doshi
2013-07-09 13:10:15 +05:30
parent bdee6e074a 0f3d2df8e8
commit c120776931
22 changed files with 126 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
accounts/doctype/purchase_invoice/purchase_invoice.py
View File

@@ -75,6 +75,7 @@ class DocType(BuyingController):
self.validate_write_off_account()
self.update_raw_material_cost()
self.update_valuation_rate("entries")
self.validate_multiple_billing("Purchase Receipt", "pr_detail", "import_amount")
def get_credit_to(self):
acc_head = sql("""select name, credit_days from `tabAccount`
@@ -206,17 +207,17 @@ class DocType(BuyingController):
},
"Purchase Order Item": {
"ref_dn_field": "po_detail",
"compare_fields": [["export_rate", "="], ["project_name", "="], ["item_code", "="],
"compare_fields": [["import_rate", "="], ["project_name", "="], ["item_code", "="],
["uom", "="]],
"is_child_table": True
},
"Purchase Receipt": {
"ref_dn_field": "purchase_receipt",
"compare_fields": [["customer", "="], ["company", "="], ["currency", "="]],
"compare_fields": [["supplier", "="], ["company", "="], ["currency", "="]],
},
"Purchase Receipt Item": {
"ref_dn_field": "pr_detail",
"compare_fields": [["export_rate", "="], ["project_name", "="], ["item_code", "="],
"compare_fields": [["import_rate", "="], ["project_name", "="], ["item_code", "="],
["uom", "="]],
"is_child_table": True
}

1
accounts/doctype/sales_invoice/sales_invoice.py
View File

@@ -93,6 +93,7 @@ class DocType(SellingController):
self.validate_c_form()
self.validate_time_logs_are_submitted()
self.validate_recurring_invoice()
self.validate_multiple_billing("Delivered Note", "dn_detail", "export_amount")
def on_submit(self):
if cint(self.doc.update_stock) == 1: