Suraj Shetty
|
ce583c9a81
|
Merge branch 'develop' into exotel-fixes
|
2022-04-05 19:48:44 +05:30 |
|
Marica
|
ff7d81020c
|
Merge pull request #30578 from marination/e-com-acessibility
chore: Accessibility for E-commerce Doctypes
|
2022-04-05 18:11:59 +05:30 |
|
Saqib Ansari
|
c4b5fa8ed1
|
Merge pull request #30573 from frappe/mergify/bp/develop/pr-30382
fix: Added validation for single_threshold in Tax With Holding Category (backport #30382)
|
2022-04-05 15:52:28 +05:30 |
|
Saqib Ansari
|
7757790572
|
Merge pull request #30579 from nextchamp-saqib/eway-bill-dialog-fix
fix: fetch from fields not working in eway bill dialog
|
2022-04-05 15:51:38 +05:30 |
|
Saqib Ansari
|
1bc0557a6c
|
Merge pull request #30553 from nextchamp-saqib/e-inv-paid-invoice-fix
fix(india): minor e-invoicing fixes
|
2022-04-05 15:51:25 +05:30 |
|
Saqib Ansari
|
c8779aa446
|
fix: fetch from fields not working in eway bill dialog
|
2022-04-05 15:44:17 +05:30 |
|
Saqib Ansari
|
2451452434
|
Merge branch 'develop' into e-inv-paid-invoice-fix
|
2022-04-05 13:12:08 +05:30 |
|
marination
|
065623ce25
|
chore: Add Prices, Stock and E-com Settings access from Website Item
|
2022-04-05 12:30:02 +05:30 |
|
marination
|
d4301d6d2f
|
chore: Accessibility for E-commerce Doctypes
- Add Website Item routing button and dashboard link in Item master
- Group Item variant buttons together
|
2022-04-05 12:07:50 +05:30 |
|
ruthra kumar
|
16bfb930f8
|
test: added test cases for group filters
|
2022-04-05 11:08:09 +05:30 |
|
Rucha Mahabal
|
0e1528365d
|
fix: sider
|
2022-04-04 21:31:14 +05:30 |
|
Rucha Mahabal
|
bd077dbb3b
|
test: add attendance sheet tests for employee filter, half days
|
2022-04-04 21:26:42 +05:30 |
|
Rucha Mahabal
|
fec47632bc
|
test: add holiday related shift and attendance tests
|
2022-04-04 21:02:22 +05:30 |
|
Suraj Shetty
|
ca66224d57
|
Merge branch 'develop' into exotel-fixes
|
2022-04-04 20:22:06 +05:30 |
|
Suraj Shetty
|
01909d2e8c
|
test: Fix used frappe._dict to avoid AttributeError down the line
ref: https://github.com/frappe/erpnext/runs/5816574721?check_suite_focus=true#step:12:880
|
2022-04-04 20:21:36 +05:30 |
|
Rucha Mahabal
|
7675542926
|
Merge pull request #30569 from ruchamahabal/fix-leave-alloc-update
|
2022-04-04 20:18:55 +05:30 |
|
Marica
|
3c3aca9568
|
Merge pull request #30522 from marination/redisearch-app-install
feat: Redisearch with consent
|
2022-04-04 19:24:06 +05:30 |
|
Sherin KR
|
e796267214
|
fix: Validation for single threshold in Tax With Holding Category (#30382)
(cherry picked from commit 0a2c72c594963f63551985a908c1c79302556e91)
|
2022-04-04 13:38:43 +00:00 |
|
Rucha Mahabal
|
793164ac2e
|
fix(test): set company for employee in leave allocation test setup
|
2022-04-04 19:08:27 +05:30 |
|
Rucha Mahabal
|
5499cecffd
|
test: leave allocation validations and total value for updates done before and after submission
|
2022-04-04 18:32:17 +05:30 |
|
Ankush Menat
|
a9811c601c
|
Merge pull request #30564 from rohitwaghchaure/fixed-rejected-warehouse-issue-for-pr
fix: if accepted warehouse not selected during rejection then stock ledger not created
|
2022-04-04 18:26:17 +05:30 |
|
Suraj Shetty
|
117e5d05a3
|
Merge branch 'develop' into exotel-fixes
|
2022-04-04 18:21:46 +05:30 |
|
Rucha Mahabal
|
7b406f422d
|
Merge branch 'develop' into multiple-shifts
|
2022-04-04 18:14:49 +05:30 |
|
Marica
|
0a592e085c
|
Merge branch 'develop' into redisearch-app-install
|
2022-04-04 18:00:56 +05:30 |
|
Rohit Waghchaure
|
ac5df1abbe
|
test: test case to validate rejected qty without accepted warehouse
|
2022-04-04 17:57:57 +05:30 |
|
Rucha Mahabal
|
3538656a7d
|
fix: total leaves allocated not validated and recalculated on updates post submission
|
2022-04-04 17:52:30 +05:30 |
|
Ankush Menat
|
de83511091
|
fix(ux): refresh update to zero val checkbox (#30567)
|
2022-04-04 17:29:51 +05:30 |
|
ruthra kumar
|
b2ed9fd3fe
|
refactor: use group fields from Sales Order and Sales Order Items
|
2022-04-04 17:00:47 +05:30 |
|
Ankush Menat
|
74e9bc6d65
|
chore: loosen pandas dependency and bump redisearch (#30249)
|
2022-04-04 16:58:25 +05:30 |
|
Ankush Menat
|
0f2eaa2cf3
|
chore: add ui test badge
|
2022-04-04 16:24:09 +05:30 |
|
Marica
|
569eff4f27
|
Merge branch 'develop' into redisearch-app-install
|
2022-04-04 16:10:01 +05:30 |
|
Saqib Ansari
|
fed66038b5
|
fix(pos): do not reset search input on item selection (#30537)
|
2022-04-04 15:59:16 +05:30 |
|
Rohit Waghchaure
|
0a71cabab1
|
fix: if accepted warehouse not selected during rejection then stock ledger not created
|
2022-04-04 15:42:59 +05:30 |
|
Ankush Menat
|
12c01e2975
|
fix: maintain FIFO queue even if outgoing_rate is not found (#30560)
|
2022-04-04 15:22:15 +05:30 |
|
ruthra kumar
|
e324d668d3
|
refactor: item filters are linked with group filters
|
2022-04-04 14:52:19 +05:30 |
|
Saqib Ansari
|
b91bf40f1b
|
fix: server error while viewing gst e-invoice
|
2022-04-04 14:40:07 +05:30 |
|
Ankush Menat
|
52eb0a93bb
|
Merge pull request #30528 from s-aga-r/is-subcontracted-fieldtype
refactor!: change "is_subcontracted" field type from "Select" to "Check"
|
2022-04-04 14:01:20 +05:30 |
|
Ankush Menat
|
a896895a9e
|
fix: bulk fix (~330) missing translations
|
2022-04-04 13:59:51 +05:30 |
|
Sagar Sharma
|
e80cd29d2e
|
Merge branch 'develop' into is-subcontracted-fieldtype
|
2022-04-04 13:31:46 +05:30 |
|
Marica
|
bfb2fbea5f
|
Merge branch 'develop' into redisearch-app-install
|
2022-04-04 13:27:50 +05:30 |
|
Deepesh Garg
|
194605823e
|
fix: Issues on loan repayment
|
2022-04-04 13:25:35 +05:30 |
|
marination
|
397b46a08b
|
chore: Add TODOs(perf) for Redisearch Query
|
2022-04-04 13:24:56 +05:30 |
|
Saqib Ansari
|
92f632c4b1
|
Merge branch 'develop' into e-inv-paid-invoice-fix
|
2022-04-04 13:10:25 +05:30 |
|
marination
|
3445682563
|
fix: Payload incorrect data (pass item_group.name)
|
2022-04-04 12:33:25 +05:30 |
|
Deepesh Garg
|
18a3c5d536
|
fix: Ignore user perm for party account company
|
2022-04-04 12:32:33 +05:30 |
|
Saqib Ansari
|
0c26f9a8c8
|
fix(india): cannot generate e-invoice for is_pos invoices
* If mode of payment > 18 characters, the e-invoice portal throws error
|
2022-04-04 12:28:09 +05:30 |
|
Ankush Menat
|
cf5f37e6d8
|
refactor: move schema change patch higher up
|
2022-04-04 12:15:26 +05:30 |
|
Ankush Menat
|
e8118fcdf1
|
fix: doctype layout based on expected tab-order
|
2022-04-04 12:06:35 +05:30 |
|
Ankush Menat
|
deca1aaf06
|
fix: dont fetch qty in reco if batch is required
|
2022-04-04 12:06:35 +05:30 |
|
Ankush Menat
|
f83a1c1989
|
fix: dont reset barcode in scan mode
|
2022-04-04 12:06:35 +05:30 |
|