Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/home/page/latest_updates/latest_updates.js b/home/page/latest_updates/latest_updates.js
index c59c5b9..b82655d 100644
--- a/home/page/latest_updates/latest_updates.js
+++ b/home/page/latest_updates/latest_updates.js
@@ -1,5 +1,8 @@
erpnext.updates = [
["14th November 2012", [
+ "Letter Head: Show preview, make upload button more visible.",
+ ]],
+ ["14th November 2012", [
"Employee: If User ID is set, Employee Name will be updated in defaults and will appear automatically in all relevant forms.",
"Backups: Link to download both database and files.",
]],
diff --git a/public/js/modules.js b/public/js/modules.js
index 9f0152e..9fa7f30 100644
--- a/public/js/modules.js
+++ b/public/js/modules.js
@@ -27,6 +27,7 @@
'Setup': 'Setup',
'Activity': 'activity',
'To Do': 'todo',
+ 'Core': 'setup',
'Calendar': 'calendar',
'Messages': 'messages',
'Knowledge Base': 'questions',
diff --git a/selling/doctype/lead/lead.txt b/selling/doctype/lead/lead.txt
index 9c74de9..c31d355 100644
--- a/selling/doctype/lead/lead.txt
+++ b/selling/doctype/lead/lead.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- u'creation': '2012-06-05 20:03:20',
+ u'creation': '2012-08-08 10:41:31',
u'docstatus': 0,
- u'modified': '2012-08-06 14:49:48',
+ u'modified': '2012-11-15 12:36:41',
u'modified_by': u'Administrator',
u'owner': u'Administrator'
},
@@ -114,7 +114,7 @@
'fieldname': u'company_name',
'fieldtype': u'Data',
'in_filter': 1,
- 'label': u'Company Name',
+ 'label': u'Organization Name (for Lead)',
'oldfieldname': u'company_name',
'oldfieldtype': u'Data',
'permlevel': 0,
@@ -626,6 +626,15 @@
# DocPerm
{
+ 'create': 1,
+ u'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'Guest',
+ 'write': 1
+ },
+
+ # DocPerm
+ {
'amend': 0,
'cancel': 0,
'create': 0,
@@ -689,14 +698,5 @@
'role': u'System Manager',
'submit': 0,
'write': 1
- },
-
- # DocPerm
- {
- 'create': 1,
- u'doctype': u'DocPerm',
- 'permlevel': 0,
- 'role': u'Guest',
- 'write': 1
}
]
\ No newline at end of file
diff --git a/setup/doctype/price_list/price_list.js b/setup/doctype/price_list/price_list.js
index 0d903a8..75d3d0f 100644
--- a/setup/doctype/price_list/price_list.js
+++ b/setup/doctype/price_list/price_list.js
@@ -15,33 +15,9 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
cur_frm.cscript.refresh = function(doc, cdt, cdn) {
+ cur_frm.set_intro("");
if(doc.__islocal) {
cur_frm.set_intro("Save this list to begin.");
return;
}
- if (wn.boot.profile.can_create.indexOf(cdt) !== -1) {
- if(!doc.file_list) {
- cur_frm.set_intro('<p>1. Click on "Download Template" \
- to download the template of all Items.</p>'
- +'<p>2. Update prices and Currency.</p>'
- +'<p>3. Save it as a CSV (.csv) file.</p>'
- +'<p>4. Upload the file.</p>');
-
- cur_frm.add_custom_button('Download Template', function() {
- $c_obj_csv(cur_frm.get_doclist(), 'download_template');
- }, 'icon-download')
-
- cur_frm.add_custom_button('Upload Price List', function() {
- cur_frm.attachments.add_attachment();
- }, 'icon-upload');
- } else {
- cur_frm.set_intro('To update prices from the attachment, click on "Update Prices". \
- To reset prices, delete the attachment (in the sidebar) and upload again.');
-
- // Update Prices
- cur_frm.add_custom_button('Update Prices', function() {
- cur_frm.call_server('update_prices');
- }, 'icon-refresh');
- }
- }
}
diff --git a/setup/doctype/price_list/price_list.txt b/setup/doctype/price_list/price_list.txt
index 79a7644..9878b53 100644
--- a/setup/doctype/price_list/price_list.txt
+++ b/setup/doctype/price_list/price_list.txt
@@ -3,29 +3,29 @@
# These values are common in all dictionaries
{
- 'creation': '2012-07-03 13:30:55',
- 'docstatus': 0,
- 'modified': '2012-07-11 17:35:10',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
+ u'creation': '2012-07-12 23:29:45',
+ u'docstatus': 0,
+ u'modified': '2012-11-15 10:50:52',
+ u'modified_by': u'Administrator',
+ u'owner': u'Administrator'
},
# These values are common for all DocType
{
'_last_update': u'1303100817',
- 'allow_attach': 1,
+ 'allow_attach': 0,
'allow_copy': 1,
'allow_email': 1,
'allow_print': 1,
'allow_trash': 1,
'autoname': u'field:price_list_name',
'colour': u'White:FFF',
- 'description': u'Maintain multiple selling rates for the same **Item** using **Price Lists**. You can upload / edit multiple prices by downloading and uploading the template.',
- 'doctype': 'DocType',
+ 'description': u'Price List Master',
+ u'doctype': u'DocType',
'document_type': u'Master',
'max_attachments': 1,
'module': u'Setup',
- 'name': '__common__',
+ u'name': u'__common__',
'section_style': u'Simple',
'server_code_error': u' ',
'show_in_menu': 0,
@@ -34,8 +34,8 @@
# These values are common for all DocField
{
- 'doctype': u'DocField',
- 'name': '__common__',
+ u'doctype': u'DocField',
+ u'name': u'__common__',
'parent': u'Price List',
'parentfield': u'fields',
'parenttype': u'DocType',
@@ -45,8 +45,8 @@
# These values are common for all DocPerm
{
'amend': 0,
- 'doctype': u'DocPerm',
- 'name': '__common__',
+ u'doctype': u'DocPerm',
+ u'name': u'__common__',
'parent': u'Price List',
'parentfield': u'permissions',
'parenttype': u'DocType',
@@ -56,63 +56,13 @@
# DocType, Price List
{
- 'doctype': 'DocType',
- 'name': u'Price List'
- },
-
- # DocPerm
- {
- 'cancel': 0,
- 'create': 0,
- 'doctype': u'DocPerm',
- 'permlevel': 1,
- 'role': u'Sales Manager',
- 'write': 0
- },
-
- # DocPerm
- {
- 'cancel': 0,
- 'create': 0,
- 'doctype': u'DocPerm',
- 'permlevel': 0,
- 'role': u'Sales Manager',
- 'write': 0
- },
-
- # DocPerm
- {
- 'cancel': 0,
- 'create': 0,
- 'doctype': u'DocPerm',
- 'permlevel': 1,
- 'role': u'Sales User',
- 'write': 0
- },
-
- # DocPerm
- {
- 'cancel': 0,
- 'create': 0,
- 'doctype': u'DocPerm',
- 'permlevel': 0,
- 'role': u'Sales User',
- 'write': 0
- },
-
- # DocPerm
- {
- 'cancel': 1,
- 'create': 1,
- 'doctype': u'DocPerm',
- 'permlevel': 0,
- 'role': u'Sales Master Manager',
- 'write': 1
+ u'doctype': u'DocType',
+ u'name': u'Price List'
},
# DocField
{
- 'doctype': u'DocField',
+ u'doctype': u'DocField',
'fieldname': u'price_list_name',
'fieldtype': u'Data',
'label': u'Price List Name',
@@ -123,10 +73,70 @@
# DocField
{
- 'doctype': u'DocField',
+ 'depends_on': u'price_list_name',
+ u'doctype': u'DocField',
+ 'fieldname': u'how_to_upload',
+ 'fieldtype': u'HTML',
+ 'label': u'How to upload',
+ 'options': u'<div class="help">Use the <a href="#data-import-tool">Data Import Tool</a> to upload, update Item Prices in bulk:\n<ol> \n<li>Go to Data Import Tool.\n<li>Select "Item"\n<li>Check on "With Data"\n<li>Download "Item Price" from Child Tables.\n<li>Update the prices required and add new rows if required.\n<li>Check on "Overwrite"\n<li>Upload the modified sheet.\n</div>\n'
+ },
+
+ # DocField
+ {
+ u'doctype': u'DocField',
'fieldname': u'file_list',
'fieldtype': u'Text',
'hidden': 1,
'label': u'File List'
+ },
+
+ # DocPerm
+ {
+ 'cancel': 0,
+ 'create': 0,
+ u'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Sales Manager',
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'cancel': 0,
+ 'create': 0,
+ u'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'Sales Manager',
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'cancel': 0,
+ 'create': 0,
+ u'doctype': u'DocPerm',
+ 'permlevel': 1,
+ 'role': u'Sales User',
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'cancel': 0,
+ 'create': 0,
+ u'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'Sales User',
+ 'write': 0
+ },
+
+ # DocPerm
+ {
+ 'cancel': 1,
+ 'create': 1,
+ u'doctype': u'DocPerm',
+ 'permlevel': 0,
+ 'role': u'Sales Master Manager',
+ 'write': 1
}
]
\ No newline at end of file