@@ -1,5 +1,5 @@ |
||
| 1 | 1 | <div class="wide"> |
| 2 | - <?php $data['controller']->display_form(); ?> |
|
| 2 | + <?php $data['controller']->display_form(); ?> |
|
| 3 | 3 | <!-- To open the report in new window we need to set the target via JS --> |
| 4 | 4 | <script type="text/javascript"> |
| 5 | 5 | $('.datamanager2 button[type="submit"].save').attr('formtarget', '_blank'); |
@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | if ($result === true) { |
| 21 | 21 | $result = []; |
| 22 | 22 | } |
| 23 | - if ( empty($fields['end']) |
|
| 23 | + if (empty($fields['end']) |
|
| 24 | 24 | && empty($fields['continuous'])) { |
| 25 | 25 | $result['end'] = midcom::get()->i18n->get_string('select either end date or continuous', 'org.openpsa.sales'); |
| 26 | 26 | } |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | public function validate_units(array $fields) |
| 34 | 34 | { |
| 35 | 35 | $result = []; |
| 36 | - if ( empty($fields['invoiceByActualUnits']) |
|
| 36 | + if (empty($fields['invoiceByActualUnits']) |
|
| 37 | 37 | && empty($fields['plannedUnits'])) { |
| 38 | 38 | $result['plannedUnits'] = midcom::get()->i18n->get_string('select either planned units or invoice by actual units', 'org.openpsa.sales'); |
| 39 | 39 | return $result; |
@@ -51,7 +51,8 @@ discard block |
||
| 51 | 51 | try { |
| 52 | 52 | $deliverable = org_openpsa_sales_salesproject_deliverable_dba::get_cached($task->get_agreement()); |
| 53 | 53 | $item->deliverable = $deliverable->id; |
| 54 | - } catch (midcom_error $e) { |
|
| 54 | + } |
|
| 55 | + catch (midcom_error $e) { |
|
| 55 | 56 | $e->log(); |
| 56 | 57 | } |
| 57 | 58 | $item->invoice = $invoice->id; |
@@ -133,7 +134,8 @@ discard block |
||
| 133 | 134 | $customer = org_openpsa_contacts_group_dba::get_cached($customer_id); |
| 134 | 135 | $data['customer_label'] = $customer->official; |
| 135 | 136 | $data['disabled'] = ''; |
| 136 | - } catch (midcom_error $e) { |
|
| 137 | + } |
|
| 138 | + catch (midcom_error $e) { |
|
| 137 | 139 | $data['customer_label'] = $this->_l10n->get('no customer'); |
| 138 | 140 | $data['disabled'] = ' disabled="disabled"'; |
| 139 | 141 | } |
@@ -156,7 +158,8 @@ discard block |
||
| 156 | 158 | } else { |
| 157 | 159 | $data['invoiceable_units'] = $task->plannedHours; |
| 158 | 160 | } |
| 159 | - } catch (midcom_error $e) { |
|
| 161 | + } |
|
| 162 | + catch (midcom_error $e) { |
|
| 160 | 163 | $e->log(); |
| 161 | 164 | if ($this->_config->get('default_hourly_price')) { |
| 162 | 165 | $data['default_price'] = $this->_config->get('default_hourly_price'); |
@@ -237,7 +237,7 @@ |
||
| 237 | 237 | $invoice_item->pricePerUnit = $deliverable->pricePerUnit; |
| 238 | 238 | $invoice_item->deliverable = $deliverable->id; |
| 239 | 239 | //calculate price |
| 240 | - if ( $deliverable->invoiceByActualUnits |
|
| 240 | + if ($deliverable->invoiceByActualUnits |
|
| 241 | 241 | || $deliverable->plannedUnits == 0) { |
| 242 | 242 | $invoice_item->units = $hours; |
| 243 | 243 | } else { |
@@ -128,7 +128,8 @@ discard block |
||
| 128 | 128 | try { |
| 129 | 129 | $task = new org_openpsa_projects_task_dba($id); |
| 130 | 130 | $task->update_cache(); |
| 131 | - } catch (midcom_error $e) { |
|
| 131 | + } |
|
| 132 | + catch (midcom_error $e) { |
|
| 132 | 133 | } |
| 133 | 134 | } |
| 134 | 135 | |
@@ -293,14 +294,16 @@ discard block |
||
| 293 | 294 | if (!empty($this->customer)) { |
| 294 | 295 | try { |
| 295 | 296 | return org_openpsa_contacts_group_dba::get_cached($this->customer); |
| 296 | - } catch (midcom_error $e) { |
|
| 297 | + } |
|
| 298 | + catch (midcom_error $e) { |
|
| 297 | 299 | $e->log(); |
| 298 | 300 | } |
| 299 | 301 | } |
| 300 | 302 | if (!empty($this->customerContact)) { |
| 301 | 303 | try { |
| 302 | 304 | return org_openpsa_contacts_person_dba::get_cached($this->customerContact); |
| 303 | - } catch (midcom_error $e) { |
|
| 305 | + } |
|
| 306 | + catch (midcom_error $e) { |
|
| 304 | 307 | $e->log(); |
| 305 | 308 | } |
| 306 | 309 | } |
@@ -94,7 +94,8 @@ |
||
| 94 | 94 | } |
| 95 | 95 | try { |
| 96 | 96 | $this->_storage = new midgard_group($id); |
| 97 | - } catch (Exception $e) { |
|
| 97 | + } |
|
| 98 | + catch (Exception $e) { |
|
| 98 | 99 | debug_add('Tried to load a midcom_core_group, but got error ' . $e->getMessage(), MIDCOM_LOG_ERROR); |
| 99 | 100 | debug_print_r('Passed argument was:', $id); |
| 100 | 101 | throw new midcom_error($e->getMessage()); |
@@ -27,7 +27,8 @@ |
||
| 27 | 27 | try { |
| 28 | 28 | midcom::get()->dbfactory->get_object_by_guid($result->fromGuid); |
| 29 | 29 | midcom::get()->dbfactory->get_object_by_guid($result->toGuid); |
| 30 | - } catch (midcom_error $e) { |
|
| 30 | + } |
|
| 31 | + catch (midcom_error $e) { |
|
| 31 | 32 | echo $i . "/" . $total . ": Deleting relatedto #" . $result->id . "\n"; |
| 32 | 33 | $result->delete(); |
| 33 | 34 | } |
@@ -28,7 +28,8 @@ |
||
| 28 | 28 | foreach ($qb->execute() as $feed) { |
| 29 | 29 | try { |
| 30 | 30 | midcom_db_topic::get_cached($feed->node); |
| 31 | - } catch (midcom_error $e) { |
|
| 31 | + } |
|
| 32 | + catch (midcom_error $e) { |
|
| 32 | 33 | debug_add("Node #{$feed->node} does not exist, skipping feed #{$feed->id}", MIDCOM_LOG_ERROR); |
| 33 | 34 | continue; |
| 34 | 35 | } |
@@ -32,7 +32,8 @@ |
||
| 32 | 32 | foreach ($qb->execute() as $article) { |
| 33 | 33 | try { |
| 34 | 34 | $dm->set_storage($article); |
| 35 | - } catch (midcom_error $e) { |
|
| 35 | + } |
|
| 36 | + catch (midcom_error $e) { |
|
| 36 | 37 | $e->log(MIDCOM_LOG_WARN); |
| 37 | 38 | continue; |
| 38 | 39 | } |
@@ -112,7 +112,8 @@ |
||
| 112 | 112 | foreach ($qb->execute() as $article) { |
| 113 | 113 | try { |
| 114 | 114 | $datamanager->set_storage($article); |
| 115 | - } catch (midcom_error $e) { |
|
| 115 | + } |
|
| 116 | + catch (midcom_error $e) { |
|
| 116 | 117 | $e->log(); |
| 117 | 118 | continue; |
| 118 | 119 | } |