Suraj Shetty
|
d1902dfadb
|
Merge branch 'develop' of github.com:frappe/erpnext into refactor-website-routing
|
2021-06-14 12:25:49 +05:30 |
|
Deepesh Garg
|
856484aeb0
|
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into gst_taxtable_value_with_discount
|
2021-06-14 11:29:41 +05:30 |
|
Deepesh Garg
|
580346360f
|
fix: Auto tax calculations in Payment Entry
|
2021-06-14 11:16:39 +05:30 |
|
Marica
|
d37912fff1
|
Merge branch 'develop' into subcontracted-rm-to-transfer-report-develop
|
2021-06-12 16:00:14 +05:30 |
|
Anoop
|
28cdff10cf
|
fix: update linked Customer on Patient update only if Link Customer to Patient is enabled (#25926)
|
2021-06-12 14:17:04 +05:30 |
|
Rucha Mahabal
|
cf349aadf9
|
fix: unable to enter score in Assessment Result details grid (#25945) (#26031)
|
2021-06-12 14:05:12 +05:30 |
|
Rucha Mahabal
|
0ed33aa4e8
|
fix: unable to enter score in Assessment Result details grid (#25945)
|
2021-06-12 13:40:58 +05:30 |
|
Rucha Mahabal
|
17550fb4bf
|
feat: add Inactive status to Employee
|
2021-06-12 13:36:47 +05:30 |
|
Rucha Mahabal
|
efd7d584b2
|
feat: add Inactive status to Employee
|
2021-06-12 13:34:20 +05:30 |
|
Rucha Mahabal
|
a38147a8ba
|
feat: add Inactive status to Employee
|
2021-06-12 13:33:21 +05:30 |
|
Anupam Kumar
|
400205cc8a
|
fix: payroll entry employee detail issue (#25968)
* fix: payroll entry employee detail issue
* fix: review changes
|
2021-06-12 12:30:53 +05:30 |
|
Ankush Menat
|
348f04ca82
|
fix: syntax error in serial/batch selector (#26024)
|
2021-06-11 21:01:30 +05:30 |
|
Ankush Menat
|
9891780f5a
|
perf(minor): remove unnecessary comprehensions (port #25645)
|
2021-06-11 18:40:22 +05:30 |
|
Marica
|
19d36be624
|
Merge branch 'develop' into subcontracted-rm-to-transfer-report-develop
|
2021-06-11 17:50:43 +05:30 |
|
Marica
|
d7d5c4c329
|
Merge pull request #26011 from marination/subcontracted-rm-to-transfer-report
fix: Report Subcontracted Raw Materials to be Transferred
|
2021-06-11 17:50:30 +05:30 |
|
marination
|
ea3e61d3b0
|
fix: Test
|
2021-06-11 17:29:55 +05:30 |
|
marination
|
c4d851e45f
|
fix: Test
|
2021-06-11 17:27:43 +05:30 |
|
Ankush Menat
|
a424c0c023
|
test(perf): eliminate repeat creation of HSN codes (bp #25947)
|
2021-06-11 16:49:39 +05:30 |
|
Ankush Menat
|
a9c84f749a
|
perf(minor): remove unnecessary comprehensions (#25645)
|
2021-06-11 16:00:48 +05:30 |
|
Ankush Menat
|
5bb89b0ead
|
test(perf): eliminate repeat creation of HSN codes (#25947)
|
2021-06-11 15:57:01 +05:30 |
|
marination
|
a4ed6a3519
|
fix: Sider
|
2021-06-11 12:51:36 +05:30 |
|
marination
|
c5da51dd7a
|
fix: Report Raw Materials to be Transferred
|
2021-06-11 12:51:10 +05:30 |
|
marination
|
ec4a3723cc
|
fix: Sider
|
2021-06-11 12:47:06 +05:30 |
|
rohitwaghchaure
|
387de3f3fa
|
Merge pull request #26015 from rohitwaghchaure/fixed-timeout-error-in-repost-item-valuation-develop
fix: timeout error in the repost item valuation
|
2021-06-11 12:18:13 +05:30 |
|
rohitwaghchaure
|
da28db3698
|
Merge pull request #26016 from rohitwaghchaure/fixed-conversion-factor-issue-develop
fix: custom conversion factor field not mapped from job card to stock entry
|
2021-06-11 12:17:54 +05:30 |
|
rohitwaghchaure
|
49f3e5bbd5
|
Merge pull request #26017 from rohitwaghchaure/donot-copy-difference-account-develop
fix: on click of duplicate button system has not copied the difference account
|
2021-06-11 12:17:36 +05:30 |
|
rohitwaghchaure
|
eac07a28e3
|
Merge pull request #26014 from rohitwaghchaure/fixed-filters-for-item-query-develop
fix: filter type for item query
|
2021-06-11 12:17:14 +05:30 |
|
Rohit Waghchaure
|
17408c6388
|
fix: on click of duplicate button system copy the difference account from first row
|
2021-06-11 10:58:00 +05:30 |
|
Rohit Waghchaure
|
9cfd3adad9
|
fix: custom conversion factor field not mapped from job card to stock entry
|
2021-06-11 10:56:44 +05:30 |
|
Rohit Waghchaure
|
b103b24ae1
|
fix: timeout error in the repost item valuation
|
2021-06-11 10:55:05 +05:30 |
|
Rohit Waghchaure
|
f310501d7d
|
fix: filter type for item query
|
2021-06-11 10:53:07 +05:30 |
|
marination
|
687ad9b942
|
fix: Report Raw Materials to be Transferred
|
2021-06-10 21:18:19 +05:30 |
|
gavin
|
04df567973
|
Merge pull request #25967 from anupamvs/payroll-emp-detail
fix: payroll entry employee detail issue
|
2021-06-10 20:37:35 +05:30 |
|
Nabin Hait
|
42d72b55b8
|
Merge branch 'version-13-hotfix' into version-13-pre-release
|
2021-06-10 20:26:31 +05:30 |
|
Nabin Hait
|
d17217c4e2
|
Merge pull request #25831 from deepeshgarg007/tds_advance_payment_v13
feat: Tax deduction against advance payments
|
2021-06-10 20:25:30 +05:30 |
|
gavin
|
46cc089f8b
|
Merge branch 'develop' into payroll-emp-detail
|
2021-06-10 20:15:28 +05:30 |
|
Nabin Hait
|
27299cfcc5
|
Merge branch 'version-13-hotfix' into version-13-pre-release
|
2021-06-10 19:45:38 +05:30 |
|
Nabin Hait
|
002ec69b2f
|
Merge pull request #25961 from deepeshgarg007/dynamic_gst_rates
feat: Item Taxes based on net rate
|
2021-06-10 19:39:48 +05:30 |
|
Anupam
|
32ebb1001e
|
fix: review chnages
|
2021-06-10 19:32:00 +05:30 |
|
Deepesh Garg
|
48f2839079
|
fix: Sort account balances by account name
|
2021-06-10 19:00:50 +05:30 |
|
Deepesh Garg
|
3b34fc4cce
|
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into tds_advance_payment_v13
|
2021-06-10 18:57:31 +05:30 |
|
Deepesh Garg
|
5434dd048b
|
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into dynamic_gst_rates
|
2021-06-10 18:56:39 +05:30 |
|
Deepesh Garg
|
0d49b6c211
|
Merge pull request #26004 from gavindsouza/patch-tests-v13
ci: Update Patch tests (backport)
|
2021-06-10 18:52:27 +05:30 |
|
Saqib
|
9a67141bfb
|
fix(einvoicing): service item check (#26010)
|
2021-06-10 18:48:55 +05:30 |
|
Deepesh Garg
|
d52539798c
|
Merge pull request #26009 from deepeshgarg007/account_balance_test
fix: Sort account balances by account name
|
2021-06-10 18:47:43 +05:30 |
|
Deepesh Garg
|
9a243ed469
|
fix: Sort account balances by account name
|
2021-06-10 18:16:46 +05:30 |
|
Deepesh Garg
|
a5c3427293
|
fix: Sort account balances by account name
|
2021-06-10 18:09:49 +05:30 |
|
Deepesh Garg
|
88176e65e4
|
fix: Check for gst_hsn_code
|
2021-06-10 17:31:28 +05:30 |
|
Sagar Vora
|
ba333927f8
|
Merge pull request #26005 from resilient-tech/fix-se
fix: syntax error in Stock Entry
|
2021-06-10 16:54:11 +05:30 |
|
walstanb
|
8f5ae0470d
|
fix: syntax error in stock entry
|
2021-06-10 16:35:27 +05:30 |
|