Subin Tom
|
c03a947e98
|
fix: removed extra space from label rate
|
2021-06-16 19:47:55 +05:30 |
|
Afshan
|
d5c172590f
|
fix(pos): pos loyalty card alignment (#26050)
|
2021-06-16 14:28:03 +05:30 |
|
Ankush
|
fd84847f2b
|
fix: syntax fixes for native class (#26064)
|
2021-06-16 11:14:40 +05:30 |
|
Nabin Hait
|
0950481253
|
fix: merge conflict
|
2021-06-15 20:18:06 +05:30 |
|
Nabin Hait
|
24a88f6cf6
|
bumped to version 13.5.0
|
2021-06-15 20:18:40 +05:50 |
|
Nabin Hait
|
1e2df2c109
|
fix(pos): 'NoneType' object is not iterable
|
2021-06-15 19:53:57 +05:30 |
|
Nabin Hait
|
b2f2d0e749
|
chore: Added change log for v13.5.0
|
2021-06-15 19:44:06 +05:30 |
|
Deepesh Garg
|
95bc141531
|
Merge pull request #26056 from deepeshgarg007/gst_taxtable_value_with_discount_v13
fix(India): Taxable value for invoices with additional discount
|
2021-06-15 12:05:16 +05:30 |
|
Deepesh Garg
|
433815daba
|
fix: Update einvoice json test
|
2021-06-14 20:43:51 +05:30 |
|
Deepesh Garg
|
4afda3c89c
|
fix(India): Taxable value for invoices with additional discount
|
2021-06-14 20:43:42 +05:30 |
|
Deepesh Garg
|
bbf6121bb5
|
fix: Revert unintended changes
|
2021-06-14 20:09:31 +05:30 |
|
Deepesh Garg
|
ac52daa14f
|
fix: Import throw
|
2021-06-14 20:09:23 +05:30 |
|
Deepesh Garg
|
5ef9a62917
|
fix: Add separate function to validate payment entry taxes
|
2021-06-14 20:09:17 +05:30 |
|
Deepesh Garg
|
302855e160
|
fix: Auto tax calculations in Payment Entry
|
2021-06-14 20:09:10 +05:30 |
|
Saqib
|
80077d215f
|
fix: patch for adding doctype to sla (#26053)
|
2021-06-14 19:34:25 +05:30 |
|
Himanshu
|
ec25d5938b
|
feat(SLA): Apply SLA to any document (#22449)
|
2021-06-14 19:05:52 +05:30 |
|
Marica
|
ff1360a8e6
|
Merge branch 'develop' into subcontracted-rm-to-transfer-report-develop
|
2021-06-14 16:48:57 +05:30 |
|
marination
|
5d082b05a9
|
fix: Flaky test for Report Subcontracted Raw materials to be transferred
|
2021-06-14 16:31:45 +05:30 |
|
Nabin Hait
|
580b4d50b5
|
Merge pull request #26027 from ruchamahabal/add-inactive-status-to-employee
feat: add Inactive status to Employee
|
2021-06-14 12:34:33 +05:30 |
|
Marica
|
d37912fff1
|
Merge branch 'develop' into subcontracted-rm-to-transfer-report-develop
|
2021-06-12 16:00:14 +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
|
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 |
|
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 |
|
marination
|
ea3e61d3b0
|
fix: Test
|
2021-06-11 17:29:55 +05:30 |
|
Ankush Menat
|
a424c0c023
|
test(perf): eliminate repeat creation of HSN codes (bp #25947)
|
2021-06-11 16:49:39 +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 |
|
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 |
|
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 |
|
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 |
|
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
|
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 |
|
walstanb
|
8f5ae0470d
|
fix: syntax error in stock entry
|
2021-06-10 16:35:27 +05:30 |
|