diff --git a/include/class.config.php b/include/class.config.php index 6fd4208b64e2f1e9a0f8fbc3aa5d44a8fb161704..eb0ffca76c6382939274120a346daada44147b0c 100644 --- a/include/class.config.php +++ b/include/class.config.php @@ -655,19 +655,21 @@ class OsticketConfig extends Config { return true; //No longer an option...hint: big plans for headers coming!! } - function getDefaultSequence() { - if ($this->get('sequence_id')) - $sequence = Sequence::lookup($this->get('sequence_id')); + function getDefaultTicketSequence() { + if ($this->get('ticket_sequence_id')) + $sequence = Sequence::lookup($this->get('ticket_sequence_id')); if (!$sequence) $sequence = new RandomSequence(); return $sequence; } - function getDefaultNumberFormat() { - return $this->get('number_format'); + + function getDefaultTicketNumberFormat() { + return $this->get('ticket_number_format'); } + function getNewTicketNumber() { - $s = $this->getDefaultSequence(); - return $s->next($this->getDefaultNumberFormat(), + $s = $this->getDefaultTicketSequence(); + return $s->next($this->getDefaultTicketNumberFormat(), array('Ticket', 'isTicketNumberUnique')); } diff --git a/include/i18n/en_US/config.yaml b/include/i18n/en_US/config.yaml index b29df10ace86324407ba25ab5605ed7d569cdf04..113cda50d9618564e15d44b60a3602bd4d7d9cd5 100644 --- a/include/i18n/en_US/config.yaml +++ b/include/i18n/en_US/config.yaml @@ -74,8 +74,10 @@ core: hide_staff_name: 0 overlimit_notice_active: 0 email_attachments: 1 - number_format: '######' - sequence_id: 0 + ticket_number_format: '######' + ticket_sequence_id: 0 + task_number_format: '#' + task_sequence_id: 2 log_level: 2 log_graceperiod: 12 client_registration: 'public'