nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-07 07:20:26 +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

7
buying/__init__.py
View File

@@ -1,7 +0,0 @@
from __future__ import unicode_literals
install_docs = [
{"doctype":"Role", "role_name":"Purchase Manager", "name":"Purchase Manager"},
{"doctype":"Role", "role_name":"Purchase User", "name":"Purchase User"},
{"doctype":"Role", "role_name":"Purchase Master Manager", "name":"Purchase Master Manager"},
{"doctype":"Role", "role_name":"Supplier", "name":"Supplier"}
]

9
buying/doctype/supplier/supplier.py
View File

@@ -85,7 +85,14 @@ class DocType(TransactionBase):
return g
def add_account(self, ac, par, abbr):
arg = {'account_name':ac,'parent_account':par, 'group_or_ledger':'Group', 'company':self.doc.company,'account_type':'','tax_rate':'0'}
arg = {
'account_name':ac,
'parent_account':par,
'group_or_ledger':'Group',
'company':self.doc.company,
'account_type':'',
'tax_rate':'0'
}
t = get_obj('GL Control').add_ac(cstr(arg))
msgprint("Created Group " + t)

5
buying/module_def/buying/locale/_messages_doc.json
View File

@@ -1,5 +0,0 @@
[
"Supplier of Goods or Services.",
"Buying Home",
"Purchase Analytics"
]

5
buying/module_def/buying/locale/hi-doc.json
View File

@@ -1,5 +0,0 @@
{
"Buying Home": "\u0918\u0930 \u0916\u0930\u0940\u0926\u0928\u093e",
"Purchase Analytics": "\u0916\u0930\u0940\u0926 \u0935\u093f\u0936\u094d\u0932\u0947\u0937\u093f\u0915\u0940",
"Supplier of Goods or Services.": "\u0938\u093e\u092e\u093e\u0928 \u092f\u093e \u0938\u0947\u0935\u093e\u0913\u0902 \u0915\u0940 \u092a\u094d\u0930\u0926\u093e\u092f\u0915."
}