Deepesh Garg
0d8c24f488
Merge branch 'develop' of https://github.com/frappe/erpnext into loan_bank_reco
2022-02-21 22:22:02 +05:30
Sagar Sharma
e4c4dc402e
fix: JobCard TimeLog to_date ( #29872 )
2022-02-21 19:49:19 +05:30
Deepesh Garg
0c6835eab2
Merge pull request #29740 from deepeshgarg007/gross_profit_non_stock_item
...
fix: Multiple fixes in Gross Profit report
2022-02-21 19:28:55 +05:30
Ankush Menat
9661058cc7
fix: only set batchwise valuation flag if new batch
2022-02-21 19:04:10 +05:30
Ankush Menat
af9fa049c7
fix: batchwise valuation can only be used by FIFO/LIFO
2022-02-21 18:02:40 +05:30
Ankush Menat
75fb561698
test: force correct flag in test data
2022-02-21 18:02:40 +05:30
Ankush Menat
f38690f703
fix: check if Moving average item can use batchwise valuation
2022-02-21 18:02:40 +05:30
Ankush Menat
6b0bc35063
test: mixed moving average items
2022-02-21 18:02:40 +05:30
Ankush Menat
609d2fccad
fix: reset stock value if no qty
2022-02-21 18:02:40 +05:30
Ankush Menat
35483242b3
fix: extend round_off_if_near_zero fix to other methods
2022-02-21 18:02:40 +05:30
Ankush Menat
76b395d62e
test: old/new mix batches valuation consumption
2022-02-21 18:02:40 +05:30
Ankush Menat
b1555fd477
chore: batch flag and consumption rate in invariant report
2022-02-21 18:02:40 +05:30
Ankush Menat
b534fee2c7
refactor: use queue difference instead of actual values
2022-02-21 18:02:40 +05:30
Ankush Menat
aba7a7ce4e
fix: handle negative inventory inside a batch
2022-02-21 18:02:40 +05:30
Ankush Menat
d7ca83ef0b
refactor: code duplication for fallback rates
2022-02-21 18:02:40 +05:30
Ankush Menat
c5bd34d238
test: multi-batch stock entry
2022-02-21 18:02:40 +05:30
Ankush Menat
60b8bae85f
test: batch wise valuation for transfer and intermediate
2022-02-21 18:02:40 +05:30
Ankush Menat
5718777a2b
fix: consider batch_no when getting incoming rate
2022-02-21 18:02:40 +05:30
18alantom
683ef8a603
test: more tests for batchwise valuation
...
Co-Authored-By: Ankush Menat <ankush@frappe.io>
2022-02-21 18:02:40 +05:30
Ankush Menat
312db429e4
refactor: use qb for patching flag
2022-02-21 18:02:40 +05:30
Ankush Menat
d130233ffc
test: fix expected test failures
2022-02-21 18:02:40 +05:30
Ankush Menat
102fff24c8
refactor: convert query to QB and make creation optional
2022-02-21 18:02:40 +05:30
Ankush Menat
ab926521bd
fix: correct incoming rate for batched items
2022-02-21 18:02:40 +05:30
Ankush Menat
342d09a671
feat: get_valuation_rate batch wise
...
This function is used to show valuation rate on frontend and also as
fallback in case values aren't available. Add "batch_no" param to get
batch specific valuation rates.
Co-Authored-By: Alan Tom <2.alan.tom@gmail.com>
2022-02-21 18:02:40 +05:30
Ankush Menat
ce0514c8db
feat: batch wise valuation rates
...
start with most used case: negative inventory isn't enabled
- simple addition of qty and value when new batch qty is added
- fetch outgoing rate from stock movement of specific batch
2022-02-21 18:02:40 +05:30
18alantom
f4af75f60b
feat: batchwise valuation flag
...
This is required to avoid breaking behaviour in valuation
of old batches
2022-02-21 18:02:40 +05:30
Ankush Menat
00e8565868
fix: round off increments in numeric item variant
2022-02-21 17:42:34 +05:30
Deepesh Garg
a4c6cb9f12
fix: Remove print statements
2022-02-21 17:08:25 +05:30
Deepesh Garg
b7c388976d
Merge branch 'develop' of https://github.com/frappe/erpnext into loan_bank_reco
2022-02-21 16:58:52 +05:30
Deepesh Garg
6bf7bd6a9f
Merge branch 'develop' into gross_profit_non_stock_item
2022-02-21 16:56:49 +05:30
Deepesh Garg
40a45a3139
Merge pull request #29907 from deepeshgarg007/tds_payable_total_amount
...
fix: Total Credit amount in TDS Payable monthly report
2022-02-21 15:33:58 +05:30
Ankush Menat
afc81351b7
test: only test erpnext doctypes
...
Co-authored-by: gavin <gavin18d@gmail.com>
2022-02-21 15:32:28 +05:30
Ankush Menat
e3ea431ef3
test: test all form loads
2022-02-21 15:32:28 +05:30
Ankush Menat
3a5dbfab50
fix: make cashflow mapping template child doctype
2022-02-21 15:32:28 +05:30
Ankush Menat
1f9ce92011
ci: moar backport labels
...
[skip ci]
2022-02-21 14:30:09 +05:30
Deepesh Garg
170a657ed8
Merge pull request #29887 from deepeshgarg007/loan_interest_principal
...
fix: Ledger entries on LIA for term loans
2022-02-21 14:24:37 +05:30
Marica
e952cce17d
chore: Show 'Produced Qty' field in Sales Order Item ( #29903 )
2022-02-21 14:22:14 +05:30
Deepesh Garg
a82cf7214e
fix: Total Credit amount in TDS Payable monthly report
2022-02-21 13:58:56 +05:30
Deepesh Garg
e24242ee33
Merge branch 'develop' into loan_interest_principal
2022-02-21 13:39:45 +05:30
Deepesh Garg
e13d774e8e
Merge branch 'develop' into gross_profit_non_stock_item
2022-02-21 12:34:14 +05:30
Saqib Ansari
1a31e9d916
Merge pull request #29896 from nextchamp-saqib/fix-pos-coupon-code-#2
...
fix(pos): removal of coupon code
2022-02-21 11:48:35 +05:30
Deepesh Garg
0b5e618e3a
fix: Update bank reconciliation statement
2022-02-21 11:46:44 +05:30
Deepesh Garg
295cbb0ff2
fix: Update queries in Bank Reconciliation Tool
2022-02-21 11:45:23 +05:30
Deepesh Garg
a0bdcbd0cd
fix: Add patch for account fields
2022-02-21 11:44:00 +05:30
Saqib Ansari
fa38c291bd
fix(pos): removal of coupon code
2022-02-21 11:38:16 +05:30
rohitwaghchaure
6956578339
Merge pull request #29771 from deepeshgarg007/consolidated_financial_statment_error
...
fix: Error in consolidated financial statements
2022-02-20 18:21:54 +05:30
Deepesh Garg
83a60a2a17
Merge pull request #29869 from deepeshgarg007/gstr_1_gstin_filter
...
fix: GSTIN filter for GSTR-1 report
2022-02-19 19:41:49 +05:30
Deepesh Garg
d188fcc066
chore: remove console statements
2022-02-19 19:36:43 +05:30
Deepesh Garg
a28ec89507
Update gstr_1.js
2022-02-19 19:35:57 +05:30
Deepesh Garg
1aa12fb3f1
fix: Ledger entries on LIA for term loans
2022-02-19 19:19:32 +05:30
