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 |
|
s-aga-r
|
01f56c621c
|
Revert "fix: get consumed_qty based on received_qty in SCR"
This reverts commit 70c9b8dc50.
|
2022-11-15 14:32:16 +05:30 |
|
s-aga-r
|
3706a9b4dc
|
Revert "fix: set received_qty before_validate SCR"
This reverts commit c447dfaa9c.
|
2022-11-15 14:30:13 +05:30 |
|
Gavin D'souza
|
35088bb4c4
|
chore(payment_entry): Remove dead validations
(cherry picked from commit e1ecc9a81973d20084f5a053d8d0155354079b2e)
|
2022-11-15 08:34:08 +00:00 |
|
Deepesh Garg
|
a0d9e1bd57
|
Merge pull request #32962 from deepeshgarg007/return_write_off
fix: Write Off section visibility for non POS Invoices
|
2022-11-15 13:01:06 +05:30 |
|
rohitwaghchaure
|
91fad1935e
|
Merge pull request #32947 from rohitwaghchaure/incorrect-fix-of-conversion-factor-in-pp
fix: incorrect fix of conversion factor in PP
|
2022-11-15 10:30:23 +05:30 |
|
Deepesh Garg
|
9f5d613c78
|
fix: Write Off section visibility for non POS Invoices
|
2022-11-15 09:45:39 +05:30 |
|
Deepesh Garg
|
a1a992b0dd
|
Merge pull request #32956 from deepeshgarg007/acc_dimension_filter_label
fix: Label for applicable dimension table
|
2022-11-15 09:24:30 +05:30 |
|
Devin Slauenwhite
|
cee069d426
|
fix: link to brand doctype.
|
2022-11-14 17:38:46 -05:00 |
|
Deepesh Garg
|
8c13f70fc5
|
fix: Label for applicable dimension table
|
2022-11-14 20:39:40 +05:30 |
|
Ernesto Ruiz
|
01cc58db83
|
Merge branch 'develop' into patch-9
|
2022-11-14 07:44:01 -06:00 |
|
Rohit Waghchaure
|
105c272816
|
feat: Workstation Type for BOM
|
2022-11-14 13:03:03 +05:30 |
|
rohitwaghchaure
|
ab1722d78e
|
Merge pull request #32937 from s-aga-r/refactor/qb/job-card
refactor: rewrite `job_card.py` queries in QB
|
2022-11-14 11:25:47 +05:30 |
|
Rohit Waghchaure
|
490b0e3cdf
|
fix: incorrect fix of conversion factor in PP
|
2022-11-14 10:10:49 +05:30 |
|
Sagar Sharma
|
a191ce6200
|
Merge branch 'develop' into refactor/qb/job-card
|
2022-11-13 22:31:35 +05:30 |
|
Deepesh Garg
|
7ba8350089
|
Merge branch 'develop' into patch-9
|
2022-11-13 20:42:48 +05:30 |
|
Deepesh Garg
|
22598a09de
|
Merge pull request #32938 from deepeshgarg007/bg_query
chore: Remove raw SQL query
|
2022-11-13 20:41:08 +05:30 |
|
Sagar Vora
|
b06345af46
|
fix: check type for reference name
|
2022-11-13 19:58:49 +05:30 |
|
Deepesh Garg
|
a2260a3dc2
|
Merge branch 'develop' into bg_query
|
2022-11-13 19:47:43 +05:30 |
|
Deepesh Garg
|
6b93b3f12a
|
Merge pull request #32866 from ruthra-kumar/gross_profit_fix_buying_amount
fix: incorrect buying amount on Gross Profit
|
2022-11-13 19:15:03 +05:30 |
|
Deepesh Garg
|
4b9921782b
|
chore: Remove qb doc reference
|
2022-11-13 18:48:32 +05:30 |
|
s-aga-r
|
7df2921d38
|
refactor: rewrite job_card.py queries in QB
|
2022-11-12 22:03:56 +05:30 |
|
Deepesh Garg
|
42a59d5c17
|
chore: Remove raw SQL query
|
2022-11-12 17:32:04 +05:30 |
|
Sagar Sharma
|
4e9a63423f
|
Merge pull request #32913 from resilient-tech/fix-item-price-fetch
fix: set stock UOM in args to ensure item price is fetched
|
2022-11-12 10:08:44 +05:30 |
|
Deepesh Garg
|
d03979eef9
|
Merge pull request #32878 from abhinavxd/fix-repayment-schedule
fix: repayment schedule regeneration
|
2022-11-11 14:22:40 +05:30 |
|
ruthra kumar
|
2c8b0b17a7
|
test: buying amount of invoices
1. Invoice with unset `update_stock`, with and without Delivery Notes
|
2022-11-11 08:33:54 +05:30 |
|
ruthra kumar
|
e4d16c31da
|
fix: GP incorrect buying amount if no upd on SI and Delivery Note
|
2022-11-11 08:33:48 +05:30 |
|
rohitwaghchaure
|
8ae9c1d192
|
Merge pull request #32895 from rohitwaghchaure/fixed-performance-issue-for-purchase-receipt
fix: Purchase Receipt timeout error
|
2022-11-10 22:41:54 +05:30 |
|
Deepesh Garg
|
902e1ab74b
|
Merge branch 'develop' into patch-9
|
2022-11-10 20:08:27 +05:30 |
|
Deepesh Garg
|
f4920d6475
|
Merge pull request #32880 from ernestoruiz89/patch-7
fix: add translate function to valitate company msg in chart of accounts importer
|
2022-11-10 20:07:52 +05:30 |
|