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

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

Browse Source
This commit is contained in:
Nabin Hait 2014-01-17 12:05:06 +05:30
commit a37ffe162b
3 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
accounts/doctype/sales_invoice/sales_invoice.txt
View File

@ -2,7 +2,7 @@
{ {
"creation": "2013-05-24 19:29:05", "creation": "2013-05-24 19:29:05",
"docstatus": 0, "docstatus": 0,
"modified": "2013-11-18 15:16:50", "modified": "2014-01-16 15:36:16",
"modified_by": "Administrator", "modified_by": "Administrator",
"owner": "Administrator" "owner": "Administrator"
}, },
@ -1091,7 +1091,7 @@
"fieldtype": "Select", "fieldtype": "Select",
"label": "Recurring Type", "label": "Recurring Type",
"no_copy": 1, "no_copy": 1,
"options": "Monthly\nQuarterly\nHalf-yearly\nYearly", "options": "\nMonthly\nQuarterly\nHalf-yearly\nYearly",
"print_hide": 1, "print_hide": 1,
"read_only": 0 "read_only": 0
}, },

13
selling/doctype/campaign/campaign.js
View File

@ -1,13 +1,2 @@
// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors // Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt // License: GNU General Public License v3. See license.txt
//--------- ONLOAD -------------
cur_frm.cscript.onload = function(doc, cdt, cdn) {
}
cur_frm.cscript.refresh = function(doc, cdt, cdn) {
}

3
selling/doctype/campaign/campaign.txt
View File

@ -2,11 +2,12 @@
{ {
"creation": "2013-01-10 16:34:18", "creation": "2013-01-10 16:34:18",
"docstatus": 0, "docstatus": 0,
"modified": "2013-07-05 14:29:57", "modified": "2014-01-16 12:52:19",
"modified_by": "Administrator", "modified_by": "Administrator",
"owner": "Administrator" "owner": "Administrator"
}, },
{ {
"allow_rename": 1,
"autoname": "field:campaign_name", "autoname": "field:campaign_name",
"description": "Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment. ", "description": "Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment. ",
"doctype": "DocType", "doctype": "DocType",