Gursheen Kaur Anand
b7f283b2f0
feat: skip disabled accounts in COA ( #38551 )
...
* feat: skip disabled accounts in coa
* fix: add parameter to other tree doctype utils
2023-12-29 12:55:37 +05:30
Deepesh Garg
cd37fd790b
fix: Validate account in Sales/Purchase Taxes and Charges Template ( #39013 )
2023-12-29 12:52:22 +05:30
rohitwaghchaure
f983e09f92
fix: purchase return without item code not working ( #39014 )
2023-12-29 12:06:04 +05:30
Deepesh Garg
3b4b2275de
fix: Multiple subscription fixes ( #39005 )
2023-12-29 08:25:38 +05:30
rohitwaghchaure
b5340c5ec0
fix: auto fetch not working if bundle exists ( #39002 )
2023-12-28 18:32:27 +05:30
rohitwaghchaure
10074e9980
fix: serial and batch bundle company mandatory error ( #38994 )
2023-12-28 17:56:24 +05:30
Deepesh Garg
bbee9b5637
fix: Opening balance in bank reconciliation tool ( #38977 )
2023-12-28 17:50:16 +05:30
ruthra kumar
915d864166
Merge pull request #38969 from ruthra-kumar/bug_in_p_l_report
...
fix: incorrect net profit in Profit and Loss Statement
2023-12-28 16:23:21 +05:30
ruthra kumar
8555617295
test: profit and loss report output
2023-12-28 15:56:35 +05:30
Ankush Menat
b71b0d5997
fix: remove bad defaults ( #38986 )
...
Child tables can't have a default.
2023-12-28 08:45:40 +00:00
rohitwaghchaure
a117ef3cb8
fix: not able to cancel sales invoice ( #38979 )
2023-12-28 11:14:27 +05:30
Raffael Meyer
33b631e395
Merge pull request #38805 from barredterra/remove-unused-coa
2023-12-28 00:06:50 +01:00
Deepesh Garg
9b1c22250f
feat: Merge taxes from mapped docs ( #38346 )
...
* feat: Merge taxes from mapped docs
* chore: ci failures
2023-12-27 22:37:01 +05:30
Ankush Menat
4feecb69d8
ci: lock old resolved issue/PRs
2023-12-27 19:31:45 +05:30
ruthra kumar
12560e2407
Merge pull request #38496 from ruthra-kumar/bisect_accounting_reports
...
feat: utility to debug financial reports
2023-12-27 17:54:36 +05:30
ruthra kumar
0890b414b1
chore: resolve linter issues
2023-12-27 17:31:34 +05:30
ruthra kumar
d54f8318fb
fix: incorrect total when Accumulating values
2023-12-27 16:50:07 +05:30
VihangT
fe77b9d633
fix : correct logic for overlap error ( #38967 )
...
fixing overlap error logic with taking care of sequential time job cards in overlap job card list
2023-12-27 16:11:29 +05:30
rohitwaghchaure
47ee801d37
fix: incorrect qty in serial batch bundle against pick list ( #38964 )
2023-12-27 13:09:23 +05:30
s-aga-r
705ae7da14
Merge pull request #38962 from s-aga-r/FIX-38781
...
fix: use `Stock Qty` while getting `POS Reserved Qty`
2023-12-27 12:50:37 +05:30
s-aga-r
7223106417
fix: use Stock Qty while getting POS Reserved Qty
2023-12-27 10:32:13 +05:30
barredterra
5a5758423e
Merge remote-tracking branch 'upstream/develop' into remove-unused-coa
2023-12-26 16:06:43 +01:00
rohitwaghchaure
b09c9354fb
fix: min order qty optional in production plan ( #38956 )
...
* fix: min order qty optional in production plan
* fix: test cases
2023-12-26 20:11:58 +05:30
rohitwaghchaure
d00f6672a8
fix: not able to import serial batch bundle using csv ( #38950 )
2023-12-26 15:24:04 +05:30
rohitwaghchaure
06d6220a2a
fix: do not make serial batch bundle for zero qty ( #38949 )
2023-12-26 15:23:32 +05:30
ruthra kumar
3011322b22
Merge pull request #38891 from ruthra-kumar/customer_wise_report_price_issue
...
fix: incorrect price list in customer-wise item price report
2023-12-26 11:27:20 +05:30
s-aga-r
e560029736
Merge pull request #38942 from s-aga-r/FIX-38151-2
...
fix(ux): make PR and PI Item rate field readonly based on `Maintain Same Rate`
2023-12-26 10:20:34 +05:30
s-aga-r
b1ba210332
fix(ux): make PR Item rate field readonly based on Maintain Same Rate
2023-12-25 22:41:18 +05:30
s-aga-r
cb9114442b
fix(ux): make PI Item rate field readonly based on Maintain Same Rate
2023-12-25 22:29:17 +05:30
s-aga-r
eb5bb9f9a9
fix(ux): make PI Item rate field editable
2023-12-25 22:05:02 +05:30
Wolfram Schmidt
87ba3b64f7
chore: german translation for actual time ( #38837 )
...
chore: german translation for actual time
2023-12-24 16:22:26 +05:30
Gursheen Kaur Anand
47f7b65058
feat: voucher subtype for general ledger ( #38822 )
...
* feat: add voucher subtype column to gle
* feat: add logic to set voucher subtypes
* feat: fetch voucher subtype in ledger report
* fix: order of conditions
2023-12-24 16:13:31 +05:30
rohitwaghchaure
161ae1edd1
fix: reset the incoming rate on changing of the warehouse ( #38925 )
2023-12-22 17:37:17 +05:30
s-aga-r
d097ad6c19
Merge pull request #38922 from s-aga-r/FIX-38558
...
fix: `Reserved Stock` report
2023-12-22 16:27:27 +05:30
s-aga-r
a5d5223c0e
fix: Reserved Stock report
2023-12-22 15:46:06 +05:30
s-aga-r
1a1629196d
chore: improve Allowed Qty error msg
2023-12-22 15:29:56 +05:30
s-aga-r
d0ed8ef83b
Merge pull request #38558 from s-aga-r/ADD-ITEMS-STOCK-RESERVATION-DIALOG
...
feat: provision to add items in Stock Reservation dialog
2023-12-22 12:15:07 +05:30
hyaray
0773f66feb
chore: Update company.py ( #38660 )
...
chore: Update company.py
2023-12-22 08:41:51 +05:30
Ankush Menat
2dc49c834a
chore: fixup broken JSON files ( #38915 )
2023-12-22 07:36:27 +05:30
Ankush Menat
787333896c
perf: Drop unused/duplicate/sub-optimal indexes ( #38884 )
...
* ci: enable more checks
* perf: Drop unused/duplicate indexes
2023-12-21 20:09:10 +05:30
Anand Baburajan
283763dfb2
chore: additional_asset_cost field ( #38904 )
2023-12-21 16:52:25 +05:30
mergify[bot]
07175367d8
fix: reposting not fixing valuation rate for sales return using movin… (backport #38895 ) ( #38897 )
...
* fix: reposting not fixing valuation rate for sales return using movin… (#38895 )
fix: reposting not fixing valuation rate for sales return using moving average method
(cherry picked from commit 3a668bbe9694fdd6e8265869c6943e42f889ac41)
# Conflicts:
# erpnext/stock/stock_ledger.py
* chore: fix conflicts
---------
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-12-21 14:40:52 +05:30
mergify[bot]
61219ca4ce
fix: do not reset the basic rate for the material receipt stock entry (backport #38896 ) ( #38898 )
...
fix: do not reset the basic rate for the material receipt stock entry (#38896 )
(cherry picked from commit 98bfcc4c758b61f714c53ea0f00246731a30fdaf)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-12-21 14:23:08 +05:30
ruthra kumar
c20995ec2f
Merge pull request #38893 from ruthra-kumar/typeerror_in_pos
...
fix: typeerror on pos order summary to new order screen
2023-12-21 12:21:59 +05:30
ruthra kumar
6a0a08b59c
fix: typeerror on pos order summary to new order screen
2023-12-21 12:13:33 +05:30
Anand Baburajan
d370c60a6c
feat: total_asset_cost field ( #38879 )
2023-12-20 19:02:32 +05:30
mergify[bot]
a6ab53236e
fix: allow to set rate manually for service item in BOM (backport #38880 ) ( #38882 )
...
fix: allow to set rate manually for service item in BOM (#38880 )
(cherry picked from commit c2f692a4e4f3dd5089fe4949c6cd74574282fdb1)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-12-20 18:33:26 +05:30
ruthra kumar
9a00edb031
fix: incorrect price list in customer-wise item price report
2023-12-20 17:47:31 +05:30
NIYAZ RAZAK
ae353398d9
fix: local reference error in BOM ( #38850 )
...
fix: local reference error
2023-12-20 14:34:38 +05:30
Ankush Menat
9983283f95
perf: use estimated rows instead of actual rows ( #38830 )
2023-12-20 13:16:09 +05:30
