From 24a69613e0dac4b4bc679dec5139e5d14e3f675a Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 11 Dec 2012 15:58:19 +0530 Subject: [PATCH 1/4] update file urls --- home/page/activity/activity.js | 2 +- stock/doctype/item/item.txt | 110 ++++++++++++++-------------- utilities/page/messages/messages.js | 6 +- 3 files changed, 59 insertions(+), 59 deletions(-) diff --git a/home/page/activity/activity.js b/home/page/activity/activity.js index df34b04348..90977be19b 100644 --- a/home/page/activity/activity.js +++ b/home/page/activity/activity.js @@ -32,7 +32,7 @@ erpnext.ActivityFeed = Class.extend({ }, scrub_data: function(data) { 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 if(!data.feed_type) { diff --git a/stock/doctype/item/item.txt b/stock/doctype/item/item.txt index 889f29b4ad..cabf7fa23a 100644 --- a/stock/doctype/item/item.txt +++ b/stock/doctype/item/item.txt @@ -2,9 +2,9 @@ { "owner": "Administrator", "docstatus": 0, - "creation": "2012-12-07 15:15:29", + "creation": "2012-12-06 15:57:02", "modified_by": "Administrator", - "modified": "2012-12-07 15:44:48" + "modified": "2012-12-11 15:56:37" }, { "allow_attach": 1, @@ -14,6 +14,7 @@ "description": "A Product or a Service that is bought, sold or kept in stock.", "autoname": "field:item_code", "name": "__common__", + "default_print_format": "Standard", "allow_rename": 1, "doctype": "DocType", "max_attachments": 1 @@ -131,6 +132,14 @@ "fieldtype": "Column Break", "permlevel": 0 }, + { + "doctype": "DocField", + "label": "Image", + "options": "attach_files:", + "fieldname": "image", + "fieldtype": "Select", + "permlevel": 0 + }, { "oldfieldtype": "Text", "doctype": "DocField", @@ -768,72 +777,23 @@ "doctype": "DocField", "label": "Short Description", "fieldname": "web_short_description", - "fieldtype": "Small Text", + "fieldtype": "Text", "permlevel": 0 }, { "depends_on": "show_in_website", "doctype": "DocField", "label": "Long Description", + "options": "Markdown", "fieldname": "web_long_description", "fieldtype": "Text Editor", "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, - "create": 0, - "doctype": "DocPerm", - "submit": 0, - "write": 0, - "cancel": 0, - "role": "Material Manager", - "permlevel": 1 - }, - { - "amend": 0, - "create": 0, - "doctype": "DocPerm", - "submit": 0, - "write": 0, - "cancel": 0, - "role": "Material Manager", - "permlevel": 0 - }, - { - "amend": 0, - "create": 0, - "doctype": "DocPerm", - "submit": 0, - "write": 0, - "cancel": 0, - "role": "Material User", - "permlevel": 1 - }, - { - "amend": 0, - "create": 0, - "doctype": "DocPerm", - "submit": 0, - "write": 0, - "cancel": 0, - "role": "Material User", - "permlevel": 0 - }, { "create": 1, "doctype": "DocPerm", "write": 1, - "role": "Material Master Manager", + "role": "System Manager", "cancel": 1, "permlevel": 0 }, @@ -848,7 +808,7 @@ "create": 1, "doctype": "DocPerm", "write": 1, - "role": "System Manager", + "role": "Material Master Manager", "cancel": 1, "permlevel": 0 }, @@ -856,5 +816,45 @@ "doctype": "DocPerm", "role": "System Manager", "permlevel": 1 + }, + { + "amend": 0, + "create": 0, + "doctype": "DocPerm", + "submit": 0, + "write": 0, + "role": "Material Manager", + "cancel": 0, + "permlevel": 1 + }, + { + "amend": 0, + "create": 0, + "doctype": "DocPerm", + "submit": 0, + "write": 0, + "role": "Material Manager", + "cancel": 0, + "permlevel": 0 + }, + { + "amend": 0, + "create": 0, + "doctype": "DocPerm", + "submit": 0, + "write": 0, + "role": "Material User", + "cancel": 0, + "permlevel": 1 + }, + { + "amend": 0, + "create": 0, + "doctype": "DocPerm", + "submit": 0, + "write": 0, + "role": "Material User", + "cancel": 0, + "permlevel": 0 } ] \ No newline at end of file diff --git a/utilities/page/messages/messages.js b/utilities/page/messages/messages.js index 625fe5b535..6683540328 100644 --- a/utilities/page/messages/messages.js +++ b/utilities/page/messages/messages.js @@ -88,7 +88,7 @@ erpnext.Messages = Class.extend({ $('#message-title').html(contact==user ? "Everyone" : 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); @@ -129,7 +129,7 @@ erpnext.Messages = Class.extend({ data.creation = dateutil.comment_when(data.creation); 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.reply_html = ''; @@ -190,7 +190,7 @@ erpnext.Messages = Class.extend({ var p = r.message[i]; if(p.name != user) { 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.status_color = p.has_session ? "green" : "#ddd"; p.status = p.has_session ? "Online" : "Offline"; From 38b6af97e56361c1c890c63ace2fe9bd49e2bb0c Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 11 Dec 2012 16:19:14 +0530 Subject: [PATCH 2/4] updates to attachment --- stock/doctype/item/item.js | 17 ++---- stock/doctype/item/item.txt | 105 +++++++++++++++++++----------------- 2 files changed, 60 insertions(+), 62 deletions(-) diff --git a/stock/doctype/item/item.js b/stock/doctype/item/item.js index 828beab384..ca64d59ddb 100644 --- a/stock/doctype/item/item.js +++ b/stock/doctype/item/item.js @@ -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 // in the "alternate_description" field cur_frm.cscript.add_image = function(doc, dt, dn) { - if(!doc.file_list) { - msgprint('Please attach a file first!'); + if(!doc.image) { + msgprint('Please select an "Image" first'); 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(''+ ''+ ''+ - '
%(desc)s
', {imgurl: wn.urllib.get_file_url(fid), desc:doc.description}); + '', {imgurl: wn.utils.get_file_link(doc.image), desc:doc.description}); 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){ 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; } } -//===================validation function ================================= cur_frm.cscript.validate = function(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){ locals[cdt][cdn].ref_currency = sys_defaults.currency; refresh_field('ref_currency',cdn,'ref_rate_details'); diff --git a/stock/doctype/item/item.txt b/stock/doctype/item/item.txt index cabf7fa23a..82256802a9 100644 --- a/stock/doctype/item/item.txt +++ b/stock/doctype/item/item.txt @@ -2,9 +2,9 @@ { "owner": "Administrator", "docstatus": 0, - "creation": "2012-12-06 15:57:02", + "creation": "2012-12-11 15:58:47", "modified_by": "Administrator", - "modified": "2012-12-11 15:56:37" + "modified": "2012-12-11 16:08:49" }, { "allow_attach": 1, @@ -140,14 +140,21 @@ "fieldtype": "Select", "permlevel": 0 }, + { + "doctype": "DocField", + "label": "Image View", + "options": "image", + "fieldname": "image_view", + "fieldtype": "Image", + "permlevel": 0 + }, { "oldfieldtype": "Text", "doctype": "DocField", "label": "Description", "oldfieldname": "description", - "width": "300px", "fieldname": "description", - "fieldtype": "Text", + "fieldtype": "Small Text", "search_index": 0, "reqd": 1, "permlevel": 0, @@ -157,13 +164,13 @@ "doctype": "DocField", "label": "Description HTML", "fieldname": "description_html", - "fieldtype": "Text", + "fieldtype": "Small Text", "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", - "label": "Add Image", + "label": "Generate Description HTML", "fieldname": "add_image", "fieldtype": "Button", "permlevel": 0 @@ -789,11 +796,51 @@ "fieldtype": "Text Editor", "permlevel": 0 }, + { + "amend": 0, + "create": 0, + "doctype": "DocPerm", + "submit": 0, + "write": 0, + "cancel": 0, + "role": "Material Manager", + "permlevel": 1 + }, + { + "amend": 0, + "create": 0, + "doctype": "DocPerm", + "submit": 0, + "write": 0, + "cancel": 0, + "role": "Material Manager", + "permlevel": 0 + }, + { + "amend": 0, + "create": 0, + "doctype": "DocPerm", + "submit": 0, + "write": 0, + "cancel": 0, + "role": "Material User", + "permlevel": 1 + }, + { + "amend": 0, + "create": 0, + "doctype": "DocPerm", + "submit": 0, + "write": 0, + "cancel": 0, + "role": "Material User", + "permlevel": 0 + }, { "create": 1, "doctype": "DocPerm", "write": 1, - "role": "System Manager", + "role": "Material Master Manager", "cancel": 1, "permlevel": 0 }, @@ -808,7 +855,7 @@ "create": 1, "doctype": "DocPerm", "write": 1, - "role": "Material Master Manager", + "role": "System Manager", "cancel": 1, "permlevel": 0 }, @@ -816,45 +863,5 @@ "doctype": "DocPerm", "role": "System Manager", "permlevel": 1 - }, - { - "amend": 0, - "create": 0, - "doctype": "DocPerm", - "submit": 0, - "write": 0, - "role": "Material Manager", - "cancel": 0, - "permlevel": 1 - }, - { - "amend": 0, - "create": 0, - "doctype": "DocPerm", - "submit": 0, - "write": 0, - "role": "Material Manager", - "cancel": 0, - "permlevel": 0 - }, - { - "amend": 0, - "create": 0, - "doctype": "DocPerm", - "submit": 0, - "write": 0, - "role": "Material User", - "cancel": 0, - "permlevel": 1 - }, - { - "amend": 0, - "create": 0, - "doctype": "DocPerm", - "submit": 0, - "write": 0, - "role": "Material User", - "cancel": 0, - "permlevel": 0 } ] \ No newline at end of file From 39b5b0653e70c38bd371a056bbe9fe93da6e1b3a Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 11 Dec 2012 16:28:33 +0530 Subject: [PATCH 3/4] assign_to / messages public bug --- utilities/page/messages/messages.js | 2 +- utilities/page/messages/messages.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/utilities/page/messages/messages.js b/utilities/page/messages/messages.js index 6683540328..6ade603e2b 100644 --- a/utilities/page/messages/messages.js +++ b/utilities/page/messages/messages.js @@ -148,7 +148,7 @@ erpnext.Messages = Class.extend({ data-name="%(name)s">×', data); } - if(data.owner==data.comment_docname) { + if(data.owner==data.comment_docname && data.parenttype!="Assignment") { data.mark_html = "
" } diff --git a/utilities/page/messages/messages.py b/utilities/page/messages/messages.py index afe4e78d34..bec0e32520 100644 --- a/utilities/page/messages/messages.py +++ b/utilities/page/messages/messages.py @@ -72,6 +72,7 @@ def post(arg=None): arg.update(webnotes.form_dict) from webnotes.model.doc import Document d = Document('Comment') + d.parenttype = arg.get("parenttype") d.comment = arg['txt'] d.comment_docname = arg['contact'] d.comment_doctype = 'Message' From 74aebf0965e5345c799ee95c8dcf75c031c5ff67 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 12 Dec 2012 11:03:51 +0530 Subject: [PATCH 4/4] added Communication to Selling and refactored module pages a bit --- .../page/accounts_home/accounts_home.html | 63 +++++++++---------- buying/page/buying_home/buying_home.html | 31 +++++---- home/page/latest_updates/latest_updates.js | 3 + hr/page/hr_home/hr_home.html | 44 ++++++------- .../page/production_home/production_home.html | 10 +-- .../page/projects_home/projects_home.html | 10 +-- selling/page/selling_home/selling_home.html | 50 ++++++++------- stock/page/stock_home/stock_home.html | 55 ++++++++-------- support/page/support_home/support_home.html | 16 ++--- website/page/website_home/website_home.html | 8 +-- 10 files changed, 144 insertions(+), 146 deletions(-) diff --git a/accounts/page/accounts_home/accounts_home.html b/accounts/page/accounts_home/accounts_home.html index 078c3f0e97..0e71487c26 100644 --- a/accounts/page/accounts_home/accounts_home.html +++ b/accounts/page/accounts_home/accounts_home.html @@ -2,41 +2,38 @@
-

Journal Voucher

+
Journal Voucher

General Ledger Entries


-

Sales Invoice

+
Sales Invoice

Bills raised to Customers


-

Purchase Invoice

+
Purchase Invoice

Bills raised by Suppliers

-

Chart of Accounts

+
Chart of Accounts

Structure of books of accounts


-

Chart of Cost Centers

+
Chart of Cost Centers

Structure cost centers


-

General Ledger - beta -

+

General Ledger Report


-

Trial Balance - beta -

+

Tree view of all Account balances


-

Financial Analytics - beta -

+

Visual representation of financial trends

@@ -52,34 +49,34 @@
Bank Reconciliation + href="#Form/Bank Reconciliation/Bank Reconciliation">Bank Reconciliation
Payment Reconciliation + href="#Form/Payment to Invoice Matching Tool/Payment to Invoice Matching Tool">Payment Reconciliation
Close Period Entry + href="#List/Period Closing Voucher">Close Period Entry
Sales or Purchase Returns + href="#Form/Sales and Purchase Return Tool/Sales and Purchase Return Tool">Sales or Purchase Returns
Trend Analyzer + href="#Report/Profile/Trend Analyzer">Trend Analyzer
Financial Statements + href="#Financial Statements">Financial Statements
Sales Taxes and Charges Master + href="#List/Sales Taxes and Charges Master">Sales Taxes and Charges Master
Purchase Taxes and Charges Master + href="#List/Purchase Taxes and Charges Master">Purchase Taxes and Charges Master
Point of Sale (PoS) Setting + href="#List/POS Setting">Point of Sale (PoS) Setting
Budget Distribution + href="#List/Budget Distribution">Budget Distribution
Terms and Conditions Template + href="#List/Terms and Conditions">Terms and Conditions Template
Mode of Payment + href="#List/Mode of Payment">Mode of Payment
@@ -131,32 +128,32 @@
TDS Payments + href="#List/TDS Payment">TDS Payments
TDS Return Acknowledgement + href="#List/TDS Return Acknowledgement">TDS Return Acknowledgement
TDS Category + href="#List/TDS Category">TDS Category
TDS Rate Chart + href="#List/TDS Rate Chart">TDS Rate Chart
Form 16A + href="#List/Form 16A">Form 16A
C-Form + href="#List/C-Form">C-Form
diff --git a/buying/page/buying_home/buying_home.html b/buying/page/buying_home/buying_home.html index 9ec7b7570c..68544fb3d3 100644 --- a/buying/page/buying_home/buying_home.html +++ b/buying/page/buying_home/buying_home.html @@ -2,32 +2,31 @@
-

Purchase Request

+
Purchase Request

Request for purchase


-

Supplier Quotation (beta)

+
Supplier Quotation (beta)

Track Quotations received from Suppliers


-

Purchase Order

+
Purchase Order

Purchase Orders given to Suppliers

-

Supplier

+
Supplier

Supplier Master


-

Item

+
Item

Item Master


-

Contact

+
Contact

Contact Master


-

Address

+
Address

Address Master


-

+
Purchase Analytics - beta -
+

Purchase trends based on Purchase Invoice

@@ -43,29 +42,29 @@
Purchase Taxes and Charges Master + href="#List/Purchase Taxes and Charges Master">Purchase Taxes and Charges Master
Supplier Type + href="#List/Supplier Type">Supplier Type
Item Group
Purchase Returns + href="#Form/Sales and Purchase Return Tool/Sales and Purchase Return Tool">Purchase Returns
Terms and Conditions Template + href="#List/Terms and Conditions">Terms and Conditions Template
@@ -75,7 +74,7 @@
Trend Analyzer + href="#Report/Profile/Trend Analyzer">Trend Analyzer
diff --git a/home/page/latest_updates/latest_updates.js b/home/page/latest_updates/latest_updates.js index 047e627a5f..04d366adbc 100644 --- a/home/page/latest_updates/latest_updates.js +++ b/home/page/latest_updates/latest_updates.js @@ -1,4 +1,7 @@ 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", [ "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.", diff --git a/hr/page/hr_home/hr_home.html b/hr/page/hr_home/hr_home.html index 36183b075c..b7c91bb58a 100644 --- a/hr/page/hr_home/hr_home.html +++ b/hr/page/hr_home/hr_home.html @@ -2,23 +2,23 @@
-

Attendance

+
Attendance

Attendance Mark


-

Leave Application

+
Leave Application

Applications for leave


-

Expense Claim

+
Expense Claim

Claims for expenses


-

Salary Slip

+
Salary Slip

Monthly salary statement


-

Appraisal

+
Appraisal

Performance appraisal

-

Employee

+
Employee

Employee Master

@@ -34,28 +34,28 @@
Upload attendance + href="#Form/Attendance Control Panel/Attendance Control Panel">Upload attendance
Leave Allocation Tool + href="#Form/Leave Control Panel/Leave Control Panel">Leave Allocation Tool
Leave Allocation + href="#List/Leave Allocation">Leave Allocation
Leave Type + href="#List/Leave Type">Leave Type
Holiday List + href="#List/Holiday List">Holiday List
@@ -65,22 +65,22 @@
Salary Structure + href="#List/Salary Structure">Salary Structure
Process Payroll + href="#Form/Salary Manager/Salary Manager">Process Payroll
Earning Type + href="#List/Earning Type">Earning Type
Deduction Type + href="#List/Deduction Type">Deduction Type
@@ -90,32 +90,32 @@
Employment Type + href="#List/Employment Type">Employment Type
Appraisal Template + href="#List/Appraisal Template">Appraisal Template
Branch + href="#List/Branch">Branch
Department + href="#List/Department">Department
Designation + href="#List/Designation">Designation
Grade + href="#List/Grade">Grade
@@ -125,7 +125,7 @@
Expense Claim Type + href="#List/Expense Claim Type">Expense Claim Type
diff --git a/production/page/production_home/production_home.html b/production/page/production_home/production_home.html index 50f99b33e6..028e752d89 100644 --- a/production/page/production_home/production_home.html +++ b/production/page/production_home/production_home.html @@ -2,17 +2,17 @@
-

Production Order

+
Production Order

Orders for manufacturing


-

Production Plan

+
Production Plan

Generate Purchase Requisition (MRP) and Production Orders

-

Bill of Materials

+
Bill of Materials

Bill of Materials (BOM) Master


-

Item

+
Item

Item Master

@@ -28,7 +28,7 @@
Workstations + href="#List/Workstation">Workstations
diff --git a/projects/page/projects_home/projects_home.html b/projects/page/projects_home/projects_home.html index d69f0af590..5cd48a0aaf 100644 --- a/projects/page/projects_home/projects_home.html +++ b/projects/page/projects_home/projects_home.html @@ -2,17 +2,17 @@
-

Task

+
Task

Project activity / task


-

Project

+
Project

Project master


-

Timesheet

+
Timesheet

Timesheet for tasks

-

Gantt Chart

+
Gantt Chart

Gantt chart of all tasks

@@ -28,7 +28,7 @@
Activity Type + href="#List/Activity Type">Activity Type
diff --git a/selling/page/selling_home/selling_home.html b/selling/page/selling_home/selling_home.html index 86fe47f8d1..54f2e386f9 100644 --- a/selling/page/selling_home/selling_home.html +++ b/selling/page/selling_home/selling_home.html @@ -2,35 +2,37 @@
-

Lead

+
Lead

Prospective customers


-

Opportunity

+
Opportunity

Business opportunities


-

Quotation

+
Quotation

Quotes sent to Leads / Customers


-

Sales Order

+
Sales Order
+

Confirmed orders from Customers

+
+
Communication

Confirmed orders from Customers

-

Customer

+
Customer

Customer Master


-

Item

+
Item

Item Master


-

Contact

+
Contact

Contact Master


-

Address

+
Address

Address Master


-

Sales Analytics - beta -

+

Sales trends based on Sales Invoice

@@ -46,65 +48,65 @@
Sales Taxes and Charges Master + href="#List/Sales Taxes and Charges Master">Sales Taxes and Charges Master
Price List + href="#List/Price List">Price List
Sales BOM + href="#List/Sales BOM">Sales BOM
Terms and Conditions Template + href="#List/Terms and Conditions">Terms and Conditions Template
Customer Group
Territory
Sales Person
Sales Partner + href="#List/Sales Partner">Sales Partner
Item Group
Campaign + href="#List/Campaign">Campaign
SMS Center + href="#Form/SMS Center/SMS Center">SMS Center
@@ -114,12 +116,12 @@
Sales Returns + href="#Form/Sales and Purchase Return Tool/Sales and Purchase Return Tool">Sales Returns
Trend Analyzer + href="#Report/Profile/Trend Analyzer">Trend Analyzer
diff --git a/stock/page/stock_home/stock_home.html b/stock/page/stock_home/stock_home.html index fd338144b0..b89b0d0b2b 100644 --- a/stock/page/stock_home/stock_home.html +++ b/stock/page/stock_home/stock_home.html @@ -2,44 +2,41 @@
-

Stock Entry

+
Stock Entry

Transfer stock from one warehouse to another


-

Delivery Note

+
Delivery Note

Delivery (shipment) to customers


-

Purchase Receipt

+
Purchase Receipt

Goods received from Suppliers

-

Item

+
Item

Item Master


-

Serial No

+
Serial No

Single unit of an Item


-

Batch

+
Batch

Batch of units of an Item


-

Warehouse

+
Warehouse

Warehouse is where items are stored


-

Stock Ledger - beta -

+

Log of stock movements


-

+
Stock Analytics - beta -
+

Visual representation of stock trends


-

+
Stock Ageing - beta -
+

Analysis of slow moving stock

@@ -55,47 +52,47 @@
Stock Reconciliation + href="#List/Stock Reconciliation">Stock Reconciliation
Installation Note + href="#List/Installation Note">Installation Note
Packing Slip + href="#List/Packing Slip">Packing Slip
Price List + href="#List/Price List">Price List
Quality Inspection + href="#List/Quality Inspection">Quality Inspection
Landed Cost Master + href="#List/Landed Cost Master">Landed Cost Master
Landed Cost Wizard + href="#Form/Landed Cost Wizard/Landed Cost Wizard">Landed Cost Wizard
UOM Replace Utility + href="#Form/Stock UOM Replace Utility/Stock UOM Replace Utility">UOM Replace Utility
Sales or Purchase Returns + href="#Form/Sales and Purchase Return Tool/Sales and Purchase Return Tool">Sales or Purchase Returns
@@ -105,24 +102,24 @@
Item Group
Unit of Measure (UOM) + href="#List/UOM">Unit of Measure (UOM)
Brand + href="#List/Brand">Brand
Warehouse Type + href="#List/Warehouse Type">Warehouse Type
diff --git a/support/page/support_home/support_home.html b/support/page/support_home/support_home.html index d7036626d7..8975bae66f 100644 --- a/support/page/support_home/support_home.html +++ b/support/page/support_home/support_home.html @@ -2,26 +2,26 @@
-

Support Ticket

+
Support Ticket

Support queries from customers via email or website


-

Customer Issue

+
Customer Issue

Customer Issue against a Serial No (warranty)


-

Maintenance Schedule

+
Maintenance Schedule

Plan for scheduled maintenance contracts


-

Maintenance Visit

+
Maintenance Visit

Visit report for maintenance visit


-

Newsletter

+
Newsletter

Send Newsletters to your contacts


-

Communication

+
Communication

Communication Log

-

Serial No

+
Serial No

Single unit of an Item

@@ -37,7 +37,7 @@
Email Settings + href="#Form/Email Settings/Email Settings">Email Settings
diff --git a/website/page/website_home/website_home.html b/website/page/website_home/website_home.html index 20b543bcd1..16850e6be4 100644 --- a/website/page/website_home/website_home.html +++ b/website/page/website_home/website_home.html @@ -2,17 +2,17 @@
-

Web Page

+
Web Page

Static (content) web page


-

Blog

+
Blog

Weblog (blog) entry

-

Website Settings

+
Website Settings

Setup of top navigation bar, footer and logo


-

Style Settings

+
Style Settings

Setup of fonts and background