Commit Graph

43762 Commits

Author SHA1 Message Date
Sabu Siyad
0b5584a54a
Merge branch 'develop' into fix/mutate_iter_list 2022-11-17 17:58:49 +05:30
Sabu Siyad
546c809cbe
fix: use list() on self mutating iteration
https://github.com/frappe/erpnext/issues/30325

Signed-off-by: Sabu Siyad <hello@ssiyad.com>
2022-11-17 17:46:49 +05:30
Deepesh Garg
cbe8fa7fd2
Merge pull request #33009 from ssiyad/fix/pos/item_img_border
fix(pos): item selector image border radius
2022-11-17 17:31:29 +05:30
Sagar Sharma
29a8d9a9b4
Merge branch 'develop' into internal_transfer 2022-11-17 16:42:18 +05:30
Deepesh Garg
2dfe849c7d fix: Bulk payment generation against invoices 2022-11-17 15:53:56 +05:30
Dany Robert
be15419bd5 chore: pre-commit 2022-11-17 11:00:34 +01:00
Dany Robert
61f05132db feat: validate repost item valuation against accounts freeze date 2022-11-17 11:00:01 +01:00
Ankush Menat
fd3c7903ba chore: typo 2022-11-17 14:18:05 +05:30
Sagar Sharma
da4c20f7be
Merge branch 'develop' into fix/scr-return-rejected-qty 2022-11-17 14:15:16 +05:30
Sagar Sharma
40f90d3e95
Merge pull request #33006 from s-aga-r/purchase-order/internal-supplier
fix: make `is_internal_supplier` read-only in PO
2022-11-17 14:08:34 +05:30
Sagar Sharma
1349d24514
Merge branch 'develop' into purchase-order/internal-supplier 2022-11-17 14:08:07 +05:30
Sabu Siyad
2f4940cc26
fix(pos): item selector image border radius
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
2022-11-17 13:21:47 +05:30
Ankush Menat
34e4903ed7
refactor: search queries (#33004)
- guard clauses for readability
- use values or format
2022-11-17 13:04:42 +05:30
Sagar Sharma
f71f27462d
Merge branch 'develop' into fix/scr-return-rejected-qty 2022-11-17 13:04:15 +05:30
Sagar Sharma
e13b9e839d
Merge branch 'develop' into purchase-order/internal-supplier 2022-11-17 13:04:07 +05:30
ruthra kumar
7f6e447d45
Merge pull request #33003 from AnandBaburajan/fix_precision_in_asset_tests
fix: precision in asset tests
2022-11-17 12:54:06 +05:30
s-aga-r
5efbc2cbf8 fix: make is_internal_supplier read-only 2022-11-17 12:36:44 +05:30
anandbaburajan
218da1217a fix: add missing commas and brackets 2022-11-17 12:23:38 +05:30
Anand Baburajan
538da9a58e
Merge branch 'develop' into fix_precision_in_asset_tests 2022-11-17 12:17:27 +05:30
anandbaburajan
b5e5d3b3af fix: precision in asset tests 2022-11-17 12:13:06 +05:30
Ritwik Puri
b03b568e6c
chore(patch): remove reload_doc from post model sync update_exchange_rate_settings patch (#32994)
[skip ci]
2022-11-17 11:59:42 +05:30
Ankush Menat
1bd886387b chore: hardcode doctype 2022-11-17 11:58:35 +05:30
Sagar Sharma
5083c22490
Merge branch 'develop' into fix/scr-return-rejected-qty 2022-11-17 10:15:23 +05:30
rohitwaghchaure
c460141f0d
Merge pull request #32911 from rohitwaghchaure/workstation-type-feat-for-bom
feat: Workstation Type for BOM
2022-11-17 00:00:17 +05:30
rohitwaghchaure
31afae3e75
Merge branch 'develop' into workstation-type-feat-for-bom 2022-11-16 23:26:08 +05:30
Rohit Waghchaure
ffa30127e7 fix: linters failing 2022-11-16 23:23:06 +05:30
Rohit Waghchaure
7bd06e6fbc test: test case to check workstation type 2022-11-16 23:19:04 +05:30
Deepesh Garg
9154d08b89
Merge pull request #32882 from ernestoruiz89/patch-9
fix: add translation function to doctype name on message
2022-11-16 20:41:34 +05:30
Deepesh Garg
3a523b56bf
Merge pull request #32983 from deepeshgarg007/journal_entry_template_fix
fix: Opening journal entry templates
2022-11-16 20:41:07 +05:30
Sagar Sharma
aae2408f70
Merge branch 'develop' into fix/scr-return-rejected-qty 2022-11-16 18:40:01 +05:30
Deepesh Garg
aac1f4923b
Merge pull request #32989 from deepeshgarg007/flake8
ci: fix flake8 URL
2022-11-16 16:25:46 +05:30
Deepesh Garg
e81bec5fc9 ci: fix flake8 URL 2022-11-16 16:24:28 +05:30
Sagar Sharma
399ee80d80
Merge branch 'develop' into fix/scr-return-rejected-qty 2022-11-16 15:02:55 +05:30
s-aga-r
7dd7617ec7 fix: hide reject-fields in return SCR 2022-11-16 14:28:54 +05:30
s-aga-r
8a73e963ce fix: don't set rejected-qty in return SCR 2022-11-16 14:28:32 +05:30
Vishal
e5dfd53e6f chore: minor fix 2022-11-16 14:25:35 +05:30
Vishal
ba6189d054 fix: minor change 2022-11-16 13:58:29 +05:30
Vishal
343b414b40 fix: test case updated for mr 2022-11-16 13:53:21 +05:30
Vishal
89aabdaaaa fix: test case added for MR internal Transfer 2022-11-16 13:53:21 +05:30
Vishal
d86afddb60 fix: minor issue fixed 2022-11-16 13:53:21 +05:30
Vishal
71412f6877 fix: Internal Transfer Material Request cycle and tracking fixed till purchase receipt 2022-11-16 13:53:21 +05:30
Deepesh Garg
0486078ba9
Merge pull request #32984 from nabinhait/si-needs-repost
fix: Validate for deferred revenue only if sales invoice needs repost
2022-11-16 13:12:09 +05:30
Nabin Hait
b89b07d0ff fix: Validate for deferred revenue only if sales invoice needs repost 2022-11-16 12:16:23 +05:30
Deepesh Garg
33b61aef5a fix: Opening journal entry templates 2022-11-16 11:57:17 +05:30
Devin Slauenwhite
3a35651441 fix: naming 2022-11-15 08:26:16 -05:00
Ankush Menat
c013db6ea1
fix: cast POS query inputs to integers (#32975)
fix: cast POS query inputs to integers
2022-11-15 18:10:45 +05:30
Deepesh Garg
b3bc1c66a3
Merge pull request #32968 from frappe/mergify/bp/develop/pr-32953
chore(payment_entry): Remove dead validations (backport #32953)
2022-11-15 16:32:40 +05:30
Rohit Waghchaure
0a69523940 fix: UX for inventory dimension 2022-11-15 15:57:30 +05:30
Sagar Sharma
6f2989c7f2
Merge pull request #32971 from s-aga-r/revert-32867-fix/scr/rejected-qty
Revert "fix: get `consumed_qty` based on `received_qty` in SCR"
2022-11-15 15:17:15 +05:30
s-aga-r
369db4eacc test: fix test cases for supplied-items consumed_qty 2022-11-15 14:39:43 +05:30