Merge pull request #1030 from fogueri/master
[docs] knowledge files and faq
diff --git a/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.txt b/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.txt
index 5e98cb0..9905398 100644
--- a/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.txt
+++ b/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:37",
"docstatus": 0,
- "modified": "2013-07-10 14:54:03",
+ "modified": "2013-11-03 14:11:31",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -47,7 +47,6 @@
"read_only": 1
},
{
- "description": "The date at which current entry will get or has actually executed.",
"doctype": "DocField",
"fieldname": "posting_date",
"fieldtype": "Date",
diff --git a/accounts/doctype/c_form/c_form.txt b/accounts/doctype/c_form/c_form.txt
index c69a658..21d6550 100644
--- a/accounts/doctype/c_form/c_form.txt
+++ b/accounts/doctype/c_form/c_form.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-03-07 11:55:06",
"docstatus": 0,
- "modified": "2013-08-08 14:21:55",
+ "modified": "2013-11-02 14:05:25",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -50,7 +50,7 @@
"doctype": "DocField",
"fieldname": "naming_series",
"fieldtype": "Select",
- "label": "Document Numbering Series",
+ "label": "Series",
"options": "\nC-FORM/",
"read_only": 0,
"reqd": 1
diff --git a/accounts/doctype/c_form_invoice_detail/c_form_invoice_detail.txt b/accounts/doctype/c_form_invoice_detail/c_form_invoice_detail.txt
index 487c982..99335b7 100644
--- a/accounts/doctype/c_form_invoice_detail/c_form_invoice_detail.txt
+++ b/accounts/doctype/c_form_invoice_detail/c_form_invoice_detail.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:38",
"docstatus": 0,
- "modified": "2013-07-10 14:54:06",
+ "modified": "2013-11-02 16:58:31",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -44,6 +44,7 @@
"width": "120px"
},
{
+ "description": "<a href=\"#Sales Browser/Territory\">Add / Edit</a>",
"doctype": "DocField",
"fieldname": "territory",
"fieldtype": "Link",
diff --git a/accounts/doctype/gl_entry/gl_entry.txt b/accounts/doctype/gl_entry/gl_entry.txt
index 90b2ed4..5740579 100644
--- a/accounts/doctype/gl_entry/gl_entry.txt
+++ b/accounts/doctype/gl_entry/gl_entry.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-01-10 16:34:06",
"docstatus": 0,
- "modified": "2013-08-22 17:12:13",
+ "modified": "2013-11-03 14:14:09",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -41,7 +41,6 @@
"name": "GL Entry"
},
{
- "description": "The date at which current entry will get or has actually executed.",
"doctype": "DocField",
"fieldname": "posting_date",
"fieldtype": "Date",
@@ -52,7 +51,6 @@
"search_index": 1
},
{
- "description": "The date at which current entry is made in system.",
"doctype": "DocField",
"fieldname": "transaction_date",
"fieldtype": "Date",
diff --git a/accounts/doctype/journal_voucher/journal_voucher.txt b/accounts/doctype/journal_voucher/journal_voucher.txt
index fdc27ea..b47d7ed 100644
--- a/accounts/doctype/journal_voucher/journal_voucher.txt
+++ b/accounts/doctype/journal_voucher/journal_voucher.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-03-25 10:53:52",
"docstatus": 0,
- "modified": "2013-09-10 14:59:41",
+ "modified": "2013-11-03 14:11:33",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -55,11 +55,10 @@
"width": "50%"
},
{
- "description": "To manage multiple series please go to Setup > Manage Series",
"doctype": "DocField",
"fieldname": "naming_series",
"fieldtype": "Select",
- "label": "Document Numbering Series",
+ "label": "Series",
"no_copy": 1,
"oldfieldname": "naming_series",
"oldfieldtype": "Select",
@@ -91,7 +90,6 @@
"width": "50%"
},
{
- "description": "The date at which current entry will get or has actually executed.",
"doctype": "DocField",
"fieldname": "posting_date",
"fieldtype": "Date",
@@ -448,7 +446,7 @@
"doctype": "DocField",
"fieldname": "select_print_heading",
"fieldtype": "Link",
- "label": "Select Print Heading",
+ "label": "Print Heading",
"no_copy": 1,
"oldfieldname": "select_print_heading",
"oldfieldtype": "Link",
diff --git a/accounts/doctype/pos_setting/pos_setting.txt b/accounts/doctype/pos_setting/pos_setting.txt
index 7eda7fd..09a3757 100755
--- a/accounts/doctype/pos_setting/pos_setting.txt
+++ b/accounts/doctype/pos_setting/pos_setting.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-05-24 12:15:51",
"docstatus": 0,
- "modified": "2013-10-15 11:12:02",
+ "modified": "2013-11-02 16:58:38",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -48,6 +48,7 @@
"read_only": 0
},
{
+ "description": "<a href=\"#Sales Browser/Territory\">Add / Edit</a>",
"doctype": "DocField",
"fieldname": "territory",
"fieldtype": "Link",
@@ -62,7 +63,7 @@
"doctype": "DocField",
"fieldname": "naming_series",
"fieldtype": "Select",
- "label": "Document Numbering Series",
+ "label": "Series",
"no_copy": 1,
"oldfieldname": "naming_series",
"oldfieldtype": "Select",
@@ -222,7 +223,7 @@
"fieldname": "select_print_heading",
"fieldtype": "Select",
"in_filter": 0,
- "label": "Select Print Heading",
+ "label": "Print Heading",
"oldfieldname": "select_print_heading",
"oldfieldtype": "Select",
"options": "link:Print Heading",
diff --git a/accounts/doctype/purchase_invoice/purchase_invoice.txt b/accounts/doctype/purchase_invoice/purchase_invoice.txt
index 8f77227..f98c14a 100755
--- a/accounts/doctype/purchase_invoice/purchase_invoice.txt
+++ b/accounts/doctype/purchase_invoice/purchase_invoice.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-05-21 16:16:39",
"docstatus": 0,
- "modified": "2013-10-02 14:24:55",
+ "modified": "2013-11-05 23:09:38",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -56,11 +56,10 @@
"width": "50%"
},
{
- "description": "To manage multiple series please go to Setup > Manage Series",
"doctype": "DocField",
"fieldname": "naming_series",
"fieldtype": "Select",
- "label": "Document Numbering Series",
+ "label": "Series",
"no_copy": 1,
"oldfieldname": "naming_series",
"oldfieldtype": "Select",
@@ -86,7 +85,7 @@
"depends_on": "supplier",
"doctype": "DocField",
"fieldname": "supplier_name",
- "fieldtype": "Text",
+ "fieldtype": "Data",
"hidden": 0,
"in_list_view": 1,
"label": "Name",
@@ -138,7 +137,6 @@
},
{
"default": "Today",
- "description": "The date at which current entry will get or has actually executed.",
"doctype": "DocField",
"fieldname": "posting_date",
"fieldtype": "Date",
@@ -241,7 +239,6 @@
"read_only": 0
},
{
- "description": "Consider this Price List for fetching rate. (only which have \"For Buying\" as checked)",
"doctype": "DocField",
"fieldname": "buying_price_list",
"fieldtype": "Link",
@@ -251,7 +248,6 @@
"read_only": 0
},
{
- "depends_on": "buying_price_list",
"doctype": "DocField",
"fieldname": "price_list_currency",
"fieldtype": "Link",
@@ -261,7 +257,6 @@
"read_only": 1
},
{
- "depends_on": "buying_price_list",
"doctype": "DocField",
"fieldname": "plc_conversion_rate",
"fieldtype": "Float",
@@ -323,7 +318,6 @@
"read_only": 1
},
{
- "description": "Add / Edit Taxes and Charges",
"doctype": "DocField",
"fieldname": "taxes",
"fieldtype": "Section Break",
@@ -336,7 +330,7 @@
"doctype": "DocField",
"fieldname": "purchase_other_charges",
"fieldtype": "Link",
- "label": "Purchase Taxes and Charges",
+ "label": "Tax Master",
"oldfieldname": "purchase_other_charges",
"oldfieldtype": "Link",
"options": "Purchase Taxes and Charges Master",
@@ -607,7 +601,7 @@
"doctype": "DocField",
"fieldname": "tc_name",
"fieldtype": "Link",
- "label": "Select Terms and Conditions",
+ "label": "Terms",
"options": "Terms and Conditions",
"print_hide": 1
},
@@ -707,7 +701,7 @@
"doctype": "DocField",
"fieldname": "select_print_heading",
"fieldtype": "Link",
- "label": "Select Print Heading",
+ "label": "Print Heading",
"no_copy": 1,
"oldfieldname": "select_print_heading",
"oldfieldtype": "Link",
diff --git a/accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt b/accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt
index d7fb8e5..1a79636 100755
--- a/accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt
+++ b/accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-05-22 12:43:10",
"docstatus": 0,
- "modified": "2013-07-10 14:54:12",
+ "modified": "2013-11-02 19:41:17",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -242,6 +242,7 @@
"read_only": 0
},
{
+ "description": "<a href=\"#Sales Browser/Item Group\">Add / Edit</a>",
"doctype": "DocField",
"fieldname": "item_group",
"fieldtype": "Link",
diff --git a/accounts/doctype/sales_invoice/pos.js b/accounts/doctype/sales_invoice/pos.js
index 043fe90..d771f4f 100644
--- a/accounts/doctype/sales_invoice/pos.js
+++ b/accounts/doctype/sales_invoice/pos.js
@@ -6,7 +6,7 @@
this.wrapper = wrapper;
this.frm = frm;
this.wrapper.html('<div class="container">\
- <div class="row">\
+ <div class="row" style="margin: -13px 0px 10px -30px; border-bottom: 3px solid #c7c7c7;">\
<div class="party-area col-sm-3 col-xs-6"></div>\
<div class="barcode-area col-sm-3 col-xs-6"></div>\
<div class="search-area col-sm-3 col-xs-6"></div>\
@@ -115,7 +115,8 @@
"fieldname": "pos_party",
"placeholder": this.party
},
- parent: this.wrapper.find(".party-area")
+ parent: this.wrapper.find(".party-area"),
+ only_input: true,
});
this.party_field.make_input();
this.party_field.$input.on("change", function() {
@@ -134,7 +135,8 @@
"fieldname": "pos_item_group",
"placeholder": "Item Group"
},
- parent: this.wrapper.find(".item-group-area")
+ parent: this.wrapper.find(".item-group-area"),
+ only_input: true,
});
this.item_group.make_input();
this.item_group.$input.on("change", function() {
@@ -152,7 +154,8 @@
"fieldname": "pos_item",
"placeholder": "Item"
},
- parent: this.wrapper.find(".search-area")
+ parent: this.wrapper.find(".search-area"),
+ only_input: true,
});
this.search.make_input();
this.search.$input.on("change", function() {
@@ -169,7 +172,8 @@
"fieldname": "pos_barcode",
"placeholder": "Barcode / Serial No"
},
- parent: this.wrapper.find(".barcode-area")
+ parent: this.wrapper.find(".barcode-area"),
+ only_input: true,
});
this.barcode.make_input();
this.barcode.$input.on("keypress", function() {
@@ -194,12 +198,12 @@
$.each(r.message, function(index, obj) {
if (obj.image)
image = '<img src="' + obj.image + '" class="img-responsive" \
- style="border:1px solid #eee;height:140px;width:100%;">';
+ style="border:1px solid #eee; max-height: 140px;">';
else
image = '<div class="missing-image"><i class="icon-camera"></i></div>';
$(repl('<div class="col-xs-3 pos-item" data-item_code="%(item_code)s">\
- <div>%(item_image)s</div>\
+ <div style="height: 140px; overflow: hidden;">%(item_image)s</div>\
<div class="small">%(item_code)s</div>\
<div class="small">%(item_name)s</div>\
<div class="small">%(item_price)s</div>\
diff --git a/accounts/doctype/sales_invoice/sales_invoice.txt b/accounts/doctype/sales_invoice/sales_invoice.txt
index 3419188..4f39698 100644
--- a/accounts/doctype/sales_invoice/sales_invoice.txt
+++ b/accounts/doctype/sales_invoice/sales_invoice.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-05-24 19:29:05",
"docstatus": 0,
- "modified": "2013-10-18 13:12:38",
+ "modified": "2013-11-03 14:11:36",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -50,11 +50,10 @@
"options": "icon-user"
},
{
- "description": "To manage multiple series please go to Setup > Manage Series",
"doctype": "DocField",
"fieldname": "naming_series",
"fieldtype": "Select",
- "label": "Document Numbering Series",
+ "label": "Series",
"no_copy": 1,
"oldfieldname": "naming_series",
"oldfieldtype": "Select",
@@ -166,7 +165,6 @@
},
{
"default": "Today",
- "description": "The date at which current entry will get or has actually executed.",
"doctype": "DocField",
"fieldname": "posting_date",
"fieldtype": "Date",
@@ -230,7 +228,7 @@
"doctype": "DocField",
"fieldname": "conversion_rate",
"fieldtype": "Float",
- "label": "Conversion Rate",
+ "label": "Exchange Rate",
"oldfieldname": "conversion_rate",
"oldfieldtype": "Currency",
"print_hide": 1,
@@ -257,7 +255,6 @@
"reqd": 1
},
{
- "description": "Select the currency in which price list is maintained",
"doctype": "DocField",
"fieldname": "price_list_currency",
"fieldtype": "Link",
@@ -272,7 +269,7 @@
"doctype": "DocField",
"fieldname": "plc_conversion_rate",
"fieldtype": "Float",
- "label": "Price List Currency Conversion Rate",
+ "label": "Price List Exchange Rate",
"no_copy": 0,
"print_hide": 1,
"read_only": 0,
@@ -379,7 +376,7 @@
"doctype": "DocField",
"fieldname": "charge",
"fieldtype": "Link",
- "label": "Apply Taxes and Charges Master",
+ "label": "Tax Master",
"oldfieldname": "charge",
"oldfieldtype": "Link",
"options": "Sales Taxes and Charges Master",
@@ -395,7 +392,7 @@
"doctype": "DocField",
"fieldname": "shipping_rule",
"fieldtype": "Link",
- "label": "Apply Shipping Rule",
+ "label": "Shipping Rule",
"oldfieldtype": "Button",
"options": "Shipping Rule",
"print_hide": 1,
@@ -722,7 +719,7 @@
"doctype": "DocField",
"fieldname": "tc_name",
"fieldtype": "Link",
- "label": "Select Terms and Conditions",
+ "label": "Terms",
"oldfieldname": "tc_name",
"oldfieldtype": "Link",
"options": "Terms and Conditions",
@@ -749,6 +746,7 @@
"read_only": 0
},
{
+ "description": "<a href=\"#Sales Browser/Territory\">Add / Edit</a>",
"doctype": "DocField",
"fieldname": "territory",
"fieldtype": "Link",
@@ -761,6 +759,7 @@
"search_index": 0
},
{
+ "description": "<a href=\"#Sales Browser/Customer Group\">Add / Edit</a>",
"doctype": "DocField",
"fieldname": "customer_group",
"fieldtype": "Link",
@@ -918,7 +917,7 @@
"doctype": "DocField",
"fieldname": "select_print_heading",
"fieldtype": "Link",
- "label": "Select Print Heading",
+ "label": "Print Heading",
"no_copy": 1,
"oldfieldname": "select_print_heading",
"oldfieldtype": "Link",
diff --git a/accounts/doctype/sales_invoice_item/sales_invoice_item.txt b/accounts/doctype/sales_invoice_item/sales_invoice_item.txt
index 07cdc54..d7dac74 100644
--- a/accounts/doctype/sales_invoice_item/sales_invoice_item.txt
+++ b/accounts/doctype/sales_invoice_item/sales_invoice_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-06-04 11:02:19",
"docstatus": 0,
- "modified": "2013-08-29 16:58:56",
+ "modified": "2013-11-02 19:41:24",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -297,6 +297,7 @@
"read_only": 0
},
{
+ "description": "<a href=\"#Sales Browser/Item Group\">Add / Edit</a>",
"doctype": "DocField",
"fieldname": "item_group",
"fieldtype": "Link",
diff --git a/accounts/page/accounts_browser/accounts_browser.js b/accounts/page/accounts_browser/accounts_browser.js
index fafe816..b9767ef 100644
--- a/accounts/page/accounts_browser/accounts_browser.js
+++ b/accounts/page/accounts_browser/accounts_browser.js
@@ -18,7 +18,7 @@
var main = $(wrapper).find(".layout-main"),
chart_area = $("<div>")
- .css({"margin-bottom": "15px"})
+ .css({"margin-bottom": "15px", "min-height": "200px"})
.appendTo(main),
help_area = $('<div class="well">'+
'<h4>'+wn._('Quick Help')+'</h4>'+
diff --git a/accounts/report/accounts_payable/accounts_payable.py b/accounts/report/accounts_payable/accounts_payable.py
index d9a0ca2..a618118 100644
--- a/accounts/report/accounts_payable/accounts_payable.py
+++ b/accounts/report/accounts_payable/accounts_payable.py
@@ -54,7 +54,7 @@
else:
ageing_based_on_date = gle.posting_date
- row += get_ageing_data(ageing_based_on_date, age_on, outstanding_amount)
+ row += get_ageing_data(age_on, ageing_based_on_date, outstanding_amount)
data.append(row)
return columns, data
@@ -130,4 +130,4 @@
(gle.account, report_date, gle.voucher_type, gle.voucher_no, gle.name))[0][0]
outstanding_amount = flt(gle.credit) - flt(gle.debit) - flt(payment_amount)
- return outstanding_amount
\ No newline at end of file
+ return outstanding_amount
diff --git a/accounts/report/accounts_receivable/accounts_receivable.py b/accounts/report/accounts_receivable/accounts_receivable.py
index 86a2475..df7c93a 100644
--- a/accounts/report/accounts_receivable/accounts_receivable.py
+++ b/accounts/report/accounts_receivable/accounts_receivable.py
@@ -3,150 +3,158 @@
from __future__ import unicode_literals
import webnotes
-from webnotes import msgprint, _
-from webnotes.utils import getdate, nowdate, flt, cstr
+from webnotes import _
+from webnotes.utils import getdate, nowdate, flt
+
+class AccountsReceivableReport(object):
+ def __init__(self, filters=None):
+ self.filters = webnotes._dict(filters or {})
+ self.filters.report_date = getdate(self.filters.report_date or nowdate())
+ self.age_as_on = getdate(nowdate()) \
+ if self.filters.report_date > getdate(nowdate()) \
+ else self.filters.report_date
+
+ def run(self):
+ return self.get_columns(), self.get_data()
+
+ def get_columns(self):
+ return [
+ "Posting Date:Date:80", "Account:Link/Account:150", "Customer::150",
+ "Voucher Type::110", "Voucher No::120", "Remarks::150",
+ "Due Date:Date:80", "Territory:Link/Territory:80",
+ "Invoiced Amount:Currency:100", "Payment Received:Currency:100",
+ "Outstanding Amount:Currency:100", "Age:Int:50", "0-30:Currency:100",
+ "30-60:Currency:100", "60-90:Currency:100", "90-Above:Currency:100"
+ ]
+
+ def get_data(self):
+ data = []
+ future_vouchers = self.get_entries_after(self.filters.report_date)
+ for gle in self.get_entries_till(self.filters.report_date):
+ if self.is_receivable(gle, future_vouchers):
+ outstanding_amount = self.get_outstanding_amount(gle, self.filters.report_date)
+ if abs(outstanding_amount) > 0.01:
+ due_date = self.get_due_date(gle)
+ invoiced_amount = gle.debit if (gle.debit > 0) else 0
+ payment_received = invoiced_amount - outstanding_amount
+ row = [gle.posting_date, gle.account, self.get_customer(gle.account),
+ gle.voucher_type, gle.voucher_no, gle.remarks, due_date,
+ self.get_territory(gle.account), invoiced_amount, payment_received,
+ outstanding_amount]
+ entry_date = due_date if self.filters.ageing_based_on=="Due Date" \
+ else gle.posting_date
+ row += get_ageing_data(self.age_as_on, entry_date, outstanding_amount)
+ data.append(row)
+ return data
+
+ def get_entries_after(self, report_date):
+ # returns a distinct list
+ return list(set([(e.voucher_type, e.voucher_no) for e in self.get_gl_entries()
+ if getdate(e.posting_date) > report_date]))
+
+ def get_entries_till(self, report_date):
+ # returns a generator
+ return (e for e in self.get_gl_entries()
+ if getdate(e.posting_date) <= report_date)
+
+ def is_receivable(self, gle, future_vouchers):
+ return ((not gle.against_voucher) or (gle.against_voucher==gle.voucher_no) or
+ ((gle.against_voucher_type, gle.against_voucher) in future_vouchers))
+
+ def get_outstanding_amount(self, gle, report_date):
+ payment_received = 0.0
+ for e in self.get_gl_entries_for(gle.account, gle.voucher_type, gle.voucher_no):
+ if getdate(e.posting_date) <= report_date and e.name!=gle.name:
+ payment_received += (flt(e.credit) - flt(e.debit))
+
+ return flt(gle.debit) - flt(gle.credit) - payment_received
+
+ def get_customer(self, account):
+ return self.get_account_map().get(account).get("customer_name") or ""
+
+ def get_territory(self, account):
+ return self.get_account_map().get(account).get("territory") or ""
+
+ def get_account_map(self):
+ if not hasattr(self, "account_map"):
+ self.account_map = dict(((r.name, r) for r in webnotes.conn.sql("""select
+ account.name, customer.customer_name, customer.territory
+ from `tabAccount` account, `tabCustomer` customer
+ where account.master_type="Customer"
+ and customer.name=account.master_name""", as_dict=True)))
+
+ return self.account_map
+
+ def get_due_date(self, gle):
+ if not hasattr(self, "invoice_due_date_map"):
+ # TODO can be restricted to posting date
+ self.invoice_due_date_map = dict(webnotes.conn.sql("""select name, due_date
+ from `tabSales Invoice` where docstatus=1"""))
+
+ return gle.voucher_type == "Sales Invoice" \
+ and self.invoice_due_date_map.get(gle.voucher_no) or ""
+
+ def get_gl_entries(self):
+ if not hasattr(self, "gl_entries"):
+ conditions, values = self.prepare_conditions()
+ self.gl_entries = webnotes.conn.sql("""select * from `tabGL Entry`
+ where docstatus < 2 {} order by posting_date, account""".format(conditions),
+ values, as_dict=True)
+
+ return self.gl_entries
+
+ def prepare_conditions(self):
+ conditions = [""]
+ values = {}
+
+ if self.filters.company:
+ conditions.append("company=%(company)s")
+ values["company"] = self.filters.company
+
+ if self.filters.account:
+ conditions.append("account=%(account)s")
+ values["account"] = self.filters.account
+ else:
+ account_map = self.get_account_map()
+ if not account_map:
+ webnotes.throw(_("No Customer Accounts found."))
+ else:
+ accounts_list = ['"{}"'.format(ac) for ac in account_map]
+ conditions.append("account in ({})".format(", ".join(accounts_list)))
+
+ return " and ".join(conditions), values
+
+ def get_gl_entries_for(self, account, against_voucher_type, against_voucher):
+ if not hasattr(self, "gl_entries_map"):
+ self.gl_entries_map = {}
+ for gle in self.get_gl_entries():
+ if gle.against_voucher_type and gle.against_voucher:
+ self.gl_entries_map.setdefault(gle.account, {})\
+ .setdefault(gle.against_voucher_type, {})\
+ .setdefault(gle.against_voucher, [])\
+ .append(gle)
+
+ return self.gl_entries_map.get(account, {})\
+ .get(against_voucher_type, {})\
+ .get(against_voucher, [])
def execute(filters=None):
- if not filters: filters = {}
- columns = get_columns()
- entries = get_gl_entries(filters)
- account_customer = dict(webnotes.conn.sql("""select account.name, customer.customer_name
- from `tabAccount` account, `tabCustomer` customer
- where account.master_type="Customer" and customer.name=account.master_name"""))
+ return AccountsReceivableReport(filters).run()
- entries_after_report_date = [[gle.voucher_type, gle.voucher_no]
- for gle in get_gl_entries(filters, upto_report_date=False)]
-
- account_territory_map = get_account_territory_map()
- si_due_date_map = get_si_due_date_map()
+def get_ageing_data(age_as_on, entry_date, outstanding_amount):
+ # [0-30, 30-60, 60-90, 90-above]
+ outstanding_range = [0.0, 0.0, 0.0, 0.0]
+ if not (age_as_on and entry_date):
+ return [0] + outstanding_range
- # Age of the invoice on this date
- age_on = getdate(filters.get("report_date")) > getdate(nowdate()) \
- and nowdate() or filters.get("report_date")
-
- data = []
- for gle in entries:
- if cstr(gle.against_voucher) == gle.voucher_no or not gle.against_voucher \
- or [gle.against_voucher_type, gle.against_voucher] in entries_after_report_date:
-
- due_date = (gle.voucher_type == "Sales Invoice") \
- and si_due_date_map.get(gle.voucher_no) or ""
-
- invoiced_amount = gle.debit > 0 and gle.debit or 0
- outstanding_amount = get_outstanding_amount(gle,
- filters.get("report_date") or nowdate())
-
- if abs(flt(outstanding_amount)) > 0.01:
- payment_amount = invoiced_amount - outstanding_amount
- row = [gle.posting_date, gle.account, account_customer.get(gle.account, ""),
- gle.voucher_type, gle.voucher_no,
- gle.remarks, due_date, account_territory_map.get(gle.account),
- invoiced_amount, payment_amount, outstanding_amount]
- # Ageing
- if filters.get("ageing_based_on") == "Due Date":
- ageing_based_on_date = due_date
- else:
- ageing_based_on_date = gle.posting_date
- row += get_ageing_data(ageing_based_on_date, age_on, outstanding_amount)
-
- data.append(row)
-
- return columns, data
+ age = (getdate(age_as_on) - getdate(entry_date)).days or 0
+ index = None
+ for i, days in enumerate([30, 60, 90]):
+ if age <= days:
+ index = i
+ break
-def get_columns():
- return [
- "Posting Date:Date:80", "Account:Link/Account:150", "Customer::150", "Voucher Type::110",
- "Voucher No::120", "Remarks::150", "Due Date:Date:80", "Territory:Link/Territory:80",
- "Invoiced Amount:Currency:100", "Payment Received:Currency:100",
- "Outstanding Amount:Currency:100", "Age:Int:50", "0-30:Currency:100",
- "30-60:Currency:100", "60-90:Currency:100", "90-Above:Currency:100"
- ]
+ if index is None: index = 3
+ outstanding_range[index] = outstanding_amount
-def get_gl_entries(filters, upto_report_date=True):
- conditions, customer_accounts = get_conditions(filters, upto_report_date)
- return webnotes.conn.sql("""select * from `tabGL Entry`
- where docstatus < 2 %s order by posting_date, account""" %
- (conditions), tuple(customer_accounts), as_dict=1)
-
-def get_conditions(filters, upto_report_date=True):
- conditions = ""
- if filters.get("company"):
- conditions += " and company='%s'" % filters["company"]
-
- customer_accounts = []
- if filters.get("account"):
- customer_accounts = [filters["account"]]
- else:
- customer_accounts = webnotes.conn.sql_list("""select name from `tabAccount`
- where ifnull(master_type, '') = 'Customer' and docstatus < 2 %s""" %
- conditions, filters)
-
- if customer_accounts:
- conditions += " and account in (%s)" % (", ".join(['%s']*len(customer_accounts)))
- else:
- msgprint(_("No Customer Accounts found. Customer Accounts are identified based on \
- 'Master Type' value in account record."), raise_exception=1)
-
- if filters.get("report_date"):
- if upto_report_date:
- conditions += " and posting_date<='%s'" % filters["report_date"]
- else:
- conditions += " and posting_date>'%s'" % filters["report_date"]
-
- return conditions, customer_accounts
-
-def get_account_territory_map():
- account_territory_map = {}
- for each in webnotes.conn.sql("""select t2.name, t1.territory from `tabCustomer` t1,
- `tabAccount` t2 where t1.name = t2.master_name"""):
- account_territory_map[each[0]] = each[1]
-
- return account_territory_map
-
-def get_si_due_date_map():
- """ get due_date from sales invoice """
- si_due_date_map = {}
- for t in webnotes.conn.sql("""select name, due_date from `tabSales Invoice`"""):
- si_due_date_map[t[0]] = t[1]
-
- return si_due_date_map
-
-def get_outstanding_amount(gle, report_date):
- payment_amount = webnotes.conn.sql("""
- select sum(ifnull(credit, 0)) - sum(ifnull(debit, 0))
- from `tabGL Entry`
- where account = %s and posting_date <= %s and against_voucher_type = %s
- and against_voucher = %s and name != %s""",
- (gle.account, report_date, gle.voucher_type, gle.voucher_no, gle.name))[0][0]
-
- return flt(gle.debit) - flt(gle.credit) - flt(payment_amount)
-
-def get_payment_amount(gle, report_date, entries_after_report_date):
- payment_amount = 0
- if flt(gle.credit) > 0 and (not gle.against_voucher or
- [gle.against_voucher_type, gle.against_voucher] in entries_after_report_date):
- payment_amount = gle.credit
- elif flt(gle.debit) > 0:
- payment_amount = webnotes.conn.sql("""
- select sum(ifnull(credit, 0)) - sum(ifnull(debit, 0)) from `tabGL Entry`
- where account = %s and posting_date <= %s and against_voucher_type = %s
- and against_voucher = %s and name != %s""",
- (gle.account, report_date, gle.voucher_type, gle.voucher_no, gle.name))[0][0]
-
- return flt(payment_amount)
-
-def get_ageing_data(ageing_based_on_date, age_on, outstanding_amount):
- val1 = val2 = val3 = val4 = diff = 0
- diff = age_on and ageing_based_on_date \
- and (getdate(age_on) - getdate(ageing_based_on_date)).days or 0
-
- if diff <= 30:
- val1 = outstanding_amount
- elif 30 < diff <= 60:
- val2 = outstanding_amount
- elif 60 < diff <= 90:
- val3 = outstanding_amount
- elif diff > 90:
- val4 = outstanding_amount
-
- return [diff, val1, val2, val3, val4]
\ No newline at end of file
+ return [age] + outstanding_range
\ No newline at end of file
diff --git a/buying/doctype/purchase_common/purchase_common.js b/buying/doctype/purchase_common/purchase_common.js
index 023c7f3..969c9be 100644
--- a/buying/doctype/purchase_common/purchase_common.js
+++ b/buying/doctype/purchase_common/purchase_common.js
@@ -414,26 +414,27 @@
setup_field_label_map(["net_total_import", "grand_total_import", "in_words_import",
"other_charges_added_import", "other_charges_deducted_import"], this.frm.doc.currency);
- setup_field_label_map(["conversion_rate"], "1 " + this.frm.doc.currency
+ cur_frm.set_df_property("conversion_rate", "description", "1 " + this.frm.doc.currency
+ " = [?] " + company_currency);
if(this.frm.doc.price_list_currency && this.frm.doc.price_list_currency!=company_currency) {
- setup_field_label_map(["plc_conversion_rate"], "1 " + this.frm.doc.price_list_currency
+ cur_frm.set_df_property("plc_conversion_rate", "description", "1 " + this.frm.doc.price_list_currency
+ " = [?] " + company_currency);
}
// toggle fields
this.frm.toggle_display(["conversion_rate", "net_total", "grand_total",
"in_words", "other_charges_added", "other_charges_deducted"],
- this.frm.doc.currency != company_currency);
-
- this.frm.toggle_display(["plc_conversion_rate"],
- this.frm.price_list_currency != company_currency);
+ this.frm.doc.currency !== company_currency);
+ this.frm.toggle_display(["plc_conversion_rate", "price_list_currency"],
+ this.frm.doc.price_list_currency !== company_currency);
+
// set labels
$.each(field_label_map, function(fname, label) {
me.frm.fields_dict[fname].set_label(label);
});
+
},
change_grid_labels: function(company_currency) {
diff --git a/buying/doctype/purchase_order/purchase_order.txt b/buying/doctype/purchase_order/purchase_order.txt
index 7169aaf..6a97eed 100644
--- a/buying/doctype/purchase_order/purchase_order.txt
+++ b/buying/doctype/purchase_order/purchase_order.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-05-21 16:16:39",
"docstatus": 0,
- "modified": "2013-10-02 14:24:49",
+ "modified": "2013-11-05 23:09:58",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -49,11 +49,10 @@
"options": "icon-user"
},
{
- "description": "To manage multiple series please go to Setup > Manage Series",
"doctype": "DocField",
"fieldname": "naming_series",
"fieldtype": "Select",
- "label": "Document Numbering Series",
+ "label": "Series",
"no_copy": 1,
"oldfieldname": "naming_series",
"oldfieldtype": "Select",
@@ -127,7 +126,6 @@
"width": "50%"
},
{
- "description": "The date at which current entry is made in system.",
"doctype": "DocField",
"fieldname": "transaction_date",
"fieldtype": "Date",
@@ -179,7 +177,6 @@
"fieldtype": "Column Break"
},
{
- "description": "Supplier's currency",
"doctype": "DocField",
"fieldname": "currency",
"fieldtype": "Link",
@@ -210,7 +207,6 @@
"fieldtype": "Column Break"
},
{
- "description": "Consider this Price List for fetching rate. (only which have \"For Buying\" as checked)",
"doctype": "DocField",
"fieldname": "buying_price_list",
"fieldtype": "Link",
@@ -219,7 +215,6 @@
"print_hide": 1
},
{
- "depends_on": "buying_price_list",
"doctype": "DocField",
"fieldname": "price_list_currency",
"fieldtype": "Link",
@@ -229,7 +224,6 @@
"read_only": 1
},
{
- "depends_on": "buying_price_list",
"doctype": "DocField",
"fieldname": "plc_conversion_rate",
"fieldtype": "Float",
@@ -312,7 +306,7 @@
"doctype": "DocField",
"fieldname": "purchase_other_charges",
"fieldtype": "Link",
- "label": "Purchase Taxes and Charges",
+ "label": "Tax Master",
"no_copy": 0,
"oldfieldname": "purchase_other_charges",
"oldfieldtype": "Link",
@@ -485,7 +479,7 @@
"doctype": "DocField",
"fieldname": "tc_name",
"fieldtype": "Link",
- "label": "Select Terms and Conditions",
+ "label": "Terms",
"oldfieldname": "tc_name",
"oldfieldtype": "Link",
"options": "Terms and Conditions",
@@ -495,7 +489,7 @@
"doctype": "DocField",
"fieldname": "terms",
"fieldtype": "Text Editor",
- "label": "Terms and Conditions1",
+ "label": "Terms and Conditions",
"oldfieldname": "terms",
"oldfieldtype": "Text Editor"
},
@@ -603,7 +597,7 @@
"doctype": "DocField",
"fieldname": "select_print_heading",
"fieldtype": "Link",
- "label": "Select Print Heading",
+ "label": "Print Heading",
"no_copy": 1,
"oldfieldname": "select_print_heading",
"oldfieldtype": "Link",
@@ -613,14 +607,6 @@
},
{
"doctype": "DocField",
- "fieldname": "instructions",
- "fieldtype": "Text",
- "label": "Instructions",
- "oldfieldname": "instructions",
- "oldfieldtype": "Text"
- },
- {
- "doctype": "DocField",
"fieldname": "column_break5",
"fieldtype": "Column Break",
"oldfieldtype": "Column Break",
@@ -657,26 +643,6 @@
"read_only": 1
},
{
- "doctype": "DocField",
- "fieldname": "payment_terms",
- "fieldtype": "Text",
- "label": "Payment Terms",
- "no_copy": 1,
- "oldfieldname": "payment_terms",
- "oldfieldtype": "Text",
- "print_hide": 0
- },
- {
- "doctype": "DocField",
- "fieldname": "remarks",
- "fieldtype": "Text",
- "label": "Remarks",
- "no_copy": 1,
- "oldfieldname": "remarks",
- "oldfieldtype": "Text",
- "print_hide": 1
- },
- {
"description": "Required raw materials issued to the supplier for producing a sub - contracted item.",
"doctype": "DocField",
"fieldname": "raw_material_details",
diff --git a/buying/doctype/purchase_order_item/purchase_order_item.txt b/buying/doctype/purchase_order_item/purchase_order_item.txt
index fade98f..4145a7f 100755
--- a/buying/doctype/purchase_order_item/purchase_order_item.txt
+++ b/buying/doctype/purchase_order_item/purchase_order_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-05-24 19:29:06",
"docstatus": 0,
- "modified": "2013-10-10 17:01:57",
+ "modified": "2013-11-02 19:41:27",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -359,6 +359,7 @@
"read_only": 1
},
{
+ "description": "<a href=\"#Sales Browser/Item Group\">Add / Edit</a>",
"doctype": "DocField",
"fieldname": "item_group",
"fieldtype": "Link",
diff --git a/buying/doctype/quality_inspection/quality_inspection.txt b/buying/doctype/quality_inspection/quality_inspection.txt
index 0a92104..d4a2d8f 100644
--- a/buying/doctype/quality_inspection/quality_inspection.txt
+++ b/buying/doctype/quality_inspection/quality_inspection.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-04-30 13:13:03",
"docstatus": 0,
- "modified": "2013-08-08 14:22:07",
+ "modified": "2013-11-02 14:05:38",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -62,7 +62,7 @@
"doctype": "DocField",
"fieldname": "naming_series",
"fieldtype": "Select",
- "label": "Document Numbering Series",
+ "label": "Series",
"no_copy": 1,
"options": "\nQAI/11-12/",
"reqd": 1
diff --git a/buying/doctype/supplier/supplier.txt b/buying/doctype/supplier/supplier.txt
index 56336d4..e5a3486 100644
--- a/buying/doctype/supplier/supplier.txt
+++ b/buying/doctype/supplier/supplier.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-01-10 16:34:11",
"docstatus": 0,
- "modified": "2013-09-10 10:53:50",
+ "modified": "2013-11-03 14:01:43",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -42,7 +42,6 @@
"name": "Supplier"
},
{
- "description": "Note: You Can Manage Multiple Address or Contacts via Addresses & Contacts",
"doctype": "DocField",
"fieldname": "basic_info",
"fieldtype": "Section Break",
@@ -52,6 +51,16 @@
},
{
"doctype": "DocField",
+ "fieldname": "naming_series",
+ "fieldtype": "Select",
+ "label": "Series",
+ "no_copy": 1,
+ "oldfieldname": "naming_series",
+ "oldfieldtype": "Select",
+ "options": "\nSUPP\nSUPP/10-11/"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "supplier_name",
"fieldtype": "Data",
"in_list_view": 1,
@@ -63,6 +72,12 @@
},
{
"doctype": "DocField",
+ "fieldname": "column_break0",
+ "fieldtype": "Column Break",
+ "width": "50%"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "supplier_type",
"fieldtype": "Link",
"in_list_view": 1,
@@ -73,22 +88,7 @@
"reqd": 1
},
{
- "doctype": "DocField",
- "fieldname": "column_break0",
- "fieldtype": "Column Break",
- "width": "50%"
- },
- {
- "doctype": "DocField",
- "fieldname": "naming_series",
- "fieldtype": "Select",
- "label": "Document Numbering Series",
- "no_copy": 1,
- "oldfieldname": "naming_series",
- "oldfieldtype": "Select",
- "options": "\nSUPP\nSUPP/10-11/"
- },
- {
+ "depends_on": "eval:!doc.__islocal",
"doctype": "DocField",
"fieldname": "address_contacts",
"fieldtype": "Section Break",
@@ -97,14 +97,6 @@
"options": "icon-map-marker"
},
{
- "depends_on": "eval:doc.__islocal",
- "doctype": "DocField",
- "fieldname": "address_desc",
- "fieldtype": "HTML",
- "label": "Address Desc",
- "options": "<em>Addresses will appear only when you save the supplier</em>"
- },
- {
"doctype": "DocField",
"fieldname": "address_html",
"fieldtype": "HTML",
@@ -118,14 +110,6 @@
"width": "50%"
},
{
- "depends_on": "eval:doc.__islocal",
- "doctype": "DocField",
- "fieldname": "contact_desc",
- "fieldtype": "HTML",
- "label": "Contact Desc",
- "options": "<em>Contact Details will appear only when you save the supplier</em>"
- },
- {
"doctype": "DocField",
"fieldname": "contact_html",
"fieldtype": "HTML",
@@ -133,6 +117,7 @@
"read_only": 1
},
{
+ "depends_on": "eval:!doc.__islocal",
"doctype": "DocField",
"fieldname": "communication_history",
"fieldtype": "Section Break",
@@ -169,7 +154,6 @@
"search_index": 0
},
{
- "description": "This currency will get fetched in Purchase transactions of this supplier",
"doctype": "DocField",
"fieldname": "default_currency",
"fieldtype": "Link",
@@ -178,21 +162,6 @@
"options": "Currency"
},
{
- "description": "Statutory info and other general information about your Supplier",
- "doctype": "DocField",
- "fieldname": "supplier_details",
- "fieldtype": "Text",
- "label": "Supplier Details",
- "oldfieldname": "supplier_details",
- "oldfieldtype": "Code"
- },
- {
- "doctype": "DocField",
- "fieldname": "column_break2",
- "fieldtype": "Column Break",
- "width": "50%"
- },
- {
"doctype": "DocField",
"fieldname": "credit_days",
"fieldtype": "Int",
@@ -200,6 +169,12 @@
},
{
"doctype": "DocField",
+ "fieldname": "column_break2",
+ "fieldtype": "Column Break",
+ "width": "50%"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "website",
"fieldtype": "Data",
"label": "Website",
@@ -207,6 +182,15 @@
"oldfieldtype": "Data"
},
{
+ "description": "Statutory info and other general information about your Supplier",
+ "doctype": "DocField",
+ "fieldname": "supplier_details",
+ "fieldtype": "Text",
+ "label": "Supplier Details",
+ "oldfieldname": "supplier_details",
+ "oldfieldtype": "Code"
+ },
+ {
"doctype": "DocField",
"fieldname": "communications",
"fieldtype": "Table",
diff --git a/buying/doctype/supplier_quotation/supplier_quotation.txt b/buying/doctype/supplier_quotation/supplier_quotation.txt
index ddd1730..fcef822 100644
--- a/buying/doctype/supplier_quotation/supplier_quotation.txt
+++ b/buying/doctype/supplier_quotation/supplier_quotation.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-05-21 16:16:45",
"docstatus": 0,
- "modified": "2013-10-02 14:24:44",
+ "modified": "2013-11-03 14:14:12",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -49,11 +49,10 @@
"options": "icon-user"
},
{
- "description": "To manage multiple series please go to Setup > Manage Series",
"doctype": "DocField",
"fieldname": "naming_series",
"fieldtype": "Select",
- "label": "Document Numbering Series",
+ "label": "Series",
"no_copy": 1,
"oldfieldname": "naming_series",
"oldfieldtype": "Select",
@@ -127,7 +126,6 @@
"width": "50%"
},
{
- "description": "The date at which current entry is made in system.",
"doctype": "DocField",
"fieldname": "transaction_date",
"fieldtype": "Date",
@@ -174,7 +172,6 @@
"options": "icon-tag"
},
{
- "description": "Supplier's currency",
"doctype": "DocField",
"fieldname": "currency",
"fieldtype": "Link",
@@ -207,7 +204,6 @@
"width": "50%"
},
{
- "description": "Consider this Price List for fetching rate. (only which have \"For Buying\" as checked)",
"doctype": "DocField",
"fieldname": "buying_price_list",
"fieldtype": "Link",
@@ -484,7 +480,7 @@
"doctype": "DocField",
"fieldname": "tc_name",
"fieldtype": "Link",
- "label": "Select Terms and Conditions",
+ "label": "Terms",
"oldfieldname": "tc_name",
"oldfieldtype": "Link",
"options": "Terms and Conditions",
@@ -587,7 +583,7 @@
"doctype": "DocField",
"fieldname": "select_print_heading",
"fieldtype": "Link",
- "label": "Select Print Heading",
+ "label": "Print Heading",
"no_copy": 1,
"oldfieldname": "select_print_heading",
"oldfieldtype": "Link",
diff --git a/buying/doctype/supplier_quotation_item/supplier_quotation_item.txt b/buying/doctype/supplier_quotation_item/supplier_quotation_item.txt
index 515cdb2..f09f5a8 100644
--- a/buying/doctype/supplier_quotation_item/supplier_quotation_item.txt
+++ b/buying/doctype/supplier_quotation_item/supplier_quotation_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-05-22 12:43:10",
"docstatus": 0,
- "modified": "2013-10-10 17:02:11",
+ "modified": "2013-11-02 19:41:29",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -288,6 +288,7 @@
"read_only": 1
},
{
+ "description": "<a href=\"#Sales Browser/Item Group\">Add / Edit</a>",
"doctype": "DocField",
"fieldname": "item_group",
"fieldtype": "Link",
diff --git a/docs/dev/docs.dev.install.md b/docs/dev/docs.dev.install.md
index 03fc6bd..f9df566 100644
--- a/docs/dev/docs.dev.install.md
+++ b/docs/dev/docs.dev.install.md
@@ -11,15 +11,34 @@
### ERPNext Installer (Beta)
-Install ERPNext in one command!
-
+1. Make sure that you have Python 2.7+
+```
+$ python -c "import platform; print platform.python_version()"
+2.7.3
+```
+or
+```
+$ which python2.7
+/usr/bin/python2.7
+```
+If your python version is less than 2.7, then follow,
+ * For CentOS, you can refer to http://toomuchdata.com/2012/06/25/how-to-install-python-2-7-3-on-centos-6-2/
+ * For Ubuntu, refer to http://askubuntu.com/questions/101591/how-do-i-install-python-2-7-2-on-ubuntu/101595#101595
+1. Make sure the 'passwd' command exists. Install passwd if necessary (e.g. on CentOS, run `yum install passwd`)
1. Switch to root user using `sudo su`
-1. Create a folder where you want to install erpnext
-1. Go to the new folder
1. `wget https://raw.github.com/webnotes/erpnext/master/install_erpnext.py`
-1. `python install_erpnext.py`
+1. `python2.7 install_erpnext.py --create_user`
+
+ This will create a user 'erpnext' and install erpnext in its home directory.
+To start a development server, login as erpnext with password erpnext (or `su erpnext` from your root shell)
+```
+cd /home/erpnext/erpnext
+./lib/wnf.py --serve
+```
> If you are installing on your server for deployment, remember to change Administrator's password!
+> You can set the erpnext username and password by passing it to the install script,
+`python2.7 install_erpnext.py --create_user --username erpnext_username --password secretpassword`
> If you get stuck, post your questions at [ERPNext Developer Forum](https://groups.google.com/forum/#!forum/erpnext-developer-forum)
@@ -37,5 +56,10 @@
### Upgrade / run latest patches
1. Backup your database!
-1. Go to Setup > Update ERPNext
-1. Click on 'Update'
\ No newline at end of file
+```
+./lib/wnf.py --backup
+```
+1. Pull changes
+```
+./lib/wnf.py --update origin master
+```
diff --git a/hr/doctype/attendance/attendance.txt b/hr/doctype/attendance/attendance.txt
index 163baa0..5186a8d 100644
--- a/hr/doctype/attendance/attendance.txt
+++ b/hr/doctype/attendance/attendance.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-01-10 16:34:13",
"docstatus": 0,
- "modified": "2013-08-08 14:22:10",
+ "modified": "2013-11-02 14:05:42",
"modified_by": "Administrator",
"owner": "ashwini@webnotestech.com"
},
@@ -54,7 +54,7 @@
"doctype": "DocField",
"fieldname": "naming_series",
"fieldtype": "Select",
- "label": "Document Numbering Series",
+ "label": "Series",
"no_copy": 1,
"oldfieldname": "naming_series",
"oldfieldtype": "Select",
diff --git a/hr/doctype/employee/employee.txt b/hr/doctype/employee/employee.txt
index 4ed8732..856f26e 100644
--- a/hr/doctype/employee/employee.txt
+++ b/hr/doctype/employee/employee.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-03-07 09:04:18",
"docstatus": 0,
- "modified": "2013-10-11 10:52:53",
+ "modified": "2013-11-03 11:19:10",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -73,11 +73,10 @@
"report_hide": 1
},
{
- "description": "<span class=\"sys_manager\">To setup, please go to Setup > Naming Series</span>",
"doctype": "DocField",
"fieldname": "naming_series",
"fieldtype": "Select",
- "label": "Document Numbering Series",
+ "label": "Series",
"no_copy": 1,
"oldfieldname": "naming_series",
"oldfieldtype": "Select",
@@ -235,7 +234,7 @@
"fieldname": "scheduled_confirmation_date",
"fieldtype": "Date",
"in_filter": 1,
- "label": "Scheduled Confirmation Date",
+ "label": "Offer Date",
"oldfieldname": "scheduled_confirmation_date",
"oldfieldtype": "Date",
"search_index": 0
@@ -244,7 +243,7 @@
"doctype": "DocField",
"fieldname": "final_confirmation_date",
"fieldtype": "Date",
- "label": "Final Confirmation Date",
+ "label": "Confirmation Date",
"oldfieldname": "final_confirmation_date",
"oldfieldtype": "Date",
"search_index": 0
@@ -330,7 +329,7 @@
"fieldname": "company_email",
"fieldtype": "Data",
"in_filter": 1,
- "label": "Email (By company)",
+ "label": "Company Email",
"oldfieldname": "company_email",
"oldfieldtype": "Data",
"reqd": 0
@@ -339,7 +338,7 @@
"doctype": "DocField",
"fieldname": "notice_number_of_days",
"fieldtype": "Int",
- "label": "Notice - Number of Days",
+ "label": "Notice (days)",
"oldfieldname": "notice_number_of_days",
"oldfieldtype": "Int"
},
@@ -458,13 +457,13 @@
"fieldname": "emergency_contact_details",
"fieldtype": "HTML",
"label": "Emergency Contact Details",
- "options": "<b>Emergency Contact Details</b>"
+ "options": "<h4 class=\"text-muted\">Emergency Contact Details</h4>"
},
{
"doctype": "DocField",
"fieldname": "person_to_be_contacted",
"fieldtype": "Data",
- "label": "Person To Be Contacted"
+ "label": "Emergency Contact"
},
{
"doctype": "DocField",
@@ -476,7 +475,7 @@
"doctype": "DocField",
"fieldname": "emergency_phone_number",
"fieldtype": "Data",
- "label": "Emergency Phone Number"
+ "label": "Emergency Phone"
},
{
"doctype": "DocField",
@@ -488,7 +487,7 @@
"doctype": "DocField",
"fieldname": "permanent_accommodation_type",
"fieldtype": "Select",
- "label": "Permanent Accommodation Type",
+ "label": "Permanent Address Is",
"options": "\nRented\nOwned"
},
{
@@ -501,7 +500,7 @@
"doctype": "DocField",
"fieldname": "current_accommodation_type",
"fieldtype": "Select",
- "label": "Current Accommodation Type",
+ "label": "Current Address Is",
"options": "\nRented\nOwned"
},
{
diff --git a/hr/doctype/job_applicant/job_applicant.js b/hr/doctype/job_applicant/job_applicant.js
index ccfbbc2..eafa40c 100644
--- a/hr/doctype/job_applicant/job_applicant.js
+++ b/hr/doctype/job_applicant/job_applicant.js
@@ -6,8 +6,7 @@
cur_frm.cscript = {
onload: function(doc, dt, dn) {
if(in_list(user_roles,'System Manager')) {
- cur_frm.footer.help_area.innerHTML = '<hr>\
- <p><a href="#Form/Jobs Email Settings">'+wn._("Jobs Email Settings")+'</a><br>\
+ cur_frm.footer.help_area.innerHTML = '<p><a href="#Form/Jobs Email Settings">'+wn._("Jobs Email Settings")+'</a><br>\
<span class="help">'+wn._('Automatically extract Job Applicants from a mail box ')+'e.g. "jobs@example.com"</span></p>';
}
},
diff --git a/install_erpnext.py b/install_erpnext.py
index 303c83b..78f9459 100644
--- a/install_erpnext.py
+++ b/install_erpnext.py
@@ -4,6 +4,7 @@
#!/usr/bin/env python
from __future__ import unicode_literals
import os, sys
+import argparse
is_redhat = is_debian = None
root_password = None
@@ -24,17 +25,7 @@
"pygeoip"
]
-def install(install_path=None):
- if os.getuid() != 0:
- raise Exception, "Please run this script as root"
-
- install_pre_requisites()
-
- if os.environ.get('SUDO_UID'):
- os.setuid(int(os.environ.get('SUDO_UID')))
-
- if not install_path:
- install_path = os.getcwd()
+def install(install_path):
setup_folders(install_path)
install_erpnext(install_path)
@@ -67,7 +58,7 @@
python_version = sys.version.split(" ")[0]
print "Python Version =", python_version
if not (python_version and int(python_version.split(".")[0])==2 and int(python_version.split(".")[1]) >= 7):
- raise Exception, "Hey! ERPNext needs Python version to be 2.6+"
+ raise Exception, "Hey! ERPNext needs Python version to be 2.7+"
# check distribution
distribution = platform.linux_distribution()[0].lower().replace('"', '')
@@ -115,7 +106,7 @@
import re
# set to autostart on startup
- for service in ("mysqld", "httpd", "memcached", "ntpd"):
+ for service in ("mysqld", "memcached", "ntpd"):
exec_in_shell("chkconfig --level 2345 %s on" % service)
exec_in_shell("service %s restart" % service)
@@ -181,7 +172,7 @@
# setup_db(install_path, root_password, db_name)
wnf.install(db_name, root_password=root_password)
- # setup_cron(install_path)
+ setup_cron(install_path)
def get_root_password():
# ask for root mysql password
@@ -197,6 +188,7 @@
raise Exception("Incorrect MySQL Root user's password")
def setup_folders(install_path):
+ os.chdir(install_path)
app = os.path.join(install_path, "app")
if not os.path.exists(app):
print "Cloning erpnext"
@@ -239,13 +231,7 @@
return db_password
def post_install(install_path):
- print
- print "-"*80
- print "To start the development server, run lib/wnf.py --serve"
- print "-"*80
- print "Installation complete"
- print "Open your browser and go to http://localhost:8000"
- print "Login using username = Administrator and password = admin"
+ pass
def exec_in_shell(cmd):
# using Popen instead of os.system - as recommended by python docs
@@ -273,5 +259,65 @@
return out
+def parse_args():
+ parser = argparse.ArgumentParser()
+ parser.add_argument('--create_user', default=False, action='store_true')
+ parser.add_argument('--username', default='erpnext')
+ parser.add_argument('--password', default='erpnext')
+ parser.add_argument('--no_install_prerequisites', default=False, action='store_true')
+ return parser.parse_args()
+
+def create_user(username, password):
+ import subprocess, pwd
+ p = subprocess.Popen("useradd -m -d /home/{username} -s {shell} {username}".format(username=username, shell=os.environ.get('SHELL')).split())
+ p.wait()
+ p = subprocess.Popen("passwd {username}".format(username=username).split(), stdin=subprocess.PIPE)
+ p.communicate('{password}\n{password}\n'.format(password=password))
+ p.wait()
+ return pwd.getpwnam(username).pw_uid
+
+def setup_cron(install_path):
+ erpnext_cron_entries = [
+ "*/3 * * * * cd %s && python lib/wnf.py --run_scheduler >> erpnext-sch.log 2>&1" % install_path,
+ "0 */6 * * * cd %s && python lib/wnf.py --backup >> erpnext-backup.log 2>&1" % install_path
+ ]
+ for row in erpnext_cron_entries:
+ try:
+ existing_cron = exec_in_shell("crontab -l")
+ if row not in existing_cron:
+ exec_in_shell('{ crontab -l; echo "%s"; } | crontab' % row)
+ except:
+ exec_in_shell('echo "%s" | crontab' % row)
+
if __name__ == "__main__":
- install()
+ args = parse_args()
+ install_path = os.getcwd()
+ if os.getuid() != 0 and args.create_user and not args.no_install_prequisites:
+ raise Exception, "Please run this script as root"
+
+ if args.create_user:
+ uid = create_user(args.username, args.password)
+ install_path = '/home/{username}/erpnext'.format(username=args.username)
+
+ if not args.no_install_prerequisites:
+ install_pre_requisites()
+
+ if os.environ.get('SUDO_UID') and not args.create_user:
+ os.setuid(int(os.environ.get('SUDO_UID')))
+
+ if os.getuid() == 0 and args.create_user:
+ os.setuid(uid)
+ if install_path:
+ os.mkdir(install_path)
+
+ install(install_path=install_path)
+ print
+ print "-"*80
+ print "Installation complete"
+ print "To start the development server,"
+ print "Login as {username} with password {password}".format(username=args.username, password=args.password)
+ print "cd {}".format(install_path)
+ print "./lib/wnf.py --serve"
+ print "-"*80
+ print "Open your browser and go to http://localhost:8000"
+ print "Login using username = Administrator and password = admin"
diff --git a/manufacturing/doctype/bom/bom.txt b/manufacturing/doctype/bom/bom.txt
index 425e9ac..9f69cb0 100644
--- a/manufacturing/doctype/bom/bom.txt
+++ b/manufacturing/doctype/bom/bom.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-01-22 15:11:38",
"docstatus": 0,
- "modified": "2013-08-09 14:47:25",
+ "modified": "2013-11-02 14:23:28",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -113,7 +113,6 @@
},
{
"depends_on": "eval:doc.rm_cost_as_per===\"Price List\"",
- "description": "Price List for Costing",
"doctype": "DocField",
"fieldname": "buying_price_list",
"fieldtype": "Link",
diff --git a/manufacturing/doctype/production_order/production_order.txt b/manufacturing/doctype/production_order/production_order.txt
index 81821f6..85c7c83 100644
--- a/manufacturing/doctype/production_order/production_order.txt
+++ b/manufacturing/doctype/production_order/production_order.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-01-10 16:34:16",
"docstatus": 0,
- "modified": "2013-10-02 14:25:03",
+ "modified": "2013-11-02 14:05:44",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -56,7 +56,7 @@
"doctype": "DocField",
"fieldname": "naming_series",
"fieldtype": "Select",
- "label": "Document Numbering Series",
+ "label": "Series",
"options": "\nPRO",
"reqd": 1
},
diff --git a/manufacturing/doctype/production_planning_tool/production_planning_tool.py b/manufacturing/doctype/production_planning_tool/production_planning_tool.py
index 277e53a..100cf08 100644
--- a/manufacturing/doctype/production_planning_tool/production_planning_tool.py
+++ b/manufacturing/doctype/production_planning_tool/production_planning_tool.py
@@ -340,7 +340,6 @@
"company": self.doc.company,
"fiscal_year": fiscal_year,
"requested_by": webnotes.session.user,
- "remark": "Automatically raised from Production Planning Tool",
"material_request_type": "Purchase"
},
{
diff --git a/manufacturing/doctype/workstation/workstation.txt b/manufacturing/doctype/workstation/workstation.txt
index 038e2c9..c9114ff 100644
--- a/manufacturing/doctype/workstation/workstation.txt
+++ b/manufacturing/doctype/workstation/workstation.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-01-10 16:34:17",
"docstatus": 0,
- "modified": "2013-07-05 15:04:25",
+ "modified": "2013-10-28 15:42:38",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -44,15 +44,6 @@
},
{
"doctype": "DocField",
- "fieldname": "trash_reason",
- "fieldtype": "Small Text",
- "label": "Trash Reason",
- "oldfieldname": "trash_reason",
- "oldfieldtype": "Small Text",
- "read_only": 1
- },
- {
- "doctype": "DocField",
"fieldname": "workstation_name",
"fieldtype": "Data",
"label": "Workstation Name",
@@ -113,30 +104,33 @@
"doctype": "DocField",
"fieldname": "over_heads",
"fieldtype": "Section Break",
- "label": "Over Heads",
+ "label": "Overheads",
"oldfieldtype": "Section Break"
},
{
+ "description": "Electricity cost per hour",
"doctype": "DocField",
"fieldname": "hour_rate_electricity",
"fieldtype": "Float",
- "label": "Hour Rate Electricity",
+ "label": "Electricity Cost",
"oldfieldname": "hour_rate_electricity",
"oldfieldtype": "Currency"
},
{
+ "description": "Consumable cost per hour",
"doctype": "DocField",
"fieldname": "hour_rate_consumable",
"fieldtype": "Float",
- "label": "Hour Rate Consumable",
+ "label": "Consumable Cost",
"oldfieldname": "hour_rate_consumable",
"oldfieldtype": "Currency"
},
{
+ "description": "Rent per hour",
"doctype": "DocField",
"fieldname": "hour_rate_rent",
"fieldtype": "Float",
- "label": "Hour Rate Rent",
+ "label": "Rent Cost",
"oldfieldname": "hour_rate_rent",
"oldfieldtype": "Currency"
},
diff --git a/patches/1311/__init__.py b/patches/1311/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/patches/1311/__init__.py
diff --git a/patches/1311/p01_cleanup.py b/patches/1311/p01_cleanup.py
new file mode 100644
index 0000000..c6d4c01
--- /dev/null
+++ b/patches/1311/p01_cleanup.py
@@ -0,0 +1,18 @@
+import webnotes
+
+def execute():
+ webnotes.reload_doc("stock", "doctype", "material_request")
+ webnotes.reload_doc("buying", "doctype", "purchase_order")
+ webnotes.reload_doc("selling", "doctype", "lead")
+ from core.doctype.custom_field.custom_field import create_custom_field_if_values_exist
+ create_custom_field_if_values_exist("Material Request",
+ {"fieldtype":"Text", "fieldname":"remark", "label":"Remarks","insert_after":"Fiscal Year"})
+ create_custom_field_if_values_exist("Purchase Order",
+ {"fieldtype":"Text", "fieldname":"instructions", "label":"Instructions","insert_after":"% Billed"})
+ create_custom_field_if_values_exist("Purchase Order",
+ {"fieldtype":"Text", "fieldname":"remarks", "label":"Remarks","insert_after":"% Billed"})
+ create_custom_field_if_values_exist("Purchase Order",
+ {"fieldtype":"Text", "fieldname":"payment_terms", "label":"Payment Terms","insert_after":"Print Heading"})
+ create_custom_field_if_values_exist("Lead",
+ {"fieldtype":"Text", "fieldname":"remark", "label":"Remark","insert_after":"Territory"})
+
\ No newline at end of file
diff --git a/patches/october_2013/p05_server_custom_script_to_file.py b/patches/october_2013/p05_server_custom_script_to_file.py
index b1d4f21..222cfea 100644
--- a/patches/october_2013/p05_server_custom_script_to_file.py
+++ b/patches/october_2013/p05_server_custom_script_to_file.py
@@ -20,7 +20,7 @@
from core.doctype.custom_script.custom_script import make_custom_server_script_file
for name, dt, script in webnotes.conn.sql("""select name, dt, script from `tabCustom Script`
where script_type='Server'"""):
- if script.strip():
+ if script and script.strip():
try:
script = indent_using_tabs(script)
make_custom_server_script_file(dt, script)
diff --git a/patches/patch_list.py b/patches/patch_list.py
index f882739..05a7e59 100644
--- a/patches/patch_list.py
+++ b/patches/patch_list.py
@@ -238,4 +238,5 @@
"patches.june_2013.p07_taxes_price_list_for_territory",
"patches.october_2013.p08_cleanup_after_item_price_module_change",
"patches.october_2013.p10_plugins_refactor",
+ "patches.1311.p01_cleanup",
]
\ No newline at end of file
diff --git a/projects/doctype/project/project.txt b/projects/doctype/project/project.txt
index fc8accf..9f21dce 100644
--- a/projects/doctype/project/project.txt
+++ b/projects/doctype/project/project.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-03-07 11:55:07",
"docstatus": 0,
- "modified": "2013-10-02 14:25:02",
+ "modified": "2013-11-06 15:13:55",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -43,6 +43,13 @@
},
{
"doctype": "DocField",
+ "fieldname": "overview",
+ "fieldtype": "Section Break",
+ "label": "Overview",
+ "options": "icon-file"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "cb_project_status",
"fieldtype": "Column Break",
"label": "Status"
@@ -143,12 +150,12 @@
"search_index": 0
},
{
- "description": "Important dates and commitments in your project life cycle",
"doctype": "DocField",
"fieldname": "sb_milestones",
"fieldtype": "Section Break",
"label": "Milestones",
- "oldfieldtype": "Section Break"
+ "oldfieldtype": "Section Break",
+ "options": "icon-flag"
},
{
"description": "Milestones will be added as Events in the Calendar",
@@ -168,7 +175,7 @@
"fieldtype": "Section Break",
"label": "Project Details",
"oldfieldtype": "Section Break",
- "options": "Simple"
+ "options": "icon-list"
},
{
"doctype": "DocField",
@@ -201,7 +208,7 @@
"fieldtype": "Section Break",
"label": "Project Costing",
"oldfieldtype": "Section Break",
- "options": "Simple"
+ "options": "icon-money"
},
{
"doctype": "DocField",
@@ -264,10 +271,10 @@
"fieldname": "customer_details",
"fieldtype": "Section Break",
"label": "Customer Details",
- "oldfieldtype": "Section Break"
+ "oldfieldtype": "Section Break",
+ "options": "icon-user"
},
{
- "description": "Select name of Customer to whom project belongs",
"doctype": "DocField",
"fieldname": "customer",
"fieldtype": "Link",
diff --git a/projects/doctype/time_log/time_log.txt b/projects/doctype/time_log/time_log.txt
index 89ca453..1c8e00f 100644
--- a/projects/doctype/time_log/time_log.txt
+++ b/projects/doctype/time_log/time_log.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-04-03 16:38:41",
"docstatus": 0,
- "modified": "2013-08-08 14:22:12",
+ "modified": "2013-11-02 14:05:45",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -46,7 +46,7 @@
"doctype": "DocField",
"fieldname": "naming_series",
"fieldtype": "Select",
- "label": "Document Numbering Series",
+ "label": "Series",
"options": "TL-",
"permlevel": 0,
"read_only": 0,
diff --git a/projects/doctype/time_log/time_log_calendar.js b/projects/doctype/time_log/time_log_calendar.js
index 12cfcba..a4f22db 100644
--- a/projects/doctype/time_log/time_log_calendar.js
+++ b/projects/doctype/time_log/time_log_calendar.js
@@ -6,7 +6,7 @@
"start": "from_time",
"end": "to_time",
"id": "name",
- "title": w._("title"),
+ "title": "title",
"allDay": "allDay"
},
get_events_method: "projects.doctype.time_log.time_log.get_events"
diff --git a/projects/doctype/time_log_batch/time_log_batch.txt b/projects/doctype/time_log_batch/time_log_batch.txt
index c12355d..74bcc4d 100644
--- a/projects/doctype/time_log_batch/time_log_batch.txt
+++ b/projects/doctype/time_log_batch/time_log_batch.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-28 17:57:33",
"docstatus": 0,
- "modified": "2013-08-08 14:22:12",
+ "modified": "2013-11-02 14:05:45",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -48,7 +48,7 @@
"doctype": "DocField",
"fieldname": "naming_series",
"fieldtype": "Select",
- "label": "Document Numbering Series",
+ "label": "Series",
"options": "TLB-",
"reqd": 1
},
diff --git a/public/js/startup.css b/public/js/startup.css
index c3b7276..54c40d4 100644
--- a/public/js/startup.css
+++ b/public/js/startup.css
@@ -41,9 +41,8 @@
}
.pos-bill {
- padding: 20px 5px;
+ margin-left: -30px;
+ margin-top: -10px;
+ padding: 20px 10px;
font-family: Monospace;
- border: 1px solid #eee;
- -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
- box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
}
\ No newline at end of file
diff --git a/public/js/transaction.js b/public/js/transaction.js
index b120190..dc4698f 100644
--- a/public/js/transaction.js
+++ b/public/js/transaction.js
@@ -455,7 +455,8 @@
}).join("\n");
if(!rows) return "";
- return '<div style="overflow-x: scroll;"><table class="table table-bordered table-hover">\
+ return '<p><a href="#" onclick="$(\'.tax-break-up\').toggleClass(\'hide\'); return false;">Show / Hide tax break-up</a><br><br></p>\
+ <div class="tax-break-up hide" style="overflow-x: auto;"><table class="table table-bordered table-hover">\
<thead><tr>' + headings + '</tr></thead> \
<tbody>' + rows + '</tbody> \
</table></div>';
diff --git a/public/js/utils.js b/public/js/utils.js
index 227aa32..2f05ebf 100644
--- a/public/js/utils.js
+++ b/public/js/utils.js
@@ -43,7 +43,7 @@
var $btn = $('<button class="btn btn-sm btn-default">'+wn._("Add Serial No")+'</button>')
.appendTo($("<div>")
- .css({"margin-bottom": "10px", "margin-top": "-10px"})
+ .css({"margin-bottom": "10px", "margin-left": "15px"})
.appendTo(grid_row.fields_dict.serial_no.$wrapper));
$btn.on("click", function() {
diff --git a/selling/doctype/customer/customer.txt b/selling/doctype/customer/customer.txt
index 5d3a508..7a24531 100644
--- a/selling/doctype/customer/customer.txt
+++ b/selling/doctype/customer/customer.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-06-11 14:26:44",
"docstatus": 0,
- "modified": "2013-10-18 16:49:20",
+ "modified": "2013-11-03 14:01:33",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -38,7 +38,6 @@
"name": "Customer"
},
{
- "description": "Note: You Can Manage Multiple Address or Contacts via Addresses & Contacts",
"doctype": "DocField",
"fieldname": "basic_info",
"fieldtype": "Section Break",
@@ -52,7 +51,7 @@
"doctype": "DocField",
"fieldname": "naming_series",
"fieldtype": "Select",
- "label": "Document Numbering Series",
+ "label": "Series",
"no_copy": 1,
"options": "\nCUST\nCUSTMUM",
"permlevel": 0,
@@ -65,7 +64,7 @@
"hidden": 0,
"in_filter": 1,
"in_list_view": 1,
- "label": "Customer Name",
+ "label": "Full Name",
"no_copy": 1,
"oldfieldname": "customer_name",
"oldfieldtype": "Data",
@@ -79,7 +78,7 @@
"doctype": "DocField",
"fieldname": "customer_type",
"fieldtype": "Select",
- "label": "Customer Type",
+ "label": "Type",
"oldfieldname": "customer_type",
"oldfieldtype": "Select",
"options": "\nCompany\nIndividual",
@@ -87,7 +86,6 @@
"reqd": 1
},
{
- "description": "Fetch lead which will be converted into customer.",
"doctype": "DocField",
"fieldname": "lead_name",
"fieldtype": "Link",
@@ -110,13 +108,13 @@
"width": "50%"
},
{
- "description": "<a href=\"#!Sales Browser/Customer Group\">To manage Customer Groups, click here</a>",
+ "description": "<a href=\"#Sales Browser/Customer Group\">Add / Edit</a>",
"doctype": "DocField",
"fieldname": "customer_group",
"fieldtype": "Link",
"hidden": 0,
"in_filter": 1,
- "label": "Customer Group",
+ "label": "Group",
"oldfieldname": "customer_group",
"oldfieldtype": "Link",
"options": "Customer Group",
@@ -126,7 +124,7 @@
"search_index": 1
},
{
- "description": "<a href=\"#!Sales Browser/Territory\">To manage Territory, click here</a>",
+ "description": "<a href=\"#Sales Browser/Territory\">Add / Edit</a>",
"doctype": "DocField",
"fieldname": "territory",
"fieldtype": "Link",
@@ -140,6 +138,7 @@
"reqd": 1
},
{
+ "depends_on": "eval:!doc.__islocal",
"doctype": "DocField",
"fieldname": "address_contacts",
"fieldtype": "Section Break",
@@ -148,15 +147,6 @@
"permlevel": 0
},
{
- "depends_on": "eval:doc.__islocal",
- "doctype": "DocField",
- "fieldname": "address_desc",
- "fieldtype": "HTML",
- "label": "Address Desc",
- "options": "<em>Addresses will appear only when you save the customer</em>",
- "permlevel": 0
- },
- {
"doctype": "DocField",
"fieldname": "address_html",
"fieldtype": "HTML",
@@ -172,15 +162,6 @@
"width": "50%"
},
{
- "depends_on": "eval:doc.__islocal",
- "doctype": "DocField",
- "fieldname": "contact_desc",
- "fieldtype": "HTML",
- "label": "Contact Desc",
- "options": "<em>Contact Details will appear only when you save the customer</em>",
- "permlevel": 0
- },
- {
"doctype": "DocField",
"fieldname": "contact_html",
"fieldtype": "HTML",
@@ -190,6 +171,7 @@
"read_only": 1
},
{
+ "depends_on": "eval:!doc.__islocal",
"doctype": "DocField",
"fieldname": "communication_history",
"fieldtype": "Section Break",
@@ -237,24 +219,6 @@
"search_index": 1
},
{
- "doctype": "DocField",
- "fieldname": "default_price_list",
- "fieldtype": "Link",
- "label": "Default Price List",
- "options": "Price List",
- "permlevel": 0
- },
- {
- "description": "This currency will get fetched in Sales transactions of this customer",
- "doctype": "DocField",
- "fieldname": "default_currency",
- "fieldtype": "Link",
- "label": "Default Currency",
- "no_copy": 1,
- "options": "Currency",
- "permlevel": 0
- },
- {
"description": "Your Customer's TAX registration numbers (if applicable) or any general information",
"doctype": "DocField",
"fieldname": "customer_details",
@@ -273,6 +237,23 @@
},
{
"doctype": "DocField",
+ "fieldname": "default_currency",
+ "fieldtype": "Link",
+ "label": "Currency",
+ "no_copy": 1,
+ "options": "Currency",
+ "permlevel": 0
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "default_price_list",
+ "fieldtype": "Link",
+ "label": "Price List",
+ "options": "Price List",
+ "permlevel": 0
+ },
+ {
+ "doctype": "DocField",
"fieldname": "credit_days",
"fieldtype": "Int",
"label": "Credit Days",
@@ -310,7 +291,7 @@
"doctype": "DocField",
"fieldname": "default_sales_partner",
"fieldtype": "Link",
- "label": "Default Sales Partner",
+ "label": "Sales Partner",
"oldfieldname": "default_sales_partner",
"oldfieldtype": "Link",
"options": "Sales Partner",
@@ -320,7 +301,7 @@
"doctype": "DocField",
"fieldname": "default_commission_rate",
"fieldtype": "Float",
- "label": "Default Commission Rate",
+ "label": "Commission Rate",
"oldfieldname": "default_commission_rate",
"oldfieldtype": "Currency",
"permlevel": 0
diff --git a/selling/doctype/customer_discount/customer_discount.txt b/selling/doctype/customer_discount/customer_discount.txt
index e7b7822..135871d 100644
--- a/selling/doctype/customer_discount/customer_discount.txt
+++ b/selling/doctype/customer_discount/customer_discount.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-07-22 12:43:40",
"docstatus": 0,
- "modified": "2013-07-22 12:49:32",
+ "modified": "2013-11-02 19:41:31",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -27,6 +27,7 @@
"name": "Customer Discount"
},
{
+ "description": "<a href=\"#Sales Browser/Item Group\">Add / Edit</a>",
"doctype": "DocField",
"fieldname": "item_group",
"fieldtype": "Link",
@@ -36,7 +37,7 @@
{
"doctype": "DocField",
"fieldname": "discount",
- "fieldtype": "Currency",
+ "fieldtype": "Float",
"label": "Discount (%)"
}
]
\ No newline at end of file
diff --git a/selling/doctype/installation_note/installation_note.txt b/selling/doctype/installation_note/installation_note.txt
index ec42455..af81d7f 100644
--- a/selling/doctype/installation_note/installation_note.txt
+++ b/selling/doctype/installation_note/installation_note.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-04-30 13:13:06",
"docstatus": 0,
- "modified": "2013-08-08 14:22:13",
+ "modified": "2013-11-02 16:58:44",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -54,7 +54,7 @@
"doctype": "DocField",
"fieldname": "naming_series",
"fieldtype": "Select",
- "label": "Document Numbering Series",
+ "label": "Series",
"no_copy": 1,
"oldfieldname": "naming_series",
"oldfieldtype": "Select",
@@ -130,6 +130,7 @@
"read_only": 1
},
{
+ "description": "<a href=\"#Sales Browser/Territory\">Add / Edit</a>",
"doctype": "DocField",
"fieldname": "territory",
"fieldtype": "Link",
@@ -141,6 +142,7 @@
"search_index": 1
},
{
+ "description": "<a href=\"#Sales Browser/Customer Group\">Add / Edit</a>",
"doctype": "DocField",
"fieldname": "customer_group",
"fieldtype": "Link",
diff --git a/selling/doctype/lead/lead.js b/selling/doctype/lead/lead.js
index 9f6412c..d65338f 100644
--- a/selling/doctype/lead/lead.js
+++ b/selling/doctype/lead/lead.js
@@ -23,8 +23,7 @@
}
if(in_list(user_roles,'System Manager')) {
- cur_frm.footer.help_area.innerHTML = '<hr>\
- <p><a href="#Form/Sales Email Settings">'+wn._('Sales Email Settings')+'</a><br>\
+ cur_frm.footer.help_area.innerHTML = '<p><a href="#Form/Sales Email Settings">'+wn._('Sales Email Settings')+'</a><br>\
<span class="help">'+wn._('Automatically extract Leads from a mail box e.g.')+' "sales@example.com"</span></p>';
}
},
diff --git a/selling/doctype/lead/lead.txt b/selling/doctype/lead/lead.txt
index b700a2e..b6d3eab 100644
--- a/selling/doctype/lead/lead.txt
+++ b/selling/doctype/lead/lead.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-04-10 11:45:37",
"docstatus": 0,
- "modified": "2013-10-09 15:27:54",
+ "modified": "2013-11-06 11:27:57",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -50,11 +50,10 @@
"options": "icon-user"
},
{
- "description": "To manage multiple series please go to Setup > Manage Series",
"doctype": "DocField",
"fieldname": "naming_series",
"fieldtype": "Select",
- "label": "Document Numbering Series",
+ "label": "Series",
"no_copy": 1,
"oldfieldname": "naming_series",
"oldfieldtype": "Select",
@@ -133,7 +132,6 @@
},
{
"depends_on": "eval:doc.source == 'Customer'",
- "description": "Source of th",
"doctype": "DocField",
"fieldname": "customer",
"fieldtype": "Link",
@@ -260,14 +258,6 @@
},
{
"doctype": "DocField",
- "fieldname": "remark",
- "fieldtype": "Small Text",
- "label": "Remark",
- "oldfieldname": "remark",
- "oldfieldtype": "Text"
- },
- {
- "doctype": "DocField",
"fieldname": "phone",
"fieldtype": "Data",
"label": "Phone",
@@ -300,7 +290,7 @@
"oldfieldtype": "Data"
},
{
- "description": "<a href=\"#!Sales Browser/Territory\">To manage Territory, click here</a>",
+ "description": "<a href=\"#Sales Browser/Territory\">Add / Edit</a>",
"doctype": "DocField",
"fieldname": "territory",
"fieldtype": "Link",
diff --git a/selling/doctype/opportunity/opportunity.txt b/selling/doctype/opportunity/opportunity.txt
index 3c860ad..604599c 100644
--- a/selling/doctype/opportunity/opportunity.txt
+++ b/selling/doctype/opportunity/opportunity.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-03-07 18:50:30",
"docstatus": 0,
- "modified": "2013-10-09 15:26:29",
+ "modified": "2013-11-03 14:20:14",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -53,11 +53,10 @@
"options": "icon-user"
},
{
- "description": "To manage multiple series please go to Setup > Manage Series",
"doctype": "DocField",
"fieldname": "naming_series",
"fieldtype": "Select",
- "label": "Document Numbering Series",
+ "label": "Series",
"no_copy": 1,
"oldfieldname": "naming_series",
"oldfieldtype": "Select",
@@ -210,7 +209,7 @@
"read_only": 1
},
{
- "description": "<a href=\"#Sales Browser/Territory\">To manage Territory, click here</a>",
+ "description": "<a href=\"#Sales Browser/Territory\">Add / Edit</a>",
"doctype": "DocField",
"fieldname": "territory",
"fieldtype": "Link",
@@ -224,7 +223,7 @@
},
{
"depends_on": "eval:doc.enquiry_from==\"Customer\"",
- "description": "<a href=\"#Sales Browser/Customer Group\">To manage Territory, click here</a>",
+ "description": "<a href=\"#Sales Browser/Customer Group\">Add / Edit</a>",
"doctype": "DocField",
"fieldname": "customer_group",
"fieldtype": "Link",
@@ -285,7 +284,6 @@
"read_only": 1
},
{
- "description": "Filing in Additional Information about the Opportunity will help you analyze your data better.",
"doctype": "DocField",
"fieldname": "more_info",
"fieldtype": "Section Break",
@@ -304,7 +302,6 @@
},
{
"default": "Today",
- "description": "The date at which current entry is made in system.",
"doctype": "DocField",
"fieldname": "transaction_date",
"fieldtype": "Date",
diff --git a/selling/doctype/opportunity_item/opportunity_item.txt b/selling/doctype/opportunity_item/opportunity_item.txt
index fb1501c..efa1ee9 100644
--- a/selling/doctype/opportunity_item/opportunity_item.txt
+++ b/selling/doctype/opportunity_item/opportunity_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:51",
"docstatus": 0,
- "modified": "2013-07-10 14:54:11",
+ "modified": "2013-11-02 19:41:31",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -58,6 +58,7 @@
"width": "300px"
},
{
+ "description": "<a href=\"#Sales Browser/Item Group\">Add / Edit</a>",
"doctype": "DocField",
"fieldname": "item_group",
"fieldtype": "Link",
diff --git a/selling/doctype/quotation/quotation.txt b/selling/doctype/quotation/quotation.txt
index 1620d91..0c42722 100644
--- a/selling/doctype/quotation/quotation.txt
+++ b/selling/doctype/quotation/quotation.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-05-24 19:29:08",
"docstatus": 0,
- "modified": "2013-10-11 13:21:07",
+ "modified": "2013-11-03 14:20:15",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -59,11 +59,10 @@
"width": "50%"
},
{
- "description": "To manage multiple series please go to Setup > Manage Series",
"doctype": "DocField",
"fieldname": "naming_series",
"fieldtype": "Select",
- "label": "Document Numbering Series",
+ "label": "Series",
"no_copy": 1,
"oldfieldname": "naming_series",
"oldfieldtype": "Select",
@@ -204,7 +203,6 @@
},
{
"default": "Today",
- "description": "The date at which current entry is made in system.",
"doctype": "DocField",
"fieldname": "transaction_date",
"fieldtype": "Date",
@@ -242,7 +240,6 @@
"read_only": 0
},
{
- "description": "Customer's currency - If you want to select a currency that is not the default currency, then you must also specify the Currency Conversion Rate.",
"doctype": "DocField",
"fieldname": "currency",
"fieldtype": "Link",
@@ -262,7 +259,7 @@
"doctype": "DocField",
"fieldname": "conversion_rate",
"fieldtype": "Float",
- "label": "Conversion Rate",
+ "label": "Exchange Rate",
"oldfieldname": "conversion_rate",
"oldfieldtype": "Currency",
"print_hide": 1,
@@ -278,7 +275,6 @@
"width": "50%"
},
{
- "description": "Select the price list as entered in \"Price List\" master. This will pull the reference rates of items against this price list as specified in \"Item\" master.",
"doctype": "DocField",
"fieldname": "selling_price_list",
"fieldtype": "Link",
@@ -294,7 +290,6 @@
"width": "100px"
},
{
- "description": "Select the currency in which price list is maintained",
"doctype": "DocField",
"fieldname": "price_list_currency",
"fieldtype": "Link",
@@ -309,7 +304,7 @@
"doctype": "DocField",
"fieldname": "plc_conversion_rate",
"fieldtype": "Float",
- "label": "Price List Currency Conversion Rate",
+ "label": "Price List Exchange Rate",
"print_hide": 1,
"read_only": 0,
"reqd": 1
@@ -385,7 +380,7 @@
"fieldname": "charge",
"fieldtype": "Link",
"hidden": 0,
- "label": "Apply Taxes and Charges Master",
+ "label": "Tax Master",
"oldfieldname": "charge",
"oldfieldtype": "Link",
"options": "Sales Taxes and Charges Master",
@@ -402,7 +397,7 @@
"fieldname": "shipping_rule",
"fieldtype": "Link",
"hidden": 0,
- "label": "Apply Shipping Rule",
+ "label": "Shipping Rule",
"oldfieldtype": "Button",
"options": "Shipping Rule",
"print_hide": 1,
@@ -563,7 +558,6 @@
"width": "200px"
},
{
- "description": "Add Terms and Conditions for the Quotation like Payment Terms, Validity of Offer etc. You can also prepare a Terms and Conditions Master and use the Template",
"doctype": "DocField",
"fieldname": "terms_section_break",
"fieldtype": "Section Break",
@@ -577,7 +571,7 @@
"doctype": "DocField",
"fieldname": "tc_name",
"fieldtype": "Link",
- "label": "Select Terms and Conditions",
+ "label": "Terms",
"oldfieldname": "tc_name",
"oldfieldtype": "Link",
"options": "Terms and Conditions",
@@ -603,7 +597,7 @@
"read_only": 0
},
{
- "description": "Will be fetched from Customer",
+ "description": "<a href=\"#Sales Browser/Territory\">Add / Edit</a>",
"doctype": "DocField",
"fieldname": "territory",
"fieldtype": "Link",
@@ -618,6 +612,7 @@
},
{
"depends_on": "customer",
+ "description": "<a href=\"#Sales Browser/Customer Group\">Add / Edit</a>",
"doctype": "DocField",
"fieldname": "customer_group",
"fieldtype": "Link",
@@ -636,7 +631,7 @@
"fieldname": "shipping_address_name",
"fieldtype": "Link",
"hidden": 0,
- "label": "Shipping Address Name",
+ "label": "Shipping Address",
"options": "Address",
"print_hide": 1
},
@@ -683,7 +678,6 @@
"reqd": 0
},
{
- "description": "Filling in additional information about the Quotation will help you analyze your data better.",
"doctype": "DocField",
"fieldname": "more_info",
"fieldtype": "Section Break",
@@ -777,7 +771,7 @@
"doctype": "DocField",
"fieldname": "select_print_heading",
"fieldtype": "Link",
- "label": "Select Print Heading",
+ "label": "Print Heading",
"no_copy": 1,
"oldfieldname": "select_print_heading",
"oldfieldtype": "Link",
@@ -825,6 +819,7 @@
},
{
"allow_on_submit": 1,
+ "depends_on": "eval:!doc.__islocal",
"doctype": "DocField",
"fieldname": "communication_html",
"fieldtype": "HTML",
diff --git a/selling/doctype/quotation_item/quotation_item.txt b/selling/doctype/quotation_item/quotation_item.txt
index c38116a..3764208 100644
--- a/selling/doctype/quotation_item/quotation_item.txt
+++ b/selling/doctype/quotation_item/quotation_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-03-07 11:42:57",
"docstatus": 0,
- "modified": "2013-08-07 14:44:28",
+ "modified": "2013-11-02 19:41:32",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -239,6 +239,7 @@
"label": "Reference"
},
{
+ "description": "<a href=\"#Sales Browser/Item Group\">Add / Edit</a>",
"doctype": "DocField",
"fieldname": "item_group",
"fieldtype": "Link",
diff --git a/selling/doctype/sales_order/sales_order.txt b/selling/doctype/sales_order/sales_order.txt
index bfbcd94..7a1af77 100644
--- a/selling/doctype/sales_order/sales_order.txt
+++ b/selling/doctype/sales_order/sales_order.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-06-18 12:39:59",
"docstatus": 0,
- "modified": "2013-10-11 13:18:47",
+ "modified": "2013-11-03 14:20:16",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -58,11 +58,10 @@
"width": "50%"
},
{
- "description": "To manage multiple series please go to Setup > Manage Series",
"doctype": "DocField",
"fieldname": "naming_series",
"fieldtype": "Select",
- "label": "Document Numbering Series",
+ "label": "Series",
"no_copy": 1,
"oldfieldname": "naming_series",
"oldfieldtype": "Select",
@@ -71,7 +70,6 @@
"reqd": 1
},
{
- "description": "Select Customer",
"doctype": "DocField",
"fieldname": "customer",
"fieldtype": "Link",
@@ -176,7 +174,6 @@
},
{
"default": "Today",
- "description": "The date at which current entry is made in system.",
"doctype": "DocField",
"fieldname": "transaction_date",
"fieldtype": "Date",
@@ -197,7 +194,7 @@
"fieldtype": "Date",
"hidden": 0,
"in_filter": 1,
- "label": "Expected Delivery Date",
+ "label": "Delivery Date",
"oldfieldname": "delivery_date",
"oldfieldtype": "Date",
"print_hide": 1,
@@ -206,12 +203,12 @@
"width": "160px"
},
{
- "description": "Purchase Order sent by customer",
+ "description": "Customer's Purchase Order Number",
"doctype": "DocField",
"fieldname": "po_no",
"fieldtype": "Data",
"hidden": 0,
- "label": "Customer's Purchase Order No",
+ "label": "PO No",
"oldfieldname": "po_no",
"oldfieldtype": "Data",
"print_hide": 0,
@@ -220,11 +217,12 @@
},
{
"depends_on": "eval:doc.po_no",
+ "description": "Customer's Purchase Order Date",
"doctype": "DocField",
"fieldname": "po_date",
"fieldtype": "Date",
"hidden": 0,
- "label": "Customer's Purchase Order Date",
+ "label": "PO Date",
"oldfieldname": "po_date",
"oldfieldtype": "Date",
"print_hide": 0,
@@ -237,7 +235,7 @@
"fieldtype": "Link",
"hidden": 1,
"in_filter": 1,
- "label": "Shipping Address Name",
+ "label": "Shipping Address",
"options": "Address",
"print_hide": 1,
"read_only": 0
@@ -260,7 +258,6 @@
"options": "icon-tag"
},
{
- "description": "Customer's currency",
"doctype": "DocField",
"fieldname": "currency",
"fieldtype": "Link",
@@ -277,7 +274,7 @@
"doctype": "DocField",
"fieldname": "conversion_rate",
"fieldtype": "Float",
- "label": "Conversion Rate",
+ "label": "Exchange Rate",
"oldfieldname": "conversion_rate",
"oldfieldtype": "Currency",
"print_hide": 1,
@@ -291,7 +288,6 @@
"width": "50%"
},
{
- "description": "Select the price list as entered in \"Price List\" master. This will pull the reference rates of items against this price list as specified in \"Item\" master.",
"doctype": "DocField",
"fieldname": "selling_price_list",
"fieldtype": "Link",
@@ -304,7 +300,6 @@
"width": "100px"
},
{
- "description": "Select the currency in which price list is maintained",
"doctype": "DocField",
"fieldname": "price_list_currency",
"fieldtype": "Link",
@@ -319,7 +314,7 @@
"doctype": "DocField",
"fieldname": "plc_conversion_rate",
"fieldtype": "Float",
- "label": "Price List Currency Conversion Rate",
+ "label": "Price List Exchange Rate",
"print_hide": 1,
"reqd": 1
},
@@ -409,7 +404,7 @@
"doctype": "DocField",
"fieldname": "charge",
"fieldtype": "Link",
- "label": "Apply Taxes and Charges Master",
+ "label": "Tax Master",
"oldfieldname": "charge",
"oldfieldtype": "Link",
"options": "Sales Taxes and Charges Master",
@@ -424,7 +419,7 @@
"doctype": "DocField",
"fieldname": "shipping_rule",
"fieldtype": "Link",
- "label": "Apply Shipping Rule",
+ "label": "Shipping Rule",
"oldfieldtype": "Button",
"options": "Shipping Rule",
"print_hide": 1
@@ -585,7 +580,7 @@
"doctype": "DocField",
"fieldname": "tc_name",
"fieldtype": "Link",
- "label": "Select Terms and Conditions",
+ "label": "Terms",
"oldfieldname": "tc_name",
"oldfieldtype": "Link",
"options": "Terms and Conditions",
@@ -616,6 +611,7 @@
"width": "50%"
},
{
+ "description": "<a href=\"#Sales Browser/Territory\">Add / Edit</a>",
"doctype": "DocField",
"fieldname": "territory",
"fieldtype": "Link",
@@ -627,7 +623,7 @@
"search_index": 1
},
{
- "description": "Category of customer as entered in Customer master",
+ "description": "<a href=\"#Sales Browser/Customer Group\">Add / Edit</a>",
"doctype": "DocField",
"fieldname": "customer_group",
"fieldtype": "Link",
@@ -664,7 +660,6 @@
"print_hide": 1
},
{
- "description": "Filling in additional information about the Sales Order will help you analyze your data better.",
"doctype": "DocField",
"fieldname": "more_info",
"fieldtype": "Section Break",
@@ -730,7 +725,7 @@
"doctype": "DocField",
"fieldname": "select_print_heading",
"fieldtype": "Link",
- "label": "Select Print Heading",
+ "label": "Print Heading",
"no_copy": 1,
"oldfieldname": "select_print_heading",
"oldfieldtype": "Link",
@@ -845,7 +840,6 @@
"print_hide": 1
},
{
- "description": "Name as entered in Sales Partner master",
"doctype": "DocField",
"fieldname": "sales_partner",
"fieldtype": "Link",
diff --git a/selling/doctype/sales_order_item/sales_order_item.txt b/selling/doctype/sales_order_item/sales_order_item.txt
index 47b4d6b..4754aa1 100644
--- a/selling/doctype/sales_order_item/sales_order_item.txt
+++ b/selling/doctype/sales_order_item/sales_order_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-03-07 11:42:58",
"docstatus": 0,
- "modified": "2013-08-22 15:43:07",
+ "modified": "2013-11-03 14:14:17",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -344,6 +344,7 @@
"search_index": 1
},
{
+ "description": "<a href=\"#Sales Browser/Item Group\">Add / Edit</a>",
"doctype": "DocField",
"fieldname": "item_group",
"fieldtype": "Link",
@@ -401,7 +402,6 @@
"report_hide": 1
},
{
- "description": "The date at which current entry is made in system.",
"doctype": "DocField",
"fieldname": "transaction_date",
"fieldtype": "Date",
diff --git a/selling/doctype/selling_settings/selling_settings.txt b/selling/doctype/selling_settings/selling_settings.txt
index fed3627..a112a7c 100644
--- a/selling/doctype/selling_settings/selling_settings.txt
+++ b/selling/doctype/selling_settings/selling_settings.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-06-25 10:25:16",
"docstatus": 0,
- "modified": "2013-08-09 14:46:24",
+ "modified": "2013-11-02 16:58:56",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -47,7 +47,7 @@
"options": "Customer Name\nNaming Series"
},
{
- "description": "<a href=\"#Sales Browser/Customer Group\">Manage Customer Groups</a>",
+ "description": "<a href=\"#Sales Browser/Customer Group\">Add / Edit</a>",
"doctype": "DocField",
"fieldname": "customer_group",
"fieldtype": "Link",
@@ -55,7 +55,7 @@
"options": "Customer Group"
},
{
- "description": "<a href=\"#Sales Browser/Territory\">Territory</a>",
+ "description": "<a href=\"#Sales Browser/Territory\">Add / Edit</a>",
"doctype": "DocField",
"fieldname": "territory",
"fieldtype": "Link",
diff --git a/selling/doctype/shopping_cart_settings/shopping_cart_settings.txt b/selling/doctype/shopping_cart_settings/shopping_cart_settings.txt
index 531f8da..ffc3635 100644
--- a/selling/doctype/shopping_cart_settings/shopping_cart_settings.txt
+++ b/selling/doctype/shopping_cart_settings/shopping_cart_settings.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-06-19 15:57:32",
"docstatus": 0,
- "modified": "2013-07-15 17:33:15",
+ "modified": "2013-11-02 16:58:56",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -58,6 +58,7 @@
"reqd": 1
},
{
+ "description": "<a href=\"#Sales Browser/Territory\">Add / Edit</a>",
"doctype": "DocField",
"fieldname": "default_territory",
"fieldtype": "Link",
@@ -71,6 +72,7 @@
"fieldtype": "Column Break"
},
{
+ "description": "<a href=\"#Sales Browser/Customer Group\">Add / Edit</a>",
"doctype": "DocField",
"fieldname": "default_customer_group",
"fieldtype": "Link",
diff --git a/selling/report/lead_details/lead_details.txt b/selling/report/lead_details/lead_details.txt
index 6da9b79..1383a79 100644
--- a/selling/report/lead_details/lead_details.txt
+++ b/selling/report/lead_details/lead_details.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-10-22 11:58:16",
"docstatus": 0,
- "modified": "2013-10-22 12:08:18",
+ "modified": "2013-11-06 15:01:09",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -10,7 +10,7 @@
"doctype": "Report",
"is_standard": "Yes",
"name": "__common__",
- "query": "SELECT\n `tabLead`.name as \"Lead Id:Link/Lead:120\",\n `tabLead`.lead_name as \"Lead Name::120\",\n\t`tabLead`.company_name as \"Company Name::120\",\n\t`tabLead`.status as \"Status::120\",\n\tconcat_ws(', ', \n\t\ttrim(',' from `tabAddress`.address_line1), \n\t\ttrim(',' from tabAddress.address_line2), \n\t\ttabAddress.state, tabAddress.pincode, tabAddress.country\n\t) as 'Address::180',\n\t`tabLead`.phone as \"Phone::100\",\n\t`tabLead`.mobile_no as \"Mobile No::100\",\n\t`tabLead`.email_id as \"Email Id::120\",\n\t`tabLead`.lead_owner as \"Lead Owner::120\",\n\t`tabLead`.source as \"Source::120\",\n\t`tabLead`.territory as \"Territory::120\"\nFROM\n\t`tabLead`\n\tleft join `tabAddress` on (\n\t\t`tabAddress`.lead=`tabLead`.name\n\t)\nWHERE\n\t`tabLead`.docstatus<2\nORDER BY\n\t`tabLead`.name asc",
+ "query": "SELECT\n `tabLead`.name as \"Lead Id:Link/Lead:120\",\n `tabLead`.lead_name as \"Lead Name::120\",\n\t`tabLead`.company_name as \"Company Name::120\",\n\t`tabLead`.status as \"Status::120\",\n\tconcat_ws(', ', \n\t\ttrim(',' from `tabAddress`.address_line1), \n\t\ttrim(',' from tabAddress.address_line2), \n\t\ttabAddress.state, tabAddress.pincode, tabAddress.country\n\t) as 'Address::180',\n\t`tabLead`.phone as \"Phone::100\",\n\t`tabLead`.mobile_no as \"Mobile No::100\",\n\t`tabLead`.email_id as \"Email Id::120\",\n\t`tabLead`.lead_owner as \"Lead Owner::120\",\n\t`tabLead`.source as \"Source::120\",\n\t`tabLead`.territory as \"Territory::120\",\n `tabLead`.owner as \"Owner:Link/Profile:120\"\nFROM\n\t`tabLead`\n\tleft join `tabAddress` on (\n\t\t`tabAddress`.lead=`tabLead`.name\n\t)\nWHERE\n\t`tabLead`.docstatus<2\nORDER BY\n\t`tabLead`.name asc",
"ref_doctype": "Lead",
"report_name": "Lead Details",
"report_type": "Query Report"
diff --git a/selling/sales_common.js b/selling/sales_common.js
index 89b60b7..5a1ee08 100644
--- a/selling/sales_common.js
+++ b/selling/sales_common.js
@@ -524,12 +524,12 @@
setup_field_label_map(["net_total_export", "other_charges_total_export", "grand_total_export",
"rounded_total_export", "in_words_export"], this.frm.doc.currency);
- setup_field_label_map(["conversion_rate"], "1 " + this.frm.doc.currency
- + " = [?] " + company_currency);
+ cur_frm.set_df_property("conversion_rate", "description", "1 " + this.frm.doc.currency
+ + " = [?] " + company_currency)
if(this.frm.doc.price_list_currency && this.frm.doc.price_list_currency!=company_currency) {
- setup_field_label_map(["plc_conversion_rate"], "1 " + this.frm.doc.price_list_currency
- + " = [?] " + company_currency);
+ cur_frm.set_df_property("plc_conversion_rate", "description", "1 " + this.frm.doc.price_list_currency
+ + " = [?] " + company_currency)
}
// toggle fields
@@ -537,7 +537,7 @@
"grand_total", "rounded_total", "in_words"],
this.frm.doc.currency != company_currency);
- this.frm.toggle_display(["plc_conversion_rate"],
+ this.frm.toggle_display(["plc_conversion_rate", "price_list_currency"],
this.frm.doc.price_list_currency != company_currency);
// set labels
diff --git a/setup/doctype/applicable_territory/applicable_territory.txt b/setup/doctype/applicable_territory/applicable_territory.txt
index 31064de..10d84d1 100644
--- a/setup/doctype/applicable_territory/applicable_territory.txt
+++ b/setup/doctype/applicable_territory/applicable_territory.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-06-20 12:48:38",
"docstatus": 0,
- "modified": "2013-10-31 18:56:54",
+ "modified": "2013-11-02 16:58:57",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -13,6 +13,7 @@
"name": "__common__"
},
{
+ "description": "<a href=\"#Sales Browser/Territory\">Add / Edit</a>",
"doctype": "DocField",
"fieldname": "territory",
"fieldtype": "Link",
diff --git a/setup/doctype/company/company.txt b/setup/doctype/company/company.txt
index eb6b9ad..8c3860a 100644
--- a/setup/doctype/company/company.txt
+++ b/setup/doctype/company/company.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-04-10 08:35:39",
"docstatus": 0,
- "modified": "2013-10-08 15:18:34",
+ "modified": "2013-11-02 14:24:11",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -157,7 +157,6 @@
"width": "50%"
},
{
- "description": "To enable more currencies go to Setup > Currency",
"doctype": "DocField",
"fieldname": "default_currency",
"fieldtype": "Link",
diff --git a/setup/doctype/contact_control/contact_control.js b/setup/doctype/contact_control/contact_control.js
index 6c3f17d..af42d83 100755
--- a/setup/doctype/contact_control/contact_control.js
+++ b/setup/doctype/contact_control/contact_control.js
@@ -123,7 +123,7 @@
});
// css
- $wrapper.css({ 'padding': '5px 0px' });
+ $wrapper.css({ 'margin': '0px' });
$wrapper.find('div.description').css({
'padding': '5px 2px',
'line-height': '150%',
diff --git a/setup/doctype/customer_group/customer_group.txt b/setup/doctype/customer_group/customer_group.txt
index 4f9acc6..f76a2e1 100644
--- a/setup/doctype/customer_group/customer_group.txt
+++ b/setup/doctype/customer_group/customer_group.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-01-10 16:34:23",
"docstatus": 0,
- "modified": "2013-08-05 18:12:57",
+ "modified": "2013-11-02 16:52:51",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -62,6 +62,7 @@
"reqd": 1
},
{
+ "description": "<a href=\"#Sales Browser/Customer Group\">Add / Edit</a>",
"doctype": "DocField",
"fieldname": "parent_customer_group",
"fieldtype": "Link",
@@ -88,7 +89,6 @@
"fieldtype": "Column Break"
},
{
- "description": "This Price List will be selected as default for all Customers under this Group.",
"doctype": "DocField",
"fieldname": "default_price_list",
"fieldtype": "Link",
@@ -122,6 +122,7 @@
"search_index": 1
},
{
+ "description": "<a href=\"#Sales Browser/Customer Group\">Add / Edit</a>",
"doctype": "DocField",
"fieldname": "old_parent",
"fieldtype": "Link",
diff --git a/setup/doctype/features_setup/features_setup.txt b/setup/doctype/features_setup/features_setup.txt
index 89c9dd3..3f73ee2 100644
--- a/setup/doctype/features_setup/features_setup.txt
+++ b/setup/doctype/features_setup/features_setup.txt
@@ -2,7 +2,7 @@
{
"creation": "2012-12-20 12:50:49",
"docstatus": 0,
- "modified": "2013-08-22 15:36:43",
+ "modified": "2013-11-03 14:20:18",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -235,7 +235,6 @@
"fieldtype": "Column Break"
},
{
- "description": "Enables <b>More Info.</b> in all documents",
"doctype": "DocField",
"fieldname": "fs_more_info",
"fieldtype": "Check",
diff --git a/setup/doctype/item_group/item_group.txt b/setup/doctype/item_group/item_group.txt
index f573110..b365893 100644
--- a/setup/doctype/item_group/item_group.txt
+++ b/setup/doctype/item_group/item_group.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-03-28 10:35:29",
"docstatus": 0,
- "modified": "2013-08-05 17:21:14",
+ "modified": "2013-11-02 19:41:37",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -67,6 +67,7 @@
"fieldtype": "Column Break"
},
{
+ "description": "<a href=\"#Sales Browser/Item Group\">Add / Edit</a>",
"doctype": "DocField",
"fieldname": "parent_item_group",
"fieldtype": "Link",
@@ -160,6 +161,7 @@
"search_index": 1
},
{
+ "description": "<a href=\"#Sales Browser/Item Group\">Add / Edit</a>",
"doctype": "DocField",
"fieldname": "old_parent",
"fieldtype": "Link",
diff --git a/setup/doctype/sales_partner/sales_partner.txt b/setup/doctype/sales_partner/sales_partner.txt
index ab47565..7d0750f 100644
--- a/setup/doctype/sales_partner/sales_partner.txt
+++ b/setup/doctype/sales_partner/sales_partner.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-04-12 15:34:06",
"docstatus": 0,
- "modified": "2013-07-05 14:54:31",
+ "modified": "2013-11-02 16:59:04",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -64,6 +64,7 @@
"search_index": 0
},
{
+ "description": "<a href=\"#Sales Browser/Territory\">Add / Edit</a>",
"doctype": "DocField",
"fieldname": "territory",
"fieldtype": "Link",
diff --git a/setup/doctype/target_detail/target_detail.txt b/setup/doctype/target_detail/target_detail.txt
index 5d22d88..71debd3 100644
--- a/setup/doctype/target_detail/target_detail.txt
+++ b/setup/doctype/target_detail/target_detail.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:58",
"docstatus": 0,
- "modified": "2013-07-10 14:54:24",
+ "modified": "2013-11-02 19:41:37",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -26,6 +26,7 @@
"name": "Target Detail"
},
{
+ "description": "<a href=\"#Sales Browser/Item Group\">Add / Edit</a>",
"doctype": "DocField",
"fieldname": "item_group",
"fieldtype": "Link",
diff --git a/setup/doctype/territory/territory.txt b/setup/doctype/territory/territory.txt
index b647e7b..200f24f 100644
--- a/setup/doctype/territory/territory.txt
+++ b/setup/doctype/territory/territory.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-01-10 16:34:24",
"docstatus": 0,
- "modified": "2013-08-05 18:12:29",
+ "modified": "2013-11-02 16:59:08",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -64,6 +64,7 @@
"reqd": 1
},
{
+ "description": "<a href=\"#Sales Browser/Territory\">Add / Edit</a>",
"doctype": "DocField",
"fieldname": "parent_territory",
"fieldtype": "Link",
@@ -130,6 +131,7 @@
"search_index": 1
},
{
+ "description": "<a href=\"#Sales Browser/Territory\">Add / Edit</a>",
"doctype": "DocField",
"fieldname": "old_parent",
"fieldtype": "Link",
diff --git a/setup/doctype/website_item_group/website_item_group.txt b/setup/doctype/website_item_group/website_item_group.txt
index 5753fcf..0a8a3aa 100644
--- a/setup/doctype/website_item_group/website_item_group.txt
+++ b/setup/doctype/website_item_group/website_item_group.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:28:09",
"docstatus": 0,
- "modified": "2013-07-10 14:54:30",
+ "modified": "2013-11-02 19:41:38",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -15,6 +15,7 @@
"name": "__common__"
},
{
+ "description": "<a href=\"#Sales Browser/Item Group\">Add / Edit</a>",
"doctype": "DocField",
"fieldname": "item_group",
"fieldtype": "Link",
diff --git a/setup/page/setup_wizard/setup_wizard.css b/setup/page/setup_wizard/setup_wizard.css
index ad49ef0..386715f 100644
--- a/setup/page/setup_wizard/setup_wizard.css
+++ b/setup/page/setup_wizard/setup_wizard.css
@@ -1,6 +1,10 @@
#page-setup-wizard .panel {
- -webkit-box-shadow: 0px 1px 8px rgba(0,0,0,0.6);
- box-shadow: 0px 1px 8px rgba(0,0,0,0.6);
+ background-color: #fff;
+ position: fixed; top:0; left: 0; width:100%; height:100%;
+ overflow: auto;
+}
+
+#page-setup-wizard .panel-body {
}
#page-setup-wizard .col-md-6 .control-input .btn {
diff --git a/setup/page/setup_wizard/setup_wizard.js b/setup/page/setup_wizard/setup_wizard.js
index bec2828..f75aeac 100644
--- a/setup/page/setup_wizard/setup_wizard.js
+++ b/setup/page/setup_wizard/setup_wizard.js
@@ -192,7 +192,6 @@
{fieldtype:"Attach", fieldname:"item_img_1", label:"Attach Image..."},
{fieldtype:"Section Break"},
{fieldtype:"Column Break"},
- {fieldtype:"Column Break"},
{fieldtype:"Select", fieldname:"item_group_1", options:["Products", "Services", "Raw Material", "Sub Assemblies"]},
{fieldtype:"Column Break"},
{fieldtype:"Select", fieldname:"item_uom_1", options:["Unit", "Nos", "Box", "Pair", "Kg", "Set", "Hour", "Minute"]},
@@ -202,7 +201,6 @@
{fieldtype:"Attach", fieldname:"item_img_2", label:"Attach Image..."},
{fieldtype:"Section Break"},
{fieldtype:"Column Break"},
- {fieldtype:"Column Break"},
{fieldtype:"Select", fieldname:"item_group_2", options:["Products", "Services", "Raw Material", "Sub Assemblies"]},
{fieldtype:"Column Break"},
{fieldtype:"Select", fieldname:"item_uom_2", options:["Unit", "Nos", "Box", "Pair", "Kg", "Set", "Hour", "Minute"]},
@@ -212,7 +210,6 @@
{fieldtype:"Attach", fieldname:"item_img_3", label:"Attach Image..."},
{fieldtype:"Section Break"},
{fieldtype:"Column Break"},
- {fieldtype:"Column Break"},
{fieldtype:"Select", fieldname:"item_group_3", options:["Products", "Services", "Raw Material", "Sub Assemblies"]},
{fieldtype:"Column Break"},
{fieldtype:"Select", fieldname:"item_uom_3", options:["Unit", "Nos", "Box", "Pair", "Kg", "Set", "Hour", "Minute"]},
@@ -222,7 +219,6 @@
{fieldtype:"Attach", fieldname:"item_img_4", label:"Attach Image..."},
{fieldtype:"Section Break"},
{fieldtype:"Column Break"},
- {fieldtype:"Column Break"},
{fieldtype:"Select", fieldname:"item_group_4", options:["Products", "Services", "Raw Material", "Sub Assemblies"]},
{fieldtype:"Column Break"},
{fieldtype:"Select", fieldname:"item_uom_4", options:["Unit", "Nos", "Box", "Pair", "Kg", "Set", "Hour", "Minute"]},
@@ -232,7 +228,6 @@
{fieldtype:"Attach", fieldname:"item_img_5", label:"Attach Image..."},
{fieldtype:"Section Break"},
{fieldtype:"Column Break"},
- {fieldtype:"Column Break"},
{fieldtype:"Select", fieldname:"item_group_5", options:["Products", "Services", "Raw Material", "Sub Assemblies"]},
{fieldtype:"Column Break"},
{fieldtype:"Select", fieldname:"item_uom_5", options:["Unit", "Nos", "Box", "Pair", "Kg", "Set", "Hour", "Minute"]},
@@ -246,40 +241,40 @@
"help": wn._("List a few products or services you buy from your suppliers or vendors. If these are same as your products, then do not add them."),
"fields": [
{fieldtype:"Data", fieldname:"item_buy_1", label:"Item 1", placeholder:"A Product or Service"},
- {fieldtype:"Section Break"},
{fieldtype:"Column Break"},
+ {fieldtype:"Section Break"},
{fieldtype:"Column Break"},
{fieldtype:"Select", fieldname:"item_buy_group_1", options:["Raw Material", "Consumable", "Sub Assemblies", "Services", "Products"]},
{fieldtype:"Column Break"},
{fieldtype:"Select", fieldname:"item_buy_uom_1", options:["Unit", "Nos", "Box", "Pair", "Kg", "Set", "Hour", "Minute"]},
{fieldtype:"Section Break"},
{fieldtype:"Data", fieldname:"item_buy_2", label:"Item 2", placeholder:"A Product or Service"},
- {fieldtype:"Section Break"},
{fieldtype:"Column Break"},
+ {fieldtype:"Section Break"},
{fieldtype:"Column Break"},
{fieldtype:"Select", fieldname:"item_buy_group_2", options:["Raw Material", "Consumable", "Sub Assemblies", "Services", "Products"]},
{fieldtype:"Column Break"},
{fieldtype:"Select", fieldname:"item_buy_uom_2", options:["Unit", "Nos", "Box", "Pair", "Kg", "Set", "Hour", "Minute"]},
{fieldtype:"Section Break"},
{fieldtype:"Data", fieldname:"item_buy_3", label:"Item 3", placeholder:"A Product or Service"},
- {fieldtype:"Section Break"},
{fieldtype:"Column Break"},
+ {fieldtype:"Section Break"},
{fieldtype:"Column Break"},
{fieldtype:"Select", fieldname:"item_buy_group_3", options:["Raw Material", "Consumable", "Sub Assemblies", "Services", "Products"]},
{fieldtype:"Column Break"},
{fieldtype:"Select", fieldname:"item_buy_uom_3", options:["Unit", "Nos", "Box", "Pair", "Kg", "Set", "Hour", "Minute"]},
{fieldtype:"Section Break"},
{fieldtype:"Data", fieldname:"item_buy_4", label:"Item 4", placeholder:"A Product or Service"},
- {fieldtype:"Section Break"},
{fieldtype:"Column Break"},
+ {fieldtype:"Section Break"},
{fieldtype:"Column Break"},
{fieldtype:"Select", fieldname:"item_buy_group_4", options:["Raw Material", "Consumable", "Sub Assemblies", "Services", "Products"]},
{fieldtype:"Column Break"},
{fieldtype:"Select", fieldname:"item_buy_uom_4", options:["Unit", "Nos", "Box", "Pair", "Kg", "Set", "Hour", "Minute"]},
{fieldtype:"Section Break"},
{fieldtype:"Data", fieldname:"item_buy_5", label:"Item 5", placeholder:"A Product or Service"},
- {fieldtype:"Section Break"},
{fieldtype:"Column Break"},
+ {fieldtype:"Section Break"},
{fieldtype:"Column Break"},
{fieldtype:"Select", fieldname:"item_buy_group_5", options:["Raw Material", "Consumable", "Sub Assemblies", "Services", "Products"]},
{fieldtype:"Column Break"},
@@ -363,7 +358,7 @@
this.show_welcome();
},
get_message: function(html) {
- return $(repl('<div class="panel panel-default" style="max-width: 400px; margin: auto;">\
+ return $(repl('<div class="panel panel-default">\
<div class="panel-body" style="padding: 40px;">%(html)s</div>\
</div>', {html:html}))
},
@@ -431,16 +426,17 @@
},
make: function() {
var me = this;
- this.$wrapper = $(repl('<div class="panel panel-default" style="margin: 0px 30px;">\
+ this.$wrapper = $(repl('<div class="panel panel-default">\
<div class="panel-heading"><div class="panel-title">%(main_title)s: Step %(step)s</div></div>\
<div class="panel-body">\
<div class="progress">\
<div class="progress-bar" style="width: %(width)s%"></div>\
</div>\
+ <br>\
<div class="row">\
- <div class="col-sm-6 form"></div>\
- <div class="col-sm-6 help">\
- <h3><i class="%(icon)s text-muted"></i> %(title)s</h3><br>\
+ <div class="col-sm-8 form"></div>\
+ <div class="col-sm-4 help">\
+ <h3 style="margin-top: 0px"><i class="%(icon)s text-muted"></i> %(title)s</h3><br>\
<p class="text-muted">%(help)s</p>\
</div>\
</div>\
diff --git a/startup/webutils.py b/startup/webutils.py
index 218741b..ee16c90 100644
--- a/startup/webutils.py
+++ b/startup/webutils.py
@@ -23,4 +23,7 @@
context.update({
"shopping_cart_enabled": cart_enabled,
"post_login": post_login + context.get("post_login", [])
- })
\ No newline at end of file
+ })
+
+ if not context.get("favicon"):
+ context["favicon"] = "app/images/favicon.ico"
\ No newline at end of file
diff --git a/stock/doctype/delivery_note/delivery_note.txt b/stock/doctype/delivery_note/delivery_note.txt
index 037b4fb..7fb166e 100644
--- a/stock/doctype/delivery_note/delivery_note.txt
+++ b/stock/doctype/delivery_note/delivery_note.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-05-24 19:29:09",
"docstatus": 0,
- "modified": "2013-10-11 13:19:40",
+ "modified": "2013-11-03 14:20:19",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -59,11 +59,10 @@
"width": "50%"
},
{
- "description": "To manage multiple series please go to Setup > Manage Series",
"doctype": "DocField",
"fieldname": "naming_series",
"fieldtype": "Select",
- "label": "Document Numbering Series",
+ "label": "Series",
"no_copy": 1,
"oldfieldname": "naming_series",
"oldfieldtype": "Select",
@@ -119,7 +118,7 @@
"doctype": "DocField",
"fieldname": "shipping_address_name",
"fieldtype": "Link",
- "label": "Shipping Address Name",
+ "label": "Shipping Address",
"options": "Address",
"print_hide": 1
},
@@ -196,7 +195,6 @@
},
{
"default": "Today",
- "description": "The date at which current entry will get or has actually executed.",
"doctype": "DocField",
"fieldname": "posting_date",
"fieldtype": "Date",
@@ -250,7 +248,6 @@
"read_only": 0
},
{
- "description": "Customer's Currency",
"doctype": "DocField",
"fieldname": "currency",
"fieldtype": "Link",
@@ -267,7 +264,7 @@
"doctype": "DocField",
"fieldname": "conversion_rate",
"fieldtype": "Float",
- "label": "Conversion Rate",
+ "label": "Exchange Rate",
"no_copy": 0,
"oldfieldname": "conversion_rate",
"oldfieldtype": "Currency",
@@ -282,7 +279,6 @@
"read_only": 0
},
{
- "description": "Select the price list as entered in \"Price List\" master. This will pull the reference rates of items against this price list as specified in \"Item\" master.",
"doctype": "DocField",
"fieldname": "selling_price_list",
"fieldtype": "Link",
@@ -295,7 +291,6 @@
"reqd": 1
},
{
- "description": "Select the currency in which price list is maintained",
"doctype": "DocField",
"fieldname": "price_list_currency",
"fieldtype": "Link",
@@ -310,7 +305,7 @@
"doctype": "DocField",
"fieldname": "plc_conversion_rate",
"fieldtype": "Float",
- "label": "Price List Currency Conversion Rate",
+ "label": "Price List Exchange Rate",
"print_hide": 1,
"read_only": 0,
"reqd": 1
@@ -414,7 +409,7 @@
"doctype": "DocField",
"fieldname": "charge",
"fieldtype": "Link",
- "label": "Apply Taxes and Charges Master",
+ "label": "Tax Master",
"oldfieldname": "charge",
"oldfieldtype": "Link",
"options": "Sales Taxes and Charges Master",
@@ -430,7 +425,7 @@
"doctype": "DocField",
"fieldname": "shipping_rule",
"fieldtype": "Link",
- "label": "Apply Shipping Rule",
+ "label": "Shipping Rule",
"oldfieldtype": "Button",
"options": "Shipping Rule",
"print_hide": 1,
@@ -608,7 +603,7 @@
"doctype": "DocField",
"fieldname": "tc_name",
"fieldtype": "Link",
- "label": "Select Terms and Conditions",
+ "label": "Terms",
"oldfieldname": "tc_name",
"oldfieldtype": "Link",
"options": "Terms and Conditions",
@@ -695,6 +690,7 @@
"read_only": 0
},
{
+ "description": "<a href=\"#Sales Browser/Territory\">Add / Edit</a>",
"doctype": "DocField",
"fieldname": "territory",
"fieldtype": "Link",
@@ -708,6 +704,7 @@
"search_index": 1
},
{
+ "description": "<a href=\"#Sales Browser/Customer Group\">Add / Edit</a>",
"doctype": "DocField",
"fieldname": "customer_group",
"fieldtype": "Link",
@@ -737,7 +734,6 @@
"read_only": 0
},
{
- "description": "Filling in Additional Information about the Delivery Note will help you analyze your data better.",
"doctype": "DocField",
"fieldname": "more_info",
"fieldtype": "Section Break",
@@ -842,7 +838,7 @@
"doctype": "DocField",
"fieldname": "select_print_heading",
"fieldtype": "Link",
- "label": "Select Print Heading",
+ "label": "Print Heading",
"no_copy": 1,
"oldfieldname": "select_print_heading",
"oldfieldtype": "Link",
diff --git a/stock/doctype/delivery_note_item/delivery_note_item.txt b/stock/doctype/delivery_note_item/delivery_note_item.txt
index 8d1792d..a118715 100644
--- a/stock/doctype/delivery_note_item/delivery_note_item.txt
+++ b/stock/doctype/delivery_note_item/delivery_note_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-04-22 13:15:44",
"docstatus": 0,
- "modified": "2013-10-10 17:03:11",
+ "modified": "2013-11-02 19:41:38",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -297,6 +297,7 @@
"width": "120px"
},
{
+ "description": "<a href=\"#Sales Browser/Item Group\">Add / Edit</a>",
"doctype": "DocField",
"fieldname": "item_group",
"fieldtype": "Link",
diff --git a/stock/doctype/item/item.txt b/stock/doctype/item/item.txt
index c70b991..22c5dcc 100644
--- a/stock/doctype/item/item.txt
+++ b/stock/doctype/item/item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-05-03 10:45:46",
"docstatus": 0,
- "modified": "2013-09-11 11:50:10",
+ "modified": "2013-11-02 19:41:40",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -57,7 +57,7 @@
"doctype": "DocField",
"fieldname": "naming_series",
"fieldtype": "Select",
- "label": "Document Numbering Series",
+ "label": "Series",
"options": "\nITEM",
"read_only": 0
},
@@ -89,7 +89,7 @@
"search_index": 1
},
{
- "description": "<a href=\"#!Sales Browser/Item Group\">Manage Item Groups</a>",
+ "description": "<a href=\"#Sales Browser/Item Group\">Add / Edit</a>",
"doctype": "DocField",
"fieldname": "item_group",
"fieldtype": "Link",
diff --git a/stock/doctype/landed_cost_wizard/landed_cost_wizard.py b/stock/doctype/landed_cost_wizard/landed_cost_wizard.py
index 89a3b81..071e1dd 100644
--- a/stock/doctype/landed_cost_wizard/landed_cost_wizard.py
+++ b/stock/doctype/landed_cost_wizard/landed_cost_wizard.py
@@ -84,7 +84,7 @@
for pr in purchase_receipts:
pr_bean = webnotes.bean("Purchase Receipt", pr)
- pr_bean.run_method("update_ordered_qty", is_cancelled="Yes")
+ pr_bean.run_method("update_ordered_qty")
webnotes.conn.sql("""delete from `tabStock Ledger Entry`
where voucher_type='Purchase Receipt' and voucher_no=%s""", pr)
diff --git a/stock/doctype/material_request/material_request.txt b/stock/doctype/material_request/material_request.txt
index 5fd576a..1330c45 100644
--- a/stock/doctype/material_request/material_request.txt
+++ b/stock/doctype/material_request/material_request.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-03-07 14:48:38",
"docstatus": 0,
- "modified": "2013-10-02 14:24:42",
+ "modified": "2013-11-03 15:29:49",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -50,7 +50,7 @@
"doctype": "DocField",
"fieldname": "type_section",
"fieldtype": "Section Break",
- "label": "Type",
+ "label": "Basic Info",
"options": "icon-pushpin"
},
{
@@ -58,7 +58,7 @@
"fieldname": "material_request_type",
"fieldtype": "Select",
"in_list_view": 1,
- "label": "Material Request Type",
+ "label": "Type",
"options": "Purchase\nTransfer",
"reqd": 1
},
@@ -68,11 +68,10 @@
"fieldtype": "Column Break"
},
{
- "description": "To manage multiple series please go to Setup > Manage Series",
"doctype": "DocField",
"fieldname": "naming_series",
"fieldtype": "Select",
- "label": "Document Numbering Series",
+ "label": "Series",
"no_copy": 1,
"oldfieldname": "naming_series",
"oldfieldtype": "Select",
@@ -129,7 +128,6 @@
"options": "Material Request Item"
},
{
- "description": "Give additional details about the indent.",
"doctype": "DocField",
"fieldname": "more_info",
"fieldtype": "Section Break",
@@ -146,7 +144,12 @@
"width": "50%"
},
{
- "description": "The date at which current entry is made in system.",
+ "doctype": "DocField",
+ "fieldname": "requested_by",
+ "fieldtype": "Data",
+ "label": "Requested For"
+ },
+ {
"doctype": "DocField",
"fieldname": "transaction_date",
"fieldtype": "Date",
@@ -176,19 +179,6 @@
"width": "150px"
},
{
- "description": "Name of the entity who has requested for the Material Request",
- "doctype": "DocField",
- "fieldname": "requested_by",
- "fieldtype": "Data",
- "in_list_view": 0,
- "label": "Requested By",
- "no_copy": 1,
- "oldfieldname": "requested_by",
- "oldfieldtype": "Data",
- "print_width": "100px",
- "width": "100px"
- },
- {
"doctype": "DocField",
"fieldname": "column_break2",
"fieldtype": "Column Break",
@@ -197,17 +187,6 @@
"width": "50%"
},
{
- "allow_on_submit": 1,
- "doctype": "DocField",
- "fieldname": "letter_head",
- "fieldtype": "Select",
- "label": "Letter Head",
- "oldfieldname": "letter_head",
- "oldfieldtype": "Select",
- "options": "link:Letter Head",
- "print_hide": 1
- },
- {
"doctype": "DocField",
"fieldname": "status",
"fieldtype": "Select",
@@ -226,6 +205,26 @@
"width": "100px"
},
{
+ "allow_on_submit": 1,
+ "doctype": "DocField",
+ "fieldname": "letter_head",
+ "fieldtype": "Select",
+ "label": "Letter Head",
+ "oldfieldname": "letter_head",
+ "oldfieldtype": "Select",
+ "options": "link:Letter Head",
+ "print_hide": 1
+ },
+ {
+ "allow_on_submit": 1,
+ "doctype": "DocField",
+ "fieldname": "select_print_heading",
+ "fieldtype": "Link",
+ "label": "Print Heading",
+ "options": "Print Heading",
+ "print_hide": 1
+ },
+ {
"description": "% of materials ordered against this Material Request",
"doctype": "DocField",
"fieldname": "per_ordered",
@@ -240,20 +239,6 @@
},
{
"doctype": "DocField",
- "fieldname": "remark",
- "fieldtype": "Small Text",
- "in_list_view": 0,
- "label": "Remarks",
- "no_copy": 1,
- "oldfieldname": "remark",
- "oldfieldtype": "Small Text",
- "print_hide": 0,
- "print_width": "150px",
- "width": "150px"
- },
- {
- "description": "Add Terms and Conditions for the Material Request. You can also prepare a Terms and Conditions Master and use the Template",
- "doctype": "DocField",
"fieldname": "terms_section_break",
"fieldtype": "Section Break",
"label": "Terms and Conditions",
@@ -264,7 +249,7 @@
"doctype": "DocField",
"fieldname": "tc_name",
"fieldtype": "Link",
- "label": "Select Terms and Conditions",
+ "label": "Terms",
"oldfieldname": "tc_name",
"oldfieldtype": "Link",
"options": "Terms and Conditions",
@@ -280,15 +265,6 @@
"oldfieldtype": "Text Editor"
},
{
- "allow_on_submit": 1,
- "doctype": "DocField",
- "fieldname": "select_print_heading",
- "fieldtype": "Link",
- "label": "Select Print Heading",
- "options": "Print Heading",
- "print_hide": 1
- },
- {
"doctype": "DocPerm",
"role": "Purchase Manager"
},
diff --git a/stock/doctype/material_request_item/material_request_item.txt b/stock/doctype/material_request_item/material_request_item.txt
index 2ef4acd..15884a3 100644
--- a/stock/doctype/material_request_item/material_request_item.txt
+++ b/stock/doctype/material_request_item/material_request_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:28:02",
"docstatus": 0,
- "modified": "2013-10-11 14:21:32",
+ "modified": "2013-11-03 20:36:45",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -76,20 +76,6 @@
},
{
"doctype": "DocField",
- "fieldname": "warehouse",
- "fieldtype": "Link",
- "in_list_view": 1,
- "label": "Warehouse",
- "oldfieldname": "warehouse",
- "oldfieldtype": "Link",
- "options": "Warehouse",
- "print_hide": 0,
- "print_width": "100px",
- "reqd": 0,
- "width": "100px"
- },
- {
- "doctype": "DocField",
"fieldname": "qty",
"fieldtype": "Float",
"in_list_view": 1,
@@ -118,6 +104,26 @@
},
{
"doctype": "DocField",
+ "fieldname": "warehouse",
+ "fieldtype": "Link",
+ "in_list_view": 1,
+ "label": "For Warehouse",
+ "oldfieldname": "warehouse",
+ "oldfieldtype": "Link",
+ "options": "Warehouse",
+ "print_hide": 0,
+ "print_width": "100px",
+ "reqd": 0,
+ "width": "100px"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "more_info",
+ "fieldtype": "Section Break",
+ "label": "More Info"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "lead_time_date",
"fieldtype": "Date",
"in_list_view": 0,
@@ -143,6 +149,7 @@
"width": "100px"
},
{
+ "description": "<a href=\"#Sales Browser/Item Group\">Add / Edit</a>",
"doctype": "DocField",
"fieldname": "item_group",
"fieldtype": "Link",
diff --git a/stock/doctype/packing_slip/packing_slip.txt b/stock/doctype/packing_slip/packing_slip.txt
index 08e71ec..c86e90f 100644
--- a/stock/doctype/packing_slip/packing_slip.txt
+++ b/stock/doctype/packing_slip/packing_slip.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-04-11 15:32:24",
"docstatus": 0,
- "modified": "2013-08-08 14:22:28",
+ "modified": "2013-11-02 14:05:59",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -78,7 +78,7 @@
"doctype": "DocField",
"fieldname": "naming_series",
"fieldtype": "Select",
- "label": "Document Numbering Series",
+ "label": "Series",
"no_copy": 0,
"options": "PS",
"print_hide": 1,
diff --git a/stock/doctype/purchase_receipt/purchase_receipt.txt b/stock/doctype/purchase_receipt/purchase_receipt.txt
index f228a14..6035b71 100755
--- a/stock/doctype/purchase_receipt/purchase_receipt.txt
+++ b/stock/doctype/purchase_receipt/purchase_receipt.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-05-21 16:16:39",
"docstatus": 0,
- "modified": "2013-10-11 13:20:13",
+ "modified": "2013-11-03 14:20:21",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -56,11 +56,10 @@
"width": "50%"
},
{
- "description": "To manage multiple series please go to Setup > Manage Series",
"doctype": "DocField",
"fieldname": "naming_series",
"fieldtype": "Select",
- "label": "Document Numbering Series",
+ "label": "Series",
"no_copy": 1,
"oldfieldname": "naming_series",
"oldfieldtype": "Select",
@@ -136,7 +135,6 @@
"width": "50%"
},
{
- "description": "The date at which current entry will get or has actually executed.",
"doctype": "DocField",
"fieldname": "posting_date",
"fieldtype": "Date",
@@ -203,7 +201,6 @@
"options": "icon-tag"
},
{
- "description": "Supplier's currency",
"doctype": "DocField",
"fieldname": "currency",
"fieldtype": "Link",
@@ -234,7 +231,6 @@
"width": "50%"
},
{
- "description": "Consider this Price List for fetching rate. (only which have \"For Buying\" as checked)",
"doctype": "DocField",
"fieldname": "buying_price_list",
"fieldtype": "Link",
@@ -489,7 +485,6 @@
"read_only": 1
},
{
- "description": "Add Terms and Conditions for the Purchase Receipt. You can also prepare a Terms and Conditions Master and use the Template.",
"doctype": "DocField",
"fieldname": "terms_section_break",
"fieldtype": "Section Break",
@@ -501,7 +496,7 @@
"doctype": "DocField",
"fieldname": "tc_name",
"fieldtype": "Link",
- "label": "Select Terms and Conditions",
+ "label": "Terms",
"oldfieldname": "tc_name",
"oldfieldtype": "Link",
"options": "Terms and Conditions",
@@ -545,7 +540,6 @@
"print_hide": 1
},
{
- "description": "Filing in Additional Information about the Purchase Receipt will help you analyze your data better.",
"doctype": "DocField",
"fieldname": "more_info",
"fieldtype": "Section Break",
@@ -632,7 +626,7 @@
"doctype": "DocField",
"fieldname": "select_print_heading",
"fieldtype": "Link",
- "label": "Select Print Heading",
+ "label": "Print Heading",
"no_copy": 1,
"oldfieldname": "select_print_heading",
"oldfieldtype": "Link",
diff --git a/stock/doctype/purchase_receipt_item/purchase_receipt_item.txt b/stock/doctype/purchase_receipt_item/purchase_receipt_item.txt
index 9c0d0fb..22ded6d 100755
--- a/stock/doctype/purchase_receipt_item/purchase_receipt_item.txt
+++ b/stock/doctype/purchase_receipt_item/purchase_receipt_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-05-24 19:29:10",
"docstatus": 0,
- "modified": "2013-10-10 17:02:51",
+ "modified": "2013-11-02 19:41:45",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -369,6 +369,7 @@
"read_only": 1
},
{
+ "description": "<a href=\"#Sales Browser/Item Group\">Add / Edit</a>",
"doctype": "DocField",
"fieldname": "item_group",
"fieldtype": "Link",
diff --git a/stock/doctype/serial_no/serial_no.txt b/stock/doctype/serial_no/serial_no.txt
index 8500303..b29a1a8 100644
--- a/stock/doctype/serial_no/serial_no.txt
+++ b/stock/doctype/serial_no/serial_no.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-05-16 10:59:15",
"docstatus": 0,
- "modified": "2013-08-28 19:13:09",
+ "modified": "2013-11-02 19:41:52",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -143,6 +143,7 @@
"width": "300px"
},
{
+ "description": "<a href=\"#Sales Browser/Item Group\">Add / Edit</a>",
"doctype": "DocField",
"fieldname": "item_group",
"fieldtype": "Link",
diff --git a/stock/doctype/stock_entry/stock_entry.txt b/stock/doctype/stock_entry/stock_entry.txt
index 204ebfa..ca9b5f2 100644
--- a/stock/doctype/stock_entry/stock_entry.txt
+++ b/stock/doctype/stock_entry/stock_entry.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-04-09 11:43:55",
"docstatus": 0,
- "modified": "2013-08-24 15:16:34",
+ "modified": "2013-11-03 14:11:42",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -66,13 +66,12 @@
},
{
"allow_on_submit": 0,
- "description": "To manage multiple series please go to Setup > Manage Series",
"doctype": "DocField",
"fieldname": "naming_series",
"fieldtype": "Select",
"hidden": 0,
"in_filter": 0,
- "label": "Document Numbering Series",
+ "label": "Series",
"no_copy": 1,
"oldfieldname": "naming_series",
"oldfieldtype": "Select",
@@ -165,7 +164,6 @@
{
"allow_on_submit": 0,
"default": "Today",
- "description": "The date at which current entry will get or has actually executed.",
"doctype": "DocField",
"fieldname": "posting_date",
"fieldtype": "Date",
@@ -535,7 +533,7 @@
"fieldtype": "Link",
"hidden": 0,
"in_filter": 0,
- "label": "Select Print Heading",
+ "label": "Print Heading",
"no_copy": 0,
"oldfieldname": "select_print_heading",
"oldfieldtype": "Link",
diff --git a/stock/doctype/stock_entry_detail/stock_entry_detail.txt b/stock/doctype/stock_entry_detail/stock_entry_detail.txt
index 5218c1a..b97928b 100644
--- a/stock/doctype/stock_entry_detail/stock_entry_detail.txt
+++ b/stock/doctype/stock_entry_detail/stock_entry_detail.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-03-29 18:22:12",
"docstatus": 0,
- "modified": "2013-10-23 14:35:46",
+ "modified": "2013-11-08 16:15:44",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -110,25 +110,9 @@
},
{
"doctype": "DocField",
- "fieldname": "incoming_rate",
- "fieldtype": "Currency",
- "in_list_view": 1,
- "label": "Valuation Rate",
- "oldfieldname": "incoming_rate",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "read_only": 0,
- "reqd": 0
- },
- {
- "doctype": "DocField",
- "fieldname": "amount",
- "fieldtype": "Currency",
- "label": "Amount",
- "oldfieldname": "amount",
- "oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "read_only": 1
+ "fieldname": "serial_no_batch",
+ "fieldtype": "Section Break",
+ "label": "Serial No / Batch"
},
{
"doctype": "DocField",
@@ -153,6 +137,34 @@
"read_only": 0
},
{
+ "doctype": "DocField",
+ "fieldname": "accounting",
+ "fieldtype": "Section Break",
+ "label": "Accounting"
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "incoming_rate",
+ "fieldtype": "Currency",
+ "in_list_view": 1,
+ "label": "Valuation Rate",
+ "oldfieldname": "incoming_rate",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "read_only": 0,
+ "reqd": 0
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "amount",
+ "fieldtype": "Currency",
+ "label": "Amount",
+ "oldfieldname": "amount",
+ "oldfieldtype": "Currency",
+ "options": "Company:company:default_currency",
+ "read_only": 1
+ },
+ {
"depends_on": "eval:sys_defaults.auto_accounting_for_stock",
"doctype": "DocField",
"fieldname": "expense_account",
@@ -176,6 +188,12 @@
},
{
"doctype": "DocField",
+ "fieldname": "more_info",
+ "fieldtype": "Section Break",
+ "label": "More Info"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "actual_qty",
"fieldtype": "Float",
"in_filter": 1,
diff --git a/stock/doctype/stock_ledger_entry/stock_ledger_entry.txt b/stock/doctype/stock_ledger_entry/stock_ledger_entry.txt
index a5ea161..641a68c 100644
--- a/stock/doctype/stock_ledger_entry/stock_ledger_entry.txt
+++ b/stock/doctype/stock_ledger_entry/stock_ledger_entry.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-01-29 19:25:42",
"docstatus": 0,
- "modified": "2013-08-23 12:23:18",
+ "modified": "2013-11-03 14:11:43",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -92,7 +92,6 @@
"width": "100px"
},
{
- "description": "The date at which current entry will get or has actually executed.",
"doctype": "DocField",
"fieldname": "posting_date",
"fieldtype": "Date",
diff --git a/stock/doctype/stock_settings/stock_settings.txt b/stock/doctype/stock_settings/stock_settings.txt
index e8edd03..634ee3a 100644
--- a/stock/doctype/stock_settings/stock_settings.txt
+++ b/stock/doctype/stock_settings/stock_settings.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-06-24 16:37:54",
"docstatus": 0,
- "modified": "2013-07-05 14:56:41",
+ "modified": "2013-11-02 19:41:56",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -46,7 +46,7 @@
"options": "Item Code\nNaming Series"
},
{
- "description": "<a href=\"#Sales Browser/Item Group\">Manage Item Groups</a>",
+ "description": "<a href=\"#Sales Browser/Item Group\">Add / Edit</a>",
"doctype": "DocField",
"fieldname": "item_group",
"fieldtype": "Link",
diff --git a/stock/doctype/warehouse/warehouse.txt b/stock/doctype/warehouse/warehouse.txt
index 76ddac7..39e335f 100644
--- a/stock/doctype/warehouse/warehouse.txt
+++ b/stock/doctype/warehouse/warehouse.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-03-07 18:50:32",
"docstatus": 0,
- "modified": "2013-09-16 10:45:49",
+ "modified": "2013-10-28 16:42:07",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -76,7 +76,7 @@
"doctype": "DocField",
"fieldname": "create_account_under",
"fieldtype": "Link",
- "label": "Create Account Under",
+ "label": "Parent Account",
"options": "Account",
"permlevel": 0
},
@@ -84,6 +84,7 @@
"doctype": "DocField",
"fieldname": "column_break_4",
"fieldtype": "Section Break",
+ "label": "Allow For Users",
"permlevel": 0,
"read_only": 0
},
diff --git a/support/doctype/customer_issue/customer_issue.txt b/support/doctype/customer_issue/customer_issue.txt
index faff298..f9fbc6b 100644
--- a/support/doctype/customer_issue/customer_issue.txt
+++ b/support/doctype/customer_issue/customer_issue.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-01-10 16:34:30",
"docstatus": 0,
- "modified": "2013-08-08 14:22:33",
+ "modified": "2013-11-02 16:59:22",
"modified_by": "Administrator",
"owner": "harshada@webnotestech.com"
},
@@ -55,7 +55,7 @@
"fieldname": "naming_series",
"fieldtype": "Select",
"in_filter": 0,
- "label": "Document Numbering Series",
+ "label": "Series",
"no_copy": 1,
"oldfieldname": "naming_series",
"oldfieldtype": "Select",
@@ -279,6 +279,7 @@
"read_only": 1
},
{
+ "description": "<a href=\"#Sales Browser/Customer Group\">Add / Edit</a>",
"doctype": "DocField",
"fieldname": "customer_group",
"fieldtype": "Link",
@@ -288,6 +289,7 @@
"reqd": 0
},
{
+ "description": "<a href=\"#Sales Browser/Territory\">Add / Edit</a>",
"doctype": "DocField",
"fieldname": "territory",
"fieldtype": "Link",
diff --git a/support/doctype/maintenance_schedule/maintenance_schedule.txt b/support/doctype/maintenance_schedule/maintenance_schedule.txt
index c14764c..bdf14a1 100644
--- a/support/doctype/maintenance_schedule/maintenance_schedule.txt
+++ b/support/doctype/maintenance_schedule/maintenance_schedule.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-01-10 16:34:30",
"docstatus": 0,
- "modified": "2013-07-22 15:32:36",
+ "modified": "2013-11-02 16:59:23",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -188,6 +188,7 @@
"search_index": 0
},
{
+ "description": "<a href=\"#Sales Browser/Territory\">Add / Edit</a>",
"doctype": "DocField",
"fieldname": "territory",
"fieldtype": "Link",
@@ -200,6 +201,7 @@
"search_index": 0
},
{
+ "description": "<a href=\"#Sales Browser/Customer Group\">Add / Edit</a>",
"doctype": "DocField",
"fieldname": "customer_group",
"fieldtype": "Link",
diff --git a/support/doctype/maintenance_visit/maintenance_visit.txt b/support/doctype/maintenance_visit/maintenance_visit.txt
index ee84f96..f68a1f4 100644
--- a/support/doctype/maintenance_visit/maintenance_visit.txt
+++ b/support/doctype/maintenance_visit/maintenance_visit.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-01-10 16:34:31",
"docstatus": 0,
- "modified": "2013-07-22 15:24:40",
+ "modified": "2013-11-02 16:59:24",
"modified_by": "Administrator",
"owner": "ashwini@webnotestech.com"
},
@@ -293,6 +293,7 @@
"fieldtype": "Column Break"
},
{
+ "description": "<a href=\"#Sales Browser/Territory\">Add / Edit</a>",
"doctype": "DocField",
"fieldname": "territory",
"fieldtype": "Link",
@@ -301,6 +302,7 @@
"print_hide": 1
},
{
+ "description": "<a href=\"#Sales Browser/Customer Group\">Add / Edit</a>",
"doctype": "DocField",
"fieldname": "customer_group",
"fieldtype": "Link",
diff --git a/support/doctype/newsletter/newsletter.txt b/support/doctype/newsletter/newsletter.txt
index 45f075e..123eeed 100644
--- a/support/doctype/newsletter/newsletter.txt
+++ b/support/doctype/newsletter/newsletter.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-01-10 16:34:31",
"docstatus": 0,
- "modified": "2013-08-08 14:22:34",
+ "modified": "2013-11-02 14:06:04",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -53,7 +53,7 @@
"doctype": "DocField",
"fieldname": "naming_series",
"fieldtype": "Select",
- "label": "Document Numbering Series",
+ "label": "Series",
"options": "NL-",
"reqd": 1
},
diff --git a/support/doctype/support_ticket/support_ticket.css b/support/doctype/support_ticket/support_ticket.css
deleted file mode 100644
index dbfff3c..0000000
--- a/support/doctype/support_ticket/support_ticket.css
+++ /dev/null
@@ -1,15 +0,0 @@
-
-.comm-content {
- border-top: 1px solid #ddd;
- padding: 10px;
- display: none;
-}
-
-.support-ticket-wrapper {
- margin-top: 10px;
-}
-
-.support-ticket-title {
- padding: 5px;
- border-bottom: 1px solid black;
-}
diff --git a/support/doctype/support_ticket/support_ticket.js b/support/doctype/support_ticket/support_ticket.js
index bcd3658..e777624 100644
--- a/support/doctype/support_ticket/support_ticket.js
+++ b/support/doctype/support_ticket/support_ticket.js
@@ -52,6 +52,7 @@
comm_list.push({
"sender": doc.raised_by,
"creation": doc.creation,
+ "subject": doc.subject,
"content": doc.description});
}
diff --git a/support/doctype/support_ticket/support_ticket.txt b/support/doctype/support_ticket/support_ticket.txt
index 76d9dcf..684c809 100644
--- a/support/doctype/support_ticket/support_ticket.txt
+++ b/support/doctype/support_ticket/support_ticket.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-01 10:36:25",
"docstatus": 0,
- "modified": "2013-10-03 16:45:41",
+ "modified": "2013-11-02 14:06:26",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -53,7 +53,7 @@
"fieldname": "naming_series",
"fieldtype": "Select",
"hidden": 0,
- "label": "Document Numbering Series",
+ "label": "Series",
"no_copy": 1,
"options": "SUP",
"print_hide": 1,
@@ -61,22 +61,6 @@
"search_index": 0
},
{
- "default": "Open",
- "doctype": "DocField",
- "fieldname": "status",
- "fieldtype": "Select",
- "in_filter": 0,
- "in_list_view": 1,
- "label": "Status",
- "no_copy": 1,
- "oldfieldname": "status",
- "oldfieldtype": "Select",
- "options": "Open\nReplied\nHold\nClosed",
- "read_only": 0,
- "reqd": 0,
- "search_index": 1
- },
- {
"doctype": "DocField",
"fieldname": "subject",
"fieldtype": "Data",
@@ -93,6 +77,22 @@
"fieldtype": "Column Break"
},
{
+ "default": "Open",
+ "doctype": "DocField",
+ "fieldname": "status",
+ "fieldtype": "Select",
+ "in_filter": 0,
+ "in_list_view": 1,
+ "label": "Status",
+ "no_copy": 1,
+ "oldfieldname": "status",
+ "oldfieldtype": "Select",
+ "options": "Open\nReplied\nHold\nClosed",
+ "read_only": 0,
+ "reqd": 0,
+ "search_index": 1
+ },
+ {
"depends_on": "eval:doc.__islocal",
"doctype": "DocField",
"fieldname": "raised_by",
diff --git a/utilities/demo/demo_docs/Lead.csv b/utilities/demo/demo_docs/Lead.csv
index a7004e4..948a68d 100644
--- a/utilities/demo/demo_docs/Lead.csv
+++ b/utilities/demo/demo_docs/Lead.csv
@@ -1,68 +1,68 @@
-Data Import Template,,,,,,,,,,,,,,,,,,,,,,,,,,
-Table:,Lead,,,,,,,,,,,,,,,,,,,,,,,,,
-,,,,,,,,,,,,,,,,,,,,,,,,,,
-,,,,,,,,,,,,,,,,,,,,,,,,,,
-Notes:,,,,,,,,,,,,,,,,,,,,,,,,,,
-Please do not change the template headings.,,,,,,,,,,,,,,,,,,,,,,,,,,
-First data column must be blank.,,,,,,,,,,,,,,,,,,,,,,,,,,
-Only mandatory fields are necessary for new records. You can delete non-mandatory columns if you wish.,,,,,,,,,,,,,,,,,,,,,,,,,,
-"For updating, you can update only selective columns.",,,,,,,,,,,,,,,,,,,,,,,,,,
-"If you are uploading new records, leave the ""name"" (ID) column blank.",,,,,,,,,,,,,,,,,,,,,,,,,,
-"If you are uploading new records, ""Naming Series"" becomes mandatory, if present.",,,,,,,,,,,,,,,,,,,,,,,,,,
-You can only upload upto 5000 records in one go. (may be less in some cases),,,,,,,,,,,,,,,,,,,,,,,,,,
-,,,,,,,,,,,,,,,,,,,,,,,,,,
-Column Labels,ID,Contact Name,Status,Naming Series,Company Name,Email Id,Source,From Customer,Campaign Name,Remark,Phone,Mobile No.,Fax,Website,Territory,Lead Type,Lead Owner,Market Segment,Industry,Request Type,Next Contact By,Next Contact Date,Company,Unsubscribed,Blog Subscriber,
-Column Name:,name,lead_name,status,naming_series,company_name,email_id,source,customer,campaign_name,remark,phone,mobile_no,fax,website,territory,type,lead_owner,market_segment,industry,request_type,contact_by,contact_date,company,unsubscribed,blog_subscriber,
-Mandatory:,Yes,Yes,Yes,No,No,No,No,No,No,No,No,No,No,No,No,No,No,No,No,No,No,No,No,No,No,
-Type:,Data (text),Data,Select,Select,Data,Data,Select,Link,Link,Small Text,Data,Data,Data,Data,Link,Select,Link,Select,Link,Select,Link,Date,Link,Check,Check,
-Info:,,,"Lead, Open, Replied, Opportunity, Interested, Converted, Do Not Contact","One of: LEAD, LEAD/10-11/, LEAD/MUMBAI/",,,"One of: Advertisement, Blog Post, Campaign, Call, Customer, Exhibition, Supplier, Website, Email",Valid Customer,Valid Campaign,,,,,,Valid Territory,"One of: Client, Channel Partner, Consultant",Valid Profile,"One of: Lower Income, Middle Income, Upper Income",Valid Industry Type,"One of: Product Enquiry, Request for Information, Suggestions, Other",Valid Profile,,Valid Company,0 or 1,0 or 1,
-Start entering data below this line,,,,,,,,,,,,,,,,,,,,,,,,,,
-,,Mart Lakeman,Lead,,Zany Brainy,MartLakeman@einrot.com,,,,,,,,,,,,,,,,,,,,
-,,Saga Lundqvist,Lead,,Patterson-Fletcher,SagaLundqvist@dayrep.com,,,,,,,,,,,,,,,,,,,,
-,,Adna Sjöberg,Lead,,Griff's Hamburgers,AdnaSjoberg@gustr.com,,,,,,,,,,,,,,,,,,,,
-,,Ida Svendsen,Lead,,Rhodes Furniture,IdaDSvendsen@superrito.com,,,,,,,,,,,,,,,,,,,,
-,,Emppu Hämeenniemi,Lead,,Burger Chef,EmppuHameenniemi@teleworm.us,,,,,,,,,,,,,,,,,,,,
-,,Eugenio Pisano,Lead,,Stratabiz,EugenioPisano@cuvox.de,,,,,,,,,,,,,,,,,,,,
-,,Semhar Hagos,Lead,,Home Quarters Warehouse,SemharHagos@einrot.com,,,,,,,,,,,,,,,,,,,,
-,,Branimira Ivanković,Lead,,Enviro Architectural Designs,BranimiraIvankovic@einrot.com,,,,,,,,,,,,,,,,,,,,
-,,Shelly Fields,Lead,,Ideal Garden Management,ShellyLFields@superrito.com,,,,,,,,,,,,,,,,,,,,
-,,Leo Mikulić,Lead,,Listen Up,LeoMikulic@gustr.com,,,,,,,,,,,,,,,,,,,,
-,,Denisa Jarošová,Lead,,I. Magnin,DenisaJarosova@teleworm.us,,,,,,,,,,,,,,,,,,,,
-,,Janek Rutkowski,Lead,,First Rate Choice,JanekRutkowski@dayrep.com,,,,,,,,,,,,,,,,,,,,
-,,美月 宇藤,Lead,,Multi Tech Development,mm@gustr.com,,,,,,,,,,,,,,,,,,,,
-,,Даниил Афанасьев,Lead,,National Auto Parts,dd@einrot.com,,,,,,,,,,,,,,,,,,,,
-,,Zorislav Petković,Lead,,Integra Investment Plan,ZorislavPetkovic@cuvox.de,,,,,,,,,,,,,,,,,,,,
-,,Nanao Niwa,Lead,,The Lawn Guru,NanaoNiwa@superrito.com,,,,,,,,,,,,,,,,,,,,
-,,Hreiðar Jörundsson,Lead,,Buena Vista Realty Service,HreiarJorundsson@armyspy.com,,,,,,,,,,,,,,,,,,,,
-,,Lai Chu,Lead,,Bountiful Harvest Health Food Store,ChuThiBichLai@einrot.com,,,,,,,,,,,,,,,,,,,,
-,,Victor Aksakov,Lead,,P. Samuels Men's Clothiers,VictorAksakov@dayrep.com,,,,,,,,,,,,,,,,,,,,
-,,Saidalim Bisliev,Lead,,Vinyl Fever,SaidalimBisliev@cuvox.de,,,,,,,,,,,,,,,,,,,,
-,,Totte Jakobsson,Lead,,Garden Master,TotteJakobsson@armyspy.com,,,,,,,,,,,,,,,,,,,,
-,,Naná Armas,Lead,,Big Apple,NanaArmasRobles@cuvox.de,,,,,,,,,,,,,,,,,,,,
-,,Walerian Duda,Lead,,Monk House Sales,WalerianDuda@dayrep.com,,,,,,,,,,,,,,,,,,,,
-,,Moarimikashi ,Lead,,ManCharm,Moarimikashi@teleworm.us,,,,,,,,,,,,,,,,,,,,
-,,Dobromił Dąbrowski ,Lead,,Custom Lawn Care,DobromilDabrowski@dayrep.com,,,,,,,,,,,,,,,,,,,,
-,,Teigan Sinclair,Lead,,The Serendipity Dip,TeiganSinclair@gustr.com,,,,,,,,,,,,,,,,,,,,
-,,Fahad Guirguis,Lead,,Cavages,FahadSaidGuirguis@gustr.com,,,,,,,,,,,,,,,,,,,,
-,,Morten Olsen,Lead,,Gallenkamp,MortenJOlsen@armyspy.com,,,,,,,,,,,,,,,,,,,,
-,,Christian Baecker,Lead,,Webcom Business Services,ChristianBaecker@armyspy.com,,,,,,,,,,,,,,,,,,,,
-,,Sebastianus Dohmen,Lead,,Accord Investments,SebastianusDohmen@cuvox.de,,,,,,,,,,,,,,,,,,,,
-,,Eero Koskinen,Lead,,American Appliance,EeroKoskinen@superrito.com,,,,,,,,,,,,,,,,,,,,
-,,富奎 盧,Lead,,Bettendorf's,LuFuKui@teleworm.us,,,,,,,,,,,,,,,,,,,,
-,,Milica Jelić,Lead,,House Of Denmark,MilicaJelic@dayrep.com,,,,,,,,,,,,,,,,,,,,
-,,Barbora Holubová,Lead,,10000 Auto Parts,BarboraHolubova@cuvox.de,,,,,,,,,,,,,,,,,,,,
-,,Marta Kos,Lead,,Mages,MartaKos@einrot.com,,,,,,,,,,,,,,,,,,,,
-,,Simret Zula,Lead,,CSK Auto,SimretZula@cuvox.de,,,,,,,,,,,,,,,,,,,,
-,,Kamil Chlubna,Lead,,Eagle Hardware & Garden,KamilChlubna@einrot.com,,,,,,,,,,,,,,,,,,,,
-,,Aceline Bolduc,Lead,,Rustler Steak House,AcelineBolduc@armyspy.com,,,,,,,,,,,,,,,,,,,,
-,,Lucie Stupková,Lead,,ABCO Foods,LucieStupkova@gustr.com,,,,,,,,,,,,,,,,,,,,
-,,Roland Solvik,Lead,,Trak Auto,RolandSolvik@cuvox.de,,,,,,,,,,,,,,,,,,,,
-,,Mekirinzukushitakufu ,Lead,,Choices,Mekirinzukushitakufu@teleworm.us,,,,,,,,,,,,,,,,,,,,
-,,Mukharbek Sultanovich,Lead,,Megatronic,MukharbekSultanovich@cuvox.de,,,,,,,,,,,,,,,,,,,,
-,,Osman Amanuel,Lead,,Handy Dan,OsmanAmanuel@dayrep.com,,,,,,,,,,,,,,,,,,,,
-,,幸子 阪部,Lead,,Channel Home Centers,dd@armyspy.com,,,,,,,,,,,,,,,,,,,,
-,,Masakazu Kamitani,Lead,,Honest Air Group,MasakazuKamitani@superrito.com,,,,,,,,,,,,,,,,,,,,
-,,Omran Sabbagh,Lead,,Pleasures and Pasttimes,OmranNuhaidSabbagh@einrot.com,,,,,,,,,,,,,,,,,,,,
-,,Rikako Matsumura,Lead,,Lazysize,RikakoMatsumura@einrot.com,,,,,,,,,,,,,,,,,,,,
-,,Anayolisa Chukwukadibia,Lead,,Prestiga-Biz,AnayolisaChukwukadibia@einrot.com,,,,,,,,,,,,,,,,,,,,
-,,Gudmunda Hinna,Lead,,Childs Restaurants,GudmundaHinna@armyspy.com,,,,,,,,,,,,,,,,,,,,
\ No newline at end of file
+Data Import Template,,,,,,,,,,,,,,,,,,,,,,,,
+Table:,Lead,,,,,,,,,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,,,,
+Notes:,,,,,,,,,,,,,,,,,,,,,,,,
+Please do not change the template headings.,,,,,,,,,,,,,,,,,,,,,,,,
+First data column must be blank.,,,,,,,,,,,,,,,,,,,,,,,,
+Only mandatory fields are necessary for new records. You can delete non-mandatory columns if you wish.,,,,,,,,,,,,,,,,,,,,,,,,
+"For updating, you can update only selective columns.",,,,,,,,,,,,,,,,,,,,,,,,
+"If you are uploading new records, leave the ""name"""" (ID) column blank.""",,,,,,,,,,,,,,,,,,,,,,,,
+"If you are uploading new records, ""Naming Series"""" becomes mandatory"," if present.""",,,,,,,,,,,,,,,,,,,,,,,
+You can only upload upto 5000 records in one go. (may be less in some cases),,,,,,,,,,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,,,,
+Column Labels,ID,Contact Name,Status,Naming Series,Company Name,Email Id,Source,From Customer,Campaign Name,Phone,Mobile No.,Fax,Website,Territory,Lead Type,Lead Owner,Market Segment,Industry,Request Type,Next Contact By,Next Contact Date,Company,Unsubscribed,Blog Subscriber
+Column Name:,name,lead_name,status,naming_series,company_name,email_id,source,customer,campaign_name,phone,mobile_no,fax,website,territory,type,lead_owner,market_segment,industry,request_type,contact_by,contact_date,company,unsubscribed,blog_subscriber
+Mandatory:,Yes,Yes,Yes,No,No,No,No,No,No,No,No,No,No,No,No,No,No,No,No,No,No,No,No,No
+Type:,Data (text),Data,Select,Select,Data,Data,Select,Link,Link,Data,Data,Data,Data,Link,Select,Link,Select,Link,Select,Link,Date,Link,Check,Check
+Info:,,,"Lead, Open, Replied, Opportunity, Interested, Converted, Do Not Contact","One of: LEAD, LEAD/10-11/, LEAD/MUMBAI/",,,"One of: Advertisement, Blog Post, Campaign, Call, Customer, Exhibition, Supplier, Website, Email",Valid Customer,Valid Campaign,,,,,Valid Territory,"One of: Client, Channel Partner, Consultant",Valid Profile,"One of: Lower Income, Middle Income, Upper Income",Valid Industry Type,"One of: Product Enquiry, Request for Information, Suggestions, Other",Valid Profile,,Valid Company,0 or 1,0 or 1
+Start entering data below this line,,,,,,,,,,,,,,,,,,,,,,,,
+,,Mart Lakeman,Lead,,Zany Brainy,MartLakeman@einrot.com,,,,,,,,,,,,,,,,,,
+,,Saga Lundqvist,Lead,,Patterson-Fletcher,SagaLundqvist@dayrep.com,,,,,,,,,,,,,,,,,,
+,,Adna Sjöberg,Lead,,Griff's Hamburgers,AdnaSjoberg@gustr.com,,,,,,,,,,,,,,,,,,
+,,Ida Svendsen,Lead,,Rhodes Furniture,IdaDSvendsen@superrito.com,,,,,,,,,,,,,,,,,,
+,,Emppu Hämeenniemi,Lead,,Burger Chef,EmppuHameenniemi@teleworm.us,,,,,,,,,,,,,,,,,,
+,,Eugenio Pisano,Lead,,Stratabiz,EugenioPisano@cuvox.de,,,,,,,,,,,,,,,,,,
+,,Semhar Hagos,Lead,,Home Quarters Warehouse,SemharHagos@einrot.com,,,,,,,,,,,,,,,,,,
+,,Branimira Ivanković,Lead,,Enviro Architectural Designs,BranimiraIvankovic@einrot.com,,,,,,,,,,,,,,,,,,
+,,Shelly Fields,Lead,,Ideal Garden Management,ShellyLFields@superrito.com,,,,,,,,,,,,,,,,,,
+,,Leo Mikulić,Lead,,Listen Up,LeoMikulic@gustr.com,,,,,,,,,,,,,,,,,,
+,,Denisa Jarošová,Lead,,I. Magnin,DenisaJarosova@teleworm.us,,,,,,,,,,,,,,,,,,
+,,Janek Rutkowski,Lead,,First Rate Choice,JanekRutkowski@dayrep.com,,,,,,,,,,,,,,,,,,
+,,美月 宇藤,Lead,,Multi Tech Development,mm@gustr.com,,,,,,,,,,,,,,,,,,
+,,Даниил Афанасьев,Lead,,National Auto Parts,dd@einrot.com,,,,,,,,,,,,,,,,,,
+,,Zorislav Petković,Lead,,Integra Investment Plan,ZorislavPetkovic@cuvox.de,,,,,,,,,,,,,,,,,,
+,,Nanao Niwa,Lead,,The Lawn Guru,NanaoNiwa@superrito.com,,,,,,,,,,,,,,,,,,
+,,Hreiðar Jörundsson,Lead,,Buena Vista Realty Service,HreiarJorundsson@armyspy.com,,,,,,,,,,,,,,,,,,
+,,Lai Chu,Lead,,Bountiful Harvest Health Food Store,ChuThiBichLai@einrot.com,,,,,,,,,,,,,,,,,,
+,,Victor Aksakov,Lead,,P. Samuels Men's Clothiers,VictorAksakov@dayrep.com,,,,,,,,,,,,,,,,,,
+,,Saidalim Bisliev,Lead,,Vinyl Fever,SaidalimBisliev@cuvox.de,,,,,,,,,,,,,,,,,,
+,,Totte Jakobsson,Lead,,Garden Master,TotteJakobsson@armyspy.com,,,,,,,,,,,,,,,,,,
+,,Naná Armas,Lead,,Big Apple,NanaArmasRobles@cuvox.de,,,,,,,,,,,,,,,,,,
+,,Walerian Duda,Lead,,Monk House Sales,WalerianDuda@dayrep.com,,,,,,,,,,,,,,,,,,
+,,Moarimikashi ,Lead,,ManCharm,Moarimikashi@teleworm.us,,,,,,,,,,,,,,,,,,
+,,Dobromił Dąbrowski ,Lead,,Custom Lawn Care,DobromilDabrowski@dayrep.com,,,,,,,,,,,,,,,,,,
+,,Teigan Sinclair,Lead,,The Serendipity Dip,TeiganSinclair@gustr.com,,,,,,,,,,,,,,,,,,
+,,Fahad Guirguis,Lead,,Cavages,FahadSaidGuirguis@gustr.com,,,,,,,,,,,,,,,,,,
+,,Morten Olsen,Lead,,Gallenkamp,MortenJOlsen@armyspy.com,,,,,,,,,,,,,,,,,,
+,,Christian Baecker,Lead,,Webcom Business Services,ChristianBaecker@armyspy.com,,,,,,,,,,,,,,,,,,
+,,Sebastianus Dohmen,Lead,,Accord Investments,SebastianusDohmen@cuvox.de,,,,,,,,,,,,,,,,,,
+,,Eero Koskinen,Lead,,American Appliance,EeroKoskinen@superrito.com,,,,,,,,,,,,,,,,,,
+,,富奎 盧,Lead,,Bettendorf's,LuFuKui@teleworm.us,,,,,,,,,,,,,,,,,,
+,,Milica Jelić,Lead,,House Of Denmark,MilicaJelic@dayrep.com,,,,,,,,,,,,,,,,,,
+,,Barbora Holubová,Lead,,10000 Auto Parts,BarboraHolubova@cuvox.de,,,,,,,,,,,,,,,,,,
+,,Marta Kos,Lead,,Mages,MartaKos@einrot.com,,,,,,,,,,,,,,,,,,
+,,Simret Zula,Lead,,CSK Auto,SimretZula@cuvox.de,,,,,,,,,,,,,,,,,,
+,,Kamil Chlubna,Lead,,Eagle Hardware & Garden,KamilChlubna@einrot.com,,,,,,,,,,,,,,,,,,
+,,Aceline Bolduc,Lead,,Rustler Steak House,AcelineBolduc@armyspy.com,,,,,,,,,,,,,,,,,,
+,,Lucie Stupková,Lead,,ABCO Foods,LucieStupkova@gustr.com,,,,,,,,,,,,,,,,,,
+,,Roland Solvik,Lead,,Trak Auto,RolandSolvik@cuvox.de,,,,,,,,,,,,,,,,,,
+,,Mekirinzukushitakufu ,Lead,,Choices,Mekirinzukushitakufu@teleworm.us,,,,,,,,,,,,,,,,,,
+,,Mukharbek Sultanovich,Lead,,Megatronic,MukharbekSultanovich@cuvox.de,,,,,,,,,,,,,,,,,,
+,,Osman Amanuel,Lead,,Handy Dan,OsmanAmanuel@dayrep.com,,,,,,,,,,,,,,,,,,
+,,幸子 阪部,Lead,,Channel Home Centers,dd@armyspy.com,,,,,,,,,,,,,,,,,,
+,,Masakazu Kamitani,Lead,,Honest Air Group,MasakazuKamitani@superrito.com,,,,,,,,,,,,,,,,,,
+,,Omran Sabbagh,Lead,,Pleasures and Pasttimes,OmranNuhaidSabbagh@einrot.com,,,,,,,,,,,,,,,,,,
+,,Rikako Matsumura,Lead,,Lazysize,RikakoMatsumura@einrot.com,,,,,,,,,,,,,,,,,,
+,,Anayolisa Chukwukadibia,Lead,,Prestiga-Biz,AnayolisaChukwukadibia@einrot.com,,,,,,,,,,,,,,,,,,
+,,Gudmunda Hinna,Lead,,Childs Restaurants,GudmundaHinna@armyspy.com,,,,,,,,,,,,,,,,,,
\ No newline at end of file
diff --git a/utilities/demo/make_demo.py b/utilities/demo/make_demo.py
index be42395..4637836 100644
--- a/utilities/demo/make_demo.py
+++ b/utilities/demo/make_demo.py
@@ -18,7 +18,7 @@
company_abbr = "WP"
country = "United States"
currency = "USD"
-time_zone = "America/New York"
+time_zone = "America/New_York"
start_date = '2013-01-01'
bank_name = "Citibank"
runs_for = None