brotherton-erpnext

Author	SHA1	Message	Date
anoop	ca6f3ec977	fix: set customer name on patient update	2020-04-27 22:27:13 +05:30
anoop	256b77b463	fix: filter service unit by company	2020-04-27 20:00:27 +05:30
anoop	e30cc83591	fix: field order, minor fixes - patient - update customer, releated fields patient appointment - send message	2020-04-27 19:36:49 +05:30
Deepesh Garg	57bfd38944	Merge pull request #21436 from deepeshgarg007/ewb_bill_error_message fix: E-Way bill error message	2020-04-27 15:04:32 +05:30
Deepesh Garg	fe7e6f5f53	fix: Test	2020-04-27 14:05:45 +05:30
Gavin D'souza	0805307514	perf: reduce failed_error_log size	2020-04-27 13:42:00 +05:30
Rucha Mahabal	e0ff9142ac	fix: show date in the message for already marked attendance	2020-04-27 13:29:46 +05:30
Gavin D'souza	82e7a9de28	feat: error log handling fix: toggle required accounts	2020-04-27 13:12:38 +05:30
Wolfram Schmidt	acfe8f020f	added time stamp to commit added time stamp to commit	2020-04-27 08:48:34 +02:00
Gavin D'souza	38c677689d	fix: set default round off acount	2020-04-27 11:50:16 +05:30
Gavin D'souza	2de4a5a7c8	feat: Error logging via doc fix: Handle duplicate company and COA feat: Error logging via doc feat: fetch defaults for accounts	2020-04-27 11:34:00 +05:30
Gavin D'souza	defeb73747	feat: Add Failed error logs fix: set defaults	2020-04-27 11:32:49 +05:30
Rucha Mahabal	f40a431d8c	fix: delivery trip form	2020-04-27 11:29:56 +05:30
Ahmad	f34faa9181	Module Import Fix (#21433 )	2020-04-27 10:57:02 +05:30
Rucha Mahabal	131452ca94	fix: Lab Test Invoicing (#21435 )	2020-04-27 10:52:38 +05:30
Rucha Mahabal	7bbe3dd8a0	fix: Patch for updating Appointment Reminder method in Scheduled Job Type (#21431 )	2020-04-27 10:51:46 +05:30
Deepesh Garg	4eecc65cff	fix: E-way bill fix in Delivery Note	2020-04-27 10:50:59 +05:30
Deepesh Garg	00ea59b447	fix: Utils messsage cleanup	2020-04-27 10:50:40 +05:30
Deepesh Garg	10aff8e118	fix: E-way bill fix in List view	2020-04-27 10:50:17 +05:30
Deepesh Garg	9979ceb96b	fix: E-way bill fix in sales invoice	2020-04-27 10:50:03 +05:30
Deepesh Garg	24b6055d89	Merge pull request #21427 from ruchamahabal/fix-desk-pages fix(Desk Page): Number of Open Leads not visible on Shortcut Card	2020-04-27 08:41:14 +05:30
rohitwaghchaure	4d754eadc8	Merge branch 'develop' into quo-status-fix	2020-04-27 00:22:43 +05:30
Rucha Mahabal	e34ec70d44	fix(Desk Page): Number of Open Leads not visible on Shortcut Card	2020-04-26 23:40:37 +05:30
Nabin Hait	2305d00e0b	fix: Procurement tracker report (#21421 ) * fix: procurement report data was not coming * fix: leave allocation minor issue	2020-04-26 23:29:13 +05:30
Himanshu	c9a1aa8eaa	fix: add dashboard to quality inspection template (#21423 )	2020-04-26 23:28:33 +05:30
Suraj Shetty	3e3a793567	fix: Set barcode field empty only if it has value (#21425 ) - To avoid unnecessary form dirty trigger	2020-04-26 23:25:40 +05:30
Anurag Mishra	ded418e31d	feat: employee leave balance reports (#20754 ) * feat: Employee leave balance summary report new design * feat: Employee leave balance report new design * fix: leave based on multiple holiday list Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-04-26 21:04:58 +05:30
Nabin Hait	ba70e7e8bc	Payroll based on attendance (#21258 ) * feat: Payroll based on attendance and leave * test: salary slip based 0n attendance * feat: Payroll based on attendance * fix: Codacy issues Co-authored-by: Anurag Mishra <mishranaman123@gmail.com>	2020-04-26 20:17:48 +05:30
Deepesh Garg	d78cf97250	feat: Allow tax withholding category selection at invoice level (#20870 ) * feat: Allow tax withholding category selection at invoice level * fix: Linitng fixes * feat: TDS calculation using common PAN * fix: Add provision to deduct Lower TDS in purchase invoice * fix: Consider only ref docs company while computing TDS * fix: Default permission fixes * fix: Add validation for dates in fiscal year * fix: Undefined variable	2020-04-26 20:08:52 +05:30
Marica	5d5454ef1f	fix [ux]: Purchase Order Form Cleanup (#20932 ) * chore: Purchase Order Form Cleanup * fix: Get Items from popups cleanup * fix: Shift Set Target Warehouse next to Supply Raw Materials. Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-04-26 20:07:22 +05:30
rohitwaghchaure	733b47c5e6	Merge pull request #21389 from marination/stock-entry-qty fix: Issues on qty trigger in Stock Entry Detail	2020-04-26 17:59:45 +05:30
Nabin Hait	58ee6c1e08	feat: Income tax slab (#21399 ) * Feat: Multiple tax as per new taxation rule * patch:for multiple tax slab, fix: payroll and exemption validation * Test: Fixture * feat: income tax slab with other charges and tax exempted deduction components * fix: added missing init file * fix: Patch fixed * fix: Patch fixed * fix: test fixes * fix: validate duplicate exemption declaration * fix: payment entry test case Co-authored-by: Anurag Mishra <mishranaman123@gmail.com>	2020-04-26 17:45:57 +05:30
Saqib Ansari	2fea073539	fix: query logic	2020-04-26 17:30:23 +05:30
marination	de33029393	fix: Remove callback outside if condition	2020-04-26 17:16:21 +05:30
Wolfram Schmidt	64c7eeed24	Update in field type Warrenty Period (in Days) changed from "Data" to "Int".	2020-04-26 10:56:08 +02:00
Abhishek Balam	8aa8457a2d	Merge branch 'develop' of https://github.com/frappe/erpnext into develop	2020-04-26 13:07:09 +05:30
Abhishek Balam	e4e23836e7	mandatory depends on for cheque no and date, fix typo	2020-04-26 13:06:55 +05:30
Saqib	7e73473a65	fix: (ux) set jv voucher type depending on mode of payment (#21411 )	2020-04-26 09:40:57 +05:30
rohitwaghchaure	8b1c71ea44	fix: work order creation message against material request (#21413 )	2020-04-26 09:38:18 +05:30
Abhishek Balam	84187fb8e9	Code cleanup and improvements requested in PR:21404	2020-04-26 05:00:36 +05:30
Abhishek Balam	331bc0c366	Merge branch 'develop' of https://github.com/frappe/erpnext into develop	2020-04-25 18:25:27 +05:30
Abhishek Balam	539c67966f	rename je template account dt	2020-04-25 18:13:01 +05:30
Abhishek Balam	fb5fbd7e0c	Merge branch 'develop' of https://github.com/frappe/erpnext into develop	2020-04-25 17:59:00 +05:30
rohitwaghchaure	77403abadd	Merge branch 'develop' into social-media-integration-feat	2020-04-25 17:37:24 +05:30
Nabin Hait	ad16e61bc2	fix: Valid warehouse in woocommerce syncing and other small fixes (#21407 ) * fix: Valid warehouse in woocommerce syncing * fix: dmall fixes in gross & net profit report * fix: company is required for getting party details * fix: None issue while getting raw material rate based on last purchase rate	2020-04-25 14:52:05 +05:30
Ahmad	454b1cf48d	Hook Fix in the scheduler events (#21410 )	2020-04-25 14:51:24 +05:30
Deepesh Garg	0b7bef5971	Merge pull request #21408 from deepeshgarg007/loan_disbursement_against fix: Loan Disbursement against account	2020-04-25 13:18:49 +05:30
Deepesh Garg	c20de8ac8d	fix: Loan Disbursement against account	2020-04-25 13:15:45 +05:30
Saqib	8952ac1ab4	fix: custom buttons are hidden if order type of SO is customised (#21397 )	2020-04-25 09:44:21 +05:30
Abhishek Balam	d64438ff47	feat: Journal Entry Template	2020-04-25 03:13:50 +05:30
Abhishek Balam	291837e63d	Merge branch 'develop' of https://github.com/frappe/erpnext into develop	2020-04-25 02:46:00 +05:30
Abhishek Balam	7bbb77e66f	feat: Journal Entry Template	2020-04-25 02:45:45 +05:30
rohitwaghchaure	55102f455f	Merge pull request #21401 from rohitwaghchaure/fixed-taget-warehouse-mandatory-issue fix: make target warehouse field mandatory while saving the work order	2020-04-25 01:19:19 +05:30
Anupam K	524eb6ce9b	freeze screen while posting and login	2020-04-25 00:35:26 +05:30
Diksha Jadhav	7b91617303	feat(accounting): show actual qty for warehouse in sales invoice	2020-04-25 00:02:32 +05:30
Rohit Waghchaure	5460691c8f	fix: make target warehouse field mandatory while saving the work order	2020-04-24 23:55:33 +05:30
Rucha Mahabal	d124581044	Merge pull request #21384 from anupamvs/email-camp-end-date fix: set end_date in Email Campaign	2020-04-24 20:04:34 +05:30
Saqib Ansari	8c70e8d4df	fix: remove debugger	2020-04-24 16:41:48 +05:30
Saqib Ansari	40140c63dc	fix: rate gets overwritten when pricing rule is set	2020-04-24 14:51:56 +05:30
Rucha Mahabal	d881dc4784	feat: metrics for Issue	2020-04-24 14:33:34 +05:30
Saqib Ansari	22d2970339	fix: query	2020-04-24 13:47:44 +05:30
Saqib	869ea1d9e4	Merge branch 'develop' into quo-status-fix	2020-04-24 12:17:30 +05:30
Anupam K	e01723e360	Review changes	2020-04-23 23:02:08 +05:30
anoop	c02eceb989	style: intendation	2020-04-23 21:15:06 +05:30
Marica	ba3adf2461	Merge branch 'develop' into stock-entry-form-cleanup	2020-04-23 20:58:44 +05:30
marination	e1e98fe116	fix: Issues on qty trigger in Stock Entry Detail	2020-04-23 20:18:52 +05:30
Rucha Mahabal	1700fc8011	Merge branch 'develop' into email-camp-end-date	2020-04-23 19:42:17 +05:30
marination	f7aa6a8357	chore: Stock Entry Form Cleanup	2020-04-23 19:27:50 +05:30
Saqib Ansari	0f2c64cfef	fix: travis	2020-04-23 19:19:09 +05:30
Anurag Mishra	92b933f4ac	feat: Upload Attendance (#20947 ) Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-04-23 16:15:18 +05:30
Deepesh Garg	525204bc50	feat: Payment allocation based on payment terms (#20945 ) * feat: Payment allocation based on payment terms * fix: Add desccription for checkbox Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-04-23 16:07:36 +05:30
Rucha Mahabal	78d7ed521f	Merge branch 'develop' into email-camp-end-date	2020-04-23 16:00:27 +05:30
Saqib	63084c6292	Merge branch 'develop' into quo-status-fix	2020-04-23 15:30:31 +05:30
Anupam K	0f7bac26e6	setting end date in email campaign	2020-04-23 15:29:12 +05:30
Saqib Ansari	1e4c28e99d	fix: quotation have expired status even if sales order exists	2020-04-23 15:28:47 +05:30
Anupam K	39911b40f0	setting end date in email campaign	2020-04-23 14:14:49 +05:30
Deepesh Garg	67173ce112	Merge pull request #21382 from deepeshgarg007/loan_security_pledge_aginst_application fix: Allow creation of loan security pledge from Loan Application for old prices	2020-04-23 13:54:38 +05:30
Deepesh Garg	2daf6dad2e	fix: Allow creation of loan security pledge from Loan Application for old prices	2020-04-23 13:51:29 +05:30
Deepesh Garg	b1e68bd022	fix: Rename bank account type doctypes (#21179 ) * fix: Rename bank account type doctypes Co-authored-by: Saqib <nextchamp.saqib@gmail.com>	2020-04-23 12:19:30 +05:30
Deepesh Garg	fa8396feb5	fix: Budget against accounting dimensions (#21268 ) * fix: Budget warning against custom accounting dimension * fix: Codacy Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-04-23 10:34:57 +05:30
rohitwaghchaure	168babfebc	fix: bom update cost issue (#21372 ) * fix: bom update cost is not working * added test case for bom cost	2020-04-23 09:48:50 +05:30
rohitwaghchaure	6fa6caf46c	fix: patch and validation message to fix target warehouse issue (#21371 )	2020-04-23 09:46:29 +05:30
rohitwaghchaure	e8a651bc00	fix: BOM stock report (#21380 )	2020-04-23 09:45:09 +05:30
rohitwaghchaure	28deddeb6f	fix: incorrect out value in stock balance due to precision issue (#21379 )	2020-04-23 09:44:58 +05:30
Rucha Mahabal	ec7db4f467	fix: modified timestamp conflict	2020-04-23 03:10:11 +05:30
Rucha Mahabal	d7304519e2	fix: conflicts	2020-04-23 00:52:47 +05:30
marination	8a30cb2565	chore: Commonify autofilling warehouses in child tables	2020-04-23 00:18:21 +05:30
Rucha Mahabal	eaa956b994	feat(Healthcare): Rehabilitation Module (#21216 ) * feat: added rehab sub-module doctypes * feat: rehab module * feat: prescribe procedures in Patient Encounter * feat: create Therapy Plan on Encounter submission * feat: manage item for Therapy Type * feat: book appointments, get prescribed therapies for Therapy Sessions * feat: invoice Therapy Sessions * feat: plan completion progress bar and exercise countsindicators * feat: Motor Assessment Scale * feat: add editable card view for exercise steps * fix: add rehab in healthcare desk page * fix: card deletion not working when child table is hidden * feat: automatically fetch therapies according to Body Part * fix: added tests for Therapy Type and Plan * fix: add exercises according to body parts in Therapy Type * fix: label for Exercise Instructions * fix: exercise cards css * feat: add dashboard for Therapy Plan * feat: Patient Assessment Template and Patient Assessment * feat: add title fields in Therapy Plan and Session * fix: remove Motor Assessment Scale * fix: fetch assessment description * feat: create Patient Assessment from Therapy Session * fix: anti pattern code * fix: update desk page * fix: exercise card rendering * fix(test): filter out disabled Items in test_mapper * fix: get stock uom from Stock Settings for Therapy Type Item creation * fix: multiline SQL query * fix: permissions for DocTypes Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-04-22 13:07:12 +05:30
Deepesh Garg	37665e12ca	Merge pull request #21367 from scmmishra/cal-report fix: specify column width	2020-04-22 12:03:05 +05:30
Shivam Mishra	55baccd63a	fix: specify column width	2020-04-22 11:50:06 +05:30
Saqib	9c494d3e72	fix: asset maintenance fixes (#21277 ) * fix: asset maintenance fixes * fix: tests	2020-04-22 11:48:19 +05:30
Nabin Hait	471cf95300	Update purchase_invoice_item.json	2020-04-22 11:46:31 +05:30
Chinmay Pai	8fb863da07	chore: remove oldfieldtype from purchase invoice item (#21365 ) fixes issue where framework expects data field type to be validated with options either set to "Email" or "Phone". removing oldfieldtype works for now, should be fixed inside framework Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>	2020-04-22 11:23:14 +05:30
Rohit Waghchaure	690855d3a1	fix: unsupported operand type issue in pricing rule	2020-04-22 02:49:48 +05:30
Anupam K	4e2256f2e3	Linkedin, Twitter Integration	2020-04-21 22:07:03 +05:30
Nabin Hait	5f77854448	Revert "fix : Create Pick List Fos Sales Order List (#20915 )" (#21352 ) This reverts commit `27c6f69435`.	2020-04-21 14:28:08 +05:30
Nabin Hait	a529a5078f	Update purchase_receipt.json	2020-04-21 13:50:26 +05:30
Marica	bda0ddf1cf	fix: Purchase Receipt Form Cleanup (#21232 )	2020-04-21 13:15:05 +05:30
Marica	9942acd9d4	fix [ux]: Material Request Form Cleanup and UX (#20810 ) * fix (ux): Material Request Form Cleanup * fix: Get Items from popup UX Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-04-21 13:13:39 +05:30
Dharmraj-48	27c6f69435	fix : Create Pick List Fos Sales Order List (#20915 ) Co-authored-by: Dharmraj <Dharmraj@bloomstack.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-04-21 13:10:09 +05:30
Marica	34bbd5b612	fix: Purchase Invoice Form Cleanup (#21230 ) * fix: Purchase Invoice Form Cleanup * fix: Made Supplier field mandatory Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-04-21 13:00:14 +05:30
Anupam Kumar	a9d59fad94	fix: on item change UOM not updated (#21242 ) * fix: on item change UOM not updated * removing uom from js	2020-04-21 12:57:44 +05:30
Rucha Mahabal	ca1c37c56d	fix(Healthcare): remove hardcoded UOM during Item creation for Templates (#21350 )	2020-04-21 12:54:07 +05:30
Marica	9ea1ad4051	fix: Re-order Item Error Email format (#21342 ) * fix: Re-order Item Error Email format * fix: Translated strings	2020-04-21 12:52:29 +05:30
rohitwaghchaure	a92eaff83b	fix: scrap items order not showing correctly in stock entry (#21346 )	2020-04-21 11:27:10 +05:30
rohitwaghchaure	3d2ced7926	Merge pull request #21345 from rohitwaghchaure/fixed_free_item_qty_develop fix: free item quantity issue	2020-04-21 01:10:33 +05:30
Rohit Waghchaure	d093a377ef	fix: free item quantity issue	2020-04-21 01:09:44 +05:30
Shivam Mishra	6372d0a842	Merge pull request #21187 from scmmishra/razorpay-subscription feat: Razorpay subscription for Non profit memberships	2020-04-20 21:01:34 +05:30
Shivam Mishra	745b632ea1	fix: linting fixes	2020-04-20 18:25:51 +05:30
Sahil Khan	f03efdc6b1	fix(patch): reload 'Import Supplier Invoice' doc	2020-04-20 14:18:28 +05:30
Shivam Mishra	83f80517c6	Merge branch 'develop' into razorpay-subscription	2020-04-20 13:54:00 +05:30
Saqib	b61d2411b1	Merge branch 'develop' into rename-bank-reco	2020-04-20 12:21:22 +05:30
Saqib Ansari	9de76de621	fix: patch	2020-04-20 12:19:27 +05:30
Wolfram Schmidt	6d49238159	Update project.json (#21274 ) unnecessary requirement for project creation as this is a field of the Type select which will be pre-filled. When creating a project of list view it will also bring up this field as it has "reqd": 1. A new projekt will have the status set to open in most cases. Co-authored-by: Nabin Hait <nabinhait@gmail.com> Co-authored-by: Himanshu <himanshuwarekar@yahoo.com>	2020-04-19 20:19:10 +05:30
Shivam Mishra	bd53f3b080	fix: filters as dictionary	2020-04-19 12:47:48 +05:30
Deepesh Garg	3cec5cbb0f	fix: Total amount field ordering in transactions (#21313 )	2020-04-18 22:13:48 +05:30
Deepesh Garg	6298bbb1eb	Merge pull request #21328 from rohitwaghchaure/fixed-account-name-in-gl_print fix: account name not showing in the gl print	2020-04-18 20:40:50 +05:30
Rohit Waghchaure	9793500154	fix: account name not showing in the gl print	2020-04-18 19:02:07 +05:30
rohitwaghchaure	866867661e	Merge pull request #21204 from rohitwaghchaure/fixed_internal_issue_develop fix: minor issues	2020-04-18 02:08:26 +05:30
Anupam K	790b9ee8d0	Merge branch 'develop' of https://github.com/frappe/erpnext into social-media-integration-feat	2020-04-18 01:51:47 +05:30
Anupam K	c12a40c923	Linkedin, Twitter Integration	2020-04-18 01:50:18 +05:30
Anupam K	22318b2eb6	Linkedin, Twitter Integration	2020-04-18 01:46:38 +05:30
Anupam K	d683dc250d	Linkedin, Twitter Integration	2020-04-18 00:48:34 +05:30
Mangesh-Khairnar	bd14a64bfb	fix: add label to gl entry	2020-04-17 19:52:47 +05:30
gavin	25932e0613	Merge pull request #21298 from gavindsouza/tally-migration-fixes fix: Tally migration	2020-04-17 19:12:55 +05:30
Deepesh Garg	3c6795a52d	Merge pull request #21305 from deepeshgarg007/partial_loan_repayment_fixes fix: Loan Repayment code clean up and other fixes	2020-04-17 11:16:38 +05:30
Nabin Hait	7eaa7f2e41	fix: requested qty for customer provided item and rate for sales (#21299 ) * fix: requested qty for customer provided item and rate for sales * fix: requested qty for material transfer * fix: customer provided item can be sales item * fix: requested qty test cases	2020-04-17 10:52:28 +05:30
rohitwaghchaure	e894c35b9a	Merge pull request #21309 from rohitwaghchaure/fixed_job_card_time_issue_develop fix: job card timer issue	2020-04-17 00:56:28 +05:30
Rohit Waghchaure	250daa3f94	fix: job card time issue	2020-04-17 00:50:00 +05:30
anoop	fdc075220d	fix: minor, codacy suggestions	2020-04-16 23:05:38 +05:30
Deepesh Garg	bf78ed6947	fix: Loan Repayment code clean up and other fixes	2020-04-16 22:53:47 +05:30
Nabin Hait	03af0299a6	fix: requested qty calculation and some other small fixes (#21296 ) * fix: Made received qty readonly and no-copy * fix: Made release date mandatory * fix: requested qty calculation fix for UOM	2020-04-16 20:11:32 +05:30
Shivam Mishra	3e4ab760db	Merge branch 'develop' into razorpay-subscription	2020-04-16 18:17:42 +05:30
anoop	1c49a12ac2	fix: patient appointment auto invoicing: record payment if payment mode and amount available test: fixes	2020-04-16 17:00:47 +05:30
Gavin D'souza	496c6a3baa	style: removed unused imports and updated formatting	2020-04-16 16:51:59 +05:30
Deepesh Garg	d521ba2c00	Merge pull request #21102 from nextchamp-saqib/asset-cat-validation fix: no server side validations for accounts in asset category	2020-04-16 16:25:08 +05:30
Saqib	14cdb24290	fix: serial and batch selection from delivery note bug fix (#21291 )	2020-04-16 16:21:35 +05:30
Saqib Ansari	33eb35d8b1	fix: incorrect transalation	2020-04-16 16:16:09 +05:30
Gavin D'souza	6abdfc586b	fix: strip data fields of whitespaces	2020-04-16 16:14:29 +05:30
Gavin D'souza	72a94941bf	fix(tally-migration): DocType improvement	2020-04-16 16:12:40 +05:30
Gavin D'souza	2ad7e81560	fix: handle errors in enqueued methods and update status	2020-04-16 16:11:55 +05:30
anoop	b922b292eb	fix: set patient while billing, tests fixed	2020-04-16 13:01:45 +05:30
anoop	93d0c78ca5	feat: multi-company billing sales onvoice - filter get items based on company utils - company filters in all get item helper methods utils - refactor appointemnt items	2020-04-16 13:01:43 +05:30
anoop	7ad98c95b9	company field added	2020-04-16 13:01:43 +05:30
anoop	38f0258991	feat: multi company support	2020-04-16 13:01:43 +05:30
anoop	2d2db60035	feat: multi company support	2020-04-16 13:01:43 +05:30
anoop	80ab98bf36	fix: company when creatign procedure, practitioner name added	2020-04-16 13:01:43 +05:30
anoop	9c7d45deae	fix: set company while creating encounter, fields rearranged	2020-04-16 13:01:43 +05:30
anoop	82aeff0a32	fix: vitals added naimg series, minor field rearrangements	2020-04-16 13:01:43 +05:30
anoop	d4f5a6928f	feat: additional customer fileds add customer_group, price list, currency etc. rearrange and group fields disable cusotmer edit after save (temp fix)	2020-04-16 13:01:43 +05:30
Shivam Mishra	88c1f28351	Merge branch 'develop' into razorpay-subscription	2020-04-16 12:23:46 +05:30
Deepesh Garg	44c0c6c159	Merge branch 'develop' into asset-cat-validation	2020-04-16 11:23:52 +05:30
Deepesh Garg	17ab1592c7	Merge pull request #21265 from vishdha/chart_account_v13 fix: Chart of account importer UX improved	2020-04-16 11:21:05 +05:30
vishdha	5b36d15927	fix: fix Transalation	2020-04-16 11:13:43 +05:30
rohitwaghchaure	65628ac3e2	Merge pull request #21283 from marination/stock-entry-get-items-mr fix: Fetch Material Requests with type Issue as well in Stock Entry via Get Items from	2020-04-16 00:33:03 +05:30
Marica	20ce433652	Merge branch 'develop' into warehouse-fix-dev	2020-04-15 23:48:27 +05:30
Saqib Ansari	f53299e98a	fix: warehouse unset when cannot find item warehouse * cannot set delivery date when all items gets deleted and new are added	2020-04-15 22:10:48 +05:30
Saqib Ansari	34640777cd	fix: pos not accessible without default customer	2020-04-15 22:10:43 +05:30
marination	0b98a6296b	fix: Fetch Material Requests with type Issue as well in Stock Entry via Get Items from	2020-04-15 21:19:04 +05:30
rohitwaghchaure	1c5b12e7d4	Merge pull request #21280 from anupamvs/opportunity-calendar Adding Opportunity Calendar View	2020-04-15 19:29:49 +05:30
Anupam K	9ee8110411	Adding Calendar view for Opportunity	2020-04-15 18:37:35 +05:30
rohitwaghchaure	c3f994b15e	Merge pull request #21197 from marination/default-item-manufacturer feat: Provision to set Default Item Manufacturer	2020-04-15 16:35:08 +05:30
Anupam K	c4c44a9a2b	Initial JS setup	2020-04-15 12:58:24 +05:30
marination	8890b6044d	fix: Patch fix, Travis fix and cleanup - Added UOM column in Report - Removed mandatory on `valid_till` - Added list view indicator for Expired status in Supplier Quotation - Sorted Labels in Chart and syntax cleanup - Made labels Translatable - Fixed patch	2020-04-15 12:31:12 +05:30
marination	1bab1539b1	Merge branch 'develop' of https://github.com/frappe/erpnext into quoted-item-report	2020-04-15 12:16:31 +05:30
sahil28297	dd719ea151	Merge branch 'develop' into patch-fix	2020-04-15 11:58:02 +05:30
Rucha Mahabal	11121f4905	fix: patch for Healthcare Refactoring	2020-04-15 11:53:39 +05:30
Deepesh Garg	9e9d44d139	fix: Loan topup test	2020-04-15 11:20:24 +05:30
marination	8179804405	refactor: Quoted Item Comparison Report - Refactored Report View - Added Chart - Added 'valid_till' date in Supplier Quotation - Added patch to set valid_till and daily job to set expiry status	2020-04-14 23:05:11 +05:30
Rohit Waghchaure	d0f6f1808b	fix: minor issues	2020-04-14 17:26:58 +05:30
vishdha	5008be1db5	fix: message bold	2020-04-14 17:17:26 +05:30
vishdha	10a6f4bd05	fix: Chart of account importer UX improved	2020-04-14 17:17:26 +05:30
Rohan Bansal	a1b747c3f3	fix: show stock UOM in POS	2020-04-14 14:28:56 +05:30
Himanshu	b84333f26e	fix: move to hooks (#21205 )	2020-04-14 13:02:03 +05:30
rohitwaghchaure	fc31dbef12	fix: on changing qty free item not removed (#21251 )	2020-04-14 12:53:54 +05:30
Deepesh Garg	dd78eb3842	Merge pull request #21252 from nextchamp-saqib/tax-breakup-for-cn fix: show positive taxes in credit notes	2020-04-14 12:41:25 +05:30
Shivam Mishra	8e91553d4b	Merge branch 'develop' of https://github.com/frappe/erpnext into razorpay-subscription	2020-04-14 12:00:38 +05:30
Shivam Mishra	4fdb4aa1d0	feat: use int for billing frequency	2020-04-14 12:00:15 +05:30
Shivam Mishra	cb354685d5	fix: linting issues	2020-04-14 12:00:02 +05:30
Marica	8636914e9a	fix: Lead Contact with blank first name via Customer (#21247 )	2020-04-14 11:53:09 +05:30
Faris Ansari	64f01bddc8	fix: Set Price List in case of User Permissions (#21237 ) Frontport of #18968	2020-04-14 11:51:48 +05:30
Marica	02c9332695	fix: Project Update Email Error (#21208 ) * fix: Project Update Email Error * Update project.json Co-authored-by: Himanshu <himanshuwarekar@yahoo.com>	2020-04-14 11:47:58 +05:30
Vishal Dhayagude	b1c2f4ef22	fix: str object not callable (#21227 )	2020-04-14 11:42:52 +05:30
Mangesh-Khairnar	2e3548eb83	fix: consider revereted expired leaves entry (#21257 )	2020-04-14 09:34:39 +05:30
Deepesh Garg	78c0841d64	Merge pull request #21249 from Thunderbottom/blanket-order-patch-fix chore: force reload doctype before running patch	2020-04-13 18:59:31 +05:30
Rucha Mahabal	79bc819f92	fix: Healthcare Patch	2020-04-13 18:51:04 +05:30
Rushabh Mehta	4c0484b60e	Merge pull request #20811 from ruchamahabal/healthcare_refactor refactor: Healthcare Module	2020-04-13 17:16:02 +05:30
Saqib Ansari	10a6a2d77f	fix: show positive taxes in credit notes	2020-04-13 16:40:13 +05:30
Deepesh Garg	435c22e403	Merge pull request #21244 from deepeshgarg007/employee_loan_fixes fix: Employee loan fixes in new loan management module	2020-04-13 16:32:42 +05:30
Deepesh Garg	40dcfd148b	fix: Import Error	2020-04-13 16:29:58 +05:30
Chinmay D. Pai	de8554d0dc	chore: force reload doctype before running patch fixes Unknown column 'against_blanket_order' in 'field list' Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>	2020-04-13 16:03:22 +05:30
Shivam Mishra	d9ce5843e5	chore: resolve conflicts	2020-04-13 13:43:04 +05:30
Shivam Mishra	affa2fba6b	feat: updated non-profit.json	2020-04-13 13:42:01 +05:30
Marica	3ce23858bf	Merge branch 'develop' into batch_message_v13	2020-04-13 13:20:25 +05:30
Deepesh Garg	03166fab56	Merge branch 'develop' of https://github.com/frappe/erpnext into employee_loan_fixes	2020-04-13 13:20:02 +05:30
Deepesh Garg	baa7521d02	fix: Allow repayment from Salary only for term loans	2020-04-13 13:18:11 +05:30
vishdha	cfaf638cc2	fix: batch message ux improved	2020-04-13 12:31:26 +05:30
Deepesh Garg	af27d61bee	fix: Employee loan test case and other fixes	2020-04-13 12:29:00 +05:30
Saqib	2e45076dcf	Merge branch 'develop' into asset-cat-validation	2020-04-12 13:39:43 +05:30
Deepesh Garg	0865625482	Merge pull request #21177 from nextchamp-saqib/purchase-register-filters feat: (minor) purchase register filters	2020-04-11 18:12:00 +05:30
Saqib Ansari	397f894a7c	fix: cannot iterate over dict_keys	2020-04-11 18:10:59 +05:30
Syed Mujeer Hashmi	58a16f1a3b	fix: GSTR 3B Report tax amount calculation The tax amount after discount amount should be considered for tax calculation. Fixes #21231 Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>	2020-04-11 00:52:10 +05:30
Deepesh Garg	5e274965cc	Merge pull request #21201 from marination/serial-no-status fix: Added Status field in Serial No for filter and report builder	2020-04-10 20:48:06 +05:30
Rucha Mahabal	59e6c7730b	Merge branch 'develop' into healthcare_refactor	2020-04-10 20:32:37 +05:30
Deepesh Garg	470679f227	fix: SQL ssyntax error	2020-04-10 20:22:42 +05:30
Deepesh Garg	9b312bfbd0	Merge branch 'develop' of https://github.com/frappe/erpnext into purchase-register-filters	2020-04-10 20:19:30 +05:30
Deepesh Garg	e2a5828f5e	Merge pull request #21193 from nextchamp-saqib/pay-entry-ux-fix chore: hide redundant base received amount	2020-04-10 20:17:56 +05:30
Deepesh Garg	669c5c6370	fix: Syntax Error	2020-04-10 20:15:53 +05:30
Deepesh Garg	550771058a	fix: Code styling	2020-04-10 20:14:29 +05:30
Deepesh Garg	f7e216e285	fix: Employee loan fixes	2020-04-10 20:03:11 +05:30
Rucha Mahabal	1ff0cfd4f9	fix: merge conflicts	2020-04-10 18:58:25 +05:30
Shivam Mishra	ebcc46d837	feat: updated desk pages (#21138 )	2020-04-10 18:52:05 +05:30
Saqib Ansari	c9d6630f17	fix: formatting	2020-04-10 12:43:54 +05:30
Saqib Ansari	debee1c977	fix: travis	2020-04-10 12:38:44 +05:30
Rucha Mahabal	41520f9fca	Merge branch 'develop' into healthcare_refactor	2020-04-09 19:16:31 +05:30
Rucha Mahabal	120d0e5796	fix: Fee Validity test	2020-04-09 19:16:01 +05:30
Michelle Alva	7f2477b72c	fix: better error message due date show better error message payment schedule due date	2020-04-09 17:23:23 +05:30
Rucha Mahabal	d30023abac	fix: failing tests	2020-04-09 16:43:13 +05:30
rohitwaghchaure	cf17809c3f	Merge pull request #21156 from marination/mr-customer-provided-to-stock-entry fix: Mapping Customer Provided Material Request to Stock Entry	2020-04-09 13:18:25 +05:30
Deepesh Garg	ef220c1989	Merge branch 'develop' into pay-entry-ux-fix	2020-04-09 12:54:33 +05:30
Marica	3e84ab1349	fix: Error on any new doc from Shipping Rule. (#21206 )	2020-04-09 12:01:10 +05:30
vishdha	0b34b90e71	fix: item_name added for message	2020-04-09 11:46:46 +05:30
marination	86e8b2a1c6	fix: Status field in Serial No for filter and report builder	2020-04-08 15:38:28 +05:30
gavin	74dd0e12e7	fix: enable validations for email and phone data fields (#21199 )	2020-04-08 12:59:15 +05:30
Mangesh-Khairnar	49816b0c5f	fix(MWS): add new regions to marketplace (#21196 ) * fix(MWS): add marketplace region for uae * fix: rename the fields for mws integrations Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-04-08 12:57:14 +05:30
Saqib	562fd0eab0	fix: purchase return are allowed even when assets are not cancelled (#20797 ) * fix: purchase return are allowed even when assets are not cancelled * chore: test case * fix: error message Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-04-08 12:11:40 +05:30
rohitwaghchaure	47c8ddb29b	Merge pull request #20962 from marination/pick-list-enhance fix: Pick List Enhancements	2020-04-08 12:09:10 +05:30
Saqib	683581edef	fix: cannot find accounting module while rendering breadcrumb (#21190 )	2020-04-08 11:49:06 +05:30
Rucha Mahabal	8844e95667	fix: pass ignore_mandatory flags	2020-04-08 10:04:10 +05:30
Nabin Hait	04870ae23a	fix: Replace newlines with spaces before evaluation of condition and formula (#21165 )	2020-04-08 09:34:46 +05:30
Suraj Shetty	da6806e6bc	fix: Translation strings with trailing spaces (#21192 )	2020-04-08 09:32:41 +05:30
Raffael Meyer	28753268e6	fix(regional): DATEV report: description in header, quote nonnumeric values (#21126 ) * fix description in header, quote nonnumeric values * fix: truncate 'Buchungstext' to 60 chars	2020-04-08 09:26:18 +05:30
Raffael Meyer	385a92d3f2	fix(patch): set_task_status (#21130 ) * fix(patch): set_task_status * remove unnecessary loop, use tabs Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-04-08 09:24:34 +05:30
Saqib	f93dc8dd88	fix: [ux] enforce 'get references from' in payment order (#21175 )	2020-04-08 09:20:17 +05:30
Nabin Hait	b95a794e51	Merge branch 'develop' into healthcare_refactor	2020-04-08 09:08:21 +05:30
Raffael Meyer	9aae0c27c2	feat(regional): a central place for regional address templates (#19862 ) * feat: a central place for regional address templates * set up address templates during install * why don't the tests run? * fix: remove unused variables, fix cwd * fix: .get() dicts contents * fix: choose the right default * fix: fieldname is template, not html * fix: import unittest * fix: remove unnecessary code * fix: ensure country exists * fix: ensure country exists * feat: test updating an existing template * fix(regional): DuplicateEntryError in test_update_address_template * refactor and set 'is_default' * fix codacy * fix: patch gst_fixes * fix: patch update_address_template_for_india Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-04-08 08:56:57 +05:30
marination	3e7a8abf29	feat: Provision to set Default Item Manufacturer - Is Default checkbox added in Item Manufacturer - Default Item Manufacturer and Part No fields added to Item Master - Manufacturer Part No field editable in all child tables with validation - Manufacturer and Part No auto fetched via get_item_details in child table	2020-04-07 21:00:57 +05:30
Shivam Mishra	31051679c8	feat: remove unused fields	2020-04-07 18:43:11 +05:30
rohitwaghchaure	36459c052f	Merge branch 'develop' into pick-list-enhance	2020-04-07 18:04:39 +05:30
rohitwaghchaure	0672b6b2e8	Merge pull request #21170 from rohitwaghchaure/get_serial_nos_based_on_posting_date_and_time_develop fix: get serial nos based on posting date and time	2020-04-07 18:02:49 +05:30
Nabin Hait	c9f08bed2b	fix: set batch qty in batch master and test cases	2020-04-07 17:33:10 +05:30
Rohan Bansal	f92a5f32bd	fix: set batch ID as title instead of item code	2020-04-07 17:33:10 +05:30
Rohan Bansal	d2d73e6cb7	fix: prioritize empty over expired as batch status	2020-04-07 17:33:10 +05:30
Rohan Bansal	ba03853b2a	fix: update Batch schema	2020-04-07 17:33:10 +05:30
Rohan Bansal	ced78cf116	fix(stock): make requested changes	2020-04-07 17:33:10 +05:30
Rohan Bansal	92669eae66	fix(stock): batch list view statuses	2020-04-07 17:33:10 +05:30
Rohan Bansal	4a50c99867	fix(stock): Update batch quantity whenever stock in it is moved	2020-04-07 17:33:10 +05:30
Rohan Bansal	1bd7ea99f4	fix(batch): Only consider valid stock ledger entries	2020-04-07 17:33:10 +05:30
Rohan Bansal	40611080da	fix(patch): Fix edge cases for Batch	2020-04-07 17:33:10 +05:30
Rohan Bansal	56827a372c	fix(patch): Reload Batch doctype before update query	2020-04-07 17:33:10 +05:30
Rohan Bansal	658ed14e40	feat(batch): Add total quantity and dashboard to Batch	2020-04-07 17:33:10 +05:30
Saqib Ansari	e9b63e45b9	chore: hide redundant base received amount	2020-04-07 17:22:11 +05:30
Rucha Mahabal	d72d9814e2	Merge branch 'develop' into healthcare_refactor	2020-04-07 16:52:22 +05:30
Rucha Mahabal	9d0ff961bc	fix: patch and tests	2020-04-07 16:43:22 +05:30
Rucha Mahabal	21f5680914	fix: merge conflicts	2020-04-07 16:42:50 +05:30
Deepesh Garg	6c36cddbd3	Merge pull request #21188 from deepeshgarg007/dimension_filter_fix fix: Use separate condition for tree and normal doctype	2020-04-07 15:23:36 +05:30
Deepesh Garg	62e9f83aab	fix: Use separate condition for tree and normal doctype	2020-04-07 15:17:06 +05:30
rohitwaghchaure	d313a239de	Merge pull request #21065 from marination/bin-requested-qty fix: Updated Bin Requested Qty logic	2020-04-07 14:50:19 +05:30
Shivam Mishra	65e11a9640	refactor: razorpay subscription for memberships	2020-04-07 14:49:28 +05:30
Rohit Waghchaure	560f822dbf	fix: get serial nos based on posting date and time	2020-04-07 14:42:02 +05:30
rohitwaghchaure	55ea142afd	Merge pull request #21181 from marination/purchase-receipt-scan-barcode feat: Scan Barcode in Purchase Receipt	2020-04-07 14:36:56 +05:30
Marica	c732e9967d	fix: Validate Serial/Batch No naming series in Item itself (#21167 ) * fix: Validate Serial/Batch No naming series in Item itself * fix: Consider '#' too	2020-04-07 14:16:14 +05:30
Marica	048de30cb5	Merge branch 'develop' into pick-list-enhance	2020-04-07 14:05:05 +05:30
marination	39f9dd03a7	fix: Use reload_doc in patch	2020-04-07 14:03:50 +05:30
Deepesh Garg	d14598bc51	Merge pull request #21180 from KanchanChauhan/address-from-lead fix: (minor) Mandatory field missing to create address from lead	2020-04-07 12:22:54 +05:30
Vishal Dhayagude	24e79b14e1	fix(shopping cart): UX Improvements (#21034 ) * fix: nontype error for resolved and moved place order button at bottom left * fix: removed inline style * fix: Request for quotation move to lower right * fix: move buttons Co-authored-by: Naren <patilnarendra3@gmail.com> Co-authored-by: Saqib <nextchamp.saqib@gmail.com>	2020-04-07 12:18:47 +05:30
Deepesh Garg	24a2c9b978	feat: Date range in financial statements (#21020 ) * feat: Date range in financial statements * feat: Add date range filter in consolidated financial statement * fix: Handle API changes in query_report Co-authored-by: Saqib <nextchamp.saqib@gmail.com>	2020-04-07 12:16:25 +05:30
Saqib	30fc621f1e	fix: Create Item tax template only for specific account types (#20931 ) fix: Create Item tax template only for specific account types	2020-04-07 12:12:04 +05:30
Saqib	5bd54f544c	fix(shopping-cart): address is made mandatory to place order (#20923 ) fix(shopping-cart): address is made mandatory to place order	2020-04-07 12:09:59 +05:30
Vishal Dhayagude	8ef0609fc7	fix: Make Sales Invoice paid when it create from shopping cart (#20879 ) Co-authored-by: Saqib <nextchamp.saqib@gmail.com>	2020-04-07 12:07:01 +05:30
rohitwaghchaure	f8e8333d77	Merge pull request #21174 from rohitwaghchaure/material_request_incorrect_filter_issue_develop fix: material request type manufacture shows items with Is Purchase I…	2020-04-07 12:06:18 +05:30
Suraj Shetty	8b55304715	Merge branch 'develop' of https://github.com/frappe/erpnext into new-translations	2020-04-07 11:04:04 +05:30
Deepesh Garg	4461868eff	Merge pull request #21184 from hrwX/update_modified fix: update modified for opportunity	2020-04-07 10:15:41 +05:30
Deepesh Garg	f3c44a97f0	Merge pull request #21100 from nextchamp-saqib/payment-req-status-fix fix: payment request status fixes	2020-04-07 10:13:08 +05:30
Himanshu Warekar	48307513c1	fix: update modified for opportunity	2020-04-07 09:06:03 +05:30
Kanchan Chauhan	4791e313db	fix: Mandatory field missing to create address from lead	2020-04-06 23:56:23 +05:30
marination	e05013ede3	feat: Scan Barcode in Purchase Receipt	2020-04-06 22:13:13 +05:30
Rucha Mahabal	0f23a304bc	fix: added patch for refactored changes	2020-04-06 19:00:17 +05:30
Saqib Ansari	ca3967d52f	feat: (minor) purchase register filters	2020-04-06 18:25:23 +05:30
Rohit Waghchaure	5317907e15	fix: material request type manufacture shows items with Is Purchase Item enabled	2020-04-06 17:53:16 +05:30
Saqib Ansari	b2a84fe478	chore: rename bank reconciliation to bank clearance	2020-04-06 16:32:33 +05:30
marination	642f19d704	fix: Patch fix	2020-04-06 16:01:50 +05:30
Marica	e58d1b1b9f	Merge branch 'develop' into bin-requested-qty	2020-04-06 15:54:51 +05:30
Shivam Mishra	8d6cded07f	feat: added subscription web hook	2020-04-06 15:01:30 +05:30
Shivam Mishra	d92b7ab258	fix: use false explicitly	2020-04-06 14:44:33 +05:30
Shivam Mishra	4b667160a0	feat: added razorpay details to membership	2020-04-06 14:44:17 +05:30
Saqib	046b69d427	Merge branch 'develop' into item_tax_template_fix	2020-04-06 14:32:45 +05:30
Saqib	0f7ef139dc	Merge branch 'develop' into cart-address-update-v13	2020-04-06 14:23:51 +05:30
Deepesh Garg	433e58d131	feat: Add report summary in financial statements (#20876 ) * feat: Add report summary API for Balance Sheet and PL report * fix: Add summary cards in Cash flow report * feat: Add report summary in consolidated financial statements * fix: Remove accumulated values filter from P&L and cashflow report * fix: set company default currency in profit and loss statement if no data Co-authored-by: Prssanna Desai <prssud@gmail.com>	2020-04-06 14:07:20 +05:30
Deepesh Garg	8853850fd8	Merge branch 'develop' into item_tax_template_fix	2020-04-06 13:13:37 +05:30
Deepesh Garg	c01ec7606d	fix: Currency validation for default company accounts (#21094 ) * fix: Currency validation for default company accounts * fix: Improve message	2020-04-06 12:43:07 +05:30
Saqib Ansari	474222074b	fix: tests	2020-04-06 12:40:41 +05:30
Saqib Ansari	4de2416806	fix: change request status on payment entry cancel	2020-04-06 12:34:38 +05:30
Marica	b37f0bb052	Merge pull request #20864 from deepeshgarg007/po_supplier_skip feat: Allow PI creation without PO	2020-04-06 12:15:42 +05:30
Himanshu Warekar	c207c457a5	Merge branch 'develop' of https://github.com/frappe/erpnext into custom_append_to	2020-04-06 11:34:27 +05:30
Deepesh Garg	aa775f87b2	fix: Setting to toggle customer and supplier warehouse for inter warehouse transfer (#21142 ) * fix: Setting to toggle customer and supplier warehouse for inter warehouse transfer * fix: Use cint	2020-04-06 10:23:06 +05:30
Deepesh Garg	1958749382	fix(minor): Minor anti pattern fixes in Exchange rate revaluation doctype (#21147 ) * fix(minor): Minor anti pattern fixes in Exchange rate revaluation doctype * fix: Codacy	2020-04-06 10:21:50 +05:30
rohitwaghchaure	05ac7213b3	fix: allow to make BOM against template item (#21146 ) * fix: allow to make BOM against template item * Update queries.py Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-04-06 10:17:57 +05:30
Nabin Hait	75ef458b34	fix: update attendace from leave application (#21155 )	2020-04-06 10:15:38 +05:30
Deepesh Garg	0268c553a3	Merge pull request #21163 from deepeshgarg007/gst_3b_user_perm fix: User permissions in GSTR 3B report	2020-04-04 21:48:23 +05:30
Deepesh Garg	6c8efdef09	fix: User permissions in GSTR 3B report	2020-04-04 20:05:17 +05:30
Saqib	63bdf5dc74	fix: [ux] credit to & debit to error message (#21132 ) Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-04-03 19:35:55 +05:30
Marica	f55c9c8d8c	Merge branch 'develop' into po_supplier_skip	2020-04-03 18:35:48 +05:30
marination	2a9a5352bb	fix: Test Cases and block expense on outward entry - Throw error if rate present against Customer Provided Item in DN and SI - Added test cases for Sales Invoice and Delivery Note - Allow SI and DN with 0 rate in Test	2020-04-03 18:25:21 +05:30
marination	fd04e96bdd	fix: Mapping Customer Provided Material Request to Stock Entry - Fixed inability to map Material Request to Stock Entry - Commonified Customer Provided Item validation	2020-04-03 15:46:48 +05:30
Saqib	e2c355f670	Merge branch 'develop' into payment-req-status-fix	2020-04-03 11:29:15 +05:30
Deepesh Garg	fc0bd2a9e4	Merge pull request #21150 from scmmishra/fix-patch-dashboard fix (tests): module import error for Dashboard Chart Field	2020-04-03 11:04:51 +05:30
Shivam Mishra	3251e1304c	fix: lms quiz type error (#21152 )	2020-04-03 10:08:19 +05:30
Marica	66c4a08703	fix: Update Received Qty in Material Request as per Stock UOM (#21054 ) * fix: Update Received Qty in Material Request as per Stock UOM * fix: Process each PR only once * fix: minor suggested changes Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-04-03 10:07:06 +05:30
Saqib	438e0433a3	fix: cannot set warehouse on deleting all so items and updating them (#21078 ) * fix: cannot set warehouse on deleting all so items and updating them * fix: travis * fix: docname is editable in update items dialog	2020-04-03 10:02:56 +05:30
Deepesh Garg	0f25a40421	Merge branch 'develop' of https://github.com/frappe/erpnext into quotation_blanket_order	2020-04-02 21:30:53 +05:30
Deepesh Garg	d29dd58e89	fix: Validation	2020-04-02 21:29:59 +05:30
Marica	5d14af52a5	Merge branch 'develop' into po_supplier_skip	2020-04-02 21:17:52 +05:30
Deepesh Garg	13dbc4a415	Merge branch 'develop' into fix-patch-dashboard	2020-04-02 20:24:23 +05:30
Shivam Mishra	03a1e31195	Merge branch 'develop' into fix-patch-dashboard	2020-04-02 20:00:11 +05:30
Shivam Mishra	d9a17a9be1	fix (tests): reload doctype	2020-04-02 19:57:11 +05:30
marination	9a39bcd031	fix: Fixed Test Cases for Material Request - Reduce quantity on Material Transfer/Issue - No effect on Customer Provided Material Request	2020-04-02 19:36:21 +05:30
Rucha Mahabal	ced978e192	fix: code clean up, performance improvements	2020-04-02 18:45:53 +05:30
Deepesh Garg	872fcb6cae	fix: Travis	2020-04-02 18:11:46 +05:30
marination	686a09620d	fix: Commonified code and added server side validation	2020-04-02 13:51:25 +05:30
rohitwaghchaure	e4fecd725d	Merge pull request #21144 from anupamvs/year-sum-fix Sum of years not needed.	2020-04-02 12:01:17 +05:30
Anupam K	b20dbff726	Sum of years not needed.	2020-04-02 11:37:44 +05:30
Deepesh Garg	625acab057	fix: Add duplicate item validation	2020-04-02 11:18:22 +05:30
Anupam K	e48bcb30e7	Sum of years not needed.	2020-04-02 01:04:01 +05:30
Deepesh Garg	94a505d31c	Merge pull request #21135 from marination/stock-ledger-typo fix: Typo in stock level validation in Stock Ledger	2020-04-01 11:20:32 +05:30
marination	6f0dc8257c	fix: Typo in stock level validation in Stock Ledger	2020-04-01 11:04:14 +05:30
Marica	7ecacb6360	Merge branch 'develop' into item_code_showing_as_mandatory_issue_develop	2020-04-01 10:47:33 +05:30
Deepesh Garg	5dcd2c118e	Merge pull request #21096 from nextchamp-saqib/customer-group-price-list-in-pos fix: customer group price list not fetched in pos	2020-04-01 09:42:13 +05:30
Deepesh Garg	8862be769b	Merge pull request #20809 from ronelvcabrera/billing-contact feat(Contacts): select billing contact for sales invoice	2020-03-31 20:42:26 +05:30
Nabin Hait	9f6bf71b95	Merge branch 'develop' into healthcare_refactor	2020-03-31 20:31:25 +05:30
Nabin Hait	a0018eed63	Merge branch 'develop' into refactor-addiional-salary	2020-03-31 20:30:52 +05:30
Saqib Ansari	9a7851096c	fix: check if selling price exists then set it	2020-03-31 18:48:35 +05:30
Saqib Ansari	8ed7535e8a	fix: travis	2020-03-31 18:44:02 +05:30
Saqib Ansari	0c8a0c9c3a	fix: no server side validations for accounts in asset category	2020-03-31 18:19:31 +05:30
Poranut Chollavorn	48aa2dd94b	fix(pos): fix pos display item instock	2020-03-31 18:13:55 +05:30
rohitwaghchaure	a19aa0431a	Merge pull request #20826 from saurabh6790/lead-address-fixes fix: if mandatory fields are missing do not create address against lead	2020-03-31 17:38:06 +05:30
Deepesh Garg	cf9347d2f5	fix: Undo unneccessary changes	2020-03-31 17:28:43 +05:30
Deepesh Garg	5fd456baa4	Merge branch 'develop' into customer-group-price-list-in-pos	2020-03-31 16:33:41 +05:30
Deepesh Garg	bf884e8b37	Merge pull request #21092 from scmmishra/multiple-option-fix fix: use setup from Supplier Quotation Controller	2020-03-31 16:28:47 +05:30
rohitwaghchaure	98a91f489d	Merge pull request #21015 from marination/so-mr-mapping-uom fix: UOM fixes in Sales Order,Material Request & Production Plan	2020-03-31 16:24:37 +05:30
Deepesh Garg	d45e0e0b5b	Merge branch 'develop' into billing-contact	2020-03-31 16:06:11 +05:30
rohitwaghchaure	7845961d46	Merge pull request #21017 from Alchez/dev-remove-same-item-validation feat: allow BOM to use same item as raw material (develop)	2020-03-31 16:04:26 +05:30
Nabin Hait	95330c850c	Merge branch 'develop' into healthcare_refactor	2020-03-31 15:59:22 +05:30
Saurabh	84b93414d0	fix: typo	2020-03-31 15:58:00 +05:30
Saurabh	6c8d63f3b9	fix: provision to setup new address from lead if address creation break due to mandatory exception	2020-03-31 15:58:00 +05:30
Saurabh	e567563aa1	fix: if mandatory fields are missing do not create address against lead	2020-03-31 15:58:00 +05:30
rohitwaghchaure	bc415331a2	Merge pull request #21003 from Alchez/dev-stock-entry-fg-validation fix: allow target warehouses to be changed for work order stock entries (develop)	2020-03-31 15:44:13 +05:30
Saqib	25846cccbd	fix: warehouse_account_map not getting reset for diff company transac (#20995 ) * fix: warehouse_account_map not getting reset for diff company transaction * fix: potential key errors while fetching warehouse_account_map * fix: travis Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-03-31 15:31:15 +05:30
Deepesh Garg	bdcc4b47d6	Merge pull request #21061 from anupamvs/customer-doctype-issue fix: Adding proper error message	2020-03-31 15:30:46 +05:30
Raffael Meyer	c19330df63	fix: account groups (#21070 )	2020-03-31 15:28:45 +05:30
rohitwaghchaure	d274923ae1	fix: "Qty To Manufacture" field as non mandatory in job card (#21081 )	2020-03-31 15:28:31 +05:30
rohitwaghchaure	86aff0de1f	fix: serial no scan not adding the serial nos in stock entry (#21083 )	2020-03-31 15:26:45 +05:30
Deepesh Garg	242a079bcb	Merge branch 'develop' of https://github.com/frappe/erpnext into quotation_blanket_order	2020-03-31 14:18:30 +05:30
Deepesh Garg	4d9fe69ba5	fix: Test cases	2020-03-31 14:17:53 +05:30
Deepesh Garg	31ea093283	Merge branch 'develop' into customer-doctype-issue	2020-03-31 13:50:40 +05:30
Anupam Kumar	ee0dec8776	fix: email_to, party_type and party are not set in payment request when order made from portal (#21084 ) Co-authored-by: Anupam K <anupam@Anupams-MacBook-Air.local>	2020-03-31 10:51:09 +05:30
Saqib	bba78f0384	fix: auto created asset message (#21108 ) * fix: auto created asset message * Update erpnext/controllers/buying_controller.py Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-03-31 10:49:44 +05:30
Deepesh Garg	fbf6e56d86	fix: Expense account currency validation in Landed Cost voucher (#21073 ) * fix: Expense account currency validation in Landed Cost voucher * fix: Remove unused imports	2020-03-31 10:45:32 +05:30
Andy Zhu	5c54adec28	fix: docfield of sales_order is not fetching route options for new doc (#21123 ) Using the wrong method to get `so` as docfield. frappe.meta changes will not effect the `sales_order` in `frm`.	2020-03-31 10:43:00 +05:30
prafful1234	3fa03df1e3	fix(transaction): Add comment-by from frappe session (#20867 ) Co-authored-by: prafful1234 <prafful@mntechnique.com>	2020-03-31 10:40:42 +05:30
Raffael Meyer	b0ab3981ea	fix(regional): header row in DATEV report (#21113 ) * fix(regional): encoding of DATEV report * feat(regional): filter datev report by voucher type * fix: creation time, coa used, is frozen * add voucher types: Payroll Entry, Bank Reconciliation, Asset, Stock Entry * fix indentation * fix indentation * fix indentation	2020-03-31 10:40:03 +05:30
Ahmad M Abdelrahman	06b3f6f781	Remove Campagin restrection (#21024 ) Lead Source Now is an independent doctype. forcing the user to add Campaign is not valid Solution Show Campaign keeping it optional and keep the user to be free to add or remove data	2020-03-31 10:38:49 +05:30
Deepesh Garg	cc4753977f	Merge branch 'develop' into po_supplier_skip	2020-03-31 10:37:21 +05:30
Shivam Mishra	7806e5a052	feat: changes for desk pages (#21027 ) * feat: rename Chart on Getting Started Page * feat: add dashboard and leaderboard to getting started * feat: remove communication Co-authored-by: Prssanna Desai <prssud@gmail.com> Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2020-03-31 10:30:20 +05:30
Deepesh Garg	007548b79c	fix: Bank Account patch (#21124 )	2020-03-31 10:07:51 +05:30
Deepesh Garg	c014c802dd	fix: Remove comments	2020-03-30 22:50:29 +05:30
Deepesh Garg	c33412b6ae	feat: Link blanket order and quotation	2020-03-30 22:44:13 +05:30
Shivam Mishra	3a2c8560ba	feat: update desk page for Non Profits	2020-03-30 18:15:51 +05:30
Shivam Mishra	28fafd0dda	feat: setup subscription API	2020-03-30 18:15:37 +05:30
Shivam Mishra	1281634306	feat: client code to handle razorpay fields	2020-03-30 18:15:22 +05:30
Shivam Mishra	1d6395c5cf	feat: add PAN details field to member for India	2020-03-30 18:14:44 +05:30
Shivam Mishra	e836cdec13	feat: update member and membership doctype	2020-03-30 18:14:10 +05:30
Shivam Mishra	1f20f6348d	feat: added membership settings doctype	2020-03-30 18:13:29 +05:30
Deepesh Garg	f0760dee80	Merge branch 'develop' of https://github.com/frappe/erpnext into customer-doctype-issue	2020-03-30 15:05:34 +05:30
Deepesh Garg	56bc36f9e2	fix: Test cases	2020-03-30 15:05:20 +05:30
Deepesh Garg	f144b8b205	Merge branch 'develop' into po_supplier_skip	2020-03-30 13:07:03 +05:30
Deepesh Garg	647529651d	Merge pull request #21067 from Alchez/dev-add-issue-status-filter feat: add status filter in issue web form (develop)	2020-03-30 12:23:20 +05:30
Deepesh Garg	025762f395	Merge pull request #21119 from rohitwaghchaure/fixed_parent_account_error_while_adding_equity_account_develop fix: not able to add equity account in the chart of accounts	2020-03-30 12:15:01 +05:30
Deepesh Garg	a47e42c515	Merge pull request #21087 from nabinhait/item_defaults_fix_dev fix: Add item defaults based on global settings only if default company and warehouse is mentioned	2020-03-29 21:55:25 +05:30
Deepesh Garg	fe1f754d83	Merge pull request #21110 from nextchamp-saqib/cancel-error-hyperlink chore: hyperlinks in cannot cancel message	2020-03-29 21:53:43 +05:30
Deepesh Garg	e0a4a32460	Merge pull request #21115 from nextchamp-saqib/course-report-perm-fix fix: cannot view report for course doctype - permission problem	2020-03-29 21:51:15 +05:30
Rohit Waghchaure	cdf80eb4ad	fix: not able to add equity account in the chart of accounts	2020-03-29 16:35:10 +05:30
Saqib Ansari	0f6d372182	fix: cannot view report for course doctype - permission problem	2020-03-29 12:52:16 +05:30
Deepesh Garg	f528aef49c	Merge pull request #21089 from scmmishra/print-format-fix fix: total currency formatting in Acc Receivable and Payable	2020-03-28 21:27:56 +05:30
Deepesh Garg	1a2cf5cabe	fix: get_party_gle_currency failing if customer_name or supplier_name is passed	2020-03-28 21:26:16 +05:30
Deepesh Garg	c6b850eacb	fix: Improve message	2020-03-28 21:17:58 +05:30
Deepesh Garg	f9f39f5a7e	Merge pull request #21103 from nextchamp-saqib/stock-ledger-warehouse-filter chore: [ux] filter warehouse based on company	2020-03-28 21:09:46 +05:30
Saqib Ansari	b345fe0fe9	chore: hyperlinks in cannot cancel message	2020-03-28 20:11:26 +05:30
Saqib Ansari	ed3553f795	chore: [ux] filter warehouse based on company	2020-03-28 19:12:59 +05:30
Deepesh Garg	b5c6412ed4	Merge pull request #21101 from nextchamp-saqib/gl-entry-currency-fix fix: currency formatting in gl entry dr cr field	2020-03-28 18:56:49 +05:30
Saqib Ansari	c1678203f1	fix: currency formatting in gl entry dr cr field	2020-03-28 16:39:22 +05:30
Saqib Ansari	0ec01d98d6	fix: payment request status fixes	2020-03-28 16:11:23 +05:30
rohitwaghchaure	2d5addafa7	Merge pull request #21099 from anupamvs/item-wise-sales-history-billed-amount-bug bug: Item-wise Sales History - Billed amount	2020-03-28 15:05:41 +05:30
Rohit Waghchaure	e7c4565483	fix: item code showing as mandatory even if the 'Item Naming By' is set as Naming Series in stock settings	2020-03-28 14:59:00 +05:30
Anupam K	85aae7de0b	bug: Item-wise Sales History - Billed amount	2020-03-28 14:13:58 +05:30
Saqib Ansari	8488ef8eb1	fix: customer group price list not fetched in pos	2020-03-28 14:07:09 +05:30
Deepesh Garg	c12a8040ef	Merge branch 'develop' into item_defaults_fix_dev	2020-03-27 21:51:00 +05:30
Deepesh Garg	e86f6d0738	Merge branch 'develop' into print-format-fix	2020-03-27 21:39:16 +05:30
Shivam Mishra	71fb8e8b57	fix: use setup from Supplier Quotation Controller	2020-03-27 20:47:04 +05:30
Nabin Hait	fe000e20e8	fix: Add item defaults based on global settings only if default company and warehouse is mentioned	2020-03-27 19:24:47 +05:30
Shivam Mishra	cf6a814328	fix: total currency formatting	2020-03-27 19:15:59 +05:30
Deepesh Garg	c5f40d9072	Merge branch 'develop' into sahil28297-patch-1	2020-03-27 18:43:13 +05:30
rohitwaghchaure	0fc8b2af60	Merge pull request #21077 from rohitwaghchaure/default_item_is_not_coming_while_making_new_bom_develop fix: item not showing in popup while making batch	2020-03-27 13:49:23 +05:30
Rohit Waghchaure	a5357c2e27	fix: item not showing in popup while making batch	2020-03-27 12:59:02 +05:30
Deepesh Garg	3a639ea187	Merge branch 'develop' into demo-fixed-asset-fix	2020-03-27 11:31:53 +05:30
Rucha Mahabal	cdf7189c29	fix: remove Expired status from Appointment	2020-03-27 11:30:00 +05:30
Deepesh Garg	88898abe6c	fix: Randomly failing loan repayment test	2020-03-27 10:27:15 +05:30
Rucha Mahabal	197165ff40	fix: codacy	2020-03-26 17:29:50 +05:30
Rohan Bansal	da54719b43	feat: add status filter in issue web form	2020-03-26 16:08:03 +05:30
Rucha Mahabal	42376705ab	fix: don't append year if values have same year in Appointment Analytics	2020-03-26 16:02:53 +05:30
Anupam K	7ca28fdab5	fix: Adding proper error message	2020-03-26 15:54:15 +05:30
marination	815c36a4eb	fix: Updated Bin Requested Qty logic	2020-03-26 15:46:27 +05:30
Rohan	ea182051d3	fix: consumed qty values in work order	2020-03-26 15:32:01 +05:30
Rucha Mahabal	2cec6bd789	fix: check new patient before creating fee validity	2020-03-26 14:38:12 +05:30
Deepesh Garg	d74bcad7af	fix: Added hidden GL column in general ledger (#21021 ) Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-03-26 13:37:40 +05:30
Marica	38cba153b5	fix: Make shelf life mandatory in Batched Item if it has expiry date (#21044 )	2020-03-26 13:29:02 +05:30
Raffael Meyer	89cac5af16	fix(regional): encoding of DATEV report (#21059 )	2020-03-26 13:25:58 +05:30
Marica	b856aae651	fix: Project field in Stock Entry Detail should be editable (#20999 )	2020-03-26 13:23:49 +05:30
Saqib	74864b3b61	fix: currency not fetched on quotation creation (#20996 )	2020-03-26 13:20:31 +05:30
Saqib	faea85451f	feat: auto set batch no on serial no selection (#20757 ) * feat: auto set batch no on serial no selection * fix: dialog not shown if set warehouse selected * fix: typo * fix: merge conflict * fix: callback no getting called after serial no selected * fix: available batch qty not fetched without set_warehouse selected * fix: item batch not synced with dialog batch table	2020-03-26 13:18:57 +05:30
Nabin Hait	1aa8c2ecc4	fix: delete contact email and phone along with contact	2020-03-26 13:15:31 +05:30
Nabin Hait	ced6898fd7	fix: Ignored user permission for parent_company and existing_company field in Company	2020-03-26 12:30:29 +05:30
Deepesh Garg	5fbada75fa	Merge pull request #21038 from anupamvs/error-message-changes fix: add better error message	2020-03-26 11:56:34 +05:30
Deepesh Garg	9062ce5191	fix: Spacing and indentations	2020-03-26 11:56:03 +05:30
Anupam K	9725e43eed	fix: Adding proper error message	2020-03-26 00:17:09 +05:30
Deepesh Garg	bdcfab3a0f	fix: Update patch and bank form cleanup	2020-03-25 21:32:10 +05:30
Deepesh Garg	3cf70a6e79	Merge branch 'develop' of https://github.com/frappe/erpnext into P-Froggy-develop	2020-03-25 21:00:25 +05:30
Anupam K	10b7a51805	Better error message	2020-03-25 18:21:42 +05:30
Deepesh Garg	113c6c86b7	fix: Remove debug	2020-03-25 16:54:17 +05:30
Deepesh Garg	878e4fbcf8	fix: Place of supply validation in GSTR-1 report	2020-03-25 16:52:07 +05:30
Rucha Mahabal	b60979cfaa	fix: show Change Item Code button only if Unit Type is billable	2020-03-25 02:10:33 +05:30
Rucha Mahabal	1900a62c54	fix: Merge branch 'develop' into healthcare_refactor	2020-03-25 02:08:42 +05:30
rohitwaghchaure	b6bb56e9bf	Merge pull request #21037 from rohitwaghchaure/fixed_batch_selector_popup_develop fix: batch selection popup not coming for stock entry	2020-03-24 16:32:21 +05:30
Deepesh Garg	da6fb435dd	Merge pull request #21041 from deepeshgarg007/default_dimension_clean_up fix: Default dimension set code cleanup	2020-03-24 15:47:51 +05:30
Deepesh Garg	4e3fbf5a8b	fix: Default dimension set code cleanup	2020-03-24 15:43:21 +05:30
Anupam K	b14085eb0e	Better error message	2020-03-24 12:17:28 +05:30
Rucha Mahabal	60e558a019	test: Patient Medical Record	2020-03-24 11:54:35 +05:30
Rucha Mahabal	aabcee4f8f	test: Healthcare Consultation DocTypes	2020-03-24 11:54:15 +05:30
Anupam K	95e35f9e81	Better error message	2020-03-24 11:52:34 +05:30
Rohit Waghchaure	5c1404e878	fix: batch selection popup not coming for stock entry	2020-03-24 11:40:03 +05:30
Rohan	7ea79933b3	fix: handle error handling (#20815 )	2020-03-23 14:54:33 +05:30
Rohan	879c6bfb44	Merge branch 'develop' into dev-stock-entry-fg-validation	2020-03-23 14:50:02 +05:30
sahil28297	39f02da45a	Merge branch 'develop' into sahil28297-patch-1	2020-03-23 13:03:30 +05:30
Rucha Mahabal	f67afe67ab	test: Healthcare Masters	2020-03-23 12:31:13 +05:30
Rucha Mahabal	4f9a1471e4	fix: tests	2020-03-23 10:40:39 +05:30
Deepesh Garg	96297f73f2	Merge pull request #21025 from deepeshgarg007/dimension_perm fix: Remove quick entry from accounting dimensions	2020-03-22 21:56:34 +05:30
Deepesh Garg	75225316f0	fix: Remove quick entry from accouting dimensions	2020-03-22 21:50:22 +05:30
Deepesh Garg	f8b54bd301	Merge pull request #21005 from rohitwaghchaure/qty_must_be_positive_for_stock_entry_develop fix: stock entry qty must be positive	2020-03-21 20:46:10 +05:30
Rohan	b7d84725e8	fix: add warehouse check for FG item	2020-03-20 18:49:11 +05:30
Rohan	4464a591ef	fix: allow BOM to use same item as raw material	2020-03-20 18:49:08 +05:30
marination	73c8d23a79	fix: UOM fixes in Sales Order,Material Request & Production Plan	2020-03-20 17:52:28 +05:30
sahil28297	4c3679ba8a	fix: develop version as 12.0.0-dev	2020-03-20 15:38:52 +05:30
sahil28297	fcdc2b1815	fix: develop version as 12.0.0.dev	2020-03-20 15:20:28 +05:30
sahil28297	54cbff9e80	fix: develop version as 12.x.x instead of 12.2.0	2020-03-20 14:23:27 +05:30
Suraj Shetty	3cf0dc966c	fix: Add currency in options of Opportunity Amount - To show currect symbol in list view	2020-03-20 12:51:16 +05:30
Rohit Waghchaure	5e4e2dbd03	fix: stock entry qty must be positive	2020-03-19 14:53:37 +05:30
Rohan	ce90848161	fix: allow target warehouses to be changed for work order stock entries	2020-03-19 13:22:58 +05:30
Deepesh Garg	dbeb77e745	fix: Unable to submit landed cost voucher (#20977 )	2020-03-19 11:03:03 +05:30
Deepesh Garg	fa6454b9c5	fix: Update is_tree field in Tree doctypes (#20981 )	2020-03-19 11:01:23 +05:30
Nabin Hait	2e67c33657	Release testing fixes develop (#20987 ) * fix: Multiple fixes during pre-release testing * fix: Merge conflict	2020-03-19 10:59:32 +05:30
Deepesh Garg	9476170b09	Merge pull request #20994 from rohitwaghchaure/fixed_bom_comparision_issue_develop fix: bom comparison issue	2020-03-19 10:55:14 +05:30
Rohit Waghchaure	d9469137cc	fix: bom comparison issue	2020-03-19 10:07:27 +05:30
rohitwaghchaure	e4cd12506c	Merge pull request #20991 from rohitwaghchaure/fixed_reserved_qty_for_production_develop fix: reserved qty for production issue for partial completion of work…	2020-03-19 09:37:43 +05:30
Deepesh Garg	6b36fae531	Merge pull request #20990 from rohitwaghchaure/fixed_shortage_qty_in_stock_projected_qty_report_develop fix: shortage qty in stock projected qty report	2020-03-19 09:33:03 +05:30
Rohit Waghchaure	dd13d0a9a9	fix: reserved qty for production issue for partial completion of work order	2020-03-19 09:29:17 +05:30
Rohit Waghchaure	cd2478a527	fix: shortage qty in stock projected qty report	2020-03-19 09:27:53 +05:30
Prssanna Desai	b4909b8fd2	fix: set filters as argument filters if passed (#20975 )	2020-03-18 18:23:38 +05:30
Marica	508ed1e121	fix: Missing if condition in Customer Default Bank Account Validation. (#20969 )	2020-03-18 11:28:04 +05:30
marination	3251dcf672	fix: Added patch to patches.txt	2020-03-18 10:11:23 +05:30
Rucha Mahabal	0eeaad8ce7	fix: create fee validity for new patients only	2020-03-17 20:26:29 +05:30
Rucha Mahabal	2d785b7b09	fix: invoicing logic for appointments	2020-03-17 20:18:16 +05:30
Priyanka Gangar	2602c7ea38	Label changes in account settings develop (#20965 ) * fix: Account setting words switches to US Terminology * created united_states.js * Remove Unwanted Spaces * Remove all changes * Add spaces between arguments Co-authored-by: PriyankaGangar <pinka0925@gmail.com>	2020-03-17 19:39:30 +05:30
Rucha Mahabal	f2574dde37	fix: set fee validity start date and set status as Completed or Pending	2020-03-17 19:28:18 +05:30
Rucha Mahabal	2f2c09bd98	fix: wrong fee validity calculation and payment fields visibility in appointment	2020-03-17 18:10:39 +05:30
Deepesh Garg	745897c354	Merge pull request #20862 from alyf-de/skr04_groups fix(accounts): adjust account groups in SKR04	2020-03-17 17:27:16 +05:30
Nabin Hait	ddc3bb2251	fix: Multiple fixes for travis (#20924 ) * fix: Multiple fixes for travis * fix: Multiple fixes for travis * fix: Run dashboard patch if table already exists * fix: Multiple fixes for travis * fix: deletion of auto-created batch	2020-03-17 17:04:18 +05:30
rohitwaghchaure	06dc6a527e	fix: bom replace tool issue (#20842 )	2020-03-17 17:01:26 +05:30
Deepesh Garg	ff7bbd2d38	fix: Party Name not visible in statement of accounts (#20913 ) * fix: Party name in Statement Of Accounts * Update general_ledger.html Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-03-17 17:00:06 +05:30
marination	e1f499ae1b	fix: Pick List Enhancements	2020-03-17 11:47:11 +05:30
Deepesh Garg	e7aefc1163	fix: Add check to skip PR in supplier master	2020-03-17 11:44:02 +05:30
Deepesh Garg	eeb1922e37	fix: Add check to skip SO and DN in customer master	2020-03-17 11:43:34 +05:30
Marica	b10adbb161	fix: Item alternative must have similar fields as original item (#20796 ) * fix: Item alternative must have similar fields as orignal item * fix: Using db.get_values and meta instead of get_value and get_doc * fix: Made code more DRY Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-03-17 10:56:59 +05:30
Deepesh Garg	ed0965a572	feat: Nested set filtering for accounting dimension (#20860 ) * feat: Nested set filtering for accounting dimension * fix: Remove print statement	2020-03-17 10:53:24 +05:30
Deepesh Garg	d1bc74d650	Merge pull request #20958 from deepeshgarg007/mode_of_payment_fix fix: Mode of payment not fetcched in Item wise purchase register	2020-03-16 22:43:09 +05:30
Don-Leopardo	2b6a20aab5	fix: sql injection (#20818 )	2020-03-16 22:36:44 +05:30
Deepesh Garg	07116c7922	fix: Mode of payment not fetcched in Item wise purchase register	2020-03-16 22:36:32 +05:30
Frappe PR Bot	b8b5fa6291	feat: Updated translation (#20954 ) Co-authored-by: frappe <frappe@scw-dazzling-elgamal>	2020-03-16 17:59:42 +05:30
Saqib	1306f5005b	fix: is_pos gets reset on making s_inv from s_ord (#20886 ) * s_inv has is_pos default set as 1	2020-03-16 17:51:00 +05:30
Anurag Mishra	c0b1c372a4	fix: local variable 'benefit_amount' referenced before assignment (#20949 )	2020-03-16 16:53:03 +05:30
Saqib	de4f6901d6	fix: serial_no_selector showing for non serialized batched item (#20851 )	2020-03-16 16:29:10 +05:30
Deepesh Garg	0a74261a94	Merge pull request #20920 from deepeshgarg007/c_form_fix fix: Get invoice details only if invoice is selected	2020-03-16 15:56:32 +05:30
Deepesh Garg	d190cc0198	Merge pull request #20835 from Thunderbottom/welcome-email-fix fix: use ERPNext in welcome email when default company is not set	2020-03-16 15:54:53 +05:30
Prssanna Desai	e71153cbee	fix: fix options of currency fieldtype in Expense Taxes and Charges (#20901 )	2020-03-16 15:52:25 +05:30
Raffael Meyer	1433436670	fix(accounts): add account_type and tax_rate to some VAT accounts (#20940 ) * Add account_type and tax rate to some VAT accounts * fix indentation	2020-03-16 15:45:05 +05:30
Himanshu Warekar	841be6713b	Merge branch 'develop' of https://github.com/frappe/erpnext into custom_append_to	2020-03-13 19:40:00 +05:30
Anurag Mishra	3ced42f302	feat: reverse linking and multiple additonal salaries in salary slip	2020-03-13 19:14:56 +05:30
Rucha Mahabal	cd31996b81	fix: check fee validity in a single function	2020-03-13 15:39:31 +05:30
Deepesh Garg	0b7acc0fd6	fix: Create Item tax template only for specific account types	2020-03-13 11:51:14 +05:30
Rucha Mahabal	200cb34ecf	Merge branch 'develop' into healthcare_refactor	2020-03-12 19:44:27 +05:30
Shivam Mishra	c06ba54f1e	refactor: remove website (#20927 )	2020-03-12 18:04:42 +05:30
Rucha Mahabal	05853efeb7	feat: Healthcare Domain Workspace with chart and shortcuts	2020-03-12 17:44:46 +05:30
Shivam Mishra	aecf9d6168	Merge branch 'develop' into desk-settings-card	2020-03-12 17:13:03 +05:30
Shivam Mishra	f241054c6c	feat: extended settings page	2020-03-12 16:38:59 +05:30
Shivam Mishra	05d74bbcf9	feat: added loan management page	2020-03-12 16:38:49 +05:30
Shivam Mishra	451382e08e	feat: update desk pages	2020-03-12 16:34:34 +05:30
Myuddin khatri	b9631a501f	fix(shopping-cart): setting billing and shipping address setting billing and shipping address	2020-03-12 16:21:38 +05:30
Myuddin khatri	4635ff9368	fix(shopping-cart): address is made mandatory to place order	2020-03-12 14:45:08 +05:30
Ronel Cabrera	fcb54762a1	feat(Contacts): select billing contact for sales invoice	2020-03-12 16:58:59 +08:00
Rucha Mahabal	72993d6828	Merge branch 'develop' into healthcare_refactor	2020-03-12 12:52:38 +05:30
Rucha Mahabal	06d1b047e0	refactor: Healthcare Module Page	2020-03-12 12:16:23 +05:30
Chinmay D. Pai	86636212c3	fix: remove make_purchase_invoice from demo script currently demo fails with the following error: frappe@bf54a9834cfe:/workspace/development/frappe-bench$ bench --site test1.localhost execute erpnext.demo.demo.make Traceback (most recent call last): File "/usr/lib/python3.7/runpy.py", line 193, in _run_module_as_main "__main__", mod_spec) File "/usr/lib/python3.7/runpy.py", line 85, in _run_code exec(code, run_globals) File "/workspace/development/frappe-bench/apps/frappe/frappe/utils/bench_helper.py", line 97, in <module> main() File "/workspace/development/frappe-bench/apps/frappe/frappe/utils/bench_helper.py", line 18, in main click.Group(commands=commands)(prog_name='bench') File "/workspace/development/frappe-bench/env/lib/python3.7/site-packages/click/core.py", line 764, in __call__ return self.main(args, kwargs) File "/workspace/development/frappe-bench/env/lib/python3.7/site-packages/click/core.py", line 717, in main rv = self.invoke(ctx) File "/workspace/development/frappe-bench/env/lib/python3.7/site-packages/click/core.py", line 1137, in invoke return _process_result(sub_ctx.command.invoke(sub_ctx)) File "/workspace/development/frappe-bench/env/lib/python3.7/site-packages/click/core.py", line 1137, in invoke return _process_result(sub_ctx.command.invoke(sub_ctx)) File "/workspace/development/frappe-bench/env/lib/python3.7/site-packages/click/core.py", line 956, in invoke return ctx.invoke(self.callback, ctx.params) File "/workspace/development/frappe-bench/env/lib/python3.7/site-packages/click/core.py", line 555, in invoke return callback(args, *kwargs) File "/workspace/development/frappe-bench/env/lib/python3.7/site-packages/click/decorators.py", line 17, in new_func return f(get_current_context(), args, *kwargs) File "/workspace/development/frappe-bench/apps/frappe/frappe/commands/__init__.py", line 25, in _func ret = f(frappe._dict(ctx.obj), args, *kwargs) File "/workspace/development/frappe-bench/apps/frappe/frappe/commands/utils.py", line 145, in execute ret = frappe.get_attr(method)(args, **kwargs) File "/workspace/development/frappe-bench/apps/frappe/frappe/__init__.py", line 1042, in get_attr return getattr(get_module(modulename), methodname) File "/workspace/development/frappe-bench/apps/frappe/frappe/__init__.py", line 823, in get_module return importlib.import_module(modulename) File "/workspace/development/frappe-bench/env/lib/python3.7/importlib/__init__.py", line 127, in import_module return _bootstrap._gcd_import(name[level:], package, level) File "<frozen importlib._bootstrap>", line 1006, in _gcd_import File "<frozen importlib._bootstrap>", line 983, in _find_and_load File "<frozen importlib._bootstrap>", line 967, in _find_and_load_unlocked File "<frozen importlib._bootstrap>", line 677, in _load_unlocked File "<frozen importlib._bootstrap_external>", line 728, in exec_module File "<frozen importlib._bootstrap>", line 219, in _call_with_frames_removed File "/workspace/development/frappe-bench/apps/erpnext/erpnext/demo/demo.py", line 6, in <module> from erpnext.demo.user import hr, sales, purchase, manufacturing, stock, accounts, projects, fixed_asset File "/workspace/development/frappe-bench/apps/erpnext/erpnext/demo/user/fixed_asset.py", line 9, in <module> from erpnext.assets.doctype.asset.asset import make_purchase_invoice, make_sales_invoice ImportError: cannot import name 'make_purchase_invoice' from 'erpnext.assets.doctype.asset.asset' (/workspace/development/frappe-bench/apps/erpnext/erpnext/assets/doctype/asset/asset.py) Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>	2020-03-11 16:20:07 +05:30
Saqib	6ec4618914	fix: travis (#20903 )	2020-03-11 16:04:00 +05:30
Prssanna Desai	4fd61c3f83	fix: parameters un get function for accounts dashboard (#20847 )	2020-03-11 12:37:56 +05:30
Suraj Shetty	edc31d51da	chore: Add CSV imported translations	2020-03-10 20:51:01 +05:30
Suraj Shetty	45ce5b07b4	Merge branch 'develop' of https://github.com/frappe/erpnext into new-translations	2020-03-10 18:22:36 +05:30
Suraj Shetty	b868c379a7	chore: Update translations	2020-03-10 18:21:33 +05:30
Shivam Mishra	1fd1852c6a	Merge branch 'develop' into yet-another-desk	2020-03-10 18:20:27 +05:30
Deepesh Garg	4b20e852ea	fix: Get invoice details only if invoice is selected	2020-03-10 10:36:05 +05:30
Deepesh Garg	9f28a3124c	Merge pull request #20890 from deepeshgarg007/itemised_purchase_register fix: HSN code not visible in GST Itemised Purchase register	2020-03-10 10:05:31 +05:30
Rucha Mahabal	c4b2dceb01	feat: Fee Validity status (Ongoing, Expired, Completed)	2020-03-09 23:57:00 +05:30
Deepesh Garg	74d4e9e4ea	Merge pull request #20884 from deepeshgarg007/first_row_dimension fix: Acccounting Dimension disappearing in first row after refresh	2020-03-09 22:47:25 +05:30
Deepesh Garg	5e58666091	fix: HSN code not visible in GST Itemised Purchase register	2020-03-09 22:38:41 +05:30
Saqib	f866ed9679	fix: [pos] customer group filter resets on syncing offline invoices (#20873 )	2020-03-09 18:30:47 +05:30
Marica	508ad51d9c	fix: Validate Serial No/Batch No against unserialized Item in Stock Reconciliation (#20858 )	2020-03-09 18:13:41 +05:30
Marica	4528badfcf	fix: ModuleNotFoundError on Turkey Company setup (#20853 )	2020-03-09 18:07:43 +05:30
Rucha Mahabal	27512c86ae	refactor: Healthcare utils	2020-03-09 17:29:23 +05:30
Deepesh Garg	8d72b14776	fix: Acccounting Dimension disappearing in first row after refresh	2020-03-09 08:06:07 +05:30
Raffael Meyer	f669f30c08	add missing equity accounts	2020-03-06 16:17:06 +01:00
Deepesh Garg	1943fb0de4	feat: Allow PI creation without PO	2020-03-06 18:50:11 +05:30
Raffael Meyer	7b7513ab2b	adjust groups	2020-03-06 12:32:49 +01:00
Anurag Mishra	d319feee9e	fix: reverse linking	2020-03-06 15:01:10 +05:30
Anurag Mishra	1663f66e6d	test: Recurring Additional salary	2020-03-06 15:00:41 +05:30
Anurag Mishra	885ab5dc66	fix: requested changes	2020-03-06 15:00:40 +05:30
Anurag Mishra	2d7fcab2c9	feat: Recurring Addtional Salary	2020-03-06 14:59:56 +05:30
Anurag Mishra	943457abd3	fix: reverse linking for employee advance	2020-03-06 13:37:24 +05:30
Rucha Mahabal	b754faa59c	fix: merge branch healthcare_refactor	2020-03-06 13:23:40 +05:30
Rucha Mahabal	e8bbdd5e84	fix: Lab Test Template data import failing in Lab Test Item creation	2020-03-06 13:18:56 +05:30
Rucha Mahabal	ac4199f2d7	fix (Lab Test): None TypeError in Patient Medical Record	2020-03-06 12:22:55 +05:30
Rucha Mahabal	11117810c5	fix (Vital Signs): Patient Medical Record not found	2020-03-06 12:21:18 +05:30
Saqib	b978d79573	fix: show uom in print formats instead of stock uom (#20843 ) Co-authored-by: Saqib Ansari <saqibansari@Saqibs-MacBook-Pro.local>	2020-03-06 11:03:46 +05:30
Marica	fc96c1a2d6	fix: update_child_qty_rate() missing argument (#20838 )	2020-03-06 10:57:59 +05:30
Anurag Mishra	59a0bce3a9	feat: Repay advance from salary	2020-03-05 16:13:52 +05:30
Shivam Mishra	0310366d5a	fix (cleanup): remove incomplete dependencies data	2020-03-05 11:28:40 +05:30
Chinmay D. Pai	612e58dca8	fix: use ERPNext in welcome email when default company is not set Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>	2020-03-05 10:08:43 +05:30
Deepesh Garg	6dc335d898	Merge pull request #20824 from scmmishra/report-options feat: update profit and loss for new report summary API	2020-03-04 16:07:31 +05:30
Deepesh Garg	a75cf35bb7	Merge pull request #20755 from lokesh-indictrans/develop fix: user is not able to do 'Set as Lost' for Quotation (#20603)	2020-03-04 11:56:52 +05:30
Deepesh Garg	6d604a151b	fix: Validation message	2020-03-04 11:55:10 +05:30
Deepesh Garg	a245a3a47f	fix: HSN code no visible in GST itemised sales register	2020-03-04 10:23:49 +05:30
Lokesh Waingankar	d398c73bc5	fix: Removed html tags in pop up message (#20603 )	2020-03-03 19:07:51 +05:30
Lokesh Waingankar	6795422204	Merge branch 'develop' of https://github.com/frappe/erpnext into develop	2020-03-03 12:12:56 +05:30
Rucha Mahabal	5eb42409c7	Merge branch 'develop' into healthcare_refactor	2020-03-03 09:22:11 +05:30
Rucha Mahabal	33fec1df54	feat: Patient Registration Web Form	2020-03-03 01:13:58 +05:30
Rucha Mahabal	77e84dfc35	fix: remove deprecated Appointment Analytics Tree Grid Report	2020-03-03 00:25:50 +05:30
Rucha Mahabal	5a92b3fc99	feat: set chart for Appointment Analytics	2020-03-03 00:24:43 +05:30
Rucha Mahabal	85aab34421	feat: Patient Appointment Analytics Script Report	2020-03-02 23:14:30 +05:30
Shivam Mishra	1f151c1032	refactor: update restrict to domain data	2020-03-02 19:37:12 +05:30
Anurag Mishra	cf04b3c680	fix: added standard filters (#20807 )	2020-03-02 19:25:01 +05:30
Deepesh Garg	12aa35aa43	fix: Label and UX fixes in AP/AP reports (#20803 )	2020-03-02 19:10:29 +05:30
Priyanka Gangar	ca05c83796	fix: fetch sales person name (#20805 ) * fix: fetch sales person name * Update sales_person.js Co-authored-by: pinka0925 <44537026+pinka0925@users.noreply.github.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-03-02 19:06:06 +05:30
Deepesh Garg	cd96be9993	fix: Excel support and UX fixes for chart of accounts importer (#20703 ) * fix: Excel support and UX fixes for chart of accounts importer * fix: Linting Errors * fix: Blank chart preview * fix: Added template types for download * fix: Description on template selection * fix: Linting fixes * fix: Move logic for download template to dialog	2020-03-02 18:57:21 +05:30
Deepesh Garg	cc2771baa7	fix: Total amount not displayed in Journal Entry (#20794 ) * fix: Total amount not displayed in Journal Entry * fix: Update paid_to_received field * fix: set total amount Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-03-02 18:09:19 +05:30
Saurabh	19df2ffbd8	[bug][fix]: set status to object instead of variable (#20790 )	2020-03-02 17:50:05 +05:30
Lokesh Waingankar	38242bc21f	Merge branch 'develop' of https://github.com/frappe/erpnext into develop	2020-03-02 17:45:59 +05:30
Shivam Mishra	3f59af3ef1	feat: added base config for domains	2020-03-02 17:25:18 +05:30
Shivam Mishra	8a8e8d6c5c	feat: added base pages for desk	2020-03-02 16:56:31 +05:30
Frappe PR Bot	eb2f79b16e	feat: Updated translation (#20784 )	2020-03-02 16:52:42 +05:30
Marica	ed25ec7ee5	chore: Item Price and Product Bundle Form cleanup (#20772 ) * chore: Item Price and Product Bundle Form cleanup * fix: Trailing comma	2020-03-02 15:51:14 +05:30
Saqib	ff52d16fb3	chore: control reposting of future gl entries with flags (#20774 )	2020-03-02 15:19:18 +05:30
Saqib	e9ac3e0d64	feat: link serial no to batch no (#20778 ) * feat: link serial no to batch no * fix: test cases	2020-03-02 15:02:58 +05:30
Saqib	7b8c3dee3d	fix: reconciled entries showing in bank reco (#20787 )	2020-03-02 15:01:06 +05:30
Rucha Mahabal	9565e62e3a	refactor: Clinical Procedure code	2020-03-02 12:11:38 +05:30
Rucha Mahabal	75626d63aa	fix: set consumable entries on client side and not on validate	2020-03-02 11:35:59 +05:30
Rucha Mahabal	5ec7b55c3c	fix: consumable total amount not set in Clinical Procedure	2020-03-02 10:17:15 +05:30
P-Froggy	f1014bb978	Merge branch 'develop' of https://github.com/P-Froggy/erpnext into develop	2020-03-02 00:21:12 +01:00
P-Froggy	313efe9b32	fix: add missing semicolon	2020-03-02 00:21:08 +01:00
P-Froggy	3bf04154b1	Merge branch 'develop' into develop	2020-03-02 00:18:23 +01:00
Deepesh Garg	09188e4a21	fix: Remove fetch from loan_application.json	2020-03-01 22:16:27 +05:30
Rucha Mahabal	7c5947f041	fix: Batch not getting fetched in Clinical Procedure Item	2020-03-01 14:46:34 +05:30
Deepesh Garg	0c7b60aa99	Merge pull request #20768 from marination/buying-dashboard chore: Rearranged Buying Module Dashboard	2020-02-29 17:33:51 +05:30
radhikag	86ecaa59ca	fix : Student Admission accepting end date less than start date. #20625	2020-02-29 12:47:03 +05:30
Deepesh Garg	2090d113e5	Merge pull request #20781 from deepeshgarg007/loan_shortfall_enhance fix: Add loan to value ratio in loan security type	2020-02-29 09:01:27 +05:30
Deepesh Garg	eee7f77d47	fix: Add loan to value ratio in loan security type	2020-02-29 08:58:15 +05:30
P-Froggy	f9b3e4be78	Merge branch 'develop' of https://github.com/P-Froggy/erpnext into develop	2020-02-28 20:46:41 +01:00
P-Froggy	266e689c4f	fix: Show swift number and branch code in quick entry of bank doctype	2020-02-28 20:46:36 +01:00
P-Froggy	393a626834	fix: Allow only bank accounts of the respective party in payment entry	2020-02-28 20:45:48 +01:00
Rucha Mahabal	d244ac9c3a	fix: status inconsistencies in Clinical Procedure	2020-02-28 19:25:26 +05:30
Rucha Mahabal	0ed4cabb5d	fix: make Clinical Procedure submittable	2020-02-28 19:24:38 +05:30
P-Froggy	55d10f77f9	fix: Add linked bank accounts to supplier dashboard	2020-02-28 13:14:11 +01:00
Rucha Mahabal	d76908d757	fix: Clinical Procedure Template code refactor	2020-02-28 13:30:43 +05:30
marination	24f4683999	chore: Rearranged Buying Module Dashboard	2020-02-28 12:58:41 +05:30
Deepesh Garg	5707c9a731	fix: Item Wise report query fix (#20760 )	2020-02-28 12:28:54 +05:30
Karthikeyan S	0db423ed5f	fix(auto attendance): bug in marking absent (#20759 ) This bug was introduces in the commit `bd6e8b9cec` i.e. The mark_absent function was renamed to mark_attendance, but there is a miss match in the order of the parameters.	2020-02-28 12:27:21 +05:30
Saqib	8cf841ce60	fix: wrong calculation of depreciation eliminated for a period (#20502 )	2020-02-27 19:09:34 +05:30
Lokesh Waingankar	b252f5851d	Merge branch 'develop' of https://github.com/frappe/erpnext into develop	2020-02-27 19:09:14 +05:30
Lokesh Waingankar	efb6482ef6	fix: user is not able to do 'Set as Lost' for Quotation (#20689 )	2020-02-27 19:08:58 +05:30
Shivam Mishra	d20e36f3fd	feat: ignore permission when deleting linked emails (#20751 ) * feat: ignore permission when deleting linked emails * fix: uncommented important snippet	2020-02-27 19:07:58 +05:30
Saqib	fb35a54bee	perf: improve gl entry submission (#20676 ) * perf: improve gl entry submission * perf: add indexes * fix: replace *kwargs with args * fix: syntax error * fix: remove cypress * fix: travis * chore: remove purchase invoice from status updater * fix: set_staus args Co-Authored-By: Nabin Hait <nabinhait@gmail.com> * fix: only update status for invoices & fees Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-02-27 18:32:19 +05:30
Anurag Mishra	d42a4a6234	fix: deductions calculation based on gross pay (#20727 ) * fix: deductions calculation based on gross pay * test: salary structure deduction based on gross pay Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-02-27 18:31:18 +05:30
rohitwaghchaure	b5a670cdb9	fix: serial no material transfer performance issue (#20747 )	2020-02-27 18:18:10 +05:30
Rucha Mahabal	8c5725c799	fix: change item_code from Link to Data to avoid item not found error	2020-02-27 17:18:52 +05:30
Deepesh Garg	d8d453d7d4	Merge pull request #20748 from deepeshgarg007/bank_reco_jv fix: Journal Entry not being fetched in Bank Reconciliation	2020-02-27 16:18:27 +05:30
Deepesh Garg	f444f451ac	fix: Remove debug statement	2020-02-27 16:04:01 +05:30
Deepesh Garg	50b3472eba	fix: Journal Entry not being fetched in Bank Reconciliation	2020-02-27 16:01:47 +05:30
Rucha Mahabal	61203b8701	fix: disabled Procedure Template shown as enabled in List View	2020-02-27 13:47:54 +05:30
Lokesh Waingankar	2866617c82	fix: 'Last Purchase Rate' taking wrong on BOM (#20689 ) * fix: 'Last Purchase Rate' taking wrong on BOM. #20228 * fix: Added condition for None purchase order and purchase receipt (#20689) * fix: fetch last purchase rate Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-02-27 13:21:14 +05:30
Rucha Mahabal	99321cd538	fix: conflicts	2020-02-27 13:16:53 +05:30
Rucha Mahabal	e29d5c1d5b	fix: Schedule Admission button not visible	2020-02-27 12:57:38 +05:30
Saqib	dd374ff77b	fix: only update items if rate or qty changed (#20742 )	2020-02-27 12:51:31 +05:30
Rohan	d40a5d92c2	fix: sort Issues chronologically (#20741 )	2020-02-26 18:54:14 +05:30
Marica	62ba320f5b	fix: Lock stock ledger entries that are being reposted. (#20737 ) - If stock ledger entries are being reposted, don't let any other transaction apply itself on the same.	2020-02-26 18:51:13 +05:30
Deepesh Garg	fe18b92b61	fix: Mandatory bank account error fix (#20733 ) * fix: Mandatory bank account error fix * fix: SQL condition	2020-02-26 17:17:02 +05:30
Rucha Mahabal	a61bf44328	feat: capture symptoms, diagnosis in Table Multiselect instead of Small Text	2020-02-26 17:11:19 +05:30
Deepesh Garg	c88a7f8317	fix: User permission for Loan repayment doctype	2020-02-26 16:49:58 +05:30
Rucha Mahabal	22351adac5	refactor: Patient Encounter	2020-02-26 16:05:43 +05:30
Anurag Mishra	773e7debb9	fix: validated leave allocation (#20636 ) * fix: validated leave allocation * fix: changes requested * Update erpnext/hr/doctype/leave_encashment/leave_encashment.py Co-Authored-By: Nabin Hait <nabinhait@gmail.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-02-26 14:50:57 +05:30
Nabin Hait	2bd6ac56c6	Merge branch 'develop' into develop	2020-02-26 13:21:38 +05:30
Deepesh Garg	9f4b46050f	Merge pull request #20732 from deepeshgarg007/loan_security_pledge_api fix: API fix for loan security pledge creation	2020-02-26 12:59:13 +05:30
Deepesh Garg	b5c5bdd671	fix: API fix for loan security pledge creation	2020-02-26 12:57:05 +05:30
rohitwaghchaure	aa3ba41e83	fix: same free item not working for pricing rule (#20712 )	2020-02-26 12:51:46 +05:30
abhijitkumbharInd	ba8840727a	Create a new item on Material Request showing error Item None not found. #20608 (#20731 )	2020-02-26 12:48:36 +05:30
Deepesh Garg	5a2f22258a	Merge pull request #20592 from byugandhara/develop fix: Changes done to get valid customer and employee list on payment entry form(#20498)	2020-02-26 12:17:47 +05:30
abhijitkumbharInd	12bc43e495	fix: Education \| Quiz accepting duplicate question #20622 (#20708 )	2020-02-26 12:04:41 +05:30
sharmatripti	08fa7590ef	fix: Employee field should be filtered based on department on doctype Instructor (#20705 ) * Fix: Filtered Employee based on Department on Instructor doctype (#20598) * Fix: Syntax error (#20598) * Fix: Syntax error (#20598) * Fix: Syntax error (#20598) * Fix: Syntax error (#20598) * fix : Filtered Employee based on Department on Instructor doctype (#20704)	2020-02-26 12:02:37 +05:30
Rucha Mahabal	63d987f345	fix: fields fetched incosistently from appointment and patient	2020-02-26 11:59:37 +05:30
RJPvT	10aab65338	fix: smaller then instead of bigger then :-( dumb mistake vdevelop #20693 (#20702 )	2020-02-26 11:59:10 +05:30
Saqib	3957ac1408	perf: search for customer's return invoices then filter out gl_entries (#20709 ) Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-02-26 11:36:55 +05:30
rohitwaghchaure	7229f694ea	fix: rate and amount in material request copying from sales order (#20717 )	2020-02-26 11:28:08 +05:30
Mangesh-Khairnar	99d89d6cb8	fix(HR): show correct closing leave balance (#20723 )	2020-02-26 11:26:07 +05:30
rohitwaghchaure	1e6788b028	fix: reorder material request not created if doctype has custom mandatory field (#20719 )	2020-02-26 11:25:34 +05:30
Deepesh Garg	d1d0a50a70	feat: Loan management and accounting (#19035 ) * fix: Create Loan Management module * fix: Move loan doctype for hr module to loan management * fix: Add loan dashboard * fix: Move loan application form hr module to loan management * fix: Move Loan Type from hr to loan management * fix: Move salary slip loan from hr to loan management * fix: Create loan security pledge doctype * fix: Create loan security type doctype * fix: Create Loan security doctype * fix: Add customer in loan_common.js * fix: Import patch for loan * fix: Add security pledging in loan doctype * fix: Add loan application pledge doctype * fix: Add logic for security pledgeing in loan * fix: Add logic for security pledging in loan application * fix: Rename Loan security doctype to Loan Security Pledge * fix: Add doctype for loan security * fix: Fixes in loan and loan application * fix: Add doctypes for loan repayment * fix: Fixes in loan and loan application * fix: Move loan repayment report from HR module to loan management * fix: Create doctype for loan security price * fix: Create doctype for loan security shortfall * fix: Make fields in Loan shortfall readonly * fix: Make loan type submittable * fix: Add daily job for loan security revaluation in hooks.py * fix: Add loan management module * fix: Doctype for loan disbursement Entry * fix: GL entry fix for loan disbursement * fix: Add company currency options in Loan related doctypes * fix: Changes in Loan Doctypes * fix: Allow miltiple loan securities in Loan Security Pledge * fix: Add proposed pledges in Loan Application * fix: Add test cases for loan * fix: Interest Accrual Entry for loans * fix: Remove loan from journal entry * fix: Update triggers in loan_common.js * fix: Accrual Entries for loan Interest * fix: Proposed Pledges for loan application * fix: Update items in loan management module * fix: Allow multiple disbursements against a loan * fix: Add loan security code in loan security master * fix: Allow multiple securities in a single pledge * fix: Spelling and label fixes * fix: Replace date in loan security price with datetime * fix: Add dashboard to loan master * fix: Move Repayment Schedule from HR to Loan Management * fix: Add back jobs for loan accrual entries * fix: Multiple fixes in loan * fix: Multiple fixes in loan application * fix: Loan Reapayment for term loans * fix: Interest Accural Entries for term loans * fix: Changes in Loan Doctypes * fix: Add test case for term loan repayment * fix: Add custom button to update loan security price and trigger shortfall * fix: Usability fixes in Loan management * fix: Multiple usablity and doctype fixes * fix: Muliple bug and usability fixes in loan * fix: Test case fixes for loan repayment from Salary * fix: Codacy fixes * fix: Test Case fixes * fix: Minor fix in validate_repayment_method * fix: Test case and codacy fixes * fix: Provide consistent naming series to loan doctypes * fix: Loan Application fix * fix: Loan Application Dashboard * fix: Add doctypes to process loan interest accural and loan security price * fix: Provision to make loan topup * fix: Pledge and unpledge statuses and doctype for loan securit unpledge * fix: Multiple fixes in Loan Cycle * fix: Add missing dashboards to loan doctypes * fix: Add Loan Manager role to loan doctypes * fix: Loan Process fixes * fix: Loan Security Unpledge fixes * fix: UX, List and dashboards fixes * fix: Minor fixes * fix: Minor fixes * fix: Status on additional loan security * fix: Codacy fixes * fix: Multiple fixes in loan * fix: Rename Process Loan Security Price to Process Loan Security Shortfall * fix: Loan Repayment and Closure report * fix: Loan Security Status report and minor fixes * fix: Multiple UX fixes * fix: Test Case fixes and UX fixes * fix: Currency symbol fixes in Salary Slip Loan * fix: Make loan account details read only * fix: Changes in loan security price updation * fix: Sanctioned Loan Amount doctype * fix: Updates in process loan interest accrual * fix: Pass loan doc instead of loan name * fix: Fixes in process loan interest accrual * fix: Add missing semicolon * fix: Test case * fix: Test case * fix: Sandbox method to get proposed pledges * fix: Sandbox method * fix: Nonetype fix in loan sanction limit * fix: GL entry fixes * fix: Update maximum loan amount on loan security pledging * fix: Round off loan amounts * fix: Loan Security unpledging * fix: Interest amount for loan closure * fix: Due date for loan repayments * fix: API fixes for loan disbursement method * fix: Disable quick entry for sanctioned loan amount * fix: Add misssing translations for validations and codecleanup * fix: Translation fixes and code cleanup * fix: Test Cases * fix: Loan Interest Accrual test case	2020-02-26 10:44:24 +05:30
Deepesh Garg	7f2ad5dd82	Merge pull request #20714 from rohitwaghchaure/account_dashboard_not_working_issue fix: account dashboard not working	2020-02-26 10:18:03 +05:30
Andy Zhu	75d9d79fac	fix: missing assign item's expense_account As in dict object "ret", missing assign item's expense_account will cause it then fetches the default stock_adjustment_account in 'Company'.	2020-02-26 10:49:48 +13:00
Rucha Mahabal	41bd317e25	refactor: Patient Appointment status	2020-02-25 13:51:36 +05:30
Deepesh Garg	0ebace5da2	fix: Update paid amount for pos return (#20543 ) * fix: Paid amount updation for pos return * fix: Remove console * fix: Styling * fix: get default mode of payment from POS profile * fix: Add test cases * fix: Codacy	2020-02-25 13:21:16 +05:30
Rucha Mahabal	7c66975040	feat: validate Customer creation for Patient during Appointment booking	2020-02-25 12:43:33 +05:30
Rucha Mahabal	5100e11fb6	fix: appointment reminders not working	2020-02-24 22:08:45 +05:30
Rucha Mahabal	24055e1552	refactor: Patient Appointment	2020-02-24 19:09:50 +05:30
Rohit Waghchaure	ebdf80ddb5	fix: account dashboard not working	2020-02-24 18:45:47 +05:30
Deepesh Garg	735ec98b61	Merge pull request #20623 from jprashant09/develop fix: Future date of birth accepted at Sibling Detail section in Studen…	2020-02-24 18:30:27 +05:30
Deepesh Garg	aaea4e60b6	fix: Validation condition	2020-02-23 20:59:05 +05:30
Deepesh Garg	dee42de0fd	Merge pull request #20596 from PratikM34/develop fix: restricted duplicate topics on Course doctype (#20594)	2020-02-23 20:56:43 +05:30
Deepesh Garg	cd416bbaa6	Merge pull request #20617 from jsukrut/develop fix: restricted duplicate courses on Program Enrollment doctype (#20611)	2020-02-23 20:51:08 +05:30
Himanshu	83acff9680	Merge branch 'develop' into opportunity-fix	2020-02-21 19:47:41 +05:30
Deepesh Garg	6e53afd947	fix: Travis (#20688 ) * fix: Travis * fix: Update test records Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>	2020-02-20 23:33:35 +05:30
prssanna	3218730a16	fix: set query on change in opportunity_from value	2020-02-20 16:14:44 +05:30
Mangesh-Khairnar	1db8ea317d	Merge pull request #20687 from Anurag810/additional_salary_fixes_v13 fix: Additional salary can be created only for active employee	2020-02-20 16:07:35 +05:30
Anurag Mishra	3f0c01199d	fix: Additional salary can be created only for active employee	2020-02-20 15:40:37 +05:30
Rohan	a29c87cfda	feat: remove unused route creation variable (#20558 )	2020-02-20 13:28:03 +05:30
Mangesh-Khairnar	5d5f5b4f8e	fix(HR): skip earned leaves check for max leaves set to zero or less (#20535 ) * fix: skip earned leaves check for max leaves set to zero or less * test: earned leaves creation	2020-02-20 13:25:55 +05:30
Deepesh Garg	a871d30a7d	Merge pull request #20607 from khushalti/develop fix: validation on max group strength student group form	2020-02-20 13:23:04 +05:30
Deepesh Garg	a0021969ad	fix: Validation message	2020-02-20 13:22:28 +05:30
Deepesh Garg	2c1da897c5	Merge pull request #20450 from Anurag810/fleet-management fix: odometer value was not syncing properly	2020-02-20 13:19:54 +05:30
Rohan	395b2b15b2	fix: apply url encoding to project names (#20642 )	2020-02-20 12:59:32 +05:30
Mangesh-Khairnar	6f6e3a940b	fix: return null for attribute (#20674 )	2020-02-20 12:58:54 +05:30
Rucha Mahabal	6071313965	fix: document creation via onboarding slide (#20644 ) * fix: defaults not set in doc created via Onboarding Slide * fix: default company not set in Supplier	2020-02-20 12:57:21 +05:30
Anurag Mishra	51cf0eb159	fix: changed field type which was affecting filters (#20671 )	2020-02-20 12:52:56 +05:30
Saqib	ca7f53b4ea	chore: SINV set_status remove redundant function calls (#20660 ) * chore: SINV set_status remove redundant function calls * Update erpnext/accounts/doctype/sales_invoice/sales_invoice.py Co-Authored-By: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com> Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2020-02-20 12:32:05 +05:30
Saqib	cfe2db6d77	fix: mandatory on hold comment for purchase invoice (#20666 )	2020-02-20 12:29:44 +05:30
Mangesh-Khairnar	2d7e024f00	fix: use system language to translate strings (#20673 )	2020-02-20 12:24:29 +05:30
Saqib	56837bc09d	fix: check for available stock in product bundle's website warehouse (#20681 )	2020-02-20 12:23:08 +05:30
Deepesh Garg	cc56b690eb	Merge pull request #20582 from alyf-de/fix_datev fix(regional): update DATEV Export to DATEV-Format v7.0	2020-02-19 19:36:45 +05:30
Deepesh Garg	6870161292	Merge pull request #20669 from Alchez/dev-priority-issue fix: show priority in Issue list view	2020-02-19 19:28:23 +05:30
Deepesh Garg	23aa5c6332	Merge pull request #20643 from abhijitkumbharInd/develop fix: HSN/SAC Error while creating a new item and not selecting the fi…	2020-02-19 19:23:10 +05:30
Deepesh Garg	ad246a4415	Merge pull request #19856 from alyf-de/skr03_gnucash feat(accounts): add german CoA "SKR03" (GnuCash)	2020-02-19 19:21:51 +05:30
Deepesh Garg	40546d8af9	Merge pull request #20663 from marination/stock-settings-query fix: Set Query on warehouse fields in Stock Settings	2020-02-19 18:57:24 +05:30
Anurag Mishra	1a11cb5a07	test: syncing of odometer value	2020-02-19 16:46:00 +05:30
Rohan Bansal	e5b59c781f	fix: show priority in Issue list view	2020-02-19 13:13:24 +05:30
marination	120f75026f	fix: Server side validation for Warehouses	2020-02-19 11:17:58 +05:30
Deepesh Garg	5632712d00	Merge pull request #20634 from scmmishra/tree-fix-qms-dev fix: filters for quality_procedure tree	2020-02-19 09:41:18 +05:30
marination	bde13b98e0	fix: Set Query on warehouse fields in Stock Settings	2020-02-18 21:35:59 +05:30
Khushal Trivedi	8773dc3ffe	fix: student max gropu cannot be zero or less than zero	2020-02-18 19:37:21 +05:30
Deepesh Garg	0a6314ab92	Merge pull request #20659 from deepeshgarg007/plaid_fix_develop fix: Plaid fixes and enhancements	2020-02-18 18:09:01 +05:30
Deepesh Garg	16445305d5	fix: Styling and minor fixes	2020-02-18 18:04:09 +05:30
racitup	f2fb963986	Ignore codacy SQL injection warning (internal code only) and add copyright notice	2020-02-18 17:52:07 +05:30
racitup	805c3efa59	fix: manually added patch for bank reconciliatio fields since develop branch was in a different place	2020-02-18 17:51:47 +05:30
racitup	547a0bb909	fix: attempt at pymysql InternalError 1054 about clearance_date in field list when removing payments from bank transactions	2020-02-18 17:49:57 +05:30
racitup	719678957a	fix: Bank Reconciliation Bank Account and Bank Account No field names	2020-02-18 17:49:45 +05:30
racitup	3c5bb80b5a	fix: Plaid transaction import order, transaction_id duplicate check, added transaction category tags	2020-02-18 17:49:35 +05:30
racitup	9a47c3dc8c	fix: Plaid automatic_synchronization TypeError on filter & add info log message #20343	2020-02-18 17:49:20 +05:30
racitup	1548e20b78	fix: KeyError about bank_account_no due to non-existent field: #20343	2020-02-18 17:49:08 +05:30
racitup	7cda218af3	fix: pymysql.err.InternalError about t2.bank_account_no due to removal of field from Journal Entry Account table: #20343	2020-02-18 17:48:54 +05:30
Khushal Trivedi	3a196b09ee	Merge branch 'develop' of https://github.com/frappe/erpnext into develop	2020-02-18 17:48:18 +05:30
Deepesh Garg	33ad0dafcb	Merge pull request #20604 from AnilPise/develop fix: Parent Department filter while creating a new department	2020-02-18 17:44:51 +05:30
Deepesh Garg	0ce9e0cc1f	feat: Group by AR/AP report (#20573 ) * feat: Group by AR/AP report * fix: Do not consider total row in charts * fix: Subtotal row for last party	2020-02-18 16:07:34 +05:30
Deepesh Garg	ecba5c40bb	Merge pull request #20657 from anuradha-8/develop fix: date of birth cannot be greater than today on student application form	2020-02-18 14:10:47 +05:30
rohitwaghchaure	0abc181360	Merge pull request #20638 from nextchamp-saqib/pos-mode-of-pay-fix fix: disabled mode of payments fetches in sales invoices	2020-02-18 12:38:06 +05:30
rohitwaghchaure	15ca1181f8	Merge pull request #20654 from marination/precision-mr-item fix: Stock Quantity not calculated on client side in Material Request Items.	2020-02-18 12:34:16 +05:30
Deepesh Garg	15ff6a594b	feat: Inter warehouse stock transfer on valuation rate with taxation (#20083 ) * fix: Validation for target warehouse * feat: Get items on valuation rate in delivery note on Internal transfers * fix: Create Inter company purchase receipt from delivery note * feat: Inter company stock transfer on valuation rate with taxation * fix: Add from warehouse in purchase invoice * fix: Use get_value instead of get_cached_value * fix: Get incoming rate instead of valuation rate * fix: GL entry for from warehouse in purchase receipt * fix: GL Entries fixes in purchase invoice * fix: Address and tax fetching fixes * fix: Add test case for stock transfer via purchase receipt * fix: Code cleanup, added validations and test cases * fix: Validation for supplier warehouse * fix: Test Cases * fix: Change validation condition * fix: Address fixes while creating Purchase Receipt from delivery note * fix: Set taxes while creating Purchase Receipt from Delivery Note * fix: Update set_missing_value function Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-02-18 12:28:41 +05:30
Anuradha Kalaskar	93e8fc1833	fix: date of birth cannot be greater than today on student application form	2020-02-18 11:32:35 +05:30
Khushal Trivedi	1153de1965	Merge branch 'develop' of https://github.com/frappe/erpnext into develop	2020-02-18 11:16:53 +05:30
marination	e143983819	fix: Stock Quantity not calculated on client side in Material Request Items.	2020-02-18 10:51:54 +05:30
P-Froggy	3cb9f4ab73	Add address and contact fields to bank Address and contact fields are enabled for DocType Bank	2020-02-18 02:14:03 +01:00
P-Froggy	e4d8ee5ba8	Revert "Added bank account reference in supplier dashboard" This reverts commit `7ee8a20964`.	2020-02-18 01:05:19 +01:00
P-Froggy	4cc929cabb	Move SWIFT-number and branch-code from bank account to bank The bank's SWIFT-Number and branch-code should be a field in bank DocType, not in bank account DocType.	2020-02-18 00:38:46 +01:00
abhijitkumbharIND	0047fcf7ad	fix: HSN/SAC Error while creating a new item and not selecting the field. #20590	2020-02-17 18:12:58 +05:30
P-Froggy	7ccb8b6707	Revert "Merge pull request #1 from P-Froggy/patch-1" This reverts commit `79c5266d0d`, reversing changes made to `bd582cfc39`.	2020-02-17 11:33:10 +01:00
Marica	db00270895	feat: Added popup to 'Get Items from Open Material Requests' in Purchase Order (#20371 ) * feat: Added popup to 'Get Items from Open Material Requests' in Purchase Order * fix: Query with filters, UX enhancements and cleanup	2020-02-17 15:58:08 +05:30
indictrans	68fa65edd1	fix: Throw message	2020-02-17 14:55:56 +05:30
indictrans	a840889dd7	Merge branch 'develop' of https://github.com/frappe/erpnext into develop	2020-02-17 14:46:40 +05:30
thefalconx33	23e728612f	fix: disabled mode of payments fetches in sales invoices	2020-02-17 14:15:20 +05:30
Deepesh Garg	a6701aa7bc	Merge pull request #20569 from Er-Naren719/feat-user-table-columns-updated feat: columns under user table updated	2020-02-17 11:15:05 +05:30
Shivam Mishra	c14f49c079	fix: filters for quality_procedure tree	2020-02-17 11:12:28 +05:30
Deepesh Garg	5894c2d005	Merge pull request #20595 from anuradha-8/develop fix: to date cannot be less than from date validation on student leave application form	2020-02-17 10:57:29 +05:30
Deepesh Garg	fd182b80ac	Merge pull request #20616 from Darpan245/develop fix: Mandatory field property failed to work based on the selection of…	2020-02-17 10:35:56 +05:30
P-Froggy	7ee8a20964	Added bank account reference in supplier dashboard	2020-02-17 00:15:29 +01:00
P-Froggy	ab92e330da	Fix: Wrong filter for supplier default bank account The query for default bank account field in the supplier master only allowed company bank accounts. With this fix it's now possible to one of the supplier bank accounts as default bank account.	2020-02-16 23:08:32 +01:00
P-Froggy	b3712158ae	Bank accounts reference in supplier dashboard Adds a reference to linked bank accounts in supplier dashboard, which was previously missing.	2020-02-16 19:10:53 +01:00
indictrans	ad5da823e1	fix:Future date of birth accepted at Sibling Detail section in Student form #20619	2020-02-16 22:59:41 +05:30
shrikant dixit	e329d417d6	fix: Added validation for student DOB can not be greater than Joining Date	2020-02-15 18:20:05 +05:30
indictrans	1118ee07a8	fix:Future date of birth accepted at Sibling Detail section in Student form #20619	2020-02-15 17:37:39 +05:30
jsukrut	c0fd30a7ec	fix: Indentation	2020-02-15 17:33:52 +05:30
jsukrut	c3a23ddbe3	fix: restricted duplicate courses on Program Enrollment doctype (#20611 )	2020-02-15 16:39:51 +05:30
Yugandhara	ce1f6a73e2	fix: Changes done to get valid sales order list on production plan form(#20609 )	2020-02-15 16:31:53 +05:30
jsukrut	3a6ca13b44	fix:Mandatory field property failed to work based on the selection of field 'Group Based on' on 'Student Group' Page #20605	2020-02-15 16:18:17 +05:30
Yugandhara	e997168a23	fix: unused variable cdn removed	2020-02-15 16:14:46 +05:30
Yugandhara	af2b39891e	fix: Changes done to get valid sales order list on sales order child table of production plan	2020-02-15 16:01:41 +05:30
anil pise	7c474130ea	fix: Removed Missing semicolon and Mixed spaces and tabs and Trailing spaces not allowed.	2020-02-15 15:58:57 +05:30
Khushal Trivedi	dc39b4ba13	fix: validation on max group strength student group form	2020-02-15 15:38:16 +05:30
anil pise	21b1a00f61	Fix:Child account which is not a group account is treating as Parent Account while creating New Department. #20599	2020-02-15 15:23:15 +05:30
pratik.m	c224cf761f	fix: restricted duplicate topics on Course doctype (#20594 )	2020-02-15 13:22:17 +05:30
Anuradha Kalaskar	21d662f96d	fix: to date cannot be less than from date validation on student leave application	2020-02-15 13:17:57 +05:30
Yugandhara	ad645afeb2	fix: Changes done to get valid customer and employee list on payment entry form	2020-02-15 10:56:41 +05:30
Raffael Meyer	772394b95a	fix header	2020-02-13 20:58:59 +01:00
Raffael Meyer	54717fa993	update cloumn names	2020-02-13 20:58:44 +01:00
Raffael Meyer	3bacdf1f4b	quote format name	2020-02-13 20:40:15 +01:00
Raffael Meyer	96b66dfae6	update TRANSACTION_COLUMNS according to "DATEV Format v7.0"	2020-02-13 20:37:37 +01:00
Raffael Meyer	b555ed0cba	update header accoding to "DATEV Format v7.0"	2020-02-13 20:05:27 +01:00
Raffael Meyer	8818850174	consutant number and client number are mandatory	2020-02-13 17:13:15 +01:00
Raffael Meyer	46cf20825b	generated on is datetime, not date	2020-02-13 17:09:22 +01:00
Raffael Meyer	0070805bbb	add format version (data type)	2020-02-13 17:06:06 +01:00
Raffael Meyer	7d2777870e	bump version number	2020-02-13 17:05:37 +01:00
Raffael Meyer	4fb897728b	EXTF must be in quotes	2020-02-13 17:02:01 +01:00
rohitwaghchaure	c2c12dc82f	Merge pull request #20572 from abhijitkumbharInd/develop Production Plan \| Get items from Sales Order not fetching grand total value	2020-02-13 10:09:24 +05:30
Raffael Meyer	0fac1f9429	Add groups for account types "Bank" and "Cash"	2020-02-12 13:59:48 +01:00
Raffael Meyer	cad404c355	Merge branch 'develop' into skr03_gnucash	2020-02-12 13:58:53 +01:00
Himanshu Mishra	b76d2d4d98	Fix: Syntax error in `get_child_warehouses`	2020-02-12 13:22:05 +05:30
rohitwaghchaure	490b843ecf	Merge branch 'develop' into fixed_purchase_receipt_time_out_error_develop	2020-02-11 19:56:11 +05:30
rohitwaghchaure	3d98c59585	Merge pull request #20555 from ashish-greycube/fix_actual_qty_for_backflush fix: backflush raw material based on - Material Transferred for Manufacture	2020-02-11 19:50:36 +05:30
abhijitkumbharIND	a67ae3ad31	fix: Production Plan \| Get items from Sales Order not fetching grand total value. #20568	2020-02-11 16:45:59 +05:30
Rucha Mahabal	ba740ff558	feat: show linked Sales Invoice in Patient Appointment after booking	2020-02-11 16:27:22 +05:30
Er-Naren719	94e14257fb	feat: column width increased for view attachments field (#314 )	2020-02-11 15:21:48 +05:30
Deepesh Garg	65a53ba86c	Merge pull request #20565 from vishdha/filter_serial_based_on_batch_v13 fix: filter serial no based on batch no	2020-02-11 13:45:21 +05:30
Deepesh Garg	93b98774e7	Merge pull request #20519 from ahmad18189/patch-3 automatic booking of asset depreciation fix	2020-02-11 13:44:29 +05:30
Rucha Mahabal	4dd6f0ae9b	fix: non-empty service unit set as empty after booking appointment	2020-02-11 13:39:18 +05:30
vishal	998de83d48	fix: filter serial no based on batch no	2020-02-11 12:24:44 +05:30
Deepesh Garg	97669e975d	fix: Update condition	2020-02-11 10:18:39 +05:30
Deepesh Garg	c688f9f584	Merge pull request #20559 from rohitwaghchaure/added_indexing_on_columns_to_fix_performance_issue_develop fix: added indexing on columns to fix performace issue	2020-02-11 10:12:49 +05:30
Deepesh Garg	9462ba6559	feat: Group by item wise sales register (#20251 ) * fix: Group by sales register report * fix: Remove group-by item * fix: Grand total query fix * fix: Remove debug param * fix: Code cleanup and commonification * fix: Add group by functionality to purchase register * fix: Changes in total row display * fix: Minor fixes * fix: Add total row * fix: Do not calculate total for rate	2020-02-10 17:59:17 +05:30
Rohit Waghchaure	50886f02c3	fix: added indexing on columns to fix performace issue	2020-02-10 15:56:56 +05:30
Rohit Waghchaure	e55a927eee	fix: test cases	2020-02-10 14:39:26 +05:30
Deepesh Garg	930e61d6e3	Merge pull request #20549 from nextchamp-saqib/so-update-items-warehouse-fix fix: mandatory warehouse wrror while updating items after submission	2020-02-10 12:09:11 +05:30
ashish-greycube	121636f9bf	fix: backflush raw material based on - Material Transferred for Manufacture	2020-02-10 10:49:50 +05:30
Rucha Mahabal	cf3c8174f6	Merge branch 'develop' into fix_regional_data	2020-02-10 00:40:21 +05:30
Rucha Mahabal	8334a3a1fd	fix: patch for creating irs_1099 custom field (United States)	2020-02-10 00:34:09 +05:30
rohitwaghchaure	7d2c8cffb0	fix: pricing rule not working on item groups (#20547 ) Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>	2020-02-09 21:23:53 +05:30
thefalconx33	9225159d8c	fix: mandatory warehouse wrror while updating items after submission	2020-02-09 12:19:03 +05:30
Rohit Waghchaure	f0d27528e3	fix: time out error while submitting the purchase receipt which has more than 100 serial nos	2020-02-07 14:42:33 +05:30
Deepesh Garg	ed5c05b0f7	Merge pull request #20533 from rohitwaghchaure/procurement_tracker_not_working_for_special_char_company_name fix: Procurement Tracker report not working	2020-02-07 10:43:11 +05:30
Rohan Bansal	d64f92cf99	fix: show WFH in monthly attendance sheet report	2020-02-06 17:30:57 +05:30
Rohit Waghchaure	07f3312804	fix: Procurement Tracker report not working	2020-02-06 14:34:11 +05:30
Deepesh Garg	eeb4c3629c	Merge pull request #20529 from nextchamp-saqib/mv-fix-develop fix: typo; serial no doesn't have amc start date	2020-02-06 13:56:10 +05:30
Deepesh Garg	cf8e2732c9	Merge pull request #20428 from 0Pranav/territory-sales-pipeline feat: add territory wise sales report	2020-02-06 13:11:07 +05:30
thefalconx33	fcae88a514	fix: typo; serial no doesn't have amc start date	2020-02-06 13:00:47 +05:30
Deepesh Garg	da406d74ef	fix: Remove debug param	2020-02-06 12:55:21 +05:30
Deepesh Garg	a4928f6f5b	fix: Add report link in module view and fix date filter	2020-02-06 12:50:25 +05:30
Parth J. Kharwar	830b316543	fix: full day leaves not tagged as half day in attendance (#20487 ) * fix: full day leaves not tagged as half day in attendance * chore: code cleanup for half day date value set	2020-02-05 15:01:13 +05:30
0Pranav	9d9a3d85d8	fix: filters after rename	2020-02-05 14:17:21 +05:30
Anurag Mishra	eacc1bc2dc	fix: requested changes	2020-02-05 12:45:43 +05:30
Deepesh Garg	30e766b228	fix: SQL query in financial statements	2020-02-05 12:12:47 +05:30
Ahmad M Abdelrahman	41e7163476	automatic booking of asset depreciation fix Stop Automatic deprecation is not working	2020-02-05 08:33:53 +02:00
Rucha Mahabal	50b67792ca	fix: remove check availability button from form	2020-02-03 23:45:14 +05:30
Rucha Mahabal	513b443861	fix: make check availability as the primary action button	2020-02-03 23:42:21 +05:30
Rucha Mahabal	4d9d51d91c	fix: get prescribed procedures button not working	2020-02-03 22:29:32 +05:30
Rucha Mahabal	217e1b41fb	refactor: Appointment Type, add dashboard	2020-02-03 21:55:52 +05:30
Rucha Mahabal	6ffdbcbcd7	feat: show Patient Appointment status in List View	2020-02-03 21:23:02 +05:30
Deepesh Garg	d8e57d3d5a	fix: Unable to submit landed cost voucher (#20493 ) * fix: Unable to submit landed cost voucher * fix: Test case for multiple landed cost voucher against a Purchase receipt * fix: Test Case	2020-02-03 18:53:34 +05:30
Anurag Mishra	1f6cc2b6ec	feat: appointment Letter (#20104 ) * feat: appointment Letter * fix: requested changes Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-02-03 17:52:42 +05:30
Pranav Nachnekar	6c14a08631	fix: disallow quick entry for doctypes with tree view (#20452 )	2020-02-03 17:05:26 +05:30
rohitwaghchaure	716a85d81a	Merge pull request #20485 from rohitwaghchaure/source_warehouse_for_the_work_order feat: added source warehouse field in the work order	2020-02-03 16:32:19 +05:30
Himanshu	10b3b79c0f	fix(Report): query report for Quality Action (#20424 ) * fix: query report for QA * fix: add QM permission * fix: add QM permission	2020-02-03 16:16:49 +05:30
Deepesh Garg	9e1fbaf59e	fix: Label and UX fixes while creating payment entry against customer (#20465 ) * fix: Label and UX fixes while creating payment entry against customer * fix: filter	2020-02-03 15:58:50 +05:30
Saqib	4fca6cae34	feat: add tax category in pos profile (#20413 ) * feat: add tax category in pos profile * fix: review fixes	2020-02-03 15:53:27 +05:30
Deepesh Garg	589f2cd16c	fix: Get only specified company accounts in financial statements (#20486 )	2020-02-03 15:49:24 +05:30
Saqib	5e6ce88c78	fix: gst permission for gst settings & hsn code (#20500 ) * fix: gst permission for gst settings & hsn code * Fix: typo Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2020-02-03 15:40:35 +05:30
Frappe PR Bot	ba0712a429	feat: Updated translation (#20490 )	2020-02-03 14:58:03 +05:30
Frappe PR Bot	1478282920	feat: Updated translation (#20499 )	2020-02-03 14:57:43 +05:30
0Pranav	9c4399e1f2	fix: better syntax for checking empty arrays	2020-02-03 14:57:42 +05:30
Deepesh Garg	943de261bb	Merge pull request #20505 from deepeshgarg007/button_shift fix: Move E-Way bill button under create	2020-02-03 14:50:54 +05:30
Rucha Mahabal	b010988033	feat: add dashboards to Healthcare Masters	2020-02-02 23:22:02 +05:30
Rucha Mahabal	0a35b2207e	refactor: Healthcare masters	2020-02-02 23:21:18 +05:30
Deepesh Garg	cce3ac9f79	fix: Move E-Way bill button under create	2020-02-02 21:25:58 +05:30
Deepesh Garg	c3f28db5b7	Merge pull request #20475 from ParthKharwar/dev-work-from-home-application feat: request for work from home marked in attendance	2020-02-01 19:06:40 +05:30
Parth Kharwar	823964f3a6	fix: test added to check work from home application	2020-01-31 14:30:38 +05:30
rohitwaghchaure	ffa74ad5c1	Merge pull request #20478 from deepeshgarg007/finance-book-filter-new fix: Do not show any finance book record if no finance book filter is applied	2020-01-31 13:19:16 +05:30
Rohit Waghchaure	adbe291498	feat: added source warehouse field in the work order	2020-01-31 13:09:06 +05:30
Rucha Mahabal	d089029bb4	fix: disabled practitioner schedule shown as enabled in list view	2020-01-31 12:32:42 +05:30
Deepesh Garg	34c33baa82	fix: Cash flow filter fix	2020-01-31 11:16:30 +05:30
0Pranav	b1473c3de0	fix: return empty array	2020-01-31 10:43:00 +05:30
0Pranav	75adb808e5	various fixes from review - Rename the report to title case - Added company filter - fixed checks in filter and += operator for total	2020-01-31 10:35:47 +05:30
Deepesh Garg	ba44f28202	fix: Filtering fixes in financial statement	2020-01-31 09:08:29 +05:30
Deepesh Garg	ce04526db8	fix: Do not show any finance book record if no finance book filter is applied	2020-01-30 15:33:51 +05:30
Suraj Shetty	0860865763	Merge branch 'develop' into fix-incorrect-translations	2020-01-30 15:12:33 +05:30
Parth Kharwar	5342c846d2	feat: request for work from home marked in attendance	2020-01-30 13:12:56 +05:30
Faris Ansari	8e131c7cad	fix: Remove translated strings from test	2020-01-30 13:03:05 +05:30
Parth Kharwar	2bccd7f717	fix: rename breadcrumb for Brand DocType from Selling to Stock	2020-01-30 12:12:42 +05:30
Suraj Shetty	082020184a	Merge branch 'develop' of https://github.com/frappe/erpnext into fix-incorrect-translations	2020-01-30 10:46:11 +05:30
Raffael Meyer	e21cd5e7f1	fix: account number for "Kasse"	2020-01-29 23:39:55 +01:00
Raffael Meyer	3716434218	fix: add missing account types	2020-01-29 22:21:19 +01:00
Rucha Mahabal	be29a24de5	refactor: Patient master	2020-01-29 22:22:39 +05:30
Deepesh Garg	d89fbc56d9	Merge pull request #20464 from Alchez/dev-wfh feat(hr): add work from home option in status	2020-01-29 20:12:40 +05:30
Diksha	480d52c6f3	feat(attendance): add work from home option in status	2020-01-29 17:46:27 +05:30
Suraj Shetty	da2c69e836	fix(translations): Incorrect syntax	2020-01-29 15:34:06 +05:30
Suraj Shetty	2f67647f7b	Merge branch 'develop' of https://github.com/frappe/erpnext into fix-incorrect-translations	2020-01-29 15:06:50 +05:30
Suraj Shetty	48e9bc3fc9	fix: Incorrect translation syntax	2020-01-29 15:06:18 +05:30
Pranav Nachnekar	d64135b2d2	fix: linking party in calendar event of appointment (#20458 )	2020-01-29 13:01:25 +05:30
Rucha Mahabal	a4202d1660	fix: disabled patient shown as enabled	2020-01-29 11:33:29 +05:30
Deepesh Garg	47ba65edc0	Merge pull request #20459 from 0Pranav/fix-supplier-quotation-button fix: missing plus button in request for quotaion for supplier quotation	2020-01-29 10:46:21 +05:30
Deepesh Garg	565a810bf7	Merge pull request #20454 from marination/stock-ledger-qty-column fix: 'In Qty' and 'Out Qty' columns in Report Stock Ledger	2020-01-29 09:49:55 +05:30
Deepesh Garg	b61b8d7ced	fix: Remove comma	2020-01-29 09:49:26 +05:30
0Pranav	d4c0184f3f	fix: missing plus button in request for quotaion for supplier quotation	2020-01-29 09:32:40 +05:30
Deepesh Garg	217517a61f	Merge pull request #20455 from toxnico/develop fix: french translation correction	2020-01-29 08:39:38 +05:30
Rucha Mahabal	c7417c08ed	refactor: Healthcare Settings	2020-01-28 18:06:23 +05:30
Pranav Nachnekar	c1312700e8	feat: create appoitnemnt against customer (#20457 )	2020-01-28 17:50:47 +05:30
Nicolas Simonnet	10ffaf4e89	french translation correction	2020-01-28 11:45:57 +01:00
marination	372c5e51d5	fix: 'In Qty' and 'Out Qty' columns in Report Stock Ledger	2020-01-28 16:04:49 +05:30
rohitwaghchaure	da9a3936e1	fix: incorrect work order qty for sub assembly items (#20449 )	2020-01-28 14:34:27 +05:30
Nabin Hait	2bb3a62b1a	fix: cannot complete task if dependent task are not completed / cancelled (#20437 )	2020-01-28 14:08:53 +05:30
Anurag Mishra	3496104ebe	fix: odometer value was not syncing properly	2020-01-28 13:11:49 +05:30
Deepesh Garg	cd8d667861	fix: Parent company defaulting on creation of new company (#20422 ) * fix: Parent company defaulting on creation of new company * fix: Test Cases * fix: Test Cases * fix: Test Cases for staffing plan	2020-01-28 12:54:45 +05:30
Pranav Nachnekar	3fb48ebf61	fix: discounting not applied on sales invoice created by subscriptions (#20431 )	2020-01-28 12:52:13 +05:30
Marica	4e7625bd8f	fix: Column 'project' in where clause is ambiguous (#20438 ) * fix: Column 'project' in where clause is ambiguous * fix: Fixed alias in query	2020-01-28 12:43:38 +05:30
Deepesh Garg	0c31d62edd	Merge pull request #20447 from Alchez/dev-driver-address-fetch fix: only fetch driver address if not set (develop)	2020-01-28 09:20:26 +05:30
Don-Leopardo	f6d5073832	Merge branch 'develop' into fix_sqlinjection_develop	2020-01-27 13:56:01 -03:00
rohitwaghchaure	7fda3a12cc	Merge pull request #20445 from rohitwaghchaure/copy_to_warehouse_to_target_warehouse_in_delivery_note_item fix: to warehouse not set in the customer warehouse	2020-01-27 19:29:19 +05:30
Rohan Bansal	ce17a546b9	fix: only fetch driver address if not set	2020-01-27 18:08:11 +05:30
Rohit Waghchaure	2dff28498f	fix: to warehouse not set in the customer warehouse	2020-01-27 17:56:25 +05:30
NahuelOperto	be1895fd08	Fix sql injection	2020-01-27 09:02:02 -03:00
Saqib	e009187e02	refac: filters and columns of fixed asset register report (#20332 )	2020-01-27 16:05:55 +05:30
Parth J. Kharwar	011c13b3cc	fix: employee checkin doctype time permissions (#20403 )	2020-01-27 16:03:24 +05:30
Shivam Mishra	149b4e5985	chore: warn bom naming conflict (#20244 ) Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2020-01-27 15:20:30 +05:30
Deepesh Garg	ef41a0eda5	fix: Finance book filtering in financial statements (#20410 ) * fix: Finance book filtering in financial statements * fix: Use IS NULL instead of ifnull	2020-01-27 15:18:51 +05:30
Saqib	9cb02bf2e1	fix: incorrect status for fraction of outstanding amount (#20369 )	2020-01-27 14:22:43 +05:30
Himanshu Warekar	e169d2964c	fix: change fieldtype to Text	2020-01-24 17:40:29 +05:30
Saqib	9291df4d4c	fix: wrong outstanding invoices fetched against employee (#20373 )	2020-01-24 16:22:49 +05:30
Anurag Mishra	ce00f6cf70	fix: Duplicate Attendance Due Wrong Date format (#20390 )	2020-01-24 16:14:50 +05:30
Rucha Mahabal	0a27c98a99	fix(Healthcare): disabled Lab Test Template shown as Enabled in List View (#20378 ) * fix (Healthcare): disabled Lab Test Template shown as enabled in List View * fix: remove custom disabled button and unhide disabled field	2020-01-24 16:12:08 +05:30
Marica	40dffab79e	fix: Product Page non-stock item status (#20383 )	2020-01-24 15:52:27 +05:30
Rucha Mahabal	72c3dd1d11	fix: healthcare settings registration fee NoneType error (#20395 )	2020-01-24 15:50:44 +05:30
Frappe PR Bot	84afdfdb4c	feat: Updated translation (#20404 )	2020-01-24 14:21:53 +05:30
rohitwaghchaure	573de02f60	Merge pull request #20398 from rohitwaghchaure/fixed_serial_no_button_not_working_develop fix: add serial no button not working	2020-01-24 13:49:41 +05:30
Deepesh Garg	60e8d52f32	Merge pull request #20401 from deepeshgarg007/general_ledger_sort fix: Order GL entries by creation time in General ledger	2020-01-24 13:19:39 +05:30
Deepesh Garg	1e77a1374d	Merge pull request #20393 from rohitwaghchaure/unlink_reference_name_from_batch_on_cancel_of_stock_transactions_develop fix: unlink references from batch on cancellation of stock transactions	2020-01-23 22:40:26 +05:30
Rohit Waghchaure	8996b7d8a4	delete the auto created batch	2020-01-23 17:44:19 +05:30
deepeshgarg007	fdba26d476	fix: Order GL entries by creation time in General ledger	2020-01-23 17:42:57 +05:30
Rohit Waghchaure	067e8ad50d	fix: add serial no button not working	2020-01-23 15:49:39 +05:30
Deepesh Garg	f2d3bd71c9	Merge pull request #20356 from abhijitkumbharInd/develop fix: Gives a 404 error when clicked on the Download Required Material…	2020-01-23 15:45:42 +05:30
Deepesh Garg	1d279c30bb	Merge pull request #20386 from rohitwaghchaure/fixed_lead_date_comparision_issue_develop fix: lead date comparison issue	2020-01-23 15:22:53 +05:30
Deepesh Garg	b83f5cee6c	Merge pull request #20388 from rohitwaghchaure/lead_showing_two_times_in_the_report_develop fix: lead details duplicate entries	2020-01-23 15:20:47 +05:30
Deepesh Garg	32be74e40d	Merge pull request #20381 from nextchamp-saqib/small-fix-asset fix: tuple index out of range error	2020-01-23 15:03:00 +05:30
Rohit Waghchaure	4f4dbf1996	fix: unlink references from batch on cacnellation of stock transactions	2020-01-23 12:45:45 +05:30
Rohit Waghchaure	0251e33f31	fix: lead details duplicate entries	2020-01-22 16:59:36 +05:30
Rohit Waghchaure	7b8e1e0891	fix: lead date comparison issue	2020-01-22 16:36:14 +05:30
thefalconx33	e7154f155b	fix: tuple index out of range error	2020-01-22 12:22:55 +05:30
Rohit Waghchaure	0cc4cf2cf5	fix: Zero division error while making finished good entry against the work order	2020-01-21 19:28:08 +05:30
abhijitkumbharIND	0eb6f06685	fix: Gives a 404 error when clicked on the Download Required Material button while the form is not saved (#20355 )	2020-01-21 19:16:32 +05:30
abhijitkumbharIND	b2f08a7a42	fix: Gives a 404 error when clicked on the Download Required Material button while the form is not saved (#20355 )	2020-01-21 19:16:32 +05:30
byugandhara	239f0d529e	Fix: Spelling correction in throw message of stock entry(#20337 ) (#20353 )	2020-01-21 15:47:27 +05:30
rohitwaghchaure	5056c8bcb4	fix: not able to import chart of account if parent account is missing (#20368 )	2020-01-21 15:32:26 +05:30
Saqib	eea0ffcb38	fix: account not added to child company (#20361 )	2020-01-21 15:25:51 +05:30
Nabin Hait	50cb49cb00	fix: Don't fetch price list rate on change of qty (#20363 )	2020-01-21 13:04:21 +05:30
KanchanChauhan	a7d1985b5f	fix: Set Quotation expired if not Ordered or Lost (#20354 ) Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>	2020-01-21 12:35:11 +05:30
Anurag Mishra	85e5ba9698	Merge branch 'develop' into fix-remaining-leave-balance-calculation	2020-01-20 19:41:33 +05:30
Mangesh-Khairnar	2892a3b067	fix: nonetype issue in the total leaves calculation	2020-01-20 18:02:23 +05:30
rohitwaghchaure	6ae61a1693	fix: incorrect number of gl entries issue (#20352 )	2020-01-20 17:53:19 +05:30
Marica	7653a8b9fa	fix: 'get_additonal_costs' is not defined (#20344 ) * fix: 'get_additonal_costs' is not defined * fix: Re-added get_items on Work order change.	2020-01-20 15:46:36 +05:30
Nabin Hait	03b116dd01	fix: deprecated fetching item price based on min_qty (#20347 )	2020-01-20 15:45:04 +05:30
Himanshu Warekar	7be9120730	fix: remove email_append_to from hooks	2020-01-19 15:05:26 +05:30
Himanshu Warekar	303f085499	Merge branch 'develop' of https://github.com/frappe/erpnext into custom_append_to	2020-01-19 11:45:24 +05:30
Mangesh-Khairnar	2ac8473abf	fix: calculate remaining leave balance	2020-01-17 22:46:26 +05:30
Nabin Hait	444156184c	fix: Plaid TypeError in add_bank_accounts (#20335 )	2020-01-17 15:57:48 +05:30
Jigar Tarpara	f5374c182e	Bug Fix (#20330 ) * Bug Fix auto_close_after_days field is in Selling Settings * fix: close_opportunity_after_days field is in selling settings Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-01-17 11:54:25 +05:30
Parth Kharwar	0a581c096b	chore: changed employee contact field name	2020-01-17 11:50:35 +05:30
Rohan	ef734ee850	fix: handle default value for batch size in BOM operation (#20328 )	2020-01-17 11:45:54 +05:30
Vishal Dhayagude	2ae87876b6	fix: salary structure assignment filter employee based on company (#20318 ) * fix: pick company from employee salary structure * fix: Salary structure assignment fetch company from enmployee * Revert "fix: Salary structure assignment fetch company from enmployee" This reverts commit ab2da691c79646d6d095f347ea3e273f466ee34f. * fix: Salary structure assignment fetch company from enmployee * fix: filter on company for salary structure assignment * fix: minor changes * fix: minor changes * fix: added company to salary strucutre assignment	2020-01-17 11:44:11 +05:30
Himanshu	e3afe8a73c	fix: don't hide primary_address_and_contact_detail (#20322 )	2020-01-16 13:39:29 +05:30
Saqib	bcb6130bbe	fix: hide total amount field from journal entry PF (#20324 )	2020-01-16 13:38:43 +05:30
Nabin Hait	e321fbb0d5	fix: Multiple fixes based on testing on pre-release branch (#20301 ) * fix: Multiple fixes based on testing on pre-release branch * fix: reload hr settings	2020-01-16 13:37:25 +05:30
rohitwaghchaure	3cbb4cbad9	Merge pull request #20315 from PawanMeh/fix_20314 fix: Italian invoicing supplier name issues	2020-01-16 11:43:14 +05:30
rohitwaghchaure	d821c58a5e	fix: capacity planning validation (#20317 )	2020-01-16 11:29:08 +05:30
Pawan Mehta	687cbc7c0c	fix: #20314	2020-01-15 23:44:36 +05:30
Vishal Dhayagude	654d785776	fix: Delivery note not able to create sales return (#20264 )	2020-01-15 19:28:58 +05:30
Marica	9f6c95549a	fix: Applied query on PO Supplier popup field in Material Request. (#20231 )	2020-01-15 19:24:28 +05:30
Marica	4e6b3ada0f	fix: Missing argument in status updater (#20281 )	2020-01-15 19:22:35 +05:30
Saqib	b0b179f1b7	fix: make jv depreciations only if calculate depr is checked (#20282 )	2020-01-15 19:05:35 +05:30
Wolfram Schmidt	a346469e0c	Update de.csv (#20292 ) Missing translation	2020-01-15 19:04:39 +05:30
sahil28297	32d643ed3c	fix(patch): reload tax category (#20308 )	2020-01-15 18:57:54 +05:30
sahil28297	596a072d5f	fix(patch): do not append taxes to template if account name is not set (#20312 )	2020-01-15 18:56:36 +05:30
Saqib	617a24191f	fix: get existing payment req amount only from unpaid req (#20289 )	2020-01-15 16:36:13 +05:30
rohitwaghchaure	61ad6292d6	fix: incorrect number of GL Entries error in stock entry (#20299 )	2020-01-15 16:35:31 +05:30
Suraj Shetty	71ed1d42e2	Merge branch 'develop' into cancel_frappe_1	2020-01-15 11:22:44 +05:30
Shivam Mishra	a59c2ce17a	fix: profit and loss indicator bug	2020-01-14 17:55:49 +05:30
Shivam Mishra	748c3d9e8b	feat: update profit and loss for new report summary API	2020-01-14 17:31:19 +05:30
0Pranav	6280609c25	enhancement: add territory wise sales report	2020-01-14 15:53:35 +05:30
Suraj Shetty	080d136fd7	fix: Improper escaping (#20248 ) * fix: Improper escaping issue was introduced in https://github.com/frappe/erpnext/pull/20202 * fix: missing closing parentheses * style: trim unwanted spaces Co-authored-by: Pranav Nachnekar <prnvnachnekar@gmail.com>	2020-01-14 12:55:03 +05:30
rohitwaghchaure	7894caf397	Merge pull request #20276 from rohitwaghchaure/fixed_report_stock_and_account_value_comparison fix: filter issue for the stock and account value comparison report	2020-01-14 12:18:39 +05:30
Rohit Waghchaure	9650c25429	fix: filter issue for the stock and account value comparision report	2020-01-14 12:12:54 +05:30
Saqib	1218160c70	fix: payment entry can be created against on hold PI (#20270 )	2020-01-14 12:07:24 +05:30
Deepesh Garg	7420fccbee	Merge pull request #20269 from rohitwaghchaure/fixed_delivery_date_not_able_to_change_after_submit fix: allow on submit for the delivery date field	2020-01-14 10:00:10 +05:30
Saqib	b8bcad5850	fix: gl not generated on manual asset creation (#20265 )	2020-01-13 18:17:05 +05:30
Himanshu Warekar	c9f497d7c0	feat: move subject and sender fields to json	2020-01-13 16:26:40 +05:30
Himanshu Warekar	e5692e035a	Merge branch 'develop' of https://github.com/frappe/erpnext into custom_append_to	2020-01-13 15:17:32 +05:30
Deepesh Garg	2d151a7b85	fix: Remove patch to set automatic tax fetching from item tax template (#20234 )	2020-01-13 15:09:27 +05:30
Suraj Shetty	06ed72a859	Merge branch 'develop' into cancel_frappe_1	2020-01-13 15:08:23 +05:30
Deepesh Garg	70a58d333b	Merge pull request #20245 from nextchamp-saqib/asset-cancel-fix fix: auto cancel if movement exists	2020-01-13 14:44:45 +05:30
Deepesh Garg	16b8673554	Merge pull request #20257 from nextchamp-saqib/revery-jv-fix fix: remove default customer as party type	2020-01-13 13:48:55 +05:30
vishal	dcef798be7	fix: minor changes	2020-01-13 12:59:52 +05:30
vishal	1dd289450f	fix: docstring for auto cancel	2020-01-13 12:59:18 +05:30
vishal	eef05758b6	feat: Added docinfo for auto cancel exempt doctypes	2020-01-13 12:59:18 +05:30
vishal	70148a6748	feat: docstring added for auto cancel exempt doctypes	2020-01-13 12:59:12 +05:30
thefalconx33	f04d054faa	fix: remove default customer as party type	2020-01-13 12:43:49 +05:30
Rohit Waghchaure	ecdfc1a15c	fix: allow on submit for the delivery date field	2020-01-13 12:43:26 +05:30
thefalconx33	1e7a127dfa	fix: auto cancel if movement exists	2020-01-11 14:19:02 +05:30
deepeshgarg007	00746306a3	fix: Item tax template fetching from HSN Code	2020-01-10 15:01:50 +05:30
gavin	12568e4f07	Merge pull request #19514 from gavindsouza/rename-doc-fix fix: frappe.rename_doc update	2020-01-09 15:07:05 +05:30
rohitwaghchaure	d4d7d211ea	feat: report to show difference between stock and account value (#20186 )	2020-01-09 15:05:05 +05:30
Suraj Shetty	000ac0068b	Merge branch 'develop' into rename-doc-fix	2020-01-09 13:46:08 +05:30
Marica	287f491f7b	fix: Employee name in Report trial balance for party (#20223 ) * fix: Employee name in Report trial balance for party * fix: Add account filter in trial balance for party report Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2020-01-09 13:35:06 +05:30
Pranav Nachnekar	1612432f45	fix: parent item should not appear in raw material request dialog (#20216 )	2020-01-09 13:32:15 +05:30
Don-Leopardo	ccdf19314d	fix: min_qty and valid_from for the price selection (#20217 )	2020-01-09 12:24:43 +05:30
Pranav Nachnekar	229e5398b5	fix: escape % in customer name (#20202 )	2020-01-09 12:21:26 +05:30
Marica	c72de6edaa	fix: Added description and title to supplier selection popup in Material Request. (#20179 )	2020-01-07 13:06:08 +05:30
Vishal Dhayagude	7ae11005c4	fix: UX improvement. move trigger on fieldname restrict_backdated_leave_application (#20211 )	2020-01-07 13:02:13 +05:30
Vishal Dhayagude	6b316cd7cb	feat: Backdated leave application (#20201 ) * fix: only HR Managers can make backdated leave applications * fix (leave application): error message changed and user check modified * fix: Move hardcoded logic to HR Settings * fix: added role as mandetory field on check restict field * fix: minor changes	2020-01-07 11:48:38 +05:30
Wolfram Schmidt	aab96b7fbf	Update de.csv (#20205 ) changed translation of "leave/-s" to "Urlaub/Urlaubstage" instead of "Blätter" (Blätter is leaves as in tree or sheet as in paper)	2020-01-07 11:37:08 +05:30
sahil28297	88737e38f2	fix(item_tax_template): fetch parent account if not set (#20198 )	2020-01-07 11:30:22 +05:30
Pranav Nachnekar	971458043d	fix: add new delivery note button in Sales Order (#20199 ) * fix: add new delivery note button in Sales Order * fix: removed debugger Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-01-07 11:29:35 +05:30
Rohan	7c8aaba449	fix: integer UOM check in transactions (#20176 )	2020-01-07 11:23:53 +05:30
Deepesh Garg	ef0d26c161	feat: Validity for Item taxes (#20135 ) * feat: Validity for Item taxes * fix: Trigger for gst hsn code * fix: Sort taxes based on validity * fix: Validation for item tax template and filters based on validity * fix: Add missing semicolon * fix: Validate tax template only if item code available * fix: Do not validate or filter item tax template if no item taxes applied * fix: Consider item group for validating taxes * fix: Test cases for item tax validation * fix: Item tax template filtering fixes * fix: Add missing semicolon * fix: Remove unnecessary query	2020-01-06 15:34:15 +05:30
rohitwaghchaure	b5f91bea90	Merge pull request #20195 from rohitwaghchaure/fixed_party_type_in_payment_request fix: incorrect party type in payment request	2020-01-06 15:16:42 +05:30
Rohit Waghchaure	8641f9ce77	fix: party type in payment request	2020-01-06 15:07:06 +05:30
rohitwaghchaure	055012a7fb	Merge pull request #20170 from nabinhait/inter-company-serial-no-outgoing-rate fix: Get outgoing rate of serial no from SLE if serial no already transferred to another company	2020-01-06 12:07:53 +05:30
rohitwaghchaure	fe2afc643e	fix: incorrect valuation rate for finished good entry (#20165 )	2020-01-06 11:51:43 +05:30
Deepesh Garg	92f3149a64	Merge pull request #20185 from mujeerhashmi/fee-write-off feat: Allow write-off for Fees doctype in journal entry.	2020-01-06 08:09:16 +05:30
Himanshu	9496b8453f	fix(plaid): change json structure (#20189 )	2020-01-06 00:17:16 +05:30
Syed Mujeer Hashmi	03bf1a875f	feat: Allow write-off for Fees doctype Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>	2020-01-04 13:26:42 +05:30
Marica	159799c238	Merge branch 'develop' into item-min-qty	2020-01-03 12:13:00 +05:30
rohitwaghchaure	52c5fb33d7	Merge pull request #20169 from rohitwaghchaure/fix_pricing_rule_issue_for_ignore_pricing_rule_develop fix: ignore pricing rule for other item group	2020-01-02 19:24:37 +05:30
thefalconx33	7a01367ef1	ux: add description for minimum purchase qty	2020-01-02 19:14:55 +05:30
Nabin Hait	328c4f9b92	fix: Get outgoing rate of serial no from SLE if serial no already transferred to another company	2020-01-02 19:00:47 +05:30
Rohit Waghchaure	660a78b877	fix: ignore pricing rule for other item group	2020-01-02 17:31:09 +05:30
deepeshgarg007	473b478883	fix: Show closing row in general ledger print	2020-01-02 12:22:04 +05:30
Raffael Meyer	5d6fada431	feat: add accounts and account types	2020-01-01 22:55:54 +01:00
Rucha Mahabal	2d293c585e	fix(Subscription): pass start_date while computing next_schedu… (#20159 )	2019-12-31 19:15:37 +05:30
Anurag Mishra	8554304616	fix: set currency to company default currency (#20157 )	2019-12-31 17:23:31 +05:30
Rohan	938ba3efc4	feat: show item name in Item Price list view (#20156 )	2019-12-31 17:21:07 +05:30
Saqib	440a3b75be	fix: don't show transfer button if already items are supplied (#20154 )	2019-12-31 17:20:04 +05:30
Nabin Hait	5748cde54b	fix: minor field arrangements	2019-12-31 17:18:15 +05:30
Anurag Mishra	d2eae9fbcf	fix: Atendance Request, Employee Skill Map, Leave Encashment form UI	2019-12-31 17:18:15 +05:30
Anurag Mishra	b57ec65812	fix: Additional salary, Department, driver, loan, salary slip, shift,Travel request form UI	2019-12-31 17:18:15 +05:30
Anurag Mishra	52d280067b	fix: Leave Type form UI	2019-12-31 17:18:15 +05:30
Anurag Mishra	cfdbbcff70	fix: Employee incentive form UI	2019-12-31 17:18:15 +05:30
Anurag Mishra	39ecd6ee1e	fix: Expense calim form UI	2019-12-31 17:18:15 +05:30
Anurag Mishra	ec9000b6b9	fix: Employee form UI	2019-12-31 17:18:14 +05:30
Anurag Mishra	bd6e8b9cec	feat: Mark Unmarked Attendance (#20062 ) * feat: Mark Unmarked Attendance * Update shift_type.py * Update attendance_list.js * Update attendance.py * Update attendance.py Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2019-12-31 17:09:56 +05:30
Rohan	b73b347697	feat: add job applicant's email in job offer (#20153 )	2019-12-31 17:09:02 +05:30
Javier Wong	5cc7648e9c	[Fix] Allow Print Before Pay in POS (#20151 ) Print Button does not show even when Print Before Pay is enabled in the POS Profile.	2019-12-31 17:07:37 +05:30
Saqib	71649fe141	fix: customer credit limit label (#20152 )	2019-12-31 17:05:34 +05:30
Deepesh Garg	2bc7e2881a	Merge pull request #20149 from nextchamp-saqib/rounded-total-ss feat: added provision to disable rounded total for salary slips	2019-12-31 17:02:14 +05:30
thefalconx33	88de158378	feat: added provision to disable rounded total for salary slips	2019-12-31 15:27:30 +05:30
Saqib	cb7043fd9d	fix: party account currency not fetched from account for SO (#20146 )	2019-12-31 13:55:13 +05:30
Marica	5483f1a27e	fix: Field 'other_charges_calculation' column type changed. (#20141 )	2019-12-30 22:20:02 +05:30
Rucha Mahabal	3ac39ba28d	fix: format currency field in bank and cash payment voucher print format (#20137 )	2019-12-30 15:18:07 +05:30
rohitwaghchaure	9af557f9d7	fix: incorrect batch fetched for the serialized items (#20119 ) * fix: incorrect batch fetched for the serialized items * Update stock_controller.py Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2019-12-30 13:26:47 +05:30
Ishan Loya	fe0adc8b25	fix: read WIP warehouse from work order (#20131 ) * fix: read wip_warehouse from work order in stock entry even if skip transfer is checked * fix: remove skip_transfer in stock entry Related to #10753	2019-12-30 12:19:08 +05:30
rohitwaghchaure	59a835602a	fix: service item's cost showing incorrect amount in stock entry (#20106 )	2019-12-30 11:42:06 +05:30
Deepesh Garg	e90126f7ab	Merge pull request #20123 from nextchamp-saqib/so-update-items fix: don't allow deletion of items which has work order assigned to it	2019-12-28 21:01:17 +05:30
Deepesh Garg	b914cf0a9d	Merge pull request #19815 from Mangesh-Khairnar/publish-item feat(marketplace): allow user to un-publish item	2019-12-28 17:52:49 +05:30
Deepesh Garg	4f1fcdd4a7	Merge pull request #20125 from marination/stock-module-desk chore: Added Reports to Stock Module Desk	2019-12-28 17:45:06 +05:30
marination	126a63af26	chore: Added Reports to Stock Module Desk	2019-12-27 17:18:27 +05:30
Rohan	901fe4785c	fix: employee preferred email patch (#20116 )	2019-12-27 17:07:35 +05:30
Ishan Loya	b2a1ae77ce	Remove default BOM filter in Work Order (#20117 ) Not all companies use default BOM (e.g. construction companies, etc.)	2019-12-27 17:06:34 +05:30
Marica	f4fbdf98d1	fix: Removed unneccesary Duplicate Entry Error. (#20120 )	2019-12-27 16:53:05 +05:30
thefalconx33	2073eeb8fa	fix: don't allow deletion of items which has work order assigned to it	2019-12-27 16:26:03 +05:30
Marica	47ab9850e6	fix: Show both warehouse columns in Stock Entry Grid view. (#20113 )	2019-12-27 15:31:07 +05:30
Mangesh-Khairnar	c7ce597b7f	fix: return when Hub Tracked Item is empty	2019-12-27 14:48:14 +05:30
Saqib	7e57ede35b	fix: unpaid invoices are created even if current invoice is paid (#20081 )	2019-12-27 13:02:13 +05:30
Deepesh Garg	467dba1954	fix: Patch incorrect GST category in invoices (#20084 ) * fix: Patch to set GST category for unregistered invoice * fix: Move patch up in line	2019-12-27 12:58:19 +05:30
Mangesh-Khairnar	cca6fb2794	Merge branch 'develop' into publish-item	2019-12-27 12:55:28 +05:30
rohitwaghchaure	4d806033af	Merge pull request #19335 from PawanMeh/feat_19334 feat(regional): Italian Localization and Passive invoicing cycle	2019-12-27 12:48:46 +05:30
rohitwaghchaure	616431d7c3	fix: incorrect reorder level in stock balance report (#20111 )	2019-12-27 12:35:58 +05:30
Rohan	e944f7ac05	fix: Add Serial No button prompt (#20099 )	2019-12-27 12:34:36 +05:30
rohitwaghchaure	a99f926a4b	fix: incorrect validation for scrap items (#20109 )	2019-12-27 12:21:15 +05:30
Nabin Hait	8f3fea63b1	Merge branch 'develop' into publish-item	2019-12-27 12:19:02 +05:30
Saqib	8774c869d7	fix: first name not fetched from job offer applicant name (#20093 )	2019-12-27 12:15:20 +05:30
Mangesh-Khairnar	8768d5d396	fix: fetch opening accumulated depreciation (#20095 )	2019-12-27 12:14:46 +05:30
rohitwaghchaure	5b889ef864	Merge pull request #20079 from nabinhait/rounding-adjustment-dev fix: rounding adjustment while both inclusive tax and discount amount present	2019-12-27 11:51:50 +05:30
Deepesh Garg	1a2e4fa36d	Merge pull request #20087 from nextchamp-saqib/pay-reco-fix fix: undefined dr_or_cr_notes in case of party type Employee	2019-12-27 08:13:09 +05:30
thefalconx33	61bd6ccc2b	fix: travis failing for leave application test	2019-12-26 18:27:58 +05:30
deepeshgarg007	bd1da65098	fix: Update modified date	2019-12-26 18:26:13 +05:30
deepeshgarg007	0b9a98ad43	fix: Add against blanket order field in sales order	2019-12-26 18:15:13 +05:30

... 18 19 20 21 22 ...

22916 Commits