Nabin Hait
|
a36325c6e5
|
Merge pull request #6403 from saurabh6790/treeview_quick_entry_fix
[fix] minor fix to accomodate custom fields in tree popup
|
2016-09-20 18:06:49 +05:30 |
|
Nabin Hait
|
429a38f90b
|
Merge pull request #6415 from rmehta/hotfix
[minor] bring back old grid style in material request
|
2016-09-20 18:05:32 +05:30 |
|
Kanchan Chauhan
|
77aaa70734
|
[Fix] filters_by_name changed to query_report_filters_by_name
|
2016-09-20 17:54:07 +05:30 |
|
Rushabh Mehta
|
57a1905576
|
[minor] bring back old grid style in material request
|
2016-09-20 17:22:54 +05:30 |
|
Nabin Hait
|
b015f1b647
|
Fixed version conflict
|
2016-09-20 16:53:02 +05:30 |
|
Nabin Hait
|
1f912f67ae
|
bumped to version 7.0.44
|
2016-09-20 17:22:10 +06:00 |
|
Kanchan Chauhan
|
e5057c8c35
|
Salary Slip fields in Condition and Formula
|
2016-09-20 14:59:42 +05:30 |
|
RobertSchouten
|
8d43b32c2c
|
improvements to email digest (#6323)
|
2016-09-20 11:11:39 +05:30 |
|
Nabin Hait
|
b8eef64e5d
|
Merge pull request #6325 from RobertSchouten/patch-26
fix allow negatives in leave type check
|
2016-09-20 11:00:31 +05:30 |
|
Nabin Hait
|
79fe1fad5d
|
Merge pull request #6374 from RobertSchouten/salary_register
print formatting for monthly Salary register
|
2016-09-20 10:58:53 +05:30 |
|
Nabin Hait
|
33ea19d616
|
Merge pull request #6395 from RobertSchouten/payroll_date
[minor] adding Payroll date field to process payroll and salary slip
|
2016-09-20 10:57:32 +05:30 |
|
robert schouten
|
5c41c77c7e
|
added posting date to process payroll and salary slip
|
2016-09-20 08:19:05 +08:00 |
|
Rohit Waghchaure
|
414199a5db
|
[Fix] Mode of payment issue
|
2016-09-19 23:43:47 +05:30 |
|
Nabin Hait
|
383cb43135
|
Merge pull request #6393 from KanchanChauhan/gl-fix
Against Voucher Type and Against Voucher added to GL
|
2016-09-19 19:35:55 +05:30 |
|
Nabin Hait
|
b20c83de46
|
Merge pull request #6397 from neilLasrado/develop
Added ability to Import Data via Data Import Tool in Instructor Doctype
|
2016-09-19 19:25:41 +05:30 |
|
Nabin Hait
|
fe15fd622d
|
Merge pull request #6398 from mainul94/Issue#6370
Update Production Status Options
|
2016-09-19 19:25:24 +05:30 |
|
Nabin Hait
|
902bcc07b5
|
Merge pull request #6401 from rmehta/fix-lead-link
[fix] connect customer to Quotation, Opportunity if created from lead, fixes #6051
|
2016-09-19 19:22:34 +05:30 |
|
Nabin Hait
|
acc3f43666
|
Merge pull request #6406 from rohitwaghchaure/add_sq_in_opportunity
Opportunity, added supplier quotation in the dashboard
|
2016-09-19 19:14:39 +05:30 |
|
Neil Trini Lasrado
|
93424e95f4
|
Added ability to Import Data via Data Import Tool in Instructor Doctype
|
2016-09-19 18:40:35 +05:30 |
|
Rohit Waghchaure
|
5b5f3743dd
|
Opportunity, added supplier quotation in the dashboard
|
2016-09-19 18:36:21 +05:30 |
|
Saurabh
|
9aacf46c51
|
[fix] minor fix to accomodate custom fields in tree popup
|
2016-09-19 16:45:35 +05:30 |
|
Rushabh Mehta
|
559aa3ab7c
|
[enhance] show customer, supplier billing and outstanding, fixes #6078
|
2016-09-19 16:04:58 +05:30 |
|
Rushabh Mehta
|
5a58d8a11e
|
[minor] production order link in material request, fixes #6197
|
2016-09-19 15:33:46 +05:30 |
|
Rushabh Mehta
|
bd15e31ea1
|
[minor] [enhance] fixes #6222
|
2016-09-19 15:27:09 +05:30 |
|
Rushabh Mehta
|
e35dbca01b
|
[fix] connect customer to Quotation, Opportunity if created from lead, fixes #6051
|
2016-09-19 15:03:57 +05:30 |
|
Kanchan Chauhan
|
006a0e68bf
|
Against Voucher Type and Against Voucher added to GL
|
2016-09-19 13:44:52 +05:30 |
|
Nabin Hait
|
17c43cd799
|
Merge pull request #6392 from KanchanChauhan/actual-qty-in-mri
Actual Qty added to Material Request Item
|
2016-09-19 13:32:31 +05:30 |
|
strixaluco
|
71073e1730
|
Update stock-entry.md
Stock Reconciliation hyperlink added
|
2016-09-19 15:38:38 +08:00 |
|
Mainul Islam
|
dbf2ce67a6
|
Fixed Issue#6370
|
2016-09-19 12:49:01 +06:00 |
|
Kanchan Chauhan
|
d1d129edf0
|
Actual Qty added to Material Request Item
|
2016-09-19 00:22:37 +05:30 |
|
Rohit Waghchaure
|
3c4cdd2a94
|
[Fix] Added base_url, print_css in pos
|
2016-09-19 00:17:32 +05:30 |
|
Rushabh Mehta
|
cf7a36ac26
|
[fix] fix patch to clear lead customization
|
2016-09-16 23:01:41 +05:30 |
|
Nabin Hait
|
5bab04fead
|
Merge pull request #6381 from rmehta/lead-source
[enhance] added Lead Source master, fixes #6231
|
2016-09-16 16:58:40 +05:30 |
|
Nabin Hait
|
c4bf8c5493
|
Merge pull request #6383 from nabinhait/article_max_cols
Article on maximum number of fields
|
2016-09-16 16:58:15 +05:30 |
|
Saurabh
|
9919a0a9db
|
[fix] #5992
|
2016-09-16 16:47:03 +05:30 |
|
Rushabh Mehta
|
39b5d39df6
|
[fix] remove campaign depends on
|
2016-09-16 15:55:34 +05:30 |
|
Nabin Hait
|
86e660f6c3
|
Article on maximum number of fields
|
2016-09-16 14:51:45 +05:30 |
|
Rushabh Mehta
|
59dc0ece9f
|
[enhance] added Lead Source master, fixes #6231
|
2016-09-16 11:44:49 +05:30 |
|
Nabin Hait
|
56700ae148
|
Merge pull request #6356 from KanchanChauhan/job-application-webform
Job Application web form
|
2016-09-15 17:20:43 +05:30 |
|
Nabin Hait
|
f3fd2ce382
|
Merge pull request #6366 from rohitwaghchaure/opportunity_enhancement
[Enhancement] Make supplier quotation from opportunity
|
2016-09-15 17:18:51 +05:30 |
|
Nabin Hait
|
f79adfddf1
|
Merge pull request #6351 from RobertSchouten/patch-29
PPT material request non-stock items
|
2016-09-15 17:01:20 +05:30 |
|
Nabin Hait
|
3cef7d5ae9
|
Update production_planning_tool.py
|
2016-09-15 17:01:00 +05:30 |
|
Neil Trini Lasrado
|
bb5eb7d6f4
|
Added title to Student Admission (#6379)
|
2016-09-15 16:44:25 +05:30 |
|
Nabin Hait
|
b267673b8e
|
Merge pull request #6373 from vrms/patch-2
Patch 2
|
2016-09-15 16:11:56 +05:30 |
|
Nabin Hait
|
756467c872
|
Merge pull request #6372 from vrms/patch-1
Patch 1
|
2016-09-15 16:11:45 +05:30 |
|
Neil Trini Lasrado
|
7e1b516103
|
fixes for student admission (#6377)
* fixes for student admission
* Added Application Route to Student Admission
|
2016-09-15 15:36:14 +05:30 |
|
Rushabh Mehta
|
769dda0874
|
[translation] [fixes] #5860
|
2016-09-15 15:17:04 +05:30 |
|
Neil Trini Lasrado
|
83d81203b2
|
Added Student Admissions (#6359)
* Added Student Admissions
* Fixes for Student Application
|
2016-09-15 14:48:13 +05:30 |
|
Rushabh Mehta
|
33d18dbc9a
|
[docs] for auto email
|
2016-09-15 13:57:43 +05:30 |
|
Nabin Hait
|
759ef4c00d
|
Allowed past dates in next depreciation date
|
2016-09-15 12:24:33 +05:30 |
|
robert schouten
|
32c366508a
|
add print format and id to monthly salary register
|
2016-09-15 14:21:15 +08:00 |
|
vrms
|
05e33789aa
|
Update index.md
|
2016-09-15 14:11:06 +08:00 |
|
vrms
|
6d34033c3f
|
Update item-variants.md
tried to bring out the implications and meaning of Variants (compared to a regular item) a little more detailed
|
2016-09-15 14:05:13 +08:00 |
|
Nabin Hait
|
d5ebd79ad7
|
Fixed version conflict
|
2016-09-14 15:50:22 +05:30 |
|
Nabin Hait
|
72801043f1
|
bumped to version 7.0.43
|
2016-09-14 16:14:25 +06:00 |
|
Rohit Waghchaure
|
00295f2b8d
|
make supplier quotation from opportunity
|
2016-09-14 15:36:40 +05:30 |
|
Nabin Hait
|
e9fa81c286
|
Merge pull request #6327 from rohitwaghchaure/timesheet_enhancement
[Enhancement] Timesheet billing based on project
|
2016-09-14 15:31:54 +05:30 |
|
Nabin Hait
|
2e8eff3456
|
Merge pull request #6352 from superlack/patch-1
Activity Summary to not show cancelled timesheets on click
|
2016-09-14 15:27:02 +05:30 |
|
Nabin Hait
|
9c32baa1f4
|
Merge pull request #6355 from rohitwaghchaure/timesheet_calendar_permission_issue
[Fix] Timesheet calendar permission issue
|
2016-09-14 15:26:30 +05:30 |
|
Rohit Waghchaure
|
b78eb2b6f2
|
[Fix] Financial Statements reports are running very slow
|
2016-09-14 13:33:27 +05:30 |
|
Rushabh Mehta
|
b6bca567ce
|
[fixes] [style] for web-form
|
2016-09-13 14:40:13 +05:30 |
|
Kanchan Chauhan
|
122d0791a3
|
Job Application web form
|
2016-09-13 14:29:02 +05:30 |
|
Rohit Waghchaure
|
4bd08182ac
|
[Fix] Timesheet calendar permission issue
|
2016-09-13 13:35:53 +05:30 |
|
Nabin Hait
|
ae9990cb81
|
Merge pull request #6353 from rohitwaghchaure/patch_fix_for_timesheet
[Fix] Timesheet patch
|
2016-09-13 13:31:11 +05:30 |
|
Rohit Waghchaure
|
a5de83351e
|
[Fix] Timesheet patch
|
2016-09-13 12:36:37 +05:30 |
|
superlack
|
1579565e52
|
Activity Summary to not show cancelled timesheets on click
Clicking an Activity Type in the Activity summary portion of project will add filter of "Status" != "Cancelled"
|
2016-09-12 21:18:41 -07:00 |
|
RobertSchouten
|
4ca64c33eb
|
Update production_planning_tool.json
|
2016-09-13 08:36:05 +08:00 |
|
RobertSchouten
|
5414725fd6
|
PPT material request non-stock items
|
2016-09-13 08:27:51 +08:00 |
|
Rohit Waghchaure
|
0568238786
|
rename total_billing_hours to total_billable_hours in timesheet doctype
|
2016-09-12 23:00:24 +05:30 |
|
Rohit Waghchaure
|
7b6fdb77d0
|
rename total_billing_amount to total_billable_amount in timesheet doctype
|
2016-09-12 19:06:41 +05:30 |
|
Nabin Hait
|
fcbb7692fa
|
Merge pull request #6322 from RobertSchouten/patch-23
leave balance now fy not calendar
|
2016-09-12 18:53:16 +05:30 |
|
Nabin Hait
|
b7c5b76ed1
|
Merge pull request #6321 from RobertSchouten/patch-22
allow users without employee with hr permission to view all calendars
|
2016-09-12 18:52:45 +05:30 |
|
Nabin Hait
|
9d9d1dceeb
|
Merge pull request #6314 from bcornwellmott/bom_desription
Fixed spelling
|
2016-09-12 18:45:21 +05:30 |
|
Nabin Hait
|
cd23530d24
|
Merge pull request #6324 from RobertSchouten/patch-24
stock entries from production_order dont fetch serial number of project
|
2016-09-12 18:35:13 +05:30 |
|
Nabin Hait
|
6c08f5caf9
|
Update stock_entry.py
|
2016-09-12 18:34:46 +05:30 |
|
Nabin Hait
|
d7b95267b3
|
Update production_planning_tool.py
|
2016-09-12 18:33:17 +05:30 |
|
Rohit Waghchaure
|
97a82714de
|
[Fix] so_dn_required for pos and stock update invoice
|
2016-09-12 18:04:17 +05:30 |
|
Nabin Hait
|
0a2c7a9a66
|
Merge pull request #6329 from bcornwellmott/quotecomp_add_supplier
Added supplier quotation filter for Quoted Item Comparison
|
2016-09-12 17:55:19 +05:30 |
|
Nabin Hait
|
97b661f995
|
Merge pull request #6334 from RobertSchouten/patch-27
[fix] itemwise sales register add sales invoice to delivery note when…
|
2016-09-12 17:53:10 +05:30 |
|
Nabin Hait
|
9821816e6c
|
Merge pull request #6337 from RobertSchouten/patch-28
[fix] status updater percent when qty is minus value
|
2016-09-12 17:37:48 +05:30 |
|
Nabin Hait
|
0a7c0f4418
|
Merge pull request #6338 from RobertSchouten/report_names
add customer and supplier names to some reports
|
2016-09-12 17:36:46 +05:30 |
|
Nabin Hait
|
014c30c90d
|
Merge pull request #6339 from rohitwaghchaure/pos_enhancement
[Enhancement] POS changes and fixes
|
2016-09-12 17:35:40 +05:30 |
|
Nabin Hait
|
33a20bdb13
|
Merge pull request #6340 from nabinhait/se_difference_account
Remove Difference Account field from Stock Entry parent form
|
2016-09-12 17:34:59 +05:30 |
|
Nabin Hait
|
d220298e69
|
Merge pull request #6343 from PawanMeh/fixes_6195
[fix] #6195
|
2016-09-12 17:34:40 +05:30 |
|
Nabin Hait
|
f314494555
|
Merge pull request #6345 from rohitwaghchaure/employee_name_missing
[Fix] Employee name is missing in timesheet
|
2016-09-12 17:34:13 +05:30 |
|
bcornwellmott
|
6594c841a7
|
Added color coding to timesheet calendars (#6269)
|
2016-09-12 16:43:23 +05:30 |
|
Rushabh Mehta
|
daee449063
|
[fix] for print format draft (#6346)
|
2016-09-12 16:42:36 +05:30 |
|
Rohit Waghchaure
|
03e5e68a7a
|
[Fix] Employee name is missing in timesheet
|
2016-09-12 16:14:06 +05:30 |
|
pawan
|
af111e9c43
|
[fix] #6195
|
2016-09-12 15:16:23 +05:30 |
|
Rohit Waghchaure
|
4eb908fc76
|
Doc updated for timesheet
|
2016-09-12 13:27:28 +05:30 |
|
Rohit Waghchaure
|
e1d59d6dde
|
test cases and minor changes
|
2016-09-12 13:27:28 +05:30 |
|
Rohit Waghchaure
|
1d0e8ea9c6
|
minor changes
|
2016-09-12 13:27:27 +05:30 |
|
Rohit Waghchaure
|
c940440fbe
|
patch and rearrangement of fields
|
2016-09-12 13:27:27 +05:30 |
|
Rohit Waghchaure
|
3815ebff8a
|
Added %billed in timesheet
|
2016-09-12 13:27:27 +05:30 |
|
Rohit Waghchaure
|
a6927e05ba
|
set project wise timesheet data
|
2016-09-12 13:27:27 +05:30 |
|
Rohit Waghchaure
|
cc8644f86e
|
[Timesheet] Field rearrange
|
2016-09-12 13:27:27 +05:30 |
|
Nabin Hait
|
a36a88b6de
|
Remove Difference Account field from Stock Entry parent form
|
2016-09-12 13:15:59 +05:30 |
|
Rohit Waghchaure
|
60a05324ce
|
POS changes and fixes
|
2016-09-12 13:11:10 +05:30 |
|
Nabin Hait
|
294664b24c
|
Merge pull request #6267 from PawanMeh/fixes_6254
[fix] #6254
|
2016-09-12 13:03:14 +05:30 |
|
Nabin Hait
|
9c82dd9157
|
Merge pull request #6332 from rmehta/item-group-paging
[fix] paging for item group
|
2016-09-12 13:01:54 +05:30 |
|
robert schouten
|
4fc70d962b
|
add customer and supplier names to some reports
|
2016-09-12 15:23:51 +08:00 |
|
RobertSchouten
|
db33ebb0ff
|
[fix] status updater percent when qty is minus value
|
2016-09-12 14:54:46 +08:00 |
|
RobertSchouten
|
bd979ec1ed
|
[fix] itemwise sales register add sales invoice to delivery note when update stock
in item wise sales register put sales invoice into delivery note field when delivery note is null and update stock ticked
|
2016-09-12 09:46:10 +08:00 |
|
Rushabh Mehta
|
3aa315040f
|
[fix] paging for item group
|
2016-09-11 16:48:24 +05:30 |
|
Ben Cornwell-Mott
|
8d0b826840
|
Added supplier quotation filter for Quoted Item Comparison
|
2016-09-09 08:00:54 -07:00 |
|
Saurabh
|
b835fef8ac
|
[enhancement] modify payment request to get payment url (#6097)
* [enhancement] modify payment request to get payment url
* redirect to payment url if payment initiated via shopping cart
|
2016-09-09 11:19:22 +05:30 |
|
RobertSchouten
|
f4498307c6
|
fix allow negatives in leave type check
|
2016-09-09 11:35:51 +08:00 |
|
RobertSchouten
|
b64fc33be1
|
stock entries from production_order dont fetch serial number of project
|
2016-09-09 11:08:39 +08:00 |
|
RobertSchouten
|
2efe20bd9a
|
stock entries from production_order dont fetch serial number of project
|
2016-09-09 11:05:22 +08:00 |
|
RobertSchouten
|
b7fc4b76e4
|
stock entries from production_order dont fetch serial number of project
stock entries from production_order dont fetch serial number of project
|
2016-09-09 11:02:33 +08:00 |
|
RobertSchouten
|
2ecddf58d2
|
leave balance now fy not calendar
changed the default from_date and to_date of Leave Balance Report to FY
|
2016-09-09 10:48:34 +08:00 |
|
RobertSchouten
|
93c095bf16
|
allow users without employee with hr permission to view all calendars
|
2016-09-09 10:15:56 +08:00 |
|
RobertSchouten
|
e4d3809c87
|
allow users without employee with hr permission to view all calendars
|
2016-09-09 10:14:07 +08:00 |
|
Nabin Hait
|
e5d13f3156
|
Update set_student_guardian.py
|
2016-09-08 17:57:55 +05:30 |
|
Neil Trini Lasrado
|
1e060e98c5
|
Rearranged feilds in Student Applicant & Student, Split address feild
|
2016-09-08 16:12:39 +05:30 |
|
Rohit Waghchaure
|
aaa6d1f1bc
|
patch fix
|
2016-09-08 12:34:36 +05:30 |
|
Nabin Hait
|
3e669ca656
|
bumped to version 7.0.42
|
2016-09-07 17:50:14 +06:00 |
|
Nabin Hait
|
1bf8e70339
|
Update convert_timelog_to_timesheet.py
|
2016-09-07 17:19:27 +05:30 |
|
Nabin Hait
|
7c9d981614
|
Update convert_timelog_to_timesheet.py
|
2016-09-07 17:17:47 +05:30 |
|
Nabin Hait
|
0a0df2e433
|
fixed version conflict
|
2016-09-07 17:01:47 +05:30 |
|
Nabin Hait
|
094d3adba3
|
bumped to version 7.0.41
|
2016-09-07 17:31:17 +06:00 |
|
Nabin Hait
|
23147ff881
|
Patch fixed
|
2016-09-07 16:59:55 +05:30 |
|
Nabin Hait
|
c16c0ca944
|
Merge pull request #6310 from rohitwaghchaure/pos_itemwise_tax_issue
[Fix] Item level taxes are not getting calculated in POS
|
2016-09-07 15:59:32 +05:30 |
|
Rohit Waghchaure
|
525900c5c1
|
[Fix] Item level taxes are not getting calculated in POS
|
2016-09-07 15:01:08 +05:30 |
|
Ben Cornwell-Mott
|
0261889c0f
|
Fixed spelling
|
2016-09-07 02:28:50 -07:00 |
|
pawan
|
7b2bd20a09
|
[fix] #6254
|
2016-09-06 18:28:41 +05:30 |
|
Nabin Hait
|
b8b228ed14
|
Fixed version conflict
|
2016-09-06 17:56:32 +05:30 |
|
Nabin Hait
|
9b54b78794
|
bumped to version 7.0.40
|
2016-09-06 18:25:55 +06:00 |
|
Neil Trini Lasrado
|
52891b55d2
|
Fixed Student Guardian patch - reload issue
|
2016-09-06 17:50:42 +05:30 |
|
Nabin Hait
|
f79d7188de
|
Patch fixed
|
2016-09-06 17:47:19 +05:30 |
|
Rohit Waghchaure
|
b44efef094
|
[Issue] Fixed, supplier quotation item uom conversion
|
2016-09-06 17:21:38 +05:30 |
|
Neil Trini Lasrado
|
6a95723a70
|
Fixed Student Guardian patch - permission issue
|
2016-09-06 17:11:13 +05:30 |
|
Nabin Hait
|
194fbaca13
|
Merge pull request #6291 from RobertSchouten/patch-21
fix for closing balance typo
|
2016-09-06 17:06:56 +05:30 |
|
Nabin Hait
|
06792a93cd
|
Merge pull request #6289 from KanchanChauhan/barcode-in-stock-reconciliation
Barcode added to Stock Reconciliation
|
2016-09-06 17:06:06 +05:30 |
|
Neil Trini Lasrado
|
49da25dd57
|
Added patch
|
2016-09-06 15:45:17 +05:30 |
|
RobertSchouten
|
5ae21053bd
|
fix for closing balance typo
|
2016-09-06 15:44:09 +08:00 |
|
Neil Trini Lasrado
|
c20adb532f
|
Added student Category
|
2016-09-06 13:08:07 +05:30 |
|
Neil Trini Lasrado
|
d878b66936
|
Updated Student Doctype
|
2016-09-06 13:08:07 +05:30 |
|
Neil Trini Lasrado
|
a477e411aa
|
Updated Guardian Doctype; Added new fields
|
2016-09-06 13:08:07 +05:30 |
|
Kanchan Chauhan
|
366ba04823
|
Barcode added to Stock Reconciliation
|
2016-09-06 12:44:57 +05:30 |
|
Rohit Waghchaure
|
377c7acd53
|
[POS] Added offline_pos_name in print format
|
2016-09-05 17:59:01 +05:30 |
|
Nabin Hait
|
ca627fb806
|
[fix] Fetch advance journal entry in invoice if it is tagged against linked order
|
2016-09-05 16:17:08 +05:30 |
|
Nabin Hait
|
406f0a38de
|
Fixed merge conflicts
|
2016-09-05 15:44:18 +05:30 |
|
Nabin Hait
|
911e9caa43
|
bumped to version 7.0.39
|
2016-09-05 16:13:48 +06:00 |
|
Nabin Hait
|
b239a09951
|
Merge pull request #6282 from nabinhait/maintenance_schedule_fix
Minor fix in maintenance schedule
|
2016-09-05 15:39:54 +05:30 |
|
Nabin Hait
|
4cb58c410a
|
Minor fix in maintenance schedule
|
2016-09-05 15:14:26 +05:30 |
|
Nabin Hait
|
906552a401
|
Notifications filters for DN, PR and PI
|
2016-09-05 14:35:40 +05:30 |
|
Nabin Hait
|
8693b5c93a
|
Minor fixes
|
2016-09-05 11:51:45 +05:30 |
|
Rohit Waghchaure
|
cc1c7ad2df
|
added test cases
|
2016-09-05 00:43:17 +05:30 |
|
Rohit Waghchaure
|
560ba391f9
|
[Enhancement] Purchase return for rejected qty
|
2016-09-05 00:43:17 +05:30 |
|