brotherton-erpnext

Author	SHA1	Message	Date
Anurag Mishra	a2cf79da0f	fix: allow to enter Releaving date if status = Left	2020-06-15 12:28:31 +05:30
Deepesh Garg	0d880079b1	fix: Validation for group cost center	2020-06-15 12:23:24 +05:30
marination	8d68ba37bb	Merge branch 'update-items-permission-fix' of https://github.com/nextchamp-saqib/erpnext into update-items-permission-fix	2020-06-15 12:18:16 +05:30
marination	b7e94cc742	fix: Travis	2020-06-15 12:16:30 +05:30
Deepesh Garg	817cbc4b48	fix: Minor fixes in cost center	2020-06-15 12:07:04 +05:30
Marica	7dd92f15fa	Merge branch 'develop' into update-items-permission-fix	2020-06-15 11:44:59 +05:30
marination	359e934cd2	fix: Travis	2020-06-15 11:44:29 +05:30
Abhishek Balam	6c4a24a6c3	cleanup	2020-06-15 11:36:56 +05:30
Abhishek Balam	1a28227daa	fix merge conflict	2020-06-15 10:58:51 +05:30
Deepesh Garg	11253a91f1	Merge pull request #22199 from marination/qi-on-return fix: Don't prompt for Quality Inspection on Return Documents.	2020-06-14 17:09:51 +05:30
rohitwaghchaure	25f49d59c5	Merge pull request #22233 from deepeshgarg007/pi_billing_address fix: Billing address in for Purchase documents	2020-06-14 15:10:43 +05:30
rohitwaghchaure	c5a2803a1c	Merge pull request #22239 from rohitwaghchaure/item-none-not-found-opening-creation-tool-develop fix: item none not found while making sales invoice using opening inv…	2020-06-14 15:09:38 +05:30
Rohit Waghchaure	d6f9a51cbb	fix: item none not found while making sales invoice using opening invoice creation tool	2020-06-14 14:46:49 +05:30
Deepesh Garg	5bf6bec656	fix: Consider Overseas category in RCM	2020-06-14 13:18:08 +05:30
Anupam K	234b5f9a8c	sm-post-permission-fix	2020-06-14 10:34:58 +05:30
Anupam K	c2d1ed7a34	Merge branch 'develop' of https://github.com/frappe/erpnext into opportunity-dashboard	2020-06-14 00:09:45 +05:30
Anupam K	65e7a2e7a6	opportunity-dashboard-fix	2020-06-14 00:05:38 +05:30
Deepesh Garg	3a16b033b6	Merge branch 'develop' of https://github.com/frappe/erpnext into rcm_develop	2020-06-13 22:50:14 +05:30
Deepesh Garg	6760077674	fix: Billing address in for Purchase documents	2020-06-13 22:40:23 +05:30
Deepesh Garg	dcdd1f3d9b	Merge pull request #22227 from frappe/opportunity-dashboard fix: Links in opportunity dashboard	2020-06-13 22:16:10 +05:30
Deepesh Garg	5f4330621c	Merge pull request #22231 from deepeshgarg007/financila_satement_immutable fix: Handle cancelled entries in financial statements	2020-06-13 21:19:20 +05:30
Deepesh Garg	cc4943d54d	fix: Distributed cost center query updation	2020-06-13 21:13:52 +05:30
Deepesh Garg	d80d442aa1	fix: Do not select cancelled entries in financial statements	2020-06-13 21:12:19 +05:30
Deepesh Garg	f3261794d9	Merge pull request #22230 from deepeshgarg007/financial_statement_to_date_v13 fix: Data not appearing properly for some fiscal_year in financial statements	2020-06-13 19:27:38 +05:30
Deepesh Garg	15231aa60d	fix: Data not appearing properly for some fiscal_year in financial statemets	2020-06-13 19:26:39 +05:30
Anupam K	8bc414620b	opportunity-dashboard-fix	2020-06-13 13:11:43 +05:30
Anurag Mishra	5b8a47d072	fix: patch for expense claim (#22226 )	2020-06-13 01:04:32 +05:30
Deepesh Garg	28fecb1b29	Merge pull request #22198 from scmmishra/membership-fixes fix: verification for razorpay hooks	2020-06-12 21:28:07 +05:30
John Clarke	15e4ea0472	Merge branch 'develop' into clarkejj-patch-1	2020-06-12 07:55:49 -06:00
John Clarke	85f237257a	Thanks so much for your pointer Marica - that violation is clear and obvious to me in retrospect, but a good relearning experience in any case	2020-06-12 07:22:14 -06:00
Deepesh Garg	c258ac82c5	feat: Accounting entries for service item in Purchase receipt	2020-06-12 18:33:42 +05:30
Anurag Mishra	7558e64d6d	fix: set_query in leave application (#22197 )	2020-06-12 17:37:59 +05:30
John Clarke	677978dd00	Update stock_ageing.py As reviewer Deepesh Garg advised thanks! batch[0] can be int of float - see line 49 - so change proposed cint to flt	2020-06-12 05:53:24 -06:00
Anurag Mishra	ec54653852	fix: Child is shown in Parent process if added from tree view	2020-06-12 17:02:31 +05:30
rohitwaghchaure	ee6f80e25b	Merge pull request #22213 from vishdha/fix-credit-limit-notification_v13 feat: notify credit controller role users with credit limit extension request	2020-06-12 16:37:41 +05:30
marination	f9c4b20985	fix: Added PO test and conversion factor fix - Don't change conversion factor if stock uom and uom is the same - Added PO test - Added Accounts User basic role in PO - Minor fixes, wrong variables	2020-06-12 15:49:53 +05:30
Deepesh Garg	7e974c9e2c	fix: Test Cases	2020-06-12 15:29:40 +05:30
Sahil Khan	182c1f860b	fix(patch): escape special characters in company field	2020-06-12 15:16:20 +05:30
Abhishek Balam	86ea75e49e	fix(HR): Change Due Advance Amount to Pending Amount (#22123 ) * rename 'Due Advance Amount' field to 'Pending Amount' * changed fieldname and references for easier debugging * added patch for moving data * added newline added Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>	2020-06-12 13:13:14 +05:30
Shivam Mishra	3bf18509ba	Merge branch 'develop' into membership-fixes	2020-06-12 07:27:20 +00:00
Rohan Bansal	ccd03bc120	feat: notify credit controller role users with credit limit extension requests	2020-06-12 12:48:54 +05:30
Vignesh S	90957b7f74	feat(Attendance): Add In and Out time to attendance (#21547 ) * feat(Attendance): Add In and Out time to attendance Co-authored-by: Karthikeyan S <skarthikeyan1410@gmail.com> * fix:add depends in attendance IN time and OUT time Co-authored-by: Karthikeyan S <skarthikeyan1410@gmail.com>	2020-06-12 12:32:55 +05:30
Marica	c62a6df016	Merge branch 'develop' into qi-on-return	2020-06-12 12:31:20 +05:30
Marica	fd3d976e06	Update erpnext/controllers/stock_controller.py Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2020-06-12 12:30:59 +05:30
Abhishek Balam	996b306cda	fix territory count	2020-06-12 11:38:07 +05:30
Abhishek Balam	72450d2af3	add revenue if within date range	2020-06-12 11:07:57 +05:30
Abhishek Balam	f596b5950e	indent to tabs	2020-06-12 11:07:28 +05:30
Deepesh Garg	d09aa53571	Merge pull request #22208 from aliriocastro/fix-itemwise-rec-reord-level-report fix: key name to get float precision was misspelled	2020-06-12 10:04:58 +05:30
Deepesh Garg	ca97e19b7e	Merge pull request #22203 from marination/account-tree fix: Check for Company before rendering tree in Account Tree	2020-06-12 10:02:41 +05:30
Alirio Castro	faf33072c8	fix: key was mispelled	2020-06-11 23:32:53 -04:00
Shivam Mishra	241088c73e	Merge branch 'develop' into membership-fixes	2020-06-11 16:53:15 +00:00
John Clarke	6b55f66f02	Stock Ageing TypeError: ‘<’ not supported between instances of ‘int’ and ‘str’ Proposed fix re this error report https://discuss.erpnext.com/t/stock-ageing-report-typeerror-not-supported-between-instances-of-int-and-str/62605	2020-06-11 10:24:48 -06:00
Deepesh Garg	9df4532d14	fix: Travis(develop)	2020-06-11 21:33:43 +05:30
marination	c9a6e4f151	fix: Check for Company before rendering tree in Account Tree	2020-06-11 19:54:44 +05:30
Abhishek Balam	44b8cf4fef	enable 'user cannot create' for payment request (#22044 ) Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-06-11 19:31:41 +05:30
Rucha Mahabal	d7481f59ba	fix: patch	2020-06-11 17:41:05 +05:30
Rucha Mahabal	4dbb7c552c	Merge branch 'develop' into sla-enhancements	2020-06-11 17:04:20 +05:30
Rucha Mahabal	9c27d683ba	fix: priority column width Co-authored-by: Himanshu <himanshuwarekar@yahoo.com>	2020-06-11 17:03:53 +05:30
marination	596560c3c2	fix: Don't prompt for Quality Inspection on Return Documents.	2020-06-11 16:39:03 +05:30
Shivam Mishra	3f60801566	Merge branch 'develop' into membership-fixes	2020-06-11 10:16:39 +00:00
Shivam Mishra	8c24810f30	refactor: ignore mandatory for customer	2020-06-11 15:42:29 +05:30
Shivam Mishra	49d51b8ce7	feat: check duplicate contact explicitly	2020-06-11 14:24:07 +05:30
Shivam Mishra	84fcc55a36	refactor: do nothing if member is not found	2020-06-11 13:34:40 +05:30
Shivam Mishra	8d61a0abef	fix: use string to verify webhook	2020-06-11 13:34:25 +05:30
Deepesh Garg	7d3c3b9a8b	Merge pull request #22188 from deepeshgarg007/payment_terms_outstanding fix: Update payment schedule based on payment terms	2020-06-10 22:17:37 +05:30
Deepesh Garg	a0fd97f2ac	fix: Update payment schedule based on payment terms	2020-06-10 22:15:27 +05:30
Deepesh Garg	f108574772	Merge pull request #22186 from deepeshgarg007/inter_warehouse_party_validation fix: Party validation for inter-warehouse transaction	2020-06-10 20:02:43 +05:30
Deepesh Garg	7963e2b708	fix: Party validation for inter-warehouse transaction	2020-06-10 19:57:49 +05:30
Rohan	d60d2e1826	fix: only auto-set serial nos and batches if allowed in Stock Settings (develop) (#21781 ) * fix: only auto-set serial nos and batches if allowed in Stock Settings * fix: bug with setting disabled batch no in Pick List * fix: remove auto-set batch variable Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-06-10 19:10:56 +05:30
Marica	170d4b7db9	Merge branch 'develop' into website-price-list	2020-06-10 18:57:44 +05:30
Deepesh Garg	6e0d6bd74c	Merge pull request #22184 from deepeshgarg007/item-wise-report-export fix: Item-wise sales and purchase register export	2020-06-10 18:48:35 +05:30
Deepesh Garg	08fee12266	fix: Item-wise sales and purchase register export	2020-06-10 18:33:24 +05:30
marination	fdddb679ed	fix: Prioritize Default Customer Price List in Portal	2020-06-10 18:22:59 +05:30
rohitwaghchaure	496b6a28f2	Merge pull request #22179 from rohitwaghchaure/code-cleanup-for-handling-batch-case-in-SI-develop fix: Cannot read property 'has_batch_no' of undefined	2020-06-10 17:57:07 +05:30
Rohit Waghchaure	afe8e88cb8	fix: Cannot read property 'has_batch_no' of undefined	2020-06-10 17:55:24 +05:30
Marica	aeeadee8f8	Merge branch 'develop' into update-items-permission-fix	2020-06-10 15:19:33 +05:30
rohitwaghchaure	0233f94570	Merge pull request #22081 from deepeshgarg007/jv_list_view fix: Add total debit in Journal Entry list view	2020-06-10 14:17:13 +05:30
rohitwaghchaure	95331a31a7	Merge pull request #22155 from frappe/barredterra-billing_hours feat(projects): bill all hours by default	2020-06-10 14:16:18 +05:30
rohitwaghchaure	9ea9a99889	Merge pull request #22063 from marination/procurement-tracker-develop fix: Procurement Tracker Data Consistency	2020-06-10 14:13:36 +05:30
rohitwaghchaure	3a9c1b23db	Merge pull request #22096 from marination/valuation-rate fix: '>=' not supported between instances of 'str' and 'int'	2020-06-10 14:12:13 +05:30
rohitwaghchaure	63e8f2c430	Merge pull request #22175 from Anurag810/expense_claim_cost_center_fix fix: set cost center in child table	2020-06-10 13:40:51 +05:30
Rucha Mahabal	1e49c6b68b	fix: update duration options	2020-06-10 12:58:16 +05:30
Anurag Mishra	452b7760df	fix: dependency for leave Period in Desk page	2020-06-10 12:48:21 +05:30
Rucha Mahabal	5b6d2c2e7b	Merge branch 'develop' into sla-enhancements	2020-06-10 12:33:19 +05:30
rohitwaghchaure	904e0f4eda	Merge pull request #22106 from Anurag810/employee_onboarding_fix fix: problem during assigning	2020-06-10 12:30:15 +05:30
Anurag Mishra	402c347f83	fix: set cost center in child table	2020-06-10 12:27:59 +05:30
Anupam Kumar	934e30ecac	update program course (#22166 )	2020-06-10 11:07:43 +05:30
Rucha Mahabal	bb3b616a04	fix: set valuesin db for handle hold time	2020-06-09 23:17:51 +05:30
Raffael Meyer	088ab75083	fix: move feature into update_billing_hours	2020-06-09 16:09:40 +02:00
Deepesh Garg	0dd925cfc8	Merge pull request #22164 from frappe/revert-21123-patch-1 Revert "fix: docfield of sales_order is not fetching route options for new doc"	2020-06-09 17:42:42 +05:30
rohitwaghchaure	b42ac845da	Merge pull request #22147 from marination/finished-good-valuation fix: Finished Product Valuation at Repack	2020-06-09 17:42:06 +05:30
Deepesh Garg	e5fe00cf58	Revert "fix: docfield of sales_order is not fetching route options for new doc (#21123 )" This reverts commit `5c54adec28`.	2020-06-09 17:41:27 +05:30
Raffael Meyer	d27d88c3e4	feat: bill all hours by default	2020-06-08 22:52:44 +02:00
marination	f5b9deea5b	fix: Finished Product Valuation at Repack	2020-06-08 13:02:00 +05:30
Karthikeyan S	e9ff6d3d52	feat(Cost Center): Distributed Cost Center (#21531 ) * feat: Distributed Cost Center Squashed commit of the following: commit 274236eb92dfddfd015583ee1e6b5e1937366d28 Author: Vignesh <kaviya.3111999@gmail.com> Date: Mon Mar 23 18:32:26 2020 +0530 Fix: Indentation commit beae0b9849f333dd1d9f29c27192ea7de2e4e809 Author: Vignesh <kaviya.3111999@gmail.com> Date: Mon Mar 23 18:26:50 2020 +0530 The validations are added to distributed cost center. commit 3f66943adacb5797338ef3510251bf6633be3dba Author: Vignesh <kaviya.3111999@gmail.com> Date: Thu Mar 19 22:17:25 2020 +0530 The distributed cost centers are shown with the percentage allocation in the reports commit 1ac11df522096fa187d2f5863b4c970e18b37fac Author: Vignesh <kaviya.3111999@gmail.com> Date: Thu Mar 19 13:36:04 2020 +0530 The child table distributed cost center are added to cost center doctype and then validate percentage allocation. * fix(Distributed Cost Center): validation and filters * fix(Distributed Cost Center): financial statement query * fix(Distributed Cost Center): add test cases Co-authored-by: Vignesh S <svignesh0308@gmail.com> * fix(Distributed Cost Center): budget variance, general ledger, profitability analysis reports. * Merge branch 'develop' into develop-distributed-cost-center * fix(Distributed Cost Center): Added DCC reflection in actual amount column of Budget Variance Report. * Update creation field in general ledger report Co-authored-by: Nabin Hait <nabinhait@gmail.com> * creation field updated in gl_entries query Co-authored-by: Nabin Hait <nabinhait@gmail.com> Co-authored-by: KaviyaPeriyasamy <kaviya.3111999@gmail.com> Co-authored-by: Vignesh S <svignesh0308@gmail.com> Co-authored-by: KaviyaPeriyasamy <kaviyaperiyasamy22@gmail.com> Co-authored-by: Kaviya Periyasamy <36359901+KaviyaPeriyasamy@users.noreply.github.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-06-08 12:20:21 +05:30
rohitwaghchaure	c6d4c2afb6	Merge pull request #22113 from Anurag810/leave_application-fixes fix: Wrong filters	2020-06-08 10:43:22 +05:30
rohitwaghchaure	b3b5c96749	Merge pull request #22092 from marination/shippinng-address fix: Apply shipping rule without address too	2020-06-08 10:36:19 +05:30
rohitwaghchaure	6debdc89c2	Merge pull request #22121 from rohitwaghchaure/error-report-exponential-smoothing-report fix: 'ForecastingReport' object has no attribute 'total_demand'	2020-06-08 10:30:19 +05:30
Deepesh Garg	63e8391381	Merge pull request #22142 from deepeshgarg007/loan_amount_precision fix: Precision in loan amount calculation	2020-06-07 21:28:23 +05:30
Deepesh Garg	0bc163c230	fix: Ignore GL Entry on cancel	2020-06-07 21:23:55 +05:30
Deepesh Garg	e5ac8cc430	fix: Precision in loan amount calculation	2020-06-07 21:18:47 +05:30
Mangesh-Khairnar	3031128167	fix: fetch tax lines within the shipping lines (#22138 )	2020-06-07 18:02:23 +05:30
Deepesh Garg	c01b4aa2e5	Merge pull request #22131 from deepeshgarg007/tds_monthly_cancelled fix: Cancelled entries in tds payable monthly report	2020-06-07 00:08:17 +05:30
Deepesh Garg	57f9d43c43	fix: Cancelled entries in tds payable monthly report	2020-06-07 00:01:20 +05:30
Rucha Mahabal	73326d308b	refactor: move pause SLA configuration to SLA DocType	2020-06-05 18:23:39 +05:30
Rucha Mahabal	d7d3ca4214	fix: tests	2020-06-05 16:57:37 +05:30
Abhishek Balam	328a55749d	fix(HR): Fix half day error when only 1 day is selected (#22122 ) * fix half day error when only 1 day is selected * adding validation fix for half day on serverside	2020-06-05 16:46:57 +05:30
Rucha Mahabal	25ef6a9638	fix: add default hold statuses in fixtures and patch	2020-06-05 16:37:20 +05:30
Rucha Mahabal	8d39928418	refactor: dashboard indicator when SLA is on hold	2020-06-05 16:36:31 +05:30
Rucha Mahabal	2c9f7cf371	feat: pause SLA on statuses configuration	2020-06-05 16:35:57 +05:30
Rohit Waghchaure	5a82276389	fix: 'ForecastingReport' object has no attribute 'total_demand'	2020-06-05 13:56:20 +05:30
Rucha Mahabal	b29cb87868	refactor: setting avg_response_time moved to communication	2020-06-05 13:35:38 +05:30
Deepesh Garg	407c7bc113	Merge pull request #22067 from marination/item-attribute fix: Misleading Error message for Item Attribute.	2020-06-05 11:21:08 +05:30
P-Froggy	6f87f97efe	fix: Wrong Ordered-Status Indicator for Material Request Items (#22118 ) The indicator displaying if a material request item has been ordered or not (green/orange) used the wrong quantity field for determining the status. The qty field used in the code is not in stock uom while the ordered_qty field is. Now, the stock_qty field is used for correct comparison with ordered_qty.	2020-06-05 10:57:07 +05:30
Anurag Mishra	94582a89c7	fix: Wrong filters	2020-06-04 17:50:47 +05:30
Rucha Mahabal	3f08350181	fix: retain Hold status	2020-06-04 15:56:59 +05:30
Marica	d03ebbd51d	Merge branch 'develop' into valuation-rate	2020-06-04 15:31:11 +05:30
rohitwaghchaure	2213ea3d82	Merge pull request #22109 from rohitwaghchaure/routing-operations-not-in-a-sequence fix: routing operations not added sequentially in the BOM	2020-06-04 14:56:10 +05:30
Rohit Waghchaure	404ed88c0c	fix: routing operations not added sequentially in the BOM	2020-06-04 14:46:50 +05:30
rohitwaghchaure	dd97a5f4a8	Merge pull request #22107 from rohitwaghchaure/fixed-import-supplier-invoice-not-worked fix: import supplier invoice not working	2020-06-04 14:40:30 +05:30
Rohit Waghchaure	60c1855014	fix: import supplier invoice not working	2020-06-04 14:31:35 +05:30
Anurag Mishra	225802e3a0	fix: problem during assigning	2020-06-04 14:15:55 +05:30
Rucha Mahabal	94d03c6100	fix: remove Service Level DocType from Support Desk Page	2020-06-04 12:35:36 +05:30
Rucha Mahabal	b3338a149b	fix: code clean-up	2020-06-04 12:35:00 +05:30
Deepesh Garg	c83ad8185a	Merge pull request #22098 from deepeshgarg007/accounts_payable_error fix: Error when no data is present in AR/AP report	2020-06-03 21:59:28 +05:30
Deepesh Garg	7135a75e5e	fix: Error when no data is present in AR/AP reeport	2020-06-03 21:51:21 +05:30
marination	6f7e9d2904	fix: '>=' not supported between instances of 'str' and 'int'	2020-06-03 17:13:58 +05:30
marination	0c72249403	fix: Apply shipping rule without address too	2020-06-03 14:32:07 +05:30
Deepesh Garg	881999d3bf	Merge pull request #22089 from scmmishra/selling-dash-fix fix: dashboard chart does not exist on selling page	2020-06-03 13:38:36 +05:30
Shivam Mishra	b84dd9b5f5	fix: dashboard chart does not exist on selling page	2020-06-03 13:24:18 +05:30
Myuddin khatri	9276d16420	fix(stock): able to create purchase invoice from purchase receipt dashboard able to create purchase invoice from purchase receipt dashboard	2020-06-03 11:22:49 +05:30
Deepesh Garg	24f9a80e7d	fix(India): Reverse charge mechanism for GST	2020-06-03 10:59:37 +05:30
Shivam Mishra	f460c17961	fix: syntax error (#22082 )	2020-06-02 21:48:23 +05:30
Shivam Mishra	789df32683	feat: verify signature on webhook (#21872 )	2020-06-02 19:18:22 +05:30
Deepesh Garg	60f3a2b8e7	fix: Add total debit in Journal Entry list view	2020-06-02 18:26:43 +05:30
gavin	7a05662e9f	Merge pull request #21491 from gavindsouza/tally-migration-feat feat(Tally migration): Errored documents handling	2020-06-02 13:03:13 +05:30
Deepesh Garg	fecac677ec	Merge pull request #22075 from abhishekbalam/fix-customer-count fix(Accounts): Customer Count in Customer Acq. Report wrong	2020-06-02 00:09:01 +05:30
Abhishek Balam	192d4c8810	indent to tabs instead of spaces	2020-06-01 23:58:05 +05:30
Abhishek Balam	732f5c1867	fixed customer count logic	2020-06-01 23:51:39 +05:30
marination	0df7f0fe9d	fix: Misleading Error message for Item Attribute.	2020-06-01 11:56:33 +05:30
Deepesh Garg	de03d2cba4	fix: Method in hooks for proccesing deferred revenue	2020-06-01 11:30:34 +05:30
marination	c0c455c471	fix: Procurement Tracker Data Consistency	2020-05-31 20:20:59 +05:30
karthikeyan5	ca46bedfcb	fix(ewb): remove checksum validation for TRANSIN	2020-05-30 15:00:56 +05:30
Saqib	c16e278979	Merge branch 'develop' into update-items-permission-fix	2020-05-30 13:16:55 +05:30
Deepesh Garg	3609ddedbb	fix: Purchase receipt item json	2020-05-30 12:03:37 +05:30
Deepesh Garg	159d0734ef	fix: Proccurement tracker report test	2020-05-30 11:47:22 +05:30
Deepesh Garg	1aec30d849	fix: Procurement Tracker test case	2020-05-30 11:47:04 +05:30
Deepesh Garg	c96bf870e4	fix: Test Cases	2020-05-30 11:46:39 +05:30
Deepesh Garg	8a4dc521cd	Revert 'fix: tests depending on global default company'	2020-05-30 11:40:16 +05:30
Deepesh Garg	36f7710356	Revert "fix: tests depending on global default company" This reverts commit `1f20c99ecf`.	2020-05-30 11:38:04 +05:30
Deepesh Garg	f8550790fa	This reverts commit `aa196c0a66`	2020-05-30 11:37:36 +05:30
Abhishek Balam	40694c98aa	fix(HR) : Filter Leave Type based on allocation for a particular employee (#22050 ) * table was showing empty with just headers when no leaves allocated, fixed template code * added filters on Leave Type based on leave allocation for a particular employee and to/from dates	2020-05-30 01:02:06 +05:30
Saqib Ansari	a655db6a79	fix: unexpected removal of print hide field	2020-05-29 22:44:59 +05:30
Saqib Ansari	d531a8ab8d	Merge branch 'develop' of https://github.com/frappe/erpnext into update-items-permission-fix	2020-05-29 22:37:13 +05:30
Saqib Ansari	c579b0879e	fix: cannot update delivery date	2020-05-29 22:34:22 +05:30
Saqib Ansari	5da8b98a04	fix: label	2020-05-29 21:59:01 +05:30
Saqib Ansari	2c3c8aaa2d	fix: submitted sales order can be updated with no permission	2020-05-29 21:55:38 +05:30
rohitwaghchaure	7544160374	fix: routing operations table is blank on pull of operations in BOM (#22039 )	2020-05-29 21:27:24 +05:30
Nabin Hait	2186c223b9	fix: Migrate standard_tax_exemption_amount if field exists (#22036 )	2020-05-29 21:26:49 +05:30
Deepesh Garg	dfa32a77c1	fix: Patch to remove Property Setter	2020-05-29 17:20:33 +05:30
Deepesh Garg	52baf8f863	fix: Test Cases	2020-05-29 17:20:03 +05:30
Chinmay D. Pai	d6587fa1d5	fix: check if swift_number exists in bank account Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>	2020-05-29 12:44:09 +05:30
Rucha Mahabal	43d4397003	Merge branch 'develop' into sla-enhancements	2020-05-29 11:43:49 +05:30
Rucha Mahabal	bc38289a59	fix: added patch for sla enhancements	2020-05-29 11:43:05 +05:30
Deepesh Garg	c897e800ed	Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts	2020-05-29 11:04:20 +05:30
Saqib	cd8b5d1e4c	fix: cannot assign same task to other asset maintenance (#22024 )	2020-05-29 10:21:20 +05:30
Mangesh-Khairnar	c302d066a3	fix: only save end date when transactions are returned (#22023 )	2020-05-29 10:19:58 +05:30
Anurag Mishra	cf0168668f	fix: Correct filters (#22022 )	2020-05-29 10:19:33 +05:30
Saqib	3c460364b5	fix: disposed asset creates inconsistencies in asset depr report (#22021 )	2020-05-29 10:18:06 +05:30
Anupam Kumar	8385fed042	crm onboarding typos (#22008 )	2020-05-28 22:14:59 +05:30
Rucha Mahabal	a3dd75e77f	fix: empty filters in Healthcare Charts	2020-05-28 19:03:37 +05:30
sahil28297	9209b9a7de	fix(set_purchase_receipt_delivery_note_detail): commit after every 100 sql updates (#22016 )	2020-05-28 18:49:47 +05:30
Deepesh Garg	1f3fe59e36	fix: Default period start date and period end date for financial statements (#22011 )	2020-05-28 18:36:21 +05:30
sahil28297	517ab955ac	fix(rename_bank_reconcilliation): do not delete doc after renaming (#22013 )	2020-05-28 18:32:16 +05:30
Marica	1a25aa83de	fix: Delete Auto Email Reports (#22009 )	2020-05-28 18:16:24 +05:30
mergify[bot]	fd351f8268	fix: set fiscal year for Profit and Loss chart (#22006 ) (cherry picked from commit `4afda76015`) Co-authored-by: Shivam Mishra <scm.mymail@gmail.com>	2020-05-28 15:18:47 +05:30
Shivam Mishra	6621e22c02	refactor: clean up desk pages (#22004 ) * refactor: clean up desk pages * refactor: update label for CRM	2020-05-28 14:48:50 +05:30
rohitwaghchaure	af91e13435	Merge pull request #22001 from nextchamp-saqib/price-rule-date-field-fix fix: transaction date not found in sales invoice	2020-05-28 14:38:13 +05:30
Rucha Mahabal	3a51a97b2d	Merge branch 'develop' into sla-enhancements	2020-05-28 14:33:51 +05:30
Rucha Mahabal	376a46f1e5	test: hold time for Replied status	2020-05-28 14:33:30 +05:30
Rucha Mahabal	c8e8e29083	test: Issue Metrics	2020-05-28 13:48:09 +05:30
Deepesh Garg	cfcdd52bf4	fix: Inter-company Invoice currency for multicurrency transactions (#21984 )	2020-05-28 13:35:29 +05:30
Anupam Kumar	f10771029a	CRM dashboard fixes (#21989 )	2020-05-28 13:34:55 +05:30
Mangesh-Khairnar	706524f1ae	fix: make transaction date of the oldest transaction as the last integration date (#22000 ) * fix: make transaction date of the oldest transaction as the last integration date * chore: remove blank line after docstring	2020-05-28 13:33:58 +05:30
Saqib Ansari	dd39ba0014	chore: tests	2020-05-28 13:11:04 +05:30
Michelle Alva	8653419c4c	fix: change modified time changed modified time to sync the changes	2020-05-28 12:52:58 +05:30
Saqib Ansari	603cc3d05e	fix: transaction date not found in sales invoice	2020-05-28 12:49:33 +05:30
Deepesh Garg	ab17b07f14	Merge pull request #21985 from marination/import-italian-invoice-dev chore: Added Italian Import Supplier Invoice to Desk	2020-05-28 12:33:53 +05:30
rohitwaghchaure	063d344000	Merge pull request #21998 from rohitwaghchaure/fixed-label-for-date fix: labels for date in manufacturing reports	2020-05-28 12:09:02 +05:30
Rohit Waghchaure	b86c0eb404	fix: labels for date in manufacturing reports	2020-05-28 12:07:13 +05:30
rohitwaghchaure	bf561f9387	Merge pull request #21738 from theopen-institute/fee-schedule-date fix(Education): Added a posting_date field to Fee Schedule	2020-05-28 12:01:30 +05:30
totolouis	596b3dbeee	fix: translation from HTML code to apostrophe For French translation, the apostrophe was in HTML code and thus is not displayed correctly. Issue reported a few times: https://discuss.erpnext.com/t/apostrophe-is-showed-as-39-is-not-interpreted/49954/3 and https://discuss.erpnext.com/t/mega-thread-version-12-release-bugs/50987/49.	2020-05-27 22:51:03 -07:00
Michelle Alva	f7beeff2d8	fix: change description for field (#21995 ) grammatical fixes for description of Default Customer	2020-05-28 11:05:19 +05:30
Rohit Waghchaure	5226403b62	refactor: display draft job card as Open job card	2020-05-28 10:15:01 +05:30
rohitwaghchaure	7320a72237	Merge pull request #21991 from rohitwaghchaure/fixed-forecasting-data-and-changed-columns refactor: showing the order's data for past period	2020-05-28 09:56:47 +05:30
Rohit Waghchaure	234a55c6bc	refactor: showing the order's data for past period	2020-05-28 09:55:24 +05:30
Deepesh Garg	6fe3a24c5d	Merge pull request #21986 from deepeshgarg007/tds_computation_summary fix: TDS computation summary report	2020-05-27 22:49:42 +05:30
Deepesh Garg	33a08f1ea7	fix: TDS computation summary report	2020-05-27 22:44:50 +05:30
marination	50956aa29e	chore: Added to v13 desk under Regional Link Card	2020-05-27 22:24:39 +05:30
marination	29d7a7ea05	fix: Added permission via regional setup and patch	2020-05-27 22:14:36 +05:30
marination	3da51984f2	chore: Add Import Supplier Invoice to Menu	2020-05-27 22:13:40 +05:30
rohitwaghchaure	7ac731dd4f	fix: raw material warehouse in Production Planning Report (#21982 )	2020-05-27 21:53:17 +05:30
Marica	c2aabb0fbf	fix: Buying Module fixes (#21965 ) * fix: Buying Module fixes * fix: Delete Report files as well * fix: Add Purchase Order Analysis to Stock & Accounting	2020-05-27 20:56:39 +05:30
Shivam Mishra	cb1a7d0fbc	fix: use get_datetime instead of getdate	2020-05-27 20:36:28 +05:30
Shivam Mishra	8fcbf1b90e	fix: compare start and end time to prevent negative diff (#21974 ) * fix: compare start and end time to prevent negative diff * feat: parse date when comparing	2020-05-27 20:31:30 +05:30
Deepesh Garg	152377f84d	fix: Total for ageing column 121-Above (#21972 )	2020-05-27 20:29:10 +05:30
Marica	a49f045d14	fix: Grammar fixes (#21970 )	2020-05-27 20:28:37 +05:30
Deepesh Garg	0030b95595	fix: Filtering issues in opneing invoice creation tool (#21969 )	2020-05-27 20:27:33 +05:30
Deepesh Garg	873542bc7f	fix: Do not allow backdated stock transactions in previous fiscal year (#21967 )	2020-05-27 20:26:38 +05:30
Anurag Mishra	d6d84a3c15	fix: Module Onboarding for HR (#21963 )	2020-05-27 20:21:15 +05:30
Anupam Kumar	a77032f926	onbarding steps fix (#21959 )	2020-05-27 20:20:20 +05:30
Deepesh Garg	df5f8528e7	Merge pull request #21957 from nabinhait/fix344 fix: label changed in production plan	2020-05-27 18:42:12 +05:30
rohitwaghchaure	29bd1c3968	Merge pull request #21960 from rohitwaghchaure/fixed-filters-for-manufacturing-reports fix: filters for the manufacturing reports	2020-05-27 15:38:51 +05:30
Shivam Mishra	45571b99a8	feat: added tour to manufacturing settings	2020-05-27 15:36:59 +05:30
Rohit Waghchaure	cb1a910538	fix: filters for the manufacturing reports	2020-05-27 15:26:40 +05:30
Andrew McLeod	0fa1cc647f	fix: website_list_for_contact, fix changed frappe.db.exist keyword argument (#21958 )	2020-05-27 13:36:35 +05:30
Nabin Hait	07388495f3	fix: label changed in production plan	2020-05-27 12:59:03 +05:30
Deepesh Garg	ed2c1803df	fix: Post Dated unallocated amount not considered in Advance Amount in AR/AP summary (#21837 ) * fix: Post Dated unallocateed amount not considered in Advance Amount in AR/AP summary report * fix: Add future payment filter in AR/AP summary * fix: Show unallocated future payments only till current creation date * fix: Remove extra query * fix: Remove debug * fix: Condition	2020-05-27 12:46:12 +05:30
Rucha Mahabal	a18c896a56	fix: titles and order of Healthcare Onboarding steps (#21948 ) * fix(Healthcare): title and order of onboarding steps * refactor: healthcare settings tour	2020-05-27 12:43:44 +05:30
Anurag Mishra	ef0026c06f	fix: addtional salary date validation (#21952 )	2020-05-27 12:28:11 +05:30
Anurag Mishra	01bced8c67	fix Report not working on parameter Grade (#21951 )	2020-05-27 12:26:54 +05:30
Shivam Mishra	2a81058f90	refactor: project summary report (#21943 ) * feat: added more filters * feat: show only first 30 projects in chart * Update erpnext/projects/report/project_summary/project_summary.js Co-authored-by: Marica <maricadsouza221197@gmail.com> Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-05-27 11:53:48 +05:30
Shivam Mishra	e4bbdbbfe1	fix: get data from request directly (#21954 )	2020-05-27 11:47:26 +05:30
rohitwaghchaure	07b56610dd	Merge pull request #21946 from rohitwaghchaure/fixed-v13-beta-2-issues-develop fix: manufacturing dashboard and work order summary chart	2020-05-26 23:19:57 +05:30
Rohit Waghchaure	1e04b455f0	fix: manufacturing dashboard and work order summary chart	2020-05-26 23:14:21 +05:30
Deepesh Garg	3a723dd815	Merge pull request #21940 from deepeshgarg007/acc_dim_report_filter fix: Do not add filters in report on accounting dimension creation if it already exists	2020-05-26 19:30:43 +05:30
Deepesh Garg	bcee78d054	fix: Remove console statement	2020-05-26 19:26:47 +05:30
Deepesh Garg	11ea0b1289	fix: Do not add filters in report on accounting dimension creation if it already exists	2020-05-26 19:23:45 +05:30
Abhishek Balam	18e7b60acc	feat(Selling): Gross Profit In Quotation (#21795 ) * added valuation rate and gross_profit in quotation item table * modified code to not fetch valuation_rate manually, used set_gross_profit from selling controller	2020-05-26 18:37:02 +05:30
Chinmay Pai	49b2b155b6	fix: sanitize all-products search before displaying results (#21764 ) Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>	2020-05-26 18:21:11 +05:30
Afshan	c0b4ec52de	fix: UX date range field separated in from and to date fields. (#21765 ) * fix for issue #21419 * changing group by filter to default Group by Voucher (Consolidated) * divided date range to seperate from and to date * divided date range to seperate from and to date for purcase and sales register	2020-05-26 18:20:47 +05:30
Rohan	d28854b3c2	fix: throw error if no serial numbers are found in Pick List (#21915 ) Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-05-26 18:13:25 +05:30
Anurag Mishra	56357fafeb	fix: Added column Expired Leave (#21857 )	2020-05-26 18:08:22 +05:30
Deepesh Garg	5fa207f020	fix(UAE): Incorrect VAT rate display in Sales Invoice (#21882 )	2020-05-26 18:02:21 +05:30
Anurag Mishra	752ca63fea	fix: Was showing opening on date not remaimning leave (#21899 )	2020-05-26 18:01:03 +05:30
Anurag Mishra	93e15c5f5c	fix: showing Wrong balance on allocation boundary dates (#21904 )	2020-05-26 18:00:37 +05:30
Mangesh-Khairnar	7402451b96	fix: shopify error message on failure of sales order creation (#21924 )	2020-05-26 17:56:40 +05:30
Mangesh-Khairnar	ddc170521f	fix: check for warehouse in the woocommerce settings (#21925 )	2020-05-26 17:55:56 +05:30
Rucha Mahabal	c52bbd79bf	fix(Healthcare): set company in healthcare service unit setup (#21929 )	2020-05-26 17:54:46 +05:30
Marica	74a910ae92	fix: title for onboarding step (#21933 ) Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com> Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>	2020-05-26 17:49:34 +05:30
Prssanna Desai	ee70d7a7eb	fix: fix function import (#21927 )	2020-05-26 17:02:51 +05:30
Rucha Mahabal	f91ed4ce24	fix: add default priority field in SLA	2020-05-26 16:03:47 +05:30
Rucha Mahabal	f3fc544918	fix: SLA tests	2020-05-26 15:03:15 +05:30
Rucha Mahabal	5379e87880	refactor: code cleanup, break functions	2020-05-26 12:48:03 +05:30
Rucha Mahabal	ec6246306c	refactor: set variance and SLA as Ongoing on Issue reopen	2020-05-26 12:32:12 +05:30
Rucha Mahabal	899ec36532	feat: added Resolved status with same functionality as Closed	2020-05-26 12:23:28 +05:30
Rucha Mahabal	79ed5755be	refactor: remove Hold status	2020-05-25 22:04:04 +05:30
Rucha Mahabal	372aa44b19	feat: implement hold time on Replied status for SLA	2020-05-25 21:37:58 +05:30
Anurag Mishra	a7f42f7256	fix: showing wrong record (#21884 )	2020-05-25 19:23:17 +05:30
Anupam Kumar	0a147d5c76	fix: adding dashboard in course and assessment plan (#21889 ) * Adding dashboards * adding dashboard in course and assessment plan	2020-05-25 19:21:48 +05:30
Saqib	48e4abf43f	fix: fetch depreciation amount only if depr entry is made (#21893 )	2020-05-25 19:21:08 +05:30
Rucha Mahabal	4dd6b9986f	fix(healthcare): patient vitals undefined (#21906 )	2020-05-25 18:42:01 +05:30
Rucha Mahabal	316d136aca	fix(Healthcare): unhide company field in Sample Collection, add field in Rehab DocTypes (#21907 ) * fix: unhide company field in Sample Collection * fix: add and set company field in rehab doctypes	2020-05-25 18:41:47 +05:30
Anurag Mishra	8a1cf45473	fix: Validation for dates (#21886 )	2020-05-25 18:39:19 +05:30
Marica	1392489b60	fix: Item Price and Add to Cart not showing on Website (#21903 ) * fix: Item Price and Add to Cart not showing on Website * fix: Use None as default argument	2020-05-25 18:26:01 +05:30
Marica	07f305a1d6	refactor: open link in new tab (#21910 )	2020-05-25 16:30:59 +05:30
Rohan	e5395c3ae8	fix: filter batches based on item and warehouse in Pick List (#21780 ) Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-05-25 15:25:21 +05:30
Vishal Dhayagude	6ff11de2f0	fix: Added gram, pound to ounce conversion (#21709 ) * fix: pound, grams to Ounce converion factor added * fix: patch date updated for UOM Conversion Factor * fix: grams move to gram * fix: duplicate entry of uom converion factor and patch added * fix: typo fix * fix: minor changes * Update patches.txt Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-05-25 14:54:19 +05:30
Deepesh Garg	9f963a2ac7	fix: Company query for number cards	2020-05-24 21:55:47 +05:30
Chinmay D. Pai	0d147b011e	fix: set default posting_date value to None using mutable python defaults, and especially function calls, inside function definitions causes bugs that can be really hard to debug sometimes. please refrain from using such defaults. instead, using None is almost always a sane default. the values can then be manipulated inside the function instead. Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>	2020-05-24 00:54:04 +05:30
Deepesh Garg	0b5e990751	Merge pull request #21877 from scmmishra/rename-loan feat: rename loan management to loan on Desk Page	2020-05-22 16:06:53 +05:30
sahil28297	2b277a7eec	fix(patch): rerun remove_duplicate_leave_ledger_entries (#21878 )	2020-05-22 15:52:15 +05:30
Shivam Mishra	5cf90baf16	feat: rename loan management to loan on Desk Page	2020-05-22 15:09:57 +05:30
Nabin Hait	78a6b6b45d	fix: Remove duplicate leave ledger entry (#21871 ) * fix: Remove duplicate leave ledger entry * fix: Remove duplicate leave ledger entry	2020-05-22 13:13:17 +05:30
Deepesh Garg	8d7f5d342d	fix: Item tax template not getting mapped from source to traget doc (#21862 )	2020-05-22 12:28:45 +05:30
Deepesh Garg	d1d54ebe41	Merge pull request #21853 from anupamvs/edu-card-report feat: Added card for reports on education desk	2020-05-22 11:52:39 +05:30
Michelle Alva	1763d3e706	fix: expense account error message in DN (#21851 ) Changed error message if expense account not set for item in Delivery Note. Earlier: Expense or Difference account is mandatory for Item IT - 6 as it impacts overall stock value After fix: Expense Account not set for Item IT - 6. Please set an Expense Account for the item in the Items table	2020-05-22 10:51:19 +05:30
Chinmay Pai	baef43977b	fix: set customer and supplier details using sql (#21846 ) * fix: set customer and supplier details using sql instead of slowing down the query with get_doc and save() we can just use sql to update the required values for customer and supplier Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com> * chore: remove extra quote Co-authored-by: Himanshu <himanshuwarekar@yahoo.com> * fix: update sql query to include tabPrice List Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com> Co-authored-by: Himanshu <himanshuwarekar@yahoo.com>	2020-05-22 10:50:13 +05:30
Marica	dd3e52184c	fix: Added Inactive serial no status (#21848 )	2020-05-22 10:48:35 +05:30
Deepesh Garg	f131260895	Merge pull request #21804 from netchampfaris/move-address-and-contact-templates-to-frappe fix: Move address and contact templates to frappe	2020-05-22 09:27:33 +05:30
Anupam K	d7d4bed0b1	adding report card in education desk	2020-05-22 01:10:55 +05:30
Anurag Mishra	c07265ea3f	fix: convert goals point to flt (#21844 )	2020-05-21 18:47:39 +05:30
sahil28297	82523a5487	fix(set_serial_no_status): auto commit on many writes (#21845 )	2020-05-21 18:42:10 +05:30
Prssanna Desai	ce8f8f4ed7	fix: hide delete company transacations button if not system manager (#21839 )	2020-05-21 18:35:03 +05:30
rohitwaghchaure	7978907cc8	feat: BOM template (#21262 ) Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-05-21 18:10:13 +05:30
Suraj Shetty	5cef8db4db	fix(patch): Handle single value in patch (#21823 )	2020-05-21 14:32:24 +05:30
rohitwaghchaure	c43932e653	Merge pull request #21831 from rohitwaghchaure/fixed-forecasting-error-report-python3 fix: dict object has no attribute append	2020-05-21 14:23:46 +05:30
rohitwaghchaure	e8c592698e	Merge pull request #21828 from marination/italian-invoice-import fix: Supplier Invoice No not fetched in Import Supplier Invoice	2020-05-21 14:22:59 +05:30
rohitwaghchaure	7aa8cf6538	Merge pull request #21824 from marination/pick-list-dn fix: Fetch customer into Delivery Note from Pick List	2020-05-21 14:19:43 +05:30
Rohit Waghchaure	feaf5c7edb	fix: dict object has no attribute append	2020-05-21 14:08:25 +05:30
marination	90b4452a25	fix: Supplier Invoice No not fetched in Import Supplier Invoice	2020-05-21 14:03:29 +05:30
marination	7afee887a8	fix: Fetch customer into Delivery Note from Pick List	2020-05-21 13:11:48 +05:30
Marica	1a6dcd7f45	fix: plc conversion rate set infinitely (#21820 )	2020-05-21 12:07:43 +05:30
Marica	82f639da59	fix: Employee Advance Return not working (#21812 )	2020-05-21 11:35:00 +05:30
Rucha Mahabal	3a6e6af84f	fix: add title to validation dialog	2020-05-21 10:02:31 +05:30
Rucha Mahabal	f3a2f1fe20	fix(ip): code cleanup and translations	2020-05-21 09:27:42 +05:30
Rucha Mahabal	d9d1f442df	fix: service unit validation and translation	2020-05-21 09:02:46 +05:30
anoop	94762ff4ff	fix: invoiced field position, medical department field corrected in query	2020-05-21 03:08:47 +05:30
anoop	c6ee83bf12	fix: inpatient date validation removed, added role perms service unit defaults not set when created from tree, added validations on after_insert	2020-05-21 02:29:02 +05:30
anoop	b53638c0a3	fix: ip-order dialogs use long text field	2020-05-21 01:34:18 +05:30
anoop	4053c46609	fix: consider only submitted docs for invoicing	2020-05-21 01:31:48 +05:30
anoop	d3961b2a78	Merge branch 'develop' of https://github.com/frappe/erpnext into develop	2020-05-21 00:56:42 +05:30
anoop	53257833f8	feat: admission and discharge schedule detials via dialog	2020-05-21 00:55:35 +05:30
Deepesh Garg	29c748184c	fix: Project filter in Trial Baalance Report	2020-05-20 22:15:12 +05:30
anoop	858593b96e	fix: service unit create - set fields based on service unit type, added validations	2020-05-20 18:41:48 +05:30
Nabin Hait	054aafa1d7	fix: Assets module onboarding and dashboard	2020-05-20 18:22:39 +05:30
Saqib Ansari	4f024128af	fix: dashboard chart dialog filters	2020-05-20 18:22:39 +05:30
Saqib Ansari	7c5e22e9d8	fix: depreciation amount not shown in asset register	2020-05-20 18:22:39 +05:30
Saqib Ansari	37c3bd2892	chore: rename onboarding to module onboarding	2020-05-20 18:22:39 +05:30
Saqib Ansari	8990697fee	feat: fixed asset register based on fiscal year *asset value chart	2020-05-20 18:22:39 +05:30
Saqib Ansari	3882939fd9	fix: dashboard fixtures and FAR chart	2020-05-20 18:22:38 +05:30
Saqib Ansari	ecddf3358d	fix: dashboard fixtures	2020-05-20 18:22:38 +05:30
Saqib Ansari	1dcf103398	chore: enhance fixed asset report and remove redundant reports	2020-05-20 18:22:38 +05:30
Saqib Ansari	03007de4d7	fix: unexpected removal of finance book filter	2020-05-20 18:22:38 +05:30
Saqib Ansari	22aec57beb	feat: asset onboarding, dashboards	2020-05-20 18:22:38 +05:30
Shivam Mishra	e091789332	feat: remove website settings from boot (#21801 )	2020-05-20 16:17:12 +05:30
Anupam Kumar	ab250e4ed5	enable Allow Rename in sales stage (#21799 )	2020-05-20 16:15:48 +05:30
Anurag Mishra	2346353a22	fix: missing parameter (#21802 )	2020-05-20 16:14:09 +05:30
Marica	2b04e8eef0	fix: Validate Payment Gateway only if it exists in Payment Request. (#21805 )	2020-05-20 16:13:43 +05:30
Marica	91a9d3fbe5	fix: Reload doc in Healthcare company patch (#21808 )	2020-05-20 16:12:46 +05:30
Faris Ansari	ca2b323117	fix: Move address and contact templates to frappe	2020-05-20 14:56:29 +05:30
Nabin Hait	e9864aa578	Merge branch 'anupamvs-crm-onboarding' into develop	2020-05-20 12:55:59 +05:30
Nabin Hait	7cbbd68176	fix: CRM module dashboard and onboarding	2020-05-20 12:55:34 +05:30
rohitwaghchaure	df78e29957	Merge pull request #21724 from rohitwaghchaure/production-forecasting feat: production forecasting using exponential smoothing method	2020-05-20 12:30:56 +05:30
Nabin Hait	189be3c68b	Merge branch 'crm-onboarding' of https://github.com/anupamvs/erpnext into anupamvs-crm-onboarding	2020-05-20 12:07:55 +05:30
Rohit Waghchaure	841a8db5d1	updated manufacturing desk	2020-05-20 12:06:07 +05:30
Nabin Hait	9d04c06c62	fix: HR dashboard and onboarding	2020-05-20 12:05:03 +05:30
Rohit Waghchaure	e6147ed9bc	feat: production forecasting using exponential smoothing method	2020-05-20 11:31:06 +05:30
rohitwaghchaure	bd4629568d	Merge pull request #21793 from deepeshgarg007/general_ledger_against_voucher fix: Against voucher in General Ledger	2020-05-20 10:30:11 +05:30
Deepesh Garg	3949b51026	Merge pull request #21785 from anupamvs/sales-order-tax-fix fix: tax id is not fetched when creating sales order from quotation	2020-05-19 21:49:11 +05:30
Anupam K	75e8b1b519	tax id is not fetched in when creating sales order from quoation	2020-05-19 21:39:56 +05:30
Nabin Hait	6277367d21	fix: project desk	2020-05-19 21:18:26 +05:30
Nabin Hait	0b10c6a1bc	Merge branch 'project-refresh' of https://github.com/scmmishra/erpnext into scmmishra-project-refresh	2020-05-19 21:03:39 +05:30
Nabin Hait	041e31b8ba	fix: added dashboard link in healthcare desk	2020-05-19 20:58:00 +05:30
Nabin Hait	4db4464123	Merge branch 'healthcare-charts-and-onboarding' of https://github.com/ruchamahabal/erpnext into ruchamahabal-healthcare-charts-and-onboarding	2020-05-19 20:53:08 +05:30
Deepesh Garg	1b1787c61a	fix: Against voucher in General Ledger	2020-05-19 20:51:30 +05:30
Rucha Mahabal	0c03834190	fix(minor): pass ignore_mandatory flag for Lab Test Item Creation (#21784 )	2020-05-19 20:30:20 +05:30
Rucha Mahabal	99d348ffa3	fix: Patch for Setting Missing Company in Healthcare DocTypes (#21790 ) * fix: patch for setting missing company in Healthcare DocTypes * fix: check doctype exists Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-05-19 20:28:19 +05:30
Nabin Hait	939441117a	Merge branch 'marination-purchase-dashboard' into develop	2020-05-19 20:22:48 +05:30
Nabin Hait	e005078c0d	feat: buying module dashboard and onboarding	2020-05-19 20:22:25 +05:30
Deepesh Garg	9a914dc592	fix: Tax amount in GSTR-1 JSON	2020-05-19 20:01:25 +05:30
rohitwaghchaure	aa85e511da	feat: Production Planning Against Sales Order/Material Request/Work Order (#21763 ) Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-05-19 19:51:45 +05:30
Nabin Hait	ddec05ee07	Merge branch 'marination-stock-dashboard' into develop	2020-05-19 19:08:58 +05:30
Nabin Hait	8b686a5721	feat: stock module dashboard and onboarding	2020-05-19 19:08:30 +05:30
rohitwaghchaure	f128b1c0c5	refactor: changed the fieldtype from data to small text (#21782 )	2020-05-19 19:05:42 +05:30
Deepesh Garg	e6d9cec6de	Merge pull request #21788 from deepeshgarg007/gst_instate_v13 fix: Instate Invoice not appearing in GSTR-1 report	2020-05-19 19:04:24 +05:30
Deepesh Garg	007eda7164	fix: Instate Invoice not appearing in GSTR-1 report	2020-05-19 18:59:36 +05:30
Deepesh Garg	9aaed1de54	Merge pull request #21777 from scmmishra/rename-dash refactor: rename dashboards in desk page	2020-05-19 17:22:29 +05:30
Marica	0e59ae405e	Merge branch 'develop' into purchase-dashboard	2020-05-19 17:09:01 +05:30
marination	50d4bf578b	fix: Date filters added to dashboards, number cards and minor fixes.	2020-05-19 17:02:47 +05:30
Nabin Hait	8db28b5647	Merge branch 'stock-dashboard' of https://github.com/marination/erpnext into marination-stock-dashboard	2020-05-19 16:51:59 +05:30
Shivam Mishra	8caffe2c71	refactor: use text editor in issue web form (#21767 )	2020-05-19 16:37:34 +05:30
Shivam Mishra	31f00b6052	refactor: rename dashboards in desk page	2020-05-19 15:56:47 +05:30
rohitwaghchaure	65c90959d1	fix: renamed manufacturing dashboards to manufacturing (#21776 )	2020-05-19 15:54:24 +05:30
Rucha Mahabal	7c759d4276	Merge branch 'develop' into healthcare-charts-and-onboarding	2020-05-19 15:39:27 +05:30
Rucha Mahabal	df1cd0ef70	fix: update default dashboard in Healthcare Desk Page	2020-05-19 15:38:46 +05:30
Marica	e50ca69bb9	Merge branch 'develop' into stock-dashboard	2020-05-19 14:39:31 +05:30
Himanshu	19ecde2197	fix: add naming series (#21769 )	2020-05-19 14:30:42 +05:30
marination	658f29915a	fix: PR and DN trend report charts, group by fixes	2020-05-19 13:58:13 +05:30
Rucha Mahabal	89dab1bc25	refactor: open links in new tab in form tour	2020-05-19 13:46:06 +05:30
Mangesh-Khairnar	e401be2a1a	Merge pull request #21654 from scmmishra/woocommerce-shipping	2020-05-19 13:31:26 +05:30
marination	64b36dba4f	fix: Changed Form Tour order and grammar fixes.	2020-05-19 13:27:10 +05:30
marination	a5fcaf66f9	fix: Added filters in number Cards	2020-05-19 13:05:22 +05:30
Rucha Mahabal	f472a19889	fix: mark onboarding steps as mandatory	2020-05-19 13:03:22 +05:30
Rohit Waghchaure	84011b79d1	fix: updated manufacturing onboarding and desk	2020-05-19 13:00:54 +05:30
Nabin Hait	f2fb9368db	fix: manufacturing dashboard	2020-05-19 12:32:39 +05:30
Rucha Mahabal	0799c679d4	feat: Healthcare Onboarding	2020-05-19 12:07:23 +05:30
Shivam Mishra	afeed27f8f	Merge branch 'develop' into project-refresh	2020-05-19 11:54:50 +05:30
Shivam Mishra	d3d3836943	style: cleaner conditions and returns	2020-05-19 11:53:28 +05:30
Nabin Hait	b03072f83f	fix: merge conflict	2020-05-19 11:35:08 +05:30
Rucha Mahabal	b8db275a35	feat: Department wise Patient Appointments custom chart	2020-05-19 01:46:48 +05:30
Rucha Mahabal	de3751387a	refactor: Lab Tests and Clinical Procedures charts to Percentage type	2020-05-18 19:15:08 +05:30
Rucha Mahabal	5162faa7df	fix: add default filters in Dashboard Charts	2020-05-18 18:59:59 +05:30
Rucha Mahabal	24477d5d06	feat: added Number Cards to Healthcare Dashboard	2020-05-18 18:15:20 +05:30
Nabin Hait	9aae6f4793	feat: accounting dashboard + desk	2020-05-18 18:03:11 +05:30
Rucha Mahabal	fb29714911	feat: Healthcare Dashboard	2020-05-18 16:28:11 +05:30
Marica	c734db5d45	fix: Validate Filters in Sales Funnel. (#21761 ) * fix: Validate Filters in Sales Funnel. * fix: Style fixes	2020-05-18 14:38:57 +05:30
Himanshu	d94a38eb51	fix: make queries show searchfields (#21685 ) * fix: make queries show searchfields * Update erpnext/controllers/queries.py Co-authored-by: Nabin Hait <nabinhait@gmail.com> * Update queries.py * Update erpnext/controllers/queries.py Co-authored-by: Nabin Hait <nabinhait@gmail.com> * Update erpnext/controllers/queries.py Co-authored-by: Nabin Hait <nabinhait@gmail.com> * fix: make fields string for sql Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-05-18 14:26:26 +05:30
rohitwaghchaure	be750096ed	fix: bom incorrect price list rate for raw material if price list currency is different from company currency (#21585 ) * fix: bom incorrect price list rate for raw material if price list currency is different from company currency * fixed test cases * fixed base_rate calculation and added plc_conversion_rate trigger	2020-05-18 14:23:30 +05:30
Shivam Mishra	4cd4109905	Merge branch 'develop' into woocommerce-shipping	2020-05-18 13:50:31 +05:30
Anurag Mishra	57bfee8ea9	fix: dashboard changes	2020-05-18 13:27:15 +05:30
Rucha Mahabal	1ac2512c73	refactor: desk page colors and filters	2020-05-18 12:55:05 +05:30
Rohit Waghchaure	1c9210b303	made changes in the dashboards, renamed number cards	2020-05-18 11:57:25 +05:30
Rohit Waghchaure	366bce678f	added onboarding for manufacturing	2020-05-18 11:57:25 +05:30
Rohit Waghchaure	34f4a2398b	feat: manufacturing dashboards	2020-05-18 11:57:25 +05:30
Deepesh Garg	a8807e2696	Merge branch 'develop' of https://github.com/frappe/erpnext into loan_patch_and_fixes	2020-05-18 11:52:39 +05:30
Nabin Hait	31b8be6c41	Merge branch 'accounts_dashboard' of https://github.com/deepeshgarg007/erpnext into deepeshgarg007-accounts_dashboard	2020-05-18 11:31:30 +05:30
Deepesh Garg	ec8c28e487	Revert "fix(accounting): Allow 0 threshold in Tax Withholding Category"	2020-05-18 11:27:38 +05:30
Shivam Mishra	2a2937bcbe	Merge branch 'develop' into woocommerce-shipping	2020-05-18 11:19:45 +05:30
Marica	f4f307c36a	fix: Patch to set status in old serial no data (#21720 ) * fix: Patch to set status in old serial no data * fix: Avoid get_doc in patch * fix: fetch all values and check status in one query	2020-05-18 11:18:44 +05:30
Nabin Hait	1862f5f29a	feat: Payroll based on employee cost center (#21609 )	2020-05-18 07:37:04 +05:30
Deepesh Garg	a63fda9097	Merge branch 'develop' of https://github.com/frappe/erpnext into loan_patch_and_fixes	2020-05-17 23:37:05 +05:30
Deepesh Garg	5ccefdc08a	fix: Patch to update old loans	2020-05-17 23:26:59 +05:30
Deepesh Garg	513099d624	fix: Description for various fields	2020-05-17 23:26:37 +05:30
Rucha Mahabal	9e8414798c	Merge branch 'develop' into multi_company	2020-05-17 22:53:03 +05:30
Rucha Mahabal	53934b7e3b	fix: failing test due to inpatient record	2020-05-17 22:44:19 +05:30
Rucha Mahabal	d3a5df2202	fix: codacy issues	2020-05-17 22:34:42 +05:30
Rucha Mahabal	2888e12dfc	fix: vital signs title field	2020-05-17 22:23:53 +05:30
Rucha Mahabal	30314f18f7	fix: patient appointment title	2020-05-17 22:06:02 +05:30
Rucha Mahabal	40d49306d3	fix: pass ignore_mandatory flag when updating customer from patient	2020-05-17 21:46:42 +05:30
Raffael Meyer	3bce13eaa2	fix: remove guest access (#21693 )	2020-05-17 20:58:37 +05:30
rohitwaghchaure	8e3fc5ee6e	fix: incorrect stock valuation for repack entry (#21736 )	2020-05-17 20:28:39 +05:30
Anurag Mishra	779fc898b1	fix: Future date half day validation (#21718 ) * fix: Future date half day validation * fix: Allow half day attendance only via leave application Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-05-17 20:18:30 +05:30
Rucha Mahabal	e83d1d221d	Merge branch 'develop' into multi_company	2020-05-17 20:02:12 +05:30
Shivam Mishra	bdc97e6b48	Merge branch 'develop' into woocommerce-shipping	2020-05-16 19:40:45 +05:30
Shivam Mishra	d69e3eb5d7	feat: use name instead of customer name to link address and contact	2020-05-16 19:37:03 +05:30
Shivam Mishra	180bda7618	refactor: return address and contact objects	2020-05-16 19:20:55 +05:30
Shivam Mishra	fc514ba940	feat: save contact to woocommerce	2020-05-16 19:19:18 +05:30
Deepesh Garg	bf16956d10	Merge pull request #21656 from kevingdc/bugfix/tax-withholding-category-description fix(accounting): Tax Withholding Category Description default	2020-05-16 18:07:45 +05:30
Deepesh Garg	2a0e3e3515	fix: Remove strip	2020-05-16 18:07:03 +05:30
Deepesh Garg	2567815b03	Merge pull request #21655 from kevingdc/bugfix/zero-threshold-in-tax-withholding-category fix(accounting): Allow 0 threshold in Tax Withholding Category	2020-05-16 17:55:51 +05:30
rohitwaghchaure	7435174300	Merge pull request #21747 from rohitwaghchaure/fix-supplier-schema-save-issue fix: promotional scheme not able to save	2020-05-16 11:34:23 +05:30
Rohit Waghchaure	49dbbdc4cb	fix: promotional scheme not able to savce	2020-05-16 04:59:59 +05:30
marination	75c65fd1b1	fix: Handle empty chart state and change desk dashboard	2020-05-15 23:47:51 +05:30
marination	a74d433cd8	fix: Fixed Dashboard Charts, modified fixtures and minor changes	2020-05-15 23:37:48 +05:30
marination	e46916be56	Merge branch 'develop' of https://github.com/frappe/erpnext into purchase-dashboard	2020-05-15 21:17:25 +05:30
rohitwaghchaure	5cfbdf4bcb	fix: user not able to view product (#21740 )	2020-05-15 19:36:23 +05:30
Deepesh Garg	7be71c88f2	fix: Better validation message for group accounts (#21725 )	2020-05-15 19:23:41 +05:30
Deepesh Garg	1b821fec4b	Merge pull request #21742 from nextchamp-saqib/payment-remark-fix fix: update remark on submitting payment entry	2020-05-15 17:48:51 +05:30
Saqib Ansari	03d165ff79	fix: update remark on submitting payment entry	2020-05-15 16:39:02 +05:30
Deepesh Garg	a812ad7555	Merge pull request #21699 from nextchamp-saqib/pur-inv-status-fix fix: purchase inv shows overdue for fraction of outstanding	2020-05-15 15:46:23 +05:30
marination	ec1f9594fa	fix: Refined Onboarding, desk cards and renamed field in Buying Settings	2020-05-15 15:17:11 +05:30
Deepesh Garg	5ee8327415	Merge pull request #21729 from nabinhait/basic-hra-comp fix: Submit perm for other income and removed caching while getting hra and basic from company	2020-05-15 14:44:37 +05:30
Saqib Ansari	940856cc16	fix: add tests for set_status	2020-05-15 14:30:24 +05:30
rohitwaghchaure	2ee400989b	Merge pull request #21273 from marination/quoted-item-report refactor: Quoted Item Comparison Report	2020-05-15 13:47:48 +05:30
marination	2a73b3ef25	Merge branch 'develop' of https://github.com/frappe/erpnext into purchase-dashboard	2020-05-15 13:40:46 +05:30
marination	be5c45a9ae	chore: Fixtures and empty state handling in chart widgets	2020-05-15 13:21:58 +05:30
Deepesh Garg	7d61c03af4	fix: Add missing dimensions in GL entries (#21689 ) * fix: Add misssing dimensions in GL entries * fix: Add project filter in trial balance report * fix: Use current dimensions instead of dimensions from asset	2020-05-15 12:58:48 +05:30
Deepesh Garg	d75af70110	Merge pull request #21712 from Mangesh-Khairnar/fix-error-log-title fix: error log title for failing bank transactions	2020-05-15 12:16:53 +05:30
Rohan	200af04657	format: better error messages for invalid coupon codes (develop) (#21599 ) * format: better error messages for invalid coupon codes * fix: remove unnecessary docstatus check	2020-05-15 12:10:34 +05:30
Mangesh-Khairnar	f984bee5f9	fix: duplicate leave expiry creation (#21505 ) * fix: validate existing ledger entries to avoid duplicates * patch: remove duplicate ledger entries created * fix: consider only submitted ledger entries * fix: delete duplicate leaves from the ledger * fix: check if duplicate ledger entry exists * chore: formatting changes Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-05-15 11:55:42 +05:30
rohitwaghchaure	c649468f37	Fixed typo	2020-05-15 11:35:41 +05:30
theopen-institute	3373dad708	Added a posting_date field to Fee Schedule, which carries forward to created Fees	2020-05-15 08:51:39 +05:45
rohitwaghchaure	b8011197d9	Merge branch 'develop' into quoted-item-report	2020-05-15 04:54:40 +05:30
rohitwaghchaure	10e24d9249	Merge pull request #21600 from anupamvs/lead-customer-issue fix: adding Email and Phone in Contact child table	2020-05-15 04:43:38 +05:30
rohitwaghchaure	abcd40c75f	Merge pull request #21715 from anupamvs/sm-fix fix: Twitter and LinkedIn Auth fix	2020-05-15 04:37:40 +05:30
Saqib	41b47a68b3	fix: item price not fetching when customer is unset in item price (#21488 ) * fix: item price not fetching when customer is unset in item price * fix: item price of selling type has hidden supplier value * fix: remove test variable * fix: test * patch: invalid customer/supplier based on item price type * fix: invalid query * fix: patch Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-05-15 04:24:36 +05:30
marination	3f7678416f	chore: Stock Onboarding	2020-05-15 04:13:02 +05:30
marination	fd8e0becd0	Merge branch 'develop' of https://github.com/frappe/erpnext into stock-dashboard	2020-05-15 01:36:30 +05:30
marination	bb95cd5fd8	chore: Added Dynamic Charts to DN and PR Trends Reports	2020-05-15 01:33:43 +05:30
Deepesh Garg	33f654ebfe	Merge branch 'develop' of https://github.com/frappe/erpnext into accounts_dashboard	2020-05-14 22:57:27 +05:30
Deepesh Garg	8bbac6defc	fix: Onboarding and Dashboard for accounts module	2020-05-14 22:57:11 +05:30
Anupam K	79a8bd1cdf	CRM Onboarding	2020-05-14 18:42:44 +05:30
Shivam Mishra	0fbc96cc8c	Merge pull request #21731 from prssanna/custom-chart-fix fix: add heatmap_year parameter to get	2020-05-14 18:27:07 +05:30
prssanna	39cb749f95	fix: add heatmap_year parameter to get	2020-05-14 18:25:58 +05:30
Nabin Hait	200f80c3d3	fix: Added submit permission in employee other income	2020-05-14 17:18:29 +05:30
Nabin Hait	10df3d5081	fix: Get basic and hra component from db, not from cache	2020-05-14 17:15:36 +05:30
marination	10bd2417ff	feat: Custom Dashboard 'Warehouse wise Stock Value' with Chart Source	2020-05-14 15:35:18 +05:30
marination	021acd0a01	chore: Stock Ageing and Item Shortage Reports with Charts	2020-05-14 13:20:43 +05:30
Suraj Shetty	dde39c3d1a	chore: Drop Python2 support (#21704 ) * chore: Drop Python2 support * test: Fix test redundancy by removing countries 3 countries seems ennough to test coa template feature	2020-05-14 12:09:36 +05:30
Saqib Ansari	13096cdbfe	fix: invalid conditional statement	2020-05-13 22:02:56 +05:30
Saqib	2b8f307ffe	Merge branch 'develop' into pur-inv-status-fix	2020-05-13 21:56:45 +05:30
Afshan	bd7e535885	Fix: Set General Ledger 'Group By' filter as 'Group by Voucher(Consolidated)' when opened from Invoice (#21673 ) * fix for issue #21419 * changing group by filter to default Group by Voucher (Consolidated)	2020-05-13 19:48:42 +05:30
Anupam K	1aaedd68b9	Twitter and LinkedIn Auth fix	2020-05-13 17:55:18 +05:30
Mangesh-Khairnar	4a9fd9ef6d	fix: error log title for failing bank transactions	2020-05-13 16:11:22 +05:30
Deepesh Garg	12a9328a63	Merge pull request #21668 from abhishekbalam/develop feat(Selling): Territory Wise Treeview In 'Customer Acquisition and Loyalty' Report	2020-05-13 14:26:40 +05:30
Saqib	7adfc34a26	Merge branch 'develop' into pur-inv-status-fix	2020-05-13 14:02:19 +05:30
Anurag Mishra	36aea71fd7	fix: new dashboard and report	2020-05-13 10:47:36 +05:30
Deepesh Garg	e9cc9f99d2	Merge pull request #21702 from abhishekbalam/error_msg_typo fix: typo in error message in loan_security_pledge.py	2020-05-12 19:11:42 +05:30
Abhishek Balam	673e704bb5	typo in error message in loan_security_pledge.py	2020-05-12 19:09:27 +05:30
marination	e4fc5ba83c	fix: Report conditional query simplification.	2020-05-12 18:58:54 +05:30
marination	7adca986fb	chore: Onboarding v2	2020-05-12 18:40:35 +05:30
marination	354b01617e	chore: Dashboard Fixtures	2020-05-12 17:35:17 +05:30
Deepesh Garg	cdeb897fff	fix: Account shortcut in desk page	2020-05-12 17:23:15 +05:30
Shivam Mishra	846ca09950	Merge branch 'develop' of https://github.com/frappe/erpnext into project-refresh	2020-05-12 17:13:59 +05:30
Abhishek Balam	411b125906	new parent updating logic, made requested changes	2020-05-12 15:25:35 +05:30
Saqib Ansari	734bfcdfc2	fix: purchase inv shows overdue for fraction of outstanding	2020-05-12 14:11:33 +05:30
marination	94ba286fd2	Merge branch 'develop' of https://github.com/frappe/erpnext into purchase-dashboard	2020-05-12 13:17:34 +05:30
marination	d99f85bf3c	chore: Fixtures using new sync api	2020-05-12 13:16:05 +05:30
Deepesh Garg	c6bd012e72	Merge branch 'develop' of https://github.com/frappe/erpnext into accounts_dashboard	2020-05-12 11:30:07 +05:30
barredterra	30d194d8a7	fix: hide transaction-specific for master data	2020-05-11 19:23:54 +02:00
barredterra	53445aa25a	fix: customer and supplier data	2020-05-11 19:15:49 +02:00
barredterra	2976831560	fix: truncate account names to max length	2020-05-11 19:15:03 +02:00
barredterra	55c048f56c	refactor: query meta data only once	2020-05-11 18:50:02 +02:00
barredterra	7a7add5001	fix(report view): explicitly set column width for	2020-05-11 18:36:57 +02:00
Shivam Mishra	498f658321	refactor: rename getting started to home (#21674 ) * feat: rename getting started to home * feat: added patch for renaming	2020-05-11 20:47:08 +05:30
Marica	97715f2877	fix: Message for missing valuation rate (#21686 )	2020-05-11 20:45:37 +05:30
Deepesh Garg	b52e40037a	fix: Remove domain restriction from Location doctype (#21659 )	2020-05-11 20:01:57 +05:30
Chinmay Pai	30f26b4457	fix: do not setup charts if not setup_complete or no company found (#21670 ) * fix: do not setup charts if not setup_complete or no company found Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com> * chore: remove check for setup_complete moved the check for setup_complete to frappe Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com> * chore: return an empty dict from get_data if company not set Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>	2020-05-11 19:54:46 +05:30
sahil28297	28c9468dad	fix(patch): use translated string while setting notification template (#21679 )	2020-05-11 19:28:10 +05:30
Nabin Hait	85a89812a4	fix: Run income-tax-slab patch only if slab already exists in payroll period (#21684 )	2020-05-11 19:23:18 +05:30
Marica	8a85b9428b	Merge branch 'develop' into quoted-item-report	2020-05-11 17:56:11 +05:30
Deepesh Garg	e684727923	Merge pull request #21519 from nextchamp-saqib/sales-report-total-row chore: add total row in sales analytics report	2020-05-11 17:07:59 +05:30
Nabin Hait	6e5952fa69	fix: Changed label for payroll working days based on field	2020-05-11 16:11:43 +05:30
Abhishek Balam	87776c335b	code improvements	2020-05-11 15:18:40 +05:30
Deepesh Garg	ece1b4bc5a	Merge pull request #21676 from rohitwaghchaure/fixed-qty-validation-in-stock-entry fix: '<' not supported between instances of 'str' and 'int'	2020-05-11 12:27:20 +05:30
Deepesh Garg	0defefda92	feat: Standard accounts dashboard	2020-05-11 12:14:46 +05:30
Rohit Waghchaure	3a914a7cd7	fix: '<' not supported between instances of 'str' and 'int'	2020-05-11 11:44:45 +05:30
rohitwaghchaure	f6c7461eb8	Merge pull request #21661 from marination/barcode-update fix: Item Barcode stays the same after updating.	2020-05-11 11:01:01 +05:30
rohitwaghchaure	6a61636c58	Merge pull request #21665 from anupamvs/assessment-issue fix: Assessment Plan not getting created	2020-05-11 07:17:46 +05:30
rohitwaghchaure	5abccc1a61	Merge pull request #21601 from rohitwaghchaure/fix-completed-qty-in-work-order fix: work order operation completed qty	2020-05-11 07:07:28 +05:30
rohitwaghchaure	76dd10f48a	Merge pull request #21652 from rohitwaghchaure/fixed-branch-code-and-swift-number fix: wrong fieldname branch_code in add_fetch	2020-05-11 07:06:42 +05:30
Deepesh Garg	e720882410	Merge pull request #21642 from kevingdc/bugfix/fix-budget-variance-report fix(accounting): fix incorrect output in Budget Variance Report	2020-05-10 17:27:46 +05:30
Deepesh Garg	b81bd5f70c	fix: Formatting fixes	2020-05-10 17:24:11 +05:30
Abhishek Balam	500dff63e7	fix: adjusted width of colums to see full column names, also fixes #21556	2020-05-10 14:53:59 +05:30
Abhishek Balam	5ec5584319	In treeview, bold only for root territory, looks cleaner	2020-05-10 00:24:43 +05:30
Abhishek Balam	7cbc902d90	removed validation for root node in territory, codacy recommended changed	2020-05-09 22:35:28 +05:30
Abhishek Balam	b59f2780eb	fix: renamed view types, added default	2020-05-09 22:09:02 +05:30
Abhishek Balam	d543830a59	feat(Selling): Added Territory wise treeview to 'Customer Acquistion and Loyalty' report	2020-05-09 21:56:53 +05:30
Suraj Shetty	65d3ac814d	fix: Add accidentally removed function	2020-05-09 17:39:59 +05:30
Anupam K	aadf264b49	Assessment Plan not getting created	2020-05-09 16:15:51 +05:30
Suraj Shetty	d53822f012	Merge pull request #21618 from scmmishra/sync-dashboards	2020-05-09 14:15:20 +05:30
Kevin Chan	bc05855805	fix: Simplify get_dimension_account_month_map This commit updates get_dimension_account_month_map to no longer show the actual expense when there is no budget. This also removes the other functions and queries related to it. Spaces are also converted to tabs.	2020-05-09 16:02:11 +08:00
Gavin D'souza	cb1376b036	chore: verbose error message for coa recursion	2020-05-09 12:05:33 +05:30
Deepesh Garg	9b70a0ac18	Merge pull request #21663 from deepeshgarg007/gross_net_profit fix: Gross and net profit report fix	2020-05-08 19:56:58 +05:30
Deepesh Garg	3392e6b80c	fix: User filters instead of hardcoded values	2020-05-08 19:53:09 +05:30
Deepesh Garg	8d9f86f781	fix: Gross and net profit report fix	2020-05-08 19:45:57 +05:30
Anupam K	be6eb201b7	Appending Email and Phone in Child Table	2020-05-08 17:33:21 +05:30
marination	65123d2adc	fix: Item Barcode stays the same after updation.	2020-05-08 16:30:46 +05:30
rohitwaghchaure	8b9574d434	Merge pull request #21657 from rohitwaghchaure/fixed-stock-and-account-value-comparison-report fix: local variable 'lft' referenced before assignment	2020-05-08 15:39:24 +05:30
Rohit Waghchaure	074ea2f882	fix: local variable 'lft' referenced before assignment	2020-05-08 15:33:35 +05:30
Kevin Chan	9d81f97fe6	fix: Tax Withholding Category Description default This commit fixes a bug that happens when a Purchase Invoice uses a Tax Withholding Category without a category_name. The category_name is used as the tax description which is a required field. The bug was fixed by using the Tax Withholding Category's name as the description if the category_name is empty.	2020-05-08 18:01:18 +08:00
Kevin Chan	e29283630b	fix: Zero threshold in Tax Withholding Category This fixes a bug in Tax Withholding Category where if it has a threshold of 0, it doesn't apply to Purchase Invoices. The bug was fixed by updating the condition.	2020-05-08 17:45:08 +08:00
Shivam Mishra	a788ab281e	fix: typo in function name	2020-05-08 15:13:48 +05:30
Shivam Mishra	da41724d9d	feat: save shipping address to woocommerce customer	2020-05-08 15:12:08 +05:30
Rohit Waghchaure	7d4ccdf240	fix: wrong fieldname branch_code in add_fetch	2020-05-08 13:27:25 +05:30
sahil28297	5b1a0fe00e	fix: bump erpnext develop to version 13-dev (#21651 )	2020-05-08 13:06:50 +05:30
rohitwaghchaure	b29926c913	Merge pull request #21632 from SDLyu/patch-1 format: Add address template for Taiwan.	2020-05-08 11:12:36 +05:30
rohitwaghchaure	f0385d0671	Merge pull request #21638 from MyuddinKhatri/lead-update-fix-v13 fix(crm): fix lead while updating contact details (develop)	2020-05-08 10:37:11 +05:30
rohitwaghchaure	67c33d1f8b	Merge pull request #21643 from sahil28297/fix_lead_name fix(lead): strip lead_name before splitting	2020-05-08 10:35:48 +05:30
rohitwaghchaure	e74f689ffa	Merge pull request #21644 from anupamvs/lms-label fix: renaming LMS to Learning Management System	2020-05-08 10:29:39 +05:30
rohitwaghchaure	6a9c84b5f6	Merge pull request #21641 from frappe/mergify/bp/develop/pr-21635 fix: Job Card submitted qty (bp #21635)	2020-05-08 10:28:19 +05:30
rohitwaghchaure	02af52fffb	Merge pull request #21612 from anupamvs/social-media-auth fix: fixing callback urls	2020-05-08 10:27:43 +05:30
rohitwaghchaure	b310d6f372	Merge pull request #21649 from anupamvs/payment-order-fix fix: Payment Order not allowing to create Payment Entry	2020-05-08 10:26:42 +05:30
Anupam K	8b52697723	Payment Order not allowing to create Payment Entry	2020-05-08 02:23:28 +05:30
Rucha Mahabal	383a94d730	fix: delete old appointment analytics tree grid report	2020-05-07 23:32:53 +05:30
Anupam K	ebf3b78b42	renaming LMS to Learning Management System	2020-05-07 19:20:16 +05:30
Marica	c1a890a739	Merge branch 'develop' into quoted-item-report	2020-05-07 17:45:32 +05:30
marination	31a747b98a	fix: Query enhancement, cleanup, added extra filter - Query changes as requested - Moved chart generation from js to py - Added Supplier Multiselect filter	2020-05-07 17:38:00 +05:30
Sahil Khan	b1385f676a	fix(lead): strip lead_name before splitting	2020-05-07 16:47:41 +05:30
Türker Tunalı	2ba89ffd48	fix: Job Card submitted qty Update Operation Status function in work order was throwing exception without checking the "Overproduction Percentage For Work Order" setting. To submit Job Card qty for more than the Work Order's "To Manufacture Qty" we need to apply this fix. (cherry picked from commit 9bd6d119c405f2ace6c93d53647af140c6543542)	2020-05-07 10:51:35 +00:00
Kevin Chan	b3ee6314f9	fix: Fix Budget Variance Report This commit fixes a bug in Budget Variance Report where it combines the actual expense amounts across different fiscal years. This was fixed by updating the function and queries for computing the actual expense amounts.	2020-05-07 18:39:47 +08:00
Deepesh Garg	58f02e7c10	Merge pull request #21639 from deepeshgarg007/loan_unpledge_uutility_fix fix: Loan Security Unpledge fixes	2020-05-07 15:45:32 +05:30
Myuddin khatri	fc0e45d79c	solved merge conflicts	2020-05-07 15:38:20 +05:30
Deepesh Garg	dd340c15de	fix: Loan Security Unpledge fixes	2020-05-07 15:35:54 +05:30
Kevin Chan	52189cba86	style: Improve formatting This commit improves indentations and makes sql queries more readable.	2020-05-07 17:49:32 +08:00
SDLyu	b2eb4ee0f9	Change <br> position Change <br> position for better format	2020-05-07 17:09:17 +08:00
SDLyu	e164985903	Create taiwan.html	2020-05-07 16:49:29 +08:00
sahil28297	c759e17900	fix(item): patch to rename duplicate item_code values to name (#21622 ) Co-authored-by: Mangesh-Khairnar <mkhairnar10@gmail.com>	2020-05-07 12:12:13 +05:30
rohitwaghchaure	9de26f6648	fix: list index out of range (#21613 )	2020-05-07 12:06:47 +05:30
Shivam Mishra	318affedb8	fix: divide by zero error	2020-05-06 20:26:12 +05:30
Shivam Mishra	20a1d375f3	feat: add fixture for project dashboards	2020-05-06 20:26:00 +05:30
Shivam Mishra	41616d4dd8	feat: add name to fixture	2020-05-06 20:21:05 +05:30
marination	4a73bc672b	fix: Old buying config update & bar chart on desk - Line chart was inapprpriate as the values were not continuous.	2020-05-06 18:34:07 +05:30
Deepesh Garg	9513171d3f	Merge pull request #21624 from deepeshgarg007/reversse_gl_fix fix(minor): Reverse GL fix	2020-05-06 18:19:19 +05:30
marination	631260b632	chore: Added fixtures and Onboarding.	2020-05-06 18:12:26 +05:30
Deepesh Garg	b821f22b7c	fix(minor): Reverse GL fix	2020-05-06 18:12:23 +05:30
Prssanna Desai	d50502ca40	fix: fix get_employee_details query (#21623 )	2020-05-06 17:36:48 +05:30
Anurag Mishra	2596c8bbe7	fix: upload attendance (#21620 )	2020-05-06 17:06:53 +05:30
Shivam Mishra	8cdcb965c5	feat: added dashboard fixtures for health care	2020-05-06 15:19:22 +05:30
Shivam Mishra	28436d2bc1	feat: added dashboard fixtures for accounts	2020-05-06 15:19:10 +05:30
Shivam Mishra	b2103f5470	feat: remove old fixtures	2020-05-06 15:18:43 +05:30
Rucha Mahabal	8993d38daf	fix: set avg response time only when there are responses	2020-05-06 13:37:10 +05:30
Rucha Mahabal	3d891f8e89	fix: set SLA as Ongoing on Issue Reopen	2020-05-06 13:00:33 +05:30
Rucha Mahabal	f2d36364f5	fix: handle issue metrics on Reopen and Close	2020-05-06 12:32:55 +05:30
Rucha Mahabal	f77d7243dc	fix: remove Service Level DocType	2020-05-06 11:47:52 +05:30
Rucha Mahabal	fc4c795661	fix: reset issue metrics on Reopen and Split	2020-05-06 11:42:43 +05:30
Rucha Mahabal	a2a1e257ae	fix: set Issue metrics using Duration fieldtype	2020-05-06 11:09:33 +05:30
Deepesh Garg	88e6f72cad	Merge branch 'develop' into sales-report-total-row	2020-05-06 10:48:21 +05:30
Deepesh Garg	3e0c51879e	fix: Set Purchase Receipt and Delivery Note detail patch (#21607 ) * fix: Set Purchase Receipt and Delievry Note detail patch * fix: Reload purchase receipt item	2020-05-06 10:46:13 +05:30
Anupam K	d078883cd4	fixing callback urls	2020-05-06 01:13:51 +05:30
marination	cc989b62bd	feat: Buying Desk, Dashboard and Reports	2020-05-05 23:58:08 +05:30
Rucha Mahabal	35d853a476	fix: SLA in issues with Duration Fieldtype	2020-05-05 18:54:50 +05:30
Shivam Mishra	81f8fbb042	feat: update colors	2020-05-05 18:53:29 +05:30
Shivam Mishra	e15dc052a2	Merge branch 'develop' of https://github.com/frappe/erpnext into project-refresh	2020-05-05 18:48:35 +05:30
Shivam Mishra	945aa08d92	feat: show stacked in report	2020-05-05 18:46:21 +05:30
Shivam Mishra	5f1240bcc6	feat: updated charts to use stacked layout	2020-05-05 18:44:02 +05:30
Nabin Hait	a4567a446f	fix: Test for payroll entry	2020-05-05 18:36:12 +05:30
Nabin Hait	07fe4e1933	Update add_default_dashboards.py	2020-05-05 18:27:13 +05:30
Deepesh Garg	0ff0522500	Merge pull request #21605 from deepeshgarg007/loan_security_unpledge_fixes fix: Loan security unpledge fixes	2020-05-05 17:04:22 +05:30
Deepesh Garg	af27c5142f	fix: Loan securiyt unpledge fixes	2020-05-05 16:54:48 +05:30
Rohit Waghchaure	6e95d248e3	fix: work order operation completed qty	2020-05-05 16:35:45 +05:30
rohitwaghchaure	54a6c64b0f	fix: against voucher no not all records showing in case of Group By Voucher (consolidated) (#21592 )	2020-05-05 16:17:15 +05:30
Saqib	d76f167e96	fix: handle make_gl_entry in case of cwip enable after puchasing (#21529 ) * fix: handle make_gl_entry in case of cwip enable after puchasing * fix: invalid variable assignment * fix: make gl entries if cwip has been booked even if cwip is disabled * add tests * fix: conditions Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-05-05 16:14:45 +05:30
Saqib	fff00cee3a	chore: fix error message (#21593 ) * chore: fix error message * chore: add row idx	2020-05-05 16:14:17 +05:30
Saqib	d46696fa03	fix: cannot make payment entry against shareholder (#21597 )	2020-05-05 16:10:47 +05:30
Anurag Mishra	ddcc4fa9b9	Feat: Monthly attendance sheet Enhancements and UI/UX Improvements (#21331 ) * refactor: Employee attendance sheet redesign * feat: Added weekly off status in monthly Attendance sheet Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-05-05 16:08:05 +05:30
Rucha Mahabal	98229db3ae	feat: Default Dashboard for Healthcare Workspace (#21414 ) * feat: Default Dashboard for Healthcare Workspace * fix: patch * Update add_healthcare_dashboard.py * fix: failing patch test Co-authored-by: Nabin Hait <nabinhait@gmail.com> Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>	2020-05-05 16:02:16 +05:30
Nabin Hait	672b74d89c	fix: Patch and tests	2020-05-05 15:58:52 +05:30
Anupam K	d097eaef63	Appending Email and Phone in Child Table	2020-05-05 15:57:49 +05:30
Nabin Hait	5a1a765ebf	Update test_leave_encashment.py	2020-05-05 15:37:17 +05:30
Nabin Hait	9be11455a5	Merge branch 'develop' into refactor-addiional-salary	2020-05-05 14:43:07 +05:30
Marica	5e3d8050aa	fix: Handle rows with same item code from Purchase Receipt to Invoice. (#20724 ) * fix: Handle rows with same item code from Purchase Receipt to Invoice. * fix: Added patch, fixed tests, fixed delivery note behaviour * chore: Added comments amd fixed typo * fix: Added patch to patches.txt * fix: Patch fix and simplification, json timestamp updation. Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-05-05 14:37:39 +05:30
Shivam Mishra	cc7488a90d	feat: rerun patch to add default dashboards	2020-05-05 13:05:53 +05:30
Shivam Mishra	39fe688809	fix: dashboard chart link	2020-05-05 13:05:38 +05:30
rohitwaghchaure	5210761e57	fix: heatmap not working for customer and supplier (#21578 ) Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-05-05 12:12:33 +05:30
Suraj Shetty	8e08698c15	test: Fix wrong test for search function (#21588 )	2020-05-05 12:06:58 +05:30
Rucha Mahabal	ec24afb283	fix: change response and resolution fieldtype to Duration in SLA	2020-05-05 10:02:14 +05:30
Shivam Mishra	4ea122662a	refactor: less verbose labels for charts	2020-05-04 20:29:59 +05:30
Shivam Mishra	c7f5724fad	feat: added project summary chart to desktop	2020-05-04 20:28:24 +05:30
Shivam Mishra	813bc49868	feat: added Report Summary Chart as fixture	2020-05-04 20:27:26 +05:30
Shivam Mishra	1607891a3c	feat: added basic project summary report	2020-05-04 20:26:33 +05:30
Saqib Ansari	52cc6ad456	fix: test	2020-05-04 20:24:00 +05:30
Shivam Mishra	100453c64f	feat: added open count tag	2020-05-04 19:32:20 +05:30
sahil28297	232396494b	fix(patch): reload GSTR 3B report	2020-05-04 19:20:55 +05:30
Anurag Mishra	94719e7e81	fix: tests	2020-05-04 18:54:06 +05:30
Anurag Mishra	09572d9892	patch: to link additional salary with salary slip and leave encashment, incentive with additional salary	2020-05-04 17:07:15 +05:30
Anurag Mishra	e15f0da011	fix: conflicts	2020-05-04 13:56:07 +05:30
Anurag Mishra	57f49ae312	Merge branch 'develop' into refactor-addiional-salary	2020-05-04 13:55:17 +05:30
Deepesh Garg	781bf78ce5	Merge pull request #21580 from deepeshgarg007/due_date_loan fix: Use grace period in days for calculation of due date	2020-05-04 13:49:20 +05:30
Deepesh Garg	2a0de58f3d	fix: Use grace period in days for calculation of due date	2020-05-04 13:45:43 +05:30
Nabin Hait	312341555f	Merge branch 'develop' into refactor-addiional-salary	2020-05-04 12:42:20 +05:30
Anurag Mishra	f453a1c13f	Fix: requested Changes	2020-05-04 12:36:01 +05:30
Faris Ansari	c6325c2f34	Merge pull request #21550 from frappe/new-translations	2020-05-04 12:28:29 +05:30
Andy Zhu	f7a0b8b5b6	fix: fieldname update for 'Credit' and 'Debit' (#21405 ) * fix: fieldname update for 'Credit' and 'Debit' 'credit' updated to 'credit_in_account_currency' 'debit' updated to 'debit_in_account_currency' * Update journal_entry.py Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-05-04 12:09:28 +05:30
Mangesh-Khairnar	c4c7d15d54	fix: pre-process both the existing and new products (#21526 ) * fix: pre-process both the existing and new products * fix: delete hub tracked item on unpublish Co-authored-by: Marica <maricadsouza221197@gmail.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-05-04 11:25:06 +05:30
Deepesh Garg	095b5586a2	fix: Accounting Dimensions in Period Closing Voucher (#21564 )	2020-05-04 11:12:14 +05:30
Rucha Mahabal	0243981f31	fix: handle exception if sending Appointment Confirmation message fails (#21569 )	2020-05-04 11:08:44 +05:30
Deepesh Garg	c33c309da3	Merge pull request #21571 from surajshetty3416/fix-console refactor: Folio no validation	2020-05-04 09:03:14 +05:30
Deepesh Garg	6df581f78b	Merge pull request #21375 from marination/commonify-warehouse-autofill chore: Commonify auto-filling warehouses in child tables	2020-05-03 20:33:45 +05:30
Suraj Shetty	9a8512d01d	fix: NameError due to invalid variable	2020-05-03 20:17:47 +05:30
Suraj Shetty	9fffe254fc	refactor: Folio no validation	2020-05-03 19:10:02 +05:30
rohitwaghchaure	268df35d80	Merge pull request #21516 from marination/stock-balance-cleanup chore: Added company filter and minor cleanup in Stock Balance Report	2020-05-03 16:31:34 +05:30
Saqib Ansari	ab9bb08c4b	fix: test	2020-05-03 14:53:13 +05:30
Saqib	d84a55313a	chore: add validation for gross purchase amount (#21534 ) * chore: add validation for gross purchase amount * fix: tests Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-05-03 13:20:24 +05:30
Suraj Shetty	a5f1fe5bba	Merge branch 'develop' of https://github.com/frappe/erpnext into new-translations	2020-05-03 12:39:12 +05:30
Mangesh-Khairnar	2f7861a9b8	feat: Process deferred accounting entry (#19658 ) * feat: process deferred accounting * feat: maintain entry for deferred accounting * feat: add check for automatic deferred accounting entry * feat: add build conditions for company and account * fix: create record for automatic processing of deferred accounting * feat: add custom naming series * fix: change the deferred revenue creation via hooks * fix: add client side validations * test: creation of gl entries on submission of process deferred accounting * fix: add multiple validations * patch(accounts-settings): set automatically process deferred accounting entry * fix: On cancel function for deferred entry * fix: Send email per process instead of per invoice * fix: Test cases * fix: Label * fix: Process deferred accounting fixes * fix: Error flag Co-authored-by: Nabin Hait <nabinhait@gmail.com> Co-authored-by: deepeshgarg007 <deepeshgarg6@gmail.com> Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2020-05-02 20:09:33 +05:30
Saqib Ansari	826b39559d	fix: review fixes	2020-05-02 19:50:45 +05:30
Saqib Ansari	971170c590	fix: incorrect total in sales analytics for customer/item group	2020-05-02 19:39:03 +05:30
Gavin D'souza	0c353a64a4	fix: un-using buggy JS frappe.new_doc	2020-05-02 18:58:33 +05:30
Deepesh Garg	cea4eeaa53	fix: Reverse GL Entry on cancel fix	2020-05-02 18:05:33 +05:30
Marica	1c8cbd07b8	fix: variable referenced before assignment (#21560 )	2020-05-02 17:55:15 +05:30
Nabin Hait	ddf90b29f2	Update salary_slip.py	2020-05-01 22:34:28 +05:30
Nabin Hait	a67fb31f67	Merge branch 'develop' into refactor-addiional-salary	2020-05-01 19:04:20 +05:30
Nabin Hait	fdacc50e78	Update salary_detail.json	2020-05-01 19:04:00 +05:30
Nabin Hait	a1ffc44f0c	fix: removed unwanted comma from json	2020-05-01 18:55:57 +05:30
Deepesh Garg	f7966f444d	Merge pull request #21404 from abhishekbalam/develop feat(Accounts): Journal Entry Templates v1	2020-05-01 18:42:54 +05:30
Deepesh Garg	978de8779c	fix: Add multi currency check and proper account filters	2020-05-01 18:38:13 +05:30
Nabin Hait	da17f9cb05	feat: Run MRP at parent level in the production plan (#21545 ) * enhance: provision to make material request from other location * fix: source warehouse for material transfer from production plan Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>	2020-05-01 18:16:25 +05:30
Saqib	39805918d4	fix: accounts payable shows advance amount of other company (#21548 )	2020-05-01 18:15:13 +05:30
Vishal Dhayagude	2e082affc7	fix(HR): Leave application company field made read-only and filter in Monthly attendance sheet (#20912 ) * fix(HR): Leave application company field made Readonly * fix: in monthly report attandance employee filter based on company * fix: minor typo * fix: Fetch company from employee * Update monthly_attendance_sheet.py Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-05-01 18:11:43 +05:30
Suraj Shetty	119f2f07a5	Merge branch 'develop' into new-translations	2020-05-01 17:59:58 +05:30
Deepesh Garg	0f8150f8de	Merge pull request #21546 from deepeshgarg007/loan_closure_fixes fix: Loan Closure without loan interest accrual	2020-05-01 15:49:56 +05:30
Deepesh Garg	662838adb3	fix: Party Type filter in payment entry list view (#21541 )	2020-05-01 15:00:55 +05:30
Gavin D'souza	af612ddb6d	feat: maintain tally voucher numbers feat: create seperate customer and supplier entries for same party if case exists	2020-05-01 14:39:11 +05:30
Gavin D'souza	51305a028b	feat: prompt that company and COA will be overwritten	2020-05-01 14:37:28 +05:30
Deepesh Garg	db83c29079	Merge branch 'develop' into develop	2020-05-01 14:20:53 +05:30
Deepesh Garg	1b35873743	Merge branch 'develop' into loan_closure_fixes	2020-05-01 14:18:36 +05:30
Deepesh Garg	1a1b06cf59	Merge pull request #21539 from deepeshgarg007/trvis_child_table_validation_fix fix: Travis (develop)	2020-05-01 14:17:46 +05:30
Deepesh Garg	032814b86a	fix: Patch test	2020-05-01 13:26:26 +05:30
Deepesh Garg	998364d636	fix: Update timestamp	2020-05-01 12:04:13 +05:30
Deepesh Garg	6cce75a230	Revert "fix: Update in field type"	2020-05-01 12:03:18 +05:30
Deepesh Garg	e2de2923e2	Merge pull request #21420 from wojosc/patch-8 fix: Update in field type	2020-05-01 11:38:23 +05:30
Deepesh Garg	779815a035	fix: Loan Repayment Test	2020-05-01 11:04:12 +05:30
rohitwaghchaure	be16e5cccc	fix: 'NoneType' object is not iterable (#21537 )	2020-05-01 10:50:17 +05:30
rohitwaghchaure	52005d1ea3	Merge pull request #21501 from nextchamp-saqib/validate-paid-inv-msg chore: validate and warn payment against paid invoices	2020-05-01 10:37:23 +05:30
Deepesh Garg	2dbd228eab	fix: Check is child table for POS profile user	2020-05-01 09:50:56 +05:30
rohitwaghchaure	260bf54c99	Merge pull request #21171 from nextchamp-saqib/rename-bank-reco chore: rename bank reconciliation to bank clearance	2020-05-01 09:33:52 +05:30
Deepesh Garg	1a497b3442	Merge branch 'develop' of https://github.com/frappe/erpnext into loan_closure_fixes	2020-05-01 09:24:10 +05:30
marination	3568dc75be	fix: Make Company the first filter	2020-05-01 00:01:37 +05:30
Shivam Mishra	d76c5e83ca	fix: elif block error	2020-04-30 22:39:03 +05:30
Deepesh Garg	61363d2ced	fix: Initialize interest_paid as zero	2020-04-30 22:22:44 +05:30
Deepesh Garg	4226191ec7	fix: Loan Closure without loan interest accrual	2020-04-30 22:11:57 +05:30
Saqib	dac51ea1cf	Merge branch 'develop' into validate-paid-inv-msg	2020-04-30 20:08:18 +05:30
Marica	66e99d5767	Merge branch 'develop' into razorpay-subscription	2020-04-30 20:07:05 +05:30
Saqib Ansari	dfa60e0ed8	chore: calculate total row month-wise in sales analytics	2020-04-30 20:06:30 +05:30
Rucha Mahabal	f65fb1fcf8	fix: Move Video Doctype from Education module to Core (#21234 ) * fix: move Video Doctype from Education module to Core * fix: patch to retain Permissions Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>	2020-04-30 19:47:18 +05:30
Saqib	4422ffdb22	chore: asset accounts should have company currency (#21524 )	2020-04-30 18:39:13 +05:30
Saqib Ansari	10d9974e77	chore: add total row in sales analytics report	2020-04-30 16:28:52 +05:30
Raffael Meyer	3484a79ccf	Update datev_settings.json (#21482 )	2020-04-30 16:27:11 +05:30

... 11 12 13 14 15 ...

23303 Commits