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

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

Browse Source
This commit is contained in:
Nabin Hait 2012-12-12 12:58:22 +05:30
commit be356b8692
15 changed files with 179 additions and 182 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
accounts/page/accounts_home/accounts_home.html
View File

@ -2,41 +2,38 @@
<div class="appframe-area"></div> <div class="appframe-area"></div>
<div class="layout-main-section"> <div class="layout-main-section">
<div style="width: 48%; float: left;"> <div style="width: 48%; float: left;">
<h4><a href="#!List/Journal Voucher">Journal Voucher</a></h4> <h5><a href="#List/Journal Voucher">Journal Voucher</a></h5>
<p class="help">General Ledger Entries</p> <p class="help">General Ledger Entries</p>
<br> <br>
<h4><a href="#!List/Sales Invoice">Sales Invoice</a></h4> <h5><a href="#List/Sales Invoice">Sales Invoice</a></h5>
<p class="help">Bills raised to Customers</p> <p class="help">Bills raised to Customers</p>
<br> <br>
<h4><a href="#!List/Purchase Invoice">Purchase Invoice</a></h4> <h5><a href="#List/Purchase Invoice">Purchase Invoice</a></h5>
<p class="help">Bills raised by Suppliers</p> <p class="help">Bills raised by Suppliers</p>
</div> </div>
<div style="width: 48%; float: right;"> <div style="width: 48%; float: right;">
<h4><a href="#!Accounts Browser/Account" <h5><a href="#Accounts Browser/Account"
data-role="Accounts Manager, Accounts User">Chart of Accounts</a></h4> data-role="Accounts Manager, Accounts User">Chart of Accounts</a></h5>
<p class="help">Structure of books of accounts</p> <p class="help">Structure of books of accounts</p>
<br> <br>
<h4><a href="#!Accounts Browser/Cost Center">Chart of Cost Centers</a></h4> <h5><a href="#Accounts Browser/Cost Center">Chart of Cost Centers</a></h5>
<p class="help">Structure cost centers</p> <p class="help">Structure cost centers</p>
<br> <br>
<h4><a href="#general-ledger" <h5><a href="#general-ledger"
data-role="Analytics, Accounts Manager, Accounts User"> data-role="Analytics, Accounts Manager, Accounts User">
General Ledger</a> General Ledger</a>
<span style="background-color: #fed; font-weight: normal; font-size: 80%">beta</span> </h5>
</h4>
<p class="help">General Ledger Report</p> <p class="help">General Ledger Report</p>
<br> <br>
<h4><a href="#trial-balance" <h5><a href="#trial-balance"
data-role="Analytics, Accounts Manager, Accounts User">Trial Balance</a> data-role="Analytics, Accounts Manager, Accounts User">Trial Balance</a>
<span style="background-color: #fed; font-weight: normal; font-size: 80%">beta</span> </h5>
</h4>
<p class="help">Tree view of all Account balances</p> <p class="help">Tree view of all Account balances</p>
<br> <br>
<h4><a href="#financial-analytics" <h5><a href="#financial-analytics"
data-role="Analytics, Accounts Manager, Accounts User"> data-role="Analytics, Accounts Manager, Accounts User">
Financial Analytics</a> Financial Analytics</a>
<span style="background-color: #fed; font-weight: normal; font-size: 80%">beta</span> </h5>
</h4>
<p class="help">Visual representation of financial trends</p> <p class="help">Visual representation of financial trends</p>
</div> </div>
<div style="clear: both"></div> <div style="clear: both"></div>
@ -52,34 +49,34 @@
<div class="section-item"> <div class="section-item">
<a class="section-link" <a class="section-link"
title="Update system bank entries (JV) with actual bank trasaction" title="Update system bank entries (JV) with actual bank trasaction"
href="#!Form/Bank Reconciliation/Bank Reconciliation">Bank Reconciliation</a> href="#Form/Bank Reconciliation/Bank Reconciliation">Bank Reconciliation</a>
</div> </div>
<div class="section-item"> <div class="section-item">
<a class="section-link" <a class="section-link"
title="Cancel off untracked Payments (JV) against Invoices" title="Cancel off untracked Payments (JV) against Invoices"
href="#!Form/Payment to Invoice Matching Tool/Payment to Invoice Matching Tool">Payment Reconciliation</a> href="#Form/Payment to Invoice Matching Tool/Payment to Invoice Matching Tool">Payment Reconciliation</a>
</div> </div>
<div class="section-item"> <div class="section-item">
<a class="section-link" <a class="section-link"
title="Clear your P/L account and balance your Balance Sheets" title="Clear your P/L account and balance your Balance Sheets"
href="#!List/Period Closing Voucher">Close Period Entry</a> href="#List/Period Closing Voucher">Close Period Entry</a>
</div> </div>
<div class="section-item"> <div class="section-item">
<a class="section-link" <a class="section-link"
title = "Helper for managing return of goods (sales or purchase)" title = "Helper for managing return of goods (sales or purchase)"
href="#!Form/Sales and Purchase Return Tool/Sales and Purchase Return Tool">Sales or Purchase Returns</a> href="#Form/Sales and Purchase Return Tool/Sales and Purchase Return Tool">Sales or Purchase Returns</a>
</div> </div>
<div class="section-item"> <div class="section-item">
<a class="section-link" <a class="section-link"
data-role="Accounts Manager, Accounts User" data-role="Accounts Manager, Accounts User"
title = "Analyze Sales and Purchase trends and slice them based on item, customer, groups etc" title = "Analyze Sales and Purchase trends and slice them based on item, customer, groups etc"
href="#!Report/Profile/Trend Analyzer">Trend Analyzer</a> href="#Report/Profile/Trend Analyzer">Trend Analyzer</a>
</div> </div>
<div class="section-item"> <div class="section-item">
<a class="section-link" <a class="section-link"
data-role="Accounts Manager, Accounts User" data-role="Accounts Manager, Accounts User"
title = "Check your Balance Sheet and Profit & Loss Statement" title = "Check your Balance Sheet and Profit & Loss Statement"
href="#!Financial Statements">Financial Statements</a> href="#Financial Statements">Financial Statements</a>
</div> </div>
<div class="section-item"> <div class="section-item">
<a class="section-link" data-role="Accounts Manager" <a class="section-link" data-role="Accounts Manager"
@ -95,32 +92,32 @@
<div class="section-item"> <div class="section-item">
<a class="section-link" <a class="section-link"
title = "Tax and charges structure master on sales transactions" title = "Tax and charges structure master on sales transactions"
href="#!List/Sales Taxes and Charges Master">Sales Taxes and Charges Master</a> href="#List/Sales Taxes and Charges Master">Sales Taxes and Charges Master</a>
</div> </div>
<div class="section-item"> <div class="section-item">
<a class="section-link" <a class="section-link"
title = "Tax and charges structure master on purchase transactions" title = "Tax and charges structure master on purchase transactions"
href="#!List/Purchase Taxes and Charges Master">Purchase Taxes and Charges Master</a> href="#List/Purchase Taxes and Charges Master">Purchase Taxes and Charges Master</a>
</div> </div>
<div class="section-item"> <div class="section-item">
<a class="section-link" <a class="section-link"
title = "Defaults for Point of Sale (Retail) type of Invoices" title = "Defaults for Point of Sale (Retail) type of Invoices"
href="#!List/POS Setting">Point of Sale (PoS) Setting</a> href="#List/POS Setting">Point of Sale (PoS) Setting</a>
</div> </div>
<div class="section-item"> <div class="section-item">
<a class="section-link" <a class="section-link"
title = "Seasonal distributions for budgets" title = "Seasonal distributions for budgets"
href="#!List/Budget Distribution">Budget Distribution</a> href="#List/Budget Distribution">Budget Distribution</a>
</div> </div>
<div class="section-item"> <div class="section-item">
<a class="section-link" <a class="section-link"
title = "Terms of contract template" title = "Terms of contract template"
href="#!List/Terms and Conditions">Terms and Conditions Template</a> href="#List/Terms and Conditions">Terms and Conditions Template</a>
</div> </div>
<div class="section-item"> <div class="section-item">
<a class="section-link" <a class="section-link"
title = "Mode of Payment master" title = "Mode of Payment master"
href="#!List/Mode of Payment">Mode of Payment</a> href="#List/Mode of Payment">Mode of Payment</a>
</div> </div>
</div> </div>
</div> </div>
@ -131,32 +128,32 @@
<div class="section-item"> <div class="section-item">
<a class="section-link" <a class="section-link"
title = "Tax Deduction at Source (TDS) payments to be made to the goverment" title = "Tax Deduction at Source (TDS) payments to be made to the goverment"
href="#!List/TDS Payment">TDS Payments</a> href="#List/TDS Payment">TDS Payments</a>
</div> </div>
<div class="section-item"> <div class="section-item">
<a class="section-link" <a class="section-link"
title = "Update with acknowledgement recd from the government" title = "Update with acknowledgement recd from the government"
href="#!List/TDS Return Acknowledgement">TDS Return Acknowledgement</a> href="#List/TDS Return Acknowledgement">TDS Return Acknowledgement</a>
</div> </div>
<div class="section-item"> <div class="section-item">
<a class="section-link" <a class="section-link"
title = "Tax deduction (TDS) categories" title = "Tax deduction (TDS) categories"
href="#!List/TDS Category">TDS Category</a> href="#List/TDS Category">TDS Category</a>
</div> </div>
<div class="section-item"> <div class="section-item">
<a class="section-link" <a class="section-link"
title = "Tax deduction (TDS) rates for different periods" title = "Tax deduction (TDS) rates for different periods"
href="#!List/TDS Rate Chart">TDS Rate Chart</a> href="#List/TDS Rate Chart">TDS Rate Chart</a>
</div> </div>
<div class="section-item"> <div class="section-item">
<a class="section-link" <a class="section-link"
title = "Challan given to employees/suppliers whose tax (TDS) has been deducted" title = "Challan given to employees/suppliers whose tax (TDS) has been deducted"
href="#!List/Form 16A">Form 16A</a> href="#List/Form 16A">Form 16A</a>
</div> </div>
<div class="section-item"> <div class="section-item">
<a class="section-link" <a class="section-link"
title = "C-Forms received from customers" title = "C-Forms received from customers"
href="#!List/C-Form">C-Form</a> href="#List/C-Form">C-Form</a>
</div> </div>
</div> </div>
</div> </div>

31
buying/page/buying_home/buying_home.html
View File

@ -2,32 +2,31 @@
<div class="appframe-area"></div> <div class="appframe-area"></div>
<div class="layout-main-section"> <div class="layout-main-section">
<div style="width: 48%; float: left;"> <div style="width: 48%; float: left;">
<h4><a href="#!List/Purchase Request">Purchase Request</a></h4> <h5><a href="#List/Purchase Request">Purchase Request</a></h5>
<p class="help">Request for purchase</p> <p class="help">Request for purchase</p>
<br> <br>
<h4><a href="#!List/Supplier Quotation">Supplier Quotation (beta)</a></h4> <h5><a href="#List/Supplier Quotation">Supplier Quotation (beta)</a></h5>
<p class="help">Track Quotations received from Suppliers</p> <p class="help">Track Quotations received from Suppliers</p>
<br> <br>
<h4><a href="#!List/Purchase Order">Purchase Order</a></h4> <h5><a href="#List/Purchase Order">Purchase Order</a></h5>
<p class="help">Purchase Orders given to Suppliers</p> <p class="help">Purchase Orders given to Suppliers</p>
</div> </div>
<div style="width: 48%; float: right;"> <div style="width: 48%; float: right;">
<h4><a href="#!List/Supplier">Supplier</a></h4> <h5><a href="#List/Supplier">Supplier</a></h5>
<p class="help">Supplier Master</p> <p class="help">Supplier Master</p>
<br> <br>
<h4><a href="#!List/Item">Item</a></h4> <h5><a href="#List/Item">Item</a></h5>
<p class="help">Item Master</p> <p class="help">Item Master</p>
<br> <br>
<h4><a href="#!List/Contact">Contact</a></h4> <h5><a href="#List/Contact">Contact</a></h5>
<p class="help">Contact Master</p> <p class="help">Contact Master</p>
<br> <br>
<h4><a href="#!List/Address">Address</a></h4> <h5><a href="#List/Address">Address</a></h5>
<p class="help">Address Master</p> <p class="help">Address Master</p>
<br> <br>
<h4><a href="#purchase-analytics" data-role="Analytics, Purchase Manager"> <h5><a href="#purchase-analytics" data-role="Analytics, Purchase Manager">
Purchase Analytics</a> Purchase Analytics</a>
<span style="background-color: #fed; font-weight: normal; font-size: 80%">beta</span> </h5>
</h4>
<p class="help">Purchase trends based on Purchase Invoice</p> <p class="help">Purchase trends based on Purchase Invoice</p>
</div> </div>
<div style="clear: both"></div> <div style="clear: both"></div>
@ -43,29 +42,29 @@
<div class="section-item"> <div class="section-item">
<a class="section-link" <a class="section-link"
title = "Tax and charges structure master" title = "Tax and charges structure master"
href="#!List/Purchase Taxes and Charges Master">Purchase Taxes and Charges Master</a> href="#List/Purchase Taxes and Charges Master">Purchase Taxes and Charges Master</a>
</div> </div>
<div class="section-item"> <div class="section-item">
<a class="section-link" <a class="section-link"
title = "Supplier classification" title = "Supplier classification"
href="#!List/Supplier Type">Supplier Type</a> href="#List/Supplier Type">Supplier Type</a>
</div> </div>
<div class="section-item"> <div class="section-item">
<a class="section-link" <a class="section-link"
title = "Tree of item classification" title = "Tree of item classification"
href="#!Sales Browser/Item Group" href="#Sales Browser/Item Group"
data-role="Purchase Manager, Purchase Master Manager data-role="Purchase Manager, Purchase Master Manager
Accounts Manager">Item Group</a> Accounts Manager">Item Group</a>
</div> </div>
<div class="section-item"> <div class="section-item">
<a class="section-link" <a class="section-link"
title = "Helper for managing return of goods (sales or purchase)" title = "Helper for managing return of goods (sales or purchase)"
href="#!Form/Sales and Purchase Return Tool/Sales and Purchase Return Tool">Purchase Returns</a> href="#Form/Sales and Purchase Return Tool/Sales and Purchase Return Tool">Purchase Returns</a>
</div> </div>
<div class="section-item"> <div class="section-item">
<a class="section-link" <a class="section-link"
title = "Terms of contract template" title = "Terms of contract template"
href="#!List/Terms and Conditions">Terms and Conditions Template</a> href="#List/Terms and Conditions">Terms and Conditions Template</a>
</div> </div>
</div> </div>
</div> </div>
@ -75,7 +74,7 @@
<div class="section-item"> <div class="section-item">
<a class="section-link" <a class="section-link"
title = "Analyze Sales and Purchase trends and slice them based on item, customer, groups etc" title = "Analyze Sales and Purchase trends and slice them based on item, customer, groups etc"
href="#!Report/Profile/Trend Analyzer">Trend Analyzer</a> href="#Report/Profile/Trend Analyzer">Trend Analyzer</a>
</div> </div>
</div> </div>
</div> </div>

2
home/page/activity/activity.js
View File

@ -32,7 +32,7 @@ erpnext.ActivityFeed = Class.extend({
}, },
scrub_data: function(data) { scrub_data: function(data) {
data.by = wn.user_info(data.owner).fullname; data.by = wn.user_info(data.owner).fullname;
data.imgsrc = wn.user_info(data.owner).image; data.imgsrc = wn.utils.get_file_link(wn.user_info(data.owner).image);
// feedtype // feedtype
if(!data.feed_type) { if(!data.feed_type) {

3
home/page/latest_updates/latest_updates.js
View File

@ -1,4 +1,7 @@
erpnext.updates = [ erpnext.updates = [
["12th December 2012", [
"Attachments: Attachments can be set as URLs or File Uploads. This will help if people want to share documents from Google Docs, Dropbox and other such services (esp for the Product listings on websites).",
]],
["6th December 2012", [ ["6th December 2012", [
"Rename: Cost Center, Item Group, Customer Group, Supplier Type, Territory, Sales Person can now be renamed.", "Rename: Cost Center, Item Group, Customer Group, Supplier Type, Territory, Sales Person can now be renamed.",
"Newsletter: Send newsletter to a list of email addresses.", "Newsletter: Send newsletter to a list of email addresses.",

44
hr/page/hr_home/hr_home.html
View File

@ -2,23 +2,23 @@
<div class="appframe-area"></div> <div class="appframe-area"></div>
<div class="layout-main-section"> <div class="layout-main-section">
<div style="width: 48%; float: left;"> <div style="width: 48%; float: left;">
<h4><a href="#!List/Attendance">Attendance</a></h4> <h5><a href="#List/Attendance">Attendance</a></h5>
<p class="help">Attendance Mark</p> <p class="help">Attendance Mark</p>
<br> <br>
<h4><a href="#!List/Leave Application">Leave Application</a></h4> <h5><a href="#List/Leave Application">Leave Application</a></h5>
<p class="help">Applications for leave</p> <p class="help">Applications for leave</p>
<br> <br>
<h4><a href="#!List/Expense Claim">Expense Claim</a></h4> <h5><a href="#List/Expense Claim">Expense Claim</a></h5>
<p class="help">Claims for expenses</p> <p class="help">Claims for expenses</p>
<br> <br>
<h4><a href="#!List/Salary Slip">Salary Slip</a></h4> <h5><a href="#List/Salary Slip">Salary Slip</a></h5>
<p class="help">Monthly salary statement</p> <p class="help">Monthly salary statement</p>
<br> <br>
<h4><a href="#!List/Appraisal">Appraisal</a></h4> <h5><a href="#List/Appraisal">Appraisal</a></h5>
<p class="help">Performance appraisal</p> <p class="help">Performance appraisal</p>
</div> </div>
<div style="width: 48%; float: right;"> <div style="width: 48%; float: right;">
<h4><a href="#!List/Employee">Employee</a></h4> <h5><a href="#List/Employee">Employee</a></h5>
<p class="help">Employee Master</p> <p class="help">Employee Master</p>
</div> </div>
<div style="clear: both"></div> <div style="clear: both"></div>
@ -34,28 +34,28 @@
<div class="section-item"> <div class="section-item">
<a class="section-link" <a class="section-link"
title = "Upload and update attendance from a spreadsheet file (csv)" title = "Upload and update attendance from a spreadsheet file (csv)"
href="#!Form/Attendance Control Panel/Attendance Control Panel">Upload attendance</a> href="#Form/Attendance Control Panel/Attendance Control Panel">Upload attendance</a>
</div> </div>
<div class="section-item"> <div class="section-item">
<a class="section-link" <a class="section-link"
title = "Leave allocation helper" title = "Leave allocation helper"
href="#!Form/Leave Control Panel/Leave Control Panel">Leave Allocation Tool</a> href="#Form/Leave Control Panel/Leave Control Panel">Leave Allocation Tool</a>
</div> </div>
<div class="section-item"> <div class="section-item">
<a class="section-link" <a class="section-link"
title = "Allocate leaves" title = "Allocate leaves"
href="#!List/Leave Allocation">Leave Allocation</a> href="#List/Leave Allocation">Leave Allocation</a>
</div> </div>
<div class="section-item"> <div class="section-item">
<a class="section-link" <a class="section-link"
title = "Type of leaves like casual, sick etc." title = "Type of leaves like casual, sick etc."
href="#!List/Leave Type">Leave Type</a> href="#List/Leave Type">Leave Type</a>
</div> </div>
<div class="section-item"> <div class="section-item">
<a class="section-link" <a class="section-link"
title = "List of holidays" title = "List of holidays"
href="#!List/Holiday List">Holiday List</a> href="#List/Holiday List">Holiday List</a>
</div> </div>
</div> </div>
</div> </div>
@ -65,22 +65,22 @@
<div class="section-item"> <div class="section-item">
<a class="section-link" <a class="section-link"
title = "Monthly salary template with earnings and deductions" title = "Monthly salary template with earnings and deductions"
href="#!List/Salary Structure">Salary Structure</a> href="#List/Salary Structure">Salary Structure</a>
</div> </div>
<div class="section-item"> <div class="section-item">
<a class="section-link" <a class="section-link"
title = "Generate Salary Slips" title = "Generate Salary Slips"
href="#!Form/Salary Manager/Salary Manager">Process Payroll</a> href="#Form/Salary Manager/Salary Manager">Process Payroll</a>
</div> </div>
<div class="section-item"> <div class="section-item">
<a class="section-link" <a class="section-link"
title = "Benefit types like basic salary, allowances etc." title = "Benefit types like basic salary, allowances etc."
href="#!List/Earning Type">Earning Type</a> href="#List/Earning Type">Earning Type</a>
</div> </div>
<div class="section-item"> <div class="section-item">
<a class="section-link" <a class="section-link"
title = "tax and other salary deductions" title = "tax and other salary deductions"
href="#!List/Deduction Type">Deduction Type</a> href="#List/Deduction Type">Deduction Type</a>
</div> </div>
</div> </div>
</div> </div>
@ -90,32 +90,32 @@
<div class="section-item"> <div class="section-item">
<a class="section-link" <a class="section-link"
title = "Type of employment master" title = "Type of employment master"
href="#!List/Employment Type">Employment Type</a> href="#List/Employment Type">Employment Type</a>
</div> </div>
<div class="section-item"> <div class="section-item">
<a class="section-link" <a class="section-link"
title = "Template for employee performance appraisals" title = "Template for employee performance appraisals"
href="#!List/Appraisal Template">Appraisal Template</a> href="#List/Appraisal Template">Appraisal Template</a>
</div> </div>
<div class="section-item"> <div class="section-item">
<a class="section-link" <a class="section-link"
title = "Company branches (for employee records)" title = "Company branches (for employee records)"
href="#!List/Branch">Branch</a> href="#List/Branch">Branch</a>
</div> </div>
<div class="section-item"> <div class="section-item">
<a class="section-link" <a class="section-link"
title = "Company departments" title = "Company departments"
href="#!List/Department">Department</a> href="#List/Department">Department</a>
</div> </div>
<div class="section-item"> <div class="section-item">
<a class="section-link" <a class="section-link"
title = "Company departments" title = "Company departments"
href="#!List/Designation">Designation</a> href="#List/Designation">Designation</a>
</div> </div>
<div class="section-item"> <div class="section-item">
<a class="section-link" <a class="section-link"
title = "Employee grades" title = "Employee grades"
href="#!List/Grade">Grade</a> href="#List/Grade">Grade</a>
</div> </div>
</div> </div>
</div> </div>
@ -125,7 +125,7 @@
<div class="section-item"> <div class="section-item">
<a class="section-link" <a class="section-link"
title = "Types of Expense Claim" title = "Types of Expense Claim"
href="#!List/Expense Claim Type">Expense Claim Type</a> href="#List/Expense Claim Type">Expense Claim Type</a>
</div> </div>
</div> </div>
</div> </div>

10
manufacturing/page/manufacturing_home/manufacturing_home.html
View File

@ -2,17 +2,17 @@
<div class="appframe-area"></div> <div class="appframe-area"></div>
<div class="layout-main-section"> <div class="layout-main-section">
<div style="width: 48%; float: left;"> <div style="width: 48%; float: left;">
<h4><a href="#!List/Production Order">Production Order</a></h4> <h5><a href="#List/Production Order">Production Order</a></h5>
<p class="help">Orders for manufacturing</p> <p class="help">Orders for manufacturing</p>
<br> <br>
<h4><a href="#!Form/Production Planning Tool/Production Planning Tool">Production Plan</a></h4> <h5><a href="#Form/Production Planning Tool/Production Planning Tool">Production Plan</a></h5>
<p class="help">Generate Purchase Requisition (MRP) and Production Orders</p> <p class="help">Generate Purchase Requisition (MRP) and Production Orders</p>
</div> </div>
<div style="width: 48%; float: right;"> <div style="width: 48%; float: right;">
<h4><a href="#!List/BOM">Bill of Materials</a></h4> <h5><a href="#List/BOM">Bill of Materials</a></h5>
<p class="help">Bill of Materials (BOM) Master</p> <p class="help">Bill of Materials (BOM) Master</p>
<br> <br>
<h4><a href="#!List/Item">Item</a></h4> <h5><a href="#List/Item">Item</a></h5>
<p class="help">Item Master</p> <p class="help">Item Master</p>
</div> </div>
<div style="clear: both"></div> <div style="clear: both"></div>
@ -38,7 +38,7 @@
<div class="section-item"> <div class="section-item">
<a class="section-link" <a class="section-link"
title = "Workstation master" title = "Workstation master"
href="#!List/Workstation">Workstations</a> href="#List/Workstation">Workstations</a>
</div> </div>
</div> </div>
</div> </div>

10
projects/page/projects_home/projects_home.html
View File

@ -2,17 +2,17 @@
<div class="appframe-area"></div> <div class="appframe-area"></div>
<div class="layout-main-section"> <div class="layout-main-section">
<div style="width: 48%; float: left;"> <div style="width: 48%; float: left;">
<h4><a href="#!List/Task">Task</a></h4> <h5><a href="#List/Task">Task</a></h5>
<p class="help">Project activity / task</p> <p class="help">Project activity / task</p>
<br> <br>
<h4><a href="#!List/Project">Project</a></h4> <h5><a href="#List/Project">Project</a></h5>
<p class="help">Project master</p> <p class="help">Project master</p>
<br> <br>
<h4><a href="#!List/Timesheet">Timesheet</a></h4> <h5><a href="#List/Timesheet">Timesheet</a></h5>
<p class="help">Timesheet for tasks</p> <p class="help">Timesheet for tasks</p>
</div> </div>
<div style="width: 48%; float: right;"> <div style="width: 48%; float: right;">
<h4><a href="#!Projects" data-role="Projects User">Gantt Chart</a></h4> <h5><a href="#Projects" data-role="Projects User">Gantt Chart</a></h5>
<p class="help">Gantt chart of all tasks</p> <p class="help">Gantt chart of all tasks</p>
</div> </div>
<div style="clear: both"></div> <div style="clear: both"></div>
@ -28,7 +28,7 @@
<div class="section-item"> <div class="section-item">
<a class="section-link" <a class="section-link"
title = "Types of activities for Time Sheets" title = "Types of activities for Time Sheets"
href="#!List/Activity Type">Activity Type</a> href="#List/Activity Type">Activity Type</a>
</div> </div>
</div> </div>
</div> </div>

50
selling/page/selling_home/selling_home.html
View File

@ -2,35 +2,37 @@
<div class="appframe-area"></div> <div class="appframe-area"></div>
<div class="layout-main-section"> <div class="layout-main-section">
<div style="width: 48%; float: left;"> <div style="width: 48%; float: left;">
<h4><a href="#!List/Lead">Lead</a></h4> <h5><a href="#List/Lead">Lead</a></h5>
<p class="help">Prospective customers</p> <p class="help">Prospective customers</p>
<br> <br>
<h4><a href="#!List/Opportunity">Opportunity</a></h4> <h5><a href="#List/Opportunity">Opportunity</a></h5>
<p class="help">Business opportunities</p> <p class="help">Business opportunities</p>
<br> <br>
<h4><a href="#!List/Quotation">Quotation</a></h4> <h5><a href="#List/Quotation">Quotation</a></h5>
<p class="help">Quotes sent to Leads / Customers</p> <p class="help">Quotes sent to Leads / Customers</p>
<br> <br>
<h4><a href="#!List/Sales Order">Sales Order</a></h4> <h5><a href="#List/Sales Order">Sales Order</a></h5>
<p class="help">Confirmed orders from Customers</p>
<br>
<h5><a href="#List/Sales Order">Communication</a></h5>
<p class="help">Confirmed orders from Customers</p> <p class="help">Confirmed orders from Customers</p>
</div> </div>
<div style="width: 48%; float: right;"> <div style="width: 48%; float: right;">
<h4><a href="#!List/Customer">Customer</a></h4> <h5><a href="#List/Customer">Customer</a></h5>
<p class="help">Customer Master</p> <p class="help">Customer Master</p>
<br> <br>
<h4><a href="#!List/Item">Item</a></h4> <h5><a href="#List/Item">Item</a></h5>
<p class="help">Item Master</p> <p class="help">Item Master</p>
<br> <br>
<h4><a href="#!List/Contact">Contact</a></h4> <h5><a href="#List/Contact">Contact</a></h5>
<p class="help">Contact Master</p> <p class="help">Contact Master</p>
<br> <br>
<h4><a href="#!List/Address">Address</a></h4> <h5><a href="#List/Address">Address</a></h5>
<p class="help">Address Master</p> <p class="help">Address Master</p>
<br> <br>
<h4><a href="#sales-analytics" data-role="Analytics, Sales Manager, <h5><a href="#sales-analytics" data-role="Analytics, Sales Manager,
Maintenance Manager">Sales Analytics</a> Maintenance Manager">Sales Analytics</a>
<span style="background-color: #fed; font-weight: normal; font-size: 80%">beta</span> </h5>
</h4>
<p class="help">Sales trends based on Sales Invoice</p> <p class="help">Sales trends based on Sales Invoice</p>
</div> </div>
<div style="clear: both"></div> <div style="clear: both"></div>
@ -46,65 +48,65 @@
<div class="section-item"> <div class="section-item">
<a class="section-link" <a class="section-link"
title = "Tax and charges structure master" title = "Tax and charges structure master"
href="#!List/Sales Taxes and Charges Master">Sales Taxes and Charges Master</a> href="#List/Sales Taxes and Charges Master">Sales Taxes and Charges Master</a>
</div> </div>
<div class="section-item"> <div class="section-item">
<a class="section-link" <a class="section-link"
title = "Multiple prices lists for items" title = "Multiple prices lists for items"
href="#!List/Price List">Price List</a> href="#List/Price List">Price List</a>
</div> </div>
<div class="section-item"> <div class="section-item">
<a class="section-link" <a class="section-link"
title = "Group items and accessories in one item code" title = "Group items and accessories in one item code"
href="#!List/Sales BOM">Sales BOM</a> href="#List/Sales BOM">Sales BOM</a>
</div> </div>
<div class="section-item"> <div class="section-item">
<a class="section-link" <a class="section-link"
title = "Terms of contract template" title = "Terms of contract template"
href="#!List/Terms and Conditions">Terms and Conditions Template</a> href="#List/Terms and Conditions">Terms and Conditions Template</a>
</div> </div>
<div class="section-item"> <div class="section-item">
<a class="section-link" <a class="section-link"
title = "Tree of customer groups" title = "Tree of customer groups"
href="#!Sales Browser/Customer Group" href="#Sales Browser/Customer Group"
data-role="Sales Manager, Sales Master Manager, data-role="Sales Manager, Sales Master Manager,
Accounts Manager">Customer Group</a> Accounts Manager">Customer Group</a>
</div> </div>
<div class="section-item"> <div class="section-item">
<a class="section-link" <a class="section-link"
title = "Tree of sales territories" title = "Tree of sales territories"
href="#!Sales Browser/Territory" href="#Sales Browser/Territory"
data-role="Sales Manager, Sales Master Manager data-role="Sales Manager, Sales Master Manager
Accounts Manager">Territory</a> Accounts Manager">Territory</a>
</div> </div>
<div class="section-item"> <div class="section-item">
<a class="section-link" <a class="section-link"
title = "Sales persons and targets" title = "Sales persons and targets"
href="#!Sales Browser/Sales Person" href="#Sales Browser/Sales Person"
data-role="Sales Manager, Sales Master Manager data-role="Sales Manager, Sales Master Manager
Accounts Manager">Sales Person</a> Accounts Manager">Sales Person</a>
</div> </div>
<div class="section-item"> <div class="section-item">
<a class="section-link" <a class="section-link"
title = "Commission partners and targets" title = "Commission partners and targets"
href="#!List/Sales Partner">Sales Partner</a> href="#List/Sales Partner">Sales Partner</a>
</div> </div>
<div class="section-item"> <div class="section-item">
<a class="section-link" <a class="section-link"
title = "Tree of item classification" title = "Tree of item classification"
href="#!Sales Browser/Item Group" href="#Sales Browser/Item Group"
data-role="Sales Manager, Sales Master Manager data-role="Sales Manager, Sales Master Manager
Accounts Manager">Item Group</a> Accounts Manager">Item Group</a>
</div> </div>
<div class="section-item"> <div class="section-item">
<a class="section-link" <a class="section-link"
title = "Sales campaigns" title = "Sales campaigns"
href="#!List/Campaign">Campaign</a> href="#List/Campaign">Campaign</a>
</div> </div>
<div class="section-item"> <div class="section-item">
<a class="section-link" <a class="section-link"
title = "Send mass SMS to your contacts, leads and employees" title = "Send mass SMS to your contacts, leads and employees"
href="#!Form/SMS Center/SMS Center">SMS Center</a> href="#Form/SMS Center/SMS Center">SMS Center</a>
</div> </div>
</div> </div>
</div> </div>
@ -114,12 +116,12 @@
<div class="section-item"> <div class="section-item">
<a class="section-link" <a class="section-link"
title = "Helper for managing return of goods (sales or purchase)" title = "Helper for managing return of goods (sales or purchase)"
href="#!Form/Sales and Purchase Return Tool/Sales and Purchase Return Tool">Sales Returns</a> href="#Form/Sales and Purchase Return Tool/Sales and Purchase Return Tool">Sales Returns</a>
</div> </div>
<div class="section-item"> <div class="section-item">
<a class="section-link" <a class="section-link"
title = "Analyze Sales and Purchase trends and slice them based on item, customer, groups etc" title = "Analyze Sales and Purchase trends and slice them based on item, customer, groups etc"
href="#!Report/Profile/Trend Analyzer">Trend Analyzer</a> href="#Report/Profile/Trend Analyzer">Trend Analyzer</a>
</div> </div>
</div> </div>
</div> </div>

17
stock/doctype/item/item.js
View File

@ -103,26 +103,19 @@ cur_frm.fields_dict['item_group'].get_query = function(doc,cdt,cdn) {
// a table with both image and attachment in HTML // a table with both image and attachment in HTML
// in the "alternate_description" field // in the "alternate_description" field
cur_frm.cscript.add_image = function(doc, dt, dn) { cur_frm.cscript.add_image = function(doc, dt, dn) {
if(!doc.file_list) { if(!doc.image) {
msgprint('Please attach a file first!'); msgprint('Please select an "Image" first');
return; return;
} }
var f = doc.file_list.split('\n')[0];
var fname = f.split(',')[0];
var fid = f.split(',')[1];
if(!in_list(['jpg','jpeg','gif','png'], fname.split('.')[1].toLowerCase())) {
msgprint('File must be of extension jpg, jpeg, gif or png'); return;
}
doc.description_html = repl('<table style="width: 100%; table-layout: fixed;">'+ doc.description_html = repl('<table style="width: 100%; table-layout: fixed;">'+
'<tr><td style="width:110px"><img src="%(imgurl)s" width="100px"></td>'+ '<tr><td style="width:110px"><img src="%(imgurl)s" width="100px"></td>'+
'<td>%(desc)s</td></tr>'+ '<td>%(desc)s</td></tr>'+
'</table>', {imgurl: wn.urllib.get_file_url(fid), desc:doc.description}); '</table>', {imgurl: wn.utils.get_file_link(doc.image), desc:doc.description});
refresh_field('description_html'); refresh_field('description_html');
} }
//===================== Quotation to validation - either customer or lead mandatory ==================== // Quotation to validation - either customer or lead mandatory
cur_frm.cscript.weight_to_validate = function(doc,cdt,cdn){ cur_frm.cscript.weight_to_validate = function(doc,cdt,cdn){
if((doc.nett_weight || doc.gross_weight) && !doc.weight_uom) if((doc.nett_weight || doc.gross_weight) && !doc.weight_uom)
@ -131,13 +124,11 @@ cur_frm.cscript.weight_to_validate = function(doc,cdt,cdn){
validated=0; validated=0;
} }
} }
//===================validation function =================================
cur_frm.cscript.validate = function(doc,cdt,cdn){ cur_frm.cscript.validate = function(doc,cdt,cdn){
cur_frm.cscript.weight_to_validate(doc,cdt,cdn); cur_frm.cscript.weight_to_validate(doc,cdt,cdn);
} }
//===========Fill Default Currency in "Item Prices====================
cur_frm.fields_dict['ref_rate_details'].grid.onrowadd = function(doc, cdt, cdn){ cur_frm.fields_dict['ref_rate_details'].grid.onrowadd = function(doc, cdt, cdn){
locals[cdt][cdn].ref_currency = sys_defaults.currency; locals[cdt][cdn].ref_currency = sys_defaults.currency;
refresh_field('ref_currency',cdn,'ref_rate_details'); refresh_field('ref_currency',cdn,'ref_rate_details');

43
stock/doctype/item/item.txt
View File

@ -2,9 +2,9 @@
{ {
"owner": "Administrator", "owner": "Administrator",
"docstatus": 0, "docstatus": 0,
"creation": "2012-12-07 15:15:29", "creation": "2012-12-11 15:58:47",
"modified_by": "Administrator", "modified_by": "Administrator",
"modified": "2012-12-07 15:44:48" "modified": "2012-12-11 16:08:49"
}, },
{ {
"allow_attach": 1, "allow_attach": 1,
@ -14,6 +14,7 @@
"description": "A Product or a Service that is bought, sold or kept in stock.", "description": "A Product or a Service that is bought, sold or kept in stock.",
"autoname": "field:item_code", "autoname": "field:item_code",
"name": "__common__", "name": "__common__",
"default_print_format": "Standard",
"allow_rename": 1, "allow_rename": 1,
"doctype": "DocType", "doctype": "DocType",
"max_attachments": 1 "max_attachments": 1
@ -131,14 +132,29 @@
"fieldtype": "Column Break", "fieldtype": "Column Break",
"permlevel": 0 "permlevel": 0
}, },
{
"doctype": "DocField",
"label": "Image",
"options": "attach_files:",
"fieldname": "image",
"fieldtype": "Select",
"permlevel": 0
},
{
"doctype": "DocField",
"label": "Image View",
"options": "image",
"fieldname": "image_view",
"fieldtype": "Image",
"permlevel": 0
},
{ {
"oldfieldtype": "Text", "oldfieldtype": "Text",
"doctype": "DocField", "doctype": "DocField",
"label": "Description", "label": "Description",
"oldfieldname": "description", "oldfieldname": "description",
"width": "300px",
"fieldname": "description", "fieldname": "description",
"fieldtype": "Text", "fieldtype": "Small Text",
"search_index": 0, "search_index": 0,
"reqd": 1, "reqd": 1,
"permlevel": 0, "permlevel": 0,
@ -148,13 +164,13 @@
"doctype": "DocField", "doctype": "DocField",
"label": "Description HTML", "label": "Description HTML",
"fieldname": "description_html", "fieldname": "description_html",
"fieldtype": "Text", "fieldtype": "Small Text",
"permlevel": 0 "permlevel": 0
}, },
{ {
"description": "Generates HTML to include image (1st attachment) in the description", "description": "Generates HTML to include selected image in the description",
"doctype": "DocField", "doctype": "DocField",
"label": "Add Image", "label": "Generate Description HTML",
"fieldname": "add_image", "fieldname": "add_image",
"fieldtype": "Button", "fieldtype": "Button",
"permlevel": 0 "permlevel": 0
@ -768,27 +784,18 @@
"doctype": "DocField", "doctype": "DocField",
"label": "Short Description", "label": "Short Description",
"fieldname": "web_short_description", "fieldname": "web_short_description",
"fieldtype": "Small Text", "fieldtype": "Text",
"permlevel": 0 "permlevel": 0
}, },
{ {
"depends_on": "show_in_website", "depends_on": "show_in_website",
"doctype": "DocField", "doctype": "DocField",
"label": "Long Description", "label": "Long Description",
"options": "Markdown",
"fieldname": "web_long_description", "fieldname": "web_long_description",
"fieldtype": "Text Editor", "fieldtype": "Text Editor",
"permlevel": 0 "permlevel": 0
}, },
{
"description": "These details will be shown in a formatted table the page for this product.",
"depends_on": "show_in_website",
"doctype": "DocField",
"label": "Item Website Specifications",
"options": "Item Website Specification",
"fieldname": "item_website_specifications",
"fieldtype": "Table",
"permlevel": 0
},
{ {
"amend": 0, "amend": 0,
"create": 0, "create": 0,

55
stock/page/stock_home/stock_home.html
View File

@ -2,44 +2,41 @@
<div class="appframe-area"></div> <div class="appframe-area"></div>
<div class="layout-main-section"> <div class="layout-main-section">
<div style="width: 48%; float: left;"> <div style="width: 48%; float: left;">
<h4><a href="#!List/Stock Entry">Stock Entry</a></h4> <h5><a href="#List/Stock Entry">Stock Entry</a></h5>
<p class="help">Transfer stock from one warehouse to another</p> <p class="help">Transfer stock from one warehouse to another</p>
<br> <br>
<h4><a href="#!List/Delivery Note">Delivery Note</a></h4> <h5><a href="#List/Delivery Note">Delivery Note</a></h5>
<p class="help">Delivery (shipment) to customers</p> <p class="help">Delivery (shipment) to customers</p>
<br> <br>
<h4><a href="#!List/Purchase Receipt">Purchase Receipt</a></h4> <h5><a href="#List/Purchase Receipt">Purchase Receipt</a></h5>
<p class="help">Goods received from Suppliers</p> <p class="help">Goods received from Suppliers</p>
</div> </div>
<div style="width: 48%; float: right;"> <div style="width: 48%; float: right;">
<h4><a href="#!List/Item">Item</a></h4> <h5><a href="#List/Item">Item</a></h5>
<p class="help">Item Master</p> <p class="help">Item Master</p>
<br> <br>
<h4><a href="#!List/Serial No">Serial No</a></h4> <h5><a href="#List/Serial No">Serial No</a></h5>
<p class="help">Single unit of an Item</p> <p class="help">Single unit of an Item</p>
<br> <br>
<h4><a href="#!List/Batch">Batch</a></h4> <h5><a href="#List/Batch">Batch</a></h5>
<p class="help">Batch of units of an Item</p> <p class="help">Batch of units of an Item</p>
<br> <br>
<h4><a href="#!List/Warehouse">Warehouse</a></h4> <h5><a href="#List/Warehouse">Warehouse</a></h5>
<p class="help">Warehouse is where items are stored</p> <p class="help">Warehouse is where items are stored</p>
<br> <br>
<h4><a href="#stock-ledger" data-role="Analytics, Material Manager, <h5><a href="#stock-ledger" data-role="Analytics, Material Manager,
Material User">Stock Ledger</a> Material User">Stock Ledger</a>
<span style="background-color: #fed; font-weight: normal; font-size: 80%">beta</span> </h5>
</h4>
<p class="help">Log of stock movements</p> <p class="help">Log of stock movements</p>
<br> <br>
<h4><a href="#stock-analytics" data-role="Analytics, Material Manager"> <h5><a href="#stock-analytics" data-role="Analytics, Material Manager">
Stock Analytics</a> Stock Analytics</a>
<span style="background-color: #fed; font-weight: normal; font-size: 80%">beta</span> </h5>
</h4>
<p class="help">Visual representation of stock trends</p> <p class="help">Visual representation of stock trends</p>
<br> <br>
<h4><a href="#stock-ageing" data-role="Analytics, Material Manager"> <h5><a href="#stock-ageing" data-role="Analytics, Material Manager">
Stock Ageing</a> Stock Ageing</a>
<span style="background-color: #fed; font-weight: normal; font-size: 80%">beta</span> </h5>
</h4>
<p class="help">Analysis of slow moving stock</p> <p class="help">Analysis of slow moving stock</p>
</div> </div>
<div style="clear: both"></div> <div style="clear: both"></div>
@ -55,47 +52,47 @@
<div class="section-item"> <div class="section-item">
<a class="section-link" <a class="section-link"
title = "Update stock by uploading a spreadsheet (csv) file" title = "Update stock by uploading a spreadsheet (csv) file"
href="#!List/Stock Reconciliation">Stock Reconciliation</a> href="#List/Stock Reconciliation">Stock Reconciliation</a>
</div> </div>
<div class="section-item"> <div class="section-item">
<a class="section-link" <a class="section-link"
title = "Details of item installations" title = "Details of item installations"
href="#!List/Installation Note">Installation Note</a> href="#List/Installation Note">Installation Note</a>
</div> </div>
<div class="section-item"> <div class="section-item">
<a class="section-link" <a class="section-link"
title = "Details packages against a delivery" title = "Details packages against a delivery"
href="#!List/Packing Slip">Packing Slip</a> href="#List/Packing Slip">Packing Slip</a>
</div> </div>
<div class="section-item"> <div class="section-item">
<a class="section-link" <a class="section-link"
title = "Multiple prices lists for items" title = "Multiple prices lists for items"
href="#!List/Price List">Price List</a> href="#List/Price List">Price List</a>
</div> </div>
<div class="section-item"> <div class="section-item">
<a class="section-link" <a class="section-link"
title = "Readings of incoming quality inspections" title = "Readings of incoming quality inspections"
href="#!List/Quality Inspection">Quality Inspection</a> href="#List/Quality Inspection">Quality Inspection</a>
</div> </div>
<div class="section-item"> <div class="section-item">
<a class="section-link" <a class="section-link"
title = "List of expense heads (Account) that will be distributed across incoming purchases (costs that you find out some time after you receive goods, like Custom Duty, but are a part of item valuation)" title = "List of expense heads (Account) that will be distributed across incoming purchases (costs that you find out some time after you receive goods, like Custom Duty, but are a part of item valuation)"
href="#!List/Landed Cost Master">Landed Cost Master</a> href="#List/Landed Cost Master">Landed Cost Master</a>
</div> </div>
<div class="section-item"> <div class="section-item">
<a class="section-link" <a class="section-link"
title = "Distribute costs on Purchase Receipts and add them to item value" title = "Distribute costs on Purchase Receipts and add them to item value"
href="#!Form/Landed Cost Wizard/Landed Cost Wizard">Landed Cost Wizard</a> href="#Form/Landed Cost Wizard/Landed Cost Wizard">Landed Cost Wizard</a>
</div> </div>
<div class="section-item"> <div class="section-item">
<a class="section-link" <a class="section-link"
title = "Change Unit of Measure (UOM) of an item" title = "Change Unit of Measure (UOM) of an item"
href="#!Form/Stock UOM Replace Utility/Stock UOM Replace Utility">UOM Replace Utility</a> href="#Form/Stock UOM Replace Utility/Stock UOM Replace Utility">UOM Replace Utility</a>
</div> </div>
<div class="section-item"> <div class="section-item">
<a class="section-link" <a class="section-link"
title = "Helper for managing return of goods (sales or purchase)" title = "Helper for managing return of goods (sales or purchase)"
href="#!Form/Sales and Purchase Return Tool/Sales and Purchase Return Tool">Sales or Purchase Returns</a> href="#Form/Sales and Purchase Return Tool/Sales and Purchase Return Tool">Sales or Purchase Returns</a>
</div> </div>
</div> </div>
</div> </div>
@ -105,24 +102,24 @@
<div class="section-item"> <div class="section-item">
<a class="section-link" <a class="section-link"
title = "Tree of item classification" title = "Tree of item classification"
href="#!Sales Browser/Item Group" href="#Sales Browser/Item Group"
data-role="Material Master Master, Material Manager, data-role="Material Master Master, Material Manager,
Accounts Manager">Item Group</a> Accounts Manager">Item Group</a>
</div> </div>
<div class="section-item"> <div class="section-item">
<a class="section-link" <a class="section-link"
title = "Unit of Measure (UOM) master" title = "Unit of Measure (UOM) master"
href="#!List/UOM">Unit of Measure (UOM)</a> href="#List/UOM">Unit of Measure (UOM)</a>
</div> </div>
<div class="section-item"> <div class="section-item">
<a class="section-link" <a class="section-link"
title = "List of Item Brands (optional)" title = "List of Item Brands (optional)"
href="#!List/Brand">Brand</a> href="#List/Brand">Brand</a>
</div> </div>
<div class="section-item"> <div class="section-item">
<a class="section-link" <a class="section-link"
title = "Types of warehouses" title = "Types of warehouses"
href="#!List/Warehouse Type">Warehouse Type</a> href="#List/Warehouse Type">Warehouse Type</a>
</div> </div>
</div> </div>
</div> </div>

16
support/page/support_home/support_home.html
View File

@ -2,26 +2,26 @@
<div class="appframe-area"></div> <div class="appframe-area"></div>
<div class="layout-main-section"> <div class="layout-main-section">
<div style="width: 48%; float: left;"> <div style="width: 48%; float: left;">
<h4><a href="#!List/Support Ticket">Support Ticket</a></h4> <h5><a href="#List/Support Ticket">Support Ticket</a></h5>
<p class="help">Support queries from customers via email or website</p> <p class="help">Support queries from customers via email or website</p>
<br> <br>
<h4><a href="#!List/Customer Issue">Customer Issue</a></h4> <h5><a href="#List/Customer Issue">Customer Issue</a></h5>
<p class="help">Customer Issue against a Serial No (warranty)</p> <p class="help">Customer Issue against a Serial No (warranty)</p>
<br> <br>
<h4><a href="#!List/Maintenance Schedule">Maintenance Schedule</a></h4> <h5><a href="#List/Maintenance Schedule">Maintenance Schedule</a></h5>
<p class="help">Plan for scheduled maintenance contracts</p> <p class="help">Plan for scheduled maintenance contracts</p>
<br> <br>
<h4><a href="#!List/Maintenance Visit">Maintenance Visit</a></h4> <h5><a href="#List/Maintenance Visit">Maintenance Visit</a></h5>
<p class="help">Visit report for maintenance visit</p> <p class="help">Visit report for maintenance visit</p>
<br> <br>
<h4><a href="#!List/Newsletter">Newsletter</a></h4> <h5><a href="#List/Newsletter">Newsletter</a></h5>
<p class="help">Send Newsletters to your contacts</p> <p class="help">Send Newsletters to your contacts</p>
<br> <br>
<h4><a href="#!List/Communication">Communication</a></h4> <h5><a href="#List/Communication">Communication</a></h5>
<p class="help">Communication Log</p> <p class="help">Communication Log</p>
</div> </div>
<div style="width: 48%; float: right;"> <div style="width: 48%; float: right;">
<h4><a href="#!List/Serial No">Serial No</a></h4> <h5><a href="#List/Serial No">Serial No</a></h5>
<p class="help">Single unit of an Item</p> <p class="help">Single unit of an Item</p>
</div> </div>
<div style="clear: both"></div> <div style="clear: both"></div>
@ -37,7 +37,7 @@
<div class="section-item"> <div class="section-item">
<a class="section-link" <a class="section-link"
title = "Pull support issue from support email account" title = "Pull support issue from support email account"
href="#!Form/Email Settings/Email Settings">Email Settings</a> href="#Form/Email Settings/Email Settings">Email Settings</a>
</div> </div>
</div> </div>
</div> </div>

8
utilities/page/messages/messages.js
View File

@ -88,7 +88,7 @@ erpnext.Messages = Class.extend({
$('#message-title').html(contact==user ? "Everyone" : $('#message-title').html(contact==user ? "Everyone" :
wn.user_info(contact).fullname) wn.user_info(contact).fullname)
$('#avatar-image').attr("src", wn.user_info(contact).image); $('#avatar-image').attr("src", wn.utils.get_file_link(wn.user_info(contact).image));
$("#show-everyone").toggle(contact!=user); $("#show-everyone").toggle(contact!=user);
@ -129,7 +129,7 @@ erpnext.Messages = Class.extend({
data.creation = dateutil.comment_when(data.creation); data.creation = dateutil.comment_when(data.creation);
data.comment_by_fullname = wn.user_info(data.owner).fullname; data.comment_by_fullname = wn.user_info(data.owner).fullname;
data.image = wn.user_info(data.owner).image; data.image = wn.utils.get_file_link(wn.user_info(data.owner).image);
data.mark_html = ""; data.mark_html = "";
data.reply_html = ''; data.reply_html = '';
@ -148,7 +148,7 @@ erpnext.Messages = Class.extend({
data-name="%(name)s">&times;</a>', data); data-name="%(name)s">&times;</a>', data);
} }
if(data.owner==data.comment_docname) { if(data.owner==data.comment_docname && data.parenttype!="Assignment") {
data.mark_html = "<div class='message-mark' title='Public'\ data.mark_html = "<div class='message-mark' title='Public'\
style='background-color: green'></div>" style='background-color: green'></div>"
} }
@ -190,7 +190,7 @@ erpnext.Messages = Class.extend({
var p = r.message[i]; var p = r.message[i];
if(p.name != user) { if(p.name != user) {
p.fullname = wn.user_info(p.name).fullname; p.fullname = wn.user_info(p.name).fullname;
p.image = wn.user_info(p.name).image; p.image = wn.utils.get_file_link(wn.user_info(p.name).image);
p.name = p.name.replace('@', '__at__'); p.name = p.name.replace('@', '__at__');
p.status_color = p.has_session ? "green" : "#ddd"; p.status_color = p.has_session ? "green" : "#ddd";
p.status = p.has_session ? "Online" : "Offline"; p.status = p.has_session ? "Online" : "Offline";

1
utilities/page/messages/messages.py
View File

@ -72,6 +72,7 @@ def post(arg=None):
arg.update(webnotes.form_dict) arg.update(webnotes.form_dict)
from webnotes.model.doc import Document from webnotes.model.doc import Document
d = Document('Comment') d = Document('Comment')
d.parenttype = arg.get("parenttype")
d.comment = arg['txt'] d.comment = arg['txt']
d.comment_docname = arg['contact'] d.comment_docname = arg['contact']
d.comment_doctype = 'Message' d.comment_doctype = 'Message'

8
website/page/website_home/website_home.html
View File

@ -2,17 +2,17 @@
<div class="appframe-area"></div> <div class="appframe-area"></div>
<div class="layout-main-section"> <div class="layout-main-section">
<div style="width: 48%; float: left;"> <div style="width: 48%; float: left;">
<h4><a href="#!List/Web Page">Web Page</a></h4> <h5><a href="#List/Web Page">Web Page</a></h5>
<p class="help">Static (content) web page</p> <p class="help">Static (content) web page</p>
<br> <br>
<h4><a href="#!List/Blog">Blog</a></h4> <h5><a href="#List/Blog">Blog</a></h5>
<p class="help">Weblog (blog) entry</p> <p class="help">Weblog (blog) entry</p>
</div> </div>
<div style="width: 48%; float: right;"> <div style="width: 48%; float: right;">
<h4><a href="#!Form/Website Settings/Website Settings">Website Settings</a></h4> <h5><a href="#Form/Website Settings/Website Settings">Website Settings</a></h5>
<p class="help">Setup of top navigation bar, footer and logo</p> <p class="help">Setup of top navigation bar, footer and logo</p>
<br> <br>
<h4><a href="#!Form/Style Settings/Style Settings">Style Settings</a></h4> <h5><a href="#Form/Style Settings/Style Settings">Style Settings</a></h5>
<p class="help">Setup of fonts and background</p> <p class="help">Setup of fonts and background</p>
</div> </div>
<div style="clear: both"></div> <div style="clear: both"></div>