14141 Commits

Author	SHA1	Message	Date
Zarrar	969c8aaf52	[Enhance] Fetch Customer's Item code based on Customer Name or Customer Group (#13198) ... * customer code can be assigned based on customer group * improvise customer group selection * requested changes made	2018-03-21 11:17:49 +05:30
Manas Solanki	c711445b91	add the student as party type (#13348)	2018-03-21 10:12:27 +05:30
rohitwaghchaure	2b88ac948e	[Fix] Special character issue (#13350)	2018-03-21 10:04:47 +05:30
pawan	53a4d2c430	[fix] #13352	2018-03-21 09:19:36 +05:30
Faris Ansari	ce08aabc84	Add Kanban Board button in project (#13345)	2018-03-20 19:03:32 +05:30
Zlash65	0859018c48	unindented code	2018-03-20 16:29:27 +05:30
Siddhi Sawant	c672530210	[hotfix] Added 'Paid Amount' and 'Change Amount' in POS print formats (#13316) ... * Added 'Paid Amount' and 'Change Amount' in GST POS Invoice and POS Invoice print formats * Update gst_pos_invoice.json Updated its 'disabled' property. * Update pos_invoice.json Updated its 'disabled' property. * Shows change amount only if it exists * Updated disable property of print formats	2018-03-20 14:31:14 +05:30
Britlog	e3a9b9fe49	[Website] Price in items list and sales uom management (#13335) ... * Price in items list and sales uom management * Price in product search page * Display website stock in sales uom * Add set_product_info_for_website to avoid duplicate code * Add price uom in item list and page * Update product.py	2018-03-20 14:28:44 +05:30
Zarrar	9a01baac1d	explicitely provide order_by (#13338)	2018-03-20 14:08:44 +05:30
Achilles Rasquinha	0575b3e1c3	fixed inconsistent tab error (#13339)	2018-03-20 14:07:25 +05:30
Charles-Henri Decultot	d0ac69704f	Chained log report doc (#13314)	2018-03-20 13:12:28 +05:30
Zarrar	c5b061834b	doctype dropdown rectify, validate series is set (#13305)	2018-03-20 13:06:18 +05:30
Zarrar	13ddc7e188	[ Enhance ] Production to Work Order (#12902) ... * remove occurrences of Production Order * rename from report and jsons * Change Production Order to Work Order * change occurences of production order from other files * resolve minor conflict issues and reports * patch added * codacy fix * updated patches, leftover changes * rename reports, rectify patches	2018-03-20 12:38:43 +05:30
Doridel Cahanap	c893268dea	Add Health Insurance Doctype and link to Employee (#13257)	2018-03-20 12:37:02 +05:30
Deepak kumar	656ff36c76	[Feature] Advance Account Balance in Employee Advance (#13263) ... * added due advance amount field to show due amount * fixes codacy * made whitelisted method * Update employee_advance.js	2018-03-20 12:35:02 +05:30
Nabin Hait	d97c5a04b2	minor fix in item naming	2018-03-20 12:31:05 +05:30
Tom Price	cd525299ee	[Feature] Add default duration and color to appointment type (#13296) ... * Add default duration and color to appointment type When creating a Patient Appointment, the Duration field will be populated when the Appointment Type is set. This is preserved when checking availability and booking an appointment. `Appointment Type.color` is used in the calendar display. * Remove accidental fixed date from git * Update modified timestamp to ensure migrations. Set to the timestamp of dd506a0961437540872c01d3487b8e37806c0bb0	2018-03-20 12:08:44 +05:30
Mark Walker	f572522f25	Copy source project into Purchase Order Item (#13321)	2018-03-20 12:06:04 +05:30
renzodemie	417dfed214	Daily Reminder (#12938) ... * for email sending * test commit for new branch * Removed test changes * test commit renzo * Email sending * Project Uo * Project Update * "My first commit" * "My second commit" * "My second commit" * Holiday is included * delete idea * first pull * first pull * "My third commit" * Delete idea * delete again * "Edit Time" * "Edit Time" * Naming series and bug fixing * "Edit current day and time" * "Proper naming series, hidden time and date" * Project and Project Update dashboard * dashboard * Remove hooks for PR * Remove hooks for PR * Remove hooks for PR * Deleted project_time.py * Corrected indention * Hook back to original * Delete project_time.py * "Modified time" * Fix indention * Sample * FRM * FRM * Time fix * Hooks original state * "Modified time" * Added permission to Project User * Added function/method to be called in order to create project update for the specific project * Naming series * this is not included * Fix minor bug * Indent again * "Reformat Code" * "Check Indent" * Indent again and again * semi colon * "Check Again Indent" * "Check again Indent" * "Check again Indent" * ind * "Check again Indent" * "Check again Indent" * Generate Project update With button in email * [] * "Erro Summary" * "Add syntax for the communcation" * "add summary code" * "Modified Summary code" * "Modified Summary code" * "Fix update ID and set localhost" * Fix time and date error in project_update Fix naming series problem in project_update * included "not updated" in project update * Bug in Number of Drafts * "add notes in summary" * Correct code * With error * Removed the method * Minor fixes * Correction for daily summary	2018-03-20 11:58:15 +05:30
Nabin Hait	8a8966ce9b	minor fix	2018-03-20 11:19:57 +05:30
Achilles Rasquinha	ecc4fdd3ef	Check Set Sales Target Item exists in User Slides	2018-03-19 22:21:45 +05:30
Achilles Rasquinha	d0786b45c3	fix issue	2018-03-19 22:17:37 +05:30
Achilles Rasquinha	60da37b502	Merge pull request #13329 from shreyashah115/travis-fix ... [Fix] Travis	2018-03-19 19:10:21 +05:30
Saurabh	2777fd4332	[fix] validate minimum transaction amount in Payment Request for selected payment gateway (#13328)	2018-03-19 18:29:01 +05:30
Shreya	9602bf4ba3	patch fix	2018-03-19 18:17:54 +05:30
Shreya	5042dd32da	undefined args error	2018-03-19 17:45:39 +05:30
Shreya	4d347b1ca0	travis fix	2018-03-19 17:31:19 +05:30
Achilles Rasquinha	034834d671	Merge pull request #13326 from shreyashah115/fix-travis ... [Fix] Travis	2018-03-19 17:00:34 +05:30
Shreya	f7b39438d2	travis fix	2018-03-19 14:19:55 +05:30
Achilles Rasquinha	3099ea67a1	Merge pull request #13303 from achillesrasquinha/py3 ... unordered types None vs int	2018-03-19 11:54:24 +05:30
Achilles Rasquinha	3d85951c1f	Merge pull request #13304 from achillesrasquinha/hotfix-hub ... [HOTFIX] Hub Domain Change	2018-03-19 11:54:13 +05:30
Achilles Rasquinha	1e95323679	Fixed dict_keys concatenation	2018-03-18 10:08:43 +05:30
Manas Solanki	7b91042ae6	Merge pull request #13310 from manassolanki/student-report-card ... addition of student report card generation tool	2018-03-16 02:00:07 +05:30
Manas Solanki	633a39144d	addition of student report card generation tool	2018-03-16 01:57:45 +05:30
Achilles Rasquinha	94b41ea4f6	removed debugging	2018-03-15 12:53:22 +05:30
Achilles Rasquinha	d8f7de9946	fixed patch for hub	2018-03-15 12:48:32 +05:30
Nabin Hait	c8cd4ba6f7	Merge branch 'master' into develop	2018-03-15 12:38:43 +05:30
Nabin Hait	60200eaf0d	bumped to version 10.1.13	2018-03-15 13:08:41 +06:00
Nabin Hait	1e4cfb4bf5	Fixes in setting po nos manually in sales invoice	2018-03-15 12:27:24 +05:30
Nabin Hait	70abac0061	Get territory from sales invoice	2018-03-15 12:19:16 +05:30
Achilles Rasquinha	a4a62d5ea1	unordered types None vs int	2018-03-15 12:18:37 +05:30
Nabin Hait	bb5caf8fad	Merge branch 'master' into develop	2018-03-14 13:33:38 +05:30
Nabin Hait	6c09297bcd	bumped to version 10.1.12	2018-03-14 14:03:36 +06:00
Nabin Hait	363cedde76	Fixed minor issue	2018-03-14 13:32:14 +05:30
Nabin Hait	d21ad807b5	Merge branch 'master' into develop	2018-03-13 18:13:44 +05:30
Nabin Hait	c8c733bc54	bumped to version 10.1.11	2018-03-13 18:43:42 +06:00
Shreya Shah	7acc8cb747	fix else condition (#13295)	2018-03-13 18:12:19 +05:30
Nabin Hait	e01dcc170c	Merge branch 'master' into develop	2018-03-13 17:11:52 +05:30
Nabin Hait	56882033bf	bumped to version 10.1.10	2018-03-13 17:41:49 +06:00
Nabin Hait	74c817e7f9	Update update_reserved_qty_for_purchase_order.py	2018-03-13 17:10:14 +05:30
Nabin Hait	3707242770	Fixed merge conflict	2018-03-13 16:15:41 +05:30
Nabin Hait	baac05955b	bumped to version 10.1.9	2018-03-13 16:44:02 +06:00
Nabin Hait	89346967da	Reverted #13259 (#13291)	2018-03-13 16:01:11 +05:30
Nabin Hait	97e890d0b3	Fix in unallocated amount calc in payment entry (#13288)	2018-03-13 15:57:34 +05:30
Ameya Shenoy	95763bc233	Purchase Order fixes (#13287) ... - Reason: If Item Code was changed in Item Master, it didn't used to reflect on the 'Purchase Order Item Supplied' and 'Purchase Reciept Item Supplied' - Data field in 'Production Order Item Supplied' and 'Production Reciept Item Supplied' converted to Link Field.	2018-03-13 15:51:56 +05:30
Nabin Hait	96f4b22589	Set po nos in DN and SI (#13290)	2018-03-13 15:46:59 +05:30
Ranjith Kurungadam	369ba85499	Physician Schedule fixes (#13284) ... * move button add schedule to grid * Physician Schedule- add slots for multiple days * fix patient image view	2018-03-13 14:50:24 +05:30
Achilles Rasquinha	cbfcb3e61d	string_types from basestirng	2018-03-12 19:15:29 +05:30
Zarrar	0702f29860	Add Ends-On field in the Lead doctype (#13147) ... * add ends_on date in lead to be mapped with calendar event * set default ends_on to 1 hour from contact_time	2018-03-12 18:49:54 +05:30
tundebabzy	0125f7b130	rename to Subscription and transfer present Subscription records to Auto Repeat in frappe	2018-03-12 13:51:47 +01:00
rohitwaghchaure	13460f023d	[Fix] Batch value showing as item value while making batch (#13281)	2018-03-12 17:20:50 +05:30
Nabin Hait	2f493731ec	Fixed merge conflict	2018-03-12 15:49:59 +05:30
Nabin Hait	04f50be306	bumped to version 10.1.8	2018-03-12 16:01:03 +06:00
Ameya Shenoy	b34ab7549a	fixed subject to task_name (#13278)	2018-03-12 15:24:01 +05:30
Shreya Shah	aa54d934b8	make stock qty negative (#13276)	2018-03-12 15:23:28 +05:30
Zarrar	c35665fa60	update physician patch fail (#13277)	2018-03-12 15:21:53 +05:30
Nabin Hait	2c7a6e6b43	Reserve for subcontracting (#13195) ... * [fix] #8427 * review comments changes * Validation for reserved warhouse * code improvements * alignment * test case * message changes * default warehouse / remove validation / change sql * fix * patch * Fixed merge conflict * Fixes and cleanups of reserve qty for subcontracting * set from_warehouse only if purchase_order and purpose found (#12398) * [HotFix] Validation issue for subcontract stock entry (#12127) * [Fix] Validation issue for subcontract stock entry * Update stock_entry.py * Fixes and cleanups of reserve qty for subcontracting * patch fixed * Reload bin in patch * [fix] set source warehouse in stock entry for manufacture * [fix] #8540 * code alignment * code alignment * Move target warehouse validation to submit * validation code improvement * code changes for single stock entry * validation fix * call make_rm_stock_entry * remove old stock entry method/rewrite test case * Don't set bom_no against raw materials while trasferring items for sub-contracting * minor fix	2018-03-12 14:12:12 +05:30
Shreya Shah	58797481f0	uncheck report hide (#13256)	2018-03-12 13:08:01 +05:30
Kenneth Sequeira	b48557fdc6	payment terms video tutorial in videos/learn (#13258) ... * payment terms video tutorial in videos/learn * Update payment-terms.md	2018-03-12 13:07:21 +05:30
Shreya Shah	ef4c3b8e2f	add has variants in standard filter (#13251)	2018-03-12 11:20:49 +05:30
rohitwaghchaure	12aa4265ff	Don't allow to set negative quantity if transaction is not return entry (#13255)	2018-03-12 11:20:30 +05:30
Shreya Shah	69d9f51dbb	if price list not found, set default selling/ buying price list from settings (#13259)	2018-03-12 11:15:49 +05:30
Prateeksha Singh	9362cf37e0	[charts] update charts API	2018-03-12 09:54:56 +05:30
tundebabzy	2970630ed2	Merge branch 'develop' into new-subscription	2018-03-12 02:00:34 +01:00
Nabin Hait	fd75d554d2	Payment Terms Template added in test_ignore for Company	2018-03-09 18:52:14 +05:30
Nabin Hait	5e63c265db	Fixed merge conflict	2018-03-09 17:34:39 +05:30
Nabin Hait	096d136460	bumped to version 10.1.7	2018-03-09 17:08:50 +06:00
Nabin Hait	c3889d85a1	Update shopping_cart.js	2018-03-09 16:28:25 +05:30
Achilles Rasquinha	138a4850fe	Merge pull request #13252 from achillesrasquinha/py3 ... sort by name accounts for trial balance.	2018-03-09 15:23:28 +05:30
Achilles Rasquinha	dc61c6b975	sort by name accounts	2018-03-09 15:23:08 +05:30
Achilles Rasquinha	1d7665fca1	sort by name accounts	2018-03-09 15:22:20 +05:30
Nabin Hait	052333ea63	subctracting stock entry should also be considered as consumed qty	2018-03-09 14:30:32 +05:30
tundebabzy	3d26003c1f	add column breaks to Subscription	2018-03-09 09:37:06 +01:00
tundebabzy	8889b70ba1	Merge branch 'develop' into new-subscription	2018-03-09 09:10:48 +01:00
Nabin Hait	0357fbc9c1	commonfied regional function for checking delete permission	2018-03-09 13:19:52 +05:30
Nabin Hait	096c05ca6f	Fixes for regional feature of Nepal	2018-03-09 13:11:00 +05:30
theopen-institute	38cbd71352	prevent deletion of sales invoices if country is nepal	2018-03-09 12:39:40 +05:30
Achilles Rasquinha	b4de7e3d07	removed has_key, used pythonic in (#13236) ... * removed has_key, used pythonic in * Update bom.py	2018-03-09 12:35:47 +05:30
Suraj Shetty	f2d28ebd6a	Data import Tool bug fix (#13165) ... * fixes #13064 * commonified naming series checks * test fixes replaced test employee names according to naming series	2018-03-09 12:33:13 +05:30
tundebabzy	e69747ca6d	[Feature Request] Add Payment Mode field on Payment Terms Template #13117 (#13243) ... * add mode of payment field to Payment Term * add mode of payment field to Payment Terms Template Detail * add mode of payment field to Payment Schedule * add mode of payment in `get_payment_term_details`	2018-03-09 12:23:53 +05:30
Shreya Shah	aadd30d194	fetch delivery date on add-row only if item_code exists (#13250)	2018-03-09 12:19:35 +05:30
Zarrar	3fd634783d	[Enhance] Fetch Customer's Item code based on Customer Name or Customer Group (#13198) ... * customer code can be assigned based on customer group * improvise customer group selection * requested changes made	2018-03-09 12:10:45 +05:30
Harsh Patel	22e6f8d4c2	Fixes for #13071 (#13234)	2018-03-08 16:23:59 +05:30
rohitwaghchaure	acd3479269	Bank POS transactions in bank reconciliation (#13225)	2018-03-08 16:22:39 +05:30
rohitwaghchaure	a32e57ae82	[Fix] Discount in offline POS is enabled even is it's disabled in POS Profile (#13233)	2018-03-08 16:21:13 +05:30
Ranjith Kurungadam	a3a63177a1	fix- cannot cancel consultation, remove updating age (#13226)	2018-03-08 16:20:22 +05:30
Achilles Rasquinha	b2f7092f9e	Merge pull request #13235 from achillesrasquinha/py3 ... removed has_key	2018-03-08 14:22:36 +05:30
Achilles Rasquinha	87dab14576	removed has_key	2018-03-08 14:21:48 +05:30
Ameya Shenoy	d2eec91b2c	indentation fix	2018-03-08 13:27:11 +05:30
Achilles Rasquinha	9efd6e80d2	fixed tabs	2018-03-08 13:20:48 +05:30
Achilles Rasquinha	987934d8ee	fixed tabs	2018-03-08 13:16:08 +05:30
Achilles Rasquinha	abd365fd90	Merge pull request #13228 from achillesrasquinha/py3 ... [FIX] filter to list	2018-03-08 13:11:58 +05:30
Achilles Rasquinha	908289d40a	[FIX] filter to list	2018-03-08 13:10:51 +05:30
Jamsheer	665b48773f	Healthcare - Patient Appointment - Service unit based scheduling and booking (#13211) ... * New Document - Patient Service Unit * Physician - schedule based on patient service unit * Consultation - Remove validation on submit * Consultation - Label changed from Drug Prescription to Medication * Availability check and book appointment based on service unit, appointment invoice creation optimized * patch fixes * Patient Service Unit - field - overlap_appointments * Patient Appointment - Service Unit based scheduling and booking * Patient Appointment - issue fixed #13016 Healthcare Patient Appointment Save Button Issue - remove validation on save and enable save on book appointment * Codacy fixes on PR #13211 * Codacy fixes on PR #13211 * Fee validity test -fixes * Fee Validity - test - fixes	2018-03-08 13:08:35 +05:30
Achilles Rasquinha	11241044b2	Merge pull request #13227 from achillesrasquinha/py3 ... [FIX] use text_type instead of unicode, use cmp from past.builtins	2018-03-08 12:58:21 +05:30
Achilles Rasquinha	9050998e06	[FIX] use text_type instead of unicode, use cmp from past.builtins	2018-03-08 12:55:41 +05:30
theopen-institute	1bfa243190	fix patch that causes error on bench update (#13222)	2018-03-08 11:20:40 +05:30
lasalesi	470977fa13	corrected setup wizard tax rates for Switzerland 2018 (#13220) (#13221)	2018-03-08 11:19:56 +05:30
tundebabzy	1643cce479	fetch journal entry details (#13218)	2018-03-08 11:17:17 +05:30
Manas Solanki	bb42e3b411	Merge pull request #13214 from manassolanki/assessment-report-fix ... minor fix for key error in assessment reports	2018-03-07 16:30:35 +05:30
Manas Solanki	586e9400b1	minor fix for key error	2018-03-07 16:28:21 +05:30
Shreya Shah	c3bf1fa009	[Fixes] Chapter DocType (#13213) ... * fetch chapter head from member doctype instead of user * add enabled in grid view and set default as 1	2018-03-07 16:27:30 +05:30
rohitwaghchaure	bbd9b71547	Provision to include exploded items while making transfer entry of raw materials for subcontrtacted item (#13043)	2018-03-07 15:39:40 +05:30
Vishal Dhayagude	668ec25d19	Allow Item variant Rename (#13161) ... * [WIP] Item varient rename * [wip] Item Variant * [fix] Item Varient Rename * [fix] Item Attribution Rename * removed unwanted code	2018-03-07 15:31:08 +05:30
Nabin Hait	c50d7446b5	Merge branch 'master' into develop	2018-03-07 13:09:07 +05:30
Nabin Hait	36b4faab48	bumped to version 10.1.6	2018-03-07 13:39:05 +06:00
Saurabh	2b59a851c4	Merge pull request #13166 from saurabh6790/patches_fixes ... [fix] use join instead of subquery	2018-03-07 12:59:03 +05:30
Manas Solanki	857d4f7a0b	Merge pull request #13209 from manassolanki/guardian-fix ... allow renaming of the guardian	2018-03-07 12:53:40 +05:30
Manas Solanki	12d7bfb658	allow renaming of the guardian	2018-03-07 12:52:31 +05:30
Raghavendra Kamath	6193b92b70	Add new logo in splash image and optimise pngs (#13206)	2018-03-07 12:39:38 +05:30
Saurabh	ca6e223694	[fix] use join instead of subquery	2018-03-07 12:13:32 +05:30
rohitwaghchaure	343ba85e3a	Merge pull request #13203 from saurabh6790/pe_fix ... [fix] setup_party_account_field on init	2018-03-07 12:11:46 +05:30
Manas Solanki	1fa992564a	fix the desktop icon for course schedule	2018-03-07 12:08:52 +05:30
Saurabh	a65b28772f	[fix] setup_party_account_field on init	2018-03-06 18:22:01 +05:30
Achilles Rasquinha	78064b7a45	Update patches.txt	2018-03-05 17:53:23 +05:30
Nabin Hait	c43c95e0aa	Fixed merge conflict	2018-03-05 14:54:44 +05:30
Nabin Hait	491ce05b8d	bumped to version 10.1.5	2018-03-05 15:17:18 +06:00
Saurabh	2cfcbf933d	Patches fixes (#13163) ... * [fix] if serialised items not found then return * [fix] unicode encoding in patch	2018-03-05 13:01:15 +05:30
Zarrar	2550180a05	remove updating territory for customers on change (#13162)	2018-03-05 12:32:41 +05:30
Zarrar	950fff0ba1	changes according to the workflow (#13160)	2018-03-05 11:30:53 +05:30
Manas Solanki	5fd7b3bb80	Fix status updater (#13033) ... * fix the status updater for multiple sources * patch for updating the status * patch for updating the sales order item * Update update_status_for_multiple_source_in_po.py	2018-03-05 11:28:29 +05:30
Vishal Dhayagude	35b665cb26	[new] Create multiple warehouse address and fetch address to stock entry (#13109) ... * [new] Create multiple warehouse address and fetch address to stock entry * [fix] Deleted unwanted field and added patch to link warehouse details to Address * [fix] Codacy fixed * [fix] Modified patch for warehouse address * [fix] Modified patch for warehouse address * [fix] Patch updated and removed contact details from stock entry * [fix] Patch Updated	2018-03-05 11:10:01 +05:30
Zarrar	4417cb0006	improve multiple add dialog, populate parent's depends on with child tasks (#13142)	2018-03-05 11:08:15 +05:30
Kenneth Sequeira	89795c3f69	Doc imp (#13148) ... * added intro, item and prices video, fixed image links in item and prices * update 2: first 5 videos added * added all videos to the user manual * updated .gitignore	2018-03-05 11:06:44 +05:30
Zarrar	1e4e004667	leave application assigned by naming_series (#13158)	2018-03-05 11:05:59 +05:30
rohitwaghchaure	a6a4e86dc8	[Fix] System only shows 20 attribute values while making variants (#13155)	2018-03-05 11:03:59 +05:30
rohitwaghchaure	0eb8bb2511	[Fix] Wrong salary slips showing when click on view salary slips from payroll entry (#13152)	2018-03-05 11:03:27 +05:30
rohitwaghchaure	67cfa81de2	[Fix] Stock Ageing report does not work with group warehouse (#13151)	2018-03-05 11:00:42 +05:30
tundebabzy	458a1fe61a	codacy	2018-03-03 18:11:48 +01:00
tundebabzy	ef605d5f00	codacy	2018-03-03 18:03:04 +01:00
tundebabzy	3b1251ef47	codacy tinzz	2018-03-03 17:36:07 +01:00
tundebabzy	2379451b68	codacy tinzz	2018-03-03 17:18:47 +01:00
tundebabzy	fbdd5d30e9	more tests and bug fixes	2018-03-03 11:19:18 +01:00
tundebabzy	024c28acf7	fix proration logic to reduce possibility of rounding errors	2018-03-03 10:32:02 +01:00
tundebabzy	79a01561d5	enhancement: do nothing if cancel_sbscription is called for cancelled subscription	2018-03-03 07:39:44 +01:00
tundebabzy	d43422c18e	enhancement: ensure subscription is cancelled before attempting to restart	2018-03-03 07:37:59 +01:00
tundebabzy	e13570f343	codacy review	2018-03-02 12:27:12 +01:00
tundebabzy	9e863b9572	Merge branch 'develop' into new-subscription	2018-03-02 11:10:27 +01:00
tundebabzy	c15dc21b7d	clean up	2018-03-02 11:00:15 +01:00
tundebabzy	49d34df8f4	more tests	2018-03-02 10:16:57 +01:00
tundebabzy	688fd6b205	prorate invoice when cancelling subscription	2018-03-02 10:16:42 +01:00
tundebabzy	4499e5351c	add article	2018-03-02 06:51:33 +01:00
tundebabzy	16afa8765e	tiny refactor of invoice setting logic	2018-03-01 17:16:41 +01:00
tundebabzy	9df4f0bd43	fix: apply_discount_on field should be of type Select not Data	2018-03-01 17:12:43 +01:00
tundebabzy	8670c85827	make sure default apply_discount_on is set when creating invoice	2018-03-01 17:11:14 +01:00
tundebabzy	ca5cf35a99	fix: task should explicitly call commit and rollback if error	2018-03-01 17:06:39 +01:00
tundebabzy	36c18c913e	docstrings	2018-03-01 16:44:10 +01:00
tundebabzy	0ec445214c	hook to hourly scheduler	2018-03-01 11:54:32 +01:00
tundebabzy	78fb12663a	fix test	2018-03-01 11:27:48 +01:00
tundebabzy	b91ec79494	update tests and more tweaks	2018-03-01 10:47:00 +01:00
tundebabzy	7eabbd93e1	update start date alone after restarting subscription	2018-03-01 09:09:23 +01:00
tundebabzy	2a11c18383	set initial invoice period based on subscription start	2018-03-01 08:47:38 +01:00
tundebabzy	a93fa16bce	freeze screen while waiting for updates on subscription	2018-03-01 08:45:56 +01:00
rohitwaghchaure	a942722619	[Fix] Timeout issue while saving multilevel BOM (#13118)	2018-03-01 13:15:25 +05:30
tundebabzy	328adedbc8	adds start field to record subscrption start date	2018-03-01 08:45:01 +01:00
Nabin Hait	c10bbd6aa7	Editable unallocated amount in pe (#13130) ... * editable unallocated amount in payment entry to handle multi currency * set unallocated amount on server side * some minor fixes * Fixes in territory patch * removed print * minor fixes	2018-03-01 13:14:14 +05:30
Rohit Waghchaure	855d843e55	[Fix] Sales invoice email prompt not working	2018-03-01 13:06:01 +05:30
Harsh Patel	5bebbbe7a9	[Feature] Supplier warehouse link field on purchase order (#13051) ... * Multiple Features: [New] Supplier warehouse link field on purchase order for sub-contracting [New] Auto select supplier warehouse while making purchase receipt from purchase order * Set default to_warehouse in stock entry as the supplier warehouse	2018-03-01 11:33:25 +05:30
rohitwaghchaure	0df95fa781	Multi-UOM for sales/purchase return (#13132) ... * Multi-UOM for sales/purchase return * Update sales_and_purchase_return.py	2018-03-01 11:31:33 +05:30
Charles-Henri Decultot	bc7a549fdb	Gocardless integration (#13008) ... * GoCardless integration * Addition of a method for determining if the email should be sent or not * Correction for Tests * Codacy fix * Documents moved to ERPNext * Codacy fix * Codacy fixes * Remove method where not necessary and replace with hasattr	2018-03-01 10:59:21 +05:30
Zarrar	6578bc11b6	wrong query formed to delete events (#13119)	2018-03-01 10:54:55 +05:30
Nabin Hait	f68dc69078	Set auto created serial nos in incoming transactions in case of multi UOM (#13112) ... * Create user from Employee * Set auto created serial nos in incoming transactions in case of multi uom	2018-03-01 10:54:24 +05:30
tundebabzy	3fecbb98c5	Make Expense Claim from Employee Advance #13053 (#13074) ... * allow to make expense claim from employee advance * make expense claim only if claimed amount < paid_amount * expense claim made from employee advance is paid	2018-03-01 10:50:45 +05:30
Zarrar	502af4dd67	display image fnd description for root BOM also (#13099)	2018-03-01 10:44:47 +05:30
rohitwaghchaure	db9fa78ee8	Do not validate payment schedule for POS (#13115)	2018-03-01 10:32:29 +05:30
Nabin Hait	a645f36b2b	Get valuation rate from historical SLE even if it is zero (#13129) ... * Don't overwrite start and end date comes from payroll entry * Get valuation rate from historical SLE even if it is zero, if records exists * Valid till should be autoset if not any default value * Set status of expense claim based on is_paid check	2018-03-01 10:31:24 +05:30
rohitwaghchaure	332a17ee86	[Fix] Test case for serial no (#13136)	2018-03-01 10:28:04 +05:30
tundebabzy	d9fec69a70	update test case, fix bugs	2018-03-01 05:34:02 +01:00
tundebabzy	8f37926ca8	add ability to cancel, restart and refresh subscription	2018-03-01 04:57:23 +01:00
Achilles Rasquinha	646522886c	self.assertEqual	2018-02-28 21:13:51 +05:30
Shreya Shah	a310cc7156	order by modified instead of item name (#13113)	2018-02-28 18:59:55 +05:30
Ameya Shenoy	c20901443e	updated develop_version to 11 (#13133)	2018-02-28 17:38:23 +05:30
tundebabzy	2cccad0274	more tests and quick fix	2018-02-28 12:45:09 +01:00
tundebabzy	a5bc057ad4	adds missing 'translatability'	2018-02-28 12:24:16 +01:00
tundebabzy	86ee455cbc	more tests and bug fix	2018-02-28 12:21:08 +01:00
tundebabzy	b3d5777e55	more test cases and bug fixes	2018-02-28 12:11:19 +01:00
Achilles Rasquinha	96698c9a77	Use range instead xrange (#13128) ... * Use range instead of xrange * convert float to int	2018-02-28 16:12:51 +05:30
Faris Ansari	72d8509b3d	python 3 fix (#13127)	2018-02-28 12:53:34 +05:30
tundebabzy	3aaf693abd	adds task -process	2018-02-28 05:12:18 +01:00
tundebabzy	95a4ca9429	update test cases	2018-02-27 18:09:06 +01:00
tundebabzy	9bf029a16e	generate new invoice only when current_invoice_end is past	2018-02-27 15:19:02 +01:00
Achilles Rasquinha	11a5f78d3e	Merge pull request #13070 from achillesrasquinha/py3 ... [FIX] sorting multiple compares	2018-02-27 19:48:25 +05:30
tundebabzy	45b6a1719f	refactor: ... - current_invoice _start and end should be determined by trial period or billing period - adds new functions to get billing period data	2018-02-27 15:14:19 +01:00
tundebabzy	c634ca8737	adds validation to billing_interval_count in Subscription Plan	2018-02-27 14:12:39 +01:00
Nabin Hait	3b43c0d160	Update territory and customer_group patch optimization (#13076) ... * Update territory and customer_group patch optimization * Update update_territory_and_customer_group.py	2018-02-27 15:57:14 +05:30
Zarrar	96002c28bd	optimize patch for faster execution (#13068)	2018-02-27 15:57:01 +05:30
Zarrar	91fc1a8fbe	Update Territory & Customer Group across all transaction (#13004) ... * added method for update query based on changes * patch added * updated function, moved util function	2018-02-27 15:56:38 +05:30
tundebabzy	3c26a7e862	adjusts query so multiple plans can be used to create single invoice	2018-02-27 09:36:29 +01:00
tundebabzy	559d01e176	allows to rename subscription plan	2018-02-27 09:13:35 +01:00
tundebabzy	07313c281a	adds more assertions to test cases	2018-02-27 09:00:13 +01:00
Ameya Shenoy	3ee22f0137	rename valid_email to validate_email (#13103)	2018-02-27 12:59:12 +05:30
rohitwaghchaure	f1755fb5b1	Merge pull request #13094 from rohitwaghchaure/pos_discount_v10_1 ... [Hotfix] POS discount issue	2018-02-27 11:58:33 +05:30
Manas Solanki	be841ccc53	Merge pull request #13096 from manassolanki/fix-fee-schedule ... Fixes in the Fees Schedule	2018-02-27 11:23:38 +05:30
Frappe PR Bot	c6e2d750bb	[Translation] Updated Translations (#13097)	2018-02-27 11:00:59 +05:30
Zarrar	033eb779d4	minor fixes for member (#13101)	2018-02-27 11:00:47 +05:30
tundebabzy	048bcbf080	more tests and code fixes	2018-02-26 22:17:06 +01:00
tundebabzy	b84e9519c2	Subscriptions doctype - subscriber should be set only once	2018-02-26 20:35:20 +01:00
tundebabzy	1ea5055967	fix another date comparison bug	2018-02-26 20:17:59 +01:00
tundebabzy	4d8175f9d9	adds test cases and fix resulting bugs	2018-02-26 18:56:05 +01:00
tundebabzy	cd700efc0b	only generate invoice after_insert if subscription is not in trial period	2018-02-26 16:26:36 +01:00
tundebabzy	0091c86e80	fix date comparison bug	2018-02-26 16:18:55 +01:00
tundebabzy	08a11b4d1f	sets default for days_until_due to 0	2018-02-26 16:13:45 +01:00
tundebabzy	d3fdcd9da5	set after_insert methods: ... - if subscription is not in trial period, generate sales invoice	2018-02-26 16:10:47 +01:00
tundebabzy	b72aac6729	adds validation: ... - ensure trial period dates are in order	2018-02-26 15:56:47 +01:00
tundebabzy	7a2c6df645	sets Subscription doc status in before_save	2018-02-26 15:55:32 +01:00
tundebabzy	3010996cc5	adds before_insert methods: ... - set current_invoice_start - set current_invoice_end	2018-02-26 15:51:32 +01:00
tundebabzy	35e92c7d29	removes start field from Subscriptions	2018-02-26 15:25:26 +01:00
Manas Solanki	51dfba749b	filter students on basis of category and button to show fees	2018-02-26 19:32:26 +05:30
tundebabzy	6e014331c5	removes end_date from Subscriptions doctype	2018-02-26 14:05:54 +01:00
tundebabzy	2b5298238e	adds prorate field to Subscription Settings	2018-02-26 13:58:29 +01:00
tundebabzy	2dee342501	Subscriptions doctype - trial start and end are set_only_once	2018-02-26 13:34:25 +01:00
Nabin Hait	3799f8bec9	Don't validate serial nos while cancelling the transaction	2018-02-26 16:39:06 +05:30
Zarrar	e53a238665	minor fix (#13095)	2018-02-26 15:59:20 +05:30
Shreya Shah	70a57e08fd	New Report Employee Advance Summary (#13040) ... * New Report Employee Advance Summary * JSON style column definition	2018-02-26 15:58:57 +05:30
tundebabzy	cbe4f5b6b3	changes to subscription settings	2018-02-26 11:22:53 +01:00
tundebabzy	066958a794	subscription_invoice doctype changes	2018-02-26 11:22:05 +01:00
Rohit Waghchaure	3edc101957	[Fix] POS discount issue	2018-02-26 13:25:58 +05:30
tundebabzy	8457bb2c7e	change in Subscription Settings	2018-02-26 08:13:41 +01:00
Nabin Hait	127c61e930	Fixed logic in itemwise recommended reorder level	2018-02-26 12:43:17 +05:30
rohitwaghchaure	8ffd5d40e3	[Fix] UX for delivery trip (#13046) ... * [Fix] UX for delivery trip * Fixed test cases	2018-02-26 12:25:39 +05:30
tundebabzy	9360f81b94	Validity of Quotation #12858 (#13078) ... * add new setting for default valid_till date * codacy cleanup	2018-02-26 12:23:41 +05:30
Nabin Hait	e55831a89c	Projected Qty in Auto reorder email	2018-02-26 11:38:40 +05:30
tundebabzy	9016890ecf	adds Subscription Settings doctype	2018-02-26 06:15:31 +01:00
tundebabzy	988f5ca38b	hide trial_period_end and invoices if empty	2018-02-26 05:14:10 +01:00
tundebabzy	bbac07d9d2	use naming series for Subscriptions	2018-02-26 05:07:56 +01:00
tundebabzy	dda6234cab	remove subscription name and name by subscriber	2018-02-26 04:52:13 +01:00
tundebabzy	7c455ad4b6	display invoices section field only if there are invoices	2018-02-26 04:50:45 +01:00
tundebabzy	4ca5e81aa3	adds description for billing_interval_count in subscription plan	2018-02-26 04:47:19 +01:00
tundebabzy	4d31255d5c	customer field in Subscriber should be Link	2018-02-26 04:40:53 +01:00
tundebabzy	a07811b67f	adds new doctype - Subscriptions ... - encapsulates subscription - linked to a subscriber - subscription can contain many plans - contains history of generated invoices	2018-02-26 04:25:30 +01:00
Nabin Hait	2572b05b35	Update territory and customer_group patch optimization (#13076) ... * Update territory and customer_group patch optimization * Update update_territory_and_customer_group.py	2018-02-25 10:45:24 +05:30
tundebabzy	2581e2e5d7	New doctype - Subscription Plan: ... - Plan is to be linked to a Product - Plan will be used to create Invoice items - Subscriber can have multiple plans - Contains billing cycle information	2018-02-24 11:31:42 +01:00
tundebabzy	007919c03f	New doctype - Subscriber: ... - Encapsulates a subscriber to a service or product - Contains subscription specific information	2018-02-24 11:19:06 +01:00
Zarrar	4a0d27078e	optimize patch for faster execution (#13068)	2018-02-23 17:41:32 +05:30
Achilles Rasquinha	a3555aa7bd	[FIX] sorting multiple compares	2018-02-23 17:22:07 +05:30
Nabin Hait	802819df9d	Merge branch 'master' into develop	2018-02-23 16:59:44 +05:30
Nabin Hait	d54953e419	bumped to version 10.1.4	2018-02-23 17:29:42 +06:00
Zarrar	339426c926	fix permission issue for stock balance report - Item Group (#13069)	2018-02-23 16:58:55 +05:30
Nabin Hait	7570774ebe	Merge branch 'master' into develop	2018-02-23 16:49:43 +05:30
Nabin Hait	d12fb58c12	bumped to version 10.1.3	2018-02-23 17:19:40 +06:00
Ameya Shenoy	82048cf3ce	verify payment entry amount is positive (#13066) ... * verify payment entry amount is positive * Update sales_invoice.py * Update sales_invoice.py	2018-02-23 16:33:28 +05:30
rohitwaghchaure	4d76269eeb	[Fix] Item wise sales register report (#13055)	2018-02-23 16:25:30 +05:30
Shreya Shah	70a68897cc	auto name on the basis of naming series (#13056)	2018-02-23 16:24:59 +05:30
Shreya Shah	d5b2e39f45	improve validation (#13058)	2018-02-23 16:23:57 +05:30
Frappe PR Bot	239c121f7d	[Translation] Updated Translations (#13059)	2018-02-23 16:23:00 +05:30
rohitwaghchaure	dd0fc1084e	[Fix] PDC amount, PDC print layout issue (#13062)	2018-02-23 16:20:46 +05:30
Faris Ansari	97b212e348	Patch optimization (#13060) ... * Patch fixes * fix codacy * Update item_barcode_childtable_migrate.py	2018-02-23 16:19:41 +05:30
Raghavendra Kamath	1a9388acbb	Clean inline css found in chapter and grant for loops! (#13038) ... * Clean inline css found in chapter and grant for loops! * Remove redundant css * remove unwanted ide files and append gitignore * remove unnecessary line from build.json * restore import for variable.less * remove kdev from gitignore	2018-02-23 14:34:44 +05:30
Nabin Hait	d283ee73f3	Fetch timesheet based on project	2018-02-23 12:58:39 +05:30
Nabin Hait	5b9f3b0cd3	Merge branch 'master' into develop	2018-02-22 18:18:36 +05:30
Nabin Hait	2b2cf13408	bumped to version 10.1.2	2018-02-22 18:48:34 +06:00
Nabin Hait	7f49b57aaa	Update added_extra_gst_custom_field_in_gstr2.py	2018-02-22 18:17:57 +05:30
Nabin Hait	0e3db275e5	Merge branch 'master' into develop	2018-02-22 18:10:39 +05:30
Nabin Hait	6b69fc7e5d	bumped to version 10.1.1	2018-02-22 18:40:37 +06:00
Saurabh	d8cd54dfd0	[fix] remove gstr2 fields from Sales Invoice and Delivery Note too (#13047)	2018-02-22 18:05:40 +05:30
Suraj Shetty	8a41887f68	patch exception fixes (#13037) ... * patch exception fixes * reload daily_work_summary_group_user doctype	2018-02-22 15:56:33 +05:30
tundebabzy	2949e9c5dc	Merge pull request #13036 from tundebabzy/issue-13019 ... Uncaught Server Exception : adjust_qty_for_expired_items #13019	2018-02-22 11:04:53 +01:00
Nabin Hait	cf72d7f135	Fixed merge conflict	2018-02-22 14:47:26 +05:30
Nabin Hait	9b530fb2cb	bumped to version 10.1.0	2018-02-22 15:09:37 +06:00
Nabin Hait	06bace9089	Fixed develop version	2018-02-22 14:36:26 +05:30
tundebabzy	c15978fca0	fix indentation	2018-02-22 09:50:49 +01:00
Nabin Hait	7d862276af	Cleanup and fixes on leaderboard	2018-02-22 13:59:41 +05:30
Nabin Hait	e4fe2d9603	Merge branch 'leaderboard' of https://github.com/vishdha/erpnext into vishdha-leaderboard	2018-02-22 11:35:10 +05:30
rohitwaghchaure	23a2b65576	[Fix] BOM Update Tool not update grandparent's exploded BOM (#13026)	2018-02-22 11:32:09 +05:30
tundebabzy	cad22dbe39	Cutomisable Cash Flow Reports (#12969) ... * add child doctype - Cash Flow Mapping Account * adds new doctype - Cash Flow Mapping * adds new doctype - Cash Flow Mapper * adds new doctype Cash Flow Mapping Template * adds new doctype Cash Flow Mapping Template * adds adjustments to Cash Flow Mapper: - remove fields from Cash Flow Mapping Template Details - update in Cash FLow Mapper * get cash_flow_accouts from Cash Flow Mapping * change `tmp` to `mappers` and make sure `mappers` is sorted by its `position` field * changes description from 'Net Profit/Loss' to 'Profit for the year' * set `net_profit_loss` `parent_account` properly * modify `get_account_type_based_data`: - changed signature such that `account_type` parameter is now `account_name` - where clause in query is now based on `name` * remove zero rows * de-duplicates row, summing similar accounts in the process * makes gl sum calculation use `parent_account` as a condition * add the `section_leader` immediately after adding net profit, sorts `accounts` by `is_working_capital` field * adds `is_working_capital` to "account_types" so that we can use this to determine when to add "Changes in working capital" for operating activities * add "Movement in working capital" subheader * refactor code for readability * adds new fields to `Cash Flow Mapping`: - `is_interest_paid` to allow me recognise accounts for 'Interest Paid' - `is_income_tax_paid` to allow me recognise accounts for 'Income Taxes Paid' * allow `Cash Flow Mapping` to be renamable * adds new field - `section_subtotal` useful for only Operating Activities * changes `Cash Flow Mapping` doctype fields: - remove `is_income_tax`_field - add `is_income_tax_liability` field to identify tax payable accounts - add `is_income_tax_expense` field to identify tax expense accounts in P or L * calculates and shows tax paid adjustment in cash flow statement * renames `is_interest_paid` to `is_finance_cost` * - adds finance costs calculation - correctly sets opening balance dates * prevents users from selecting extra options in Cash Flow Mapping * adds validation to prevent selecting multiple options * adds new fields to Cash Flow Mapping * calculate non cash p or l items (2nd pass) * separates default cash flow generation from custom * adds new setting to Accounts Settings: - allow user elect to use customised cash flow report * clean up * removes mandatory constraint from accounts field * allow rename, disallow create and delete * adds patch to add default Cash Flow Mappers * refactors custom_cashflow * add article to explain configuration * refactor * further refactor * final clean up (hopefully) * clean up for codacy * more codacy fixes * more codacy fixes * fix broken patch * rename article to .md * create default mappers after install * PEP 8 * create the tables in `after_install` call	2018-02-22 11:08:36 +05:30
tundebabzy	27d558c9ef	Optionally allow overlap on Timesheet #12893 (#13018) ... * give user option to ignore time overlap validation * move settings to new Projects Settings * clean up - remove trailing space	2018-02-22 11:05:49 +05:30
rohitwaghchaure	4e8fdf7b3f	[Enhance] Quality Inspection Template (#12988) ... * [Enhance] Quality Inspection Template * Test case and patch * Update make_quality_inspection_template.py	2018-02-22 11:03:48 +05:30
Zarrar	79756c44c9	Update Territory & Customer Group across all transaction (#13004) ... * added method for update query based on changes * patch added * updated function, moved util function	2018-02-22 10:57:49 +05:30
Shreya Shah	0bde9e11c7	clear log if no attachments (#13023)	2018-02-22 10:55:40 +05:30
tundebabzy	637b242a34	Credit card default account should be debtors #12989 (#13029) ... * allow receivable account type in mode of payment * update `default_account` field description	2018-02-22 10:51:57 +05:30
vishdha	09d56754ea	[fix] Codacy issue	2018-02-21 16:10:09 +05:30
vishdha	e9166d7c19	[fix] Sales partner details get from sales Order and company currency details from selected company	2018-02-21 15:35:58 +05:30
vishdha	9a64d4371e	[fix] Codacy Issue	2018-02-21 15:35:58 +05:30
vishdha	d4491d361f	[new] Filter based on company:	2018-02-21 15:35:58 +05:30
vishdha	09acb779d7	[new] Leader board	2018-02-21 15:35:58 +05:30
Suraj Shetty	d3069fee4d	Daily work summary refactor (#12944) ... * added daily work summary setting doctype and code to support feature this will allow multiple setting for daily work summary * added daily work summary setting user doctype * made changes in daily work summary code * [minor] entry change in hr config file * deleted previous daily work summary settings (and its company) doctype * removed unwanted permission check * toggled read_only option for enabled field * removed print statements * add patch for the changes * doc changes * [minor] indentation fix * fixed tests * indentation fixes * codacy issue fix * formatting fixes * renamed doctype Renamed Daily Work Summary Setting to Daily Work Summary Group and did related code and doc changes * fixed typo * updated doc * codacy issue fix * [minor] renamed doctype name in json * Renamed old doctype * fixed indentation * codacy fix * indentation fix * renamed doctype * handled patch exception * fixed exception * Update daily_work_summary_group.py * rename patch file removed abbreviation in file name * handled exception in patch code * removed Unnecessary pass statement * [minor] indentation fix	2018-02-21 15:15:43 +05:30
Zarrar	67f74414c4	disable expand_all button for BOM (#13015)	2018-02-21 14:46:41 +05:30
Shreya Shah	8a77a0e1e4	Add total row in all trends reports (#13010) ... * total in sales order trends report * total in all trends reports	2018-02-21 14:46:07 +05:30
Zarrar	bc5515651b	[Hotfix] Selecting create on blank field throws error (#13014) ... * selecting create on blank field error fix * error when fetching default_print_format	2018-02-21 11:13:14 +05:30
Shreya Shah	f65afac353	db_update instead of save to avoid unnecessary validations (#13009)	2018-02-21 11:12:04 +05:30
Charles-Henri Decultot	b8c088edb7	Transaction Log for France (#12795) ... * Regional overrides for France * Addition of tests and documentation	2018-02-21 11:07:33 +05:30
Faris Ansari	7c744acc49	Changes for Rollup (#12924) ... * Changes for rollup * remove variables.less	2018-02-20 14:21:50 +05:30
rohitwaghchaure	e2558308f6	[enhance] Production Plan (#12160) ... * [enhance] Production plan * Test cases * Removed production planning tool * Documentation * Added actual qty in material request production item * Renamed field 'Use Multilevel BOM' to 'Include Exploded Items'	2018-02-20 12:20:00 +05:30
Pawan Mehta	2fbb4923a7	item balance report (#12983) ... * item balance report * remove hard coding * Update item_balance.json * Update item_balance.json Change name to "Item Balance (Simple)" * Update item_balance.json	2018-02-20 12:17:49 +05:30
Pawan Mehta	244e235c48	Sales Payment Summary - fix for change amount (#12981) ... * [fix] #12980 * apply change amount to cash	2018-02-20 12:15:10 +05:30
Shreya Shah	f718b0c0df	Currency filter in Pricing Rule (#11776) ... * added currency filter * modified files * pull margin only if currency matches * Renamed price to rate in pricing rule * fetch rate only if currency matches * rebase with develop * rebase with develop * patch to set currency in existing docs * currency field mandatory in pricing rule * modified test cases * rebase with develop * fixed test case	2018-02-20 11:26:46 +05:30
rohitwaghchaure	554f2de23d	Code cleanup online POS (#12985)	2018-02-20 11:18:01 +05:30
Vishal Dhayagude	a5003f8f5b	[minor] Balance Qty added in reorder level email notification (#13000)	2018-02-20 11:14:54 +05:30
tundebabzy	6c5d7986ab	Outstanding Amount not getting updated in Payment Entry #12713 (#12975) ... * allow to `set_missing_ref_details` by force * update payment entry references during submit and cancel	2018-02-19 13:11:56 +05:30
Shreya Shah	5448318146	fix total field (#12992)	2018-02-19 12:44:52 +05:30