@@ -45,7 +45,8 @@ |
||
| 45 | 45 | } |
| 46 | 46 | try { |
| 47 | 47 | $this->_request_data['product'] = org_openpsa_products_product_dba::get_cached($this->_deliverable->product); |
| 48 | - } catch (midcom_error) { |
|
| 48 | + } |
|
| 49 | + catch (midcom_error) { |
|
| 49 | 50 | $this->_request_data['product'] = false; |
| 50 | 51 | } |
| 51 | 52 | } |
@@ -141,7 +141,8 @@ |
||
| 141 | 141 | debug_add('person #' . $person->id . 'has no email address, aborting'); |
| 142 | 142 | return null; |
| 143 | 143 | } |
| 144 | - } catch (midcom_error) { |
|
| 144 | + } |
|
| 145 | + catch (midcom_error) { |
|
| 145 | 146 | return null; |
| 146 | 147 | } |
| 147 | 148 | |
@@ -43,7 +43,8 @@ |
||
| 43 | 43 | } |
| 44 | 44 | try { |
| 45 | 45 | $resource = org_openpsa_calendar_resource_dba::get_cached($this->resource); |
| 46 | - } catch (midcom_error) { |
|
| 46 | + } |
|
| 47 | + catch (midcom_error) { |
|
| 47 | 48 | debug_add("Cannot fetch resource #{$this->resource} returning false", MIDCOM_LOG_INFO); |
| 48 | 49 | return false; |
| 49 | 50 | } |
@@ -142,7 +142,8 @@ discard block |
||
| 142 | 142 | try { |
| 143 | 143 | $event = new org_openpsa_calendar_event_dba($member->event); |
| 144 | 144 | $set_as_modified = true; |
| 145 | - } catch (midcom_error) { |
|
| 145 | + } |
|
| 146 | + catch (midcom_error) { |
|
| 146 | 147 | debug_add("event_resource #{$member->id} links to bogus event #{$member->event}, skipping and removing", MIDCOM_LOG_WARN); |
| 147 | 148 | $member->delete(); |
| 148 | 149 | return; |
@@ -170,7 +171,8 @@ discard block |
||
| 170 | 171 | |
| 171 | 172 | try { |
| 172 | 173 | $event = new org_openpsa_calendar_event_dba($member->eid); |
| 173 | - } catch (midcom_error) { |
|
| 174 | + } |
|
| 175 | + catch (midcom_error) { |
|
| 174 | 176 | debug_add("eventmember #{$member->id} links to bogus event #{$member->eid}, skipping and removing", MIDCOM_LOG_WARN); |
| 175 | 177 | $member->delete(); |
| 176 | 178 | return; |
@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | |
| 26 | 26 | public function _on_creating() : bool |
| 27 | 27 | { |
| 28 | - if ( $this->invoice |
|
| 28 | + if ($this->invoice |
|
| 29 | 29 | && $this->position == 0) { |
| 30 | 30 | $invoice = org_openpsa_invoices_invoice_dba::get_cached($this->invoice); |
| 31 | 31 | $this->position = count($invoice->get_invoice_items()) + 1; |
@@ -75,7 +75,7 @@ discard block |
||
| 75 | 75 | } catch (midcom_error) { |
| 76 | 76 | } |
| 77 | 77 | } |
| 78 | - if ( $url == '' |
|
| 78 | + if ($url == '' |
|
| 79 | 79 | && $sales_url) { |
| 80 | 80 | try { |
| 81 | 81 | $deliverable = org_openpsa_sales_salesproject_deliverable_dba::get_cached($this->deliverable); |
@@ -97,7 +97,7 @@ discard block |
||
| 97 | 97 | $invoice = new org_openpsa_invoices_invoice_dba($this->invoice); |
| 98 | 98 | $old_sum = $invoice->sum; |
| 99 | 99 | self::update_invoice($invoice); |
| 100 | - if ( $old_sum != $invoice->sum |
|
| 100 | + if ($old_sum != $invoice->sum |
|
| 101 | 101 | && !empty($this->deliverable)) { |
| 102 | 102 | $deliverable = new org_openpsa_sales_salesproject_deliverable_dba($this->deliverable); |
| 103 | 103 | self::update_deliverable($deliverable); |
@@ -135,7 +135,7 @@ discard block |
||
| 135 | 135 | |
| 136 | 136 | if ($invoiced != $deliverable->invoiced) { |
| 137 | 137 | $deliverable->invoiced = $invoiced; |
| 138 | - if ( $deliverable->orgOpenpsaObtype !== org_openpsa_products_product_dba::DELIVERY_SUBSCRIPTION |
|
| 138 | + if ($deliverable->orgOpenpsaObtype !== org_openpsa_products_product_dba::DELIVERY_SUBSCRIPTION |
|
| 139 | 139 | && $deliverable->state < org_openpsa_sales_salesproject_deliverable_dba::STATE_INVOICED) { |
| 140 | 140 | $deliverable->state = org_openpsa_sales_salesproject_deliverable_dba::STATE_INVOICED; |
| 141 | 141 | } |
@@ -72,7 +72,8 @@ discard block |
||
| 72 | 72 | try { |
| 73 | 73 | $task = org_openpsa_projects_task_dba::get_cached($this->task); |
| 74 | 74 | $url = $projects_url . 'task/' . $task->guid . '/'; |
| 75 | - } catch (midcom_error) { |
|
| 75 | + } |
|
| 76 | + catch (midcom_error) { |
|
| 76 | 77 | } |
| 77 | 78 | } |
| 78 | 79 | if ( $url == '' |
@@ -80,7 +81,8 @@ discard block |
||
| 80 | 81 | try { |
| 81 | 82 | $deliverable = org_openpsa_sales_salesproject_deliverable_dba::get_cached($this->deliverable); |
| 82 | 83 | $url = $sales_url . 'deliverable/' . $deliverable->guid . '/'; |
| 83 | - } catch (midcom_error) { |
|
| 84 | + } |
|
| 85 | + catch (midcom_error) { |
|
| 84 | 86 | } |
| 85 | 87 | } |
| 86 | 88 | if ($url != '') { |
@@ -102,7 +104,8 @@ discard block |
||
| 102 | 104 | $deliverable = new org_openpsa_sales_salesproject_deliverable_dba($this->deliverable); |
| 103 | 105 | self::update_deliverable($deliverable); |
| 104 | 106 | } |
| 105 | - } catch (midcom_error $e) { |
|
| 107 | + } |
|
| 108 | + catch (midcom_error $e) { |
|
| 106 | 109 | $e->log(); |
| 107 | 110 | } |
| 108 | 111 | } |
@@ -8,7 +8,8 @@ |
||
| 8 | 8 | if ($customer->orgOpenpsaObtype < org_openpsa_contacts_group_dba::ORGANIZATION) { |
| 9 | 9 | $customer = false; |
| 10 | 10 | } |
| 11 | -} catch (midcom_error) { |
|
| 11 | +} |
|
| 12 | +catch (midcom_error) { |
|
| 12 | 13 | $customer = false; |
| 13 | 14 | } |
| 14 | 15 | |
@@ -86,7 +86,8 @@ discard block |
||
| 86 | 86 | // if the property useContactAddress is set |
| 87 | 87 | $billing_data[0]->set_address(); |
| 88 | 88 | return $billing_data[0]; |
| 89 | - } catch (midcom_error $e) { |
|
| 89 | + } |
|
| 90 | + catch (midcom_error $e) { |
|
| 90 | 91 | $e->log(); |
| 91 | 92 | return null; |
| 92 | 93 | } |
@@ -131,10 +132,12 @@ discard block |
||
| 131 | 132 | { |
| 132 | 133 | try { |
| 133 | 134 | return new org_openpsa_contacts_person_dba($this->linkGuid); |
| 134 | - } catch (midcom_error) { |
|
| 135 | + } |
|
| 136 | + catch (midcom_error) { |
|
| 135 | 137 | try { |
| 136 | 138 | return new org_openpsa_contacts_group_dba($this->linkGuid); |
| 137 | - } catch (midcom_error $e) { |
|
| 139 | + } |
|
| 140 | + catch (midcom_error $e) { |
|
| 138 | 141 | debug_add("Failed to load contact with GUID: " . $this->linkGuid . " - last error:" . $e->getMessage(), MIDCOM_LOG_ERROR); |
| 139 | 142 | return false; |
| 140 | 143 | } |
@@ -40,7 +40,8 @@ discard block |
||
| 40 | 40 | if ($sales_url) { |
| 41 | 41 | $entry['deliverable'] = '<a href="' . $sales_url . 'deliverable/' . $deliverable->guid . '/">' . $entry['deliverable'] . '</a>'; |
| 42 | 42 | } |
| 43 | - } catch (midcom_error) { |
|
| 43 | + } |
|
| 44 | + catch (midcom_error) { |
|
| 44 | 45 | $entry['deliverable'] = ''; |
| 45 | 46 | } |
| 46 | 47 | try { |
@@ -49,7 +50,8 @@ discard block |
||
| 49 | 50 | if ($projects_url) { |
| 50 | 51 | $entry['task'] = '<a href="' . $projects_url . 'task/' . $task->guid . '/">' . $entry['task'] . '</a>'; |
| 51 | 52 | } |
| 52 | - } catch (midcom_error) { |
|
| 53 | + } |
|
| 54 | + catch (midcom_error) { |
|
| 53 | 55 | $entry['task'] = ''; |
| 54 | 56 | } |
| 55 | 57 | |
@@ -42,7 +42,8 @@ discard block |
||
| 42 | 42 | // We're creating invoice for chosen customer |
| 43 | 43 | try { |
| 44 | 44 | $this->customer = new org_openpsa_contacts_group_dba($company); |
| 45 | - } catch (midcom_error) { |
|
| 45 | + } |
|
| 46 | + catch (midcom_error) { |
|
| 46 | 47 | $contact = new org_openpsa_contacts_person_dba($company); |
| 47 | 48 | $this->contact_id = $contact->id; |
| 48 | 49 | } |
@@ -143,7 +144,8 @@ discard block |
||
| 143 | 144 | if (!empty($this->invoice->customer)) { |
| 144 | 145 | try { |
| 145 | 146 | $this->customer = org_openpsa_contacts_group_dba::get_cached($this->invoice->customer); |
| 146 | - } catch (midcom_error $e) { |
|
| 147 | + } |
|
| 148 | + catch (midcom_error $e) { |
|
| 147 | 149 | $customer_field['hidden'] = true; |
| 148 | 150 | $e->log(); |
| 149 | 151 | } |