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

589 Commits

Author SHA1 Message Date
Anand Doshi
9a20cc5cd8 Merge branch 'sales_purchase_return' 2013-03-19 16:23:11 +05:30
Anand Doshi
3e967ab9b6 hide Reference section break when using Sales or Purchase Return 2013-03-19 16:22:22 +05:30
Anand Doshi
73091ecac3 shifted return reference fields in stock entry to the main section 2013-03-19 15:15:12 +05:30
Anand Doshi
f6b06a6b30 fixes in sales purchase return 2013-03-19 15:01:07 +05:30
Anand Doshi
af6f1ba82e fixes in sales purchase return for stock entry 2013-03-19 13:43:49 +05:30
Anand Doshi
f9e51bbab3 removed complications from sales purchase return 2013-03-19 13:33:51 +05:30
Nabin Hait
e68103be30 fixes in reorder level and company 2013-03-19 12:34:47 +05:30
Nabin Hait
928355ad9a Merge branch 'master' of github.com:webnotes/erpnext 2013-03-19 12:02:13 +05:30
Nabin Hait
89a94d8135 aii: stock reconciliation with test case 2013-03-19 12:01:46 +05:30
Nabin Hait
c3afb256b4 aii: stock entry 2013-03-19 12:01:24 +05:30
Nabin Hait
35e037651c fixes in packing slip 2013-03-19 11:58:57 +05:30
Anand Doshi
839fee3e71 restrict material_request_type in Material Request form 2013-03-18 18:20:09 +05:30
Anand Doshi
080f9098c0 deprecated sales and purchase return tool 2013-03-18 17:57:59 +05:30
Anand Doshi
f11e2f8f6f Merge branch 'master' of github.com:webnotes/erpnext into sales_purchase_return 
Conflicts:
	patches/patch_list.py
 2013-03-18 17:42:08 +05:30
Anand Doshi
ab7b7c2974 completed sales purchase return as part of stock entry 2013-03-18 17:37:31 +05:30
Anand Doshi
6230aa9292 make return jv for sales return 2013-03-16 19:05:11 +05:30
Anand Doshi
1524c2a5b6 create return jv 2013-03-15 17:42:45 +05:30
Anand Doshi
87052b366b validate over-return of stock for sales purchase return 2013-03-15 11:32:40 +05:30
Rushabh Mehta
ebee1c7033 website module: minor updates 2013-03-14 14:33:31 +05:30
Anand Doshi
47428c2d92 more test cases for stock entry 2013-03-13 15:30:05 +05:30
Anand Doshi
23d742693a Merge branch 'master' into sales_purchase_return 2013-03-13 14:01:34 +05:30
Anand Doshi
71bed3116f working on merging sales purchase return into stock entry 2013-03-13 12:57:04 +05:30
Nabin Hait
4ceb1b5164 aii: gl entries for stock entry and testcases 2013-03-13 11:40:30 +05:30
Nabin Hait
06ae34b015 Merge branch 'master' of github.com:webnotes/erpnext 2013-03-12 15:47:55 +05:30
Nabin Hait
4f856f1250 fixes in buying_amount_calculation 2013-03-12 15:44:38 +05:30
Anand Doshi
6dc6e7c84a minor fixes in stock entry js 2013-03-12 12:51:53 +05:30
Anand Doshi
4127bb14ed Merge branch 'master' of github.com:webnotes/erpnext 2013-03-12 12:48:10 +05:30
Nabin Hait
0cfbc5feb5 fixes in sales order test cases and set_buying_amount 2013-03-12 11:34:56 +05:30
Anand Doshi
c9d229ec9e Merge branch 'master' of github.com:webnotes/erpnext 2013-03-12 11:06:06 +05:30
Nabin Hait
f7df8b28d2 -m 2013-03-12 10:58:11 +05:30
Anand Doshi
df6ff1385f fixes in warehouse validation 2013-03-11 19:44:52 +05:30
Nabin Hait
8c7234f270 aii: gl_entries for sales invoice 2013-03-11 16:32:33 +05:30
Anand Doshi
d5aeb21dd9 fix in get_value_diff of stock grid report: case for serialized items 2013-03-08 12:46:48 +05:30
Nabin Hait
0e6ce9af17 Merge branch 'master' of github.com:webnotes/erpnext 2013-03-07 18:50:23 +05:30
Anand Doshi
f1e274c8b4 when cancelling stock ledger entry, change modified and modified by 2013-03-07 16:34:59 +05:30
Nabin Hait
ad7266e48d Merge branch 'master' of github.com:webnotes/erpnext 2013-03-07 11:42:47 +05:30
Nabin Hait
58b2a101ae aii: testcases for sales invoice gl entries 2013-03-07 11:42:14 +05:30
Anand Doshi
80f7637ae6 added print width in txts of istable type doctypes 2013-03-07 11:37:33 +05:30
Nabin Hait
a72c5127a6 aii: gl entries for delivery note 2013-03-06 18:50:53 +05:30
Rushabh Mehta
ba7ed4c27c Merge branch 'master' of github.com:webnotes/erpnext 2013-03-05 14:20:24 +05:30
Rushabh Mehta
07287e8b93 removed colour fields from txt files 2013-03-05 14:19:48 +05:30
Anand Doshi
9e69dc5ad8 fix in material request test case 2013-03-05 13:39:28 +05:30
Anand Doshi
1f3a5c3798 use validate value method to validate valuation rate should be greater than 0 in stock entry 2013-03-05 12:25:15 +05:30
Nabin Hait
4c5af2f33d Merge branch 'master' of github.com:webnotes/erpnext 2013-03-04 15:36:27 +05:30
Nabin Hait
0d20d6fdd2 fixes for purchase price list 2013-03-04 15:35:45 +05:30
Anand Doshi
91484391ce invalidate cache if 'show in website' is unchecked for item and item group 2013-03-04 14:28:38 +05:30
Rushabh Mehta
ba0e1ea194 Merge branch 'master' of github.com:webnotes/erpnext 2013-03-01 19:09:38 +05:30
Rushabh Mehta
213b180060 merge, update bean validations 2013-03-01 19:09:06 +05:30
Nabin Hait
54d209ffb0 sub-contracting code refactored for po 2013-03-01 18:51:10 +05:30
Nabin Hait
73b2bb6f91 Merge branch 'master' of github.com:webnotes/erpnext 2013-03-01 17:40:31 +05:30
Nabin Hait
37ef553f6b fixes for sub_contracting 2013-03-01 17:39:41 +05:30
Anand Doshi
a10461e16c minor fix in purchase receipt 2013-03-01 16:12:50 +05:30
Anand Doshi
322bd08f26 allow attachment in batch 2013-03-01 12:52:34 +05:30
Anand Doshi
b05185ba96 hide website fields function removed 2013-02-28 18:49:17 +05:30
Rushabh Mehta
b21eb9ac09 added time log batch 2013-02-28 18:42:46 +05:30
Anand Doshi
4a36e479c1 fix in subcontracted validation 2013-02-28 17:41:03 +05:30
Nabin Hait
86dc888648 datetime issue in stock balance repory 2013-02-28 17:09:08 +05:30
Nabin Hait
a71ace0d74 fixed asynchronus issue in purchase cycle 2013-02-28 16:30:53 +05:30
billyfordson
9b352309c6 Adding German translation 2013-02-27 17:36:23 +01:00
Anand Doshi
55d9a62114 Merge branch 'master' of github.com:webnotes/erpnext 
Conflicts:
	accounts/doctype/purchase_invoice/purchase_invoice.py
	stock/doctype/purchase_receipt/purchase_receipt.py
 2013-02-27 18:14:28 +05:30
Nabin Hait
5418d71fc0 sub-contracting rewrite with testcases 2013-02-27 18:11:17 +05:30
Anand Doshi
4a7248ee0b commonified some purchase code, added test case for auto inventory accounting for purchase invoice 2013-02-27 18:10:30 +05:30
Anand Doshi
a1d4b78fbe started with Auto Inventory Accounting - test case for purchase receipt 2013-02-26 18:09:47 +05:30
Rushabh Mehta
29786e38df added get_value, fixed appframe from Single 2013-02-26 14:27:03 +05:30
Anand Doshi
805fdf313c shifted item name and description fields to the left of stock reports 2013-02-26 12:23:39 +05:30
Anand Doshi
7f27d34f81 Material Request - Print Heading as a Link field 2013-02-25 15:38:28 +05:30
Rushabh Mehta
e4eb89b02a added new language and filters in query reports 2013-02-25 13:00:16 +05:30
Rushabh Mehta
9e02949821 updated language and separated slickgrid files 2013-02-25 11:05:27 +05:30
Rushabh Mehta
90098d2ebd new employee_leave_balance_report 2013-02-22 17:54:50 +05:30
Nabin Hait
8a14cdb45d Merge branch 'master' of github.com:webnotes/erpnext 2013-02-22 12:45:40 +05:30
Nabin Hait
87d270a5b5 refactored code for reserved qty with testcases 2013-02-22 12:44:51 +05:30
Rushabh Mehta
c359a58766 added Item Name in pending type query reports 2013-02-22 10:48:07 +05:30
Anand Doshi
561556db58 Merge branch 'master' of github.com:webnotes/erpnext 2013-02-21 19:51:10 +05:30
Anand Doshi
9a17051c8d material request should update bin, even if it is of type Material Transfer 2013-02-21 19:44:55 +05:30
Rushabh Mehta
86039fc614 Merge branch 'master' of github.com:webnotes/erpnext 2013-02-21 16:58:27 +05:30
Rushabh Mehta
f41dd39286 added language 2013-02-21 16:57:54 +05:30
Anand Doshi
1678f6d4ae update requested quantity in bin for both Purchase as well as Transfer type material request 2013-02-21 16:55:14 +05:30
Nabin Hait
c924c1ebb5 Merge branch 'master' of github.com:webnotes/erpnext 2013-02-21 14:53:42 +05:30
Nabin Hait
9082fad994 testcases for reserved qty 2013-02-21 14:49:44 +05:30
Anand Doshi
a96ba7b326 auto material request should be submitted 2013-02-21 14:38:24 +05:30
Anand Doshi
51fc7c0683 Merge branch 'master' of github.com:webnotes/erpnext into edge 2013-02-21 12:23:58 +05:30
Anand Doshi
c64da278ca fixed auto material request email 2013-02-21 12:04:42 +05:30
Nabin Hait
8f7899a642 added stopped condition in pending to deliver/received/billed report 2013-02-21 11:44:08 +05:30
Anand Doshi
2c9103fc05 changed save to set value for observer of Material Request 2013-02-21 11:21:34 +05:30
Anand Doshi
59d8a76e60 Merge branch 'master' of github.com:webnotes/erpnext into edge 
Conflicts:
	hr/doctype/leave_application/locale/_messages_py.json
	hr/doctype/leave_block_list/locale/_messages_doc.json
	public/js/locale/_messages_js.json
	setup/doctype/email_digest/locale/_messages_doc.json
	setup/doctype/global_defaults/global_defaults.txt
 2013-02-21 11:09:43 +05:30
Anand Doshi
8867cc2381 fixes in material request - hide sales order fields, changed Purchase Requisition to Material Request in some places 2013-02-21 11:02:10 +05:30
Rushabh Mehta
833b0f12d5 Merge branch 'master' of github.com:webnotes/erpnext 2013-02-21 09:48:35 +05:30
Anand Doshi
cf05580f8e fixes related to Material Request; added button to make Stock Entry of type Material Transfer; calculate ordered_qty and per_ordered in Material Request using observer pattern when Stock Entry against it is submitted or cancelled 2013-02-20 18:44:10 +05:30
Nabin Hait
4489c56b0c Merge branch 'master' of github.com:webnotes/erpnext 2013-02-20 16:25:46 +05:30
Nabin Hait
6f1a5ec209 Disable rounded total feature 2013-02-20 16:25:05 +05:30
Anand Doshi
7ce7d7cad4 Merge branch 'master' of github.com:webnotes/erpnext into edge 2013-02-20 16:08:43 +05:30
Anand Doshi
a43b29e4b1 get label from doctype's doclist 2013-02-20 15:55:10 +05:30
Rushabh Mehta
87e4801946 website settings social icons 2013-02-20 15:02:21 +05:30
Rushabh Mehta
b0a76bdfe2 material receipt from bin 2013-02-20 11:16:47 +05:30
Rushabh Mehta
5117d9c266 refactored defaults, bin material request wip 2013-02-19 15:27:31 +05:30
Rushabh Mehta
c53231a841 model_wrapper is now bean, refactoring defaults 2013-02-18 18:24:28 +05:30
Rushabh Mehta
c06ce25470 updated translations 2013-02-18 14:24:05 +05:30
Anand Doshi
236cc173ad rename Purchase Request to Material Request 2013-02-18 13:49:15 +05:30
Rushabh Mehta
51709b7eb3 Merge branch 'master' into edge 2013-02-12 19:23:48 +05:30
Rushabh Mehta
4b9827a5fc upgraded test_runner, now can run multiple tests 2013-02-12 19:20:39 +05:30
Anand Doshi
ca73b90a0d raw material supplied in purchase receipt should be a no copy field 2013-02-11 19:32:18 +05:30
Rushabh Mehta
af222dc6b2 updated language 2013-02-11 11:49:18 +05:30
Rushabh Mehta
60135df6fd updated language 2013-02-11 11:44:12 +05:30
Anand Doshi
8595fcf910 purchase invoice taxes and totals calculations with test cases 2013-02-08 19:28:14 +05:30
Nabin Hait
2604a99072 Merge branch 'master' of github.com:webnotes/erpnext 2013-02-08 14:08:28 +05:30
Nabin Hait
0739e7f573 fixed conflict 2013-02-08 14:07:29 +05:30
Nabin Hait
a76a0687ef get_query continued 2013-02-08 14:04:13 +05:30
Anand Doshi
6a5efa972b added test record for purchase invoice test case 2013-02-08 13:57:05 +05:30
Anand Doshi
6209046772 added some test records 2013-02-07 19:47:34 +05:30
Nabin Hait
dc95c15002 changed args to filters in get_query 2013-02-07 12:08:38 +05:30
Nabin Hait
c39d13b6a7 fixes in item: duplicate tax validation 2013-02-07 11:36:37 +05:30
Nabin Hait
9986ae8c6f stock_qty now editable in PO item and PR Item table 2013-02-07 10:51:40 +05:30
Nabin Hait
b5bc99376e Merge branch 'master' of github.com:webnotes/erpnext 2013-02-06 17:40:46 +05:30
Nabin Hait
fa230e47f4 get_query shifted to server for account 2013-02-06 17:40:14 +05:30
Anand Doshi
613cb6a9f9 bug fix in clear unallocated advances 2013-02-06 17:33:46 +05:30
Nabin Hait
6fb3814b92 added project column in to be delivered/billed report 2013-02-05 16:56:14 +05:30
Rushabh Mehta
4310fd6aa0 Merge branch 'master' of github.com:webnotes/erpnext 2013-02-04 14:03:05 +05:30
Nabin Hait
cb5a05ea98 fixes in stock ledger report 2013-02-04 13:57:54 +05:30
Rushabh Mehta
0dbe898d82 added warehouse user to retrict entry and also introduced query handlers 2013-02-04 13:56:50 +05:30
Rushabh Mehta
9665fd967e fixes in alter table and updated listviews for delivery note and purchase receipt 2013-02-02 19:20:35 +05:30
Nabin Hait
c06e29ddbc removed sales order pending items report 2013-02-01 18:35:35 +05:30
Nabin Hait
ced855e38b purchase order items pending to be received 2013-02-01 13:16:15 +05:30
Nabin Hait
124a6237bf purchase order items pending to be received 2013-02-01 13:11:52 +05:30
Nabin Hait
c063e653a9 Merge branch 'master' of github.com:webnotes/erpnext 2013-02-01 10:36:17 +05:30
Anand Doshi
ec061b0dcc changed item code get query of stock entry 2013-01-31 12:36:32 +05:30
Nabin Hait
53595c6521 Merge branch 'master' of github.com:webnotes/erpnext 2013-01-30 12:49:44 +05:30
Nabin Hait
bf495c9a6d GL Control rewrite and many other cleanup using inheritence 2013-01-30 12:49:08 +05:30
Rushabh Mehta
08da1a0a3d setting list_views 2013-01-29 17:53:29 +05:30
Nabin Hait
021dd54fed report: purchase order items pending to be received 2013-01-29 13:48:18 +05:30
Rushabh Mehta
cda5d42a65 updated languages 2013-01-28 14:21:40 +05:30
Rushabh Mehta
7b563f7569 added translation files 2013-01-28 11:19:03 +05:30
Nabin Hait
d4c7159f60 fixes in dynamic label setting and column hiding based on currency 2013-01-25 18:31:06 +05:30
Nabin Hait
f89fb1e41a Other charges in currect currency fixes for all classic/modern/spartan print g=format 2013-01-25 17:24:47 +05:30
Nabin Hait
671fcc00c0 stock ageing: apply zero filters 2013-01-25 15:04:35 +05:30
Rushabh Mehta
e281e670ba Merge branch 'master' of github.com:webnotes/erpnext 2013-01-25 07:32:10 +01:00
Rushabh Mehta
9babf9dbdb Merge branch 'master' of github.com:webnotes/erpnext 2013-01-25 11:58:45 +05:30
Rushabh Mehta
8e3affbf70 added nl 2013-01-25 11:58:18 +05:30
Rushabh Mehta
3525b62842 Merge branch 'master' of github.com:webnotes/erpnext 2013-01-25 06:44:01 +01:00
Nabin Hait
27b4a92b02 error fixed in recurring invoices 2013-01-25 11:10:29 +05:30
Rushabh Mehta
4e01011669 added language to pages 2013-01-24 19:31:55 +05:30
Rushabh Mehta
317177afd2 updated languages 2013-01-24 18:18:39 +05:30
Rushabh Mehta
ad14943c3f added arabic 2013-01-24 17:37:43 +05:30
Rushabh Mehta
4c17718b4c added portuguese 2013-01-24 16:31:23 +05:30
Rushabh Mehta
877a1a9274 Merge branch 'master' of github.com:webnotes/erpnext 2013-01-24 15:56:15 +05:30
Rushabh Mehta
908d09d058 added spanish 2013-01-24 15:55:30 +05:30
Rushabh Mehta
27254d9440 added spanish 2013-01-24 15:55:08 +05:30
Rushabh Mehta
46e8084aea fixes to language 2013-01-24 15:22:06 +05:30
Nabin Hait
8cf90f18f0 check item/item group with same name while creating item group/item 2013-01-24 14:58:21 +05:30
Nabin Hait
1290284c80 validation fixes in mantenance schedule and error fixes in setting serial no warranty expiry date 2013-01-24 13:23:20 +05:30
Nabin Hait
a4a20cbf7b issue fixed in packing slip 2013-01-24 12:37:50 +05:30
Nabin Hait
fd23153f50 Merge branch 'master' of github.com:webnotes/erpnext 2013-01-24 11:03:24 +05:30
Nabin Hait
8df3f125e5 stripped serial nos before processing 2013-01-24 11:02:48 +05:30
Rushabh Mehta
9c77a25cd3 merge 2013-01-23 19:44:35 +05:30
Rushabh Mehta
597d470e63 added format_currency and added options to all currency fields 2013-01-23 19:39:51 +05:30
Nabin Hait
291e8c2545 removed landed cost master 2013-01-23 16:06:44 +05:30
Rushabh Mehta
5842ee0918 removed amendment_date mandatory validation from purchase cucle 2013-01-23 09:17:51 +01:00
Rushabh Mehta
6382a42dbe more fixes to perms, floats and default enabled / disabled in search 2013-01-23 10:09:28 +05:30
Nabin Hait
92a0218091 added uom column in stock reports 2013-01-22 17:52:43 +05:30
Nabin Hait
bf95405c6d Merge branch 'master' of github.com:webnotes/erpnext 2013-01-22 16:50:23 +05:30
Nabin Hait
6e9756b8bb valuation rate mandatory for opening stock reco 2013-01-22 16:49:55 +05:30
Rushabh Mehta
efe8102351 merge 2013-01-22 15:23:58 +05:30
Rushabh Mehta
cd4a854a28 converted currency to float and removed level 1 permissions 2013-01-22 15:10:25 +05:30
Nabin Hait
319fb92d18 consider global val method if not specified in item master and apply zero filters 2013-01-22 14:40:20 +05:30
Nabin Hait
025e01322c stock balance report: qty and value in same page, valuation method from item master 2013-01-22 14:03:34 +05:30
Nabin Hait
ec52db8490 commonified in_words function and introduced selling_controller 2013-01-22 11:53:14 +05:30
Nabin Hait
5b4c294b40 commonified in_words function 2013-01-22 11:12:02 +05:30
Rushabh Mehta
a495b86848 description in stock level 2013-01-21 18:48:26 +05:30
Rushabh Mehta
70d4fbb7ea changed item from select to link in stock ledger and stock level 2013-01-21 18:19:52 +05:30
Nabin Hait
223897f145 fixes merge conflict 2013-01-21 17:30:35 +05:30
Nabin Hait
d3b625035c fixes in total_in_words 2013-01-21 17:24:31 +05:30
Rushabh Mehta
bb9968491b added report permissions to txt files 2013-01-21 14:22:07 +05:30
Nabin Hait
aeb992a4fd get_query for item code in batch master 2013-01-21 14:20:02 +05:30
Rushabh Mehta
861b3d6092 merge 2013-01-21 10:23:21 +05:30
Rushabh Mehta
f5b04cff8b added number format, sent country info in boot, link options not extracted from cache 2013-01-21 10:14:10 +05:30
Nabin Hait
f947368881 added validation for sales return and purchase return 2013-01-18 16:04:51 +05:30
Anand Doshi
75c85a0ff5 Merge branch 'master' into edge 2013-01-18 16:01:53 +05:30
Nabin Hait
e5f1152c01 fixes in stock entry 2013-01-18 15:17:40 +05:30
Nabin Hait
dad280ed8e fixes in stock entry 2013-01-18 15:01:30 +05:30
Anand Doshi
35af9ba4e6 Merge branch 'master' into edge 2013-01-18 14:50:25 +05:30
Nabin Hait
a1716543c2 fixes in stock entry 2013-01-18 14:26:43 +05:30
Anand Doshi
a81370f2a3 added description to Price List field. added in latest updates 2013-01-18 13:26:54 +05:30
Anand Doshi
8b940ee451 fixes after merge 2013-01-18 13:07:02 +05:30
Anand Doshi
ef02ddfc40 Merge branch 'master' of github.com:webnotes/erpnext into purchase_price_list 
Conflicts:
	accounts/doctype/gl_control/gl_control.py
 2013-01-17 20:31:41 +05:30
Anand Doshi
8957bf9e09 print hide price list related fields 2013-01-17 20:29:28 +05:30
Anand Doshi
f8f0c0d089 updates in purchase cycle's price list 2013-01-17 20:20:56 +05:30
Rushabh Mehta
8af47e8413 Merge branch 'edge' 2013-01-17 18:24:09 +05:30
Rushabh Mehta
80721518e3 Merge branch 'master' of github.com:webnotes/erpnext 2013-01-17 18:23:07 +05:30
Rushabh Mehta
db7139a649 started fresh install and added country_info 2013-01-17 18:22:22 +05:30
Nabin Hait
1b4f56c57f fixes in c-form 2013-01-17 17:01:51 +05:30
Anand Doshi
9d9aec1ed4 shifted get_company_currency from transaction base to setup/utils.py 2013-01-17 15:44:57 +05:30
Nabin Hait
feee252093 fixes in website page_name for item 2013-01-17 13:03:30 +05:30
Nabin Hait
64d7c4b2d5 fixes in get_incoming_rate 2013-01-17 12:22:59 +05:30
Anand Doshi
03fa78597d Merge branch 'master' into purchase_price_list 2013-01-17 10:58:41 +05:30
Rushabh Mehta
6f9915cd17 install from txt files, part 1 2013-01-16 17:48:17 +05:30
Nabin Hait
6b1f21d1bb fixes in get_incoming_rate 2013-01-16 17:17:17 +05:30
Nabin Hait
831207ff54 incoming rate for sales return as per delivery note outgoing rate 2013-01-16 14:15:48 +05:30
Nabin Hait
44ffd4360c reorder level and qty added in stock level report 2013-01-16 11:16:21 +05:30
Nabin Hait
c57c0d4e1d item name and description added in stock ageing report 2013-01-16 10:31:55 +05:30
Anand Doshi
8ec06aed5c only allow upto 100 rows in stock reco 2013-01-15 18:54:16 +05:30
Anand Doshi
756dca719b refactored purchase cycle's get item details and update item details functions and started with purchase price list 2013-01-15 18:39:21 +05:30