Commit Graph

46714 Commits

Author SHA1 Message Date
Deepesh Garg
e31db18912 chore: Add accounting dimensions to Sales Order Item table 2023-10-17 18:19:47 +05:30
s-aga-r
9d687ca6e9
Merge pull request #37541 from s-aga-r/FIX-PROJECT-TEST
fix(test): project test case
2023-10-17 14:13:38 +05:30
s-aga-r
fd6aee15e6 fix(test): project test case 2023-10-17 12:48:07 +05:30
ruthra kumar
5bb3e290d2
Merge pull request #37330 from ruthra-kumar/provision_to_pick_exc_rate_on_transaction_date
refactor: checkbox to toggle exchange rate inheritence in PO->PI
2023-10-17 09:45:33 +05:30
mergify[bot]
27a1e3bf83
feat: validate negative stock for inventory dimension (backport #37373) (#37383)
* feat: validate negative stock for inventory dimension (#37373)

* feat: validate negative stock for inventory dimension

* test: test case for validate negative stock for inv dimension

(cherry picked from commit 1480acabb0faeae61c7c055bb7d1e81877b87cfb)

# Conflicts:
#	erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
#	erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
#	erpnext/stock/stock_ledger.py

* chore: fix conflicts

* chore: fix conflicts

* chore: fix conflicts

* chore: fix linter issue

* chore: fix linter issue

* chore: fix linter issue

* chore: fix linter issue

* chore: fix linter issue

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-10-16 19:15:18 +05:30
Ankush Menat
6e3e4c8ade
Merge pull request #37532 from frappe/cust_role
fix: keep customer/supplier website role by default
2023-10-16 17:29:54 +05:30
Ankush Menat
d2096cfdb7 fix: keep customer/supplier website role by default 2023-10-16 16:55:09 +05:30
s-aga-r
f59066c185
Merge pull request #37528 from s-aga-r/FIX-4360
perf: index `dn_detail` in `Delivery Note Item`
2023-10-16 16:42:32 +05:30
s-aga-r
5b4528e614 perf: index dn_detail in Delivery Note Item 2023-10-16 16:26:03 +05:30
ruthra kumar
08315522bb refactor: checkbox to toggle exchange rate inheritence in PO->PI 2023-10-16 16:25:19 +05:30
Ankush Menat
2790ae0744 fix: Update frappe.link_search usage
refer https://github.com/frappe/frappe/pull/22745
2023-10-16 15:43:14 +05:30
s-aga-r
08aec7f6d7
Merge pull request #37517 from s-aga-r/FIX-4388-1
fix(test): purchase return test case
2023-10-16 01:12:15 +05:30
s-aga-r
240b161e81 fix: purchase return test case 2023-10-16 01:08:42 +05:30
s-aga-r
0f6d67d8d4
Merge pull request #37513 from s-aga-r/FIX-4388
fix: GL Entries not getting created for PR Return
2023-10-16 00:33:21 +05:30
s-aga-r
253d4782c6 test: add test case for PR return with zero rate 2023-10-15 23:34:58 +05:30
Deepesh Garg
bd2d04e222
Merge pull request #37312 from blaggacao/feat/add-delivery-roles
fix(stock): add delivery user and manager role
2023-10-15 20:28:42 +05:30
Deepesh Garg
10a9a7c52a
Merge pull request #36780 from rtdany10/rounded-row-wise-tax
feat: item(row) wise tax amount rounding
2023-10-15 20:01:34 +05:30
s-aga-r
795020dddc
Merge pull request #37414 from s-aga-r/FIX-4347
fix: consider received qty while creating SO -> MR
2023-10-15 19:11:14 +05:30
Deepesh Garg
15df4924e8
Merge pull request #36797 from rtdany10/uae-item-tax
fix(regional): item wise tax calc issue
2023-10-15 18:17:40 +05:30
Deepesh Garg
621da178e1 Merge branch 'develop' of https://github.com/frappe/erpnext into rounded-row-wise-tax 2023-10-15 18:10:27 +05:30
s-aga-r
46add06a29 fix: GL Entries not getting created for PR Return 2023-10-15 15:46:29 +05:30
ruthra kumar
dd099be690
Merge pull request #37478 from ruthra-kumar/tds_from_journals
refactor: back calculate total amt for TDS
2023-10-15 10:51:42 +05:30
ruthra kumar
dfd40ca7b3
Merge pull request #37319 from ruthra-kumar/test_fixtures_for_sales_purchase_invoice
test: use fixtures for sales and purchase invoice
2023-10-15 10:16:22 +05:30
ruthra kumar
fbabf4ac2e refactor(test): make sure TDS Payable is available for testing 2023-10-15 08:57:38 +05:30
ruthra kumar
0207d6e7c9 refactor(test): make use of @change_settings in PI test cases 2023-10-15 08:57:38 +05:30
ruthra kumar
a2e064d214 refactor(test): use test fixture in purchase invoice 2023-10-15 08:57:38 +05:30
ruthra kumar
3bdf4f628c refactor(test): use test fixture in subscription 2023-10-15 08:57:38 +05:30
ruthra kumar
de9baef84a refactor(test): use @change_settings to fix failing test cases 2023-10-15 08:57:38 +05:30
ruthra kumar
8ebe5733ac refactor(test): fix broken test cases in Sales Invoice 2023-10-15 08:57:38 +05:30
ruthra kumar
58065f31b1 refactor(test): use @change_settings in sales invoice 2023-10-15 08:57:38 +05:30
ruthra kumar
fc50b174eb refactor(test): unset accounts frozen date 2023-10-15 08:57:38 +05:30
ruthra kumar
c322e5f381 test: use fixtures for sales and purchase invoice 2023-10-15 08:57:38 +05:30
s-aga-r
b2cee396ac fix: consider received qty while creating SO -> MR 2023-10-14 20:43:32 +05:30
s-aga-r
afef9dc8df
Merge pull request #37182 from s-aga-r/MOVE-PAYMENTS-GATEWAYS
refactor!: move payment gateways to the payments app
2023-10-14 16:48:11 +05:30
ruthra kumar
f4a294c5ce
Merge pull request #37495 from ruthra-kumar/keyerror_on_comparison_report
fix: keyerror on gl and pl comparision report
2023-10-14 12:15:19 +05:30
ruthra kumar
8ca0e4eacc
Merge pull request #37435 from rtdany10/sp-gp-fix
fix(gp): wrong `allocated_amount` when grouped by Sales Person
2023-10-14 12:12:14 +05:30
ruthra kumar
ad00df0af6 fix: keyerror on gl and pl comparision report 2023-10-13 15:39:54 +05:30
Ankush Menat
5167fb2bae
Merge pull request #37475 from iamrishiksahu/fix/#37231-doc-is-not-defined
fix: fixed the doc not defined issue.
2023-10-13 15:30:39 +05:30
ruthra kumar
479fe915af
Merge pull request #37484 from ruthra-kumar/ignore_links_on_closing_balance_patch
refactor(patch): ignore links on closing balance patch
2023-10-13 09:18:41 +05:30
ruthra kumar
17ca8756a7 refactor(patch): ignore links on closing balance patch 2023-10-12 20:43:15 +05:30
Anand Baburajan
18e3a8907a
fix: don't set finance books if gross_purchase_amount is not set (#37480) 2023-10-12 19:41:11 +05:30
ruthra kumar
2c56ee97c7 refactor: back calculate total amt for TDS 2023-10-12 16:03:26 +05:30
Rishik Sahu
5ebf7c8c29 fixed-#37231-changed-doc-to-d/closes-the-isse 2023-10-12 14:03:49 +05:30
Deepesh Garg
ff7c77e9fd
Merge pull request #37418 from barredterra/de-is-return
fix: german tranlations of "Is Return"
2023-10-12 07:49:52 +05:30
ruthra kumar
510f12a1e8
Merge pull request #37436 from ruthra-kumar/validate_for_repost_only_for_critical_fields
refactor: for non-repost fields, don't validate
2023-10-11 20:03:16 +05:30
ruthra kumar
30adfa9844
Merge pull request #37459 from ruthra-kumar/validate_advances
refactor: add validation for Advances in SI/PI
2023-10-11 20:02:36 +05:30
ruthra kumar
0cdd6435a5 refactor: add validation for Advances in SI/PI 2023-10-11 14:42:23 +05:30
rohitwaghchaure
f3238f9105
fix: production plan reserved qty incorrect calculation (#37400) 2023-10-11 14:08:11 +05:30
s-aga-r
847f774c8b
Merge pull request #37452 from s-aga-r/FIX-4407
fix(ux): allow MR to Stop until fully received
2023-10-11 13:50:20 +05:30
ruthra kumar
c1782c5015 refactor: for non-repost fields, don't validate 2023-10-11 13:30:21 +05:30