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

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

Browse Source
This commit is contained in:
Nabin Hait 2013-12-06 12:10:37 +05:30
commit ce2dfadfbd
4 changed files with 131 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

154
config.json
View File

@ -1,78 +1,78 @@
{ {
"app_name": "ERPNext", "app_name": "ERPNext",
"app_version": "3.0.0", "app_version": "3.1.0",
"requires_framework_version": "==3.0.0", "base_template": "app/portal/templates/base.html",
"base_template": "app/portal/templates/base.html", "modules": {
"modules": { "Accounts": {
"Selling": { "color": "#3498db",
"link": "selling-home", "icon": "icon-money",
"color": "#1abc9c", "link": "accounts-home",
"icon": "icon-tag", "type": "module"
"type": "module" },
}, "Activity": {
"Accounts": { "color": "#e67e22",
"link": "accounts-home", "icon": "icon-play",
"color": "#3498db", "label": "Activity",
"icon": "icon-money", "link": "activity",
"type": "module" "type": "page"
}, },
"Stock": { "Buying": {
"type": "module", "color": "#c0392b",
"link": "stock-home", "icon": "icon-shopping-cart",
"color": "#f39c12", "link": "buying-home",
"icon": "icon-truck" "type": "module"
}, },
"Buying": { "HR": {
"type": "module", "color": "#2ecc71",
"link": "buying-home", "icon": "icon-group",
"color": "#c0392b", "label": "Human Resources",
"icon": "icon-shopping-cart" "link": "hr-home",
}, "type": "module"
"Support": { },
"type": "module", "Manufacturing": {
"link": "support-home", "color": "#7f8c8d",
"color": "#2c3e50", "icon": "icon-cogs",
"icon": "icon-phone" "link": "manufacturing-home",
}, "type": "module"
"Projects": { },
"type": "module", "Notes": {
"link": "projects-home", "color": "#95a5a6",
"color": "#8e44ad", "doctype": "Note",
"icon": "icon-puzzle-piece" "icon": "icon-file-alt",
}, "label": "Notes",
"Manufacturing": { "link": "List/Note",
"type": "module", "type": "list"
"link": "manufacturing-home", },
"color": "#7f8c8d", "Projects": {
"icon": "icon-cogs" "color": "#8e44ad",
}, "icon": "icon-puzzle-piece",
"HR": { "link": "projects-home",
"type": "module", "type": "module"
"link": "hr-home", },
"color": "#2ecc71", "Selling": {
"label": "Human Resources", "color": "#1abc9c",
"icon": "icon-group" "icon": "icon-tag",
}, "link": "selling-home",
"Setup": { "type": "module"
"type": "setup", },
"link": "Setup", "Setup": {
"color": "#bdc3c7", "color": "#bdc3c7",
"icon": "icon-wrench" "icon": "icon-wrench",
}, "link": "Setup",
"Activity": { "type": "setup"
"type": "page", },
"link": "activity", "Stock": {
"color": "#e67e22", "color": "#f39c12",
"icon": "icon-play", "icon": "icon-truck",
"label": "Activity" "link": "stock-home",
}, "type": "module"
"Notes": { },
"type": "list", "Support": {
"doctype": "Note", "color": "#2c3e50",
"link": "List/Note", "icon": "icon-phone",
"color": "#95a5a6", "link": "support-home",
"label": "Notes", "type": "module"
"icon": "icon-file-alt" }
} },
} "requires_framework_version": "==3.1.0"
} }

15
portal/utils.py
View File

@ -64,9 +64,14 @@ def send_message(subject="Website Query", message="", sender="", status="Open"):
if not website_send_message(subject, message, sender): if not website_send_message(subject, message, sender):
return return
# make lead / communication if subject=="Support":
from selling.doctype.lead.get_leads import add_sales_communication # create support ticket
add_sales_communication(subject or "Website Query", message, sender, sender, from support.doctype.support_ticket.get_support_mails import add_support_communication
mail=None, status=status) add_support_communication(subject, message, sender, mail=None)
else:
# make lead / communication
from selling.doctype.lead.get_leads import add_sales_communication
add_sales_communication(subject or "Website Query", message, sender, sender,
mail=None, status=status)

4
stock/report/stock_ledger/stock_ledger.js
View File

@ -15,14 +15,14 @@ wn.query_reports["Stock Ledger"] = {
"fieldname":"from_date", "fieldname":"from_date",
"label": wn._("From Date"), "label": wn._("From Date"),
"fieldtype": "Date", "fieldtype": "Date",
"default": wn.defaults.get_user_default("year_start_date"), "default": wn.datetime.add_months(wn.datetime.get_today(), -1),
"reqd": 1 "reqd": 1
}, },
{ {
"fieldname":"to_date", "fieldname":"to_date",
"label": wn._("To Date"), "label": wn._("To Date"),
"fieldtype": "Date", "fieldtype": "Date",
"default": wn.defaults.get_user_default("year_end_date"), "default": wn.datetime.get_today(),
"reqd": 1 "reqd": 1
}, },
{ {

59
stock/report/stock_ledger/stock_ledger.py
View File

@ -3,37 +3,62 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import webnotes import webnotes
from webnotes import _
def execute(filters=None): def execute(filters=None):
columns = ["Date:Datetime:95", "Item:Link/Item:100", "Item Name::100", columns = get_columns()
sl_entries = get_stock_ledger_entries(filters)
item_details = get_item_details(filters)
data = []
for sle in sl_entries:
item_detail = item_details[sle.item_code]
data.append([sle.date, sle.item_code, item_detail.item_name, item_detail.item_group,
item_detail.brand, item_detail.description, sle.warehouse, item_detail.stock_uom,
sle.actual_qty, sle.qty_after_transaction, sle.stock_value, sle.voucher_type,
sle.voucher_no, sle.batch_no, sle.serial_no, sle.company])
return columns, data
def get_columns():
return ["Date:Datetime:95", "Item:Link/Item:100", "Item Name::100",
"Item Group:Link/Item Group:100", "Brand:Link/Brand:100", "Item Group:Link/Item Group:100", "Brand:Link/Brand:100",
"Description::200", "Warehouse:Link/Warehouse:100", "Description::200", "Warehouse:Link/Warehouse:100",
"Stock UOM:Link/UOM:100", "Qty:Float:50", "Balance Qty:Float:80", "Stock UOM:Link/UOM:100", "Qty:Float:50", "Balance Qty:Float:80",
"Balance Value:Currency:100", "Voucher Type::100", "Voucher #::100", "Balance Value:Currency:100", "Voucher Type::100", "Voucher #::100",
"Batch:Link/Batch:100", "Serial #:Link/Serial No:100", "Company:Link/Company:100"] "Batch:Link/Batch:100", "Serial #:Link/Serial No:100", "Company:Link/Company:100"]
data = webnotes.conn.sql("""select concat_ws(" ", posting_date, posting_time), def get_stock_ledger_entries(filters):
item.name, item.item_name, item.item_group, brand, description, warehouse, sle.stock_uom, if not filters.get("company"):
actual_qty, qty_after_transaction, stock_value, voucher_type, voucher_no, webnotes.throw(_("Company is mandatory"))
batch_no, serial_no, company if not filters.get("from_date"):
from `tabStock Ledger Entry` sle, webnotes.throw(_("From Date is mandatory"))
(select name, item_name, description, stock_uom, brand, item_group if not filters.get("to_date"):
from `tabItem` {item_conditions}) item webnotes.throw(_("To Date is mandatory"))
where item_code = item.name and
company = %(company)s and return webnotes.conn.sql("""select concat_ws(" ", posting_date, posting_time) as date,
item_code, warehouse, actual_qty, qty_after_transaction,
stock_value, voucher_type, voucher_no, batch_no, serial_no, company
from `tabStock Ledger Entry`
where company = %(company)s and
posting_date between %(from_date)s and %(to_date)s posting_date between %(from_date)s and %(to_date)s
{sle_conditions} {sle_conditions}
order by posting_date desc, posting_time desc, sle.name desc"""\ order by posting_date desc, posting_time desc, name desc"""\
.format(item_conditions=get_item_conditions(filters), .format(sle_conditions=get_sle_conditions(filters)), filters, as_dict=1)
sle_conditions=get_sle_conditions(filters)),
filters)
return columns, data def get_item_details(filters):
item_details = {}
for item in webnotes.conn.sql("""select name, item_name, description, item_group,
brand, stock_uom from `tabItem` {item_conditions}"""\
.format(item_conditions=get_item_conditions(filters)), filters, as_dict=1):
item_details.setdefault(item.name, item)
return item_details
def get_item_conditions(filters): def get_item_conditions(filters):
conditions = [] conditions = []
if filters.get("item_code"): if filters.get("item_code"):
conditions.append("item_code=%(item_code)s") conditions.append("name=%(item_code)s")
if filters.get("brand"): if filters.get("brand"):
conditions.append("brand=%(brand)s") conditions.append("brand=%(brand)s")