nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-08 15:51:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	accounts/doctype/gl_control/gl_control.py
This commit is contained in:
Anand Doshi
2013-01-17 20:31:41 +05:30
parent 8957bf9e09 16546d25e7
commit ef02ddfc40
92 changed files with 1234 additions and 1924 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
selling/__init__.py
View File

@@ -1,8 +0,0 @@
from __future__ import unicode_literals
install_docs = [
{"doctype":"Role", "role_name":"Customer", "name":"Customer"},
{"doctype":"Role", "role_name":"Partner", "name":"Partner"},
{"doctype":"Role", "role_name":"Sales Manager", "name":"Sales Manager"},
{"doctype":"Role", "role_name":"Sales Master Manager", "name":"Sales Master Manager"},
{"doctype":"Role", "role_name":"Sales User", "name":"Sales User"},
]

7
selling/doctype/customer/customer.py
View File

@@ -123,7 +123,7 @@ class DocType(TransactionBase):
abbr = self.get_company_abbr()
if not sql("select name from tabAccount where name=%s", (self.doc.name + " - " + abbr)):
parent_account = self.get_receivables_group()
arg = {'account_name':self.doc.name,'parent_account': parent_account, 'group_or_ledger':'Ledger', 'company':self.doc.company,'account_type':'','tax_rate':'0','master_type':'Customer','master_name':self.doc.name,'address':self.doc.address}
arg = {'account_name':self.doc.name,'parent_account': parent_account, 'group_or_ledger':'Ledger', 'company':self.doc.company,'account_type':'','tax_rate':'0','master_type':'Customer','master_name':self.doc.name}
# create
ac = get_obj('GL Control').add_ac(cstr(arg))
@@ -172,11 +172,6 @@ class DocType(TransactionBase):
pass
def on_update(self):
# create customer addr
#self.create_customer_address()
# create customer contact
#self.create_customer_contact()
# update lead status
self.update_lead_status()
# create account head
self.create_account_head()

2
selling/doctype/quotation/quotation.js
View File

@@ -299,7 +299,7 @@ cur_frm.fields_dict['quotation_details'].grid.get_field('item_code').get_query=
and si_item.item_code = item.name \
and si.docstatus = 1 \
and si.customer = \"%(cust)s\" \
order by si.voucher_date desc \
order by si.posting_date desc \
limit 1 \
) as sales_rate, \
item.item_name, item.description \

11
selling/module_def/selling/locale/_messages_doc.json
View File

@@ -1,11 +0,0 @@
[
"Sales Orders Pending To Be Delivered",
"Customer Addresses And Contacts",
"Buyer of Goods and Services.",
"Sales Dashboard",
"Potential Sales Deal",
"Selling Home",
"Sales Analytics",
"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment. ",
"Sales Browser"
]

11
selling/module_def/selling/locale/hi-doc.json
View File

@@ -1,11 +0,0 @@
{
"Buyer of Goods and Services.": "\u0938\u093e\u092e\u093e\u0928 \u0914\u0930 \u0938\u0947\u0935\u093e\u0913\u0902 \u0915\u0947 \u0916\u0930\u0940\u0926\u093e\u0930.",
"Customer Addresses And Contacts": "\u0917\u094d\u0930\u093e\u0939\u0915 \u0915\u0947 \u092a\u0924\u0947 \u0914\u0930 \u0938\u0902\u092a\u0930\u094d\u0915",
"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment. ": "\u092c\u093f\u0915\u094d\u0930\u0940 \u0905\u092d\u093f\u092f\u093e\u0928 \u0915\u093e \u091f\u094d\u0930\u0948\u0915 \u0930\u0916\u0947\u0902. \u092c\u093f\u0915\u094d\u0930\u0940\u0938\u0942\u0924\u094d\u0930, \u0915\u094b\u091f\u0947\u0936\u0928, \u0905\u092d\u093f\u092f\u093e\u0928 \u0938\u0947 \u092c\u093f\u0915\u094d\u0930\u0940 \u0906\u0926\u0947\u0936 \u0906\u0926\u093f \u0915\u0930\u0928\u0947 \u0915\u0947 \u0932\u093f\u090f \u0928\u093f\u0935\u0947\u0936 \u092a\u0930 \u0935\u093e\u092a\u0938\u0940 \u0917\u0947\u091c \u091f\u094d\u0930\u0948\u0915 \u0930\u0916\u0947\u0902.",
"Potential Sales Deal": "\u0938\u0902\u092d\u093e\u0935\u093f\u0924 \u092c\u093f\u0915\u094d\u0930\u0940 \u0938\u094c\u0926\u093e",
"Sales Analytics": "\u092c\u093f\u0915\u094d\u0930\u0940 \u0935\u093f\u0936\u094d\u0932\u0947\u0937\u093f\u0915\u0940",
"Sales Browser": "\u092c\u093f\u0915\u094d\u0930\u0940 \u092c\u094d\u0930\u093e\u0909\u091c\u093c\u0930",
"Sales Dashboard": "\u092c\u093f\u0915\u094d\u0930\u0940 \u0921\u0948\u0936\u092c\u094b\u0930\u094d\u0921",
"Sales Orders Pending To Be Delivered": "\u0935\u093f\u0915\u094d\u0930\u092f \u0906\u0926\u0947\u0936 \u0926\u093f\u092f\u093e \u091c\u093e \u0932\u0902\u092c\u093f\u0924",
"Selling Home": "\u0918\u0930 \u092c\u0947\u091a\u0928\u093e"
}

1
selling/page/sales_browser/sales_browser.txt
View File

@@ -9,7 +9,6 @@
{
"name": "__common__",
"module": "Selling",
"show_in_menu": 0,
"page_name": "Sales Browser",
"doctype": "Page",
"standard": "Yes"