Commit Graph

43237 Commits

Author SHA1 Message Date
Maharshi Patel
edc93ab6aa fix: pricing rule item group uom
Handle use case where pricing rule is applied on item group and user have selected UOM. pricing rule was applied on all UOM's even after specifying UOM. i have added condition in sql to fix this.
2022-10-13 12:00:30 +05:30
Sagar Sharma
d6c28aa64d Merge pull request #32576 from s-aga-r/fix/github-issue/32559
fix: `Brand Defaults` filters
2022-10-12 19:22:47 +05:30
Sagar Sharma
7dfd741ced Merge branch 'develop' into fix/github-issue/32559 2022-10-12 19:20:39 +05:30
rohitwaghchaure
e583d17062 Merge pull request #32583 from rohitwaghchaure/removed-unnecessary-imports
fix: removed unnecessary imports
2022-10-12 17:09:08 +05:30
Rohit Waghchaure
692462d7c8 fix: removed unnecessary imports 2022-10-12 16:30:48 +05:30
Deepesh Garg
43c2bd1351 Merge pull request #32272 from deepeshgarg007/internal_transfer_precision_fixes
fix: Incoming rate precision fixes for intra company transfer
2022-10-12 16:23:16 +05:30
Deepesh Garg
ab137472b0 Merge pull request #32563 from rohitwaghchaure/fixed-source-stock-reposting-for-purchase-flow
fix: consider sales rate as incoming rate for transit warehouse in purchase flow
2022-10-12 16:20:12 +05:30
Deepesh Garg
9aa5e20ef7 chore: check only for inter-company transfers 2022-10-12 15:53:28 +05:30
Rohit Waghchaure
98bf8e1304 fix: test case 2022-10-12 15:45:36 +05:30
Rohit Waghchaure
3266e54e33 fix: consider outgoingrate while valuation rate calculate 2022-10-12 15:44:53 +05:30
Rohit Waghchaure
683a47f7a1 fix: consider sales rate as incoming rate for transit warehouse in purchase flow 2022-10-12 15:44:53 +05:30
Deepesh Garg
49601558c6 chore: fix precision condition 2022-10-12 14:57:16 +05:30
Deepesh Garg
1c05c004cd chore: Use proper accounts 2022-10-12 14:19:09 +05:30
Deepesh Garg
c8d2181498 chore: Increase precision for other doc fields 2022-10-12 14:17:55 +05:30
Sagar Sharma
d2755c0106 Merge branch 'develop' into fix/github-issue/32559 2022-10-12 13:28:35 +05:30
Rohan
43037d893d fix: type-cast while saving an item (#32549) 2022-10-12 13:07:58 +05:30
Sagar Sharma
7da32c7db3 fix: Brand Defaults filters 2022-10-12 12:15:07 +05:30
Ankush Menat
6ce3ce758c ci: disable orchestrator (#32571) 2022-10-12 10:57:58 +05:30
Deepesh Garg
38b34f2a45 Merge pull request #32408 from nabinhait/sales-purchase-tab-break
feat: Tab Breaks in all Sales and Purchase cycle transactions
2022-10-11 16:02:45 +05:30
Deepesh Garg
df2a0e265b chore: GL Entries for SLE diff 2022-10-11 14:55:09 +05:30
Deepesh Garg
dc20b21fb5 test: Internal tranfer precision loss test 2022-10-11 14:54:27 +05:30
Deepesh Garg
b31c3bd35d chore: Increase incoming_rate field precision to 6 2022-10-11 14:53:26 +05:30
ruthra kumar
633c2a289e Merge pull request #32557 from ruthra-kumar/value_error_on_pos_save
fix: Value error on validation of POS invoices with Serial Nos
2022-10-11 14:42:47 +05:30
Nabin Hait
e71c417f7e fix: minor cleanup 2022-10-11 13:21:27 +05:30
Nabin Hait
5389a35798 fix: more fields reordering related to Tab Break 2022-10-11 13:21:07 +05:30
Nabin Hait
aaf3c2b329 feat: Tab Break in Purchase Invoice 2022-10-11 13:20:41 +05:30
Nabin Hait
35f836c4b7 feat: Tab Break in Purchase Receipt 2022-10-11 13:18:21 +05:30
Nabin Hait
3d9263bf86 feat: Tab Break in Supplier Quotation 2022-10-11 13:18:21 +05:30
Nabin Hait
2172c5034a feat: Tab Break in Material Request 2022-10-11 13:18:21 +05:30
Nabin Hait
10a25603ac feat: Tab Break in Purchase Order 2022-10-11 13:18:21 +05:30
Nabin Hait
7546562139 feat: Tab Break in Quotation 2022-10-11 13:18:21 +05:30
Nabin Hait
f6613e1e4c feat: Tab Break in Sales Order, Delivery Note, Sales Invoice and Purchase Order 2022-10-11 13:18:21 +05:30
ruthra kumar
9e2bd10d03 test: value error on serial no validation on pos 2022-10-11 12:54:50 +05:30
Deepesh Garg
dddbc130db Merge branch 'develop' of https://github.com/frappe/erpnext into internal_transfer_precision_fixes 2022-10-11 12:54:11 +05:30
ruthra kumar
4b908ebcd6 fix: value error on pos submit 2022-10-11 11:21:11 +05:30
Deepesh Garg
b99b2b75ca Merge pull request #32477 from rasos/patch-1
Austria chart of accounts update
2022-10-11 10:20:49 +05:30
Deepesh Garg
6a2edab6eb Merge pull request #32554 from AnandBaburajan/fix_budget_autoname
fix: use naming_series in budget
2022-10-11 10:15:17 +05:30
Anand Baburajan
ba754825b9 Merge branch 'develop' into fix_budget_autoname 2022-10-10 23:17:18 +05:30
anandbaburajan
e4d7d8c42d fix: use naming_series in budget 2022-10-10 23:04:34 +05:30
ruthra kumar
65194efa97 Merge pull request #32548 from ruthra-kumar/suppress_linked_doc_valdiation_on_delete
fix: allow deletion of cancelled Invoices once payments are unlinked
2022-10-10 16:41:07 +05:30
ruthra kumar
143f905838 test: update ple on payment unlink for SI's and SO's 2022-10-10 15:57:38 +05:30
Deepesh Garg
a14c5dbcc4 Merge branch 'develop' of https://github.com/frappe/erpnext into internal_transfer_precision_fixes 2022-10-10 15:08:15 +05:30
rohitwaghchaure
be1ebd348b Merge pull request #32497 from s-aga-r/fix/quality-inspection/status
chore: set `Quality Inspection` status based on readings status
2022-10-10 10:49:56 +05:30
ruthra kumar
537d953f4c fix: unlink payment on invoice cancellation 2022-10-10 10:17:19 +05:30
Deepesh Garg
0f033bf8f6 Merge pull request #32536 from deepeshgarg007/po_cancel
fix: PO cancel post advance payment cancel against PO
2022-10-09 18:34:55 +05:30
Deepesh Garg
d806e32030 fix: PO cancel post advance payment cancel against PO 2022-10-08 21:25:11 +05:30
Sagar Sharma
60befcd8a8 Merge branch 'develop' into fix/quality-inspection/status 2022-10-08 13:34:21 +05:30
Sagar Sharma
4992e4a2b8 fix(test): test_rejected_qi_validation 2022-10-08 13:33:36 +05:30
Sagar Sharma
fcc1272d42 test: add test cases for Quality Inspection status 2022-10-08 13:33:36 +05:30
Sagar Sharma
2657ece2cd fix: set Quality Inspection status based on readings status 2022-10-08 13:33:22 +05:30