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

4732 Commits

Author SHA1 Message Date
Saqib
3a50490c04
fix: fetching of item tax from hsn code (#26736) 
* fix: fetching of item tax from hsn code
 2021-08-03 15:57:11 +05:30
Ganga Manoj
471f48f64d
fix: Reset weight_per_unit on replacing Item (#26619) 
* fix: Assign Item's default weight_per_unit as its weight_per_unit in get_item_details

* fix: Set weight_uom in get_item_details as Item's default weight_uom
 2021-08-03 14:39:38 +05:30
Ankush
b3740e9afc
fix: remove limit from stock balance report (#26773) 2021-08-02 20:13:26 +05:30
rohitwaghchaure
31fe5f5b92
fix: added progress bar in repost item valuation (#26680) 2021-08-02 11:01:30 +05:30
Rohit Waghchaure
343143037c fix: conflicts 2021-08-01 14:45:24 +05:30
rohitwaghchaure
41da6f0d13
Merge pull request #26735 from rohitwaghchaure/fixed-cogs-in-purchase-receipt 
fix: COGS account in purchase receipt
 2021-07-31 14:50:47 +05:30
Rohit Waghchaure
2a14f255cf fix: COGS account in purchase receipt 2021-07-31 11:14:14 +05:30
Marica
0eed394f5e
Merge branch 'develop' into stock-reco-fetch-non-empty-stock 2021-07-29 19:54:56 +05:30
rohitwaghchaure
22eac9bd0c
Merge pull request #26720 from rohitwaghchaure/skip-cancelled-entries-in-report-develop 
fix: remove cancelled entries from Stock and Account Value comparison report
 2021-07-29 19:50:00 +05:30
Ankush
57cd273f7c
fix: empty "against account" in Purchase Receipt GLE bp #26712 (#26719) 
* fix: correct field for GLE against account in PR

* fix: remove incorrect field check from reposting
 2021-07-29 19:49:36 +05:30
marination
533ee9a401 feat: (Stock Reco) Ignore Empty Stock while fetching items from warehouse 
- Added checkbox to `Fetch Items from Warehouse` dialog to ignore empty stock
- fix: Items fetched twice due to Item Defaults
- Improved code readability
 2021-07-29 19:39:32 +05:30
Rohit Waghchaure
a6d276a06f fix: remove cancelled entries from Stock and Account Value comparison report 2021-07-29 19:16:20 +05:30
Rohit Waghchaure
c1c5a4ae17 fix: remove cancelled entries from Stock and Account Value comparison report 2021-07-29 19:15:34 +05:30
Deepesh Garg
8b7e3775c2
Merge pull request #26712 from ankush/against_acc_pr 
fix: empty "against account" in Purchase Receipt GLE
 2021-07-29 19:10:38 +05:30
Ankush Menat
c3e739caf8
fix: correct field for GLE against account in PR 2021-07-29 15:34:18 +05:30
Noah Jacob
ba18a96b0c test: test case for over transfer of materials 2021-07-26 18:12:40 +05:30
Noah Jacob
bc82344fc7 feat: over transfer allowance for material transfers 2021-07-26 18:12:37 +05:30
rohitwaghchaure
ac6bfeaa8d
Merge pull request #26558 from rohitwaghchaure/fixed-incorrect-gross-profit-report 
fix: incorrect valuation rate calculation in gross profit report
 2021-07-21 19:35:55 +05:30
Deepesh Garg
3e109840f9
Merge pull request #26464 from nemesis189/added-dispatch-address-to-sales 
feat: Added dispatch address fields in Sales Ord, Sales Inv, Delivery Note for Eway Bill
 2021-07-21 10:52:10 +05:30
Subin Tom
013b352639
fix: Price list rate not fetched for return sales invoice fixed (#26559) 
Co-authored-by: Subin Tom <subin-home@Subins-MacBook-Air.local>
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
 2021-07-20 21:03:11 +05:30
Subin Tom
2d225e621f
fix: Price list rate not fetched for return sales invoice fixed (#26560) 
Co-authored-by: Subin Tom <subin-home@Subins-MacBook-Air.local>
 2021-07-20 20:41:04 +05:30
Rohit Waghchaure
c14aa45720 fix: incorrect valuation rate calculation in gross profit report 2021-07-20 18:19:15 +05:30
Ankush
92273cade0
fix(ux): item description should fall back to name (#26339) (#26552) 
Don't set item description = item code from front end. This is already
being set to item_name in before_insert and item_name is better
fallback than item code for description.

Also fixed wrong condition for erasing description while duplicating
item.
 2021-07-19 20:44:05 +05:30
Ankush
80e269887d
fix(ux): item description should fall back to name (#26339) 
Don't set item description = item code from front end. This is already
being set to item_name in before_insert and item_name is better
fallback than item code for description.

Also fixed wrong condition for erasing description while duplicating
item.
 2021-07-19 20:42:44 +05:30
Nabin Hait
11475487fb fix: merge conflict 2021-07-16 15:58:50 +05:30
Rohit Waghchaure
56e4a88956 fix: added patch to fix missing FG item 2021-07-16 15:06:57 +05:30
Nabin Hait
9ddf33715e
Merge pull request #26513 from rohitwaghchaure/patch-to-fix-missing-fg-item 
fix: added patch to fix missing FG item
 2021-07-16 15:05:23 +05:30
Noah Jacob
3362c080b6
fix: validation check when no conversion_factor (#26527) 2021-07-16 15:00:08 +05:30
Rohit Waghchaure
13e9aa5956 fix: added patch to fix missing FG item 2021-07-16 14:34:24 +05:30
Rohit Waghchaure
0c6ca09e06 fix: added patch to fix missing FG item 2021-07-16 14:33:25 +05:30
Rohit Waghchaure
df5c2b9aaf fix: FG item not fetched in manufacture entry 2021-07-16 11:35:14 +05:30
Rohit Waghchaure
a748dd9261
feat: provision to make subcontracted purchase order from the production plan 2021-07-15 19:01:36 +05:30
Noah Jacob
d8668f78f4
fix: validation check when no conversion_factor (#26219) 2021-07-15 18:32:15 +05:30
Rohit Waghchaure
9997cce1ea fix: FG item not fetched in manufacture entry 2021-07-15 15:32:21 +05:30
rohitwaghchaure
4d444559ff
Merge pull request #26508 from rohitwaghchaure/fixed-fg-items-not-added-for-batch-item 
fix: FG item not fetched in manufacture entry
 2021-07-15 15:32:05 +05:30
Rohit Waghchaure
74b97b5ec9 fix: FG item not fetched in manufacture entry 2021-07-15 14:52:21 +05:30
Noah Jacob
03f4db0606
fix: validation check for batch for stock reconciliation type in stock entry(bp #26370 ) (#26488) 
* fix(ux): added filter for valid batch nos.

* fix: not validating batch no if entry type stock reconciliation

* test: validate batch_no
 2021-07-14 16:28:54 +05:30
Noah Jacob
2c67894135
fix: validation check for batch for stock reconciliation type in stock entry(bp #26370 ) (#26487) 
* fix(ux): added filter for valid batch nos.

* fix: not validating batch no if entry type stock reconciliation

* test: validate batch_no
 2021-07-14 16:28:40 +05:30
Noah Jacob
c932baeb32
fix: validation check for batch for stock reconciliation type in stock entry (#26370) 
* fix(ux): added filter for valid batch nos.

* fix: not validating batch no if entry type stock reconciliation

* test: validate batch_no
 2021-07-14 16:25:42 +05:30
Saqib
bb493a0602
Merge pull request #26159 from GangaManoj/asset-credit-note 2021-07-14 12:02:02 +05:30
rohitwaghchaure
96eb147bb6
Merge pull request #26457 from rohitwaghchaure/fixed-multi-currency-issue 
fix: multi-currency issue
 2021-07-13 23:01:30 +05:30
rohitwaghchaure
bd8699b8a9
Merge pull request #26458 from rohitwaghchaure/fixed-multi-currency-issue-pre 
fix: multi-currency issue
 2021-07-13 16:05:36 +05:30
Rohit Waghchaure
4acbeecbbe fix: multi-currency issue 2021-07-13 15:35:30 +05:30
Rohit Waghchaure
0d190bb930 fix: multi-currency issue 2021-07-13 15:32:39 +05:30
Subin Tom
5265ba39f0 feat: Added fields for dispatch address in Sales Order, Sales Invoice, Delivery Note for Eway Bill 2021-07-13 14:58:17 +05:30
rohitwaghchaure
84f23ac8d2
Merge pull request #26222 from 18alantom/teabox-cogs-by-item-group 
feat: report to show cogs by item groups
 2021-07-13 11:24:59 +05:30
Nabin Hait
97bce3af9a refactor: Optimized code for reposting item valuation 2021-07-12 13:33:08 +05:30
Nabin Hait
0003938f2b refactor: Optimized code for reposting item valuation 2021-07-12 13:29:20 +05:30
Nabin Hait
01aada6c90 refactor: Optimized code for reposting item valuation 2021-07-12 13:28:19 +05:30
Nabin Hait
45e6cffa4f refactor: Optimized code for reposting item valuation 2021-07-12 13:26:08 +05:30