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

6681 Commits

Author SHA1 Message Date
s-aga-r
851a234988
Merge pull request #37819 from s-aga-r/FIX-5274 
fix: `TypeError` in PR for non-stock item
 2023-11-02 10:39:35 +05:30
barredterra
38e5e4a893 feat(Stock Balance): add filters from route 2023-11-01 18:05:50 +01:00
s-aga-r
f0a1f4ac7c refactor: remove unused fields fcfs_rate and ma_rate from Bin 2023-11-01 15:36:41 +05:30
s-aga-r
ec1a7869f8 refactor: rearrange fields and update label 2023-11-01 15:35:18 +05:30
Deepesh Garg
47f913abcb
Merge pull request #37694 from viralpatel15/develop 
fix: set docstatus filter to ignore cancel document
 2023-11-01 14:16:31 +05:30
s-aga-r
028b3e2fbf fix: TypeError in PR for non-stock item 2023-11-01 11:48:27 +05:30
David Arnold
139a68fd0f
test: fix bad test data (#37773) 
* test(stock): fix bad test data

* test(asset): fix bad test data

* test(stock): fix bad test data

* test(manufacturing): fix bad test data
 2023-10-31 16:50:09 +05:30
rohitwaghchaure
056b74b162
fix: indexing on Delivery Note Item (#37766) 
fix: added indexing on Delivery Note Item
 2023-10-31 12:32:52 +05:30
viralkansodiya15
a15484fe3d
fix: solve linter test and update 2023-10-30 13:01:25 +05:30
viralkansodiya15
76c61c1b04
Merge branch 'frappe:develop' into develop 2023-10-30 12:12:47 +05:30
viralkansodiya15
de58c67991
fix: linter test solve 2023-10-30 10:44:17 +05:30
s-aga-r
8a34a4ba68
Merge pull request #37732 from bosue/remove_extraneous_disabled_filters 
refactor: remove extraneous disabled filters
 2023-10-30 09:54:05 +05:30
s-aga-r
62384e9321
Merge pull request #37722 from s-aga-r/FIX-TYPO 
fix: typo in function name and msg
 2023-10-29 12:17:27 +05:30
Deepesh Garg
1081df3d7e
Merge pull request #37674 from GursheenK/item-variant-tax-template 
fix(minor): set tax values for item variants
 2023-10-29 10:33:03 +05:30
Bernd Oliver Sünderhauf
f276fbba4f refactor: remove extraneous disabled filters 2023-10-28 02:10:28 +02:00
rohitwaghchaure
fd78f868e1
fix: unsupported operand type(s) for serial and batch bundle in POS Invoice (#37721) 2023-10-27 23:33:04 +05:30
Anand Baburajan
d99a56bc27
chore: allow wip_composite_asset in the MR PO PR PI flow (#37723) 2023-10-27 18:54:36 +05:30
s-aga-r
48c66b68ab fix: typo in function name and msg 2023-10-27 17:07:16 +05:30
David Arnold
1612d7ba3f
fix(defaults): apply discount and provisonal defaults from item group and brand if available (#37466) 2023-10-26 12:03:22 +00:00
David Arnold
681782121c
fix: avoid name clash in delivery stop (#37306) 
* fix(stock): avoid name clash in delivery stop with Document.lock()

* chore(stock): format delivery stop json according to doctype builder
 2023-10-26 11:46:50 +00:00
s-aga-r
35cf944cb7
Merge pull request #37604 from blaggacao/feat/link-dn-list-from-dt-form 
feat(delivery): link to delivery notes list view from delivery trip
 2023-10-26 13:01:55 +05:30
viralkansodiya15
4bbad7f448
fix: set docstatus filter to ignore cancel document 2023-10-26 11:45:47 +05:30
s-aga-r
3290df5593 fix: consider returned qty while calculating unsupplied qty 2023-10-25 19:08:51 +05:30
rohitwaghchaure
2bcff4c7f2
chore: fixed test case non_internal_transfer_delivery_note (#37671) 2023-10-25 13:24:34 +05:30
Gursheen Anand
d436a40739 fix: only update if variant table empty 2023-10-25 13:06:03 +05:30
Gursheen Anand
5deba1b6f9 fix: copy all child fields to item variant 2023-10-25 12:50:16 +05:30
mergify[bot]
886102d462
chore: fixed test cases related to Internal Transfer (backport #37659) (#37662) 
* chore: fixed test cases related to Internal Transfer (#37659)

(cherry picked from commit 72d32a49012329d33fd4ecea70988fbfbfce566f)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
#	erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py

* chore: fix conflicts

* chore: fix conflicts

* chore: fix test cases

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-10-25 12:46:39 +05:30
rohitwaghchaure
92cbe580e6
fix: incorrect process loss validation for multiple finished items (#37576) 2023-10-24 15:28:55 +05:30
Deepesh Garg
11d956fa18
fix: Purchase Receipt GL Entries (#37642) 
* fix: Purchase Receipt GL Entries

* chore: cleanup

* test: set cwip account
 2023-10-24 14:28:19 +05:30
s-aga-r
cdbe1c87d4
Merge pull request #37603 from s-aga-r/AUTO-RESERVATION 
feat: auto reserve stock for Sales Order on purchase
 2023-10-24 10:14:18 +05:30
Deepesh Garg
3bfb7b79f2
refactor: Remove expense included in valuation accounts (#37632) 
* refactor: Remove expense included in valuation accounts

* test: Deprecate tests

* test: Depricate tests

* test: Depricate tests
 2023-10-23 18:23:45 +05:30
s-aga-r
24788ddcc0 chore: add SRE link in PR Connections 2023-10-23 18:00:58 +05:30
s-aga-r
adf313a6d3 test: add test case for auto-reservation from PR 2023-10-23 17:52:59 +05:30
s-aga-r
a432290a82 fix: ignore qty msg if From Voucher is set 2023-10-23 16:26:00 +05:30
Imesha Sudasingha
2b64e1ca8b
chore: typo in description (#37636) 
chore: typo in description
 2023-10-23 15:28:52 +05:30
Deepesh Garg
d1ec0a6093
chore: Add missing commits back (#37618) 
* chore: Add missing commits back

* test: cwip accounting unit tests

* chore: Attribute error

* chore: Purchase Invoice tests

* chore: Missing asset account

* chore: Missing asset account

* chore: update tests

* fix: Internal transfer GL Entries
 2023-10-23 00:16:40 +05:30
rohitwaghchaure
5136fe196b
fix: remove from or target warehouse for non internal transfer entries (#37612) 2023-10-22 20:03:02 +05:30
Gursheen Kaur Anand
b0d440c34b
fix: set empty value for tax template in item details (#37496) 
* fix: empty tax template for items with invalid templates

* fix: test for empty tax template

* fix: test for item tax template calculation

* fix: test for pos inv tax template calculation
 2023-10-21 17:58:43 +05:30
Akhil Narang
21c3d9c371
refactor: use gzip library's compress() and decompress() methods directly (#37611) 
The util methods in framework were added for python2.7 compat, so can be removed

Signed-off-by: Akhil Narang <me@akhilnarang.dev>

[skip ci]
 2023-10-21 11:19:45 +05:30
Deepesh Garg
dae66eab36 Merge branch 'develop' of https://github.com/frappe/erpnext into asset_purchase_receipt_gl 2023-10-20 20:12:43 +05:30
Deepesh Garg
eec4057e8d fix: Purchase Invoice GL entires for assets 2023-10-20 19:42:14 +05:30
Deepesh Garg
2a7d1c4c8d
Merge pull request #37595 from vorasmit/purchase-gl 
fix: add regional support to extend purchase gl entries
 2023-10-20 16:51:58 +05:30
Deepesh Garg
0b674b608b Merge branch 'develop' of https://github.com/frappe/erpnext into asset_purchase_receipt_gl 2023-10-20 16:50:52 +05:30
rohitwaghchaure
14b009b093
fix: incorrect cost center in the purchase invoice (#37591) 2023-10-20 16:22:29 +05:30
David Arnold
79d51a0a0b
fix(delivery): rename dt fetch stop action 2023-10-20 12:31:46 +02:00
David Arnold
85488cd0dc
feat(delivery): link to delivery notes list view from delivery trip 2023-10-20 12:25:19 +02:00
s-aga-r
4f363f5bf3 fix: partial reservation against SBB 2023-10-20 15:46:06 +05:30
Smit Vora
ff7108a3b1 fix: update existing doc if possible 2023-10-20 09:33:37 +05:30
Smit Vora
77cc91d06b fix: add regional support to extend purchase gl entries 2023-10-19 22:35:55 +05:30
s-aga-r
45395027d3 fix: incorrect serial and batch get reserved 2023-10-19 19:57:50 +05:30