|
@@ -95,7 +95,7 @@ discard block |
|
|
block discarded – undo |
|
95
|
95
|
} |
|
96
|
96
|
|
|
97
|
97
|
// TODO: Warehouse management: create new order |
|
98
|
|
- if ( $this->_deliverable->end < $next_cycle_start |
|
|
98
|
+ if ($this->_deliverable->end < $next_cycle_start |
|
99
|
99
|
&& $this->_deliverable->end != 0) { |
|
100
|
100
|
debug_add('Do not register next cycle, the contract ends before'); |
|
101
|
101
|
return $this->_deliverable->end_subscription(); |
|
@@ -328,7 +328,7 @@ discard block |
|
|
block discarded – undo |
|
328
|
328
|
} |
|
329
|
329
|
|
|
330
|
330
|
//If previous cycle was run at the end of the month, the new one should be at the end of the month as well |
|
331
|
|
- if ( $date->format('t') == $date->format('j') |
|
|
331
|
+ if ($date->format('t') == $date->format('j') |
|
332
|
332
|
&& $new_date->format('t') != $new_date->format('j')) { |
|
333
|
333
|
$new_date->setDate((int) $new_date->format('Y'), (int) $new_date->format('m'), (int) $new_date->format('t')); |
|
334
|
334
|
} |
Please login to merge, or discard this patch.