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

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

Browse Source
This commit is contained in:
Nabin Hait 2012-02-13 12:26:45 +05:30
commit 043b0f26bd
12 changed files with 431 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

207
erpnext/accounts/__init__.py
View File

@ -1,4 +1,6 @@
import webnotes
from webnotes.utils import flt
from webnotes.model.code import get_obj
def get_default_bank_account():
"""
@ -11,3 +13,208 @@ def get_default_bank_account():
WHERE name=%s AND docstatus<2""", company)
if res: return res[0][0]
def get_new_jv_details():
"""
Get details which will help create new jv on sales/purchase return
"""
doclist = webnotes.form_dict.get('doclist')
fiscal_year = webnotes.form_dict.get('fiscal_year')
if not (isinstance(doclist, basestring) and isinstance(fiscal_year, basestring)): return
import json
doclist = json.loads(doclist)
doc, children = doclist[0], doclist[1:]
if doc.get('return_type')=='Sales Return':
if doc.get('sales_invoice_no'):
return get_invoice_details(doc, children, fiscal_year)
elif doc.get('delivery_note_no'):
return get_delivery_note_details(doc, children, fiscal_year)
elif doc.get('purchase_receipt_no'):
return get_purchase_receipt_details(doc, children, fiscal_year)
def get_invoice_details(doc, children, fiscal_year):
"""
Gets details from an invoice to make new jv
Returns [{
'account': ,
'balance': ,
'debit': ,
'credit': ,
'against_invoice': ,
'against_payable':
}, { ... }, ...]
"""
if doc.get('return_type')=='Sales Return':
obj = get_obj('Receivable Voucher', doc.get('sales_invoice_no'), with_children=1)
else:
obj = get_obj('Payable Voucher', doc.get('purchase_invoice_no'), with_children=1)
if not obj.doc.docstatus==1: return
# Build invoice account jv detail record
invoice_rec = get_invoice_account_jv_record(doc, children, fiscal_year, obj)
# Build item accountwise jv detail records
item_accountwise_list = get_item_accountwise_jv_record(doc, children, fiscal_year, obj)
return [invoice_rec] + item_accountwise_list
def get_invoice_account_jv_record(doc, children, fiscal_year, obj):
"""
Build customer/supplier account jv detail record
"""
# Calculate total return amount
total_amt = sum([(flt(ch.get('rate')) * flt(ch.get('returned_qty'))) for ch in children])
ret = {}
if doc.get('return_type')=='Sales Return':
account = obj.doc.debit_to
ret['against_invoice'] = doc.get('sales_invoice_no')
ret['credit'] = total_amt
else:
account = obj.doc.credit_to
ret['against_voucher'] = doc.get('purchase_invoice_no')
ret['debit'] = total_amt
ret.update({
'account': account,
'balance': get_obj('GL Control').get_bal(account + "~~~" + fiscal_year)
})
return ret
def get_item_accountwise_jv_record(doc, children, fiscal_year, obj):
"""
Build item accountwise jv detail records
"""
if doc.get('return_type')=='Sales Return':
amt_field = 'debit'
ac_field = 'income_account'
else:
amt_field = 'credit'
ac_field = 'expense_head'
inv_children = dict([[ic.fields.get('item_code'), ic] for ic in obj.doclist if ic.fields.get('item_code')])
accwise_list = []
for ch in children:
inv_ch = inv_children.get(ch.get('item_code'))
if not inv_ch: continue
amount = flt(ch.get('rate')) * flt(ch.get('returned_qty'))
accounts = [[jvd['account'], jvd['cost_center']] for jvd in accwise_list]
if [inv_ch.fields.get(ac_field), inv_ch.fields.get('cost_center')] not in accounts:
rec = {
'account': inv_ch.fields.get(ac_field),
'cost_center': inv_ch.fields.get('cost_center'),
'balance': get_obj('GL Control').get_bal(inv_ch.fields.get(ac_field) + "~~~" + fiscal_year)
}
rec[amt_field] = amount
accwise_list.append(rec)
else:
rec = accwise_list[accounts.index([inv_ch.fields.get(ac_field), inv_ch.fields.get('cost_center')])]
rec[amt_field] = rec[amt_field] + amount
return accwise_list
def get_jv_details_from_inv_list(doc, children, fiscal_year, inv_list, jv_details_list):
"""
Get invoice details and make jv detail records
"""
for inv in inv_list:
if not inv[0]: continue
if doc.get('return_type')=='Sales Return':
doc['sales_invoice_no'] = inv[0]
else:
doc['purchase_invoice_no'] = inv[0]
jv_details = get_invoice_details(doc, children, fiscal_year)
if jv_details and len(jv_details)>1: jv_details_list.extend(jv_details)
return jv_details_list
def get_prev_doc_list(obj, prev_doctype):
"""
Returns a list of previous doc's names
"""
prevdoc_list = []
for ch in obj.doclist:
if ch.fields.get('prevdoc_docname') and ch.fields.get('prevdoc_doctype')==prev_doctype:
prevdoc_list.append(ch.fields.get('prevdoc_docname'))
return prevdoc_list
def get_inv_list(table, field, value):
"""
Returns invoice list
"""
if isinstance(value, basestring):
return webnotes.conn.sql("""\
SELECT DISTINCT parent FROM `%s`
WHERE %s='%s' AND docstatus=1""" % (table, field, value))
elif isinstance(value, list):
return webnotes.conn.sql("""\
SELECT DISTINCT parent FROM `%s`
WHERE %s IN ("%s") AND docstatus=1""" % (table, field, '", "'.join(value)))
else:
return []
def get_delivery_note_details(doc, children, fiscal_year):
"""
Gets sales invoice numbers from delivery note details
and returns detail records for jv
"""
jv_details_list = []
dn_obj = get_obj('Delivery Note', doc['delivery_note_no'], with_children=1)
inv_list = get_inv_list('tabRV Detail', 'delivery_note', doc['delivery_note_no'])
if inv_list:
jv_details_list = get_jv_details_from_inv_list(doc, children, fiscal_year, inv_list, jv_details_list)
if not (inv_list and jv_details_list):
so_list = get_prev_doc_list(dn_obj, 'Sales Order')
inv_list = get_inv_list('tabRV Detail', 'sales_order', so_list)
if inv_list:
jv_details_list = get_jv_details_from_inv_list(doc, children, fiscal_year, inv_list, jv_details_list)
return jv_details_list
def get_purchase_receipt_details(doc, children, fiscal_year):
"""
Gets purchase invoice numbers from purchase receipt details
and returns detail records for jv
"""
jv_details_list = []
pr_obj = get_obj('Purchase Receipt', doc['purchase_receipt_no'], with_children=1)
inv_list = get_inv_list('tabPV Detail', 'purchase_receipt', doc['purchase_receipt_no'])
if inv_list:
jv_details_list = get_jv_details_from_inv_list(doc, children, fiscal_year, inv_list, jv_details_list)
if not (inv_list and jv_details_list):
po_list = get_prev_doc_list(pr_obj, 'Purchase Order')
inv_list = get_inv_list('tabPV Detail', 'purchase_order', po_list)
if inv_list:
jv_details_list = get_jv_details_from_inv_list(doc, children, fiscal_year, inv_list, jv_details_list)
return jv_details_list

8
erpnext/accounts/doctype/payable_voucher/payable_voucher.js
View File

@ -65,8 +65,12 @@ cur_frm.cscript.supplier = function(doc,dt,dn) {
var el = getchildren('PV Detail',doc.name,'entries');
for(var i in el){
if(el[i].item_code && (!el[i].expense_head || !el[i].cost_center)){
args = "{'item_code':'" + el[i].item_code + "','expense_head':'" + el[i].expense_head + "','cost_center':'" + el[i].cost_center + "'}";
get_server_fields('get_default_values', args, 'entries', doc, el[i].doctype, el[i].name, 1);
args = {
item_code: el[i].item_code,
expense_head: el[i].expense_head,
cost_center: el[i].cost_center
};
get_server_fields('get_default_values', JSON.stringify(args), 'entries', doc, el[i].doctype, el[i].name, 1);
}
}
cur_frm.cscript.calc_amount(doc, 1);

6
erpnext/accounts/doctype/payable_voucher/payable_voucher.py
View File

@ -61,7 +61,8 @@ class DocType(TransactionBase):
# Get Default Cost Center and Expense Head from Item Master
# ----------------------------------------------------------
def get_default_values(self,args):
args = eval(args)
import json
args = json.loads(args)
ret = {}
if sql("select name from `tabItem` where name = '%s'" % args['item_code']):
if not args['expense_head'] or args['expense_head'] == 'undefined':
@ -105,6 +106,7 @@ class DocType(TransactionBase):
def get_pv_details(self, arg):
import json
item_det = sql("select item_name, brand, description, item_group,purchase_account,cost_center from tabItem where name=%s",arg,as_dict=1)
tax = sql("select tax_type, tax_rate from `tabItem Tax` where parent = %s" , arg)
t = {}
@ -119,7 +121,7 @@ class DocType(TransactionBase):
'amount' : 0.00,
'expense_head' : item_det and item_det[0]['purchase_account'] or '',
'cost_center' : item_det and item_det[0]['cost_center'] or '',
'item_tax_rate' : str(t)
'item_tax_rate' : json.dumps(t)
}
return ret

2
erpnext/buying/doctype/purchase_common/purchase_common.js
View File

@ -34,7 +34,7 @@ cur_frm.cscript.load_defaults = function(doc, dt, dn) {
// Update existing item details
cur_frm.cscript.update_item_details = function(doc, dt, dn) {
if(!cur_frm.doc.__islocal) return;
if(!cur_frm.doc.__islocal) { return; }
var children = getchildren(cur_frm.cscript.tname, doc.name, cur_frm.cscript.fname);
if(children) {
$c_obj(make_doclist(doc.doctype, doc.name), 'get_item_details', '',

36
erpnext/home/page/event_updates/event_updates.js
View File

@ -585,6 +585,7 @@ HomeStatusBar = function() {
this.wrapper.innerHTML = '';
this.profile_settings = $a($a(this.wrapper, 'p'), 'span', 'link_type', {fontWeight:'bold'});
this.profile_settings.innerHTML = user_fullname + ' (Profile Settings)';
this.profile_settings.id = "user_fullname";
this.profile_settings.onclick = function() { loadpage('profile-settings'); }
this.span = $a($a(this.wrapper, 'p'), 'span', 'link_type', {fontWeight:'bold'});
@ -614,7 +615,7 @@ pscript.home_make_status = function() {
// complete registration
if(in_list(user_roles,'System Manager')) {
pscript.complete_registration(r.message.registration_complete);
pscript.complete_registration(r.message.registration_complete, r.message.profile);
}
// setup wizard
@ -627,15 +628,19 @@ pscript.home_make_status = function() {
// complete my company registration
// --------------------------------
pscript.complete_registration = function(is_complete) {
pscript.complete_registration = function(is_complete, profile) {
if(is_complete == 'No'){
var d = new Dialog(400, 200, "Please Complete Your Registration");
var d = new Dialog(400, 200, "Setup your Account");
if(user != 'Administrator'){
d.no_cancel(); // Hide close image
$dh(page_body.wntoolbar.wrapper);
}
d.make_body([
['HTML', 'Your Profile Details', '<h4>Your Profile Details</h4>'],
['Data', 'First Name'],
['Data', 'Last Name'],
['HTML', 'Company Details', '<h4>Create your first company</h4>'],
['Data','Company Name','Example: Your Company LLC'],
['Data','Company Abbreviation', 'Example: YC (all your acconts will have this as a suffix)'],
['Select','Fiscal Year Start Date'],
@ -650,6 +655,15 @@ pscript.complete_registration = function(is_complete) {
d.widgets['Company Name'].disabled = 1;
}
if(profile && profile.length>0) {
if(profile[0].first_name && profile[0].first_name!='None') {
d.widgets['First Name'].value = profile[0].first_name;
}
if(profile[0].last_name && profile[0].last_name!='None') {
d.widgets['Last Name'].value = profile[0].last_name;
}
}
//d.widgets['Save'].disabled = true; // disable Save button
pscript.make_dialog_field(d);
@ -666,14 +680,20 @@ pscript.complete_registration = function(is_complete) {
d.widgets['Company Name'].value,
d.widgets['Company Abbreviation'].value,
d.widgets['Fiscal Year Start Date'].value,
d.widgets['Default Currency'].value
d.widgets['Default Currency'].value,
d.widgets['First Name'].value,
d.widgets['Last Name'].value
];
$c_obj('Setup Control','setup_account',JSON.stringify(args),function(r, rt){
sys_defaults = r.message;
sys_defaults = r.message.sys_defaults;
user_fullname = r.message.user_fullname;
d.hide();
$ds(page_body.wntoolbar.wrapper);
$('#user_fullname').html(user_fullname + " (Profile Settings)");
});
} else {
d.widgets['Save'].done_working();
}
}
d.show();
@ -699,12 +719,12 @@ pscript.make_dialog_field = function(d)
// ---------------
pscript.validate_fields = function(d)
{
var lst = ['Company Abbreviation', 'Fiscal Year Start Date', 'Default Currency'];
var msg = 'Please enter the following fields';
var lst = ['First Name', 'Company Name', 'Company Abbreviation', 'Fiscal Year Start Date', 'Default Currency'];
var msg = 'Please enter the following fields\n';
var flag = 1;
for(var i=0; i<lst.length; i++)
{
if(!d.widgets[lst[i]].value){
if(!d.widgets[lst[i]].value || d.widgets[lst[i]].value=='None'){
flag = 0;
msg = msg + NEWLINE + lst[i];
}

5
erpnext/home/page/event_updates/event_updates.py
View File

@ -36,7 +36,10 @@ def get_status_details(arg=None):
'is_trial': webnotes.conn.get_global('is_trial'),
'days_to_expiry': (webnotes.conn.get_global('days_to_expiry') or '0'),
'setup_status': get_setup_status(),
'registration_complete': cint(get_defaults('registration_complete')) and 'Yes' or 'No'
'registration_complete': cint(get_defaults('registration_complete')) and 'Yes' or 'No',
'profile': webnotes.conn.sql("""\
SELECT first_name, last_name FROM `tabProfile`
WHERE name=%s AND docstatus<2""", webnotes.user.name, as_dict=1)
}
return ret

6
erpnext/selling/doctype/sales_common/sales_common.py
View File

@ -197,17 +197,19 @@ class DocType(TransactionBase):
#---------------------------------------- Get Tax Details -------------------------------#
def get_tax_details(self, item_code, obj):
import json
tax = webnotes.conn.sql("select tax_type, tax_rate from `tabItem Tax` where parent = %s" , item_code)
t = {}
for x in tax: t[x[0]] = flt(x[1])
ret = {
'item_tax_rate' : tax and str(t) or ''
'item_tax_rate' : tax and json.dumps(t) or ''
}
return ret
# Get Serial No Details
# ==========================================================================
def get_serial_details(self, serial_no, obj):
import json
item = webnotes.conn.sql("select item_code, make, label,brand, description from `tabSerial No` where name = '%s' and docstatus != 2" %(serial_no), as_dict=1)
tax = webnotes.conn.sql("select tax_type, tax_rate from `tabItem Tax` where parent = %s" , item[0]['item_code'])
t = {}
@ -218,7 +220,7 @@ class DocType(TransactionBase):
'label' : item and item[0]['label'] or '',
'brand' : item and item[0]['brand'] or '',
'description' : item and item[0]['description'] or '',
'item_tax_rate' : str(t)
'item_tax_rate' : json.dumps(t)
}
return ret

14
erpnext/setup/doctype/setup_control/setup_control.py
View File

@ -47,10 +47,18 @@ class DocType:
# Account Setup
# ---------------
def setup_account(self, args):
company_name, comp_abbr, fy_start, currency = eval(args)
import webnotes
company_name, comp_abbr, fy_start, currency, first_name, last_name = eval(args)
curr_fiscal_year,fy_start_date = self.get_fy_details(fy_start)
self.currency = currency
# Update Profile
if last_name=='None': last_name = None
webnotes.conn.sql("""\
UPDATE `tabProfile` SET first_name=%s, last_name=%s
WHERE name=%s AND docstatus<2""", (first_name, last_name, webnotes.user.name))
# Fiscal Year
master_dict = {'Fiscal Year':{'year':curr_fiscal_year, 'year_start_date':fy_start_date}}
self.create_records(master_dict)
@ -66,6 +74,7 @@ class DocType:
'default_currency': currency,
'default_company':company_name,
'default_valuation_method':'FIFO',
'default_stock_uom':'Nos',
'date_format':'dd-mm-yyyy',
'default_currency_format':'Lacs',
'so_required':'No',
@ -87,7 +96,8 @@ class DocType:
msgprint("Great! Your company has now been created")
import webnotes.utils
return webnotes.utils.get_defaults()
user_fullname = (first_name or '') + (last_name and (" " + last_name) or '')
return {'sys_defaults': webnotes.utils.get_defaults(), 'user_fullname': user_fullname}
# Get Fiscal year Details

5
erpnext/stock/doctype/landed_cost_wizard/landed_cost_wizard.py
View File

@ -112,6 +112,7 @@ class DocType:
def cal_charges_and_item_tax_amt(self):
""" Re-calculates other charges values and itemwise tax amount for getting valuation rate"""
import json
for pr in self.selected_pr:
obj = get_obj('Purchase Receipt', pr, with_children = 1)
total = 0
@ -121,8 +122,12 @@ class DocType:
prev_total, item_tax = flt(prd.amount), 0
total += flt(prd.qty) * flt(prd.purchase_rate)
try:
item_tax_rate = prd.item_tax_rate and json.loads(prd.item_tax_rate) or {}
except ValueError:
item_tax_rate = prd.item_tax_rate and eval(prd.item_tax_rate) or {}
ocd = getlist(obj.doclist, 'purchase_tax_details')
# calculate tax for other charges
for oc in range(len(ocd)):

55
erpnext/stock/doctype/sales_and_purchase_return_wizard/sales_and_purchase_return_wizard.js
View File

@ -26,11 +26,23 @@ cur_frm.fields_dict.purchase_receipt_no.get_query = function(doc) {
// Hide/unhide based on return type
//----------------------------------
cur_frm.cscript.return_type = function(doc, cdt, cdn) {
hide_field(['purchase_receipt_no', 'delivery_note_no', 'sales_invoice_no', 'return_details', 'Get Items', 'Make Excise Invoice', 'Make Stock Entry', 'Make Debit Note', 'Make Credit Note']);
if(doc.return_type == 'Sales Return')
unhide_field(['delivery_note_no', 'sales_invoice_no', 'Get Items', 'return_details', 'Make Credit Note', 'Make Stock Entry', 'Make Excise Invoice']);
else if(doc.return_type == 'Purchase Return')
unhide_field(['purchase_receipt_no', 'Get Items', 'return_details', 'Make Debit Note', 'Make Stock Entry', 'Make Excise Invoice']);
var cp = locals['Control Panel']['Control Panel'];
hide_field(['purchase_receipt_no', 'delivery_note_no', 'sales_invoice_no',
'return_details', 'Get Items', 'Make Excise Invoice', 'Make Stock Entry',
'Make Debit Note', 'Make Credit Note']);
if(doc.return_type == 'Sales Return') {
unhide_field(['delivery_note_no', 'sales_invoice_no', 'Get Items',
'return_details', 'Make Credit Note', 'Make Stock Entry']);
if(cp.country == 'India') { unhide_field(['Make Excise Invoice']); }
} else if(doc.return_type == 'Purchase Return') {
unhide_field(['purchase_receipt_no', 'Get Items', 'return_details',
'Make Debit Note', 'Make Stock Entry']);
if(cp.country == 'India') { unhide_field(['Make Excise Invoice']); }
}
cur_frm.cscript.clear_fields(doc);
}
@ -151,17 +163,34 @@ cur_frm.cscript['Make Excise Invoice'] = function(doc) {
// Make debit note
//------------------------------
cur_frm.cscript['Make Debit Note'] = function(doc) {
cur_frm.cscript.make_jv(doc, 'Debit Note');
var doclist = make_doclist(doc.doctype, doc.name);
$c('accounts.get_new_jv_details', {
doclist: JSON.stringify(doclist),
fiscal_year: sys_defaults.fiscal_year
}, function(r, rt) {
if(!r.exc) {
cur_frm.cscript.make_jv(doc, 'Debit Note', r.message);
}
});
}
// Make credit note
//------------------------------
cur_frm.cscript['Make Credit Note'] = function(doc) {
cur_frm.cscript.make_jv(doc, 'Credit Note');
var doclist = make_doclist(doc.doctype, doc.name);
$c('accounts.get_new_jv_details', {
doclist: JSON.stringify(doclist),
fiscal_year: sys_defaults.fiscal_year
}, function(r, rt) {
if(!r.exc) {
cur_frm.cscript.make_jv(doc, 'Credit Note', r.message);
}
});
}
// Make JV
//--------------------------------
cur_frm.cscript.make_jv = function(doc, dr_or_cr) {
cur_frm.cscript.make_jv = function(doc, dr_or_cr, children) {
var jv = LocalDB.create('Journal Voucher');
jv = locals['Journal Voucher'][jv];
@ -172,5 +201,13 @@ cur_frm.cscript.make_jv = function(doc, dr_or_cr) {
jv.posting_date = dateutil.obj_to_str(new Date());
jv.voucher_date = dateutil.obj_to_str(new Date());
loaddoc('Journal Voucher',jv.name);
// Add children
if(children) {
for(var i=0; i<children.length; i++) {
var ch = LocalDB.add_child(jv, 'Journal Voucher Detail', 'entries');
$.extend(ch, children[i]);
}
}
loaddoc('Journal Voucher', jv.name);
}

8
erpnext/support/doctype/support_ticket/support_ticket.js
View File

@ -84,15 +84,19 @@ $.extend(cur_frm.cscript, {
Send: function(doc, dt, dn) {
$c_obj([doc], 'send_response', '', function(r,rt) {
locals[dt][dn].new_response = '';
if(!r.exc) {
cur_frm.refresh();
}
});
},
customer: function(doc, dt, dn) {
var callback = function(r,rt) {
var doc = locals[cur_frm.doctype][cur_frm.docname];
if(!r.exc) {
cur_frm.refresh();
}
}
if(doc.customer) $c_obj(make_doclist(doc.doctype, doc.name), 'get_default_customer_address', '', callback);
if(doc.customer) unhide_field(['customer_name','address_display','contact_display','contact_mobile','contact_email']);
},
@ -104,7 +108,9 @@ $.extend(cur_frm.cscript, {
if(answer) {
if(doc.name)
$c_obj([doc],'close_ticket','',function(r,rt) {
if(!r.exc) {
cur_frm.refresh();
}
});
}
},
@ -116,7 +122,9 @@ $.extend(cur_frm.cscript, {
if(answer) {
if(doc.name)
$c_obj([doc],'reopen_ticket','',function(r,rt) {
if(!r.exc) {
cur_frm.refresh();
}
});
}
}