Merge pull request #2669 from nathando/patch-2
Look like a minor bug
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
index 6c7e87f..c9a4ff0 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
@@ -405,7 +405,7 @@
# Hence the first condition is an "OR"
return frappe.db.sql("""select tabAccount.name from `tabAccount`
where (tabAccount.report_type = "Profit and Loss"
- or tabAccount.account_type = "Expense Account")
+ or tabAccount.account_type in ("Expense Account", "Fixed Asset"))
and tabAccount.group_or_ledger="Ledger"
and tabAccount.docstatus!=2
and ifnull(tabAccount.master_type, "")=""
diff --git a/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py b/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
index 127e9cb..100051a 100644
--- a/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
+++ b/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
@@ -10,40 +10,40 @@
if not filters: filters = {}
columns = get_columns()
last_col = len(columns)
-
+
item_list = get_items(filters)
aii_account_map = get_aii_accounts()
if item_list:
item_tax, tax_accounts = get_tax_accounts(item_list, columns)
-
+
data = []
for d in item_list:
expense_account = d.expense_account or aii_account_map.get(d.company)
- row = [d.item_code, d.item_name, d.item_group, d.parent, d.posting_date,
- d.supplier_name, d.credit_to, d.project_name, d.company, d.purchase_order,
+ row = [d.item_code, d.item_name, d.item_group, d.parent, d.posting_date,
+ d.supplier_name, d.credit_to, d.project_name, d.company, d.purchase_order,
d.purchase_receipt, expense_account, d.qty, d.base_rate, d.base_amount]
for tax in tax_accounts:
row.append(item_tax.get(d.parent, {}).get(d.item_code, {}).get(tax, 0))
total_tax = sum(row[last_col:])
row += [total_tax, d.base_amount + total_tax]
-
+
data.append(row)
-
+
return columns, data
-
-
+
+
def get_columns():
- return [_("Item Code") + ":Link/Item:120", _("Item Name") + "::120", _("Item Group") + ":Link/Item Group:100",
- _("Invoice") + ":Link/Purchase Invoice:120", _("Posting Date") + ":Date:80", _("Supplier") + ":Link/Customer:120",
- _("Supplier Account") + ":Link/Account:120", _("Project") + ":Link/Project:80", _("Company") + ":Link/Company:100",
- _("Purchase Order") + ":Link/Purchase Order:100", _("Purchase Receipt") + ":Link/Purchase Receipt:100",
- _("Expense Account") + ":Link/Account:140", _("Qty") + ":Float:120", _("Rate") + ":Currency:120",
+ return [_("Item Code") + ":Link/Item:120", _("Item Name") + "::120", _("Item Group") + ":Link/Item Group:100",
+ _("Invoice") + ":Link/Purchase Invoice:120", _("Posting Date") + ":Date:80", _("Supplier") + ":Link/Customer:120",
+ _("Supplier Account") + ":Link/Account:120", _("Project") + ":Link/Project:80", _("Company") + ":Link/Company:100",
+ _("Purchase Order") + ":Link/Purchase Order:100", _("Purchase Receipt") + ":Link/Purchase Receipt:100",
+ _("Expense Account") + ":Link/Account:140", _("Qty") + ":Float:120", _("Rate") + ":Currency:120",
_("Amount") + ":Currency:120"]
-
+
def get_conditions(filters):
conditions = ""
-
+
for opts in (("company", " and company=%(company)s"),
("account", " and pi.credit_to = %(account)s"),
("item_code", " and pi_item.item_code = %(item_code)s"),
@@ -53,48 +53,56 @@
conditions += opts[1]
return conditions
-
+
def get_items(filters):
conditions = get_conditions(filters)
match_conditions = frappe.build_match_conditions("Purchase Invoice")
-
- return frappe.db.sql("""select pi_item.parent, pi.posting_date, pi.credit_to, pi.company,
- pi.supplier, pi.remarks, pi_item.item_code, pi_item.item_name, pi_item.item_group,
- pi_item.project_name, pi_item.purchase_order, pi_item.purchase_receipt,
+
+ return frappe.db.sql("""select pi_item.parent, pi.posting_date, pi.credit_to, pi.company,
+ pi.supplier, pi.remarks, pi.net_total, pi_item.item_code, pi_item.item_name, pi_item.item_group,
+ pi_item.project_name, pi_item.purchase_order, pi_item.purchase_receipt,
pi_item.expense_account, pi_item.qty, pi_item.base_rate, pi_item.base_amount, pi.supplier_name
- from `tabPurchase Invoice` pi, `tabPurchase Invoice Item` pi_item
+ from `tabPurchase Invoice` pi, `tabPurchase Invoice Item` pi_item
where pi.name = pi_item.parent and pi.docstatus = 1 %s %s
order by pi.posting_date desc, pi_item.item_code desc""" % (conditions, match_conditions), filters, as_dict=1)
-
+
def get_aii_accounts():
return dict(frappe.db.sql("select name, stock_received_but_not_billed from tabCompany"))
-
+
def get_tax_accounts(item_list, columns):
import json
item_tax = {}
tax_accounts = []
-
- tax_details = frappe.db.sql("""select parent, account_head, item_wise_tax_detail
- from `tabPurchase Taxes and Charges` where parenttype = 'Purchase Invoice'
- and docstatus = 1 and ifnull(account_head, '') != '' and category in ('Total', 'Valuation and Total')
- and parent in (%s)""" % ', '.join(['%s']*len(item_list)), tuple([item.parent for item in item_list]))
-
- for parent, account_head, item_wise_tax_detail in tax_details:
+
+ invoice_wise_items = {}
+ for d in item_list:
+ invoice_wise_items.setdefault(d.parent, []).append(d)
+
+ tax_details = frappe.db.sql("""select parent, account_head, item_wise_tax_detail, charge_type, tax_amount
+ from `tabPurchase Taxes and Charges` where parenttype = 'Purchase Invoice'
+ and docstatus = 1 and ifnull(account_head, '') != '' and category in ('Total', 'Valuation and Total')
+ and parent in (%s)""" % ', '.join(['%s']*len(invoice_wise_items)), tuple(invoice_wise_items.keys()))
+
+ for parent, account_head, item_wise_tax_detail, charge_type, tax_amount in tax_details:
if account_head not in tax_accounts:
tax_accounts.append(account_head)
-
+
if item_wise_tax_detail:
try:
item_wise_tax_detail = json.loads(item_wise_tax_detail)
for item, tax_amount in item_wise_tax_detail.items():
item_tax.setdefault(parent, {}).setdefault(item, {})[account_head] = \
flt(tax_amount[1]) if isinstance(tax_amount, list) else flt(tax_amount)
-
+
except ValueError:
continue
-
+ elif charge_type == "Actual" and tax_amount:
+ for d in invoice_wise_items.get(parent, []):
+ item_tax.setdefault(parent, {}).setdefault(d.item_code, {})[account_head] = \
+ (tax_amount * d.base_amount) / d.net_total
+
tax_accounts.sort()
columns += [account_head + ":Currency:80" for account_head in tax_accounts]
columns += ["Total Tax:Currency:80", "Total:Currency:80"]
- return item_tax, tax_accounts
\ No newline at end of file
+ return item_tax, tax_accounts
diff --git a/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py b/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py
index 2840291..e3b93d0 100644
--- a/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py
+++ b/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py
@@ -14,36 +14,36 @@
item_list = get_items(filters)
if item_list:
item_tax, tax_accounts = get_tax_accounts(item_list, columns)
-
+
data = []
for d in item_list:
- row = [d.item_code, d.item_name, d.item_group, d.parent, d.posting_date,
- d.customer_name, d.debit_to, d.territory, d.project_name, d.company, d.sales_order,
+ row = [d.item_code, d.item_name, d.item_group, d.parent, d.posting_date,
+ d.customer_name, d.debit_to, d.territory, d.project_name, d.company, d.sales_order,
d.delivery_note, d.income_account, d.qty, d.base_rate, d.base_amount]
-
+
for tax in tax_accounts:
row.append(item_tax.get(d.parent, {}).get(d.item_code, {}).get(tax, 0))
total_tax = sum(row[last_col:])
row += [total_tax, d.base_amount + total_tax]
-
+
data.append(row)
-
+
return columns, data
-
+
def get_columns():
return [
- _("Item Code") + ":Link/Item:120", _("Item Name") + "::120", _("Item Group") + ":Link/Item Group:100",
- _("Invoice") + ":Link/Sales Invoice:120", _("Posting Date") + ":Date:80", _("Customer") + ":Link/Customer:120",
+ _("Item Code") + ":Link/Item:120", _("Item Name") + "::120", _("Item Group") + ":Link/Item Group:100",
+ _("Invoice") + ":Link/Sales Invoice:120", _("Posting Date") + ":Date:80", _("Customer") + ":Link/Customer:120",
_("Customer Account") + ":Link/Account:120", _("Territory") + ":Link/Territory:80",
- _("Project") + ":Link/Project:80", _("Company") + ":Link/Company:100", _("Sales Order") + ":Link/Sales Order:100",
- _("Delivery Note") + ":Link/Delivery Note:100", _("Income Account") + ":Link/Account:140",
+ _("Project") + ":Link/Project:80", _("Company") + ":Link/Company:100", _("Sales Order") + ":Link/Sales Order:100",
+ _("Delivery Note") + ":Link/Delivery Note:100", _("Income Account") + ":Link/Account:140",
_("Qty") + ":Float:120", _("Rate") + ":Currency:120", _("Amount") + ":Currency:120"
]
-
+
def get_conditions(filters):
conditions = ""
-
+
for opts in (("company", " and company=%(company)s"),
("account", " and si.debit_to = %(account)s"),
("item_code", " and si_item.item_code = %(item_code)s"),
@@ -53,32 +53,36 @@
conditions += opts[1]
return conditions
-
+
def get_items(filters):
conditions = get_conditions(filters)
- return frappe.db.sql("""select si_item.parent, si.posting_date, si.debit_to, si.project_name,
- si.customer, si.remarks, si.territory, si.company, si_item.item_code, si_item.item_name,
- si_item.item_group, si_item.sales_order, si_item.delivery_note, si_item.income_account,
+ return frappe.db.sql("""select si_item.parent, si.posting_date, si.debit_to, si.project_name,
+ si.customer, si.remarks, si.territory, si.company, si.net_total, si_item.item_code, si_item.item_name,
+ si_item.item_group, si_item.sales_order, si_item.delivery_note, si_item.income_account,
si_item.qty, si_item.base_rate, si_item.base_amount, si.customer_name
- from `tabSales Invoice` si, `tabSales Invoice Item` si_item
- where si.name = si_item.parent and si.docstatus = 1 %s
+ from `tabSales Invoice` si, `tabSales Invoice Item` si_item
+ where si.name = si_item.parent and si.docstatus = 1 %s
order by si.posting_date desc, si_item.item_code desc""" % conditions, filters, as_dict=1)
-
+
def get_tax_accounts(item_list, columns):
import json
item_tax = {}
tax_accounts = []
-
- tax_details = frappe.db.sql("""select parent, account_head, item_wise_tax_detail
- from `tabSales Taxes and Charges` where parenttype = 'Sales Invoice'
+
+ invoice_wise_items = {}
+ for d in item_list:
+ invoice_wise_items.setdefault(d.parent, []).append(d)
+
+ tax_details = frappe.db.sql("""select parent, account_head, item_wise_tax_detail, charge_type, tax_amount
+ from `tabSales Taxes and Charges` where parenttype = 'Sales Invoice'
and docstatus = 1 and ifnull(account_head, '') != ''
- and parent in (%s)""" % ', '.join(['%s']*len(item_list)),
- tuple([item.parent for item in item_list]))
-
- for parent, account_head, item_wise_tax_detail in tax_details:
+ and parent in (%s)""" % ', '.join(['%s']*len(invoice_wise_items)),
+ tuple(invoice_wise_items.keys()))
+
+ for parent, account_head, item_wise_tax_detail, charge_type, tax_amount in tax_details:
if account_head not in tax_accounts:
tax_accounts.append(account_head)
-
+
if item_wise_tax_detail:
try:
item_wise_tax_detail = json.loads(item_wise_tax_detail)
@@ -87,9 +91,13 @@
flt(tax_amount[1]) if isinstance(tax_amount, list) else flt(tax_amount)
except ValueError:
continue
-
+ elif charge_type == "Actual" and tax_amount:
+ for d in invoice_wise_items.get(parent, []):
+ item_tax.setdefault(parent, {}).setdefault(d.item_code, {})[account_head] = \
+ flt((tax_amount * d.base_amount) / d.net_total)
+
tax_accounts.sort()
columns += [account_head + ":Currency:80" for account_head in tax_accounts]
columns += ["Total Tax:Currency:80", "Total:Currency:80"]
- return item_tax, tax_accounts
\ No newline at end of file
+ return item_tax, tax_accounts
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.js b/erpnext/stock/doctype/stock_entry/stock_entry.js
index a2c670e..61cacce 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.js
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.js
@@ -24,6 +24,12 @@
};
};
+ this.frm.fields_dict.bom_no.get_query = function() {
+ return {
+ filters:{ 'docstatus': 1 }
+ };
+ };
+
this.frm.fields_dict.mtn_details.grid.get_field('item_code').get_query = function() {
if(in_list(["Sales Return", "Purchase Return"], me.frm.doc.purpose) &&
me.get_doctype_docname()) {
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.json b/erpnext/stock/doctype/stock_entry/stock_entry.json
index 5f78758..e865e6f 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.json
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.json
@@ -238,11 +238,6 @@
"read_only": 0
},
{
- "fieldname": "fold",
- "fieldtype": "Fold",
- "permlevel": 0
- },
- {
"depends_on": "eval:(doc.purpose!==\"Sales Return\" && doc.purpose!==\"Purchase Return\")",
"fieldname": "sb1",
"fieldtype": "Section Break",
@@ -340,6 +335,11 @@
"search_index": 0
},
{
+ "fieldname": "fold",
+ "fieldtype": "Fold",
+ "permlevel": 0
+ },
+ {
"depends_on": "eval:(doc.purpose==\"Sales Return\" || doc.purpose==\"Purchase Return\")",
"fieldname": "contact_section",
"fieldtype": "Section Break",
@@ -585,7 +585,7 @@
"is_submittable": 1,
"issingle": 0,
"max_attachments": 0,
- "modified": "2014-09-16 15:56:37.514676",
+ "modified": "2015-01-29 11:26:46.968041",
"modified_by": "Administrator",
"module": "Stock",
"name": "Stock Entry",
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py
index 81a2f59..5a5904a 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.py
@@ -109,8 +109,8 @@
def validate_warehouse(self, pro_obj):
"""perform various (sometimes conditional) validations on warehouse"""
- source_mandatory = ["Material Issue", "Material Transfer", "Purchase Return"]
- target_mandatory = ["Material Receipt", "Material Transfer", "Sales Return"]
+ source_mandatory = ["Material Issue", "Material Transfer", "Purchase Return", "Subcontract"]
+ target_mandatory = ["Material Receipt", "Material Transfer", "Sales Return", "Subcontract"]
validate_for_manufacture_repack = any([d.bom_no for d in self.get("mtn_details")])
@@ -467,6 +467,9 @@
"Subcontract"]:
if self.production_order and self.purpose == "Material Transfer":
item_dict = self.get_pending_raw_materials(pro_obj)
+ if self.to_warehouse and pro_obj:
+ for item in item_dict.values():
+ item["to_warehouse"] = pro_obj.wip_warehouse
else:
if not self.fg_completed_qty:
frappe.throw(_("Manufacturing Quantity is mandatory"))
@@ -474,7 +477,8 @@
for item in item_dict.values():
if pro_obj:
item["from_warehouse"] = pro_obj.wip_warehouse
- item["to_warehouse"] = ""
+
+ item["to_warehouse"] = self.to_warehouse if self.purpose=="Subcontract" else ""
# add raw materials to Stock Entry Detail table
self.add_to_stock_entry_detail(item_dict)
@@ -525,7 +529,7 @@
item_dict = get_bom_items_as_dict(self.bom_no, qty=qty, fetch_exploded = self.use_multi_level_bom)
for item in item_dict.values():
- item.from_warehouse = item.default_warehouse
+ item.from_warehouse = self.from_warehouse or item.default_warehouse
return item_dict
diff --git a/erpnext/templates/print_formats/includes/item_grid.html b/erpnext/templates/print_formats/includes/item_grid.html
index 7e1d1a6..0c912ca 100644
--- a/erpnext/templates/print_formats/includes/item_grid.html
+++ b/erpnext/templates/print_formats/includes/item_grid.html
@@ -6,17 +6,19 @@
<table class="table table-bordered">
<tbody>
- <tr>
- <th style="width: 3%">{{ _("Sr") }}</th>
- <th style="width: 57%">{{ _("Item") }}</th>
- <th style="width: 10%;" class="text-right">{{ _(data[0].meta.get_label("qty")) }}</th>
- {% if not hide_rate -%}
- <th style="width: 15%;" class="text-right">{{ _(data[0].meta.get_label("rate")) }}</th>
- {%- endif %}
- {% if not hide_amount -%}
- <th style="width: 15%;" class="text-right">{{ _(data[0].meta.get_label("amount")) }}</th>
- {%- endif %}
- </tr>
+ {% if data|length -%}
+ <tr>
+ <th style="width: 3%">{{ _("Sr") }}</th>
+ <th style="width: 57%">{{ _("Item") }}</th>
+ <th style="width: 10%;" class="text-right">{{ _(data[0].meta.get_label("qty")) }}</th>
+ {% if not hide_rate -%}
+ <th style="width: 15%;" class="text-right">{{ _(data[0].meta.get_label("rate")) }}</th>
+ {%- endif %}
+ {% if not hide_amount -%}
+ <th style="width: 15%;" class="text-right">{{ _(data[0].meta.get_label("amount")) }}</th>
+ {%- endif %}
+ </tr>
+ {%- endif %}
{%- for row in data -%}
<tr>
<td>{{ row.idx }}</td>