21013 Commits

Author	SHA1	Message	Date
Saqib	20c31dd579	fix: tax templates from all companies fetching in receipt (#19682) ... * fix: tax templates from all companies fetching in receipt * Update purchase_receipt.js	2019-11-29 16:55:10 +05:30
rohitwaghchaure	d76529e6ca	Merge pull request #19748 from deepeshgarg007/version-12-serial-no-fix ... fix: Serial no validation against sales invoice	2019-11-29 16:34:58 +05:30
rohitwaghchaure	c9afe2f707	Merge pull request #19602 from Anurag810/bom-explorer-report-fix ... fix: Raw material qty depending on the quantity of the parent BOM	2019-11-29 16:18:30 +05:30
deepeshgarg007	c51dd2989e	fix: Validation msg	2019-11-29 15:56:16 +05:30
deepeshgarg007	45f57f273c	fix: Serial no validation against sales invoice	2019-11-29 15:56:08 +05:30
Mangesh-Khairnar	8287c3d05a	feat(marketplace): unpublish item from hub	2019-11-29 15:52:29 +05:30
rohitwaghchaure	b59a25b02b	Merge pull request #19746 from rohitwaghchaure/fixed_customer_selection_issue_in_sales_invoice_healthcare_module ... fix: please specify customer error in sales invoice if patient is blank	2019-11-29 14:29:31 +05:30
Mangesh-Khairnar	92b9d7383d	fix: show create payment request for so that are not billed	2019-11-29 14:22:52 +05:30
Rohit Waghchaure	bf8fe06f86	fix: please specify customer error in sales invoice if patient is blank	2019-11-29 14:14:11 +05:30
Rohit Waghchaure	8b599f2bc9	fix: capacity planning back	2019-11-29 14:09:30 +05:30
Suraj Shetty	9d6d95c4a2	fix: valuation of "finished good" item in purchase receipt (#19268) ... * fix: Remove redundant purchase orders and unwanted condition * fix: [WIP] Purchase receipt value * fix: Add raw material cost based on transfered raw material * fix: get_qty_to_be_received * fix: Remove debugger statement * fix: Reset rm_supp_cost before setting subcontracted raw_materials * test: Fix and modify tests for backflush_based_on_stock_entry * fix: Add non stock items to Purchase Receipt from Purchase Order * fix: Ignore valuation rate check for non stock raw material * fix: Rename check all rows * fix: Remove amount from test * test: Fix item rate error * fix: handling of serial nos in backflush * fix: Add serial no. of raw materials * fix: [WIP] Handle Batch nos for purchase reciept backflushed raw material * fix: Raw material batch number selection in purchase receipt * Update test_purchase_order.py	2019-11-29 13:26:52 +05:30
Marica	8f48896261	fix: Permission issue in Stock Entry (#19738)	2019-11-28 19:39:49 +05:30
Mangesh-Khairnar	2597817cde	fix: add new routes to handle category wise search	2019-11-28 18:57:42 +05:30
Anurag Mishra	f3b393f5e0	fix: UOM was not fetching in purchase invoice (#19732) ... * fix: UOM was not fetching in purchase invoice * fix: Changes requested Co-authored-by: Marica <maricadsouza221197@gmail.com>	2019-11-28 18:52:16 +05:30
Deepesh Garg	7cdde93645	fix: Validation for parent cost center (#19664) ... * fix: Validation for parent cost center * fix: Minor modification in condition * fix: Update test cases for invalid cost center creation	2019-11-28 18:37:51 +05:30
Joseph Marie Alba	5c2ba0ef9c	Fix: Logic bug (#19692) ... account_groups = [accounts[d]["account_type"] for d in accounts if accounts[d]['is_group'] not in ('', 1)] - if accounts[d]['is_group'] not in ('', 1) is wrong because it returns false even if the account is a group. - should be if accounts[d]['is_group'] not in ('', 0) However, the correction provided here: account_groups = [accounts[d]["account_type"] for d in accounts if accounts[d]['is_group'] == 1] is more consistent with the prior statement that extracts ledger (and not group) accounts. account_types = [accounts[d]["account_type"] for d in accounts if not accounts[d]['is_group'] == 1]	2019-11-28 18:33:20 +05:30
Deepesh Garg	9f3276046f	fix: Account type in Handling Difference in Inventory account (#19674) ... * fix: Account type in Handling Difference in Inventory account * fix: Add Stock Adjustment account * fix: Rename account to stock adjustment	2019-11-28 18:29:33 +05:30
Saqib	707b83940a	fix: due date before posting date for items added to cart yesterday (#19681)	2019-11-28 18:27:17 +05:30
Marica	bcd02069ea	fix: Validation for Suppliers in SO to PO (#19686) ... - Check if there is a Supplier against atleast one item in Sales Order - Validation message earlier was vague	2019-11-28 18:23:45 +05:30
Marica	aff678e376	fix: Changed type of column 'serial_no' in Stock Ledger Entry (#19702)	2019-11-28 18:20:48 +05:30
Shivam Mishra	2512962f55	fix: handle None case for get_shipping_amount_from_rules (#19723)	2019-11-28 16:46:58 +05:30
Marica	f51ccbf5d4	chore: Added Quick Stock Balance to Stock Module (#19726) ... - Also 'Stock Balance Report' button no longer primary button	2019-11-28 16:44:46 +05:30
rohitwaghchaure	1511154aa8	fix: removed stock value and account balance out of sync validation (#19729) ... * fix: revert value out of sync feature * fix: removed stock value and account balance out of sync validation	2019-11-28 16:43:39 +05:30
marination	236140d94c	fix: Division by zero error in Stock Entry	2019-11-28 16:36:24 +05:30
Shivam Mishra	30245a0673	Merge pull request #19677 from ruchamahabal/setup_wizard ... feat: Slides for Onboading Wizard in ERPNext	2019-11-28 14:35:10 +05:30
Rohan Bansal	c59ac36378	fix: use new Contact schema	2019-11-28 12:25:38 +05:30
Rohan Bansal	fd46fef857	fix: add designation to Lead	2019-11-28 12:23:33 +05:30
Rohan Bansal	69e3868a9d	patch: set title for old leads	2019-11-28 12:23:19 +05:30
Rohan Bansal	75da5af900	fix: set missing values	2019-11-28 12:23:05 +05:30
Rohan Bansal	f9e2bfcc29	fix: conditionally set lead title as organization or person	2019-11-28 12:23:05 +05:30
Rohan Bansal	312210c2b0	feat: create address and contact after lead creation	2019-11-28 12:22:47 +05:30
deepeshgarg007	2fe0c98772	fix: Path for quotation expiry method in hooks	2019-11-28 08:09:47 +05:30
Rohan Bansal	c7cfc726d7	feat: navigate to stock ledger from batch report	2019-11-27 18:23:31 +05:30
Anurag Mishra	707bb2052c	fix: Employee dashboard disappear after switching from leave application form (#19690)	2019-11-27 16:27:50 +05:30
Marica	f0e87f7fdd	fix: get_batch_qty_and_serial_no() requires argument 'stock_qty' (#19693)	2019-11-27 15:49:41 +05:30
Rucha Mahabal	58928e8eae	Merge branch 'develop' into setup_wizard	2019-11-27 11:55:53 +05:30
Rucha Mahabal	e2bb82872c	fix: moved slide json files to respective modules	2019-11-26 18:46:17 +05:30
Rucha Mahabal	3f8c460584	feat: moved slide action functions from onboarding utils to doctypes	2019-11-26 15:22:45 +05:30
Rucha Mahabal	195893db0e	fix: conditionally run old patch for Setup Progress	2019-11-26 15:22:05 +05:30
Shivam Mishra	a791170f29	Merge pull request #19475 from 0Pranav/scheduling-ui-rewrite ... feat: Appointment Schedulling	2019-11-26 13:43:14 +05:30
rohitwaghchaure	b5991e9264	Merge pull request #19683 from rohitwaghchaure/bom_ux_fixes_version_12 ... fix: BOM UX	2019-11-26 13:15:40 +05:30
0Pranav	fb1e87710b	Tweaks to success redirect ... - 5 seconds wait before redirect - Edited description for URL in settings	2019-11-26 12:14:41 +05:30
0Pranav	8d2b0d800c	Merge branch 'scheduling-ui-rewrite' of https://github.com/0Pranav/erpnext into scheduling-ui-rewrite	2019-11-26 10:55:53 +05:30
0Pranav	2515022377	add condition for zero appointment slots	2019-11-26 10:55:28 +05:30
Deepesh Garg	5558ee8597	Merge pull request #19591 from 0Pranav/FR-ISS-152101 ... fix: add status "expired" to doctype quotation	2019-11-26 09:08:30 +05:30
Deepesh Garg	31a4fa5dd3	Merge pull request #19606 from deepeshgarg007/shareholder_refactor ... refactor: Share Transfer code cleanup and refactor	2019-11-26 07:54:57 +05:30
deepeshgarg007	53a66ee386	fix: Method name in hooks, test case code clean up	2019-11-25 21:58:15 +05:30
rohitwaghchaure	0881557c7d	Merge pull request #19636 from rohitwaghchaure/not_able_to_submit_sales_invoice_e_invoice_issue ... fix: e-invoice issue	2019-11-25 19:24:23 +05:30
Rohit Waghchaure	9326fb78f2	fix: BOM UX	2019-11-25 18:56:18 +05:30
Nabin Hait	ecc6b1917b	Merge branch 'develop' of https://github.com/frappe/erpnext into develop	2019-11-25 18:13:58 +05:30
Nabin Hait	a7d168c05f	fix: merge conflict	2019-11-25 18:12:56 +05:30
Pranav Nachnekar	fc5d8fcd9f	Merge branch 'develop' into scheduling-ui-rewrite	2019-11-25 12:24:32 +00:00
0Pranav	b84e56ebb5	fix:travis tests	2019-11-25 17:32:02 +05:30
0Pranav	565d3efcdf	fetch updated document in test_quotation	2019-11-25 17:11:12 +05:30
Pranav Nachnekar	d63ad3bb5f	fix: add email group and newsletter links to CRM module view (#19679) ... * fix: add email group and newsletter links to CRM module view * chore: move email group to bottom	2019-11-25 16:50:47 +05:30
0Pranav	f9dec5201f	fix:tests	2019-11-25 16:42:07 +05:30
0Pranav	cf3a2f6579	set transaction date to yesterday	2019-11-25 16:26:04 +05:30
0Pranav	032baeac5b	don't submit quotation	2019-11-25 15:15:00 +05:30
Nabin Hait	4d12f8acab	bumped to version 12.2.0	2019-11-25 15:31:23 +05:50
Nabin Hait	c856cb85d9	log: Change log for v12.2.0	2019-11-25 15:08:47 +05:30
0Pranav	754c43f6c3	fix set_expired_status method	2019-11-25 14:27:43 +05:30
0Pranav	e0c9f3c282	fix valid date	2019-11-25 14:14:51 +05:30
0Pranav	3ec5eabaf6	formatting	2019-11-25 14:11:31 +05:30
0Pranav	f2752bf38c	fix: tests for python2	2019-11-25 14:09:49 +05:30
Nabin Hait	35e8d1e1d7	Stock acc bal sync msg (#19676) ... * fix: Prefilled JV via Account Balance and Stock Value mismatch error message - Make JV button will route to Journal Entry and add rows in child table * fix: make journal entry to sync stock and account balance * fix: translated action label	2019-11-25 14:02:51 +05:30
Mangesh-Khairnar	647331bbd7	feat: add search in category	2019-11-25 13:56:00 +05:30
Rucha Mahabal	7728ae6988	fix: added company letter head slide	2019-11-25 13:23:53 +05:30
0Pranav	a9ff7df2e6	add sql query to set valid_till	2019-11-25 12:55:27 +05:30
Nabin Hait	2fd6814cbf	Merge branch 'marination-account_stock_sync_error' into develop	2019-11-25 12:46:45 +05:30
Nabin Hait	1ed1c4e6a4	fix: make journal entry to sync stock and account balance	2019-11-25 12:33:40 +05:30
Saqib	cd3976f7d2	Asset cancellation fix (#19671) ... * fix: remove asset movement mandatory fields * fix: label for reference doctype	2019-11-25 12:24:34 +05:30
Pranav Nachnekar	04e3a506e4	fix: Primary address not being fetched for customer (#19667) ... * fix: priamry address not being fetched * add doctype to filter for customer_primary_address * remove get_customer_primary_address_method	2019-11-25 12:04:00 +05:30
0Pranav	a077795581	fix tests	2019-11-25 12:01:00 +05:30
Rucha Mahabal	00677f334e	fix: user progress code cleanup	2019-11-25 11:58:14 +05:30
0Pranav	eefc492ff4	call commit after sql query for schedular job	2019-11-25 10:51:27 +05:30
marination	737d8a1e26	fix: Added comments	2019-11-25 09:42:08 +05:30
Saqib	c9203a1bee	fix: asset movement ux fixes (#19637)	2019-11-22 16:35:15 +05:30
Saqib	f37a46edea	Fixed Asset Refactor Review fixes (#19665) ... * fix: fixed asset item creation ux fixes * fix: auto creation of asset ux fixes * fix: [LCV] incorrect condition when checking assets linked with PR * fix: bulk update assets * refac: remove company level cwip enabling * cwip can be enabled only on category level * fix: #19649	2019-11-22 16:32:50 +05:30
Saqib	1919af2ff1	Fixed Asset Refactor Review fixes (#19666) ... * fix: fixed asset item creation ux fixes * fix: auto creation of asset ux fixes * fix: [LCV] incorrect condition when checking assets linked with PR * fix: bulk update assets * refac: remove company level cwip enabling * cwip can be enabled only on category level * fix: #19649	2019-11-22 16:32:34 +05:30
Nabin Hait	aff4a67954	Merge branch 'account_stock_sync_error' of https://github.com/marination/erpnext into marination-account_stock_sync_error	2019-11-22 15:14:32 +05:30
Marica	b5c296da9e	fix: Validation Error message on Prepared Report. (#19639) ... Give the user the reason why he has to use filters.	2019-11-22 14:38:58 +05:30
Marica	7ca472780b	fix: Get Current Stock button not working in Purchase Receipt (#19645) ... - Field visible in grid view as well for better feedback	2019-11-22 14:37:38 +05:30
Anurag Mishra	763660b2e4	fix: set allocated amount in employee advance as per total amount (#19626)	2019-11-22 13:32:25 +05:30
0Pranav	6c368e2dfb	submit quotation in test	2019-11-22 13:22:12 +05:30
0Pranav	b3354198f1	Fix sql query in set_expired_status	2019-11-22 12:38:43 +05:30
Mangesh-Khairnar	b10526dd86	fix: consider taxes in the grand total (#19631)	2019-11-22 12:28:33 +05:30
thefalconx33	fa42999314	fix: last purchase rate greater than selling price	2019-11-22 12:15:41 +05:30
Saqib	290253fdd0	fix: last purchase rate greater than selling price (#19617)	2019-11-22 12:12:29 +05:30
Deepesh Garg	24cde55e28	fix: Patch for updating price or product discount field (#19642) ... * fix: Patch for updating price or product discount field * fix: Update pactch * Update update_price_or_product_discount.py	2019-11-22 11:57:42 +05:30
Ben Knowles	49cd19d917	fix: update syntax error in company.js (#19661)	2019-11-22 11:36:02 +05:30
Nabin Hait	7af153da50	fix: Multiple fixes related to landed cost accounting (#19656)	2019-11-22 11:35:14 +05:30
Nabin Hait	046137caa2	fix: Multiple fixes related to landed cost accounting (#19657)	2019-11-22 11:34:50 +05:30
Saqib	150c44b350	fix: asset movement ux fixes (#19641)	2019-11-22 11:08:35 +05:30
Rucha Mahabal	3cf2c2b3d5	feat: slides for onboarding wizard in ERPNext	2019-11-21 20:47:08 +05:30
Mangesh-Khairnar	1a92eb14ed	fix: Mark attendance from employee attendance tool (#19627)	2019-11-21 17:58:18 +05:30
0Pranav	f5112905dc	import make_item method in tests	2019-11-21 13:19:44 +05:30
Rohit Waghchaure	c4e6c42950	fix: e-invoice issue	2019-11-21 11:20:49 +05:30
Rohit Waghchaure	a831848074	fix: code cleanup	2019-11-20 19:42:27 +05:30
Rohit Waghchaure	eed30c6d8c	fix: not able to select item in sales order	2019-11-20 19:42:11 +05:30
0Pranav	4a28144941	add tests	2019-11-20 15:53:19 +05:30
0Pranav	5717a265b7	remove: unused imports	2019-11-20 15:31:13 +05:30
0Pranav	ae90ea9547	fix:travis errors	2019-11-20 15:24:33 +05:30
marination	e537cda062	fix: Added conditional check for conversion factor	2019-11-20 12:38:58 +05:30
0Pranav	682956543e	fix travis	2019-11-20 11:45:14 +05:30
Rucha Mahabal	45e9dd9c51	fix(Journal Entry): default Cash Entry account not getting fetched	2019-11-20 11:40:38 +05:30
0Pranav	fe2147a496	fix travis	2019-11-20 11:37:49 +05:30
0Pranav	dbde140e46	fix: save method of Appointment Booking Setting	2019-11-20 10:30:41 +05:30
0Pranav	c8e66a0f71	Infer number_of_agents from agent_list in apppointment booking settings	2019-11-20 10:27:59 +05:30
rohitwaghchaure	26c46282e8	Merge pull request #19618 from nextchamp-saqib/pos_fix ... fix: stock qty not displayed in pos	2019-11-19 19:41:25 +05:30
rohitwaghchaure	95270ad14b	Merge pull request #19619 from rohitwaghchaure/not_able_to_select_item_in_the_sales_order ... fix: not able to select item in sales order	2019-11-19 19:40:11 +05:30
Rohit Waghchaure	248585b5a1	fix: code cleanup	2019-11-19 19:21:27 +05:30
Rohit Waghchaure	c42312ea12	fix: not able to select item in sales order	2019-11-19 19:06:51 +05:30
rohitwaghchaure	a85ddf2fb4	fix: performance issue of sales invoice while save/submit (#19598) ... * fix: performace issue of sales invoice while save/submit * Cached price list data, item group child data, added indexing for blanket order	2019-11-19 18:47:48 +05:30
Nabin Hait	9db9edca2c	fix(expense claim): fetch outstanding documents based on party account type	2019-11-19 18:44:54 +05:30
rohitwaghchaure	238521c2bd	Merge pull request #19501 from Mangesh-Khairnar/multiple-pos-profile ... feat: multiple company pos profile	2019-11-19 18:39:06 +05:30
thefalconx33	353f73a153	fix: stock qty not displayed in pos	2019-11-19 18:37:21 +05:30
Mangesh-Khairnar	c436d93303	fix: reset pos profile when default doesn't exists	2019-11-19 18:21:53 +05:30
Pranav Nachnekar	e13b769813	use nowdate instead of date.today() ... Co-Authored-By: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2019-11-19 12:04:30 +00:00
Mangesh-Khairnar	3f854fce2e	feat: fetch leave approver from both employee and department approvers (#19613) ... * fix: fetch leave approvers from both department and employee master * fix: creaate a set of approvers	2019-11-19 15:07:30 +05:30
RJPvT	a998978415	fix: pending on review date (#19609) ... * fix: On Specific case if no item code in name * fix: pending on review date	2019-11-19 14:54:38 +05:30
Joseph Marie Alba	2578d49b84	Correct bug in abbr cause by missing " " separator (#19605) ... Only 1 letter ABBR is generated after typing in a COMPANY NAME separated by spaces. This is due to missing " " value in split method. For example: Company Name: ABC Multiple Industries Generates Abbr: A Correct Abbr should be: AMI This is caused by mission " " in split method.	2019-11-19 14:54:09 +05:30
Shivam Mishra	776ff2f75d	fix: query for item group listing (#19604)	2019-11-19 14:51:25 +05:30
Mangesh-Khairnar	f3ecfd8e58	fix: fetch leave approvers from both department and employee master (#19611) ... * fix: fetch leave approvers from both department and employee master * fix: creaate a set of approvers	2019-11-19 14:50:05 +05:30
0Pranav	539ea2cefb	Rename doctype Appointment Booking Slots	2019-11-19 10:59:24 +05:30
0Pranav	b9460ed22c	switched ORM methods for single SQL query	2019-11-19 10:46:07 +05:30
Deepesh Garg	ee69f707a9	Merge pull request #19600 from rohitwaghchaure/make_email_queue_issue_in_pos ... fix: 'NoneType' object has no attribute 'replace' in POS	2019-11-19 09:47:55 +05:30
deepeshgarg007	0debcf9f2f	fix: Share existing condition logic	2019-11-18 22:12:29 +05:30
deepeshgarg007	9c1c4ef3dd	refactor: Share transfer cancellation and code cleanup	2019-11-18 17:52:19 +05:30
rohitwaghchaure	8131f7657e	Merge pull request #19601 from rohitwaghchaure/fix_set_query_not_working_for_department_field ... fix: not able to select department in instructor form	2019-11-18 16:40:42 +05:30
marination	6ef057a2a3	fix: Prefilled JV via Account Balance and Stock Value mismatch error message ... - Make JV button will route to Journal Entry and add rows in child table	2019-11-18 15:55:32 +05:30
Anurag Mishra	c0d8233a8b	fix: Raw material qty depending on the quantity of the parent BOM	2019-11-18 15:45:53 +05:30
Rohit Waghchaure	39eeac265b	fix: not able to select department in instructor form	2019-11-18 15:20:15 +05:30
Rohit Waghchaure	466702200f	fix: 'NoneType' object has no attribute 'replace' in POS	2019-11-18 14:57:55 +05:30
Deepesh Garg	87c6718d90	fix: Book valuation expense in specified account rather than expense included in valuation account (#19590) ... * fix: Book valuation expense in specified accout rather than expense included in valuation account * fix: Remove undefined variable * fix: Test cases * fix: Test Case	2019-11-18 12:34:30 +05:30
Saqib	d995609ffa	Fixed asset refactor (#19369) ... * refactor: Asset Movement with multiple assets using table * refactor: Create Asset Movement from Asset List & Linking PR/PI with Asset * feat: Auto create asset on Purchase checkbox * refactor: LCV for asset created via PR/PI * refactor: get asset category accounts from item master * refactor: Purchase Receipt for asset purchasing * refactor: Purchase Invoice for asset purchasing * fix: post-refactor delete fixes * refactor: moved asset validation from pr/pi on asset submission * fix: Asset Category should be defined for auto purchasing assets * fix: undo serial_no_update removal (for non asset item) from LCV * fix: remove duplicate calls from item.js * fix: args position of all occurrence of get_asset_category_account() * fix: test cases * fix: landed cost voucher validations * refactor: test case for auto creation of asset * fix: removed invalid assertions * fix: patch errors on travis * fix: codacy fixes * fix: PI Items not fetching details from item * fix: asset movement from list view having default purpose 'Receipt' * chore: msgprint for selecting item code first while creating asset manually * fix: alert messages * minor: asset movement fixes * fix: lcv was made against submitted assets * minor: ux fixes * refac: move specific asset validation to SINV * chore: remove make_purchase_invoice from asset form * make asset movement on asset submission * add PR & PI queries based on item code * refac: not allow last movement cancellation * move asset movement creation on asset submission * asset movement naming series * add tests * fix: code review changes * chore: remove unecessary asset movement updation * refac: setting latest location while making asset movements * Added extra validations * fix: form dashboard make lcv button * fix: auto asset movement creation validation * fix: allow lcv against other items after removing submitted assets * chore: remove unwanted condition * fix: mismatch debit credit on purchase of asset with valuation tax * chore: toggle required field based on movement type * chore: fix lcv error message * fix: travis failing * fix: travis failing test * fix: wrong conditions after merge * fix: cannot cancel assets * fix: travis failing* fix change in deletion of assets * fix: codacy * fix: process cancellation of assets * refac: cancellation of pr only deletes auto created assets * fix: incorrect query	2019-11-18 11:46:55 +05:30
Mangesh-Khairnar	f69b9a8c47	fix: fetch default pos profile user for the company	2019-11-15 16:54:26 +05:30
0Pranav	53b65ab8ed	Add status expired to doctype quotation	2019-11-15 16:42:32 +05:30
rohitwaghchaure	6424416886	fix: sales order item shwoing incorrect produced qty (#19584)	2019-11-15 14:18:45 +05:30
marination	a076bddd83	fix: Show 'Bill of Materials' custom button conditionally	2019-11-15 12:03:06 +05:30
0Pranav	18fda5a571	add appointment list to module page	2019-11-15 11:58:21 +05:30
rohitwaghchaure	16f6ca12a7	Merge pull request #19023 from Alchez/dev-work-order-bugs ... fix: Work Order operating cost re-calculation on client-side (develop)	2019-11-15 11:19:10 +05:30
rohitwaghchaure	c74c5d5644	Merge pull request #19583 from rohitwaghchaure/fixed_stock_rec_showing_incorrect_current_qty_and_serial_no ... fix: stock reconciliation showing incorrect current serial no and qty	2019-11-15 10:17:11 +05:30
deepeshgarg007	57bd1308eb	fix: Validation messages code cleanup	2019-11-15 08:25:48 +05:30
prssanna	74bbcb539f	fix: Ignore period closing voucher entries in accounts dashboard	2019-11-14 22:47:58 +05:30
Mangesh-Khairnar	d545f6fb6b	fix: fetch approver from employee	2019-11-14 19:26:49 +05:30
Rohit Waghchaure	cf55c9c6da	fix: stock reconciliation shwoing incorrect current serial no and qty	2019-11-14 18:22:20 +05:30
Marica	c9e8a1bf96	fix: Account Balance and Stock Value out of sync error message (#19526) ... * fix: Account Balance and Stock Value out of sync error message Added 'Make Adjustment Entry' button and enhanced message * fix: Split message and changed routing for translation	2019-11-14 16:13:43 +05:30
rohitwaghchaure	e942f99897	Update work_order.js	2019-11-14 15:26:18 +05:30
Nabin Hait	ec082754b4	fix: One serial no can be tagged in multiple invoices if used against different items (#19580)	2019-11-14 13:28:24 +05:30
Deepesh Garg	d69d0e3046	fix(patch): skip leave ledger entry creation for denied leaves (#19579)	2019-11-14 13:05:13 +05:30
0Pranav	511780a4d4	feat: configurable redirect on success	2019-11-14 12:47:08 +05:30
Mangesh-Khairnar	fc3b924d4d	fix: skip leave ledger entry creation for denied leaves (#19556) ... * fix: skip leave ledger entry creation for denied leave application * patch: remove incorrect leave ledger entries * fix: create reverse ledger entry before setting status to cancel	2019-11-14 12:02:10 +05:30
0Pranav	793ba8fc06	pretty timezone names	2019-11-14 11:25:49 +05:30
Himanshu	5503b6cff5	fix(Task): Do not create/schedule task after project end (#19184) ... * fix: do not create/schedule task after project end * fix: check difference between dates * fix: check project date * fix: task creation * fix: tests	2019-11-14 10:11:25 +05:30
Saqib	73616d6b33	fix: duplication while bulk creation of item tax template (#19570)	2019-11-14 10:09:44 +05:30
Deepesh Garg	95a6320459	Merge pull request #19576 from marination/cwip-patch-fix ... fix(patch): Enable CWIP Accounting	2019-11-13 22:18:12 +05:30
Himanshu	1ad2d4a962	fix: get tags for rfq (#19564) ... * fix: get tags for rfq * chore: remove console log	2019-11-13 19:21:52 +05:30
marination	9ffa9d4a64	fix(patch): Enable CWIP Accounting	2019-11-13 19:10:20 +05:30
Mangesh-Khairnar	af7fe1937e	fix: fetch leave approver defined in employee in leave application (#19559) ... * fix: fetch leave approver defined in employee in leave application * Update department_approver.py	2019-11-13 19:00:56 +05:30
Saqib	3e515e704d	Monthly distribution of depreciation amount (#19493) ... * feat: allow monthly distribution of depreciation amount * chore: added comments * fix: monthly depr was not starting from use date's month	2019-11-13 19:00:24 +05:30
rohitwaghchaure	94565d69d1	fix: travis failing (#19568)	2019-11-13 18:58:22 +05:30
Nabin Hait	732d6afad5	fix: Show AR summary based on outstanding (#19573)	2019-11-13 18:49:23 +05:30
rohitwaghchaure	d064505ebe	fix: incorrect produced qty in the production plan (#19569)	2019-11-13 18:17:48 +05:30
rohitwaghchaure	ba8fc21594	fix: merge similar entries for serialized items in stock reconciliation (#19408)	2019-11-13 18:11:58 +05:30
Nabin Hait	3a72cb46bc	fix: Set due date in accounts receivable based on payment terms (#19563)	2019-11-13 17:58:10 +05:30
Deepesh Garg	082bfb8cb3	Merge pull request #19567 from deepeshgarg007/balance_sheet_develop ... fix: Accumulated Values filter disappearing	2019-11-13 17:46:46 +05:30
0Pranav	4006eb5277	Merge branch 'scheduling-ui-rewrite' of https://github.com/0Pranav/erpnext into scheduling-ui-rewrite	2019-11-13 17:12:24 +05:30
Pranav Nachnekar	ccd9b38463	Merge branch 'develop' into scheduling-ui-rewrite	2019-11-13 11:41:41 +00:00
0Pranav	c31808f5b2	fix margins	2019-11-13 16:47:51 +05:30
0Pranav	6e6954cab8	timezone aware datetime	2019-11-13 16:00:59 +05:30
0Pranav	b1e9fb9e14	fix: buttons on page of appointment scheduling	2019-11-13 15:32:56 +05:30
0Pranav	67f191df4e	padding fixes for timeslot divs	2019-11-13 14:14:10 +05:30
deepeshgarg007	5ea4328359	fix: Accumulated Values filter disappearing	2019-11-13 13:23:49 +05:30
Rohan	4d27b50437	Merge branch 'develop' into dev-work-order-bugs	2019-11-13 13:09:12 +05:30
0Pranav	c72e1f812d	adjust padding for appointment booking	2019-11-13 12:59:05 +05:30
0Pranav	a92f060740	multiple fixes in index.js	2019-11-13 12:13:42 +05:30
0Pranav	f25e2a29f7	fix:formatting	2019-11-13 12:01:36 +05:30
0Pranav	cce000a6d0	remove: commented code	2019-11-13 11:48:37 +05:30
0Pranav	db64c69dac	fix: reference before assignement error	2019-11-13 11:12:38 +05:30
0Pranav	f75ea952e3	Added expired status to quotation	2019-11-13 11:03:53 +05:30
rohitwaghchaure	ffbfaf7099	fix: email digest showing incorrect upcoming events (#19552)	2019-11-13 10:59:23 +05:30
Mangesh-Khairnar	06c8129574	fix(batch): fetch company on splitting the batch (#19558)	2019-11-13 10:51:43 +05:30
Marica	d00c59830e	feat: Disable CWIP Accounting checkbox added in Company and Asset Category (#19262) ... * feat: Disable CWIP Accounting checkbox added in Company and Asset Category Asset Settings is removed completely Disable CWIP Accounting checkbox will give priority to Asset Category * fix: Changed checkbox name to 'Enable Capital Work in Progress Accounting' - checkbox will be disabled by default - Enabling it in Company will globally enable it - When globally disabled , it's value on the asset category will be considered * chore: Added patch to set pre-existing CWIP checkbox value into new checkbox * fix(test): Asset * fix: Asset Test and Patch * fix(test): Opening Invoice Creation Tool * Update asset.py * fix: Patch and other fixes	2019-11-12 19:17:43 +05:30
rohitwaghchaure	010714757c	fix: '<' not supported between instances of 'str' and 'NoneType' (#19553)	2019-11-12 18:20:07 +05:30
MorezMartin	4fa6194009	feat: [production_plan -> fetching item description] Fetch item description from Material Request or Sales Order (#19541) ... * Change packed item * Remove description field on update_packed_items * add possibility to modify description on packed items * Fetch description from Material Request or Sales Order in production plan, add the possibility to modify the description un production plan * sync with fork * Fetch description from Material Request or Sales Order in production plan, Add the possibility to modify description in production plan * code cleaning syncing fork * code cleaning syncing fork * code cleaning syncing fork * code cleaning syncing fork * rewied and add item_details.description in case of blank field	2019-11-12 18:19:01 +05:30
Marica	29a2e16f62	fix: Add Serial No. button not responding (#19550)	2019-11-12 14:43:41 +05:30
Deepesh Garg	3cc3b57926	fix: Expense claim paid through employee advance getting fetched as outstanding in Payment Entry (#19427) ... * fix: Expense claim paid through employee advance getting fetched as outstanding in Payment Entry * fix: Codacy * fix: Minor UX fixes * fix: Also credit payable amount in case of advance payment * fix: Against voucher in GL enrty	2019-11-12 14:32:50 +05:30
deepeshgarg007	929676fceb	fix: Validation logic code cleanup	2019-11-12 12:00:30 +05:30
Diksha	39152f935c	fix(employee): show only active employees in the error display while marking a reporting to employee as left	2019-11-11 19:22:51 +05:30
rohitwaghchaure	001ee5ee1b	fix: dictionary changed size during iteration (#19546)	2019-11-11 17:43:48 +05:30
Mitchy25	a227b9a9a6	Fix Bank Reconcilaition for Payment Entries (#19190) ... * Fix Bank Reconciliation with Payment Entries * Update bank_reconciliation.js	2019-11-11 17:29:53 +05:30
ci2014	8b2223ae5f	Move add_custom_button for Gantt and Kanban Board (#19193) ... Move add_custom_button for Gantt and Kanban Board to set_buttons, because in onload it is not working.	2019-11-11 17:27:48 +05:30
Nabin Hait	f997b443e1	Merge branch 'finbyz-develop' into develop	2019-11-11 17:20:28 +05:30
Nabin Hait	4c7ac65db1	fix: Made Campaign for field mandatory	2019-11-11 17:19:52 +05:30
FinByz Tech Pvt. Ltd	88de00fb94	Rendered Email template in email Campaign	2019-11-11 17:17:21 +05:30
Tufan Kaynak	06c6f7cfd3	fix: Currency Exchange for_selling and for_buying on the same day (#19339) ... * fix: test data of Currency Exchange to incluse buying and selling test data of Currency Exchange to incluse buying and selling * fix: Currency Exchange Test corrected to include selling and buying exchange_rate Currency Exchange Test corrected to include selling and buying exchange_rate * fix: Currency Exchange for_selling and for_buying fields test and functionality restored In this fix: * You can now add a separate exchange_rate in date for_selling and for_buying. You could not before because the unique field name was only calculated to allow a single name for a date * tests did not account for for_selling and for_buying fields and thier uniqueness * Update test_currency_exchange.py * Update test_records.json * fix: update test_records.json * Update test_records.json * The basic package for turkey is defined. It is empty now but applications specific to Turkey will be created under that package. * fix: update code with scapes vs.tabs updated the code regarding spaces issue * Update currency_exchange.py	2019-11-11 17:11:16 +05:30
Saurabh	d3ed499854	Merge pull request #19416 from EconCode/shopify-connector-unregisterfix ... fix: unregistering url wrong formatted string	2019-11-11 17:04:44 +05:30
Nabin Hait	32936024a0	patch: set default for add taxes from item tax template	2019-11-11 15:44:27 +05:30
Nabin Hait	8bd2d4d35e	fix(trial balance): Show opening and closing of group account in single column (#19509)	2019-11-11 10:59:20 +05:30
rohitwaghchaure	df75b7693a	fix: added description, uom fields in material request plan item table (#19463)	2019-11-11 10:59:10 +05:30
Mangesh-Khairnar	2f44480d69	enhancement: Item-wise sales history report (#19500) ... * refactor(item-wise-sales-history): convert query report to script report * refactor: add columns, fetch data * refactor: shift company set func to utils * fix: add filters * fix: minor changes * fix: fetch all the descendants	2019-11-11 10:54:12 +05:30
rohitwaghchaure	090f9a3dc9	Merge pull request #19533 from rohitwaghchaure/fixed_precision_issue_while_updating_qty_and_rate ... fix: precision issue	2019-11-08 14:54:58 +05:30
rohitwaghchaure	b81942404d	fix: incorrect balance qty in stock ledger if batch filter set (#19479)	2019-11-08 14:50:48 +05:30
rohitwaghchaure	d36c6068b2	fix: 'NoneType' object has no attribute 'stock_uom' (#19532)	2019-11-08 14:43:53 +05:30
Rohit Waghchaure	e93dc9f1cd	fix: precision issue	2019-11-08 13:43:15 +05:30
Deepesh Garg	7a23057eab	feat: Enhancement in landed cost voucher (#19252) ... * feat: Enhancement in landed cost voucher * fix: Make GL entries based on ledgers in Landed cost voucher * fix: Patch to update expense account in Landed Cost Voucher and Stock Entry * fix: Ability to select expense account in Stock Entry * fix: Renaming and test case fixes * fix: Test Cases * fix: Additional cost in Stock Entry * fix: Changed filters and test case fixes * fix: Upadte filters in stokc entry expense account filter * fix: company filter	2019-11-08 12:52:54 +05:30
Deepesh Garg	7aef9f3b43	fix: Accounting Dimension custom fields should be admin owned (#19525) ... * fix: Accounting Dimension custom fileds should be admin owned * fix: Update query * fix: Travis	2019-11-08 12:42:38 +05:30
Deepesh Garg	a839510b33	Merge pull request #19528 from deepeshgarg007/gst_check_digit_msg ... fix: GSTIN validation msg fix	2019-11-07 23:05:23 +05:30
deepeshgarg007	62fbf37eb4	fix: GSTIN validation msg fix	2019-11-07 21:54:25 +05:30
deepeshgarg007	015285c42f	fix: Exception handling in GSTR-1 Report	2019-11-07 19:38:52 +05:30
Rucha Mahabal	b455318f01	fix(Integration): Woocommerce issues (#19487) ... * fix: Delivery URL returned response code 500 * fix: set default company in Woocommerce Settings * fix: remove redundant function calls * fix: make offset configurable for delivery date in sales order * fix: remove redundant code from woocommerce_settings.py * fix: import create_custom_field * fix: added ignore_mandatory for saving item, customer and sales order * fix: remove unused woocommerce_check custom field * fix: do not delete custom fields or item group when sync is disabled	2019-11-07 18:20:32 +05:30
Nabin Hait	628701f1a5	fix: Accounts mandatory depending on share transfer type (#19523)	2019-11-07 18:05:40 +05:30
Himanshu	bac50bc295	fix: remove validate for issue priority (#19522)	2019-11-07 18:04:50 +05:30
Saurabh	28c6a0aeb1	fix: reload global defaults (#19517)	2019-11-07 14:16:26 +05:30
0Pranav	83100c9c84	Add comemnts for tz conversions	2019-11-07 13:37:11 +05:30
0Pranav	0671ea8137	use frappe.Redirect instead of DoesNotExistError	2019-11-07 13:31:56 +05:30
0Pranav	76b20a5fa4	crack some one liners	2019-11-07 13:24:59 +05:30
rohitwaghchaure	15382a6f71	Merge pull request #19518 from sahil28297/fix_cart ... fix(cart): return rule instead of rule_label_map	2019-11-07 13:03:41 +05:30
Marica	52d888de42	fix[minor]: Payment Entry status patch (#19519)	2019-11-07 13:01:45 +05:30
0Pranav	151853b887	remove unneccessary imports	2019-11-07 12:55:43 +05:30
0Pranav	51208b3f0b	fix:formatting	2019-11-07 12:54:48 +05:30
Marica	e37a67245e	fix: Sales and Purchase Invoice Status, Payment Reconciliation Credit/Debit Note (#19388)	2019-11-07 12:52:23 +05:30
0Pranav	75db6f7073	convert indentation to tabs	2019-11-07 12:47:00 +05:30
Sahil Khan	1c44bb0982	fix(cart): return rule instead of rule_label_map	2019-11-07 12:38:05 +05:30
0Pranav	fce8f36bb2	don't change lead if assigned	2019-11-07 12:37:28 +05:30
theopen-institute	36520ef951	fix: Add a setting to make creation of new Student User optional (#19122) ... * New setting to skip Student User creation * Allow skip of new User creation via settings	2019-11-06 19:09:15 +05:30
Raffael Meyer	edba06038e	feat(regional): enable transaction log for germany (#19198)	2019-11-06 19:07:04 +05:30
Mitchy25	a5776d16b4	fix: Version 12 Bank Reconciliation fix (#19182) ... * Fix Bank Reconciliation Change fixes Bank Rec upload as well as the duplicatation of bank_account and company filters * Update bank_reconciliation.js Removing incorrect fix to filters. Filters are loaded from Bank Transaction List. * Update bank_reconciliation.js	2019-11-06 19:04:54 +05:30
Suraj Shetty	7508896bfb	perf: Optimise BOM Update Tool (#19236) ... * perf: Optimize BOM update tool - Remove redundant traverse_tree calls - Cache bom_children data Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com> * fix: Replace get_list with db.sql * fix: Enable versioning for updated BOM * fix: Directly save doc_before_save from bom obj instead of using load_doc_before_save * fix: recurssion check performance issue	2019-11-06 18:46:57 +05:30
Mangesh-Khairnar	a709ae894c	feat: duplicate linked task in project (#19271) ... * feat: create a duplicate project * fix: allow duplication via form * feat: fetch old task and link project * fix: link task with project * fix: parse json string as python object * fix: avoid duplicate task based on the project template * fix: ask user for the new project name * fix: display a descriptive message on switching to a new route * fix: override duplicate in menu * fix: check for duplicate project name after submitting prompt * fix: set the project template * fix: minor changes * fix: function call * refactor: add a separate button for duplicate * Update project.js	2019-11-06 18:20:06 +05:30
Deepesh Garg	02b9472152	Merge pull request #19490 from prssanna/dashboard-fix ... fix: fix dashboard with date range	2019-11-06 18:17:08 +05:30
Marica	1beed7db72	fix: Added 'status' field in Payment Entry (#19507)	2019-11-06 18:12:29 +05:30
Shivam Mishra	d743583bf4	fix: contact creation and fetching for shopping cart (#19510)	2019-11-06 18:03:03 +05:30
rohitwaghchaure	0c12eded05	Merge pull request #19505 from rohitwaghchaure/credit_limit_not_defined_in_accounts_receivable_report ... fix: unknown column credit limit in accounts receivable report	2019-11-06 17:26:35 +05:30
Deepesh Garg	f67833f249	Merge pull request #19492 from gavindsouza/invoice-creation-tool-py3 ... fix: invoice creation tool of invoices with no paid and outstanding amounts	2019-11-06 16:40:04 +05:30
rohitwaghchaure	6a50c92087	Update accounts_receivable.js	2019-11-06 16:34:17 +05:30
rohitwaghchaure	e123ec6b45	fix: incorrect number of entries while making deferred revenue entry (#19473)	2019-11-06 15:25:00 +05:30
Saqib	01c19d3b93	internal issues (#19496) ... * fix: user remark mandatory in quick entry but not in form * fix: preview salary slip btn showing in draft and unsaved states * minor: removed unecessay comma * fix: department analytics report showing departments of all companies	2019-11-06 14:41:16 +05:30
Rohit Waghchaure	dec5bead9c	fix: unknown column credit limit in accounts receivable report	2019-11-06 13:13:31 +05:30
0Pranav	6f1d2eeffd	changes to suggestions made by shivam	2019-11-06 11:57:37 +05:30
Rohan	f527713b89	Merge branch 'develop' into dev-work-order-bugs	2019-11-06 11:39:24 +05:30
0Pranav	d1ee962d4b	seperate function for sending confirmation	2019-11-05 14:53:36 +05:30
Rohit Waghchaure	730c8a145d	minor: code cleanup	2019-11-05 12:46:52 +05:30
Pranav Nachnekar	4d3dc87a1a	Apply suggestions from code review ... Co-Authored-By: Shivam Mishra <scmmishra@users.noreply.github.com>	2019-11-05 04:32:06 +00:00
marination	075f6ea0d5	feat: Provision to fetch items from BOM in Stock Entry ... Items are populated in child table and amounts are calculated Warehouse Fields in popup toggle based on Stock Entry Type	2019-11-04 21:58:13 +05:30
Prssanna Desai	167aa7655d	Merge branch 'develop' into dashboard-fix	2019-11-04 15:42:20 +05:30
Gavin D'souza	05710804cf	fix: invoice creation tool of invoices with no paid and outstanding amounts	2019-11-04 14:45:11 +05:30
prssanna	7e2b030052	fix: fix dashboard with date range	2019-11-04 13:07:27 +05:30
Diksha	7091a2102c	fix(sales order): rename delivery to delivery note on sales order make button	2019-11-04 12:03:35 +05:30
Pranav Nachnekar	af18b2cdc5	Merge branch 'develop' into scheduling-ui-rewrite	2019-11-04 04:38:59 +00:00
Deepesh Garg	b565e9ba64	Merge pull request #19309 from sagargharge/develop ... fix: restricted duplicate guardians on student doctype (#19194)	2019-11-04 09:04:29 +05:30
Mangesh-Khairnar	e3bc213262	feat: multiple company pos profile	2019-11-01 22:35:08 +05:30
rohitwaghchaure	475d8e3cdc	Merge pull request #19477 from rohitwaghchaure/production_plan_warehouse_not_changed ... fix: Wrong warehouse fetched in production plan	2019-11-01 16:46:46 +05:30
Deepesh Garg	0bcf8b64f6	Merge pull request #19422 from marination/search-field ... fix: Search field entries included in Item Link field query	2019-11-01 15:38:25 +05:30
Rohit Waghchaure	1bb5d01192	fix: Wrong warehouse fetched in production plan	2019-11-01 14:24:21 +05:30
Deepesh Garg	ebf46120ba	Merge pull request #18985 from Alchez/dev-serial-no-statuses ... feat: add statuses for Serial No	2019-11-01 14:16:45 +05:30
0Pranav	e573bd9074	remove unnecessary variable	2019-11-01 12:47:11 +05:30
0Pranav	53ec8c6322	Merge branch 'develop' of https://github.com/0Pranav/erpnext into scheduling-ui-rewrite	2019-11-01 12:40:08 +05:30
deepeshgarg007	c82aed0718	fix: Add missing semicolon	2019-11-01 12:36:33 +05:30
0Pranav	97f6576213	prettify confirmation email	2019-11-01 12:36:06 +05:30
0Pranav	54f33f4e5d	move utility functions	2019-11-01 12:14:21 +05:30
0Pranav	3609872760	rename function	2019-11-01 12:06:42 +05:30
Deepesh Garg	9378aacbe5	Merge pull request #17151 from Alchez/develop-company-address-label ... fix(selling): Add missing label to company address field	2019-11-01 11:56:08 +05:30
0Pranav	6de68c8671	avoid repetition on get_form date	2019-11-01 09:51:32 +05:30
0Pranav	957c9f5ff0	fix:comments	2019-11-01 09:36:45 +05:30
0Pranav	4701bc8bfc	Add ignore permissions for opportunity	2019-11-01 09:36:29 +05:30
Deepesh Garg	3cbd70a1d9	Merge pull request #19316 from joelios/develop ... fix: Unable to create timesheet from project dashboard	2019-10-31 23:28:13 +05:30
Deepesh Garg	2ec7acb592	Merge pull request #19294 from vijaywm/duplicate-attendance ... fix: Typo in attendance date filter	2019-10-31 16:46:52 +05:30
Ashish Shah	28710cdf99	fix: coupon code changes suggested by prasad (#19352) ... * changes suggested by prasad * codacy correction	2019-10-31 16:09:06 +05:30
Mangesh-Khairnar	45c18b3184	fix: fetch employee department (#19433)	2019-10-31 16:00:52 +05:30
Suraj Shetty	519ca54f53	feat: Show timesheets related to customer's projects on customer portal (#19443) ... * fix: Show timesheets related to customer's projects on customer portal * style: fix codacy	2019-10-31 16:00:04 +05:30
Suraj Shetty	77e4cf89f8	fix: Pass parent_acc_name (#19450)	2019-10-31 15:57:31 +05:30
deepeshgarg007	4a1d000c33	fix: Test Case	2019-10-31 15:57:15 +05:30
rohitwaghchaure	81c217584a	fix: purchase order issue, margin_rate_or_amount not there in the purchase documents (#19466)	2019-10-31 15:56:10 +05:30
Anurag Mishra	a11e738801	feat: Stock value and account balance sync. (#19233) ... * feat: Allow user to sync stock_value and account_balance jv if perpetual inventory is checked * fix(test): Sales Invoice * fix(test): Purchase Invoice * fix(test): Delivery Note * fix: more test_case * fix(test): Stock Entry * fix(test): Purchase Receipt * fix(more-test): Stock Entries * fix(more-test): Sales Invoice and Delivery Note * fix: tests for delivery note * fix: tests for stock reconciliation * refactor: stock and account balance function * fix(more-test): Warehouse * fix(test): Landed Cost Voucher * fix: changes requested	2019-10-31 15:55:03 +05:30
0Pranav	e494144c96	merge settings fetch, add helpers	2019-10-31 15:38:39 +05:30
0Pranav	60093d98b0	auto assign before creating event	2019-10-31 15:37:57 +05:30
0Pranav	d1c530c564	fix: merge settings into one call	2019-10-31 15:36:33 +05:30
gavin	450da16dc2	Merge branch 'develop' into hooks-update	2019-10-31 11:26:37 +05:30
rohitwaghchaure	139c20a736	Merge pull request #19454 from rohitwaghchaure/fix_item_price_stock_report_not_working_v12 ... fix: item price stock report not working	2019-10-30 22:30:10 +05:30
marination	1e754b161c	fix: Fetching catched meta and removed description fetch from Search Fields ... Description is conditionally fetched and also used in WHERE clause, that is maintained. Improved naming	2019-10-30 18:33:44 +05:30
gavin	8ed6772727	Merge branch 'develop' into hooks-update	2019-10-30 17:52:36 +05:30
gavin	ad04d442a1	Merge pull request #19442 from 0Pranav/maintainance-ux-fix ... fix: maintenance schedule ux	2019-10-30 17:51:55 +05:30
rohitwaghchaure	6bd6039496	Revert "fix: patch, item tax template showing 'Untitled' in the name"	2019-10-30 17:37:22 +05:30
Pranav Nachnekar	c02cb6ca94	Merge branch 'develop' into maintainance-ux-fix	2019-10-30 11:15:44 +00:00
rohitwaghchaure	1545ee914a	Merge pull request #19432 from rohitwaghchaure/showing_untitled_name_in_item_tax_template ... fix: patch, item tax template showing 'Untitled' in the name	2019-10-30 16:33:56 +05:30
rohitwaghchaure	7b6ab9738d	Merge pull request #19446 from rohitwaghchaure/not_able_to_select_project_in_work_order ... fix: not able to select the project in the work order	2019-10-30 16:32:34 +05:30
Rohit Waghchaure	d8b64cd199	replaced frappe.db.sql with frappe.get_all	2019-10-30 16:27:58 +05:30
Rohit Waghchaure	2e01573a40	fix: item price stock report not working	2019-10-30 16:22:30 +05:30
Deepesh Garg	fac4eb919b	Merge pull request #19445 from scmmishra/typo-fix ... fix: typo in production plan	2019-10-30 16:03:56 +05:30
gavin	e0348c9ec8	Merge branch 'develop' into hooks-update	2019-10-30 15:46:46 +05:30
Pranav Nachnekar	66e5e16a2e	Merge branch 'develop' into maintainance-ux-fix	2019-10-30 09:54:47 +00:00
Gavin D'souza	d38f5374cb	chore: moved email digest to long job	2019-10-30 14:43:58 +05:30
Mangesh-Khairnar	83c7b5b44b	fix(bom): maintain a default bom for an item (#19407)	2019-10-30 14:25:50 +05:30
Mangesh-Khairnar	7638788c2f	fix: calculate pending leaves (#19411)	2019-10-30 14:23:41 +05:30
Rohit Waghchaure	486a8f67a4	fix: not able to select the project in the work order	2019-10-30 14:22:49 +05:30
Anurag Mishra	5c9d92eabf	fix: On Specific case if no item code in name (#19419)	2019-10-30 14:18:16 +05:30
Shivam Mishra	afa03fd654	Merge branch 'develop' into typo-fix	2019-10-30 14:08:20 +05:30
Shivam Mishra	d8abac3278	fix: typo in production plan	2019-10-30 14:06:56 +05:30
0Pranav	c8333d4b41	fix: codacy	2019-10-30 13:48:01 +05:30
0Pranav	07b74533fe	fix: error message matches field name	2019-10-30 13:47:49 +05:30
Faris Ansari	e127d937f7	fix(ExpenseClaim): List filter config for Rejected and Unpaid (#19434)	2019-10-30 13:31:05 +05:30
0Pranav	da5bf5a7c4	fix:indentation	2019-10-30 11:24:58 +05:30
0Pranav	be5c6e7aec	fix:readability	2019-10-30 11:14:49 +05:30
0Pranav	0f0d6ce25c	Remove doctype related to appointment scheduling	2019-10-30 11:08:09 +05:30
0Pranav	846c03889e	fix: hide schedule section on new forms	2019-10-30 10:51:25 +05:30
0Pranav	d2d0100c9a	fix:better error message when sales person is none	2019-10-30 10:48:13 +05:30
0Pranav	abbc08cb48	fix: hide generate schedule button on new forms	2019-10-30 10:46:16 +05:30
ahmadRagheb	2a72d1fee4	Update salary_slip.py ... getdate imported twice	2019-10-29 19:49:08 +02:00
Rohit Waghchaure	b051fa37df	fix: patch, item tax template showing 'Untitled' in the name	2019-10-29 14:56:03 +05:30
Faris Ansari	bcf107b9f7	chore: fix unexpected keyword in shopify_settings (#19430) ... chore: fix unexpected keyword in shopify_settings	2019-10-29 14:25:37 +05:30
Deepesh Garg	118f2c7d64	Merge pull request #19402 from Mangesh-Khairnar/fix-dn-status ... fix: sync delivery note status in both list view and form view	2019-10-29 14:17:38 +05:30
Chinmay D. Pai	702f9f929b	chore: rename undefined variable in shopify_log ... Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>	2019-10-29 13:30:13 +05:30
Chinmay D. Pai	4f7885f1aa	chore: fix unexpected keyword in shopify_settings ... Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>	2019-10-29 13:20:17 +05:30
rohitwaghchaure	3270ba6d8c	Merge pull request #19421 from rohitwaghchaure/account_not_set_for_dasboard_chart_v12 ... fix: 'NoneType' object is not iterable	2019-10-29 11:30:22 +05:30
Rohan	8728e94dbd	Merge branch 'develop' into develop-company-address-label	2019-10-29 11:26:00 +05:30
Rohan	379f38e1cd	Merge branch 'develop' into dev-work-order-bugs	2019-10-29 11:25:53 +05:30
Rohan	fba7cae2c9	Merge branch 'develop' into dev-serial-no-statuses	2019-10-29 11:25:36 +05:30
Rohit Waghchaure	88d2c97391	fix: default accounts are not added on creation of company	2019-10-28 17:50:31 +05:30
Anurag Mishra	07b908c0c5	patch: Missing Patch for item Tax template	2019-10-28 16:00:24 +05:30
marination	3dbef9de74	fix: Search field entries included in Item Link field query	2019-10-28 15:48:10 +05:30
Rohit Waghchaure	8916916a03	fix: 'NoneType' object is not iterable	2019-10-28 13:00:18 +05:30
Deepesh Garg	9942fcc8cb	fix: Better validation msg for difference account in Stock Entry (#19400) ... * fix: Better validation msg for difference account * fix: Make primary info bold	2019-10-28 12:08:31 +05:30
Suraj Shetty	83b58352ce	fix: Overwrite default cost center if item has default cost center set. (#19405)	2019-10-28 12:05:30 +05:30
Deepesh Garg	a8358f0342	Merge pull request #19415 from frappe/jaichavan-fix-typo ... fix: typo in Budget Variance Report	2019-10-27 18:39:23 +05:30
Shivam Mishra	5e14660dda	Merge branch 'develop' into revert-19265-issue_fix	2019-10-27 17:36:08 +05:30
Sahil Khan	e6f86c934d	bumped to version 12.1.8	2019-10-26 20:22:19 +05:50
EconCode	07ae3abf34	fix: unregistering url wrong formated string ... Fixed the formated string for unregistering webhooks. String should look like: "/admin/api/2019-04/webhooks/#{webhook_id}.json" Taken from shopify api documentation - deleting webhooks: https://help.shopify.com/en/api/reference/events/webhook?api[version]=2019-04#destroy-2019-04	2019-10-26 16:31:29 +02:00
Sahil Khan	ce5200d700	bumped to version 12.1.7	2019-10-26 19:56:06 +05:30
Jai Chavan	9f483c1fa9	fix: Spelling of Variance	2019-10-26 18:45:01 +05:30
Suraj Shetty	8f67ef8a75	fix: Add patch to replace accounting with accounts in home_settings	2019-10-25 18:55:57 +05:30
Deepesh Garg	09a6868ccd	Merge pull request #19390 from 0Pranav/patch-1 ... fix: setting incorrect field for party bank account	2019-10-25 12:24:39 +05:30
Ashish Shah	e1f95c0529	fix: allow_items_not_in_stock should be evaluated (#19398)	2019-10-25 12:16:11 +05:30
0Pranav	8c1b88f156	Merge branch 'develop' of https://github.com/frappe/erpnext into develop	2019-10-25 11:45:03 +05:30
Aditya Hase	7bdc612013	chore: Update module name (#19404)	2019-10-24 18:01:58 +05:30
Mangesh-Khairnar	233c0bc779	fix: sync delivery note status in both list view and form view	2019-10-24 15:46:12 +05:30
rohitwaghchaure	5d0362669d	Merge pull request #19386 from rohitwaghchaure/while_making_return_entry_not_able_to_select_null_batch ... fix: not able to select the zero qty batch while making the sales ret…	2019-10-23 18:35:58 +05:30
Rohan	962f4eb96c	Merge branch 'develop' into develop-company-address-label	2019-10-23 15:57:26 +05:30
Pranav Nachnekar	d5166861de	fix:setting incorrect field for party bank account ... Previously  Corrected 	2019-10-23 07:46:00 +00:00
Deepesh Garg	d9e27b727f	Merge branch 'develop' into item_row_link_issue	2019-10-23 12:20:19 +05:30
Deepesh Garg	275f3f8b91	Merge pull request #19320 from deepeshgarg007/demo-fixes ... fix: Demo Script fixes	2019-10-23 12:17:08 +05:30
Deepesh Garg	3f96306986	Merge pull request #19375 from khushalti/develop ... fix: date validation, setting up default company, customer/supplier manadatory property on Blanket Order	2019-10-23 12:11:13 +05:30
rohitwaghchaure	5ff377e2bb	fix: product link not working in website (#19373)	2019-10-23 11:09:21 +05:30
deepeshgarg007	799f8d4f93	Merge branch 'develop' of https://github.com/frappe/erpnext into demo-fixes	2019-10-23 08:47:11 +05:30
Deepesh Garg	36c97c3128	Merge pull request #19385 from ruchamahabal/fix_moduleview ... fix: custom doctypes and reports not visible in Accounts module view	2019-10-22 17:34:38 +05:30
Deepesh Garg	453ad3c155	Merge branch 'develop' into develop	2019-10-22 17:30:13 +05:30
Shivam Mishra	85c028b60d	Merge branch 'develop' into revert-19265-issue_fix	2019-10-22 17:26:54 +05:30
Rohan	ee5f0f7c30	Merge branch 'develop' into dev-work-order-bugs	2019-10-22 17:12:00 +05:30
Rohan	8522fdc99c	Merge branch 'develop' into dev-serial-no-statuses	2019-10-22 17:11:30 +05:30
Nabin Hait	bd6b1806cd	fix: fixed asset register report and made skip-dn field hidden	2019-10-22 14:28:37 +05:30