@@ -19,11 +19,11 @@ discard block |
||
| 19 | 19 | |
| 20 | 20 | <table cellspacing="0" cellpadding="3" border="0"> |
| 21 | 21 | <tr> |
| 22 | - <td><?php echo $data['l10n']->get('query');?>:</td> |
|
| 22 | + <td><?php echo $data['l10n']->get('query'); ?>:</td> |
|
| 23 | 23 | <td><input type='text' style="width: 20em;" name='query' value=&(query:h); /></td> |
| 24 | 24 | </tr> |
| 25 | 25 | <tr> |
| 26 | - <td><?php echo $data['l10n']->get('limit search by topic tree');?>:</td> |
|
| 26 | + <td><?php echo $data['l10n']->get('limit search by topic tree'); ?>:</td> |
|
| 27 | 27 | <td> |
| 28 | 28 | <select name="topic" size="1" style="width: 20em;"> |
| 29 | 29 | <?php |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | </td> |
| 39 | 39 | </tr> |
| 40 | 40 | <tr> |
| 41 | - <td><?php echo $data['l10n']->get('limit search by content type');?>:</td> |
|
| 41 | + <td><?php echo $data['l10n']->get('limit search by content type'); ?>:</td> |
|
| 42 | 42 | <td> |
| 43 | 43 | <select name="component" size="1" style="width: 20em;"> |
| 44 | 44 | <?php |
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | </td> |
| 54 | 54 | </tr> |
| 55 | 55 | <tr> |
| 56 | - <td><?php echo $data['l10n']->get('limit search by last modified');?>:</td> |
|
| 56 | + <td><?php echo $data['l10n']->get('limit search by last modified'); ?>:</td> |
|
| 57 | 57 | <td> |
| 58 | 58 | <select name="lastmodified" size="1" style="width: 20em;"> |
| 59 | 59 | <?php |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | </td> |
| 69 | 69 | </tr> |
| 70 | 70 | <tr> |
| 71 | - <td colspan="2"><input type='submit' name='submit' value='<?php echo $data['l10n']->get('search');?>' /></td> |
|
| 71 | + <td colspan="2"><input type='submit' name='submit' value='<?php echo $data['l10n']->get('search'); ?>' /></td> |
|
| 72 | 72 | </tr> |
| 73 | 73 | </table> |
| 74 | 74 | </form> |
@@ -4,7 +4,8 @@ |
||
| 4 | 4 | |
| 5 | 5 | try { |
| 6 | 6 | $topic = midcom_db_topic::get_cached($document->topic_guid); |
| 7 | -} catch (midcom_error $e) { |
|
| 7 | +} |
|
| 8 | +catch (midcom_error $e) { |
|
| 8 | 9 | $e->log(); |
| 9 | 10 | } |
| 10 | 11 | ?> |
@@ -1,16 +1,16 @@ |
||
| 1 | -<h1><?php echo $data['topic']->extra;?></h1> |
|
| 1 | +<h1><?php echo $data['topic']->extra; ?></h1> |
|
| 2 | 2 | |
| 3 | 3 | <div class="midcom_helper_search_form"> |
| 4 | 4 | <?php midcom_show_style("{$data['type']}_form"); ?> |
| 5 | 5 | </div> |
| 6 | 6 | |
| 7 | -<h2><?php echo $data['l10n']->get('search results');?>:</h2> |
|
| 7 | +<h2><?php echo $data['l10n']->get('search results'); ?>:</h2> |
|
| 8 | 8 | |
| 9 | 9 | <div class="midcom_helper_search_results"> |
| 10 | 10 | <p><?php echo $data['l10n']->get('your query returned no results'); ?></p> |
| 11 | 11 | </div> |
| 12 | 12 | |
| 13 | -<h2><?php echo $data['l10n']->get('search hints');?>:</h2> |
|
| 13 | +<h2><?php echo $data['l10n']->get('search hints'); ?>:</h2> |
|
| 14 | 14 | <p><?php |
| 15 | 15 | $string = 'search hints ' . $data['config']->get('search_help_message'); |
| 16 | 16 | echo $data['l10n']->get($string); |
@@ -1,8 +1,8 @@ |
||
| 1 | -<h1><?php echo $data['topic']->extra;?></h1> |
|
| 1 | +<h1><?php echo $data['topic']->extra; ?></h1> |
|
| 2 | 2 | |
| 3 | 3 | <?php midcom_show_style("{$data['type']}_form"); ?> |
| 4 | 4 | |
| 5 | -<h2><?php echo $data['l10n']->get('search hints');?>:</h2> |
|
| 5 | +<h2><?php echo $data['l10n']->get('search hints'); ?>:</h2> |
|
| 6 | 6 | <p><?php |
| 7 | 7 | $string = 'search hints ' . $data['config']->get('search_help_message'); |
| 8 | 8 | echo $data['l10n']->get($string); |
@@ -1,10 +1,10 @@ discard block |
||
| 1 | -<h1><?php echo $data['topic']->extra;?></h1> |
|
| 1 | +<h1><?php echo $data['topic']->extra; ?></h1> |
|
| 2 | 2 | |
| 3 | 3 | <div class="midcom_helper_search_form"> |
| 4 | 4 | <?php midcom_show_style("{$data['type']}_form"); ?> |
| 5 | 5 | </div> |
| 6 | 6 | |
| 7 | -<h2><?php echo $data['l10n']->get('search results');?>:</h2> |
|
| 7 | +<h2><?php echo $data['l10n']->get('search results'); ?>:</h2> |
|
| 8 | 8 | <?php |
| 9 | 9 | midcom_show_style('result_summary'); |
| 10 | 10 | midcom_show_style('result_nav'); |
@@ -19,7 +19,7 @@ discard block |
||
| 19 | 19 | midcom_show_style('result_nav'); |
| 20 | 20 | ?> |
| 21 | 21 | |
| 22 | -<h2><?php echo $data['l10n']->get('search hints');?>:</h2> |
|
| 22 | +<h2><?php echo $data['l10n']->get('search hints'); ?>:</h2> |
|
| 23 | 23 | <p><?php |
| 24 | 24 | $string = 'search hints ' . $data['config']->get('search_help_message'); |
| 25 | 25 | echo $data['l10n']->get($string); |
@@ -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 | } |