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

Rebase following Subscription corrections

Browse Source
This commit is contained in:
Charles-Henri Decultot 2018-07-13 13:25:53 +00:00
parent 7722b81c8e
commit c047bf88db
2 changed files with 893 additions and 924 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
erpnext/accounts/doctype/subscription/subscription.json
View File

@ -111,39 +111,6 @@
"translatable": 0, "translatable": 0,
"unique": 0 "unique": 0
}, },
{
"allow_bulk_edit": 0,
"allow_in_quick_entry": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"default": "1",
"fieldname": "quantity",
"fieldtype": "Int",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Quantity",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"translatable": 0,
"unique": 0
},
{ {
"allow_bulk_edit": 0, "allow_bulk_edit": 0,
"allow_in_quick_entry": 0, "allow_in_quick_entry": 0,
@ -847,7 +814,7 @@
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"modified": "2018-07-11 19:34:44.582203", "modified": "2018-07-13 15:18:49.016010",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Subscription", "name": "Subscription",
@ -922,4 +889,4 @@
"title_field": "", "title_field": "",
"track_changes": 1, "track_changes": 1,
"track_seen": 0 "track_seen": 0
} }

2
erpnext/accounts/doctype/subscription/subscription.py
View File

@ -305,6 +305,8 @@ class Subscription(Document):
else: else:
items.append({'item_code': item_code, 'qty': plan.qty, 'rate': (get_plan_rate(plan.plan, plan.qty, customer) * prorate_factor)}) items.append({'item_code': item_code, 'qty': plan.qty, 'rate': (get_plan_rate(plan.plan, plan.qty, customer) * prorate_factor)})
frappe.log_error(items)
return items return items
def process(self): def process(self):