Saqib
9198caa5e7
fix: incorrect gl entry on period closing involving finance books ( #26921 )
2021-08-24 17:26:23 +05:30
Subin Tom
2e5525aba9
fix: Correct price list rate value in return si ( #27097 )
2021-08-24 17:24:41 +05:30
Saqib
ce129a1414
feat: re-arrange company doctype fields ( #27091 )
2021-08-24 17:23:14 +05:30
Subin Tom
d4d5a4221a
feat: coupon code discount in pos invoice ( #27004 )
2021-08-24 16:22:46 +05:30
Marica
236f35d2fa
Merge pull request #27098 from surajshetty3416/fix-remove-all-import
...
fix: Use remove_all from file_manager
2021-08-24 15:56:31 +05:30
Saqib
9e82c24b27
fix: pos closing entry cancellation test ( #27099 )
...
* fix: pos closing entry cancellation test
* fix: invalid imports
* fix: sider issue
2021-08-24 15:37:00 +05:30
Saqib
6cf9254ee5
fix: invalid imports ( #27101 )
2021-08-24 15:26:44 +05:30
Suraj Shetty
1e05c9467b
fix: Use remove_all from file_manager
2021-08-24 14:21:14 +05:30
Ankush Menat
c09d8a2809
fix(ux): keep stock entry title & purpose in sync ( #27043 )
...
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2021-08-24 12:20:34 +05:30
Ankush Menat
6de7b8ea93
fix: discard empty rows from update items ( #27021 )
2021-08-24 12:18:40 +05:30
Ankush Menat
0dff0beaba
fix: stock analytics report date range issues and add company filter ( #27014 )
...
* test: tests for correct get_period_date_ranges
* fix: stock analytics report date range issues
- Upon selecting second half of month with Monthly filter, data from
that period was missing.
- Solution: "round down" the date as per expected frequency.
* chore: drop py2 and fix misleading docstring
* test: fix test to avoid FY clash
* feat: add company filter in stock analytics report
[skip ci]
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2021-08-24 12:16:46 +05:30
Pruthvi Patel
332ac105b5
refactor: use read_only_depends_on
instead of code ( #27008 )
2021-08-24 12:07:38 +05:30
rohitwaghchaure
db385261f0
Merge pull request #27080 from rohitwaghchaure/fixed-stock-ledger-report-with-included-uom
...
fix: stock ledger report not working if include UOM selected in filter
2021-08-24 10:16:35 +05:30
rohitwaghchaure
95866b736e
Merge pull request #27081 from rohitwaghchaure/fixed-donot-overrride-batch-no
...
fix: batch no reset on changing of qty
2021-08-24 10:15:36 +05:30
rohitwaghchaure
da3220e38e
Merge branch 'develop' into fixed-stock-ledger-report-with-included-uom
2021-08-24 08:50:49 +05:30
Rushabh Mehta
dd3372a3a5
Merge pull request #27089 from frappe/revert-26604-salary-component-account-filter
...
Revert "fix: Salary component account filter"
2021-08-24 08:34:21 +05:30
Rushabh Mehta
49e0a4f287
Revert "fix: Salary component account filter ( #26604 )"
...
This reverts commit ae9d1d9617
.
2021-08-24 08:33:57 +05:30
rohitwaghchaure
129a0fc8b2
Merge branch 'develop' into fixed-donot-overrride-batch-no
2021-08-23 18:07:22 +05:30
Deepesh Garg
69973a65aa
Merge pull request #26900 from deepeshgarg007/payment_entry_validations_and_trigger_develop
...
fix: Multiple fixes in payment entry
2021-08-23 18:03:01 +05:30
Subin Tom
47b63a627d
fix: Eway bill test update to check ver 1.0.0421 ( #27083 )
2021-08-23 15:38:26 +05:30
Rohit Waghchaure
e1f070437a
fix: selected batch no changed on updation of qty
2021-08-23 14:27:55 +05:30
Rohit Waghchaure
098d349bf4
fix: stock ledger report not working if include uom selected in filter
2021-08-23 13:36:13 +05:30
Subin Tom
8b2fe9e793
fix: eway bill version changed to 1.0.0421 ( #27044 )
2021-08-23 11:17:31 +05:30
Subin Tom
7d627df4db
fix: pos return payment mode issue ( #26872 )
2021-08-23 11:05:07 +05:30
Deepesh Garg
df185045a1
Merge branch 'develop' into payment_entry_validations_and_trigger_develop
2021-08-23 10:34:28 +05:30
Deepesh Garg
496bff5136
feat: Column for total amount due in Accounts Receivable/Payable Summary ( #27069 )
2021-08-22 18:10:51 +05:30
Deepesh Garg
57e326e7d0
fix: Consolidated balance sheet showing incorrect values ( #26975 )
2021-08-21 17:59:11 +05:30
Saqib
ec258551bf
fix: flaky test for SLA ( #27051 )
2021-08-20 19:09:31 +05:30
Alan
62c590261c
refactor: rectify typo ( #27057 )
...
[skip ci]
2021-08-20 18:21:09 +05:30
Deepesh Garg
2b2572b9b9
fix: Cascade deletion for Company ( #26923 )
...
* fix: Cascade deletion for Company
2021-08-20 14:40:12 +05:30
Saqib
c335962827
refactor!: drop e-invoicing integration from erpnext ( #26940 )
2021-08-20 11:10:46 +05:30
Saqib
153fe1cdb4
refactor: scan barcode field scanning ( #26990 )
2021-08-20 11:09:51 +05:30
Nabin Hait
b8c998119b
Merge pull request #27040 from marination/cart-pl-exchange-rate
...
fix: Shopping cart Exchange rate validation
2021-08-20 10:56:10 +05:30
Nabin Hait
12d7f83998
Merge pull request #27033 from noahjacob/ux_promo_scheme_fix
...
fix(ux): removed rate from grid view
2021-08-20 10:51:59 +05:30
Nabin Hait
657e61ae6d
Merge pull request #27028 from noahjacob/prompt_warehouse_fix
...
fix: incorrect mandatory error message for warehouse
2021-08-20 10:48:34 +05:30
marination
8046d15ef0
chore: Comment out obsolete test
...
- Modifying this test means considering extreme edge cases, which seems pointless now
2021-08-19 21:10:30 +05:30
Noah Jacob
f13315809e
refactor: renamed varint_item_code to variant_item_code ( #27025 )
2021-08-19 20:28:30 +05:30
marination
45617ae22f
fix: Shopping cart Exchange rate validation
...
- Use `get_exchange_rate` to check for price list exchange rate in cart settings
- Move cart exchange rate validation for Price List from hooks to doc event
- Call cart exchange rate validation on PL update only if PL is in cart and currency is changed
2021-08-19 20:01:05 +05:30
Alan
9225f02599
fix: pass planned start date to created work order ( #27031 )
...
* fix: pass planned start date to created workorder
* test: production plan to work order start date
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2021-08-19 18:49:20 +05:30
Afshan
c60d5523bc
fix: add child item groups into the filters ( #26997 )
...
* fix: add child item groups into the filters
* fix: appending values to proper variable
* fix: refactor the loop
2021-08-19 16:23:18 +05:30
Noah Jacob
6541453c16
fix(ux): removed rate from grid view
2021-08-19 15:53:55 +05:30
Alan
09f34e558e
fix: set production plan to completed even on over production ( #27027 )
2021-08-19 15:51:36 +05:30
Ankush Menat
993b0532f8
Merge pull request #27026 from ankush/eq_assign
...
fix: equality check instead of assignment
[skip ci]
2021-08-19 15:43:34 +05:30
Noah Jacob
cf8d2d97dd
fix: Incorrect mandatory error message for warehouse
2021-08-19 15:43:20 +05:30
Ankush Menat
5b54d0436b
chore: revert "chore: ignore whitespace fixes from git blame"
...
This reverts commit 2c40b7c206
.
2021-08-19 14:18:39 +05:30
Ankush Menat
2c40b7c206
chore: ignore whitespace fixes from git blame
2021-08-19 14:12:09 +05:30
Ankush Menat
0ef5247e2f
chore: whitespace cleanup from codebase ( #27023 )
...
* chore: mass trailing whitespace and EOF fixes
* chore: update git-blame-ignore-revs
2021-08-19 14:09:54 +05:30
Ankush Menat
49db369d21
chore: update git-blame-ignore-revs
2021-08-19 13:44:11 +05:30
Ankush Menat
4551d7d602
chore: mass trailing whitespace and EOF fixes
2021-08-19 13:43:28 +05:30
Deepesh Garg
869e36c33a
Merge pull request #26737 from nemesis189/payment-reconc-party-validation-fix
...
fix: Payment Reconciliation party validation issue
2021-08-19 12:40:54 +05:30