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

5502 Commits

Author SHA1 Message Date
Ankush Menat
36c5e8a14f feat: Pick list from SO with Product Bundle 2022-04-27 12:05:15 +05:30
Ankush Menat
7d5682020a test: bundles in picklist 2022-04-27 12:05:15 +05:30
Ankush Menat
5c3f9019cc refactor: misc pick list refactors 
- make tracking fields read only and no-copy 🤦
- collapse print settings section, most users configure it once and
  forget about it, not need to show this.
- call pick list grouping function directly
- use get_descendants_of instead of obscure db function
 2022-04-27 12:05:15 +05:30
marination
e2a163d4e9 fix: Use account_type == 'Stock' to filter stock accounts 2022-04-26 17:50:51 +05:30
marination
44331f4f1f chore: Warn users about multiple warehouse accounts 
- Get distinct accounts that warehouse value has been booked against
- If same account as the one being set, ignore
- If not same account or multiple accounts: warn user that it makes it harder to track mismatches
 2022-04-26 17:43:33 +05:30
Deepesh Garg
00ace8f62c
Merge branch 'develop' into accounting_dimension_consistency 2022-04-26 14:26:08 +05:30
Deepesh Garg
82a0635c66 fix: Consistent accounting dimensions across Sales and Purchase docs 2022-04-26 14:01:13 +05:30
Ankush Menat
7e555d3d8c fix: item price query for postgres 
postgres doesn't like bad type comparisons and doesn't have `isnull`
funciton
 2022-04-26 11:47:02 +05:30
Ankush Menat
7d2587c0a9 fix: nullish check and table name 2022-04-26 11:03:32 +05:30
Ankush Menat
ce75fe0ec4 fix: out of range date value 2022-04-26 11:03:32 +05:30
Ankush Menat
e1c1687661 refactor: use db agnostic CombineDatetime 2022-04-26 11:03:32 +05:30
Ankush Menat
d6a43a39ae
test: tie breaking in SLEs (#30796) 
[skip ci]
 2022-04-25 11:46:01 +05:30
Ankush Menat
d5ab626a31
Merge pull request #30726 from ankush/dependent_gle_reposting 
fix: dependent gle reposting
 2022-04-21 18:06:40 +05:30
Ankush Menat
ee3036651a
fix: batch_no filtering not working when batch no is also a number in scientific notation (#30770) 
[skip ci]
 2022-04-21 16:34:31 +05:30
Ankush Menat
9734329094 test: discard local future SLE cache between tests 2022-04-19 17:40:28 +05:30
Ankush Menat
b24920c0e9 fix: correct sorting while updating bin 2022-04-19 17:38:36 +05:30
Ankush Menat
d2882ea436 test: use disposable item codes in tests 
dependency causes flake
 2022-04-19 17:38:36 +05:30
Ankush Menat
8f519545b0 test: repost queue progress 2022-04-19 17:38:36 +05:30
Ankush Menat
ecdb49314f fix: dependent GLE reposting 2022-04-19 17:38:36 +05:30
Ankush Menat
a2af2daca7 test: dependent GL entry reposting 2022-04-19 17:38:36 +05:30
Ankush Menat
afc5a55a23 refactor: repost error handling 2022-04-19 17:38:36 +05:30
Ankush Menat
9af2d68945 refactor: convert queries to ORM/QB, add types 2022-04-14 18:05:38 +05:30
Ankush Menat
ba29323e11 test: increase assertions to cover all cases 2022-04-14 18:05:38 +05:30
Ankush Menat
e278ee359a test: item attribute columns 2022-04-14 18:05:38 +05:30
Ankush Menat
febc74a21b refactor: rewrite stock balance query to QB 2022-04-14 18:05:35 +05:30
Ankush Menat
8a499e95d3 test: uom conversion in stock balance report 2022-04-14 18:01:43 +05:30
Ankush Menat
af0ea7b532 test: assert balanaces against SLE 2022-04-14 18:01:42 +05:30
Ankush Menat
f4766ae4eb test: opening balance in stock balance report 2022-04-14 18:01:42 +05:30
Ankush Menat
8b2432dfa0 test: stock balance report tests 2022-04-14 18:01:42 +05:30
Ankush Menat
64ac22af82 refactor: add filter type info 2022-04-14 18:01:42 +05:30
Marica
87117313a1
Merge branch 'develop' into values-out-of-sync-jv 2022-04-14 13:41:27 +05:30
marination
d75d5ebe8d chore: Remove Values Out of Sync from Repost hourly job 
- It runs after repost (after commiting), so it has 0 impact on repost itself
- Just that scheduled job log shows up as failed, while actually repost is done and repost document is "Completed"
- The check is inaccurate also, so best to remove this
- Users cant do anything about it anyway. This just piles up phantom failed jobs unneccessarily
 2022-04-14 12:30:06 +05:30
Deepesh Garg
065c38152a Merge branch 'develop' of https://github.com/frappe/erpnext into item_wise_provisional_accounting 2022-04-14 12:04:21 +05:30
Deepesh Garg
ad171c6225 test: Update test case 2022-04-14 12:03:12 +05:30
Ankush Menat
79fbc2c504
test: flaky PR close test (#30709) 2022-04-13 20:42:25 +05:30
Deepesh Garg
3ce64170db feat: Item-wise provisional accounting for service items 2022-04-11 14:35:22 +05:30
marination
dfff4beaf4 fix: Handle multiple item transfer in separate SEs against WO 
- Check for pending qty in child items to show/hide "Start" button
- If no qty needed to transfer (FG qty is fulfilled), but RM qty pending: map pending in SE with For Quantity = 0
 2022-04-11 14:10:57 +05:30
Ankush Menat
8138e53cf3 test: flaky picklist tests 2022-04-10 17:50:57 +05:30
Ankush Menat
af6b07f9b9
fix: block cancellation of SL/GL entries (#30652) 
Individual GL/SLEs aren't supposed to be cancelled by users.
 2022-04-08 18:05:04 +05:30
Ankush Menat
d74181630a test: prevent cancelling RIV of cancelled voucher 2022-04-08 14:57:55 +05:30
Ankush Menat
a281998bcb fix: prevent deleting repost queue for cancelled transactions 2022-04-08 14:57:55 +05:30
Ankush Menat
49560d20bc
fix: remove bad defaults from BOM operation (#30644) 
[skip ci]
 2022-04-08 11:23:02 +05:30
Ankush Menat
f1fd4e5c27 test: cant_change validations on item 2022-04-07 17:30:12 +05:30
Ankush Menat
fba68541d6 refactor(Item): linked doc checking 2022-04-07 17:30:12 +05:30
Ankush Menat
2f1e98d1e8 feat: show Stock Reconciliation links on item dashboard 2022-04-07 17:30:12 +05:30
Ankush Menat
be04eaf723
fix: warehouse naming when suffix is present (#30621) 2022-04-07 13:21:08 +05:30
Ankush Menat
e4c6d6a1a6
fix: strip html tags before checking for empty description (#30619) 2022-04-07 12:53:10 +05:30
Marica
ff7d81020c
Merge pull request #30578 from marination/e-com-acessibility 
chore: Accessibility for E-commerce Doctypes
 2022-04-05 18:11:59 +05:30
marination
d4301d6d2f chore: Accessibility for E-commerce Doctypes 
- Add Website Item routing button and dashboard link in Item master
- Group Item variant buttons together
 2022-04-05 12:07:50 +05:30
Ankush Menat
a9811c601c
Merge pull request #30564 from rohitwaghchaure/fixed-rejected-warehouse-issue-for-pr 
fix: if accepted warehouse not selected during rejection then stock ledger not created
 2022-04-04 18:26:17 +05:30
Rohit Waghchaure
ac5df1abbe test: test case to validate rejected qty without accepted warehouse 2022-04-04 17:57:57 +05:30
Ankush Menat
de83511091
fix(ux): refresh update to zero val checkbox (#30567) 2022-04-04 17:29:51 +05:30
Ankush Menat
12c01e2975
fix: maintain FIFO queue even if outgoing_rate is not found (#30560) 2022-04-04 15:22:15 +05:30
Ankush Menat
52eb0a93bb
Merge pull request #30528 from s-aga-r/is-subcontracted-fieldtype 
refactor!: change "is_subcontracted" field type from "Select" to "Check"
 2022-04-04 14:01:20 +05:30
Ankush Menat
a896895a9e fix: bulk fix (~330) missing translations 2022-04-04 13:59:51 +05:30
Sagar Sharma
e80cd29d2e
Merge branch 'develop' into is-subcontracted-fieldtype 2022-04-04 13:31:46 +05:30
Ankush Menat
e8118fcdf1 fix: doctype layout based on expected tab-order 2022-04-04 12:06:35 +05:30
Ankush Menat
deca1aaf06 fix: dont fetch qty in reco if batch is required 2022-04-04 12:06:35 +05:30
Ankush Menat
f83a1c1989 fix: dont reset barcode in scan mode 2022-04-04 12:06:35 +05:30
Ankush Menat
1736ab57ac feat: Barcode scanning in Stock Reconciliation 
[skip ci]
 2022-04-04 12:06:35 +05:30
Ankush Menat
c8ead0a7ab fix: dont send empty serial no in get_item_details 
[skip ci]
 2022-04-01 21:11:03 +05:30
Ankush Menat
47f27a5171 refactor: move scan api to stock utils; add item_info 2022-04-01 21:11:03 +05:30
Ankush Menat
9bf427985f fix!: remove barcode field triggers 
use "scan barcode" field instead for scanning

[skip ci]
 2022-04-01 21:11:03 +05:30
Ankush Menat
6c5b01c60d
perf: index barcode for faster scans (#30543) 2022-04-01 15:27:46 +05:30
Sagar Sharma
0a3cdc2623 chore: rename "is_subcontracted" field label to "Is Subcontracted" 2022-04-01 13:22:54 +05:30
Sagar Sharma
d074c93ac7 refactor!: change "is_subcontracted" field type from "Select" to "Check" 2022-04-01 13:22:44 +05:30
Rohit Waghchaure
2f51011f91 test: test case to check pick list name has mapped or not 2022-03-31 18:47:09 +05:30
Rohit Waghchaure
2f63ae2ee9 feat: minor, pick list item reference on delivery note item table 2022-03-31 18:43:42 +05:30
Ankush Menat
b981fae5a4
fix: remove naming series from bin, repost queue (#30497) 
Removing naming series from:
1. Bin
2. Repost queue

These doctypes are not user facing and dont really need naming series.
Current implementation of naming makes stock transaction sequential if
these documents are to be created during submission.
 2022-03-30 21:46:15 +05:30
Ankush Menat
8ab226a2fc
test: add class to uniquely id item dashboard (#30487) 2022-03-30 13:20:54 +05:30
Marica
7e719a12f1
Merge pull request #30377 from marination/stock-entry-items-idx 
fix: Dont set `idx` while adding WO items to Stock Entry
 2022-03-30 11:14:18 +05:30
Saqib Ansari
87dc9c6331
Merge pull request #30470 from nextchamp-saqib/fix-dn-credit-limit-validation 
fix: credit limit validation in delivery note
 2022-03-30 11:08:25 +05:30
Ankush Menat
b80fac03af
fix: validate 0 transfer qty in stock entry (#30476) 2022-03-29 17:19:22 +05:30
Ankush Menat
b12fe0f15b
fix: dont check for failed repost while freezing (#30472) 
[skip ci]
 2022-03-29 13:54:26 +05:30
Saqib Ansari
c122882884 fix: credit limit validation in delivery note 2022-03-29 13:36:00 +05:30
marination
639d380c1f chore: Remove redundant idx query and value setting 
- idx can be removed from `select_columns` as it is already in the main query
- setting idx to '' is not required as it is not used further
 2022-03-28 21:00:00 +05:30
Ankush Menat
40d7418dca Merge branch 'develop' into stock-entry-items-idx 2022-03-28 20:21:21 +05:30
Ankush Menat
494bd9ef78 style: format code with black 2022-03-28 18:52:46 +05:30
Ankush Menat
c34847e801 refactor: dont hardcode child table "items" 2022-03-28 12:07:00 +05:30
Ankush Menat
69ae2661d2 fix: update picked qty on cancellation 2022-03-28 10:43:32 +05:30
Ankush Menat
f06ef17b5d fix: copy has_batch_no and has_serial_no while duplicating 2022-03-25 16:18:58 +05:30
Ankush Menat
f4b39b87e3 fix(UX): use autocomplete for variant fields 2022-03-25 16:18:58 +05:30
Saqib Ansari
9a0f5bff65
Merge branch 'develop' into fix-pos-issues-again 2022-03-25 10:52:08 +05:30
Ankush Menat
788d492757 test: basic item and wh capacity dashboard tests 2022-03-25 10:51:19 +05:30
Saqib Ansari
cb4873c019 fix: sider issues 2022-03-24 17:56:27 +05:30
Saqib Ansari
4aabe97565
Merge branch 'develop' into fix-pos-issues-again 2022-03-24 11:18:13 +05:30
marination
a787ebb732 fix: Dont set idx while adding WO items to Stock Entry 
- `idx` must be computed by base document's `self.append()` function, so do not set it
 2022-03-23 14:59:27 +05:30
Deepesh Garg
3a1e31592e
Merge branch 'develop' into ignore_price_list 2022-03-23 09:27:44 +05:30
Deepesh Garg
66ca085e39 fix: Changing item prices on converting orders/receipts to invoices 2022-03-22 23:03:41 +05:30
Saqib Ansari
f2ae63cbfd fix(pos): remove returned sr. nos. from pos reserved sr. nos. list 2022-03-22 17:41:49 +05:30
Ankush Menat
41db43cdc5 fix: consider full integer batch nos 2022-03-22 16:40:17 +05:30
Ankush Menat
a18c687844 fix: ignore already fetched serial no 
exclude_sr_nos is sent as JSON string of list, so load it before
operating on it.
 2022-03-22 16:40:17 +05:30
Ankush Menat
d3be84bfe8 test: correct use of test decorator 2022-03-21 15:40:34 +05:30
Ankush Menat
c2aad115c1
fix: disable deferred naming on SLE/GLE if hash method is used. (#30286) 
* fix: dont rename GLE/SLE that dont have naming series

* test: tests for deferred naming of ledgers
 2022-03-20 19:26:34 +05:30
HENRY Florian
ca8d757691
fix: clear "Retain Sample" and "Max Sample Quantity" in Item card if Has Batch No is uncheck (#30307) 2022-03-20 15:27:00 +05:30
Ankush Menat
4859574233 perf: Single query to delete bins instead of N 2022-03-19 20:55:27 +05:30
Ankush Menat
684d9d66d1 test: warehouse conversion and treeview test 2022-03-19 20:55:27 +05:30
Ankush Menat
953afda01b refactor(warehouse): raw query to ORM 2022-03-19 20:55:27 +05:30
Ankush Menat
4b695915f4 refactor: Use QB for serial fetching query 2022-03-19 20:55:27 +05:30
Ankush Menat
a585dff6fd refactor: batch no filter handling 2022-03-19 20:55:27 +05:30
Ankush Menat
b9eec331e3 test: auto serial fetching 2022-03-19 20:55:27 +05:30
Ankush Menat
4f8bb91eae fix: sort serial nos before sending 2022-03-19 20:55:27 +05:30
Ankush Menat
0a533d6ccc fix: skip already selected serials in sr selector 2022-03-19 20:55:27 +05:30
mergify[bot]
c2cbd407c1
fix: Allow on Submit for Material Request Item Required Date (#30174) (#30308) 
* fix: Allow on Submit for Material Request Item Required Date

* chore: whitespace

(cherry picked from commit cca9668309711bf3ca517726a94df547c5a16bbb)

Co-authored-by: Devarsh Bhatt <58166671+bhattdevarsh@users.noreply.github.com>
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
 2022-03-19 20:31:06 +05:30
Ankush Menat
5a9bf9ffd6
fix: respect db multi_tenancy while fetching precision (#30301) 
[skip ci]
 2022-03-18 17:29:09 +05:30
rohitwaghchaure
da16ee159a
Merge pull request #30238 from KrithiRamani/bulk_create_PL_and_DN 
feat: Create single PL/DN from several SO.
 2022-03-17 15:39:45 +05:30
Ankush Menat
76187d175f
refactor: call repost directly during tests (#30277) 
enqueue(now=frappe.flags.in_test) is always true in test, this change avoids
confusion.
 2022-03-16 19:50:56 +05:30
Noah Jacob
2a0ca7c91a
refactor: removed unrequired code and test for standalone delivery note serial return (#30276) 2022-03-16 19:27:47 +05:30
Ankush Menat
b93ce78df1 chore: dont supress errors server side 
not required after https://github.com/frappe/frappe/pull/16284
 2022-03-16 17:50:34 +05:30
Krithi Ramani
a12895ec03 corrected spacing 2022-03-16 13:56:54 +05:30
Ankush Menat
b46d6e3c05 test: packed item return scenarios 2022-03-16 13:36:53 +05:30
Ankush Menat
b781e8b7d1 revert: "fix: updated packed_items getting fetched on Sales Return / Credit Note (#28607)" 
This reverts commit 20216fa9f1.
 2022-03-16 13:36:53 +05:30
Krithi Ramani
0211f27e83 as per review comments - changed for loop 2022-03-16 12:28:30 +05:30
Krithi Ramani
e970616b51 removed semicolon for break statement 2022-03-15 21:52:34 +05:30
Krithi Ramani
f33a725a9e fixed spacings 2022-03-15 15:35:51 +05:30
Deepesh Garg
07715118cf
Merge pull request #30206 from deepeshgarg007/implicit_pricing_rule_enable 
fix: Do not update ignore prcing rule check implicitly
 2022-03-14 21:46:24 +05:30
Ankush Menat
8e559f01c8 test: refactor BOM quality template test 2022-03-14 18:28:08 +05:30
Florian HENRY
9415229e8d fix: BOM - clear Quality Inspection Template according to Inspection Quality Required 
Squashed commit of the following:

commit b73fa210b234d2c8067db2c32f94f362b89afe5a
Author: Florian HENRY <florian.henry@open-concept.pro>
Date:   Mon Mar 14 08:30:24 2022 +0100

    add json tes

commit 984d015a7d9aceb6ea64be7ed9f1cc0caa356714
Author: Florian HENRY <florian.henry@open-concept.pro>
Date:   Mon Mar 14 08:30:06 2022 +0100

    better test

commit 42061146658598da02eda7cb781bd2cf44c8ca34
Author: Florian HENRY <florian.henry@open-concept.pro>
Date:   Fri Mar 11 16:12:57 2022 +0100

    update test

commit 6259c0957566600b044fcd4a5e14e69cdff71020
Author: Florian HENRY <florian.henry@open-concept.pro>
Date:   Fri Mar 11 13:59:13 2022 +0100

    update test

commit cbc4ad9566f6f7f01dd622651458fea309d80954
Merge: faa44b3fdd 94d0f8d4e7
Author: Florian HENRY <florian.henry@open-concept.pro>
Date:   Fri Mar 11 12:46:48 2022 +0100

    Merge branch 'develop' of https://github.com/frappe/erpnext into dev_fix_30190

commit faa44b3fdd983adfc04bbf04a7ebfef114501bb3
Author: Florian HENRY <florian.henry@open-concept.pro>
Date:   Fri Mar 11 12:03:35 2022 +0100

    fix: clear Quality Inspection Template according to Inspection Quality Required
 2022-03-14 18:25:00 +05:30
Krithi Ramani
466df6bdb7 to enable selection of SO irrespective of customer,removed validation for customer 2022-03-14 17:29:02 +05:30
Krithi Ramani
61eb9b6c68 feat: Create single PL/DN from several SO. New PR from latest develop to avoid rebase 2022-03-14 17:20:49 +05:30
Ankush Menat
02d64a32c2 fix(ux): negative stock warning 2022-03-14 17:16:39 +05:30
Deepesh Garg
2b6e7963f6
Merge branch 'develop' into implicit_pricing_rule_enable 2022-03-14 15:49:21 +05:30
Noah Jacob
60c4593f7b chore: removed unrequired batch_no parameter while fetching stock_balance 2022-03-14 15:36:56 +05:30
Noah Jacob
00797fa02d test: checking balance serial nos in stock ledger report 2022-03-14 15:36:56 +05:30
Noah Jacob
e8ba1f4e74 fix: incorrect balance serial no in stock ledger report 2022-03-14 15:36:56 +05:30
Saqib Ansari
c1740ced97
fix: cannot create multicurrency sales order with product bundles (#30166) 2022-03-14 13:43:55 +05:30
Ankush Menat
91fd9d917a test: negative fifo test 2022-03-14 10:25:18 +05:30
Ankush Menat
1a256c62c4 fix: attach sr no si standalone credit note 2022-03-13 19:00:34 +05:30
Deepesh Garg
96b5cedcf8 fix: Do not update ignore prcing rule check implicitly 2022-03-13 17:48:37 +05:30
Deepesh Garg
e4e38ad60b
Merge branch 'develop' into sales_purchase_retrun_optimization 2022-03-13 12:45:10 +05:30
mergify[bot]
b085e96a12
revert: "Merge pull request #29290 from s-aga-r/fix/delivery-note/billed-amount" (#29782) (#29807) 
* Revert "Merge pull request #29290 from s-aga-r/fix/delivery-note/billed-amount"

This reverts commit 038f94955006c88209f9df28e3a785c59a4ddb28, reversing
changes made to c7b491843476bca89be02851ccafb7e409876609.

* fix: linter

(cherry picked from commit 7fa46f77e0bdbc516b3c0cb0fb20594ee7fa398b)

# Conflicts:
#	erpnext/patches.txt

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
 2022-03-11 18:28:50 +05:30
Ankush Menat
472fe8e319 test: submit PR directly 2022-03-10 18:08:29 +05:30
Ankush Menat
7dd10367f4 fix: only update valuation rate if not None 2022-03-10 18:08:29 +05:30
Ankush Menat
73901aad6f fix: handle duplicate bins during item merge renames 2022-03-10 17:01:22 +05:30
Ankush Menat
b4d4ae6aa3 test: refactor item merge test and disable commits 2022-03-10 17:01:22 +05:30
Ankush Menat
4126455975
fix: dont reset UOM in MR on every get_item_detail call (#30164) 2022-03-10 15:43:09 +05:30
Deepesh Garg
a5befb6bf8 fix: Update modified timestamp 2022-03-10 14:18:54 +05:30
Himanshu
5193a63781
fix: do not reset asset_category (#29696) 2022-03-10 13:43:35 +05:30
Deepesh Garg
395b15058c fix: Sales and Purchase retrun optimization 2022-03-10 10:50:03 +05:30
Chillar Anand
fe4b6771b5
refactor: Remove dead code (#30140) 2022-03-09 17:16:05 +05:30
Ankush Menat
64905188c4
fix: dont fetch entire barcode table in get_item_details (#30131) 2022-03-09 15:37:14 +05:30
Deepesh Garg
e829f65fde
Merge pull request #30102 from deepeshgarg007/pick_list_query 
fix: Ambigous column in picklist query
 2022-03-09 10:17:26 +05:30
mergify[bot]
7a3d30161f
fix: translate error message titles (#30105) 
(cherry picked from commit 456ebc32f00be56cc9972cc76ac412776581060a)

Co-authored-by: Türker Tunalı <turker.tunali@gmail.com>
 2022-03-08 10:42:30 +05:30
Deepesh Garg
d9d4c2ce79 fix: Remove unintentional changes 2022-03-08 07:56:44 +05:30
Deepesh Garg
517fbf1d1f fix: Ambigous column in picklist query 2022-03-07 22:31:42 +05:30
Marica
7579981fb5
Merge pull request #29987 from marination/mr-to-order-and-receive-report 
fix: Get MRs that are yet to be received but fully ordered in Report `Requested Items to Order and Receive`
 2022-03-07 10:18:28 +05:30
Saqib Ansari
cd2513ceec
Merge pull request #29939 from nextchamp-saqib/ordered-qty-for-packed-items 
feat: update ordered qty for packed items
 2022-03-02 17:10:20 +05:30
Ankush Menat
55a966ec41
chore: get stock reco qty from SR instead of SLE (#30059) 
[skip ci]
 2022-03-02 14:49:45 +05:30
Ankush Menat
701878f60b revert "fix: FIFO valuation in case of multi-item entries" 
This reverts commit b8ee193d1a124668691b3d8181ce4e3bf612afe0.

This is huge performance regression for large docs.
 2022-03-02 13:11:04 +05:30
Ankush Menat
2f71c5bcca test: repack FIFO rates 2022-03-02 13:11:04 +05:30