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

Merge pull request #2150 from nabinhait/hotfix

Browse Source 
minor fixes
This commit is contained in:
Nabin Hait 2014-09-05 14:57:02 +05:30
commit cbd433603d
2 changed files with 146 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

279
erpnext/accounts/doctype/c_form/c_form.json
View File

@ -1,181 +1,182 @@
{
"autoname": "naming_series:",
"creation": "2013-03-07 11:55:06",
"docstatus": 0,
"doctype": "DocType",
"allow_import": 1,
"autoname": "naming_series:",
"creation": "2013-03-07 11:55:06",
"docstatus": 0,
"doctype": "DocType",
"fields": [
{
"fieldname": "column_break0",
"fieldtype": "Column Break",
"permlevel": 0,
"print_width": "50%",
"read_only": 0,
"fieldname": "column_break0",
"fieldtype": "Column Break",
"permlevel": 0,
"print_width": "50%",
"read_only": 0,
"width": "50%"
},
},
{
"fieldname": "naming_series",
"fieldtype": "Select",
"label": "Series",
"options": "C-FORM-",
"permlevel": 0,
"read_only": 0,
"fieldname": "naming_series",
"fieldtype": "Select",
"label": "Series",
"options": "C-FORM-",
"permlevel": 0,
"read_only": 0,
"reqd": 1
},
},
{
"fieldname": "c_form_no",
"fieldtype": "Data",
"in_list_view": 1,
"label": "C-Form No",
"permlevel": 0,
"read_only": 0,
"fieldname": "c_form_no",
"fieldtype": "Data",
"in_list_view": 1,
"label": "C-Form No",
"permlevel": 0,
"read_only": 0,
"reqd": 1
},
},
{
"fieldname": "received_date",
"fieldtype": "Date",
"in_list_view": 1,
"label": "Received Date",
"permlevel": 0,
"read_only": 0,
"fieldname": "received_date",
"fieldtype": "Date",
"in_list_view": 1,
"label": "Received Date",
"permlevel": 0,
"read_only": 0,
"reqd": 1
},
},
{
"fieldname": "customer",
"fieldtype": "Link",
"in_list_view": 1,
"label": "Customer",
"options": "Customer",
"permlevel": 0,
"read_only": 0,
"fieldname": "customer",
"fieldtype": "Link",
"in_list_view": 1,
"label": "Customer",
"options": "Customer",
"permlevel": 0,
"read_only": 0,
"reqd": 1
},
},
{
"fieldname": "column_break1",
"fieldtype": "Column Break",
"permlevel": 0,
"print_width": "50%",
"read_only": 0,
"fieldname": "column_break1",
"fieldtype": "Column Break",
"permlevel": 0,
"print_width": "50%",
"read_only": 0,
"width": "50%"
},
},
{
"fieldname": "company",
"fieldtype": "Link",
"label": "Company",
"options": "Company",
"permlevel": 0,
"fieldname": "company",
"fieldtype": "Link",
"label": "Company",
"options": "Company",
"permlevel": 0,
"read_only": 0
},
},
{
"fieldname": "fiscal_year",
"fieldtype": "Link",
"label": "Fiscal Year",
"options": "Fiscal Year",
"permlevel": 0,
"read_only": 0,
"fieldname": "fiscal_year",
"fieldtype": "Link",
"label": "Fiscal Year",
"options": "Fiscal Year",
"permlevel": 0,
"read_only": 0,
"reqd": 1
},
},
{
"fieldname": "quarter",
"fieldtype": "Select",
"label": "Quarter",
"options": "\nI\nII\nIII\nIV",
"permlevel": 0,
"fieldname": "quarter",
"fieldtype": "Select",
"label": "Quarter",
"options": "\nI\nII\nIII\nIV",
"permlevel": 0,
"read_only": 0
},
},
{
"fieldname": "total_amount",
"fieldtype": "Currency",
"label": "Total Amount",
"options": "Company:company:default_currency",
"permlevel": 0,
"read_only": 0,
"fieldname": "total_amount",
"fieldtype": "Currency",
"label": "Total Amount",
"options": "Company:company:default_currency",
"permlevel": 0,
"read_only": 0,
"reqd": 1
},
},
{
"fieldname": "state",
"fieldtype": "Data",
"label": "State",
"permlevel": 0,
"read_only": 0,
"fieldname": "state",
"fieldtype": "Data",
"label": "State",
"permlevel": 0,
"read_only": 0,
"reqd": 1
},
},
{
"fieldname": "section_break0",
"fieldtype": "Section Break",
"permlevel": 0,
"fieldname": "section_break0",
"fieldtype": "Section Break",
"permlevel": 0,
"read_only": 0
},
},
{
"fieldname": "invoice_details",
"fieldtype": "Table",
"label": "Invoice Details",
"options": "C-Form Invoice Detail",
"permlevel": 0,
"fieldname": "invoice_details",
"fieldtype": "Table",
"label": "Invoice Details",
"options": "C-Form Invoice Detail",
"permlevel": 0,
"read_only": 0
},
},
{
"fieldname": "total_invoiced_amount",
"fieldtype": "Currency",
"label": "Total Invoiced Amount",
"options": "Company:company:default_currency",
"permlevel": 0,
"print_hide": 0,
"fieldname": "total_invoiced_amount",
"fieldtype": "Currency",
"label": "Total Invoiced Amount",
"options": "Company:company:default_currency",
"permlevel": 0,
"print_hide": 0,
"read_only": 1
},
},
{
"fieldname": "amended_from",
"fieldtype": "Link",
"ignore_user_permissions": 1,
"label": "Amended From",
"no_copy": 1,
"options": "C-Form",
"permlevel": 0,
"print_hide": 1,
"fieldname": "amended_from",
"fieldtype": "Link",
"ignore_user_permissions": 1,
"label": "Amended From",
"no_copy": 1,
"options": "C-Form",
"permlevel": 0,
"print_hide": 1,
"read_only": 1
}
],
"icon": "icon-file-text",
"idx": 1,
"is_submittable": 1,
"max_attachments": 3,
"modified": "2014-05-27 03:49:08.272135",
"modified_by": "Administrator",
"module": "Accounts",
"name": "C-Form",
"owner": "Administrator",
],
"icon": "icon-file-text",
"idx": 1,
"is_submittable": 1,
"max_attachments": 3,
"modified": "2014-09-05 12:58:43.333698",
"modified_by": "Administrator",
"module": "Accounts",
"name": "C-Form",
"owner": "Administrator",
"permissions": [
{
"apply_user_permissions": 1,
"create": 1,
"email": 1,
"permlevel": 0,
"print": 1,
"read": 1,
"report": 1,
"role": "Accounts User",
"submit": 0,
"apply_user_permissions": 1,
"create": 1,
"email": 1,
"permlevel": 0,
"print": 1,
"read": 1,
"report": 1,
"role": "Accounts User",
"submit": 0,
"write": 1
},
},
{
"create": 1,
"email": 1,
"permlevel": 0,
"print": 1,
"read": 1,
"report": 1,
"role": "Accounts Manager",
"submit": 0,
"create": 1,
"email": 1,
"permlevel": 0,
"print": 1,
"read": 1,
"report": 1,
"role": "Accounts Manager",
"submit": 0,
"write": 1
},
},
{
"amend": 0,
"cancel": 0,
"create": 0,
"permlevel": 1,
"read": 1,
"report": 1,
"role": "All",
"amend": 0,
"cancel": 0,
"create": 0,
"permlevel": 1,
"read": 1,
"report": 1,
"role": "All",
"submit": 0
}
]
}
}

17
erpnext/controllers/recurring_document.py
View File

@ -2,14 +2,9 @@ from __future__ import unicode_literals
import frappe
import frappe.utils
import frappe.defaults
from frappe.utils import add_days, cint, cstr, date_diff, flt, getdate, nowdate, \
get_first_day, get_last_day, comma_and
from frappe.utils import cint, cstr, getdate, nowdate, get_first_day, get_last_day
from frappe.model.naming import make_autoname
from frappe import _, msgprint, throw
from erpnext.accounts.party import get_party_account, get_due_date, get_party_details
from frappe.model.mapper import get_mapped_doc
month_map = {'Monthly': 1, 'Quarterly': 3, 'Half-yearly': 6, 'Yearly': 12}
@ -51,7 +46,7 @@ def manage_recurring_documents(doctype, next_date=None, commit=True):
frappe.db.begin()
frappe.db.sql("update `tab%s` \
set is_recurring = 0 where name = %s" % (doctype, '%s'),
set is_recurring = 0 where name = %s" % (doctype, '%s'),
(ref_document))
notify_errors(ref_document, doctype, ref_wrapper.customer, ref_wrapper.owner)
frappe.db.commit()
@ -93,12 +88,12 @@ def make_new_document(ref_wrapper, date_field, posting_date):
if ref_wrapper.doctype == "Sales Order":
new_document.update({
"delivery_date": get_next_date(ref_wrapper.delivery_date, mcount,
"delivery_date": get_next_date(ref_wrapper.delivery_date, mcount,
cint(ref_wrapper.repeat_on_day_of_month))
})
new_document.submit()
return new_document
def get_next_date(dt, mcount, day=None):
@ -187,11 +182,11 @@ def validate_notification_email_id(doc):
def set_next_date(doc, posting_date):
""" Set next date on which recurring document will be created"""
if not doc.repeat_on_day_of_month:
msgprint(_("Please enter 'Repeat on Day of Month' field value"), raise_exception=1)
next_date = get_next_date(posting_date, month_map[doc.recurring_type],
next_date = get_next_date(posting_date, month_map[doc.recurring_type],
cint(doc.repeat_on_day_of_month))
frappe.db.set(doc, 'next_date', next_date)