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

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

Browse Source
This commit is contained in:
Ravi Dey 2011-06-24 13:00:48 +05:30
commit 211b04a011
9 changed files with 193 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
crm/doctype/enquiry/enquiry.js
View File

@ -43,14 +43,15 @@ cur_frm.cscript.onload = function(doc, cdt, cdn) {
} }
} }
if(doc.enquiry_from == 'Lead' && doc.lead) {
cur_frm.cscript.lead(doc,cdt,cdn);
}
// setup fetch // setup fetch
cur_frm.cscript.set_fetch(); cur_frm.cscript.set_fetch();
} }
cur_frm.cscript.onload_post_render = function(doc, cdt, cdn) {
if(doc.enquiry_from == 'Lead' && doc.lead) {
cur_frm.cscript.lead(doc,cdt,cdn);
}
}
// fetch // fetch
// =============================================================== // ===============================================================

11
crm/doctype/quotation/quotation.js
View File

@ -22,11 +22,6 @@ cur_frm.cscript.onload = function(doc, cdt, cdn) {
if(!doc.company && sys_defaults.company) set_multiple(cdt,cdn,{company:sys_defaults.company}); if(!doc.company && sys_defaults.company) set_multiple(cdt,cdn,{company:sys_defaults.company});
if(!doc.fiscal_year && sys_defaults.fiscal_year) set_multiple(cdt,cdn,{fiscal_year:sys_defaults.fiscal_year}); if(!doc.fiscal_year && sys_defaults.fiscal_year) set_multiple(cdt,cdn,{fiscal_year:sys_defaults.fiscal_year});
// load default charges
if(doc.__islocal && !getchildren('RV Tax Detail', doc.name, 'other_charges', doc.doctype).length) cur_frm.cscript.load_taxes(doc, cdt, cdn);
if(doc.__islocal==1){ cur_frm.cscript.price_list_name(doc, cdt, cdn);}
if(doc.quotation_to) { if(doc.quotation_to) {
if(doc.quotation_to == 'Customer') { if(doc.quotation_to == 'Customer') {
hide_field(['lead', 'lead_name']); hide_field(['lead', 'lead_name']);
@ -37,6 +32,12 @@ cur_frm.cscript.onload = function(doc, cdt, cdn) {
} }
} }
cur_frm.cscript.onload_post_render = function(doc, dt, dn) {
// load default charges
if(doc.__islocal && !getchildren('RV Tax Detail', doc.name, 'other_charges', doc.doctype).length)
cur_frm.cscript.load_taxes(doc, cdt, cdn);
}
// hide - unhide fields based on lead or customer.. // hide - unhide fields based on lead or customer..
// ======================================================================================================================= // =======================================================================================================================
cur_frm.cscript.lead_cust_show = function(doc,cdt,cdn){ cur_frm.cscript.lead_cust_show = function(doc,cdt,cdn){

10
material_management/doctype/purchase_receipt/purchase_receipt.js
View File

@ -14,10 +14,6 @@ cur_frm.cscript.onload = function(doc, cdt, cdn) {
if (!doc.transaction_date) doc.transaction_date = dateutil.obj_to_str(new Date()); if (!doc.transaction_date) doc.transaction_date = dateutil.obj_to_str(new Date());
if (!doc.status) doc.status = 'Draft'; if (!doc.status) doc.status = 'Draft';
if(doc.__islocal){
cur_frm.cscript.get_default_schedule_date(doc);
}
if(doc.__islocal){ if(doc.__islocal){
hide_field(['supplier_name','supplier_address','contact_person','address_display','contact_display','contact_mobile','contact_email']); hide_field(['supplier_name','supplier_address','contact_person','address_display','contact_display','contact_mobile','contact_email']);
} }
@ -26,6 +22,12 @@ cur_frm.cscript.onload = function(doc, cdt, cdn) {
} }
cur_frm.cscript.onload_post_render = function(doc, dt, dn) {
if(doc.__islocal){
cur_frm.cscript.get_default_schedule_date(doc);
}
}
//========================== Refresh =============================================================== //========================== Refresh ===============================================================
cur_frm.cscript.refresh = function(doc, cdt, cdn) { cur_frm.cscript.refresh = function(doc, cdt, cdn) {

7
material_management/doctype/stock_ledger/stock_ledger.py
View File

@ -235,3 +235,10 @@ class DocType:
sle_obj.validate() sle_obj.validate()
sle.save(new = 1) sle.save(new = 1)
return sle.name return sle.name
def repost(self):
"""
Repost everything!
"""
for wh in sql("select name from tabWarehouse"):
get_obj('Warehouse', wh[0]).repost_stock()

9
patches/patch.py
View File

@ -1,6 +1,6 @@
# REMEMBER to update this # REMEMBER to update this
# ======================== # ========================
last_patch = 293 last_patch = 294
#------------------------------------------- #-------------------------------------------
@ -1167,3 +1167,10 @@ def execute(patch_no):
elif patch_no == 293: elif patch_no == 293:
sql("delete from tabDocField where parent='Account' and fieldname='address'") sql("delete from tabDocField where parent='Account' and fieldname='address'")
reload_doc('accounts', 'doctype', 'account') reload_doc('accounts', 'doctype', 'account')
elif patch_no == 294:
# new account profile fix
ul = sql("select name from tabProfile where ifnull(name,'') not in ('Administrator', 'Guest', '')")
# if one user and one user has no roles
if len(ul)==1 and not sql("select parent from tabUserRole where role='System Manager' and parent=%s", ul[0][0]):
get_obj('Setup Control').add_roles(Document('Profile', ul[0][0]))

3
setup/doctype/sales_person/sales_person.py
View File

@ -6,6 +6,7 @@ from webnotes.model.doclist import getlist
from webnotes.model.code import get_obj from webnotes.model.code import get_obj
from webnotes import session, form, is_testing, msgprint, errprint from webnotes import session, form, is_testing, msgprint, errprint
sql = webnotes.conn.sql sql = webnotes.conn.sql
convert_to_lists = webnotes.conn.convert_to_lists convert_to_lists = webnotes.conn.convert_to_lists
@ -36,7 +37,7 @@ class DocType:
def validate(self): def validate(self):
from webnotes.utils import flt
for d in getlist(self.doclist, 'target_details'): for d in getlist(self.doclist, 'target_details'):
if not flt(d.target_qty) and not flt(d.target_amount): if not flt(d.target_qty) and not flt(d.target_amount):
msgprint("Either target qty or target amount is mandatory.") msgprint("Either target qty or target amount is mandatory.")

274
setup/doctype/setup_control/setup_control.py
View File

@ -18,160 +18,164 @@ convert_to_lists = webnotes.conn.convert_to_lists
class DocType: class DocType:
def __init__(self, d, dl): def __init__(self, d, dl):
self.doc, self.doclist = d, dl self.doc, self.doclist = d, dl
#Default Naming Series #Default Naming Series
#--------------------------------------------------- #---------------------------------------------------
def naming_series(self): def naming_series(self):
ns = [['TDS Payment', 'TDSP'], ['Payable Voucher', 'BILL'], ['Journal Voucher', 'JV'], ['Receivable Voucher', 'INV'], ['Lead', 'Lead'], ['Indent', 'IDT'], ['Enquiry', 'Enquiry'], ['Purchase Order', 'PO'], ['Quotation', 'QTN'], ['Purchase Receipt', 'GRN'], ['Stock Entry', 'STE'], ['Sales Order', 'SO'], ['Delivery Note', 'DN'], ['Employee', 'EMP/']] ns = [['TDS Payment', 'TDSP'], ['Payable Voucher', 'BILL'], ['Journal Voucher', 'JV'], ['Receivable Voucher', 'INV'], ['Lead', 'Lead'], ['Indent', 'IDT'], ['Enquiry', 'Enquiry'], ['Purchase Order', 'PO'], ['Quotation', 'QTN'], ['Purchase Receipt', 'GRN'], ['Stock Entry', 'STE'], ['Sales Order', 'SO'], ['Delivery Note', 'DN'], ['Employee', 'EMP/']]
for r in ns: for r in ns:
rec = Document('Naming Series') rec = Document('Naming Series')
rec.select_doc_for_series = r[0] rec.select_doc_for_series = r[0]
rec.new_series = r[1] rec.new_series = r[1]
rec_obj = get_obj(doc=rec) rec_obj = get_obj(doc=rec)
rec_obj.add_series() rec_obj.add_series()
# set account details # set account details
#----------------------- #-----------------------
def set_account_details(self, args): def set_account_details(self, args):
args = eval(args) args = eval(args)
self.set_cp_defaults(args['company_name'], args['industry'], args['time_zone'], args['country'], args['account_name']) self.set_cp_defaults(args['company_name'], args['industry'], args['time_zone'], args['country'], args['account_name'])
self.create_profile(args['user'], args['first_name'], args['last_name']) self.create_profile(args['user'], args['first_name'], args['last_name'])
self.update_client_control() self.update_client_control()
# Account Setup # Account Setup
# --------------- # ---------------
def setup_account(self, args): def setup_account(self, args):
company_name, comp_abbr, fy_start, currency = eval(args) company_name, comp_abbr, fy_start, currency = eval(args)
curr_fiscal_year,fy_start_date = self.get_fy_details(fy_start) curr_fiscal_year,fy_start_date = self.get_fy_details(fy_start)
self.currency = currency self.currency = currency
# Fiscal Year # Fiscal Year
master_dict = {'Fiscal Year':{'year':curr_fiscal_year, master_dict = {'Fiscal Year':{'year':curr_fiscal_year,
'year_start_date':fy_start_date}} 'year_start_date':fy_start_date}}
self.create_records(master_dict) self.create_records(master_dict)
# Company # Company
master_dict = {'Company':{'company_name':company_name, master_dict = {'Company':{'company_name':company_name,
'abbr':comp_abbr 'abbr':comp_abbr
}} }}
self.create_records(master_dict) self.create_records(master_dict)
def_args = {'current_fiscal_year':curr_fiscal_year, def_args = {'current_fiscal_year':curr_fiscal_year,
'default_currency': currency, 'default_currency': currency,
'default_company':company_name, 'default_company':company_name,
'default_valuation_method':'FIFO', 'default_valuation_method':'FIFO',
'date_format':'dd-mm-yyyy', 'date_format':'dd-mm-yyyy',
'default_currency_format':'Lacs', 'default_currency_format':'Lacs',
'so_required':'No', 'so_required':'No',
'dn_required':'No', 'dn_required':'No',
'po_required':'No', 'po_required':'No',
'pr_required':'No', 'pr_required':'No',
'emp_created_by':'Naming Series', 'emp_created_by':'Naming Series',
'cust_master_name':'Customer Name', 'cust_master_name':'Customer Name',
'supp_master_name':'Supplier Name'} 'supp_master_name':'Supplier Name'}
# Set # Set
self.set_defaults(def_args) self.set_defaults(def_args)
# Set Registration Complete # Set Registration Complete
set_default('registration_complete','1') set_default('registration_complete','1')
import webnotes.utils import webnotes.utils
return webnotes.utils.get_defaults() return webnotes.utils.get_defaults()
# Get Fiscal year Details # Get Fiscal year Details
# ------------------------ # ------------------------
def get_fy_details(self, fy_start): def get_fy_details(self, fy_start):
st = {'1st Jan':'01-01','1st Apr':'04-01','1st Jul':'07-01', '1st Oct': '10-01'} st = {'1st Jan':'01-01','1st Apr':'04-01','1st Jul':'07-01', '1st Oct': '10-01'}
curr_year = getdate(nowdate()).year curr_year = getdate(nowdate()).year
if cint(getdate(nowdate()).month) < cint((st[fy_start].split('-'))[0]): if cint(getdate(nowdate()).month) < cint((st[fy_start].split('-'))[0]):
curr_year = getdate(nowdate()).year - 1 curr_year = getdate(nowdate()).year - 1
stdt = cstr(curr_year)+'-'+cstr(st[fy_start]) stdt = cstr(curr_year)+'-'+cstr(st[fy_start])
#eddt = sql("select DATE_FORMAT(DATE_SUB(DATE_ADD('%s', INTERVAL 1 YEAR), INTERVAL 1 DAY),'%%d-%%m-%%Y')" % (stdt.split('-')[2]+ '-' + stdt.split('-')[1] + '-' + stdt.split('-')[0])) #eddt = sql("select DATE_FORMAT(DATE_SUB(DATE_ADD('%s', INTERVAL 1 YEAR), INTERVAL 1 DAY),'%%d-%%m-%%Y')" % (stdt.split('-')[2]+ '-' + stdt.split('-')[1] + '-' + stdt.split('-')[0]))
if(fy_start == '1st Jan'): if(fy_start == '1st Jan'):
fy = cstr(getdate(nowdate()).year) fy = cstr(getdate(nowdate()).year)
else: else:
fy = cstr(curr_year) + '-' + cstr(curr_year+1) fy = cstr(curr_year) + '-' + cstr(curr_year+1)
return fy,stdt return fy,stdt
# Create Company and Fiscal Year # Create Company and Fiscal Year
# ------------------------------- # -------------------------------
def create_records(self, master_dict): def create_records(self, master_dict):
for d in master_dict.keys(): for d in master_dict.keys():
rec = Document(d) rec = Document(d)
for fn in master_dict[d].keys(): for fn in master_dict[d].keys():
rec.fields[fn] = master_dict[d][fn] rec.fields[fn] = master_dict[d][fn]
# add blank fields # add blank fields
for fn in rec.fields: for fn in rec.fields:
if fn not in master_dict[d].keys()+['name','owner','doctype']: if fn not in master_dict[d].keys()+['name','owner','doctype']:
rec.fields[fn] = '' rec.fields[fn] = ''
rec_obj = get_obj(doc=rec) rec_obj = get_obj(doc=rec)
rec_obj.doc.save(1) rec_obj.doc.save(1)
if hasattr(rec_obj, 'on_update'): if hasattr(rec_obj, 'on_update'):
rec_obj.on_update() rec_obj.on_update()
# Set System Defaults # Set System Defaults
# -------------------- # --------------------
def set_defaults(self, def_args): def set_defaults(self, def_args):
ma_obj = get_obj('Manage Account','Manage Account') ma_obj = get_obj('Manage Account','Manage Account')
for d in def_args.keys(): for d in def_args.keys():
ma_obj.doc.fields[d] = def_args[d] ma_obj.doc.fields[d] = def_args[d]
ma_obj.doc.save() ma_obj.doc.save()
ma_obj.update_cp() ma_obj.update_cp()
# Set Control Panel Defaults # Set Control Panel Defaults
# -------------------------- # --------------------------
def set_cp_defaults(self, cname, industry, timezone, country, acc_name): def set_cp_defaults(self, cname, industry, timezone, country, acc_name):
cp = Document('Control Panel','Control Panel') cp = Document('Control Panel','Control Panel')
cp.account_id = acc_name cp.account_id = acc_name
cp.company_name = cname cp.company_name = cname
cp.industry = industry cp.industry = industry
cp.time_zone = timezone cp.time_zone = timezone
cp.country = country cp.country = country
cp.client_name = '<div style="padding:4px; font-size:20px;">'+cname+'</div>' cp.client_name = '<div style="padding:4px; font-size:20px;">'+cname+'</div>'
cp.save() cp.save()
# Create Profile # Create Profile
# -------------- # --------------
def create_profile(self, user_email, user_fname, user_lname): def create_profile(self, user_email, user_fname, user_lname):
roles_list = ['System Manager','Sales Manager','Sales User','Purchase Manager','Purchase User','Material Manager','Material User','Accounts Manager','Accounts User','HR Manager','HR User','Production Manager','Production User','Sales Master Manager','Purchase Master Manager','Material Master Manager','Quality Manager','Maintenance User','Maintenance Manager'] pr = Document('Profile')
pr = Document('Profile') pr.first_name = user_fname
pr.first_name = user_fname pr.last_name = user_lname
pr.last_name = user_lname pr.email = user_email
pr.email = user_email pr.enabled = 1
pr.enabled = 1 pr.save(1)
pr.save(1) self.add_roles(pr)
for r in roles_list:
d = addchild(pr, 'userroles', 'UserRole', 1)
d.role = r
d.save()
# Add roles to Administrator profile
pr_obj = get_obj('Profile','Administrator')
for r in roles_list:
d = addchild(pr_obj.doc,'userroles', 'UserRole', 1)
d.role = r
d.save()
# Update WN ERP Client Control def add_roles(self, pr):
# ----------------------------- roles_list = ['System Manager','Sales Manager','Sales User','Purchase Manager','Purchase User','Material Manager','Material User','Accounts Manager','Accounts User','HR Manager','HR User','Production Manager','Production User','Sales Master Manager','Purchase Master Manager','Material Master Manager','Quality Manager','Maintenance User','Maintenance Manager']
def update_client_control(self): for r in roles_list:
cl = Document('WN ERP Client Control','WN ERP Client Control') d = addchild(pr, 'userroles', 'UserRole', 1)
cl.account_start_date = nowdate() d.role = r
cl.total_users = 1 d.save(1)
cl.is_trial_account = 1
cl.save()
# Sync DB # Add roles to Administrator profile
# ------- pr_obj = get_obj('Profile','Administrator')
def sync_db(arg=''): for r in roles_list:
import webnotes.model.db_schema d = addchild(pr_obj.doc,'userroles', 'UserRole', 1)
sql("delete from `tabDocType Update Register`") d.role = r
webnotes.model.db_schema.sync_all() d.save(1)
# Update WN ERP Client Control
# -----------------------------
def update_client_control(self):
cl = Document('WN ERP Client Control','WN ERP Client Control')
cl.account_start_date = nowdate()
cl.total_users = 1
cl.is_trial_account = 1
cl.save()
# Sync DB
# -------
def sync_db(arg=''):
import webnotes.model.db_schema
sql("delete from `tabDocType Update Register`")
webnotes.model.db_schema.sync_all()

3
srm/doctype/indent/indent.js
View File

@ -9,6 +9,9 @@ cur_frm.cscript.onload = function(doc, cdt, cdn) {
if (!doc.transaction_date) doc.transaction_date = dateutil.obj_to_str(new Date()) if (!doc.transaction_date) doc.transaction_date = dateutil.obj_to_str(new Date())
if (!doc.status) doc.status = 'Draft'; if (!doc.status) doc.status = 'Draft';
}
cur_frm.cscript.onload_post_render = function(doc, cdt, cdn) {
// second call // second call
if(doc.__islocal){ if(doc.__islocal){
cur_frm.cscript.get_item_defaults(doc); cur_frm.cscript.get_item_defaults(doc);

10
srm/doctype/purchase_order/purchase_order.js
View File

@ -16,15 +16,17 @@ cur_frm.cscript.onload = function(doc, cdt, cdn) {
if(!doc.status) set_multiple(cdt,cdn,{status:'Draft'}); if(!doc.status) set_multiple(cdt,cdn,{status:'Draft'});
if(!doc.transaction_date) set_multiple(cdt,cdn,{transaction_date:get_today()}); if(!doc.transaction_date) set_multiple(cdt,cdn,{transaction_date:get_today()});
if(doc.__islocal){
cur_frm.cscript.get_default_schedule_date(doc);
}
if(doc.__islocal){ if(doc.__islocal){
hide_field(['supplier_name','supplier_address','contact_person','address_display','contact_display','contact_mobile','contact_email']); hide_field(['supplier_name','supplier_address','contact_person','address_display','contact_display','contact_mobile','contact_email']);
} }
} }
cur_frm.cscript.onload_post_render = function(doc, cdt, cdn) {
if(doc.__islocal){
cur_frm.cscript.get_default_schedule_date(doc);
}
}
// ================================== Refresh ========================================== // ================================== Refresh ==========================================
cur_frm.cscript.refresh = function(doc, cdt, cdn) { cur_frm.cscript.refresh = function(doc, cdt, cdn) {