[openaria-Commits] r2222 - trunk/obj

0 views
Skip to first unread message

fmi...@adullact.net

unread,
Dec 7, 2017, 9:12:15 AM12/7/17
to openmairi...@googlegroups.com
Author: fmichon
Date: 2017-12-07 15:12:12 +0100 (Thu, 07 Dec 2017)
New Revision: 2222

Modified:
trunk/obj/courrier.class.php
Log:
* ?\195?\137volution : Rendre configurable le format du num?\195?\169ro de l'arr?\195?\170t?\195?\169. Ticket #8949.


Modified: trunk/obj/courrier.class.php
===================================================================
--- trunk/obj/courrier.class.php 2017-12-07 13:34:00 UTC (rev 2221)
+++ trunk/obj/courrier.class.php 2017-12-07 14:12:12 UTC (rev 2222)
@@ -892,10 +892,21 @@
function compute_arrete_number() {
$this->addToLog(__METHOD__ . "(): begin", EXTRA_VERBOSE_MODE);
$year = date("Y");
- $arrete_number = sprintf(
- '%s_%s_ERP',
+ //
+ $arrete_number_template = "[ANNEE]_[CHRONO]_ERP";
+ if ($this->f->getParameter("template__arrete_numero") != "") {
+ $arrete_number_template = $this->f->getParameter("template__arrete_numero");
+ }
+ $arrete_number = $arrete_number_template;
+ $arrete_number = str_replace(
+ "[CHRONO]",
+ str_pad($this->get_next_arrete_number($year), 5, "0", STR_PAD_LEFT),
+ $arrete_number
+ );
+ $arrete_number = str_replace(
+ "[ANNEE]",
$year,
- str_pad($this->get_next_arrete_number($year), 5, "0", STR_PAD_LEFT)
+ $arrete_number
);
$this->addToLog(__METHOD__ . "(): ".$arrete_number, EXTRA_VERBOSE_MODE);
$this->addToLog(__METHOD__ . "(): end", EXTRA_VERBOSE_MODE);

Reply all
Reply to author
Forward
0 new messages