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

[fixes] [minor]

Browse Source
This commit is contained in:
Rushabh Mehta 2015-02-24 16:50:47 +05:30
parent 7ce2f55ca9
commit b620fed762
5 changed files with 4 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/controllers/accounts_controller.py
View File

@ -109,6 +109,7 @@ class AccountsController(TransactionBase):
def set_missing_item_details(self): def set_missing_item_details(self):
"""set missing item values""" """set missing item values"""
from erpnext.stock.get_item_details import get_item_details from erpnext.stock.get_item_details import get_item_details
if hasattr(self, "items"): if hasattr(self, "items"):
parent_dict = {} parent_dict = {}
for fieldname in self.meta.get_valid_columns(): for fieldname in self.meta.get_valid_columns():

3
erpnext/stock/doctype/item/item.json
View File

@ -174,6 +174,7 @@
"precision": "" "precision": ""
}, },
{ {
"default": "0",
"description": "Automatically set. If this item has variants, then it cannot be selected in sales orders etc.", "description": "Automatically set. If this item has variants, then it cannot be selected in sales orders etc.",
"fieldname": "has_variants", "fieldname": "has_variants",
"fieldtype": "Check", "fieldtype": "Check",
@ -875,7 +876,7 @@
"icon": "icon-tag", "icon": "icon-tag",
"idx": 1, "idx": 1,
"max_attachments": 1, "max_attachments": 1,
"modified": "2015-02-23 06:12:13.359646", "modified": "2015-02-24 05:19:07.382483",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Item", "name": "Item",

1
erpnext/stock/get_item_details.py
View File

@ -205,7 +205,6 @@ def get_price_list_rate(args, item_doc, out):
validate_price_list(args) validate_price_list(args)
validate_conversion_rate(args, meta) validate_conversion_rate(args, meta)
price_list_rate = get_price_list_rate_for(args, item_doc.name) price_list_rate = get_price_list_rate_for(args, item_doc.name)
if not price_list_rate and item_doc.variant_of: if not price_list_rate and item_doc.variant_of:
price_list_rate = get_price_list_rate_for(args, item_doc.variant_of) price_list_rate = get_price_list_rate_for(args, item_doc.variant_of)

2
erpnext/templates/form_grid/includes/visible_cols.html
View File

@ -1,6 +1,6 @@
{% $.each(visible_columns || [], function(i, df) { %} {% $.each(visible_columns || [], function(i, df) { %}
{% var val = doc.get_formatted(df.fieldname); {% var val = doc.get_formatted(df.fieldname);
if(val) { %} if((df.fieldname !== "description") && val) { %}
<div class="row"> <div class="row">
<div class="col-xs-4 text-ellipsis"> <div class="col-xs-4 text-ellipsis">
<strong title="{%= __(df.label) %}">{%= __(df.label) %}:</strong> <strong title="{%= __(df.label) %}">{%= __(df.label) %}:</strong>

25
erpnext/templates/form_grid/item_grid.html
View File

@ -47,32 +47,7 @@
{% if(doc.item_name != doc.item_code) { %} {% if(doc.item_name != doc.item_code) { %}
<br>{%= doc.item_name %}{% } %} <br>{%= doc.item_name %}{% } %}
<!-- {% if(doc.item_name != doc.description) { %}
<p>{%= doc.description %}</p>{% } %} -->
<!-- <p>
{% if(doc.sales_order || doc.against_sales_order) { %}
<span class="label label-default" style="margin-right: 10px;"
title="{%= __("Sales Order") %}">
<i class="icon-file"></i>
{%= doc.sales_order || doc.against_sales_order %}
</span>
{% } %}
</p> -->
{% include "templates/form_grid/includes/visible_cols.html" %} {% include "templates/form_grid/includes/visible_cols.html" %}
<!-- {% if(doc.schedule_date) { %}
<div class="clearfix"></div>
<div>
{% if(frappe.datetime.get_diff(doc.schedule_date) < 1 && doc.received_qty < doc.qty) { %}
<span class="text-danger">
{%= __("Overdue on {0}", [doc.get_formatted("schedule_date")]) %}
</span>
{% } else { %}
<span class="text-muted">
{%= __("Due on {0}", [doc.get_formatted("schedule_date")]) %}
</span>
{% } %}
</div>
{% } %} -->
</div> </div>
<!-- qty --> <!-- qty -->