Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
48,256 Commits 3 Branches 0 Tags
Commit Graph

6745 Commits

Author SHA1 Message Date
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
rohitwaghchaure
10074e9980
fix: serial and batch bundle company mandatory error (#38994) 2023-12-28 17:56:24 +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
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
Gursheen Anand
43fed29514 fix: use child table values instead of global min max 2023-12-27 19:32:48 +05:30
rohitwaghchaure
47ee801d37
fix: incorrect qty in serial batch bundle against pick list (#38964) 2023-12-27 13:09:23 +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
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
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
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
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
Ankush Menat
9983283f95
perf: use estimated rows instead of actual rows (#38830) 2023-12-20 13:16:09 +05:30
mergify[bot]
793e3ad78e
fix: if not budget then don't validate (backport #38861) (#38864) 
fix: if not budget then don't validate (#38861)

(cherry picked from commit d375164100158db9b974742caa3e05062c481d7d)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-19 18:31:18 +05:30
mergify[bot]
4057682c87
fix: incoming rate for sales return with Moving Average valuation method (backport #38849) (#38863) 
* fix: incoming rate for sales return with Moving Average valuation method (#38849)

(cherry picked from commit 7fdac62393ee1e96969cca38a4ce0c07993dce7e)

# Conflicts:
#	erpnext/stock/doctype/delivery_note/test_delivery_note.py

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-19 18:29:56 +05:30
mergify[bot]
4aa960b744
fix: item variant with manufacturer (backport #38845) (#38847) 
* fix: item variant with manufacturer (#38845)

(cherry picked from commit e0c8ff10daeed0829266aea9142805f68ceedb2b)

* chore: fix test case

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-19 14:59:33 +05:30
Ankush Menat
8d79365e0d
perf: index return_against on delivery note (#38827) 
There's a multi-column index but that's useful IFF all parts of column
are part of query.

return against on it's own is VERY unique because it's a primary key, we
don't need a multi-column index here.
 2023-12-18 18:06:44 +05:30
mergify[bot]
71e833c3f2
fix: not able to cancel SCR with Batch (backport #38817) (#38821) 
* fix: not able to cancel SCR with Batch (#38817)

(cherry picked from commit fb5090fd3f23ada507fe8abc5a899f4b06e48d7e)

# Conflicts:
#	erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py

* chore: fix test case

* chore: fix test case

* chore: fix test case

* chore: fix test case

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-18 17:56:05 +05:30
rohitwaghchaure
0743289925
fix: serial and batch bundle return not working (#38754) 
* fix: serial and batch bundle return not working

* test: added test case for delivery note return against denormalized serial no
 2023-12-17 12:42:07 +05:30
Deepesh Garg
863116f1cd
Merge pull request #37232 from GursheenK/make-against-field-dynamic 
fix: make GL and JV against fields dynamic links
 2023-12-16 22:27:50 +05:30
s-aga-r
9a5c422074
Merge pull request #38778 from s-aga-r/FIX-7327 
fix: wrong currency in Stock Balance report
 2023-12-15 15:28:52 +05:30
s-aga-r
5a83a16e60 fix: wrong currency in Stock Balance report 2023-12-15 14:45:09 +05:30
s-aga-r
a1b95606b1
Merge pull request #38720 from s-aga-r/FIX-6545 
fix(ux): don't override Item Name and Description in MR
 2023-12-15 10:57:24 +05:30
s-aga-r
726ac6bda1 fix(ux): don't override Item Name and Description in MR 2023-12-15 10:56:54 +05:30
rohitwaghchaure
13cba5068b
fix: barcode scanning for the stock entry (#38716) 2023-12-13 15:08:16 +05:30
rohitwaghchaure
db24e24882
fix: supplier removed on selection of item (#38712) 2023-12-13 14:06:45 +05:30
rohitwaghchaure
69d7a640ee
fix: negative batch issue (#38688) 2023-12-12 16:18:32 +05:30
rohitwaghchaure
780c4278e6
fix: serial no filter in the Serial No Ledger report (#38669) 2023-12-12 11:24:07 +05:30
s-aga-r
c41cbb3e29
Merge pull request #38644 from barredterra/fix-attribute-error 
fix: attribute error
 2023-12-12 10:02:16 +05:30
rohitwaghchaure
89a0e9c245
fix: not able to make serial and batch using csv import (#38659) 2023-12-11 10:35:31 +05:30
rohitwaghchaure
89326bd657
fix: auto delete draft serial and batch bundle (#38637) 2023-12-10 11:05:58 +05:30
barredterra
0465c9aabb fix: attribute error 2023-12-08 14:15:26 +01:00
rohitwaghchaure
231ab83562
fix: serial and batch bundle permission (#38618) 2023-12-07 18:00:07 +05:30
rohitwaghchaure
f45dd740c5
chore: minor code cleanup (#38615) 2023-12-07 15:29:50 +05:30
Raffael Meyer
f99bb61181
Merge pull request #38591 from barredterra/de-morgan 2023-12-06 22:30:03 +01:00
s-aga-r
16c297c2ec feat: add Valuation Method column in Stock Ledger Variance report 2023-12-05 18:06:14 +05:30
s-aga-r
8beec58670 fix: incorrect SLE for Moving Average valuation method 2023-12-05 17:51:01 +05:30
barredterra
eb9ee3f79b refactor: simplify conditional logic 
Command: `sourcery review --fix --enable de-morgan .`
 2023-12-05 11:22:55 +01:00
Gursheen Anand
005c5a587f chore: orderby in gle 2023-12-05 13:16:54 +05:30
Gursheen Anand
47c78a5a73 fix: check for unmerged gle in purchase receipt test 2023-12-05 12:48:25 +05:30
Gursheen Anand
a56b79cc72 fix: check for split entries in stock entry test 2023-12-05 12:46:22 +05:30
s-aga-r
16b7401d4c
Merge pull request #38553 from s-aga-r/STOCK-VARIANCE-COMPANY 
feat: `Company` filter in `Stock Ledger Variance` report
 2023-12-05 11:56:17 +05:30
s-aga-r
fb3421fcce feat: Company filter in Stock Ledger Variance report 2023-12-04 15:39:25 +05:30
rohitwaghchaure
c8693cdf37
fix: scan for serial or batch in bundle (#38534) 2023-12-04 15:02:47 +05:30
s-aga-r
01aadbef85 fix: don't show non-stock items in Stock Analytics report 2023-12-04 12:00:36 +05:30
s-aga-r
ccdcb7dfcc fix(ux): stock-item filter for Item Code field 2023-12-04 11:58:44 +05:30
Bernd Oliver Sünderhauf
4918aeb4c6 refactor: Consolidate duplicate zero-quantity transaction Items checks. 2023-12-03 19:57:32 +01:00