Commit Graph

33296 Commits

Author SHA1 Message Date
sahil28297
3d3c922d7f
fix(patch): handle duplicate entry error while inserting account () 2020-07-22 16:42:31 +05:30
Marica
514366654e
fix: Serial No Rename does not affect Stock Ledger Entry ()
* Revert "fix: Remove rename related code from Serial No ()"

This reverts commit 1ec2d962db.

* fix: Rename fails on Stock Ledger Entry

* fix: Allow Rename in Serial No
2020-07-22 16:40:24 +05:30
Marica
53646cb360
chore: Export Stock Dashboard () 2020-07-22 16:17:40 +05:30
Shivam Mishra
f50312b6d2
fix: button sizing () 2020-07-22 16:17:11 +05:30
Rucha Mahabal
1fddc6d126
chore: Exported Accounts Module Dashboard ()
* chore: Exported Accounts Module Dashboards

* chore: deleted dashboard fixtures for Accounts module
2020-07-22 16:11:06 +05:30
Afshan
6b9acf4476 updated patch to delete auto email reports and moved patch to v13 from v12 2020-07-22 16:00:18 +05:30
Rucha Mahabal
8d28eacb09
chore: Exported Healthcare Module Dashboard () 2020-07-22 15:57:33 +05:30
Deepesh Garg
d6615248a8
Merge pull request from DeeMysterio/financial-stat
fix(report): fix alignment in script report that extends financial_statements.js
2020-07-22 14:45:22 +05:30
Anupam K
de417d2774 feat: Provision to make RFQ against Opportunity 2020-07-22 01:05:32 +05:30
Afshan
871889220b
style: moved parent warehouse to top section also added a section bre… ()
* style: moved parent warehouse to top section also added a section break for better look

* style: changes display depends on for HTML field

Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-07-21 20:39:00 +05:30
Afshan
66d4b42df0
fix: update set query for warehouse after changing the company ()
* fix: update set query for warehouse after changing the company

* fix: changed set_query to get_query

* fix: variable filter doesn't get updated once set on load hence removed

Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-07-21 19:59:30 +05:30
Rucha Mahabal
ffbd7b4087 fix: move Video DocType from Core to Utilities module 2020-07-21 19:40:18 +05:30
Diksha Jadhav
09b8caf866 fix(report): fix alignment in script report that extends financial_statements.js 2020-07-21 17:35:10 +05:30
Deepesh Garg
9e5aa282ec
Merge pull request from nabinhait/trial-balance-opening-cancelled-entry-fix
fix: Ignore cancelled entries in trial balance opening
2020-07-21 16:42:02 +05:30
Abhishek Balam
a5b83e85c3
feat: dashboard for timesheet () 2020-07-21 12:54:59 +05:30
Nabin Hait
493b581862 fix: Ignore cancelled entries in trial balance opening 2020-07-21 12:47:16 +05:30
Rucha Mahabal
a13a0608b6
Merge pull request from frappe/vehicle
fix: Heatmap in Vehicle
2020-07-20 23:52:25 +05:30
Marica
8ec4198af2
Merge branch 'develop' into club-mr-column 2020-07-20 16:07:10 +05:30
Afshan
2b21b7bafa fix: moved custom_make_buttons to PurchaseOrderController to avoid duplication of dropdown options 2020-07-20 16:05:52 +05:30
michellealva
8c7d8ba917 fix: remove tab in code 2020-07-20 13:12:17 +05:30
michellealva
37cd1b8021 fix: Heatmap in Vehicle 2020-07-20 13:04:46 +05:30
Deepesh Garg
04e8af7dca Merge branch 'develop' of https://github.com/frappe/erpnext into loan_patch_and_fixes 2020-07-20 09:53:26 +05:30
Chinmay D. Pai
33bf0574a3
chore: fix get single value call
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-07-19 15:54:11 +05:30
Chinmay D. Pai
5bda28eae6
fix: reset homepage to home after unchecking products page
resets homepage back to home when "home page is products" is unchecked

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-07-19 00:15:40 +05:30
Deepesh Garg
d81372a39c
Merge pull request from deepeshgarg007/custom_cash_flow
fix: Period list api changes for custom cash flow report
2020-07-18 20:35:28 +05:30
Deepesh Garg
07f8e749be fix: Period list api changes for custom cash flow report 2020-07-18 19:47:33 +05:30
gavin
320cde956b
Merge branch 'develop' into dependabot/npm_and_yarn/lodash-4.17.19 2020-07-17 17:55:43 +05:30
Deepesh Garg
f6c70bca0a
Merge pull request from aerele/fix_mandatory_error
fix: log type mandatory error while exposing api call to employee checkin.
2020-07-17 17:38:21 +05:30
Deepesh Garg
2fd4aa3051
Merge pull request from frappe/lead-owner-efficiency
fix: making owner fieldtype to link
2020-07-17 17:36:59 +05:30
rohitwaghchaure
f4db8c1c11
Merge pull request from rohitwaghchaure/fixed-incorrect-currency-symbol-in-stock-balance-report-develop
fix: currency symbol not showing as per company currency in stock balance report
2020-07-17 16:56:22 +05:30
rohitwaghchaure
b4ef13c686
Merge pull request from rohitwaghchaure/fixed-actual-qty-showing-as-zero-develop
fix: Stock Reconciliation Invalid Quantity for Batched Item
2020-07-17 16:55:59 +05:30
dependabot[bot]
a96a16cf59
build(deps): bump lodash from 4.17.15 to 4.17.19
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19)

Signed-off-by: dependabot[bot] <support@github.com>
2020-07-17 11:07:58 +00:00
Rucha Mahabal
0eab84dc02
Merge pull request from Mangesh-Khairnar/fix-maintenance-visit
fix(maintenance-visit): change fieldtype of status to select
2020-07-17 16:35:21 +05:30
Rucha Mahabal
3e6fe38d02
Merge branch 'develop' into fix-maintenance-visit 2020-07-17 16:34:59 +05:30
Rohit Waghchaure
2347e69cb9 fix: for past dated stock reco, batched item showing the current available qty instead of quantity as per posting date 2020-07-17 14:50:49 +05:30
Rohit Waghchaure
848568d023 fix: currency symbol not showing as per company currency in stock balance 2020-07-17 14:49:12 +05:30
rohitwaghchaure
7e56e80057
Merge pull request from deepeshgarg007/gstr_test
fix: Multiple fixes in GST
2020-07-17 14:34:43 +05:30
Mangesh-Khairnar
9be6787b80 fix(maintenance-visit): change fieldtype of status to select 2020-07-17 12:51:49 +05:30
Rucha Mahabal
c2977cf877
Merge pull request from marination/issue-list-action
fix: Move Issue List actions under 'Actions' dropdown (ux)
2020-07-17 12:03:51 +05:30
Rucha Mahabal
7e64a1f170
Merge branch 'develop' into issue-list-action 2020-07-17 11:48:23 +05:30
Deepesh Garg
188273564c fix: Multiple fixes in GST 2020-07-17 11:31:15 +05:30
Deepesh Garg
e3e8f5069d
Merge pull request from frappe/delivery_note
fix: Update modified timestamp for Delivery Note Item
2020-07-17 11:29:47 +05:30
michellealva
d02465a68f fix: Update modified timestamp for Delivery Note Item 2020-07-17 10:35:16 +05:30
marination
6319073d81 fix: Move Issue List actions under 'Actions' dropdown 2020-07-16 15:38:51 +05:30
Karthikeyan S
ff6ba25386
fix: remove FE validation for log_type field 2020-07-16 13:33:38 +05:30
Anurag Mishra
ac23ac6a02
fix: validation for additional salary ()
* fix: validation for additional salary

* fix:changes requested

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2020-07-16 13:10:43 +05:30
Rucha Mahabal
aab0ada598
Merge pull request from Anurag810/expense-claim-payment-fix
fix: 'ExpenseClaim' object has no attribute 'conversion_rate'
2020-07-16 12:58:51 +05:30
Rucha Mahabal
6b3110ed13
Merge branch 'develop' into expense-claim-payment-fix 2020-07-16 12:23:26 +05:30
Anurag Mishra
50902cf30c Fix: Changes Requested 2020-07-16 12:21:46 +05:30
Deepesh Garg
48ba29b647
Merge pull request from surajshetty3416/fix-financial-statement-print-format
fix: Show total row in print format of financial statement
2020-07-16 11:32:34 +05:30