Completed
Pull Request — master (#194)
by
unknown
15:06
created
lib/org/openpsa/sales/midcom/interfaces.php 1 patch
Braces   +6 added lines, -3 removed lines patch added patch discarded remove patch
@@ -134,7 +134,8 @@  discard block
 block discarded – undo
134 134
 
135 135
         try {
136 136
             $deliverable = new org_openpsa_sales_salesproject_deliverable_dba($args['deliverable']);
137
-        } catch (midcom_error $e) {
137
+        }
138
+        catch (midcom_error $e) {
138 139
             $handler->print_error("Deliverable {$args['deliverable']} not found: " . midcom_connection::get_error_string());
139 140
             return false;
140 141
         }
@@ -158,7 +159,8 @@  discard block
 block discarded – undo
158 159
         }
159 160
         try {
160 161
             $deliverable = new org_openpsa_sales_salesproject_deliverable_dba($args['deliverable']);
161
-        } catch (midcom_error $e) {
162
+        }
163
+        catch (midcom_error $e) {
162 164
             $handler->print_error('no deliverable with passed GUID: ' . $args['deliverable'] . ', aborting');
163 165
             return false;
164 166
         }
@@ -166,7 +168,8 @@  discard block
 block discarded – undo
166 168
         //get the owner of the salesproject the deliverable belongs to
167 169
         try {
168 170
             $project = new org_openpsa_sales_salesproject_dba($deliverable->salesproject);
169
-        } catch (midcom_error $e) {
171
+        }
172
+        catch (midcom_error $e) {
170 173
             $handler->print_error('Failed to load salesproject: ' . $e->getMessage());
171 174
             return false;
172 175
         }
Please login to merge, or discard this patch.
lib/org/openpsa/sales/handler/deliverable/view.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -51,7 +51,8 @@
 block discarded – undo
51 51
         }
52 52
         try {
53 53
             $this->_request_data['product'] = org_openpsa_products_product_dba::get_cached($this->_deliverable->product);
54
-        } catch (midcom_error $e) {
54
+        }
55
+        catch (midcom_error $e) {
55 56
             $this->_request_data['product'] = false;
56 57
         }
57 58
     }
Please login to merge, or discard this patch.
lib/org/openpsa/sales/handler/list.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -113,7 +113,8 @@
 block discarded – undo
113 113
         try {
114 114
             $this->_request_data['customer'] = new org_openpsa_contacts_group_dba($guid);
115 115
             $qb->add_constraint('customer', '=', $this->_request_data['customer']->id);
116
-        } catch (midcom_error $e) {
116
+        }
117
+        catch (midcom_error $e) {
117 118
             $this->_request_data['customer'] = new org_openpsa_contacts_person_dba($guid);
118 119
             $qb->add_constraint('customerContact', '=', $this->_request_data['customer']->id);
119 120
         }
Please login to merge, or discard this patch.
lib/org/openpsa/contacts/midcom/interfaces.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -159,7 +159,8 @@
 block discarded – undo
159 159
 
160 160
         try {
161 161
             $object = new $classname($guid);
162
-        } catch (midcom_error $e) {
162
+        }
163
+        catch (midcom_error $e) {
163 164
             $handler->print_error($type . " {$guid} not found, error " . $e->getMessage());
164 165
             return false;
165 166
         }
Please login to merge, or discard this patch.
lib/org/openpsa/contacts/handler/person/view.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -216,7 +216,8 @@
 block discarded – undo
216 216
         foreach ($this->_request_data[$identifier] as $member) {
217 217
             try {
218 218
                 $this->_request_data['group'] = org_openpsa_contacts_group_dba::get_cached($member->gid);
219
-            } catch (midcom_error $e) {
219
+            }
220
+            catch (midcom_error $e) {
220 221
                 $e->log();
221 222
                 continue;
222 223
             }
Please login to merge, or discard this patch.
lib/org/openpsa/contacts/duplicates/check.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -382,7 +382,8 @@
 block discarded – undo
382 382
             try {
383 383
                 $obj1 = $class::get_cached($arr1['guid']);
384 384
                 $obj2 = $class::get_cached($arr2['guid']);
385
-            } catch (midcom_error $e) {
385
+            }
386
+            catch (midcom_error $e) {
386 387
                 $e->log();
387 388
                 continue;
388 389
             }
Please login to merge, or discard this patch.
lib/org/openpsa/reports/handler/invoices/report.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -114,7 +114,8 @@
 block discarded – undo
114 114
                         && $deliverable->end > $this->_request_data['start'])) {
115 115
                     $invoices = array_merge($invoices, $this->_get_invoices_for_subscription($deliverable, $at_entry));
116 116
                 }
117
-            } catch (midcom_error $e) {
117
+            }
118
+            catch (midcom_error $e) {
118 119
             }
119 120
         }
120 121
         $invoices = array_merge($invoices, $this->_get_deliverable_invoices());
Please login to merge, or discard this patch.
lib/org/openpsa/reports/handler/sales/report.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -71,7 +71,8 @@
 block discarded – undo
71 71
             $owner = org_openpsa_contacts_person_dba::get_cached($salesproject->owner);
72 72
             $row['index_owner'] = $owner->name;
73 73
             $row['owner'] = org_openpsa_widgets_contact::get($owner->guid)->show_inline();
74
-        } catch (midcom_error $e) {
74
+        }
75
+        catch (midcom_error $e) {
75 76
             $e->log();
76 77
         }
77 78
         $row['amount'] = $object->pricePerUnit * $object->units;
Please login to merge, or discard this patch.
lib/org/openpsa/helpers/list.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -69,7 +69,8 @@
 block discarded – undo
69 69
         if (empty(self::$_seen[$company_id])) {
70 70
             try {
71 71
                 $company = new org_openpsa_contacts_group_dba($company_id);
72
-            } catch (midcom_error $e) {
72
+            }
73
+            catch (midcom_error $e) {
73 74
                 return;
74 75
             }
75 76
             self::$_seen[$company->id] = true;
Please login to merge, or discard this patch.