flack / openpsa

lib/org/openpsa/invoices/status.php

Spacing +9 added lines, -16 removed lines

@@ -115,8 +115,7 @@ 
             $cancelation_invoice = new org_openpsa_invoices_invoice_dba($this->invoice->cancelationInvoice);
             $cancelation_invoice_link = $prefix . 'invoice/' . $cancelation_invoice->guid . '/';
             $cancelation_invoice_link = "<a href=\"" . $cancelation_invoice_link . "\">" . $this->l10n->get('invoice') . " " . $cancelation_invoice->get_label() . "</a>";
-            $entries[] = array
-            (
+            $entries[] = array(
                 'timestamp' => $cancelation_invoice->metadata->created,
                 'message' => sprintf($this->l10n->get('invoice got canceled by %s'), $cancelation_invoice_link),
                 'order' => 4
@@ -124,20 +123,18 @@ 
         }
         else if ($this->invoice->paid)
         {
-            $entries[] = array
-            (
+            $entries[] = array(
                 'timestamp' => $this->invoice->paid,
                 'message' => sprintf($this->l10n->get('marked invoice %s paid'), ''),
                 'order' => 3
             );
         }
-        if (   $this->invoice->due
-            && (   (   $this->invoice->due < time()
+        if ($this->invoice->due
+            && (($this->invoice->due < time()
                     && $this->invoice->paid == 0)
                 || $this->invoice->due < $this->invoice->paid))
         {
-            $entries[] = array
-            (
+            $entries[] = array(
                 'timestamp' => $this->invoice->due,
                 'message' => $this->l10n->get('overdue'),
                 'order' => 2
@@ -148,8 +145,7 @@ 
         {
             if ($mail_time = $this->invoice->get_parameter('org.openpsa.invoices', 'sent_by_mail'))
             {
-                $entries[] = array
-                (
+                $entries[] = array(
                     'timestamp' => $mail_time,
                     'message' => sprintf($this->l10n->get('marked invoice %s sent per mail'), ''),
                     'order' => 1
@@ -157,16 +153,14 @@ 
             }
             else
             {
-                $entries[] = array
-                (
+                $entries[] = array(
                     'timestamp' => $this->invoice->sent,
                     'message' => sprintf($this->l10n->get('marked invoice %s sent'), ''),
                     'order' => 1
                 );
             }
         }
-        $entries[] = array
-        (
+        $entries[] = array(
             'timestamp' => $this->invoice->metadata->created,
             'message' => sprintf($this->l10n->get('invoice %s created'), ''),
             'order' => 0
@@ -183,8 +177,7 @@ 
 
         foreach ($rows as $row)
         {
-            $entries[] = array
-            (
+            $entries[] = array(
                 'timestamp' => strtotime((string) $row['created']),
                 'message' => $row['title']
             );

Braces +2 added lines, -4 removed lines

@@ -121,8 +121,7 @@ 
                 'message' => sprintf($this->l10n->get('invoice got canceled by %s'), $cancelation_invoice_link),
                 'order' => 4
             );
-        }
-        else if ($this->invoice->paid)
+        } else if ($this->invoice->paid)
         {
             $entries[] = array
             (
@@ -154,8 +153,7 @@ 
                     'message' => sprintf($this->l10n->get('marked invoice %s sent per mail'), ''),
                     'order' => 1
                 );
-            }
-            else
+            } else
             {
                 $entries[] = array
                 (

lib/org/openpsa/invoices/scheduler.php

Spacing +5 added lines, -6 removed lines

@@ -92,7 +92,7 @@ 
         }
 
         // TODO: Warehouse management: create new order
-        if (   $this->_deliverable->end < $next_cycle_start
+        if ($this->_deliverable->end < $next_cycle_start
             && $this->_deliverable->end != 0)
         {
             debug_add('Do not register next cycle, the contract ends before');
@@ -112,8 +112,7 @@ 
 
     private function _create_at_entry($cycle_number, $start)
     {
-        $args = array
-        (
+        $args = array(
             'deliverable' => $this->_deliverable->guid,
             'cycle'       => $cycle_number,
         );
@@ -344,7 +343,7 @@ 
         {
             //If previous cycle was run at the end of the month, the new one should be at the end of the month as well
             $date = new DateTime(gmdate('Y-m-d', $time), new DateTimeZone('GMT'));
-            if (   $date->format('t') == $date->format('j')
+            if ($date->format('t') == $date->format('j')
                 && $new_date->format('t') != $new_date->format('j'))
             {
                 $new_date->setDate((int) $new_date->format('Y'), (int) $new_date->format('m'), (int) $new_date->format('t'));
@@ -415,11 +414,11 @@ 
                 break;
             case 'q':
                 // Quarterly recurring subscription
-                $identifier = ceil(((int)$date->format('n')) / 4) . 'Q' . $date->format('y');
+                $identifier = ceil(((int) $date->format('n')) / 4) . 'Q' . $date->format('y');
                 break;
             case 'hy':
                 // Half-yearly recurring subscription
-                $identifier = ceil(((int)$date->format('n')) / 6) . '/' . $date->format('Y');
+                $identifier = ceil(((int) $date->format('n')) / 6) . '/' . $date->format('Y');
                 break;
             case 'y':
                 // Yearly recurring subscription

Braces +3 added lines, -6 removed lines

@@ -78,8 +78,7 @@ 
                 if (org_openpsa_projects_workflow::complete($task, sprintf($this->_i18n->get_string('completed by subscription %s', 'org.openpsa.sales'), $cycle_number)))
                 {
                     $tasks_completed[] = $task;
-                }
-                else
+                } else
                 {
                     $tasks_not_completed[] = $task;
                 }
@@ -141,8 +140,7 @@ 
         try
         {
             $owner = midcom_db_person::get_cached($salesproject->owner);
-        }
-        catch (midcom_error $e)
+        } catch (midcom_error $e)
         {
             $e->log();
             return;
@@ -152,8 +150,7 @@ 
         if (is_null($next_run))
         {
             $next_run_label = $l10n->get('no more cycles');
-        }
-        else
+        } else
         {
             $next_run_label = $l10n->get_formatter()->date($next_run);
         }

lib/org/openpsa/invoices/style/show-projects-customer-task.php

Spacing +5 added lines, -5 removed lines

@@ -1,4 +1,4 @@ 
-<tr class="&(data['class']);" id="task_<?php echo $data['task']->id;?>">
+<tr class="&(data['class']);" id="task_<?php echo $data['task']->id; ?>">
     <td>
         <input type="checkbox"<?php echo $data['disabled']; ?> name="org_openpsa_invoices_invoice_tasks[<?php echo $data['task']->id; ?>]" checked="checked" value="1" />
     </td>
@@ -18,12 +18,12 @@ 
         <?php echo $data['reported_hours']; ?>
     </td>
     <td class="numeric">
-        <input id="units_<?php echo $data['task']->id;?>" class="units" type="text"<?php echo $data['disabled']; ?> size="6" name="org_openpsa_invoices_invoice_tasks_units[<?php echo $data['task']->id; ?>]" value="<?php echo $data['invoiceable_units']; ?>" />
+        <input id="units_<?php echo $data['task']->id; ?>" class="units" type="text"<?php echo $data['disabled']; ?> size="6" name="org_openpsa_invoices_invoice_tasks_units[<?php echo $data['task']->id; ?>]" value="<?php echo $data['invoiceable_units']; ?>" />
     </td>
     <td class="numeric">
-        <input id="price_per_unit_<?php echo $data['task']->id;?>" class="price_per_unit" type="text"<?php echo $data['disabled']; ?> size="6" name="org_openpsa_invoices_invoice_tasks_price[<?php echo $data['task']->id; ?>]" value="<?php echo $data['default_price']; ?>" />
+        <input id="price_per_unit_<?php echo $data['task']->id; ?>" class="price_per_unit" type="text"<?php echo $data['disabled']; ?> size="6" name="org_openpsa_invoices_invoice_tasks_price[<?php echo $data['task']->id; ?>]" value="<?php echo $data['default_price']; ?>" />
     </td>
-    <td id="row_sum_<?php echo $data['task']->id;?>" class="numeric">
-        <?php echo $data['invoiceable_units'] * $data['default_price'];?>
+    <td id="row_sum_<?php echo $data['task']->id; ?>" class="numeric">
+        <?php echo $data['invoiceable_units'] * $data['default_price']; ?>
     </td>
 </tr>
\ No newline at end of file

Braces +1 added lines, -2 removed lines

@@ -7,8 +7,7 @@
         if ($data['projects_url'])
         {
             echo "<a href=\"{$data['projects_url']}task/{$data['task']->guid}/\">" . $data['task']->get_label() . "</a>\n";
-        }
-        else
+        } else
         {
             echo $data['task']->get_label();
         }

lib/org/openpsa/invoices/style/admin-read.php

Indentation +6 added lines, -6 removed lines

@@ -243,13 +243,13 @@
       datatype: "local",
       data: &(grid_id);_entries,
       colNames: ['id', <?php
-                 echo '"index_date", "' .  midcom::get()->i18n->get_string('date', 'org.openpsa.projects') . '",';
+                    echo '"index_date", "' .  midcom::get()->i18n->get_string('date', 'org.openpsa.projects') . '",';
 
-                 echo '"index_reporter", "' .  midcom::get()->i18n->get_string('reporter', 'org.openpsa.projects') . '",';
-                 echo '"' . midcom::get()->i18n->get_string('hours', 'org.openpsa.projects') . '",';
-                 echo '"' . midcom::get()->i18n->get_string('description', 'org.openpsa.projects') . '",';
-                 echo '"' . midcom::get()->i18n->get_string('approved', 'org.openpsa.projects') . '",';
-                 echo '"' . midcom::get()->i18n->get_string('task', 'org.openpsa.projects') . '"';
+                    echo '"index_reporter", "' .  midcom::get()->i18n->get_string('reporter', 'org.openpsa.projects') . '",';
+                    echo '"' . midcom::get()->i18n->get_string('hours', 'org.openpsa.projects') . '",';
+                    echo '"' . midcom::get()->i18n->get_string('description', 'org.openpsa.projects') . '",';
+                    echo '"' . midcom::get()->i18n->get_string('approved', 'org.openpsa.projects') . '",';
+                    echo '"' . midcom::get()->i18n->get_string('task', 'org.openpsa.projects') . '"';
                 ?>],
       colModel:[
           {name:'id', index:'id', hidden:true, key:true},

Spacing +6 added lines, -6 removed lines

@@ -72,7 +72,7 @@ 
     }
     ?>
 
-    <div class="field"><div class="title"><?php echo $data['l10n_midcom']->get('description');?>: </div>
+    <div class="field"><div class="title"><?php echo $data['l10n_midcom']->get('description'); ?>: </div>
     <div class="description value">&(view['description']:h);</div></div>
 
     <?php
@@ -90,7 +90,7 @@ 
     if ($cancelation_invoice_link)
     {
         echo "<div class=\"field\">";
-        echo "<div class=\"title\">" . $data['l10n']->get('canceled by') .":</div>";
+        echo "<div class=\"title\">" . $data['l10n']->get('canceled by') . ":</div>";
         echo "<div class=\"value\">" . $cancelation_invoice_link . "</a></div>";
         echo "</div>";
     }
@@ -101,7 +101,7 @@ 
         $canceled_invoice_link = $prefix . 'invoice/' . $canceled_invoice->guid . '/';
 
         echo "<div class=\"field\">";
-        echo "<div class=\"title\">" . $data['l10n']->get('cancelation invoice for') .":</div>";
+        echo "<div class=\"title\">" . $data['l10n']->get('cancelation invoice for') . ":</div>";
         echo "<div class=\"value\"><a href=\"" . $canceled_invoice_link . "\">" . $data['l10n']->get('invoice') . " " . $canceled_invoice->get_label() . "</a></div>";
         echo "</div>";
     }
@@ -212,7 +212,7 @@ 
             $approved_text = $data['l10n']->get('not approved');
             $approved_img_src .= 'page-notapproved.png';
         }
-        $approved_img =  "<img src='{$approved_img_src}' alt='{$approved_text}' title='{$approved_text}' />";
+        $approved_img = "<img src='{$approved_img_src}' alt='{$approved_text}' title='{$approved_text}' />";
 
         $row['id'] = $report->id;
         $row['index_date'] = $report->date;
@@ -243,9 +243,9 @@ 
       datatype: "local",
       data: &(grid_id);_entries,
       colNames: ['id', <?php
-                 echo '"index_date", "' .  midcom::get()->i18n->get_string('date', 'org.openpsa.projects') . '",';
+                 echo '"index_date", "' . midcom::get()->i18n->get_string('date', 'org.openpsa.projects') . '",';
 
-                 echo '"index_reporter", "' .  midcom::get()->i18n->get_string('reporter', 'org.openpsa.projects') . '",';
+                 echo '"index_reporter", "' . midcom::get()->i18n->get_string('reporter', 'org.openpsa.projects') . '",';
                  echo '"' . midcom::get()->i18n->get_string('hours', 'org.openpsa.projects') . '",';
                  echo '"' . midcom::get()->i18n->get_string('description', 'org.openpsa.projects') . '",';
                  echo '"' . midcom::get()->i18n->get_string('approved', 'org.openpsa.projects') . '",';

Braces +3 added lines, -6 removed lines

@@ -6,8 +6,7 @@ 
 try
 {
     $customer = org_openpsa_contacts_group_dba::get_cached($invoice->customer);
-}
-catch (midcom_error $e)
+} catch (midcom_error $e)
 {
     $customer = false;
 }
@@ -193,8 +192,7 @@ 
         {
             $task = org_openpsa_projects_task_dba::get_cached($report->task);
             $reporter = org_openpsa_contacts_person_dba::get_cached($report->person);
-        }
-        catch (midcom_error $e)
+        } catch (midcom_error $e)
         {
             continue;
         }
@@ -206,8 +204,7 @@ 
         {
             $approved_text = $data['l10n']->get('approved');
             $approved_img_src .= 'page-approved.png';
-        }
-        else
+        } else
         {
             $approved_text = $data['l10n']->get('not approved');
             $approved_img_src .= 'page-notapproved.png';

lib/org/openpsa/invoices/style/show-grid.php

Spacing +1 added lines, -2 removed lines

@@ -16,8 +16,7 @@
     $classes .= ' normal';
 }
 
-$footer_data = array
-(
+$footer_data = array(
     'customer' => $data['l10n']->get('totals'),
     'sum' => $formatter->number($grid->get_provider()->get_column_total('index_sum'))
 );

Braces +3 added lines, -6 removed lines

@@ -6,12 +6,10 @@ 
 if ($data['list_type'] == 'overdue')
 {
     $classes .= ' bad';
-}
-else if ($data['list_type'] == 'paid')
+} else if ($data['list_type'] == 'paid')
 {
     $classes .= ' good';
-}
-else if ($data['list_type'] == 'open')
+} else if ($data['list_type'] == 'open')
 {
     $classes .= ' normal';
 }
@@ -51,8 +49,7 @@ 
 if ($data['list_type'] != 'paid')
 {
     $grid->set_column('action', $data['l10n']->get('next action'), 'width: 80, align: "center", title: false, sortable: false');
-}
-else
+} else
 {
     $grid->set_column('paid', $data['l10n']->get('paid date'), 'width: 80, align: "right", formatter: "date"');
 }

lib/org/openpsa/invoices/style/show-grid-ajax.php

Spacing +1 added lines, -2 removed lines

@@ -64,8 +64,7 @@
     $grid->set_column('paid', $data['l10n']->get('paid date'), 'width: 80, align: "right", formatter: "date"');
 }
 
-$footer_data = array
-(
+$footer_data = array(
     'customer' => $data['l10n']->get('totals')
 );
 

Braces +2 added lines, -4 removed lines

@@ -7,8 +7,7 @@ 
 if ($data['list_type'] == 'overdue')
 {
     $classes .= ' bad';
-}
-else if ($data['list_type'] == 'paid')
+} else if ($data['list_type'] == 'paid')
 {
     $classes .= ' good';
 }
@@ -58,8 +57,7 @@ 
 if ($data['list_type'] != 'paid')
 {
     $grid->set_column('action', $data['l10n']->get('next action'), 'width: 80, align: "center"');
-}
-else
+} else
 {
     $grid->set_column('paid', $data['l10n']->get('paid date'), 'width: 80, align: "right", formatter: "date"');
 }

lib/org/openpsa/invoices/style/show-scheduled.php

Spacing +2 added lines, -4 removed lines

@@ -1,16 +1,14 @@
 <?php
 $i18n = midcom::get()->i18n;
 $grid = $data['grid'];
-$footer_data = array
-(
+$footer_data = array(
     'customer' => $data['l10n']->get('totals'),
     'sum' => $grid->get_provider()->get_column_total('sum')
 );
 
 $grid->set_option('loadonce', true)
 ->set_option('grouping', true)
-->set_option('groupingView', array
-(
+->set_option('groupingView', array(
     'groupField' => array('month'),
     'groupColumnShow' => array(false),
     'groupText' => array('<strong>{0}</strong> ({1})'),

lib/org/openpsa/invoices/calculator.php

Braces +1 added lines, -2 removed lines

@@ -63,8 +63,7 @@
             if ($item->id)
             {
                 $stat = $item->update();
-            }
-            else
+            } else
             {
                 $stat = $item->create();
             }

lib/org/openpsa/invoices/handler/projects.php

Braces +5 added lines, -10 removed lines

@@ -55,8 +55,7 @@ 
             {
                 $deliverable = org_openpsa_sales_salesproject_deliverable_dba::get_cached($task->agreement);
                 $item->deliverable = $deliverable->id;
-            }
-            catch (midcom_error $e)
+            } catch (midcom_error $e)
             {
                 $e->log();
             }
@@ -155,8 +154,7 @@ 
                 $customer = org_openpsa_contacts_group_dba::get_cached($customer_id);
                 $data['customer_label'] = $customer->official;
                 $data['disabled'] = '';
-            }
-            catch (midcom_error $e)
+            } catch (midcom_error $e)
             {
                 $data['customer_label'] = $this->_l10n->get('no customer');
                 $data['disabled'] = ' disabled="disabled"';
@@ -180,21 +178,18 @@ 
                     if ($deliverable->invoiceByActualUnits)
                     {
                         $data['invoiceable_units'] = $task->invoiceableHours;
-                    }
-                    else
+                    } else
                     {
                         $data['invoiceable_units'] = $task->plannedHours;
                     }
-                }
-                catch (midcom_error $e)
+                } catch (midcom_error $e)
                 {
                     $e->log();
                     if ($this->_config->get('default_hourly_price'))
                     {
                         $data['default_price'] = $this->_config->get('default_hourly_price');
                         $data['invoiceable_units'] = $task->invoiceableHours;
-                    }
-                    else
+                    } else
                     {
                         $data['default_price'] = '';
                     }