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

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

@ -1,4 +1,5 @@
{ {
"allow_import": 1,
"autoname": "naming_series:", "autoname": "naming_series:",
"creation": "2013-03-07 11:55:06", "creation": "2013-03-07 11:55:06",
"docstatus": 0, "docstatus": 0,
@ -138,7 +139,7 @@
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"max_attachments": 3, "max_attachments": 3,
"modified": "2014-05-27 03:49:08.272135", "modified": "2014-09-05 12:58:43.333698",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "C-Form", "name": "C-Form",

7
erpnext/controllers/recurring_document.py
View File

@ -2,14 +2,9 @@ from __future__ import unicode_literals
import frappe import frappe
import frappe.utils import frappe.utils
import frappe.defaults import frappe.defaults
from frappe.utils import cint, cstr, getdate, nowdate, get_first_day, get_last_day
from frappe.utils import add_days, cint, cstr, date_diff, flt, getdate, nowdate, \
get_first_day, get_last_day, comma_and
from frappe.model.naming import make_autoname from frappe.model.naming import make_autoname
from frappe import _, msgprint, throw 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} month_map = {'Monthly': 1, 'Quarterly': 3, 'Half-yearly': 6, 'Yearly': 12}