13835 Commits

Author	SHA1	Message	Date
Vishal	cc06d291c6	link member in dynamic link table	2017-12-05 16:41:09 +05:30
Vishal	50f13e17a7	[new] Chapter Doctype Added	2017-12-05 16:41:09 +05:30
Vishal	ca61453fa3	[new] Non Profit module Added	2017-12-05 16:41:09 +05:30
rohitwaghchaure	3a5ca927e7	[Fix] Asset depreciations and balances report showing wrong accumulated depreciation amount if multiple asset against same asset category (#11848) ... * [Fix] Asset depreciations and balances report showing wrong accumulated depreciation amount if multiple asset against same asset category * Update asset_depreciations_and_balances.py	2017-12-04 19:29:03 +05:30
Zarrar	c47745ea83	only fetch distinct names of events (#11846)	2017-12-04 19:23:20 +05:30
Kenneth Sequeira	406cb920ae	Documentation Update (#11844) ... * Delete payment-tool.md * Update index.txt Removed Payment Tools from Index * Update index.txt removed barcode setup from index * Delete barcode-1.png removed barcode-1.png * Delete barcode-2.png * Delete bar-code.md removing barcode set up as functionality is deprecated. Barcode can be directly entered in Item Master. * Delete bar-code.md removing barcode set up as functionality is deprecated. Barcode can be directly entered in Item Master. * Update index.txt remove bar-code set up link from index de (german) * Update index.txt remove bar-code set up link from index de (german)	2017-12-04 19:22:50 +05:30
Manas Solanki	e6fd07fda9	Changes in the Fee structure (#11842) ... * academic year non mandatory in the fee structure and minor changes * update the docs	2017-12-04 19:21:50 +05:30
Shreya	e570e4a049	fixed a test	2017-12-04 16:49:44 +05:30
Shreya	f8e7bc7c5b	removed process payroll doctype	2017-12-04 16:49:44 +05:30
Shreya Shah	db332f2c08	employee_details table added	2017-12-04 16:49:44 +05:30
Shreya	9956f15c80	added py test	2017-12-04 16:49:44 +05:30
Shreya	b5dff03453	added changes from process payroll	2017-12-04 16:49:44 +05:30
Shreya	d1defa5fc7	set salary components	2017-12-04 16:49:44 +05:30
Shreya	d73dd056d6	test case	2017-12-04 16:49:44 +05:30
Shreya	7b2870431e	new doctype payroll_entry	2017-12-04 16:49:44 +05:30
Shreya	eba3f39bbe	test delivery trip fix	2017-12-04 16:04:56 +05:30
Shreya	3febe0215e	test asset fix	2017-12-04 16:04:42 +05:30
Shreya Shah	8ee1ea456d	travis fix (#11841)	2017-12-04 14:28:02 +05:30
Nabin Hait	a11dcb6e59	Pull items in Stock Entry from Purchase Invoice (#11839)	2017-12-04 13:36:50 +05:30
rohitwaghchaure	148fccd45a	[Fix] Wrong value showing in the email digest (#11840)	2017-12-04 13:36:01 +05:30
Manas Solanki	3bac586ee2	fix in the assessment result tool while entering the zero marks (#11837)	2017-12-04 12:55:10 +05:30
tundebabzy	3061fc92fd	Batch Stock Items, having serial number can't be moved without inserting Serial Number (#11792) (#11813) ... * if doctype is batch, add extra information to args * automatically fetch serial numbers if possible * take advantage of changes in make_stock_entry * code clean up * PEP 8 compliance * fix bug that clears serial number	2017-12-04 11:23:21 +05:30
Zarrar	5e470f757f	[Fix] Filter on child table not working in Calendar (#11824) ... * use the new get_events method * using the common get_events method for calendar_view * using add_fetch to fill customer_name	2017-12-04 11:22:25 +05:30
Charles-Henri Decultot	8a052cb153	Translation issue (#11833)	2017-12-04 11:17:05 +05:30
vwithv1602	78d5ccf5fc	Invalid return against purchase invoice Error - Issue#11834 (#11835)	2017-12-04 11:16:34 +05:30
tundebabzy	1fb285c165	hide html example in print (#11830)	2017-12-04 11:13:36 +05:30
Shreya Shah	11938a47ec	fixed typo (#11825)	2017-12-01 17:38:26 +05:30
pawan	990277a0de	patch	2017-12-01 16:45:47 +05:30
Saurabh	d505d83cb6	[fix] merge conflicts	2017-12-01 16:23:46 +05:30
Saurabh	a067ddbc20	bumped to version 9.2.19	2017-12-01 16:52:43 +06:00
Charles-Henri Decultot	e90a1caeb1	Portal print format correction (#11812) ... * Portal print format correction * Correction following Rushabh's comment	2017-12-01 16:19:45 +05:30
Kenneth Sequeira	9e27b347ca	Delete payment-tool.md (#11820) ... * Delete payment-tool.md * Update index.txt Removed Payment Tools from Index	2017-12-01 16:17:53 +05:30
KanchanChauhan	8380253178	On changing assign_to assign maintenance task in Asset Maintenance (#11804)	2017-12-01 16:14:05 +05:30
Jamsheer	f4d9af1ab9	Fix Patch - remove company from patient (#11819)	2017-12-01 16:10:39 +05:30
rohitwaghchaure	b1ac979ac5	[fix] Do not allow zero valuation rate for serial no and fetch previous valuation rate for serial no (#11817)	2017-12-01 16:09:02 +05:30
pawan	14d570ed9e	fix	2017-11-30 18:41:09 +05:30
pawan	2ff844e740	default warehouse / remove validation / change sql	2017-11-30 18:14:55 +05:30
Nabin Hait	7a294e6ef5	Update asset_category.json	2017-11-30 18:02:22 +05:30
Nabin Hait	5e801955f1	Update asset_category.json	2017-11-30 18:01:56 +05:30
Saurabh	34a0e90115	[fix] merge conflicts	2017-11-30 16:45:01 +05:30
Saurabh	f9509a084a	bumped to version 9.2.18	2017-11-30 17:11:46 +06:00
Nabin Hait	1b89be0c66	Fixed rounding issue in subcontracting (#11802)	2017-11-30 15:59:56 +05:30
rohitwaghchaure	e34ef60e3e	[fix] Asset test cases and added make_sales_invoice (#11800) ... * [fix] Asset test cases and added make_sales_invoice * vehicle trip test cases	2017-11-30 15:59:40 +05:30
Faris Ansari	ec3be9eebf	[hotfix] Party Type name (#11797)	2017-11-30 15:53:39 +05:30
Nabin Hait	c5e0d22464	Update set_delivery_date_in_so_item.py	2017-11-30 15:52:47 +05:30
pawan	e4aaff6686	message changes	2017-11-30 15:49:54 +05:30
pawan	f5bb2af92c	test case	2017-11-30 15:20:00 +05:30
Nabin Hait	e761b9de40	Rearranged fields due to merge conflict messup	2017-11-30 14:29:10 +05:30
Vishal Dhayagude	8677cd1565	[patch] Patch added to rename net_weight field (#11798)	2017-11-30 13:52:30 +05:30
pawan	e43cd915e8	alignment	2017-11-30 12:31:32 +05:30
pawan	abc5523405	code improvements	2017-11-30 12:23:46 +05:30
Manas Solanki	f9cc56cd62	minor fixes in the assessment result tool (#11795)	2017-11-30 11:39:06 +05:30
tundebabzy	ce63ab7602	Show Batch Selector Dialog Only If There Are Multiple Batches (#11794) ... * check if multiple batches available before showing dialog * Update point_of_sale.js	2017-11-30 11:38:53 +05:30
tundebabzy	8ae53cacc5	When Warehouse Field Is Changed, Batch Number Field Should Be Updated (#11789) (#11790) ... * reset batch_no field if no batch number returned * on warehouse change, query for batch number	2017-11-30 11:37:21 +05:30
pawan	11398fd572	Validation for reserved warhouse	2017-11-29 21:16:02 +05:30
Shreya	c0c470b56d	fixed json affected by latest merge	2017-11-29 19:31:15 +05:30
Zarrar	95ee7654a1	Employee tree (#11667) ... * nested set implemented * treeview for employee * patch added to assign lft rgt, update nsm_model on trash * call on_trash method of super class	2017-11-29 18:44:02 +05:30
Rohit Waghchaure	17e03cf3fc	[minor] Removed hidden for field pos profile	2017-11-29 17:40:42 +05:30
Rushabh Mehta	0154538c06	[fix] [minor] pos.js	2017-11-29 16:42:02 +05:30
Vishal Dhayagude	855e390265	[fix] Sales Invoice json conflict (#11779)	2017-11-29 16:25:24 +05:30
rohitwaghchaure	1b344ca81e	[Fix] POS not loading if pos profile not defined (#11778)	2017-11-29 16:21:51 +05:30
Vishal Dhayagude	d42242df22	[Feature] Shipping Rule Calculation based on Net Weight (#11770) ... * [new] Calculate shipping tax based on weight * [fix] Change field name weight to weight_per_unit in SI Item * [new] Shipping Rule based tax for selling module * [new] Shipping rule based on weight added to Buying module * [fix] Conflict in jsons * [fix] Removed Redudant add_fetch * [fix] Codacy fixed * [fix] Print hide added	2017-11-29 16:09:59 +05:30
KanchanChauhan	2d1cbd0b2e	Delete old asset doctypes from Accounts module and minor changes (#11766)	2017-11-29 16:03:00 +05:30
Nabin Hait	ad2a3e4f38	Cleanup and fixes on delivery trip	2017-11-29 15:53:01 +05:30
Nabin Hait	46e285efe9	Merge branch 'add_delivery' of https://github.com/creamdory/erpnext into creamdory-add_delivery	2017-11-29 14:15:16 +05:30
rohitwaghchaure	f591a220c9	Fetch items of item groups defined in the pos profile (#11763)	2017-11-29 13:55:13 +05:30
Zarrar	c43c5cae5a	Set query sales order (#11772) ... * set_query for sales order based on production_item * codacy fix * check in packed item to fetch sales order * Update production_order.py	2017-11-29 13:54:35 +05:30
rohitwaghchaure	2fb8cc5f2c	[fix] Options must be a valid DocType for field Asset Category in row 18 (#11773) ... * [fix] Options must be a valid DocType for field Asset Category in row 18 * test cases	2017-11-29 13:50:04 +05:30
tundebabzy	2a4fefc6ff	Auto fetch batches based on quantity on POS (#11004) (#11767) ... * prevent premature escape when item has serial no and batch no * fetch actual_batch_qty for item * add available_qty to dialog * remove expired batches from drop-down * Update queries.py	2017-11-29 10:53:09 +05:30
Julian Robbins	d785e22211	Fix spelling of accessibility (#11765)	2017-11-29 10:49:12 +05:30
pawan	54465f5df1	review comments changes	2017-11-29 10:18:38 +05:30
tunde	0d82b6979e	add missing field and value parameters	2017-11-28 23:30:03 +01:00
tundebabzy	bc7c387a0d	set read only property properly (#11761)	2017-11-28 22:40:05 +05:30
Prateeksha Singh	bf31d853e7	Merge pull request #11762 from manassolanki/fix ... fix for module in the new report	2017-11-28 19:08:52 +05:30
Manas Solanki	34a8be83ea	delete the old files	2017-11-28 18:47:56 +05:30
Manas Solanki	49ff065684	fix for the new report module	2017-11-28 18:44:06 +05:30
Manas Solanki	84e9d45055	Minor fixes for the Education domain (#11758) ... * add the new role Education Manager for education settings * minor changes in the hooks for bootinfo * Fix for amending the assessment plan	2017-11-28 18:04:08 +05:30
Nabin Hait	cf9573ab2f	Removed asset doctypes files from accounts module and patches	2017-11-28 16:56:53 +05:30
rohitwaghchaure	c037dc775e	Refactor multi pos profile selection in the pos invoice (#11721)	2017-11-28 16:11:15 +05:30
Shreya Shah	8d9edbf133	Letterhead in user progress (#11679) ... * added letter-head to user progress slides * added letterhead action to patch * improvised * added date in patches.txt	2017-11-28 16:09:58 +05:30
Kanchan Chauhan	e58a41a8a2	Added maintenance to Asset and enhanced maintenance for Asset Maintenance	2017-11-28 15:14:56 +05:30
Nabin Hait	35cd1d325f	[fix] Set GST State code based on state, even if GSTIN not mentioned (#11755)	2017-11-28 13:01:01 +05:30
Doridel Cahanap	de82fe9e8f	[minor] Set Rename for Training Program (#11740)	2017-11-28 11:26:23 +05:30
Saurabh	b750b304dd	fixed merge-conflicts	2017-11-28 11:02:28 +05:30
Saurabh	d86ace41a1	bumped to version 9.2.17	2017-11-28 11:30:17 +06:00
Jamsheer	b488475d92	Remove Company from Patient - Patches Added (#11716) ... * Remove Company from Patient - Patches Added * Update patient DOB field label to Date of birth * Patient marital status default null * Update patient.py	2017-11-28 10:47:06 +05:30
Saurabh	8eda0cc8ba	[fix] validate bom if order type is subcontracting (#11705) ... * [fix] validate bom if order type is subcontracting * [fix] moved validation to server side	2017-11-28 10:41:35 +05:30
rohitwaghchaure	a14baf4188	Merge pull request #11739 from rohitwaghchaure/payment_terms_test_case ... [fix] payment terms test case	2017-11-27 12:05:57 +05:30
Saurabh	9d0092f89a	[fix] pull source warehouse from production order child table (#11718)	2017-11-27 12:04:41 +05:30
Shreya Shah	e3d6d21ec5	[Fix] Item name and description in production order (#11723) ... * fetch item name and description from bom * Update production_order.py * patch added * Update set_item_name_in_production_order.py	2017-11-27 12:02:13 +05:30
Charles-Henri Decultot	22641e44ad	Allowing the creation of an Oganization as Lead (#11724) ... * Allow the creation of an organization lead * Changes following test fails * Test case correction	2017-11-27 11:58:22 +05:30
Shreya Shah	dcbc4284d3	expenses included in valuation account type in purchase taxes and charges (#11725)	2017-11-27 11:48:09 +05:30
Rohit Waghchaure	52bf56d415	[fix] payment terms test case	2017-11-27 11:43:52 +05:30
rohitwaghchaure	373b5702a9	[fix] Server test cases (#11727)	2017-11-27 11:27:28 +05:30
Saurabh	ab5e77ecf1	[fix] do not pull disabled pos profiles (#11733)	2017-11-27 11:26:13 +05:30
pawan	f5279a0d67	[fix] #8427	2017-11-24 11:21:47 +05:30
rohitwaghchaure	15f8fe0179	[fix] Batch selected in the sales transaction for non batch item (#11713)	2017-11-24 10:46:27 +05:30
Saurabh	41f60546a1	[fix] do not allow user to create party type (#11706)	2017-11-23 18:02:51 +05:30
Nabin Hait	82ef26b327	Minor fix in patch	2017-11-23 17:57:33 +05:30
Nabin Hait	aa5b566ea9	Merge branch 'ashish-greycube-feature_10861-1' into develop	2017-11-23 17:49:25 +05:30
Nabin Hait	68768252ce	Cleanup and fixes on bypass credit limit check on sales order	2017-11-23 17:48:59 +05:30
Rohit Waghchaure	09b39f06ea	Code cleanup	2017-11-23 16:30:10 +05:30
Nabin Hait	57952f6946	Merge branch 'develop' into feature_10861	2017-11-23 16:12:55 +05:30
Manas Solanki	966f141f62	Rename schools to Education (#11524) ... * renaming for the docs, demo data and patch * changes in the doctypes and reports * rename the config file * Few name changes in messages and license * rename the school settings to education settings * changes in the documentation * added the setup file for the fixtures * corrected the ui tests file path * fix the codacy * add the patch for renaming few doctypes and fields * changes in the patch	2017-11-23 15:22:10 +05:30
Nabin Hait	cda4d50063	Fixed reserved qty for production logic and patch for reposting (#11691)	2017-11-23 13:05:43 +05:30
tundebabzy	acccdb3890	Default batch number selection (#11454) ... * fetch batch_no in `get_basic_details` * PEP8 changes and docstring * only auto-fetch batch number for Sales documents: otherwise, automatic batch creation will not work properly because all new stock will be added to old batch * new function to fetch batch number using FEFO: FEFO - First Expiring First Out * fetch batch number in `get_basic_details` using FEFO * add new function - `set_batch_number` * `set_batch_number` when `qty` is triggered * `set_batch_number` when `uom` is triggered * whitelist `get_batch_no_fefo` * code clean up * move `set_batch_number` to conversion_factor instead of uom * rename `get_batch_no_fefo` to `get_batch_no` * fix test case * final cleanup * Revert "fetch batch_no in `get_basic_details`" This reverts commit dd024b1eb369eaeafab28165d523fb7a9f8ab8d3. * fix test case * update Sales Invoice manual * move changes away from `transaction.js` * query should not fetch expired batches * refactor `get_batch_no`: add new function `get_batches` * Update batch.py	2017-11-23 13:05:15 +05:30
Nabin Hait	82027ea3bf	Set print hide property for payment terms	2017-11-23 12:49:42 +05:30
Manas Solanki	30babee2ef	add courses in the program enrollment (#11694)	2017-11-23 12:19:57 +05:30
Zarrar	a90274fed9	linking issue in dashboard (#11701)	2017-11-23 12:19:40 +05:30
Jamsheer	1ce56316ea	Populate patient_name in Healthcare Doctypes (#11690) ... * On Cancel Consultation - Open Appointment - Delete Medical Record * Add Filter on Account Selection - is_group: 0 * Patient Medical Record - List view Fixes * Update consultation.py * Set Appointment Refrence in Vital Signs * Add Other in Gender Selection * Populate patient_name in Healthcare Doctypes	2017-11-23 12:18:43 +05:30
Helkyd	6e3f789f82	code fixe ... fixed })	2017-11-22 16:12:27 +01:00
Helkyd	3264c13545	No ZERO payment ... If no payment mode selected does not process ... to avoid having SI with payment pending as POS for sure was paid..	2017-11-22 16:06:22 +01:00
Helkyd	0195528798	Merge branch 'develop' of https://github.com/Helkyd/erpnext-1 into develop	2017-11-22 14:51:18 +01:00
Helkyd	2b6bf82d61	Default Payment Mode ... POS drafted, user retrieves the record and sets the default payment mode so that Zero payment is not done.	2017-11-22 14:49:51 +01:00
Saurabh	ed4191ec5b	[fix] merge-conflicts	2017-11-22 18:01:56 +05:30
Saurabh	4bc12b68e4	bumped to version 9.2.16	2017-11-22 18:24:18 +06:00
Nabin Hait	02ac901345	[fix] Rounding adjustment in company currency	2017-11-22 16:12:20 +05:30
rohitwaghchaure	4dc5f0efaf	[Fix] Item details not fetching if item has no default bom (#11688)	2017-11-22 15:21:47 +05:30
Nabin Hait	96abfd2ab9	[fix] In payment entry, run some events serially to avoid async issue	2017-11-22 15:13:16 +05:30
Nabin Hait	036bf6de6e	Merge branch 'develop' of https://github.com/frappe/erpnext into develop	2017-11-21 20:19:13 +05:30
Nabin Hait	32a62a02df	Fixed merge conflict	2017-11-21 20:18:03 +05:30
Nabin Hait	0551f7bb00	Cleanup and fixes of payment terms feature	2017-11-21 19:58:16 +05:30
Zarrar	657ceef105	skipped tax_account (#11678)	2017-11-21 17:40:22 +05:30
Faris Ansari	6ca6a69070	Course Scheduling Tool (#11676) ... * [education] Fix Course Scheduling Tool * minor	2017-11-21 17:28:51 +05:30
Rushabh Mehta	476c66d699	[fix] tests.txt	2017-11-21 17:02:39 +05:30
Rushabh Mehta	26ca6afd11	[fix] test.txt for accounts	2017-11-21 16:17:58 +05:30
rohitwaghchaure	e8ccc0e942	[enhance] Added multi UOM feature in Material Request (#11352) ... * [enhance] Added multi UOM in Material Request * test cases * patch to update multi uom fields in material request item	2017-11-21 16:17:22 +05:30
Makarand Bauskar	75443a94ee	[minor] set the pos profile name while creating demo (#11664)	2017-11-21 16:12:40 +05:30
Zarrar	f71f3af938	adding task to root node (#11666)	2017-11-21 16:12:01 +05:30
Saurabh	5add4897a5	Merge pull request #11506 from saurabh6790/test_patches ... [travis] run patches by restoring v7 database	2017-11-21 15:56:54 +05:30
Saurabh	d503f12713	[fix] ui test-case path	2017-11-21 15:22:41 +05:30
Rushabh Mehta	5171da81a1	[minor] fix-patch	2017-11-21 15:18:47 +05:30
Nabin Hait	cc884578b5	Update sales_order.py	2017-11-21 12:24:03 +05:30
rohitwaghchaure	834541a7e8	[fix] Added primary action in the modal which will show on the submission in the pos (#11575)	2017-11-20 11:31:53 +05:30
Britlog	1484793055	Shopping cart addresses management (#11657)	2017-11-20 11:22:18 +05:30
rohitwaghchaure	179e0c1d8d	Added party name in accounts receivable/payable report (#11656)	2017-11-20 11:18:55 +05:30
creamdory	fd1503c6a5	[New Feature] Delivery	2017-11-20 10:28:49 +08:00
Rohit Waghchaure	77940493a8	[fix] Price list not loaded from pos profile, auto set outstanding amount in the mode of payment	2017-11-18 19:06:31 +05:30
Prateeksha Singh	e1b8629313	Fix setup wiz test (#11640) ... * increase timeout in setup wiz test * enable profile slide	2017-11-17 20:08:45 +05:30
KanchanChauhan	0fe455a991	[Minor][Bug] Fix syntax error (#11633)	2017-11-17 20:08:15 +05:30
Saurabh	00e82cdab3	[fix] patch fixes to setup patch tester on travis	2017-11-17 19:08:01 +05:30
Prateeksha Singh	241d64d8c1	Merge pull request #11634 from pratu16x7/variant-modal-fix ... [minor] fix plurals spacing	2017-11-17 15:34:34 +05:30
pratu16x7	83587c72f6	[minor] fix plurals spacing	2017-11-17 15:33:12 +05:30
Saurabh	a4f78211ab	Merge branch 'master' into develop	2017-11-17 14:55:24 +05:30
Saurabh	f773af6053	bumped to version 9.2.15	2017-11-17 15:25:23 +06:00
Saurabh	11ec2c50e0	[fix] set default language in local	2017-11-17 14:51:08 +05:30
Zarrar	1b4894c33a	make root_type null if not root (#11626)	2017-11-17 14:32:12 +05:30
Rushabh Mehta	30dc9a14c6	[feature] [refactor] Shipping Rule for Buying + Refactor (#11628) ... * Shipping rule for Buying * [refactor] shipping rule	2017-11-17 14:31:09 +05:30
Saurabh	66e65dc104	[fix] merge-conflicts	2017-11-17 14:03:13 +05:30
Saurabh	05ed86a00e	bumped to version 9.2.14	2017-11-17 14:31:29 +06:00
Rohit Waghchaure	44f7b157ff	[fix] POS redirect issue	2017-11-17 13:52:11 +05:30
Nabin Hait	7fa111de45	Update sales_invoice.py	2017-11-17 12:55:08 +05:30
Nabin Hait	6b70906deb	Update purchase_invoice.py	2017-11-17 12:54:32 +05:30
Nabin Hait	1c4653ed97	Merge branch 'develop' into payment-terms	2017-11-17 12:41:56 +05:30
Saurabh	3499ba08df	[fix] do not translate domains while creating db record (#11616)	2017-11-17 12:29:26 +05:30
Nabin Hait	877e1bb377	Post GL Entry based on rounded total in Sales/Purchase Invoice (#11542)	2017-11-17 12:27:43 +05:30
Nabin Hait	1783549e75	Minor fixes in patch	2017-11-17 12:20:07 +05:30
Rushabh Mehta	58dccf38c5	[fix] for tests	2017-11-17 12:12:53 +05:30
Prateeksha Singh	744ff0010b	Variant report (#11618) ... * Item Variant Details Report * remove queries from inside for loop * make attribute value map * Update item_variant_details.py	2017-11-17 12:00:29 +05:30
hiousi	d81e9f30dd	[fix] issue #11456 (#11612) ... using bench export-fixtures create a erpnext/fixtures/web_form.json file see : https://github.com/frappe/erpnext/issues/11456#issuecomment-344846063	2017-11-17 11:42:24 +05:30
Britlog	b6096057c6	Hide cart icon and badge count after logging out (#11530)	2017-11-17 11:41:35 +05:30
Britlog	2a89a502f0	[Website] Items list and stock (#11480) ... * Add stock availability in items list and a parameter to set the number of products per page * Substract reserved_qty from actual_qty for website stock	2017-11-17 11:41:07 +05:30
Vishal Dhayagude	82b200e497	[fix] Patch fail (#11623)	2017-11-17 11:01:42 +05:30
Britlog	d9978d9c4f	Check stock in shopping cart (#11529)	2017-11-16 18:38:13 +05:30
rohitwaghchaure	51a397c97f	[fix] Valuation rate in stock entry and code cleanup (#11614)	2017-11-16 18:23:16 +05:30
Manas Solanki	bb34c57603	link the address and contact with the sales partner (#11592)	2017-11-16 18:10:04 +05:30
Prateeksha Singh	8f43d2514c	Multiple variant creation dialog (#11608) ... * Multiple variant creation dialog * variant dialog codacy fixes * [multiple variants] show_alert, and other minors	2017-11-16 18:06:26 +05:30
Nabin Hait	1749b7c16b	Minor fixes related to account renaming and deletion	2017-11-16 17:49:54 +05:30
Rushabh Mehta	a5ebebd09c	[enhance] Add Issue Type and Opportunity Type masters (#11598) ... * [enhance] added & linked Issue Type & Opportunity Type with opportunity * [patch] create issue and opportunity type from the custom field if available * [minor] issue_type and opportunity type should be mandatory * [patches] removed try catch from the patch * [fix] patch * [refactor] cleanup issue/opportunity type	2017-11-16 17:03:52 +05:30
Nabin Hait	46be9896a9	Account number in chart of accounts (#10551) ... * Account number in chart of accounts * Include account number while renaming account * Test case fixed * Standard coa with and without numbers * Standard coa with and without numbers	2017-11-16 16:51:55 +05:30
augustinfotech	135a54ca93	Allow print before pay in POS (#11590)	2017-11-16 15:28:42 +05:30
tundebabzy	f7e6934d7c	handle None case in update_reserved_qty_for_production (#11593)	2017-11-16 14:13:49 +05:30
Manas Solanki	eb3982044b	convert html into text in the taxes description as it can break the reports (#11603)	2017-11-16 14:11:39 +05:30
Pawan Mehta	bda07c6db4	Added Warehouse, Cost Center, Owner filters to Sales Register (#11600) ... * [fix] #3668 * fix codacy space issue	2017-11-16 14:09:17 +05:30
Neil Trini Lasrado	0df93d61eb	Update update_sales_cost_in_project.py (#11595) ... Will break if select sum(base_grand_total) from `tabSales Order` where project=p.name and docstatus=1 returns Null. Gives - "OperationalError: (1048, "Column 'total_sales_cost' cannot be null")" Error	2017-11-16 14:07:55 +05:30
rohitwaghchaure	21cbbae88f	[fix] Payment reconcillation showing linked journal entries (#11611)	2017-11-16 14:05:57 +05:30
ashish	f17ca7866a	removed names from comments	2017-11-16 11:08:14 +05:30
ashish	604eb9d689	added flag to function get_customer_outstanding and removed names in comments	2017-11-16 11:05:59 +05:30
ashish	a20c8dbd5c	instead of caller as 3rd arg added a flag	2017-11-16 11:03:39 +05:30
ashish	a1feb32891	added json for bypass credit limit checkbox	2017-11-16 11:01:43 +05:30
ashish	f67372cfb3	removed logic from delivery note for checking bypass credit limit flag	2017-11-16 10:58:25 +05:30
ashish	8146c7a3df	not required as default is set by default	2017-11-16 10:54:22 +05:30
ashish	bccdf74344	set default value of bypass_credit_limit flag removed as it is not required	2017-11-16 10:53:22 +05:30
ashish	62155fa0e5	Merge branch 'feature_10861' of https://github.com/ashish-greycube/erpnext into feature_10861	2017-11-16 10:47:44 +05:30
Rushabh Mehta	8e5dcd06fb	[fix] item.py	2017-11-15 17:53:44 +05:30
Rushabh Mehta	083dabaaf8	[fix] item.py	2017-11-15 17:08:53 +05:30
Frappe PR Bot	978cfdec2c	[Translation] Updated Translations (#11591)	2017-11-15 16:30:08 +05:30
Rushabh Mehta	d3f5d0961a	[feature] Opening Invoice Creation Tool (#11589) ... * [enhance] Opening Invoice Tool create Opening Sales/Purchase Invoices * [minor] added progress bar while creating invoice * [minor] allow bulk upload for the invoices * [minor] calculate item rate from net total * [minor] added defaults for invoices fields, create gl entries only if grand_total is greater than 0 * [minor] check mandatory values before making opening invoices * [minor] enable primary button if there is any error while creating invoices * [minor] minor fixes, set company currency as invoice currency added tests * [dashboard] added Opening Invoice Summery section in Dashboard * [minor] added total invoices count on dashboard * [minor] don't show dashboard if there are no opening invoices available * [minor] added Opening Invoice Tools to Account's Tools section * [minor] codecy fixes * [fix] refactored general ledger and buttons on charts * [fix] tests	2017-11-15 16:29:53 +05:30
Nabin Hait	78ab8235f6	Minor code cleanups in stock balance report	2017-11-15 14:43:54 +05:30
Brown-Harry Boma	b9e44217a2	[Fix]Codacy Issues	2017-11-15 14:43:54 +05:30
Brown-Harry Boma	2da8f6e89d	Add Items Variants Attributes columns to Stock Balance Report	2017-11-15 14:43:54 +05:30
Zarrar	24b8aa2e80	set field dependent on link field fix (#11580)	2017-11-15 14:27:00 +05:30
Nabin Hait	6fd163bc55	Merge branch 'master' into develop	2017-11-15 14:08:17 +05:30
Nabin Hait	429e5d57d5	bumped to version 9.2.13	2017-11-15 14:38:17 +06:00
Jamsheer	0abec034df	Healthcare hotfix (#11586) ... * On Cancel Consultation - Open Appointment - Delete Medical Record * Add Filter on Account Selection - is_group: 0 * Patient Medical Record - List view Fixes * Update consultation.py	2017-11-15 13:53:50 +05:30
Umair Sayed	3a9ca883b9	Update party.py (#11584)	2017-11-15 13:44:04 +05:30
Manas Solanki	bf59b5927f	make route from item code if item name is None (#11579)	2017-11-15 10:55:22 +05:30
ppd1990	9bd84277db	Propagate projected_qty all the way to the root warehouse to make 'check in group' actually work for more complex warehouse topologies (#10842)	2017-11-15 10:13:09 +05:30
schilgod	e418a5bdc1	Option to disable fetching last purchase details in Purchase Order (#11573) ... * add check for enable/disable last purchase details in Purchase Order * fix tabs	2017-11-15 09:49:49 +05:30
Jamsheer	bab226698f	Healthcare hotfix (#11574) ... * Patient dashboard - Vital Signs * Remove submit validation in Consultation * Physician Schedule - Add Time Slots - Fix * Patient Appointment - Client side - fixes	2017-11-15 09:47:00 +05:30
rohitwaghchaure	43edd5d03c	Employee loan fixes (#11495) ... * Employee loan fixes * Update update_employee_loan_details.py	2017-11-14 17:59:20 +05:30
Nabin Hait	50616da905	Merge branch 'master' into develop	2017-11-14 17:48:43 +05:30
Nabin Hait	ea3e6b93a7	bumped to version 9.2.12	2017-11-14 18:18:42 +06:00
Nabin Hait	10823e5a25	Merge branch 'neilLasrado-develop1' into develop	2017-11-14 17:40:45 +05:30
Nabin Hait	b55e98570f	Minor fixes	2017-11-14 17:40:30 +05:30
Shreya Shah	be690ef817	Rate with margin in customer and company currency (#11437) ... * field for company margin * added base_rate_with_margin * calculate company margin * test for item price * test for delivery note * test for sales order * test for quotation * test for sales invoice	2017-11-14 17:22:41 +05:30
Nabin Hait	42274a4591	Delete healthcare domain items (#11567)	2017-11-14 17:15:11 +05:30
Nabin Hait	cd13a28417	Get items from quotation in sales invoice	2017-11-14 17:13:53 +05:30
AravindPranera	04e3518fad	Update request_for_quotation.py	2017-11-14 17:13:53 +05:30
AravindPranera	5bae488f25	Update request_for_quotation.py	2017-11-14 17:13:53 +05:30
AravindPranera	86e726158b	Getting Quotation Document in Sales Invoice	2017-11-14 17:13:53 +05:30
AravindPranera	0ebd3c373c	Getting Quotation Document in Sales Invoice	2017-11-14 17:13:53 +05:30
Rushabh Mehta	b8b8dc119f	[fix] item.py fix for _doc_before_save	2017-11-14 16:52:05 +05:30
Rushabh Mehta	cc1262c36d	Add option to clean description html in item description. (#11565) ... * [fix] add item settings * [docs] Item Settings * [fix] enqueue in item_settings.py * [refactor] move to stock settings * [refactor] move to stock settings	2017-11-14 16:36:25 +05:30
Rushabh Mehta	d5c6416d91	[new feature] Product Configurator (via Item Quick Entry) (#11535) ... * [Feature] Item Variant Creation from Quick Entry * [minor] formatted js * [minor] set 3 attribute per page instead of 5 in template * [fix] fixed codecy issue * [fix] label translation * [minor] changed trigger event of item template * [fix] moved item ui tests under stock * [UI test] added test for item attribute * [UI test] added test for creation of item variant from quick entry * [fix] item variant ui test fixes * [wip] * [cleanup] item quick entry * [remove] tests, fixtures were missing * [refactor] use set_only_once in item	2017-11-14 15:27:28 +05:30
tunde	ffa659fd2c	Merge branch 'develop' into payment-terms	2017-11-14 09:59:45 +01:00
Nabin Hait	4d99ebaeb5	Merge branch 'master' into develop	2017-11-14 13:58:37 +05:30
Nabin Hait	0590d1da05	bumped to version 9.2.11	2017-11-14 14:28:37 +06:00
Rushabh Mehta	d8bc8de6ca	[minor] remove unnecessary description in upload attendance, fixes #10603	2017-11-14 12:52:53 +05:30
Rushabh Mehta	98aa581864	[fix] default tax only on insert (#11544) ... * [fix] default tax only on insert * [fix] default tax only on insert * [fix] default tax only on insert	2017-11-14 09:32:32 +05:30
Faris Ansari	3a5dceae18	Add Github Connector (#11259) ... - Add new module ERPNext Integrations	2017-11-13 19:19:13 +05:30
Manas Solanki	e5aa9c5f2f	new report - assessment plan status (#11504) ... * new report - assessment plan status * add the report in the school dashboard * fix for the print format	2017-11-13 18:56:53 +05:30
Manas Solanki	69be5362a5	minor fixes in the assessment result (#11543)	2017-11-13 18:32:06 +05:30
Nabin Hait	ec8a0a22d7	Merge branch 'master' into develop	2017-11-13 15:10:17 +05:30
Nabin Hait	58ab203fc0	bumped to version 9.2.10	2017-11-13 15:40:16 +06:00
Nabin Hait	6605919ecd	GL Entries on sale of an asset (#11538)	2017-11-13 15:06:35 +05:30
Saurabh	feeb47dbbe	[fix] if not students in student groups then raise exception (#11537)	2017-11-13 13:52:58 +05:30
Nabin Hait	deeb1380b1	Ignore paid credit note in outstanding invoices in Payment Entry (#11534)	2017-11-13 13:52:05 +05:30
Saurabh	0f86d86e27	[fix] validate party account (#11517)	2017-11-10 19:21:09 +05:30
Faris Ansari	4ec4e3fb29	[patch] Revert Manufacturing User role (#11514)	2017-11-10 19:15:17 +05:30
Prateeksha Singh	17b7209032	remove erroneous column breaks (#11522)	2017-11-10 18:54:03 +05:30
Prateeksha Singh	731b66b788	remove erroneous column breaks (#11523)	2017-11-10 18:53:52 +05:30
Rushabh Mehta	4313326ba0	[fix] treeview for tasks (#11515) ... [fix] treeview for tasks	2017-11-10 18:52:21 +05:30
Saurabh	a5275a1ba9	Merge branch 'master' into develop	2017-11-10 15:53:44 +05:30
Saurabh	a10cd10640	bumped to version 9.2.9	2017-11-10 16:23:43 +06:00
Saurabh	44ef8654f9	Merge pull request #11510 from rohitwaghchaure/issue_11502 ... Add item directly in the cart only if serial no, batch, barcode has enter in the search field	2017-11-10 15:51:14 +05:30
Saurabh	71862f9024	Merge pull request #11509 from saurabh6790/bom_search_query_fix ... [fix] query param fixes	2017-11-10 15:50:55 +05:30
Rohit Waghchaure	a5e3c3a79f	Add item directly in the cart only if serial no, batch, barcode has enter in the search field	2017-11-10 15:29:26 +05:30
rohitwaghchaure	cc97ec9202	[hotfix] Salary slip, leave considered in amount calculation even if depends on lwp is disabled in salary slip (#11507)	2017-11-10 15:06:58 +05:30
Saurabh	022ab63a0f	[fix] query param fixes	2017-11-10 15:06:02 +05:30
Pawan Mehta	1368ba00bc	[fix] #11337 (#11339)	2017-11-10 14:59:26 +05:30
Saurabh	7b78a83592	Merge branch 'master' into develop	2017-11-10 13:15:04 +05:30
Saurabh	18c8cf965f	bumped to version 9.2.8	2017-11-10 13:45:04 +06:00
Saurabh	7ab28ec562	[fix] give preference to gateway selected on shopping cart settings (#11393)	2017-11-10 11:17:01 +05:30
KanchanChauhan	e59c9ce9f4	Checkbox has_expiry_date in Item to make suer Expiry Date is entered in Batch (#11413)	2017-11-10 11:16:29 +05:30
Alchez	1077c782a3	[Fix] Packing Slip creation if custom field does not have a value (#11423) ... * [Fix] Packing Slip creation if custom field is Column/Section Break * Used no_value_fields and sorted imports * Update packing_slip.py	2017-11-10 11:14:57 +05:30
Nabin Hait	15753074bf	Nestedset model fixes for changing parent and renaming (#11467)	2017-11-10 11:12:43 +05:30
Nabin Hait	8e3da7f70e	Update test_assessment_plan.js	2017-11-10 10:59:17 +05:30
Nabin Hait	887285ed1a	Update test_assessment_plan.js	2017-11-10 10:59:07 +05:30
Manas Solanki	aeb0026354	commits from develop merged PR's (#11491) ... * better student search queries and minor fixes in the student group * remove the print option for the tools * fixes for the chart * minor fixes in the fee module for print and permission, delete redundant doctype * set the naming series and independent dob validation	2017-11-10 10:58:43 +05:30
rohitwaghchaure	1ce48e7032	[fix] POS profile patch (#11501)	2017-11-10 10:53:12 +05:30
Faris Ansari	99e31f97b8	set default params for paging (#11500)	2017-11-10 10:50:49 +05:30
Faris Ansari	4a864c1eea	[fix] Update bom item description (#11498) ... * [fix] Update bom item description * Update item.py	2017-11-09 19:01:21 +05:30
Nabin Hait	c4de619eac	Update assessment_plan.py	2017-11-09 14:36:11 +05:30
Nabin Hait	fe72ed003e	Update test_assessment_plan.js	2017-11-09 11:47:13 +05:30
pratu16x7	40016372c6	[minor][hotfix] naming_series variable assignment	2017-11-08 16:30:15 +05:30
Saurabh	b97f08e0ac	[fixed] merge-conflicts	2017-11-08 15:08:38 +05:30
Saurabh	3894a5ed94	bumped to version 9.2.7	2017-11-08 15:37:33 +06:00
Saurabh	045b2877b7	[fix] remove warehouse from Stock Settings if warehouse wont exists (#11487)	2017-11-08 14:57:03 +05:30
Manas Solanki	a658630751	remove the print option from the tools (#11484) ... * remove the print option for the tools * better student search queries and minor fixes in the student group	2017-11-08 14:55:54 +05:30
Saurabh	d2cef208fe	[fix] catch link validation exception in POS profile and reload fees doctype	2017-11-08 14:44:43 +05:30
Nabin Hait	ff73646212	Made POS Profile mandatory and changed test order	2017-11-08 14:34:38 +05:30
Saurabh	eb760d6d09	Merge branch 'master' into develop	2017-11-08 12:20:46 +05:30
Saurabh	f985ae1379	bumped to version 9.2.6	2017-11-08 12:50:46 +06:00
Saurabh	98aa544f25	Merge branch 'master' into staging	2017-11-08 12:18:50 +05:30
Saurabh	f41b13b736	[fix] merge-conflicts	2017-11-08 12:18:41 +05:30
Saurabh	db781e607a	bumped to version 9.2.5	2017-11-08 12:42:37 +06:00
rohitwaghchaure	521606e433	Merge pull request #11398 from rohitwaghchaure/item_variants_donot_copy_option ... [enhance] In item variants settings added provision, do not update the variants of variants from the template but will copy the value while making new variant aginst the template	2017-11-08 11:49:24 +05:30
Rohit Waghchaure	acc8995c48	[enhance] In item variants settings added provision, do not update the fields of variants from the template but will copy the value while making new variant aginst the template	2017-11-08 11:39:08 +05:30
Sushant Nadkar	72c40f0383	Enabled track seen for Sales Order, Sales Invoice, Production Order, and Delivery Note (#11440)	2017-11-08 11:35:46 +05:30
Shreya Shah	d9e2b24535	task name in gantt view - clickable (#11459)	2017-11-08 11:35:19 +05:30
rohitwaghchaure	f688af3809	[fix] Offline pos name is not defined issue in the POS (#11469)	2017-11-08 11:33:39 +05:30
Achilles Rasquinha	7fd20f303f	moved from MySQLdb to pymysql (#11462)	2017-11-08 11:33:24 +05:30
rohitwaghchaure	9f2a27c99c	Merge pull request #11477 from rohitwaghchaure/pos_profile_test_cases ... [fix] POS Profile test cases	2017-11-07 16:35:52 +05:30
Rohit Waghchaure	35fc45eff9	[fix] POS Profile test cases	2017-11-07 10:43:16 +05:30
Rohit Waghchaure	57cc924d29	[Fix] Fast clicking on an item, showing invalid grand total and quantity in the POS cart	2017-11-06 18:42:37 +05:30
Manas Solanki	36e2fb8d58	minor fixes in the fee module for print and permission, delete redundant doctype (#11430)	2017-11-06 17:44:59 +05:30
Nabin Hait	e552a51266	Minor cleanups	2017-11-06 17:39:31 +05:30
pawan	436f7b980c	codacy issues	2017-11-06 17:39:31 +05:30
pawan	438dfc081b	fix codacy issues	2017-11-06 17:39:30 +05:30
pawan	d59225635d	remove old report	2017-11-06 17:39:30 +05:30
pawan	b699b86b76	Add Total Row	2017-11-06 17:39:30 +05:30
pawan	8d1d64aa29	[fix] #11449	2017-11-06 17:39:30 +05:30
pawan	e61a275651	[fix] #11427	2017-11-06 17:39:30 +05:30
Manas Solanki	6ba2eda04a	fixes for the chart (#11460)	2017-11-06 17:22:14 +05:30
rohitwaghchaure	bcb7854340	Merge pull request #10982 from netchampfaris/multiple-users-pos-profile ... [Enhancement] Allow Multiple users in POS Profile	2017-11-06 16:45:01 +05:30
Manas Solanki	40ef7e7039	patch for renaming the pos profile and setting the pos profile name	2017-11-06 13:53:52 +05:30
Manas Solanki	b1616a0cb3	changes in thepos profile	2017-11-06 13:53:52 +05:30
Manas Solanki	3f0dfd720f	set the pos profile in the sales invoice	2017-11-06 13:53:52 +05:30
Nabin Hait	f15a8409eb	[tests] Test case fixes for task and project (#11445) ... * [tests] Test case fixes for task and project * Removed hard-coded dates from test cases * Codacy fix	2017-11-06 11:11:34 +05:30
Saurabh	e850655c1d	Merge branch 'master' into staging	2017-11-03 16:56:24 +05:30
Saurabh	0faa61009f	Merge branch 'master' into develop	2017-11-03 16:56:23 +05:30
Saurabh	56cb0aa9c1	bumped to version 9.2.4	2017-11-03 17:26:23 +06:00
Faris Ansari	cbaa0e629c	fix codacy	2017-11-03 11:35:49 +05:30
Manas Solanki	76ce074c63	return the account details if and only if there is single account of that type (#11407)	2017-11-02 18:12:47 +05:30
rohitwaghchaure	7677ff00a2	[hotfix] User not able to edit exchange rate even if Allow Stale Exchange Rates is disabled in the accounts settings (#11409)	2017-11-02 18:12:14 +05:30
Saurabh	62fd4007b0	Merge branch 'master' into staging	2017-11-02 12:14:42 +05:30
Saurabh	3be72ef187	Merge branch 'master' into develop	2017-11-02 12:14:41 +05:30
Saurabh	870ce3cfea	bumped to version 9.2.3	2017-11-02 12:44:40 +06:00
rohitwaghchaure	1473a37d8c	Merge pull request #11395 from jay-parikh/develop ... POS - Add % to the Discount Field #9749	2017-11-02 12:11:12 +05:30
Saurabh	0ad2cc3def	Merge pull request #11403 from tundebabzy/issue-11402 ... Error In Employee Loan Form (#11402)	2017-11-02 12:09:54 +05:30
Saurabh	00f6c2d61d	Merge pull request #11417 from rohitwaghchaure/issue_not_save_v9 ... [Fix] Customer is manadatory even if customer has selected in the Issue	2017-11-02 12:07:32 +05:30
Saurabh	38008f8daa	Merge pull request #11406 from rohitwaghchaure/payment_entry_differnece_amount_issue ... [Fix] Wrong difference amount in the payment entry for the internal transfer type	2017-11-02 12:07:14 +05:30
Saurabh	afb63af3b6	Merge pull request #11397 from rohitwaghchaure/delivery_note_issue_from_so ... [Fix] Getting an error while making delivery note from sales order and sales order has no item code	2017-11-02 12:06:08 +05:30
Rohit Waghchaure	816ce33daf	[Fix] Customer is manadatory even if customer has selected in the Issue	2017-11-01 19:02:09 +05:30
Rohit Waghchaure	99748dbacf	[Fix] Wrong difference amount in the payment entry for the internal transfer type	2017-11-01 11:45:02 +05:30
tunde	31287b00a6	call get_employee_loan_application only when appropriate	2017-10-31 18:10:17 +01:00
Faris Ansari	3d59179205	Load default pos profile if not found	2017-10-31 21:56:16 +05:30
Manas Solanki	a941a394ba	set the naming series and independent dob validation	2017-10-31 17:34:50 +05:30
Rohit Waghchaure	5ec9f6930b	[Fix] Getting an error while making delivery note from sales order and sales order has no item code	2017-10-31 15:26:56 +05:30
Jay Parikh	96f167573b	POS - Add % to the Discount Field #9749	2017-10-31 01:07:09 -07:00
Zarrar	6d41a9a647	Converting Task to a Tree structure (#11117) ... * added support for tree view * nestedset added to handle tree based structure * treeview ui added * removed is_group dependency * added validation while editing a group-task * codacy fix * BOM like filter added * Added ui-test for treeview-task	2017-10-31 13:10:55 +05:30
Manas Solanki	160e710ebf	set bank account only if there is single bank type account (#11363) ... * set bank account only if there is single bank type account * Update journal_entry.py	2017-10-31 13:04:02 +05:30
Faris Ansari	40611e4f69	[fix] hub get_item_details (#11383)	2017-10-31 13:00:09 +05:30
KanchanChauhan	21f946f365	[Minor] Source Warehouse should be filtered by Company in Production Order (#11376)	2017-10-31 12:59:45 +05:30
Prateeksha Singh	6b26e391b8	use the new frappe charts :D (#11391)	2017-10-31 12:58:48 +05:30
Faris Ansari	895aa7b7ac	fix codacy	2017-10-30 17:12:50 +05:30
Faris Ansari	7095de03ef	Merge branch 'develop' into multiple-users-pos-profile	2017-10-30 15:00:55 +05:30
Faris Ansari	79be8f969f	Add to patches.txt	2017-10-30 14:46:09 +05:30
ci2014	e741b91f1d	Update issue.js (#11381) ... Make the close / reopen button more flexible for customized user status. For example, if the user has several status, it will now show the Close button every time the ticket is not closed! It will show Reopen only, if the ticket is closed, and not if it's on hold for example. This will make it more flexible.	2017-10-30 10:13:05 +05:30
tunde	5ea10a77a3	Merge branch 'develop' into payment-terms	2017-10-27 17:37:15 +01:00
Faris Ansari	638e3f9fa6	Merge pull request #11154 from netchampfaris/hub-item-image ... [hub] fix company page routing	2017-10-27 17:07:10 +05:30
Saurabh	1bc8e32f94	Merge pull request #11360 from manassolanki/fix-fee-patch ... fix the fee patch	2017-10-27 17:00:11 +05:30
Faris Ansari	8c1099d236	Add POS Profile User DocType	2017-10-27 16:48:07 +05:30
Manas Solanki	8637e52d4c	fix the fee patch	2017-10-27 11:55:15 +05:30
ashish	b883e4ee0d	customer.py -- get_credit_limit function which gets called by the above customer_credit_balance report is updated to deduct the amount of sales order for which credit limit bypass flag is set. cint function is added.	2017-10-26 20:32:08 +05:30
ashish	ca2250c440	sales_invoice.py -- Check credit limit when make delivery is done from sales invoice.We need to check the credit limit as there could be multiple partially paid sales order(note we are bypassing credit check at sales order) so we need to recheck credit balance of customer to avoid any delivery crossing credit limit from sales invoice.cint function is added.	2017-10-26 20:22:34 +05:30
ashish	751b05f1e8	sales_order.py -- Three changes are done (a) if bypass credit limit check is enabled we should not check customer credit on submit of sales order (b.1/b.2) There is provision to make delivery note and sales invoice from sales order. Since credit limit is bypassed at sales order level we need to check credit of customer on make of (b.1)delivery note or (b.2)sales invoice. cint function is added.	2017-10-26 20:15:24 +05:30
ashish	9dfc0f32ab	customer.json -- a checkbox field is added which gives user ability to bypass credit limit check at sales order level for a customer. It is default to 0. Also patch is added to update value of new field to 0 after migrate. ... test_customer.js -- It is auto generated file as customer.json is modified. And it is removed.	2017-10-26 20:07:32 +05:30
tunde	bbce7b7e5d	get attribute with get method	2017-10-26 14:31:13 +01:00
tunde	6575a615b1	get attribute with get method	2017-10-26 14:30:18 +01:00
tunde	14e97ce0c8	Merge branch 'develop' into payment-terms	2017-10-26 13:35:42 +01:00
Faris Ansari	c83413134d	Merge pull request #11294 from revant/map_field_docs ... [Docs] added field for storing map	2017-10-26 17:19:46 +05:30
Nabin Hait	c799a22d55	Merge branch 'master' into staging	2017-10-26 14:35:34 +05:30
Nabin Hait	edef9811f9	Merge branch 'master' into develop	2017-10-26 14:35:34 +05:30
Nabin Hait	819c50c042	bumped to version 9.2.2	2017-10-26 15:05:33 +06:00
Faris Ansari	6887cedaea	[fix] item qty trigger (#11349)	2017-10-26 14:34:15 +05:30
Nabin Hait	aa7896f1e1	[test] Fixed physician test cases (#11347)	2017-10-26 14:33:28 +05:30
Nabin Hait	52909b73bb	[test] Fixed advance jv cancellation (#11333)	2017-10-26 11:06:07 +05:30
Saurabh	b445633e56	Merge branch 'master' into staging	2017-10-26 09:59:22 +05:30
Saurabh	0d597cef8d	Merge branch 'master' into develop	2017-10-26 09:59:22 +05:30
Saurabh	d0131762cc	bumped to version 9.2.1	2017-10-26 10:29:22 +06:00
Saurabh	92a6155bb0	[fix] translate domain	2017-10-26 09:44:51 +05:30
Faris Ansari	33d74ce6e5	Merge branch 'develop' into hub-item-image	2017-10-25 18:06:42 +05:30
Saurabh	d6e67ce123	[fix] check for null date fields (#11334)	2017-10-25 17:44:22 +05:30
Nabin Hait	6a4e230cde	[fix] Status of Item (#11326)	2017-10-25 17:06:30 +05:30
rohitwaghchaure	c65f1d7745	Search item using name instead of item code (#11327)	2017-10-25 17:04:56 +05:30
rohitwaghchaure	e02ee898e9	[Fix] Production order not displaying in the calendar view, if po has no operations (#11328)	2017-10-25 17:04:31 +05:30
rohitwaghchaure	2e6f6d6749	[minor] cleanup code (#11331)	2017-10-25 17:03:49 +05:30
ashish	8fbf10f5db	New test case files added.(a)test_sales_order_with_bypass_credit_limit_check.js -- New feature: i.e. bypass credit limit check at sales order.(b)test_sales_order_without_bypass_credit_limit_check.js --Regression test case : the existing default flow is checked i.e. credit limit check happens at sales order level	2017-10-25 16:20:50 +05:30
ashish	fb364df091	customer_credit_balance.py -- Credit limit should now reflect outstanding amount for each customer based on value of flage bypass credit limit check at sales order level. A new column is added to show the value of this flag. customer.py -- get_credit_limit function which gets called by the above customer_credit_balance report is updated to deduct the amount of sales order for which credit limit bypass flag is set	2017-10-25 16:17:55 +05:30
ashish	ff20182d03	sales_invoice.py -- Check credit limit when make delivery is done from sales invoice.We need to check the credit limit as there could be multiple partially paid sales order(note we are bypassing credit check at sales order) so we need to recheck credit balance of customer to avoid any delivery crossing credit limit from sales invoice	2017-10-25 16:11:58 +05:30
ashish	8ad4efee25	sales_order.py -- Three changes are done (a) if bypass credit limit check is enabled we should not check customer credit on submit of sales order (b.1/b.2) There is provision to make delivery note and sales invoice from sales order. Since credit limit is bypassed at sales order level we need to check credit of customer on make of (b.1)delivery note or (b.2)sales invoice	2017-10-25 16:07:21 +05:30
ashish	06e6a82d56	customer.json -- a checkbox field is added which gives user ability to bypass credit limit check at sales order level for a customer. test_customer.js : auto generated file as customer.json is modified	2017-10-25 15:56:39 +05:30
Nabin Hait	fb734976eb	Removed appintment field from Invoice, it should be a custom field and will be added from domain settings	2017-10-25 15:53:07 +05:30
Nabin Hait	8f2500083c	Merge branch 'master' into develop	2017-10-25 14:10:39 +05:30
Nabin Hait	e146143bd1	bumped to version 9.2.0	2017-10-25 14:40:38 +06:00
Nabin Hait	4d22b6db30	Fixed Merge Conflict	2017-10-25 14:09:46 +05:30
Nabin Hait	cd3dbcb2ef	Fixed Merge Conflict	2017-10-25 14:07:25 +05:30
Nabin Hait	c7bd77111e	bumped to version 9.1.8	2017-10-25 14:32:32 +06:00
rohitwaghchaure	4a60554b91	Green indicator in the cart for non stock item (#11325)	2017-10-25 13:59:29 +05:30
rohitwaghchaure	3dc21b099d	[Fix] Translation issue (#11323)	2017-10-25 12:38:17 +05:30
tundebabzy	40a02769c5	Error in the Address fetched in Sales Order.(#11129) (#11145) ... * add new function - `get_party_shipping_address` * `swap `get_default_address` with `get_party_shipping_address` * test cases * properly sets order by direction * move `get_party_shipping_address` to party.py * fix test module import	2017-10-25 12:24:34 +05:30
tundebabzy	bafcd7418a	Add Bundle Description Field To Product Bundle (#11122) ... * add description field that shows in list view * description field should be simply `description`	2017-10-25 12:22:08 +05:30
Makarand Bauskar	085b4842a1	[minor] minor fixes in get_company_details for Hub page (#11168)	2017-10-25 12:19:10 +05:30
Makarand Bauskar	e6712c129c	[hotfix] fixed Permissions Error while fetching allow_stale field value from Accounts Settings (#11182) ... * [hotfix] fixed Permissions Error while fetching allow_stale field value from Accounts Settings * [minor] renamed the allow_stale_rate method to stale_rate_allowed	2017-10-25 12:17:40 +05:30
Doridel Cahanap	49a7bde6e2	[minor] Label for Training Event in Training Program Dashboard (#11280)	2017-10-25 12:15:17 +05:30
Manas Solanki	464289b726	copy the older total amount field and corrsp. changes in report (#11322)	2017-10-25 12:13:42 +05:30
Nabin Hait	1c1237537b	Subscription fixes (#11292) ... * Subscription fixes * Removed recurring fields, cleanup code	2017-10-25 12:10:44 +05:30
Nabin Hait	b7483f6dfd	Update item.json	2017-10-25 11:58:02 +05:30
tundebabzy	cba7a11d75	Make Variant does not copy UOM properties (#10887) (#11261) ... * add `uoms` to Item Variant Settings if not already added * add new patch to patch list * change uoms field to no_copy:0	2017-10-25 11:57:10 +05:30
Pawan Mehta	07ab4622e8	[fix] #9824 - Calculate costing amount even if billable is unchecked (#11310) ... * [fix] #9824 * fix code	2017-10-25 11:55:49 +05:30
Narciso E. Núñez Arias	47caf51efe	[docs] Translate the Projects section of the Manual to Spanish (#11319) ... * [docs] Translate projects module. Add index page * [docs] Translate activity cost page from projects module. * [docs] Translate activity type page from projects module. * [docs] Translate the Project Costing article in project module * [docs] Translate the Project page in projects module * [docs] Translate the Task page in projects module * [docs] Translate the Time Log Batch page in projects module	2017-10-25 11:53:10 +05:30
rohitwaghchaure	2672c331af	Validation for duplicate offline pos (#11281)	2017-10-25 11:47:18 +05:30
Nabin Hait	f4283a3ebf	Moved company field to the top in BOM (#11283)	2017-10-25 11:46:47 +05:30
Nabin Hait	8a0943ead7	Unlink reference doc on Journal Cancellation only if advance (#11285)	2017-10-25 11:46:35 +05:30
Nabin Hait	82c9352d53	Update variant description based on attribute if not already there (#11302)	2017-10-25 11:46:20 +05:30
rohitwaghchaure	311823aca1	Validate stock exists against template item (#11305)	2017-10-25 11:45:51 +05:30
Charles-Henri Decultot	7862eb444f	[Hotfix] Addition of an empty tax group in the french CoA (#11306)	2017-10-25 11:44:46 +05:30
Neil Trini Lasrado	1f99bea6ce	Pass sender as contact email in Opportunity (#11308) ... Always pass sender as the contact email while creating an opportunity for a website enquiry.	2017-10-25 11:44:12 +05:30
Manas Solanki	a5eee4629f	Fix UI tests (#11309) ... * decrease the timeout * delete the duplicate test	2017-10-25 11:42:22 +05:30
Nabin Hait	6c06e700d6	[Fix] Unallocated amount considering deductions (#11314)	2017-10-25 11:42:05 +05:30
Revant Nandgaonkar	f8006b140f	[Docs] Map field renamed to Geolocation	2017-10-25 11:18:29 +05:30
tunde	c8d2361b81	Merge branch 'develop' into payment-terms	2017-10-24 12:25:29 +01:00
Revant Nandgaonkar	010f619ed3	[Docs] added field for storing map ... related PR https://github.com/frappe/frappe/pull/4327	2017-10-23 17:25:52 +05:30
vishalseshagiri	5c5a853894	Update customer_group.py (#11270) ... Minor syntactical error !	2017-10-23 11:35:49 +05:30
Doridel Cahanap	b06f155ceb	[minor] Set Quick Entry to False in Training Event (#11279)	2017-10-23 11:35:12 +05:30
Nabin Hait	7533101d4b	Merge branch 'master' into develop	2017-10-21 11:29:40 +05:30
Nabin Hait	e7eda65968	bumped to version 9.1.7	2017-10-21 11:59:39 +06:00
rohitwaghchaure	5fdd26f1e7	[fix] Discount amount not reset for new order in offline pos (#11258)	2017-10-21 11:23:45 +05:30
Nabin Hait	c44290955e	Minor fix in patches (#11268)	2017-10-21 11:20:18 +05:30
Nabin Hait	4825eccad5	UI test fixed for supplier quotation (#11260) ... * UI test fixed for supplier quotation * ui test fixes for purchase order * Fixed number of assertion in student admission test * Fixed multiple ui tests * ui tests	2017-10-21 10:44:30 +05:30
Doridel Cahanap	5a4d5bfaf2	Add Training Program DocType, Script, Path and Doc (#11181) ... * Add Training Program Doctype, Script, Config and documentation * Add Training Program to Training Event * [Test Case] Training Event in a Training Program	2017-10-20 11:31:15 +05:30
Nabin Hait	b4f5f14438	Timeout increased for setting __newname (#11252) ... * Timeout increased for setting __newname * UI test fixes * fixed ui test for PO * ui tests * ui tests * ui tests * ui tests * ui tests	2017-10-20 11:26:17 +05:30
tunde	09ce68ec19	Merge branch 'develop' into payment-terms	2017-10-19 17:47:31 +01:00
Nabin Hait	bb60a59b96	Fixed asset test cases due to tax rule (#11247) ... * Fixed asset testcases due to tax rule * Delete tax rule record after running test cases * Fixed test cases * Fixed test cases * Fixed subscription tests due to tax rule	2017-10-19 12:14:37 +05:30
Neil Trini Lasrado	eb662b5a9a	Added Test Cases	2017-10-18 18:16:47 +05:30
Neil Lasrado	7935d186f9	Auto set warehouses in Production Order if default warehouses are set in Manufacturing Settings and not mentioned in Production Order	2017-10-18 18:16:47 +05:30
Neil Lasrado	af091ac5dd	[BUG] Map Production Order with the exact Sales Order line item	2017-10-18 18:16:46 +05:30
Neil Lasrado	5afc194742	[BUG] Fixes make Production Order from Sales Order	2017-10-18 18:16:46 +05:30
Saurabh	5fa2adcca9	Merge branch 'master' into develop	2017-10-18 16:23:44 +05:30
Saurabh	47e405516b	bumped to version 9.1.6	2017-10-18 16:53:43 +06:00
Saurabh	3173be9b17	[minor-fix] patch fix	2017-10-18 16:14:20 +05:30
Saurabh	8227422124	[fix] remove explicit variant save	2017-10-18 16:03:40 +05:30
Saurabh	a7d5f94d4a	[fix] Do not append description to variant if description already exists (#11204)	2017-10-18 16:02:08 +05:30
Ranjith Kurungadam	7624e7bf85	[hot-fix] sql getting translated (#11243) ... * fix remove _ in frappe.sql * use %s replacement for sql	2017-10-18 15:48:12 +05:30
Jamsheer	dd7c1b87c5	Healthcare Doctypes - Docfield Clean up (#11065) ... * Healthcare Doctype Clean up - updated index, in_filter, no_copy and ect. * Healthcare Doctype - remove frappe import	2017-10-18 12:13:15 +05:30
Makarand Bauskar	3e4ca4219f	[hotfix] fixed 'ValueError: Unknown string format' error if the from_time value is null (#11162)	2017-10-18 11:16:47 +05:30
Helkyd	7ec7a45f05	Salary Detail Abbr (#11165) ... When processing via Process Salary Abbr is not filled unless if Hourly pay ... this is required for later check what Component is or was added for Employee	2017-10-18 11:16:24 +05:30
Nabin Hait	cfb68dee34	Merge branch 'develop' into develop	2017-10-18 11:16:17 +05:30
Vishal Dhayagude	3e02d80636	[fix] Travis Client Side Failure (#11198)	2017-10-18 11:10:45 +05:30
Nabin Hait	5ab6ff2470	[fix] Fetch raw material rate based on last purchase rate (#11205) ... * [fix] Fetch raw material rate based on last purchase rate * Don't fetch sub-assembly item rate from BOM if not mentioned by the user	2017-10-18 11:09:11 +05:30
Brown-Harry Boma	11e964d442	Set transaction type in pricing rule only if unavailable (#11229) ... * Set transaction type in pricing rule only if unavailable * Update pricing_rule.py	2017-10-18 11:07:09 +05:30
rohitwaghchaure	a516856c32	[Fix] Getting an error duplicate name while making an invoice in draft mode (#11230)	2017-10-18 11:05:10 +05:30
Javier Wong	84f7ba8699	[hotfix] Allow Sales User and Purchase User to Read Account Settings (#11233) ... * [hotfix] Allow Sales User and Purchase User to Read Account Settings This fixes https://discuss.erpnext.com/t/not-permitted-message-for-new-quotation-and-sales-order/29261/4. * Added back Accounts Manager Permissions	2017-10-18 11:04:15 +05:30
rohitwaghchaure	a3fe5b8528	[Fix] Disable desk access view to supplier (#11234)	2017-10-18 10:53:34 +05:30
jigneshpshah	bad5e90e46	Priority of credit limit check functionality (#11232) ... CREDIT LIMIT field is at customer, customer group and company level . Explanation given on priority of the three levels.	2017-10-18 10:53:11 +05:30
Nabin Hait	a9feddbb79	Testcase fixes (#11238) ... * Restaurant test records fixed * Fixes for test cases	2017-10-18 10:52:48 +05:30
KanchanChauhan	44734049f5	[Minor] Populate Expense Claim Description from Expense Claim Type (#11156)	2017-10-17 17:23:26 +05:30
Rushabh Mehta	bc4e2cd9c1	[added] hospitality domain (#11020) ... * [added] hospitality domain * [tests] wip * [tests] for restaurant * [fix] tests for new naming * [docs] added restaurant docs * [docs] added restaurant docs	2017-10-17 12:30:34 +05:30
Prateeksha Singh	bfb108d722	Replace c3 (#11112) ... * [charts] replace in asset.js * replace in reports	2017-10-17 12:03:02 +05:30
Nabin Hait	45a640df08	Update payment_entry_reference.json	2017-10-16 12:58:32 +05:30
Nabin Hait	53659cf0bd	Update payment_entry_reference.json	2017-10-16 12:57:51 +05:30
Makarand Bauskar	80f333950b	[minor] fixed AttributeError: 'GrossProfitGenerator' object has no attribute 'grouped_data' (#11195)	2017-10-16 11:27:22 +05:30
mbauskar	cd4202c2f7	Merge branch 'master' into develop	2017-10-15 19:10:56 +05:30
mbauskar	bbbce58884	bumped to version 9.1.5	2017-10-15 19:40:55 +06:00
rohitwaghchaure	8bf7230fcc	[Fix] New invoice showing old paid amount if POS Profile is not created (#11160)	2017-10-15 19:09:14 +05:30
rohitwaghchaure	496174bbdf	[Fix] Naming series not copy from referebce document to new document in subscription (#11196)	2017-10-15 19:08:42 +05:30
Nabin Hait	4072d71769	Delete api.py	2017-10-11 23:53:57 +05:30
Helkyd	e9f2b176bc	Salary Detail Abbr ... When processing via Process Salary Abbr is not filled unless if Hourly pay ... this is required for later check what Component is or was added for Employee	2017-10-11 15:02:27 +01:00
Faris Ansari	7997271368	[hub] fix company page routing	2017-10-11 15:46:21 +05:30
Saurabh	5ffed60916	Merge branch 'master' into develop	2017-10-11 14:39:11 +05:30
Saurabh	15411fcf70	bumped to version 9.1.4	2017-10-11 15:09:10 +06:00
rohitwaghchaure	76a9cefc9c	Merge pull request #11151 from rohitwaghchaure/minor_fix_title ... [minor] Title not showing in payment modal	2017-10-11 12:05:29 +05:30
Rohit Waghchaure	4f7873b9df	[minor] Title not showing in payment modal	2017-10-11 12:03:49 +05:30
Saurabh	ad9afe68f3	Merge pull request #11119 from rohitwaghchaure/default_company_pos ... [enhance] Provision to select company in the POS screen if company is not defined in the global defaults	2017-10-11 12:00:56 +05:30
Saurabh	41e2b98b63	Merge pull request #11137 from mbauskar/healthcare ... [hotfix] passed localise item_group value for create_lab_test_itemsfield	2017-10-11 12:00:12 +05:30
Rohit Waghchaure	3f309e1c20	Multiple items showing for single barcode	2017-10-11 02:14:56 +05:30
Rohit Waghchaure	9bb81ee1cb	[fix] Total amount showing wrong in the payment modal if user has changed the qty after payment	2017-10-11 01:54:36 +05:30
Makarand Bauskar	4cdb9dee09	[minor] changed the modified date for the subscription doctype (#11142)	2017-10-10 18:41:00 +05:30
mbauskar	ee9da67173	[hotfix] passed localize item_group value for create_lab_test_itemsfield	2017-10-10 12:20:45 +05:30
Saurabh	9893a2d608	Merge branch 'master' into develop	2017-10-10 11:22:39 +05:30
Saurabh	47b2a5f7d1	bumped to version 9.1.3	2017-10-10 11:52:38 +06:00
tunde	37c2b6116c	Merge branch 'develop' into payment-terms	2017-10-09 15:42:47 +01:00
Faris Ansari	172f28fa06	Merge pull request #11133 from netchampfaris/fix-hub-sync ... fix Hub Sync plan	2017-10-09 19:31:08 +05:30
Faris Ansari	d635a2646b	fix Hub Sync plan	2017-10-09 19:30:11 +05:30
Saurabh	f347e23556	[fix] upload attendacne with with no_socketio param	2017-10-09 16:13:21 +05:30
mbauskar	966b3c156a	[conflicts] resolved merge conflicts	2017-10-09 15:20:30 +05:30
mbauskar	f9577652a0	bumped to version 9.1.2	2017-10-09 15:48:51 +06:00
tunde	e27f5dee1f	Merge branch 'develop' into payment-terms	2017-10-09 10:11:05 +01:00
Rohit Waghchaure	d270748eea	[Fix] Provision to select company in the POS screen if company is not defined in the global defaults	2017-10-09 12:54:26 +05:30
Doridel Cahanap	5ba39f3f83	Add has_certificate and level fields in Training Event (#11093)	2017-10-09 12:45:28 +05:30
tundebabzy	2622d370c6	deal zero division possibility (#11098)	2017-10-09 12:44:24 +05:30
rohitwaghchaure	e181dd4c24	[patch] To add healthcare domain (#11105)	2017-10-09 12:43:36 +05:30
tundebabzy	7f9d75521e	Confirmation desired before cancelling appointment (#10996) (#11106) ... * shows confirm dialog when user clicks cancel * indentation and frm as per review	2017-10-09 12:43:18 +05:30
Makarand Bauskar	eaf0abedd4	[hotfix] ignore if student email address field value is None (#11116)	2017-10-09 12:42:18 +05:30
Manas Solanki	f91ad75b5a	test, patch, docs for student admission (#11075)	2017-10-09 12:41:24 +05:30
tunde	1db7faa862	Merge branch 'develop' into payment-terms	2017-10-06 09:37:10 +01:00
Doridel Cahanap	5cb6c38a34	Add Calendar in Training Event Doctype (#11090)	2017-10-06 11:50:05 +05:30
Rohit Waghchaure	62ce218fc2	Show total instead of net total	2017-10-06 11:16:46 +05:30
Rohit Waghchaure	beeba8b37a	[Fix] Discount field not displaying in offline POS	2017-10-06 09:50:43 +05:30
Rohit Waghchaure	b870d0081b	[fix] Online print format in pos profile field not displaying	2017-10-06 09:31:40 +05:30
tunde	d82677f1e6	Merge branch 'develop' into payment-terms	2017-10-06 02:23:45 +01:00
Nabin Hait	7eaeec951d	Merge branch 'schilgod-develop' into develop	2017-10-05 19:54:17 +05:30
Nabin Hait	5a834209d0	Cleanup of PO schedule date pull requests	2017-10-05 19:51:10 +05:30
Faris Ansari	e3a5899980	[hub] Add hub category filters, fix minor issues (#11079)	2017-10-05 19:43:08 +05:30
Stavros Anastasiadis	455c3ebb27	Add as optional field link Company (#11068)	2017-10-05 18:45:37 +05:30
Stavros Anastasiadis	58b587834e	Provide a minor warning message if no stock levels are availiable (#11074) ... * Provide a minor warning message if no stock levels are availiable * Update item_dashboard.js	2017-10-05 18:44:50 +05:30
Stavros Anastasiadis	e31757b001	Show Stock Level section only to stock maintain items (#11073)	2017-10-05 18:41:51 +05:30
rohitwaghchaure	e0dfd1608e	[Fix] Auto add item in the cart if sinfle items found in the serach (#11072)	2017-10-05 18:30:51 +05:30
Nabin Hait	395cf4689b	Cleanup of schedule date functionality in Material Request	2017-10-05 18:27:37 +05:30
Prateeksha Singh	925e9776e8	[hub] rename is_hub_item to is_item_from_hub (#11069) ... * [hub] rename is_hub_item to is_item_from_hub * [rename] is_hub_item to is_item_from_hub	2017-10-05 17:17:41 +05:30
AravindPranera	9c0d30a087	Fetching Document ID also in Email Subject while clicking "Send Supplier Emails" button (#10874)	2017-10-05 17:08:32 +05:30
Utkarsh Goswami	4cb4d2f155	Tests for payment entry against purchase invoice (#10930)	2017-10-05 16:51:42 +05:30
Utkarsh Goswami	975d28307a	Payroll feature (#10900)	2017-10-05 15:59:51 +05:30
rohitwaghchaure	607b5d4985	[Fix] Negative qty issue in POS (#11070) ... * [Fix] Negative qty issue in POS * Update point_of_sale.js	2017-10-05 15:57:58 +05:30
Stavros Anastasiadis	ea390effa5	Add multirows in Attendees selection (#11067)	2017-10-05 15:31:25 +05:30
Nabin Hait	34ad2e6a60	Use format_currency only if fieldtype is currency	2017-10-05 15:28:43 +05:30
Nabin Hait	f8ad0cbe70	Merge branch 'develop' of https://github.com/Helkyd/erpnext-1 into Helkyd-develop	2017-10-05 15:02:50 +05:30
Manas Solanki	0518001bdc	Changes in Student Admission (#11019) ... * configurable student admission * validate dob and admission date from student admission * add in hooks and fix codacy	2017-10-05 14:31:31 +05:30
Doridel Cahanap	25db832be1	[minor] Add "Attendance" in grid view for Training Event Employee (#11063)	2017-10-05 14:20:43 +05:30
Makarand Bauskar	f23788bb7d	[hotfix] Show Make button only for Email communication (#10876)	2017-10-05 14:19:45 +05:30
mbauskar	74ce391303	Merge branch 'master' into develop	2017-10-05 13:36:50 +05:30
mbauskar	8c3d19e2ab	bumped to version 9.1.1	2017-10-05 14:06:49 +06:00
Rohit Waghchaure	f7a856b913	[Fix] Rate not fetched in the POS, User trying to add an item in the cart before loading of frm	2017-10-05 13:31:29 +05:30
Nabin Hait	26507d7867	Removed deprecated hub functions	2017-10-05 13:10:32 +05:30
Nabin Hait	d6d99e0d59	Removed duplicate field related to hub from Item	2017-10-05 12:39:42 +05:30
Nabin Hait	729aa2025a	Show commission section for pos as well (#11059)	2017-10-05 12:21:36 +05:30
Nabin Hait	7d4fd35aa3	Add POS Settings link in Accounts module (#11060)	2017-10-05 12:20:33 +05:30
rohitwaghchaure	e87a076f1d	Update link in the pos for offline and online mode from pos settings (#11061)	2017-10-05 12:20:20 +05:30
Faris Ansari	fd345f8e90	Hub (#10934) ... * [WIP]Hub * [listing] Show items, users and item_groups * Show filters * [start] cart, api for rfq and opp * rfq working * [wip] keys * wip quotes * [hub] register/unregister * [hub] rename password to access_token, remove passed company field * [hub] publishing cases, api call wrapper * [hub] add and remove fields working * [hub] fix flags, update on client save working * [hub] new hub page, client item CUD at hub working * listing, standard rate, local site hack * item listing, item page, search, back to home * [hub] implement hub company * [hub] company filter * [hub] basic rfq-ing, item page cleanup * categories wip * [hub] use get_doc_before_save() * [hub] send opportunity message to hub, api to make locally * [hub] enqueueing in hub api request wrapper * cleanup * [hub] refactor shopping cart's product.py to reuse * sync dynamic item fields daily * Scheduler heartbeat check * [wip] hub categories * [hub] wip enqueued callbacks * [hub] outgoing messages, fixing callback loop * [hub] bug: callback save after primary save * [hub] pricing, stock, currency * [hub] replace send_hub_request with make_and_enqueue * add hub.less, refactor code * Remove template html files, add styling for hub item cards * fix paging * add breadcrumb * Add sidebar * [hub] add company page, change country * [hub] order_by filters * [hub] make hub category a tree * [hub] enqueue batched item enqueueing * [hub] requested products page * [minor] * update hub url * [fix] url * [fix] more reform * fix recursion * [hub] data migration plans as jsons * Hub register, create data connector, sync with run * [add] user registration by session user * Removed hub_message * Remove sync code from hub_settings * Remove hub methods from item.py * Update Hub Sync plan * Hub unregister * Update Hub connector on reregister * Dont delete Hub Connector on unregister * Enable hub on success response * Add new hub whitelisted methods * [hub] list working * Hub register from hub page * [hub] Add hub logo in desk icon, link to page * [hub] hide page head on empty state * [hub] make rfq * [hub] push opportunity doc, poll for opportunity docs * add fields to item mapping * update hub mappings * Make RFQ * [hub] item, home routing * Make rfq and send opportunity refactor * [hub][fix] remote lead data * images passed as base64 * set default company on register * Revert "images passed as base64" This reverts commit 0b033a5fb7072b2d39a1b87a47dc41e7af707bb4. * Add sync to hub page * Prompt for publish items to hub * add post process to hub document to lead * Rename Hub document to Hub message, create opportunity in post process	2017-10-05 11:17:30 +05:30
Nabin Hait	b290e3a4e7	bumped to version 9.1.0	2017-10-04 18:51:34 +06:00
Nabin Hait	fc712aea32	Merge branch 'master' into develop	2017-10-04 18:05:20 +05:30
Nabin Hait	54c725dcd1	bumped to version 9.0.9	2017-10-04 18:35:19 +06:00
rohitwaghchaure	1e2c554e61	[Fix] Stock entry multi uom batch validation issue (#11049)	2017-10-04 17:52:49 +05:30
tundebabzy	65dfd09947	fix wrong variable name (#11050)	2017-10-04 17:51:44 +05:30
Javier Wong	61287e3c53	[fix] Change Sample Item Error Message to Zero Valuation Rate (#10935) ... Change Sample Item Error Message to Zero Valuation Rate	2017-10-04 16:01:34 +05:30
Makarand Bauskar	1b67d71139	[minor] add the Lead in email account -> append_to field (#10983)	2017-10-04 15:55:56 +05:30
Doridel Cahanap	32456b0f14	[minor edits] BOM Stock Report (#11012) ... * HTML for BOM Stock Report to show filters in PDF * Added BOM Stock Report in Manufacturing Config under Report	2017-10-04 15:54:44 +05:30
Nabin Hait	3d0d4b2157	update subscription period only if relevant date field exists (#11046)	2017-10-04 15:51:55 +05:30
Nabin Hait	7e5a9f5c0e	Update new bom rate while replacing BOM (#11045)	2017-10-04 15:51:34 +05:30
KanchanChauhan	d3e21fff66	[Minor] Employee name as standard filter (#11043)	2017-10-04 15:20:34 +05:30
Nabin Hait	b779644493	Merge branch 'master' into develop	2017-10-04 14:52:32 +05:30
Nabin Hait	c83e793ce8	bumped to version 9.0.8	2017-10-04 15:22:31 +06:00
Revant Nandgaonkar	4d68e03a97	[Fix] Job Opening Web Form breadcrumb (#11029)	2017-10-04 14:35:21 +05:30
Makarand Bauskar	eaec4695f7	[hotfix] filter doctype if the doctype has subscription field (#11038)	2017-10-04 14:34:45 +05:30
rohitwaghchaure	5049edb494	[Fix] Discount and serial no search issue (#11040)	2017-10-04 14:33:12 +05:30
Makarand Bauskar	d17bea0a31	[hotfix] check minimum actual start time and actual end time before updating PO Operations (#11041) ... * [hotfix] check minimum actual start time and actual end time before updating PO Operations * Update production_order.py	2017-10-04 14:30:12 +05:30
Saurabh	ee4a2dd26f	[fix] resolved merge conflicts	2017-10-03 18:02:09 +05:30
Saurabh	e3a468ed1b	bumped to version 9.0.7	2017-10-03 18:30:31 +06:00
rohitwaghchaure	9e6f2a49e8	Merge pull request #11033 from rohitwaghchaure/subscription_next_data_fix ... [Fix] Subscription next schedule date, cancel issue, added from and to date	2017-10-03 17:48:53 +05:30
Rohit Waghchaure	445e8a2e57	[Fix] Subscription end date, cancel issue, added from and to date	2017-10-03 17:45:11 +05:30
tunde	19e63b73ed	Merge branch 'develop' into payment-terms	2017-10-03 12:02:38 +01:00
Nabin Hait	7b6eaee05b	Fixes to handle async events (#11018) ... * Fixes to handle async events * transaction.js code cleanup * Don't map taxes and charges while making PO from SO for drop-ship * Removed print	2017-10-03 01:09:46 +05:30
Rohit Waghchaure	c4e52e5f95	[Fix] Old invoice payment amount showing in the payment modal while making payment	2017-10-02 21:20:54 +05:30
Nabin Hait	7eba1a35d3	Controller init args fix (#11015) ... * Controller init args fix * cleanup useless code	2017-10-02 15:59:27 +05:30
Nabin Hait	1f10d693e9	Don't set currency as company currency if default currency is different (#11011)	2017-10-02 13:20:51 +05:30
Nabin Hait	8919669ac2	Merge branch 'master' into develop	2017-10-02 12:28:27 +05:30
Nabin Hait	3a2834c7ad	bumped to version 9.0.6	2017-10-02 12:58:26 +06:00
rohitwaghchaure	88491715e0	[Fix] select batch not displaying in the modal, duplicate invoice making after sync (#11005)	2017-10-02 12:13:36 +05:30
Nabin Hait	f059e7be35	Merge branch 'master' into develop	2017-10-02 12:09:00 +05:30
Nabin Hait	def308a433	bumped to version 9.0.5	2017-10-02 12:38:59 +06:00
Makarand Bauskar	cb38e599e5	[minor] don't create lead if customer contact is already created against contact_email (#10976) ... * [minor] don't create lead if customer contact is already created against contact_email * [tests] added tests cases for opportunity to check if lead is required or not	2017-10-02 11:40:43 +05:30
Nabin Hait	9b98d7fa14	Gst doctype roles (#10984) ... * Removed default permission from GST doctypes * default permission from GST doctypes	2017-10-02 11:38:40 +05:30
Makarand Bauskar	b1bf502119	[hotfix] validate company name on 'The Brand' Slide instead of 'Your Organization' (#11007)	2017-10-02 11:38:03 +05:30
Nabin Hait	cb48404bd2	Revert "Fixes for uom in get_item_details (#10986)" (#11009) ... This reverts commit 5b58e489a8.	2017-10-02 11:37:18 +05:30
Nabin Hait	5b58e489a8	Fixes for uom in get_item_details (#10986)	2017-10-02 11:36:10 +05:30
Sunny	38647ed832	move Purchase Order patch to v9	2017-10-02 11:37:48 +08:00
Sunny	42c74a6365	set schedule_date when creating po	2017-10-02 11:37:48 +08:00
Sunny	c6f25ba996	correct field name	2017-10-02 11:37:47 +08:00
Sunny	b387b3cca0	[fix] tests	2017-10-02 11:37:47 +08:00
Sunny	a456901e9f	[fix] Codacy errors	2017-10-02 11:37:47 +08:00
Sunny	0f2b21f88b	Add Purchase Order schedule_date field, similar to delivery_date in Sales Order	2017-10-02 11:37:47 +08:00
Sunny	73f4eef40f	[fix] tests	2017-10-02 11:37:47 +08:00
Sunny	9ded8a7290	[fix] Codacy errors	2017-10-02 11:37:47 +08:00
Sunny	c2befc59d1	Add Purchase Order schedule_date field, similar to delivery_date in Sales Order	2017-10-02 11:37:47 +08:00
Sunny	34a8fb4100	[fix] Codacy errors	2017-10-02 11:37:47 +08:00
Sunny	47eac28f0a	Add Purchase Order schedule_date field, similar to delivery_date in Sales Order	2017-10-02 11:37:47 +08:00
Sunny	869b878286	set schedule_Date when creating po	2017-10-02 11:36:24 +08:00
Sunny	f2e2e23b6b	[fix] tests	2017-10-02 11:35:33 +08:00
Sunny	3a22fd1535	Add schedule_date when creating Purchase Order	2017-10-02 11:35:33 +08:00
Sunny	f07e53b7a8	[fix] tests	2017-10-02 11:35:33 +08:00
Sunny	bd121486a8	[fix] Codacy errors	2017-10-02 11:35:33 +08:00
Sunny	122981d465	Add Purchase Order schedule_date field, similar to delivery_date in Sales Order	2017-10-02 11:35:33 +08:00
Sunny	962cef470a	Set PO Reqd By Date default in code, to next date	2017-10-02 11:35:33 +08:00
Sunny	0f73f90fa2	[fix] Codacy errors	2017-10-02 11:35:33 +08:00
Sunny	69e88ffa39	Add Purchase Order schedule_date field, similar to delivery_date in Sales Order	2017-10-02 11:35:33 +08:00
schilgod	f29969a5cc	update test records	2017-10-02 11:35:32 +08:00
Sunny	e3ed8b7cb3	[fix] tests	2017-10-02 11:35:32 +08:00
Sunny	9626ed79fa	Add patch to update schedule date of submitted Purchase Orders	2017-10-02 11:35:32 +08:00
Sunny	c429a6e688	[fix] Codacy errors	2017-10-02 11:35:32 +08:00
Sunny	2315a79b5f	Add Purchase Order schedule_date field, similar to delivery_date in Sales Order	2017-10-02 11:35:32 +08:00
Sunny	9da25f568d	Set PO Reqd By Date default in code, to next date	2017-10-02 11:35:32 +08:00
Sunny	9d497a984b	[fix] Codacy errors	2017-10-02 11:35:32 +08:00
Sunny	bb03ec103b	Add Purchase Order schedule_date field, similar to delivery_date in Sales Order	2017-10-02 11:35:32 +08:00
Helkyd	4c58588d25	Improve Salary Register ... Check if fieldname is a number to format. Start the Html Salary with hidden fields and check if they not empty and increase the width... This will remove Blank fields from the report.	2017-10-01 20:20:57 +01:00
Rushabh Mehta	4b99fe15cc	[version] 9.x.x-develop	2017-09-30 11:41:26 +05:30
Rushabh Mehta	b9fe14631d	[fix] healthcare setup	2017-09-30 10:46:56 +05:30
Nabin Hait	01b96a0e31	Fixes for uom in get_item_details	2017-09-29 18:57:41 +05:30
Nabin Hait	79a1d2a3b0	Fixes for uom in get_item_details	2017-09-29 18:15:40 +05:30
tunde	c49e748c85	Merge branch 'develop' into payment-terms	2017-09-29 13:30:22 +01:00
Nabin Hait	f65e55064b	Fixed ui tests for production order	2017-09-29 12:50:37 +01:00
Nabin Hait	6488645d42	Fixed ui tests for production order	2017-09-29 16:38:28 +05:30
Rushabh Mehta	912ae24ca2	Merge branch 'master' into develop	2017-09-29 16:22:02 +05:30
Rushabh Mehta	e1a4b3e4bc	bumped to version 9.0.4	2017-09-29 16:52:01 +06:00
Faris Ansari	8ac56b26e0	[Enhancement] Allow Multiple users in POS Profile	2017-09-29 16:15:15 +05:30
Rushabh Mehta	d3a48a83fd	[fix] bom.py, dont use keyword	2017-09-29 15:50:17 +05:30
Rushabh Mehta	80d24f83f8	[fix] item variant description	2017-09-29 15:39:03 +05:30
Pawan Mehta	5d8fd477bd	[fix] #10840 (#10844)	2017-09-29 15:23:54 +05:30
Javier Wong	bf37995745	[Enhancement] Sales and Purchase Default UOM (#10929) ... Option for specifying an optional default Sales and Purchase UOM at the item master level.	2017-09-29 15:23:08 +05:30
tundebabzy	5510d0751d	correctly set frm company currency (#10944)	2017-09-29 15:21:59 +05:30
Shreya Shah	b79c4a9ff6	Getting last purchase price of an item (#10897) ... * Added a column last purchase rate * Removed button last purchase rate * Get last purchase rate on adding an item * Added test case for last purchase rate * Replaced cur_frm with frm * Update purchase_order.js	2017-09-29 15:20:48 +05:30
Francisco Roldán	1b61dfd9ea	translated (#10886)	2017-09-29 15:19:12 +05:30
Shridhar Patil	3f7d96ecba	Unassign from todo. (#10896) ... Unassign from todo when the status is changed to Closed or Cancelled	2017-09-29 15:18:43 +05:30
Faris Ansari	367b90e3ae	Add Data Import Tool desktop icon (#10916) ... fixes #8332	2017-09-29 15:17:48 +05:30
tunde	25275077ab	Merge branch 'develop' into payment-terms	2017-09-29 10:47:01 +01:00
Nabin Hait	945f502748	Fixes for updating item variant from template (#10975) ... * Fixes for updating item variant from template * More fixes for test cases	2017-09-29 15:11:50 +05:30
Makarand Bauskar	9c339145b2	[Enhance] Custom notification messages for subscription documents (#10970) ... * [minor] configurable subscription email message and subject for notification * [minor] added description for subject field	2017-09-29 15:02:51 +05:30
tunde	3415ac6e9c	Merge branch 'develop' into payment-terms	2017-09-29 10:10:24 +01:00
Rushabh Mehta	3c14c5a16c	[fix] tax_rule.py args	2017-09-29 13:21:22 +05:30
Nabin Hait	bdb4c542e7	default permission from GST doctypes	2017-09-29 10:39:32 +05:30
Nabin Hait	6d61a45f42	Removed default permission from GST doctypes	2017-09-29 10:35:21 +05:30
Nabin Hait	c314485d55	Fixes based on test case	2017-09-28 18:55:49 +05:30
Nabin Hait	3b04cfc812	minor fix	2017-09-28 18:55:49 +05:30
tunde	131f0104b0	fix production order ui test	2017-09-28 14:08:25 +01:00
tunde	18764a12c4	increase point-of-sale timeout to fix UI test	2017-09-28 11:47:27 +01:00
rohitwaghchaure	0dc3c1b114	Merge pull request #10953 from rohitwaghchaure/has_batch_item_in_demo ... [minor] Added batch item in the demo data	2017-09-28 16:07:01 +05:30
schilgod	0f6fff6f0c	item price track_changes default to 1 (#10958)	2017-09-28 15:28:59 +05:30
Rushabh Mehta	2b87d100fa	[fix] https://github.com/frappe/erpnext/issues/10956	2017-09-28 15:21:36 +05:30
Rohit Waghchaure	c4ee77a3cc	[minor] Added batch item in the demo data	2017-09-28 15:19:26 +05:30
tunde	d348c12bdb	fix sales order ui test	2017-09-28 09:46:31 +01:00
Sunny	3ec6960478	move Material Request patch to v9	2017-09-28 15:26:20 +08:00
Sunny	33670bba47	fix reorder_item	2017-09-28 15:24:11 +08:00
Sunny	73f1c93cd2	fix ppt code	2017-09-28 15:24:11 +08:00
Sunny	bf68611567	clean code	2017-09-28 15:24:11 +08:00
Sunny	0d91d3f572	add schedule_date while creating Material Request	2017-09-28 15:23:52 +08:00
Sunny	892ec599d4	[fix] tests	2017-09-28 15:23:09 +08:00
Sunny	65cd9f2284	Add patch to update schedule date of submitted Purchase Orders	2017-09-28 15:23:09 +08:00
Sunny	799d69baba	[fix] Codacy errors	2017-09-28 15:22:49 +08:00
Sunny	71866e06f3	Add Purchase Order schedule_date field, similar to delivery_date in Sales Order	2017-09-28 15:22:49 +08:00
Sunny	284ceb7abe	Set PO Reqd By Date default in code, to next date	2017-09-28 15:22:49 +08:00
Sunny	65c7a6947a	[fix] Codacy errors	2017-09-28 15:22:49 +08:00
Sunny	f7a8277d12	Add Purchase Order schedule_date field, similar to delivery_date in Sales Order	2017-09-28 15:22:49 +08:00
Sunny	12cb07ce3c	[fix] test records	2017-09-28 15:22:49 +08:00
Sunny	23a4b09d43	Add Material Request schedule_date field, similar to delivery_date in Sales Order	2017-09-28 15:22:48 +08:00
Nabin Hait	c9f9e5235b	Fixed merge conflict	2017-09-28 12:31:33 +05:30
Nabin Hait	ca916a73de	bumped to version 9.0.3	2017-09-28 13:00:48 +06:00
Makarand Bauskar	53e19075d1	[hotfix] fixes and refactored Quoted Item Comparison report (#10954)	2017-09-28 12:30:04 +05:30
Rushabh Mehta	a0ba5594f9	[fix] production_order.py via error report	2017-09-28 11:26:24 +05:30
rohitwaghchaure	16645803f9	[fix] Added billing address gstin number in the sales invoice and delivery note as well in the sales gst reports (#10872)	2017-09-28 11:05:03 +05:30
rohitwaghchaure	94799a8b93	[fix] ‘NoneType’ object is not iterable onload of POS (#10941)	2017-09-28 10:56:27 +05:30
Nabin Hait	fce14fdcf0	Fixed merge conflict	2017-09-27 17:21:21 +05:30
Nabin Hait	76615c8001	bumped to version 9.0.2	2017-09-27 17:49:55 +06:00
Prateeksha Singh	283922daa2	[fix] Check for stock_qty, else use qty (#10937)	2017-09-27 17:12:28 +05:30
rohitwaghchaure	da8de2f0c7	Re-order patch sequence (#10936)	2017-09-27 17:11:40 +05:30
Rohit Waghchaure	566a0a05c8	[fix] 'NoneType' object is not iterable while saving quotation	2017-09-27 15:57:48 +05:30
Rushabh Mehta	f702d72c35	[minor] [performance] push hsn code creation after setup (#10928)	2017-09-27 15:31:30 +05:30
Nabin Hait	76e1ca35ad	Merge branch 'master' into develop	2017-09-27 13:05:21 +05:30
Nabin Hait	eb686f8b1a	bumped to version 9.0.1	2017-09-27 13:35:20 +06:00
Brown-Harry Boma	d3fa19143d	Properly redirect supplier after quotations submit (#10903)	2017-09-27 12:53:38 +05:30
Makarand Bauskar	70eaf2da95	[minor] removed the default precision for the margin_rate_or_amount field (#10923)	2017-09-27 12:49:16 +05:30
Rohit Waghchaure	87e994e0a2	[fixed] Disocunt amount not working for POS	2017-09-27 12:16:58 +05:30
rohitwaghchaure	45d45f4247	[hotfix] Wrong calculation of total in taxes and totals (#10924)	2017-09-27 11:49:13 +05:30
Prateeksha Singh	946e182564	install company fixtures while creating company (#10904) ... * install company fixtures while creating company * [fix] remove from setup_complete	2017-09-27 11:44:39 +05:30
tunde	567119170e	Merge branch 'develop' into payment-terms	2017-09-26 17:28:07 +01:00
Frappe PR Bot	9aff73d156	[Translation] Updated Translations (#10901)	2017-09-26 17:18:42 +05:30
Prateeksha Singh	df8fbd7d72	[fix] batch qty checked against stock_qty field (#10906)	2017-09-26 17:16:03 +05:30
Nabin Hait	51a07d19c8	Merge branch 'master' into develop	2017-09-26 15:59:15 +05:30
Nabin Hait	c0b4f0e81b	bumped to version 9.0.0	2017-09-26 16:29:12 +06:00
Nabin Hait	b0ba55e52f	Set bill no while making payment entry from purchase invoice	2017-09-26 15:56:58 +05:30
tunde	79f9a4aef1	bug fix: sales invoice always dirty even after reloading	2017-09-26 10:39:30 +01:00
tunde	095cfc9cfc	disable some Payment Schedule fields	2017-09-26 10:25:49 +01:00
tunde	9e4dcdfbc8	rename Payment Terms Schedule section break to Payment Terms	2017-09-26 09:44:23 +01:00
rohitwaghchaure	d4c2d77bba	[fix] POS not working if user clicks on back button from form view (#10912)	2017-09-26 13:27:06 +05:30
Prateeksha Singh	ada8ba96b3	[setup] remove translations from action name (#10911)	2017-09-26 13:07:24 +05:30
Nabin Hait	773e686fb1	change log for version 9	2017-09-26 12:41:43 +05:30
tunde	192587fe56	UI test cases	2017-09-26 01:32:08 +01:00
tunde	c4b0d17c08	fix bug: can't make PE for invoice with multi due date	2017-09-26 01:02:43 +01:00
tunde	31ddbe36c0	fix bug: cast to flt	2017-09-25 23:24:32 +01:00
tunde	541d3f9567	fix ui tests	2017-09-25 18:15:47 +01:00
tunde	cd9bc6f795	fix failing test	2017-09-25 14:51:21 +01:00
tunde	94c3c13ba6	fix failing tests	2017-09-25 14:47:48 +01:00
Nabin Hait	afe9eabd3c	Merge branch 'master' into develop	2017-09-25 16:36:47 +05:30
Nabin Hait	360c1efd18	Merge branch 'master' into staging	2017-09-25 16:36:47 +05:30
Nabin Hait	9ef023b10f	bumped to version 8.11.6	2017-09-25 17:06:44 +06:00
Nabin Hait	0d0811ca14	reload print style	2017-09-25 16:33:45 +05:30
Nabin Hait	39c2f75e6d	Merge branch 'master' into staging	2017-09-25 16:03:32 +05:30
Nabin Hait	cb5e1e550f	Merge branch 'master' into develop	2017-09-25 16:03:31 +05:30
Nabin Hait	7da3c46ef2	bumped to version 8.11.5	2017-09-25 16:33:29 +06:00
tunde	90e09d4e79	fix failing tests from shopping cart	2017-09-25 11:27:32 +01:00
tunde	8a53b64ac4	Merge branch 'develop' into payment-terms	2017-09-25 10:31:42 +01:00
tunde	9bed2de726	show all duplicate rows after checking for duplicate due date	2017-09-25 10:19:35 +01:00
tunde	e52bb825ec	fix bug: form is always dirty	2017-09-25 09:02:23 +01:00
Nabin Hait	3b61552836	Revert "Advance against expense claim (#10632)" (#10877) ... This reverts commit cdd6ded790.	2017-09-25 11:27:39 +05:30
Nabin Hait	4ebac3380d	reload print style	2017-09-23 15:50:39 +05:30
tunde	77ecacc379	validation to check for possible duplicate payment terms	2017-09-22 23:12:55 +01:00
tunde	cf42d1db5c	more tests	2017-09-22 17:20:33 +01:00
tunde	3aec78b472	make due date, invoice_portion mandatory	2017-09-22 16:22:15 +01:00
tunde	e6b3fe1215	add tests for payment term template	2017-09-22 16:04:07 +01:00
tunde	d6cf6fb124	documentation for payment terms	2017-09-22 15:49:02 +01:00
tunde	62af5c5693	more validation checks and test fixes	2017-09-22 15:16:38 +01:00
tunde	73a83a472d	validation for Payment Terms Template	2017-09-22 11:05:40 +01:00
tunde	25cda29007	fix test Employee	2017-09-21 14:33:39 +01:00
tundebabzy	e4be3f8dc9	use generator when updating and notify user of long process (#10777)	2017-09-21 18:27:33 +05:30
tunde	d7d306bfdb	fix final failing test	2017-09-21 13:43:38 +01:00
Nabin Hait	cdd6ded790	Advance against expense claim (#10632) ... * Adds Whitelist Method for Advance Entry * Adds changes required for managing Advance Payments in Expense Claim including new fields and documentation. Also resolved merge conflict by using the more recent modified date * Adds changes for managing advance payments using Default Account and Party * Removed console.log from the JS file * Advance Payment Patch - Fixed Codacy errors * Removed stray file * Fixed conflicts due to changes in upstream * Fixed Codacy errors * Fixed Codacy errors * Fixed Codacy errors * Fixed Codacy errors * Fixed Codacy errors * Fixed pending Codacy error * Updated JS code by removing cur_frm which is soon to be deprecated * Advance against Expense Claim: cleanup and fixes * Test case fixed	2017-09-21 18:03:45 +05:30
Nabin Hait	3d5d858933	set total in tax table if category not valuation and consider deductions (#10870)	2017-09-21 16:15:30 +05:30
Nabin Hait	6d78f7b862	Fixed indentation	2017-09-21 15:51:42 +05:30
tunde	82de375ba0	Merge branch 'develop' into payment-terms	2017-09-21 11:21:05 +01:00
Nabin Hait	5478a7fa67	Merge branch 'develop' of https://github.com/AravindPranera/erpnext-1 into AravindPranera-develop	2017-09-21 15:48:18 +05:30
tunde	951092eecd	fix sales order and pricing rule failing tests	2017-09-21 11:14:53 +01:00
Nabin Hait	2851dfad99	Set fields in Item Variant Settings which should be copied from template to variant	2017-09-21 15:41:57 +05:30
Rohit Waghchaure	5b05335e89	added patch and set default fields after completion of setup wizard	2017-09-21 15:41:57 +05:30
Rohit Waghchaure	0e28fccb34	[Enahance] Update variants fields defined in the Item Varianst Settings, if template updated	2017-09-21 15:41:57 +05:30
tunde	99849f8eab	fix failing tests	2017-09-21 10:23:40 +01:00
tundebabzy	ab5b03011d	Enhance Currency Exchange Management (#10482) ... * add new settings in Accouts Settings * patch for new settings * refactor `get_exchange_rate` * adds validation * tests validation * disables conversion rate field if stale rates not allowed * more test cases more test case... test `get_exchange_rate` behaviour with stale not allowed in sett.. fix currency exchange test case do housekeeping after running accounts settings test * clean up * documentation * make use of correct api url * Fix tests failing due to wrong exchange rate from fixer.io * remove mandatory constraint from `allow_stale` * added info to documentation	2017-09-21 14:50:39 +05:30
rohitwaghchaure	12fd8a6047	[fix] User not able to complete the production order because of decimal issue (#10868)	2017-09-21 14:39:10 +05:30
Nabin Hait	24ec3c7dcb	Fixed merge conflict	2017-09-21 12:53:41 +05:30
tunde	ae0eb718a3	Merge branch 'develop' into payment-terms	2017-09-21 08:12:23 +01:00
Prateeksha Singh	705d885b64	[progress] R/W permission for all roles (#10866)	2017-09-21 12:02:18 +05:30
Manas Solanki	1c1dd08a34	only validate party account and ref doc party account in selected case (#10863) ... * only validate party account and ref doc party account in selected case * fix for fee structure test * fix the assessment result test	2017-09-21 12:01:20 +05:30
tunde	c02f332565	Merge branch 'develop' into payment-terms	2017-09-20 15:37:34 +01:00
tunde	35c84fe4f2	fix failing test case	2017-09-20 12:26:19 +01:00
Nabin Hait	b2dca79d89	Updated modified timestamp in sales/purchase transaction doctypes	2017-09-20 09:56:06 +05:30
tunde	4712ed6377	remove logging statement	2017-09-19 21:30:34 +01:00
tunde	3387d026b1	Merge branch 'develop' into payment-terms	2017-09-19 18:07:12 +01:00
tunde	da17954919	fix failing tests	2017-09-19 17:53:31 +01:00
Nabin Hait	6960a76adc	Fixes related to schools fees	2017-09-19 17:23:03 +05:30
Manas Solanki	0664d6ed8b	real time fee creation status via socketio	2017-09-19 17:23:03 +05:30
Manas Solanki	1bcc6c661a	minor changes	2017-09-19 17:23:03 +05:30
Manas Solanki	9b44c16a32	add the fee schedule in config	2017-09-19 17:23:03 +05:30
Manas Solanki	1299d56e85	cleanup of the fee module	2017-09-19 17:23:03 +05:30
Manas Solanki	8c88af23ef	added the test case for the fees	2017-09-19 17:23:03 +05:30
Manas Solanki	d1d2633658	removed the fee schedule	2017-09-19 17:23:03 +05:30
Manas Solanki	152ba1eccb	fixes as per the review	2017-09-19 17:23:03 +05:30
Manas Solanki	49c52f7639	renamed one doctype to the fee schedule	2017-09-19 17:23:03 +05:30
Manas Solanki	4e0559bc79	make payment entry for the fees	2017-09-19 17:23:03 +05:30
Manas Solanki	2b39d5d6d5	make gl_entry on submission of fees	2017-09-19 17:23:02 +05:30
Manas Solanki	e4acf763a5	make payment request for the fee	2017-09-19 17:23:02 +05:30
Manas Solanki	f073814635	added fee request doctype	2017-09-19 17:23:02 +05:30
Nabin Hait	2e4de83df6	Rounding Adjustment via a separate field, instead of last tax row (#10659) ... * Rounding Adjust via a separate field, instead of last tax row * Fixed test cases	2017-09-19 14:53:16 +05:30
Rohit Waghchaure	c15a3bd379	[fix] Subscription patch broken if reference document has been cancelled	2017-09-19 12:53:11 +05:30
Nabin Hait	caf9891075	Fixed merge conflict	2017-09-19 12:06:22 +05:30
Nabin Hait	bd4b80e3d8	Merge branch 'master' into develop	2017-09-19 12:05:41 +05:30
Nabin Hait	703e837125	bumped to version 8.11.4	2017-09-19 12:35:39 +06:00
rohitwaghchaure	4f0f144142	Merge pull request #10831 from rohitwaghchaure/cherry_pick_subscription_staging_to_develop ... Cherry pick staging to develop for subscription cleanup	2017-09-19 10:26:20 +05:30
Nabin Hait	cf36534eed	Gross profit report considering returned items (#10734)	2017-09-18 19:13:45 +05:30
AravindPranera	cb6774e373	Files added with all functions	2017-09-18 17:37:37 +05:30
AravindPranera	1276893550	Files added with all functions	2017-09-18 17:30:20 +05:30
rohitwaghchaure	d02744b436	[fix] Subscription patch (#10827)	2017-09-18 17:23:00 +05:30
rohitwaghchaure	850eaa73b0	Move subscription module to accounts (#10772)	2017-09-18 17:23:00 +05:30
Nabin Hait	e859671eb3	Revert "Added ability to disable auto creation of Sales Invoice when customer pays a payment request (#10706)" (#10830) ... This reverts commit d258372f9e.	2017-09-18 17:22:46 +05:30
Neil Trini Lasrado	d258372f9e	Added ability to disable auto creation of Sales Invoice when customer pays a payment request (#10706)	2017-09-18 17:12:16 +05:30
tundebabzy	f6d738b3c5	Delivery note to billing issue (#10726) (#10766) ... * allow invoices to be made from sales returns * Update queries.py	2017-09-18 17:10:09 +05:30
Utkarsh Goswami	b98359f4a7	Payment entry (#10668)	2017-09-18 17:06:13 +05:30
Makarand Bauskar	5c1d15f015	[change-log] added change log for v9.0.0 (#10756) ... * [change-log] added change log for v9.0.0 * Update v9_0_0.md	2017-09-18 17:03:21 +05:30
Manas Solanki	a22c94c246	refactored assessment result tool (#10633) ... * save the assessment instead of submit * Added comments in the artool * remove the cur_frm and message for submitted result * link field for the assessment result	2017-09-18 16:59:54 +05:30
Faris Ansari	aebcb17daf	Show thumbnail image in daily work summary (#10605) ... * Show thumbnail image in daily work summary * Crop thumbnail image into square * fix codacy	2017-09-18 16:58:24 +05:30
rohitwaghchaure	6cea73b834	[fix] Subscription patch (#10827)	2017-09-18 16:58:05 +05:30
Utkarsh Goswami	bd0beb6c02	[fix] unknown column in production order (#10828)	2017-09-18 16:48:45 +05:30
Utkarsh Goswami	e78d5a240a	[fix] unknown column in production order (#10828)	2017-09-18 16:44:11 +05:30
Neil Trini Lasrado	de3429280b	Made Template link in variant (Item Master) intro linkable (#10696) ... * Made Template link in variant (Item Master) intro linkable * Update item.js	2017-09-18 16:42:10 +05:30
Neil Trini Lasrado	8c9f2a1be6	Add communication entry to Sales Order only if payment entry email is sent to customer (#10716)	2017-09-18 16:41:49 +05:30
Prateeksha Singh	9b4f3cf9de	Leaderboard cleanup (#10638) ... * [leaderboard] wip * [leaderboard] filter for selecting leaderboard criteria, single col * [leaderboard] doctypes in sidebar * hide graph if no results	2017-09-18 16:41:04 +05:30
tunde	9448f4b13c	codacy corrections	2017-09-18 12:08:34 +01:00
tunde	4bf3ed47ff	revert from trying to adjust payment schedule based on old recurring_document	2017-09-18 11:54:28 +01:00
Saurabh	9c334c34a6	[fix]remove employee field from tab salary structure	2017-09-18 16:17:13 +05:30
Manas Solanki	e716da04ec	add the newsletter in the standard portel (#10784)	2017-09-18 16:00:34 +05:30
Saurabh	590d401e5f	[fix] if bom specified on purchase order item then don't pull default bom in purchase receipt (#10793) ... * [fix] if bom specified on purchase order item then don't pull default bom in purchase receipt * Update bom.js * Update stock_entry.py	2017-09-18 15:49:19 +05:30
ci2014	9bc197cfd5	Update project.js (#10796) ... * Update project.js Move indicators to setup to be less buggy * fixed codecy trailing whitespace issues	2017-09-18 15:44:36 +05:30
Saurabh	d7e1869a70	[fix] if item code not exists then exclude item in validate_selling_price (#10800)	2017-09-18 15:43:35 +05:30
Saurabh	3f15bf9828	[fix] query fix for match conditions (#10810)	2017-09-18 15:27:24 +05:30
Nabin Hait	9744aa21af	Minor fix in tax rule	2017-09-18 15:25:33 +05:30
Adam Dawoodjee	91eda6dad4	Update creating-custom-link-field.md (#10822) ... Grammer improvements	2017-09-18 15:11:57 +05:30
Zarrar	8f957ef6e6	fetching data from last route (#10816)	2017-09-18 15:11:20 +05:30
Utkarsh Goswami	11bd5fc3b1	Description moved next to item code (#10820)	2017-09-18 15:05:50 +05:30
Saurabh	2222f10720	[patch] remove employee name salary structure (#10817) ... * [patch] remove employee name salary structure * Update remove_employee_from_salary_structure_parent.py	2017-09-18 15:05:18 +05:30
Nabin Hait	bc9006ff30	Delete GST related doctypes and reports if account is from outside India (#10808)	2017-09-18 13:16:04 +05:30
rohitwaghchaure	70ef09aa8f	Merge pull request #10809 from rohitwaghchaure/fixed_test_cases_issue ... [fix] Test cases for tax rule	2017-09-16 22:55:16 +05:30
Rohit Waghchaure	2cb2064c6f	Fixed test cases tax rule	2017-09-15 23:10:27 +05:30
Nabin Hait	21617da619	More fixes for UI tests	2017-09-15 21:22:16 +05:30
Nabin Hait	628ca2a2ec	Minor fix for ui tests	2017-09-15 19:35:12 +05:30
Nabin Hait	46941e8b35	Time out increased for appraisal template	2017-09-15 18:56:49 +05:30
Prateeksha Singh	d1ce7bfff4	[fix] set item valuation rates (#10681)	2017-09-15 16:17:29 +05:30
rohitwaghchaure	dd092e30fb	Move subscription module to accounts (#10772)	2017-09-15 16:16:36 +05:30
Makarand Bauskar	5ac01a2bf7	[minor] translate the action name in get_slide_settings (#10740) (#10790)	2017-09-15 12:10:29 +05:30
AravindPranera	27bbb561d2	removed whitespace	2017-09-15 11:04:14 +05:30
AravindPranera	2c1f44ecfa	Trailing space removed in line 275	2017-09-15 10:57:23 +05:30
AravindPranera	c73383c34c	Trailing whitespace in Line 207 and 276	2017-09-15 10:34:21 +05:30
Nabin Hait	43268bd350	Fixed salary structure tests	2017-09-14 19:39:10 +05:30
Nabin Hait	2f64f0f5fa	Fixed salary structure tests	2017-09-14 19:08:15 +05:30
Nabin Hait	427172c941	Update test_salary_structure.js	2017-09-14 17:57:21 +05:30
Nabin Hait	41146657de	Set default customer group and territory after install	2017-09-14 17:26:23 +05:30
Nabin Hait	092f6d3739	Fixes ui tests	2017-09-14 16:45:47 +05:30
mbauskar	f41cff27e6	resolved merge conflicts	2017-09-14 15:32:55 +05:30
mbauskar	ea832b8157	resolved merge conflicts	2017-09-14 15:32:10 +05:30
mbauskar	8ea3bb0d90	bumped to version 8.11.3	2017-09-14 15:58:44 +06:00
Nabin Hait	45dce89cae	Print Settings for printing taxes with zero amount (#10782) ... * Print Settings for printing taxes with zero amount * added __init__.py file to patch module v8_9	2017-09-14 15:17:38 +05:30
Rushabh Mehta	bf8e331135	[fix] unset default customer group (#10689) ... * [fix] unset default customer group * added __init__.py file for patch v8.9 directory	2017-09-14 15:03:45 +05:30
Nabin Hait	a6d78ef842	Added Supplier Bill Date in Itemised Purchase Register (#10783)	2017-09-14 15:01:04 +05:30
Nabin Hait	77b225e021	Fetch BOM items in Production Order in the same order as BOM	2017-09-14 13:22:45 +05:30
Nabin Hait	3f583b6dd2	Merge branch 'sort_bom_items' of https://github.com/creamdory/erpnext into creamdory-sort_bom_items	2017-09-14 12:59:31 +05:30
Vishal Dhayagude	d3e22ac09e	[UI Test] Modified Sales Order UI Test (#10770) ... * [UI Test] Modified Sales Order UI Test * [fix] Codacy fixed	2017-09-14 12:51:22 +05:30
Nabin Hait	f6b132f78e	Update test_quotation.js	2017-09-14 11:55:31 +05:30
Nabin Hait	c7c141a5a0	Update test_setup_wizard.py	2017-09-14 11:51:43 +05:30
rohitwaghchaure	f8458ed9e4	Merge pull request #10771 from nabinhait/pro_order_99 ... Update actual dates in Production Order from Timesheet	2017-09-14 10:53:48 +05:30
rohitwaghchaure	9a0db392de	[Fix] Only typed keywords displying in the field on selection of customer (#10778)	2017-09-14 10:51:21 +05:30
Nabin Hait	92309afea1	Update test_setup_wizard.py	2017-09-13 22:37:14 +05:30
Prateeksha Singh	242218d2b7	Progress fixes (#10710) ... * [progress] sales target slide * [fix] rerun patch for sales target slide	2017-09-13 18:41:01 +05:30
tundebabzy	c050c6945c	show error message if cannot get accounts details (#10768)	2017-09-13 15:27:30 +05:30
Nabin Hait	c443c9f05d	Update actual dates in Production Order from Timesheet	2017-09-13 15:14:40 +05:30
Nabin Hait	78baebfe0d	Setup wizard test fix	2017-09-13 15:12:45 +05:30
Rushabh Mehta	f056974bc5	[domain] Healthcare (#10664) ... * Medical module for erpnext * Changes in core for Medical module * patient registration updated * fix - appointment invioce - fields missing * pages- indicator instead of bg-color * Lab Test field renamed service type * Department added Lab Test * procedure name in prescription * fixes sample collection * filter disabled patient * fix patient admission * updated patient age * availability check msg updated * fixes, removed procedure from invoice * sample print renamed * fixes, validation * service desk physician in filter * refactor scheduler * Appointment -field property - set only once = 1 * Appointment - Mark closed and pending buttons removed * Appointment - readonly = 1 if value set * Appointment - availabilty * Appointment - Cancel - info - cancel invoice * Appointment - set pending appointments * Dosage form - new DT * Drug Prescription - Dosage form added * Facility - Floor - removed from Fecility * Floor - removed * Lab Test Template - item creation validation * Procedure - Create Procedure * Procedure Appointment - new DT * Service Unit - Floor reference removed * Zone Fcilities - Unused DT removed * Appointment Desk - fixed * Service Desk - method pointing from procedure changed to procedure_appointment * Consultation print - got featured * Consultation - removed patient refernce to procedure prescription * Procedure Prescription - removed patient refernce * Lab Test - Changed field properties and value * Lab Test - field property changed * Lab Test - methods rewrite - lab test doc creation * Lab Test - create lab test from invoice and consultaion - got changed * Button History changed to Medical Record * Service Desk - Updated * Notification - Procedure Appointment * fix-get procedure prescription * fix field added to test prescription * msgprint on invoice creation * fix data on install * Merge branch erpnext/develop * fixes- minor * Setup wizard - Create Sensitivity * Appointment - Validate and Save if there is no schedule for Physician * Consultation - Button create vital signs and medical record * Review Type - New DocType * Review Detail and Treatment Plan - Childs - Consultation * Patient Medical Record - field Attach doc * Consultation - New Fields * Consultation - Manage new Fields - Medical record add action * Patient Relation - Child DocType - Patient * Patient - Patient Relation added * Patient - collapsible = 1 * Laboratory Settings - fields - message for lab test * Laboratory Settings - get message for lab test * SMS text for lab test and invoice test report * Procedure Stock Detail - Stock detail for Procedure and Template * Template Stage Detail - Stage detail for Procedure Template * Procedure Stage Detail - Stage detail for Procedure * Service Unit - field - warehouse * Scheduler - msg - content changed * Laboratory Settings - defualt - msg content * Invoice Test Report - msg print * Print Format-Changed-Consultation-Invoice Test Report-Lab Test * OP Settings - Expnse Account for Stock Entry in Procedure * Procedure and Procedure Template - Manage Stock Stage and Sample Collection * Procedure Appointment - Manage Stock and Stage * Lab Test - fixed - resource not find * Invoice Test Report - fixed - resource not find * Procedure - doc reload after insert * Patient Medical Record - fixed - refernce missed * Create Vital Signs -on client side * Rename module Medical to Healthcare * Remove In Patient (IP) Feature. * Rename - Procedure to Clinical Procedure * Remove spaces in Naming Series * Rename Duration to Drug Prescription Duration * Duration to Drug Prescription Duration * Merge All Settings to Healthcare Settings * Healthcare settings - import fixed * Procedure related documents are removed * Appointment Desk and Sevrvice Desk are removed * Consultation - minimal * Consultation - minimal * Consultation - minimal - patient detials in collapsible section * Message Print to Alerts * Patient - some fields removed * Patient - create consultation - message print to alerts * Consultation - show patient details updated * Setup wizard - Duration to Drug Prescritpion Duration * Healthcare Settings - patient registration - fee collection * Lab Test - Create Sales Invoice bug fixed * Healthcare menu rearranged * Healthcare Settings - Optimised and Rearragnged * Healthcare Settings - Expense account removed * Receivable account removed from patient * Patient - Optimised and Rearragnged * Removed Referring Physician * Healthcare Settings - bold headings removed * Physician - Patient - Fields are Segregated * Remove Service Unit * Remove - Service Type * Consultation invoice * Lab Test - invoice * Patient - Invoice * Rename Appointment to Patient Appointment * wip * Patient Dashboard, Physician Form cleanup * Dosage renamed to Prescription Dosage * Renamed Drug Prescription Duration to Prescription Duration * Patient Appointment booking modal * Patient Age - calculate by dob * Remove - scheduler * Consultation - Appointment to Patient Appointment * Patient Dashboard - rearranged * Patient Appointment * Removed rer_physician from lab test and consultation * Patient Appontment Changes * Appointment and Consultation - optimized * Patient Appointment - fee validity code optimized * Consultation and Patient Appointment - Invoice validate two side * fix: #13 remove relation to admission * Healthcare - Patient Portal * fix import error * domain Healthcare added on install * Removed - Invoice Test Report * Physician Schedule - menu * Consultation - patient details - re write * New Doctype-Medical Code * Consultation - Daignosis codification * Medical Code - Codification - Settings * Medical Code Standard - Medical Code - Codification - Settings * fix appointment calendar * fix appointment analytics * Menu Medical Code Standard * New Doctype - Medical Code Standard * Set Physician Role insted of IP Physician and OP Physician Role * fixed some json files * Medical code - permission to physician * Unused Childs - Work Schedule and User List - Removed * Label Procedure to Lab Test * Lab Test and Patient - code optimised * Add Item Groups - setup wizard * Healthcare Settings - add Role - Medical Administrator * Healthcare - Demo setup - Make Demo * Fee Validity - Logic Test * Test Fee Validity - Optimised * Healthcare Doctypes - Restricted to Domain Healthcare * Domainify - remove Healthcare Roles - Other Domains * Healthcare doctypes - beta checked * Codacy fixes * Codacy - fixes * Codacy - fixes * Codacy - fixes * Codacy - fixes * Codacy - fixes * Lab Test - print hide =1 for some fields * Consultation - Codification field label to Medical Coding * Codacy fixes - import frappe and etc. * Codacy fixes - import frappe in test_vital_signs * Codacy fixes * Codacy fixes * Codacy fixes and remove delete perm for patient * send_sms - import form frappe * Healthcare Settings * Lab Prescription - Consultation - Test Code - read_only = 0 * Portal fixes * Patient Appointment - filter physician - if has schedule * Physician - IP Charge - Removed * test - files * Web Form - Patient Profile - removed * Role Medical Administrator to Healthcare Administrator * WIP healthcare documentation * Coday - fixes * Travis - fixes * Lab Test Report - menu * Reorder Healthcare settings - group lab config to bottom * Sample Collection - New - allow Sample and patient Selection * Rate - similar behaviour and Label as in Item Standard Selling Rate * Healthcare documentation * Lab Test Samples to Lab Test sample * Commplaints to Complaint * Commplaints to Complaint * Antibiotics to Antibiotic * Appointment Token Number - remove * View - Medical record * Codacy fixes * update healthcare docs * Cleanup Docs - Search, quick entry, trsck change, etc. * [minor] ux changes	2017-09-13 12:52:30 +05:30
Nabin Hait	ff667695ad	timeout in setup wizard test	2017-09-13 11:26:55 +05:30
Rushabh Mehta	f849915c13	[fix] label	2017-09-13 10:48:53 +05:30
Nabin Hait	231c324589	Merge branch 'master' into staging	2017-09-12 16:26:31 +05:30
tunde	1255aa0f11	Merge branch 'develop' into payment-terms	2017-09-12 11:54:52 +01:00
Nabin Hait	f8f29677fd	Merge branch 'master' into develop	2017-09-12 16:16:57 +05:30
Nabin Hait	e47bd4f477	bumped to version 8.11.2	2017-09-12 16:46:55 +06:00
rohitwaghchaure	67dfd26639	[fix] Production planning tool, unable to download material required report (#10704)	2017-09-12 15:54:27 +05:30
rohitwaghchaure	54099e592e	[fix] Serial No has already been received error while making purchase receipt entry for the returned serial no (#10736)	2017-09-12 15:51:52 +05:30
Manas Solanki	580f39a12c	check the instructor table before querying (#10754)	2017-09-12 15:49:36 +05:30
Nabin Hait	c9e96c15af	Rate and amount in a single row in tax breakup	2017-09-12 15:45:49 +05:30
Nabin Hait	de9eebe51c	Fixed multiple ui tests	2017-09-12 15:40:33 +05:30
Sagar Vora	d54d6bc572	[fix] use stock_qty in reports instead of qty to match with stock_uom (#10727)	2017-09-12 11:31:10 +05:30
rohitwaghchaure	38830e54d8	[fix] No module namd student_batch_name.student_batch_name error in the patch (#10745)	2017-09-12 11:25:02 +05:30
Rohit Waghchaure	1a77922e85	rename Is Online field to Use POS in Offline Mode in pos settings	2017-09-12 11:01:48 +05:30
Makarand Bauskar	d0823adf42	[minor] translate the action name in get_slide_settings (#10740)	2017-09-12 10:52:24 +05:30
rohitwaghchaure	80b902cea6	Merge pull request #10732 from rohitwaghchaure/rename_pos_field_in_pos_settings ... Rename Is Online field to Use POS in Offline Mode in pos settings	2017-09-11 22:36:38 +05:30
tunde	ecb118fb3b	bugfix: call set_payment_schedule only in relevant doc	2017-09-11 15:45:10 +01:00
Nabin Hait	e5716e3b1e	Default view of BOM is Listview	2017-09-11 19:21:47 +05:30
rohitwaghchaure	47605cae16	Merge pull request #10737 from nabinhait/budget_variance_for_project ... [fix] Actual amount for budget variance report	2017-09-11 16:47:16 +05:30
Frappe PR Bot	8a803a2310	[Translation] Updated Translations (#10741)	2017-09-11 16:31:10 +05:30
rohitwaghchaure	e2149cb46f	Merge pull request #10697 from rohitwaghchaure/customer_search_optimization ... [Fix] Customer search optimization for the offline POS	2017-09-11 16:23:15 +05:30
tunde	df3a175974	fix bugs: add payment_schedule if payment_terms_schedule specified	2017-09-11 11:02:57 +01:00
Nabin Hait	509bca36b1	Reverse charge in gst print format	2017-09-11 15:19:07 +05:30
Nabin Hait	cfb9310d13	Removed commit after creating custom gst fields	2017-09-11 15:00:16 +05:30
Rohit Waghchaure	4e006b0bc5	rename Is Online field to Use POS in Offline Mode in pos settings	2017-09-11 14:51:50 +05:30
Nabin Hait	f5cbb9c7b9	[fix] Actual amount for budget variance report	2017-09-11 13:58:15 +05:30
mbauskar	336c9b23d6	Merge branch 'master' into staging	2017-09-10 12:32:21 +05:30
mbauskar	dfeadf876e	Merge branch 'master' into develop	2017-09-10 12:32:21 +05:30
mbauskar	438088f69d	bumped to version 8.11.1	2017-09-10 13:02:20 +06:00
Makarand Bauskar	80b2ba2b9a	[hotfix] fixed Not Permitted issue for System user while accessing documents on portal (#10725) ... * [hotfix] dont allow guest user to list the invoices or orders * [hotfix] fixed Not Permitted issue for System user while accessing documents on portal * [codecy] removed trailing whitespace * [fixes] added filters for supplier in RFQ and other minor fixes	2017-09-10 12:04:28 +05:30
tunde	96b8f223fd	fix failing tests	2017-09-08 15:35:59 +01:00
Faris Ansari	425f1df799	[fix] Tax area alignment (#10690)	2017-09-08 15:56:34 +05:30
rohitwaghchaure	225ac0dac3	[Enhance] Subscription module (#10089) ... * [Enhance] Subscription module * Added view documents from the subscription form * Test cases * documentation * UI Test cases, fixes * Removed child table in the subscription * Provision to make subscription from the document, added subscription in the dashboard for the sales and buying flow * added patch to make subscription from the recurring data * Rename field subscriptio to subscription_id, added new test cases, remove recurring_document from controller * renamed subscription_id to subscription	2017-09-08 10:31:21 +01:00
tunde	24cb494a3b	Revert "Revert "make payment_schedule field no-copy"" ... This reverts commit fbd895d781.	2017-09-08 10:07:39 +01:00
tunde	fbd895d781	Revert "make payment_schedule field no-copy" ... This reverts commit 4f4148b0da.	2017-09-08 10:06:46 +01:00
tunde	199daf7ac5	Merge branch 'develop' into payment-terms	2017-09-08 09:59:13 +01:00
tunde	4f4148b0da	make payment_schedule field no-copy	2017-09-07 18:49:10 +01:00
tunde	2d3a575f29	more test cases for purchase/sales invoice	2017-09-07 14:50:20 +01:00
Nabin Hait	d4e57a38a4	Fixed multiple ui test cases	2017-09-07 19:16:38 +05:30
tunde	9085a5e52d	more test cases for quotation, purchase/sales order	2017-09-07 14:31:33 +01:00
tunde	b0f6b068ef	remove test based on deleted recurring_document.py	2017-09-07 13:50:46 +01:00
Rohit Waghchaure	06b22e9ac1	[Fix] Customer search optimization for the offline POS	2017-09-07 17:44:42 +05:30
tunde	ad7d3a1733	Merge branch 'develop' into payment-terms	2017-09-07 13:13:59 +01:00
rohitwaghchaure	1b65575860	Merge branch 'develop' into pos-refactor	2017-09-07 17:15:58 +05:30
tunde	67f3d854bc	test for quotation	2017-09-07 12:22:48 +01:00
rohitwaghchaure	166b78f022	[Enhance] Subscription module (#10089) ... * [Enhance] Subscription module * Added view documents from the subscription form * Test cases * documentation * UI Test cases, fixes * Removed child table in the subscription * Provision to make subscription from the document, added subscription in the dashboard for the sales and buying flow * added patch to make subscription from the recurring data * Rename field subscriptio to subscription_id, added new test cases, remove recurring_document from controller * renamed subscription_id to subscription	2017-09-07 16:14:22 +05:30
Vishal Dhayagude	c79d14190f	[fix] travis failed (#10702)	2017-09-07 16:05:41 +05:30
tunde	353099d7ad	Merge branch 'develop' into payment-terms	2017-09-07 11:31:26 +01:00
tunde	788de8001c	more tests	2017-09-07 11:30:06 +01:00
tunde	32aa7c1e68	Automatically set payment schedule if not specified ... - fix failing test cases - fix failing tests for recurring documents - others	2017-09-07 06:52:15 +01:00
tunde	dba6f841e6	refactor: DRY for due date disabled	2017-09-07 06:51:07 +01:00
Rushabh Mehta	2e8e5354e9	[fix] trainig_feedback.py	2017-09-07 10:43:36 +05:30
Rushabh Mehta	290e066633	[rename] /test_training_event_attendance.js	2017-09-07 09:07:15 +05:30
Rushabh Mehta	134d59949a	[minor] update warehouse_group in item.reorder_levels	2017-09-07 09:04:24 +05:30
Prateeksha Singh	2697e332f3	[fix] wizard UI test order (#10663) ... * [fix] wizard ui test order * [setup] remove old test * [fix] commit to remove lock from defaults table during setup	2017-09-07 09:03:16 +05:30
tunde	e7da1c5500	refactor: DRY for disable due date logic	2017-09-06 12:36:45 +01:00
Rohit Waghchaure	c72d08e8b9	Added indicator to show stock is available or not	2017-09-06 14:56:08 +05:30
tunde	9e32387aa7	fix customer test records	2017-09-06 09:44:45 +01:00
tunde	794001df50	more test cases in Supplier	2017-09-06 09:16:11 +01:00
tunde	98fd5401ff	test customer	2017-09-06 08:47:14 +01:00
rohitwaghchaure	ec46e51ed4	Merge pull request #10426 from nabinhait/payment_entry_deductions ... Unallocated and difference amount calculation in Payment Entry	2017-09-06 13:04:25 +05:30
Rohit Waghchaure	7419c4b577	Fixed test cases	2017-09-06 12:44:51 +05:30
rohitwaghchaure	914fd197fc	Update test_payment_against_invoice.js	2017-09-06 12:42:58 +05:30
Faris Ansari	8868ae22be	[fix] Tax area alignment (#10690)	2017-09-06 12:17:12 +05:30
Nabin Hait	ded8d11728	Js tests added for write off difference amount	2017-09-06 12:11:48 +05:30
Nabin Hait	6c3618be37	Unallocated and difference amount calculation in Payment Entry	2017-09-06 12:10:52 +05:30
Rushabh Mehta	6ef741554c	[fix] [patch] rename_company_sales_target_field.py	2017-09-06 10:53:26 +05:30
tunde	98cca8ee18	remove unused imports	2017-09-06 06:11:58 +01:00
tunde	8173239f63	Merge branch 'develop' into payment-terms	2017-09-06 04:18:40 +01:00
tunde	e5973e45f1	fix test	2017-09-05 18:11:58 +01:00
tunde	e0cec4ef05	Merge branch 'payment-terms' of https://github.com/tundebabzy/erpnext into payment-terms	2017-09-05 17:37:35 +01:00
tunde	a496c43581	fix test	2017-09-05 17:36:21 +01:00
mbauskar	668d04548a	Merge branch 'master' into develop	2017-09-05 20:45:00 +05:30
mbauskar	d4316f0264	bumped to version 8.11.0	2017-09-05 21:14:58 +06:00
Faris Ansari	4bcaeb312c	fix codacy	2017-09-05 17:30:22 +05:30
Faris Ansari	e4434d3200	Merge branch 'develop' into pos-refactor	2017-09-05 17:18:04 +05:30
Faris Ansari	62b1dc777e	Namespace PointOfSale class	2017-09-05 17:10:24 +05:30
Nabin Hait	799619b6b0	Fixed multiple uom in selling	2017-09-05 15:52:12 +05:30
tundebabzy	dc64f70f07	Merge branch 'develop' into payment-terms	2017-09-05 11:14:47 +01:00
Makarand Bauskar	3ad045302b	[minor] set abbreviation on company name trigger (#10671) ... * [minor] set abbreviation on company name trigger * [minor] codecy fixes	2017-09-05 15:23:55 +05:30
Nabin Hait	499fbe90dc	Test case fixed for multi-currency and multi-uom BOM (#10679)	2017-09-05 15:16:32 +05:30
Francisco Roldán	c929e88b97	Company Dashboard Title Translatable (#10673)	2017-09-05 15:09:35 +05:30
creamdory	05885ca184	Sorting in Production Order BOM Items	2017-09-05 17:02:54 +08:00
Rohit Waghchaure	2967d7ed01	Merge branch 'bom_currency' into develop	2017-09-05 11:26:22 +05:30
Rohit Waghchaure	c872095d76	update rate based on uom conversion factor	2017-09-05 11:25:05 +05:30
Frappe PR Bot	8054d962cf	[Translation] Updated Translations (#10669)	2017-09-05 09:19:06 +05:30
tunde	7f9a462506	Merge branch 'develop' into payment-terms	2017-09-05 01:35:51 +01:00
tunde	743ba690dd	more test cases for Supplier	2017-09-05 01:17:14 +01:00
tunde	ed86efb1fd	modify get_due_date to check Supplier Type if needed	2017-09-05 01:15:31 +01:00
tunde	b8ddae13ba	fix patches	2017-09-05 00:23:24 +01:00
tunde	2fdb857fed	fix due date disable bug	2017-09-05 00:21:54 +01:00
tunde	60aecd87b1	fix bugs in patches	2017-09-04 19:40:31 +01:00
tunde	4e4a40e46b	add new field payment_terms to Supplier Type	2017-09-04 19:38:41 +01:00
tunde	635423d70f	rewrite Supplier test cases	2017-09-04 19:37:54 +01:00
tunde	57171cdc48	patch for credit days in Supplier Type	2017-09-04 19:33:35 +01:00
tunde	95b3d7c619	patch for payment term field in Supplier Type	2017-09-04 19:32:14 +01:00
tunde	4163c9529d	fix get_due_date function to return date as string	2017-09-04 19:30:01 +01:00
Nabin Hait	22cff25bf5	BOM rates as per selected currency and UOM	2017-09-04 18:31:45 +05:30
tunde	c6d60e1de3	update patch list	2017-09-04 13:41:17 +01:00
tunde	bc9b5d699e	fix patch	2017-09-04 13:40:54 +01:00
tunde	76bba08e45	patch to create and set default payment term in customer/supplier	2017-09-04 13:37:32 +01:00
tunde	feffca2b05	patch to add payment_terms_field	2017-09-04 13:34:31 +01:00
mbauskar	7faac85fff	Merge branch 'master' into staging	2017-09-04 14:50:32 +05:30
mbauskar	d32f08f6ec	Merge branch 'master' into develop	2017-09-04 14:50:31 +05:30
mbauskar	11cf44986b	bumped to version 8.10.2	2017-09-04 15:20:30 +06:00
Prateeksha Singh	95d8fd38f5	User Progress (#10336) ... * [user-progress] first cut * [user-progress] Add users slide, remove taxes, make sample data * wip tests * [setup-wiz] UI test * [user-progress] notif test, docs trim * wip * [user-progress] Setup Progress single to update action states, fixtures * setup progress actions patch * rename sales_target field patch * [progress] wip reform slide data * [progress] remove slide data * [setup] add roles for GST doctypes, remove commit from fixtures	2017-09-04 11:14:04 +05:30
Makarand Bauskar	cf9e986f82	[hotfix] fixed the invalid variable name lead.name (#10648)	2017-09-04 10:25:37 +05:30
rohitwaghchaure	fd39d6bd3c	[Enahance] Provision to select customer, item code while making an invoice from timesheet (#10616)	2017-09-04 10:20:40 +05:30
Arundhatii	2e6db4d928	Help pages for Attendance (#10634) ... * Help pages for Schools setup * Documentation of Schools module * Help pages for Student * Help pages for Student * Help pages for Schools Student and Admission Module * Documentation for Schools Attendance	2017-09-04 10:17:18 +05:30
Saurabh	21833413b0	[fix] ERPNext signup link fix on demo page (#10649)	2017-09-04 10:15:24 +05:30
Francisco Roldán	11355cd3c9	Set at lost translated in quotation (#10652)	2017-09-04 10:14:58 +05:30
Nabin Hait	baacf51a00	Fixed merge conflict	2017-09-04 10:13:29 +05:30
Zarrar	85eeafdccc	added filter for grading scale selection (#10639)	2017-09-01 21:45:10 +05:30
Makarand Bauskar	d6922b2de3	[hotfix] lead name should available before creating new customer from quotations (#10642)	2017-09-01 18:45:40 +05:30
Rohit Waghchaure	6ab630371d	Fixed serial no trigger not working from dialog box	2017-09-01 17:02:42 +05:30
tunde	975eff7310	remove redundant test case	2017-09-01 12:10:44 +01:00
Umair Sayed	f1881065a8	Merging Help Articles (Q & A) into Manual (Part 2) (#10629) ... * adding articles in the manual * adding articles in the manual 2 * migrating help articles to manuals * migrating help articles to manuals	2017-09-01 16:26:41 +05:30
tunde	cbd72f6113	adjust failing tests	2017-09-01 11:48:00 +01:00
tunde	7b7dcddf86	modify get_due_date call from sales/purchase invoice	2017-09-01 11:36:08 +01:00
tunde	b3a6338c79	patch replace credit_days with payment terms schedule	2017-09-01 11:35:22 +01:00
tunde	f0e9dd2597	patch to add due_date to GL Entry table	2017-09-01 11:34:26 +01:00
Rushabh Mehta	fc1c00716c	[test] test_account.js - more timeout?	2017-09-01 12:41:12 +05:30
Rushabh Mehta	baabb07e00	[test] test_account.js	2017-09-01 12:12:39 +05:30
Rushabh Mehta	7d868e41a6	[test] test_account.js	2017-09-01 11:46:11 +05:30
tunde	1c2edaebc4	patch customer records ... - creates payment term and payment term template based on credit_days setting - sets payment term template for records that had credit_days	2017-08-31 22:52:06 +01:00
tunde	8935f6546c	removes get_credit_days function as it is no longer useful	2017-08-31 16:31:15 +01:00
tunde	3b4bd3791d	adjust get_due_date to calculate based on payment term template	2017-08-31 16:28:47 +01:00
tunde	e44ce5d88e	adjustment: removes credit_days_based on and credit_days fields	2017-08-31 16:11:42 +01:00
tunde	657ecd5227	adjustment: removes credit_based_on field	2017-08-31 16:06:56 +01:00
Nabin Hait	a9c9b69c22	Change actual charges based on exchange rate (#10619) ... * Change actual charges based on exchange rate * Update transaction.js	2017-08-31 19:40:09 +05:30
Frappe PR Bot	d112ee5244	[Translation] Updated Translations (#10628)	2017-08-31 19:38:41 +05:30
tunde	229b583715	disable due date field if form has payment schedule data	2017-08-31 14:30:53 +01:00
Rohit Waghchaure	3e43927767	Test cases	2017-08-31 18:21:27 +05:30
tunde	50ec45d3b6	Merge branch 'develop' into payment-terms	2017-08-31 13:46:02 +01:00
tunde	400d046653	set payment terms template in get_party_details	2017-08-31 13:44:57 +01:00
Saurabh	60739847ab	[minor][fix] change price field type from float to currency (#10626)	2017-08-31 17:08:30 +05:30
tunde	762c810fa2	add payment terms to supplier master	2017-08-31 11:52:49 +01:00
tunde	2775175b17	add payment terms to customer master	2017-08-31 11:52:14 +01:00
mbauskar	9012a9b414	Merge branch 'master' into staging	2017-08-31 15:31:48 +05:30
mbauskar	2965f92be3	Merge branch 'master' into develop	2017-08-31 15:31:47 +05:30
mbauskar	2a4328b4f5	bumped to version 8.10.1	2017-08-31 16:01:47 +06:00
Nabin Hait	d7ff9dca1d	Fixed rounding issue in Process Payroll, fixes #9300 (#10586)	2017-08-31 15:17:01 +05:30
Nabin Hait	e7e29b7f10	GST print format for POS (#10590) ... * Serial no added in GST tax invoice * GST print format for POS	2017-08-31 15:06:12 +05:30
Umair Sayed	84be137b4e	Migrating Help Articles (Q&A format) into User Manual (#10608) ... * adding articles in the manual * adding articles in the manual 2 * migrating help articles to manuals	2017-08-31 14:53:47 +05:30
Vishal Dhayagude	1252c30edf	[UI Test] UI test for Repack and Sales Invoice with Serialize item Added (#10583) ... * [UI Test] UI test for Repack and Sales Invoice with Serialize item Added * [Fix] Fixed path for sales invoice"	2017-08-31 14:47:56 +05:30
Vishal Dhayagude	1458d7fea6	[UI Test] Stock Entry for material issue with serialize item (#10592)	2017-08-31 14:47:01 +05:30
tundebabzy	7f8a259beb	Fixer Always Fetches Latest Exchange Rate Even When Date is Specified (#10596) (#10597) ... * test that confirms the bug. Same test should pass after fix * make use of correct api url	2017-08-31 14:30:15 +05:30
rohitwaghchaure	56e31d05e9	[Fix] POS customer field is hang while searching customer, make error log if sync has failed (#10607)	2017-08-31 14:19:58 +05:30
krnkris	3c635e219e	Rename fr_plan_comptable_général.json to fr_plan_comptable_general.json (#10601)	2017-08-31 14:17:46 +05:30
tunde	3dfbd957b7	add payment terms to supplier master	2017-08-31 09:42:01 +01:00
tunde	226164d81c	add payment terms in customer master	2017-08-31 09:41:25 +01:00
Makarand Bauskar	de278635a3	[hotfix] fixes for UnicodeDecodeError (#10620)	2017-08-31 13:36:56 +05:30
tunde	e5460ab1df	rename patch	2017-08-30 22:37:14 +01:00
tunde	6de18ce589	codacy fixes	2017-08-30 21:20:41 +01:00
tunde	93c015a42b	add due_date in GL Entry from Journal Entry	2017-08-30 21:05:38 +01:00
tunde	501ef8733b	fix due_date autopopulate commit	2017-08-30 21:02:20 +01:00
Rohit Waghchaure	7e752c4ebf	Added patch, fixed codacy issue	2017-08-31 00:31:35 +05:30
tunde	4e490ad718	Merge branch 'develop' into payment-terms	2017-08-30 14:11:40 +01:00
tunde	08d8ca0184	enhance reference_due_date behaviour: ... - creates new api - get_invoice_due_dates - when reference_name is changed, populate reference_due_date	2017-08-30 13:55:32 +01:00
tunde	2883662ccb	change due_date to reference_due_date in Journal Entry Account	2017-08-30 08:45:28 +01:00
Faris Ansari	6163a397df	Disable eslint in lib	2017-08-30 12:54:16 +05:30
Faris Ansari	1116f96aee	Grand Total Value width	2017-08-30 12:53:08 +05:30
Faris Ansari	491108a198	Merge branch 'develop' into pos-refactor	2017-08-30 12:37:05 +05:30
mbauskar	5096c45dec	Merge branch 'master' into hotfix	2017-08-29 20:42:06 +05:30
mbauskar	a896e52489	resolved merge conflicts	2017-08-29 20:41:59 +05:30
mbauskar	c0f34f454b	bumped to version 8.10.0	2017-08-29 21:08:21 +06:00
tunde	a19ea6e2f3	Merge branch 'develop' of https://github.com/frappe/erpnext into payment-terms	2017-08-29 15:26:50 +01:00
Rohit Waghchaure	70aaff46be	minor fix in item group search	2017-08-29 19:19:58 +05:30
tundebabzy	1a947dbf6a	Item Name not loaded in Material Request via BOM (#10535) (#10555) ... * adds item_name to child table * adds two new functions to utils: - first_row_is_empty: to check if first row in child table is empty - remove_empty_first_row: to remove the empty first row in a child table * removes empty first row after getting from BOM * ui test	2017-08-29 18:18:27 +05:30
tunde	7555a4a13e	fix patch and also patch payment entries	2017-08-29 13:40:16 +01:00
Faris Ansari	c70bbacd34	Add online, offline option, fix search	2017-08-29 15:27:17 +05:30
tunde	3b327ed55f	'modify patch to also adjust journal entries'	2017-08-29 10:23:19 +01:00
Faris Ansari	655f86d5e2	UI fixes	2017-08-29 14:27:01 +05:30
Faris Ansari	b9939a6449	Merge pull request #10448 from joelios/selfpostback ... improvement for self-postbacks	2017-08-29 14:05:13 +05:30
Faris Ansari	6f50b3a5b2	handle both cases	2017-08-29 14:02:49 +05:30
Rohit Waghchaure	ba3f0e6b70	Added serial no, batch no, item group functionality	2017-08-28 19:45:58 +05:30
Aditya Hase	6ccb6562f1	Python 3 compatibility syntax error fixes (#10519) ... * Use Python 3 style print function * Use 'Exception as e' instead of 'Exception, e' * Unpack tuple arguments explicitly in instead of relying on auto unpacking * Use consistent indentation * Use 0 if stock_frozen_upto_days is None	2017-08-28 18:17:36 +05:30
Faris Ansari	847f9f80c1	Merge pull request #10559 from mntechnique/pos_scanner_hotfix ... [Fix] POS Scanner	2017-08-28 16:54:01 +05:30
Vishal Dhayagude	7ed4bfe7ee	[UI Test] UI Test for Material Receipt with Serialize Item Added (#10565) ... * [UI Test] UI Test for Material Receipt with Serialize Item Added * [fix]Codacy fixed	2017-08-28 16:53:25 +05:30
Faris Ansari	8fbc08f91f	Decrease timeout to 400	2017-08-28 16:52:20 +05:30
Vishal Dhayagude	872bebbbf8	[UI Test] Stock Entry for Subcontract (#10574)	2017-08-28 15:33:21 +05:30
Vishal Dhayagude	f8e6c44996	[UI Test] Stock Entry for Material Transfer to Manufacture (#10572)	2017-08-28 15:32:33 +05:30
mbauskar	5d0c4361ab	resolved merged conflicts	2017-08-28 11:58:44 +05:30
mbauskar	aaec42ebc2	resolved merged conflicts	2017-08-28 11:57:56 +05:30
mbauskar	d44af40de8	bumped to version 8.9.2	2017-08-28 12:26:17 +06:00
Nabin Hait	2df0788c11	Validate for negative outstanding reference only if party is Customer or Supplier (#10568)	2017-08-28 11:23:33 +05:30
Vishal Dhayagude	914b8463b7	[UI Test] UI Test for Payment Request Added: (#10553)	2017-08-28 11:14:28 +05:30
Utkarsh Goswami	7ba2a83182	Tests for Loan (#10557)	2017-08-28 11:13:16 +05:30
Vishal Dhayagude	554cf9be44	[UI Test] UI Test Added for Bank Reconciliation (#10563)	2017-08-28 11:11:36 +05:30
Vishal Dhayagude	da2164373c	[UI Test] UI Test added for Batch (#10564)	2017-08-28 11:10:26 +05:30
Vishal Dhayagude	c3a2204653	[UI Test] UI Test for Sales Order Cancel, amend and save (#10570)	2017-08-28 11:09:35 +05:30
tunde	63c8cb2fd1	add due_date to Journal Entry Account doctype	2017-08-27 17:56:47 +01:00
Faris Ansari	3ae9e91bcd	Add memoization in search	2017-08-27 14:04:23 +05:30
Faris Ansari	d733b7d7d0	Styling and code fixes	2017-08-27 13:56:33 +05:30
Rohit Waghchaure	5e2d2059fe	Added email, edit on form view from POS, pay using numpad functionality	2017-08-27 08:54:40 +05:30
Revant Nandgaonkar	2558daf6b7	Allow search without keypress enter	2017-08-26 15:52:35 +05:30
Revant Nandgaonkar	2f7cb82ca0	[Fix] POS Scanner ... Search item based on key press instead of 1sec wait Fast Scanning needs this to avoid 1sec delay	2017-08-26 09:58:15 +05:30
tunde	6b2d9e4990	patch to add due date to GL Entries for Sales/Purchase invoice	2017-08-25 15:25:18 +01:00
Zarrar	7dc113e977	instructor-naming (#10550)	2017-08-25 17:48:36 +05:30
Utkarsh Goswami	579c8e68f9	Tests for Expense Claims [HR] (#10514)	2017-08-25 16:12:49 +05:30
Ashwini Save	e33a1e0515	Hide "Help Article" button for timeline Communication type "Comment". (#10541)	2017-08-25 12:44:33 +05:30
Nabin Hait	bf4a974124	IMproved print format for AR/AP report (#10528)	2017-08-25 12:10:49 +05:30
Utkarsh Goswami	9a04da27b0	Test for training (#10545)	2017-08-25 12:01:04 +05:30
AravindPranera	764bb30d2d	Fetching Opportunity items into Request for Quotation	2017-08-24 18:34:45 +05:30
AravindPranera	6544a85f1e	Opportunity Items fetching into Request for quotation	2017-08-24 18:32:40 +05:30
Manas Solanki	8de7c0245c	Fixes in the naming series (#10480) ... * rewrite the js * fix the space issue in the naming series	2017-08-24 17:51:23 +05:30
Vishal Dhayagude	17b2720f5b	[UI Test] UI Test for Payment Entry (#10521)	2017-08-24 17:50:28 +05:30
Faris Ansari	5d9196960e	new form improvements	2017-08-24 17:09:34 +05:30
Nabin Hait	caab582943	Tax breakup for actual amount and fixes in itemised purchase register (#10515) ... * Tax breakup for actual amount and fixes in itemised pur register * Rounding of itemised tax breakup amount	2017-08-24 16:22:28 +05:30
Zarrar	1010a2a2a4	Resolving some issues in school [ issue no:- #10464 ] (#10529) ... * guardian_name issue fix * guardian table issue resolved * resolved fetching issue + unnecessary code removed	2017-08-24 16:22:06 +05:30
Utkarsh Goswami	3da5574d79	Test for appraisal (#10525)	2017-08-24 15:48:57 +05:30
Rushabh Mehta	6b651d734e	[fix] status in purchase_receipt.py (#10534)	2017-08-24 15:47:49 +05:30
Rohit Waghchaure	e5f6b4d640	Added print, make new invoice from POS functionality	2017-08-24 15:27:55 +05:30
Rushabh Mehta	7e506af0b9	[fix] warehouse query fixes https://github.com/frappe/erpnext/issues/10537 (#10538)	2017-08-24 15:23:33 +05:30
tunde	f7e87e66ee	do correct gl entry for debit and credit notes	2017-08-23 22:36:25 +01:00
Rushabh Mehta	72fa958f2c	[layout] lead and opportunity (#10487)	2017-08-23 18:47:57 +05:30
Vishal Dhayagude	641d88fd6b	[UI Test] UI Test added for Journal Entry (#10512) ... * [UI Test] UI Test added for Journal Entry * [mod] Edited date in journal Entry * [fix] Codacy fixed	2017-08-23 18:32:12 +05:30
Faris Ansari	6d2f6c2e4d	Search improved, code refactor	2017-08-23 16:25:16 +05:30
Rushabh Mehta	4a546e6c18	[minor] delivery note standard filter	2017-08-23 16:16:43 +05:30
Makarand Bauskar	dd8c0febd5	[minor] changed the modified date for bom for rename_bom_update_tool patch (#10509)	2017-08-23 13:17:37 +05:30
Faris Ansari	26df5b8c00	Connect Numpad events with POSCart	2017-08-23 13:12:12 +05:30
mbauskar	06f5ae0e78	Merge branch 'master' into develop	2017-08-23 13:06:43 +05:30
mbauskar	918f029d98	bumped to version 8.9.1	2017-08-23 13:36:43 +06:00
Nabin Hait	cb40bd86f8	Supplier bill no in GST itemised purchase register (#10513)	2017-08-23 13:04:50 +05:30
Rohit Waghchaure	b73321c577	Item search refactor	2017-08-23 12:15:10 +05:30
Saurabh	b903c86076	Merge pull request #10506 from nabinhait/hotfix677 ... Minor fix in itemised sales register	2017-08-23 11:13:31 +05:30
Nabin Hait	fcb2462902	Minor fix in itemised sales register	2017-08-23 09:44:33 +05:30