added session expiry in global defaults

This commit is contained in:
Rushabh Mehta 2012-12-12 14:33:02 +05:30
parent 74aebf0965
commit 20b75e372f
2 changed files with 440 additions and 553 deletions

View File

@ -37,7 +37,8 @@ keydict = {
'currency_format':'default_currency_format', 'currency_format':'default_currency_format',
'account_url':'account_url', 'account_url':'account_url',
'allow_negative_stock' : 'allow_negative_stock', 'allow_negative_stock' : 'allow_negative_stock',
'maintain_same_rate' : 'maintain_same_rate' 'maintain_same_rate' : 'maintain_same_rate',
'session_expiry': 'session_expiry'
} }
class DocType: class DocType:
@ -47,6 +48,8 @@ class DocType:
def on_update(self): def on_update(self):
"""update defaults""" """update defaults"""
self.validate_session_expiry()
for key in keydict: for key in keydict:
webnotes.conn.set_default(key, self.doc.fields.get(keydict[key], '')) webnotes.conn.set_default(key, self.doc.fields.get(keydict[key], ''))
@ -61,5 +64,14 @@ class DocType:
webnotes.conn.set_default('year_end_date', \ webnotes.conn.set_default('year_end_date', \
get_last_day(get_first_day(ysd,0,11)).strftime('%Y-%m-%d')) get_last_day(get_first_day(ysd,0,11)).strftime('%Y-%m-%d'))
def validate_session_expiry(self):
if self.doc.session_expiry:
from datetime import datetime
try:
datetime.strptime(self.doc.session_expiry, "%H:%M")
except ValueError:
webnotes.msgprint("""Session Expiry must be in format hh:mm""",
raise_exception=1)
def get_defaults(self): def get_defaults(self):
return webnotes.conn.get_defaults() return webnotes.conn.get_defaults()

View File

@ -1,553 +1,428 @@
# DocType, Global Defaults
[ [
{
# These values are common in all dictionaries "owner": "Administrator",
{ "docstatus": 0,
u'creation': '2012-07-03 13:30:02', "creation": "2012-10-26 16:49:40",
u'docstatus': 0, "modified_by": "Administrator",
u'modified': '2012-10-26 16:42:29', "modified": "2012-12-12 14:13:31"
u'modified_by': u'Administrator', },
u'owner': u'Administrator' {
}, "in_create": 1,
"allow_print": 1,
# These values are common for all DocType "module": "Setup",
{ "read_only": 1,
'_last_update': u'1323855502', "allow_email": 1,
'allow_copy': 1, "issingle": 1,
'allow_email': 1, "name": "__common__",
'allow_print': 1, "doctype": "DocType",
'colour': u'White:FFF', "hide_toolbar": 0,
u'doctype': u'DocType', "allow_copy": 1
'hide_toolbar': 0, },
'in_create': 1, {
'issingle': 1, "name": "__common__",
'module': u'Setup', "parent": "Global Defaults",
u'name': u'__common__', "doctype": "DocField",
'read_only': 1, "parenttype": "DocType",
'section_style': u'Tabbed', "permlevel": 0,
'server_code_error': u' ', "parentfield": "fields"
'show_in_menu': 1, },
'version': 1 {
}, "name": "__common__",
"parent": "Global Defaults",
# These values are common for all DocField "read": 1,
{ "doctype": "DocPerm",
u'doctype': u'DocField', "parenttype": "DocType",
u'name': u'__common__', "parentfield": "permissions"
'parent': u'Global Defaults', },
'parentfield': u'fields', {
'parenttype': u'DocType', "name": "Global Defaults",
'permlevel': 0 "doctype": "DocType"
}, },
{
# These values are common for all DocPerm "doctype": "DocField",
{ "label": "General",
u'doctype': u'DocPerm', "fieldname": "general",
u'name': u'__common__', "fieldtype": "Section Break"
'parent': u'Global Defaults', },
'parentfield': u'permissions', {
'parenttype': u'DocType', "description": "Session Expiry in Hours e.g. 06:00",
'read': 1 "doctype": "DocField",
}, "label": "Session Expiry",
"fieldname": "session_expiry",
# DocType, Global Defaults "fieldtype": "Data"
{ },
u'doctype': u'DocType', {
u'name': u'Global Defaults' "doctype": "DocField",
}, "label": "Company",
"fieldname": "company",
# DocField "fieldtype": "Section Break"
{ },
u'doctype': u'DocField', {
'fieldname': u'company', "doctype": "DocField",
'fieldtype': u'Section Break', "label": "Default Company",
'label': u'Company' "fieldname": "default_company",
}, "fieldtype": "Link",
"reqd": 0,
# DocField "options": "Company"
{ },
u'doctype': u'DocField', {
'fieldname': u'default_company', "doctype": "DocField",
'fieldtype': u'Link', "label": "Current Fiscal Year",
'label': u'Default Company', "fieldname": "current_fiscal_year",
'options': u'Company', "fieldtype": "Link",
'reqd': 0 "reqd": 1,
}, "options": "Fiscal Year"
},
# DocField {
{ "doctype": "DocField",
u'doctype': u'DocField', "label": "Date Format",
'fieldname': u'current_fiscal_year', "fieldname": "date_format",
'fieldtype': u'Link', "fieldtype": "Select",
'label': u'Current Fiscal Year', "options": "yyyy-mm-dd\ndd-mm-yyyy\ndd/mm/yyyy\nmm/dd/yyyy\nmm-dd-yyyy"
'options': u'Fiscal Year', },
'reqd': 1 {
}, "doctype": "DocField",
"width": "50%",
# DocField "fieldname": "column_break1",
{ "fieldtype": "Column Break"
u'doctype': u'DocField', },
'fieldname': u'date_format', {
'fieldtype': u'Select', "default": "INR",
'label': u'Date Format', "doctype": "DocField",
'options': u'yyyy-mm-dd\ndd-mm-yyyy\ndd/mm/yyyy\nmm/dd/yyyy\nmm-dd-yyyy' "label": "Default Currency",
}, "fieldname": "default_currency",
"fieldtype": "Select",
# DocField "reqd": 1,
{ "options": "link:Currency"
u'doctype': u'DocField', },
'fieldname': u'column_break1', {
'fieldtype': u'Column Break', "doctype": "DocField",
'width': u'50%' "label": "Default Currency Format",
}, "fieldname": "default_currency_format",
"fieldtype": "Select",
# DocField "options": "Lacs\nMillions"
{ },
'default': u'INR', {
u'doctype': u'DocField', "doctype": "DocField",
'fieldname': u'default_currency', "label": "Default Currency Fraction",
'fieldtype': u'Select', "fieldname": "default_currency_fraction",
'label': u'Default Currency', "fieldtype": "Data"
'options': u'link:Currency', },
'reqd': 1 {
}, "doctype": "DocField",
"label": "Stock",
# DocField "fieldname": "stock",
{ "fieldtype": "Section Break"
u'doctype': u'DocField', },
'fieldname': u'default_currency_format', {
'fieldtype': u'Select', "doctype": "DocField",
'label': u'Default Currency Format', "width": "50%",
'options': u'Lacs\nMillions' "fieldname": "column_break2",
}, "fieldtype": "Column Break"
},
# DocField {
{ "doctype": "DocField",
u'doctype': u'DocField', "label": "Default Item Group",
'fieldname': u'default_currency_fraction', "fieldname": "default_item_group",
'fieldtype': u'Data', "fieldtype": "Link",
'label': u'Default Currency Fraction' "options": "Item Group"
}, },
{
# DocField "doctype": "DocField",
{ "label": "IGHelp",
u'doctype': u'DocField', "fieldname": "ighelp",
'fieldname': u'stock', "fieldtype": "HTML",
'fieldtype': u'Section Break', "options": "<a href=\"#!Sales Browser/Item Group\">To manage Item Groups, click here</a>"
'label': u'Stock' },
}, {
"doctype": "DocField",
# DocField "label": "Default Stock UOM",
{ "fieldname": "default_stock_uom",
u'doctype': u'DocField', "fieldtype": "Link",
'fieldname': u'column_break2', "options": "UOM"
'fieldtype': u'Column Break', },
'width': u'50%' {
}, "doctype": "DocField",
"label": "Default Valuation Method",
# DocField "fieldname": "default_valuation_method",
{ "fieldtype": "Select",
u'doctype': u'DocField', "options": "FIFO\nMoving Average"
'fieldname': u'default_item_group', },
'fieldtype': u'Link', {
'label': u'Default Item Group', "description": "Applicable only if valuation method is moving average",
'options': u'Item Group' "doctype": "DocField",
}, "label": "Allow Negative Stock",
"fieldname": "allow_negative_stock",
# DocField "fieldtype": "Check"
{ },
u'doctype': u'DocField', {
'fieldname': u'ighelp', "doctype": "DocField",
'fieldtype': u'HTML', "label": "Default Warehouse Type",
'label': u'IGHelp', "fieldname": "default_warehouse_type",
'options': u'<a href="#!Sales Browser/Item Group">To manage Item Groups, click here</a>' "fieldtype": "Link",
}, "options": "Warehouse Type"
},
# DocField {
{ "doctype": "DocField",
u'doctype': u'DocField', "label": "Raise Purchase Request when stock reaches re-order level",
'fieldname': u'default_stock_uom', "fieldname": "auto_indent",
'fieldtype': u'Link', "fieldtype": "Check"
'label': u'Default Stock UOM', },
'options': u'UOM' {
}, "default": "1",
"doctype": "DocField",
# DocField "width": "50%",
{ "fieldname": "column_break3",
u'doctype': u'DocField', "fieldtype": "Column Break"
'fieldname': u'default_valuation_method', },
'fieldtype': u'Select', {
'label': u'Default Valuation Method', "description": "Percentage you are allowed to receive or deliver more against the quantity ordered. <p>For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units</p>",
'options': u'FIFO\nMoving Average' "doctype": "DocField",
}, "label": "Allowance Percent",
"fieldname": "tolerance",
# DocField "fieldtype": "Currency"
{ },
'colour': u'White:FFF', {
'description': u'Applicable only if valuation method is moving average', "description": "Stock level frozen up to this date, nobody can do / modify entry except authorized person",
u'doctype': u'DocField', "doctype": "DocField",
'fieldname': u'allow_negative_stock', "label": "Stock Frozen Upto",
'fieldtype': u'Check', "fieldname": "stock_frozen_upto",
'label': u'Allow Negative Stock' "fieldtype": "Date"
}, },
{
# DocField "description": "Users with this role are allowed to do / modify stock entry before frozen date",
{ "doctype": "DocField",
u'doctype': u'DocField', "label": "Authorized Role (Frozen Entry)",
'fieldname': u'default_warehouse_type', "fieldname": "stock_auth_role",
'fieldtype': u'Link', "fieldtype": "Link",
'label': u'Default Warehouse Type', "options": "Role"
'options': u'Warehouse Type' },
}, {
"doctype": "DocField",
# DocField "label": "Accounts",
{ "fieldname": "accounts",
u'doctype': u'DocField', "fieldtype": "Section Break"
'fieldname': u'auto_indent', },
'fieldtype': u'Check', {
'label': u'Raise Purchase Request when stock reaches re-order level' "description": "Accounting entry frozen up to this date, nobody can do / modify entry except authorized person",
}, "doctype": "DocField",
"label": "Accounts Frozen Upto",
# DocField "fieldname": "acc_frozen_upto",
{ "fieldtype": "Date"
'default': u'1', },
u'doctype': u'DocField', {
'fieldname': u'column_break3', "description": "Users with this role are allowed to do / modify accounting entry before frozen date",
'fieldtype': u'Column Break', "doctype": "DocField",
'width': u'50%' "label": "Authourized Role (Frozen Entry)",
}, "fieldname": "bde_auth_role",
"fieldtype": "Link",
# DocField "options": "Role"
{ },
'colour': u'White:FFF', {
'description': u'Percentage you are allowed to receive or deliver more against the quantity ordered. <p>For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units</p>', "doctype": "DocField",
u'doctype': u'DocField', "label": "Credit Controller",
'fieldname': u'tolerance', "fieldname": "credit_controller",
'fieldtype': u'Currency', "fieldtype": "Link",
'label': u'Allowance Percent' "options": "Role"
}, },
{
# DocField "doctype": "DocField",
{ "fieldname": "column_break4",
'colour': u'White:FFF', "fieldtype": "Column Break"
'description': u'Stock level frozen up to this date, nobody can do / modify entry except authorized person', },
u'doctype': u'DocField', {
'fieldname': u'stock_frozen_upto', "doctype": "DocField",
'fieldtype': u'Date', "label": "Account Info",
'label': u'Stock Frozen Upto' "fieldname": "account_info",
}, "fieldtype": "HTML",
"options": "<div class=\"help-box\">For more accounting defaults, Open <a href=\"#!List/Company\">Company</a></div>"
# DocField },
{ {
'colour': u'White:FFF', "doctype": "DocField",
'description': u'Users with this role are allowed to do / modify stock entry before frozen date', "label": "Selling",
u'doctype': u'DocField', "fieldname": "selling",
'fieldname': u'stock_auth_role', "fieldtype": "Section Break"
'fieldtype': u'Link', },
'label': u'Authorized Role (Frozen Entry)', {
'options': u'Role' "default": "Customer Name",
}, "doctype": "DocField",
"label": "Customer Master created by ",
# DocField "fieldname": "cust_master_name",
{ "fieldtype": "Select",
u'doctype': u'DocField', "options": "Customer Name\nNaming Series"
'fieldname': u'accounts', },
'fieldtype': u'Section Break', {
'label': u'Accounts' "doctype": "DocField",
}, "label": "Default Customer Group",
"fieldname": "default_customer_group",
# DocField "fieldtype": "Link",
{ "options": "Customer Group"
'colour': u'White:FFF', },
'description': u'Accounting entry frozen up to this date, nobody can do / modify entry except authorized person', {
u'doctype': u'DocField', "doctype": "DocField",
'fieldname': u'acc_frozen_upto', "label": "CGHelp",
'fieldtype': u'Date', "fieldname": "cghelp",
'label': u'Accounts Frozen Upto' "fieldtype": "HTML",
}, "options": "<a href=\"#!Sales Browser/Customer Group\">To manage Customer Groups, click here</a>"
},
# DocField {
{ "doctype": "DocField",
'colour': u'White:FFF', "label": "Default Territory",
'description': u'Users with this role are allowed to do / modify accounting entry before frozen date', "fieldname": "default_territory",
u'doctype': u'DocField', "fieldtype": "Link",
'fieldname': u'bde_auth_role', "options": "Territory"
'fieldtype': u'Link', },
'label': u'Authourized Role (Frozen Entry)', {
'options': u'Role' "doctype": "DocField",
}, "label": "TerritoryHelp",
"fieldname": "territoryhelp",
# DocField "fieldtype": "HTML",
{ "options": "<a href=\"#!Sales Browser/Territory\">To manage Territory, click here</a>"
u'doctype': u'DocField', },
'fieldname': u'credit_controller', {
'fieldtype': u'Link', "doctype": "DocField",
'label': u'Credit Controller', "width": "50%",
'options': u'Role' "fieldname": "column_break5",
}, "fieldtype": "Column Break"
},
# DocField {
{ "doctype": "DocField",
u'doctype': u'DocField', "label": "Default Price List",
'fieldname': u'column_break4', "fieldname": "default_price_list",
'fieldtype': u'Column Break' "fieldtype": "Link",
}, "options": "Price List"
},
# DocField {
{ "doctype": "DocField",
u'doctype': u'DocField', "label": "Default Price List Currency",
'fieldname': u'account_info', "fieldname": "default_price_list_currency",
'fieldtype': u'HTML', "fieldtype": "Link",
'label': u'Account Info', "options": "Currency"
'options': u'<div class="help-box">For more accounting defaults, Open <a href="#!List/Company">Company</a></div>' },
}, {
"default": "No",
# DocField "doctype": "DocField",
{ "label": "Sales Order Required",
u'doctype': u'DocField', "fieldname": "so_required",
'fieldname': u'selling', "fieldtype": "Select",
'fieldtype': u'Section Break', "options": "No\nYes"
'label': u'Selling' },
}, {
"default": "No",
# DocField "doctype": "DocField",
{ "label": "Delivery Note Required",
'colour': u'White:FFF', "fieldname": "dn_required",
'default': u'Customer Name', "fieldtype": "Select",
u'doctype': u'DocField', "options": "No\nYes"
'fieldname': u'cust_master_name', },
'fieldtype': u'Select', {
'label': u'Customer Master created by ', "doctype": "DocField",
'options': u'Customer Name\nNaming Series' "label": "Buying",
}, "fieldname": "buying",
"fieldtype": "Section Break"
# DocField },
{ {
u'doctype': u'DocField', "doctype": "DocField",
'fieldname': u'default_customer_group', "label": "Default Supplier Type",
'fieldtype': u'Link', "fieldname": "default_supplier_type",
'label': u'Default Customer Group', "fieldtype": "Link",
'options': u'Customer Group' "options": "Supplier Type"
}, },
{
# DocField "default": "Supplier Name",
{ "doctype": "DocField",
u'doctype': u'DocField', "label": "Supplier Master created by ",
'fieldname': u'cghelp', "fieldname": "supp_master_name",
'fieldtype': u'HTML', "fieldtype": "Select",
'label': u'CGHelp', "options": "Supplier Name\nNaming Series"
'options': u'<a href="#!Sales Browser/Customer Group">To manage Customer Groups, click here</a>' },
}, {
"doctype": "DocField",
# DocField "width": "50%",
{ "fieldname": "column_break6",
u'doctype': u'DocField', "fieldtype": "Column Break"
'fieldname': u'default_territory', },
'fieldtype': u'Link', {
'label': u'Default Territory', "default": "No",
'options': u'Territory' "doctype": "DocField",
}, "label": "Purchase Order Required",
"fieldname": "po_required",
# DocField "fieldtype": "Select",
{ "options": "No\nYes"
u'doctype': u'DocField', },
'fieldname': u'territoryhelp', {
'fieldtype': u'HTML', "default": "No",
'label': u'TerritoryHelp', "doctype": "DocField",
'options': u'<a href="#!Sales Browser/Territory">To manage Territory, click here</a>' "label": "Purchase Receipt Required",
}, "fieldname": "pr_required",
"fieldtype": "Select",
# DocField "options": "No\nYes"
{ },
u'doctype': u'DocField', {
'fieldname': u'column_break5', "doctype": "DocField",
'fieldtype': u'Column Break', "label": "Maintain same rate throughout purchase cycle",
'width': u'50%' "fieldname": "maintain_same_rate",
}, "fieldtype": "Check"
},
# DocField {
{ "doctype": "DocField",
u'doctype': u'DocField', "label": "HR",
'fieldname': u'default_price_list', "fieldname": "hr",
'fieldtype': u'Link', "fieldtype": "Section Break",
'label': u'Default Price List', "options": "<div style=\"padding-top: 8px;\" class=\"columnHeading\">HR</div>"
'options': u'Price List' },
}, {
"description": "Employee record is created using selected field. ",
# DocField "doctype": "DocField",
{ "label": "Employee Records to be created by ",
u'doctype': u'DocField', "fieldname": "emp_created_by",
'fieldname': u'default_price_list_currency', "fieldtype": "Select",
'fieldtype': u'Link', "options": "\nNaming Series\nEmployee Number"
'label': u'Default Price List Currency', },
'options': u'Currency' {
}, "doctype": "DocField",
"label": "System",
# DocField "fieldname": "system",
{ "fieldtype": "Section Break"
'colour': u'White:FFF', },
'default': u'No', {
u'doctype': u'DocField', "doctype": "DocField",
'fieldname': u'so_required', "label": "SMS Sender Name",
'fieldtype': u'Select', "fieldname": "sms_sender_name",
'label': u'Sales Order Required', "fieldtype": "Data"
'options': u'No\nYes' },
}, {
"amend": 0,
# DocField "create": 1,
{ "doctype": "DocPerm",
'colour': u'White:FFF', "submit": 0,
'default': u'No', "write": 1,
u'doctype': u'DocField', "role": "System Manager",
'fieldname': u'dn_required', "cancel": 0,
'fieldtype': u'Select', "permlevel": 0
'label': u'Delivery Note Required', },
'options': u'No\nYes' {
}, "create": 1,
"doctype": "DocPerm",
# DocField "write": 1,
{ "role": "System Manager",
u'doctype': u'DocField', "permlevel": 0
'fieldname': u'buying', },
'fieldtype': u'Section Break', {
'label': u'Buying' "doctype": "DocPerm",
}, "write": 1,
"role": "System Manager",
# DocField "permlevel": 1
{ },
u'doctype': u'DocField', {
'fieldname': u'default_supplier_type', "doctype": "DocPerm",
'fieldtype': u'Link', "role": "All",
'label': u'Default Supplier Type', "permlevel": 1
'options': u'Supplier Type' },
}, {
"doctype": "DocPerm",
# DocField "write": 1,
{ "role": "System Manager",
'colour': u'White:FFF', "permlevel": 2
'default': u'Supplier Name', }
u'doctype': u'DocField',
'fieldname': u'supp_master_name',
'fieldtype': u'Select',
'label': u'Supplier Master created by ',
'options': u'Supplier Name\nNaming Series'
},
# DocField
{
u'doctype': u'DocField',
'fieldname': u'column_break6',
'fieldtype': u'Column Break',
'width': u'50%'
},
# DocField
{
'colour': u'White:FFF',
'default': u'No',
u'doctype': u'DocField',
'fieldname': u'po_required',
'fieldtype': u'Select',
'label': u'Purchase Order Required',
'options': u'No\nYes'
},
# DocField
{
'colour': u'White:FFF',
'default': u'No',
u'doctype': u'DocField',
'fieldname': u'pr_required',
'fieldtype': u'Select',
'label': u'Purchase Receipt Required',
'options': u'No\nYes'
},
# DocField
{
u'doctype': u'DocField',
'fieldname': u'maintain_same_rate',
'fieldtype': u'Check',
'label': u'Maintain same rate throughout purchase cycle'
},
# DocField
{
u'doctype': u'DocField',
'fieldname': u'hr',
'fieldtype': u'Section Break',
'label': u'HR',
'options': u'<div style="padding-top: 8px;" class="columnHeading">HR</div>'
},
# DocField
{
'colour': u'White:FFF',
'description': u'Employee record is created using selected field. ',
u'doctype': u'DocField',
'fieldname': u'emp_created_by',
'fieldtype': u'Select',
'label': u'Employee Records to be created by ',
'options': u'\nNaming Series\nEmployee Number'
},
# DocField
{
u'doctype': u'DocField',
'fieldname': u'system',
'fieldtype': u'Section Break',
'label': u'System'
},
# DocField
{
u'doctype': u'DocField',
'fieldname': u'sms_sender_name',
'fieldtype': u'Data',
'label': u'SMS Sender Name'
},
# DocPerm
{
'amend': 0,
'cancel': 0,
'create': 1,
u'doctype': u'DocPerm',
'permlevel': 0,
'role': u'System Manager',
'submit': 0,
'write': 1
},
# DocPerm
{
'create': 1,
u'doctype': u'DocPerm',
'permlevel': 0,
'role': u'System Manager',
'write': 1
},
# DocPerm
{
u'doctype': u'DocPerm',
'permlevel': 1,
'role': u'All'
},
# DocPerm
{
u'doctype': u'DocPerm',
'permlevel': 1,
'role': u'System Manager',
'write': 1
},
# DocPerm
{
u'doctype': u'DocPerm',
'permlevel': 2,
'role': u'System Manager',
'write': 1
}
] ]