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

fixes in Purchase Invoice

Browse Source
This commit is contained in:
Neil Trini Lasrado 2015-04-30 13:05:36 +05:30
parent 01720404db
commit 42a554e5cb
4 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
View File

@ -76,14 +76,6 @@
"print_hide": 1, "print_hide": 1,
"read_only": 1 "read_only": 1
}, },
{
"fieldname": "project",
"fieldtype": "Link",
"label": "Project",
"options": "Project",
"permlevel": 0,
"precision": ""
},
{ {
"fieldname": "column_break1", "fieldname": "column_break1",
"fieldtype": "Column Break", "fieldtype": "Column Break",
@ -946,7 +938,7 @@
"icon": "icon-file-text", "icon": "icon-file-text",
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"modified": "2015-04-27 20:32:12.436976", "modified": "2015-04-30 03:05:13.790265",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Purchase Invoice", "name": "Purchase Invoice",

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

@ -377,11 +377,14 @@ class PurchaseInvoice(BuyingController):
self.update_project() self.update_project()
def update_project(self): def update_project(self):
if self.project and frappe.db.exists("Project", self.project): project_list = []
project = frappe.get_doc("Project", self.project) for d in self.items:
if d.project_name and d.project_name not in project_list:
project = frappe.get_doc("Project", d.project_name)
project.flags.dont_sync_tasks = True project.flags.dont_sync_tasks = True
project.update_purchase_costing() project.update_purchase_costing()
project.save() project.save()
project_list.append(d.project_name)
@frappe.whitelist() @frappe.whitelist()
def get_expense_account(doctype, txt, searchfield, start, page_len, filters): def get_expense_account(doctype, txt, searchfield, start, page_len, filters):

3
erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
View File

@ -238,13 +238,13 @@ class TestPurchaseInvoice(unittest.TestCase):
purchase_invoice = frappe.new_doc('Purchase Invoice') purchase_invoice = frappe.new_doc('Purchase Invoice')
purchase_invoice.update({ purchase_invoice.update({
"credit_to": "_Test Payable - _TC", "credit_to": "_Test Payable - _TC",
"project": "_Test Project",
"supplier": "_Test Supplier", "supplier": "_Test Supplier",
"company": "_Test Company", "company": "_Test Company",
"items": [ "items": [
{ {
"rate": 500, "rate": 500,
"qty": 1, "qty": 1,
"project_name": "_Test Project",
"item_code": "_Test Item Home Desktop 100", "item_code": "_Test Item Home Desktop 100",
"expense_account": "_Test Account Cost for Goods Sold - _TC", "expense_account": "_Test Account Cost for Goods Sold - _TC",
"cost_center": "_Test Cost Center - _TC" "cost_center": "_Test Cost Center - _TC"
@ -252,6 +252,7 @@ class TestPurchaseInvoice(unittest.TestCase):
{ {
"rate": 1500, "rate": 1500,
"qty": 1, "qty": 1,
"project_name": "_Test Project",
"item_code": "_Test Item Home Desktop 200", "item_code": "_Test Item Home Desktop 200",
"expense_account": "_Test Account Cost for Goods Sold - _TC", "expense_account": "_Test Account Cost for Goods Sold - _TC",
"cost_center": "_Test Cost Center - _TC" "cost_center": "_Test Cost Center - _TC"

4
erpnext/projects/doctype/project/project.py
View File

@ -91,8 +91,8 @@ class Project(Document):
self.per_gross_margin = (self.gross_margin / flt(self.total_billing_amount)) *100 self.per_gross_margin = (self.gross_margin / flt(self.total_billing_amount)) *100
def update_purchase_costing(self): def update_purchase_costing(self):
self.total_purchase_cost = frappe.db.sql("""select sum(grand_total) as cost self.total_purchase_cost = frappe.db.sql("""select sum(amount) as cost
from `tabPurchase Invoice` where project = %s and docstatus=1 """, self.name, as_dict=1)[0].cost or 0 from `tabPurchase Invoice Item` where project_name = %s and docstatus=1 """, self.name, as_dict=1)[0].cost or 0
@frappe.whitelist() @frappe.whitelist()
def get_cost_center_name(project_name): def get_cost_center_name(project_name):