Commit Graph

43044 Commits

Author SHA1 Message Date
Maharshi Patel
8c5b420aea fix: remove no_copy for ignore_pricing_rule 2022-09-16 18:26:00 +05:30
Sagar Sharma
bd6af7c613 test: update test case for production plan pending-qty 2022-09-16 18:00:26 +05:30
ruthra kumar
5bd5dd7262 test: gl entries of payments with advance tax 2022-09-16 16:22:21 +05:30
Rohit Waghchaure
f5bd3fa952 fix: suggestion threshold label and rule was not working for other items with min and max amount 2022-09-16 16:03:08 +05:30
Sagar Sharma
5be7d42dfd fix: production plan pending-qty 2022-09-16 14:39:39 +05:30
Maharshi Patel
f4b64686ae fix: fetch description only if empty on the payment schedule
added fetch_if_empty on description field of payment_schedule.
2022-09-16 14:14:14 +05:30
Deepesh Garg
36d0906ea2 fix: TDS deduction via journal entry 2022-09-16 13:50:37 +05:30
Sagar Sharma
487d825ede
Merge pull request #32233 from s-aga-r/refactor/file/production_plan.py
refactor: rewrite Production Plan queries in QB
2022-09-16 13:28:54 +05:30
ruthra kumar
f0ae77b23b fix: incorrect gl if tax on multi currency payment entry 2022-09-16 12:40:40 +05:30
Deepesh Garg
0a6462e627 Merge branch 'develop' of https://github.com/frappe/erpnext into pending_tds_vouchers 2022-09-16 12:35:39 +05:30
Sagar Sharma
be0d9d8c13
Merge branch 'develop' into refactor/file/production_plan.py 2022-09-16 12:28:48 +05:30
Sagar Sharma
b8cf3b4c77 refactor: rewrite Production Plan queries in QB 2022-09-16 12:23:43 +05:30
Deepesh Garg
38d00f407e
Merge pull request #32225 from nabinhait/dunning-fix
fix: create dunning from sales invoice
2022-09-16 11:04:55 +05:30
Deepesh Garg
e4ef6c9645
Merge pull request #32219 from nabinhait/bank-clearnance-perm-issue
fix: No permission to read doctype
2022-09-16 11:04:42 +05:30
Nabin Hait
0286f2da78
Merge branch 'develop' into dunning-fix 2022-09-16 09:40:18 +05:30
Nabin Hait
a1fcabee0e
Merge pull request #32221 from rohitwaghchaure/consider-posting-time-for-internal-po
fix: consider posting time for internal transfer PO
2022-09-16 09:37:45 +05:30
Nabin Hait
9c96cd6090
Merge pull request #32222 from nabinhait/cost-center-renaming
fix: abbreviation issue on renaming cost center
2022-09-16 09:36:55 +05:30
Nabin Hait
786891c600
Merge branch 'develop' into bank-clearnance-perm-issue 2022-09-15 17:42:37 +05:30
Nabin Hait
0d732609f0
Merge branch 'develop' into consider-posting-time-for-internal-po 2022-09-15 17:42:26 +05:30
Nabin Hait
c5c6a69269
Merge branch 'develop' into cost-center-renaming 2022-09-15 17:42:13 +05:30
Nabin Hait
73f6c5fe35
Merge branch 'develop' into dunning-fix 2022-09-15 17:42:00 +05:30
Nabin Hait
5fa3450a9c
Merge pull request #32218 from nabinhait/asset-cap-tests
fix: Fixed asset capitalization test cases
2022-09-15 17:41:39 +05:30
Nabin Hait
29db084dc3 fix: create dunning from sales invoice 2022-09-15 13:11:53 +05:30
Nabin Hait
af21a11e1e fix: abbreviation issue on renaming cost center 2022-09-15 12:09:18 +05:30
Rohit Waghchaure
cb763938dc fix: consider posting time for internal transfer PO 2022-09-15 11:48:43 +05:30
Nabin Hait
c0da948a4e fix: No permission to read doctype 2022-09-15 11:27:35 +05:30
Nabin Hait
3457105504 fix: test cases 2022-09-15 11:19:33 +05:30
Nabin Hait
a5b5885933 fix: test cases 2022-09-15 11:19:14 +05:30
Nabin Hait
cbf973d90f fix: always set default expense account in company 2022-09-15 11:19:06 +05:30
Ankush Menat
97977cdb4b
fix: correct sql output format in CRM patch (#32213) 2022-09-14 19:19:05 +05:30
Deepesh Garg
87160c8d2f
Merge pull request #32208 from abhinavxd/fix-pending-accrual-entries
fix: Loans pending accrual entries
2022-09-14 14:14:44 +05:30
Abhinav Raut
f2209045f8 fix: pending accrual entries 2022-09-14 11:55:03 +05:30
Deepesh Garg
b6184ce471 test: Add tests 2022-09-14 09:13:02 +05:30
Sagar Sharma
444fda5d82
Merge pull request #32205 from s-aga-r/fix/issue/31557
fix: unknown column error while updating value of maintain-stock in item master
2022-09-14 08:14:21 +05:30
Deepesh Garg
b6d87ae25b Merge branch 'develop' of https://github.com/frappe/erpnext into pending_tds_vouchers 2022-09-13 22:31:21 +05:30
Sagar Sharma
bf1fa014f4 test: add test case for item master maintain-stock 2022-09-13 22:12:56 +05:30
Sagar Sharma
7b878ea3d8 fix: unknown column error while updating value of maintain-stock in item master 2022-09-13 21:52:58 +05:30
Deepesh Garg
3fb1595a4e fix: Fetch vouchers to show in Invoice 2022-09-13 20:31:31 +05:30
Deepesh Garg
246c1a9380 fix: Add child table for tax withheld vouchers 2022-09-13 20:05:20 +05:30
Ankush Menat
8043f4fc10 chore: let frappe pr bot raise stable branch PRs
[skip ci]
2022-09-13 15:14:53 +05:30
Nabin Hait
e24a4b18c4 Merge branch 'SaiFi0102-asset-capitalization' into develop 2022-09-13 15:00:21 +05:30
Nabin Hait
58d430fe3e feat: Asset Capitalization
- manual selection of entry type
- GLE cleanup with smaller functions
- GLE considering periodical inventory
- test cases
2022-09-13 14:56:21 +05:30
Deepesh Garg
dc985e0e83
Merge pull request #32190 from maharshivpatel/fix-item-wise-sales-register
fix: item wise sales register taxes and charges
2022-09-13 13:53:51 +05:30
Shadrak Gurupnor
f2b7c9ee66
fix: validate for active sla (#32132) 2022-09-13 13:42:45 +05:30
Ankush Menat
fffc245922
fix(UX): make Item attachments public by default (#32196) 2022-09-13 13:41:00 +05:30
Deepesh Garg
f8bee0e75f
Merge pull request #32091 from nabinhait/lead-notes-patch
fix: Migrate old lead notes as per the new format
2022-09-13 12:20:50 +05:30
Rucha Mahabal
eb01f9729d
fix(Employee): shorter tab titles (#32192) 2022-09-13 10:34:35 +05:30
Deepesh Garg
51c37aeee3
Merge branch 'develop' into lead-notes-patch 2022-09-13 09:42:07 +05:30
Raffael Meyer
e00ece7a78
fix: remove EmployeeBoardingController (#32139)
fix: remove employee boarding controller

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2022-09-13 02:00:04 +05:30
Maharshi Patel
62163ab3d3 fix: item wise sales register taxes and charges
i have added separate column for other charges. Instead of adding all values to tax_total, it checks if account_type is tax, and then only it adds to total_tax otherwise it adds to the total_other_charges.
2022-09-12 23:44:56 +05:30