Release 2.33.0 (#5438)
This commit is contained in:
@@ -49,43 +49,37 @@ class ShortInvoiceCalculatorTest extends AbstractCalculatorTestCase
|
||||
$activity->setProject($project);
|
||||
|
||||
$timesheet = new Timesheet();
|
||||
$timesheet
|
||||
->setDuration(3600)
|
||||
->setRate(293.27)
|
||||
->setHourlyRate(293.27)
|
||||
->setUser(new User())
|
||||
->setActivity($activity)
|
||||
->setProject($project)
|
||||
->setBegin(new \DateTime('2018-11-29'))
|
||||
->setEnd(new \DateTime())
|
||||
->addTag((new Tag())->setName('foo'))
|
||||
->addTag((new Tag())->setName('bar'))
|
||||
;
|
||||
$timesheet->setDuration(3600);
|
||||
$timesheet->setRate(293.27);
|
||||
$timesheet->setHourlyRate(293.27);
|
||||
$timesheet->setUser(new User());
|
||||
$timesheet->setActivity($activity);
|
||||
$timesheet->setProject($project);
|
||||
$timesheet->setBegin(new \DateTime('2018-11-29'));
|
||||
$timesheet->setEnd(new \DateTime());
|
||||
$timesheet->addTag((new Tag())->setName('foo'));
|
||||
$timesheet->addTag((new Tag())->setName('bar'));
|
||||
|
||||
$timesheet2 = new Timesheet();
|
||||
$timesheet2
|
||||
->setDuration(400)
|
||||
->setRate(32.59)
|
||||
->setHourlyRate(293.27)
|
||||
->setUser(new User())
|
||||
->setActivity($activity)
|
||||
->setProject($project)
|
||||
->setBegin(new \DateTime('2018-11-28'))
|
||||
->setEnd(new \DateTime())
|
||||
->addTag((new Tag())->setName('bar1'))
|
||||
;
|
||||
$timesheet2->setDuration(400);
|
||||
$timesheet2->setRate(32.59);
|
||||
$timesheet2->setHourlyRate(293.27);
|
||||
$timesheet2->setUser(new User());
|
||||
$timesheet2->setActivity($activity);
|
||||
$timesheet2->setProject($project);
|
||||
$timesheet2->setBegin(new \DateTime('2018-11-28'));
|
||||
$timesheet2->setEnd(new \DateTime());
|
||||
$timesheet2->addTag((new Tag())->setName('bar1'));
|
||||
|
||||
$timesheet3 = new Timesheet();
|
||||
$timesheet3
|
||||
->setDuration(1800)
|
||||
->setRate(146.64)
|
||||
->setHourlyRate(293.27)
|
||||
->setUser(new User())
|
||||
->setActivity($activity)
|
||||
->setProject($project)
|
||||
->setBegin(new \DateTime('2018-11-29'))
|
||||
->setEnd(new \DateTime())
|
||||
;
|
||||
$timesheet3->setDuration(1800);
|
||||
$timesheet3->setRate(146.64);
|
||||
$timesheet3->setHourlyRate(293.27);
|
||||
$timesheet3->setUser(new User());
|
||||
$timesheet3->setActivity($activity);
|
||||
$timesheet3->setProject($project);
|
||||
$timesheet3->setBegin(new \DateTime('2018-11-29'));
|
||||
$timesheet3->setEnd(new \DateTime());
|
||||
|
||||
$entries = [$timesheet, $timesheet2, $timesheet3];
|
||||
|
||||
@@ -134,40 +128,34 @@ class ShortInvoiceCalculatorTest extends AbstractCalculatorTestCase
|
||||
$activity->setProject($project);
|
||||
|
||||
$timesheet = new Timesheet();
|
||||
$timesheet
|
||||
->setDuration(3600)
|
||||
->setRate(293.27)
|
||||
->setHourlyRate(293.27)
|
||||
->setUser(new User())
|
||||
->setActivity($activity)
|
||||
->setProject($project)
|
||||
->setBegin(new \DateTime())
|
||||
->setEnd(new \DateTime())
|
||||
;
|
||||
$timesheet->setDuration(3600);
|
||||
$timesheet->setRate(293.27);
|
||||
$timesheet->setHourlyRate(293.27);
|
||||
$timesheet->setUser(new User());
|
||||
$timesheet->setActivity($activity);
|
||||
$timesheet->setProject($project);
|
||||
$timesheet->setBegin(new \DateTime());
|
||||
$timesheet->setEnd(new \DateTime());
|
||||
|
||||
$timesheet2 = new Timesheet();
|
||||
$timesheet2
|
||||
->setDuration(400)
|
||||
->setRate(84)
|
||||
->setHourlyRate(756.00)
|
||||
->setUser(new User())
|
||||
->setActivity($activity)
|
||||
->setProject($project)
|
||||
->setBegin(new \DateTime())
|
||||
->setEnd(new \DateTime())
|
||||
;
|
||||
$timesheet2->setDuration(400);
|
||||
$timesheet2->setRate(84);
|
||||
$timesheet2->setHourlyRate(756.00);
|
||||
$timesheet2->setUser(new User());
|
||||
$timesheet2->setActivity($activity);
|
||||
$timesheet2->setProject($project);
|
||||
$timesheet2->setBegin(new \DateTime());
|
||||
$timesheet2->setEnd(new \DateTime());
|
||||
|
||||
$timesheet3 = new Timesheet();
|
||||
$timesheet3
|
||||
->setDuration(1800)
|
||||
->setRate(111.11)
|
||||
->setHourlyRate(222.22)
|
||||
->setUser(new User())
|
||||
->setActivity($activity)
|
||||
->setProject($project)
|
||||
->setBegin(new \DateTime())
|
||||
->setEnd(new \DateTime())
|
||||
;
|
||||
$timesheet3->setDuration(1800);
|
||||
$timesheet3->setRate(111.11);
|
||||
$timesheet3->setHourlyRate(222.22);
|
||||
$timesheet3->setUser(new User());
|
||||
$timesheet3->setActivity($activity);
|
||||
$timesheet3->setProject($project);
|
||||
$timesheet3->setBegin(new \DateTime());
|
||||
$timesheet3->setEnd(new \DateTime());
|
||||
|
||||
$entries = [$timesheet, $timesheet2, $timesheet3];
|
||||
|
||||
@@ -212,38 +200,32 @@ class ShortInvoiceCalculatorTest extends AbstractCalculatorTestCase
|
||||
$activity->setProject($project);
|
||||
|
||||
$timesheet = new Timesheet();
|
||||
$timesheet
|
||||
->setDuration(3600)
|
||||
->setRate(293.27)
|
||||
->setUser(new User())
|
||||
->setActivity($activity)
|
||||
->setProject($project)
|
||||
->setBegin(new \DateTime())
|
||||
->setEnd(new \DateTime())
|
||||
;
|
||||
$timesheet->setDuration(3600);
|
||||
$timesheet->setRate(293.27);
|
||||
$timesheet->setUser(new User());
|
||||
$timesheet->setActivity($activity);
|
||||
$timesheet->setProject($project);
|
||||
$timesheet->setBegin(new \DateTime());
|
||||
$timesheet->setEnd(new \DateTime());
|
||||
|
||||
$timesheet2 = new Timesheet();
|
||||
$timesheet2
|
||||
->setDuration(400)
|
||||
->setFixedRate(84)
|
||||
->setRate(84)
|
||||
->setUser(new User())
|
||||
->setActivity($activity)
|
||||
->setProject($project)
|
||||
->setBegin(new \DateTime())
|
||||
->setEnd(new \DateTime())
|
||||
;
|
||||
$timesheet2->setDuration(400);
|
||||
$timesheet2->setFixedRate(84);
|
||||
$timesheet2->setRate(84);
|
||||
$timesheet2->setUser(new User());
|
||||
$timesheet2->setActivity($activity);
|
||||
$timesheet2->setProject($project);
|
||||
$timesheet2->setBegin(new \DateTime());
|
||||
$timesheet2->setEnd(new \DateTime());
|
||||
|
||||
$timesheet3 = new Timesheet();
|
||||
$timesheet3
|
||||
->setDuration(1800)
|
||||
->setRate(111.11)
|
||||
->setUser(new User())
|
||||
->setActivity($activity)
|
||||
->setProject($project)
|
||||
->setBegin(new \DateTime())
|
||||
->setEnd(new \DateTime())
|
||||
;
|
||||
$timesheet3->setDuration(1800);
|
||||
$timesheet3->setRate(111.11);
|
||||
$timesheet3->setUser(new User());
|
||||
$timesheet3->setActivity($activity);
|
||||
$timesheet3->setProject($project);
|
||||
$timesheet3->setBegin(new \DateTime());
|
||||
$timesheet3->setEnd(new \DateTime());
|
||||
|
||||
$entries = [$timesheet, $timesheet2, $timesheet3];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user