diff --git a/module/program/css/prjedit.css b/module/program/css/prjedit.css index e7c1b33177..e0863151b9 100644 --- a/module/program/css/prjedit.css +++ b/module/program/css/prjedit.css @@ -1 +1,2 @@ #budget {border-right:0px;} +#budgetUnit {border-left: 0px;} diff --git a/module/program/model.php b/module/program/model.php index 4b63355fd5..e449da8e4d 100644 --- a/module/program/model.php +++ b/module/program/model.php @@ -156,7 +156,7 @@ class programModel extends model ->setDefault('openedDate', helper::now()) ->setIF($this->post->acl == 'open', 'whitelist', '') ->setIF($this->post->delta == 999, 'end', LONG_TIME) - ->setIF($this->post->budget != 0, 'budget', number_format((float)$this->post->budget, 2)) + ->setIF($this->post->budget != 0, 'budget', round($this->post->budget, 2)) ->add('type', 'program') ->join('whitelist', ',') ->stripTags($this->config->program->editor->pgmcreate['id'], $this->config->allowedTags) @@ -268,7 +268,7 @@ class programModel extends model ->setIF($this->post->acl == 'open', 'whitelist', '') ->setIF($this->post->delta == 999, 'end', LONG_TIME) ->setIF($this->post->future, 'budget', 0) - ->setIF($this->post->budget != 0, 'budget', number_format((float)$this->post->budget, 2)) + ->setIF($this->post->budget != 0, 'budget', round($this->post->budget, 2)) ->join('whitelist', ',') ->stripTags($this->config->program->editor->pgmedit['id'], $this->config->allowedTags) ->remove('uid,delta,future') @@ -1309,7 +1309,7 @@ class programModel extends model ->setIF($this->post->delta == 999, 'end', LONG_TIME) ->setIF($this->post->delta == 999, 'days', 0) ->setIF($this->post->acl == 'open', 'whitelist', '') - ->setIF($this->post->budget != 0, 'budget', number_format((float)$this->post->budget, 2)) + ->setIF($this->post->budget != 0, 'budget', round($this->post->budget, 2)) ->setDefault('openedBy', $this->app->user->account) ->setDefault('openedDate', helper::now()) ->setDefault('team', substr($this->post->name, 0, 30)) @@ -1507,7 +1507,7 @@ class programModel extends model ->setIF($this->post->end == '0000-00-00', 'end', '') ->setIF($this->post->acl == 'open', 'whitelist', '') ->setIF($this->post->future, 'budget', 0) - ->setIF($this->post->budget != 0, 'budget', number_format((float)$this->post->budget, 2)) + ->setIF($this->post->budget != 0, 'budget', round($this->post->budget, 2)) ->join('whitelist', ',') ->stripTags($this->config->program->editor->prjedit['id'], $this->config->allowedTags) ->remove('products,branch,plans,delta,future') diff --git a/module/program/view/pgmcreate.html.php b/module/program/view/pgmcreate.html.php index 05db7b4c24..f44eea15aa 100644 --- a/module/program/view/pgmcreate.html.php +++ b/module/program/view/pgmcreate.html.php @@ -61,7 +61,7 @@