PATCH C-TMS 11.0 P024: Difference between revisions
From Calidus HUB
(Created page with "<div class="noprint"> {{#vardefine:Client|OBS}} {{#vardefine:ClientName|OBS Logistics Ltd}} {{#vardefine:System|''CALIDUS'' WMS}} {{#vardefine:Doc_Title|Release Notes}} {{#vardef...") |
No edit summary |
||
Line 1,702: | Line 1,702: | ||
!Module Name !! Version No !! Description !! Log Number | !Module Name !! Version No !! Description !! Log Number | ||
|- | |- | ||
| | | ACC.sql || 5.59 || Accounts package || 341738 | ||
|- | |||
| ACC.sql || 5.61 || Accounts package || 339950 | |||
|- | |||
| ACC_MAINT.fmx || 2.74 || Accounts Maintenance || 338196 | |||
|- | |||
| ACC_MAINT.fmx || 2.77 || Accounts Maintenance || 339157 | |||
|- | |||
| AGREEMENTS.fmx || 2.37 || Agreements Screen || 341487 | |||
|- | |||
| AGREEMENTS.fmx || 2.38 || Agreements Screen || 341473 | |||
|- | |||
| AKW_DELIVERY_NOTE.rep || 1.6 || Client specific delivery note || 341143 | |||
|- | |||
| AT_ACC_ORD_CHARGES_342082.sql || 1.1 || Alter Table Script || 342082 | |||
|- | |||
| AT_ACC_SERVICES_338196.sql || 1.1 || Alter Table Script || 338196 | |||
|- | |||
| AT_CNT_DEL_TYPE_338477.sql || 1.1 || Alter Table Script || 338477 | |||
|- | |||
| AT_CNT_STD_JOURNEY.sql || 1.1 || Alter Table Script || 342459 | |||
|- | |||
| AT_GEO_LOCATION_339678.sql || 1.1 || Alter Table Script || 339678 | |||
|- | |||
| AT_INT_ORD_ITEMS_CSV_341173.sq || 1.1 || Alter Table Script || 341173 | |||
|- | |||
| AT_INT_XML_CONTROL_342138.sql || 1.1 || Alter Table Script || 342138 | |||
|- | |||
| AT_ORG_CUSTOMER_339530.sql || 1.2 || Alter Table Script || 339530 | |||
|- | |||
| AT_ORG_CUSTOMER_339535.sql || 1.2 || Alter Table Script || 339535 | |||
|- | |||
| AT_ORG_CUSTOMER_341175.sql || 1.1 || Alter Table Script || 341172 | |||
|- | |||
| AT_ORG_CUSTOMER_341175.sql || 1.1 || Alter Table Script || 341175 | |||
|- | |||
| AT_ORS_AUDIT_342138.sql || 1.1 || Alter Table Script || 342138 | |||
|- | |||
| AT_ORS_MASTER_DATA_342138.sql || 1.1 || Alter Table Script || 342138 | |||
|- | |||
| AT_ORS_SQL_342138.sql || 1.1 || Alter Table Script || 342138 | |||
|- | |||
| AT_ORS_USER_DETAILS_342138.sql || 1.1 || Alter Table Script || 342138 | |||
|- | |||
| AT_ORS_USER_HEADER_342138.sql || 1.1 || Alter Table Script || 342138 | |||
|- | |||
| AT_PAR_TRIP_DTL_339598.sql || 1.1 || Alter Table Script || 339598 | |||
|- | |||
| AT_SCH_ORD_339530.sql || 1.1 || Alter Table Script || 339530 | |||
|- | |||
| AT_SCH_ORD_SERVICES_338196.sql || 1.1 || Alter Table Script || 338196 | |||
|- | |||
| AT_SCH_TRIP_339598.sql || 1.1 || Alter Table Script || 339598 | |||
|- | |||
| AT_SCH_TRIP_ITEMS_342082.sql || 1.1 || Alter Table Script || 342082 | |||
|- | |||
| BATHSTORE_MANIFEST.rep || 1.8 || Manifest Report || 341942 | |||
|- | |||
| BDM.fmx || 2.96 || Business Data Form || 338477 | |||
|- | |||
| CNT.sql || 5.46 || Contracts package || 339157 | |||
|- | |||
| CONTRACT.fmx || 2.63 || Contracts Form || 342795 | |||
|- | |||
| CSV.sql || 5.97 || CSV extract package || 338703 | |||
|- | |||
| CSV.sql || 5.98 || CSV extract package || 339598 | |||
|- | |||
| CSV.sql || 5.99 || CSV extract package || 341172 | |||
|- | |||
| CT_ORG_CUST_ZONES_SURCHARGES_339950.sql || 1.1 || Create Table Script || 339950 | |||
|- | |||
| CT_ORG_CUSTOMER_COUNTRIES_339678.sql || 1.1 || Create Table Script || 339678 | |||
|- | |||
| CT_RTE_DELIVERY_SCHEDULE_339535.sql || 1.2 || Create Table Script || 339535 | |||
|- | |||
| CT_SEQ_CLICK_COLL_341171.sql || 1.1 || Create Table Script || 341171 | |||
|- | |||
| CT_SEQ_ORG_CUST_ZONE_SURCHARGES_339950.sql || 1.1 || Create Table Script || 339950 | |||
|- | |||
| CT_SEQ_RTE_DELIVERY_SCHEDULE_339535.sql || 1.1 || Create Table Script || 339535 | |||
|- | |||
| CUST_COST.fmx || 2.108 || Customer Maintenance form || 339530 | |||
|- | |||
| CUST_COST.fmx || 2.109 || Customer Maintenance form || 339534 | |||
|- | |||
| CUST_COST.fmx || 2.110 || Customer Maintenance form || 339678 | |||
|- | |||
| CUST_COST.fmx || 2.111 || Customer Maintenance form || 341175 | |||
|- | |||
| CUST_COST.fmx || 2.114 || Customer Maintenance form || 339950 | |||
|- | |||
| DATA_1_IMP_IMPORT_TYPE_339950.sql || 1.1 || Data Script || 339950 | |||
|- | |||
| DATA_2_IMP_FIELD_339950.sql || 1.1 || Data Script || 339950 | |||
|- | |||
| DATA_ADM_FORM_TAB_339535.sql || 1.1 || Data Script || 339535 | |||
|- | |||
| DATA_ADM_FORM_TAB_339678.sql || 1.1 || Data Script || 339678 | |||
|- | |||
| DATA_ADM_FORM_TAB_341188.sql || 1.1 || Data Script || 341188 | |||
|- | |||
| DATA_ADM_SYSTEM_PARAM_338196.sql || 1.1 || Data Script || 338196 | |||
|- | |||
| DATA_ADM_SYSTEM_PARAM_338703.sql || 1.1 || Data Script || 338703 | |||
|- | |||
| DATA_ADM_SYSTEM_PARAM_339157.sql || 1.1 || Data Script || 339157 | |||
|- | |||
| DATA_ADM_SYSTEM_PARAM_339530.sql || 1.2 || Data Script || 339530 | |||
|- | |||
| DATA_ADM_SYSTEM_PARAM_339534.sql || 1.1 || Data Script || 339534 | |||
|- | |||
| DATA_ADM_SYSTEM_PARAM_339535.sql || 1.1 || Data Script || 339535 | |||
|- | |||
| DATA_ADM_SYSTEM_PARAM_339678.sql || 1.1 || Data Script || 339678 | |||
|- | |||
| DATA_ADM_SYSTEM_PARAM_341176.sql || 1.1 || Data Script || 341176 | |||
|- | |||
| DATA_ADM_SYSTEM_PARAM_341189.sql || 1.1 || Data Script || 341189 | |||
|- | |||
| DATA_ADM_SYSTEM_PARAM_341274.sql || 1.1 || Data Script || 341292 | |||
|- | |||
| DATA_ADM_SYSTEM_PARAM_341881.sql || 1.1 || Data Script || 341881 | |||
|- | |||
| DATA_ADM_SYSTEM_PARAM_342410.sql || 1.1 || Data Script || 342410 | |||
|- | |||
| DATA_ADM_SYSTEM_PARAM_342794.sql || 1.1 || Data Script || 342794 | |||
|- | |||
| DATA_ADM_SYSTEM_PARAM_342560.sql || 1.1 || Data Script || 342560 | |||
|- | |||
| DATA_ADM_SYSTEM_PARAM_CONFIG_338196.sql || 1.1 || Data Script || 338196 | |||
|- | |||
| DATA_ADM_SYSTEM_PARAM_CONFIG_339157.sql || 1.1 || Data Script || 339157 | |||
|- | |||
| DATA_ADM_SYSTEM_PARAM_CONFIG_339530.sql || 1.1 || Data Script || 339530 | |||
|- | |||
| DATA_ADM_SYSTEM_PARAM_CONFIG_339534.sql || 1.1 || Data Script || 339534 | |||
|- | |||
| DATA_ADM_SYSTEM_PARAM_CONFIG_339535.sql || 1.1 || Data Script || 339535 | |||
|- | |||
| DATA_ADM_SYSTEM_PARAM_CONFIG_341176.sql || 1.2 || Data Script || 341176 | |||
|- | |||
| DATA_ADM_SYSTEM_PARAM_CONFIG_341274.sql || 1.1 || Data Script || 341292 | |||
|- | |||
| DATA_ADM_SYSTEM_PARAM_CONFIG_342794.sql || 1.1 || Data Script || 342794 | |||
|- | |||
| DATA_ADM_SYSTEM_PARAM_CONFIG_342560.sql || 1.1 || Data Script || 342560 | |||
|- | |||
| DATA_IMP_FIELD_339535.sql || 1.1 || Data Script || 339535 | |||
|- | |||
| DATA_IMP_FIELD_339598.sql || 1.1 || Data Script || 339598 | |||
|- | |||
| DATA_IMP_FIELD_340999.sql || 1.1 || Data Script || 340999 | |||
|- | |||
| DATA_IMP_FIELD_341173.sql || 1.1 || Data Script || 341173 | |||
|- | |||
| DATA_IMP_FIELD_341297.sql || 1.1 || Data Script || 341297 | |||
|- | |||
| DATA_IMP_IMPORT_TYPE_339535.sql || 1.1 || Data Script || 339535 | |||
|- | |||
| DATA_ORG_CUST_ORD_REV_CHG_TYPE_339157.sql || 1.1 || Data Script || 339157 | |||
|- | |||
| DATA_ORS_341062.sql || 1.1 || Data Script || 341062 | |||
|- | |||
| DATA_REP_REPORT_339530.sql || 1.1 || Data Script || 339530 | |||
|- | |||
| DATA_REP_REPORT_339535.sql || 1.1 || Data Script || 339535 | |||
|- | |||
| DATA_REP_REPORT_PARAM_339530.sql || 1.1 || Data Script || 339530 | |||
|- | |||
| DATA_REP_REPORT_PARAM_339535.sql || 1.2 || Data Script || 339535 | |||
|- | |||
| DATA_RES_LABEL_FORMATS_340930.sql || 1.1 || Data Script || 340930 | |||
|- | |||
| DATA_RES_LABEL_FORMATS_342420.sql || 1.1 || Data Script || 342420 | |||
|- | |||
| DATA_SCH_SOURCE_SYSTEM_341173.sql || 1.1 || Data Script || 341173 | |||
|- | |||
| DP_AQ.sql || 5.4 || RDT Queue controller || 340872 | |||
|- | |||
| DP_AQ.sql || 5.5 || RDT Queue controller || 342750 | |||
|- | |||
| DP_BMW_EDI_OUT.sql || 1.11 || Outbound EDI Package || 341034 | |||
|- | |||
| DP_BNL_EDI_IN.sql || 1.9 || Inbound EDI Package || 341287 | |||
|- | |||
| DP_CARRIER.sql || 1.52 || Carrier Management || 339598 | |||
|- | |||
| DP_CARRIER.sql || 1.53 || Carrier Management || 340930 | |||
|- | |||
| DP_CARRIER.sql || 1.54 || Carrier Management || 342420 | |||
|- | |||
| DP_CSV_BNL.sql || 1.10 || Extract package || 341198 | |||
|- | |||
| DP_CSV_DHL.sql || 1.13 || Export Package || 339535 | |||
|- | |||
| DP_CSV_DHL.sql || 1.14 || Export Package || 341626 | |||
|- | |||
| DP_CSV_DUN.sql || 5.29 || Client specific CSV extracts || 342073 | |||
|- | |||
| DP_CSV_NR.sql || 5.53 || NR CSV reports || 338196 | |||
|- | |||
| DP_CSV_NR.sql || 5.54 || NR CSV reports || 342518 | |||
|- | |||
| DP_CSV_NR.sql || 5.55 || NR CSV reports || 342967 | |||
|- | |||
| DP_CSV6.sql || 1.30 || CSV Extract package || 339530 | |||
|- | |||
| DP_CSV6.sql || 1.31 || CSV Extract package || 342164 | |||
|- | |||
| DP_IMP_2.sql || 1.59 || Import Package || 341637 | |||
|- | |||
| DP_IMP_3.sql || 1.7 || Imports Package || 341701 | |||
|- | |||
| DP_LOGIX.sql || 1.6 || Package for LOGIX Interfaces || 342322 | |||
|- | |||
| DP_MCS_SCANNING.sql || 5.38 || MCS Scanning Package || 341039 | |||
|- | |||
| DP_MCS_SCANNING.sql || 5.39 || MCS Scanning Package || 342082 | |||
|- | |||
| DP_NOKIA_LOC_PLAT.sql || 1.30 || Nokia Location Platform Interface || 341465 | |||
|- | |||
| DP_PULSE.sql || 1.44 || Pulse Interface Package || 341231 | |||
|- | |||
| DP_PULSE.sql || 1.45 || Pulse Interface Package || 342555 | |||
|- | |||
| DP_RDT_AUTO.sql || 5.42 || Client specific RDT funtions || 341881 | |||
|- | |||
| DP_RDT_FAST_UNLOAD.sql || 5.37 || RF Unload Package || 342843 | |||
|- | |||
| DP_RDT_PREADVICE.sql || 5.6 || RDT Pre-advice Package || 342146 | |||
|- | |||
| DP_SCHEDULING_ENGINE.sql || 5.100 || Scheduling Package || 341898 | |||
|- | |||
| DP_SCHEDULING_ENGINE.sql || 5.101 || Scheduling Package || 342002 | |||
|- | |||
| DP_SCHEDULING_ENGINE.sql || 5.102 || Scheduling Package || 342129 | |||
|- | |||
| DP_SCHEDULING_ENGINE.sql || 5.103 || Scheduling Package || 342591 | |||
|- | |||
| DP_SCHEDULING_ENGINE.sql || 5.104 || Scheduling Package || 342966 | |||
|- | |||
| DP_SCHEDULING_ENGINE.sql || 5.96 || Scheduling Package || 339534 | |||
|- | |||
| DP_SCHEDULING_ENGINE.sql || 5.97 || Scheduling Package || 340677 | |||
|- | |||
| DP_SCHEDULING_ENGINE.sql || 5.98 || Scheduling Package || 341026 | |||
|- | |||
| DP_SCHEDULING_ENGINE.sql || 5.99 || Scheduling Package || 341684 | |||
|- | |||
| DP_TOMTOM.sql || 1.25 || TomTom Package || 341016 | |||
|- | |||
| DP_TOMTOM.sql || 1.26 || TomTom Package || 341057 | |||
|- | |||
| DP_TOY_EDI_IN.sql || 1.7 || Inbound EDI database package || 341489 | |||
|- | |||
| DP_TOY_EDI_IN.sql || 1.8 || Inbound EDI database package || 341173 | |||
|- | |||
| DP_TOY_EDI_IN.sql || 1.9 || Inbound EDI database package || 342146 | |||
|- | |||
| DUNELM_DAILY_STORE_ASN.rep || 1.5 || Dunelm Report || 341175 | |||
|- | |||
| GEO.sql || 5.31 || Location Processing || 342148 | |||
|- | |||
| IMP.sql || 5.140 || CSV Imports Package || 339535 | |||
|- | |||
| IMP.sql || 5.141 || CSV Imports Package || 339598 | |||
|- | |||
| IMP.sql || 5.142 || CSV Imports Package || 340999 | |||
|- | |||
| IMP.sql || 5.144 || CSV Imports Package || 341293 | |||
|- | |||
| IMP.sql || 5.145 || CSV Imports Package || 342513 | |||
|- | |||
| IMP.sql || 5.147 || CSV Imports Package || 339950 | |||
|- | |||
| INT_ERR.fmx || 1.98 || Interface Errors || 341173 | |||
|- | |||
| INT_XML_IN.sql || 5.158 || Order Import Package || 339530 | |||
|- | |||
| INT_XML_IN.sql || 5.159 || Order Import Package || 341032 | |||
|- | |||
| INT_XML_IN.sql || 5.160 || Order Import Package || 341248 | |||
|- | |||
| INT_XML_IN.sql || 5.162 || Order Import Package || 341855 | |||
|- | |||
| INT_XML_IN.sql || 5.163 || Order Import Package || 342470 | |||
|- | |||
| INT_XML_MIC.sql || 5.140 || MIC interface || 338703 | |||
|- | |||
| INT_XML_MIC.sql || 5.141 || MIC interface || 341292 | |||
|- | |||
| INT_XML_OUT2.sql || 5.245 || Outbound XML Package || 338703 | |||
|- | |||
| INT_XML_OUT2.sql || 5.247 || Outbound XML Package || 341177 | |||
|- | |||
| INT_XML_OUT2.sql || 5.248 || Outbound XML Package || 341957 | |||
|- | |||
| INT_XML_OUT2.sql || 5.249 || Outbound XML Package || 342410 | |||
|- | |||
| LOAD_MAN.fmx || 1.20 || Load Management Form || 341292 | |||
|- | |||
| LOAD_MAN.fmx || 1.21 || Load Management Form || 341881 | |||
|- | |||
| LOCATION.fmx || 2.174 || Location Maintenance || 339678 | |||
|- | |||
| LOCATION.fmx || 2.175 || Location Maintenance || 341099 | |||
|- | |||
| LOCATION.fmx || 2.176 || Location Maintenance || 341296 | |||
|- | |||
| LOCATION.fmx || 2.177 || Location Maintenance || 341299 | |||
|- | |||
| LOCATION.fmx || 2.178 || Location Maintenance || 342575 | |||
|- | |||
| LOCATION.fmx || 2.179 || Location Maintenance || 342705 | |||
|- | |||
| LOCK_MONITOR.fmx || 2.19 || Lock Monitor || 340922 | |||
|- | |||
| LOCK_MONITOR.fmx || 2.20 || Lock Monitor || 341188 | |||
|- | |||
| NHSBT_MANIFEST.rep || 1.3 || Client specific manifest report || 341043 | |||
|- | |||
| OMS.sql || 5.165 || Order package || 339535 | |||
|- | |||
| OMS.sql || 5.167 || Order package || 338703 | |||
|- | |||
| OMS.sql || 5.168 || Order package || 339534 | |||
|- | |||
| OMS.sql || 5.169 || Order package || 338477 | |||
|- | |||
| OMS.sql || 5.170 || Order package || 339530 | |||
|- | |||
| OMS.sql || 5.171 || Order package || 340944 | |||
|- | |||
| OMS.sql || 5.172 || Order package || 341248 | |||
|- | |||
| OMS.sql || 5.173 || Order package || 341451 | |||
|- | |||
| OMS.sql || 5.175 || Order package || 341512 | |||
|- | |||
| OMS.sql || 5.176 || Order package || 341547 | |||
|- | |||
| OMS.sql || 5.177 || Order package || 338196 | |||
|- | |||
| OMS.sql || 5.178 || Order package || 341664 | |||
|- | |||
| OMS.sql || 5.179 || Order package || 341171 | |||
|- | |||
| OMS.sql || 5.180 || Order package || 341865 | |||
|- | |||
| OMS.sql || 5.181 || Order package || 342452 | |||
|- | |||
| OMS.sql || 5.182 || Order package || 342410 | |||
|- | |||
| OMS.sql || 5.183 || Order package || 342470 | |||
|- | |||
| ORDERS.fmx || 2.378 || Order Screen || 338703 | |||
|- | |||
| ORDERS.fmx || 2.379 || Order Screen || 340930 | |||
|- | |||
| ORDERS.fmx || 2.380 || Order Screen || 339678 | |||
|- | |||
| ORDERS.fmx || 2.381 || Order Screen || 341302 | |||
|- | |||
| ORDERS.fmx || 2.382 || Order Screen || 338196 | |||
|- | |||
| ORDERS.fmx || 2.383 || Order Screen || 341189 | |||
|- | |||
| ORDERS.fmx || 2.384 || Order Screen || 342294 | |||
|- | |||
| ORDERS.fmx || 2.385 || Order Screen || 342327 | |||
|- | |||
| ORDERS.fmx || 2.386 || Order Screen || 342011 | |||
|- | |||
| PAR.sql || 5.70 || Paragon Interface || 339531 | |||
|- | |||
| PAR.sql || 5.71 || Paragon Interface || 339598 | |||
|- | |||
| PAR.sql || 5.73 || Paragon Interface || 339532 | |||
|- | |||
| PAR.sql || 5.74 || Paragon Interface || 341432 | |||
|- | |||
| PAR.sql || 5.75 || Paragon Interface || 341172 | |||
|- | |||
| PAR.sql || 5.77 || Paragon Interface || 341885 | |||
|- | |||
| PAR.sql || 5.78 || Paragon Interface || 342186 | |||
|- | |||
| PAR.sql || 5.79 || Paragon Interface || 342151 | |||
|- | |||
| PAR_INT.fmx || 10.35 || Paragon Interface form || 339533 | |||
|- | |||
| PLANNING.fmx || 1.55 || Planning Screen || 339534 | |||
|- | |||
| PLANNING.fmx || 1.56 || Planning Screen || 341176 | |||
|- | |||
| PRNTQ.ksh || 4.1 || Printer Functions || 341188 | |||
|- | |||
| RATE.sql || 5.125 || Rates Tariff database package || 341144 | |||
|- | |||
| RATE.sql || 5.127 || Rates Tariff database package || 338196 | |||
|- | |||
| RATE.sql || 5.128 || Rates Tariff database package || 339157 | |||
|- | |||
| RATE.sql || 5.129 || Rates Tariff database package || 342794 | |||
|- | |||
| RATE.sql || 5.130 || Rates Tariff database package || 342560 | |||
|- | |||
| SCHED_RULES.fmx || 1.29 || Scheduling Screen || 339535 | |||
|- | |||
| SCHED_RULES.fmx || 1.30 || Scheduling Screen || 341626 | |||
|- | |||
| SCHED_RULES.fmx || 1.31 || Scheduling Screen || 341770 | |||
|- | |||
| T_SCH_HAULAGE_ACTIVITY_BIU.sql || 1.7 || Trigger || 341597 | |||
|- | |||
| TI_SCH_ORD_STATUS.sql || 1.15 || Trigger on SCH_ORD for status change || 341598 | |||
|- | |||
| TRG_ORG_CUSTOMER_COUNTRIES_BIU_339678.sql || 1.1 || Trigger || 339678 | |||
|- | |||
| TRG_RTE_DELIVERY_SCHEDULE_UI.sql || 1.1 || Trigger || 339535 | |||
|- | |||
| TRG_SCH_ORD_LOTS.sql || 5.10 || Trigger || 342410 | |||
|- | |||
| TRG_SHA_XML_GEN.sql || 5.8 || Trigger || 342966 | |||
|- | |||
| TRG_SOM_SUPP_CONF.sql || 5.18 || Trigger || 342396 | |||
|- | |||
| TRG_STS_XML_GEN.sql || 5.6 || Trigger || 342966 | |||
|- | |||
| TRIP_SHEET_DUNELM_DETAIL.rep || 5.19 || Driver Trip Sheet for Dunelm || 341176 | |||
|- | |||
| TRIP_SHEET_DUNELM_DETAIL.rep || 5.20 || Driver Trip Sheet for Dunelm || 342073 | |||
|- | |||
| TRIPDTL.fmx || 2.212 || Trip Debrief || 340088 | |||
|- | |||
| TRIPSUM.fmx || 2.429 || Trip Manipulation screen || 341638 | |||
|- | |||
| TRM.sql || 5.152 || Trip manipulation package || 341039 | |||
|- | |||
| TRM.sql || 5.153 || Trip manipulation package || 338196 | |||
|- | |||
| TRM.sql || 5.154 || Trip manipulation package || 342020 | |||
|- | |||
| TRM.sql || 5.155 || Trip manipulation package || 342142 | |||
|- | |||
| TRM.sql || 5.156 || Trip manipulation package || 342322 | |||
|- | |||
| TRM.sql || 5.157 || Trip manipulation package || 341881 | |||
|- | |||
| V_TRIP_FIXED_341062.sql || 1.1 || View || 341062 | |||
|- | |||
| WCS_MAINT.fmx || 1.10 || WCS Maintenance || 341174 | |||
|- | |||
|} | |} | ||