';
$morehtmlref .= $langs->trans("TechnicalID").': '.$object->id;
From f52af233963c6438d1179e791fd7e0efa90eaf14 Mon Sep 17 00:00:00 2001
From: Florian Mortgat
Date: Wed, 1 Apr 2020 17:09:01 +0200
Subject: [PATCH 036/336] NEW: "author" column in the client/supplier invoice
lists
---
htdocs/compta/facture/list.php | 31 ++++++++++++++++++++++++++++++-
htdocs/fourn/facture/list.php | 31 ++++++++++++++++++++++++++++++-
2 files changed, 60 insertions(+), 2 deletions(-)
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index cecbacdc209..93d47ae584f 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -87,6 +87,7 @@ $search_montant_vat = GETPOST('search_montant_vat', 'alpha');
$search_montant_localtax1 = GETPOST('search_montant_localtax1', 'alpha');
$search_montant_localtax2 = GETPOST('search_montant_localtax2', 'alpha');
$search_montant_ttc = GETPOST('search_montant_ttc', 'alpha');
+$search_login=GETPOST('search_login', 'alpha');
$search_multicurrency_code = GETPOST('search_multicurrency_code', 'alpha');
$search_multicurrency_tx = GETPOST('search_multicurrency_tx', 'alpha');
$search_multicurrency_montant_ht = GETPOST('search_multicurrency_montant_ht', 'alpha');
@@ -186,6 +187,7 @@ $arrayfields = array(
'f.total_localtax1'=>array('label'=>$langs->transcountry("AmountLT1", $mysoc->country_code), 'checked'=>0, 'enabled'=>($mysoc->localtax1_assuj == "1"), 'position'=>110),
'f.total_localtax2'=>array('label'=>$langs->transcountry("AmountLT2", $mysoc->country_code), 'checked'=>0, 'enabled'=>($mysoc->localtax2_assuj == "1"), 'position'=>120),
'f.total_ttc'=>array('label'=>"AmountTTC", 'checked'=>0, 'position'=>130),
+ 'u.login'=>array('label'=>"Author", 'checked'=>1, 'position'=>135),
'dynamount_payed'=>array('label'=>"Received", 'checked'=>0, 'position'=>140),
'rtp'=>array('label'=>"Rest", 'checked'=>0, 'position'=>150), // Not enabled by default because slow
'f.multicurrency_code'=>array('label'=>'Currency', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1), 'position'=>160),
@@ -248,6 +250,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter',
$search_montant_localtax1 = '';
$search_montant_localtax2 = '';
$search_montant_ttc = '';
+ $search_login='';
$search_multicurrency_code = '';
$search_multicurrency_tx = '';
$search_multicurrency_montant_ht = '';
@@ -400,6 +403,7 @@ $sql = 'SELECT';
if ($sall || $search_product_category > 0) $sql = 'SELECT DISTINCT';
$sql .= ' f.rowid as id, f.ref, f.ref_client, f.type, f.note_private, f.note_public, f.increment, f.fk_mode_reglement, f.fk_cond_reglement, f.total as total_ht, f.tva as total_vat, f.total_ttc,';
$sql .= ' f.localtax1 as total_localtax1, f.localtax2 as total_localtax2,';
+$sql .= ' f.fk_user_author,';
$sql .= ' f.fk_multicurrency, f.multicurrency_code, f.multicurrency_tx, f.multicurrency_total_ht, f.multicurrency_total_tva as multicurrency_total_vat, f.multicurrency_total_ttc,';
$sql .= ' f.datef as df, f.date_lim_reglement as datelimite, f.module_source, f.pos_source,';
$sql .= ' f.paye as paye, f.fk_statut, f.close_code,';
@@ -409,7 +413,8 @@ $sql .= ' s.rowid as socid, s.nom as name, s.email, s.town, s.zip, s.fk_pays, s.
$sql .= " typent.code as typent_code,";
$sql .= " state.code_departement as state_code, state.nom as state_name,";
$sql .= " country.code as country_code,";
-$sql .= " p.rowid as project_id, p.ref as project_ref, p.title as project_label";
+$sql .= " p.rowid as project_id, p.ref as project_ref, p.title as project_label,";
+$sql .= " u.login";
// We need dynamount_payed to be able to sort on status (value is surely wrong because we can count several lines several times due to other left join or link with contacts. But what we need is just 0 or > 0)
// TODO Better solution to be able to sort on already payed or remain to pay is to store amount_payed in a denormalized field.
if (!$sall) $sql .= ', SUM(pf.amount) as dynamount_payed, SUM(pf.multicurrency_amount) as multicurrency_dynamount_payed';
@@ -441,6 +446,7 @@ if ($search_user > 0)
$sql .= ", ".MAIN_DB_PREFIX."element_contact as ec";
$sql .= ", ".MAIN_DB_PREFIX."c_type_contact as tc";
}
+$sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'user AS u ON f.fk_user_author = u.rowid';
$sql .= ' WHERE f.fk_soc = s.rowid';
$sql .= ' AND f.entity IN ('.getEntity('invoice').')';
if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
@@ -482,6 +488,7 @@ if ($search_multicurrency_tx != '') $sql .= natural_search('f.multicurrency_tx',
if ($search_multicurrency_montant_ht != '') $sql .= natural_search('f.multicurrency_total_ht', $search_multicurrency_montant_ht, 1);
if ($search_multicurrency_montant_vat != '') $sql .= natural_search('f.multicurrency_total_tva', $search_multicurrency_montant_vat, 1);
if ($search_multicurrency_montant_ttc != '') $sql .= natural_search('f.multicurrency_total_ttc', $search_multicurrency_montant_ttc, 1);
+if ($search_login) $sql .= natural_search('u.login', $search_login);
if ($search_categ_cus > 0) $sql .= " AND cc.fk_categorie = ".$db->escape($search_categ_cus);
if ($search_categ_cus == -2) $sql .= " AND cc.fk_categorie IS NULL";
if ($search_status != '-1' && $search_status != '')
@@ -608,6 +615,7 @@ if ($resql)
if ($search_zip) $param .= '&search_zip='.urlencode($search_zip);
if ($search_sale > 0) $param .= '&search_sale='.urlencode($search_sale);
if ($search_user > 0) $param .= '&search_user='.urlencode($search_user);
+ if ($search_login) $param .= '&search_login='.urlencode($search_login);
if ($search_product_category > 0) $param .= '&search_product_category='.urlencode($search_product_category);
if ($search_montant_ht != '') $param .= '&search_montant_ht='.urlencode($search_montant_ht);
if ($search_montant_vat != '') $param .= '&search_montant_vat='.urlencode($search_montant_vat);
@@ -906,6 +914,13 @@ if ($resql)
print '';
print '';
}
+ if (! empty($arrayfields['u.login']['checked']))
+ {
+ // Author
+ print '';
+ print '';
+ print ' ';
+ }
if (!empty($arrayfields['f.retained_warranty']['checked']))
{
print '';
@@ -1029,6 +1044,7 @@ if ($resql)
if (!empty($arrayfields['f.total_localtax1']['checked'])) print_liste_field_titre($arrayfields['f.total_localtax1']['label'], $_SERVER['PHP_SELF'], 'f.localtax1', '', $param, 'class="right"', $sortfield, $sortorder);
if (!empty($arrayfields['f.total_localtax2']['checked'])) print_liste_field_titre($arrayfields['f.total_localtax2']['label'], $_SERVER['PHP_SELF'], 'f.localtax2', '', $param, 'class="right"', $sortfield, $sortorder);
if (!empty($arrayfields['f.total_ttc']['checked'])) print_liste_field_titre($arrayfields['f.total_ttc']['label'], $_SERVER['PHP_SELF'], 'f.total_ttc', '', $param, 'class="right"', $sortfield, $sortorder);
+ if (!empty($arrayfields['u.login']['checked'])) print_liste_field_titre($arrayfields['u.login']['label'], $_SERVER["PHP_SELF"], 'u.login', '', $param, 'align="center"', $sortfield, $sortorder);
if (!empty($arrayfields['f.retained_warranty']['checked'])) print_liste_field_titre($arrayfields['f.retained_warranty']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'align="right"', $sortfield, $sortorder);
if (!empty($arrayfields['dynamount_payed']['checked'])) print_liste_field_titre($arrayfields['dynamount_payed']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
if (!empty($arrayfields['rtp']['checked'])) print_liste_field_titre($arrayfields['rtp']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
@@ -1054,6 +1070,7 @@ if ($resql)
$projectstatic = new Project($db);
$discount = new DiscountAbsolute($db);
+ $userstatic = new User($db);
if ($num > 0)
{
@@ -1374,6 +1391,18 @@ if ($resql)
$totalarray['val']['f.total_ttc'] += $obj->total_ttc;
}
+ // Author
+ if (! empty($arrayfields['u.login']['checked']))
+ {
+ $userstatic->id = $obj->fk_user_author;
+ $userstatic->login = $obj->login;
+ print ' ';
+ if ($userstatic->id) print $userstatic->getLoginUrl(1);
+ else print ' ';
+ print " \n";
+ if (!$i) $totalarray['nbfield']++;
+ }
+
if (!empty($arrayfields['f.retained_warranty']['checked']))
{
print ''.(!empty($obj->retained_warranty) ?price($obj->retained_warranty).'%' : ' ').' ';
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 7be2c5e9b26..742944f6c80 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -84,6 +84,7 @@ $search_montant_vat = GETPOST('search_montant_vat', 'alpha');
$search_montant_localtax1 = GETPOST('search_montant_localtax1', 'alpha');
$search_montant_localtax2 = GETPOST('search_montant_localtax2', 'alpha');
$search_montant_ttc = GETPOST('search_montant_ttc', 'alpha');
+$search_login=GETPOST('search_login', 'alpha');
$search_multicurrency_code = GETPOST('search_multicurrency_code', 'alpha');
$search_multicurrency_tx = GETPOST('search_multicurrency_tx', 'alpha');
$search_multicurrency_montant_ht = GETPOST('search_multicurrency_montant_ht', 'alpha');
@@ -170,6 +171,7 @@ $arrayfields = array(
'f.total_localtax1'=>array('label'=>$langs->transcountry("AmountLT1", $mysoc->country_code), 'checked'=>0, 'enabled'=>$mysoc->localtax1_assuj == "1"),
'f.total_localtax2'=>array('label'=>$langs->transcountry("AmountLT2", $mysoc->country_code), 'checked'=>0, 'enabled'=>$mysoc->localtax2_assuj == "1"),
'f.total_ttc'=>array('label'=>$langs->trans("AmountTTC"), 'checked'=>0),
+ 'u.login'=>array('label'=>"Author", 'checked'=>1),
'dynamount_payed'=>array('label'=>$langs->trans("Payed"), 'checked'=>0),
'rtp'=>array('label'=>$langs->trans("Rest"), 'checked'=>0),
'f.multicurrency_code'=>array('label'=>'Currency', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1)),
@@ -230,6 +232,7 @@ if (empty($reshook))
$search_montant_localtax1 = '';
$search_montant_localtax2 = '';
$search_montant_ttc = '';
+ $search_login='';
$search_multicurrency_code = '';
$search_multicurrency_tx = '';
$search_multicurrency_montant_ht = '';
@@ -288,11 +291,13 @@ $sql .= " f.total_ht, f.total_ttc, f.total_tva as total_vat, f.paye as paye, f.f
$sql .= " f.localtax1 as total_localtax1, f.localtax2 as total_localtax2,";
$sql .= ' f.fk_multicurrency, f.multicurrency_code, f.multicurrency_tx, f.multicurrency_total_ht, f.multicurrency_total_tva as multicurrency_total_vat, f.multicurrency_total_ttc,';
$sql .= " f.note_public, f.note_private,";
+$sql .= " f.fk_user_author,";
$sql .= " s.rowid as socid, s.nom as name, s.email, s.town, s.zip, s.fk_pays, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta as code_compta_client, s.code_compta_fournisseur,";
$sql .= " typent.code as typent_code,";
$sql .= " state.code_departement as state_code, state.nom as state_name,";
$sql .= " country.code as country_code,";
-$sql .= " p.rowid as project_id, p.ref as project_ref, p.title as project_label";
+$sql .= " p.rowid as project_id, p.ref as project_ref, p.title as project_label,";
+$sql .= " u.login";
// We need dynamount_payed to be able to sort on status (value is surely wrong because we can count several lines several times due to other left join or link with contacts. But what we need is just 0 or > 0)
// TODO Better solution to be able to sort on already payed or remain to pay is to store amount_payed in a denormalized field.
if (!$search_all) $sql .= ', SUM(pf.amount) as dynamount_payed';
@@ -321,6 +326,7 @@ if ($search_user > 0)
$sql .= ", ".MAIN_DB_PREFIX."element_contact as ec";
$sql .= ", ".MAIN_DB_PREFIX."c_type_contact as tc";
}
+$sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'user AS u ON f.fk_user_author = u.rowid';
$sql .= ' WHERE f.fk_soc = s.rowid';
$sql .= ' AND f.entity IN ('.getEntity('facture_fourn').')';
if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
@@ -359,6 +365,7 @@ if ($search_multicurrency_tx != '') $sql .= natural_search('f.multicurrency_tx',
if ($search_multicurrency_montant_ht != '') $sql .= natural_search('f.multicurrency_total_ht', $search_multicurrency_montant_ht, 1);
if ($search_multicurrency_montant_vat != '') $sql .= natural_search('f.multicurrency_total_tva', $search_multicurrency_montant_vat, 1);
if ($search_multicurrency_montant_ttc != '') $sql .= natural_search('f.multicurrency_total_ttc', $search_multicurrency_montant_ttc, 1);
+if ($search_login) $sql .= natural_search('u.login', $search_login);
if ($search_status != '' && $search_status >= 0) $sql .= " AND f.fk_statut = ".$db->escape($search_status);
if ($search_paymentmode > 0) $sql .= " AND f.fk_mode_reglement = ".$search_paymentmode."";
$sql .= dolSqlDateFilter("f.datef", $day, $month, $year);
@@ -470,6 +477,7 @@ if ($resql)
if ($search_type != '') $param .= '&search_type='.urlencode($search_type);
if ($search_label) $param .= '&search_label='.urlencode($search_label);
if ($search_company) $param .= '&search_company='.urlencode($search_company);
+ if ($search_login) $param .= '&search_login='.urlencode($search_login);
if ($search_montant_ht != '') $param .= '&search_montant_ht='.urlencode($search_montant_ht);
if ($search_montant_vat != '') $param .= '&search_montant_vat='.urlencode($search_montant_vat);
if ($search_montant_localtax1 != '') $param .= '&search_montant_localtax1='.urlencode($search_montant_localtax1);
@@ -759,6 +767,13 @@ if ($resql)
print '';
print '';
}
+ if (! empty($arrayfields['u.login']['checked']))
+ {
+ // Author
+ print '';
+ print '';
+ print ' ';
+ }
if (!empty($arrayfields['dynamount_payed']['checked']))
{
print '';
@@ -869,6 +884,7 @@ if ($resql)
if (!empty($arrayfields['f.total_localtax1']['checked'])) print_liste_field_titre($arrayfields['f.total_localtax1']['label'], $_SERVER['PHP_SELF'], 'f.localtax1', '', $param, '', $sortfield, $sortorder, 'right ');
if (!empty($arrayfields['f.total_localtax2']['checked'])) print_liste_field_titre($arrayfields['f.total_localtax2']['label'], $_SERVER['PHP_SELF'], 'f.localtax2', '', $param, '', $sortfield, $sortorder, 'right ');
if (!empty($arrayfields['f.total_ttc']['checked'])) print_liste_field_titre($arrayfields['f.total_ttc']['label'], $_SERVER['PHP_SELF'], 'f.total_ttc', '', $param, '', $sortfield, $sortorder, 'right ');
+ if (!empty($arrayfields['u.login']['checked'])) print_liste_field_titre($arrayfields['u.login']['label'], $_SERVER["PHP_SELF"], 'u.login', '', $param, 'align="center"', $sortfield, $sortorder);
if (!empty($arrayfields['dynamount_payed']['checked'])) print_liste_field_titre($arrayfields['dynamount_payed']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'right ');
if (!empty($arrayfields['rtp']['checked'])) print_liste_field_titre($arrayfields['rtp']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'right ');
if (!empty($arrayfields['f.multicurrency_code']['checked'])) print_liste_field_titre($arrayfields['f.multicurrency_code']['label'], $_SERVER['PHP_SELF'], 'f.multicurrency_code', '', $param, '', $sortfield, $sortorder);
@@ -893,6 +909,7 @@ if ($resql)
$facturestatic = new FactureFournisseur($db);
$supplierstatic = new Fournisseur($db);
$projectstatic = new Project($db);
+ $userstatic = new User($db);
if ($num > 0)
{
@@ -1131,6 +1148,18 @@ if ($resql)
$totalarray['val']['f.total_ttc'] += $obj->total_ttc;
}
+ // Author
+ if (! empty($arrayfields['u.login']['checked']))
+ {
+ $userstatic->id = $obj->fk_user_author;
+ $userstatic->login = $obj->login;
+ print ' ';
+ if ($userstatic->id) print $userstatic->getLoginUrl(1);
+ else print ' ';
+ print " \n";
+ if (!$i) $totalarray['nbfield']++;
+ }
+
if (!empty($arrayfields['dynamount_payed']['checked']))
{
print ''.(!empty($totalpay) ?price($totalpay, 0, $langs) : ' ').' '; // TODO Use a denormalized field
From d2de6a22ebf126e9600b5d49fea87308295af242 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur
Date: Wed, 1 Apr 2020 18:11:28 +0200
Subject: [PATCH 037/336] WIP Can set values in extra languages
---
htdocs/core/class/commonobject.class.php | 28 +++++++++++--
htdocs/core/class/html.form.class.php | 17 ++++++++
htdocs/core/lib/functions.lib.php | 53 +++++++++++++-----------
htdocs/societe/card.php | 2 +-
4 files changed, 71 insertions(+), 29 deletions(-)
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 7553594bb82..1d5ebbc4fa6 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -593,9 +593,10 @@ abstract class CommonObject
* @param int $withcountry 1=Add country into address string
* @param string $sep Separator to use to build string
* @param int $withregion 1=Add region into address string
+ * @param string $extralangcode User extralanguages as value
* @return string Full address string
*/
- public function getFullAddress($withcountry = 0, $sep = "\n", $withregion = 0)
+ public function getFullAddress($withcountry = 0, $sep = "\n", $withregion = 0, $extralangcode = '')
{
if ($withcountry && $this->country_id && (empty($this->country_code) || empty($this->country)))
{
@@ -615,7 +616,7 @@ abstract class CommonObject
$this->region = $tmparray['region'];
}
- return dol_format_address($this, $withcountry, $sep);
+ return dol_format_address($this, $withcountry, $sep, '', 0, $extralangcode);
}
@@ -628,7 +629,7 @@ abstract class CommonObject
*/
public function getBannerAddress($htmlkey, $object)
{
- global $conf, $langs;
+ global $conf, $langs, $form;
$countriesusingstate = array('AU', 'US', 'IN', 'GB', 'ES', 'UK', 'TR'); // See also option MAIN_FORCE_STATE_INTO_ADDRESS
@@ -657,6 +658,7 @@ abstract class CommonObject
{
if (!empty($conf->use_javascript_ajax))
{
+ // Add picto with tooltip on map
$namecoords = '';
if ($this->element == 'contact' && !empty($conf->global->MAIN_SHOW_COMPANY_NAME_IN_BANNER_ADDRESS))
{
@@ -670,6 +672,26 @@ abstract class CommonObject
}
$out .= dol_print_address($coords, 'address_'.$htmlkey.'_'.$this->id, $this->element, $this->id, 1, ', '); $outdone++;
$outdone++;
+
+ $useextralanguages = $conf->global->PDF_USE_ALSO_LANGUAGE_CODE;
+ if ($useextralanguages) {
+ $this->fetchValuesForExtraLanguages();
+ $extralanguages = array();
+ if (isset($this->array_languages['address'])) $extralanguages[] = reset(array_keys($this->array_languages['address']));
+ if (isset($this->array_languages['town'])) $extralanguages[] = reset(array_keys($this->array_languages['town']));
+
+ if (is_array($extralanguages) && count($extralanguages)) {
+ if (! is_object($form)) $form = new Form($this->db);
+ $htmltext = '';
+ // If there is extra languages
+ foreach($extralanguages as $key => $extralangcode) {
+ $s=picto_from_langcode($extralangcode, 'class="pictoforlang paddingright"');
+ $coords = $this->getFullAddress(1, ', ', $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT, $extralangcode);
+ $htmltext .= $s.dol_print_address($coords, 'address_'.$htmlkey.'_'.$this->id, $this->element, $this->id, 1, ', ');
+ }
+ $out .= $form->textwithpicto('', $htmltext, -1, 'language', 'opacitymedium paddingleft');
+ }
+ }
}
if (!in_array($this->country_code, $countriesusingstate) && empty($conf->global->MAIN_FORCE_STATE_INTO_ADDRESS) // If MAIN_FORCE_STATE_INTO_ADDRESS is on, state is already returned previously with getFullAddress
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 696d1a9aa7d..7404b3c6945 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -7359,6 +7359,23 @@ class Form
if ($object->element == 'societe')
{
$ret .= dol_htmlentities($object->name);
+
+ $useextralanguages = $conf->global->PDF_USE_ALSO_LANGUAGE_CODE;
+ if ($useextralanguages) {
+ $object->fetchValuesForExtraLanguages();
+ $extralanguages = array();
+ if (isset($object->array_languages['name'])) $extralanguages[] = reset(array_keys($object->array_languages['name']));
+
+ if (is_array($extralanguages) && count($extralanguages)) {
+ $htmltext = '';
+ // If there is extra languages
+ foreach($extralanguages as $extralangcode) {
+ $s=picto_from_langcode($extralangcode, 'class="pictoforlang paddingright"');
+ $htmltext .= $s.$object->array_languages['name'][$extralangcode];
+ }
+ $ret .= $this->textwithpicto('', $htmltext, -1, 'language', 'opacitymedium paddingleft');
+ }
+ }
}
elseif ($object->element == 'member')
{
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 2b1d2695ed4..751e3ebb0a6 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1646,12 +1646,12 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
if (!empty($object->name_alias)) $morehtmlref .= '
';
}
if ($showomap)
{
- $url = dol_buildpath('/openstreetmap/maps.php?mode='.$mode.'&id='.$id, 1);
+ $url = dol_buildpath('/openstreetmap/maps.php?mode='.$element.'&id='.$id, 1);
$out .= ' ';
}
}
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index be97aff6377..0186d3d9807 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -931,7 +931,7 @@ else
* Creation
*/
$private = GETPOST("private", "int");
- if (!empty($conf->global->THIRDPARTY_DEFAULT_CREATE_CONTACT) && !isset($_GET['private']) && !isset($_POST['private'])) $private = 1;
+ if (!empty($conf->global->THIRDPARTY_DEFAULT_CREATE_CONTACT) && ! GETPOSTISSET('private')) $private = 1;
if (empty($private)) $private = 0;
// Load object modCodeTiers
From 70706d9ea712848a6a57dceea14c7099f1a71aa8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur
Date: Wed, 1 Apr 2020 18:48:45 +0200
Subject: [PATCH 038/336] FIX Missing token and take into account max date when
it can.
---
htdocs/compta/stats/index.php | 27 +++++++++++++++++++--------
htdocs/core/lib/report.lib.php | 19 ++++++++++---------
2 files changed, 29 insertions(+), 17 deletions(-)
diff --git a/htdocs/compta/stats/index.php b/htdocs/compta/stats/index.php
index 684ef337fcd..ba17730831f 100644
--- a/htdocs/compta/stats/index.php
+++ b/htdocs/compta/stats/index.php
@@ -31,12 +31,12 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
// Load translation files required by the page
$langs->loadLangs(array('compta', 'bills', 'donation', 'salaries'));
-$date_startmonth = GETPOST('date_startmonth');
-$date_startday = GETPOST('date_startday');
-$date_startyear = GETPOST('date_startyear');
-$date_endmonth = GETPOST('date_endmonth');
-$date_endday = GETPOST('date_endday');
-$date_endyear = GETPOST('date_endyear');
+$date_startday = GETPOST('date_startday', 'int');
+$date_startmonth = GETPOST('date_startmonth', 'int');
+$date_startyear = GETPOST('date_startyear', 'int');
+$date_endday = GETPOST('date_endday', 'int');
+$date_endmonth = GETPOST('date_endmonth', 'int');
+$date_endyear = GETPOST('date_endyear', 'int');
$nbofyear = 4;
@@ -193,15 +193,18 @@ elseif ($modecompta == "BOOKKEEPING")
{
$sql = "SELECT date_format(b.doc_date,'%Y-%m') as dm, sum(b.credit) as amount_ttc";
$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as b, ".MAIN_DB_PREFIX."accounting_journal as aj";
- $sql .= " WHERE b.entity = ".$conf->entity;
+ $sql .= " WHERE b.entity = ".$conf->entity; // In module double party accounting, we never share entities
$sql .= " AND aj.entity = ".$conf->entity;
$sql .= " AND b.code_journal = aj.code AND aj.nature = 2"; // @todo currently count amount in sale journal, but we need to define a category group for turnover
}
$sql .= " GROUP BY dm";
$sql .= " ORDER BY dm";
+// TODO Add a filter on $date_start and $date_end to reduce quantity on data
//print $sql;
+$minyearmonth = $maxyearmonth = 0;
+
$result = $db->query($sql);
if ($result)
{
@@ -214,7 +217,7 @@ if ($result)
$cum[$obj->dm] = $obj->amount_ttc;
if ($obj->amount_ttc)
{
- $minyearmonth = ($minyearmonth ?min($minyearmonth, $obj->dm) : $obj->dm);
+ $minyearmonth = ($minyearmonth ? min($minyearmonth, $obj->dm) : $obj->dm);
$maxyearmonth = max($maxyearmonth, $obj->dm);
}
$i++;
@@ -309,9 +312,17 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++)
$mois_modulo = $mois; // ajout
if ($mois > 12) {$mois_modulo = $mois - 12; } // ajout
+ if ($year_start == $year_end) {
+ if ($mois > $date_endmonth && $year_end >= $date_endyear) {
+ break;
+ }
+ }
+
print '';
+ // Month
print "".dol_print_date(dol_mktime(12, 0, 0, $mois_modulo, 1, 2000), "%B")." ";
+
for ($annee = $year_start - 1; $annee <= $year_end; $annee++) // We start one year before to have data to be able to make delta
{
$annee_decalage = $annee;
diff --git a/htdocs/core/lib/report.lib.php b/htdocs/core/lib/report.lib.php
index 4649abc474a..979583e8b4d 100644
--- a/htdocs/core/lib/report.lib.php
+++ b/htdocs/core/lib/report.lib.php
@@ -53,16 +53,17 @@ function report_header($reportname, $notused, $period, $periodlink, $description
$head[$h][1] = $langs->trans("Report");
$head[$h][2] = 'report';
- print ' ');
- fragments.push('');
- rowStarted = true;
- }
-
- fragments.push(
- '' + entry.label + ' '
- );
- }
-
- if (rowStarted)
- fragments.push(' ');
-
- if (fragments.length == 0)
- return;
-
- var table = '' + fragments.join("") + '
';
- if (options.legend.container != null)
- $(options.legend.container).html(table);
- else {
- var pos = "",
- p = options.legend.position,
- m = options.legend.margin;
- if (m[0] == null)
- m = [m, m];
- if (p.charAt(0) == "n")
- pos += 'top:' + (m[1] + plotOffset.top) + 'px;';
- else if (p.charAt(0) == "s")
- pos += 'bottom:' + (m[1] + plotOffset.bottom) + 'px;';
- if (p.charAt(1) == "e")
- pos += 'right:' + (m[0] + plotOffset.right) + 'px;';
- else if (p.charAt(1) == "w")
- pos += 'left:' + (m[0] + plotOffset.left) + 'px;';
- var legend = $(' ').prependTo(legend).css('opacity', options.legend.backgroundOpacity);
- }
- }
- }
-
-
- // interactive features
-
- var highlights = [],
- redrawTimeout = null;
-
- // returns the data item the mouse is over, or null if none is found
- function findNearbyItem(mouseX, mouseY, seriesFilter) {
- var maxDistance = options.grid.mouseActiveRadius,
- smallestDistance = maxDistance * maxDistance + 1,
- item = null, foundPoint = false, i, j, ps;
-
- for (i = series.length - 1; i >= 0; --i) {
- if (!seriesFilter(series[i]))
- continue;
-
- var s = series[i],
- axisx = s.xaxis,
- axisy = s.yaxis,
- points = s.datapoints.points,
- mx = axisx.c2p(mouseX), // precompute some stuff to make the loop faster
- my = axisy.c2p(mouseY),
- maxx = maxDistance / axisx.scale,
- maxy = maxDistance / axisy.scale;
-
- ps = s.datapoints.pointsize;
- // with inverse transforms, we can't use the maxx/maxy
- // optimization, sadly
- if (axisx.options.inverseTransform)
- maxx = Number.MAX_VALUE;
- if (axisy.options.inverseTransform)
- maxy = Number.MAX_VALUE;
-
- if (s.lines.show || s.points.show) {
- for (j = 0; j < points.length; j += ps) {
- var x = points[j], y = points[j + 1];
- if (x == null)
- continue;
-
- // For points and lines, the cursor must be within a
- // certain distance to the data point
- if (x - mx > maxx || x - mx < -maxx ||
- y - my > maxy || y - my < -maxy)
- continue;
-
- // We have to calculate distances in pixels, not in
- // data units, because the scales of the axes may be different
- var dx = Math.abs(axisx.p2c(x) - mouseX),
- dy = Math.abs(axisy.p2c(y) - mouseY),
- dist = dx * dx + dy * dy; // we save the sqrt
-
- // use <= to ensure last point takes precedence
- // (last generally means on top of)
- if (dist < smallestDistance) {
- smallestDistance = dist;
- item = [i, j / ps];
- }
- }
- }
-
- if (s.bars.show && !item) { // no other point can be nearby
-
- var barLeft, barRight;
-
- switch (s.bars.align) {
- case "left":
- barLeft = 0;
- break;
- case "right":
- barLeft = -s.bars.barWidth;
- break;
- default:
- barLeft = -s.bars.barWidth / 2;
- }
-
- barRight = barLeft + s.bars.barWidth;
-
- for (j = 0; j < points.length; j += ps) {
- var x = points[j], y = points[j + 1], b = points[j + 2];
- if (x == null)
- continue;
-
- // for a bar graph, the cursor must be inside the bar
- if (series[i].bars.horizontal ?
- (mx <= Math.max(b, x) && mx >= Math.min(b, x) &&
- my >= y + barLeft && my <= y + barRight) :
- (mx >= x + barLeft && mx <= x + barRight &&
- my >= Math.min(b, y) && my <= Math.max(b, y)))
- item = [i, j / ps];
- }
- }
- }
-
- if (item) {
- i = item[0];
- j = item[1];
- ps = series[i].datapoints.pointsize;
-
- return { datapoint: series[i].datapoints.points.slice(j * ps, (j + 1) * ps),
- dataIndex: j,
- series: series[i],
- seriesIndex: i };
- }
-
- return null;
- }
-
- function onMouseMove(e) {
- if (options.grid.hoverable)
- triggerClickHoverEvent("plothover", e,
- function (s) { return s["hoverable"] != false; });
- }
-
- function onMouseLeave(e) {
- if (options.grid.hoverable)
- triggerClickHoverEvent("plothover", e,
- function (s) { return false; });
- }
-
- function onClick(e) {
- triggerClickHoverEvent("plotclick", e,
- function (s) { return s["clickable"] != false; });
- }
-
- // trigger click or hover event (they send the same parameters
- // so we share their code)
- function triggerClickHoverEvent(eventname, event, seriesFilter) {
- var offset = eventHolder.offset(),
- canvasX = event.pageX - offset.left - plotOffset.left,
- canvasY = event.pageY - offset.top - plotOffset.top,
- pos = canvasToAxisCoords({ left: canvasX, top: canvasY });
-
- pos.pageX = event.pageX;
- pos.pageY = event.pageY;
-
- var item = findNearbyItem(canvasX, canvasY, seriesFilter);
-
- if (item) {
- // fill in mouse pos for any listeners out there
- item.pageX = parseInt(item.series.xaxis.p2c(item.datapoint[0]) + offset.left + plotOffset.left, 10);
- item.pageY = parseInt(item.series.yaxis.p2c(item.datapoint[1]) + offset.top + plotOffset.top, 10);
- }
-
- if (options.grid.autoHighlight) {
- // clear auto-highlights
- for (var i = 0; i < highlights.length; ++i) {
- var h = highlights[i];
- if (h.auto == eventname &&
- !(item && h.series == item.series &&
- h.point[0] == item.datapoint[0] &&
- h.point[1] == item.datapoint[1]))
- unhighlight(h.series, h.point);
- }
-
- if (item)
- highlight(item.series, item.datapoint, eventname);
- }
-
- placeholder.trigger(eventname, [ pos, item ]);
- }
-
- function triggerRedrawOverlay() {
- var t = options.interaction.redrawOverlayInterval;
- if (t == -1) { // skip event queue
- drawOverlay();
- return;
- }
-
- if (!redrawTimeout)
- redrawTimeout = setTimeout(drawOverlay, t);
- }
-
- function drawOverlay() {
- redrawTimeout = null;
-
- // draw highlights
- octx.save();
- overlay.clear();
- octx.translate(plotOffset.left, plotOffset.top);
-
- var i, hi;
- for (i = 0; i < highlights.length; ++i) {
- hi = highlights[i];
-
- if (hi.series.bars.show)
- drawBarHighlight(hi.series, hi.point);
- else
- drawPointHighlight(hi.series, hi.point);
- }
- octx.restore();
-
- executeHooks(hooks.drawOverlay, [octx]);
- }
-
- function highlight(s, point, auto) {
- if (typeof s == "number")
- s = series[s];
-
- if (typeof point == "number") {
- var ps = s.datapoints.pointsize;
- point = s.datapoints.points.slice(ps * point, ps * (point + 1));
- }
-
- var i = indexOfHighlight(s, point);
- if (i == -1) {
- highlights.push({ series: s, point: point, auto: auto });
-
- triggerRedrawOverlay();
- }
- else if (!auto)
- highlights[i].auto = false;
- }
-
- function unhighlight(s, point) {
- if (s == null && point == null) {
- highlights = [];
- triggerRedrawOverlay();
- return;
- }
-
- if (typeof s == "number")
- s = series[s];
-
- if (typeof point == "number") {
- var ps = s.datapoints.pointsize;
- point = s.datapoints.points.slice(ps * point, ps * (point + 1));
- }
-
- var i = indexOfHighlight(s, point);
- if (i != -1) {
- highlights.splice(i, 1);
-
- triggerRedrawOverlay();
- }
- }
-
- function indexOfHighlight(s, p) {
- for (var i = 0; i < highlights.length; ++i) {
- var h = highlights[i];
- if (h.series == s && h.point[0] == p[0]
- && h.point[1] == p[1])
- return i;
- }
- return -1;
- }
-
- function drawPointHighlight(series, point) {
- var x = point[0], y = point[1],
- axisx = series.xaxis, axisy = series.yaxis,
- highlightColor = (typeof series.highlightColor === "string") ? series.highlightColor : $.color.parse(series.color).scale('a', 0.5).toString();
-
- if (x < axisx.min || x > axisx.max || y < axisy.min || y > axisy.max)
- return;
-
- var pointRadius = series.points.radius + series.points.lineWidth / 2;
- octx.lineWidth = pointRadius;
- octx.strokeStyle = highlightColor;
- var radius = 1.5 * pointRadius;
- x = axisx.p2c(x);
- y = axisy.p2c(y);
-
- octx.beginPath();
- if (series.points.symbol == "circle")
- octx.arc(x, y, radius, 0, 2 * Math.PI, false);
- else
- series.points.symbol(octx, x, y, radius, false);
- octx.closePath();
- octx.stroke();
- }
-
- function drawBarHighlight(series, point) {
- var highlightColor = (typeof series.highlightColor === "string") ? series.highlightColor : $.color.parse(series.color).scale('a', 0.5).toString(),
- fillStyle = highlightColor,
- barLeft;
-
- switch (series.bars.align) {
- case "left":
- barLeft = 0;
- break;
- case "right":
- barLeft = -series.bars.barWidth;
- break;
- default:
- barLeft = -series.bars.barWidth / 2;
- }
-
- octx.lineWidth = series.bars.lineWidth;
- octx.strokeStyle = highlightColor;
-
- drawBar(point[0], point[1], point[2] || 0, barLeft, barLeft + series.bars.barWidth,
- function () { return fillStyle; }, series.xaxis, series.yaxis, octx, series.bars.horizontal, series.bars.lineWidth);
- }
-
- function getColorOrGradient(spec, bottom, top, defaultColor) {
- if (typeof spec == "string")
- return spec;
- else {
- // assume this is a gradient spec; IE currently only
- // supports a simple vertical gradient properly, so that's
- // what we support too
- var gradient = ctx.createLinearGradient(0, top, 0, bottom);
-
- for (var i = 0, l = spec.colors.length; i < l; ++i) {
- var c = spec.colors[i];
- if (typeof c != "string") {
- var co = $.color.parse(defaultColor);
- if (c.brightness != null)
- co = co.scale('rgb', c.brightness);
- if (c.opacity != null)
- co.a *= c.opacity;
- c = co.toString();
- }
- gradient.addColorStop(i / (l - 1), c);
- }
-
- return gradient;
- }
- }
- }
-
- // Add the plot function to the top level of the jQuery object
-
- $.plot = function(placeholder, data, options) {
- //var t0 = new Date();
- var plot = new Plot($(placeholder), data, options, $.plot.plugins);
- //(window.console ? console.log : alert)("time used (msecs): " + ((new Date()).getTime() - t0.getTime()));
- return plot;
- };
-
- $.plot.version = "0.8.3";
-
- $.plot.plugins = [];
-
- // Also add the plot function as a chainable property
-
- $.fn.plot = function(data, options) {
- return this.each(function() {
- $.plot(this, data, options);
- });
- };
-
- // round to nearby lower multiple of base
- function floorInBase(n, base) {
- return base * Math.floor(n / base);
- }
-
-})(jQuery);
diff --git a/htdocs/includes/jquery/plugins/flot/jquery.flot.min.js b/htdocs/includes/jquery/plugins/flot/jquery.flot.min.js
deleted file mode 100644
index 968d3ebd990..00000000000
--- a/htdocs/includes/jquery/plugins/flot/jquery.flot.min.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/* Javascript plotting library for jQuery, version 0.8.3.
-
-Copyright (c) 2007-2014 IOLA and Ole Laursen.
-Licensed under the MIT license.
-
-*/
-(function($){$.color={};$.color.make=function(r,g,b,a){var o={};o.r=r||0;o.g=g||0;o.b=b||0;o.a=a!=null?a:1;o.add=function(c,d){for(var i=0;i=1){return"rgb("+[o.r,o.g,o.b].join(",")+")"}else{return"rgba("+[o.r,o.g,o.b,o.a].join(",")+")"}};o.normalize=function(){function clamp(min,value,max){return valuemax?max:value}o.r=clamp(0,parseInt(o.r),255);o.g=clamp(0,parseInt(o.g),255);o.b=clamp(0,parseInt(o.b),255);o.a=clamp(0,o.a,1);return o};o.clone=function(){return $.color.make(o.r,o.b,o.g,o.a)};return o.normalize()};$.color.extract=function(elem,css){var c;do{c=elem.css(css).toLowerCase();if(c!=""&&c!="transparent")break;elem=elem.parent()}while(elem.length&&!$.nodeName(elem.get(0),"body"));if(c=="rgba(0, 0, 0, 0)")c="transparent";return $.color.parse(c)};$.color.parse=function(str){var res,m=$.color.make;if(res=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(str))return m(parseInt(res[1],10),parseInt(res[2],10),parseInt(res[3],10));if(res=/rgba\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(str))return m(parseInt(res[1],10),parseInt(res[2],10),parseInt(res[3],10),parseFloat(res[4]));if(res=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(str))return m(parseFloat(res[1])*2.55,parseFloat(res[2])*2.55,parseFloat(res[3])*2.55);if(res=/rgba\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(str))return m(parseFloat(res[1])*2.55,parseFloat(res[2])*2.55,parseFloat(res[3])*2.55,parseFloat(res[4]));if(res=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(str))return m(parseInt(res[1],16),parseInt(res[2],16),parseInt(res[3],16));if(res=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(str))return m(parseInt(res[1]+res[1],16),parseInt(res[2]+res[2],16),parseInt(res[3]+res[3],16));var name=$.trim(str).toLowerCase();if(name=="transparent")return m(255,255,255,0);else{res=lookupColors[name]||[0,0,0];return m(res[0],res[1],res[2])}};var lookupColors={aqua:[0,255,255],azure:[240,255,255],beige:[245,245,220],black:[0,0,0],blue:[0,0,255],brown:[165,42,42],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgrey:[169,169,169],darkgreen:[0,100,0],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkviolet:[148,0,211],fuchsia:[255,0,255],gold:[255,215,0],green:[0,128,0],indigo:[75,0,130],khaki:[240,230,140],lightblue:[173,216,230],lightcyan:[224,255,255],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightyellow:[255,255,224],lime:[0,255,0],magenta:[255,0,255],maroon:[128,0,0],navy:[0,0,128],olive:[128,128,0],orange:[255,165,0],pink:[255,192,203],purple:[128,0,128],violet:[128,0,128],red:[255,0,0],silver:[192,192,192],white:[255,255,255],yellow:[255,255,0]}})(jQuery);(function($){var hasOwnProperty=Object.prototype.hasOwnProperty;if(!$.fn.detach){$.fn.detach=function(){return this.each(function(){if(this.parentNode){this.parentNode.removeChild(this)}})}}function Canvas(cls,container){var element=container.children("."+cls)[0];if(element==null){element=document.createElement("canvas");element.className=cls;$(element).css({direction:"ltr",position:"absolute",left:0,top:0}).appendTo(container);if(!element.getContext){if(window.G_vmlCanvasManager){element=window.G_vmlCanvasManager.initElement(element)}else{throw new Error("Canvas is not available. If you're using IE with a fall-back such as Excanvas, then there's either a mistake in your conditional include, or the page has no DOCTYPE and is rendering in Quirks Mode.")}}}this.element=element;var context=this.context=element.getContext("2d");var devicePixelRatio=window.devicePixelRatio||1,backingStoreRatio=context.webkitBackingStorePixelRatio||context.mozBackingStorePixelRatio||context.msBackingStorePixelRatio||context.oBackingStorePixelRatio||context.backingStorePixelRatio||1;this.pixelRatio=devicePixelRatio/backingStoreRatio;this.resize(container.width(),container.height());this.textContainer=null;this.text={};this._textCache={}}Canvas.prototype.resize=function(width,height){if(width<=0||height<=0){throw new Error("Invalid dimensions for plot, width = "+width+", height = "+height)}var element=this.element,context=this.context,pixelRatio=this.pixelRatio;if(this.width!=width){element.width=width*pixelRatio;element.style.width=width+"px";this.width=width}if(this.height!=height){element.height=height*pixelRatio;element.style.height=height+"px";this.height=height}context.restore();context.save();context.scale(pixelRatio,pixelRatio)};Canvas.prototype.clear=function(){this.context.clearRect(0,0,this.width,this.height)};Canvas.prototype.render=function(){var cache=this._textCache;for(var layerKey in cache){if(hasOwnProperty.call(cache,layerKey)){var layer=this.getTextLayer(layerKey),layerCache=cache[layerKey];layer.hide();for(var styleKey in layerCache){if(hasOwnProperty.call(layerCache,styleKey)){var styleCache=layerCache[styleKey];for(var key in styleCache){if(hasOwnProperty.call(styleCache,key)){var positions=styleCache[key].positions;for(var i=0,position;position=positions[i];i++){if(position.active){if(!position.rendered){layer.append(position.element);position.rendered=true}}else{positions.splice(i--,1);if(position.rendered){position.element.detach()}}}if(positions.length==0){delete styleCache[key]}}}}}layer.show()}}};Canvas.prototype.getTextLayer=function(classes){var layer=this.text[classes];if(layer==null){if(this.textContainer==null){this.textContainer=$("").css({position:"absolute",top:0,left:0,bottom:0,right:0,"font-size":"smaller",color:"#545454"}).insertAfter(this.element)}layer=this.text[classes]=$("").addClass(classes).css({position:"absolute",top:0,left:0,bottom:0,right:0}).appendTo(this.textContainer)}return layer};Canvas.prototype.getTextInfo=function(layer,text,font,angle,width){var textStyle,layerCache,styleCache,info;text=""+text;if(typeof font==="object"){textStyle=font.style+" "+font.variant+" "+font.weight+" "+font.size+"px/"+font.lineHeight+"px "+font.family}else{textStyle=font}layerCache=this._textCache[layer];if(layerCache==null){layerCache=this._textCache[layer]={}}styleCache=layerCache[textStyle];if(styleCache==null){styleCache=layerCache[textStyle]={}}info=styleCache[text];if(info==null){var element=$("").html(text).css({position:"absolute","max-width":width,top:-9999}).appendTo(this.getTextLayer(layer));if(typeof font==="object"){element.css({font:textStyle,color:font.color})}else if(typeof font==="string"){element.addClass(font)}info=styleCache[text]={width:element.outerWidth(true),height:element.outerHeight(true),element:element,positions:[]};element.detach()}return info};Canvas.prototype.addText=function(layer,x,y,text,font,angle,width,halign,valign){var info=this.getTextInfo(layer,text,font,angle,width),positions=info.positions;if(halign=="center"){x-=info.width/2}else if(halign=="right"){x-=info.width}if(valign=="middle"){y-=info.height/2}else if(valign=="bottom"){y-=info.height}for(var i=0,position;position=positions[i];i++){if(position.x==x&&position.y==y){position.active=true;return}}position={active:true,rendered:false,element:positions.length?info.element.clone():info.element,x:x,y:y};positions.push(position);position.element.css({top:Math.round(y),left:Math.round(x),"text-align":halign})};Canvas.prototype.removeText=function(layer,x,y,text,font,angle){if(text==null){var layerCache=this._textCache[layer];if(layerCache!=null){for(var styleKey in layerCache){if(hasOwnProperty.call(layerCache,styleKey)){var styleCache=layerCache[styleKey];for(var key in styleCache){if(hasOwnProperty.call(styleCache,key)){var positions=styleCache[key].positions;for(var i=0,position;position=positions[i];i++){position.active=false}}}}}}}else{var positions=this.getTextInfo(layer,text,font,angle).positions;for(var i=0,position;position=positions[i];i++){if(position.x==x&&position.y==y){position.active=false}}}};function Plot(placeholder,data_,options_,plugins){var series=[],options={colors:["#edc240","#afd8f8","#cb4b4b","#4da74d","#9440ed"],legend:{show:true,noColumns:1,labelFormatter:null,labelBoxBorderColor:"#ccc",container:null,position:"ne",margin:5,backgroundColor:null,backgroundOpacity:.85,sorted:null},xaxis:{show:null,position:"bottom",mode:null,font:null,color:null,tickColor:null,transform:null,inverseTransform:null,min:null,max:null,autoscaleMargin:null,ticks:null,tickFormatter:null,labelWidth:null,labelHeight:null,reserveSpace:null,tickLength:null,alignTicksWithAxis:null,tickDecimals:null,tickSize:null,minTickSize:null},yaxis:{autoscaleMargin:.02,position:"left"},xaxes:[],yaxes:[],series:{points:{show:false,radius:3,lineWidth:2,fill:true,fillColor:"#ffffff",symbol:"circle"},lines:{lineWidth:2,fill:false,fillColor:null,steps:false},bars:{show:false,lineWidth:2,barWidth:1,fill:true,fillColor:null,align:"left",horizontal:false,zero:true},shadowSize:3,highlightColor:null},grid:{show:true,aboveData:false,color:"#545454",backgroundColor:null,borderColor:null,tickColor:null,margin:0,labelMargin:5,axisMargin:8,borderWidth:2,minBorderMargin:null,markings:null,markingsColor:"#f4f4f4",markingsLineWidth:2,clickable:false,hoverable:false,autoHighlight:true,mouseActiveRadius:10},interaction:{redrawOverlayInterval:1e3/60},hooks:{}},surface=null,overlay=null,eventHolder=null,ctx=null,octx=null,xaxes=[],yaxes=[],plotOffset={left:0,right:0,top:0,bottom:0},plotWidth=0,plotHeight=0,hooks={processOptions:[],processRawData:[],processDatapoints:[],processOffset:[],drawBackground:[],drawSeries:[],draw:[],bindEvents:[],drawOverlay:[],shutdown:[]},plot=this;plot.setData=setData;plot.setupGrid=setupGrid;plot.draw=draw;plot.getPlaceholder=function(){return placeholder};plot.getCanvas=function(){return surface.element};plot.getPlotOffset=function(){return plotOffset};plot.width=function(){return plotWidth};plot.height=function(){return plotHeight};plot.offset=function(){var o=eventHolder.offset();o.left+=plotOffset.left;o.top+=plotOffset.top;return o};plot.getData=function(){return series};plot.getAxes=function(){var res={},i;$.each(xaxes.concat(yaxes),function(_,axis){if(axis)res[axis.direction+(axis.n!=1?axis.n:"")+"axis"]=axis});return res};plot.getXAxes=function(){return xaxes};plot.getYAxes=function(){return yaxes};plot.c2p=canvasToAxisCoords;plot.p2c=axisToCanvasCoords;plot.getOptions=function(){return options};plot.highlight=highlight;plot.unhighlight=unhighlight;plot.triggerRedrawOverlay=triggerRedrawOverlay;plot.pointOffset=function(point){return{left:parseInt(xaxes[axisNumber(point,"x")-1].p2c(+point.x)+plotOffset.left,10),top:parseInt(yaxes[axisNumber(point,"y")-1].p2c(+point.y)+plotOffset.top,10)}};plot.shutdown=shutdown;plot.destroy=function(){shutdown();placeholder.removeData("plot").empty();series=[];options=null;surface=null;overlay=null;eventHolder=null;ctx=null;octx=null;xaxes=[];yaxes=[];hooks=null;highlights=[];plot=null};plot.resize=function(){var width=placeholder.width(),height=placeholder.height();surface.resize(width,height);overlay.resize(width,height)};plot.hooks=hooks;initPlugins(plot);parseOptions(options_);setupCanvases();setData(data_);setupGrid();draw();bindEvents();function executeHooks(hook,args){args=[plot].concat(args);for(var i=0;imaxIndex){maxIndex=sc}}}if(neededColors<=maxIndex){neededColors=maxIndex+1}var c,colors=[],colorPool=options.colors,colorPoolSize=colorPool.length,variation=0;for(i=0;i=0){if(variation<.5){variation=-variation-.2}else variation=0}else variation=-variation}colors[i]=c.scale("rgb",1+variation)}var colori=0,s;for(i=0;iaxis.datamax&&max!=fakeInfinity)axis.datamax=max}$.each(allAxes(),function(_,axis){axis.datamin=topSentry;axis.datamax=bottomSentry;axis.used=false});for(i=0;i0&&points[k-ps]!=null&&points[k-ps]!=points[k]&&points[k-ps+1]!=points[k+1]){for(m=0;mxmax)xmax=val}if(f.y){if(valymax)ymax=val}}}if(s.bars.show){var delta;switch(s.bars.align){case"left":delta=0;break;case"right":delta=-s.bars.barWidth;break;default:delta=-s.bars.barWidth/2}if(s.bars.horizontal){ymin+=delta;ymax+=delta+s.bars.barWidth}else{xmin+=delta;xmax+=delta+s.bars.barWidth}}updateAxis(s.xaxis,xmin,xmax);updateAxis(s.yaxis,ymin,ymax)}$.each(allAxes(),function(_,axis){if(axis.datamin==topSentry)axis.datamin=null;if(axis.datamax==bottomSentry)axis.datamax=null})}function setupCanvases(){placeholder.css("padding",0).children().filter(function(){return!$(this).hasClass("flot-overlay")&&!$(this).hasClass("flot-base")}).remove();if(placeholder.css("position")=="static")placeholder.css("position","relative");surface=new Canvas("flot-base",placeholder);overlay=new Canvas("flot-overlay",placeholder);ctx=surface.context;octx=overlay.context;eventHolder=$(overlay.element).unbind();var existing=placeholder.data("plot");if(existing){existing.shutdown();overlay.clear()}placeholder.data("plot",plot)}function bindEvents(){if(options.grid.hoverable){eventHolder.mousemove(onMouseMove);eventHolder.bind("mouseleave",onMouseLeave)}if(options.grid.clickable)eventHolder.click(onClick);executeHooks(hooks.bindEvents,[eventHolder])}function shutdown(){if(redrawTimeout)clearTimeout(redrawTimeout);eventHolder.unbind("mousemove",onMouseMove);eventHolder.unbind("mouseleave",onMouseLeave);eventHolder.unbind("click",onClick);executeHooks(hooks.shutdown,[eventHolder])}function setTransformationHelpers(axis){function identity(x){return x}var s,m,t=axis.options.transform||identity,it=axis.options.inverseTransform;if(axis.direction=="x"){s=axis.scale=plotWidth/Math.abs(t(axis.max)-t(axis.min));m=Math.min(t(axis.max),t(axis.min))}else{s=axis.scale=plotHeight/Math.abs(t(axis.max)-t(axis.min));s=-s;m=Math.max(t(axis.max),t(axis.min))}if(t==identity)axis.p2c=function(p){return(p-m)*s};else axis.p2c=function(p){return(t(p)-m)*s};if(!it)axis.c2p=function(c){return m+c/s};else axis.c2p=function(c){return it(m+c/s)}}function measureTickLabels(axis){var opts=axis.options,ticks=axis.ticks||[],labelWidth=opts.labelWidth||0,labelHeight=opts.labelHeight||0,maxWidth=labelWidth||(axis.direction=="x"?Math.floor(surface.width/(ticks.length||1)):null),legacyStyles=axis.direction+"Axis "+axis.direction+axis.n+"Axis",layer="flot-"+axis.direction+"-axis flot-"+axis.direction+axis.n+"-axis "+legacyStyles,font=opts.font||"flot-tick-label tickLabel";for(var i=0;i=0;--i)allocateAxisBoxFirstPhase(allocatedAxes[i]);adjustLayoutForThingsStickingOut();$.each(allocatedAxes,function(_,axis){allocateAxisBoxSecondPhase(axis)})}plotWidth=surface.width-plotOffset.left-plotOffset.right;plotHeight=surface.height-plotOffset.bottom-plotOffset.top;$.each(axes,function(_,axis){setTransformationHelpers(axis)});if(showGrid){drawAxisLabels()}insertLegend()}function setRange(axis){var opts=axis.options,min=+(opts.min!=null?opts.min:axis.datamin),max=+(opts.max!=null?opts.max:axis.datamax),delta=max-min;if(delta==0){var widen=max==0?1:.01;if(opts.min==null)min-=widen;if(opts.max==null||opts.min!=null)max+=widen}else{var margin=opts.autoscaleMargin;if(margin!=null){if(opts.min==null){min-=delta*margin;if(min<0&&axis.datamin!=null&&axis.datamin>=0)min=0}if(opts.max==null){max+=delta*margin;if(max>0&&axis.datamax!=null&&axis.datamax<=0)max=0}}}axis.min=min;axis.max=max}function setupTickGeneration(axis){var opts=axis.options;var noTicks;if(typeof opts.ticks=="number"&&opts.ticks>0)noTicks=opts.ticks;else noTicks=.3*Math.sqrt(axis.direction=="x"?surface.width:surface.height);var delta=(axis.max-axis.min)/noTicks,dec=-Math.floor(Math.log(delta)/Math.LN10),maxDec=opts.tickDecimals;if(maxDec!=null&&dec>maxDec){dec=maxDec}var magn=Math.pow(10,-dec),norm=delta/magn,size;if(norm<1.5){size=1}else if(norm<3){size=2;if(norm>2.25&&(maxDec==null||dec+1<=maxDec)){size=2.5;++dec}}else if(norm<7.5){size=5}else{size=10}size*=magn;if(opts.minTickSize!=null&&size0){if(opts.min==null)axis.min=Math.min(axis.min,niceTicks[0]);if(opts.max==null&&niceTicks.length>1)axis.max=Math.max(axis.max,niceTicks[niceTicks.length-1])}axis.tickGenerator=function(axis){var ticks=[],v,i;for(i=0;i1&&/\..*0$/.test((ts[1]-ts[0]).toFixed(extraDec))))axis.tickDecimals=extraDec}}}}function setTicks(axis){var oticks=axis.options.ticks,ticks=[];if(oticks==null||typeof oticks=="number"&&oticks>0)ticks=axis.tickGenerator(axis);else if(oticks){if($.isFunction(oticks))ticks=oticks(axis);else ticks=oticks}var i,v;axis.ticks=[];for(i=0;i1)label=t[1]}else v=+t;if(label==null)label=axis.tickFormatter(v,axis);if(!isNaN(v))axis.ticks.push({v:v,label:label})}}function snapRangeToTicks(axis,ticks){if(axis.options.autoscaleMargin&&ticks.length>0){if(axis.options.min==null)axis.min=Math.min(axis.min,ticks[0].v);if(axis.options.max==null&&ticks.length>1)axis.max=Math.max(axis.max,ticks[ticks.length-1].v)}}function draw(){surface.clear();executeHooks(hooks.drawBackground,[ctx]);var grid=options.grid;if(grid.show&&grid.backgroundColor)drawBackground();if(grid.show&&!grid.aboveData){drawGrid()}for(var i=0;ito){var tmp=from;from=to;to=tmp}return{from:from,to:to,axis:axis}}function drawBackground(){ctx.save();ctx.translate(plotOffset.left,plotOffset.top);ctx.fillStyle=getColorOrGradient(options.grid.backgroundColor,plotHeight,0,"rgba(255, 255, 255, 0)");ctx.fillRect(0,0,plotWidth,plotHeight);ctx.restore()}function drawGrid(){var i,axes,bw,bc;ctx.save();ctx.translate(plotOffset.left,plotOffset.top);var markings=options.grid.markings;if(markings){if($.isFunction(markings)){axes=plot.getAxes();axes.xmin=axes.xaxis.min;axes.xmax=axes.xaxis.max;axes.ymin=axes.yaxis.min;axes.ymax=axes.yaxis.max;markings=markings(axes)}for(i=0;ixrange.axis.max||yrange.toyrange.axis.max)continue;xrange.from=Math.max(xrange.from,xrange.axis.min);xrange.to=Math.min(xrange.to,xrange.axis.max);yrange.from=Math.max(yrange.from,yrange.axis.min);yrange.to=Math.min(yrange.to,yrange.axis.max);var xequal=xrange.from===xrange.to,yequal=yrange.from===yrange.to;if(xequal&&yequal){continue}xrange.from=Math.floor(xrange.axis.p2c(xrange.from));xrange.to=Math.floor(xrange.axis.p2c(xrange.to));yrange.from=Math.floor(yrange.axis.p2c(yrange.from));yrange.to=Math.floor(yrange.axis.p2c(yrange.to));if(xequal||yequal){var lineWidth=m.lineWidth||options.grid.markingsLineWidth,subPixel=lineWidth%2?.5:0;ctx.beginPath();ctx.strokeStyle=m.color||options.grid.markingsColor;ctx.lineWidth=lineWidth;if(xequal){ctx.moveTo(xrange.to+subPixel,yrange.from);ctx.lineTo(xrange.to+subPixel,yrange.to)}else{ctx.moveTo(xrange.from,yrange.to+subPixel);ctx.lineTo(xrange.to,yrange.to+subPixel)}ctx.stroke()}else{ctx.fillStyle=m.color||options.grid.markingsColor;ctx.fillRect(xrange.from,yrange.to,xrange.to-xrange.from,yrange.from-yrange.to)}}}axes=allAxes();bw=options.grid.borderWidth;for(var j=0;jaxis.max||t=="full"&&(typeof bw=="object"&&bw[axis.position]>0||bw>0)&&(v==axis.min||v==axis.max))continue;if(axis.direction=="x"){x=axis.p2c(v);yoff=t=="full"?-plotHeight:t;if(axis.position=="top")yoff=-yoff}else{y=axis.p2c(v);xoff=t=="full"?-plotWidth:t;if(axis.position=="left")xoff=-xoff}if(ctx.lineWidth==1){if(axis.direction=="x")x=Math.floor(x)+.5;else y=Math.floor(y)+.5}ctx.moveTo(x,y);ctx.lineTo(x+xoff,y+yoff)}ctx.stroke()}if(bw){bc=options.grid.borderColor;if(typeof bw=="object"||typeof bc=="object"){if(typeof bw!=="object"){bw={top:bw,right:bw,bottom:bw,left:bw}}if(typeof bc!=="object"){bc={top:bc,right:bc,bottom:bc,left:bc}}if(bw.top>0){ctx.strokeStyle=bc.top;ctx.lineWidth=bw.top;ctx.beginPath();ctx.moveTo(0-bw.left,0-bw.top/2);ctx.lineTo(plotWidth,0-bw.top/2);ctx.stroke()}if(bw.right>0){ctx.strokeStyle=bc.right;ctx.lineWidth=bw.right;ctx.beginPath();ctx.moveTo(plotWidth+bw.right/2,0-bw.top);ctx.lineTo(plotWidth+bw.right/2,plotHeight);ctx.stroke()}if(bw.bottom>0){ctx.strokeStyle=bc.bottom;ctx.lineWidth=bw.bottom;ctx.beginPath();ctx.moveTo(plotWidth+bw.right,plotHeight+bw.bottom/2);ctx.lineTo(0,plotHeight+bw.bottom/2);ctx.stroke()}if(bw.left>0){ctx.strokeStyle=bc.left;ctx.lineWidth=bw.left;ctx.beginPath();ctx.moveTo(0-bw.left/2,plotHeight+bw.bottom);ctx.lineTo(0-bw.left/2,0);ctx.stroke()}}else{ctx.lineWidth=bw;ctx.strokeStyle=options.grid.borderColor;ctx.strokeRect(-bw/2,-bw/2,plotWidth+bw,plotHeight+bw)}}ctx.restore()}function drawAxisLabels(){$.each(allAxes(),function(_,axis){var box=axis.box,legacyStyles=axis.direction+"Axis "+axis.direction+axis.n+"Axis",layer="flot-"+axis.direction+"-axis flot-"+axis.direction+axis.n+"-axis "+legacyStyles,font=axis.options.font||"flot-tick-label tickLabel",tick,x,y,halign,valign;surface.removeText(layer);if(!axis.show||axis.ticks.length==0)return;for(var i=0;iaxis.max)continue;if(axis.direction=="x"){halign="center";x=plotOffset.left+axis.p2c(tick.v);if(axis.position=="bottom"){y=box.top+box.padding}else{y=box.top+box.height-box.padding;valign="bottom"}}else{valign="middle";y=plotOffset.top+axis.p2c(tick.v);if(axis.position=="left"){x=box.left+box.width-box.padding;halign="right"}else{x=box.left+box.padding}}surface.addText(layer,x,y,tick.label,font,null,null,halign,valign)}})}function drawSeries(series){if(series.lines.show)drawSeriesLines(series);if(series.bars.show)drawSeriesBars(series);if(series.points.show)drawSeriesPoints(series)}function drawSeriesLines(series){function plotLine(datapoints,xoffset,yoffset,axisx,axisy){var points=datapoints.points,ps=datapoints.pointsize,prevx=null,prevy=null;ctx.beginPath();for(var i=ps;i=y2&&y1>axisy.max){if(y2>axisy.max)continue;x1=(axisy.max-y1)/(y2-y1)*(x2-x1)+x1;y1=axisy.max}else if(y2>=y1&&y2>axisy.max){if(y1>axisy.max)continue;x2=(axisy.max-y1)/(y2-y1)*(x2-x1)+x1;y2=axisy.max}if(x1<=x2&&x1=x2&&x1>axisx.max){if(x2>axisx.max)continue;y1=(axisx.max-x1)/(x2-x1)*(y2-y1)+y1;x1=axisx.max}else if(x2>=x1&&x2>axisx.max){if(x1>axisx.max)continue;y2=(axisx.max-x1)/(x2-x1)*(y2-y1)+y1;x2=axisx.max}if(x1!=prevx||y1!=prevy)ctx.moveTo(axisx.p2c(x1)+xoffset,axisy.p2c(y1)+yoffset);prevx=x2;prevy=y2;ctx.lineTo(axisx.p2c(x2)+xoffset,axisy.p2c(y2)+yoffset)}ctx.stroke()}function plotLineArea(datapoints,axisx,axisy){var points=datapoints.points,ps=datapoints.pointsize,bottom=Math.min(Math.max(0,axisy.min),axisy.max),i=0,top,areaOpen=false,ypos=1,segmentStart=0,segmentEnd=0;while(true){if(ps>0&&i>points.length+ps)break;i+=ps;var x1=points[i-ps],y1=points[i-ps+ypos],x2=points[i],y2=points[i+ypos];if(areaOpen){if(ps>0&&x1!=null&&x2==null){segmentEnd=i;ps=-ps;ypos=2;continue}if(ps<0&&i==segmentStart+ps){ctx.fill();areaOpen=false;ps=-ps;ypos=1;i=segmentStart=segmentEnd+ps;continue}}if(x1==null||x2==null)continue;if(x1<=x2&&x1=x2&&x1>axisx.max){if(x2>axisx.max)continue;y1=(axisx.max-x1)/(x2-x1)*(y2-y1)+y1;x1=axisx.max}else if(x2>=x1&&x2>axisx.max){if(x1>axisx.max)continue;y2=(axisx.max-x1)/(x2-x1)*(y2-y1)+y1;x2=axisx.max}if(!areaOpen){ctx.beginPath();ctx.moveTo(axisx.p2c(x1),axisy.p2c(bottom));areaOpen=true}if(y1>=axisy.max&&y2>=axisy.max){ctx.lineTo(axisx.p2c(x1),axisy.p2c(axisy.max));ctx.lineTo(axisx.p2c(x2),axisy.p2c(axisy.max));continue}else if(y1<=axisy.min&&y2<=axisy.min){ctx.lineTo(axisx.p2c(x1),axisy.p2c(axisy.min));ctx.lineTo(axisx.p2c(x2),axisy.p2c(axisy.min));continue}var x1old=x1,x2old=x2;if(y1<=y2&&y1=axisy.min){x1=(axisy.min-y1)/(y2-y1)*(x2-x1)+x1;y1=axisy.min}else if(y2<=y1&&y2=axisy.min){x2=(axisy.min-y1)/(y2-y1)*(x2-x1)+x1;y2=axisy.min}if(y1>=y2&&y1>axisy.max&&y2<=axisy.max){x1=(axisy.max-y1)/(y2-y1)*(x2-x1)+x1;y1=axisy.max}else if(y2>=y1&&y2>axisy.max&&y1<=axisy.max){x2=(axisy.max-y1)/(y2-y1)*(x2-x1)+x1;y2=axisy.max}if(x1!=x1old){ctx.lineTo(axisx.p2c(x1old),axisy.p2c(y1))}ctx.lineTo(axisx.p2c(x1),axisy.p2c(y1));ctx.lineTo(axisx.p2c(x2),axisy.p2c(y2));if(x2!=x2old){ctx.lineTo(axisx.p2c(x2),axisy.p2c(y2));ctx.lineTo(axisx.p2c(x2old),axisy.p2c(y2))}}}ctx.save();ctx.translate(plotOffset.left,plotOffset.top);ctx.lineJoin="round";var lw=series.lines.lineWidth,sw=series.shadowSize;if(lw>0&&sw>0){ctx.lineWidth=sw;ctx.strokeStyle="rgba(0,0,0,0.1)";var angle=Math.PI/18;plotLine(series.datapoints,Math.sin(angle)*(lw/2+sw/2),Math.cos(angle)*(lw/2+sw/2),series.xaxis,series.yaxis);ctx.lineWidth=sw/2;plotLine(series.datapoints,Math.sin(angle)*(lw/2+sw/4),Math.cos(angle)*(lw/2+sw/4),series.xaxis,series.yaxis)}ctx.lineWidth=lw;ctx.strokeStyle=series.color;var fillStyle=getFillStyle(series.lines,series.color,0,plotHeight);if(fillStyle){ctx.fillStyle=fillStyle;plotLineArea(series.datapoints,series.xaxis,series.yaxis)}if(lw>0)plotLine(series.datapoints,0,0,series.xaxis,series.yaxis);ctx.restore()}function drawSeriesPoints(series){function plotPoints(datapoints,radius,fillStyle,offset,shadow,axisx,axisy,symbol){var points=datapoints.points,ps=datapoints.pointsize;for(var i=0;iaxisx.max||yaxisy.max)continue;ctx.beginPath();x=axisx.p2c(x);y=axisy.p2c(y)+offset;if(symbol=="circle")ctx.arc(x,y,radius,0,shadow?Math.PI:Math.PI*2,false);else symbol(ctx,x,y,radius,shadow);ctx.closePath();if(fillStyle){ctx.fillStyle=fillStyle;ctx.fill()}ctx.stroke()}}ctx.save();ctx.translate(plotOffset.left,plotOffset.top);var lw=series.points.lineWidth,sw=series.shadowSize,radius=series.points.radius,symbol=series.points.symbol;if(lw==0)lw=1e-4;if(lw>0&&sw>0){var w=sw/2;ctx.lineWidth=w;ctx.strokeStyle="rgba(0,0,0,0.1)";plotPoints(series.datapoints,radius,null,w+w/2,true,series.xaxis,series.yaxis,symbol);ctx.strokeStyle="rgba(0,0,0,0.2)";plotPoints(series.datapoints,radius,null,w/2,true,series.xaxis,series.yaxis,symbol)}ctx.lineWidth=lw;ctx.strokeStyle=series.color;plotPoints(series.datapoints,radius,getFillStyle(series.points,series.color),0,false,series.xaxis,series.yaxis,symbol);ctx.restore()}function drawBar(x,y,b,barLeft,barRight,fillStyleCallback,axisx,axisy,c,horizontal,lineWidth){var left,right,bottom,top,drawLeft,drawRight,drawTop,drawBottom,tmp;if(horizontal){drawBottom=drawRight=drawTop=true;drawLeft=false;left=b;right=x;top=y+barLeft;bottom=y+barRight;if(rightaxisx.max||topaxisy.max)return;if(leftaxisx.max){right=axisx.max;drawRight=false}if(bottomaxisy.max){top=axisy.max;drawTop=false}left=axisx.p2c(left);bottom=axisy.p2c(bottom);right=axisx.p2c(right);top=axisy.p2c(top);if(fillStyleCallback){c.fillStyle=fillStyleCallback(bottom,top);c.fillRect(left,top,right-left,bottom-top)}if(lineWidth>0&&(drawLeft||drawRight||drawTop||drawBottom)){c.beginPath();c.moveTo(left,bottom);if(drawLeft)c.lineTo(left,top);else c.moveTo(left,top);if(drawTop)c.lineTo(right,top);else c.moveTo(right,top);if(drawRight)c.lineTo(right,bottom);else c.moveTo(right,bottom);if(drawBottom)c.lineTo(left,bottom);else c.moveTo(left,bottom);c.stroke()}}function drawSeriesBars(series){function plotBars(datapoints,barLeft,barRight,fillStyleCallback,axisx,axisy){var points=datapoints.points,ps=datapoints.pointsize;for(var i=0;i");fragments.push("");rowStarted=true}fragments.push(''+entry.label+" ")}if(rowStarted)fragments.push(" ");if(fragments.length==0)return;var table=''+fragments.join("")+"
";if(options.legend.container!=null)$(options.legend.container).html(table);else{var pos="",p=options.legend.position,m=options.legend.margin;if(m[0]==null)m=[m,m];if(p.charAt(0)=="n")pos+="top:"+(m[1]+plotOffset.top)+"px;";else if(p.charAt(0)=="s")pos+="bottom:"+(m[1]+plotOffset.bottom)+"px;";if(p.charAt(1)=="e")pos+="right:"+(m[0]+plotOffset.right)+"px;";else if(p.charAt(1)=="w")pos+="left:"+(m[0]+plotOffset.left)+"px;";var legend=$(' ').prependTo(legend).css("opacity",options.legend.backgroundOpacity)}}}var highlights=[],redrawTimeout=null;function findNearbyItem(mouseX,mouseY,seriesFilter){var maxDistance=options.grid.mouseActiveRadius,smallestDistance=maxDistance*maxDistance+1,item=null,foundPoint=false,i,j,ps;for(i=series.length-1;i>=0;--i){if(!seriesFilter(series[i]))continue;var s=series[i],axisx=s.xaxis,axisy=s.yaxis,points=s.datapoints.points,mx=axisx.c2p(mouseX),my=axisy.c2p(mouseY),maxx=maxDistance/axisx.scale,maxy=maxDistance/axisy.scale;ps=s.datapoints.pointsize;if(axisx.options.inverseTransform)maxx=Number.MAX_VALUE;if(axisy.options.inverseTransform)maxy=Number.MAX_VALUE;if(s.lines.show||s.points.show){for(j=0;jmaxx||x-mx<-maxx||y-my>maxy||y-my<-maxy)continue;var dx=Math.abs(axisx.p2c(x)-mouseX),dy=Math.abs(axisy.p2c(y)-mouseY),dist=dx*dx+dy*dy;if(dist=Math.min(b,x)&&my>=y+barLeft&&my<=y+barRight:mx>=x+barLeft&&mx<=x+barRight&&my>=Math.min(b,y)&&my<=Math.max(b,y))item=[i,j/ps]}}}if(item){i=item[0];j=item[1];ps=series[i].datapoints.pointsize;return{datapoint:series[i].datapoints.points.slice(j*ps,(j+1)*ps),dataIndex:j,series:series[i],seriesIndex:i}}return null}function onMouseMove(e){if(options.grid.hoverable)triggerClickHoverEvent("plothover",e,function(s){return s["hoverable"]!=false})}function onMouseLeave(e){if(options.grid.hoverable)triggerClickHoverEvent("plothover",e,function(s){return false})}function onClick(e){triggerClickHoverEvent("plotclick",e,function(s){return s["clickable"]!=false})}function triggerClickHoverEvent(eventname,event,seriesFilter){var offset=eventHolder.offset(),canvasX=event.pageX-offset.left-plotOffset.left,canvasY=event.pageY-offset.top-plotOffset.top,pos=canvasToAxisCoords({left:canvasX,top:canvasY});pos.pageX=event.pageX;pos.pageY=event.pageY;var item=findNearbyItem(canvasX,canvasY,seriesFilter);if(item){item.pageX=parseInt(item.series.xaxis.p2c(item.datapoint[0])+offset.left+plotOffset.left,10);item.pageY=parseInt(item.series.yaxis.p2c(item.datapoint[1])+offset.top+plotOffset.top,10)}if(options.grid.autoHighlight){for(var i=0;iaxisx.max||yaxisy.max)return;var pointRadius=series.points.radius+series.points.lineWidth/2;octx.lineWidth=pointRadius;octx.strokeStyle=highlightColor;var radius=1.5*pointRadius;x=axisx.p2c(x);y=axisy.p2c(y);octx.beginPath();if(series.points.symbol=="circle")octx.arc(x,y,radius,0,2*Math.PI,false);else series.points.symbol(octx,x,y,radius,false);octx.closePath();octx.stroke()}function drawBarHighlight(series,point){var highlightColor=typeof series.highlightColor==="string"?series.highlightColor:$.color.parse(series.color).scale("a",.5).toString(),fillStyle=highlightColor,barLeft;switch(series.bars.align){case"left":barLeft=0;break;case"right":barLeft=-series.bars.barWidth;break;default:barLeft=-series.bars.barWidth/2}octx.lineWidth=series.bars.lineWidth;octx.strokeStyle=highlightColor;drawBar(point[0],point[1],point[2]||0,barLeft,barLeft+series.bars.barWidth,function(){return fillStyle},series.xaxis,series.yaxis,octx,series.bars.horizontal,series.bars.lineWidth)}function getColorOrGradient(spec,bottom,top,defaultColor){if(typeof spec=="string")return spec;else{var gradient=ctx.createLinearGradient(0,top,0,bottom);for(var i=0,l=spec.colors.length;i0&&h.which!=l.which||a(h.target).is(l.not))return;switch(h.type){case"mousedown":return a.extend(l,a(j).offset(),{elem:j,target:h.target,pageX:h.pageX,pageY:h.pageY}),b.add(document,"mousemove mouseup",e,l),i(j,!1),d.dragging=null,!1;case!d.dragging&&"mousemove":if(g(h.pageX-l.pageX)+g(h.pageY-l.pageY) max) {
- // make sure min < max
- var tmp = min;
- min = max;
- max = tmp;
- }
-
- //Check that we are in panRange
- if (pr) {
- if (pr[0] != null && min < pr[0]) {
- min = pr[0];
- }
- if (pr[1] != null && max > pr[1]) {
- max = pr[1];
- }
- }
-
- var range = max - min;
- if (zr &&
- ((zr[0] != null && range < zr[0] && amount >1) ||
- (zr[1] != null && range > zr[1] && amount <1)))
- return;
-
- opts.min = min;
- opts.max = max;
- });
-
- plot.setupGrid();
- plot.draw();
-
- if (!args.preventEvent)
- plot.getPlaceholder().trigger("plotzoom", [ plot, args ]);
- };
-
- plot.pan = function (args) {
- var delta = {
- x: +args.left,
- y: +args.top
- };
-
- if (isNaN(delta.x))
- delta.x = 0;
- if (isNaN(delta.y))
- delta.y = 0;
-
- $.each(plot.getAxes(), function (_, axis) {
- var opts = axis.options,
- min, max, d = delta[axis.direction];
-
- min = axis.c2p(axis.p2c(axis.min) + d),
- max = axis.c2p(axis.p2c(axis.max) + d);
-
- var pr = opts.panRange;
- if (pr === false) // no panning on this axis
- return;
-
- if (pr) {
- // check whether we hit the wall
- if (pr[0] != null && pr[0] > min) {
- d = pr[0] - min;
- min += d;
- max += d;
- }
-
- if (pr[1] != null && pr[1] < max) {
- d = pr[1] - max;
- min += d;
- max += d;
- }
- }
-
- opts.min = min;
- opts.max = max;
- });
-
- plot.setupGrid();
- plot.draw();
-
- if (!args.preventEvent)
- plot.getPlaceholder().trigger("plotpan", [ plot, args ]);
- };
-
- function shutdown(plot, eventHolder) {
- eventHolder.unbind(plot.getOptions().zoom.trigger, onZoomClick);
- eventHolder.unbind("mousewheel", onMouseWheel);
- eventHolder.unbind("dragstart", onDragStart);
- eventHolder.unbind("drag", onDrag);
- eventHolder.unbind("dragend", onDragEnd);
- if (panTimeout)
- clearTimeout(panTimeout);
- }
-
- plot.hooks.bindEvents.push(bindEvents);
- plot.hooks.shutdown.push(shutdown);
- }
-
- $.plot.plugins.push({
- init: init,
- options: options,
- name: 'navigate',
- version: '1.3'
- });
-})(jQuery);
diff --git a/htdocs/includes/jquery/plugins/flot/jquery.flot.navigate.min.js b/htdocs/includes/jquery/plugins/flot/jquery.flot.navigate.min.js
deleted file mode 100644
index 7288a23fab3..00000000000
--- a/htdocs/includes/jquery/plugins/flot/jquery.flot.navigate.min.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/* Javascript plotting library for jQuery, version 0.8.3.
-
-Copyright (c) 2007-2014 IOLA and Ole Laursen.
-Licensed under the MIT license.
-
-*/
-(function(a){function e(h){var k,j=this,l=h.data||{};if(l.elem)j=h.dragTarget=l.elem,h.dragProxy=d.proxy||j,h.cursorOffsetX=l.pageX-l.left,h.cursorOffsetY=l.pageY-l.top,h.offsetX=h.pageX-h.cursorOffsetX,h.offsetY=h.pageY-h.cursorOffsetY;else if(d.dragging||l.which>0&&h.which!=l.which||a(h.target).is(l.not))return;switch(h.type){case"mousedown":return a.extend(l,a(j).offset(),{elem:j,target:h.target,pageX:h.pageX,pageY:h.pageY}),b.add(document,"mousemove mouseup",e,l),i(j,!1),d.dragging=null,!1;case!d.dragging&&"mousemove":if(g(h.pageX-l.pageX)+g(h.pageY-l.pageY)max){var tmp=min;min=max;max=tmp}if(pr){if(pr[0]!=null&&minpr[1]){max=pr[1]}}var range=max-min;if(zr&&(zr[0]!=null&&range1||zr[1]!=null&&range>zr[1]&&amount<1))return;opts.min=min;opts.max=max});plot.setupGrid();plot.draw();if(!args.preventEvent)plot.getPlaceholder().trigger("plotzoom",[plot,args])};plot.pan=function(args){var delta={x:+args.left,y:+args.top};if(isNaN(delta.x))delta.x=0;if(isNaN(delta.y))delta.y=0;$.each(plot.getAxes(),function(_,axis){var opts=axis.options,min,max,d=delta[axis.direction];min=axis.c2p(axis.p2c(axis.min)+d),max=axis.c2p(axis.p2c(axis.max)+d);var pr=opts.panRange;if(pr===false)return;if(pr){if(pr[0]!=null&&pr[0]>min){d=pr[0]-min;min+=d;max+=d}if(pr[1]!=null&&pr[1] 1) {
- options.series.pie.tilt = 1;
- } else if (options.series.pie.tilt < 0) {
- options.series.pie.tilt = 0;
- }
- }
- });
-
- plot.hooks.bindEvents.push(function(plot, eventHolder) {
- var options = plot.getOptions();
- if (options.series.pie.show) {
- if (options.grid.hoverable) {
- eventHolder.unbind("mousemove").mousemove(onMouseMove);
- }
- if (options.grid.clickable) {
- eventHolder.unbind("click").click(onClick);
- }
- }
- });
-
- plot.hooks.processDatapoints.push(function(plot, series, data, datapoints) {
- var options = plot.getOptions();
- if (options.series.pie.show) {
- processDatapoints(plot, series, data, datapoints);
- }
- });
-
- plot.hooks.drawOverlay.push(function(plot, octx) {
- var options = plot.getOptions();
- if (options.series.pie.show) {
- drawOverlay(plot, octx);
- }
- });
-
- plot.hooks.draw.push(function(plot, newCtx) {
- var options = plot.getOptions();
- if (options.series.pie.show) {
- draw(plot, newCtx);
- }
- });
-
- function processDatapoints(plot, series, datapoints) {
- if (!processed) {
- processed = true;
- canvas = plot.getCanvas();
- target = $(canvas).parent();
- options = plot.getOptions();
- plot.setData(combine(plot.getData()));
- }
- }
-
- function combine(data) {
-
- var total = 0,
- combined = 0,
- numCombined = 0,
- color = options.series.pie.combine.color,
- newdata = [];
-
- // Fix up the raw data from Flot, ensuring the data is numeric
-
- for (var i = 0; i < data.length; ++i) {
-
- var value = data[i].data;
-
- // If the data is an array, we'll assume that it's a standard
- // Flot x-y pair, and are concerned only with the second value.
-
- // Note how we use the original array, rather than creating a
- // new one; this is more efficient and preserves any extra data
- // that the user may have stored in higher indexes.
-
- if ($.isArray(value) && value.length == 1) {
- value = value[0];
- }
-
- if ($.isArray(value)) {
- // Equivalent to $.isNumeric() but compatible with jQuery < 1.7
- if (!isNaN(parseFloat(value[1])) && isFinite(value[1])) {
- value[1] = +value[1];
- } else {
- value[1] = 0;
- }
- } else if (!isNaN(parseFloat(value)) && isFinite(value)) {
- value = [1, +value];
- } else {
- value = [1, 0];
- }
-
- data[i].data = [value];
- }
-
- // Sum up all the slices, so we can calculate percentages for each
-
- for (var i = 0; i < data.length; ++i) {
- total += data[i].data[0][1];
- }
-
- // Count the number of slices with percentages below the combine
- // threshold; if it turns out to be just one, we won't combine.
-
- for (var i = 0; i < data.length; ++i) {
- var value = data[i].data[0][1];
- if (value / total <= options.series.pie.combine.threshold) {
- combined += value;
- numCombined++;
- if (!color) {
- color = data[i].color;
- }
- }
- }
-
- for (var i = 0; i < data.length; ++i) {
- var value = data[i].data[0][1];
- if (numCombined < 2 || value / total > options.series.pie.combine.threshold) {
- newdata.push(
- $.extend(data[i], { /* extend to allow keeping all other original data values
- and using them e.g. in labelFormatter. */
- data: [[1, value]],
- color: data[i].color,
- label: data[i].label,
- angle: value * Math.PI * 2 / total,
- percent: value / (total / 100)
- })
- );
- }
- }
-
- if (numCombined > 1) {
- newdata.push({
- data: [[1, combined]],
- color: color,
- label: options.series.pie.combine.label,
- angle: combined * Math.PI * 2 / total,
- percent: combined / (total / 100)
- });
- }
-
- return newdata;
- }
-
- function draw(plot, newCtx) {
-
- if (!target) {
- return; // if no series were passed
- }
-
- var canvasWidth = plot.getPlaceholder().width(),
- canvasHeight = plot.getPlaceholder().height(),
- legendWidth = target.children().filter(".legend").children().width() || 0;
-
- ctx = newCtx;
-
- // WARNING: HACK! REWRITE THIS CODE AS SOON AS POSSIBLE!
-
- // When combining smaller slices into an 'other' slice, we need to
- // add a new series. Since Flot gives plugins no way to modify the
- // list of series, the pie plugin uses a hack where the first call
- // to processDatapoints results in a call to setData with the new
- // list of series, then subsequent processDatapoints do nothing.
-
- // The plugin-global 'processed' flag is used to control this hack;
- // it starts out false, and is set to true after the first call to
- // processDatapoints.
-
- // Unfortunately this turns future setData calls into no-ops; they
- // call processDatapoints, the flag is true, and nothing happens.
-
- // To fix this we'll set the flag back to false here in draw, when
- // all series have been processed, so the next sequence of calls to
- // processDatapoints once again starts out with a slice-combine.
- // This is really a hack; in 0.9 we need to give plugins a proper
- // way to modify series before any processing begins.
-
- processed = false;
-
- // calculate maximum radius and center point
-
- maxRadius = Math.min(canvasWidth, canvasHeight / options.series.pie.tilt) / 2;
- centerTop = canvasHeight / 2 + options.series.pie.offset.top;
- centerLeft = canvasWidth / 2;
-
- if (options.series.pie.offset.left == "auto") {
- if (options.legend.position.match("w")) {
- centerLeft += legendWidth / 2;
- } else {
- centerLeft -= legendWidth / 2;
- }
- if (centerLeft < maxRadius) {
- centerLeft = maxRadius;
- } else if (centerLeft > canvasWidth - maxRadius) {
- centerLeft = canvasWidth - maxRadius;
- }
- } else {
- centerLeft += options.series.pie.offset.left;
- }
-
- var slices = plot.getData(),
- attempts = 0;
-
- // Keep shrinking the pie's radius until drawPie returns true,
- // indicating that all the labels fit, or we try too many times.
-
- do {
- if (attempts > 0) {
- maxRadius *= REDRAW_SHRINK;
- }
- attempts += 1;
- clear();
- if (options.series.pie.tilt <= 0.8) {
- drawShadow();
- }
- } while (!drawPie() && attempts < REDRAW_ATTEMPTS)
-
- if (attempts >= REDRAW_ATTEMPTS) {
- clear();
- target.prepend("options.series.pie.combine.threshold){newdata.push($.extend(data[i],{data:[[1,value]],color:data[i].color,label:data[i].label,angle:value*Math.PI*2/total,percent:value/(total/100)}))}}if(numCombined>1){newdata.push({data:[[1,combined]],color:color,label:options.series.pie.combine.label,angle:combined*Math.PI*2/total,percent:combined/(total/100)})}return newdata}function draw(plot,newCtx){if(!target){return}var canvasWidth=plot.getPlaceholder().width(),canvasHeight=plot.getPlaceholder().height(),legendWidth=target.children().filter(".legend").children().width()||0;ctx=newCtx;processed=false;maxRadius=Math.min(canvasWidth,canvasHeight/options.series.pie.tilt)/2;centerTop=canvasHeight/2+options.series.pie.offset.top;centerLeft=canvasWidth/2;if(options.series.pie.offset.left=="auto"){if(options.legend.position.match("w")){centerLeft+=legendWidth/2}else{centerLeft-=legendWidth/2}if(centerLeftcanvasWidth-maxRadius){centerLeft=canvasWidth-maxRadius}}else{centerLeft+=options.series.pie.offset.left}var slices=plot.getData(),attempts=0;do{if(attempts>0){maxRadius*=REDRAW_SHRINK}attempts+=1;clear();if(options.series.pie.tilt<=.8){drawShadow()}}while(!drawPie()&&attempts=REDRAW_ATTEMPTS){clear();target.prepend("0){ctx.save();ctx.lineWidth=options.series.pie.stroke.width;currentAngle=startAngle;for(var i=0;i1e-9){ctx.moveTo(0,0)}ctx.arc(0,0,radius,currentAngle,currentAngle+angle/2,false);ctx.arc(0,0,radius,currentAngle+angle/2,currentAngle+angle,false);ctx.closePath();currentAngle+=angle;if(fill){ctx.fill()}else{ctx.stroke()}}function drawLabels(){var currentAngle=startAngle;var radius=options.series.pie.label.radius>1?options.series.pie.label.radius:maxRadius*options.series.pie.label.radius;for(var i=0;i=options.series.pie.label.threshold*100){if(!drawLabel(slices[i],currentAngle,i)){return false}}currentAngle+=slices[i].angle}return true;function drawLabel(slice,startAngle,index){if(slice.data[0][1]==0){return true}var lf=options.legend.labelFormatter,text,plf=options.series.pie.label.formatter;if(lf){text=lf(slice.label,slice)}else{text=slice.label}if(plf){text=plf(text,slice)}var halfAngle=(startAngle+slice.angle+startAngle)/2;var x=centerLeft+Math.round(Math.cos(halfAngle)*radius);var y=centerTop+Math.round(Math.sin(halfAngle)*radius)*options.series.pie.tilt;var html=""+text+"";target.append(html);var label=target.children("#pieLabel"+index);var labelTop=y-label.height()/2;var labelLeft=x-label.width()/2;label.css("top",labelTop);label.css("left",labelLeft);if(0-labelTop>0||0-labelLeft>0||canvasHeight-(labelTop+label.height())<0||canvasWidth-(labelLeft+label.width())<0){return false}if(options.series.pie.label.background.opacity!=0){var c=options.series.pie.label.background.color;if(c==null){c=slice.color}var pos="top:"+labelTop+"px;left:"+labelLeft+"px;";$("").css("opacity",options.series.pie.label.background.opacity).insertBefore(label)}return true}}}}function drawDonutHole(layer){if(options.series.pie.innerRadius>0){layer.save();var innerRadius=options.series.pie.innerRadius>1?options.series.pie.innerRadius:maxRadius*options.series.pie.innerRadius;layer.globalCompositeOperation="destination-out";layer.beginPath();layer.fillStyle=options.series.pie.stroke.color;layer.arc(0,0,innerRadius,0,Math.PI*2,false);layer.fill();layer.closePath();layer.restore();layer.save();layer.beginPath();layer.strokeStyle=options.series.pie.stroke.color;layer.arc(0,0,innerRadius,0,Math.PI*2,false);layer.stroke();layer.closePath();layer.restore()}}function isPointInPoly(poly,pt){for(var c=false,i=-1,l=poly.length,j=l-1;++i1?options.series.pie.radius:maxRadius*options.series.pie.radius,x,y;for(var i=0;i1?options.series.pie.radius:maxRadius*options.series.pie.radius;octx.save();octx.translate(centerLeft,centerTop);octx.scale(1,options.series.pie.tilt);for(var i=0;i1e-9){octx.moveTo(0,0)}octx.arc(0,0,radius,series.startAngle,series.startAngle+series.angle/2,false);octx.arc(0,0,radius,series.startAngle+series.angle/2,series.startAngle+series.angle,false);octx.closePath();octx.fill()}}}var options={series:{pie:{show:false,radius:"auto",innerRadius:0,startAngle:3/2,tilt:1,shadow:{left:5,top:15,alpha:.02},offset:{top:0,left:"auto"},stroke:{color:"#fff",width:1},label:{show:"auto",formatter:function(label,slice){return"max?max:value}function setSelectionPos(pos,e){var o=plot.getOptions();var offset=plot.getPlaceholder().offset();var plotOffset=plot.getPlotOffset();pos.x=clamp(0,e.pageX-offset.left-plotOffset.left,plot.width());pos.y=clamp(0,e.pageY-offset.top-plotOffset.top,plot.height());if(o.selection.mode=="y")pos.x=pos==selection.first?0:plot.width();if(o.selection.mode=="x")pos.y=pos==selection.first?0:plot.height()}function updateSelection(pos){if(pos.pageX==null)return;setSelectionPos(selection.second,pos);if(selectionIsSane()){selection.show=true;plot.triggerRedrawOverlay()}else clearSelection(true)}function clearSelection(preventEvent){if(selection.show){selection.show=false;plot.triggerRedrawOverlay();if(!preventEvent)plot.getPlaceholder().trigger("plotunselected",[])}}function extractRange(ranges,coord){var axis,from,to,key,axes=plot.getAxes();for(var k in axes){axis=axes[k];if(axis.direction==coord){key=coord+axis.n+"axis";if(!ranges[key]&&axis.n==1)key=coord+"axis";if(ranges[key]){from=ranges[key].from;to=ranges[key].to;break}}}if(!ranges[key]){axis=coord=="x"?plot.getXAxes()[0]:plot.getYAxes()[0];from=ranges[coord+"1"];to=ranges[coord+"2"]}if(from!=null&&to!=null&&from>to){var tmp=from;from=to;to=tmp}return{from:from,to:to,axis:axis}}function setSelection(ranges,preventEvent){var axis,range,o=plot.getOptions();if(o.selection.mode=="y"){selection.first.x=0;selection.second.x=plot.width()}else{range=extractRange(ranges,"x");selection.first.x=range.axis.p2c(range.from);selection.second.x=range.axis.p2c(range.to)}if(o.selection.mode=="x"){selection.first.y=0;selection.second.y=plot.height()}else{range=extractRange(ranges,"y");selection.first.y=range.axis.p2c(range.from);selection.second.y=range.axis.p2c(range.to)}selection.show=true;plot.triggerRedrawOverlay();if(!preventEvent&&selectionIsSane())triggerSelectedEvent()}function selectionIsSane(){var minSize=plot.getOptions().selection.minSize;return Math.abs(selection.second.x-selection.first.x)>=minSize&&Math.abs(selection.second.y-selection.first.y)>=minSize}plot.clearSelection=clearSelection;plot.setSelection=setSelection;plot.getSelection=getSelection;plot.hooks.bindEvents.push(function(plot,eventHolder){var o=plot.getOptions();if(o.selection.mode!=null){eventHolder.mousemove(onMouseMove);eventHolder.mousedown(onMouseDown)}});plot.hooks.drawOverlay.push(function(plot,ctx){if(selection.show&&selectionIsSane()){var plotOffset=plot.getPlotOffset();var o=plot.getOptions();ctx.save();ctx.translate(plotOffset.left,plotOffset.top);var c=$.color.parse(o.selection.color);ctx.strokeStyle=c.scale("a",.8).toString();ctx.lineWidth=1;ctx.lineJoin=o.selection.shape;ctx.fillStyle=c.scale("a",.4).toString();var x=Math.min(selection.first.x,selection.second.x)+.5,y=Math.min(selection.first.y,selection.second.y)+.5,w=Math.abs(selection.second.x-selection.first.x)-1,h=Math.abs(selection.second.y-selection.first.y)-1;ctx.fillRect(x,y,w,h);ctx.strokeRect(x,y,w,h);ctx.restore()}});plot.hooks.shutdown.push(function(plot,eventHolder){eventHolder.unbind("mousemove",onMouseMove);eventHolder.unbind("mousedown",onMouseDown);if(mouseUpHandler)$(document).unbind("mouseup",mouseUpHandler)})}$.plot.plugins.push({init:init,options:{selection:{mode:null,color:"#e8cfac",shape:"round",minSize:5}},name:"selection",version:"1.1"})})(jQuery);
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/flot/jquery.flot.stack.js b/htdocs/includes/jquery/plugins/flot/jquery.flot.stack.js
deleted file mode 100644
index e75a7dfc074..00000000000
--- a/htdocs/includes/jquery/plugins/flot/jquery.flot.stack.js
+++ /dev/null
@@ -1,188 +0,0 @@
-/* Flot plugin for stacking data sets rather than overlyaing them.
-
-Copyright (c) 2007-2014 IOLA and Ole Laursen.
-Licensed under the MIT license.
-
-The plugin assumes the data is sorted on x (or y if stacking horizontally).
-For line charts, it is assumed that if a line has an undefined gap (from a
-null point), then the line above it should have the same gap - insert zeros
-instead of "null" if you want another behaviour. This also holds for the start
-and end of the chart. Note that stacking a mix of positive and negative values
-in most instances doesn't make sense (so it looks weird).
-
-Two or more series are stacked when their "stack" attribute is set to the same
-key (which can be any number or string or just "true"). To specify the default
-stack, you can set the stack option like this:
-
- series: {
- stack: null/false, true, or a key (number/string)
- }
-
-You can also specify it for a single series, like this:
-
- $.plot( $("#placeholder"), [{
- data: [ ... ],
- stack: true
- }])
-
-The stacking order is determined by the order of the data series in the array
-(later series end up on top of the previous).
-
-Internally, the plugin modifies the datapoints in each series, adding an
-offset to the y value. For line series, extra data points are inserted through
-interpolation. If there's a second y value, it's also adjusted (e.g for bar
-charts or filled areas).
-
-*/
-
-(function ($) {
- var options = {
- series: { stack: null } // or number/string
- };
-
- function init(plot) {
- function findMatchingSeries(s, allseries) {
- var res = null;
- for (var i = 0; i < allseries.length; ++i) {
- if (s == allseries[i])
- break;
-
- if (allseries[i].stack == s.stack)
- res = allseries[i];
- }
-
- return res;
- }
-
- function stackData(plot, s, datapoints) {
- if (s.stack == null || s.stack === false)
- return;
-
- var other = findMatchingSeries(s, plot.getData());
- if (!other)
- return;
-
- var ps = datapoints.pointsize,
- points = datapoints.points,
- otherps = other.datapoints.pointsize,
- otherpoints = other.datapoints.points,
- newpoints = [],
- px, py, intery, qx, qy, bottom,
- withlines = s.lines.show,
- horizontal = s.bars.horizontal,
- withbottom = ps > 2 && (horizontal ? datapoints.format[2].x : datapoints.format[2].y),
- withsteps = withlines && s.lines.steps,
- fromgap = true,
- keyOffset = horizontal ? 1 : 0,
- accumulateOffset = horizontal ? 0 : 1,
- i = 0, j = 0, l, m;
-
- while (true) {
- if (i >= points.length)
- break;
-
- l = newpoints.length;
-
- if (points[i] == null) {
- // copy gaps
- for (m = 0; m < ps; ++m)
- newpoints.push(points[i + m]);
- i += ps;
- }
- else if (j >= otherpoints.length) {
- // for lines, we can't use the rest of the points
- if (!withlines) {
- for (m = 0; m < ps; ++m)
- newpoints.push(points[i + m]);
- }
- i += ps;
- }
- else if (otherpoints[j] == null) {
- // oops, got a gap
- for (m = 0; m < ps; ++m)
- newpoints.push(null);
- fromgap = true;
- j += otherps;
- }
- else {
- // cases where we actually got two points
- px = points[i + keyOffset];
- py = points[i + accumulateOffset];
- qx = otherpoints[j + keyOffset];
- qy = otherpoints[j + accumulateOffset];
- bottom = 0;
-
- if (px == qx) {
- for (m = 0; m < ps; ++m)
- newpoints.push(points[i + m]);
-
- newpoints[l + accumulateOffset] += qy;
- bottom = qy;
-
- i += ps;
- j += otherps;
- }
- else if (px > qx) {
- // we got past point below, might need to
- // insert interpolated extra point
- if (withlines && i > 0 && points[i - ps] != null) {
- intery = py + (points[i - ps + accumulateOffset] - py) * (qx - px) / (points[i - ps + keyOffset] - px);
- newpoints.push(qx);
- newpoints.push(intery + qy);
- for (m = 2; m < ps; ++m)
- newpoints.push(points[i + m]);
- bottom = qy;
- }
-
- j += otherps;
- }
- else { // px < qx
- if (fromgap && withlines) {
- // if we come from a gap, we just skip this point
- i += ps;
- continue;
- }
-
- for (m = 0; m < ps; ++m)
- newpoints.push(points[i + m]);
-
- // we might be able to interpolate a point below,
- // this can give us a better y
- if (withlines && j > 0 && otherpoints[j - otherps] != null)
- bottom = qy + (otherpoints[j - otherps + accumulateOffset] - qy) * (px - qx) / (otherpoints[j - otherps + keyOffset] - qx);
-
- newpoints[l + accumulateOffset] += bottom;
-
- i += ps;
- }
-
- fromgap = false;
-
- if (l != newpoints.length && withbottom)
- newpoints[l + 2] += bottom;
- }
-
- // maintain the line steps invariant
- if (withsteps && l != newpoints.length && l > 0
- && newpoints[l] != null
- && newpoints[l] != newpoints[l - ps]
- && newpoints[l + 1] != newpoints[l - ps + 1]) {
- for (m = 0; m < ps; ++m)
- newpoints[l + ps + m] = newpoints[l + m];
- newpoints[l + 1] = newpoints[l - ps + 1];
- }
- }
-
- datapoints.points = newpoints;
- }
-
- plot.hooks.processDatapoints.push(stackData);
- }
-
- $.plot.plugins.push({
- init: init,
- options: options,
- name: 'stack',
- version: '1.2'
- });
-})(jQuery);
diff --git a/htdocs/includes/jquery/plugins/flot/jquery.flot.stack.min.js b/htdocs/includes/jquery/plugins/flot/jquery.flot.stack.min.js
deleted file mode 100644
index 920764f5e7c..00000000000
--- a/htdocs/includes/jquery/plugins/flot/jquery.flot.stack.min.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/* Javascript plotting library for jQuery, version 0.8.3.
-
-Copyright (c) 2007-2014 IOLA and Ole Laursen.
-Licensed under the MIT license.
-
-*/
-(function($){var options={series:{stack:null}};function init(plot){function findMatchingSeries(s,allseries){var res=null;for(var i=0;i2&&(horizontal?datapoints.format[2].x:datapoints.format[2].y),withsteps=withlines&&s.lines.steps,fromgap=true,keyOffset=horizontal?1:0,accumulateOffset=horizontal?0:1,i=0,j=0,l,m;while(true){if(i>=points.length)break;l=newpoints.length;if(points[i]==null){for(m=0;m=otherpoints.length){if(!withlines){for(m=0;mqx){if(withlines&&i>0&&points[i-ps]!=null){intery=py+(points[i-ps+accumulateOffset]-py)*(qx-px)/(points[i-ps+keyOffset]-px);newpoints.push(qx);newpoints.push(intery+qy);for(m=2;m0&&otherpoints[j-otherps]!=null)bottom=qy+(otherpoints[j-otherps+accumulateOffset]-qy)*(px-qx)/(otherpoints[j-otherps+keyOffset]-qx);newpoints[l+accumulateOffset]+=bottom;i+=ps}fromgap=false;if(l!=newpoints.length&&withbottom)newpoints[l+2]+=bottom}if(withsteps&&l!=newpoints.length&&l>0&&newpoints[l]!=null&&newpoints[l]!=newpoints[l-ps]&&newpoints[l+1]!=newpoints[l-ps+1]){for(m=0;m s = r * sqrt(pi)/2
- var size = radius * Math.sqrt(Math.PI) / 2;
- ctx.rect(x - size, y - size, size + size, size + size);
- },
- diamond: function (ctx, x, y, radius, shadow) {
- // pi * r^2 = 2s^2 => s = r * sqrt(pi/2)
- var size = radius * Math.sqrt(Math.PI / 2);
- ctx.moveTo(x - size, y);
- ctx.lineTo(x, y - size);
- ctx.lineTo(x + size, y);
- ctx.lineTo(x, y + size);
- ctx.lineTo(x - size, y);
- },
- triangle: function (ctx, x, y, radius, shadow) {
- // pi * r^2 = 1/2 * s^2 * sin (pi / 3) => s = r * sqrt(2 * pi / sin(pi / 3))
- var size = radius * Math.sqrt(2 * Math.PI / Math.sin(Math.PI / 3));
- var height = size * Math.sin(Math.PI / 3);
- ctx.moveTo(x - size/2, y + height/2);
- ctx.lineTo(x + size/2, y + height/2);
- if (!shadow) {
- ctx.lineTo(x, y - height/2);
- ctx.lineTo(x - size/2, y + height/2);
- }
- },
- cross: function (ctx, x, y, radius, shadow) {
- // pi * r^2 = (2s)^2 => s = r * sqrt(pi)/2
- var size = radius * Math.sqrt(Math.PI) / 2;
- ctx.moveTo(x - size, y - size);
- ctx.lineTo(x + size, y + size);
- ctx.moveTo(x - size, y + size);
- ctx.lineTo(x + size, y - size);
- }
- };
-
- var s = series.points.symbol;
- if (handlers[s])
- series.points.symbol = handlers[s];
- }
-
- function init(plot) {
- plot.hooks.processDatapoints.push(processRawData);
- }
-
- $.plot.plugins.push({
- init: init,
- name: 'symbols',
- version: '1.0'
- });
-})(jQuery);
diff --git a/htdocs/includes/jquery/plugins/flot/jquery.flot.symbol.min.js b/htdocs/includes/jquery/plugins/flot/jquery.flot.symbol.min.js
deleted file mode 100644
index f4a3430136b..00000000000
--- a/htdocs/includes/jquery/plugins/flot/jquery.flot.symbol.min.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/* Javascript plotting library for jQuery, version 0.8.3.
-
-Copyright (c) 2007-2014 IOLA and Ole Laursen.
-Licensed under the MIT license.
-
-*/
-(function($){function processRawData(plot,series,datapoints){var handlers={square:function(ctx,x,y,radius,shadow){var size=radius*Math.sqrt(Math.PI)/2;ctx.rect(x-size,y-size,size+size,size+size)},diamond:function(ctx,x,y,radius,shadow){var size=radius*Math.sqrt(Math.PI/2);ctx.moveTo(x-size,y);ctx.lineTo(x,y-size);ctx.lineTo(x+size,y);ctx.lineTo(x,y+size);ctx.lineTo(x-size,y)},triangle:function(ctx,x,y,radius,shadow){var size=radius*Math.sqrt(2*Math.PI/Math.sin(Math.PI/3));var height=size*Math.sin(Math.PI/3);ctx.moveTo(x-size/2,y+height/2);ctx.lineTo(x+size/2,y+height/2);if(!shadow){ctx.lineTo(x,y-height/2);ctx.lineTo(x-size/2,y+height/2)}},cross:function(ctx,x,y,radius,shadow){var size=radius*Math.sqrt(Math.PI)/2;ctx.moveTo(x-size,y-size);ctx.lineTo(x+size,y+size);ctx.moveTo(x-size,y+size);ctx.lineTo(x+size,y-size)}};var s=series.points.symbol;if(handlers[s])series.points.symbol=handlers[s]}function init(plot){plot.hooks.processDatapoints.push(processRawData)}$.plot.plugins.push({init:init,name:"symbols",version:"1.0"})})(jQuery);
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/flot/jquery.flot.threshold.js b/htdocs/includes/jquery/plugins/flot/jquery.flot.threshold.js
deleted file mode 100644
index 8c99c401d87..00000000000
--- a/htdocs/includes/jquery/plugins/flot/jquery.flot.threshold.js
+++ /dev/null
@@ -1,142 +0,0 @@
-/* Flot plugin for thresholding data.
-
-Copyright (c) 2007-2014 IOLA and Ole Laursen.
-Licensed under the MIT license.
-
-The plugin supports these options:
-
- series: {
- threshold: {
- below: number
- color: colorspec
- }
- }
-
-It can also be applied to a single series, like this:
-
- $.plot( $("#placeholder"), [{
- data: [ ... ],
- threshold: { ... }
- }])
-
-An array can be passed for multiple thresholding, like this:
-
- threshold: [{
- below: number1
- color: color1
- },{
- below: number2
- color: color2
- }]
-
-These multiple threshold objects can be passed in any order since they are
-sorted by the processing function.
-
-The data points below "below" are drawn with the specified color. This makes
-it easy to mark points below 0, e.g. for budget data.
-
-Internally, the plugin works by splitting the data into two series, above and
-below the threshold. The extra series below the threshold will have its label
-cleared and the special "originSeries" attribute set to the original series.
-You may need to check for this in hover events.
-
-*/
-
-(function ($) {
- var options = {
- series: { threshold: null } // or { below: number, color: color spec}
- };
-
- function init(plot) {
- function thresholdData(plot, s, datapoints, below, color) {
- var ps = datapoints.pointsize, i, x, y, p, prevp,
- thresholded = $.extend({}, s); // note: shallow copy
-
- thresholded.datapoints = { points: [], pointsize: ps, format: datapoints.format };
- thresholded.label = null;
- thresholded.color = color;
- thresholded.threshold = null;
- thresholded.originSeries = s;
- thresholded.data = [];
-
- var origpoints = datapoints.points,
- addCrossingPoints = s.lines.show;
-
- var threspoints = [];
- var newpoints = [];
- var m;
-
- for (i = 0; i < origpoints.length; i += ps) {
- x = origpoints[i];
- y = origpoints[i + 1];
-
- prevp = p;
- if (y < below)
- p = threspoints;
- else
- p = newpoints;
-
- if (addCrossingPoints && prevp != p && x != null
- && i > 0 && origpoints[i - ps] != null) {
- var interx = x + (below - y) * (x - origpoints[i - ps]) / (y - origpoints[i - ps + 1]);
- prevp.push(interx);
- prevp.push(below);
- for (m = 2; m < ps; ++m)
- prevp.push(origpoints[i + m]);
-
- p.push(null); // start new segment
- p.push(null);
- for (m = 2; m < ps; ++m)
- p.push(origpoints[i + m]);
- p.push(interx);
- p.push(below);
- for (m = 2; m < ps; ++m)
- p.push(origpoints[i + m]);
- }
-
- p.push(x);
- p.push(y);
- for (m = 2; m < ps; ++m)
- p.push(origpoints[i + m]);
- }
-
- datapoints.points = newpoints;
- thresholded.datapoints.points = threspoints;
-
- if (thresholded.datapoints.points.length > 0) {
- var origIndex = $.inArray(s, plot.getData());
- // Insert newly-generated series right after original one (to prevent it from becoming top-most)
- plot.getData().splice(origIndex + 1, 0, thresholded);
- }
-
- // FIXME: there are probably some edge cases left in bars
- }
-
- function processThresholds(plot, s, datapoints) {
- if (!s.threshold)
- return;
-
- if (s.threshold instanceof Array) {
- s.threshold.sort(function(a, b) {
- return a.below - b.below;
- });
-
- $(s.threshold).each(function(i, th) {
- thresholdData(plot, s, datapoints, th.below, th.color);
- });
- }
- else {
- thresholdData(plot, s, datapoints, s.threshold.below, s.threshold.color);
- }
- }
-
- plot.hooks.processDatapoints.push(processThresholds);
- }
-
- $.plot.plugins.push({
- init: init,
- options: options,
- name: 'threshold',
- version: '1.2'
- });
-})(jQuery);
diff --git a/htdocs/includes/jquery/plugins/flot/jquery.flot.threshold.min.js b/htdocs/includes/jquery/plugins/flot/jquery.flot.threshold.min.js
deleted file mode 100644
index ce93e0f4808..00000000000
--- a/htdocs/includes/jquery/plugins/flot/jquery.flot.threshold.min.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/* Javascript plotting library for jQuery, version 0.8.3.
-
-Copyright (c) 2007-2014 IOLA and Ole Laursen.
-Licensed under the MIT license.
-
-*/
-(function($){var options={series:{threshold:null}};function init(plot){function thresholdData(plot,s,datapoints,below,color){var ps=datapoints.pointsize,i,x,y,p,prevp,thresholded=$.extend({},s);thresholded.datapoints={points:[],pointsize:ps,format:datapoints.format};thresholded.label=null;thresholded.color=color;thresholded.threshold=null;thresholded.originSeries=s;thresholded.data=[];var origpoints=datapoints.points,addCrossingPoints=s.lines.show;var threspoints=[];var newpoints=[];var m;for(i=0;i0&&origpoints[i-ps]!=null){var interx=x+(below-y)*(x-origpoints[i-ps])/(y-origpoints[i-ps+1]);prevp.push(interx);prevp.push(below);for(m=2;m0){var origIndex=$.inArray(s,plot.getData());plot.getData().splice(origIndex+1,0,thresholded)}}function processThresholds(plot,s,datapoints){if(!s.threshold)return;if(s.threshold instanceof Array){s.threshold.sort(function(a,b){return a.below-b.below});$(s.threshold).each(function(i,th){thresholdData(plot,s,datapoints,th.below,th.color)})}else{thresholdData(plot,s,datapoints,s.threshold.below,s.threshold.color)}}plot.hooks.processDatapoints.push(processThresholds)}$.plot.plugins.push({init:init,options:options,name:"threshold",version:"1.2"})})(jQuery);
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/flot/jquery.flot.time.js b/htdocs/includes/jquery/plugins/flot/jquery.flot.time.js
deleted file mode 100644
index 34c1d121259..00000000000
--- a/htdocs/includes/jquery/plugins/flot/jquery.flot.time.js
+++ /dev/null
@@ -1,432 +0,0 @@
-/* Pretty handling of time axes.
-
-Copyright (c) 2007-2014 IOLA and Ole Laursen.
-Licensed under the MIT license.
-
-Set axis.mode to "time" to enable. See the section "Time series data" in
-API.txt for details.
-
-*/
-
-(function($) {
-
- var options = {
- xaxis: {
- timezone: null, // "browser" for local to the client or timezone for timezone-js
- timeformat: null, // format string to use
- twelveHourClock: false, // 12 or 24 time in time mode
- monthNames: null // list of names of months
- }
- };
-
- // round to nearby lower multiple of base
-
- function floorInBase(n, base) {
- return base * Math.floor(n / base);
- }
-
- // Returns a string with the date d formatted according to fmt.
- // A subset of the Open Group's strftime format is supported.
-
- function formatDate(d, fmt, monthNames, dayNames) {
-
- if (typeof d.strftime == "function") {
- return d.strftime(fmt);
- }
-
- var leftPad = function(n, pad) {
- n = "" + n;
- pad = "" + (pad == null ? "0" : pad);
- return n.length == 1 ? pad + n : n;
- };
-
- var r = [];
- var escape = false;
- var hours = d.getHours();
- var isAM = hours < 12;
-
- if (monthNames == null) {
- monthNames = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
- }
-
- if (dayNames == null) {
- dayNames = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];
- }
-
- var hours12;
-
- if (hours > 12) {
- hours12 = hours - 12;
- } else if (hours == 0) {
- hours12 = 12;
- } else {
- hours12 = hours;
- }
-
- for (var i = 0; i < fmt.length; ++i) {
-
- var c = fmt.charAt(i);
-
- if (escape) {
- switch (c) {
- case 'a': c = "" + dayNames[d.getDay()]; break;
- case 'b': c = "" + monthNames[d.getMonth()]; break;
- case 'd': c = leftPad(d.getDate()); break;
- case 'e': c = leftPad(d.getDate(), " "); break;
- case 'h': // For back-compat with 0.7; remove in 1.0
- case 'H': c = leftPad(hours); break;
- case 'I': c = leftPad(hours12); break;
- case 'l': c = leftPad(hours12, " "); break;
- case 'm': c = leftPad(d.getMonth() + 1); break;
- case 'M': c = leftPad(d.getMinutes()); break;
- // quarters not in Open Group's strftime specification
- case 'q':
- c = "" + (Math.floor(d.getMonth() / 3) + 1); break;
- case 'S': c = leftPad(d.getSeconds()); break;
- case 'y': c = leftPad(d.getFullYear() % 100); break;
- case 'Y': c = "" + d.getFullYear(); break;
- case 'p': c = (isAM) ? ("" + "am") : ("" + "pm"); break;
- case 'P': c = (isAM) ? ("" + "AM") : ("" + "PM"); break;
- case 'w': c = "" + d.getDay(); break;
- }
- r.push(c);
- escape = false;
- } else {
- if (c == "%") {
- escape = true;
- } else {
- r.push(c);
- }
- }
- }
-
- return r.join("");
- }
-
- // To have a consistent view of time-based data independent of which time
- // zone the client happens to be in we need a date-like object independent
- // of time zones. This is done through a wrapper that only calls the UTC
- // versions of the accessor methods.
-
- function makeUtcWrapper(d) {
-
- function addProxyMethod(sourceObj, sourceMethod, targetObj, targetMethod) {
- sourceObj[sourceMethod] = function() {
- return targetObj[targetMethod].apply(targetObj, arguments);
- };
- };
-
- var utc = {
- date: d
- };
-
- // support strftime, if found
-
- if (d.strftime != undefined) {
- addProxyMethod(utc, "strftime", d, "strftime");
- }
-
- addProxyMethod(utc, "getTime", d, "getTime");
- addProxyMethod(utc, "setTime", d, "setTime");
-
- var props = ["Date", "Day", "FullYear", "Hours", "Milliseconds", "Minutes", "Month", "Seconds"];
-
- for (var p = 0; p < props.length; p++) {
- addProxyMethod(utc, "get" + props[p], d, "getUTC" + props[p]);
- addProxyMethod(utc, "set" + props[p], d, "setUTC" + props[p]);
- }
-
- return utc;
- };
-
- // select time zone strategy. This returns a date-like object tied to the
- // desired timezone
-
- function dateGenerator(ts, opts) {
- if (opts.timezone == "browser") {
- return new Date(ts);
- } else if (!opts.timezone || opts.timezone == "utc") {
- return makeUtcWrapper(new Date(ts));
- } else if (typeof timezoneJS != "undefined" && typeof timezoneJS.Date != "undefined") {
- var d = new timezoneJS.Date();
- // timezone-js is fickle, so be sure to set the time zone before
- // setting the time.
- d.setTimezone(opts.timezone);
- d.setTime(ts);
- return d;
- } else {
- return makeUtcWrapper(new Date(ts));
- }
- }
-
- // map of app. size of time units in milliseconds
-
- var timeUnitSize = {
- "second": 1000,
- "minute": 60 * 1000,
- "hour": 60 * 60 * 1000,
- "day": 24 * 60 * 60 * 1000,
- "month": 30 * 24 * 60 * 60 * 1000,
- "quarter": 3 * 30 * 24 * 60 * 60 * 1000,
- "year": 365.2425 * 24 * 60 * 60 * 1000
- };
-
- // the allowed tick sizes, after 1 year we use
- // an integer algorithm
-
- var baseSpec = [
- [1, "second"], [2, "second"], [5, "second"], [10, "second"],
- [30, "second"],
- [1, "minute"], [2, "minute"], [5, "minute"], [10, "minute"],
- [30, "minute"],
- [1, "hour"], [2, "hour"], [4, "hour"],
- [8, "hour"], [12, "hour"],
- [1, "day"], [2, "day"], [3, "day"],
- [0.25, "month"], [0.5, "month"], [1, "month"],
- [2, "month"]
- ];
-
- // we don't know which variant(s) we'll need yet, but generating both is
- // cheap
-
- var specMonths = baseSpec.concat([[3, "month"], [6, "month"],
- [1, "year"]]);
- var specQuarters = baseSpec.concat([[1, "quarter"], [2, "quarter"],
- [1, "year"]]);
-
- function init(plot) {
- plot.hooks.processOptions.push(function (plot, options) {
- $.each(plot.getAxes(), function(axisName, axis) {
-
- var opts = axis.options;
-
- if (opts.mode == "time") {
- axis.tickGenerator = function(axis) {
-
- var ticks = [];
- var d = dateGenerator(axis.min, opts);
- var minSize = 0;
-
- // make quarter use a possibility if quarters are
- // mentioned in either of these options
-
- var spec = (opts.tickSize && opts.tickSize[1] ===
- "quarter") ||
- (opts.minTickSize && opts.minTickSize[1] ===
- "quarter") ? specQuarters : specMonths;
-
- if (opts.minTickSize != null) {
- if (typeof opts.tickSize == "number") {
- minSize = opts.tickSize;
- } else {
- minSize = opts.minTickSize[0] * timeUnitSize[opts.minTickSize[1]];
- }
- }
-
- for (var i = 0; i < spec.length - 1; ++i) {
- if (axis.delta < (spec[i][0] * timeUnitSize[spec[i][1]]
- + spec[i + 1][0] * timeUnitSize[spec[i + 1][1]]) / 2
- && spec[i][0] * timeUnitSize[spec[i][1]] >= minSize) {
- break;
- }
- }
-
- var size = spec[i][0];
- var unit = spec[i][1];
-
- // special-case the possibility of several years
-
- if (unit == "year") {
-
- // if given a minTickSize in years, just use it,
- // ensuring that it's an integer
-
- if (opts.minTickSize != null && opts.minTickSize[1] == "year") {
- size = Math.floor(opts.minTickSize[0]);
- } else {
-
- var magn = Math.pow(10, Math.floor(Math.log(axis.delta / timeUnitSize.year) / Math.LN10));
- var norm = (axis.delta / timeUnitSize.year) / magn;
-
- if (norm < 1.5) {
- size = 1;
- } else if (norm < 3) {
- size = 2;
- } else if (norm < 7.5) {
- size = 5;
- } else {
- size = 10;
- }
-
- size *= magn;
- }
-
- // minimum size for years is 1
-
- if (size < 1) {
- size = 1;
- }
- }
-
- axis.tickSize = opts.tickSize || [size, unit];
- var tickSize = axis.tickSize[0];
- unit = axis.tickSize[1];
-
- var step = tickSize * timeUnitSize[unit];
-
- if (unit == "second") {
- d.setSeconds(floorInBase(d.getSeconds(), tickSize));
- } else if (unit == "minute") {
- d.setMinutes(floorInBase(d.getMinutes(), tickSize));
- } else if (unit == "hour") {
- d.setHours(floorInBase(d.getHours(), tickSize));
- } else if (unit == "month") {
- d.setMonth(floorInBase(d.getMonth(), tickSize));
- } else if (unit == "quarter") {
- d.setMonth(3 * floorInBase(d.getMonth() / 3,
- tickSize));
- } else if (unit == "year") {
- d.setFullYear(floorInBase(d.getFullYear(), tickSize));
- }
-
- // reset smaller components
-
- d.setMilliseconds(0);
-
- if (step >= timeUnitSize.minute) {
- d.setSeconds(0);
- }
- if (step >= timeUnitSize.hour) {
- d.setMinutes(0);
- }
- if (step >= timeUnitSize.day) {
- d.setHours(0);
- }
- if (step >= timeUnitSize.day * 4) {
- d.setDate(1);
- }
- if (step >= timeUnitSize.month * 2) {
- d.setMonth(floorInBase(d.getMonth(), 3));
- }
- if (step >= timeUnitSize.quarter * 2) {
- d.setMonth(floorInBase(d.getMonth(), 6));
- }
- if (step >= timeUnitSize.year) {
- d.setMonth(0);
- }
-
- var carry = 0;
- var v = Number.NaN;
- var prev;
-
- do {
-
- prev = v;
- v = d.getTime();
- ticks.push(v);
-
- if (unit == "month" || unit == "quarter") {
- if (tickSize < 1) {
-
- // a bit complicated - we'll divide the
- // month/quarter up but we need to take
- // care of fractions so we don't end up in
- // the middle of a day
-
- d.setDate(1);
- var start = d.getTime();
- d.setMonth(d.getMonth() +
- (unit == "quarter" ? 3 : 1));
- var end = d.getTime();
- d.setTime(v + carry * timeUnitSize.hour + (end - start) * tickSize);
- carry = d.getHours();
- d.setHours(0);
- } else {
- d.setMonth(d.getMonth() +
- tickSize * (unit == "quarter" ? 3 : 1));
- }
- } else if (unit == "year") {
- d.setFullYear(d.getFullYear() + tickSize);
- } else {
- d.setTime(v + step);
- }
- } while (v < axis.max && v != prev);
-
- return ticks;
- };
-
- axis.tickFormatter = function (v, axis) {
-
- var d = dateGenerator(v, axis.options);
-
- // first check global format
-
- if (opts.timeformat != null) {
- return formatDate(d, opts.timeformat, opts.monthNames, opts.dayNames);
- }
-
- // possibly use quarters if quarters are mentioned in
- // any of these places
-
- var useQuarters = (axis.options.tickSize &&
- axis.options.tickSize[1] == "quarter") ||
- (axis.options.minTickSize &&
- axis.options.minTickSize[1] == "quarter");
-
- var t = axis.tickSize[0] * timeUnitSize[axis.tickSize[1]];
- var span = axis.max - axis.min;
- var suffix = (opts.twelveHourClock) ? " %p" : "";
- var hourCode = (opts.twelveHourClock) ? "%I" : "%H";
- var fmt;
-
- if (t < timeUnitSize.minute) {
- fmt = hourCode + ":%M:%S" + suffix;
- } else if (t < timeUnitSize.day) {
- if (span < 2 * timeUnitSize.day) {
- fmt = hourCode + ":%M" + suffix;
- } else {
- fmt = "%b %d " + hourCode + ":%M" + suffix;
- }
- } else if (t < timeUnitSize.month) {
- fmt = "%b %d";
- } else if ((useQuarters && t < timeUnitSize.quarter) ||
- (!useQuarters && t < timeUnitSize.year)) {
- if (span < timeUnitSize.year) {
- fmt = "%b";
- } else {
- fmt = "%b %Y";
- }
- } else if (useQuarters && t < timeUnitSize.year) {
- if (span < timeUnitSize.year) {
- fmt = "Q%q";
- } else {
- fmt = "Q%q %Y";
- }
- } else {
- fmt = "%Y";
- }
-
- var rt = formatDate(d, fmt, opts.monthNames, opts.dayNames);
-
- return rt;
- };
- }
- });
- });
- }
-
- $.plot.plugins.push({
- init: init,
- options: options,
- name: 'time',
- version: '1.0'
- });
-
- // Time-axis support used to be in Flot core, which exposed the
- // formatDate function on the plot object. Various plugins depend
- // on the function, so we need to re-expose it here.
-
- $.plot.formatDate = formatDate;
- $.plot.dateGenerator = dateGenerator;
-
-})(jQuery);
diff --git a/htdocs/includes/jquery/plugins/flot/jquery.flot.time.min.js b/htdocs/includes/jquery/plugins/flot/jquery.flot.time.min.js
deleted file mode 100644
index 690eb682551..00000000000
--- a/htdocs/includes/jquery/plugins/flot/jquery.flot.time.min.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/* Javascript plotting library for jQuery, version 0.8.3.
-
-Copyright (c) 2007-2014 IOLA and Ole Laursen.
-Licensed under the MIT license.
-
-*/
-(function($){var options={xaxis:{timezone:null,timeformat:null,twelveHourClock:false,monthNames:null}};function floorInBase(n,base){return base*Math.floor(n/base)}function formatDate(d,fmt,monthNames,dayNames){if(typeof d.strftime=="function"){return d.strftime(fmt)}var leftPad=function(n,pad){n=""+n;pad=""+(pad==null?"0":pad);return n.length==1?pad+n:n};var r=[];var escape=false;var hours=d.getHours();var isAM=hours<12;if(monthNames==null){monthNames=["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"]}if(dayNames==null){dayNames=["Sun","Mon","Tue","Wed","Thu","Fri","Sat"]}var hours12;if(hours>12){hours12=hours-12}else if(hours==0){hours12=12}else{hours12=hours}for(var i=0;i=minSize){break}}var size=spec[i][0];var unit=spec[i][1];if(unit=="year"){if(opts.minTickSize!=null&&opts.minTickSize[1]=="year"){size=Math.floor(opts.minTickSize[0])}else{var magn=Math.pow(10,Math.floor(Math.log(axis.delta/timeUnitSize.year)/Math.LN10));var norm=axis.delta/timeUnitSize.year/magn;if(norm<1.5){size=1}else if(norm<3){size=2}else if(norm<7.5){size=5}else{size=10}size*=magn}if(size<1){size=1}}axis.tickSize=opts.tickSize||[size,unit];var tickSize=axis.tickSize[0];unit=axis.tickSize[1];var step=tickSize*timeUnitSize[unit];if(unit=="second"){d.setSeconds(floorInBase(d.getSeconds(),tickSize))}else if(unit=="minute"){d.setMinutes(floorInBase(d.getMinutes(),tickSize))}else if(unit=="hour"){d.setHours(floorInBase(d.getHours(),tickSize))}else if(unit=="month"){d.setMonth(floorInBase(d.getMonth(),tickSize))}else if(unit=="quarter"){d.setMonth(3*floorInBase(d.getMonth()/3,tickSize))}else if(unit=="year"){d.setFullYear(floorInBase(d.getFullYear(),tickSize))}d.setMilliseconds(0);if(step>=timeUnitSize.minute){d.setSeconds(0)}if(step>=timeUnitSize.hour){d.setMinutes(0)}if(step>=timeUnitSize.day){d.setHours(0)}if(step>=timeUnitSize.day*4){d.setDate(1)}if(step>=timeUnitSize.month*2){d.setMonth(floorInBase(d.getMonth(),3))}if(step>=timeUnitSize.quarter*2){d.setMonth(floorInBase(d.getMonth(),6))}if(step>=timeUnitSize.year){d.setMonth(0)}var carry=0;var v=Number.NaN;var prev;do{prev=v;v=d.getTime();ticks.push(v);if(unit=="month"||unit=="quarter"){if(tickSize<1){d.setDate(1);var start=d.getTime();d.setMonth(d.getMonth()+(unit=="quarter"?3:1));var end=d.getTime();d.setTime(v+carry*timeUnitSize.hour+(end-start)*tickSize);carry=d.getHours();d.setHours(0)}else{d.setMonth(d.getMonth()+tickSize*(unit=="quarter"?3:1))}}else if(unit=="year"){d.setFullYear(d.getFullYear()+tickSize)}else{d.setTime(v+step)}}while(v
Date: Thu, 2 Apr 2020 12:37:21 +0200
Subject: [PATCH 052/336] Remove Geoipv1 library. We use now v2
---
COPYRIGHT | 2 +-
htdocs/core/class/dolgeoip.class.php | 16 +-
htdocs/includes/geoip/README.txt | 43 -
htdocs/includes/geoip/geoip.inc | 1890 -------
htdocs/includes/geoip/geoipcity.inc | 171 -
htdocs/includes/geoip/geoipregionvars.php | 4633 ------------------
htdocs/includes/geoip/sample.php | 20 -
htdocs/includes/geoip/sample_city.php | 32 -
htdocs/includes/geoip/sample_distributed.php | 31 -
htdocs/includes/geoip/sample_netspeed.php | 23 -
htdocs/includes/geoip/sample_org.php | 23 -
htdocs/includes/geoip/sample_region.php | 20 -
htdocs/includes/geoip/timezone.php | 2243 ---------
13 files changed, 7 insertions(+), 9140 deletions(-)
delete mode 100644 htdocs/includes/geoip/README.txt
delete mode 100644 htdocs/includes/geoip/geoip.inc
delete mode 100644 htdocs/includes/geoip/geoipcity.inc
delete mode 100644 htdocs/includes/geoip/geoipregionvars.php
delete mode 100644 htdocs/includes/geoip/sample.php
delete mode 100644 htdocs/includes/geoip/sample_city.php
delete mode 100644 htdocs/includes/geoip/sample_distributed.php
delete mode 100644 htdocs/includes/geoip/sample_netspeed.php
delete mode 100644 htdocs/includes/geoip/sample_org.php
delete mode 100644 htdocs/includes/geoip/sample_region.php
delete mode 100644 htdocs/includes/geoip/timezone.php
diff --git a/COPYRIGHT b/COPYRIGHT
index d32bb9b45ea..86f0489eeb3 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -16,7 +16,7 @@ AdoDb-Date 0.36 Modified BSD License Yes
CKEditor 4.12.1 LGPL-2.1+ Yes Editor WYSIWYG
EvalMath 1.0 BSD Yes Safe math expressions evaluation
Escpos-php 2.2 MIT License Yes Thermal receipt printer library, for use with ESC/POS compatible printers
-GeoIP 1.4 LGPL-2.1+ Yes Sample code to make geoip convert (not into deb package)
+GeoIP2 0.2.0 LGPL-2.1+ Yes Lib to make geoip convert
Mobiledetect 2.8.34 MIT License Yes Detect mobile devices browsers
NuSoap 0.9.5 LGPL 2.1+ Yes Library to develop SOAP Web services (not into rpm and deb package)
PEAR Mail_MIME 1.8.9 BSD Yes NuSoap dependency
diff --git a/htdocs/core/class/dolgeoip.class.php b/htdocs/core/class/dolgeoip.class.php
index 67042d2d53b..85ec9cebb24 100644
--- a/htdocs/core/class/dolgeoip.class.php
+++ b/htdocs/core/class/dolgeoip.class.php
@@ -45,7 +45,7 @@ class DolGeoIP
{
global $conf;
- $geoipversion = '2'; // 'php', '1' or '2'
+ $geoipversion = '2'; // 'php', or '2'
if (! empty($conf->global->GEOIP_VERSION)) $geoipversion = $conf->global->GEOIP_VERSION;
if ($type == 'country')
@@ -53,9 +53,7 @@ class DolGeoIP
// geoip may have been already included with PEAR
if ($geoipversion == '2' || ($geoipversion != 'php' && ! function_exists('geoip_country_code_by_name')))
{
- if ($geoipversion == '1') $res=include_once GEOIP_PATH.'geoip.inc';
- //else $res=include_once DOL_DOCUMENT_ROOT.'/includes/geoip2/vendor/autoload.php';
- else require_once DOL_DOCUMENT_ROOT.'/includes/geoip2/geoip2.phar';
+ require_once DOL_DOCUMENT_ROOT.'/includes/geoip2/geoip2.phar';
}
}
elseif ($type == 'city')
@@ -63,9 +61,7 @@ class DolGeoIP
// geoip may have been already included with PEAR
if ($geoipversion == '2' || ($geoipversion != 'php' && ! function_exists('geoip_country_code_by_name')))
{
- if ($geoipversion == '1') $res=include_once GEOIP_PATH.'geoipcity.inc';
- //else $res=include_once DOL_DOCUMENT_ROOT.'/includes/geoip2/vendor/autoload.php';
- else require_once DOL_DOCUMENT_ROOT.'/includes/geoip2/geoip2.phar';
+ require_once DOL_DOCUMENT_ROOT.'/includes/geoip2/geoip2.phar';
}
}
else { print 'ErrorBadParameterInConstructor'; return 0; }
@@ -119,7 +115,7 @@ class DolGeoIP
{
global $conf;
- $geoipversion = '2'; // 'php', '1' or '2'
+ $geoipversion = '2'; // 'php', or '2'
if (! empty($conf->global->GEOIP_VERSION)) $geoipversion = $conf->global->GEOIP_VERSION;
if (empty($this->gi))
@@ -184,7 +180,7 @@ class DolGeoIP
{
global $conf;
- $geoipversion = '2'; // 'php', '1' or '2'
+ $geoipversion = '2'; // 'php', or '2'
if (! empty($conf->global->GEOIP_VERSION)) $geoipversion = $conf->global->GEOIP_VERSION;
if (empty($this->gi))
@@ -218,7 +214,7 @@ class DolGeoIP
{
global $conf;
- $geoipversion = '2'; // 'php', '1' or '2'
+ $geoipversion = '2'; // 'php', or '2'
if (! empty($conf->global->GEOIP_VERSION)) $geoipversion = $conf->global->GEOIP_VERSION;
if ($geoipversion == 'php')
diff --git a/htdocs/includes/geoip/README.txt b/htdocs/includes/geoip/README.txt
deleted file mode 100644
index 8456d2b0e35..00000000000
--- a/htdocs/includes/geoip/README.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-Requirements
-
-None (only the 'GeoIP.dat' file is needed). To download a free GeoIP Standard Country
-database, go to
-http://maxmind.com/download/geoip/database/
-
-Install
-
-Just place the 'geoip.inc' file somewhere according to the 'include_path' directive of
-your 'php.ini' file, or just place it in the same directory as your PHP scripts.
-
-Usage
-
-Gets country name by hostname :
-
-include("geoip.inc");
-
-$gi = geoip_open("/usr/local/share/GeoIP/GeoIP.dat",GEOIP_STANDARD);
-
-echo geoip_country_code_by_addr($gi, "24.24.24.24") . "\t" .
- geoip_country_name_by_addr($gi, "24.24.24.24") . "\n";
-echo geoip_country_code_by_addr($gi, "80.24.24.24") . "\t" .
- geoip_country_name_by_addr($gi, "80.24.24.24") . "\n";
-
-geoip_close($gi);
-
-Memory Caching:
-To enable memory caching, pass GEOIP_SHARED_MEMORY or
-GEOIP_MEMORY_CACHE to the second argument of geoip_open
-
-For GEOIP_SHARED_MEMORY, requires php >= 4.0.4,
-and --enable-shmop passed at configure time, see
-http://us2.php.net/manual/en/ref.shmop.php
-In addition, you should call geoip_load_shared_mem
-before calling geoip_open. See sample_city.php for an
-example of shared memory caching.
-
-Working with PHP5.
-geoip_country_code_by_addr should work
-with PHP. For help with the other
-routines, please contact support@maxmind.com
-
-Thanks to Jim Winstead.
diff --git a/htdocs/includes/geoip/geoip.inc b/htdocs/includes/geoip/geoip.inc
deleted file mode 100644
index 301c7f266eb..00000000000
--- a/htdocs/includes/geoip/geoip.inc
+++ /dev/null
@@ -1,1890 +0,0 @@
- 0,
- "AP" => 1,
- "EU" => 2,
- "AD" => 3,
- "AE" => 4,
- "AF" => 5,
- "AG" => 6,
- "AI" => 7,
- "AL" => 8,
- "AM" => 9,
- "CW" => 10,
- "AO" => 11,
- "AQ" => 12,
- "AR" => 13,
- "AS" => 14,
- "AT" => 15,
- "AU" => 16,
- "AW" => 17,
- "AZ" => 18,
- "BA" => 19,
- "BB" => 20,
- "BD" => 21,
- "BE" => 22,
- "BF" => 23,
- "BG" => 24,
- "BH" => 25,
- "BI" => 26,
- "BJ" => 27,
- "BM" => 28,
- "BN" => 29,
- "BO" => 30,
- "BR" => 31,
- "BS" => 32,
- "BT" => 33,
- "BV" => 34,
- "BW" => 35,
- "BY" => 36,
- "BZ" => 37,
- "CA" => 38,
- "CC" => 39,
- "CD" => 40,
- "CF" => 41,
- "CG" => 42,
- "CH" => 43,
- "CI" => 44,
- "CK" => 45,
- "CL" => 46,
- "CM" => 47,
- "CN" => 48,
- "CO" => 49,
- "CR" => 50,
- "CU" => 51,
- "CV" => 52,
- "CX" => 53,
- "CY" => 54,
- "CZ" => 55,
- "DE" => 56,
- "DJ" => 57,
- "DK" => 58,
- "DM" => 59,
- "DO" => 60,
- "DZ" => 61,
- "EC" => 62,
- "EE" => 63,
- "EG" => 64,
- "EH" => 65,
- "ER" => 66,
- "ES" => 67,
- "ET" => 68,
- "FI" => 69,
- "FJ" => 70,
- "FK" => 71,
- "FM" => 72,
- "FO" => 73,
- "FR" => 74,
- "SX" => 75,
- "GA" => 76,
- "GB" => 77,
- "GD" => 78,
- "GE" => 79,
- "GF" => 80,
- "GH" => 81,
- "GI" => 82,
- "GL" => 83,
- "GM" => 84,
- "GN" => 85,
- "GP" => 86,
- "GQ" => 87,
- "GR" => 88,
- "GS" => 89,
- "GT" => 90,
- "GU" => 91,
- "GW" => 92,
- "GY" => 93,
- "HK" => 94,
- "HM" => 95,
- "HN" => 96,
- "HR" => 97,
- "HT" => 98,
- "HU" => 99,
- "ID" => 100,
- "IE" => 101,
- "IL" => 102,
- "IN" => 103,
- "IO" => 104,
- "IQ" => 105,
- "IR" => 106,
- "IS" => 107,
- "IT" => 108,
- "JM" => 109,
- "JO" => 110,
- "JP" => 111,
- "KE" => 112,
- "KG" => 113,
- "KH" => 114,
- "KI" => 115,
- "KM" => 116,
- "KN" => 117,
- "KP" => 118,
- "KR" => 119,
- "KW" => 120,
- "KY" => 121,
- "KZ" => 122,
- "LA" => 123,
- "LB" => 124,
- "LC" => 125,
- "LI" => 126,
- "LK" => 127,
- "LR" => 128,
- "LS" => 129,
- "LT" => 130,
- "LU" => 131,
- "LV" => 132,
- "LY" => 133,
- "MA" => 134,
- "MC" => 135,
- "MD" => 136,
- "MG" => 137,
- "MH" => 138,
- "MK" => 139,
- "ML" => 140,
- "MM" => 141,
- "MN" => 142,
- "MO" => 143,
- "MP" => 144,
- "MQ" => 145,
- "MR" => 146,
- "MS" => 147,
- "MT" => 148,
- "MU" => 149,
- "MV" => 150,
- "MW" => 151,
- "MX" => 152,
- "MY" => 153,
- "MZ" => 154,
- "NA" => 155,
- "NC" => 156,
- "NE" => 157,
- "NF" => 158,
- "NG" => 159,
- "NI" => 160,
- "NL" => 161,
- "NO" => 162,
- "NP" => 163,
- "NR" => 164,
- "NU" => 165,
- "NZ" => 166,
- "OM" => 167,
- "PA" => 168,
- "PE" => 169,
- "PF" => 170,
- "PG" => 171,
- "PH" => 172,
- "PK" => 173,
- "PL" => 174,
- "PM" => 175,
- "PN" => 176,
- "PR" => 177,
- "PS" => 178,
- "PT" => 179,
- "PW" => 180,
- "PY" => 181,
- "QA" => 182,
- "RE" => 183,
- "RO" => 184,
- "RU" => 185,
- "RW" => 186,
- "SA" => 187,
- "SB" => 188,
- "SC" => 189,
- "SD" => 190,
- "SE" => 191,
- "SG" => 192,
- "SH" => 193,
- "SI" => 194,
- "SJ" => 195,
- "SK" => 196,
- "SL" => 197,
- "SM" => 198,
- "SN" => 199,
- "SO" => 200,
- "SR" => 201,
- "ST" => 202,
- "SV" => 203,
- "SY" => 204,
- "SZ" => 205,
- "TC" => 206,
- "TD" => 207,
- "TF" => 208,
- "TG" => 209,
- "TH" => 210,
- "TJ" => 211,
- "TK" => 212,
- "TM" => 213,
- "TN" => 214,
- "TO" => 215,
- "TL" => 216,
- "TR" => 217,
- "TT" => 218,
- "TV" => 219,
- "TW" => 220,
- "TZ" => 221,
- "UA" => 222,
- "UG" => 223,
- "UM" => 224,
- "US" => 225,
- "UY" => 226,
- "UZ" => 227,
- "VA" => 228,
- "VC" => 229,
- "VE" => 230,
- "VG" => 231,
- "VI" => 232,
- "VN" => 233,
- "VU" => 234,
- "WF" => 235,
- "WS" => 236,
- "YE" => 237,
- "YT" => 238,
- "RS" => 239,
- "ZA" => 240,
- "ZM" => 241,
- "ME" => 242,
- "ZW" => 243,
- "A1" => 244,
- "A2" => 245,
- "O1" => 246,
- "AX" => 247,
- "GG" => 248,
- "IM" => 249,
- "JE" => 250,
- "BL" => 251,
- "MF" => 252,
- "BQ" => 253,
- "SS" => 254
- );
-
- public $GEOIP_COUNTRY_CODES = array(
- "",
- "AP",
- "EU",
- "AD",
- "AE",
- "AF",
- "AG",
- "AI",
- "AL",
- "AM",
- "CW",
- "AO",
- "AQ",
- "AR",
- "AS",
- "AT",
- "AU",
- "AW",
- "AZ",
- "BA",
- "BB",
- "BD",
- "BE",
- "BF",
- "BG",
- "BH",
- "BI",
- "BJ",
- "BM",
- "BN",
- "BO",
- "BR",
- "BS",
- "BT",
- "BV",
- "BW",
- "BY",
- "BZ",
- "CA",
- "CC",
- "CD",
- "CF",
- "CG",
- "CH",
- "CI",
- "CK",
- "CL",
- "CM",
- "CN",
- "CO",
- "CR",
- "CU",
- "CV",
- "CX",
- "CY",
- "CZ",
- "DE",
- "DJ",
- "DK",
- "DM",
- "DO",
- "DZ",
- "EC",
- "EE",
- "EG",
- "EH",
- "ER",
- "ES",
- "ET",
- "FI",
- "FJ",
- "FK",
- "FM",
- "FO",
- "FR",
- "SX",
- "GA",
- "GB",
- "GD",
- "GE",
- "GF",
- "GH",
- "GI",
- "GL",
- "GM",
- "GN",
- "GP",
- "GQ",
- "GR",
- "GS",
- "GT",
- "GU",
- "GW",
- "GY",
- "HK",
- "HM",
- "HN",
- "HR",
- "HT",
- "HU",
- "ID",
- "IE",
- "IL",
- "IN",
- "IO",
- "IQ",
- "IR",
- "IS",
- "IT",
- "JM",
- "JO",
- "JP",
- "KE",
- "KG",
- "KH",
- "KI",
- "KM",
- "KN",
- "KP",
- "KR",
- "KW",
- "KY",
- "KZ",
- "LA",
- "LB",
- "LC",
- "LI",
- "LK",
- "LR",
- "LS",
- "LT",
- "LU",
- "LV",
- "LY",
- "MA",
- "MC",
- "MD",
- "MG",
- "MH",
- "MK",
- "ML",
- "MM",
- "MN",
- "MO",
- "MP",
- "MQ",
- "MR",
- "MS",
- "MT",
- "MU",
- "MV",
- "MW",
- "MX",
- "MY",
- "MZ",
- "NA",
- "NC",
- "NE",
- "NF",
- "NG",
- "NI",
- "NL",
- "NO",
- "NP",
- "NR",
- "NU",
- "NZ",
- "OM",
- "PA",
- "PE",
- "PF",
- "PG",
- "PH",
- "PK",
- "PL",
- "PM",
- "PN",
- "PR",
- "PS",
- "PT",
- "PW",
- "PY",
- "QA",
- "RE",
- "RO",
- "RU",
- "RW",
- "SA",
- "SB",
- "SC",
- "SD",
- "SE",
- "SG",
- "SH",
- "SI",
- "SJ",
- "SK",
- "SL",
- "SM",
- "SN",
- "SO",
- "SR",
- "ST",
- "SV",
- "SY",
- "SZ",
- "TC",
- "TD",
- "TF",
- "TG",
- "TH",
- "TJ",
- "TK",
- "TM",
- "TN",
- "TO",
- "TL",
- "TR",
- "TT",
- "TV",
- "TW",
- "TZ",
- "UA",
- "UG",
- "UM",
- "US",
- "UY",
- "UZ",
- "VA",
- "VC",
- "VE",
- "VG",
- "VI",
- "VN",
- "VU",
- "WF",
- "WS",
- "YE",
- "YT",
- "RS",
- "ZA",
- "ZM",
- "ME",
- "ZW",
- "A1",
- "A2",
- "O1",
- "AX",
- "GG",
- "IM",
- "JE",
- "BL",
- "MF",
- "BQ",
- "SS",
- "O1"
- );
-
- public $GEOIP_COUNTRY_CODES3 = array(
- "",
- "AP",
- "EU",
- "AND",
- "ARE",
- "AFG",
- "ATG",
- "AIA",
- "ALB",
- "ARM",
- "CUW",
- "AGO",
- "ATA",
- "ARG",
- "ASM",
- "AUT",
- "AUS",
- "ABW",
- "AZE",
- "BIH",
- "BRB",
- "BGD",
- "BEL",
- "BFA",
- "BGR",
- "BHR",
- "BDI",
- "BEN",
- "BMU",
- "BRN",
- "BOL",
- "BRA",
- "BHS",
- "BTN",
- "BVT",
- "BWA",
- "BLR",
- "BLZ",
- "CAN",
- "CCK",
- "COD",
- "CAF",
- "COG",
- "CHE",
- "CIV",
- "COK",
- "CHL",
- "CMR",
- "CHN",
- "COL",
- "CRI",
- "CUB",
- "CPV",
- "CXR",
- "CYP",
- "CZE",
- "DEU",
- "DJI",
- "DNK",
- "DMA",
- "DOM",
- "DZA",
- "ECU",
- "EST",
- "EGY",
- "ESH",
- "ERI",
- "ESP",
- "ETH",
- "FIN",
- "FJI",
- "FLK",
- "FSM",
- "FRO",
- "FRA",
- "SXM",
- "GAB",
- "GBR",
- "GRD",
- "GEO",
- "GUF",
- "GHA",
- "GIB",
- "GRL",
- "GMB",
- "GIN",
- "GLP",
- "GNQ",
- "GRC",
- "SGS",
- "GTM",
- "GUM",
- "GNB",
- "GUY",
- "HKG",
- "HMD",
- "HND",
- "HRV",
- "HTI",
- "HUN",
- "IDN",
- "IRL",
- "ISR",
- "IND",
- "IOT",
- "IRQ",
- "IRN",
- "ISL",
- "ITA",
- "JAM",
- "JOR",
- "JPN",
- "KEN",
- "KGZ",
- "KHM",
- "KIR",
- "COM",
- "KNA",
- "PRK",
- "KOR",
- "KWT",
- "CYM",
- "KAZ",
- "LAO",
- "LBN",
- "LCA",
- "LIE",
- "LKA",
- "LBR",
- "LSO",
- "LTU",
- "LUX",
- "LVA",
- "LBY",
- "MAR",
- "MCO",
- "MDA",
- "MDG",
- "MHL",
- "MKD",
- "MLI",
- "MMR",
- "MNG",
- "MAC",
- "MNP",
- "MTQ",
- "MRT",
- "MSR",
- "MLT",
- "MUS",
- "MDV",
- "MWI",
- "MEX",
- "MYS",
- "MOZ",
- "NAM",
- "NCL",
- "NER",
- "NFK",
- "NGA",
- "NIC",
- "NLD",
- "NOR",
- "NPL",
- "NRU",
- "NIU",
- "NZL",
- "OMN",
- "PAN",
- "PER",
- "PYF",
- "PNG",
- "PHL",
- "PAK",
- "POL",
- "SPM",
- "PCN",
- "PRI",
- "PSE",
- "PRT",
- "PLW",
- "PRY",
- "QAT",
- "REU",
- "ROU",
- "RUS",
- "RWA",
- "SAU",
- "SLB",
- "SYC",
- "SDN",
- "SWE",
- "SGP",
- "SHN",
- "SVN",
- "SJM",
- "SVK",
- "SLE",
- "SMR",
- "SEN",
- "SOM",
- "SUR",
- "STP",
- "SLV",
- "SYR",
- "SWZ",
- "TCA",
- "TCD",
- "ATF",
- "TGO",
- "THA",
- "TJK",
- "TKL",
- "TKM",
- "TUN",
- "TON",
- "TLS",
- "TUR",
- "TTO",
- "TUV",
- "TWN",
- "TZA",
- "UKR",
- "UGA",
- "UMI",
- "USA",
- "URY",
- "UZB",
- "VAT",
- "VCT",
- "VEN",
- "VGB",
- "VIR",
- "VNM",
- "VUT",
- "WLF",
- "WSM",
- "YEM",
- "MYT",
- "SRB",
- "ZAF",
- "ZMB",
- "MNE",
- "ZWE",
- "A1",
- "A2",
- "O1",
- "ALA",
- "GGY",
- "IMN",
- "JEY",
- "BLM",
- "MAF",
- "BES",
- "SSD",
- "O1"
- );
-
- public $GEOIP_COUNTRY_NAMES = array(
- "",
- "Asia/Pacific Region",
- "Europe",
- "Andorra",
- "United Arab Emirates",
- "Afghanistan",
- "Antigua and Barbuda",
- "Anguilla",
- "Albania",
- "Armenia",
- "Curacao",
- "Angola",
- "Antarctica",
- "Argentina",
- "American Samoa",
- "Austria",
- "Australia",
- "Aruba",
- "Azerbaijan",
- "Bosnia and Herzegovina",
- "Barbados",
- "Bangladesh",
- "Belgium",
- "Burkina Faso",
- "Bulgaria",
- "Bahrain",
- "Burundi",
- "Benin",
- "Bermuda",
- "Brunei Darussalam",
- "Bolivia",
- "Brazil",
- "Bahamas",
- "Bhutan",
- "Bouvet Island",
- "Botswana",
- "Belarus",
- "Belize",
- "Canada",
- "Cocos (Keeling) Islands",
- "Congo, The Democratic Republic of the",
- "Central African Republic",
- "Congo",
- "Switzerland",
- "Cote D'Ivoire",
- "Cook Islands",
- "Chile",
- "Cameroon",
- "China",
- "Colombia",
- "Costa Rica",
- "Cuba",
- "Cape Verde",
- "Christmas Island",
- "Cyprus",
- "Czech Republic",
- "Germany",
- "Djibouti",
- "Denmark",
- "Dominica",
- "Dominican Republic",
- "Algeria",
- "Ecuador",
- "Estonia",
- "Egypt",
- "Western Sahara",
- "Eritrea",
- "Spain",
- "Ethiopia",
- "Finland",
- "Fiji",
- "Falkland Islands (Malvinas)",
- "Micronesia, Federated States of",
- "Faroe Islands",
- "France",
- "Sint Maarten (Dutch part)",
- "Gabon",
- "United Kingdom",
- "Grenada",
- "Georgia",
- "French Guiana",
- "Ghana",
- "Gibraltar",
- "Greenland",
- "Gambia",
- "Guinea",
- "Guadeloupe",
- "Equatorial Guinea",
- "Greece",
- "South Georgia and the South Sandwich Islands",
- "Guatemala",
- "Guam",
- "Guinea-Bissau",
- "Guyana",
- "Hong Kong",
- "Heard Island and McDonald Islands",
- "Honduras",
- "Croatia",
- "Haiti",
- "Hungary",
- "Indonesia",
- "Ireland",
- "Israel",
- "India",
- "British Indian Ocean Territory",
- "Iraq",
- "Iran, Islamic Republic of",
- "Iceland",
- "Italy",
- "Jamaica",
- "Jordan",
- "Japan",
- "Kenya",
- "Kyrgyzstan",
- "Cambodia",
- "Kiribati",
- "Comoros",
- "Saint Kitts and Nevis",
- "Korea, Democratic People's Republic of",
- "Korea, Republic of",
- "Kuwait",
- "Cayman Islands",
- "Kazakhstan",
- "Lao People's Democratic Republic",
- "Lebanon",
- "Saint Lucia",
- "Liechtenstein",
- "Sri Lanka",
- "Liberia",
- "Lesotho",
- "Lithuania",
- "Luxembourg",
- "Latvia",
- "Libya",
- "Morocco",
- "Monaco",
- "Moldova, Republic of",
- "Madagascar",
- "Marshall Islands",
- "Macedonia",
- "Mali",
- "Myanmar",
- "Mongolia",
- "Macau",
- "Northern Mariana Islands",
- "Martinique",
- "Mauritania",
- "Montserrat",
- "Malta",
- "Mauritius",
- "Maldives",
- "Malawi",
- "Mexico",
- "Malaysia",
- "Mozambique",
- "Namibia",
- "New Caledonia",
- "Niger",
- "Norfolk Island",
- "Nigeria",
- "Nicaragua",
- "Netherlands",
- "Norway",
- "Nepal",
- "Nauru",
- "Niue",
- "New Zealand",
- "Oman",
- "Panama",
- "Peru",
- "French Polynesia",
- "Papua New Guinea",
- "Philippines",
- "Pakistan",
- "Poland",
- "Saint Pierre and Miquelon",
- "Pitcairn Islands",
- "Puerto Rico",
- "Palestinian Territory",
- "Portugal",
- "Palau",
- "Paraguay",
- "Qatar",
- "Reunion",
- "Romania",
- "Russian Federation",
- "Rwanda",
- "Saudi Arabia",
- "Solomon Islands",
- "Seychelles",
- "Sudan",
- "Sweden",
- "Singapore",
- "Saint Helena",
- "Slovenia",
- "Svalbard and Jan Mayen",
- "Slovakia",
- "Sierra Leone",
- "San Marino",
- "Senegal",
- "Somalia",
- "Suriname",
- "Sao Tome and Principe",
- "El Salvador",
- "Syrian Arab Republic",
- "Swaziland",
- "Turks and Caicos Islands",
- "Chad",
- "French Southern Territories",
- "Togo",
- "Thailand",
- "Tajikistan",
- "Tokelau",
- "Turkmenistan",
- "Tunisia",
- "Tonga",
- "Timor-Leste",
- "Turkey",
- "Trinidad and Tobago",
- "Tuvalu",
- "Taiwan",
- "Tanzania, United Republic of",
- "Ukraine",
- "Uganda",
- "United States Minor Outlying Islands",
- "United States",
- "Uruguay",
- "Uzbekistan",
- "Holy See (Vatican City State)",
- "Saint Vincent and the Grenadines",
- "Venezuela",
- "Virgin Islands, British",
- "Virgin Islands, U.S.",
- "Vietnam",
- "Vanuatu",
- "Wallis and Futuna",
- "Samoa",
- "Yemen",
- "Mayotte",
- "Serbia",
- "South Africa",
- "Zambia",
- "Montenegro",
- "Zimbabwe",
- "Anonymous Proxy",
- "Satellite Provider",
- "Other",
- "Aland Islands",
- "Guernsey",
- "Isle of Man",
- "Jersey",
- "Saint Barthelemy",
- "Saint Martin",
- "Bonaire, Saint Eustatius and Saba",
- "South Sudan",
- "Other"
- );
-
- public $GEOIP_CONTINENT_CODES = array(
- "--",
- "AS",
- "EU",
- "EU",
- "AS",
- "AS",
- "NA",
- "NA",
- "EU",
- "AS",
- "NA",
- "AF",
- "AN",
- "SA",
- "OC",
- "EU",
- "OC",
- "NA",
- "AS",
- "EU",
- "NA",
- "AS",
- "EU",
- "AF",
- "EU",
- "AS",
- "AF",
- "AF",
- "NA",
- "AS",
- "SA",
- "SA",
- "NA",
- "AS",
- "AN",
- "AF",
- "EU",
- "NA",
- "NA",
- "AS",
- "AF",
- "AF",
- "AF",
- "EU",
- "AF",
- "OC",
- "SA",
- "AF",
- "AS",
- "SA",
- "NA",
- "NA",
- "AF",
- "AS",
- "AS",
- "EU",
- "EU",
- "AF",
- "EU",
- "NA",
- "NA",
- "AF",
- "SA",
- "EU",
- "AF",
- "AF",
- "AF",
- "EU",
- "AF",
- "EU",
- "OC",
- "SA",
- "OC",
- "EU",
- "EU",
- "NA",
- "AF",
- "EU",
- "NA",
- "AS",
- "SA",
- "AF",
- "EU",
- "NA",
- "AF",
- "AF",
- "NA",
- "AF",
- "EU",
- "AN",
- "NA",
- "OC",
- "AF",
- "SA",
- "AS",
- "AN",
- "NA",
- "EU",
- "NA",
- "EU",
- "AS",
- "EU",
- "AS",
- "AS",
- "AS",
- "AS",
- "AS",
- "EU",
- "EU",
- "NA",
- "AS",
- "AS",
- "AF",
- "AS",
- "AS",
- "OC",
- "AF",
- "NA",
- "AS",
- "AS",
- "AS",
- "NA",
- "AS",
- "AS",
- "AS",
- "NA",
- "EU",
- "AS",
- "AF",
- "AF",
- "EU",
- "EU",
- "EU",
- "AF",
- "AF",
- "EU",
- "EU",
- "AF",
- "OC",
- "EU",
- "AF",
- "AS",
- "AS",
- "AS",
- "OC",
- "NA",
- "AF",
- "NA",
- "EU",
- "AF",
- "AS",
- "AF",
- "NA",
- "AS",
- "AF",
- "AF",
- "OC",
- "AF",
- "OC",
- "AF",
- "NA",
- "EU",
- "EU",
- "AS",
- "OC",
- "OC",
- "OC",
- "AS",
- "NA",
- "SA",
- "OC",
- "OC",
- "AS",
- "AS",
- "EU",
- "NA",
- "OC",
- "NA",
- "AS",
- "EU",
- "OC",
- "SA",
- "AS",
- "AF",
- "EU",
- "EU",
- "AF",
- "AS",
- "OC",
- "AF",
- "AF",
- "EU",
- "AS",
- "AF",
- "EU",
- "EU",
- "EU",
- "AF",
- "EU",
- "AF",
- "AF",
- "SA",
- "AF",
- "NA",
- "AS",
- "AF",
- "NA",
- "AF",
- "AN",
- "AF",
- "AS",
- "AS",
- "OC",
- "AS",
- "AF",
- "OC",
- "AS",
- "EU",
- "NA",
- "OC",
- "AS",
- "AF",
- "EU",
- "AF",
- "OC",
- "NA",
- "SA",
- "AS",
- "EU",
- "NA",
- "SA",
- "NA",
- "NA",
- "AS",
- "OC",
- "OC",
- "OC",
- "AS",
- "AF",
- "EU",
- "AF",
- "AF",
- "EU",
- "AF",
- "--",
- "--",
- "--",
- "EU",
- "EU",
- "EU",
- "EU",
- "NA",
- "NA",
- "NA",
- "AF",
- "--"
- );
-}
-
-function geoip_load_shared_mem($file)
-{
- $fp = fopen($file, "rb");
- if (!$fp) {
- print "error opening $file: $php_errormsg\n";
- exit;
- }
- $s_array = fstat($fp);
- $size = $s_array['size'];
- if (($shmid = @shmop_open(GEOIP_SHM_KEY, "w", 0, 0))) {
- shmop_delete($shmid);
- shmop_close($shmid);
- }
- $shmid = shmop_open(GEOIP_SHM_KEY, "c", 0644, $size);
- shmop_write($shmid, fread($fp, $size), 0);
- shmop_close($shmid);
-}
-
-function _setup_segments($gi)
-{
- $gi->databaseType = GEOIP_COUNTRY_EDITION;
- $gi->record_length = STANDARD_RECORD_LENGTH;
- if ($gi->flags & GEOIP_SHARED_MEMORY) {
- $offset = shmop_size($gi->shmid) - 3;
- for ($i = 0; $i < STRUCTURE_INFO_MAX_SIZE; $i++) {
- $delim = shmop_read($gi->shmid, $offset, 3);
- $offset += 3;
- if ($delim == (chr(255) . chr(255) . chr(255))) {
- $gi->databaseType = ord(shmop_read($gi->shmid, $offset, 1));
- if ($gi->databaseType >= 106) {
- $gi->databaseType -= 105;
- }
- $offset++;
-
- if ($gi->databaseType == GEOIP_REGION_EDITION_REV0) {
- $gi->databaseSegments = GEOIP_STATE_BEGIN_REV0;
- } elseif ($gi->databaseType == GEOIP_REGION_EDITION_REV1) {
- $gi->databaseSegments = GEOIP_STATE_BEGIN_REV1;
- } elseif (($gi->databaseType == GEOIP_CITY_EDITION_REV0)
- || ($gi->databaseType == GEOIP_CITY_EDITION_REV1)
- || ($gi->databaseType == GEOIP_ORG_EDITION)
- || ($gi->databaseType == GEOIP_ORG_EDITION_V6)
- || ($gi->databaseType == GEOIP_DOMAIN_EDITION)
- || ($gi->databaseType == GEOIP_DOMAIN_EDITION_V6)
- || ($gi->databaseType == GEOIP_ISP_EDITION)
- || ($gi->databaseType == GEOIP_ISP_EDITION_V6)
- || ($gi->databaseType == GEOIP_USERTYPE_EDITION)
- || ($gi->databaseType == GEOIP_USERTYPE_EDITION_V6)
- || ($gi->databaseType == GEOIP_LOCATIONA_EDITION)
- || ($gi->databaseType == GEOIP_ACCURACYRADIUS_EDITION)
- || ($gi->databaseType == GEOIP_CITY_EDITION_REV0_V6)
- || ($gi->databaseType == GEOIP_CITY_EDITION_REV1_V6)
- || ($gi->databaseType == GEOIP_NETSPEED_EDITION_REV1)
- || ($gi->databaseType == GEOIP_NETSPEED_EDITION_REV1_V6)
- || ($gi->databaseType == GEOIP_ASNUM_EDITION)
- || ($gi->databaseType == GEOIP_ASNUM_EDITION_V6)
- ) {
- $gi->databaseSegments = 0;
- $buf = shmop_read($gi->shmid, $offset, SEGMENT_RECORD_LENGTH);
- for ($j = 0; $j < SEGMENT_RECORD_LENGTH; $j++) {
- $gi->databaseSegments += (ord($buf[$j]) << ($j * 8));
- }
- if (($gi->databaseType == GEOIP_ORG_EDITION)
- || ($gi->databaseType == GEOIP_ORG_EDITION_V6)
- || ($gi->databaseType == GEOIP_DOMAIN_EDITION)
- || ($gi->databaseType == GEOIP_DOMAIN_EDITION_V6)
- || ($gi->databaseType == GEOIP_ISP_EDITION)
- || ($gi->databaseType == GEOIP_ISP_EDITION_V6)
- ) {
- $gi->record_length = ORG_RECORD_LENGTH;
- }
- }
- break;
- } else {
- $offset -= 4;
- }
- }
- if (($gi->databaseType == GEOIP_COUNTRY_EDITION) ||
- ($gi->databaseType == GEOIP_COUNTRY_EDITION_V6) ||
- ($gi->databaseType == GEOIP_PROXY_EDITION) ||
- ($gi->databaseType == GEOIP_NETSPEED_EDITION)
- ) {
- $gi->databaseSegments = GEOIP_COUNTRY_BEGIN;
- }
- } else {
- $filepos = ftell($gi->filehandle);
- fseek($gi->filehandle, -3, SEEK_END);
- for ($i = 0; $i < STRUCTURE_INFO_MAX_SIZE; $i++) {
- $delim = fread($gi->filehandle, 3);
- if ($delim == (chr(255) . chr(255) . chr(255))) {
- $gi->databaseType = ord(fread($gi->filehandle, 1));
- if ($gi->databaseType >= 106) {
- $gi->databaseType -= 105;
- }
- if ($gi->databaseType == GEOIP_REGION_EDITION_REV0) {
- $gi->databaseSegments = GEOIP_STATE_BEGIN_REV0;
- } elseif ($gi->databaseType == GEOIP_REGION_EDITION_REV1) {
- $gi->databaseSegments = GEOIP_STATE_BEGIN_REV1;
- } elseif (($gi->databaseType == GEOIP_CITY_EDITION_REV0)
- || ($gi->databaseType == GEOIP_CITY_EDITION_REV1)
- || ($gi->databaseType == GEOIP_CITY_EDITION_REV0_V6)
- || ($gi->databaseType == GEOIP_CITY_EDITION_REV1_V6)
- || ($gi->databaseType == GEOIP_ORG_EDITION)
- || ($gi->databaseType == GEOIP_DOMAIN_EDITION)
- || ($gi->databaseType == GEOIP_ISP_EDITION)
- || ($gi->databaseType == GEOIP_ORG_EDITION_V6)
- || ($gi->databaseType == GEOIP_DOMAIN_EDITION_V6)
- || ($gi->databaseType == GEOIP_ISP_EDITION_V6)
- || ($gi->databaseType == GEOIP_LOCATIONA_EDITION)
- || ($gi->databaseType == GEOIP_ACCURACYRADIUS_EDITION)
- || ($gi->databaseType == GEOIP_CITY_EDITION_REV0_V6)
- || ($gi->databaseType == GEOIP_CITY_EDITION_REV1_V6)
- || ($gi->databaseType == GEOIP_NETSPEED_EDITION_REV1)
- || ($gi->databaseType == GEOIP_NETSPEED_EDITION_REV1_V6)
- || ($gi->databaseType == GEOIP_USERTYPE_EDITION)
- || ($gi->databaseType == GEOIP_USERTYPE_EDITION_V6)
- || ($gi->databaseType == GEOIP_ASNUM_EDITION)
- || ($gi->databaseType == GEOIP_ASNUM_EDITION_V6)
- ) {
- $gi->databaseSegments = 0;
-
- $buf = fread($gi->filehandle, SEGMENT_RECORD_LENGTH);
- for ($j = 0; $j < SEGMENT_RECORD_LENGTH; $j++) {
- $gi->databaseSegments += (ord($buf[$j]) << ($j * 8));
- }
- if (($gi->databaseType == GEOIP_ORG_EDITION)
- || ($gi->databaseType == GEOIP_DOMAIN_EDITION)
- || ($gi->databaseType == GEOIP_ISP_EDITION)
- || ($gi->databaseType == GEOIP_ORG_EDITION_V6)
- || ($gi->databaseType == GEOIP_DOMAIN_EDITION_V6)
- || ($gi->databaseType == GEOIP_ISP_EDITION_V6)
- ) {
- $gi->record_length = ORG_RECORD_LENGTH;
- }
- }
- break;
- } else {
- fseek($gi->filehandle, -4, SEEK_CUR);
- }
- }
- if (($gi->databaseType == GEOIP_COUNTRY_EDITION) ||
- ($gi->databaseType == GEOIP_COUNTRY_EDITION_V6) ||
- ($gi->databaseType == GEOIP_PROXY_EDITION) ||
- ($gi->databaseType == GEOIP_NETSPEED_EDITION)
- ) {
- $gi->databaseSegments = GEOIP_COUNTRY_BEGIN;
- }
- fseek($gi->filehandle, $filepos, SEEK_SET);
- }
- return $gi;
-}
-
-# This should be only used for variable-length records where
-# $start + $maxLength may be greater than the shared mem size
-function _sharedMemRead($gi, $start, $maxLength)
-{
- $readLength = min(shmop_size($gi->shmid) - $start, $maxLength);
- return shmop_read($gi->shmid, $start, $readLength);
-}
-
-function geoip_open($filename, $flags)
-{
- $gi = new GeoIP;
- $gi->flags = $flags;
- if ($gi->flags & GEOIP_SHARED_MEMORY) {
- $gi->shmid = shmop_open(GEOIP_SHM_KEY, "a", 0, 0);
- } else {
- $gi->filehandle = fopen($filename, "rb") or trigger_error("GeoIP API: Can not open $filename\n", E_USER_ERROR);
- if ($gi->flags & GEOIP_MEMORY_CACHE) {
- $s_array = fstat($gi->filehandle);
- $gi->memory_buffer = fread($gi->filehandle, $s_array['size']);
- }
- }
-
- $gi = _setup_segments($gi);
- return $gi;
-}
-
-function geoip_close($gi)
-{
- if ($gi->flags & GEOIP_SHARED_MEMORY) {
- return true;
- }
-
- return fclose($gi->filehandle);
-}
-
-function geoip_country_id_by_name_v6($gi, $name)
-{
- $rec = dns_get_record($name, DNS_AAAA);
- if (!$rec) {
- return false;
- }
- $addr = $rec[0]["ipv6"];
- if (!$addr || $addr == $name) {
- return false;
- }
- return geoip_country_id_by_addr_v6($gi, $addr);
-}
-
-function geoip_country_id_by_name($gi, $name)
-{
- $addr = gethostbyname($name);
- if (!$addr || $addr == $name) {
- return false;
- }
- return geoip_country_id_by_addr($gi, $addr);
-}
-
-function geoip_country_code_by_name_v6($gi, $name)
-{
- $country_id = geoip_country_id_by_name_v6($gi, $name);
- if ($country_id !== false) {
- return $gi->GEOIP_COUNTRY_CODES[$country_id];
- }
- return false;
-}
-
-function geoip_country_code_by_name($gi, $name)
-{
- $country_id = geoip_country_id_by_name($gi, $name);
- if ($country_id !== false) {
- return $gi->GEOIP_COUNTRY_CODES[$country_id];
- }
- return false;
-}
-
-function geoip_country_name_by_name_v6($gi, $name)
-{
- $country_id = geoip_country_id_by_name_v6($gi, $name);
- if ($country_id !== false) {
- return $gi->GEOIP_COUNTRY_NAMES[$country_id];
- }
- return false;
-}
-
-function geoip_country_name_by_name($gi, $name)
-{
- $country_id = geoip_country_id_by_name($gi, $name);
- if ($country_id !== false) {
- return $gi->GEOIP_COUNTRY_NAMES[$country_id];
- }
- return false;
-}
-
-function geoip_country_id_by_addr_v6($gi, $addr)
-{
- $ipnum = inet_pton($addr);
- return _geoip_seek_country_v6($gi, $ipnum) - GEOIP_COUNTRY_BEGIN;
-}
-
-function geoip_country_id_by_addr($gi, $addr)
-{
- $ipnum = ip2long($addr);
- return _geoip_seek_country($gi, $ipnum) - GEOIP_COUNTRY_BEGIN;
-}
-
-function geoip_country_code_by_addr_v6($gi, $addr)
-{
- $country_id = geoip_country_id_by_addr_v6($gi, $addr);
- if ($country_id !== false) {
- return $gi->GEOIP_COUNTRY_CODES[$country_id];
- }
- return false;
-}
-
-function geoip_country_code_by_addr($gi, $addr)
-{
- if ($gi->databaseType == GEOIP_CITY_EDITION_REV1) {
- $record = GeoIP_record_by_addr($gi, $addr);
- if ($record) {
- return $record->country_code;
- }
- } else {
- $country_id = geoip_country_id_by_addr($gi, $addr);
- if ($country_id !== false) {
- return $gi->GEOIP_COUNTRY_CODES[$country_id];
- }
- }
- return false;
-}
-
-function geoip_country_name_by_addr_v6($gi, $addr)
-{
- $country_id = geoip_country_id_by_addr_v6($gi, $addr);
- if ($country_id !== false) {
- return $gi->GEOIP_COUNTRY_NAMES[$country_id];
- }
- return false;
-}
-
-function geoip_country_name_by_addr($gi, $addr)
-{
- if ($gi->databaseType == GEOIP_CITY_EDITION_REV1) {
- $record = GeoIP_record_by_addr($gi, $addr);
- return $record->country_name;
- } else {
- $country_id = geoip_country_id_by_addr($gi, $addr);
- if ($country_id !== false) {
- return $gi->GEOIP_COUNTRY_NAMES[$country_id];
- }
- }
- return false;
-}
-
-function _geoip_seek_country_v6($gi, $ipnum)
-{
- # arrays from unpack start with offset 1
- # yet another php mystery. array_merge work around
- # this broken behaviour
- $v6vec = array_merge(unpack("C16", $ipnum));
-
- $offset = 0;
- for ($depth = 127; $depth >= 0; --$depth) {
- if ($gi->flags & GEOIP_MEMORY_CACHE) {
- $buf = _safe_substr(
- $gi->memory_buffer,
- 2 * $gi->record_length * $offset,
- 2 * $gi->record_length
- );
- } elseif ($gi->flags & GEOIP_SHARED_MEMORY) {
- $buf = _sharedMemRead($gi,
- 2 * $gi->record_length * $offset,
- 2 * $gi->record_length
- );
- } else {
- fseek($gi->filehandle, 2 * $gi->record_length * $offset, SEEK_SET) == 0
- or trigger_error("GeoIP API: fseek failed", E_USER_ERROR);
- $buf = fread($gi->filehandle, 2 * $gi->record_length);
- }
- $x = array(0, 0);
- for ($i = 0; $i < 2; ++$i) {
- for ($j = 0; $j < $gi->record_length; ++$j) {
- $x[$i] += ord($buf[$gi->record_length * $i + $j]) << ($j * 8);
- }
- }
-
- $bnum = 127 - $depth;
- $idx = $bnum >> 3;
- $b_mask = 1 << ($bnum & 7 ^ 7);
- if (($v6vec[$idx] & $b_mask) > 0) {
- if ($x[1] >= $gi->databaseSegments) {
- return $x[1];
- }
- $offset = $x[1];
- } else {
- if ($x[0] >= $gi->databaseSegments) {
- return $x[0];
- }
- $offset = $x[0];
- }
- }
- trigger_error("GeoIP API: Error traversing database - perhaps it is corrupt?", E_USER_ERROR);
- return false;
-}
-
-function _geoip_seek_country($gi, $ipnum)
-{
- $offset = 0;
- for ($depth = 31; $depth >= 0; --$depth) {
- if ($gi->flags & GEOIP_MEMORY_CACHE) {
- $buf = _safe_substr(
- $gi->memory_buffer,
- 2 * $gi->record_length * $offset,
- 2 * $gi->record_length
- );
- } elseif ($gi->flags & GEOIP_SHARED_MEMORY) {
- $buf = _sharedMemRead(
- $gi,
- 2 * $gi->record_length * $offset,
- 2 * $gi->record_length
- );
- } else {
- fseek($gi->filehandle, 2 * $gi->record_length * $offset, SEEK_SET) == 0
- or trigger_error("GeoIP API: fseek failed", E_USER_ERROR);
- $buf = fread($gi->filehandle, 2 * $gi->record_length);
- }
- $x = array(0, 0);
- for ($i = 0; $i < 2; ++$i) {
- for ($j = 0; $j < $gi->record_length; ++$j) {
- $x[$i] += ord($buf[$gi->record_length * $i + $j]) << ($j * 8);
- }
- }
- if ($ipnum & (1 << $depth)) {
- if ($x[1] >= $gi->databaseSegments) {
- return $x[1];
- }
- $offset = $x[1];
- } else {
- if ($x[0] >= $gi->databaseSegments) {
- return $x[0];
- }
- $offset = $x[0];
- }
- }
- trigger_error("GeoIP API: Error traversing database - perhaps it is corrupt?", E_USER_ERROR);
- return false;
-}
-
-function _common_get_org($gi, $seek_org)
-{
- $record_pointer = $seek_org + (2 * $gi->record_length - 1) * $gi->databaseSegments;
- if ($gi->flags & GEOIP_SHARED_MEMORY) {
- $org_buf = _sharedMemRead($gi, $record_pointer, MAX_ORG_RECORD_LENGTH);
- } else {
- fseek($gi->filehandle, $record_pointer, SEEK_SET);
- $org_buf = fread($gi->filehandle, MAX_ORG_RECORD_LENGTH);
- }
- $org_buf = _safe_substr($org_buf, 0, strpos($org_buf, "\0"));
- return $org_buf;
-}
-
-function _get_org_v6($gi, $ipnum)
-{
- $seek_org = _geoip_seek_country_v6($gi, $ipnum);
- if ($seek_org == $gi->databaseSegments) {
- return null;
- }
- return _common_get_org($gi, $seek_org);
-}
-
-function _get_org($gi, $ipnum)
-{
- $seek_org = _geoip_seek_country($gi, $ipnum);
- if ($seek_org == $gi->databaseSegments) {
- return null;
- }
- return _common_get_org($gi, $seek_org);
-}
-
-
-function geoip_name_by_addr_v6($gi, $addr)
-{
- if ($addr == null) {
- return 0;
- }
- $ipnum = inet_pton($addr);
- return _get_org_v6($gi, $ipnum);
-}
-
-function geoip_name_by_addr($gi, $addr)
-{
- if ($addr == null) {
- return 0;
- }
- $ipnum = ip2long($addr);
- return _get_org($gi, $ipnum);
-}
-
-function geoip_org_by_addr($gi, $addr)
-{
- return geoip_name_by_addr($gi, $addr);
-}
-
-function _get_region($gi, $ipnum)
-{
- if ($gi->databaseType == GEOIP_REGION_EDITION_REV0) {
- $seek_region = _geoip_seek_country($gi, $ipnum) - GEOIP_STATE_BEGIN_REV0;
- if ($seek_region >= 1000) {
- $country_code = "US";
- $region = chr(($seek_region - 1000) / 26 + 65) . chr(($seek_region - 1000) % 26 + 65);
- } else {
- $country_code = $gi->GEOIP_COUNTRY_CODES[$seek_region];
- $region = "";
- }
- return array($country_code, $region);
- } elseif ($gi->databaseType == GEOIP_REGION_EDITION_REV1) {
- $seek_region = _geoip_seek_country($gi, $ipnum) - GEOIP_STATE_BEGIN_REV1;
- if ($seek_region < US_OFFSET) {
- $country_code = "";
- $region = "";
- } elseif ($seek_region < CANADA_OFFSET) {
- $country_code = "US";
- $region = chr(($seek_region - US_OFFSET) / 26 + 65) . chr(($seek_region - US_OFFSET) % 26 + 65);
- } elseif ($seek_region < WORLD_OFFSET) {
- $country_code = "CA";
- $region = chr(($seek_region - CANADA_OFFSET) / 26 + 65) . chr(($seek_region - CANADA_OFFSET) % 26 + 65);
- } else {
- $country_code = $gi->GEOIP_COUNTRY_CODES[(int) (($seek_region - WORLD_OFFSET) / FIPS_RANGE)];
- $region = "";
- }
- return array($country_code, $region);
- }
- return null;
-}
-
-function geoip_region_by_addr($gi, $addr)
-{
- if ($addr == null) {
- return 0;
- }
- $ipnum = ip2long($addr);
- return _get_region($gi, $ipnum);
-}
-
-function _safe_substr($string, $start, $length)
-{
- // workaround php's broken substr, strpos, etc handling with
- // mbstring.func_overload and mbstring.internal_encoding
- $mbExists = extension_loaded('mbstring');
-
- if ($mbExists) {
- $enc = mb_internal_encoding();
- mb_internal_encoding('ISO-8859-1');
- }
-
- $buf = substr($string, $start, $length);
-
- if ($mbExists) {
- mb_internal_encoding($enc);
- }
-
- return $buf;
-}
diff --git a/htdocs/includes/geoip/geoipcity.inc b/htdocs/includes/geoip/geoipcity.inc
deleted file mode 100644
index 671f4e2c8e4..00000000000
--- a/htdocs/includes/geoip/geoipcity.inc
+++ /dev/null
@@ -1,171 +0,0 @@
-databaseSegments) {
- return null;
- }
- return _common_get_record($gi, $seek_country);
-}
-
-function _common_get_record($gi, $seek_country)
-{
- // workaround php's broken substr, strpos, etc handling with
- // mbstring.func_overload and mbstring.internal_encoding
- $mbExists = extension_loaded('mbstring');
- if ($mbExists) {
- $enc = mb_internal_encoding();
- mb_internal_encoding('ISO-8859-1');
- }
-
- $record_pointer = $seek_country + (2 * $gi->record_length - 1) * $gi->databaseSegments;
-
- if ($gi->flags & GEOIP_MEMORY_CACHE) {
- $record_buf = substr($gi->memory_buffer, $record_pointer, FULL_RECORD_LENGTH);
- } elseif ($gi->flags & GEOIP_SHARED_MEMORY) {
- $record_buf = _sharedMemRead($gi, $record_pointer, FULL_RECORD_LENGTH);
- } else {
- fseek($gi->filehandle, $record_pointer, SEEK_SET);
- $record_buf = fread($gi->filehandle, FULL_RECORD_LENGTH);
- }
- $record = new geoiprecord;
- $record_buf_pos = 0;
- $char = ord(substr($record_buf, $record_buf_pos, 1));
- $record->country_code = $gi->GEOIP_COUNTRY_CODES[$char];
- $record->country_code3 = $gi->GEOIP_COUNTRY_CODES3[$char];
- $record->country_name = $gi->GEOIP_COUNTRY_NAMES[$char];
- $record->continent_code = $gi->GEOIP_CONTINENT_CODES[$char];
- $record_buf_pos++;
- $str_length = 0;
-
- // Get region
- $char = ord(substr($record_buf, $record_buf_pos + $str_length, 1));
- while ($char != 0) {
- $str_length++;
- $char = ord(substr($record_buf, $record_buf_pos + $str_length, 1));
- }
- if ($str_length > 0) {
- $record->region = substr($record_buf, $record_buf_pos, $str_length);
- }
- $record_buf_pos += $str_length + 1;
- $str_length = 0;
- // Get city
- $char = ord(substr($record_buf, $record_buf_pos + $str_length, 1));
- while ($char != 0) {
- $str_length++;
- $char = ord(substr($record_buf, $record_buf_pos + $str_length, 1));
- }
- if ($str_length > 0) {
- $record->city = substr($record_buf, $record_buf_pos, $str_length);
- }
- $record_buf_pos += $str_length + 1;
- $str_length = 0;
- // Get postal code
- $char = ord(substr($record_buf, $record_buf_pos + $str_length, 1));
- while ($char != 0) {
- $str_length++;
- $char = ord(substr($record_buf, $record_buf_pos + $str_length, 1));
- }
- if ($str_length > 0) {
- $record->postal_code = substr($record_buf, $record_buf_pos, $str_length);
- }
- $record_buf_pos += $str_length + 1;
-
- // Get latitude and longitude
- $latitude = 0;
- $longitude = 0;
- for ($j = 0; $j < 3; ++$j) {
- $char = ord(substr($record_buf, $record_buf_pos++, 1));
- $latitude += ($char << ($j * 8));
- }
- $record->latitude = ($latitude / 10000) - 180;
- for ($j = 0; $j < 3; ++$j) {
- $char = ord(substr($record_buf, $record_buf_pos++, 1));
- $longitude += ($char << ($j * 8));
- }
- $record->longitude = ($longitude / 10000) - 180;
- if (GEOIP_CITY_EDITION_REV1 == $gi->databaseType) {
- $metroarea_combo = 0;
- if ($record->country_code == "US") {
- for ($j = 0; $j < 3; ++$j) {
- $char = ord(substr($record_buf, $record_buf_pos++, 1));
- $metroarea_combo += ($char << ($j * 8));
- }
- $record->metro_code = $record->dma_code = floor($metroarea_combo / 1000);
- $record->area_code = $metroarea_combo % 1000;
- }
- }
- if ($mbExists) {
- mb_internal_encoding($enc);
- }
- return $record;
-}
-
-function GeoIP_record_by_addr_v6($gi, $addr)
-{
- if ($addr == null) {
- return 0;
- }
- $ipnum = inet_pton($addr);
- return _get_record_v6($gi, $ipnum);
-}
-
-function _get_record($gi, $ipnum)
-{
- $seek_country = _geoip_seek_country($gi, $ipnum);
- if ($seek_country == $gi->databaseSegments) {
- return null;
- }
- return _common_get_record($gi, $seek_country);
-}
-
-function GeoIP_record_by_addr($gi, $addr)
-{
- if ($addr == null) {
- return 0;
- }
- $ipnum = ip2long($addr);
- return _get_record($gi, $ipnum);
-}
\ No newline at end of file
diff --git a/htdocs/includes/geoip/geoipregionvars.php b/htdocs/includes/geoip/geoipregionvars.php
deleted file mode 100644
index 2ba9e0b0653..00000000000
--- a/htdocs/includes/geoip/geoipregionvars.php
+++ /dev/null
@@ -1,4633 +0,0 @@
-
- array (
- '02' => 'Canillo',
- '03' => 'Encamp',
- '04' => 'La Massana',
- '05' => 'Ordino',
- '06' => 'Sant Julia de Loria',
- '07' => 'Andorra la Vella',
- '08' => 'Escaldes-Engordany',
- ),
- 'AE' =>
- array (
- '01' => 'Abu Dhabi',
- '02' => 'Ajman',
- '03' => 'Dubai',
- '04' => 'Fujairah',
- '05' => 'Ras Al Khaimah',
- '06' => 'Sharjah',
- '07' => 'Umm Al Quwain',
- ),
- 'AF' =>
- array (
- '01' => 'Badakhshan',
- '02' => 'Badghis',
- '03' => 'Baghlan',
- '05' => 'Bamian',
- '06' => 'Farah',
- '07' => 'Faryab',
- '08' => 'Ghazni',
- '09' => 'Ghowr',
- 10 => 'Helmand',
- 11 => 'Herat',
- 13 => 'Kabol',
- 14 => 'Kapisa',
- 17 => 'Lowgar',
- 18 => 'Nangarhar',
- 19 => 'Nimruz',
- 23 => 'Kandahar',
- 24 => 'Kondoz',
- 26 => 'Takhar',
- 27 => 'Vardak',
- 28 => 'Zabol',
- 29 => 'Paktika',
- 30 => 'Balkh',
- 31 => 'Jowzjan',
- 32 => 'Samangan',
- 33 => 'Sar-e Pol',
- 34 => 'Konar',
- 35 => 'Laghman',
- 36 => 'Paktia',
- 37 => 'Khowst',
- 38 => 'Nurestan',
- 39 => 'Oruzgan',
- 40 => 'Parvan',
- 41 => 'Daykondi',
- 42 => 'Panjshir',
- ),
- 'AG' =>
- array (
- '01' => 'Barbuda',
- '03' => 'Saint George',
- '04' => 'Saint John',
- '05' => 'Saint Mary',
- '06' => 'Saint Paul',
- '07' => 'Saint Peter',
- '08' => 'Saint Philip',
- '09' => 'Redonda',
- ),
- 'AL' =>
- array (
- 40 => 'Berat',
- 41 => 'Diber',
- 42 => 'Durres',
- 43 => 'Elbasan',
- 44 => 'Fier',
- 45 => 'Gjirokaster',
- 46 => 'Korce',
- 47 => 'Kukes',
- 48 => 'Lezhe',
- 49 => 'Shkoder',
- 50 => 'Tirane',
- 51 => 'Vlore',
- ),
- 'AM' =>
- array (
- '01' => 'Aragatsotn',
- '02' => 'Ararat',
- '03' => 'Armavir',
- '04' => 'Geghark\'unik\'',
- '05' => 'Kotayk\'',
- '06' => 'Lorri',
- '07' => 'Shirak',
- '08' => 'Syunik\'',
- '09' => 'Tavush',
- 10 => 'Vayots\' Dzor',
- 11 => 'Yerevan',
- ),
- 'AO' =>
- array (
- '01' => 'Benguela',
- '02' => 'Bie',
- '03' => 'Cabinda',
- '04' => 'Cuando Cubango',
- '05' => 'Cuanza Norte',
- '06' => 'Cuanza Sul',
- '07' => 'Cunene',
- '08' => 'Huambo',
- '09' => 'Huila',
- 12 => 'Malanje',
- 13 => 'Namibe',
- 14 => 'Moxico',
- 15 => 'Uige',
- 16 => 'Zaire',
- 17 => 'Lunda Norte',
- 18 => 'Lunda Sul',
- 19 => 'Bengo',
- 20 => 'Luanda',
- ),
- 'AR' =>
- array (
- '01' => 'Buenos Aires',
- '02' => 'Catamarca',
- '03' => 'Chaco',
- '04' => 'Chubut',
- '05' => 'Cordoba',
- '06' => 'Corrientes',
- '07' => 'Distrito Federal',
- '08' => 'Entre Rios',
- '09' => 'Formosa',
- 10 => 'Jujuy',
- 11 => 'La Pampa',
- 12 => 'La Rioja',
- 13 => 'Mendoza',
- 14 => 'Misiones',
- 15 => 'Neuquen',
- 16 => 'Rio Negro',
- 17 => 'Salta',
- 18 => 'San Juan',
- 19 => 'San Luis',
- 20 => 'Santa Cruz',
- 21 => 'Santa Fe',
- 22 => 'Santiago del Estero',
- 23 => 'Tierra del Fuego',
- 24 => 'Tucuman',
- ),
- 'AT' =>
- array (
- '01' => 'Burgenland',
- '02' => 'Karnten',
- '03' => 'Niederosterreich',
- '04' => 'Oberosterreich',
- '05' => 'Salzburg',
- '06' => 'Steiermark',
- '07' => 'Tirol',
- '08' => 'Vorarlberg',
- '09' => 'Wien',
- ),
- 'AU' =>
- array (
- '01' => 'Australian Capital Territory',
- '02' => 'New South Wales',
- '03' => 'Northern Territory',
- '04' => 'Queensland',
- '05' => 'South Australia',
- '06' => 'Tasmania',
- '07' => 'Victoria',
- '08' => 'Western Australia',
- ),
- 'AZ' =>
- array (
- '01' => 'Abseron',
- '02' => 'Agcabadi',
- '03' => 'Agdam',
- '04' => 'Agdas',
- '05' => 'Agstafa',
- '06' => 'Agsu',
- '07' => 'Ali Bayramli',
- '08' => 'Astara',
- '09' => 'Baki',
- 10 => 'Balakan',
- 11 => 'Barda',
- 12 => 'Beylaqan',
- 13 => 'Bilasuvar',
- 14 => 'Cabrayil',
- 15 => 'Calilabad',
- 16 => 'Daskasan',
- 17 => 'Davaci',
- 18 => 'Fuzuli',
- 19 => 'Gadabay',
- 20 => 'Ganca',
- 21 => 'Goranboy',
- 22 => 'Goycay',
- 23 => 'Haciqabul',
- 24 => 'Imisli',
- 25 => 'Ismayilli',
- 26 => 'Kalbacar',
- 27 => 'Kurdamir',
- 28 => 'Lacin',
- 30 => 'Lankaran',
- 31 => 'Lerik',
- 32 => 'Masalli',
- 33 => 'Mingacevir',
- 34 => 'Naftalan',
- 35 => 'Naxcivan',
- 36 => 'Neftcala',
- 37 => 'Oguz',
- 38 => 'Qabala',
- 39 => 'Qax',
- 40 => 'Qazax',
- 41 => 'Qobustan',
- 42 => 'Quba',
- 43 => 'Qubadli',
- 44 => 'Qusar',
- 45 => 'Saatli',
- 46 => 'Sabirabad',
- 48 => 'Saki',
- 49 => 'Salyan',
- 50 => 'Samaxi',
- 51 => 'Samkir',
- 52 => 'Samux',
- 53 => 'Siyazan',
- 54 => 'Sumqayit',
- 56 => 'Susa',
- 57 => 'Tartar',
- 58 => 'Tovuz',
- 59 => 'Ucar',
- 60 => 'Xacmaz',
- 61 => 'Xankandi',
- 62 => 'Xanlar',
- 63 => 'Xizi',
- 64 => 'Xocali',
- 65 => 'Xocavand',
- 66 => 'Yardimli',
- 68 => 'Yevlax',
- 69 => 'Zangilan',
- 70 => 'Zaqatala',
- 71 => 'Zardab',
- ),
- 'BA' =>
- array (
- '01' => 'Federation of Bosnia and Herzegovina',
- '03' => 'Brcko District',
- '02' => 'Republika Srpska',
- ),
- 'BB' =>
- array (
- '01' => 'Christ Church',
- '02' => 'Saint Andrew',
- '03' => 'Saint George',
- '04' => 'Saint James',
- '05' => 'Saint John',
- '06' => 'Saint Joseph',
- '07' => 'Saint Lucy',
- '08' => 'Saint Michael',
- '09' => 'Saint Peter',
- 10 => 'Saint Philip',
- 11 => 'Saint Thomas',
- ),
- 'BD' =>
- array (
- 81 => 'Dhaka',
- 82 => 'Khulna',
- 83 => 'Rajshahi',
- 84 => 'Chittagong',
- 85 => 'Barisal',
- 86 => 'Sylhet',
- 87 => 'Rangpur',
- ),
- 'BE' =>
- array (
- '01' => 'Antwerpen',
- '03' => 'Hainaut',
- '04' => 'Liege',
- '05' => 'Limburg',
- '06' => 'Luxembourg',
- '07' => 'Namur',
- '08' => 'Oost-Vlaanderen',
- '09' => 'West-Vlaanderen',
- 10 => 'Brabant Wallon',
- 11 => 'Brussels Hoofdstedelijk Gewest',
- 12 => 'Vlaams-Brabant',
- 13 => 'Flanders',
- 14 => 'Wallonia',
- ),
- 'BF' =>
- array (
- 15 => 'Bam',
- 19 => 'Boulkiemde',
- 20 => 'Ganzourgou',
- 21 => 'Gnagna',
- 28 => 'Kouritenga',
- 33 => 'Oudalan',
- 34 => 'Passore',
- 36 => 'Sanguie',
- 40 => 'Soum',
- 42 => 'Tapoa',
- 44 => 'Zoundweogo',
- 45 => 'Bale',
- 46 => 'Banwa',
- 47 => 'Bazega',
- 48 => 'Bougouriba',
- 49 => 'Boulgou',
- 50 => 'Gourma',
- 51 => 'Houet',
- 52 => 'Ioba',
- 53 => 'Kadiogo',
- 54 => 'Kenedougou',
- 55 => 'Komoe',
- 56 => 'Komondjari',
- 57 => 'Kompienga',
- 58 => 'Kossi',
- 59 => 'Koulpelogo',
- 60 => 'Kourweogo',
- 61 => 'Leraba',
- 62 => 'Loroum',
- 63 => 'Mouhoun',
- 64 => 'Namentenga',
- 65 => 'Naouri',
- 66 => 'Nayala',
- 67 => 'Noumbiel',
- 68 => 'Oubritenga',
- 69 => 'Poni',
- 70 => 'Sanmatenga',
- 71 => 'Seno',
- 72 => 'Sissili',
- 73 => 'Sourou',
- 74 => 'Tuy',
- 75 => 'Yagha',
- 76 => 'Yatenga',
- 77 => 'Ziro',
- 78 => 'Zondoma',
- ),
- 'BG' =>
- array (
- 33 => 'Mikhaylovgrad',
- 38 => 'Blagoevgrad',
- 39 => 'Burgas',
- 40 => 'Dobrich',
- 41 => 'Gabrovo',
- 42 => 'Grad Sofiya',
- 43 => 'Khaskovo',
- 44 => 'Kurdzhali',
- 45 => 'Kyustendil',
- 46 => 'Lovech',
- 47 => 'Montana',
- 48 => 'Pazardzhik',
- 49 => 'Pernik',
- 50 => 'Pleven',
- 51 => 'Plovdiv',
- 52 => 'Razgrad',
- 53 => 'Ruse',
- 54 => 'Shumen',
- 55 => 'Silistra',
- 56 => 'Sliven',
- 57 => 'Smolyan',
- 58 => 'Sofiya',
- 59 => 'Stara Zagora',
- 60 => 'Turgovishte',
- 61 => 'Varna',
- 62 => 'Veliko Turnovo',
- 63 => 'Vidin',
- 64 => 'Vratsa',
- 65 => 'Yambol',
- ),
- 'BH' =>
- array (
- '01' => 'Al Hadd',
- '02' => 'Al Manamah',
- '05' => 'Jidd Hafs',
- '06' => 'Sitrah',
- '08' => 'Al Mintaqah al Gharbiyah',
- '09' => 'Mintaqat Juzur Hawar',
- 10 => 'Al Mintaqah ash Shamaliyah',
- 11 => 'Al Mintaqah al Wusta',
- 12 => 'Madinat',
- 13 => 'Ar Rifa',
- 14 => 'Madinat Hamad',
- 15 => 'Al Muharraq',
- 16 => 'Al Asimah',
- 17 => 'Al Janubiyah',
- 18 => 'Ash Shamaliyah',
- 19 => 'Al Wusta',
- ),
- 'BI' =>
- array (
- '02' => 'Bujumbura',
- '09' => 'Bubanza',
- 10 => 'Bururi',
- 11 => 'Cankuzo',
- 12 => 'Cibitoke',
- 13 => 'Gitega',
- 14 => 'Karuzi',
- 15 => 'Kayanza',
- 16 => 'Kirundo',
- 17 => 'Makamba',
- 18 => 'Muyinga',
- 19 => 'Ngozi',
- 20 => 'Rutana',
- 21 => 'Ruyigi',
- 22 => 'Muramvya',
- 23 => 'Mwaro',
- ),
- 'BJ' =>
- array (
- '07' => 'Alibori',
- '08' => 'Atakora',
- '09' => 'Atlanyique',
- 10 => 'Borgou',
- 11 => 'Collines',
- 12 => 'Kouffo',
- 13 => 'Donga',
- 14 => 'Littoral',
- 15 => 'Mono',
- 16 => 'Oueme',
- 17 => 'Plateau',
- 18 => 'Zou',
- ),
- 'BM' =>
- array (
- '01' => 'Devonshire',
- '03' => 'Hamilton',
- '04' => 'Paget',
- '05' => 'Pembroke',
- '06' => 'Saint George',
- '07' => 'Saint George\'s',
- '08' => 'Sandys',
- '09' => 'Smiths',
- 10 => 'Southampton',
- 11 => 'Warwick',
- ),
- 'BN' =>
- array (
- '07' => 'Alibori',
- '08' => 'Belait',
- '09' => 'Brunei and Muara',
- 10 => 'Temburong',
- 11 => 'Collines',
- 12 => 'Kouffo',
- 13 => 'Donga',
- 14 => 'Littoral',
- 15 => 'Tutong',
- 16 => 'Oueme',
- 17 => 'Plateau',
- 18 => 'Zou',
- ),
- 'BO' =>
- array (
- '01' => 'Chuquisaca',
- '02' => 'Cochabamba',
- '03' => 'El Beni',
- '04' => 'La Paz',
- '05' => 'Oruro',
- '06' => 'Pando',
- '07' => 'Potosi',
- '08' => 'Santa Cruz',
- '09' => 'Tarija',
- ),
- 'BR' =>
- array (
- '01' => 'Acre',
- '02' => 'Alagoas',
- '03' => 'Amapa',
- '04' => 'Amazonas',
- '05' => 'Bahia',
- '06' => 'Ceara',
- '07' => 'Distrito Federal',
- '08' => 'Espirito Santo',
- 11 => 'Mato Grosso do Sul',
- 13 => 'Maranhao',
- 14 => 'Mato Grosso',
- 15 => 'Minas Gerais',
- 16 => 'Para',
- 17 => 'Paraiba',
- 18 => 'Parana',
- 20 => 'Piaui',
- 21 => 'Rio de Janeiro',
- 22 => 'Rio Grande do Norte',
- 23 => 'Rio Grande do Sul',
- 24 => 'Rondonia',
- 25 => 'Roraima',
- 26 => 'Santa Catarina',
- 27 => 'Sao Paulo',
- 28 => 'Sergipe',
- 29 => 'Goias',
- 30 => 'Pernambuco',
- 31 => 'Tocantins',
- ),
- 'BS' =>
- array (
- '05' => 'Bimini',
- '06' => 'Cat Island',
- 10 => 'Exuma',
- 13 => 'Inagua',
- 15 => 'Long Island',
- 16 => 'Mayaguana',
- 18 => 'Ragged Island',
- 22 => 'Harbour Island',
- 23 => 'New Providence',
- 24 => 'Acklins and Crooked Islands',
- 25 => 'Freeport',
- 26 => 'Fresh Creek',
- 27 => 'Governor\'s Harbour',
- 28 => 'Green Turtle Cay',
- 29 => 'High Rock',
- 30 => 'Kemps Bay',
- 31 => 'Marsh Harbour',
- 32 => 'Nichollstown and Berry Islands',
- 33 => 'Rock Sound',
- 34 => 'Sandy Point',
- 35 => 'San Salvador and Rum Cay',
- ),
- 'BT' =>
- array (
- '05' => 'Bumthang',
- '06' => 'Chhukha',
- '07' => 'Chirang',
- '08' => 'Daga',
- '09' => 'Geylegphug',
- 10 => 'Ha',
- 11 => 'Lhuntshi',
- 12 => 'Mongar',
- 13 => 'Paro',
- 14 => 'Pemagatsel',
- 15 => 'Punakha',
- 16 => 'Samchi',
- 17 => 'Samdrup',
- 18 => 'Shemgang',
- 19 => 'Tashigang',
- 20 => 'Thimphu',
- 21 => 'Tongsa',
- 22 => 'Wangdi Phodrang',
- ),
- 'BW' =>
- array (
- '01' => 'Central',
- '03' => 'Ghanzi',
- '04' => 'Kgalagadi',
- '05' => 'Kgatleng',
- '06' => 'Kweneng',
- '08' => 'North-East',
- '09' => 'South-East',
- 10 => 'Southern',
- 11 => 'North-West',
- ),
- 'BY' =>
- array (
- '01' => 'Brestskaya Voblasts\'',
- '02' => 'Homyel\'skaya Voblasts\'',
- '03' => 'Hrodzyenskaya Voblasts\'',
- '04' => 'Minsk',
- '05' => 'Minskaya Voblasts\'',
- '06' => 'Mahilyowskaya Voblasts\'',
- '07' => 'Vitsyebskaya Voblasts\'',
- ),
- 'BZ' =>
- array (
- '01' => 'Belize',
- '02' => 'Cayo',
- '03' => 'Corozal',
- '04' => 'Orange Walk',
- '05' => 'Stann Creek',
- '06' => 'Toledo',
- ),
- 'CA' =>
- array (
- 'AB' => 'Alberta',
- 'BC' => 'British Columbia',
- 'MB' => 'Manitoba',
- 'NB' => 'New Brunswick',
- 'NL' => 'Newfoundland',
- 'NS' => 'Nova Scotia',
- 'NT' => 'Northwest Territories',
- 'NU' => 'Nunavut',
- 'ON' => 'Ontario',
- 'PE' => 'Prince Edward Island',
- 'QC' => 'Quebec',
- 'SK' => 'Saskatchewan',
- 'YT' => 'Yukon Territory',
- ),
- 'CD' =>
- array (
- '01' => 'Bandundu',
- '02' => 'Equateur',
- '04' => 'Kasai-Oriental',
- '05' => 'Katanga',
- '06' => 'Kinshasa',
- '08' => 'Bas-Congo',
- '09' => 'Orientale',
- 10 => 'Maniema',
- 11 => 'Nord-Kivu',
- 12 => 'Sud-Kivu',
- ),
- 'CF' =>
- array (
- '01' => 'Bamingui-Bangoran',
- '02' => 'Basse-Kotto',
- '03' => 'Haute-Kotto',
- '04' => 'Mambere-Kadei',
- '05' => 'Haut-Mbomou',
- '06' => 'Kemo',
- '07' => 'Lobaye',
- '08' => 'Mbomou',
- '09' => 'Nana-Mambere',
- 11 => 'Ouaka',
- 12 => 'Ouham',
- 13 => 'Ouham-Pende',
- 14 => 'Cuvette-Ouest',
- 15 => 'Nana-Grebizi',
- 16 => 'Sangha-Mbaere',
- 17 => 'Ombella-Mpoko',
- 18 => 'Bangui',
- ),
- 'CG' =>
- array (
- '01' => 'Bouenza',
- '04' => 'Kouilou',
- '05' => 'Lekoumou',
- '06' => 'Likouala',
- '07' => 'Niari',
- '08' => 'Plateaux',
- 10 => 'Sangha',
- 11 => 'Pool',
- 12 => 'Brazzaville',
- 13 => 'Cuvette',
- 14 => 'Cuvette-Ouest',
- ),
- 'CH' =>
- array (
- '01' => 'Aargau',
- '02' => 'Ausser-Rhoden',
- '03' => 'Basel-Landschaft',
- '04' => 'Basel-Stadt',
- '05' => 'Bern',
- '06' => 'Fribourg',
- '07' => 'Geneve',
- '08' => 'Glarus',
- '09' => 'Graubunden',
- 10 => 'Inner-Rhoden',
- 11 => 'Luzern',
- 12 => 'Neuchatel',
- 13 => 'Nidwalden',
- 14 => 'Obwalden',
- 15 => 'Sankt Gallen',
- 16 => 'Schaffhausen',
- 17 => 'Schwyz',
- 18 => 'Solothurn',
- 19 => 'Thurgau',
- 20 => 'Ticino',
- 21 => 'Uri',
- 22 => 'Valais',
- 23 => 'Vaud',
- 24 => 'Zug',
- 25 => 'Zurich',
- 26 => 'Jura',
- ),
- 'CI' =>
- array (
- 74 => 'Agneby',
- 75 => 'Bafing',
- 76 => 'Bas-Sassandra',
- 77 => 'Denguele',
- 78 => 'Dix-Huit Montagnes',
- 79 => 'Fromager',
- 80 => 'Haut-Sassandra',
- 81 => 'Lacs',
- 82 => 'Lagunes',
- 83 => 'Marahoue',
- 84 => 'Moyen-Cavally',
- 85 => 'Moyen-Comoe',
- 86 => 'N\'zi-Comoe',
- 87 => 'Savanes',
- 88 => 'Sud-Bandama',
- 89 => 'Sud-Comoe',
- 90 => 'Vallee du Bandama',
- 91 => 'Worodougou',
- 92 => 'Zanzan',
- ),
- 'CL' =>
- array (
- '01' => 'Valparaiso',
- '02' => 'Aisen del General Carlos Ibanez del Campo',
- '03' => 'Antofagasta',
- '04' => 'Araucania',
- '05' => 'Atacama',
- '06' => 'Bio-Bio',
- '07' => 'Coquimbo',
- '08' => 'Libertador General Bernardo O\'Higgins',
- 14 => 'Los Lagos',
- 10 => 'Magallanes y de la Antartica Chilena',
- 11 => 'Maule',
- 12 => 'Region Metropolitana',
- 15 => 'Tarapaca',
- 16 => 'Arica y Parinacota',
- 17 => 'Los Rios',
- ),
- 'CM' =>
- array (
- '04' => 'Est',
- '05' => 'Littoral',
- '07' => 'Nord-Ouest',
- '08' => 'Ouest',
- '09' => 'Sud-Ouest',
- 10 => 'Adamaoua',
- 11 => 'Centre',
- 12 => 'Extreme-Nord',
- 13 => 'Nord',
- 14 => 'Sud',
- ),
- 'CN' =>
- array (
- '01' => 'Anhui',
- '02' => 'Zhejiang',
- '03' => 'Jiangxi',
- '04' => 'Jiangsu',
- '05' => 'Jilin',
- '06' => 'Qinghai',
- '07' => 'Fujian',
- '08' => 'Heilongjiang',
- '09' => 'Henan',
- 10 => 'Hebei',
- 11 => 'Hunan',
- 12 => 'Hubei',
- 13 => 'Xinjiang',
- 14 => 'Xizang',
- 15 => 'Gansu',
- 16 => 'Guangxi',
- 18 => 'Guizhou',
- 19 => 'Liaoning',
- 20 => 'Nei Mongol',
- 21 => 'Ningxia',
- 22 => 'Beijing',
- 23 => 'Shanghai',
- 24 => 'Shanxi',
- 25 => 'Shandong',
- 26 => 'Shaanxi',
- 28 => 'Tianjin',
- 29 => 'Yunnan',
- 30 => 'Guangdong',
- 31 => 'Hainan',
- 32 => 'Sichuan',
- 33 => 'Chongqing',
- ),
- 'CO' =>
- array (
- '01' => 'Amazonas',
- '02' => 'Antioquia',
- '03' => 'Arauca',
- '04' => 'Atlantico',
- '08' => 'Caqueta',
- '09' => 'Cauca',
- 10 => 'Cesar',
- 11 => 'Choco',
- 12 => 'Cordoba',
- 14 => 'Guaviare',
- 15 => 'Guainia',
- 16 => 'Huila',
- 17 => 'La Guajira',
- 19 => 'Meta',
- 20 => 'Narino',
- 21 => 'Norte de Santander',
- 22 => 'Putumayo',
- 23 => 'Quindio',
- 24 => 'Risaralda',
- 25 => 'San Andres y Providencia',
- 26 => 'Santander',
- 27 => 'Sucre',
- 28 => 'Tolima',
- 29 => 'Valle del Cauca',
- 30 => 'Vaupes',
- 31 => 'Vichada',
- 32 => 'Casanare',
- 33 => 'Cundinamarca',
- 34 => 'Distrito Especial',
- 35 => 'Bolivar',
- 36 => 'Boyaca',
- 37 => 'Caldas',
- 38 => 'Magdalena',
- ),
- 'CR' =>
- array (
- '01' => 'Alajuela',
- '02' => 'Cartago',
- '03' => 'Guanacaste',
- '04' => 'Heredia',
- '06' => 'Limon',
- '07' => 'Puntarenas',
- '08' => 'San Jose',
- ),
- 'CU' =>
- array (
- '01' => 'Pinar del Rio',
- '02' => 'Ciudad de la Habana',
- '03' => 'Matanzas',
- '04' => 'Isla de la Juventud',
- '05' => 'Camaguey',
- '07' => 'Ciego de Avila',
- '08' => 'Cienfuegos',
- '09' => 'Granma',
- 10 => 'Guantanamo',
- 11 => 'La Habana',
- 12 => 'Holguin',
- 13 => 'Las Tunas',
- 14 => 'Sancti Spiritus',
- 15 => 'Santiago de Cuba',
- 16 => 'Villa Clara',
- ),
- 'CV' =>
- array (
- '01' => 'Boa Vista',
- '02' => 'Brava',
- '04' => 'Maio',
- '05' => 'Paul',
- '07' => 'Ribeira Grande',
- '08' => 'Sal',
- 10 => 'Sao Nicolau',
- 11 => 'Sao Vicente',
- 13 => 'Mosteiros',
- 14 => 'Praia',
- 15 => 'Santa Catarina',
- 16 => 'Santa Cruz',
- 17 => 'Sao Domingos',
- 18 => 'Sao Filipe',
- 19 => 'Sao Miguel',
- 20 => 'Tarrafal',
- ),
- 'CY' =>
- array (
- '01' => 'Famagusta',
- '02' => 'Kyrenia',
- '03' => 'Larnaca',
- '04' => 'Nicosia',
- '05' => 'Limassol',
- '06' => 'Paphos',
- ),
- 'CZ' =>
- array (
- 52 => 'Hlavni mesto Praha',
- 78 => 'Jihomoravsky kraj',
- 79 => 'Jihocesky kraj',
- 80 => 'Vysocina',
- 81 => 'Karlovarsky kraj',
- 82 => 'Kralovehradecky kraj',
- 83 => 'Liberecky kraj',
- 84 => 'Olomoucky kraj',
- 85 => 'Moravskoslezsky kraj',
- 86 => 'Pardubicky kraj',
- 87 => 'Plzensky kraj',
- 88 => 'Stredocesky kraj',
- 89 => 'Ustecky kraj',
- 90 => 'Zlinsky kraj',
- ),
- 'DE' =>
- array (
- '01' => 'Baden-Wurttemberg',
- '02' => 'Bayern',
- '03' => 'Bremen',
- '04' => 'Hamburg',
- '05' => 'Hessen',
- '06' => 'Niedersachsen',
- '07' => 'Nordrhein-Westfalen',
- '08' => 'Rheinland-Pfalz',
- '09' => 'Saarland',
- 10 => 'Schleswig-Holstein',
- 11 => 'Brandenburg',
- 12 => 'Mecklenburg-Vorpommern',
- 13 => 'Sachsen',
- 14 => 'Sachsen-Anhalt',
- 15 => 'Thuringen',
- 16 => 'Berlin',
- ),
- 'DJ' =>
- array (
- '01' => 'Ali Sabieh',
- '04' => 'Obock',
- '05' => 'Tadjoura',
- '06' => 'Dikhil',
- '07' => 'Djibouti',
- '08' => 'Arta',
- ),
- 'DK' =>
- array (
- 17 => 'Hovedstaden',
- 18 => 'Midtjylland',
- 19 => 'Nordjylland',
- 20 => 'Sjelland',
- 21 => 'Syddanmark',
- ),
- 'DM' =>
- array (
- '02' => 'Saint Andrew',
- '03' => 'Saint David',
- '04' => 'Saint George',
- '05' => 'Saint John',
- '06' => 'Saint Joseph',
- '07' => 'Saint Luke',
- '08' => 'Saint Mark',
- '09' => 'Saint Patrick',
- 10 => 'Saint Paul',
- 11 => 'Saint Peter',
- ),
- 'DO' =>
- array (
- '01' => 'Azua',
- '02' => 'Baoruco',
- '03' => 'Barahona',
- '04' => 'Dajabon',
- 34 => 'Distrito Nacional',
- '06' => 'Duarte',
- '08' => 'Espaillat',
- '09' => 'Independencia',
- 10 => 'La Altagracia',
- 11 => 'Elias Pina',
- 12 => 'La Romana',
- 14 => 'Maria Trinidad Sanchez',
- 15 => 'Monte Cristi',
- 16 => 'Pedernales',
- 35 => 'Peravia',
- 18 => 'Puerto Plata',
- 19 => 'Salcedo',
- 20 => 'Samana',
- 21 => 'Sanchez Ramirez',
- 23 => 'San Juan',
- 24 => 'San Pedro De Macoris',
- 25 => 'Santiago',
- 26 => 'Santiago Rodriguez',
- 27 => 'Valverde',
- 28 => 'El Seibo',
- 29 => 'Hato Mayor',
- 30 => 'La Vega',
- 31 => 'Monsenor Nouel',
- 32 => 'Monte Plata',
- 33 => 'San Cristobal',
- 36 => 'San Jose de Ocoa',
- 37 => 'Santo Domingo',
- ),
- 'DZ' =>
- array (
- '01' => 'Alger',
- '03' => 'Batna',
- '04' => 'Constantine',
- '06' => 'Medea',
- '07' => 'Mostaganem',
- '09' => 'Oran',
- 10 => 'Saida',
- 12 => 'Setif',
- 13 => 'Tiaret',
- 14 => 'Tizi Ouzou',
- 15 => 'Tlemcen',
- 18 => 'Bejaia',
- 19 => 'Biskra',
- 20 => 'Blida',
- 21 => 'Bouira',
- 22 => 'Djelfa',
- 23 => 'Guelma',
- 24 => 'Jijel',
- 25 => 'Laghouat',
- 26 => 'Mascara',
- 27 => 'M\'sila',
- 29 => 'Oum el Bouaghi',
- 30 => 'Sidi Bel Abbes',
- 31 => 'Skikda',
- 33 => 'Tebessa',
- 34 => 'Adrar',
- 35 => 'Ain Defla',
- 36 => 'Ain Temouchent',
- 37 => 'Annaba',
- 38 => 'Bechar',
- 39 => 'Bordj Bou Arreridj',
- 40 => 'Boumerdes',
- 41 => 'Chlef',
- 42 => 'El Bayadh',
- 43 => 'El Oued',
- 44 => 'El Tarf',
- 45 => 'Ghardaia',
- 46 => 'Illizi',
- 47 => 'Khenchela',
- 48 => 'Mila',
- 49 => 'Naama',
- 50 => 'Ouargla',
- 51 => 'Relizane',
- 52 => 'Souk Ahras',
- 53 => 'Tamanghasset',
- 54 => 'Tindouf',
- 55 => 'Tipaza',
- 56 => 'Tissemsilt',
- ),
- 'EC' =>
- array (
- '01' => 'Galapagos',
- '02' => 'Azuay',
- '03' => 'Bolivar',
- '04' => 'Canar',
- '05' => 'Carchi',
- '06' => 'Chimborazo',
- '07' => 'Cotopaxi',
- '08' => 'El Oro',
- '09' => 'Esmeraldas',
- 10 => 'Guayas',
- 11 => 'Imbabura',
- 12 => 'Loja',
- 13 => 'Los Rios',
- 14 => 'Manabi',
- 15 => 'Morona-Santiago',
- 17 => 'Pastaza',
- 18 => 'Pichincha',
- 19 => 'Tungurahua',
- 20 => 'Zamora-Chinchipe',
- 22 => 'Sucumbios',
- 23 => 'Napo',
- 24 => 'Orellana',
- ),
- 'EE' =>
- array (
- '01' => 'Harjumaa',
- '02' => 'Hiiumaa',
- '03' => 'Ida-Virumaa',
- '04' => 'Jarvamaa',
- '05' => 'Jogevamaa',
- '06' => 'Kohtla-Jarve',
- '07' => 'Laanemaa',
- '08' => 'Laane-Virumaa',
- '09' => 'Narva',
- 10 => 'Parnu',
- 11 => 'Parnumaa',
- 12 => 'Polvamaa',
- 13 => 'Raplamaa',
- 14 => 'Saaremaa',
- 15 => 'Sillamae',
- 16 => 'Tallinn',
- 17 => 'Tartu',
- 18 => 'Tartumaa',
- 19 => 'Valgamaa',
- 20 => 'Viljandimaa',
- 21 => 'Vorumaa',
- ),
- 'EG' =>
- array (
- '01' => 'Ad Daqahliyah',
- '02' => 'Al Bahr al Ahmar',
- '03' => 'Al Buhayrah',
- '04' => 'Al Fayyum',
- '05' => 'Al Gharbiyah',
- '06' => 'Al Iskandariyah',
- '07' => 'Al Isma\'iliyah',
- '08' => 'Al Jizah',
- '09' => 'Al Minufiyah',
- 10 => 'Al Minya',
- 11 => 'Al Qahirah',
- 12 => 'Al Qalyubiyah',
- 13 => 'Al Wadi al Jadid',
- 14 => 'Ash Sharqiyah',
- 15 => 'As Suways',
- 16 => 'Aswan',
- 17 => 'Asyut',
- 18 => 'Bani Suwayf',
- 19 => 'Bur Sa\'id',
- 20 => 'Dumyat',
- 21 => 'Kafr ash Shaykh',
- 22 => 'Matruh',
- 23 => 'Qina',
- 24 => 'Suhaj',
- 26 => 'Janub Sina\'',
- 27 => 'Shamal Sina\'',
- 28 => 'Al Uqsur',
- ),
- 'ER' =>
- array (
- '01' => 'Anseba',
- '02' => 'Debub',
- '03' => 'Debubawi K\'eyih Bahri',
- '04' => 'Gash Barka',
- '05' => 'Ma\'akel',
- '06' => 'Semenawi K\'eyih Bahri',
- ),
- 'ES' =>
- array (
- '07' => 'Islas Baleares',
- 27 => 'La Rioja',
- 29 => 'Madrid',
- 31 => 'Murcia',
- 32 => 'Navarra',
- 34 => 'Asturias',
- 39 => 'Cantabria',
- 51 => 'Andalucia',
- 52 => 'Aragon',
- 53 => 'Canarias',
- 54 => 'Castilla-La Mancha',
- 55 => 'Castilla y Leon',
- 56 => 'Catalonia',
- 57 => 'Extremadura',
- 58 => 'Galicia',
- 59 => 'Pais Vasco',
- 60 => 'Comunidad Valenciana',
- ),
- 'ET' =>
- array (
- 44 => 'Adis Abeba',
- 45 => 'Afar',
- 46 => 'Amara',
- 47 => 'Binshangul Gumuz',
- 48 => 'Dire Dawa',
- 49 => 'Gambela Hizboch',
- 50 => 'Hareri Hizb',
- 51 => 'Oromiya',
- 52 => 'Sumale',
- 53 => 'Tigray',
- 54 => 'YeDebub Biheroch Bihereseboch na Hizboch',
- ),
- 'FI' =>
- array (
- '01' => 'Aland',
- '06' => 'Lapland',
- '08' => 'Oulu',
- 13 => 'Southern Finland',
- 14 => 'Eastern Finland',
- 15 => 'Western Finland',
- ),
- 'FJ' =>
- array (
- '01' => 'Central',
- '02' => 'Eastern',
- '03' => 'Northern',
- '04' => 'Rotuma',
- '05' => 'Western',
- ),
- 'FM' =>
- array (
- '01' => 'Kosrae',
- '02' => 'Pohnpei',
- '03' => 'Chuuk',
- '04' => 'Yap',
- ),
- 'FR' =>
- array (
- 97 => 'Aquitaine',
- 98 => 'Auvergne',
- 99 => 'Basse-Normandie',
- 'A1' => 'Bourgogne',
- 'A2' => 'Bretagne',
- 'A3' => 'Centre',
- 'A4' => 'Champagne-Ardenne',
- 'A5' => 'Corse',
- 'A6' => 'Franche-Comte',
- 'A7' => 'Haute-Normandie',
- 'A8' => 'Ile-de-France',
- 'A9' => 'Languedoc-Roussillon',
- 'B1' => 'Limousin',
- 'B2' => 'Lorraine',
- 'B3' => 'Midi-Pyrenees',
- 'B4' => 'Nord-Pas-de-Calais',
- 'B5' => 'Pays de la Loire',
- 'B6' => 'Picardie',
- 'B7' => 'Poitou-Charentes',
- 'B8' => 'Provence-Alpes-Cote d\'Azur',
- 'B9' => 'Rhone-Alpes',
- 'C1' => 'Alsace',
- ),
- 'GA' =>
- array (
- '01' => 'Estuaire',
- '02' => 'Haut-Ogooue',
- '03' => 'Moyen-Ogooue',
- '04' => 'Ngounie',
- '05' => 'Nyanga',
- '06' => 'Ogooue-Ivindo',
- '07' => 'Ogooue-Lolo',
- '08' => 'Ogooue-Maritime',
- '09' => 'Woleu-Ntem',
- ),
- 'GB' =>
- array (
- 'A1' => 'Barking and Dagenham',
- 'A2' => 'Barnet',
- 'A3' => 'Barnsley',
- 'A4' => 'Bath and North East Somerset',
- 'Z5' => 'Bedfordshire',
- 'A6' => 'Bexley',
- 'A7' => 'Birmingham',
- 'A8' => 'Blackburn with Darwen',
- 'A9' => 'Blackpool',
- 'B1' => 'Bolton',
- 'B2' => 'Bournemouth',
- 'B3' => 'Bracknell Forest',
- 'B4' => 'Bradford',
- 'B5' => 'Brent',
- 'B6' => 'Brighton and Hove',
- 'B7' => 'Bristol',
- 'B8' => 'Bromley',
- 'B9' => 'Buckinghamshire',
- 'C1' => 'Bury',
- 'C2' => 'Calderdale',
- 'C3' => 'Cambridgeshire',
- 'C4' => 'Camden',
- 'C5' => 'Cheshire',
- 'C6' => 'Cornwall',
- 'C7' => 'Coventry',
- 'C8' => 'Croydon',
- 'C9' => 'Cumbria',
- 'D1' => 'Darlington',
- 'D2' => 'Derby',
- 'D3' => 'Derbyshire',
- 'D4' => 'Devon',
- 'D5' => 'Doncaster',
- 'D6' => 'Dorset',
- 'D7' => 'Dudley',
- 'D8' => 'Durham',
- 'D9' => 'Ealing',
- 'E1' => 'East Riding of Yorkshire',
- 'E2' => 'East Sussex',
- 'E3' => 'Enfield',
- 'E4' => 'Essex',
- 'E5' => 'Gateshead',
- 'E6' => 'Gloucestershire',
- 'E7' => 'Greenwich',
- 'E8' => 'Hackney',
- 'E9' => 'Halton',
- 'F1' => 'Hammersmith and Fulham',
- 'F2' => 'Hampshire',
- 'F3' => 'Haringey',
- 'F4' => 'Harrow',
- 'F5' => 'Hartlepool',
- 'F6' => 'Havering',
- 'F7' => 'Herefordshire',
- 'F8' => 'Hertford',
- 'F9' => 'Hillingdon',
- 'G1' => 'Hounslow',
- 'G2' => 'Isle of Wight',
- 'G3' => 'Islington',
- 'G4' => 'Kensington and Chelsea',
- 'G5' => 'Kent',
- 'G6' => 'Kingston upon Hull',
- 'G7' => 'Kingston upon Thames',
- 'G8' => 'Kirklees',
- 'G9' => 'Knowsley',
- 'H1' => 'Lambeth',
- 'H2' => 'Lancashire',
- 'H3' => 'Leeds',
- 'H4' => 'Leicester',
- 'H5' => 'Leicestershire',
- 'H6' => 'Lewisham',
- 'H7' => 'Lincolnshire',
- 'H8' => 'Liverpool',
- 'H9' => 'London',
- 'I1' => 'Luton',
- 'I2' => 'Manchester',
- 'I3' => 'Medway',
- 'I4' => 'Merton',
- 'I5' => 'Middlesbrough',
- 'I6' => 'Milton Keynes',
- 'I7' => 'Newcastle upon Tyne',
- 'I8' => 'Newham',
- 'I9' => 'Norfolk',
- 'J1' => 'Northamptonshire',
- 'J2' => 'North East Lincolnshire',
- 'J3' => 'North Lincolnshire',
- 'J4' => 'North Somerset',
- 'J5' => 'North Tyneside',
- 'J6' => 'Northumberland',
- 'J7' => 'North Yorkshire',
- 'J8' => 'Nottingham',
- 'J9' => 'Nottinghamshire',
- 'K1' => 'Oldham',
- 'K2' => 'Oxfordshire',
- 'K3' => 'Peterborough',
- 'K4' => 'Plymouth',
- 'K5' => 'Poole',
- 'K6' => 'Portsmouth',
- 'K7' => 'Reading',
- 'K8' => 'Redbridge',
- 'K9' => 'Redcar and Cleveland',
- 'L1' => 'Richmond upon Thames',
- 'L2' => 'Rochdale',
- 'L3' => 'Rotherham',
- 'L4' => 'Rutland',
- 'L5' => 'Salford',
- 'L6' => 'Shropshire',
- 'L7' => 'Sandwell',
- 'L8' => 'Sefton',
- 'L9' => 'Sheffield',
- 'M1' => 'Slough',
- 'M2' => 'Solihull',
- 'M3' => 'Somerset',
- 'M4' => 'Southampton',
- 'M5' => 'Southend-on-Sea',
- 'M6' => 'South Gloucestershire',
- 'M7' => 'South Tyneside',
- 'M8' => 'Southwark',
- 'M9' => 'Staffordshire',
- 'N1' => 'St. Helens',
- 'N2' => 'Stockport',
- 'N3' => 'Stockton-on-Tees',
- 'N4' => 'Stoke-on-Trent',
- 'N5' => 'Suffolk',
- 'N6' => 'Sunderland',
- 'N7' => 'Surrey',
- 'N8' => 'Sutton',
- 'N9' => 'Swindon',
- 'O1' => 'Tameside',
- 'O2' => 'Telford and Wrekin',
- 'O3' => 'Thurrock',
- 'O4' => 'Torbay',
- 'O5' => 'Tower Hamlets',
- 'O6' => 'Trafford',
- 'O7' => 'Wakefield',
- 'O8' => 'Walsall',
- 'O9' => 'Waltham Forest',
- 'P1' => 'Wandsworth',
- 'P2' => 'Warrington',
- 'P3' => 'Warwickshire',
- 'P4' => 'West Berkshire',
- 'P5' => 'Westminster',
- 'P6' => 'West Sussex',
- 'P7' => 'Wigan',
- 'P8' => 'Wiltshire',
- 'P9' => 'Windsor and Maidenhead',
- 'Q1' => 'Wirral',
- 'Q2' => 'Wokingham',
- 'Q3' => 'Wolverhampton',
- 'Q4' => 'Worcestershire',
- 'Q5' => 'York',
- 'Q6' => 'Antrim',
- 'Q7' => 'Ards',
- 'Q8' => 'Armagh',
- 'Q9' => 'Ballymena',
- 'R1' => 'Ballymoney',
- 'R2' => 'Banbridge',
- 'R3' => 'Belfast',
- 'R4' => 'Carrickfergus',
- 'R5' => 'Castlereagh',
- 'R6' => 'Coleraine',
- 'R7' => 'Cookstown',
- 'R8' => 'Craigavon',
- 'R9' => 'Down',
- 'S1' => 'Dungannon',
- 'S2' => 'Fermanagh',
- 'S3' => 'Larne',
- 'S4' => 'Limavady',
- 'S5' => 'Lisburn',
- 'S6' => 'Derry',
- 'S7' => 'Magherafelt',
- 'S8' => 'Moyle',
- 'S9' => 'Newry and Mourne',
- 'T1' => 'Newtownabbey',
- 'T2' => 'North Down',
- 'T3' => 'Omagh',
- 'T4' => 'Strabane',
- 'T5' => 'Aberdeen City',
- 'T6' => 'Aberdeenshire',
- 'T7' => 'Angus',
- 'T8' => 'Argyll and Bute',
- 'T9' => 'Scottish Borders',
- 'U1' => 'Clackmannanshire',
- 'U2' => 'Dumfries and Galloway',
- 'U3' => 'Dundee City',
- 'U4' => 'East Ayrshire',
- 'U5' => 'East Dunbartonshire',
- 'U6' => 'East Lothian',
- 'U7' => 'East Renfrewshire',
- 'U8' => 'Edinburgh',
- 'U9' => 'Falkirk',
- 'V1' => 'Fife',
- 'V2' => 'Glasgow City',
- 'V3' => 'Highland',
- 'V4' => 'Inverclyde',
- 'V5' => 'Midlothian',
- 'V6' => 'Moray',
- 'V7' => 'North Ayrshire',
- 'V8' => 'North Lanarkshire',
- 'V9' => 'Orkney',
- 'W1' => 'Perth and Kinross',
- 'W2' => 'Renfrewshire',
- 'W3' => 'Shetland Islands',
- 'W4' => 'South Ayrshire',
- 'W5' => 'South Lanarkshire',
- 'W6' => 'Stirling',
- 'W7' => 'West Dunbartonshire',
- 'W8' => 'Eilean Siar',
- 'W9' => 'West Lothian',
- 'X1' => 'Isle of Anglesey',
- 'X2' => 'Blaenau Gwent',
- 'X3' => 'Bridgend',
- 'X4' => 'Caerphilly',
- 'X5' => 'Cardiff',
- 'X6' => 'Ceredigion',
- 'X7' => 'Carmarthenshire',
- 'X8' => 'Conwy',
- 'X9' => 'Denbighshire',
- 'Y1' => 'Flintshire',
- 'Y2' => 'Gwynedd',
- 'Y3' => 'Merthyr Tydfil',
- 'Y4' => 'Monmouthshire',
- 'Y5' => 'Neath Port Talbot',
- 'Y6' => 'Newport',
- 'Y7' => 'Pembrokeshire',
- 'Y8' => 'Powys',
- 'Y9' => 'Rhondda Cynon Taff',
- 'Z1' => 'Swansea',
- 'Z2' => 'Torfaen',
- 'Z3' => 'Vale of Glamorgan',
- 'Z4' => 'Wrexham',
- 'Z6' => 'Central Bedfordshire',
- 'Z7' => 'Cheshire East',
- 'Z8' => 'Cheshire West and Chester',
- 'Z9' => 'Isles of Scilly',
- ),
- 'GD' =>
- array (
- '01' => 'Saint Andrew',
- '02' => 'Saint David',
- '03' => 'Saint George',
- '04' => 'Saint John',
- '05' => 'Saint Mark',
- '06' => 'Saint Patrick',
- ),
- 'GE' =>
- array (
- '01' => 'Abashis Raioni',
- '02' => 'Abkhazia',
- '03' => 'Adigenis Raioni',
- '04' => 'Ajaria',
- '05' => 'Akhalgoris Raioni',
- '06' => 'Akhalk\'alak\'is Raioni',
- '07' => 'Akhalts\'ikhis Raioni',
- '08' => 'Akhmetis Raioni',
- '09' => 'Ambrolauris Raioni',
- 10 => 'Aspindzis Raioni',
- 11 => 'Baghdat\'is Raioni',
- 12 => 'Bolnisis Raioni',
- 13 => 'Borjomis Raioni',
- 14 => 'Chiat\'ura',
- 15 => 'Ch\'khorotsqus Raioni',
- 16 => 'Ch\'okhatauris Raioni',
- 17 => 'Dedop\'listsqaros Raioni',
- 18 => 'Dmanisis Raioni',
- 19 => 'Dushet\'is Raioni',
- 20 => 'Gardabanis Raioni',
- 21 => 'Gori',
- 22 => 'Goris Raioni',
- 23 => 'Gurjaanis Raioni',
- 24 => 'Javis Raioni',
- 25 => 'K\'arelis Raioni',
- 26 => 'Kaspis Raioni',
- 27 => 'Kharagaulis Raioni',
- 28 => 'Khashuris Raioni',
- 29 => 'Khobis Raioni',
- 30 => 'Khonis Raioni',
- 31 => 'K\'ut\'aisi',
- 32 => 'Lagodekhis Raioni',
- 33 => 'Lanch\'khut\'is Raioni',
- 34 => 'Lentekhis Raioni',
- 35 => 'Marneulis Raioni',
- 36 => 'Martvilis Raioni',
- 37 => 'Mestiis Raioni',
- 38 => 'Mts\'khet\'is Raioni',
- 39 => 'Ninotsmindis Raioni',
- 40 => 'Onis Raioni',
- 41 => 'Ozurget\'is Raioni',
- 42 => 'P\'ot\'i',
- 43 => 'Qazbegis Raioni',
- 44 => 'Qvarlis Raioni',
- 45 => 'Rust\'avi',
- 46 => 'Sach\'kheris Raioni',
- 47 => 'Sagarejos Raioni',
- 48 => 'Samtrediis Raioni',
- 49 => 'Senakis Raioni',
- 50 => 'Sighnaghis Raioni',
- 51 => 'T\'bilisi',
- 52 => 'T\'elavis Raioni',
- 53 => 'T\'erjolis Raioni',
- 54 => 'T\'et\'ritsqaros Raioni',
- 55 => 'T\'ianet\'is Raioni',
- 56 => 'Tqibuli',
- 57 => 'Ts\'ageris Raioni',
- 58 => 'Tsalenjikhis Raioni',
- 59 => 'Tsalkis Raioni',
- 60 => 'Tsqaltubo',
- 61 => 'Vanis Raioni',
- 62 => 'Zestap\'onis Raioni',
- 63 => 'Zugdidi',
- 64 => 'Zugdidis Raioni',
- ),
- 'GH' =>
- array (
- '01' => 'Greater Accra',
- '02' => 'Ashanti',
- '03' => 'Brong-Ahafo',
- '04' => 'Central',
- '05' => 'Eastern',
- '06' => 'Northern',
- '08' => 'Volta',
- '09' => 'Western',
- 10 => 'Upper East',
- 11 => 'Upper West',
- ),
- 'GL' =>
- array (
- '01' => 'Nordgronland',
- '02' => 'Ostgronland',
- '03' => 'Vestgronland',
- ),
- 'GM' =>
- array (
- '01' => 'Banjul',
- '02' => 'Lower River',
- '03' => 'Central River',
- '04' => 'Upper River',
- '05' => 'Western',
- '07' => 'North Bank',
- ),
- 'GN' =>
- array (
- '01' => 'Beyla',
- '02' => 'Boffa',
- '03' => 'Boke',
- '04' => 'Conakry',
- '05' => 'Dabola',
- '06' => 'Dalaba',
- '07' => 'Dinguiraye',
- '09' => 'Faranah',
- 10 => 'Forecariah',
- 11 => 'Fria',
- 12 => 'Gaoual',
- 13 => 'Gueckedou',
- 15 => 'Kerouane',
- 16 => 'Kindia',
- 17 => 'Kissidougou',
- 18 => 'Koundara',
- 19 => 'Kouroussa',
- 21 => 'Macenta',
- 22 => 'Mali',
- 23 => 'Mamou',
- 25 => 'Pita',
- 27 => 'Telimele',
- 28 => 'Tougue',
- 29 => 'Yomou',
- 30 => 'Coyah',
- 31 => 'Dubreka',
- 32 => 'Kankan',
- 33 => 'Koubia',
- 34 => 'Labe',
- 35 => 'Lelouma',
- 36 => 'Lola',
- 37 => 'Mandiana',
- 38 => 'Nzerekore',
- 39 => 'Siguiri',
- ),
- 'GQ' =>
- array (
- '03' => 'Annobon',
- '04' => 'Bioko Norte',
- '05' => 'Bioko Sur',
- '06' => 'Centro Sur',
- '07' => 'Kie-Ntem',
- '08' => 'Litoral',
- '09' => 'Wele-Nzas',
- ),
- 'GR' =>
- array (
- '01' => 'Evros',
- '02' => 'Rodhopi',
- '03' => 'Xanthi',
- '04' => 'Drama',
- '05' => 'Serrai',
- '06' => 'Kilkis',
- '07' => 'Pella',
- '08' => 'Florina',
- '09' => 'Kastoria',
- 10 => 'Grevena',
- 11 => 'Kozani',
- 12 => 'Imathia',
- 13 => 'Thessaloniki',
- 14 => 'Kavala',
- 15 => 'Khalkidhiki',
- 16 => 'Pieria',
- 17 => 'Ioannina',
- 18 => 'Thesprotia',
- 19 => 'Preveza',
- 20 => 'Arta',
- 21 => 'Larisa',
- 22 => 'Trikala',
- 23 => 'Kardhitsa',
- 24 => 'Magnisia',
- 25 => 'Kerkira',
- 26 => 'Levkas',
- 27 => 'Kefallinia',
- 28 => 'Zakinthos',
- 29 => 'Fthiotis',
- 30 => 'Evritania',
- 31 => 'Aitolia kai Akarnania',
- 32 => 'Fokis',
- 33 => 'Voiotia',
- 34 => 'Evvoia',
- 35 => 'Attiki',
- 36 => 'Argolis',
- 37 => 'Korinthia',
- 38 => 'Akhaia',
- 39 => 'Ilia',
- 40 => 'Messinia',
- 41 => 'Arkadhia',
- 42 => 'Lakonia',
- 43 => 'Khania',
- 44 => 'Rethimni',
- 45 => 'Iraklion',
- 46 => 'Lasithi',
- 47 => 'Dhodhekanisos',
- 48 => 'Samos',
- 49 => 'Kikladhes',
- 50 => 'Khios',
- 51 => 'Lesvos',
- ),
- 'GT' =>
- array (
- '01' => 'Alta Verapaz',
- '02' => 'Baja Verapaz',
- '03' => 'Chimaltenango',
- '04' => 'Chiquimula',
- '05' => 'El Progreso',
- '06' => 'Escuintla',
- '07' => 'Guatemala',
- '08' => 'Huehuetenango',
- '09' => 'Izabal',
- 10 => 'Jalapa',
- 11 => 'Jutiapa',
- 12 => 'Peten',
- 13 => 'Quetzaltenango',
- 14 => 'Quiche',
- 15 => 'Retalhuleu',
- 16 => 'Sacatepequez',
- 17 => 'San Marcos',
- 18 => 'Santa Rosa',
- 19 => 'Solola',
- 20 => 'Suchitepequez',
- 21 => 'Totonicapan',
- 22 => 'Zacapa',
- ),
- 'GW' =>
- array (
- '01' => 'Bafata',
- '02' => 'Quinara',
- '04' => 'Oio',
- '05' => 'Bolama',
- '06' => 'Cacheu',
- '07' => 'Tombali',
- 10 => 'Gabu',
- 11 => 'Bissau',
- 12 => 'Biombo',
- ),
- 'GY' =>
- array (
- 10 => 'Barima-Waini',
- 11 => 'Cuyuni-Mazaruni',
- 12 => 'Demerara-Mahaica',
- 13 => 'East Berbice-Corentyne',
- 14 => 'Essequibo Islands-West Demerara',
- 15 => 'Mahaica-Berbice',
- 16 => 'Pomeroon-Supenaam',
- 17 => 'Potaro-Siparuni',
- 18 => 'Upper Demerara-Berbice',
- 19 => 'Upper Takutu-Upper Essequibo',
- ),
- 'HN' =>
- array (
- '01' => 'Atlantida',
- '02' => 'Choluteca',
- '03' => 'Colon',
- '04' => 'Comayagua',
- '05' => 'Copan',
- '06' => 'Cortes',
- '07' => 'El Paraiso',
- '08' => 'Francisco Morazan',
- '09' => 'Gracias a Dios',
- 10 => 'Intibuca',
- 11 => 'Islas de la Bahia',
- 12 => 'La Paz',
- 13 => 'Lempira',
- 14 => 'Ocotepeque',
- 15 => 'Olancho',
- 16 => 'Santa Barbara',
- 17 => 'Valle',
- 18 => 'Yoro',
- ),
- 'HR' =>
- array (
- '01' => 'Bjelovarsko-Bilogorska',
- '02' => 'Brodsko-Posavska',
- '03' => 'Dubrovacko-Neretvanska',
- '04' => 'Istarska',
- '05' => 'Karlovacka',
- '06' => 'Koprivnicko-Krizevacka',
- '07' => 'Krapinsko-Zagorska',
- '08' => 'Licko-Senjska',
- '09' => 'Medimurska',
- 10 => 'Osjecko-Baranjska',
- 11 => 'Pozesko-Slavonska',
- 12 => 'Primorsko-Goranska',
- 13 => 'Sibensko-Kninska',
- 14 => 'Sisacko-Moslavacka',
- 15 => 'Splitsko-Dalmatinska',
- 16 => 'Varazdinska',
- 17 => 'Viroviticko-Podravska',
- 18 => 'Vukovarsko-Srijemska',
- 19 => 'Zadarska',
- 20 => 'Zagrebacka',
- 21 => 'Grad Zagreb',
- ),
- 'HT' =>
- array (
- '03' => 'Nord-Ouest',
- '06' => 'Artibonite',
- '07' => 'Centre',
- '09' => 'Nord',
- 10 => 'Nord-Est',
- 11 => 'Ouest',
- 12 => 'Sud',
- 13 => 'Sud-Est',
- 14 => 'Grand\' Anse',
- 15 => 'Nippes',
- ),
- 'HU' =>
- array (
- '01' => 'Bacs-Kiskun',
- '02' => 'Baranya',
- '03' => 'Bekes',
- '04' => 'Borsod-Abauj-Zemplen',
- '05' => 'Budapest',
- '06' => 'Csongrad',
- '07' => 'Debrecen',
- '08' => 'Fejer',
- '09' => 'Gyor-Moson-Sopron',
- 10 => 'Hajdu-Bihar',
- 11 => 'Heves',
- 12 => 'Komarom-Esztergom',
- 13 => 'Miskolc',
- 14 => 'Nograd',
- 15 => 'Pecs',
- 16 => 'Pest',
- 17 => 'Somogy',
- 18 => 'Szabolcs-Szatmar-Bereg',
- 19 => 'Szeged',
- 20 => 'Jasz-Nagykun-Szolnok',
- 21 => 'Tolna',
- 22 => 'Vas',
- 39 => 'Veszprem',
- 24 => 'Zala',
- 25 => 'Gyor',
- 26 => 'Bekescsaba',
- 27 => 'Dunaujvaros',
- 28 => 'Eger',
- 29 => 'Hodmezovasarhely',
- 30 => 'Kaposvar',
- 31 => 'Kecskemet',
- 32 => 'Nagykanizsa',
- 33 => 'Nyiregyhaza',
- 34 => 'Sopron',
- 35 => 'Szekesfehervar',
- 36 => 'Szolnok',
- 37 => 'Szombathely',
- 38 => 'Tatabanya',
- 40 => 'Zalaegerszeg',
- 41 => 'Salgotarjan',
- 42 => 'Szekszard',
- 43 => 'Erd',
- ),
- 'ID' =>
- array (
- '01' => 'Aceh',
- '02' => 'Bali',
- '03' => 'Bengkulu',
- '04' => 'Jakarta Raya',
- '05' => 'Jambi',
- '07' => 'Jawa Tengah',
- '08' => 'Jawa Timur',
- 10 => 'Yogyakarta',
- 11 => 'Kalimantan Barat',
- 12 => 'Kalimantan Selatan',
- 13 => 'Kalimantan Tengah',
- 14 => 'Kalimantan Timur',
- 15 => 'Lampung',
- 17 => 'Nusa Tenggara Barat',
- 18 => 'Nusa Tenggara Timur',
- 21 => 'Sulawesi Tengah',
- 22 => 'Sulawesi Tenggara',
- 24 => 'Sumatera Barat',
- 26 => 'Sumatera Utara',
- 28 => 'Maluku',
- 29 => 'Maluku Utara',
- 30 => 'Jawa Barat',
- 31 => 'Sulawesi Utara',
- 32 => 'Sumatera Selatan',
- 33 => 'Banten',
- 34 => 'Gorontalo',
- 35 => 'Kepulauan Bangka Belitung',
- 36 => 'Papua',
- 37 => 'Riau',
- 38 => 'Sulawesi Selatan',
- 39 => 'Irian Jaya Barat',
- 40 => 'Kepulauan Riau',
- 41 => 'Sulawesi Barat',
- ),
- 'IE' =>
- array (
- '01' => 'Carlow',
- '02' => 'Cavan',
- '03' => 'Clare',
- '04' => 'Cork',
- '06' => 'Donegal',
- '07' => 'Dublin',
- 10 => 'Galway',
- 11 => 'Kerry',
- 12 => 'Kildare',
- 13 => 'Kilkenny',
- 14 => 'Leitrim',
- 15 => 'Laois',
- 16 => 'Limerick',
- 18 => 'Longford',
- 19 => 'Louth',
- 20 => 'Mayo',
- 21 => 'Meath',
- 22 => 'Monaghan',
- 23 => 'Offaly',
- 24 => 'Roscommon',
- 25 => 'Sligo',
- 26 => 'Tipperary',
- 27 => 'Waterford',
- 29 => 'Westmeath',
- 30 => 'Wexford',
- 31 => 'Wicklow',
- ),
- 'IL' =>
- array (
- '01' => 'HaDarom',
- '02' => 'HaMerkaz',
- '03' => 'HaZafon',
- '04' => 'Hefa',
- '05' => 'Tel Aviv',
- '06' => 'Yerushalayim',
- ),
- 'IN' =>
- array (
- '01' => 'Andaman and Nicobar Islands',
- '02' => 'Andhra Pradesh',
- '03' => 'Assam',
- '05' => 'Chandigarh',
- '06' => 'Dadra and Nagar Haveli',
- '07' => 'Delhi',
- '09' => 'Gujarat',
- 10 => 'Haryana',
- 11 => 'Himachal Pradesh',
- 12 => 'Jammu and Kashmir',
- 13 => 'Kerala',
- 14 => 'Lakshadweep',
- 16 => 'Maharashtra',
- 17 => 'Manipur',
- 18 => 'Meghalaya',
- 19 => 'Karnataka',
- 20 => 'Nagaland',
- 21 => 'Orissa',
- 22 => 'Puducherry',
- 23 => 'Punjab',
- 24 => 'Rajasthan',
- 25 => 'Tamil Nadu',
- 26 => 'Tripura',
- 28 => 'West Bengal',
- 29 => 'Sikkim',
- 30 => 'Arunachal Pradesh',
- 31 => 'Mizoram',
- 32 => 'Daman and Diu',
- 33 => 'Goa',
- 34 => 'Bihar',
- 35 => 'Madhya Pradesh',
- 36 => 'Uttar Pradesh',
- 37 => 'Chhattisgarh',
- 38 => 'Jharkhand',
- 39 => 'Uttarakhand',
- ),
- 'IQ' =>
- array (
- '01' => 'Al Anbar',
- '02' => 'Al Basrah',
- '03' => 'Al Muthanna',
- '04' => 'Al Qadisiyah',
- '05' => 'As Sulaymaniyah',
- '06' => 'Babil',
- '07' => 'Baghdad',
- '08' => 'Dahuk',
- '09' => 'Dhi Qar',
- 10 => 'Diyala',
- 11 => 'Arbil',
- 12 => 'Karbala\'',
- 13 => 'At Ta\'mim',
- 14 => 'Maysan',
- 15 => 'Ninawa',
- 16 => 'Wasit',
- 17 => 'An Najaf',
- 18 => 'Salah ad Din',
- ),
- 'IR' =>
- array (
- '01' => 'Azarbayjan-e Bakhtari',
- '03' => 'Chahar Mahall va Bakhtiari',
- '04' => 'Sistan va Baluchestan',
- '05' => 'Kohkiluyeh va Buyer Ahmadi',
- '07' => 'Fars',
- '08' => 'Gilan',
- '09' => 'Hamadan',
- 10 => 'Ilam',
- 11 => 'Hormozgan',
- 29 => 'Kerman',
- 13 => 'Bakhtaran',
- 15 => 'Khuzestan',
- 16 => 'Kordestan',
- 35 => 'Mazandaran',
- 18 => 'Semnan Province',
- 34 => 'Markazi',
- 36 => 'Zanjan',
- 22 => 'Bushehr',
- 23 => 'Lorestan',
- 25 => 'Semnan',
- 26 => 'Tehran',
- 28 => 'Esfahan',
- 30 => 'Khorasan',
- 40 => 'Yazd',
- 32 => 'Ardabil',
- 33 => 'East Azarbaijan',
- 37 => 'Golestan',
- 38 => 'Qazvin',
- 39 => 'Qom',
- 41 => 'Khorasan-e Janubi',
- 42 => 'Khorasan-e Razavi',
- 43 => 'Khorasan-e Shemali',
- 44 => 'Alborz',
- ),
- 'IS' =>
- array (
- '03' => 'Arnessysla',
- '05' => 'Austur-Hunavatnssysla',
- '06' => 'Austur-Skaftafellssysla',
- '07' => 'Borgarfjardarsysla',
- '09' => 'Eyjafjardarsysla',
- 10 => 'Gullbringusysla',
- 15 => 'Kjosarsysla',
- 17 => 'Myrasysla',
- 20 => 'Nordur-Mulasysla',
- 21 => 'Nordur-Tingeyjarsysla',
- 23 => 'Rangarvallasysla',
- 28 => 'Skagafjardarsysla',
- 29 => 'Snafellsnes- og Hnappadalssysla',
- 30 => 'Strandasysla',
- 31 => 'Sudur-Mulasysla',
- 32 => 'Sudur-Tingeyjarsysla',
- 34 => 'Vestur-Bardastrandarsysla',
- 35 => 'Vestur-Hunavatnssysla',
- 36 => 'Vestur-Isafjardarsysla',
- 37 => 'Vestur-Skaftafellssysla',
- 38 => 'Austurland',
- 39 => 'Hofuoborgarsvaoio',
- 40 => 'Norourland Eystra',
- 41 => 'Norourland Vestra',
- 42 => 'Suourland',
- 43 => 'Suournes',
- 44 => 'Vestfiroir',
- 45 => 'Vesturland',
- ),
- 'IT' =>
- array (
- '01' => 'Abruzzi',
- '02' => 'Basilicata',
- '03' => 'Calabria',
- '04' => 'Campania',
- '05' => 'Emilia-Romagna',
- '06' => 'Friuli-Venezia Giulia',
- '07' => 'Lazio',
- '08' => 'Liguria',
- '09' => 'Lombardia',
- 10 => 'Marche',
- 11 => 'Molise',
- 12 => 'Piemonte',
- 13 => 'Puglia',
- 14 => 'Sardegna',
- 15 => 'Sicilia',
- 16 => 'Toscana',
- 17 => 'Trentino-Alto Adige',
- 18 => 'Umbria',
- 19 => 'Valle d\'Aosta',
- 20 => 'Veneto',
- ),
- 'JM' =>
- array (
- '01' => 'Clarendon',
- '02' => 'Hanover',
- '04' => 'Manchester',
- '07' => 'Portland',
- '08' => 'Saint Andrew',
- '09' => 'Saint Ann',
- 10 => 'Saint Catherine',
- 11 => 'Saint Elizabeth',
- 12 => 'Saint James',
- 13 => 'Saint Mary',
- 14 => 'Saint Thomas',
- 15 => 'Trelawny',
- 16 => 'Westmoreland',
- 17 => 'Kingston',
- ),
- 'JO' =>
- array (
- '02' => 'Al Balqa\'',
- '09' => 'Al Karak',
- 12 => 'At Tafilah',
- 15 => 'Al Mafraq',
- 16 => 'Amman',
- 17 => 'Az Zaraqa',
- 18 => 'Irbid',
- 19 => 'Ma\'an',
- 20 => 'Ajlun',
- 21 => 'Al Aqabah',
- 22 => 'Jarash',
- 23 => 'Madaba',
- ),
- 'JP' =>
- array (
- '01' => 'Aichi',
- '02' => 'Akita',
- '03' => 'Aomori',
- '04' => 'Chiba',
- '05' => 'Ehime',
- '06' => 'Fukui',
- '07' => 'Fukuoka',
- '08' => 'Fukushima',
- '09' => 'Gifu',
- 10 => 'Gumma',
- 11 => 'Hiroshima',
- 12 => 'Hokkaido',
- 13 => 'Hyogo',
- 14 => 'Ibaraki',
- 15 => 'Ishikawa',
- 16 => 'Iwate',
- 17 => 'Kagawa',
- 18 => 'Kagoshima',
- 19 => 'Kanagawa',
- 20 => 'Kochi',
- 21 => 'Kumamoto',
- 22 => 'Kyoto',
- 23 => 'Mie',
- 24 => 'Miyagi',
- 25 => 'Miyazaki',
- 26 => 'Nagano',
- 27 => 'Nagasaki',
- 28 => 'Nara',
- 29 => 'Niigata',
- 30 => 'Oita',
- 31 => 'Okayama',
- 32 => 'Osaka',
- 33 => 'Saga',
- 34 => 'Saitama',
- 35 => 'Shiga',
- 36 => 'Shimane',
- 37 => 'Shizuoka',
- 38 => 'Tochigi',
- 39 => 'Tokushima',
- 40 => 'Tokyo',
- 41 => 'Tottori',
- 42 => 'Toyama',
- 43 => 'Wakayama',
- 44 => 'Yamagata',
- 45 => 'Yamaguchi',
- 46 => 'Yamanashi',
- 47 => 'Okinawa',
- ),
- 'KE' =>
- array (
- '01' => 'Central',
- '02' => 'Coast',
- '03' => 'Eastern',
- '05' => 'Nairobi Area',
- '06' => 'North-Eastern',
- '07' => 'Nyanza',
- '08' => 'Rift Valley',
- '09' => 'Western',
- ),
- 'KG' =>
- array (
- '01' => 'Bishkek',
- '02' => 'Chuy',
- '03' => 'Jalal-Abad',
- '04' => 'Naryn',
- '08' => 'Osh',
- '06' => 'Talas',
- '07' => 'Ysyk-Kol',
- '09' => 'Batken',
- ),
- 'KH' =>
- array (
- 29 => 'Batdambang',
- '02' => 'Kampong Cham',
- '03' => 'Kampong Chhnang',
- '04' => 'Kampong Speu',
- '05' => 'Kampong Thum',
- '06' => 'Kampot',
- '07' => 'Kandal',
- '08' => 'Koh Kong',
- '09' => 'Kracheh',
- 10 => 'Mondulkiri',
- 22 => 'Phnum Penh',
- 12 => 'Pursat',
- 13 => 'Preah Vihear',
- 14 => 'Prey Veng',
- 15 => 'Ratanakiri Kiri',
- 16 => 'Siem Reap',
- 17 => 'Stung Treng',
- 18 => 'Svay Rieng',
- 19 => 'Takeo',
- 23 => 'Ratanakiri',
- 25 => 'Banteay Meanchey',
- 28 => 'Preah Seihanu',
- 30 => 'Pailin',
- ),
- 'KI' =>
- array (
- '01' => 'Gilbert Islands',
- '02' => 'Line Islands',
- '03' => 'Phoenix Islands',
- ),
- 'KM' =>
- array (
- '01' => 'Anjouan',
- '02' => 'Grande Comore',
- '03' => 'Moheli',
- ),
- 'KN' =>
- array (
- '01' => 'Christ Church Nichola Town',
- '02' => 'Saint Anne Sandy Point',
- '03' => 'Saint George Basseterre',
- '04' => 'Saint George Gingerland',
- '05' => 'Saint James Windward',
- '06' => 'Saint John Capisterre',
- '07' => 'Saint John Figtree',
- '08' => 'Saint Mary Cayon',
- '09' => 'Saint Paul Capisterre',
- 10 => 'Saint Paul Charlestown',
- 11 => 'Saint Peter Basseterre',
- 12 => 'Saint Thomas Lowland',
- 13 => 'Saint Thomas Middle Island',
- 15 => 'Trinity Palmetto Point',
- ),
- 'KP' =>
- array (
- '01' => 'Chagang-do',
- '03' => 'Hamgyong-namdo',
- '06' => 'Hwanghae-namdo',
- '07' => 'Hwanghae-bukto',
- '08' => 'Kaesong-si',
- '09' => 'Kangwon-do',
- 11 => 'P\'yongan-bukto',
- 12 => 'P\'yongyang-si',
- 13 => 'Yanggang-do',
- 14 => 'Namp\'o-si',
- 15 => 'P\'yongan-namdo',
- 17 => 'Hamgyong-bukto',
- 18 => 'Najin Sonbong-si',
- ),
- 'KR' =>
- array (
- '01' => 'Cheju-do',
- '03' => 'Cholla-bukto',
- '05' => 'Ch\'ungch\'ong-bukto',
- '06' => 'Kangwon-do',
- 10 => 'Pusan-jikhalsi',
- 11 => 'Seoul-t\'ukpyolsi',
- 12 => 'Inch\'on-jikhalsi',
- 13 => 'Kyonggi-do',
- 14 => 'Kyongsang-bukto',
- 15 => 'Taegu-jikhalsi',
- 16 => 'Cholla-namdo',
- 17 => 'Ch\'ungch\'ong-namdo',
- 18 => 'Kwangju-jikhalsi',
- 19 => 'Taejon-jikhalsi',
- 20 => 'Kyongsang-namdo',
- 21 => 'Ulsan-gwangyoksi',
- ),
- 'KW' =>
- array (
- '01' => 'Al Ahmadi',
- '02' => 'Al Kuwayt',
- '05' => 'Al Jahra',
- '07' => 'Al Farwaniyah',
- '08' => 'Hawalli',
- '09' => 'Mubarak al Kabir',
- ),
- 'KY' =>
- array (
- '01' => 'Creek',
- '02' => 'Eastern',
- '03' => 'Midland',
- '04' => 'South Town',
- '05' => 'Spot Bay',
- '06' => 'Stake Bay',
- '07' => 'West End',
- '08' => 'Western',
- ),
- 'KZ' =>
- array (
- '01' => 'Almaty',
- '02' => 'Almaty City',
- '03' => 'Aqmola',
- '04' => 'Aqtobe',
- '05' => 'Astana',
- '06' => 'Atyrau',
- '07' => 'West Kazakhstan',
- '08' => 'Bayqonyr',
- '09' => 'Mangghystau',
- 10 => 'South Kazakhstan',
- 11 => 'Pavlodar',
- 12 => 'Qaraghandy',
- 13 => 'Qostanay',
- 14 => 'Qyzylorda',
- 15 => 'East Kazakhstan',
- 16 => 'North Kazakhstan',
- 17 => 'Zhambyl',
- ),
- 'LA' =>
- array (
- '01' => 'Attapu',
- '02' => 'Champasak',
- '03' => 'Houaphan',
- '04' => 'Khammouan',
- '05' => 'Louang Namtha',
- '07' => 'Oudomxai',
- '08' => 'Phongsali',
- '09' => 'Saravan',
- 10 => 'Savannakhet',
- 11 => 'Vientiane',
- 13 => 'Xaignabouri',
- 14 => 'Xiangkhoang',
- 17 => 'Louangphrabang',
- ),
- 'LB' =>
- array (
- '08' => 'Beqaa',
- '02' => 'Al Janub',
- '09' => 'Liban-Nord',
- '04' => 'Beyrouth',
- '05' => 'Mont-Liban',
- '06' => 'Liban-Sud',
- '07' => 'Nabatiye',
- 10 => 'Aakk',
- 11 => 'Baalbek-Hermel',
- ),
- 'LC' =>
- array (
- '01' => 'Anse-la-Raye',
- '02' => 'Dauphin',
- '03' => 'Castries',
- '04' => 'Choiseul',
- '05' => 'Dennery',
- '06' => 'Gros-Islet',
- '07' => 'Laborie',
- '08' => 'Micoud',
- '09' => 'Soufriere',
- 10 => 'Vieux-Fort',
- 11 => 'Praslin',
- ),
- 'LI' =>
- array (
- '01' => 'Balzers',
- '02' => 'Eschen',
- '03' => 'Gamprin',
- '04' => 'Mauren',
- '05' => 'Planken',
- '06' => 'Ruggell',
- '07' => 'Schaan',
- '08' => 'Schellenberg',
- '09' => 'Triesen',
- 10 => 'Triesenberg',
- 11 => 'Vaduz',
- 21 => 'Gbarpolu',
- 22 => 'River Gee',
- ),
- 'LK' =>
- array (
- 29 => 'Central',
- 30 => 'North Central',
- 32 => 'North Western',
- 33 => 'Sabaragamuwa',
- 34 => 'Southern',
- 35 => 'Uva',
- 36 => 'Western',
- 37 => 'Eastern',
- 38 => 'Northern',
- ),
- 'LR' =>
- array (
- '01' => 'Bong',
- 12 => 'Grand Cape Mount',
- 20 => 'Lofa',
- 13 => 'Maryland',
- '07' => 'Monrovia',
- '09' => 'Nimba',
- 10 => 'Sino',
- 11 => 'Grand Bassa',
- 14 => 'Montserrado',
- 17 => 'Margibi',
- 18 => 'River Cess',
- 19 => 'Grand Gedeh',
- 21 => 'Gbarpolu',
- 22 => 'River Gee',
- ),
- 'LS' =>
- array (
- 10 => 'Berea',
- 11 => 'Butha-Buthe',
- 12 => 'Leribe',
- 13 => 'Mafeteng',
- 14 => 'Maseru',
- 15 => 'Mohales Hoek',
- 16 => 'Mokhotlong',
- 17 => 'Qachas Nek',
- 18 => 'Quthing',
- 19 => 'Thaba-Tseka',
- ),
- 'LT' =>
- array (
- 56 => 'Alytaus Apskritis',
- 57 => 'Kauno Apskritis',
- 58 => 'Klaipedos Apskritis',
- 59 => 'Marijampoles Apskritis',
- 60 => 'Panevezio Apskritis',
- 61 => 'Siauliu Apskritis',
- 62 => 'Taurages Apskritis',
- 63 => 'Telsiu Apskritis',
- 64 => 'Utenos Apskritis',
- 65 => 'Vilniaus Apskritis',
- ),
- 'LU' =>
- array (
- '01' => 'Diekirch',
- '02' => 'Grevenmacher',
- '03' => 'Luxembourg',
- ),
- 'LV' =>
- array (
- '01' => 'Aizkraukles',
- '02' => 'Aluksnes',
- '03' => 'Balvu',
- '04' => 'Bauskas',
- '05' => 'Cesu',
- '07' => 'Daugavpils',
- '08' => 'Dobeles',
- '09' => 'Gulbenes',
- 10 => 'Jekabpils',
- 11 => 'Jelgava',
- 12 => 'Jelgavas',
- 13 => 'Jurmala',
- 14 => 'Kraslavas',
- 15 => 'Kuldigas',
- 16 => 'Liepaja',
- 17 => 'Liepajas',
- 18 => 'Limbazu',
- 19 => 'Ludzas',
- 20 => 'Madonas',
- 21 => 'Ogres',
- 22 => 'Preilu',
- 23 => 'Rezekne',
- 24 => 'Rezeknes',
- 25 => 'Riga',
- 26 => 'Rigas',
- 27 => 'Saldus',
- 28 => 'Talsu',
- 29 => 'Tukuma',
- 30 => 'Valkas',
- 31 => 'Valmieras',
- 33 => 'Ventspils',
- ),
- 'LY' =>
- array (
- '03' => 'Al Aziziyah',
- '05' => 'Al Jufrah',
- '08' => 'Al Kufrah',
- 13 => 'Ash Shati\'',
- 30 => 'Murzuq',
- 34 => 'Sabha',
- 41 => 'Tarhunah',
- 42 => 'Tubruq',
- 45 => 'Zlitan',
- 47 => 'Ajdabiya',
- 48 => 'Al Fatih',
- 49 => 'Al Jabal al Akhdar',
- 50 => 'Al Khums',
- 51 => 'An Nuqat al Khams',
- 52 => 'Awbari',
- 53 => 'Az Zawiyah',
- 54 => 'Banghazi',
- 55 => 'Darnah',
- 56 => 'Ghadamis',
- 57 => 'Gharyan',
- 58 => 'Misratah',
- 59 => 'Sawfajjin',
- 60 => 'Surt',
- 61 => 'Tarabulus',
- 62 => 'Yafran',
- ),
- 'MA' =>
- array (
- 45 => 'Grand Casablanca',
- 46 => 'Fes-Boulemane',
- 47 => 'Marrakech-Tensift-Al Haouz',
- 48 => 'Meknes-Tafilalet',
- 49 => 'Rabat-Sale-Zemmour-Zaer',
- 50 => 'Chaouia-Ouardigha',
- 51 => 'Doukkala-Abda',
- 52 => 'Gharb-Chrarda-Beni Hssen',
- 53 => 'Guelmim-Es Smara',
- 54 => 'Oriental',
- 55 => 'Souss-Massa-Dr',
- 56 => 'Tadla-Azilal',
- 57 => 'Tanger-Tetouan',
- 58 => 'Taza-Al Hoceima-Taounate',
- 59 => 'La',
- ),
- 'MC' =>
- array (
- '01' => 'La Condamine',
- '02' => 'Monaco',
- '03' => 'Monte-Carlo',
- ),
- 'MD' =>
- array (
- 51 => 'Gagauzia',
- 57 => 'Chisinau',
- 58 => 'Stinga Nistrului',
- 59 => 'Anenii Noi',
- 60 => 'Balti',
- 61 => 'Basarabeasca',
- 62 => 'Bender',
- 63 => 'Briceni',
- 64 => 'Cahul',
- 65 => 'Cantemir',
- 66 => 'Calarasi',
- 67 => 'Causeni',
- 68 => 'Cimislia',
- 69 => 'Criuleni',
- 70 => 'Donduseni',
- 71 => 'Drochia',
- 72 => 'Dubasari',
- 73 => 'Edinet',
- 74 => 'Falesti',
- 75 => 'Floresti',
- 76 => 'Glodeni',
- 77 => 'Hincesti',
- 78 => 'Ialoveni',
- 79 => 'Leova',
- 80 => 'Nisporeni',
- 81 => 'Ocnita',
- 82 => 'Orhei',
- 83 => 'Rezina',
- 84 => 'Riscani',
- 85 => 'Singerei',
- 86 => 'Soldanesti',
- 87 => 'Soroca',
- 88 => 'Stefan-Voda',
- 89 => 'Straseni',
- 90 => 'Taraclia',
- 91 => 'Telenesti',
- 92 => 'Ungheni',
- ),
- 'MG' =>
- array (
- '01' => 'Antsiranana',
- '02' => 'Fianarantsoa',
- '03' => 'Mahajanga',
- '04' => 'Toamasina',
- '05' => 'Antananarivo',
- '06' => 'Toliara',
- ),
- 'MK' =>
- array (
- '01' => 'Aracinovo',
- '02' => 'Bac',
- '03' => 'Belcista',
- '04' => 'Berovo',
- '05' => 'Bistrica',
- '06' => 'Bitola',
- '07' => 'Blatec',
- '08' => 'Bogdanci',
- '09' => 'Bogomila',
- 10 => 'Bogovinje',
- 11 => 'Bosilovo',
- 12 => 'Brvenica',
- 'C8' => 'Cair',
- 14 => 'Capari',
- 'C9' => 'Caska',
- 16 => 'Cegrane',
- 17 => 'Centar',
- 18 => 'Centar Zupa',
- 19 => 'Cesinovo',
- 20 => 'Cucer-Sandevo',
- 'D2' => 'Debar',
- 22 => 'Delcevo',
- 23 => 'Delogozdi',
- 'D3' => 'Demir Hisar',
- 25 => 'Demir Kapija',
- 26 => 'Dobrusevo',
- 27 => 'Dolna Banjica',
- 28 => 'Dolneni',
- 29 => 'Dorce Petrov',
- 30 => 'Drugovo',
- 31 => 'Dzepciste',
- 32 => 'Gazi Baba',
- 33 => 'Gevgelija',
- 'D4' => 'Gostivar',
- 35 => 'Gradsko',
- 36 => 'Ilinden',
- 37 => 'Izvor',
- 'D5' => 'Jegunovce',
- 39 => 'Kamenjane',
- 40 => 'Karbinci',
- 41 => 'Karpos',
- 'D6' => 'Kavadarci',
- 43 => 'Kicevo',
- 44 => 'Kisela Voda',
- 45 => 'Klecevce',
- 46 => 'Kocani',
- 47 => 'Konce',
- 48 => 'Kondovo',
- 49 => 'Konopiste',
- 50 => 'Kosel',
- 51 => 'Kratovo',
- 52 => 'Kriva Palanka',
- 53 => 'Krivogastani',
- 54 => 'Krusevo',
- 55 => 'Kuklis',
- 56 => 'Kukurecani',
- 'D7' => 'Kumanovo',
- 58 => 'Labunista',
- 59 => 'Lipkovo',
- 60 => 'Lozovo',
- 61 => 'Lukovo',
- 62 => 'Makedonska Kamenica',
- 'D8' => 'Makedonski Brod',
- 64 => 'Mavrovi Anovi',
- 65 => 'Meseista',
- 66 => 'Miravci',
- 67 => 'Mogila',
- 68 => 'Murtino',
- 69 => 'Negotino',
- 70 => 'Negotino-Polosko',
- 71 => 'Novaci',
- 72 => 'Novo Selo',
- 73 => 'Oblesevo',
- 'E2' => 'Ohrid',
- 75 => 'Orasac',
- 76 => 'Orizari',
- 77 => 'Oslomej',
- 78 => 'Pehcevo',
- 79 => 'Petrovec',
- 80 => 'Plasnica',
- 81 => 'Podares',
- 'E3' => 'Prilep',
- 83 => 'Probistip',
- 84 => 'Radovis',
- 85 => 'Rankovce',
- 86 => 'Resen',
- 87 => 'Rosoman',
- 88 => 'Rostusa',
- 89 => 'Samokov',
- 90 => 'Saraj',
- 91 => 'Sipkovica',
- 92 => 'Sopiste',
- 93 => 'Sopotnica',
- 94 => 'Srbinovo',
- 95 => 'Staravina',
- 96 => 'Star Dojran',
- 97 => 'Staro Nagoricane',
- 98 => 'Stip',
- 'E6' => 'Struga',
- 'E7' => 'Strumica',
- 'A2' => 'Studenicani',
- 'A3' => 'Suto Orizari',
- 'A4' => 'Sveti Nikole',
- 'A5' => 'Tearce',
- 'E8' => 'Tetovo',
- 'A7' => 'Topolcani',
- 'E9' => 'Valandovo',
- 'A9' => 'Vasilevo',
- 'F1' => 'Veles',
- 'B2' => 'Velesta',
- 'B3' => 'Vevcani',
- 'B4' => 'Vinica',
- 'B5' => 'Vitoliste',
- 'B6' => 'Vranestica',
- 'B7' => 'Vrapciste',
- 'B8' => 'Vratnica',
- 'B9' => 'Vrutok',
- 'C1' => 'Zajas',
- 'C2' => 'Zelenikovo',
- 'C3' => 'Zelino',
- 'C4' => 'Zitose',
- 'C5' => 'Zletovo',
- 'C6' => 'Zrnovci',
- 'E5' => 'Dojran',
- 'F2' => 'Aerodrom',
- ),
- 'ML' =>
- array (
- '01' => 'Bamako',
- '03' => 'Kayes',
- '04' => 'Mopti',
- '05' => 'Segou',
- '06' => 'Sikasso',
- '07' => 'Koulikoro',
- '08' => 'Tombouctou',
- '09' => 'Gao',
- 10 => 'Kidal',
- ),
- 'MM' =>
- array (
- '01' => 'Rakhine State',
- '02' => 'Chin State',
- '03' => 'Irrawaddy',
- '04' => 'Kachin State',
- '05' => 'Karan State',
- '06' => 'Kayah State',
- '07' => 'Magwe',
- '08' => 'Mandalay',
- '09' => 'Pegu',
- 10 => 'Sagaing',
- 11 => 'Shan State',
- 12 => 'Tenasserim',
- 13 => 'Mon State',
- 14 => 'Rangoon',
- 17 => 'Yangon',
- ),
- 'MN' =>
- array (
- '01' => 'Arhangay',
- '02' => 'Bayanhongor',
- '03' => 'Bayan-Olgiy',
- '05' => 'Darhan',
- '06' => 'Dornod',
- '07' => 'Dornogovi',
- '08' => 'Dundgovi',
- '09' => 'Dzavhan',
- 10 => 'Govi-Altay',
- 11 => 'Hentiy',
- 12 => 'Hovd',
- 13 => 'Hovsgol',
- 14 => 'Omnogovi',
- 15 => 'Ovorhangay',
- 16 => 'Selenge',
- 17 => 'Suhbaatar',
- 18 => 'Tov',
- 19 => 'Uvs',
- 20 => 'Ulaanbaatar',
- 21 => 'Bulgan',
- 22 => 'Erdenet',
- 23 => 'Darhan-Uul',
- 24 => 'Govisumber',
- 25 => 'Orhon',
- ),
- 'MO' =>
- array (
- '01' => 'Ilhas',
- '02' => 'Macau',
- ),
- 'MR' =>
- array (
- '01' => 'Hodh Ech Chargui',
- '02' => 'Hodh El Gharbi',
- '03' => 'Assaba',
- '04' => 'Gorgol',
- '05' => 'Brakna',
- '06' => 'Trarza',
- '07' => 'Adrar',
- '08' => 'Dakhlet Nouadhibou',
- '09' => 'Tagant',
- 10 => 'Guidimaka',
- 11 => 'Tiris Zemmour',
- 12 => 'Inchiri',
- ),
- 'MS' =>
- array (
- '01' => 'Saint Anthony',
- '02' => 'Saint Georges',
- '03' => 'Saint Peter',
- ),
- 'MU' =>
- array (
- 12 => 'Black River',
- 13 => 'Flacq',
- 14 => 'Grand Port',
- 15 => 'Moka',
- 16 => 'Pamplemousses',
- 17 => 'Plaines Wilhems',
- 18 => 'Port Louis',
- 19 => 'Riviere du Rempart',
- 20 => 'Savanne',
- 21 => 'Agalega Islands',
- 22 => 'Cargados Carajos',
- 23 => 'Rodrigues',
- ),
- 'MV' =>
- array (
- '01' => 'Seenu',
- '05' => 'Laamu',
- 30 => 'Alifu',
- 31 => 'Baa',
- 32 => 'Dhaalu',
- 33 => 'Faafu',
- 34 => 'Gaafu Alifu',
- 35 => 'Gaafu Dhaalu',
- 36 => 'Haa Alifu',
- 37 => 'Haa Dhaalu',
- 38 => 'Kaafu',
- 39 => 'Lhaviyani',
- 40 => 'Maale',
- 41 => 'Meemu',
- 42 => 'Gnaviyani',
- 43 => 'Noonu',
- 44 => 'Raa',
- 45 => 'Shaviyani',
- 46 => 'Thaa',
- 47 => 'Vaavu',
- ),
- 'MW' =>
- array (
- '02' => 'Chikwawa',
- '03' => 'Chiradzulu',
- '04' => 'Chitipa',
- '05' => 'Thyolo',
- '06' => 'Dedza',
- '07' => 'Dowa',
- '08' => 'Karonga',
- '09' => 'Kasungu',
- 11 => 'Lilongwe',
- 12 => 'Mangochi',
- 13 => 'Mchinji',
- 15 => 'Mzimba',
- 16 => 'Ntcheu',
- 17 => 'Nkhata Bay',
- 18 => 'Nkhotakota',
- 19 => 'Nsanje',
- 20 => 'Ntchisi',
- 21 => 'Rumphi',
- 22 => 'Salima',
- 23 => 'Zomba',
- 24 => 'Blantyre',
- 25 => 'Mwanza',
- 26 => 'Balaka',
- 27 => 'Likoma',
- 28 => 'Machinga',
- 29 => 'Mulanje',
- 30 => 'Phalombe',
- ),
- 'MX' =>
- array (
- '01' => 'Aguascalientes',
- '02' => 'Baja California',
- '03' => 'Baja California Sur',
- '04' => 'Campeche',
- '05' => 'Chiapas',
- '06' => 'Chihuahua',
- '07' => 'Coahuila de Zaragoza',
- '08' => 'Colima',
- '09' => 'Distrito Federal',
- 10 => 'Durango',
- 11 => 'Guanajuato',
- 12 => 'Guerrero',
- 13 => 'Hidalgo',
- 14 => 'Jalisco',
- 15 => 'Mexico',
- 16 => 'Michoacan de Ocampo',
- 17 => 'Morelos',
- 18 => 'Nayarit',
- 19 => 'Nuevo Leon',
- 20 => 'Oaxaca',
- 21 => 'Puebla',
- 22 => 'Queretaro de Arteaga',
- 23 => 'Quintana Roo',
- 24 => 'San Luis Potosi',
- 25 => 'Sinaloa',
- 26 => 'Sonora',
- 27 => 'Tabasco',
- 28 => 'Tamaulipas',
- 29 => 'Tlaxcala',
- 30 => 'Veracruz-Llave',
- 31 => 'Yucatan',
- 32 => 'Zacatecas',
- ),
- 'MY' =>
- array (
- '01' => 'Johor',
- '02' => 'Kedah',
- '03' => 'Kelantan',
- '04' => 'Melaka',
- '05' => 'Negeri Sembilan',
- '06' => 'Pahang',
- '07' => 'Perak',
- '08' => 'Perlis',
- '09' => 'Pulau Pinang',
- 11 => 'Sarawak',
- 12 => 'Selangor',
- 13 => 'Terengganu',
- 14 => 'Kuala Lumpur',
- 15 => 'Labuan',
- 16 => 'Sabah',
- 17 => 'Putrajaya',
- ),
- 'MZ' =>
- array (
- '01' => 'Cabo Delgado',
- '02' => 'Gaza',
- '03' => 'Inhambane',
- 11 => 'Maputo',
- '05' => 'Sofala',
- '06' => 'Nampula',
- '07' => 'Niassa',
- '08' => 'Tete',
- '09' => 'Zambezia',
- 10 => 'Manica',
- ),
- 'NA' =>
- array (
- '01' => 'Bethanien',
- '02' => 'Caprivi Oos',
- '03' => 'Boesmanland',
- '04' => 'Gobabis',
- '05' => 'Grootfontein',
- '06' => 'Kaokoland',
- '07' => 'Karibib',
- '08' => 'Keetmanshoop',
- '09' => 'Luderitz',
- 10 => 'Maltahohe',
- 11 => 'Okahandja',
- 12 => 'Omaruru',
- 13 => 'Otjiwarongo',
- 14 => 'Outjo',
- 15 => 'Owambo',
- 16 => 'Rehoboth',
- 17 => 'Swakopmund',
- 18 => 'Tsumeb',
- 20 => 'Karasburg',
- 21 => 'Windhoek',
- 22 => 'Damaraland',
- 23 => 'Hereroland Oos',
- 24 => 'Hereroland Wes',
- 25 => 'Kavango',
- 26 => 'Mariental',
- 27 => 'Namaland',
- 28 => 'Caprivi',
- 29 => 'Erongo',
- 30 => 'Hardap',
- 31 => 'Karas',
- 32 => 'Kunene',
- 33 => 'Ohangwena',
- 34 => 'Okavango',
- 35 => 'Omaheke',
- 36 => 'Omusati',
- 37 => 'Oshana',
- 38 => 'Oshikoto',
- 39 => 'Otjozondjupa',
- ),
- 'NE' =>
- array (
- '01' => 'Agadez',
- '02' => 'Diffa',
- '03' => 'Dosso',
- '04' => 'Maradi',
- '08' => 'Niamey',
- '06' => 'Tahoua',
- '07' => 'Zinder',
- ),
- 'NG' =>
- array (
- '05' => 'Lagos',
- 11 => 'Federal Capital Territory',
- 16 => 'Ogun',
- 21 => 'Akwa Ibom',
- 22 => 'Cross River',
- 23 => 'Kaduna',
- 24 => 'Katsina',
- 25 => 'Anambra',
- 26 => 'Benue',
- 27 => 'Borno',
- 28 => 'Imo',
- 29 => 'Kano',
- 30 => 'Kwara',
- 31 => 'Niger',
- 32 => 'Oyo',
- 35 => 'Adamawa',
- 36 => 'Delta',
- 37 => 'Edo',
- 39 => 'Jigawa',
- 40 => 'Kebbi',
- 41 => 'Kogi',
- 42 => 'Osun',
- 43 => 'Taraba',
- 44 => 'Yobe',
- 45 => 'Abia',
- 46 => 'Bauchi',
- 47 => 'Enugu',
- 48 => 'Ondo',
- 49 => 'Plateau',
- 50 => 'Rivers',
- 51 => 'Sokoto',
- 52 => 'Bayelsa',
- 53 => 'Ebonyi',
- 54 => 'Ekiti',
- 55 => 'Gombe',
- 56 => 'Nassarawa',
- 57 => 'Zamfara',
- ),
- 'NI' =>
- array (
- '01' => 'Boaco',
- '02' => 'Carazo',
- '03' => 'Chinandega',
- '04' => 'Chontales',
- '05' => 'Esteli',
- '06' => 'Granada',
- '07' => 'Jinotega',
- '08' => 'Leon',
- '09' => 'Madriz',
- 10 => 'Managua',
- 11 => 'Masaya',
- 12 => 'Matagalpa',
- 13 => 'Nueva Segovia',
- 14 => 'Rio San Juan',
- 15 => 'Rivas',
- 16 => 'Zelaya',
- 17 => 'Autonoma Atlantico Norte',
- 18 => 'Region Autonoma Atlantico Sur',
- ),
- 'NL' =>
- array (
- '01' => 'Drenthe',
- '02' => 'Friesland',
- '03' => 'Gelderland',
- '04' => 'Groningen',
- '05' => 'Limburg',
- '06' => 'Noord-Brabant',
- '07' => 'Noord-Holland',
- '09' => 'Utrecht',
- 10 => 'Zeeland',
- 11 => 'Zuid-Holland',
- 15 => 'Overijssel',
- 16 => 'Flevoland',
- ),
- 'NO' =>
- array (
- '01' => 'Akershus',
- '02' => 'Aust-Agder',
- '04' => 'Buskerud',
- '05' => 'Finnmark',
- '06' => 'Hedmark',
- '07' => 'Hordaland',
- '08' => 'More og Romsdal',
- '09' => 'Nordland',
- 10 => 'Nord-Trondelag',
- 11 => 'Oppland',
- 12 => 'Oslo',
- 13 => 'Ostfold',
- 14 => 'Rogaland',
- 15 => 'Sogn og Fjordane',
- 16 => 'Sor-Trondelag',
- 17 => 'Telemark',
- 18 => 'Troms',
- 19 => 'Vest-Agder',
- 20 => 'Vestfold',
- ),
- 'NP' =>
- array (
- '01' => 'Bagmati',
- '02' => 'Bheri',
- '03' => 'Dhawalagiri',
- '04' => 'Gandaki',
- '05' => 'Janakpur',
- '06' => 'Karnali',
- '07' => 'Kosi',
- '08' => 'Lumbini',
- '09' => 'Mahakali',
- 10 => 'Mechi',
- 11 => 'Narayani',
- 12 => 'Rapti',
- 13 => 'Sagarmatha',
- 14 => 'Seti',
- ),
- 'NR' =>
- array (
- '01' => 'Aiwo',
- '02' => 'Anabar',
- '03' => 'Anetan',
- '04' => 'Anibare',
- '05' => 'Baiti',
- '06' => 'Boe',
- '07' => 'Buada',
- '08' => 'Denigomodu',
- '09' => 'Ewa',
- 10 => 'Ijuw',
- 11 => 'Meneng',
- 12 => 'Nibok',
- 13 => 'Uaboe',
- 14 => 'Yaren',
- ),
- 'NZ' =>
- array (
- 10 => 'Chatham Islands',
- 'E7' => 'Auckland',
- 'E8' => 'Bay of Plenty',
- 'E9' => 'Canterbury',
- 'F1' => 'Gisborne',
- 'F2' => 'Hawke\'s Bay',
- 'F3' => 'Manawatu-Wanganui',
- 'F4' => 'Marlborough',
- 'F5' => 'Nelson',
- 'F6' => 'Northland',
- 'F7' => 'Otago',
- 'F8' => 'Southland',
- 'F9' => 'Taranaki',
- 'G1' => 'Waikato',
- 'G2' => 'Wellington',
- 'G3' => 'West Coast',
- ),
- 'OM' =>
- array (
- '01' => 'Ad Dakhiliyah',
- '02' => 'Al Batinah',
- '03' => 'Al Wusta',
- '04' => 'Ash Sharqiyah',
- '05' => 'Az Zahirah',
- '06' => 'Masqat',
- '07' => 'Musandam',
- '08' => 'Zufar',
- ),
- 'PA' =>
- array (
- '01' => 'Bocas del Toro',
- '02' => 'Chiriqui',
- '03' => 'Cocle',
- '04' => 'Colon',
- '05' => 'Darien',
- '06' => 'Herrera',
- '07' => 'Los Santos',
- '08' => 'Panama',
- '09' => 'San Blas',
- 10 => 'Veraguas',
- ),
- 'PE' =>
- array (
- '01' => 'Amazonas',
- '02' => 'Ancash',
- '03' => 'Apurimac',
- '04' => 'Arequipa',
- '05' => 'Ayacucho',
- '06' => 'Cajamarca',
- '07' => 'Callao',
- '08' => 'Cusco',
- '09' => 'Huancavelica',
- 10 => 'Huanuco',
- 11 => 'Ica',
- 12 => 'Junin',
- 13 => 'La Libertad',
- 14 => 'Lambayeque',
- 15 => 'Lima',
- 16 => 'Loreto',
- 17 => 'Madre de Dios',
- 18 => 'Moquegua',
- 19 => 'Pasco',
- 20 => 'Piura',
- 21 => 'Puno',
- 22 => 'San Martin',
- 23 => 'Tacna',
- 24 => 'Tumbes',
- 25 => 'Ucayali',
- ),
- 'PG' =>
- array (
- '01' => 'Central',
- '02' => 'Gulf',
- '03' => 'Milne Bay',
- '04' => 'Northern',
- '05' => 'Southern Highlands',
- '06' => 'Western',
- '07' => 'North Solomons',
- '08' => 'Chimbu',
- '09' => 'Eastern Highlands',
- 10 => 'East New Britain',
- 11 => 'East Sepik',
- 12 => 'Madang',
- 13 => 'Manus',
- 14 => 'Morobe',
- 15 => 'New Ireland',
- 16 => 'Western Highlands',
- 17 => 'West New Britain',
- 18 => 'Sandaun',
- 19 => 'Enga',
- 20 => 'National Capital',
- ),
- 'PH' =>
- array (
- '01' => 'Abra',
- '02' => 'Agusan del Norte',
- '03' => 'Agusan del Sur',
- '04' => 'Aklan',
- '05' => 'Albay',
- '06' => 'Antique',
- '07' => 'Bataan',
- '08' => 'Batanes',
- '09' => 'Batangas',
- 10 => 'Benguet',
- 11 => 'Bohol',
- 12 => 'Bukidnon',
- 13 => 'Bulacan',
- 14 => 'Cagayan',
- 15 => 'Camarines Norte',
- 16 => 'Camarines Sur',
- 17 => 'Camiguin',
- 18 => 'Capiz',
- 19 => 'Catanduanes',
- 20 => 'Cavite',
- 21 => 'Cebu',
- 22 => 'Basilan',
- 23 => 'Eastern Samar',
- 24 => 'Davao',
- 25 => 'Davao del Sur',
- 26 => 'Davao Oriental',
- 27 => 'Ifugao',
- 28 => 'Ilocos Norte',
- 29 => 'Ilocos Sur',
- 30 => 'Iloilo',
- 31 => 'Isabela',
- 32 => 'Kalinga-Apayao',
- 33 => 'Laguna',
- 34 => 'Lanao del Norte',
- 35 => 'Lanao del Sur',
- 36 => 'La Union',
- 37 => 'Leyte',
- 38 => 'Marinduque',
- 39 => 'Masbate',
- 40 => 'Mindoro Occidental',
- 41 => 'Mindoro Oriental',
- 42 => 'Misamis Occidental',
- 43 => 'Misamis Oriental',
- 44 => 'Mountain',
- 'H3' => 'Negros Occidental',
- 46 => 'Negros Oriental',
- 47 => 'Nueva Ecija',
- 48 => 'Nueva Vizcaya',
- 49 => 'Palawan',
- 50 => 'Pampanga',
- 51 => 'Pangasinan',
- 53 => 'Rizal',
- 54 => 'Romblon',
- 55 => 'Samar',
- 56 => 'Maguindanao',
- 57 => 'North Cotabato',
- 58 => 'Sorsogon',
- 59 => 'Southern Leyte',
- 60 => 'Sulu',
- 'N3' => 'Surigao del Norte',
- 62 => 'Surigao del Sur',
- 63 => 'Tarlac',
- 'P1' => 'Zambales',
- 65 => 'Zamboanga del Norte',
- 66 => 'Zamboanga del Sur',
- 67 => 'Northern Samar',
- 68 => 'Quirino',
- 69 => 'Siquijor',
- 70 => 'South Cotabato',
- 71 => 'Sultan Kudarat',
- 72 => 'Tawitawi',
- 'A1' => 'Angeles',
- 'A2' => 'Bacolod',
- 'A3' => 'Bago',
- 'A4' => 'Baguio',
- 'A5' => 'Bais',
- 'A6' => 'Basilan City',
- 'A7' => 'Batangas City',
- 'A8' => 'Butuan',
- 'A9' => 'Cabanatuan',
- 'B1' => 'Cadiz',
- 'B2' => 'Cagayan de Oro',
- 'B3' => 'Calbayog',
- 'B4' => 'Caloocan',
- 'B5' => 'Canlaon',
- 'B6' => 'Cavite City',
- 'B7' => 'Cebu City',
- 'B8' => 'Cotabato',
- 'B9' => 'Dagupan',
- 'C1' => 'Danao',
- 'C2' => 'Dapitan',
- 'C3' => 'Davao City',
- 'C4' => 'Dipolog',
- 'C5' => 'Dumaguete',
- 'C6' => 'General Santos',
- 'C7' => 'Gingoog',
- 'C8' => 'Iligan',
- 'C9' => 'Iloilo City',
- 'D1' => 'Iriga',
- 'D2' => 'La Carlota',
- 'D3' => 'Laoag',
- 'D4' => 'Lapu-Lapu',
- 'D5' => 'Legaspi',
- 'D6' => 'Lipa',
- 'D7' => 'Lucena',
- 'D8' => 'Mandaue',
- 'D9' => 'Manila',
- 'E1' => 'Marawi',
- 'E2' => 'Naga',
- 'E3' => 'Olongapo',
- 'E4' => 'Ormoc',
- 'E5' => 'Oroquieta',
- 'E6' => 'Ozamis',
- 'E7' => 'Pagadian',
- 'E8' => 'Palayan',
- 'E9' => 'Pasay',
- 'F1' => 'Puerto Princesa',
- 'F2' => 'Quezon City',
- 'F3' => 'Roxas',
- 'F5' => 'San Carlos',
- 'F6' => 'San Jose',
- 'F7' => 'San Pablo',
- 'F8' => 'Silay',
- 'F9' => 'Surigao',
- 'G1' => 'Tacloban',
- 'G2' => 'Tagaytay',
- 'G3' => 'Tagbilaran',
- 'G4' => 'Tangub',
- 'G5' => 'Toledo',
- 'G6' => 'Trece Martires',
- 'P2' => 'Zamboanga',
- 'G8' => 'Aurora',
- 'H2' => 'Quezon',
- 'H9' => 'Biliran',
- 'I6' => 'Compostela Valley',
- 'I7' => 'Davao del Norte',
- 'J3' => 'Guimaras',
- 'J4' => 'Himamaylan',
- 'J7' => 'Kalinga',
- 'K1' => 'Las Pinas',
- 'K5' => 'Malabon',
- 'K6' => 'Malaybalay',
- 'L4' => 'Muntinlupa',
- 'L5' => 'Navotas',
- 'L7' => 'Paranaque',
- 'L9' => 'Passi',
- 'M5' => 'San Jose del Monte',
- 'M6' => 'San Juan',
- 'M8' => 'Santiago',
- 'M9' => 'Sarangani',
- 'N1' => 'Sipalay',
- ),
- 'PK' =>
- array (
- '01' => 'Federally Administered Tribal Areas',
- '02' => 'Balochistan',
- '03' => 'North-West Frontier',
- '04' => 'Punjab',
- '05' => 'Sindh',
- '06' => 'Azad Kashmir',
- '07' => 'Northern Areas',
- '08' => 'Islamabad',
- ),
- 'PL' =>
- array (
- 72 => 'Dolnoslaskie',
- 73 => 'Kujawsko-Pomorskie',
- 74 => 'Lodzkie',
- 75 => 'Lubelskie',
- 76 => 'Lubuskie',
- 77 => 'Malopolskie',
- 78 => 'Mazowieckie',
- 79 => 'Opolskie',
- 80 => 'Podkarpackie',
- 81 => 'Podlaskie',
- 82 => 'Pomorskie',
- 83 => 'Slaskie',
- 84 => 'Swietokrzyskie',
- 85 => 'Warminsko-Mazurskie',
- 86 => 'Wielkopolskie',
- 87 => 'Zachodniopomorskie',
- ),
- 'PS' =>
- array (
- 'GZ' => 'Gaza',
- 'WE' => 'West Bank',
- ),
- 'PT' =>
- array (
- '02' => 'Aveiro',
- '03' => 'Beja',
- '04' => 'Braga',
- '05' => 'Braganca',
- '06' => 'Castelo Branco',
- '07' => 'Coimbra',
- '08' => 'Evora',
- '09' => 'Faro',
- 10 => 'Madeira',
- 11 => 'Guarda',
- 13 => 'Leiria',
- 14 => 'Lisboa',
- 16 => 'Portalegre',
- 17 => 'Porto',
- 18 => 'Santarem',
- 19 => 'Setubal',
- 20 => 'Viana do Castelo',
- 21 => 'Vila Real',
- 22 => 'Viseu',
- 23 => 'Azores',
- ),
- 'PY' =>
- array (
- '01' => 'Alto Parana',
- '02' => 'Amambay',
- '04' => 'Caaguazu',
- '05' => 'Caazapa',
- '06' => 'Central',
- '07' => 'Concepcion',
- '08' => 'Cordillera',
- 10 => 'Guaira',
- 11 => 'Itapua',
- 12 => 'Misiones',
- 13 => 'Neembucu',
- 15 => 'Paraguari',
- 16 => 'Presidente Hayes',
- 17 => 'San Pedro',
- 19 => 'Canindeyu',
- 22 => 'Asuncion',
- 23 => 'Alto Paraguay',
- 24 => 'Boqueron',
- ),
- 'QA' =>
- array (
- '01' => 'Ad Dawhah',
- '02' => 'Al Ghuwariyah',
- '03' => 'Al Jumaliyah',
- '04' => 'Al Khawr',
- '05' => 'Al Wakrah Municipality',
- '06' => 'Ar Rayyan',
- '08' => 'Madinat ach Shamal',
- '09' => 'Umm Salal',
- 10 => 'Al Wakrah',
- 11 => 'Jariyan al Batnah',
- 12 => 'Umm Sa\'id',
- ),
- 'RO' =>
- array (
- '01' => 'Alba',
- '02' => 'Arad',
- '03' => 'Arges',
- '04' => 'Bacau',
- '05' => 'Bihor',
- '06' => 'Bistrita-Nasaud',
- '07' => 'Botosani',
- '08' => 'Braila',
- '09' => 'Brasov',
- 10 => 'Bucuresti',
- 11 => 'Buzau',
- 12 => 'Caras-Severin',
- 13 => 'Cluj',
- 14 => 'Constanta',
- 15 => 'Covasna',
- 16 => 'Dambovita',
- 17 => 'Dolj',
- 18 => 'Galati',
- 19 => 'Gorj',
- 20 => 'Harghita',
- 21 => 'Hunedoara',
- 22 => 'Ialomita',
- 23 => 'Iasi',
- 25 => 'Maramures',
- 26 => 'Mehedinti',
- 27 => 'Mures',
- 28 => 'Neamt',
- 29 => 'Olt',
- 30 => 'Prahova',
- 31 => 'Salaj',
- 32 => 'Satu Mare',
- 33 => 'Sibiu',
- 34 => 'Suceava',
- 35 => 'Teleorman',
- 36 => 'Timis',
- 37 => 'Tulcea',
- 38 => 'Vaslui',
- 39 => 'Valcea',
- 40 => 'Vrancea',
- 41 => 'Calarasi',
- 42 => 'Giurgiu',
- 43 => 'Ilfov',
- ),
- 'RS' =>
- array (
- '01' => 'Kosovo',
- '02' => 'Vojvodina',
- ),
- 'RU' =>
- array (
- '01' => 'Adygeya',
- '02' => 'Aginsky Buryatsky AO',
- '03' => 'Gorno-Altay',
- '04' => 'Altaisky krai',
- '05' => 'Amur',
- '06' => 'Arkhangel\'sk',
- '07' => 'Astrakhan\'',
- '08' => 'Bashkortostan',
- '09' => 'Belgorod',
- 10 => 'Bryansk',
- 11 => 'Buryat',
- 12 => 'Chechnya',
- 13 => 'Chelyabinsk',
- 14 => 'Chita',
- 15 => 'Chukot',
- 16 => 'Chuvashia',
- 17 => 'Dagestan',
- 18 => 'Evenk',
- 19 => 'Ingush',
- 20 => 'Irkutsk',
- 21 => 'Ivanovo',
- 22 => 'Kabardin-Balkar',
- 23 => 'Kaliningrad',
- 24 => 'Kalmyk',
- 25 => 'Kaluga',
- 26 => 'Kamchatka',
- 27 => 'Karachay-Cherkess',
- 28 => 'Karelia',
- 29 => 'Kemerovo',
- 30 => 'Khabarovsk',
- 31 => 'Khakass',
- 32 => 'Khanty-Mansiy',
- 33 => 'Kirov',
- 34 => 'Komi',
- 36 => 'Koryak',
- 37 => 'Kostroma',
- 38 => 'Krasnodar',
- 39 => 'Krasnoyarsk',
- 40 => 'Kurgan',
- 41 => 'Kursk',
- 42 => 'Leningrad',
- 43 => 'Lipetsk',
- 44 => 'Magadan',
- 45 => 'Mariy-El',
- 46 => 'Mordovia',
- 47 => 'Moskva',
- 48 => 'Moscow City',
- 49 => 'Murmansk',
- 50 => 'Nenets',
- 51 => 'Nizhegorod',
- 52 => 'Novgorod',
- 53 => 'Novosibirsk',
- 54 => 'Omsk',
- 55 => 'Orenburg',
- 56 => 'Orel',
- 57 => 'Penza',
- 58 => 'Perm\'',
- 59 => 'Primor\'ye',
- 60 => 'Pskov',
- 61 => 'Rostov',
- 62 => 'Ryazan\'',
- 63 => 'Sakha',
- 64 => 'Sakhalin',
- 65 => 'Samara',
- 66 => 'Saint Petersburg City',
- 67 => 'Saratov',
- 68 => 'North Ossetia',
- 69 => 'Smolensk',
- 70 => 'Stavropol\'',
- 71 => 'Sverdlovsk',
- 72 => 'Tambovskaya oblast',
- 73 => 'Tatarstan',
- 74 => 'Taymyr',
- 75 => 'Tomsk',
- 76 => 'Tula',
- 77 => 'Tver\'',
- 78 => 'Tyumen\'',
- 79 => 'Tuva',
- 80 => 'Udmurt',
- 81 => 'Ul\'yanovsk',
- 83 => 'Vladimir',
- 84 => 'Volgograd',
- 85 => 'Vologda',
- 86 => 'Voronezh',
- 87 => 'Yamal-Nenets',
- 88 => 'Yaroslavl\'',
- 89 => 'Yevrey',
- 90 => 'Permskiy Kray',
- 91 => 'Krasnoyarskiy Kray',
- 92 => 'Kamchatskiy Kray',
- 93 => 'Zabaykal\'skiy Kray',
- ),
- 'RW' =>
- array (
- '01' => 'Butare',
- '06' => 'Gitarama',
- '07' => 'Kibungo',
- 12 => 'Kigali',
- 11 => 'Est',
- 13 => 'Nord',
- 14 => 'Ouest',
- 15 => 'Sud',
- ),
- 'SA' =>
- array (
- '02' => 'Al Bahah',
- '05' => 'Al Madinah',
- '06' => 'Ash Sharqiyah',
- '08' => 'Al Qasim',
- 10 => 'Ar Riyad',
- 11 => 'Asir Province',
- 13 => 'Ha\'il',
- 14 => 'Makkah',
- 15 => 'Al Hudud ash Shamaliyah',
- 16 => 'Najran',
- 17 => 'Jizan',
- 19 => 'Tabuk',
- 20 => 'Al Jawf',
- ),
- 'SB' =>
- array (
- '03' => 'Malaita',
- '06' => 'Guadalcanal',
- '07' => 'Isabel',
- '08' => 'Makira',
- '09' => 'Temotu',
- 10 => 'Central',
- 11 => 'Western',
- 12 => 'Choiseul',
- 13 => 'Rennell and Bellona',
- ),
- 'SC' =>
- array (
- '01' => 'Anse aux Pins',
- '02' => 'Anse Boileau',
- '03' => 'Anse Etoile',
- '04' => 'Anse Louis',
- '05' => 'Anse Royale',
- '06' => 'Baie Lazare',
- '07' => 'Baie Sainte Anne',
- '08' => 'Beau Vallon',
- '09' => 'Bel Air',
- 10 => 'Bel Ombre',
- 11 => 'Cascade',
- 12 => 'Glacis',
- 14 => 'Grand\' Anse',
- 15 => 'La Digue',
- 16 => 'La Riviere Anglaise',
- 17 => 'Mont Buxton',
- 18 => 'Mont Fleuri',
- 19 => 'Plaisance',
- 20 => 'Pointe La Rue',
- 21 => 'Port Glaud',
- 22 => 'Saint Louis',
- 23 => 'Takamaka',
- ),
- 'SD' =>
- array (
- 27 => 'Al Wusta',
- 28 => 'Al Istiwa\'iyah',
- 29 => 'Al Khartum',
- 30 => 'Ash Shamaliyah',
- 31 => 'Ash Sharqiyah',
- 32 => 'Bahr al Ghazal',
- 33 => 'Darfur',
- 34 => 'Kurdufan',
- 35 => 'Upper Nile',
- 40 => 'Al Wahadah State',
- 44 => 'Central Equatoria State',
- 49 => 'Southern Darfur',
- 50 => 'Southern Kordofan',
- 52 => 'Kassala',
- 53 => 'River Nile',
- 55 => 'Northern Darfur',
- ),
- 'SE' =>
- array (
- '02' => 'Blekinge Lan',
- '03' => 'Gavleborgs Lan',
- '05' => 'Gotlands Lan',
- '06' => 'Hallands Lan',
- '07' => 'Jamtlands Lan',
- '08' => 'Jonkopings Lan',
- '09' => 'Kalmar Lan',
- 10 => 'Dalarnas Lan',
- 12 => 'Kronobergs Lan',
- 14 => 'Norrbottens Lan',
- 15 => 'Orebro Lan',
- 16 => 'Ostergotlands Lan',
- 18 => 'Sodermanlands Lan',
- 21 => 'Uppsala Lan',
- 22 => 'Varmlands Lan',
- 23 => 'Vasterbottens Lan',
- 24 => 'Vasternorrlands Lan',
- 25 => 'Vastmanlands Lan',
- 26 => 'Stockholms Lan',
- 27 => 'Skane Lan',
- 28 => 'Vastra Gotaland',
- ),
- 'SH' =>
- array (
- '01' => 'Ascension',
- '02' => 'Saint Helena',
- '03' => 'Tristan da Cunha',
- ),
- 'SI' =>
- array (
- '01' => 'Ajdovscina Commune',
- '02' => 'Beltinci Commune',
- '03' => 'Bled Commune',
- '04' => 'Bohinj Commune',
- '05' => 'Borovnica Commune',
- '06' => 'Bovec Commune',
- '07' => 'Brda Commune',
- '08' => 'Brezice Commune',
- '09' => 'Brezovica Commune',
- 11 => 'Celje Commune',
- 12 => 'Cerklje na Gorenjskem Commune',
- 13 => 'Cerknica Commune',
- 14 => 'Cerkno Commune',
- 15 => 'Crensovci Commune',
- 16 => 'Crna na Koroskem Commune',
- 17 => 'Crnomelj Commune',
- 19 => 'Divaca Commune',
- 20 => 'Dobrepolje Commune',
- 22 => 'Dol pri Ljubljani Commune',
- 24 => 'Dornava Commune',
- 25 => 'Dravograd Commune',
- 26 => 'Duplek Commune',
- 27 => 'Gorenja vas-Poljane Commune',
- 28 => 'Gorisnica Commune',
- 29 => 'Gornja Radgona Commune',
- 30 => 'Gornji Grad Commune',
- 31 => 'Gornji Petrovci Commune',
- 32 => 'Grosuplje Commune',
- 34 => 'Hrastnik Commune',
- 35 => 'Hrpelje-Kozina Commune',
- 36 => 'Idrija Commune',
- 37 => 'Ig Commune',
- 38 => 'Ilirska Bistrica Commune',
- 39 => 'Ivancna Gorica Commune',
- 40 => 'Izola-Isola Commune',
- 42 => 'Jursinci Commune',
- 44 => 'Kanal Commune',
- 45 => 'Kidricevo Commune',
- 46 => 'Kobarid Commune',
- 47 => 'Kobilje Commune',
- 49 => 'Komen Commune',
- 50 => 'Koper-Capodistria Urban Commune',
- 51 => 'Kozje Commune',
- 52 => 'Kranj Commune',
- 53 => 'Kranjska Gora Commune',
- 54 => 'Krsko Commune',
- 55 => 'Kungota Commune',
- 57 => 'Lasko Commune',
- 61 => 'Ljubljana Urban Commune',
- 62 => 'Ljubno Commune',
- 64 => 'Logatec Commune',
- 66 => 'Loski Potok Commune',
- 68 => 'Lukovica Commune',
- 71 => 'Medvode Commune',
- 72 => 'Menges Commune',
- 73 => 'Metlika Commune',
- 74 => 'Mezica Commune',
- 76 => 'Mislinja Commune',
- 77 => 'Moravce Commune',
- 78 => 'Moravske Toplice Commune',
- 79 => 'Mozirje Commune',
- 80 => 'Murska Sobota Urban Commune',
- 81 => 'Muta Commune',
- 82 => 'Naklo Commune',
- 83 => 'Nazarje Commune',
- 84 => 'Nova Gorica Urban Commune',
- 86 => 'Odranci Commune',
- 87 => 'Ormoz Commune',
- 88 => 'Osilnica Commune',
- 89 => 'Pesnica Commune',
- 91 => 'Pivka Commune',
- 92 => 'Podcetrtek Commune',
- 94 => 'Postojna Commune',
- 97 => 'Puconci Commune',
- 98 => 'Race-Fram Commune',
- 99 => 'Radece Commune',
- 'A1' => 'Radenci Commune',
- 'A2' => 'Radlje ob Dravi Commune',
- 'A3' => 'Radovljica Commune',
- 'A6' => 'Rogasovci Commune',
- 'A7' => 'Rogaska Slatina Commune',
- 'A8' => 'Rogatec Commune',
- 'B1' => 'Semic Commune',
- 'B2' => 'Sencur Commune',
- 'B3' => 'Sentilj Commune',
- 'B4' => 'Sentjernej Commune',
- 'B6' => 'Sevnica Commune',
- 'B7' => 'Sezana Commune',
- 'B8' => 'Skocjan Commune',
- 'B9' => 'Skofja Loka Commune',
- 'C1' => 'Skofljica Commune',
- 'C2' => 'Slovenj Gradec Urban Commune',
- 'C4' => 'Slovenske Konjice Commune',
- 'C5' => 'Smarje pri Jelsah Commune',
- 'C6' => 'Smartno ob Paki Commune',
- 'C7' => 'Sostanj Commune',
- 'C8' => 'Starse Commune',
- 'C9' => 'Store Commune',
- 'D1' => 'Sveti Jurij Commune',
- 'D2' => 'Tolmin Commune',
- 'D3' => 'Trbovlje Commune',
- 'D4' => 'Trebnje Commune',
- 'D5' => 'Trzic Commune',
- 'D6' => 'Turnisce Commune',
- 'D7' => 'Velenje Urban Commune',
- 'D8' => 'Velike Lasce Commune',
- 'E1' => 'Vipava Commune',
- 'E2' => 'Vitanje Commune',
- 'E3' => 'Vodice Commune',
- 'E5' => 'Vrhnika Commune',
- 'E6' => 'Vuzenica Commune',
- 'E7' => 'Zagorje ob Savi Commune',
- 'E9' => 'Zavrc Commune',
- 'F1' => 'Zelezniki Commune',
- 'F2' => 'Ziri Commune',
- 'F3' => 'Zrece Commune',
- 'F4' => 'Benedikt Commune',
- 'F5' => 'Bistrica ob Sotli Commune',
- 'F6' => 'Bloke Commune',
- 'F7' => 'Braslovce Commune',
- 'F8' => 'Cankova Commune',
- 'F9' => 'Cerkvenjak Commune',
- 'G1' => 'Destrnik Commune',
- 'G2' => 'Dobje Commune',
- 'G3' => 'Dobrna Commune',
- 'G4' => 'Dobrova-Horjul-Polhov Gradec Commune',
- 'G5' => 'Dobrovnik-Dobronak Commune',
- 'G6' => 'Dolenjske Toplice Commune',
- 'G7' => 'Domzale Commune',
- 'G8' => 'Grad Commune',
- 'G9' => 'Hajdina Commune',
- 'H1' => 'Hoce-Slivnica Commune',
- 'H2' => 'Hodos-Hodos Commune',
- 'H3' => 'Horjul Commune',
- 'H4' => 'Jesenice Commune',
- 'H5' => 'Jezersko Commune',
- 'H6' => 'Kamnik Commune',
- 'H7' => 'Kocevje Commune',
- 'H8' => 'Komenda Commune',
- 'H9' => 'Kostel Commune',
- 'I1' => 'Krizevci Commune',
- 'I2' => 'Kuzma Commune',
- 'I3' => 'Lenart Commune',
- 'I4' => 'Lendava-Lendva Commune',
- 'I5' => 'Litija Commune',
- 'I6' => 'Ljutomer Commune',
- 'I7' => 'Loska Dolina Commune',
- 'I8' => 'Lovrenc na Pohorju Commune',
- 'I9' => 'Luce Commune',
- 'J1' => 'Majsperk Commune',
- 'J2' => 'Maribor Commune',
- 'J3' => 'Markovci Commune',
- 'J4' => 'Miklavz na Dravskem polju Commune',
- 'J5' => 'Miren-Kostanjevica Commune',
- 'J6' => 'Mirna Pec Commune',
- 'J7' => 'Novo mesto Urban Commune',
- 'J8' => 'Oplotnica Commune',
- 'J9' => 'Piran-Pirano Commune',
- 'K1' => 'Podlehnik Commune',
- 'K2' => 'Podvelka Commune',
- 'K3' => 'Polzela Commune',
- 'K4' => 'Prebold Commune',
- 'K5' => 'Preddvor Commune',
- 'K6' => 'Prevalje Commune',
- 'K7' => 'Ptuj Urban Commune',
- 'K8' => 'Ravne na Koroskem Commune',
- 'K9' => 'Razkrizje Commune',
- 'L1' => 'Ribnica Commune',
- 'L2' => 'Ribnica na Pohorju Commune',
- 'L3' => 'Ruse Commune',
- 'L4' => 'Salovci Commune',
- 'L5' => 'Selnica ob Dravi Commune',
- 'L6' => 'Sempeter-Vrtojba Commune',
- 'L7' => 'Sentjur pri Celju Commune',
- 'L8' => 'Slovenska Bistrica Commune',
- 'L9' => 'Smartno pri Litiji Commune',
- 'M1' => 'Sodrazica Commune',
- 'M2' => 'Solcava Commune',
- 'M3' => 'Sveta Ana Commune',
- 'M4' => 'Sveti Andraz v Slovenskih goricah Commune',
- 'M5' => 'Tabor Commune',
- 'M6' => 'Tisina Commune',
- 'M7' => 'Trnovska vas Commune',
- 'M8' => 'Trzin Commune',
- 'M9' => 'Velika Polana Commune',
- 'N1' => 'Verzej Commune',
- 'N2' => 'Videm Commune',
- 'N3' => 'Vojnik Commune',
- 'N4' => 'Vransko Commune',
- 'N5' => 'Zalec Commune',
- 'N6' => 'Zetale Commune',
- 'N7' => 'Zirovnica Commune',
- 'N8' => 'Zuzemberk Commune',
- 'N9' => 'Apace Commune',
- 'O1' => 'Cirkulane Commune',
- 'O2' => 'Gorje',
- 'O3' => 'Kostanjevica na Krki',
- 'O4' => 'Log-Dragomer',
- 'O5' => 'Makole',
- 'O6' => 'Mirna',
- 'O7' => 'Mokronog-Trebelno',
- 'O8' => 'Poljcane',
- 'O9' => 'Recica ob Savinji',
- 'P1' => 'Rence-Vogrsko',
- 'P2' => 'Sentrupert',
- 'P3' => 'Smarjesk Toplice',
- 'P4' => 'Sredisce ob Dravi',
- 'P5' => 'Straza',
- 'P7' => 'Sveti Jurij v Slovenskih Goricah',
- ),
- 'SK' =>
- array (
- '01' => 'Banska Bystrica',
- '02' => 'Bratislava',
- '03' => 'Kosice',
- '04' => 'Nitra',
- '05' => 'Presov',
- '06' => 'Trencin',
- '07' => 'Trnava',
- '08' => 'Zilina',
- ),
- 'SL' =>
- array (
- '01' => 'Eastern',
- '02' => 'Northern',
- '03' => 'Southern',
- '04' => 'Western Area',
- ),
- 'SM' =>
- array (
- '01' => 'Acquaviva',
- '02' => 'Chiesanuova',
- '03' => 'Domagnano',
- '04' => 'Faetano',
- '05' => 'Fiorentino',
- '06' => 'Borgo Maggiore',
- '07' => 'San Marino',
- '08' => 'Monte Giardino',
- '09' => 'Serravalle',
- ),
- 'SN' =>
- array (
- '01' => 'Dakar',
- '03' => 'Diourbel',
- '05' => 'Tambacounda',
- '07' => 'Thies',
- '09' => 'Fatick',
- 10 => 'Kaolack',
- 11 => 'Kolda',
- 12 => 'Ziguinchor',
- 13 => 'Louga',
- 14 => 'Saint-Louis',
- 15 => 'Matam',
- ),
- 'SO' =>
- array (
- '01' => 'Bakool',
- '02' => 'Banaadir',
- '03' => 'Bari',
- '04' => 'Bay',
- '05' => 'Galguduud',
- '06' => 'Gedo',
- '07' => 'Hiiraan',
- '08' => 'Jubbada Dhexe',
- '09' => 'Jubbada Hoose',
- 10 => 'Mudug',
- 18 => 'Nugaal',
- 12 => 'Sanaag',
- 13 => 'Shabeellaha Dhexe',
- 14 => 'Shabeellaha Hoose',
- 20 => 'Woqooyi Galbeed',
- 19 => 'Togdheer',
- 21 => 'Awdal',
- 22 => 'Sool',
- ),
- 'SR' =>
- array (
- 10 => 'Brokopondo',
- 11 => 'Commewijne',
- 12 => 'Coronie',
- 13 => 'Marowijne',
- 14 => 'Nickerie',
- 15 => 'Para',
- 16 => 'Paramaribo',
- 17 => 'Saramacca',
- 18 => 'Sipaliwini',
- 19 => 'Wanica',
- ),
- 'SS' =>
- array (
- '01' => 'Central Equatoria',
- '02' => 'Eastern Equatoria',
- '03' => 'Jonglei',
- '04' => 'Lakes',
- '05' => 'Northern Bahr el Ghazal',
- '06' => 'Unity',
- '07' => 'Upper Nile',
- '08' => 'Warrap',
- '09' => 'Western Bahr el Ghazal',
- 10 => 'Western Equatoria',
- ),
- 'ST' =>
- array (
- '01' => 'Principe',
- '02' => 'Sao Tome',
- ),
- 'SV' =>
- array (
- '01' => 'Ahuachapan',
- '02' => 'Cabanas',
- '03' => 'Chalatenango',
- '04' => 'Cuscatlan',
- '05' => 'La Libertad',
- '06' => 'La Paz',
- '07' => 'La Union',
- '08' => 'Morazan',
- '09' => 'San Miguel',
- 10 => 'San Salvador',
- 11 => 'Santa Ana',
- 12 => 'San Vicente',
- 13 => 'Sonsonate',
- 14 => 'Usulutan',
- ),
- 'SY' =>
- array (
- '01' => 'Al Hasakah',
- '02' => 'Al Ladhiqiyah',
- '03' => 'Al Qunaytirah',
- '04' => 'Ar Raqqah',
- '05' => 'As Suwayda\'',
- '06' => 'Dar',
- '07' => 'Dayr az Zawr',
- '08' => 'Rif Dimashq',
- '09' => 'Halab',
- 10 => 'Hamah',
- 11 => 'Hims',
- 12 => 'Idlib',
- 13 => 'Dimashq',
- 14 => 'Tartus',
- ),
- 'SZ' =>
- array (
- '01' => 'Hhohho',
- '02' => 'Lubombo',
- '03' => 'Manzini',
- '04' => 'Shiselweni',
- '05' => 'Praslin',
- ),
- 'TD' =>
- array (
- '01' => 'Batha',
- '02' => 'Biltine',
- '03' => 'Borkou-Ennedi-Tibesti',
- '04' => 'Chari-Baguirmi',
- '05' => 'Guera',
- '06' => 'Kanem',
- '07' => 'Lac',
- '08' => 'Logone Occidental',
- '09' => 'Logone Oriental',
- 10 => 'Mayo-Kebbi',
- 11 => 'Moyen-Chari',
- 12 => 'Ouaddai',
- 13 => 'Salamat',
- 14 => 'Tandjile',
- ),
- 'TG' =>
- array (
- 22 => 'Centrale',
- 23 => 'Kara',
- 24 => 'Maritime',
- 25 => 'Plateaux',
- 26 => 'Savanes',
- ),
- 'TH' =>
- array (
- '01' => 'Mae Hong Son',
- '02' => 'Chiang Mai',
- '03' => 'Chiang Rai',
- '04' => 'Nan',
- '05' => 'Lamphun',
- '06' => 'Lampang',
- '07' => 'Phrae',
- '08' => 'Tak',
- '09' => 'Sukhothai',
- 10 => 'Uttaradit',
- 11 => 'Kamphaeng Phet',
- 12 => 'Phitsanulok',
- 13 => 'Phichit',
- 14 => 'Phetchabun',
- 15 => 'Uthai Thani',
- 16 => 'Nakhon Sawan',
- 17 => 'Nong Khai',
- 18 => 'Loei',
- 20 => 'Sakon Nakhon',
- 73 => 'Nakhon Phanom',
- 22 => 'Khon Kaen',
- 23 => 'Kalasin',
- 24 => 'Maha Sarakham',
- 25 => 'Roi Et',
- 26 => 'Chaiyaphum',
- 27 => 'Nakhon Ratchasima',
- 28 => 'Buriram',
- 29 => 'Surin',
- 30 => 'Sisaket',
- 31 => 'Narathiwat',
- 32 => 'Chai Nat',
- 33 => 'Sing Buri',
- 34 => 'Lop Buri',
- 35 => 'Ang Thong',
- 36 => 'Phra Nakhon Si Ayutthaya',
- 37 => 'Saraburi',
- 38 => 'Nonthaburi',
- 39 => 'Pathum Thani',
- 40 => 'Krung Thep',
- 41 => 'Phayao',
- 42 => 'Samut Prakan',
- 43 => 'Nakhon Nayok',
- 44 => 'Chachoengsao',
- 74 => 'Prachin Buri',
- 46 => 'Chon Buri',
- 47 => 'Rayong',
- 48 => 'Chanthaburi',
- 49 => 'Trat',
- 50 => 'Kanchanaburi',
- 51 => 'Suphan Buri',
- 52 => 'Ratchaburi',
- 53 => 'Nakhon Pathom',
- 54 => 'Samut Songkhram',
- 55 => 'Samut Sakhon',
- 56 => 'Phetchaburi',
- 57 => 'Prachuap Khiri Khan',
- 58 => 'Chumphon',
- 59 => 'Ranong',
- 60 => 'Surat Thani',
- 61 => 'Phangnga',
- 62 => 'Phuket',
- 63 => 'Krabi',
- 64 => 'Nakhon Si Thammarat',
- 65 => 'Trang',
- 66 => 'Phatthalung',
- 67 => 'Satun',
- 68 => 'Songkhla',
- 69 => 'Pattani',
- 70 => 'Yala',
- 75 => 'Ubon Ratchathani',
- 72 => 'Yasothon',
- 76 => 'Udon Thani',
- 77 => 'Amnat Charoen',
- 78 => 'Mukdahan',
- 79 => 'Nong Bua Lamphu',
- 80 => 'Sa Kaeo',
- 81 => 'Bueng Kan',
- ),
- 'TJ' =>
- array (
- '01' => 'Kuhistoni Badakhshon',
- '02' => 'Khatlon',
- '03' => 'Sughd',
- '04' => 'Dushanbe',
- '05' => 'Nohiyahoi Tobei Jumhuri',
- ),
- 'TL' =>
- array (
- '06' => 'Dili',
- ),
- 'TM' =>
- array (
- '01' => 'Ahal',
- '02' => 'Balkan',
- '03' => 'Dashoguz',
- '04' => 'Lebap',
- '05' => 'Mary',
- ),
- 'TN' =>
- array (
- '02' => 'Kasserine',
- '03' => 'Kairouan',
- '06' => 'Jendouba',
- 10 => 'Qafsah',
- 14 => 'El Kef',
- 15 => 'Al Mahdia',
- 16 => 'Al Munastir',
- 17 => 'Bajah',
- 18 => 'Bizerte',
- 19 => 'Nabeul',
- 22 => 'Siliana',
- 23 => 'Sousse',
- 27 => 'Ben Arous',
- 28 => 'Madanin',
- 29 => 'Gabes',
- 31 => 'Kebili',
- 32 => 'Sfax',
- 33 => 'Sidi Bou Zid',
- 34 => 'Tataouine',
- 35 => 'Tozeur',
- 36 => 'Tunis',
- 37 => 'Zaghouan',
- 38 => 'Aiana',
- 39 => 'Manouba',
- ),
- 'TO' =>
- array (
- '01' => 'Ha',
- '02' => 'Tongatapu',
- '03' => 'Vava',
- ),
- 'TR' =>
- array (
- '02' => 'Adiyaman',
- '03' => 'Afyonkarahisar',
- '04' => 'Agri',
- '05' => 'Amasya',
- '07' => 'Antalya',
- '08' => 'Artvin',
- '09' => 'Aydin',
- 10 => 'Balikesir',
- 11 => 'Bilecik',
- 12 => 'Bingol',
- 13 => 'Bitlis',
- 14 => 'Bolu',
- 15 => 'Burdur',
- 16 => 'Bursa',
- 17 => 'Canakkale',
- 19 => 'Corum',
- 20 => 'Denizli',
- 21 => 'Diyarbakir',
- 22 => 'Edirne',
- 23 => 'Elazig',
- 24 => 'Erzincan',
- 25 => 'Erzurum',
- 26 => 'Eskisehir',
- 28 => 'Giresun',
- 31 => 'Hatay',
- 32 => 'Mersin',
- 33 => 'Isparta',
- 34 => 'Istanbul',
- 35 => 'Izmir',
- 37 => 'Kastamonu',
- 38 => 'Kayseri',
- 39 => 'Kirklareli',
- 40 => 'Kirsehir',
- 41 => 'Kocaeli',
- 43 => 'Kutahya',
- 44 => 'Malatya',
- 45 => 'Manisa',
- 46 => 'Kahramanmaras',
- 48 => 'Mugla',
- 49 => 'Mus',
- 50 => 'Nevsehir',
- 52 => 'Ordu',
- 53 => 'Rize',
- 54 => 'Sakarya',
- 55 => 'Samsun',
- 57 => 'Sinop',
- 58 => 'Sivas',
- 59 => 'Tekirdag',
- 60 => 'Tokat',
- 61 => 'Trabzon',
- 62 => 'Tunceli',
- 63 => 'Sanliurfa',
- 64 => 'Usak',
- 65 => 'Van',
- 66 => 'Yozgat',
- 68 => 'Ankara',
- 69 => 'Gumushane',
- 70 => 'Hakkari',
- 71 => 'Konya',
- 72 => 'Mardin',
- 73 => 'Nigde',
- 74 => 'Siirt',
- 75 => 'Aksaray',
- 76 => 'Batman',
- 77 => 'Bayburt',
- 78 => 'Karaman',
- 79 => 'Kirikkale',
- 80 => 'Sirnak',
- 81 => 'Adana',
- 82 => 'Cankiri',
- 83 => 'Gaziantep',
- 84 => 'Kars',
- 85 => 'Zonguldak',
- 86 => 'Ardahan',
- 87 => 'Bartin',
- 88 => 'Igdir',
- 89 => 'Karabuk',
- 90 => 'Kilis',
- 91 => 'Osmaniye',
- 92 => 'Yalova',
- 93 => 'Duzce',
- ),
- 'TT' =>
- array (
- '01' => 'Arima',
- '02' => 'Caroni',
- '03' => 'Mayaro',
- '04' => 'Nariva',
- '05' => 'Port-of-Spain',
- '06' => 'Saint Andrew',
- '07' => 'Saint David',
- '08' => 'Saint George',
- '09' => 'Saint Patrick',
- 10 => 'San Fernando',
- 11 => 'Tobago',
- 12 => 'Victoria',
- ),
- 'TW' =>
- array (
- '01' => 'Fu-chien',
- '02' => 'Kao-hsiung',
- '03' => 'T\'ai-pei',
- '04' => 'T\'ai-wan',
- ),
- 'TZ' =>
- array (
- '02' => 'Pwani',
- '03' => 'Dodoma',
- '04' => 'Iringa',
- '05' => 'Kigoma',
- '06' => 'Kilimanjaro',
- '07' => 'Lindi',
- '08' => 'Mara',
- '09' => 'Mbeya',
- 10 => 'Morogoro',
- 11 => 'Mtwara',
- 12 => 'Mwanza',
- 13 => 'Pemba North',
- 14 => 'Ruvuma',
- 15 => 'Shinyanga',
- 16 => 'Singida',
- 17 => 'Tabora',
- 18 => 'Tanga',
- 19 => 'Kagera',
- 20 => 'Pemba South',
- 21 => 'Zanzibar Central',
- 22 => 'Zanzibar North',
- 23 => 'Dar es Salaam',
- 24 => 'Rukwa',
- 25 => 'Zanzibar Urban',
- 26 => 'Arusha',
- 27 => 'Manyara',
- ),
- 'UA' =>
- array (
- '01' => 'Cherkas\'ka Oblast\'',
- '02' => 'Chernihivs\'ka Oblast\'',
- '03' => 'Chernivets\'ka Oblast\'',
- '04' => 'Dnipropetrovs\'ka Oblast\'',
- '05' => 'Donets\'ka Oblast\'',
- '06' => 'Ivano-Frankivs\'ka Oblast\'',
- '07' => 'Kharkivs\'ka Oblast\'',
- '08' => 'Khersons\'ka Oblast\'',
- '09' => 'Khmel\'nyts\'ka Oblast\'',
- 10 => 'Kirovohrads\'ka Oblast\'',
- 11 => 'Krym',
- 12 => 'Kyyiv',
- 13 => 'Kyyivs\'ka Oblast\'',
- 14 => 'Luhans\'ka Oblast\'',
- 15 => 'L\'vivs\'ka Oblast\'',
- 16 => 'Mykolayivs\'ka Oblast\'',
- 17 => 'Odes\'ka Oblast\'',
- 18 => 'Poltavs\'ka Oblast\'',
- 19 => 'Rivnens\'ka Oblast\'',
- 20 => 'Sevastopol\'',
- 21 => 'Sums\'ka Oblast\'',
- 22 => 'Ternopil\'s\'ka Oblast\'',
- 23 => 'Vinnyts\'ka Oblast\'',
- 24 => 'Volyns\'ka Oblast\'',
- 25 => 'Zakarpats\'ka Oblast\'',
- 26 => 'Zaporiz\'ka Oblast\'',
- 27 => 'Zhytomyrs\'ka Oblast\'',
- ),
- 'UG' =>
- array (
- 26 => 'Apac',
- 28 => 'Bundibugyo',
- 29 => 'Bushenyi',
- 30 => 'Gulu',
- 31 => 'Hoima',
- 33 => 'Jinja',
- 36 => 'Kalangala',
- 37 => 'Kampala',
- 38 => 'Kamuli',
- 39 => 'Kapchorwa',
- 40 => 'Kasese',
- 41 => 'Kibale',
- 42 => 'Kiboga',
- 43 => 'Kisoro',
- 45 => 'Kotido',
- 46 => 'Kumi',
- 47 => 'Lira',
- 50 => 'Masindi',
- 52 => 'Mbarara',
- 56 => 'Mubende',
- 58 => 'Nebbi',
- 59 => 'Ntungamo',
- 60 => 'Pallisa',
- 61 => 'Rakai',
- 65 => 'Adjumani',
- 66 => 'Bugiri',
- 67 => 'Busia',
- 69 => 'Katakwi',
- 70 => 'Luwero',
- 71 => 'Masaka',
- 72 => 'Moyo',
- 73 => 'Nakasongola',
- 74 => 'Sembabule',
- 76 => 'Tororo',
- 77 => 'Arua',
- 78 => 'Iganga',
- 79 => 'Kabarole',
- 80 => 'Kaberamaido',
- 81 => 'Kamwenge',
- 82 => 'Kanungu',
- 83 => 'Kayunga',
- 84 => 'Kitgum',
- 85 => 'Kyenjojo',
- 86 => 'Mayuge',
- 87 => 'Mbale',
- 88 => 'Moroto',
- 89 => 'Mpigi',
- 90 => 'Mukono',
- 91 => 'Nakapiripirit',
- 92 => 'Pader',
- 93 => 'Rukungiri',
- 94 => 'Sironko',
- 95 => 'Soroti',
- 96 => 'Wakiso',
- 97 => 'Yumbe',
- ),
- 'US' =>
- array (
- 'AA' => 'Armed Forces Americas',
- 'AE' => 'Armed Forces Europe',
- 'AK' => 'Alaska',
- 'AL' => 'Alabama',
- 'AP' => 'Armed Forces Pacific',
- 'AR' => 'Arkansas',
- 'AS' => 'American Samoa',
- 'AZ' => 'Arizona',
- 'CA' => 'California',
- 'CO' => 'Colorado',
- 'CT' => 'Connecticut',
- 'DC' => 'District of Columbia',
- 'DE' => 'Delaware',
- 'FL' => 'Florida',
- 'FM' => 'Federated States of Micronesia',
- 'GA' => 'Georgia',
- 'GU' => 'Guam',
- 'HI' => 'Hawaii',
- 'IA' => 'Iowa',
- 'ID' => 'Idaho',
- 'IL' => 'Illinois',
- 'IN' => 'Indiana',
- 'KS' => 'Kansas',
- 'KY' => 'Kentucky',
- 'LA' => 'Louisiana',
- 'MA' => 'Massachusetts',
- 'MD' => 'Maryland',
- 'ME' => 'Maine',
- 'MH' => 'Marshall Islands',
- 'MI' => 'Michigan',
- 'MN' => 'Minnesota',
- 'MO' => 'Missouri',
- 'MP' => 'Northern Mariana Islands',
- 'MS' => 'Mississippi',
- 'MT' => 'Montana',
- 'NC' => 'North Carolina',
- 'ND' => 'North Dakota',
- 'NE' => 'Nebraska',
- 'NH' => 'New Hampshire',
- 'NJ' => 'New Jersey',
- 'NM' => 'New Mexico',
- 'NV' => 'Nevada',
- 'NY' => 'New York',
- 'OH' => 'Ohio',
- 'OK' => 'Oklahoma',
- 'OR' => 'Oregon',
- 'PA' => 'Pennsylvania',
- 'PW' => 'Palau',
- 'RI' => 'Rhode Island',
- 'SC' => 'South Carolina',
- 'SD' => 'South Dakota',
- 'TN' => 'Tennessee',
- 'TX' => 'Texas',
- 'UT' => 'Utah',
- 'VA' => 'Virginia',
- 'VI' => 'Virgin Islands',
- 'VT' => 'Vermont',
- 'WA' => 'Washington',
- 'WI' => 'Wisconsin',
- 'WV' => 'West Virginia',
- 'WY' => 'Wyoming',
- ),
- 'UY' =>
- array (
- '01' => 'Artigas',
- '02' => 'Canelones',
- '03' => 'Cerro Largo',
- '04' => 'Colonia',
- '05' => 'Durazno',
- '06' => 'Flores',
- '07' => 'Florida',
- '08' => 'Lavalleja',
- '09' => 'Maldonado',
- 10 => 'Montevideo',
- 11 => 'Paysandu',
- 12 => 'Rio Negro',
- 13 => 'Rivera',
- 14 => 'Rocha',
- 15 => 'Salto',
- 16 => 'San Jose',
- 17 => 'Soriano',
- 18 => 'Tacuarembo',
- 19 => 'Treinta y Tres',
- ),
- 'UZ' =>
- array (
- '01' => 'Andijon',
- '02' => 'Bukhoro',
- '03' => 'Farghona',
- '04' => 'Jizzakh',
- '05' => 'Khorazm',
- '06' => 'Namangan',
- '07' => 'Nawoiy',
- '08' => 'Qashqadaryo',
- '09' => 'Qoraqalpoghiston',
- 10 => 'Samarqand',
- 11 => 'Sirdaryo',
- 12 => 'Surkhondaryo',
- 14 => 'Toshkent',
- 15 => 'Jizzax',
- ),
- 'VC' =>
- array (
- '01' => 'Charlotte',
- '02' => 'Saint Andrew',
- '03' => 'Saint David',
- '04' => 'Saint George',
- '05' => 'Saint Patrick',
- '06' => 'Grenadines',
- ),
- 'VE' =>
- array (
- '01' => 'Amazonas',
- '02' => 'Anzoategui',
- '03' => 'Apure',
- '04' => 'Aragua',
- '05' => 'Barinas',
- '06' => 'Bolivar',
- '07' => 'Carabobo',
- '08' => 'Cojedes',
- '09' => 'Delta Amacuro',
- 11 => 'Falcon',
- 12 => 'Guarico',
- 13 => 'Lara',
- 14 => 'Merida',
- 15 => 'Miranda',
- 16 => 'Monagas',
- 17 => 'Nueva Esparta',
- 18 => 'Portuguesa',
- 19 => 'Sucre',
- 20 => 'Tachira',
- 21 => 'Trujillo',
- 22 => 'Yaracuy',
- 23 => 'Zulia',
- 24 => 'Dependencias Federales',
- 25 => 'Distrito Federal',
- 26 => 'Vargas',
- ),
- 'VN' =>
- array (
- '01' => 'An Giang',
- '03' => 'Ben Tre',
- '05' => 'Cao Bang',
- '09' => 'Dong Thap',
- 13 => 'Hai Phong',
- 20 => 'Ho Chi Minh',
- 21 => 'Kien Giang',
- 23 => 'Lam Dong',
- 24 => 'Long An',
- 30 => 'Quang Ninh',
- 32 => 'Son La',
- 33 => 'Tay Ninh',
- 34 => 'Thanh Hoa',
- 35 => 'Thai Binh',
- 37 => 'Tien Giang',
- 39 => 'Lang Son',
- 43 => 'Dong Nai',
- 44 => 'Ha Noi',
- 45 => 'Ba Ria-Vung Tau',
- 46 => 'Binh Dinh',
- 47 => 'Binh Thuan',
- 49 => 'Gia Lai',
- 50 => 'Ha Giang',
- 52 => 'Ha Tinh',
- 53 => 'Hoa Binh',
- 54 => 'Khanh Hoa',
- 55 => 'Kon Tum',
- 58 => 'Nghe An',
- 59 => 'Ninh Binh',
- 60 => 'Ninh Thuan',
- 61 => 'Phu Yen',
- 62 => 'Quang Binh',
- 63 => 'Quang Ngai',
- 64 => 'Quang Tri',
- 65 => 'Soc Trang',
- 66 => 'Thua Thien-Hue',
- 67 => 'Tra Vinh',
- 68 => 'Tuyen Quang',
- 69 => 'Vinh Long',
- 70 => 'Yen Bai',
- 71 => 'Bac Giang',
- 72 => 'Bac Kan',
- 73 => 'Bac Lieu',
- 74 => 'Bac Ninh',
- 75 => 'Binh Duong',
- 76 => 'Binh Phuoc',
- 77 => 'Ca Mau',
- 78 => 'Da Nang',
- 79 => 'Hai Duong',
- 80 => 'Ha Nam',
- 81 => 'Hung Yen',
- 82 => 'Nam Dinh',
- 83 => 'Phu Tho',
- 84 => 'Quang Nam',
- 85 => 'Thai Nguyen',
- 86 => 'Vinh Phuc',
- 87 => 'Can Tho',
- 88 => 'Dac Lak',
- 89 => 'Lai Chau',
- 90 => 'Lao Cai',
- 91 => 'Dak Nong',
- 92 => 'Dien Bien',
- 93 => 'Hau Giang',
- ),
- 'VU' =>
- array (
- '05' => 'Ambrym',
- '06' => 'Aoba',
- '07' => 'Torba',
- '08' => 'Efate',
- '09' => 'Epi',
- 10 => 'Malakula',
- 11 => 'Paama',
- 12 => 'Pentecote',
- 13 => 'Sanma',
- 14 => 'Shepherd',
- 15 => 'Tafea',
- 16 => 'Malampa',
- 17 => 'Penama',
- 18 => 'Shefa',
- ),
- 'WS' =>
- array (
- '02' => 'Aiga-i-le-Tai',
- '03' => 'Atua',
- '04' => 'Fa',
- '05' => 'Gaga',
- '06' => 'Va',
- '07' => 'Gagaifomauga',
- '08' => 'Palauli',
- '09' => 'Satupa',
- 10 => 'Tuamasaga',
- 11 => 'Vaisigano',
- ),
- 'YE' =>
- array (
- '01' => 'Abyan',
- '02' => 'Adan',
- '03' => 'Al Mahrah',
- '04' => 'Hadramawt',
- '05' => 'Shabwah',
- 24 => 'Lahij',
- 20 => 'Al Bayda\'',
- '08' => 'Al Hudaydah',
- 21 => 'Al Jawf',
- 10 => 'Al Mahwit',
- 11 => 'Dhamar',
- 22 => 'Hajjah',
- 23 => 'Ibb',
- 14 => 'Ma\'rib',
- 15 => 'Sa\'dah',
- 16 => 'San\'a\'',
- 25 => 'Taizz',
- 18 => 'Ad Dali',
- 19 => 'Amran',
- ),
- 'ZA' =>
- array (
- '01' => 'North-Western Province',
- '02' => 'KwaZulu-Natal',
- '03' => 'Free State',
- '05' => 'Eastern Cape',
- '06' => 'Gauteng',
- '07' => 'Mpumalanga',
- '08' => 'Northern Cape',
- '09' => 'Limpopo',
- 10 => 'North-West',
- 11 => 'Western Cape',
- ),
- 'ZM' =>
- array (
- '01' => 'Western',
- '02' => 'Central',
- '03' => 'Eastern',
- '04' => 'Luapula',
- '05' => 'Northern',
- '06' => 'North-Western',
- '07' => 'Southern',
- '08' => 'Copperbelt',
- '09' => 'Lusaka',
- ),
- 'ZW' =>
- array (
- '01' => 'Manicaland',
- '02' => 'Midlands',
- '03' => 'Mashonaland Central',
- '04' => 'Mashonaland East',
- '05' => 'Mashonaland West',
- '06' => 'Matabeleland North',
- '07' => 'Matabeleland South',
- '08' => 'Masvingo',
- '09' => 'Bulawayo',
- 10 => 'Harare',
- ),
-);
\ No newline at end of file
diff --git a/htdocs/includes/geoip/sample.php b/htdocs/includes/geoip/sample.php
deleted file mode 100644
index 75a36c0e5c5..00000000000
--- a/htdocs/includes/geoip/sample.php
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/php -q
-
diff --git a/htdocs/includes/geoip/sample_city.php b/htdocs/includes/geoip/sample_city.php
deleted file mode 100644
index 38a9f4b9b2b..00000000000
--- a/htdocs/includes/geoip/sample_city.php
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/usr/bin/php -q
-country_code . " " . $record->country_code3 . " " . $record->country_name . "\n";
-print $record->region . " " . $GEOIP_REGION_NAME[$record->country_code][$record->region] . "\n";
-print $record->city . "\n";
-print $record->postal_code . "\n";
-print $record->latitude . "\n";
-print $record->longitude . "\n";
-print $record->metro_code . "\n";
-print $record->area_code . "\n";
-
-geoip_close($gi);
-
-?>
diff --git a/htdocs/includes/geoip/sample_distributed.php b/htdocs/includes/geoip/sample_distributed.php
deleted file mode 100644
index d139be51d51..00000000000
--- a/htdocs/includes/geoip/sample_distributed.php
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/php -q
-country_code . "\n";
-print "country code3: " . $r->country_code3 . "\n";
-print "country name: " . $r->country_name . "\n";
-print "city: " . $r->city . "\n";
-print "region: " . $r->region . "\n";
-print "region name: " . $r->regionname . "\n";
-print "postal_code: " . $r->postal_code . "\n";
-print "latitude: " . $r->latitude . "\n";
-print "longitude: " . $r->longitude . "\n";
-print "area code: " . $r->areacode . "\n";
-print "dma code: " . $r->dmacode . "\n";
-print "isp: " . $r->isp . "\n";
-print "org: " . $r->org . "\n";
-?>
diff --git a/htdocs/includes/geoip/sample_netspeed.php b/htdocs/includes/geoip/sample_netspeed.php
deleted file mode 100644
index d8ec83714ab..00000000000
--- a/htdocs/includes/geoip/sample_netspeed.php
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/php -q
-
diff --git a/htdocs/includes/geoip/sample_org.php b/htdocs/includes/geoip/sample_org.php
deleted file mode 100644
index 009a5bd0f49..00000000000
--- a/htdocs/includes/geoip/sample_org.php
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/php -q
-
-
diff --git a/htdocs/includes/geoip/sample_region.php b/htdocs/includes/geoip/sample_region.php
deleted file mode 100644
index 9669c9c2df9..00000000000
--- a/htdocs/includes/geoip/sample_region.php
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/php -q
-
diff --git a/htdocs/includes/geoip/timezone.php b/htdocs/includes/geoip/timezone.php
deleted file mode 100644
index e5d991d8133..00000000000
--- a/htdocs/includes/geoip/timezone.php
+++ /dev/null
@@ -1,2243 +0,0 @@
-
Date: Wed, 1 Apr 2020 11:09:40 +0100
Subject: [PATCH 053/336] On _checkAccessToResource: category -> categorie
---
htdocs/categories/class/api_categories.class.php | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/htdocs/categories/class/api_categories.class.php b/htdocs/categories/class/api_categories.class.php
index 459b61ba740..4274dd37344 100644
--- a/htdocs/categories/class/api_categories.class.php
+++ b/htdocs/categories/class/api_categories.class.php
@@ -226,7 +226,7 @@ class Categories extends DolibarrApi
throw new RestException(404, 'category not found');
}
- if (!DolibarrApi::_checkAccessToResource('category', $this->category->id)) {
+ if (!DolibarrApi::_checkAccessToResource('categorie', $this->category->id)) {
throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
}
@@ -261,7 +261,7 @@ class Categories extends DolibarrApi
throw new RestException(404, 'category not found');
}
- if (!DolibarrApi::_checkAccessToResource('category', $this->category->id)) {
+ if (!DolibarrApi::_checkAccessToResource('categorie', $this->category->id)) {
throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
}
@@ -750,7 +750,7 @@ class Categories extends DolibarrApi
throw new RestException(404, 'category not found');
}
- if (!DolibarrApi::_checkAccessToResource('category', $this->category->id)) {
+ if (!DolibarrApi::_checkAccessToResource('categorie', $this->category->id)) {
throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
}
From c225f35eff4694dbb2c3bab6cfa7d06ad369f863 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur
Date: Thu, 2 Apr 2020 12:49:20 +0200
Subject: [PATCH 054/336] Update 11.0.0-12.0.0.sql
---
htdocs/install/mysql/migration/11.0.0-12.0.0.sql | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
index 713dc91a32f..27efb88f8b2 100644
--- a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
+++ b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
@@ -206,8 +206,8 @@ ALTER TABLE llx_societe_remise_except ADD COLUMN vat_src_code varchar(10) DEFAUL
ALTER TABLE llx_blockedlog MODIFY COLUMN object_data mediumtext;
ALTER TABLE llx_blockedlog ADD COLUMN object_version varchar(32) DEFAULT '';
-ALTER TABLE llx_product_lot MODIFY batch varchar(128);
-ALTER TABLE llx_product_batch MODIFY batch varchar(128);
-ALTER TABLE llx_commande_fournisseur_dispatch MODIFY batch varchar(128);
-ALTER TABLE llx_stock_mouvement MODIFY batch varchar(128);
-ALTER TABLE llx_mrp_production MODIFY batch varchar(128);
+ALTER TABLE llx_product_lot MODIFY COLUMN batch varchar(128);
+ALTER TABLE llx_product_batch MODIFY COLUMN batch varchar(128);
+ALTER TABLE llx_commande_fournisseur_dispatch MODIFY COLUMN batch varchar(128);
+ALTER TABLE llx_stock_mouvement MODIFY COLUMN batch varchar(128);
+ALTER TABLE llx_mrp_production MODIFY COLUMN batch varchar(128);
From a94f8572f1ecdf82b8ff11fe8424b00f42ba99dc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur
Date: Thu, 2 Apr 2020 12:53:41 +0200
Subject: [PATCH 055/336] Update api_setup.class.php
---
htdocs/api/class/api_setup.class.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/htdocs/api/class/api_setup.class.php b/htdocs/api/class/api_setup.class.php
index 15493159110..1b619acfeb7 100644
--- a/htdocs/api/class/api_setup.class.php
+++ b/htdocs/api/class/api_setup.class.php
@@ -407,11 +407,11 @@ class Setup extends DolibarrApi
*
* @param object $object Object with label to translate
* @param string $lang Code of the language the name of the object must be translated to
- * @param string $prefix Prefix for translation
+ * @param string $prefix Prefix for translation key
*
* @return void
*/
- private function translateLabel($object, $lang, $prefix)
+ private function translateLabel($object, $lang, $prefix = 'Country')
{
if (!empty($lang)) {
// Load the translations if this is a new language.
From a2fd363f91f3846b9dbe5130b0e8c6f70a7e483c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur
Date: Thu, 2 Apr 2020 12:55:06 +0200
Subject: [PATCH 056/336] Update livraison.class.php
---
htdocs/livraison/class/livraison.class.php | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/htdocs/livraison/class/livraison.class.php b/htdocs/livraison/class/livraison.class.php
index e96a9d36035..da1fc75b5b2 100644
--- a/htdocs/livraison/class/livraison.class.php
+++ b/htdocs/livraison/class/livraison.class.php
@@ -775,7 +775,7 @@ class Livraison extends CommonObject
$this->lines = array();
$sql = "SELECT ld.rowid, ld.fk_product, ld.description, ld.subprice, ld.total_ht, ld.qty as qty_shipped, ld.fk_origin_line, ";
- $sql.= " cd.qty as qty_asked, cd.label as custom_label, cd.fk_unit ,";
+ $sql.= " cd.qty as qty_asked, cd.label as custom_label, cd.fk_unit,";
$sql.= " p.ref as product_ref, p.fk_product_type as fk_product_type, p.label as product_label, p.description as product_desc,";
$sql.= " p.weight, p.weight_units, p.width, p.width_units, p.length, p.length_units, p.height, p.height_units, p.surface, p.surface_units, p.volume, p.volume_units, p.tobatch as product_tobatch";
$sql.= " FROM ".MAIN_DB_PREFIX."commandedet as cd, ".MAIN_DB_PREFIX."livraisondet as ld";
@@ -813,7 +813,7 @@ class Livraison extends CommonObject
$line->price = $obj->price;
$line->total_ht = $obj->total_ht;
- // Add
+ // units
$line->weight = $obj->weight;
$line->weight_units = $obj->weight_units;
$line->width = $obj->width;
@@ -827,7 +827,6 @@ class Livraison extends CommonObject
$line->volume = $obj->volume;
$line->volume_units = $obj->volume_units;
-
$line->fk_unit = $obj->fk_unit;
$this->lines[$i] = $line;
From c6f57c46a890bf8736e98497bb09e6935ad4e607 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur
Date: Thu, 2 Apr 2020 13:01:49 +0200
Subject: [PATCH 057/336] Update supplier_proposal.class.php
---
.../class/supplier_proposal.class.php | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index 6ad2dd1a2df..b91c6c43ffe 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -1849,8 +1849,8 @@ class SupplierProposal extends CommonObject
public function createPriceFournisseur($product, $user)
{
global $conf;
- if(!empty($conf->multicurrency->enabled)) include_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
- $price=price2num($product->subprice*$product->qty, 'MU');
+
+ $price=price2num($product->subprice*$product->qty, 'MU');
$qty=price2num($product->qty);
$unitPrice = price2num($product->subprice, 'MU');
$now=dol_now();
@@ -1865,9 +1865,10 @@ class SupplierProposal extends CommonObject
$product->tva_tx,
$user->id
);
- if(!empty($conf->multicurrency->enabled)) {
- $multicurrency = new MultiCurrency($this->db); //need to fetch because empty fk_multicurrency and rate
- if(!empty($product->multicurrency_code)) {
+ if (!empty($conf->multicurrency->enabled)) {
+ if (!empty($product->multicurrency_code)) {
+ include_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
+ $multicurrency = new MultiCurrency($this->db); //need to fetch because empty fk_multicurrency and rate
$multicurrency->fetch(0, $product->multicurrency_code);
if(! empty($multicurrency->id)) {
$values[] = $multicurrency->id;
From 386b27a14c2ff4a2bb7026987091fd17457ed433 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur
Date: Thu, 2 Apr 2020 14:32:54 +0200
Subject: [PATCH 058/336] Standardize code
---
htdocs/categories/viewcat.php | 236 ++++++++++++++++++-----------
htdocs/langs/en_US/categories.lang | 8 +-
2 files changed, 151 insertions(+), 93 deletions(-)
diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index 513d411d188..a61d29b6a48 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -292,6 +292,7 @@ if ($user->rights->categorie->supprimer)
print "
";
+$newcardbutton = '';
if (! empty($user->rights->categorie->creer))
{
$link = DOL_URL_ROOT.'/categories/card.php';
@@ -300,9 +301,9 @@ if (! empty($user->rights->categorie->creer))
$link .= '&catorigin='.$object->id;
$link .= '&backtopage='.urlencode($_SERVER["PHP_SELF"].'?type='.$type.'&id='.$id);
- print ''.$object->name_alias.'
';
// Add label
- if ($object->element == 'product' || $object->element == 'bank_account' || $object->element == 'project_task')
+ if (in_array($object->element, array('product', 'bank_account', 'project_task')))
{
if (!empty($object->label)) $morehtmlref .= ''.$object->label.'
';
}
- if (method_exists($object, 'getBannerAddress') && $object->element != 'product' && $object->element != 'bookmark' && $object->element != 'ecm_directories' && $object->element != 'ecm_files')
+ if (method_exists($object, 'getBannerAddress') && !in_array($object->element, array('product', 'bookmark', 'ecm_directories', 'ecm_files')))
{
$moreaddress = $object->getBannerAddress('refaddress', $object);
if ($moreaddress) {
@@ -1718,10 +1718,11 @@ function dol_bc($var, $moreclass = '')
* @param string $sep Separator to use to build string
* @param Translate $outputlangs Object lang that contains language for text translation.
* @param int $mode 0=Standard output, 1=Remove address
+ * @param string $extralangcode User extralanguage $langcode as values for address, town
* @return string Formated string
* @see dol_print_address()
*/
-function dol_format_address($object, $withcountry = 0, $sep = "\n", $outputlangs = '', $mode = 0)
+function dol_format_address($object, $withcountry = 0, $sep = "\n", $outputlangs = '', $mode = 0, $extralangcode = '')
{
global $conf, $langs;
@@ -1729,15 +1730,15 @@ function dol_format_address($object, $withcountry = 0, $sep = "\n", $outputlangs
$countriesusingstate = array('AU', 'CA', 'US', 'IN', 'GB', 'ES', 'UK', 'TR'); // See also MAIN_FORCE_STATE_INTO_ADDRESS
// See format of addresses on https://en.wikipedia.org/wiki/Address
-
// Address
if (empty($mode)) {
- $ret .= $object->address;
+ $ret .= ($extralangcode ? $object->array_languages['address'][$extralangcode] : $object->address);
}
// Zip/Town/State
if (in_array($object->country_code, array('AU', 'CA', 'US')) || !empty($conf->global->MAIN_FORCE_STATE_INTO_ADDRESS)) // US: title firstname name \n address lines \n town, state, zip \n country
{
- $ret .= ($ret ? $sep : '').$object->town;
+ $town = ($extralangcode ? $object->array_languages['town'][$extralangcode] : $object->town);
+ $ret .= ($ret ? $sep : '').$town;
if ($object->state)
{
$ret .= ($ret ? ", " : '').$object->state;
@@ -1746,7 +1747,8 @@ function dol_format_address($object, $withcountry = 0, $sep = "\n", $outputlangs
}
elseif (in_array($object->country_code, array('GB', 'UK'))) // UK: title firstname name \n address lines \n town state \n zip \n country
{
- $ret .= ($ret ? $sep : '').$object->town;
+ $town = ($extralangcode ? $object->array_languages['town'][$extralangcode] : $object->town);
+ $ret .= ($ret ? $sep : '').$town;
if ($object->state)
{
$ret .= ($ret ? ", " : '').$object->state;
@@ -1756,7 +1758,8 @@ function dol_format_address($object, $withcountry = 0, $sep = "\n", $outputlangs
elseif (in_array($object->country_code, array('ES', 'TR'))) // ES: title firstname name \n address lines \n zip town \n state \n country
{
$ret .= ($ret ? $sep : '').$object->zip;
- $ret .= ($object->town ? (($object->zip ? ' ' : '').$object->town) : '');
+ $town = ($extralangcode ? $object->array_languages['town'][$extralangcode] : $object->town);
+ $ret .= ($town ? (($object->zip ? ' ' : '').$town) : '');
if ($object->state)
{
$ret .= "\n".$object->state;
@@ -1765,13 +1768,15 @@ function dol_format_address($object, $withcountry = 0, $sep = "\n", $outputlangs
elseif (in_array($object->country_code, array('IT'))) // IT: tile firstname name\n address lines \n zip (Code Departement) \n country
{
$ret .= ($ret ? $sep : '').$object->zip;
- $ret .= ($object->town ? (($object->zip ? ' ' : '').$object->town) : '');
+ $town = ($extralangcode ? $object->array_languages['town'][$extralangcode] : $object->town);
+ $ret .= ($town ? (($object->zip ? ' ' : '').$town) : '');
$ret .= ($object->state_code ? (' '.($object->state_code)) : '');
}
else // Other: title firstname name \n address lines \n zip town \n country
{
+ $town = ($extralangcode ? $object->array_languages['town'][$extralangcode] : $object->town);
$ret .= $object->zip ? (($ret ? $sep : '').$object->zip) : '';
- $ret .= ($object->town ? (($object->zip ? ' ' : ($ret ? $sep : '')).$object->town) : '');
+ $ret .= ($town ? (($object->zip ? ' ' : ($ret ? $sep : '')).$town) : '');
if ($object->state && in_array($object->country_code, $countriesusingstate))
{
$ret .= ($ret ? ", " : '').$object->state;
@@ -2853,16 +2858,16 @@ function dol_user_country()
/**
* Format address string
*
- * @param string $address Address
+ * @param string $address Address string, already formatted with dol_format_address()
* @param int $htmlid Html ID (for example 'gmap')
- * @param int $mode thirdparty|contact|member|other
+ * @param int $element 'thirdparty'|'contact'|'member'|'other'
* @param int $id Id of object
* @param int $noprint No output. Result is the function return
* @param string $charfornl Char to use instead of nl2br. '' means we use a standad nl2br.
* @return string|void Nothing if noprint is 0, formatted address if noprint is 1
* @see dol_format_address()
*/
-function dol_print_address($address, $htmlid, $mode, $id, $noprint = 0, $charfornl = '')
+function dol_print_address($address, $htmlid, $element, $id, $noprint = 0, $charfornl = '')
{
global $conf, $user, $langs, $hookmanager;
@@ -2871,7 +2876,7 @@ function dol_print_address($address, $htmlid, $mode, $id, $noprint = 0, $charfor
if ($address)
{
if ($hookmanager) {
- $parameters = array('element' => $mode, 'id' => $id);
+ $parameters = array('element' => $element, 'id' => $id);
$reshook = $hookmanager->executeHooks('printAddress', $parameters, $address);
$out .= $hookmanager->resPrint;
}
@@ -2880,24 +2885,22 @@ function dol_print_address($address, $htmlid, $mode, $id, $noprint = 0, $charfor
if (empty($charfornl)) $out .= nl2br($address);
else $out .= preg_replace('/[\r\n]+/', $charfornl, $address);
+ // TODO Remove this block, we can add this using the hook now
$showgmap = $showomap = 0;
-
- // TODO Add a hook here
- if (($mode == 'thirdparty' || $mode == 'societe') && !empty($conf->google->enabled) && !empty($conf->global->GOOGLE_ENABLE_GMAPS)) $showgmap = 1;
- if ($mode == 'contact' && !empty($conf->google->enabled) && !empty($conf->global->GOOGLE_ENABLE_GMAPS_CONTACTS)) $showgmap = 1;
- if ($mode == 'member' && !empty($conf->google->enabled) && !empty($conf->global->GOOGLE_ENABLE_GMAPS_MEMBERS)) $showgmap = 1;
- if (($mode == 'thirdparty' || $mode == 'societe') && !empty($conf->openstreetmap->enabled) && !empty($conf->global->OPENSTREETMAP_ENABLE_MAPS)) $showomap = 1;
- if ($mode == 'contact' && !empty($conf->openstreetmap->enabled) && !empty($conf->global->OPENSTREETMAP_ENABLE_MAPS_CONTACTS)) $showomap = 1;
- if ($mode == 'member' && !empty($conf->openstreetmap->enabled) && !empty($conf->global->OPENSTREETMAP_ENABLE_MAPS_MEMBERS)) $showomap = 1;
-
+ if (($element == 'thirdparty' || $element == 'societe') && !empty($conf->google->enabled) && !empty($conf->global->GOOGLE_ENABLE_GMAPS)) $showgmap = 1;
+ if ($element == 'contact' && !empty($conf->google->enabled) && !empty($conf->global->GOOGLE_ENABLE_GMAPS_CONTACTS)) $showgmap = 1;
+ if ($element == 'member' && !empty($conf->google->enabled) && !empty($conf->global->GOOGLE_ENABLE_GMAPS_MEMBERS)) $showgmap = 1;
+ if (($element == 'thirdparty' || $element == 'societe') && !empty($conf->openstreetmap->enabled) && !empty($conf->global->OPENSTREETMAP_ENABLE_MAPS)) $showomap = 1;
+ if ($element == 'contact' && !empty($conf->openstreetmap->enabled) && !empty($conf->global->OPENSTREETMAP_ENABLE_MAPS_CONTACTS)) $showomap = 1;
+ if ($element == 'member' && !empty($conf->openstreetmap->enabled) && !empty($conf->global->OPENSTREETMAP_ENABLE_MAPS_MEMBERS)) $showomap = 1;
if ($showgmap)
{
- $url = dol_buildpath('/google/gmaps.php?mode='.$mode.'&id='.$id, 1);
+ $url = dol_buildpath('/google/gmaps.php?mode='.$element.'&id='.$id, 1);
$out .= ' ';
}
if ($showomap)
{
- $url = dol_buildpath('/openstreetmap/maps.php?mode='.$mode.'&id='.$id, 1);
+ $url = dol_buildpath('/openstreetmap/maps.php?mode='.$element.'&id='.$id, 1);
$out .= ' ';
}
}
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index be97aff6377..0186d3d9807 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -931,7 +931,7 @@ else
* Creation
*/
$private = GETPOST("private", "int");
- if (!empty($conf->global->THIRDPARTY_DEFAULT_CREATE_CONTACT) && !isset($_GET['private']) && !isset($_POST['private'])) $private = 1;
+ if (!empty($conf->global->THIRDPARTY_DEFAULT_CREATE_CONTACT) && ! GETPOSTISSET('private')) $private = 1;
if (empty($private)) $private = 0;
// Load object modCodeTiers
From 70706d9ea712848a6a57dceea14c7099f1a71aa8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur ' + table.replace('style="', 'style="position:absolute;' + pos +';') + '
').appendTo(placeholder);
- if (options.legend.backgroundOpacity != 0.0) {
- // put in the transparent background
- // separately to avoid blended labels and
- // label boxes
- var c = options.legend.backgroundColor;
- if (c == null) {
- c = options.grid.backgroundColor;
- if (c && typeof c == "string")
- c = $.color.parse(c);
- else
- c = $.color.extract(legend, 'background-color');
- c.a = 1;
- c = c.toString();
- }
- var div = legend.children();
- $(''+table.replace('style="','style="position:absolute;'+pos+";")+"
").appendTo(placeholder);if(options.legend.backgroundOpacity!=0){var c=options.legend.backgroundColor;if(c==null){c=options.grid.backgroundColor;if(c&&typeof c=="string")c=$.color.parse(c);else c=$.color.extract(legend,"background-color");c.a=1;c=c.toString()}var div=legend.children();$('Could not draw pie with labels contained inside canvas
");
- }
-
- if (plot.setSeries && plot.insertLegend) {
- plot.setSeries(slices);
- plot.insertLegend();
- }
-
- // we're actually done at this point, just defining internal functions at this point
-
- function clear() {
- ctx.clearRect(0, 0, canvasWidth, canvasHeight);
- target.children().filter(".pieLabel, .pieLabelBackground").remove();
- }
-
- function drawShadow() {
-
- var shadowLeft = options.series.pie.shadow.left;
- var shadowTop = options.series.pie.shadow.top;
- var edge = 10;
- var alpha = options.series.pie.shadow.alpha;
- var radius = options.series.pie.radius > 1 ? options.series.pie.radius : maxRadius * options.series.pie.radius;
-
- if (radius >= canvasWidth / 2 - shadowLeft || radius * options.series.pie.tilt >= canvasHeight / 2 - shadowTop || radius <= edge) {
- return; // shadow would be outside canvas, so don't draw it
- }
-
- ctx.save();
- ctx.translate(shadowLeft,shadowTop);
- ctx.globalAlpha = alpha;
- ctx.fillStyle = "#000";
-
- // center and rotate to starting position
-
- ctx.translate(centerLeft,centerTop);
- ctx.scale(1, options.series.pie.tilt);
-
- //radius -= edge;
-
- for (var i = 1; i <= edge; i++) {
- ctx.beginPath();
- ctx.arc(0, 0, radius, 0, Math.PI * 2, false);
- ctx.fill();
- radius -= i;
- }
-
- ctx.restore();
- }
-
- function drawPie() {
-
- var startAngle = Math.PI * options.series.pie.startAngle;
- var radius = options.series.pie.radius > 1 ? options.series.pie.radius : maxRadius * options.series.pie.radius;
-
- // center and rotate to starting position
-
- ctx.save();
- ctx.translate(centerLeft,centerTop);
- ctx.scale(1, options.series.pie.tilt);
- //ctx.rotate(startAngle); // start at top; -- This doesn't work properly in Opera
-
- // draw slices
-
- ctx.save();
- var currentAngle = startAngle;
- for (var i = 0; i < slices.length; ++i) {
- slices[i].startAngle = currentAngle;
- drawSlice(slices[i].angle, slices[i].color, true);
- }
- ctx.restore();
-
- // draw slice outlines
-
- if (options.series.pie.stroke.width > 0) {
- ctx.save();
- ctx.lineWidth = options.series.pie.stroke.width;
- currentAngle = startAngle;
- for (var i = 0; i < slices.length; ++i) {
- drawSlice(slices[i].angle, options.series.pie.stroke.color, false);
- }
- ctx.restore();
- }
-
- // draw donut hole
-
- drawDonutHole(ctx);
-
- ctx.restore();
-
- // Draw the labels, returning true if they fit within the plot
-
- if (options.series.pie.label.show) {
- return drawLabels();
- } else return true;
-
- function drawSlice(angle, color, fill) {
-
- if (angle <= 0 || isNaN(angle)) {
- return;
- }
-
- if (fill) {
- ctx.fillStyle = color;
- } else {
- ctx.strokeStyle = color;
- ctx.lineJoin = "round";
- }
-
- ctx.beginPath();
- if (Math.abs(angle - Math.PI * 2) > 0.000000001) {
- ctx.moveTo(0, 0); // Center of the pie
- }
-
- //ctx.arc(0, 0, radius, 0, angle, false); // This doesn't work properly in Opera
- ctx.arc(0, 0, radius,currentAngle, currentAngle + angle / 2, false);
- ctx.arc(0, 0, radius,currentAngle + angle / 2, currentAngle + angle, false);
- ctx.closePath();
- //ctx.rotate(angle); // This doesn't work properly in Opera
- currentAngle += angle;
-
- if (fill) {
- ctx.fill();
- } else {
- ctx.stroke();
- }
- }
-
- function drawLabels() {
-
- var currentAngle = startAngle;
- var radius = options.series.pie.label.radius > 1 ? options.series.pie.label.radius : maxRadius * options.series.pie.label.radius;
-
- for (var i = 0; i < slices.length; ++i) {
- if (slices[i].percent >= options.series.pie.label.threshold * 100) {
- if (!drawLabel(slices[i], currentAngle, i)) {
- return false;
- }
- }
- currentAngle += slices[i].angle;
- }
-
- return true;
-
- function drawLabel(slice, startAngle, index) {
-
- if (slice.data[0][1] == 0) {
- return true;
- }
-
- // format label text
-
- var lf = options.legend.labelFormatter, text, plf = options.series.pie.label.formatter;
-
- if (lf) {
- text = lf(slice.label, slice);
- } else {
- text = slice.label;
- }
-
- if (plf) {
- text = plf(text, slice);
- }
-
- var halfAngle = ((startAngle + slice.angle) + startAngle) / 2;
- var x = centerLeft + Math.round(Math.cos(halfAngle) * radius);
- var y = centerTop + Math.round(Math.sin(halfAngle) * radius) * options.series.pie.tilt;
-
- var html = "" + text + "";
- target.append(html);
-
- var label = target.children("#pieLabel" + index);
- var labelTop = (y - label.height() / 2);
- var labelLeft = (x - label.width() / 2);
-
- label.css("top", labelTop);
- label.css("left", labelLeft);
-
- // check to make sure that the label is not outside the canvas
-
- if (0 - labelTop > 0 || 0 - labelLeft > 0 || canvasHeight - (labelTop + label.height()) < 0 || canvasWidth - (labelLeft + label.width()) < 0) {
- return false;
- }
-
- if (options.series.pie.label.background.opacity != 0) {
-
- // put in the transparent background separately to avoid blended labels and label boxes
-
- var c = options.series.pie.label.background.color;
-
- if (c == null) {
- c = slice.color;
- }
-
- var pos = "top:" + labelTop + "px;left:" + labelLeft + "px;";
- $("")
- .css("opacity", options.series.pie.label.background.opacity)
- .insertBefore(label);
- }
-
- return true;
- } // end individual label function
- } // end drawLabels function
- } // end drawPie function
- } // end draw function
-
- // Placed here because it needs to be accessed from multiple locations
-
- function drawDonutHole(layer) {
- if (options.series.pie.innerRadius > 0) {
-
- // subtract the center
-
- layer.save();
- var innerRadius = options.series.pie.innerRadius > 1 ? options.series.pie.innerRadius : maxRadius * options.series.pie.innerRadius;
- layer.globalCompositeOperation = "destination-out"; // this does not work with excanvas, but it will fall back to using the stroke color
- layer.beginPath();
- layer.fillStyle = options.series.pie.stroke.color;
- layer.arc(0, 0, innerRadius, 0, Math.PI * 2, false);
- layer.fill();
- layer.closePath();
- layer.restore();
-
- // add inner stroke
-
- layer.save();
- layer.beginPath();
- layer.strokeStyle = options.series.pie.stroke.color;
- layer.arc(0, 0, innerRadius, 0, Math.PI * 2, false);
- layer.stroke();
- layer.closePath();
- layer.restore();
-
- // TODO: add extra shadow inside hole (with a mask) if the pie is tilted.
- }
- }
-
- //-- Additional Interactive related functions --
-
- function isPointInPoly(poly, pt) {
- for(var c = false, i = -1, l = poly.length, j = l - 1; ++i < l; j = i)
- ((poly[i][1] <= pt[1] && pt[1] < poly[j][1]) || (poly[j][1] <= pt[1] && pt[1]< poly[i][1]))
- && (pt[0] < (poly[j][0] - poly[i][0]) * (pt[1] - poly[i][1]) / (poly[j][1] - poly[i][1]) + poly[i][0])
- && (c = !c);
- return c;
- }
-
- function findNearbySlice(mouseX, mouseY) {
-
- var slices = plot.getData(),
- options = plot.getOptions(),
- radius = options.series.pie.radius > 1 ? options.series.pie.radius : maxRadius * options.series.pie.radius,
- x, y;
-
- for (var i = 0; i < slices.length; ++i) {
-
- var s = slices[i];
-
- if (s.pie.show) {
-
- ctx.save();
- ctx.beginPath();
- ctx.moveTo(0, 0); // Center of the pie
- //ctx.scale(1, options.series.pie.tilt); // this actually seems to break everything when here.
- ctx.arc(0, 0, radius, s.startAngle, s.startAngle + s.angle / 2, false);
- ctx.arc(0, 0, radius, s.startAngle + s.angle / 2, s.startAngle + s.angle, false);
- ctx.closePath();
- x = mouseX - centerLeft;
- y = mouseY - centerTop;
-
- if (ctx.isPointInPath) {
- if (ctx.isPointInPath(mouseX - centerLeft, mouseY - centerTop)) {
- ctx.restore();
- return {
- datapoint: [s.percent, s.data],
- dataIndex: 0,
- series: s,
- seriesIndex: i
- };
- }
- } else {
-
- // excanvas for IE doesn;t support isPointInPath, this is a workaround.
-
- var p1X = radius * Math.cos(s.startAngle),
- p1Y = radius * Math.sin(s.startAngle),
- p2X = radius * Math.cos(s.startAngle + s.angle / 4),
- p2Y = radius * Math.sin(s.startAngle + s.angle / 4),
- p3X = radius * Math.cos(s.startAngle + s.angle / 2),
- p3Y = radius * Math.sin(s.startAngle + s.angle / 2),
- p4X = radius * Math.cos(s.startAngle + s.angle / 1.5),
- p4Y = radius * Math.sin(s.startAngle + s.angle / 1.5),
- p5X = radius * Math.cos(s.startAngle + s.angle),
- p5Y = radius * Math.sin(s.startAngle + s.angle),
- arrPoly = [[0, 0], [p1X, p1Y], [p2X, p2Y], [p3X, p3Y], [p4X, p4Y], [p5X, p5Y]],
- arrPoint = [x, y];
-
- // TODO: perhaps do some mathmatical trickery here with the Y-coordinate to compensate for pie tilt?
-
- if (isPointInPoly(arrPoly, arrPoint)) {
- ctx.restore();
- return {
- datapoint: [s.percent, s.data],
- dataIndex: 0,
- series: s,
- seriesIndex: i
- };
- }
- }
-
- ctx.restore();
- }
- }
-
- return null;
- }
-
- function onMouseMove(e) {
- triggerClickHoverEvent("plothover", e);
- }
-
- function onClick(e) {
- triggerClickHoverEvent("plotclick", e);
- }
-
- // trigger click or hover event (they send the same parameters so we share their code)
-
- function triggerClickHoverEvent(eventname, e) {
-
- var offset = plot.offset();
- var canvasX = parseInt(e.pageX - offset.left);
- var canvasY = parseInt(e.pageY - offset.top);
- var item = findNearbySlice(canvasX, canvasY);
-
- if (options.grid.autoHighlight) {
-
- // clear auto-highlights
-
- for (var i = 0; i < highlights.length; ++i) {
- var h = highlights[i];
- if (h.auto == eventname && !(item && h.series == item.series)) {
- unhighlight(h.series);
- }
- }
- }
-
- // highlight the slice
-
- if (item) {
- highlight(item.series, eventname);
- }
-
- // trigger any hover bind events
-
- var pos = { pageX: e.pageX, pageY: e.pageY };
- target.trigger(eventname, [pos, item]);
- }
-
- function highlight(s, auto) {
- //if (typeof s == "number") {
- // s = series[s];
- //}
-
- var i = indexOfHighlight(s);
-
- if (i == -1) {
- highlights.push({ series: s, auto: auto });
- plot.triggerRedrawOverlay();
- } else if (!auto) {
- highlights[i].auto = false;
- }
- }
-
- function unhighlight(s) {
- if (s == null) {
- highlights = [];
- plot.triggerRedrawOverlay();
- }
-
- //if (typeof s == "number") {
- // s = series[s];
- //}
-
- var i = indexOfHighlight(s);
-
- if (i != -1) {
- highlights.splice(i, 1);
- plot.triggerRedrawOverlay();
- }
- }
-
- function indexOfHighlight(s) {
- for (var i = 0; i < highlights.length; ++i) {
- var h = highlights[i];
- if (h.series == s)
- return i;
- }
- return -1;
- }
-
- function drawOverlay(plot, octx) {
-
- var options = plot.getOptions();
-
- var radius = options.series.pie.radius > 1 ? options.series.pie.radius : maxRadius * options.series.pie.radius;
-
- octx.save();
- octx.translate(centerLeft, centerTop);
- octx.scale(1, options.series.pie.tilt);
-
- for (var i = 0; i < highlights.length; ++i) {
- drawHighlight(highlights[i].series);
- }
-
- drawDonutHole(octx);
-
- octx.restore();
-
- function drawHighlight(series) {
-
- if (series.angle <= 0 || isNaN(series.angle)) {
- return;
- }
-
- //octx.fillStyle = parseColor(options.series.pie.highlight.color).scale(null, null, null, options.series.pie.highlight.opacity).toString();
- octx.fillStyle = "rgba(255, 255, 255, " + options.series.pie.highlight.opacity + ")"; // this is temporary until we have access to parseColor
- octx.beginPath();
- if (Math.abs(series.angle - Math.PI * 2) > 0.000000001) {
- octx.moveTo(0, 0); // Center of the pie
- }
- octx.arc(0, 0, radius, series.startAngle, series.startAngle + series.angle / 2, false);
- octx.arc(0, 0, radius, series.startAngle + series.angle / 2, series.startAngle + series.angle, false);
- octx.closePath();
- octx.fill();
- }
- }
- } // end init (plugin body)
-
- // define pie specific options and their default values
-
- var options = {
- series: {
- pie: {
- show: false,
- radius: "auto", // actual radius of the visible pie (based on full calculated radius if <=1, or hard pixel value)
- innerRadius: 0, /* for donut */
- startAngle: 3/2,
- tilt: 1,
- shadow: {
- left: 5, // shadow left offset
- top: 15, // shadow top offset
- alpha: 0.02 // shadow alpha
- },
- offset: {
- top: 0,
- left: "auto"
- },
- stroke: {
- color: "#fff",
- width: 1
- },
- label: {
- show: "auto",
- formatter: function(label, slice) {
- return "" + label + "
" + Math.round(slice.percent) + "%
";
- }, // formatter function
- radius: 1, // radius at which to place the labels (based on full calculated radius if <=1, or hard pixel value)
- background: {
- color: null,
- opacity: 0
- },
- threshold: 0 // percentage at which to hide the label (i.e. the slice is too narrow)
- },
- combine: {
- threshold: -1, // percentage at which to combine little slices into one larger slice
- color: null, // color to give the new slice (auto-generated if null)
- label: "Other" // label to give the new slice
- },
- highlight: {
- //color: "#fff", // will add this functionality once parseColor is available
- opacity: 0.5
- }
- }
- }
- };
-
- $.plot.plugins.push({
- init: init,
- options: options,
- name: "pie",
- version: "1.1"
- });
-
-})(jQuery);
diff --git a/htdocs/includes/jquery/plugins/flot/jquery.flot.pie.min.js b/htdocs/includes/jquery/plugins/flot/jquery.flot.pie.min.js
deleted file mode 100644
index 9bc488b1546..00000000000
--- a/htdocs/includes/jquery/plugins/flot/jquery.flot.pie.min.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/* Javascript plotting library for jQuery, version 0.8.3.
-
-Copyright (c) 2007-2014 IOLA and Ole Laursen.
-Licensed under the MIT license.
-
-*/
-(function($){var REDRAW_ATTEMPTS=10;var REDRAW_SHRINK=.95;function init(plot){var canvas=null,target=null,options=null,maxRadius=null,centerLeft=null,centerTop=null,processed=false,ctx=null;var highlights=[];plot.hooks.processOptions.push(function(plot,options){if(options.series.pie.show){options.grid.show=false;if(options.series.pie.label.show=="auto"){if(options.legend.show){options.series.pie.label.show=false}else{options.series.pie.label.show=true}}if(options.series.pie.radius=="auto"){if(options.series.pie.label.show){options.series.pie.radius=3/4}else{options.series.pie.radius=1}}if(options.series.pie.tilt>1){options.series.pie.tilt=1}else if(options.series.pie.tilt<0){options.series.pie.tilt=0}}});plot.hooks.bindEvents.push(function(plot,eventHolder){var options=plot.getOptions();if(options.series.pie.show){if(options.grid.hoverable){eventHolder.unbind("mousemove").mousemove(onMouseMove)}if(options.grid.clickable){eventHolder.unbind("click").click(onClick)}}});plot.hooks.processDatapoints.push(function(plot,series,data,datapoints){var options=plot.getOptions();if(options.series.pie.show){processDatapoints(plot,series,data,datapoints)}});plot.hooks.drawOverlay.push(function(plot,octx){var options=plot.getOptions();if(options.series.pie.show){drawOverlay(plot,octx)}});plot.hooks.draw.push(function(plot,newCtx){var options=plot.getOptions();if(options.series.pie.show){draw(plot,newCtx)}});function processDatapoints(plot,series,datapoints){if(!processed){processed=true;canvas=plot.getCanvas();target=$(canvas).parent();options=plot.getOptions();plot.setData(combine(plot.getData()))}}function combine(data){var total=0,combined=0,numCombined=0,color=options.series.pie.combine.color,newdata=[];for(var i=0;i" + Math.round(slice.percent) + "%
Could not draw pie with labels contained inside canvas
")}if(plot.setSeries&&plot.insertLegend){plot.setSeries(slices);plot.insertLegend()}function clear(){ctx.clearRect(0,0,canvasWidth,canvasHeight);target.children().filter(".pieLabel, .pieLabelBackground").remove()}function drawShadow(){var shadowLeft=options.series.pie.shadow.left;var shadowTop=options.series.pie.shadow.top;var edge=10;var alpha=options.series.pie.shadow.alpha;var radius=options.series.pie.radius>1?options.series.pie.radius:maxRadius*options.series.pie.radius;if(radius>=canvasWidth/2-shadowLeft||radius*options.series.pie.tilt>=canvasHeight/2-shadowTop||radius<=edge){return}ctx.save();ctx.translate(shadowLeft,shadowTop);ctx.globalAlpha=alpha;ctx.fillStyle="#000";ctx.translate(centerLeft,centerTop);ctx.scale(1,options.series.pie.tilt);for(var i=1;i<=edge;i++){ctx.beginPath();ctx.arc(0,0,radius,0,Math.PI*2,false);ctx.fill();radius-=i}ctx.restore()}function drawPie(){var startAngle=Math.PI*options.series.pie.startAngle;var radius=options.series.pie.radius>1?options.series.pie.radius:maxRadius*options.series.pie.radius;ctx.save();ctx.translate(centerLeft,centerTop);ctx.scale(1,options.series.pie.tilt);ctx.save();var currentAngle=startAngle;for(var i=0;i"+label+"
"+Math.round(slice.percent)+"%
"},radius:1,background:{color:null,opacity:0},threshold:0},combine:{threshold:-1,color:null,label:"Other"},highlight:{opacity:.5}}}};$.plot.plugins.push({init:init,options:options,name:"pie",version:"1.1"})})(jQuery);
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/flot/jquery.flot.resize.js b/htdocs/includes/jquery/plugins/flot/jquery.flot.resize.js
deleted file mode 100644
index 8a626dda0ad..00000000000
--- a/htdocs/includes/jquery/plugins/flot/jquery.flot.resize.js
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Flot plugin for automatically redrawing plots as the placeholder resizes.
-
-Copyright (c) 2007-2014 IOLA and Ole Laursen.
-Licensed under the MIT license.
-
-It works by listening for changes on the placeholder div (through the jQuery
-resize event plugin) - if the size changes, it will redraw the plot.
-
-There are no options. If you need to disable the plugin for some plots, you
-can just fix the size of their placeholders.
-
-*/
-
-/* Inline dependency:
- * jQuery resize event - v1.1 - 3/14/2010
- * http://benalman.com/projects/jquery-resize-plugin/
- *
- * Copyright (c) 2010 "Cowboy" Ben Alman
- * Dual licensed under the MIT and GPL licenses.
- * http://benalman.com/about/license/
- */
-(function($,e,t){"$:nomunge";var i=[],n=$.resize=$.extend($.resize,{}),a,r=false,s="setTimeout",u="resize",m=u+"-special-event",o="pendingDelay",l="activeDelay",f="throttleWindow";n[o]=200;n[l]=20;n[f]=true;$.event.special[u]={setup:function(){if(!n[f]&&this[s]){return false}var e=$(this);i.push(this);e.data(m,{w:e.width(),h:e.height()});if(i.length===1){a=t;h()}},teardown:function(){if(!n[f]&&this[s]){return false}var e=$(this);for(var t=i.length-1;t>=0;t--){if(i[t]==this){i.splice(t,1);break}}e.removeData(m);if(!i.length){if(r){cancelAnimationFrame(a)}else{clearTimeout(a)}a=null}},add:function(e){if(!n[f]&&this[s]){return false}var i;function a(e,n,a){var r=$(this),s=r.data(m)||{};s.w=n!==t?n:r.width();s.h=a!==t?a:r.height();i.apply(this,arguments)}if($.isFunction(e)){i=e;return a}else{i=e.handler;e.handler=a}}};function h(t){if(r===true){r=t||1}for(var s=i.length-1;s>=0;s--){var l=$(i[s]);if(l[0]==e||l.is(":visible")){var f=l.width(),c=l.height(),d=l.data(m);if(d&&(f!==d.w||c!==d.h)){l.trigger(u,[d.w=f,d.h=c]);r=t||true}}else{d=l.data(m);d.w=0;d.h=0}}if(a!==null){if(r&&(t==null||t-r<1e3)){a=e.requestAnimationFrame(h)}else{a=setTimeout(h,n[o]);r=false}}}if(!e.requestAnimationFrame){e.requestAnimationFrame=function(){return e.webkitRequestAnimationFrame||e.mozRequestAnimationFrame||e.oRequestAnimationFrame||e.msRequestAnimationFrame||function(t,i){return e.setTimeout(function(){t((new Date).getTime())},n[l])}}()}if(!e.cancelAnimationFrame){e.cancelAnimationFrame=function(){return e.webkitCancelRequestAnimationFrame||e.mozCancelRequestAnimationFrame||e.oCancelRequestAnimationFrame||e.msCancelRequestAnimationFrame||clearTimeout}()}})(jQuery,this);
-
-(function ($) {
- var options = { }; // no options
-
- function init(plot) {
- function onResize() {
- var placeholder = plot.getPlaceholder();
-
- // somebody might have hidden us and we can't plot
- // when we don't have the dimensions
- if (placeholder.width() == 0 || placeholder.height() == 0)
- return;
-
- plot.resize();
- plot.setupGrid();
- plot.draw();
- }
-
- function bindEvents(plot, eventHolder) {
- plot.getPlaceholder().resize(onResize);
- }
-
- function shutdown(plot, eventHolder) {
- plot.getPlaceholder().unbind("resize", onResize);
- }
-
- plot.hooks.bindEvents.push(bindEvents);
- plot.hooks.shutdown.push(shutdown);
- }
-
- $.plot.plugins.push({
- init: init,
- options: options,
- name: 'resize',
- version: '1.0'
- });
-})(jQuery);
diff --git a/htdocs/includes/jquery/plugins/flot/jquery.flot.resize.min.js b/htdocs/includes/jquery/plugins/flot/jquery.flot.resize.min.js
deleted file mode 100644
index 7e92aa681c9..00000000000
--- a/htdocs/includes/jquery/plugins/flot/jquery.flot.resize.min.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/* Javascript plotting library for jQuery, version 0.8.3.
-
-Copyright (c) 2007-2014 IOLA and Ole Laursen.
-Licensed under the MIT license.
-
-*/
-(function($,e,t){"$:nomunge";var i=[],n=$.resize=$.extend($.resize,{}),a,r=false,s="setTimeout",u="resize",m=u+"-special-event",o="pendingDelay",l="activeDelay",f="throttleWindow";n[o]=200;n[l]=20;n[f]=true;$.event.special[u]={setup:function(){if(!n[f]&&this[s]){return false}var e=$(this);i.push(this);e.data(m,{w:e.width(),h:e.height()});if(i.length===1){a=t;h()}},teardown:function(){if(!n[f]&&this[s]){return false}var e=$(this);for(var t=i.length-1;t>=0;t--){if(i[t]==this){i.splice(t,1);break}}e.removeData(m);if(!i.length){if(r){cancelAnimationFrame(a)}else{clearTimeout(a)}a=null}},add:function(e){if(!n[f]&&this[s]){return false}var i;function a(e,n,a){var r=$(this),s=r.data(m)||{};s.w=n!==t?n:r.width();s.h=a!==t?a:r.height();i.apply(this,arguments)}if($.isFunction(e)){i=e;return a}else{i=e.handler;e.handler=a}}};function h(t){if(r===true){r=t||1}for(var s=i.length-1;s>=0;s--){var l=$(i[s]);if(l[0]==e||l.is(":visible")){var f=l.width(),c=l.height(),d=l.data(m);if(d&&(f!==d.w||c!==d.h)){l.trigger(u,[d.w=f,d.h=c]);r=t||true}}else{d=l.data(m);d.w=0;d.h=0}}if(a!==null){if(r&&(t==null||t-r<1e3)){a=e.requestAnimationFrame(h)}else{a=setTimeout(h,n[o]);r=false}}}if(!e.requestAnimationFrame){e.requestAnimationFrame=function(){return e.webkitRequestAnimationFrame||e.mozRequestAnimationFrame||e.oRequestAnimationFrame||e.msRequestAnimationFrame||function(t,i){return e.setTimeout(function(){t((new Date).getTime())},n[l])}}()}if(!e.cancelAnimationFrame){e.cancelAnimationFrame=function(){return e.webkitCancelRequestAnimationFrame||e.mozCancelRequestAnimationFrame||e.oCancelRequestAnimationFrame||e.msCancelRequestAnimationFrame||clearTimeout}()}})(jQuery,this);(function($){var options={};function init(plot){function onResize(){var placeholder=plot.getPlaceholder();if(placeholder.width()==0||placeholder.height()==0)return;plot.resize();plot.setupGrid();plot.draw()}function bindEvents(plot,eventHolder){plot.getPlaceholder().resize(onResize)}function shutdown(plot,eventHolder){plot.getPlaceholder().unbind("resize",onResize)}plot.hooks.bindEvents.push(bindEvents);plot.hooks.shutdown.push(shutdown)}$.plot.plugins.push({init:init,options:options,name:"resize",version:"1.0"})})(jQuery);
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/flot/jquery.flot.selection.js b/htdocs/includes/jquery/plugins/flot/jquery.flot.selection.js
deleted file mode 100644
index d3c20fa4e12..00000000000
--- a/htdocs/includes/jquery/plugins/flot/jquery.flot.selection.js
+++ /dev/null
@@ -1,360 +0,0 @@
-/* Flot plugin for selecting regions of a plot.
-
-Copyright (c) 2007-2014 IOLA and Ole Laursen.
-Licensed under the MIT license.
-
-The plugin supports these options:
-
-selection: {
- mode: null or "x" or "y" or "xy",
- color: color,
- shape: "round" or "miter" or "bevel",
- minSize: number of pixels
-}
-
-Selection support is enabled by setting the mode to one of "x", "y" or "xy".
-In "x" mode, the user will only be able to specify the x range, similarly for
-"y" mode. For "xy", the selection becomes a rectangle where both ranges can be
-specified. "color" is color of the selection (if you need to change the color
-later on, you can get to it with plot.getOptions().selection.color). "shape"
-is the shape of the corners of the selection.
-
-"minSize" is the minimum size a selection can be in pixels. This value can
-be customized to determine the smallest size a selection can be and still
-have the selection rectangle be displayed. When customizing this value, the
-fact that it refers to pixels, not axis units must be taken into account.
-Thus, for example, if there is a bar graph in time mode with BarWidth set to 1
-minute, setting "minSize" to 1 will not make the minimum selection size 1
-minute, but rather 1 pixel. Note also that setting "minSize" to 0 will prevent
-"plotunselected" events from being fired when the user clicks the mouse without
-dragging.
-
-When selection support is enabled, a "plotselected" event will be emitted on
-the DOM element you passed into the plot function. The event handler gets a
-parameter with the ranges selected on the axes, like this:
-
- placeholder.bind( "plotselected", function( event, ranges ) {
- alert("You selected " + ranges.xaxis.from + " to " + ranges.xaxis.to)
- // similar for yaxis - with multiple axes, the extra ones are in
- // x2axis, x3axis, ...
- });
-
-The "plotselected" event is only fired when the user has finished making the
-selection. A "plotselecting" event is fired during the process with the same
-parameters as the "plotselected" event, in case you want to know what's
-happening while it's happening,
-
-A "plotunselected" event with no arguments is emitted when the user clicks the
-mouse to remove the selection. As stated above, setting "minSize" to 0 will
-destroy this behavior.
-
-The plugin allso adds the following methods to the plot object:
-
-- setSelection( ranges, preventEvent )
-
- Set the selection rectangle. The passed in ranges is on the same form as
- returned in the "plotselected" event. If the selection mode is "x", you
- should put in either an xaxis range, if the mode is "y" you need to put in
- an yaxis range and both xaxis and yaxis if the selection mode is "xy", like
- this:
-
- setSelection({ xaxis: { from: 0, to: 10 }, yaxis: { from: 40, to: 60 } });
-
- setSelection will trigger the "plotselected" event when called. If you don't
- want that to happen, e.g. if you're inside a "plotselected" handler, pass
- true as the second parameter. If you are using multiple axes, you can
- specify the ranges on any of those, e.g. as x2axis/x3axis/... instead of
- xaxis, the plugin picks the first one it sees.
-
-- clearSelection( preventEvent )
-
- Clear the selection rectangle. Pass in true to avoid getting a
- "plotunselected" event.
-
-- getSelection()
-
- Returns the current selection in the same format as the "plotselected"
- event. If there's currently no selection, the function returns null.
-
-*/
-
-(function ($) {
- function init(plot) {
- var selection = {
- first: { x: -1, y: -1}, second: { x: -1, y: -1},
- show: false,
- active: false
- };
-
- // FIXME: The drag handling implemented here should be
- // abstracted out, there's some similar code from a library in
- // the navigation plugin, this should be massaged a bit to fit
- // the Flot cases here better and reused. Doing this would
- // make this plugin much slimmer.
- var savedhandlers = {};
-
- var mouseUpHandler = null;
-
- function onMouseMove(e) {
- if (selection.active) {
- updateSelection(e);
-
- plot.getPlaceholder().trigger("plotselecting", [ getSelection() ]);
- }
- }
-
- function onMouseDown(e) {
- if (e.which != 1) // only accept left-click
- return;
-
- // cancel out any text selections
- document.body.focus();
-
- // prevent text selection and drag in old-school browsers
- if (document.onselectstart !== undefined && savedhandlers.onselectstart == null) {
- savedhandlers.onselectstart = document.onselectstart;
- document.onselectstart = function () { return false; };
- }
- if (document.ondrag !== undefined && savedhandlers.ondrag == null) {
- savedhandlers.ondrag = document.ondrag;
- document.ondrag = function () { return false; };
- }
-
- setSelectionPos(selection.first, e);
-
- selection.active = true;
-
- // this is a bit silly, but we have to use a closure to be
- // able to whack the same handler again
- mouseUpHandler = function (e) { onMouseUp(e); };
-
- $(document).one("mouseup", mouseUpHandler);
- }
-
- function onMouseUp(e) {
- mouseUpHandler = null;
-
- // revert drag stuff for old-school browsers
- if (document.onselectstart !== undefined)
- document.onselectstart = savedhandlers.onselectstart;
- if (document.ondrag !== undefined)
- document.ondrag = savedhandlers.ondrag;
-
- // no more dragging
- selection.active = false;
- updateSelection(e);
-
- if (selectionIsSane())
- triggerSelectedEvent();
- else {
- // this counts as a clear
- plot.getPlaceholder().trigger("plotunselected", [ ]);
- plot.getPlaceholder().trigger("plotselecting", [ null ]);
- }
-
- return false;
- }
-
- function getSelection() {
- if (!selectionIsSane())
- return null;
-
- if (!selection.show) return null;
-
- var r = {}, c1 = selection.first, c2 = selection.second;
- $.each(plot.getAxes(), function (name, axis) {
- if (axis.used) {
- var p1 = axis.c2p(c1[axis.direction]), p2 = axis.c2p(c2[axis.direction]);
- r[name] = { from: Math.min(p1, p2), to: Math.max(p1, p2) };
- }
- });
- return r;
- }
-
- function triggerSelectedEvent() {
- var r = getSelection();
-
- plot.getPlaceholder().trigger("plotselected", [ r ]);
-
- // backwards-compat stuff, to be removed in future
- if (r.xaxis && r.yaxis)
- plot.getPlaceholder().trigger("selected", [ { x1: r.xaxis.from, y1: r.yaxis.from, x2: r.xaxis.to, y2: r.yaxis.to } ]);
- }
-
- function clamp(min, value, max) {
- return value < min ? min: (value > max ? max: value);
- }
-
- function setSelectionPos(pos, e) {
- var o = plot.getOptions();
- var offset = plot.getPlaceholder().offset();
- var plotOffset = plot.getPlotOffset();
- pos.x = clamp(0, e.pageX - offset.left - plotOffset.left, plot.width());
- pos.y = clamp(0, e.pageY - offset.top - plotOffset.top, plot.height());
-
- if (o.selection.mode == "y")
- pos.x = pos == selection.first ? 0 : plot.width();
-
- if (o.selection.mode == "x")
- pos.y = pos == selection.first ? 0 : plot.height();
- }
-
- function updateSelection(pos) {
- if (pos.pageX == null)
- return;
-
- setSelectionPos(selection.second, pos);
- if (selectionIsSane()) {
- selection.show = true;
- plot.triggerRedrawOverlay();
- }
- else
- clearSelection(true);
- }
-
- function clearSelection(preventEvent) {
- if (selection.show) {
- selection.show = false;
- plot.triggerRedrawOverlay();
- if (!preventEvent)
- plot.getPlaceholder().trigger("plotunselected", [ ]);
- }
- }
-
- // function taken from markings support in Flot
- function extractRange(ranges, coord) {
- var axis, from, to, key, axes = plot.getAxes();
-
- for (var k in axes) {
- axis = axes[k];
- if (axis.direction == coord) {
- key = coord + axis.n + "axis";
- if (!ranges[key] && axis.n == 1)
- key = coord + "axis"; // support x1axis as xaxis
- if (ranges[key]) {
- from = ranges[key].from;
- to = ranges[key].to;
- break;
- }
- }
- }
-
- // backwards-compat stuff - to be removed in future
- if (!ranges[key]) {
- axis = coord == "x" ? plot.getXAxes()[0] : plot.getYAxes()[0];
- from = ranges[coord + "1"];
- to = ranges[coord + "2"];
- }
-
- // auto-reverse as an added bonus
- if (from != null && to != null && from > to) {
- var tmp = from;
- from = to;
- to = tmp;
- }
-
- return { from: from, to: to, axis: axis };
- }
-
- function setSelection(ranges, preventEvent) {
- var axis, range, o = plot.getOptions();
-
- if (o.selection.mode == "y") {
- selection.first.x = 0;
- selection.second.x = plot.width();
- }
- else {
- range = extractRange(ranges, "x");
-
- selection.first.x = range.axis.p2c(range.from);
- selection.second.x = range.axis.p2c(range.to);
- }
-
- if (o.selection.mode == "x") {
- selection.first.y = 0;
- selection.second.y = plot.height();
- }
- else {
- range = extractRange(ranges, "y");
-
- selection.first.y = range.axis.p2c(range.from);
- selection.second.y = range.axis.p2c(range.to);
- }
-
- selection.show = true;
- plot.triggerRedrawOverlay();
- if (!preventEvent && selectionIsSane())
- triggerSelectedEvent();
- }
-
- function selectionIsSane() {
- var minSize = plot.getOptions().selection.minSize;
- return Math.abs(selection.second.x - selection.first.x) >= minSize &&
- Math.abs(selection.second.y - selection.first.y) >= minSize;
- }
-
- plot.clearSelection = clearSelection;
- plot.setSelection = setSelection;
- plot.getSelection = getSelection;
-
- plot.hooks.bindEvents.push(function(plot, eventHolder) {
- var o = plot.getOptions();
- if (o.selection.mode != null) {
- eventHolder.mousemove(onMouseMove);
- eventHolder.mousedown(onMouseDown);
- }
- });
-
-
- plot.hooks.drawOverlay.push(function (plot, ctx) {
- // draw selection
- if (selection.show && selectionIsSane()) {
- var plotOffset = plot.getPlotOffset();
- var o = plot.getOptions();
-
- ctx.save();
- ctx.translate(plotOffset.left, plotOffset.top);
-
- var c = $.color.parse(o.selection.color);
-
- ctx.strokeStyle = c.scale('a', 0.8).toString();
- ctx.lineWidth = 1;
- ctx.lineJoin = o.selection.shape;
- ctx.fillStyle = c.scale('a', 0.4).toString();
-
- var x = Math.min(selection.first.x, selection.second.x) + 0.5,
- y = Math.min(selection.first.y, selection.second.y) + 0.5,
- w = Math.abs(selection.second.x - selection.first.x) - 1,
- h = Math.abs(selection.second.y - selection.first.y) - 1;
-
- ctx.fillRect(x, y, w, h);
- ctx.strokeRect(x, y, w, h);
-
- ctx.restore();
- }
- });
-
- plot.hooks.shutdown.push(function (plot, eventHolder) {
- eventHolder.unbind("mousemove", onMouseMove);
- eventHolder.unbind("mousedown", onMouseDown);
-
- if (mouseUpHandler)
- $(document).unbind("mouseup", mouseUpHandler);
- });
-
- }
-
- $.plot.plugins.push({
- init: init,
- options: {
- selection: {
- mode: null, // one of null, "x", "y" or "xy"
- color: "#e8cfac",
- shape: "round", // one of "round", "miter", or "bevel"
- minSize: 5 // minimum number of pixels
- }
- },
- name: 'selection',
- version: '1.1'
- });
-})(jQuery);
diff --git a/htdocs/includes/jquery/plugins/flot/jquery.flot.selection.min.js b/htdocs/includes/jquery/plugins/flot/jquery.flot.selection.min.js
deleted file mode 100644
index a0154fbc5bb..00000000000
--- a/htdocs/includes/jquery/plugins/flot/jquery.flot.selection.min.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/* Javascript plotting library for jQuery, version 0.8.3.
-
-Copyright (c) 2007-2014 IOLA and Ole Laursen.
-Licensed under the MIT license.
-
-*/
-(function($){function init(plot){var selection={first:{x:-1,y:-1},second:{x:-1,y:-1},show:false,active:false};var savedhandlers={};var mouseUpHandler=null;function onMouseMove(e){if(selection.active){updateSelection(e);plot.getPlaceholder().trigger("plotselecting",[getSelection()])}}function onMouseDown(e){if(e.which!=1)return;document.body.focus();if(document.onselectstart!==undefined&&savedhandlers.onselectstart==null){savedhandlers.onselectstart=document.onselectstart;document.onselectstart=function(){return false}}if(document.ondrag!==undefined&&savedhandlers.ondrag==null){savedhandlers.ondrag=document.ondrag;document.ondrag=function(){return false}}setSelectionPos(selection.first,e);selection.active=true;mouseUpHandler=function(e){onMouseUp(e)};$(document).one("mouseup",mouseUpHandler)}function onMouseUp(e){mouseUpHandler=null;if(document.onselectstart!==undefined)document.onselectstart=savedhandlers.onselectstart;if(document.ondrag!==undefined)document.ondrag=savedhandlers.ondrag;selection.active=false;updateSelection(e);if(selectionIsSane())triggerSelectedEvent();else{plot.getPlaceholder().trigger("plotunselected",[]);plot.getPlaceholder().trigger("plotselecting",[null])}return false}function getSelection(){if(!selectionIsSane())return null;if(!selection.show)return null;var r={},c1=selection.first,c2=selection.second;$.each(plot.getAxes(),function(name,axis){if(axis.used){var p1=axis.c2p(c1[axis.direction]),p2=axis.c2p(c2[axis.direction]);r[name]={from:Math.min(p1,p2),to:Math.max(p1,p2)}}});return r}function triggerSelectedEvent(){var r=getSelection();plot.getPlaceholder().trigger("plotselected",[r]);if(r.xaxis&&r.yaxis)plot.getPlaceholder().trigger("selected",[{x1:r.xaxis.from,y1:r.yaxis.from,x2:r.xaxis.to,y2:r.yaxis.to}])}function clamp(min,value,max){return value"+Math.round(slice.percent)+"%
';
- print dolGetButtonTitle($langs->trans('NewCategory'), '', 'fa fa-plus-circle', $link);
- print "
";
+ $newcardbutton = '';
+ $newcardbutton .= dolGetButtonTitle($langs->trans('NewCategory'), '', 'fa fa-plus-circle', $link);
+ $newcardbutton .= '
';
}
@@ -311,6 +312,10 @@ if (! empty($user->rights->categorie->creer))
*/
print '';
+
+print load_fiche_titre($langs->trans("SubCats"), $newcardbutton);
+
+
print '';
print '
';
print '';
@@ -483,9 +492,10 @@ if ($type == Categorie::TYPE_PRODUCT)
print '
'; $param = '&limit='.$limit.'&id='.$id.'&type='.$type; $num = count($prods); $nbtotalofrecords = ''; $newcardbutton = ''; - print_barre_liste($langs->trans("ProductsAndServices"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, '', 0, $newcardbutton, '', $limit); + print_barre_liste($langs->trans("ProductsAndServices"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'products', 0, $newcardbutton, '', $limit); - print "\n";
+
+ print ''."\n";
print '
\n";
@@ -532,7 +536,9 @@ if ($type == Categorie::TYPE_PRODUCT)
if ($type == Categorie::TYPE_SUPPLIER)
{
- $socs = $object->getObjectsInCateg("supplier", 0, $limit, $offset);
+ $permission = $user->rights->societe->creer;
+
+ $socs = $object->getObjectsInCateg($type, 0, $limit, $offset);
if ($socs < 0)
{
dol_print_error($db, $socs->error, $socs->errors);
@@ -548,7 +554,7 @@ if ($type == Categorie::TYPE_SUPPLIER)
print '
'; $param = '&limit='.$limit.'&id='.$id.'&type='.$type; $num = count($socs); $nbtotalofrecords = ''; $newcardbutton = ''; - print_barre_liste($langs->trans("Suppliers"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, '', 0, $newcardbutton, '', $limit); + print_barre_liste($langs->trans("Suppliers"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'companies', 0, $newcardbutton, '', $limit); print ''."\n";
print '
\n";
@@ -597,7 +597,9 @@ if ($type == Categorie::TYPE_SUPPLIER)
if ($type == Categorie::TYPE_CUSTOMER)
{
- $socs = $object->getObjectsInCateg("customer", 0, $limit, $offset);
+ $permission = $user->rights->societe->creer;
+
+ $socs = $object->getObjectsInCateg($type, 0, $limit, $offset);
if ($socs < 0)
{
dol_print_error($db, $socs->error, $socs->errors);
@@ -613,7 +615,7 @@ if ($type == Categorie::TYPE_CUSTOMER)
print '
'; $param = '&limit='.$limit.'&id='.$id.'&type='.$type; $num = count($socs); $nbtotalofrecords = ''; $newcardbutton = ''; - print_barre_liste($langs->trans("Customers"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, '', 0, $newcardbutton, '', $limit); + print_barre_liste($langs->trans("Customers"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'companies', 0, $newcardbutton, '', $limit); print ''."\n";
print '
\n";
@@ -664,7 +660,9 @@ if ($type == Categorie::TYPE_MEMBER)
{
require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
- $prods = $object->getObjectsInCateg("member", 0, $limit, $offset);
+ $permission = $user->rights->adherent->creer;
+
+ $prods = $object->getObjectsInCateg($type, 0, $limit, $offset);
if ($prods < 0)
{
dol_print_error($db, $prods->error, $prods->errors);
@@ -680,7 +678,7 @@ if ($type == Categorie::TYPE_MEMBER)
print '
'; $param = '&limit='.$limit.'&id='.$id.'&type='.$type; $num = count($prods); $nbtotalofrecords = ''; $newcardbutton = ''; - print_barre_liste($langs->trans("Member"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, '', 0, $newcardbutton, '', $limit); + print_barre_liste($langs->trans("Member"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'adherents', 0, $newcardbutton, '', $limit); print "\n";
print '
\n";
@@ -731,7 +723,9 @@ if ($type == Categorie::TYPE_MEMBER)
// Categorie contact
if ($type == Categorie::TYPE_CONTACT)
{
- $contacts = $object->getObjectsInCateg("contact", 0, $limit, $offset);
+ $permission = $user->rights->societe->creer;
+
+ $contacts = $object->getObjectsInCateg($type, 0, $limit, $offset);
if ($contacts < 0)
{
dol_print_error($db, $contacts->error, $contacts->errors);
@@ -746,8 +740,11 @@ if ($type == Categorie::TYPE_CONTACT)
print '';
print '
'; - $param = '&limit='.$limit.'&id='.$id.'&type='.$type; $num = count($contacts); $nbtotalofrecords = ''; $newcardbutton = ''; - print_barre_liste($langs->trans("Contact"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, '', 0, $newcardbutton, '', $limit); + $param = '&limit='.$limit.'&id='.$id.'&type='.$type; + $num = count($contacts); + $nbtotalofrecords = ''; + $newcardbutton = ''; + print_barre_liste($langs->trans("Contact"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'contacts', 0, $newcardbutton, '', $limit); print ''."\n";
print '
\n";
@@ -798,7 +789,9 @@ if ($type == Categorie::TYPE_ACCOUNT)
{
require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
- $accounts = $object->getObjectsInCateg("account", 0, $limit, $offset);
+ $permission = $user->rights->banque->creer;
+
+ $accounts = $object->getObjectsInCateg($type, 0, $limit, $offset);
if ($accounts < 0)
{
dol_print_error($db, $accounts->error, $accounts->errors);
@@ -814,7 +807,7 @@ if ($type == Categorie::TYPE_ACCOUNT)
print '
'; $param = '&limit='.$limit.'&id='.$id.'&type='.$type; $num = count($accounts); $nbtotalofrecords = ''; $newcardbutton = ''; - print_barre_liste($langs->trans("Account"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, '', 0, $newcardbutton, '', $limit); + print_barre_liste($langs->trans("Account"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'account', 0, $newcardbutton, '', $limit); print "\n";
print '
\n";
@@ -866,8 +853,10 @@ if ($type == Categorie::TYPE_PROJECT)
{
require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
- $projects = $object->getObjectsInCateg("project", 0, $limit, $offset);
- if ($projects < 0)
+ $permission = $user->rights->projet->creer;
+
+ $objects = $object->getObjectsInCateg($type, 0, $limit, $offset);
+ if ($objects < 0)
{
dol_print_error($db, $object->error, $object->errors);
}
@@ -881,16 +870,17 @@ if ($type == Categorie::TYPE_PROJECT)
print '';
print '
'; - $param = '&limit='.$limit.'&id='.$id.'&type='.$type; $num = count($projects); $nbtotalofrecords = ''; $newcardbutton = ''; - print_barre_liste($langs->trans("Project"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, '', 0, $newcardbutton, '', $limit); + $param = '&limit='.$limit.'&id='.$id.'&type='.$type; $num = count($objects); $nbtotalofrecords = ''; $newcardbutton = ''; + + print_barre_liste($langs->trans("Project"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'projects', 0, $newcardbutton, '', $limit); print "\n";
print '
\n";
@@ -934,14 +918,25 @@ if ($type == Categorie::TYPE_USER)
{
require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
- $users = $object->getObjectsInCateg("user");
+ $users = $object->getObjectsInCateg($type);
if ($users < 0)
{
dol_print_error($db, $object->error, $object->errors);
}
else
{
- print "
"; + print ''."\n"; } } + +// List of Project +if ($type == Categorie::TYPE_WAREHOUSE) +{ + $permission = $user->rights->stock->creer; + + require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php'; + + $objects = $object->getObjectsInCateg($type, 0, $limit, $offset); + if ($objects < 0) + { + dol_print_error($db, $object->error, $object->errors); + } + else + { + print ''."\n"; + } +} + + // End of page llxFooter(); $db->close(); diff --git a/htdocs/langs/en_US/categories.lang b/htdocs/langs/en_US/categories.lang index 1ec9b5bd409..30bace0574c 100644 --- a/htdocs/langs/en_US/categories.lang +++ b/htdocs/langs/en_US/categories.lang @@ -63,13 +63,7 @@ AccountsCategoriesShort=Accounts tags/categories ProjectsCategoriesShort=Projects tags/categories UsersCategoriesShort=Users tags/categories StockCategoriesShort=Warehouse tags/categories -ThisCategoryHasNoProduct=This category does not contain any product. -ThisCategoryHasNoSupplier=This category does not contain any vendor. -ThisCategoryHasNoCustomer=This category does not contain any customer. -ThisCategoryHasNoMember=This category does not contain any member. -ThisCategoryHasNoContact=This category does not contain any contact. -ThisCategoryHasNoAccount=This category does not contain any account. -ThisCategoryHasNoProject=This category does not contain any project. +ThisCategoryHasNoItems=This category does not contain any items. CategId=Tag/category id CatSupList=List of vendor tags/categories CatCusList=List of customer/prospect tags/categories From a55d1fca0aa22aa6ef18df7e23a1ebba01829407 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
Date: Thu, 2 Apr 2020 14:33:49 +0200
Subject: [PATCH 059/336] Update list.php
---
htdocs/user/list.php | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index c82420c3337..f779818140f 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -201,7 +201,7 @@ $sql = "SELECT DISTINCT u.rowid, u.lastname, u.firstname, u.admin, u.fk_soc, u.l
$sql .= " u.datelastlogin, u.datepreviouslogin,";
$sql .= " u.ldap_sid, u.statut, u.entity,";
$sql .= " u.tms as date_update, u.datec as date_creation,";
-$sql .= " u2.rowid as id2, u2.login as login2, u2.firstname as firstname2, u2.lastname as lastname2, u2.admin as admin2, u2.fk_soc as fk_soc2, u2.email as email2, u2.gender as gender2, u2.photo as photo2, u2.entity as entity2,";
+$sql .= " u2.rowid as id2, u2.login as login2, u2.firstname as firstname2, u2.lastname as lastname2, u2.admin as admin2, u2.fk_soc as fk_soc2, u2.email as email2, u2.gender as gender2, u2.photo as photo2, u2.entity as entity2, u2.statut as statut2,";
$sql .= " s.nom as name, s.canvas";
// Add fields from extrafields
if (!empty($extrafields->attributes[$object->table_element]['label'])) {
@@ -625,6 +625,7 @@ while ($i < min($num, $limit))
$user2->admin = $obj->admin2;
$user2->email = $obj->email2;
$user2->socid = $obj->fk_soc2;
+ $user2->statut = $obj->statut2;
print $user2->getNomUrl(-1, '', 0, 0, 24, 0, '', '', 1);
if (!empty($conf->multicompany->enabled) && $obj->admin2 && !$obj->entity2)
{
From b8c2dd6025eee54a8cf2531e2c092bf88e167498 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur
Date: Thu, 2 Apr 2020 15:11:46 +0200
Subject: [PATCH 060/336] Look and feel v12
---
.../class/accountingaccount.class.php | 2 +-
.../class/accountingjournal.class.php | 2 +-
htdocs/categories/viewcat.php | 8 ++--
htdocs/compta/bank/bankentries_list.php | 10 ++--
htdocs/compta/bank/categ.php | 2 +-
htdocs/compta/bank/line.php | 4 +-
htdocs/compta/bank/list.php | 48 ++++++++++---------
7 files changed, 39 insertions(+), 37 deletions(-)
diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php
index 794ce3c8e7c..ff1e7ff8b72 100644
--- a/htdocs/accountancy/class/accountingaccount.class.php
+++ b/htdocs/accountancy/class/accountingaccount.class.php
@@ -507,7 +507,7 @@ class AccountingAccount extends CommonObject
}
$label_link = length_accountg($this->account_number);
- if ($withlabel) $label_link .= ' - ' . $labeltoshow;
+ if ($withlabel) $label_link .= ' - ' . ($nourl ? '' : '').$labeltoshow.($nourl ? '' : '');
if ($withpicto) $result.=($linkstart.img_object(($notooltip?'':$label), $picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend);
if ($withpicto && $withpicto != 2) $result .= ' ';
diff --git a/htdocs/accountancy/class/accountingjournal.class.php b/htdocs/accountancy/class/accountingjournal.class.php
index 1191187a139..727e68346fa 100644
--- a/htdocs/accountancy/class/accountingjournal.class.php
+++ b/htdocs/accountancy/class/accountingjournal.class.php
@@ -266,7 +266,7 @@ class AccountingJournal extends CommonObject
}
$label_link = $this->code;
- if ($withlabel) $label_link .= ' - '.$langs->transnoentities($this->label);
+ if ($withlabel) $label_link .= ' - '.($nourl ? '' : '').$langs->transnoentities($this->label).($nourl ? '' : '');
$result .= $linkstart;
if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index a61d29b6a48..dd45d7e59fe 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -1,6 +1,6 @@
- * Copyright (C) 2006-2015 Laurent Destailleur
+ * Copyright (C) 2006-2020 Laurent Destailleur
* Copyright (C) 2007 Patrick Raguin
* Copyright (C) 2005-2012 Regis Houssin
* Copyright (C) 2015 Raphaël Doursenaud
@@ -678,7 +678,7 @@ if ($type == Categorie::TYPE_MEMBER)
print '
'; $param = '&limit='.$limit.'&id='.$id.'&type='.$type; $num = count($prods); $nbtotalofrecords = ''; $newcardbutton = ''; - print_barre_liste($langs->trans("Member"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'adherents', 0, $newcardbutton, '', $limit); + print_barre_liste($langs->trans("Member"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'members', 0, $newcardbutton, '', $limit); print "\n";
print '\n";
print '\n";
print '
'; - } - - $familytext = empty($familyinfo[$familykey]['label']) ? $familykey : $familyinfo[$familykey]['label']; - print load_fiche_titre($familytext, '', ''); - - if (! empty($conf->global->MAIN_USE_KANBAN_FOR_MODULES)) { - print '
\n";
+ print '';
+ }
+ }
+
+ dol_fiche_end();
+
+ print '
'; + + // Show warning about external users + print info_admin(showModulesExludedForExternal($modules))."\n"; + + print ''; } if ($mode == 'marketplace') { - dol_fiche_head($head, $mode, '', -1); + dol_fiche_head($head, $mode, '', -1); - // Marketplace - print '
'; + print '
'; - if (empty($conf->global->MAIN_DISABLE_DOLISTORE_SEARCH) && $conf->global->MAIN_FEATURES_LEVEL >= 1) - { - // $options is array with filter criterias - //var_dump($options); - $dolistore->getRemoteCategories(); - $dolistore->getRemoteProducts($options); + if (empty($conf->global->MAIN_DISABLE_DOLISTORE_SEARCH) && $conf->global->MAIN_FEATURES_LEVEL >= 1) + { + // $options is array with filter criterias + //var_dump($options); + $dolistore->getRemoteCategories(); + $dolistore->getRemoteProducts($options); - print ''.$langs->trans('DOLISTOREdescriptionLong').'
'; + print ''.$langs->trans('DOLISTOREdescriptionLong').'
'; - $previouslink = $dolistore->get_previous_link(); - $nextlink = $dolistore->get_next_link(); + $previouslink = $dolistore->get_previous_link(); + $nextlink = $dolistore->get_next_link(); - print '';
+ print '';
- ?>
+ ?>
global->MAIN_UPLOAD_DOC))
{
- if ($user->admin)
- {
- $langs->load('other');
- print ' ';
- print info_admin($langs->trans("ThisLimitIsDefinedInSetup", $max, $maxphptoshow, $maxphptoshowparam), 1);
- }
+ if ($user->admin)
+ {
+ $langs->load('other');
+ print ' ';
+ print info_admin($langs->trans("ThisLimitIsDefinedInSetup", $max, $maxphptoshow, $maxphptoshowparam), 1);
+ }
}
else
{
- print ' ('.$langs->trans("UploadDisabled").')';
+ print ' ('.$langs->trans("UploadDisabled").')';
}
print '';
diff --git a/htdocs/core/lib/modulebuilder.lib.php b/htdocs/core/lib/modulebuilder.lib.php
index 6ea1d949833..b9a958160d4 100644
--- a/htdocs/core/lib/modulebuilder.lib.php
+++ b/htdocs/core/lib/modulebuilder.lib.php
@@ -39,165 +39,165 @@
*/
function rebuildObjectClass($destdir, $module, $objectname, $newmask, $readdir = '', $addfieldentry = array(), $delfieldentry = '')
{
- global $db, $langs;
+ global $db, $langs;
- if (empty($objectname)) return -1;
- if (empty($readdir)) $readdir = $destdir;
+ if (empty($objectname)) return -1;
+ if (empty($readdir)) $readdir = $destdir;
- if (!empty($addfieldentry['arrayofkeyval']) && !is_array($addfieldentry['arrayofkeyval']))
- {
- dol_print_error('', 'Bad parameter addfieldentry with a property arrayofkeyval defined but that is not an array.');
- return -1;
- }
+ if (!empty($addfieldentry['arrayofkeyval']) && !is_array($addfieldentry['arrayofkeyval']))
+ {
+ dol_print_error('', 'Bad parameter addfieldentry with a property arrayofkeyval defined but that is not an array.');
+ return -1;
+ }
- // Check parameters
- if (count($addfieldentry) > 0)
- {
- if (empty($addfieldentry['name']))
- {
- setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("Name")), null, 'errors');
- return -2;
- }
- if (empty($addfieldentry['label']))
- {
- setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("Label")), null, 'errors');
- return -2;
- }
- if (!preg_match('/^(integer|price|sellist|varchar|double|text|html|duration)/', $addfieldentry['type'])
- && !preg_match('/^(boolean|real|date|datetime|timestamp)$/', $addfieldentry['type']))
- {
- setEventMessages($langs->trans('BadValueForType', $objectname), null, 'errors');
- return -2;
- }
- }
+ // Check parameters
+ if (count($addfieldentry) > 0)
+ {
+ if (empty($addfieldentry['name']))
+ {
+ setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("Name")), null, 'errors');
+ return -2;
+ }
+ if (empty($addfieldentry['label']))
+ {
+ setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("Label")), null, 'errors');
+ return -2;
+ }
+ if (!preg_match('/^(integer|price|sellist|varchar|double|text|html|duration)/', $addfieldentry['type'])
+ && !preg_match('/^(boolean|real|date|datetime|timestamp)$/', $addfieldentry['type']))
+ {
+ setEventMessages($langs->trans('BadValueForType', $objectname), null, 'errors');
+ return -2;
+ }
+ }
- $pathoffiletoeditsrc = $readdir.'/class/'.strtolower($objectname).'.class.php';
- $pathoffiletoedittarget = $destdir.'/class/'.strtolower($objectname).'.class.php'.($readdir != $destdir ? '.new' : '');
- if (!dol_is_file($pathoffiletoeditsrc))
- {
- $langs->load("errors");
- setEventMessages($langs->trans("ErrorFileNotFound", $pathoffiletoeditsrc), null, 'errors');
- return -3;
- }
+ $pathoffiletoeditsrc = $readdir.'/class/'.strtolower($objectname).'.class.php';
+ $pathoffiletoedittarget = $destdir.'/class/'.strtolower($objectname).'.class.php'.($readdir != $destdir ? '.new' : '');
+ if (!dol_is_file($pathoffiletoeditsrc))
+ {
+ $langs->load("errors");
+ setEventMessages($langs->trans("ErrorFileNotFound", $pathoffiletoeditsrc), null, 'errors');
+ return -3;
+ }
- //$pathoffiletoedittmp=$destdir.'/class/'.strtolower($objectname).'.class.php.tmp';
- //dol_delete_file($pathoffiletoedittmp, 0, 1, 1);
+ //$pathoffiletoedittmp=$destdir.'/class/'.strtolower($objectname).'.class.php.tmp';
+ //dol_delete_file($pathoffiletoedittmp, 0, 1, 1);
- try
- {
- include_once $pathoffiletoeditsrc;
- if (class_exists($objectname)) $object = new $objectname($db);
- else return -4;
+ try
+ {
+ include_once $pathoffiletoeditsrc;
+ if (class_exists($objectname)) $object = new $objectname($db);
+ else return -4;
- // Backup old file
- dol_copy($pathoffiletoedittarget, $pathoffiletoedittarget.'.back', $newmask, 1);
+ // Backup old file
+ dol_copy($pathoffiletoedittarget, $pathoffiletoedittarget.'.back', $newmask, 1);
- // Edit class files
- $contentclass = file_get_contents(dol_osencode($pathoffiletoeditsrc), 'r');
+ // Edit class files
+ $contentclass = file_get_contents(dol_osencode($pathoffiletoeditsrc), 'r');
- // Update ->fields (add or remove entries)
- if (count($object->fields))
- {
- if (is_array($addfieldentry) && count($addfieldentry))
- {
+ // Update ->fields (add or remove entries)
+ if (count($object->fields))
+ {
+ if (is_array($addfieldentry) && count($addfieldentry))
+ {
$name = $addfieldentry['name'];
- unset($addfieldentry['name']);
+ unset($addfieldentry['name']);
- $object->fields[$name] = $addfieldentry;
- }
- if (!empty($delfieldentry))
- {
- $name = $delfieldentry;
- unset($object->fields[$name]);
- }
- }
+ $object->fields[$name] = $addfieldentry;
+ }
+ if (!empty($delfieldentry))
+ {
+ $name = $delfieldentry;
+ unset($object->fields[$name]);
+ }
+ }
- dol_sort_array($object->fields, 'position');
+ dol_sort_array($object->fields, 'position');
- $i = 0;
- $texttoinsert = '// BEGIN MODULEBUILDER PROPERTIES'."\n";
- $texttoinsert .= "\t".'/**'."\n";
- $texttoinsert .= "\t".' * @var array Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.'."\n";
- $texttoinsert .= "\t".' */'."\n";
- $texttoinsert .= "\t".'public $fields=array('."\n";
+ $i = 0;
+ $texttoinsert = '// BEGIN MODULEBUILDER PROPERTIES'."\n";
+ $texttoinsert .= "\t".'/**'."\n";
+ $texttoinsert .= "\t".' * @var array Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.'."\n";
+ $texttoinsert .= "\t".' */'."\n";
+ $texttoinsert .= "\t".'public $fields=array('."\n";
- if (count($object->fields))
- {
- foreach ($object->fields as $key => $val)
- {
- $i++;
- $texttoinsert .= "\t\t'".$key."' => array('type'=>'".$val['type']."', 'label'=>'".$val['label']."',";
- $texttoinsert .= " 'enabled'=>".($val['enabled'] !== '' ? $val['enabled'] : 1).",";
- $texttoinsert .= " 'position'=>".($val['position'] !== '' ? $val['position'] : 50).",";
- $texttoinsert .= " 'notnull'=>".(empty($val['notnull']) ? 0 : $val['notnull']).",";
- $texttoinsert .= " 'visible'=>".($val['visible'] !== '' ? $val['visible'] : -1).",";
- if ($val['noteditable']) $texttoinsert .= " 'noteditable'=>'".$val['noteditable']."',";
- if ($val['default']) $texttoinsert .= " 'default'=>'".$val['default']."',";
- if ($val['index']) $texttoinsert .= " 'index'=>".$val['index'].",";
- if ($val['foreignkey']) $texttoinsert .= " 'foreignkey'=>'".$val['foreignkey']."',";
- if ($val['searchall']) $texttoinsert .= " 'searchall'=>".$val['searchall'].",";
- if ($val['isameasure']) $texttoinsert .= " 'isameasure'=>'".$val['isameasure']."',";
- if ($val['css']) $texttoinsert .= " 'css'=>'".$val['css']."',";
- if ($val['help']) $texttoinsert .= " 'help'=>\"".preg_replace('/"/', '', $val['help'])."\",";
- if ($val['showoncombobox']) $texttoinsert .= " 'showoncombobox'=>'".$val['showoncombobox']."',";
- if ($val['disabled']) $texttoinsert .= " 'disabled'=>'".$val['disabled']."',";
- if ($val['arrayofkeyval'])
- {
- $texttoinsert .= " 'arrayofkeyval'=>array(";
- $i = 0;
- foreach ($val['arrayofkeyval'] as $key2 => $val2)
- {
- if ($i) $texttoinsert .= ", ";
- $texttoinsert .= "'".$key2."'=>'".$val2."'";
- $i++;
- }
- $texttoinsert .= "),";
- }
- if ($val['comment']) $texttoinsert .= " 'comment'=>\"".preg_replace('/"/', '', $val['comment'])."\"";
+ if (count($object->fields))
+ {
+ foreach ($object->fields as $key => $val)
+ {
+ $i++;
+ $texttoinsert .= "\t\t'".$key."' => array('type'=>'".$val['type']."', 'label'=>'".$val['label']."',";
+ $texttoinsert .= " 'enabled'=>".($val['enabled'] !== '' ? $val['enabled'] : 1).",";
+ $texttoinsert .= " 'position'=>".($val['position'] !== '' ? $val['position'] : 50).",";
+ $texttoinsert .= " 'notnull'=>".(empty($val['notnull']) ? 0 : $val['notnull']).",";
+ $texttoinsert .= " 'visible'=>".($val['visible'] !== '' ? $val['visible'] : -1).",";
+ if ($val['noteditable']) $texttoinsert .= " 'noteditable'=>'".$val['noteditable']."',";
+ if ($val['default']) $texttoinsert .= " 'default'=>'".$val['default']."',";
+ if ($val['index']) $texttoinsert .= " 'index'=>".$val['index'].",";
+ if ($val['foreignkey']) $texttoinsert .= " 'foreignkey'=>'".$val['foreignkey']."',";
+ if ($val['searchall']) $texttoinsert .= " 'searchall'=>".$val['searchall'].",";
+ if ($val['isameasure']) $texttoinsert .= " 'isameasure'=>'".$val['isameasure']."',";
+ if ($val['css']) $texttoinsert .= " 'css'=>'".$val['css']."',";
+ if ($val['help']) $texttoinsert .= " 'help'=>\"".preg_replace('/"/', '', $val['help'])."\",";
+ if ($val['showoncombobox']) $texttoinsert .= " 'showoncombobox'=>'".$val['showoncombobox']."',";
+ if ($val['disabled']) $texttoinsert .= " 'disabled'=>'".$val['disabled']."',";
+ if ($val['arrayofkeyval'])
+ {
+ $texttoinsert .= " 'arrayofkeyval'=>array(";
+ $i = 0;
+ foreach ($val['arrayofkeyval'] as $key2 => $val2)
+ {
+ if ($i) $texttoinsert .= ", ";
+ $texttoinsert .= "'".$key2."'=>'".$val2."'";
+ $i++;
+ }
+ $texttoinsert .= "),";
+ }
+ if ($val['comment']) $texttoinsert .= " 'comment'=>\"".preg_replace('/"/', '', $val['comment'])."\"";
- $texttoinsert .= "),\n";
- }
- }
+ $texttoinsert .= "),\n";
+ }
+ }
- $texttoinsert .= "\t".');'."\n";
+ $texttoinsert .= "\t".');'."\n";
//print ($texttoinsert);exit;
- if (count($object->fields))
- {
- //$typetotypephp=array('integer'=>'integer', 'duration'=>'integer', 'varchar'=>'string');
+ if (count($object->fields))
+ {
+ //$typetotypephp=array('integer'=>'integer', 'duration'=>'integer', 'varchar'=>'string');
- foreach ($object->fields as $key => $val)
- {
- $i++;
- //$typephp=$typetotypephp[$val['type']];
- $texttoinsert .= "\t".'public $'.$key.";";
- //if ($key == 'rowid') $texttoinsert.= ' AUTO_INCREMENT PRIMARY KEY';
- //if ($key == 'entity') $texttoinsert.= ' DEFAULT 1';
- //$texttoinsert.= ($val['notnull']?' NOT NULL':'');
- //if ($i < count($object->fields)) $texttoinsert.=";";
- $texttoinsert .= "\n";
- }
- }
+ foreach ($object->fields as $key => $val)
+ {
+ $i++;
+ //$typephp=$typetotypephp[$val['type']];
+ $texttoinsert .= "\t".'public $'.$key.";";
+ //if ($key == 'rowid') $texttoinsert.= ' AUTO_INCREMENT PRIMARY KEY';
+ //if ($key == 'entity') $texttoinsert.= ' DEFAULT 1';
+ //$texttoinsert.= ($val['notnull']?' NOT NULL':'');
+ //if ($i < count($object->fields)) $texttoinsert.=";";
+ $texttoinsert .= "\n";
+ }
+ }
- $texttoinsert .= "\t".'// END MODULEBUILDER PROPERTIES';
+ $texttoinsert .= "\t".'// END MODULEBUILDER PROPERTIES';
- //print($texttoinsert);exit;
+ //print($texttoinsert);exit;
- $contentclass = preg_replace('/\/\/ BEGIN MODULEBUILDER PROPERTIES.*END MODULEBUILDER PROPERTIES/ims', $texttoinsert, $contentclass);
+ $contentclass = preg_replace('/\/\/ BEGIN MODULEBUILDER PROPERTIES.*END MODULEBUILDER PROPERTIES/ims', $texttoinsert, $contentclass);
- dol_mkdir(dirname($pathoffiletoedittarget));
+ dol_mkdir(dirname($pathoffiletoedittarget));
- //file_put_contents($pathoffiletoedittmp, $contentclass);
- file_put_contents(dol_osencode($pathoffiletoedittarget), $contentclass);
- @chmod($pathoffiletoedittarget, octdec($newmask));
+ //file_put_contents($pathoffiletoedittmp, $contentclass);
+ file_put_contents(dol_osencode($pathoffiletoedittarget), $contentclass);
+ @chmod($pathoffiletoedittarget, octdec($newmask));
- return $object;
- }
- catch (Exception $e)
- {
- print $e->getMessage();
- return -5;
- }
+ return $object;
+ }
+ catch (Exception $e)
+ {
+ print $e->getMessage();
+ return -5;
+ }
}
/**
@@ -214,134 +214,134 @@ function rebuildObjectClass($destdir, $module, $objectname, $newmask, $readdir =
*/
function rebuildObjectSql($destdir, $module, $objectname, $newmask, $readdir = '', $object = null)
{
- global $db, $langs;
+ global $db, $langs;
- $error = 0;
+ $error = 0;
- if (empty($objectname)) return -1;
- if (empty($readdir)) $readdir = $destdir;
+ if (empty($objectname)) return -1;
+ if (empty($readdir)) $readdir = $destdir;
- $pathoffiletoclasssrc = $readdir.'/class/'.strtolower($objectname).'.class.php';
+ $pathoffiletoclasssrc = $readdir.'/class/'.strtolower($objectname).'.class.php';
- // Edit .sql file
- $pathoffiletoeditsrc = $readdir.'/sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.sql';
- $pathoffiletoedittarget = $destdir.'/sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.sql'.($readdir != $destdir ? '.new' : '');
+ // Edit .sql file
+ $pathoffiletoeditsrc = $readdir.'/sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.sql';
+ $pathoffiletoedittarget = $destdir.'/sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.sql'.($readdir != $destdir ? '.new' : '');
if (!dol_is_file($pathoffiletoeditsrc))
- {
- $langs->load("errors");
- setEventMessages($langs->trans("ErrorFileNotFound", $pathoffiletoeditsrc), null, 'errors');
- return -1;
- }
+ {
+ $langs->load("errors");
+ setEventMessages($langs->trans("ErrorFileNotFound", $pathoffiletoeditsrc), null, 'errors');
+ return -1;
+ }
- // Load object from myobject.class.php
- try
- {
- if (!is_object($object))
- {
- include_once $pathoffiletoclasssrc;
- if (class_exists($objectname)) $object = new $objectname($db);
- else return -1;
- }
- }
- catch (Exception $e)
- {
- print $e->getMessage();
- }
+ // Load object from myobject.class.php
+ try
+ {
+ if (!is_object($object))
+ {
+ include_once $pathoffiletoclasssrc;
+ if (class_exists($objectname)) $object = new $objectname($db);
+ else return -1;
+ }
+ }
+ catch (Exception $e)
+ {
+ print $e->getMessage();
+ }
- // Backup old file
- dol_copy($pathoffiletoedittarget, $pathoffiletoedittarget.'.back', $newmask, 1);
+ // Backup old file
+ dol_copy($pathoffiletoedittarget, $pathoffiletoedittarget.'.back', $newmask, 1);
- $contentsql = file_get_contents(dol_osencode($pathoffiletoeditsrc), 'r');
+ $contentsql = file_get_contents(dol_osencode($pathoffiletoeditsrc), 'r');
- $i = 0;
- $texttoinsert = '-- BEGIN MODULEBUILDER FIELDS'."\n";
- if (count($object->fields))
- {
- foreach ($object->fields as $key => $val)
- {
- $i++;
+ $i = 0;
+ $texttoinsert = '-- BEGIN MODULEBUILDER FIELDS'."\n";
+ if (count($object->fields))
+ {
+ foreach ($object->fields as $key => $val)
+ {
+ $i++;
- $type = $val['type'];
- $type = preg_replace('/:.*$/', '', $type); // For case type = 'integer:Societe:societe/class/societe.class.php'
+ $type = $val['type'];
+ $type = preg_replace('/:.*$/', '', $type); // For case type = 'integer:Societe:societe/class/societe.class.php'
- if ($type == 'html') $type = 'text'; // html modulebuilder type is a text type in database
- elseif ($type == 'price') $type = 'double'; // html modulebuilder type is a text type in database
- elseif (in_array($type, array('link', 'sellist', 'duration'))) $type = 'integer';
- $texttoinsert .= "\t".$key." ".$type;
- if ($key == 'rowid') $texttoinsert .= ' AUTO_INCREMENT PRIMARY KEY';
- if ($key == 'entity') $texttoinsert .= ' DEFAULT 1';
- else
- {
- if ($val['default'] != '')
- {
- if (preg_match('/^null$/i', $val['default'])) $texttoinsert .= " DEFAULT NULL";
- elseif (preg_match('/varchar/', $type)) $texttoinsert .= " DEFAULT '".$db->escape($val['default'])."'";
- else $texttoinsert .= (($val['default'] > 0) ? ' DEFAULT '.$val['default'] : '');
- }
- }
- $texttoinsert .= (($val['notnull'] > 0) ? ' NOT NULL' : '');
- if ($i < count($object->fields)) $texttoinsert .= ", ";
- $texttoinsert .= "\n";
- }
- }
- $texttoinsert .= "\t".'-- END MODULEBUILDER FIELDS';
+ if ($type == 'html') $type = 'text'; // html modulebuilder type is a text type in database
+ elseif ($type == 'price') $type = 'double'; // html modulebuilder type is a text type in database
+ elseif (in_array($type, array('link', 'sellist', 'duration'))) $type = 'integer';
+ $texttoinsert .= "\t".$key." ".$type;
+ if ($key == 'rowid') $texttoinsert .= ' AUTO_INCREMENT PRIMARY KEY';
+ if ($key == 'entity') $texttoinsert .= ' DEFAULT 1';
+ else
+ {
+ if ($val['default'] != '')
+ {
+ if (preg_match('/^null$/i', $val['default'])) $texttoinsert .= " DEFAULT NULL";
+ elseif (preg_match('/varchar/', $type)) $texttoinsert .= " DEFAULT '".$db->escape($val['default'])."'";
+ else $texttoinsert .= (($val['default'] > 0) ? ' DEFAULT '.$val['default'] : '');
+ }
+ }
+ $texttoinsert .= (($val['notnull'] > 0) ? ' NOT NULL' : '');
+ if ($i < count($object->fields)) $texttoinsert .= ", ";
+ $texttoinsert .= "\n";
+ }
+ }
+ $texttoinsert .= "\t".'-- END MODULEBUILDER FIELDS';
- $contentsql = preg_replace('/-- BEGIN MODULEBUILDER FIELDS.*END MODULEBUILDER FIELDS/ims', $texttoinsert, $contentsql);
+ $contentsql = preg_replace('/-- BEGIN MODULEBUILDER FIELDS.*END MODULEBUILDER FIELDS/ims', $texttoinsert, $contentsql);
- $result = file_put_contents($pathoffiletoedittarget, $contentsql);
- if ($result)
- {
- @chmod($pathoffiletoedittarget, octdec($newmask));
- }
- else
- {
- $error++;
- }
+ $result = file_put_contents($pathoffiletoedittarget, $contentsql);
+ if ($result)
+ {
+ @chmod($pathoffiletoedittarget, octdec($newmask));
+ }
+ else
+ {
+ $error++;
+ }
- // Edit .key.sql file
- $pathoffiletoeditsrc = $destdir.'/sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.key.sql';
- $pathoffiletoedittarget = $destdir.'/sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.key.sql'.($readdir != $destdir ? '.new' : '');
+ // Edit .key.sql file
+ $pathoffiletoeditsrc = $destdir.'/sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.key.sql';
+ $pathoffiletoedittarget = $destdir.'/sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.key.sql'.($readdir != $destdir ? '.new' : '');
- $contentsql = file_get_contents(dol_osencode($pathoffiletoeditsrc), 'r');
+ $contentsql = file_get_contents(dol_osencode($pathoffiletoeditsrc), 'r');
- $i = 0;
- $texttoinsert = '-- BEGIN MODULEBUILDER INDEXES'."\n";
- if (count($object->fields))
- {
- foreach ($object->fields as $key => $val)
- {
- $i++;
- if (!empty($val['index']))
- {
- $texttoinsert .= "ALTER TABLE llx_".strtolower($module).'_'.strtolower($objectname)." ADD INDEX idx_".strtolower($module).'_'.strtolower($objectname)."_".$key." (".$key.");";
- $texttoinsert .= "\n";
- }
- if (!empty($val['foreignkey']))
- {
- $tmp = explode('.', $val['foreignkey']);
- if (!empty($tmp[0]) && !empty($tmp[1]))
- {
- $texttoinsert .= "ALTER TABLE llx_".strtolower($module).'_'.strtolower($objectname)." ADD CONSTRAINT llx_".strtolower($module).'_'.strtolower($objectname)."_".$key." FOREIGN KEY (".$key.") REFERENCES llx_".preg_replace('/^llx_/', '', $tmp[0])."(".$tmp[1].");";
- $texttoinsert .= "\n";
- }
- }
- }
- }
- $texttoinsert .= '-- END MODULEBUILDER INDEXES';
+ $i = 0;
+ $texttoinsert = '-- BEGIN MODULEBUILDER INDEXES'."\n";
+ if (count($object->fields))
+ {
+ foreach ($object->fields as $key => $val)
+ {
+ $i++;
+ if (!empty($val['index']))
+ {
+ $texttoinsert .= "ALTER TABLE llx_".strtolower($module).'_'.strtolower($objectname)." ADD INDEX idx_".strtolower($module).'_'.strtolower($objectname)."_".$key." (".$key.");";
+ $texttoinsert .= "\n";
+ }
+ if (!empty($val['foreignkey']))
+ {
+ $tmp = explode('.', $val['foreignkey']);
+ if (!empty($tmp[0]) && !empty($tmp[1]))
+ {
+ $texttoinsert .= "ALTER TABLE llx_".strtolower($module).'_'.strtolower($objectname)." ADD CONSTRAINT llx_".strtolower($module).'_'.strtolower($objectname)."_".$key." FOREIGN KEY (".$key.") REFERENCES llx_".preg_replace('/^llx_/', '', $tmp[0])."(".$tmp[1].");";
+ $texttoinsert .= "\n";
+ }
+ }
+ }
+ }
+ $texttoinsert .= '-- END MODULEBUILDER INDEXES';
- $contentsql = preg_replace('/-- BEGIN MODULEBUILDER INDEXES.*END MODULEBUILDER INDEXES/ims', $texttoinsert, $contentsql);
+ $contentsql = preg_replace('/-- BEGIN MODULEBUILDER INDEXES.*END MODULEBUILDER INDEXES/ims', $texttoinsert, $contentsql);
- dol_mkdir(dirname($pathoffiletoedittarget));
+ dol_mkdir(dirname($pathoffiletoedittarget));
- $result2 = file_put_contents($pathoffiletoedittarget, $contentsql);
- if ($result)
- {
- @chmod($pathoffiletoedittarget, octdec($newmask));
- }
- else
- {
- $error++;
- }
+ $result2 = file_put_contents($pathoffiletoedittarget, $contentsql);
+ if ($result)
+ {
+ @chmod($pathoffiletoedittarget, octdec($newmask));
+ }
+ else
+ {
+ $error++;
+ }
- return $error ? -1 : 1;
+ return $error ? -1 : 1;
}
diff --git a/htdocs/core/modules/bom/mod_bom_standard.php b/htdocs/core/modules/bom/mod_bom_standard.php
index 16df1dd0d92..40d082ace0f 100644
--- a/htdocs/core/modules/bom/mod_bom_standard.php
+++ b/htdocs/core/modules/bom/mod_bom_standard.php
@@ -30,9 +30,9 @@ require_once DOL_DOCUMENT_ROOT .'/core/modules/bom/modules_bom.php';
class mod_bom_standard extends ModeleNumRefboms
{
/**
- * Dolibarr version of the loaded document
- * @var string
- */
+ * Dolibarr version of the loaded document
+ * @var string
+ */
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
public $prefix='BOM';
@@ -48,16 +48,16 @@ class mod_bom_standard extends ModeleNumRefboms
public $name='standard';
- /**
- * Return description of numbering module
- *
- * @return string Text with description
- */
- public function info()
- {
- global $langs;
- return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
- }
+ /**
+ * Return description of numbering module
+ *
+ * @return string Text with description
+ */
+ public function info()
+ {
+ global $langs;
+ return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
+ }
/**
@@ -72,8 +72,8 @@ class mod_bom_standard extends ModeleNumRefboms
/**
- * Checks if the numbers already in the database do not
- * cause conflicts that would prevent this numbering working.
+ * Checks if the numbers already in the database do not
+ * cause conflicts that would prevent this numbering working.
*
* @return boolean false if conflict, true if ok
*/
@@ -140,8 +140,8 @@ class mod_bom_standard extends ModeleNumRefboms
$date=$object->date_creation;
$yymm = strftime("%y%m", $date);
- if ($max >= (pow(10, 4) - 1)) $num=$max+1; // If counter > 9999, we do not format on 4 chars, we take number as it is
- else $num = sprintf("%04s", $max+1);
+ if ($max >= (pow(10, 4) - 1)) $num=$max+1; // If counter > 9999, we do not format on 4 chars, we take number as it is
+ else $num = sprintf("%04s", $max+1);
dol_syslog("mod_bom_standard::getNextValue return ".$this->prefix.$yymm."-".$num);
return $this->prefix.$yymm."-".$num;
diff --git a/htdocs/core/modules/bom/modules_bom.php b/htdocs/core/modules/bom/modules_bom.php
index 2b150402fb0..86e072633ec 100644
--- a/htdocs/core/modules/bom/modules_bom.php
+++ b/htdocs/core/modules/bom/modules_bom.php
@@ -39,17 +39,17 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; // requir
abstract class ModelePDFBom extends CommonDocGenerator
{
- // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
- /**
- * Return list of active generation modules
- *
- * @param DoliDB $db Database handler
- * @param integer $maxfilenamelength Max length of value to show
- * @return array List of templates
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+ /**
+ * Return list of active generation modules
+ *
+ * @param DoliDB $db Database handler
+ * @param integer $maxfilenamelength Max length of value to show
+ * @return array List of templates
*/
public static function liste_modeles($db, $maxfilenamelength = 0)
{
- // phpcs:enable
+ // phpcs:enable
global $conf;
$type = 'bom';
@@ -110,7 +110,7 @@ abstract class ModeleNumRefBoms
/**
* Checks if the numbers already in the database do not
- * cause conflicts that would prevent this numbering working.
+ * cause conflicts that would prevent this numbering working.
*
* @return boolean false if conflict, true if ok
*/
diff --git a/htdocs/core/modules/cheque/mod_chequereceipt_mint.php b/htdocs/core/modules/cheque/mod_chequereceipt_mint.php
index f4995962f90..15e95df561b 100644
--- a/htdocs/core/modules/cheque/mod_chequereceipt_mint.php
+++ b/htdocs/core/modules/cheque/mod_chequereceipt_mint.php
@@ -30,9 +30,9 @@ require_once DOL_DOCUMENT_ROOT .'/core/modules/cheque/modules_chequereceipts.php
class mod_chequereceipt_mint extends ModeleNumRefChequeReceipts
{
/**
- * Dolibarr version of the loaded document
- * @var string
- */
+ * Dolibarr version of the loaded document
+ * @var string
+ */
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
public $prefix='CHK';
@@ -45,16 +45,16 @@ class mod_chequereceipt_mint extends ModeleNumRefChequeReceipts
public $name='Mint';
- /**
- * Return description of numbering module
- *
- * @return string Text with description
- */
- public function info()
- {
- global $langs;
- return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
- }
+ /**
+ * Return description of numbering module
+ *
+ * @return string Text with description
+ */
+ public function info()
+ {
+ global $langs;
+ return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
+ }
/**
@@ -69,8 +69,8 @@ class mod_chequereceipt_mint extends ModeleNumRefChequeReceipts
/**
- * Checks if the numbers already in the database do not
- * cause conflicts that would prevent this numbering working.
+ * Checks if the numbers already in the database do not
+ * cause conflicts that would prevent this numbering working.
*
* @return boolean false if conflict, true if ok
*/
@@ -137,15 +137,15 @@ class mod_chequereceipt_mint extends ModeleNumRefChequeReceipts
$date=$object->date_bordereau;
$yymm = strftime("%y%m", $date);
- if ($max >= (pow(10, 4) - 1)) $num=$max+1; // If counter > 9999, we do not format on 4 chars, we take number as it is
- else $num = sprintf("%04s", $max+1);
+ if ($max >= (pow(10, 4) - 1)) $num=$max+1; // If counter > 9999, we do not format on 4 chars, we take number as it is
+ else $num = sprintf("%04s", $max+1);
dol_syslog(__METHOD__." return ".$this->prefix.$yymm."-".$num);
return $this->prefix.$yymm."-".$num;
}
- // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/**
* Return next free value
*
@@ -155,7 +155,7 @@ class mod_chequereceipt_mint extends ModeleNumRefChequeReceipts
*/
public function chequereceipt_get_num($objsoc, $objforref)
{
- // phpcs:enable
+ // phpcs:enable
return $this->getNextValue($objsoc, $objforref);
}
}
diff --git a/htdocs/core/modules/cheque/modules_chequereceipts.php b/htdocs/core/modules/cheque/modules_chequereceipts.php
index 74de02bcd0f..92a0b139ea6 100644
--- a/htdocs/core/modules/cheque/modules_chequereceipts.php
+++ b/htdocs/core/modules/cheque/modules_chequereceipts.php
@@ -76,11 +76,11 @@ abstract class ModeleNumRefChequeReceipts
}
/**
- * Checks if the numbers already in the database do not
- * cause conflicts that would prevent this numbering working.
- *
- * @return boolean false if conflict, true if ok
- */
+ * Checks if the numbers already in the database do not
+ * cause conflicts that would prevent this numbering working.
+ *
+ * @return boolean false if conflict, true if ok
+ */
public function canBeActivated()
{
return true;
@@ -128,17 +128,17 @@ abstract class ModeleChequeReceipts extends CommonDocGenerator
*/
public $error='';
- // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/**
* Return list of active generation modules
*
- * @param DoliDB $db Database handler
- * @param integer $maxfilenamelength Max length of value to show
- * @return array List of templates
+ * @param DoliDB $db Database handler
+ * @param integer $maxfilenamelength Max length of value to show
+ * @return array List of templates
*/
public static function liste_modeles($db, $maxfilenamelength = 0)
{
- // phpcs:enable
+ // phpcs:enable
global $conf;
$type='chequereceipt';
diff --git a/htdocs/core/modules/commande/mod_commande_marbre.php b/htdocs/core/modules/commande/mod_commande_marbre.php
index 9dc07576797..380f54bbecf 100644
--- a/htdocs/core/modules/commande/mod_commande_marbre.php
+++ b/htdocs/core/modules/commande/mod_commande_marbre.php
@@ -30,9 +30,9 @@ require_once DOL_DOCUMENT_ROOT .'/core/modules/commande/modules_commande.php';
class mod_commande_marbre extends ModeleNumRefCommandes
{
/**
- * Dolibarr version of the loaded document
- * @var string
- */
+ * Dolibarr version of the loaded document
+ * @var string
+ */
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
public $prefix='CO';
@@ -48,16 +48,16 @@ class mod_commande_marbre extends ModeleNumRefCommandes
public $name='Marbre';
- /**
- * Return description of numbering module
- *
- * @return string Text with description
- */
- public function info()
- {
- global $langs;
- return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
- }
+ /**
+ * Return description of numbering module
+ *
+ * @return string Text with description
+ */
+ public function info()
+ {
+ global $langs;
+ return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
+ }
/**
@@ -72,8 +72,8 @@ class mod_commande_marbre extends ModeleNumRefCommandes
/**
- * Checks if the numbers already in the database do not
- * cause conflicts that would prevent this numbering working.
+ * Checks if the numbers already in the database do not
+ * cause conflicts that would prevent this numbering working.
*
* @return boolean false if conflict, true if ok
*/
@@ -140,15 +140,15 @@ class mod_commande_marbre extends ModeleNumRefCommandes
$date=$object->date;
$yymm = strftime("%y%m", $date);
- if ($max >= (pow(10, 4) - 1)) $num=$max+1; // If counter > 9999, we do not format on 4 chars, we take number as it is
- else $num = sprintf("%04s", $max+1);
+ if ($max >= (pow(10, 4) - 1)) $num=$max+1; // If counter > 9999, we do not format on 4 chars, we take number as it is
+ else $num = sprintf("%04s", $max+1);
dol_syslog("mod_commande_marbre::getNextValue return ".$this->prefix.$yymm."-".$num);
return $this->prefix.$yymm."-".$num;
}
- // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/**
* Return next free value
*
@@ -158,7 +158,7 @@ class mod_commande_marbre extends ModeleNumRefCommandes
*/
public function commande_get_num($objsoc, $objforref)
{
- // phpcs:enable
+ // phpcs:enable
return $this->getNextValue($objsoc, $objforref);
}
}
diff --git a/htdocs/core/modules/commande/modules_commande.php b/htdocs/core/modules/commande/modules_commande.php
index 53b9a636d4b..b64275faeb6 100644
--- a/htdocs/core/modules/commande/modules_commande.php
+++ b/htdocs/core/modules/commande/modules_commande.php
@@ -40,17 +40,17 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
abstract class ModelePDFCommandes extends CommonDocGenerator
{
- // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
- /**
- * Return list of active generation modules
- *
- * @param DoliDB $db Database handler
- * @param integer $maxfilenamelength Max length of value to show
- * @return array List of templates
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+ /**
+ * Return list of active generation modules
+ *
+ * @param DoliDB $db Database handler
+ * @param integer $maxfilenamelength Max length of value to show
+ * @return array List of templates
*/
public static function liste_modeles($db, $maxfilenamelength = 0)
{
- // phpcs:enable
+ // phpcs:enable
global $conf;
$type = 'order';
@@ -111,7 +111,7 @@ abstract class ModeleNumRefCommandes
/**
* Checks if the numbers already in the database do not
- * cause conflicts that would prevent this numbering working.
+ * cause conflicts that would prevent this numbering working.
*
* @return boolean false if conflict, true if ok
*/
diff --git a/htdocs/core/modules/dons/modules_don.php b/htdocs/core/modules/dons/modules_don.php
index 11538d8fff4..aea8493944f 100644
--- a/htdocs/core/modules/dons/modules_don.php
+++ b/htdocs/core/modules/dons/modules_don.php
@@ -34,32 +34,32 @@ require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
*/
abstract class ModeleDon extends CommonDocGenerator
{
- /**
+ /**
* @var string Error code (or message)
*/
public $error='';
- // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
- /**
- * Return list of active generation modules
- *
- * @param DoliDB $db Database handler
- * @param integer $maxfilenamelength Max length of value to show
- * @return array List of templates
- */
- public static function liste_modeles($db, $maxfilenamelength = 0)
- {
- // phpcs:enable
- global $conf;
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+ /**
+ * Return list of active generation modules
+ *
+ * @param DoliDB $db Database handler
+ * @param integer $maxfilenamelength Max length of value to show
+ * @return array List of templates
+ */
+ public static function liste_modeles($db, $maxfilenamelength = 0)
+ {
+ // phpcs:enable
+ global $conf;
- $type='donation';
- $liste=array();
+ $type='donation';
+ $liste=array();
- include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
- $liste=getListOfModels($db, $type, $maxfilenamelength);
+ include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+ $liste=getListOfModels($db, $type, $maxfilenamelength);
- return $liste;
- }
+ return $liste;
+ }
}
@@ -68,81 +68,81 @@ abstract class ModeleDon extends CommonDocGenerator
*/
abstract class ModeleNumRefDons
{
- /**
+ /**
* @var string Error code (or message)
*/
public $error='';
- /**
- * Return if a module can be used or not
- *
- * @return boolean true if module can be used
- */
- public function isEnabled()
- {
- return true;
- }
+ /**
+ * Return if a module can be used or not
+ *
+ * @return boolean true if module can be used
+ */
+ public function isEnabled()
+ {
+ return true;
+ }
- /**
- * Renvoi la description par defaut du modele de numerotation
- *
- * @return string Texte descripif
- */
- public function info()
- {
- global $langs;
- $langs->load("bills");
- return $langs->trans("NoDescription");
- }
+ /**
+ * Renvoi la description par defaut du modele de numerotation
+ *
+ * @return string Texte descripif
+ */
+ public function info()
+ {
+ global $langs;
+ $langs->load("bills");
+ return $langs->trans("NoDescription");
+ }
- /**
- * Return an example of numbering
- *
- * @return string Example
- */
- public function getExample()
- {
- global $langs;
- $langs->load("bills");
- return $langs->trans("NoExample");
- }
+ /**
+ * Return an example of numbering
+ *
+ * @return string Example
+ */
+ public function getExample()
+ {
+ global $langs;
+ $langs->load("bills");
+ return $langs->trans("NoExample");
+ }
- /**
- * Checks if the numbers already in the database do not
- * cause conflicts that would prevent this numbering working.
- *
- * @return boolean false if conflict, true if ok
- */
- public function canBeActivated()
- {
- return true;
- }
+ /**
+ * Checks if the numbers already in the database do not
+ * cause conflicts that would prevent this numbering working.
+ *
+ * @return boolean false if conflict, true if ok
+ */
+ public function canBeActivated()
+ {
+ return true;
+ }
- /**
- * Renvoi prochaine valeur attribuee
- *
- * @return string Valeur
- */
- public function getNextValue()
- {
- global $langs;
- return $langs->trans("NotAvailable");
- }
+ /**
+ * Renvoi prochaine valeur attribuee
+ *
+ * @return string Valeur
+ */
+ public function getNextValue()
+ {
+ global $langs;
+ return $langs->trans("NotAvailable");
+ }
- /**
- * Renvoi version du module numerotation
- *
- * @return string Valeur
- */
- public function getVersion()
- {
- global $langs;
- $langs->load("admin");
+ /**
+ * Renvoi version du module numerotation
+ *
+ * @return string Valeur
+ */
+ public function getVersion()
+ {
+ global $langs;
+ $langs->load("admin");
- if ($this->version == 'development') return $langs->trans("VersionDevelopment");
- if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
- if ($this->version == 'dolibarr') return DOL_VERSION;
- if ($this->version) return $this->version;
- return $langs->trans("NotAvailable");
- }
+ if ($this->version == 'development') return $langs->trans("VersionDevelopment");
+ if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
+ if ($this->version == 'dolibarr') return DOL_VERSION;
+ if ($this->version) return $this->version;
+ return $langs->trans("NotAvailable");
+ }
}
diff --git a/htdocs/core/modules/expensereport/mod_expensereport_jade.php b/htdocs/core/modules/expensereport/mod_expensereport_jade.php
index 93d2ca15a48..d2b3ce0793a 100644
--- a/htdocs/core/modules/expensereport/mod_expensereport_jade.php
+++ b/htdocs/core/modules/expensereport/mod_expensereport_jade.php
@@ -29,9 +29,9 @@ require_once DOL_DOCUMENT_ROOT .'/core/modules/expensereport/modules_expenserepo
class mod_expensereport_jade extends ModeleNumRefExpenseReport
{
/**
- * Dolibarr version of the loaded document
- * @var string
- */
+ * Dolibarr version of the loaded document
+ * @var string
+ */
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
public $prefix='ER';
@@ -54,16 +54,16 @@ class mod_expensereport_jade extends ModeleNumRefExpenseReport
public $name='Jade';
- /**
- * Return description of numbering model
- *
- * @return string Text with description
- */
- public function info()
- {
- global $langs;
- return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
- }
+ /**
+ * Return description of numbering model
+ *
+ * @return string Text with description
+ */
+ public function info()
+ {
+ global $langs;
+ return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
+ }
/**
@@ -71,19 +71,19 @@ class mod_expensereport_jade extends ModeleNumRefExpenseReport
*
* @return string Example
*/
- public function getExample()
+ public function getExample()
{
return $this->prefix."0501-0001";
}
/**
- * Checks if the numbers already in the database do not
- * cause conflicts that would prevent this numbering working.
+ * Checks if the numbers already in the database do not
+ * cause conflicts that would prevent this numbering working.
*
* @return boolean false if conflict, true if ok
*/
- public function canBeActivated()
+ public function canBeActivated()
{
global $conf,$langs,$db;
@@ -117,7 +117,7 @@ class mod_expensereport_jade extends ModeleNumRefExpenseReport
* @param Object $object Object we need next value for
* @return string Value if KO, <0 if KO
*/
- public function getNextValue($object)
+ public function getNextValue($object)
{
global $db,$conf;
@@ -139,19 +139,19 @@ class mod_expensereport_jade extends ModeleNumRefExpenseReport
$result = $db->query($sql);
- if ($db->num_rows($result) > 0) {
- $objp = $db->fetch_object($result);
- $newref = $objp->max;
- $newref++;
- while (strlen($newref) < $num_car) {
- $newref = "0".$newref;
- }
- } else {
- $newref = 1;
- while (strlen($newref) < $num_car) {
- $newref = "0".$newref;
- }
- }
+ if ($db->num_rows($result) > 0) {
+ $objp = $db->fetch_object($result);
+ $newref = $objp->max;
+ $newref++;
+ while (strlen($newref) < $num_car) {
+ $newref = "0".$newref;
+ }
+ } else {
+ $newref = 1;
+ while (strlen($newref) < $num_car) {
+ $newref = "0".$newref;
+ }
+ }
$ref_number_int = ($newref+1)-1;
@@ -202,8 +202,8 @@ class mod_expensereport_jade extends ModeleNumRefExpenseReport
$yymm = strftime("%y%m", $date);
- if ($max >= (pow(10, 4) - 1)) $num=$max+1; // If counter > 9999, we do not format on 4 chars, we take number as it is
- else $num = sprintf("%04s", $max+1);
+ if ($max >= (pow(10, 4) - 1)) $num=$max+1; // If counter > 9999, we do not format on 4 chars, we take number as it is
+ else $num = sprintf("%04s", $max+1);
dol_syslog("mod_expensereport_jade::getNextValue return ".$this->prefix.$yymm."-".$num);
return $this->prefix.$yymm."-".$num;
diff --git a/htdocs/core/modules/facture/modules_facture.php b/htdocs/core/modules/facture/modules_facture.php
index 871d29fca0d..775864eec52 100644
--- a/htdocs/core/modules/facture/modules_facture.php
+++ b/htdocs/core/modules/facture/modules_facture.php
@@ -46,17 +46,17 @@ abstract class ModelePDFFactures extends CommonDocGenerator
public $atleastoneratenotnull = 0;
- // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/**
* Return list of active generation modules
*
- * @param DoliDB $db Database handler
- * @param integer $maxfilenamelength Max length of value to show
- * @return array List of templates
+ * @param DoliDB $db Database handler
+ * @param integer $maxfilenamelength Max length of value to show
+ * @return array List of templates
*/
- public static function liste_modeles($db, $maxfilenamelength = 0)
+ public static function liste_modeles($db, $maxfilenamelength = 0)
{
- // phpcs:enable
+ // phpcs:enable
global $conf;
$type = 'invoice';
@@ -114,8 +114,8 @@ abstract class ModeleNumRefFactures
}
/**
- * Checks if the numbers already in the database do not
- * cause conflicts that would prevent this numbering working.
+ * Checks if the numbers already in the database do not
+ * cause conflicts that would prevent this numbering working.
*
* @return boolean false if conflict, true if ok
*/
diff --git a/htdocs/core/modules/fichinter/modules_fichinter.php b/htdocs/core/modules/fichinter/modules_fichinter.php
index 8db526da0a2..356ecf05081 100644
--- a/htdocs/core/modules/fichinter/modules_fichinter.php
+++ b/htdocs/core/modules/fichinter/modules_fichinter.php
@@ -40,17 +40,17 @@ abstract class ModelePDFFicheinter extends CommonDocGenerator
public $error='';
- // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/**
* Return list of active generation modules
*
- * @param DoliDB $db Database handler
- * @param integer $maxfilenamelength Max length of value to show
- * @return array List of templates
+ * @param DoliDB $db Database handler
+ * @param integer $maxfilenamelength Max length of value to show
+ * @return array List of templates
*/
public static function liste_modeles($db, $maxfilenamelength = 0)
{
- // phpcs:enable
+ // phpcs:enable
global $conf;
$type='ficheinter';
@@ -109,8 +109,8 @@ abstract class ModeleNumRefFicheinter
}
/**
- * Checks if the numbers already in the database do not
- * cause conflicts that would prevent this numbering working.
+ * Checks if the numbers already in the database do not
+ * cause conflicts that would prevent this numbering working.
*
* @return boolean false if conflict, true if ok
*/
@@ -164,7 +164,7 @@ abstract class ModeleNumRefFicheinter
*/
function fichinter_create($db, $object, $modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
{
- // phpcs:enable
+ // phpcs:enable
global $conf,$langs,$user;
$langs->load("ficheinter");
@@ -187,11 +187,11 @@ function fichinter_create($db, $object, $modele, $outputlangs, $hidedetails = 0,
// If selected modele is a filename template (then $modele="modelname:filename")
$tmp=explode(':', $modele, 2);
- if (! empty($tmp[1]))
- {
- $modele=$tmp[0];
- $srctemplatepath=$tmp[1];
- }
+ if (! empty($tmp[1]))
+ {
+ $modele=$tmp[0];
+ $srctemplatepath=$tmp[1];
+ }
// Search template files
$file=''; $classname=''; $filefound=0;
@@ -199,21 +199,21 @@ function fichinter_create($db, $object, $modele, $outputlangs, $hidedetails = 0,
if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels, $conf->modules_parts['models']);
foreach($dirmodels as $reldir)
{
- foreach(array('doc','pdf') as $prefix)
- {
- $file = $prefix."_".$modele.".modules.php";
+ foreach(array('doc','pdf') as $prefix)
+ {
+ $file = $prefix."_".$modele.".modules.php";
- // On verifie l'emplacement du modele
- $file=dol_buildpath($reldir."core/modules/fichinter/doc/".$file, 0);
- if (file_exists($file))
- {
- $filefound=1;
- $classname=$prefix.'_'.$modele;
- break;
- }
- }
- if ($filefound) break;
- }
+ // On verifie l'emplacement du modele
+ $file=dol_buildpath($reldir."core/modules/fichinter/doc/".$file, 0);
+ if (file_exists($file))
+ {
+ $filefound=1;
+ $classname=$prefix.'_'.$modele;
+ break;
+ }
+ }
+ if ($filefound) break;
+ }
// Charge le modele
if ($filefound)
diff --git a/htdocs/core/modules/livraison/mod_livraison_jade.php b/htdocs/core/modules/livraison/mod_livraison_jade.php
index f27c1a8583f..840b6a6f0a6 100644
--- a/htdocs/core/modules/livraison/mod_livraison_jade.php
+++ b/htdocs/core/modules/livraison/mod_livraison_jade.php
@@ -35,9 +35,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/livraison/modules_livraison.php';
class mod_livraison_jade extends ModeleNumRefDeliveryOrder
{
/**
- * Dolibarr version of the loaded document
- * @var string
- */
+ * Dolibarr version of the loaded document
+ * @var string
+ */
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
/**
@@ -57,7 +57,7 @@ class mod_livraison_jade extends ModeleNumRefDeliveryOrder
*/
public $name = 'Jade';
- public $prefix = 'BL';
+ public $prefix = 'BL';
/**
@@ -74,103 +74,103 @@ class mod_livraison_jade extends ModeleNumRefDeliveryOrder
/**
* Return an example of numbering
*
- * @return string Example
- */
- public function getExample()
- {
- return $this->prefix."0501-0001";
- }
+ * @return string Example
+ */
+ public function getExample()
+ {
+ return $this->prefix."0501-0001";
+ }
- /**
- * Checks if the numbers already in the database do not
- * cause conflicts that would prevent this numbering working.
- *
- * @return boolean false if conflict, true if ok
- */
- public function canBeActivated()
- {
- global $langs, $conf, $db;
+ /**
+ * Checks if the numbers already in the database do not
+ * cause conflicts that would prevent this numbering working.
+ *
+ * @return boolean false if conflict, true if ok
+ */
+ public function canBeActivated()
+ {
+ global $langs, $conf, $db;
- $langs->load("bills");
+ $langs->load("bills");
- // Check invoice num
- $fayymm = ''; $max = '';
+ // Check invoice num
+ $fayymm = ''; $max = '';
- $posindice = 8;
- $sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max"; // This is standard SQL
- $sql .= " FROM ".MAIN_DB_PREFIX."livraison";
- $sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
- $sql .= " AND entity = ".$conf->entity;
+ $posindice = 8;
+ $sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max"; // This is standard SQL
+ $sql .= " FROM ".MAIN_DB_PREFIX."livraison";
+ $sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
+ $sql .= " AND entity = ".$conf->entity;
- $resql = $db->query($sql);
- if ($resql)
- {
- $row = $db->fetch_row($resql);
- if ($row) { $fayymm = substr($row[0], 0, 6); $max = $row[0]; }
- }
- if ($fayymm && !preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $fayymm))
- {
- $langs->load("errors");
- $this->error = $langs->trans('ErrorNumRefModel', $max);
- return false;
- }
+ $resql = $db->query($sql);
+ if ($resql)
+ {
+ $row = $db->fetch_row($resql);
+ if ($row) { $fayymm = substr($row[0], 0, 6); $max = $row[0]; }
+ }
+ if ($fayymm && !preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $fayymm))
+ {
+ $langs->load("errors");
+ $this->error = $langs->trans('ErrorNumRefModel', $max);
+ return false;
+ }
- return true;
- }
+ return true;
+ }
- /**
+ /**
* Return next free value
*
* @param Societe $objsoc Object thirdparty
* @param Object $object Object we need next value for
* @return string Value if KO, <0 if KO
*/
- public function getNextValue($objsoc, $object)
- {
- global $db, $conf;
+ public function getNextValue($objsoc, $object)
+ {
+ global $db, $conf;
- // D'abord on recupere la valeur max
- $posindice = 8;
- $sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max"; // This is standard SQL
- $sql .= " FROM ".MAIN_DB_PREFIX."livraison";
- $sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
- $sql .= " AND entity = ".$conf->entity;
+ // D'abord on recupere la valeur max
+ $posindice = 8;
+ $sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max"; // This is standard SQL
+ $sql .= " FROM ".MAIN_DB_PREFIX."livraison";
+ $sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
+ $sql .= " AND entity = ".$conf->entity;
- $resql = $db->query($sql);
- dol_syslog("mod_livraison_jade::getNextValue", LOG_DEBUG);
- if ($resql) {
- $obj = $db->fetch_object($resql);
- if ($obj) $max = intval($obj->max);
- else $max = 0;
- }
- else
- {
- return -1;
- }
+ $resql = $db->query($sql);
+ dol_syslog("mod_livraison_jade::getNextValue", LOG_DEBUG);
+ if ($resql) {
+ $obj = $db->fetch_object($resql);
+ if ($obj) $max = intval($obj->max);
+ else $max = 0;
+ }
+ else
+ {
+ return -1;
+ }
- $date = $object->date_delivery;
- if (empty($date)) $date = dol_now();
- $yymm = strftime("%y%m", $date);
+ $date = $object->date_delivery;
+ if (empty($date)) $date = dol_now();
+ $yymm = strftime("%y%m", $date);
- if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
- else $num = sprintf("%04s", $max + 1);
+ if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
+ else $num = sprintf("%04s", $max + 1);
- dol_syslog("mod_livraison_jade::getNextValue return ".$this->prefix.$yymm."-".$num);
- return $this->prefix.$yymm."-".$num;
- }
+ dol_syslog("mod_livraison_jade::getNextValue return ".$this->prefix.$yymm."-".$num);
+ return $this->prefix.$yymm."-".$num;
+ }
- // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
- /**
- * Return next free ref
- *
- * @param Societe $objsoc Object thirdparty
- * @param Object $object Object livraison
- * @return string Texte descriptif
- */
- public function livraison_get_num($objsoc = 0, $object = '')
- {
- // phpcs:enable
- return $this->getNextValue($objsoc, $object);
- }
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+ /**
+ * Return next free ref
+ *
+ * @param Societe $objsoc Object thirdparty
+ * @param Object $object Object livraison
+ * @return string Texte descriptif
+ */
+ public function livraison_get_num($objsoc = 0, $object = '')
+ {
+ // phpcs:enable
+ return $this->getNextValue($objsoc, $object);
+ }
}
diff --git a/htdocs/core/modules/livraison/modules_livraison.php b/htdocs/core/modules/livraison/modules_livraison.php
index 9672f1f31cf..c108f65ac33 100644
--- a/htdocs/core/modules/livraison/modules_livraison.php
+++ b/htdocs/core/modules/livraison/modules_livraison.php
@@ -36,32 +36,32 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
*/
abstract class ModelePDFDeliveryOrder extends CommonDocGenerator
{
- /**
- * @var string Error code (or message)
- */
- public $error='';
+ /**
+ * @var string Error code (or message)
+ */
+ public $error='';
- // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
- /**
- * Return list of active generation modules
- *
- * @param DoliDB $db Database handler
- * @param integer $maxfilenamelength Max length of value to show
- * @return array List of templates
- */
- public static function liste_modeles($db, $maxfilenamelength = 0)
- {
- // phpcs:enable
- global $conf;
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+ /**
+ * Return list of active generation modules
+ *
+ * @param DoliDB $db Database handler
+ * @param integer $maxfilenamelength Max length of value to show
+ * @return array List of templates
+ */
+ public static function liste_modeles($db, $maxfilenamelength = 0)
+ {
+ // phpcs:enable
+ global $conf;
- $type='delivery';
- $liste=array();
+ $type='delivery';
+ $liste=array();
- include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
- $liste=getListOfModels($db, $type, $maxfilenamelength);
+ include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+ $liste=getListOfModels($db, $type, $maxfilenamelength);
- return $liste;
- }
+ return $liste;
+ }
}
@@ -72,83 +72,83 @@ abstract class ModelePDFDeliveryOrder extends CommonDocGenerator
*/
abstract class ModeleNumRefDeliveryOrder
{
- /**
- * @var string Error code (or message)
- */
- public $error='';
+ /**
+ * @var string Error code (or message)
+ */
+ public $error='';
- /**
- * Return if a module can be used or not
- *
- * @return boolean true if module can be used
- */
- public function isEnabled()
- {
- return true;
- }
+ /**
+ * Return if a module can be used or not
+ *
+ * @return boolean true if module can be used
+ */
+ public function isEnabled()
+ {
+ return true;
+ }
- /**
- * Renvoi la description par defaut du modele de numerotation
- *
- * @return string Texte descripif
- */
- public function info()
- {
- global $langs;
- $langs->load("deliveries");
- return $langs->trans("NoDescription");
- }
+ /**
+ * Renvoi la description par defaut du modele de numerotation
+ *
+ * @return string Texte descripif
+ */
+ public function info()
+ {
+ global $langs;
+ $langs->load("deliveries");
+ return $langs->trans("NoDescription");
+ }
- /**
- * Return an example of numbering
- *
- * @return string Example
- */
- public function getExample()
- {
- global $langs;
- $langs->load("deliveries");
- return $langs->trans("NoExample");
- }
+ /**
+ * Return an example of numbering
+ *
+ * @return string Example
+ */
+ public function getExample()
+ {
+ global $langs;
+ $langs->load("deliveries");
+ return $langs->trans("NoExample");
+ }
- /**
- * Checks if the numbers already in the database do not
- * cause conflicts that would prevent this numbering working.
- *
- * @return boolean false if conflict, true if ok
- */
- public function canBeActivated()
- {
- return true;
- }
+ /**
+ * Checks if the numbers already in the database do not
+ * cause conflicts that would prevent this numbering working.
+ *
+ * @return boolean false if conflict, true if ok
+ */
+ public function canBeActivated()
+ {
+ return true;
+ }
- /**
- * Renvoi prochaine valeur attribuee
- *
- * @param Societe $objsoc Object third party
- * @param Object $object Object delivery
- * @return string Valeur
- */
- public function getNextValue($objsoc, $object)
- {
- global $langs;
- return $langs->trans("NotAvailable");
- }
+ /**
+ * Renvoi prochaine valeur attribuee
+ *
+ * @param Societe $objsoc Object third party
+ * @param Object $object Object delivery
+ * @return string Valeur
+ */
+ public function getNextValue($objsoc, $object)
+ {
+ global $langs;
+ return $langs->trans("NotAvailable");
+ }
- /**
- * Renvoi version du module numerotation
- *
- * @return string Valeur
- */
- public function getVersion()
- {
- global $langs;
- $langs->load("admin");
+ /**
+ * Renvoi version du module numerotation
+ *
+ * @return string Valeur
+ */
+ public function getVersion()
+ {
+ global $langs;
+ $langs->load("admin");
- if ($this->version == 'development') return $langs->trans("VersionDevelopment");
- elseif ($this->version == 'experimental') return $langs->trans("VersionExperimental");
- elseif ($this->version == 'dolibarr') return DOL_VERSION;
- elseif ($this->version) return $this->version;
- else return $langs->trans("NotAvailable");
- }
+ if ($this->version == 'development') return $langs->trans("VersionDevelopment");
+ elseif ($this->version == 'experimental') return $langs->trans("VersionExperimental");
+ elseif ($this->version == 'dolibarr') return DOL_VERSION;
+ elseif ($this->version) return $this->version;
+ else return $langs->trans("NotAvailable");
+ }
}
diff --git a/htdocs/core/modules/mrp/mod_mo_standard.php b/htdocs/core/modules/mrp/mod_mo_standard.php
index 04391d25fd7..3fd3b1ad87e 100644
--- a/htdocs/core/modules/mrp/mod_mo_standard.php
+++ b/htdocs/core/modules/mrp/mod_mo_standard.php
@@ -30,9 +30,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/mrp/modules_mo.php';
class mod_mo_standard extends ModeleNumRefMos
{
/**
- * Dolibarr version of the loaded document
- * @var string
- */
+ * Dolibarr version of the loaded document
+ * @var string
+ */
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
public $prefix = 'MO';
@@ -48,16 +48,16 @@ class mod_mo_standard extends ModeleNumRefMos
public $name = 'standard';
- /**
- * Return description of numbering module
- *
- * @return string Text with description
- */
- public function info()
- {
- global $langs;
- return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
- }
+ /**
+ * Return description of numbering module
+ *
+ * @return string Text with description
+ */
+ public function info()
+ {
+ global $langs;
+ return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
+ }
/**
@@ -72,8 +72,8 @@ class mod_mo_standard extends ModeleNumRefMos
/**
- * Checks if the numbers already in the database do not
- * cause conflicts that would prevent this numbering working.
+ * Checks if the numbers already in the database do not
+ * cause conflicts that would prevent this numbering working.
*
* @return boolean false if conflict, true if ok
*/
@@ -140,8 +140,8 @@ class mod_mo_standard extends ModeleNumRefMos
$date = $object->date_creation;
$yymm = strftime("%y%m", $date);
- if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
- else $num = sprintf("%04s", $max + 1);
+ if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
+ else $num = sprintf("%04s", $max + 1);
dol_syslog("mod_mo_standard::getNextValue return ".$this->prefix.$yymm."-".$num);
return $this->prefix.$yymm."-".$num;
diff --git a/htdocs/core/modules/mrp/modules_mo.php b/htdocs/core/modules/mrp/modules_mo.php
index cd9b3ec51db..4a251e21788 100644
--- a/htdocs/core/modules/mrp/modules_mo.php
+++ b/htdocs/core/modules/mrp/modules_mo.php
@@ -39,17 +39,17 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; // requir
abstract class ModelePDFMo extends CommonDocGenerator
{
- // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
- /**
- * Return list of active generation modules
- *
- * @param DoliDB $db Database handler
- * @param integer $maxfilenamelength Max length of value to show
- * @return array List of templates
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+ /**
+ * Return list of active generation modules
+ *
+ * @param DoliDB $db Database handler
+ * @param integer $maxfilenamelength Max length of value to show
+ * @return array List of templates
*/
public static function liste_modeles($db, $maxfilenamelength = 0)
{
- // phpcs:enable
+ // phpcs:enable
global $conf;
$type = 'mo';
@@ -110,7 +110,7 @@ abstract class ModeleNumRefMos
/**
* Checks if the numbers already in the database do not
- * cause conflicts that would prevent this numbering working.
+ * cause conflicts that would prevent this numbering working.
*
* @return boolean false if conflict, true if ok
*/
diff --git a/htdocs/core/modules/payment/mod_payment_cicada.php b/htdocs/core/modules/payment/mod_payment_cicada.php
index 6addb1a5e31..c9d2dfc98a3 100644
--- a/htdocs/core/modules/payment/mod_payment_cicada.php
+++ b/htdocs/core/modules/payment/mod_payment_cicada.php
@@ -30,9 +30,9 @@ require_once DOL_DOCUMENT_ROOT .'/core/modules/payment/modules_payment.php';
class mod_payment_cicada extends ModeleNumRefPayments
{
/**
- * Dolibarr version of the loaded document
- * @var string
- */
+ * Dolibarr version of the loaded document
+ * @var string
+ */
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
public $prefix='PAY';
@@ -55,16 +55,16 @@ class mod_payment_cicada extends ModeleNumRefPayments
public $name='Cicada';
- /**
- * Return description of numbering module
- *
- * @return string Text with description
- */
- public function info()
- {
- global $langs;
- return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
- }
+ /**
+ * Return description of numbering module
+ *
+ * @return string Text with description
+ */
+ public function info()
+ {
+ global $langs;
+ return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
+ }
/**
@@ -79,8 +79,8 @@ class mod_payment_cicada extends ModeleNumRefPayments
/**
- * Checks if the numbers already in the database do not
- * cause conflicts that would prevent this numbering working.
+ * Checks if the numbers already in the database do not
+ * cause conflicts that would prevent this numbering working.
*
* @return boolean false if conflict, true if ok
*/
@@ -147,15 +147,15 @@ class mod_payment_cicada extends ModeleNumRefPayments
$date=$object->datepaye;
$yymm = strftime("%y%m", $date);
- if ($max >= (pow(10, 4) - 1)) $num=$max+1; // If counter > 9999, we do not format on 4 chars, we take number as it is
- else $num = sprintf("%04s", $max+1);
+ if ($max >= (pow(10, 4) - 1)) $num=$max+1; // If counter > 9999, we do not format on 4 chars, we take number as it is
+ else $num = sprintf("%04s", $max+1);
dol_syslog(__METHOD__." return ".$this->prefix.$yymm."-".$num);
return $this->prefix.$yymm."-".$num;
}
- // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/**
* Return next free value
*
@@ -165,7 +165,7 @@ class mod_payment_cicada extends ModeleNumRefPayments
*/
public function payment_get_num($objsoc, $objforref)
{
- // phpcs:enable
+ // phpcs:enable
return $this->getNextValue($objsoc, $objforref);
}
}
diff --git a/htdocs/core/modules/payment/modules_payment.php b/htdocs/core/modules/payment/modules_payment.php
index 10d7a56164d..4effd51cc2d 100644
--- a/htdocs/core/modules/payment/modules_payment.php
+++ b/htdocs/core/modules/payment/modules_payment.php
@@ -63,11 +63,11 @@ abstract class ModeleNumRefPayments
}
/**
- * Checks if the numbers already in the database do not
- * cause conflicts that would prevent this numbering working.
- *
- * @return boolean false if conflict, true if ok
- */
+ * Checks if the numbers already in the database do not
+ * cause conflicts that would prevent this numbering working.
+ *
+ * @return boolean false if conflict, true if ok
+ */
public function canBeActivated()
{
return true;
diff --git a/htdocs/core/modules/product/modules_product.class.php b/htdocs/core/modules/product/modules_product.class.php
index 82a099a09fa..78974eaa4bc 100644
--- a/htdocs/core/modules/product/modules_product.class.php
+++ b/htdocs/core/modules/product/modules_product.class.php
@@ -33,226 +33,226 @@
*/
abstract class ModelePDFProduct extends CommonDocGenerator
{
- /**
- * @var string Error code (or message)
- */
- public $error='';
+ /**
+ * @var string Error code (or message)
+ */
+ public $error='';
- // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
- /**
- * Return list of active generation modules
- *
- * @param DoliDB $db Database handler
- * @param integer $maxfilenamelength Max length of value to show
- * @return array List of templates
- */
- public static function liste_modeles($db, $maxfilenamelength = 0)
- {
- // phpcs:enable
- global $conf;
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+ /**
+ * Return list of active generation modules
+ *
+ * @param DoliDB $db Database handler
+ * @param integer $maxfilenamelength Max length of value to show
+ * @return array List of templates
+ */
+ public static function liste_modeles($db, $maxfilenamelength = 0)
+ {
+ // phpcs:enable
+ global $conf;
- $type='product';
- $liste=array();
+ $type='product';
+ $liste=array();
- include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
- $liste=getListOfModels($db, $type, $maxfilenamelength);
- return $liste;
- }
+ include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+ $liste=getListOfModels($db, $type, $maxfilenamelength);
+ return $liste;
+ }
}
abstract class ModeleProductCode
{
- /**
- * @var string Error code (or message)
- */
- public $error='';
+ /**
+ * @var string Error code (or message)
+ */
+ public $error='';
- /** Renvoi la description par defaut du modele de numerotation
- *
- * @param Translate $langs Object langs
- * @return string Texte descripif
- */
- public function info($langs)
- {
- $langs->load("bills");
- return $langs->trans("NoDescription");
- }
+ /** Renvoi la description par defaut du modele de numerotation
+ *
+ * @param Translate $langs Object langs
+ * @return string Texte descripif
+ */
+ public function info($langs)
+ {
+ $langs->load("bills");
+ return $langs->trans("NoDescription");
+ }
- /** Renvoi nom module
- *
- * @param Translate $langs Object langs
- * @return string Nom du module
- */
- public function getNom($langs)
- {
- return empty($this->name)?$this->nom:$this->name;
- }
+ /** Renvoi nom module
+ *
+ * @param Translate $langs Object langs
+ * @return string Nom du module
+ */
+ public function getNom($langs)
+ {
+ return empty($this->name)?$this->nom:$this->name;
+ }
- /** Return an example of numbering
- *
- * @param Translate $langs Object langs
- * @return string Example
- */
- public function getExample($langs)
- {
- $langs->load("bills");
- return $langs->trans("NoExample");
- }
+ /** Return an example of numbering
+ *
+ * @param Translate $langs Object langs
+ * @return string Example
+ */
+ public function getExample($langs)
+ {
+ $langs->load("bills");
+ return $langs->trans("NoExample");
+ }
- /**
- * Checks if the numbers already in the database do not
- * cause conflicts that would prevent this numbering working.
- *
- * @return boolean false if conflict, true if ok
- */
- public function canBeActivated()
- {
- return true;
- }
+ /**
+ * Checks if the numbers already in the database do not
+ * cause conflicts that would prevent this numbering working.
+ *
+ * @return boolean false if conflict, true if ok
+ */
+ public function canBeActivated()
+ {
+ return true;
+ }
- /**
- * Return next value available
- *
- * @param Product $objproduct Object product
- * @param int $type Type
- * @return string Value
- */
- public function getNextValue($objproduct = 0, $type = -1)
- {
- global $langs;
- return $langs->trans("Function_getNextValue_InModuleNotWorking");
- }
+ /**
+ * Return next value available
+ *
+ * @param Product $objproduct Object product
+ * @param int $type Type
+ * @return string Value
+ */
+ public function getNextValue($objproduct = 0, $type = -1)
+ {
+ global $langs;
+ return $langs->trans("Function_getNextValue_InModuleNotWorking");
+ }
- /** Return version of module
- *
- * @return string Version
- */
- public function getVersion()
- {
- global $langs;
- $langs->load("admin");
+ /** Return version of module
+ *
+ * @return string Version
+ */
+ public function getVersion()
+ {
+ global $langs;
+ $langs->load("admin");
- if ($this->version == 'development') return $langs->trans("VersionDevelopment");
- if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
- if ($this->version == 'dolibarr') return DOL_VERSION;
- if ($this->version) return $this->version;
- return $langs->trans("NotAvailable");
- }
+ if ($this->version == 'development') return $langs->trans("VersionDevelopment");
+ if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
+ if ($this->version == 'dolibarr') return DOL_VERSION;
+ if ($this->version) return $this->version;
+ return $langs->trans("NotAvailable");
+ }
- // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
- /**
- * Renvoi la liste des modeles de numérotation
- *
- * @param DoliDB $db Database handler
- * @param integer $maxfilenamelength Max length of value to show
- * @return array List of numbers
- */
- public static function liste_modeles($db, $maxfilenamelength = 0)
- {
- // phpcs:enable
- $liste=array();
- $sql ="";
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+ /**
+ * Renvoi la liste des modeles de numérotation
+ *
+ * @param DoliDB $db Database handler
+ * @param integer $maxfilenamelength Max length of value to show
+ * @return array List of numbers
+ */
+ public static function liste_modeles($db, $maxfilenamelength = 0)
+ {
+ // phpcs:enable
+ $liste=array();
+ $sql ="";
- $resql = $db->query($sql);
- if ($resql)
- {
- $num = $db->num_rows($resql);
- $i = 0;
- while ($i < $num)
- {
- $row = $db->fetch_row($resql);
- $liste[$row[0]]=$row[1];
- $i++;
- }
- }
- else
- {
- return -1;
- }
- return $liste;
- }
+ $resql = $db->query($sql);
+ if ($resql)
+ {
+ $num = $db->num_rows($resql);
+ $i = 0;
+ while ($i < $num)
+ {
+ $row = $db->fetch_row($resql);
+ $liste[$row[0]]=$row[1];
+ $i++;
+ }
+ }
+ else
+ {
+ return -1;
+ }
+ return $liste;
+ }
- /**
- * Return description of module parameters
- *
- * @param Translate $langs Output language
- * @param Product $product Product object
- * @param int $type -1=Nothing, 0=Customer, 1=Supplier
- * @return string HTML translated description
- */
- public function getToolTip($langs, $product, $type)
- {
- global $conf;
+ /**
+ * Return description of module parameters
+ *
+ * @param Translate $langs Output language
+ * @param Product $product Product object
+ * @param int $type -1=Nothing, 0=Customer, 1=Supplier
+ * @return string HTML translated description
+ */
+ public function getToolTip($langs, $product, $type)
+ {
+ global $conf;
- $langs->load("admin");
+ $langs->load("admin");
- $s='';
- if ($type == -1) {
- $s.=$langs->trans("Name").': '.$this->getNom($langs).'
'; - $s.=$langs->trans("Version").': '.$this->getVersion().'
'; - } - if ($type == 0) $s.=$langs->trans("ProductCodeDesc").'
'; - if ($type == 1) $s.=$langs->trans("ServiceCodeDesc").'
'; - if ($type != -1) $s.=$langs->trans("ValidityControledByModule").': '.$this->getNom($langs).'
'; - $s.='
'; - $s.=''.$langs->trans("ThisIsModuleRules").':
'; - if ($type == 0) - { - $s.=$langs->trans("RequiredIfProduct").': '; - if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='';
- $s.=yn(!$this->code_null, 1, 2);
- if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.=' '.yn(1, 1, 2).' ('.$langs->trans("ForcedToByAModule", $langs->transnoentities("yes")).')';
- $s.='
'; - } - elseif ($type == 1) - { - $s.=$langs->trans("RequiredIfService").': '; - if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='';
- $s.=yn(!$this->code_null, 1, 2);
- if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.=' '.yn(1, 1, 2).' ('.$langs->trans("ForcedToByAModule", $langs->transnoentities("yes")).')';
- $s.='
'; - } - elseif ($type == -1) - { - $s.=$langs->trans("Required").': '; - if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='';
- $s.=yn(!$this->code_null, 1, 2);
- if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.=' '.yn(1, 1, 2).' ('.$langs->trans("ForcedToByAModule", $langs->transnoentities("yes")).')';
- $s.='
'; - } - $s.=$langs->trans("CanBeModifiedIfOk").': '; - $s.=yn($this->code_modifiable, 1, 2); - $s.='
'; - $s.=$langs->trans("CanBeModifiedIfKo").': '.yn($this->code_modifiable_invalide, 1, 2).'
'; - $s.=$langs->trans("AutomaticCode").': '.yn($this->code_auto, 1, 2).'
'; - $s.='
'; - if ($type == 0 || $type == -1) - { - $nextval=$this->getNextValue($product, 0); - if (empty($nextval)) $nextval=$langs->trans("Undefined"); - $s.=$langs->trans("NextValue").($type == -1?' ('.$langs->trans("Product").')':'').': '.$nextval.'
'; - } - if ($type == 1 || $type == -1) - { - $nextval=$this->getNextValue($product, 1); - if (empty($nextval)) $nextval=$langs->trans("Undefined"); - $s.=$langs->trans("NextValue").($type == -1?' ('.$langs->trans("Service").')':'').': '.$nextval.''; - } - return $s; - } + $s=''; + if ($type == -1) { + $s.=$langs->trans("Name").': '.$this->getNom($langs).'
'; + $s.=$langs->trans("Version").': '.$this->getVersion().'
'; + } + if ($type == 0) $s.=$langs->trans("ProductCodeDesc").'
'; + if ($type == 1) $s.=$langs->trans("ServiceCodeDesc").'
'; + if ($type != -1) $s.=$langs->trans("ValidityControledByModule").': '.$this->getNom($langs).'
'; + $s.='
'; + $s.=''.$langs->trans("ThisIsModuleRules").':
'; + if ($type == 0) + { + $s.=$langs->trans("RequiredIfProduct").': '; + if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='';
+ $s.=yn(!$this->code_null, 1, 2);
+ if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.=' '.yn(1, 1, 2).' ('.$langs->trans("ForcedToByAModule", $langs->transnoentities("yes")).')';
+ $s.='
'; + } + elseif ($type == 1) + { + $s.=$langs->trans("RequiredIfService").': '; + if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='';
+ $s.=yn(!$this->code_null, 1, 2);
+ if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.=' '.yn(1, 1, 2).' ('.$langs->trans("ForcedToByAModule", $langs->transnoentities("yes")).')';
+ $s.='
'; + } + elseif ($type == -1) + { + $s.=$langs->trans("Required").': '; + if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='';
+ $s.=yn(!$this->code_null, 1, 2);
+ if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.=' '.yn(1, 1, 2).' ('.$langs->trans("ForcedToByAModule", $langs->transnoentities("yes")).')';
+ $s.='
'; + } + $s.=$langs->trans("CanBeModifiedIfOk").': '; + $s.=yn($this->code_modifiable, 1, 2); + $s.='
'; + $s.=$langs->trans("CanBeModifiedIfKo").': '.yn($this->code_modifiable_invalide, 1, 2).'
'; + $s.=$langs->trans("AutomaticCode").': '.yn($this->code_auto, 1, 2).'
'; + $s.='
'; + if ($type == 0 || $type == -1) + { + $nextval=$this->getNextValue($product, 0); + if (empty($nextval)) $nextval=$langs->trans("Undefined"); + $s.=$langs->trans("NextValue").($type == -1?' ('.$langs->trans("Product").')':'').': '.$nextval.'
'; + } + if ($type == 1 || $type == -1) + { + $nextval=$this->getNextValue($product, 1); + if (empty($nextval)) $nextval=$langs->trans("Undefined"); + $s.=$langs->trans("NextValue").($type == -1?' ('.$langs->trans("Service").')':'').': '.$nextval.''; + } + return $s; + } - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps - /** - * Check if mask/numbering use prefix - * - * @return int 0=no, 1=yes - */ - public function verif_prefixIsUsed() - { - // phpcs:enable - return 0; - } + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps + /** + * Check if mask/numbering use prefix + * + * @return int 0=no, 1=yes + */ + public function verif_prefixIsUsed() + { + // phpcs:enable + return 0; + } } diff --git a/htdocs/core/modules/project/mod_project_simple.php b/htdocs/core/modules/project/mod_project_simple.php index 3d091658619..c5cc9c7bba3 100644 --- a/htdocs/core/modules/project/mod_project_simple.php +++ b/htdocs/core/modules/project/mod_project_simple.php @@ -32,14 +32,14 @@ require_once DOL_DOCUMENT_ROOT .'/core/modules/project/modules_project.php'; class mod_project_simple extends ModeleNumRefProjects { /** - * Dolibarr version of the loaded document - * @var string - */ + * Dolibarr version of the loaded document + * @var string + */ public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' public $prefix='PJ'; - /** + /** * @var string Error code (or message) */ public $error=''; @@ -57,74 +57,74 @@ class mod_project_simple extends ModeleNumRefProjects public $name='Simple'; - /** - * Return description of numbering module - * - * @return string Text with description - */ - public function info() - { - global $langs; - return $langs->trans("SimpleNumRefModelDesc", $this->prefix); - } + /** + * Return description of numbering module + * + * @return string Text with description + */ + public function info() + { + global $langs; + return $langs->trans("SimpleNumRefModelDesc", $this->prefix); + } - /** - * Return an example of numbering module values - * - * @return string Example - */ - public function getExample() - { - return $this->prefix."0501-0001"; - } + /** + * Return an example of numbering module values + * + * @return string Example + */ + public function getExample() + { + return $this->prefix."0501-0001"; + } - /** - * Checks if the numbers already in the database do not - * cause conflicts that would prevent this numbering working. - * - * @return boolean false if conflict, true if ok - */ - public function canBeActivated() - { - global $conf,$langs,$db; + /** + * Checks if the numbers already in the database do not + * cause conflicts that would prevent this numbering working. + * + * @return boolean false if conflict, true if ok + */ + public function canBeActivated() + { + global $conf,$langs,$db; - $coyymm=''; $max=''; + $coyymm=''; $max=''; $posindice=8; $sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max"; - $sql.= " FROM ".MAIN_DB_PREFIX."projet"; + $sql.= " FROM ".MAIN_DB_PREFIX."projet"; $sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'"; - $sql.= " AND entity = ".$conf->entity; - $resql=$db->query($sql); - if ($resql) - { - $row = $db->fetch_row($resql); - if ($row) { $coyymm = substr($row[0], 0, 6); $max=$row[0]; } - } - if (! $coyymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $coyymm)) - { - return true; - } - else - { + $sql.= " AND entity = ".$conf->entity; + $resql=$db->query($sql); + if ($resql) + { + $row = $db->fetch_row($resql); + if ($row) { $coyymm = substr($row[0], 0, 6); $max=$row[0]; } + } + if (! $coyymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $coyymm)) + { + return true; + } + else + { $langs->load("errors"); $this->error=$langs->trans('ErrorNumRefModel', $max); - return false; - } - } + return false; + } + } - /** - * Return next value - * - * @param Societe $objsoc Object third party - * @param Project $project Object project - * @return string Value if OK, 0 if KO - */ - public function getNextValue($objsoc, $project) - { + /** + * Return next value + * + * @param Societe $objsoc Object third party + * @param Project $project Object project + * @return string Value if OK, 0 if KO + */ + public function getNextValue($objsoc, $project) + { global $db,$conf; // D'abord on recupere la valeur max @@ -157,20 +157,20 @@ class mod_project_simple extends ModeleNumRefProjects dol_syslog("mod_project_simple::getNextValue return ".$this->prefix.$yymm."-".$num); return $this->prefix.$yymm."-".$num; - } + } - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps - /** - * Return next reference not yet used as a reference - * - * @param Societe $objsoc Object third party - * @param Project $project Object project - * @return string Next not used reference - */ - public function project_get_num($objsoc = 0, $project = '') - { - // phpcs:enable - return $this->getNextValue($objsoc, $project); - } + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps + /** + * Return next reference not yet used as a reference + * + * @param Societe $objsoc Object third party + * @param Project $project Object project + * @return string Next not used reference + */ + public function project_get_num($objsoc = 0, $project = '') + { + // phpcs:enable + return $this->getNextValue($objsoc, $project); + } } diff --git a/htdocs/core/modules/project/task/mod_task_simple.php b/htdocs/core/modules/project/task/mod_task_simple.php index fbb5f2d4c5d..961b9a732f6 100644 --- a/htdocs/core/modules/project/task/mod_task_simple.php +++ b/htdocs/core/modules/project/task/mod_task_simple.php @@ -32,14 +32,14 @@ require_once DOL_DOCUMENT_ROOT .'/core/modules/project/task/modules_task.php'; class mod_task_simple extends ModeleNumRefTask { /** - * Dolibarr version of the loaded document - * @var string - */ + * Dolibarr version of the loaded document + * @var string + */ public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' public $prefix='TK'; - /** + /** * @var string Error code (or message) */ public $error=''; @@ -57,40 +57,40 @@ class mod_task_simple extends ModeleNumRefTask public $name='Simple'; - /** - * Return description of numbering module - * - * @return string Text with description - */ - public function info() - { - global $langs; - return $langs->trans("SimpleNumRefModelDesc", $this->prefix); - } + /** + * Return description of numbering module + * + * @return string Text with description + */ + public function info() + { + global $langs; + return $langs->trans("SimpleNumRefModelDesc", $this->prefix); + } - /** - * Return an example of numbering module values - * - * @return string Example - */ - public function getExample() - { - return $this->prefix."0501-0001"; - } + /** + * Return an example of numbering module values + * + * @return string Example + */ + public function getExample() + { + return $this->prefix."0501-0001"; + } - /** - * Checks if the numbers already in the database do not - * cause conflicts that would prevent this numbering working. - * - * @return boolean false if conflict, true if ok - */ - public function canBeActivated() - { - global $conf,$langs,$db; + /** + * Checks if the numbers already in the database do not + * cause conflicts that would prevent this numbering working. + * + * @return boolean false if conflict, true if ok + */ + public function canBeActivated() + { + global $conf,$langs,$db; - $coyymm=''; $max=''; + $coyymm=''; $max=''; $posindice=8; $sql = "SELECT MAX(CAST(SUBSTRING(task.ref FROM " . $posindice . ") AS SIGNED)) as max"; @@ -98,34 +98,34 @@ class mod_task_simple extends ModeleNumRefTask $sql .= MAIN_DB_PREFIX . "projet AS project WHERE task.fk_projet=project.rowid"; $sql .= " AND task.ref LIKE '" . $db->escape($this->prefix) . "____-%'"; $sql .= " AND project.entity = " . $conf->entity; - $resql=$db->query($sql); - if ($resql) - { - $row = $db->fetch_row($resql); - if ($row) { $coyymm = substr($row[0], 0, 6); $max=$row[0]; } - } - if (! $coyymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $coyymm)) - { - return true; - } - else - { + $resql=$db->query($sql); + if ($resql) + { + $row = $db->fetch_row($resql); + if ($row) { $coyymm = substr($row[0], 0, 6); $max=$row[0]; } + } + if (! $coyymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $coyymm)) + { + return true; + } + else + { $langs->load("errors"); $this->error=$langs->trans('ErrorNumRefModel', $max); - return false; - } - } + return false; + } + } - /** - * Return next value - * - * @param Societe $objsoc Object third party - * @param Task $object Object Task - * @return string Value if OK, 0 if KO - */ - public function getNextValue($objsoc, $object) - { + /** + * Return next value + * + * @param Societe $objsoc Object third party + * @param Task $object Object Task + * @return string Value if OK, 0 if KO + */ + public function getNextValue($objsoc, $object) + { global $db,$conf; // D'abord on recupere la valeur max @@ -157,19 +157,19 @@ class mod_task_simple extends ModeleNumRefTask dol_syslog("mod_task_simple::getNextValue return ".$this->prefix.$yymm."-".$num); return $this->prefix.$yymm."-".$num; - } + } - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps - /** - * Return next reference not yet used as a reference - * - * @param Societe $objsoc Object third party - * @param Task $object Object task - * @return string Next not used reference - */ - public function task_get_num($objsoc = 0, $object = '') - { - return $this->getNextValue($objsoc, $object); - } + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps + /** + * Return next reference not yet used as a reference + * + * @param Societe $objsoc Object third party + * @param Task $object Object task + * @return string Next not used reference + */ + public function task_get_num($objsoc = 0, $object = '') + { + return $this->getNextValue($objsoc, $object); + } } diff --git a/htdocs/core/modules/propale/mod_propale_marbre.php b/htdocs/core/modules/propale/mod_propale_marbre.php index e8fa9970ef9..9a45ff647f0 100644 --- a/htdocs/core/modules/propale/mod_propale_marbre.php +++ b/htdocs/core/modules/propale/mod_propale_marbre.php @@ -32,9 +32,9 @@ require_once DOL_DOCUMENT_ROOT .'/core/modules/propale/modules_propale.php'; class mod_propale_marbre extends ModeleNumRefPropales { /** - * Dolibarr version of the loaded document - * @var string - */ + * Dolibarr version of the loaded document + * @var string + */ public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' public $prefix='PR'; @@ -57,16 +57,16 @@ class mod_propale_marbre extends ModeleNumRefPropales public $name='Marbre'; - /** - * Return description of numbering module - * - * @return string Text with description - */ - public function info() - { - global $langs; - return $langs->trans("SimpleNumRefModelDesc", $this->prefix); - } + /** + * Return description of numbering module + * + * @return string Text with description + */ + public function info() + { + global $langs; + return $langs->trans("SimpleNumRefModelDesc", $this->prefix); + } /** @@ -81,8 +81,8 @@ class mod_propale_marbre extends ModeleNumRefPropales /** - * Checks if the numbers already in the database do not - * cause conflicts that would prevent this numbering working. + * Checks if the numbers already in the database do not + * cause conflicts that would prevent this numbering working. * * @return boolean false if conflict, true if ok */ diff --git a/htdocs/core/modules/societe/modules_societe.class.php b/htdocs/core/modules/societe/modules_societe.class.php index f76aa6e20d3..d29b2f321fd 100644 --- a/htdocs/core/modules/societe/modules_societe.class.php +++ b/htdocs/core/modules/societe/modules_societe.class.php @@ -33,32 +33,32 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php'; */ abstract class ModeleThirdPartyDoc extends CommonDocGenerator { - /** + /** * @var string Error code (or message) */ public $error=''; - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps - /** - * Return list of active generation modules - * - * @param DoliDB $db Database handler - * @param integer $maxfilenamelength Max length of value to show - * @return array List of templates - */ - public static function liste_modeles($db, $maxfilenamelength = 0) - { - // phpcs:enable - global $conf; + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps + /** + * Return list of active generation modules + * + * @param DoliDB $db Database handler + * @param integer $maxfilenamelength Max length of value to show + * @return array List of templates + */ + public static function liste_modeles($db, $maxfilenamelength = 0) + { + // phpcs:enable + global $conf; - $type='company'; - $liste=array(); + $type='company'; + $liste=array(); - include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; - $liste = getListOfModels($db, $type, $maxfilenamelength); + include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; + $liste = getListOfModels($db, $type, $maxfilenamelength); - return $liste; - } + return $liste; + } } /** @@ -67,197 +67,197 @@ abstract class ModeleThirdPartyDoc extends CommonDocGenerator */ abstract class ModeleThirdPartyCode { - /** - * @var string Error code (or message) + /** + * @var string Error code (or message) */ public $error=''; - /** Renvoi la description par defaut du modele de numerotation - * - * @param Translate $langs Object langs - * @return string Texte descripif - */ - public function info($langs) - { - $langs->load("bills"); - return $langs->trans("NoDescription"); - } + /** Renvoi la description par defaut du modele de numerotation + * + * @param Translate $langs Object langs + * @return string Texte descripif + */ + public function info($langs) + { + $langs->load("bills"); + return $langs->trans("NoDescription"); + } - /** Return name of module - * - * @param Translate $langs Object langs - * @return string Nom du module - */ - public function getNom($langs) - { - return $this->name; - } + /** Return name of module + * + * @param Translate $langs Object langs + * @return string Nom du module + */ + public function getNom($langs) + { + return $this->name; + } - /** Return an example of numbering - * - * @param Translate $langs Object langs - * @return string Example - */ - public function getExample($langs) - { - $langs->load("bills"); - return $langs->trans("NoExample"); - } + /** Return an example of numbering + * + * @param Translate $langs Object langs + * @return string Example + */ + public function getExample($langs) + { + $langs->load("bills"); + return $langs->trans("NoExample"); + } - /** - * Checks if the numbers already in the database do not - * cause conflicts that would prevent this numbering working. - * - * @return boolean false if conflict, true if ok - */ - public function canBeActivated() - { - return true; - } + /** + * Checks if the numbers already in the database do not + * cause conflicts that would prevent this numbering working. + * + * @return boolean false if conflict, true if ok + */ + public function canBeActivated() + { + return true; + } - /** - * Return next value available - * - * @param Societe $objsoc Object thirdparty - * @param int $type Type - * @return string Value - */ - public function getNextValue($objsoc = 0, $type = -1) - { - global $langs; - return $langs->trans("Function_getNextValue_InModuleNotWorking"); - } + /** + * Return next value available + * + * @param Societe $objsoc Object thirdparty + * @param int $type Type + * @return string Value + */ + public function getNextValue($objsoc = 0, $type = -1) + { + global $langs; + return $langs->trans("Function_getNextValue_InModuleNotWorking"); + } - /** - * Return version of module - * - * @return string Version - */ - public function getVersion() - { - global $langs; - $langs->load("admin"); + /** + * Return version of module + * + * @return string Version + */ + public function getVersion() + { + global $langs; + $langs->load("admin"); - if ($this->version == 'development') return $langs->trans("VersionDevelopment"); - if ($this->version == 'experimental') return $langs->trans("VersionExperimental"); - if ($this->version == 'dolibarr') return DOL_VERSION; - if ($this->version) return $this->version; - return $langs->trans("NotAvailable"); - } + if ($this->version == 'development') return $langs->trans("VersionDevelopment"); + if ($this->version == 'experimental') return $langs->trans("VersionExperimental"); + if ($this->version == 'dolibarr') return DOL_VERSION; + if ($this->version) return $this->version; + return $langs->trans("NotAvailable"); + } - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps - /** - * Renvoie la liste des modeles de numérotation - * - * @param DoliDB $db Database handler - * @param integer $maxfilenamelength Max length of value to show - * @return array List of numbers - */ - public static function liste_modeles($db, $maxfilenamelength = 0) - { - // phpcs:enable - $liste=array(); - $sql =""; + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps + /** + * Renvoie la liste des modeles de numérotation + * + * @param DoliDB $db Database handler + * @param integer $maxfilenamelength Max length of value to show + * @return array List of numbers + */ + public static function liste_modeles($db, $maxfilenamelength = 0) + { + // phpcs:enable + $liste=array(); + $sql =""; - $resql = $db->query($sql); - if ($resql) - { - $num = $db->num_rows($resql); - $i = 0; - while ($i < $num) - { - $row = $db->fetch_row($resql); - $liste[$row[0]]=$row[1]; - $i++; - } - } - else - { - return -1; - } - return $liste; - } + $resql = $db->query($sql); + if ($resql) + { + $num = $db->num_rows($resql); + $i = 0; + while ($i < $num) + { + $row = $db->fetch_row($resql); + $liste[$row[0]]=$row[1]; + $i++; + } + } + else + { + return -1; + } + return $liste; + } - /** - * Return description of module parameters - * - * @param Translate $langs Output language - * @param Societe $soc Third party object - * @param int $type -1=Nothing, 0=Customer, 1=Supplier - * @return string HTML translated description - */ - public function getToolTip($langs, $soc, $type) - { - global $conf; + /** + * Return description of module parameters + * + * @param Translate $langs Output language + * @param Societe $soc Third party object + * @param int $type -1=Nothing, 0=Customer, 1=Supplier + * @return string HTML translated description + */ + public function getToolTip($langs, $soc, $type) + { + global $conf; - $langs->load("admin"); + $langs->load("admin"); - $s=''; - if ($type == -1) $s.=$langs->trans("Name").': '.$this->getNom($langs).'
'; - if ($type == -1) $s.=$langs->trans("Version").': '.$this->getVersion().'
'; - if ($type == 0) $s.=$langs->trans("CustomerCodeDesc").'
'; - if ($type == 1) $s.=$langs->trans("SupplierCodeDesc").'
'; - if ($type != -1) $s.=$langs->trans("ValidityControledByModule").': '.$this->getNom($langs).'
'; - $s.='
'; - $s.=''.$langs->trans("ThisIsModuleRules").':
'; - if ($type == 0) - { - $s.=$langs->trans("RequiredIfCustomer").': '; - if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='';
- $s.=yn(!$this->code_null, 1, 2);
- if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.=' '.yn(1, 1, 2).' ('.$langs->trans("ForcedToByAModule", $langs->transnoentities("yes")).')';
- $s.='
'; - } - if ($type == 1) - { - $s.=$langs->trans("RequiredIfSupplier").': '; - if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='';
- $s.=yn(!$this->code_null, 1, 2);
- if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.=' '.yn(1, 1, 2).' ('.$langs->trans("ForcedToByAModule", $langs->transnoentities("yes")).')';
- $s.='
'; - } - if ($type == -1) - { - $s.=$langs->trans("Required").': '; - if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='';
- $s.=yn(!$this->code_null, 1, 2);
- if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.=' '.yn(1, 1, 2).' ('.$langs->trans("ForcedToByAModule", $langs->transnoentities("yes")).')';
- $s.='
'; - } - $s.=$langs->trans("CanBeModifiedIfOk").': '; - $s.=yn($this->code_modifiable, 1, 2); - $s.='
'; - $s.=$langs->trans("CanBeModifiedIfKo").': '.yn($this->code_modifiable_invalide, 1, 2).'
'; - $s.=$langs->trans("AutomaticCode").': '.yn($this->code_auto, 1, 2).'
'; - $s.='
'; - if ($type == 0 || $type == -1) - { - $nextval=$this->getNextValue($soc, 0); - if (empty($nextval)) $nextval=$langs->trans("Undefined"); - $s.=$langs->trans("NextValue").($type == -1?' ('.$langs->trans("Customer").')':'').': '.$nextval.'
'; - } - if ($type == 1 || $type == -1) - { - $nextval=$this->getNextValue($soc, 1); - if (empty($nextval)) $nextval=$langs->trans("Undefined"); - $s.=$langs->trans("NextValue").($type == -1?' ('.$langs->trans("Supplier").')':'').': '.$nextval.''; - } - return $s; - } + $s=''; + if ($type == -1) $s.=$langs->trans("Name").': '.$this->getNom($langs).'
'; + if ($type == -1) $s.=$langs->trans("Version").': '.$this->getVersion().'
'; + if ($type == 0) $s.=$langs->trans("CustomerCodeDesc").'
'; + if ($type == 1) $s.=$langs->trans("SupplierCodeDesc").'
'; + if ($type != -1) $s.=$langs->trans("ValidityControledByModule").': '.$this->getNom($langs).'
'; + $s.='
'; + $s.=''.$langs->trans("ThisIsModuleRules").':
'; + if ($type == 0) + { + $s.=$langs->trans("RequiredIfCustomer").': '; + if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='';
+ $s.=yn(!$this->code_null, 1, 2);
+ if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.=' '.yn(1, 1, 2).' ('.$langs->trans("ForcedToByAModule", $langs->transnoentities("yes")).')';
+ $s.='
'; + } + if ($type == 1) + { + $s.=$langs->trans("RequiredIfSupplier").': '; + if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='';
+ $s.=yn(!$this->code_null, 1, 2);
+ if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.=' '.yn(1, 1, 2).' ('.$langs->trans("ForcedToByAModule", $langs->transnoentities("yes")).')';
+ $s.='
'; + } + if ($type == -1) + { + $s.=$langs->trans("Required").': '; + if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='';
+ $s.=yn(!$this->code_null, 1, 2);
+ if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.=' '.yn(1, 1, 2).' ('.$langs->trans("ForcedToByAModule", $langs->transnoentities("yes")).')';
+ $s.='
'; + } + $s.=$langs->trans("CanBeModifiedIfOk").': '; + $s.=yn($this->code_modifiable, 1, 2); + $s.='
'; + $s.=$langs->trans("CanBeModifiedIfKo").': '.yn($this->code_modifiable_invalide, 1, 2).'
'; + $s.=$langs->trans("AutomaticCode").': '.yn($this->code_auto, 1, 2).'
'; + $s.='
'; + if ($type == 0 || $type == -1) + { + $nextval=$this->getNextValue($soc, 0); + if (empty($nextval)) $nextval=$langs->trans("Undefined"); + $s.=$langs->trans("NextValue").($type == -1?' ('.$langs->trans("Customer").')':'').': '.$nextval.'
'; + } + if ($type == 1 || $type == -1) + { + $nextval=$this->getNextValue($soc, 1); + if (empty($nextval)) $nextval=$langs->trans("Undefined"); + $s.=$langs->trans("NextValue").($type == -1?' ('.$langs->trans("Supplier").')':'').': '.$nextval.''; + } + return $s; + } - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps /** * Check if mask/numbering use prefix * * @return int 0=no, 1=yes - */ - public function verif_prefixIsUsed() - { - // phpcs:enable - return 0; - } + */ + public function verif_prefixIsUsed() + { + // phpcs:enable + return 0; + } } @@ -266,119 +266,119 @@ abstract class ModeleThirdPartyCode */ abstract class ModeleAccountancyCode { - /** + /** * @var string Error code (or message) */ public $error=''; - /** - * Return description of module - * - * @param Translate $langs Object langs - * @return string Description of module - */ - public function info($langs) - { - $langs->load("bills"); - return $langs->trans("NoDescription"); - } + /** + * Return description of module + * + * @param Translate $langs Object langs + * @return string Description of module + */ + public function info($langs) + { + $langs->load("bills"); + return $langs->trans("NoDescription"); + } - /** - * Return an example of result returned by getNextValue - * - * @param Translate $langs Object langs - * @param societe $objsoc Object thirdparty - * @param int $type Type of third party (1:customer, 2:supplier, -1:autodetect) - * @return string Example - */ - public function getExample($langs, $objsoc = 0, $type = -1) - { - $langs->load("bills"); - return $langs->trans("NoExample"); - } + /** + * Return an example of result returned by getNextValue + * + * @param Translate $langs Object langs + * @param societe $objsoc Object thirdparty + * @param int $type Type of third party (1:customer, 2:supplier, -1:autodetect) + * @return string Example + */ + public function getExample($langs, $objsoc = 0, $type = -1) + { + $langs->load("bills"); + return $langs->trans("NoExample"); + } - /** - * Checks if the numbers already in the database do not - * cause conflicts that would prevent this numbering working. - * - * @return boolean false if conflict, true if ok - */ - public function canBeActivated() - { - return true; - } + /** + * Checks if the numbers already in the database do not + * cause conflicts that would prevent this numbering working. + * + * @return boolean false if conflict, true if ok + */ + public function canBeActivated() + { + return true; + } - /** - * Return version of module - * - * @return string Version - */ - public function getVersion() - { - global $langs; - $langs->load("admin"); + /** + * Return version of module + * + * @return string Version + */ + public function getVersion() + { + global $langs; + $langs->load("admin"); - if ($this->version == 'development') return $langs->trans("VersionDevelopment"); - if ($this->version == 'experimental') return $langs->trans("VersionExperimental"); - if ($this->version == 'dolibarr') return DOL_VERSION; - if ($this->version) return $this->version; - return $langs->trans("NotAvailable"); - } + if ($this->version == 'development') return $langs->trans("VersionDevelopment"); + if ($this->version == 'experimental') return $langs->trans("VersionExperimental"); + if ($this->version == 'dolibarr') return DOL_VERSION; + if ($this->version) return $this->version; + return $langs->trans("NotAvailable"); + } - /** - * Return description of module parameters - * - * @param Translate $langs Output language - * @param Societe $soc Third party object - * @param int $type -1=Nothing, 0=Customer, 1=Supplier - * @return string HTML translated description - */ - public function getToolTip($langs, $soc, $type) - { - global $conf,$db; + /** + * Return description of module parameters + * + * @param Translate $langs Output language + * @param Societe $soc Third party object + * @param int $type -1=Nothing, 0=Customer, 1=Supplier + * @return string HTML translated description + */ + public function getToolTip($langs, $soc, $type) + { + global $conf,$db; - $langs->load("admin"); + $langs->load("admin"); - $s=''; - if ($type == -1) $s.=$langs->trans("Name").': '.$this->name.'
'; - if ($type == -1) $s.=$langs->trans("Version").': '.$this->getVersion().'
'; - //$s.='
'; - //$s.=''.$langs->trans("ThisIsModuleRules").':
'; - $s.='
'; - if ($type == 0 || $type == -1) - { - $result=$this->get_code($db, $soc, 'customer'); - $nextval=$this->code; - if (empty($nextval)) $nextval=$langs->trans("Undefined"); - $s.=$langs->trans("NextValue").($type == -1?' ('.$langs->trans("Customer").')':'').': '.$nextval.'
'; - } - if ($type == 1 || $type == -1) - { - $result=$this->get_code($db, $soc, 'supplier'); - $nextval=$this->code; - if (empty($nextval)) $nextval=$langs->trans("Undefined"); - $s.=$langs->trans("NextValue").($type == -1?' ('.$langs->trans("Supplier").')':'').': '.$nextval.''; - } - return $s; - } + $s=''; + if ($type == -1) $s.=$langs->trans("Name").': '.$this->name.'
'; + if ($type == -1) $s.=$langs->trans("Version").': '.$this->getVersion().'
'; + //$s.='
'; + //$s.=''.$langs->trans("ThisIsModuleRules").':
'; + $s.='
'; + if ($type == 0 || $type == -1) + { + $result=$this->get_code($db, $soc, 'customer'); + $nextval=$this->code; + if (empty($nextval)) $nextval=$langs->trans("Undefined"); + $s.=$langs->trans("NextValue").($type == -1?' ('.$langs->trans("Customer").')':'').': '.$nextval.'
'; + } + if ($type == 1 || $type == -1) + { + $result=$this->get_code($db, $soc, 'supplier'); + $nextval=$this->code; + if (empty($nextval)) $nextval=$langs->trans("Undefined"); + $s.=$langs->trans("NextValue").($type == -1?' ('.$langs->trans("Supplier").')':'').': '.$nextval.''; + } + return $s; + } - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps - /** - * Set accountancy account code for a third party into this->code - * - * @param DoliDB $db Database handler - * @param Societe $societe Third party object - * @param int $type 'customer' or 'supplier' - * @return int >=0 if OK, <0 if KO - */ - public function get_code($db, $societe, $type = '') - { - // phpcs:enable - global $langs; + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps + /** + * Set accountancy account code for a third party into this->code + * + * @param DoliDB $db Database handler + * @param Societe $societe Third party object + * @param int $type 'customer' or 'supplier' + * @return int >=0 if OK, <0 if KO + */ + public function get_code($db, $societe, $type = '') + { + // phpcs:enable + global $langs; - return $langs->trans("NotAvailable"); - } + return $langs->trans("NotAvailable"); + } } @@ -399,7 +399,7 @@ abstract class ModeleAccountancyCode */ function thirdparty_doc_create(DoliDB $db, Societe $object, $message, $modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0) { - dol_syslog(__METHOD__ . " is deprecated", LOG_WARNING); + dol_syslog(__METHOD__ . " is deprecated", LOG_WARNING); - return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref); + return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref); } diff --git a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php index f6bf6480c0f..a4d75326395 100644 --- a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php +++ b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php @@ -32,15 +32,15 @@ require_once DOL_DOCUMENT_ROOT .'/core/modules/supplier_order/modules_commandefo class mod_commande_fournisseur_muguet extends ModeleNumRefSuppliersOrders { /** - * Dolibarr version of the loaded document - * @var string - */ + * Dolibarr version of the loaded document + * @var string + */ public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' /** - * @var string Error code (or message) - */ - public $error = ''; + * @var string Error code (or message) + */ + public $error = ''; /** * @var string Nom du modele @@ -62,118 +62,118 @@ class mod_commande_fournisseur_muguet extends ModeleNumRefSuppliersOrders */ public function __construct() { - global $conf; + global $conf; - if ((float) $conf->global->MAIN_VERSION_LAST_INSTALL >= 5.0) $this->prefix = 'PO'; // We use correct standard code "PO = Purchase Order" + if ((float) $conf->global->MAIN_VERSION_LAST_INSTALL >= 5.0) $this->prefix = 'PO'; // We use correct standard code "PO = Purchase Order" } - /** - * Return description of numbering module - * - * @return string Text with description - */ - public function info() - { - global $langs; - return $langs->trans("SimpleNumRefModelDesc", $this->prefix); - } + /** + * Return description of numbering module + * + * @return string Text with description + */ + public function info() + { + global $langs; + return $langs->trans("SimpleNumRefModelDesc", $this->prefix); + } - /** - * Return an example of numbering - * - * @return string Example - */ - public function getExample() - { - return $this->prefix."0501-0001"; - } + /** + * Return an example of numbering + * + * @return string Example + */ + public function getExample() + { + return $this->prefix."0501-0001"; + } - /** - * Checks if the numbers already in the database do not - * cause conflicts that would prevent this numbering working. - * - * @return boolean false if conflict, true if ok - */ - public function canBeActivated() - { - global $conf,$langs,$db; + /** + * Checks if the numbers already in the database do not + * cause conflicts that would prevent this numbering working. + * + * @return boolean false if conflict, true if ok + */ + public function canBeActivated() + { + global $conf,$langs,$db; - $coyymm=''; $max=''; + $coyymm=''; $max=''; $posindice=8; $sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max"; - $sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur"; + $sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur"; $sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'"; - $sql.= " AND entity = ".$conf->entity; - $resql=$db->query($sql); - if ($resql) - { - $row = $db->fetch_row($resql); - if ($row) { $coyymm = substr($row[0], 0, 6); $max=$row[0]; } - } - if (! $coyymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $coyymm)) - { - return true; - } - else - { + $sql.= " AND entity = ".$conf->entity; + $resql=$db->query($sql); + if ($resql) + { + $row = $db->fetch_row($resql); + if ($row) { $coyymm = substr($row[0], 0, 6); $max=$row[0]; } + } + if (! $coyymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $coyymm)) + { + return true; + } + else + { $langs->load("errors"); $this->error=$langs->trans('ErrorNumRefModel', $max); - return false; - } - } + return false; + } + } - /** - * Return next value + /** + * Return next value * * @param Societe $objsoc Object third party * @param Object $object Object * @return string Value if OK, 0 if KO - */ - public function getNextValue($objsoc = 0, $object = '') - { - global $db,$conf; + */ + public function getNextValue($objsoc = 0, $object = '') + { + global $db,$conf; - // D'abord on recupere la valeur max - $posindice=8; - $sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max"; - $sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur"; + // D'abord on recupere la valeur max + $posindice=8; + $sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max"; + $sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur"; $sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'"; - $sql.= " AND entity = ".$conf->entity; + $sql.= " AND entity = ".$conf->entity; - $resql=$db->query($sql); - if ($resql) - { - $obj = $db->fetch_object($resql); - if ($obj) $max = intval($obj->max); - else $max=0; - } + $resql=$db->query($sql); + if ($resql) + { + $obj = $db->fetch_object($resql); + if ($obj) $max = intval($obj->max); + else $max=0; + } //$date=time(); - $date=$object->date_commande; // Not always defined - if (empty($date)) $date=$object->date; // Creation date is order date for suppliers orders - $yymm = strftime("%y%m", $date); + $date=$object->date_commande; // Not always defined + if (empty($date)) $date=$object->date; // Creation date is order date for suppliers orders + $yymm = strftime("%y%m", $date); - if ($max >= (pow(10, 4) - 1)) $num=$max+1; // If counter > 9999, we do not format on 4 chars, we take number as it is - else $num = sprintf("%04s", $max+1); + if ($max >= (pow(10, 4) - 1)) $num=$max+1; // If counter > 9999, we do not format on 4 chars, we take number as it is + else $num = sprintf("%04s", $max+1); - return $this->prefix.$yymm."-".$num; - } + return $this->prefix.$yymm."-".$num; + } - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps - /** - * Renvoie la reference de commande suivante non utilisee - * + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps + /** + * Renvoie la reference de commande suivante non utilisee + * * @param Societe $objsoc Object third party * @param Object $object Object - * @return string Texte descripif - */ - public function commande_get_num($objsoc = 0, $object = '') - { - // phpcs:enable - return $this->getNextValue($objsoc, $object); - } + * @return string Texte descripif + */ + public function commande_get_num($objsoc = 0, $object = '') + { + // phpcs:enable + return $this->getNextValue($objsoc, $object); + } } diff --git a/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php b/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php index c3499bdbf8d..b10a45dfa8b 100644 --- a/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php +++ b/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php @@ -30,9 +30,9 @@ require_once DOL_DOCUMENT_ROOT .'/core/modules/supplier_payment/modules_supplier class mod_supplier_payment_bronan extends ModeleNumRefSupplierPayments { /** - * Dolibarr version of the loaded document - * @var string - */ + * Dolibarr version of the loaded document + * @var string + */ public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' public $prefix='SPAY'; @@ -55,16 +55,16 @@ class mod_supplier_payment_bronan extends ModeleNumRefSupplierPayments public $name='Bronan'; - /** - * Return description of numbering module - * - * @return string Text with description - */ - public function info() - { - global $langs; - return $langs->trans("SimpleNumRefModelDesc", $this->prefix); - } + /** + * Return description of numbering module + * + * @return string Text with description + */ + public function info() + { + global $langs; + return $langs->trans("SimpleNumRefModelDesc", $this->prefix); + } /** @@ -79,8 +79,8 @@ class mod_supplier_payment_bronan extends ModeleNumRefSupplierPayments /** - * Checks if the numbers already in the database do not - * cause conflicts that would prevent this numbering working. + * Checks if the numbers already in the database do not + * cause conflicts that would prevent this numbering working. * * @return boolean false if conflict, true if ok */ @@ -147,15 +147,15 @@ class mod_supplier_payment_bronan extends ModeleNumRefSupplierPayments $date=$object->datepaye; $yymm = strftime("%y%m", $date); - if ($max >= (pow(10, 4) - 1)) $num=$max+1; // If counter > 9999, we do not format on 4 chars, we take number as it is - else $num = sprintf("%04s", $max+1); + if ($max >= (pow(10, 4) - 1)) $num=$max+1; // If counter > 9999, we do not format on 4 chars, we take number as it is + else $num = sprintf("%04s", $max+1); dol_syslog(__METHOD__." return ".$this->prefix.$yymm."-".$num); return $this->prefix.$yymm."-".$num; } - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps /** * Return next free value * @@ -165,7 +165,7 @@ class mod_supplier_payment_bronan extends ModeleNumRefSupplierPayments */ public function payment_get_num($objsoc, $objforref) { - // phpcs:enable + // phpcs:enable return $this->getNextValue($objsoc, $objforref); } } diff --git a/htdocs/core/modules/supplier_payment/modules_supplier_payment.php b/htdocs/core/modules/supplier_payment/modules_supplier_payment.php index f020e501c1e..88476330d13 100644 --- a/htdocs/core/modules/supplier_payment/modules_supplier_payment.php +++ b/htdocs/core/modules/supplier_payment/modules_supplier_payment.php @@ -28,17 +28,17 @@ abstract class ModelePDFSuppliersPayments extends CommonDocGenerator public $error=''; - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps /** * Return list of active generation models * - * @param DoliDB $db Database handler - * @param integer $maxfilenamelength Max length of value to show - * @return array List of numbers - */ + * @param DoliDB $db Database handler + * @param integer $maxfilenamelength Max length of value to show + * @return array List of numbers + */ public static function liste_modeles($db, $maxfilenamelength = 0) { - // phpcs:enable + // phpcs:enable global $conf; $type='supplier_payment'; @@ -98,11 +98,11 @@ abstract class ModeleNumRefSupplierPayments } /** - * Checks if the numbers already in the database do not - * cause conflicts that would prevent this numbering working. - * - * @return boolean false if conflict, true if ok - */ + * Checks if the numbers already in the database do not + * cause conflicts that would prevent this numbering working. + * + * @return boolean false if conflict, true if ok + */ public function canBeActivated() { return true; diff --git a/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php index a340f3eddd1..2af31145b94 100644 --- a/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php +++ b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php @@ -32,9 +32,9 @@ require_once DOL_DOCUMENT_ROOT .'/core/modules/supplier_proposal/modules_supplie class mod_supplier_proposal_marbre extends ModeleNumRefSupplierProposal { /** - * Dolibarr version of the loaded document - * @var string - */ + * Dolibarr version of the loaded document + * @var string + */ public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' public $prefix='RQ'; // RQ = Request for quotation @@ -57,16 +57,16 @@ class mod_supplier_proposal_marbre extends ModeleNumRefSupplierProposal public $name='Marbre'; - /** - * Return description of numbering module - * - * @return string Text with description - */ - public function info() - { - global $langs; - return $langs->trans("SimpleNumRefModelDesc", $this->prefix); - } + /** + * Return description of numbering module + * + * @return string Text with description + */ + public function info() + { + global $langs; + return $langs->trans("SimpleNumRefModelDesc", $this->prefix); + } /** @@ -81,8 +81,8 @@ class mod_supplier_proposal_marbre extends ModeleNumRefSupplierProposal /** - * Checks if the numbers already in the database do not - * cause conflicts that would prevent this numbering working. + * Checks if the numbers already in the database do not + * cause conflicts that would prevent this numbering working. * * @return boolean false if conflict, true if ok */ diff --git a/htdocs/core/modules/takepos/modules_takepos.php b/htdocs/core/modules/takepos/modules_takepos.php index e077cda7b6b..28ac39c3f0f 100644 --- a/htdocs/core/modules/takepos/modules_takepos.php +++ b/htdocs/core/modules/takepos/modules_takepos.php @@ -47,21 +47,21 @@ abstract class ModeleNumRefTakepos * @return boolean true if module can be used */ public function isEnabled() - { - return true; - } + { + return true; + } /** * Renvoi la description par defaut du modele de numerotation * * @return string Texte descripif */ - public function info() - { - global $langs; - $langs->load("cashdesk@cashdesk"); - return $langs->trans("NoDescription"); - } + public function info() + { + global $langs; + $langs->load("cashdesk@cashdesk"); + return $langs->trans("NoDescription"); + } /** * Return an example of numbering @@ -69,11 +69,11 @@ abstract class ModeleNumRefTakepos * @return string Example */ public function getExample() - { - global $langs; - $langs->load('cashdesk@cashdesk'); - return $langs->trans('NoExample'); - } + { + global $langs; + $langs->load('cashdesk@cashdesk'); + return $langs->trans('NoExample'); + } /** * Checks if the numbers already in the database do not @@ -82,20 +82,20 @@ abstract class ModeleNumRefTakepos * @return boolean false if conflict, true if ok */ public function canBeActivated() - { - return true; - } + { + return true; + } - /** - * Renvoi prochaine valeur attribuee - * - * @return string Valeur - */ + /** + * Renvoi prochaine valeur attribuee + * + * @return string Valeur + */ public function getNextValue() - { - global $langs; - return $langs->trans('NotAvailable'); - } + { + global $langs; + return $langs->trans('NotAvailable'); + } /** * Renvoi version du modele de numerotation @@ -103,14 +103,14 @@ abstract class ModeleNumRefTakepos * @return string Valeur */ public function getVersion() - { - global $langs; - $langs->load("admin"); + { + global $langs; + $langs->load("admin"); - if ($this->version == 'development') return $langs->trans('VersionDevelopment'); - if ($this->version == 'experimental') return $langs->trans('VersionExperimental'); - if ($this->version == 'dolibarr') return DOL_VERSION; - if ($this->version) return $this->version; - return $langs->trans('NotAvailable'); - } + if ($this->version == 'development') return $langs->trans('VersionDevelopment'); + if ($this->version == 'experimental') return $langs->trans('VersionExperimental'); + if ($this->version == 'dolibarr') return DOL_VERSION; + if ($this->version) return $this->version; + return $langs->trans('NotAvailable'); + } } diff --git a/htdocs/core/modules/ticket/mod_ticket_simple.php b/htdocs/core/modules/ticket/mod_ticket_simple.php index a6fbb6fde72..f5e5f025175 100644 --- a/htdocs/core/modules/ticket/mod_ticket_simple.php +++ b/htdocs/core/modules/ticket/mod_ticket_simple.php @@ -30,20 +30,20 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/ticket/modules_ticket.php'; */ class mod_ticket_simple extends ModeleNumRefTicket { - /** - * Dolibarr version of the loaded document - * @var string - */ + /** + * Dolibarr version of the loaded document + * @var string + */ public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' - public $prefix = 'TS'; + public $prefix = 'TS'; - /** - * @var string Error code (or message) - */ - public $error = ''; + /** + * @var string Error code (or message) + */ + public $error = ''; - /** + /** * @var string Nom du modele * @deprecated * @see $name @@ -55,108 +55,108 @@ class mod_ticket_simple extends ModeleNumRefTicket */ public $name='Simple'; - /** - * Return description of numbering module - * - * @return string Text with description - */ - public function info() - { - global $langs; - return $langs->trans("SimpleNumRefModelDesc", $this->prefix); - } + /** + * Return description of numbering module + * + * @return string Text with description + */ + public function info() + { + global $langs; + return $langs->trans("SimpleNumRefModelDesc", $this->prefix); + } - /** - * Return an example of numbering module values - * - * @return string Example - */ - public function getExample() - { - return $this->prefix . "0501-0001"; - } + /** + * Return an example of numbering module values + * + * @return string Example + */ + public function getExample() + { + return $this->prefix . "0501-0001"; + } - /** - * Checks if the numbers already in the database do not - * cause conflicts that would prevent this numbering working. - * - * @return boolean false if conflict, true if ok - */ - public function canBeActivated() - { - global $conf, $langs, $db; + /** + * Checks if the numbers already in the database do not + * cause conflicts that would prevent this numbering working. + * + * @return boolean false if conflict, true if ok + */ + public function canBeActivated() + { + global $conf, $langs, $db; - $coyymm = ''; - $max = ''; + $coyymm = ''; + $max = ''; - $posindice = 8; - $sql = "SELECT MAX(CAST(SUBSTRING(ref FROM " . $posindice . ") AS SIGNED)) as max"; - $sql .= " FROM " . MAIN_DB_PREFIX . "ticket"; - $search = $this->prefix . "____-%"; - $sql .= " WHERE ref LIKE '" . $search ."'"; - $sql .= " AND entity = " . $conf->entity; - $resql = $db->query($sql); - if ($resql) { - $row = $db->fetch_row($resql); - if ($row) { - $coyymm = substr($row[0], 0, 6); - $max = $row[0]; - } - } - if (!$coyymm || preg_match('/' . $this->prefix . '[0-9][0-9][0-9][0-9]/i', $coyymm)) { - return true; - } else { - $langs->load("errors"); - $this->error = $langs->trans('ErrorNumRefModel', $max); - return false; - } - } + $posindice = 8; + $sql = "SELECT MAX(CAST(SUBSTRING(ref FROM " . $posindice . ") AS SIGNED)) as max"; + $sql .= " FROM " . MAIN_DB_PREFIX . "ticket"; + $search = $this->prefix . "____-%"; + $sql .= " WHERE ref LIKE '" . $search ."'"; + $sql .= " AND entity = " . $conf->entity; + $resql = $db->query($sql); + if ($resql) { + $row = $db->fetch_row($resql); + if ($row) { + $coyymm = substr($row[0], 0, 6); + $max = $row[0]; + } + } + if (!$coyymm || preg_match('/' . $this->prefix . '[0-9][0-9][0-9][0-9]/i', $coyymm)) { + return true; + } else { + $langs->load("errors"); + $this->error = $langs->trans('ErrorNumRefModel', $max); + return false; + } + } - /** - * Return next value - * - * @param Societe $objsoc Object third party - * @param Project $ticket Object ticket - * @return string Value if OK, 0 if KO - */ - public function getNextValue($objsoc, $ticket) - { - global $db, $conf; + /** + * Return next value + * + * @param Societe $objsoc Object third party + * @param Project $ticket Object ticket + * @return string Value if OK, 0 if KO + */ + public function getNextValue($objsoc, $ticket) + { + global $db, $conf; - // D'abord on recupere la valeur max - $posindice = 8; - $sql = "SELECT MAX(CAST(SUBSTRING(ref FROM " . $posindice . ") AS SIGNED)) as max"; - $sql .= " FROM " . MAIN_DB_PREFIX . "ticket"; - $search = $this->prefix . "____-%"; - $sql .= " WHERE ref LIKE '" . $search ."'"; - $sql .= " AND entity = " . $conf->entity; + // D'abord on recupere la valeur max + $posindice = 8; + $sql = "SELECT MAX(CAST(SUBSTRING(ref FROM " . $posindice . ") AS SIGNED)) as max"; + $sql .= " FROM " . MAIN_DB_PREFIX . "ticket"; + $search = $this->prefix . "____-%"; + $sql .= " WHERE ref LIKE '" . $search ."'"; + $sql .= " AND entity = " . $conf->entity; - $resql = $db->query($sql); - if ($resql) { - $obj = $db->fetch_object($resql); - if ($obj) { - $max = intval($obj->max); - } else { - $max = 0; - } - } else { - dol_syslog("mod_ticket_simple::getNextValue", LOG_DEBUG); - return -1; - } + $resql = $db->query($sql); + if ($resql) { + $obj = $db->fetch_object($resql); + if ($obj) { + $max = intval($obj->max); + } else { + $max = 0; + } + } else { + dol_syslog("mod_ticket_simple::getNextValue", LOG_DEBUG); + return -1; + } - $date = empty($ticket->datec) ? dol_now() : $ticket->datec; + $date = empty($ticket->datec) ? dol_now() : $ticket->datec; - //$yymm = strftime("%y%m",time()); - $yymm = strftime("%y%m", $date); + //$yymm = strftime("%y%m",time()); + $yymm = strftime("%y%m", $date); - if ($max >= (pow(10, 4) - 1)) { - $num = $max + 1; - } // If counter > 9999, we do not format on 4 chars, we take number as it is - else { - $num = sprintf("%04s", $max + 1); - } + if ($max >= (pow(10, 4) - 1)) { + $num = $max + 1; + } // If counter > 9999, we do not format on 4 chars, we take number as it is + else { + $num = sprintf("%04s", $max + 1); + } - dol_syslog("mod_ticket_simple::getNextValue return " . $this->prefix . $yymm . "-" . $num); - return $this->prefix . $yymm . "-" . $num; - } + dol_syslog("mod_ticket_simple::getNextValue return " . $this->prefix . $yymm . "-" . $num); + return $this->prefix . $yymm . "-" . $num; + } } diff --git a/htdocs/core/modules/ticket/modules_ticket.php b/htdocs/core/modules/ticket/modules_ticket.php index ee50071b591..ad8394fa91e 100644 --- a/htdocs/core/modules/ticket/modules_ticket.php +++ b/htdocs/core/modules/ticket/modules_ticket.php @@ -29,95 +29,95 @@ */ abstract class ModeleNumRefTicket { - /** - * @var string Error code (or message) - */ - public $error = ''; + /** + * @var string Error code (or message) + */ + public $error = ''; - /** - * Return if a module can be used or not - * - * @return boolean true if module can be used - */ - public function isEnabled() - { - return true; - } + /** + * Return if a module can be used or not + * + * @return boolean true if module can be used + */ + public function isEnabled() + { + return true; + } - /** - * Renvoi la description par defaut du modele de numerotation - * - * @return string Texte descripif - */ - public function info() - { - global $langs; - $langs->load("ticket"); - return $langs->trans("NoDescription"); - } + /** + * Renvoi la description par defaut du modele de numerotation + * + * @return string Texte descripif + */ + public function info() + { + global $langs; + $langs->load("ticket"); + return $langs->trans("NoDescription"); + } - /** - * Return an example of numbering - * - * @return string Example - */ - public function getExample() - { - global $langs; - $langs->load("ticket"); - return $langs->trans("NoExample"); - } + /** + * Return an example of numbering + * + * @return string Example + */ + public function getExample() + { + global $langs; + $langs->load("ticket"); + return $langs->trans("NoExample"); + } - /** - * Checks if the numbers already in the database do not - * cause conflicts that would prevent this numbering working. - * - * @return boolean false if conflict, true if ok - */ - public function canBeActivated() - { - return true; - } + /** + * Checks if the numbers already in the database do not + * cause conflicts that would prevent this numbering working. + * + * @return boolean false if conflict, true if ok + */ + public function canBeActivated() + { + return true; + } - /** - * Renvoi prochaine valeur attribuee - * - * @param Societe $objsoc Object third party - * @param Project $project Object project - * @return string Valeur - */ - public function getNextValue($objsoc, $project) - { - global $langs; - return $langs->trans("NotAvailable"); - } + /** + * Renvoi prochaine valeur attribuee + * + * @param Societe $objsoc Object third party + * @param Project $project Object project + * @return string Valeur + */ + public function getNextValue($objsoc, $project) + { + global $langs; + return $langs->trans("NotAvailable"); + } - /** - * Renvoi version du module numerotation - * - * @return string Valeur - */ - public function getVersion() - { - global $langs; - $langs->load("admin"); + /** + * Renvoi version du module numerotation + * + * @return string Valeur + */ + public function getVersion() + { + global $langs; + $langs->load("admin"); - if ($this->version == 'development') { - return $langs->trans("VersionDevelopment"); - } + if ($this->version == 'development') { + return $langs->trans("VersionDevelopment"); + } - if ($this->version == 'experimental') { - return $langs->trans("VersionExperimental"); - } + if ($this->version == 'experimental') { + return $langs->trans("VersionExperimental"); + } - if ($this->version == 'dolibarr') { - return DOL_VERSION; - } + if ($this->version == 'dolibarr') { + return DOL_VERSION; + } - if ($this->version) { - return $this->version; - } + if ($this->version) { + return $this->version; + } - return $langs->trans("NotAvailable"); - } + return $langs->trans("NotAvailable"); + } } diff --git a/htdocs/core/tpl/card_presend.tpl.php b/htdocs/core/tpl/card_presend.tpl.php index 37920ed1ebc..f349251d654 100644 --- a/htdocs/core/tpl/card_presend.tpl.php +++ b/htdocs/core/tpl/card_presend.tpl.php @@ -28,8 +28,8 @@ // Protection to avoid direct call of template if (empty($conf) || ! is_object($conf)) { - print "Error, template page can't be called as URL"; - exit; + print "Error, template page can't be called as URL"; + exit; } @@ -54,7 +54,7 @@ if ($action == 'presend') } else { - $fileparams = dol_most_recent_file($diroutput . '/' . $ref, preg_quote($ref, '/').'[^\-]+'); + $fileparams = dol_most_recent_file($diroutput . '/' . $ref, preg_quote($ref, '/').'[^\-]+'); } $file = $fileparams['fullname']; @@ -102,11 +102,11 @@ if ($action == 'presend') } if ($object->element == 'invoice_supplier') { - $fileparams = dol_most_recent_file($diroutput . '/' . get_exdir($object->id, 2, 0, 0, $object, $object->element).$ref, preg_quote($ref, '/').'([^\-])+'); + $fileparams = dol_most_recent_file($diroutput . '/' . get_exdir($object->id, 2, 0, 0, $object, $object->element).$ref, preg_quote($ref, '/').'([^\-])+'); } else { - $fileparams = dol_most_recent_file($diroutput . '/' . $ref, preg_quote($ref, '/').'[^\-]+'); + $fileparams = dol_most_recent_file($diroutput . '/' . $ref, preg_quote($ref, '/').'[^\-]+'); } $file = $fileparams['fullname']; @@ -212,51 +212,51 @@ if ($action == 'presend') complete_substitutions_array($substitutionarray, $outputlangs, $object, $parameters); // Find the good contact address - $tmpobject = $object; - if (($object->element == 'shipping'|| $object->element == 'reception')) { - $origin = $object->origin; - $origin_id = $object->origin_id; + $tmpobject = $object; + if (($object->element == 'shipping'|| $object->element == 'reception')) { + $origin = $object->origin; + $origin_id = $object->origin_id; - if (!empty($origin) && !empty($origin_id)) { - $element = $subelement = $origin; - $regs = array(); - if (preg_match('/^([^_]+)_([^_]+)/i', $origin, $regs)) { - $element = $regs[1]; - $subelement = $regs[2]; - } - // For compatibility - if ($element == 'order') { - $element = $subelement = 'commande'; - } - if ($element == 'propal') { - $element = 'comm/propal'; - $subelement = 'propal'; - } - if ($element == 'contract') { - $element = $subelement = 'contrat'; - } - if ($element == 'inter') { - $element = $subelement = 'ficheinter'; - } - if ($element == 'shipping') { - $element = $subelement = 'expedition'; - } - if ($element == 'order_supplier') { - $element = 'fourn'; - $subelement = 'fournisseur.commande'; - } - if ($element == 'project') { - $element = 'projet'; - } + if (!empty($origin) && !empty($origin_id)) { + $element = $subelement = $origin; + $regs = array(); + if (preg_match('/^([^_]+)_([^_]+)/i', $origin, $regs)) { + $element = $regs[1]; + $subelement = $regs[2]; + } + // For compatibility + if ($element == 'order') { + $element = $subelement = 'commande'; + } + if ($element == 'propal') { + $element = 'comm/propal'; + $subelement = 'propal'; + } + if ($element == 'contract') { + $element = $subelement = 'contrat'; + } + if ($element == 'inter') { + $element = $subelement = 'ficheinter'; + } + if ($element == 'shipping') { + $element = $subelement = 'expedition'; + } + if ($element == 'order_supplier') { + $element = 'fourn'; + $subelement = 'fournisseur.commande'; + } + if ($element == 'project') { + $element = 'projet'; + } - dol_include_once('/' . $element . '/class/' . $subelement . '.class.php'); - $classname = ucfirst($origin); - $objectsrc = new $classname($db); - $objectsrc->fetch($origin_id); + dol_include_once('/' . $element . '/class/' . $subelement . '.class.php'); + $classname = ucfirst($origin); + $objectsrc = new $classname($db); + $objectsrc->fetch($origin_id); - $tmpobject = $objectsrc; - } - } + $tmpobject = $objectsrc; + } + } $custcontact = ''; $contactarr = array(); @@ -264,11 +264,11 @@ if ($action == 'presend') if (is_array($contactarr) && count($contactarr) > 0) { require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php'; - $contactstatic = new Contact($db); + $contactstatic = new Contact($db); foreach ($contactarr as $contact) { - $contactstatic->fetch($contact['id']); - $substitutionarray['__CONTACT_NAME_'.$contact['code'].'__'] = $contactstatic->getFullName($outputlangs, 1); + $contactstatic->fetch($contact['id']); + $substitutionarray['__CONTACT_NAME_'.$contact['code'].'__'] = $contactstatic->getFullName($outputlangs, 1); } } diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php index 05dd4a6a3ab..6400f032252 100644 --- a/htdocs/expedition/list.php +++ b/htdocs/expedition/list.php @@ -183,13 +183,13 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x' if (empty($reshook)) { - $objectclass = 'Expedition'; - $objectlabel = 'Sendings'; - $permissiontoread = $user->rights->expedition->lire; - $permissiontoadd = $user->rights->expedition->creer; - $permissiontodelete = $user->rights->expedition->supprimer; - $uploaddir = $conf->expedition->dir_output.'/sending'; - include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php'; + $objectclass = 'Expedition'; + $objectlabel = 'Sendings'; + $permissiontoread = $user->rights->expedition->lire; + $permissiontoadd = $user->rights->expedition->creer; + $permissiontodelete = $user->rights->expedition->supprimer; + $uploaddir = $conf->expedition->dir_output.'/sending'; + include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php'; } @@ -313,7 +313,7 @@ if ($resql) { $num = $db->num_rows($resql); - $arrayofselected = is_array($toselect) ? $toselect : array(); + $arrayofselected = is_array($toselect) ? $toselect : array(); $expedition = new Expedition($db); @@ -341,18 +341,18 @@ if ($resql) // Add $param from extra fields include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php'; - $arrayofmassactions = array( - 'builddoc' => $langs->trans("PDFMerge"), - //'classifyclose'=>$langs->trans("Close"), TODO massive close shipment ie: when truck is charged - 'presend' => $langs->trans("SendByMail"), - ); - if (in_array($massaction, array('presend'))) $arrayofmassactions = array(); - $massactionbutton = $form->selectMassAction('', $arrayofmassactions); + $arrayofmassactions = array( + 'builddoc' => $langs->trans("PDFMerge"), + //'classifyclose'=>$langs->trans("Close"), TODO massive close shipment ie: when truck is charged + 'presend' => $langs->trans("SendByMail"), + ); + if (in_array($massaction, array('presend'))) $arrayofmassactions = array(); + $massactionbutton = $form->selectMassAction('', $arrayofmassactions); $newcardbutton = ''; if ($user->rights->expedition->creer) { - $newcardbutton .= dolGetButtonTitle($langs->trans('NewSending'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/expedition/card.php?action=create2'); + $newcardbutton .= dolGetButtonTitle($langs->trans('NewSending'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/expedition/card.php?action=create2'); } $i = 0; @@ -367,11 +367,11 @@ if ($resql) print_barre_liste($langs->trans('ListOfSendings'), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, '', 0, $newcardbutton, '', $limit); - $topicmail = "SendShippingRef"; - $modelmail = "shipping_send"; - $objecttmp = new Expedition($db); - $trackid = 'shi'.$object->id; - include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php'; + $topicmail = "SendShippingRef"; + $modelmail = "shipping_send"; + $objecttmp = new Expedition($db); + $trackid = 'shi'.$object->id; + include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php'; if ($sall) { @@ -583,7 +583,7 @@ if ($resql) print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch '); print "\n"; - $typenArray = $formcompany->typent_array(1); + $typenArray = $formcompany->typent_array(1); $i = 0; $totalarray = array(); while ($i < min($num, $limit)) @@ -736,48 +736,48 @@ if ($resql) if (!$i) $totalarray['nbfield']++; } - // Action column - print '';
- if ($massactionbutton || $massaction) // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
- {
- $selected = 0;
- if (in_array($obj->rowid, $arrayofselected)) $selected = 1;
- print '';
- }
- print ' ';
+ // Action column
+ print '';
+ if ($massactionbutton || $massaction) // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+ {
+ $selected = 0;
+ if (in_array($obj->rowid, $arrayofselected)) $selected = 1;
+ print '';
+ }
+ print ' ';
if (!$i) $totalarray['nbfield']++;
print "\n";
$i++;
}
- $db->free($resql);
+ $db->free($resql);
- $parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
- $reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters); // Note that $action and $object may have been modified by hook
- print $hookmanager->resPrint;
+ $parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+ $reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters); // Note that $action and $object may have been modified by hook
+ print $hookmanager->resPrint;
print "
";
print "";
print '';
- $hidegeneratedfilelistifempty = 1;
- if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) $hidegeneratedfilelistifempty = 0;
+ $hidegeneratedfilelistifempty = 1;
+ if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) $hidegeneratedfilelistifempty = 0;
- // Show list of available documents
- $urlsource = $_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
- $urlsource .= str_replace('&', '&', $param);
+ // Show list of available documents
+ $urlsource = $_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
+ $urlsource .= str_replace('&', '&', $param);
- $filedir = $diroutputmassaction;
- $genallowed = $user->rights->expedition->lire;
- $delallowed = $user->rights->expedition->creer;
- $title = '';
+ $filedir = $diroutputmassaction;
+ $genallowed = $user->rights->expedition->lire;
+ $delallowed = $user->rights->expedition->creer;
+ $title = '';
- print $formfile->showdocuments('massfilesarea_sendings', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
+ print $formfile->showdocuments('massfilesarea_sendings', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
}
else
{
- dol_print_error($db);
+ dol_print_error($db);
}
// End of page
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 8cf2e17d804..f6ad3379caa 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -101,7 +101,7 @@ $error = 0;
if ($dirins && $action == 'initmodule' && $modulename)
{
- $modulename = ucfirst($modulename); // Force first letter in uppercase
+ $modulename = ucfirst($modulename); // Force first letter in uppercase
if (preg_match('/[^a-z0-9_]/i', $modulename))
{
@@ -115,8 +115,8 @@ if ($dirins && $action == 'initmodule' && $modulename)
$destdir = $dirins.'/'.strtolower($modulename);
$arrayreplacement = array(
- 'mymodule'=>strtolower($modulename),
- 'MyModule'=>$modulename
+ 'mymodule'=>strtolower($modulename),
+ 'MyModule'=>$modulename
);
$result = dolCopyDir($srcdir, $destdir, 0, 0, $arrayreplacement);
@@ -193,24 +193,24 @@ if ($dirins && $action == 'initmodule' && $modulename)
{
//var_dump($phpfileval['fullname']);
$arrayreplacement = array(
- 'mymodule'=>strtolower($modulename),
- 'MyModule'=>$modulename,
- 'MYMODULE'=>strtoupper($modulename),
- 'My module'=>$modulename,
- 'my module'=>$modulename,
- 'Mon module'=>$modulename,
- 'mon module'=>$modulename,
- 'htdocs/modulebuilder/template'=>strtolower($modulename),
- '---Put here your own copyright and developer email---'=>dol_print_date($now, '%Y').' '.$user->getFullName($langs).($user->email ? ' <'.$user->email.'>' : '')
+ 'mymodule'=>strtolower($modulename),
+ 'MyModule'=>$modulename,
+ 'MYMODULE'=>strtoupper($modulename),
+ 'My module'=>$modulename,
+ 'my module'=>$modulename,
+ 'Mon module'=>$modulename,
+ 'mon module'=>$modulename,
+ 'htdocs/modulebuilder/template'=>strtolower($modulename),
+ '---Put here your own copyright and developer email---'=>dol_print_date($now, '%Y').' '.$user->getFullName($langs).($user->email ? ' <'.$user->email.'>' : '')
);
- if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
- if (!empty($conf->global->MODULEBUILDER_SPECIFIC_EDITOR_NAME)) $arrayreplacement['Editor name'] = $conf->global->MODULEBUILDER_SPECIFIC_EDITOR_NAME;
- if (!empty($conf->global->MODULEBUILDER_SPECIFIC_EDITOR_URL)) $arrayreplacement['https://www.example.com'] = $conf->global->MODULEBUILDER_SPECIFIC_EDITOR_URL;
- if (!empty($conf->global->MODULEBUILDER_SPECIFIC_AUTHOR)) $arrayreplacement['---Put here your own copyright and developer email---'] = dol_print_date($now, '%Y').' '.$conf->global->MODULEBUILDER_SPECIFIC_AUTHOR;
- if (!empty($conf->global->MODULEBUILDER_SPECIFIC_VERSION)) $arrayreplacement['1.0'] = $conf->global->MODULEBUILDER_SPECIFIC_VERSION;
- if (!empty($conf->global->MODULEBUILDER_SPECIFIC_FAMILY)) $arrayreplacement['other'] = $conf->global->MODULEBUILDER_SPECIFIC_FAMILY;
- }
+ if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
+ if (!empty($conf->global->MODULEBUILDER_SPECIFIC_EDITOR_NAME)) $arrayreplacement['Editor name'] = $conf->global->MODULEBUILDER_SPECIFIC_EDITOR_NAME;
+ if (!empty($conf->global->MODULEBUILDER_SPECIFIC_EDITOR_URL)) $arrayreplacement['https://www.example.com'] = $conf->global->MODULEBUILDER_SPECIFIC_EDITOR_URL;
+ if (!empty($conf->global->MODULEBUILDER_SPECIFIC_AUTHOR)) $arrayreplacement['---Put here your own copyright and developer email---'] = dol_print_date($now, '%Y').' '.$conf->global->MODULEBUILDER_SPECIFIC_AUTHOR;
+ if (!empty($conf->global->MODULEBUILDER_SPECIFIC_VERSION)) $arrayreplacement['1.0'] = $conf->global->MODULEBUILDER_SPECIFIC_VERSION;
+ if (!empty($conf->global->MODULEBUILDER_SPECIFIC_FAMILY)) $arrayreplacement['other'] = $conf->global->MODULEBUILDER_SPECIFIC_FAMILY;
+ }
$result = dolReplaceInFile($phpfileval['fullname'], $arrayreplacement);
@@ -239,78 +239,78 @@ if ($dirins && $action == 'initmodule' && $modulename)
if ($dirins && $action == 'initapi' && !empty($module))
{
- $modulename = ucfirst($module); // Force first letter in uppercase
- $objectname = $tabobj;
+ $modulename = ucfirst($module); // Force first letter in uppercase
+ $objectname = $tabobj;
- dol_mkdir($dirins.'/'.strtolower($module).'/class');
- $srcdir = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
- $srcfile = $srcdir.'/class/api_mymodule.class.php';
- $destfile = $dirins.'/'.strtolower($module).'/class/api_'.strtolower($module).'.class.php';
- //var_dump($srcfile);var_dump($destfile);
- $result = dol_copy($srcfile, $destfile, 0, 0);
+ dol_mkdir($dirins.'/'.strtolower($module).'/class');
+ $srcdir = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
+ $srcfile = $srcdir.'/class/api_mymodule.class.php';
+ $destfile = $dirins.'/'.strtolower($module).'/class/api_'.strtolower($module).'.class.php';
+ //var_dump($srcfile);var_dump($destfile);
+ $result = dol_copy($srcfile, $destfile, 0, 0);
- if ($result > 0)
- {
- //var_dump($phpfileval['fullname']);
- $arrayreplacement = array(
- 'mymodule'=>strtolower($modulename),
- 'MyModule'=>$modulename,
- 'MYMODULE'=>strtoupper($modulename),
- 'My module'=>$modulename,
- 'my module'=>$modulename,
- 'Mon module'=>$modulename,
- 'mon module'=>$modulename,
- 'htdocs/modulebuilder/template'=>strtolower($modulename),
- 'myobject'=>strtolower($objectname),
- 'MyObject'=>$objectname,
- 'MYOBJECT'=>strtoupper($objectname),
- '---Put here your own copyright and developer email---'=>dol_print_date($now, '%Y').' '.$user->getFullName($langs).($user->email ? ' <'.$user->email.'>' : '')
- );
+ if ($result > 0)
+ {
+ //var_dump($phpfileval['fullname']);
+ $arrayreplacement = array(
+ 'mymodule'=>strtolower($modulename),
+ 'MyModule'=>$modulename,
+ 'MYMODULE'=>strtoupper($modulename),
+ 'My module'=>$modulename,
+ 'my module'=>$modulename,
+ 'Mon module'=>$modulename,
+ 'mon module'=>$modulename,
+ 'htdocs/modulebuilder/template'=>strtolower($modulename),
+ 'myobject'=>strtolower($objectname),
+ 'MyObject'=>$objectname,
+ 'MYOBJECT'=>strtoupper($objectname),
+ '---Put here your own copyright and developer email---'=>dol_print_date($now, '%Y').' '.$user->getFullName($langs).($user->email ? ' <'.$user->email.'>' : '')
+ );
- dolReplaceInFile($destfile, $arrayreplacement);
- }
- else
- {
- $langs->load("errors");
- setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors');
- }
+ dolReplaceInFile($destfile, $arrayreplacement);
+ }
+ else
+ {
+ $langs->load("errors");
+ setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors');
+ }
}
if ($dirins && $action == 'initphpunit' && !empty($module))
{
- $modulename = ucfirst($module); // Force first letter in uppercase
- $objectname = $tabobj;
+ $modulename = ucfirst($module); // Force first letter in uppercase
+ $objectname = $tabobj;
- dol_mkdir($dirins.'/'.strtolower($module).'/class');
- $srcdir = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
- $srcfile = $srcdir.'/test/phpunit/MyObjectTest.php';
- $destfile = $dirins.'/'.strtolower($module).'/test/phpunit/'.strtolower($objectname).'Test.php';
- $result = dol_copy($srcfile, $destfile, 0, 0);
+ dol_mkdir($dirins.'/'.strtolower($module).'/class');
+ $srcdir = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
+ $srcfile = $srcdir.'/test/phpunit/MyObjectTest.php';
+ $destfile = $dirins.'/'.strtolower($module).'/test/phpunit/'.strtolower($objectname).'Test.php';
+ $result = dol_copy($srcfile, $destfile, 0, 0);
- if ($result > 0)
- {
- //var_dump($phpfileval['fullname']);
- $arrayreplacement = array(
- 'mymodule'=>strtolower($modulename),
- 'MyModule'=>$modulename,
- 'MYMODULE'=>strtoupper($modulename),
- 'My module'=>$modulename,
- 'my module'=>$modulename,
- 'Mon module'=>$modulename,
- 'mon module'=>$modulename,
- 'htdocs/modulebuilder/template'=>strtolower($modulename),
- 'myobject'=>strtolower($objectname),
- 'MyObject'=>$objectname,
- 'MYOBJECT'=>strtoupper($objectname),
- '---Put here your own copyright and developer email---'=>dol_print_date($now, '%Y').' '.$user->getFullName($langs).($user->email ? ' <'.$user->email.'>' : '')
- );
+ if ($result > 0)
+ {
+ //var_dump($phpfileval['fullname']);
+ $arrayreplacement = array(
+ 'mymodule'=>strtolower($modulename),
+ 'MyModule'=>$modulename,
+ 'MYMODULE'=>strtoupper($modulename),
+ 'My module'=>$modulename,
+ 'my module'=>$modulename,
+ 'Mon module'=>$modulename,
+ 'mon module'=>$modulename,
+ 'htdocs/modulebuilder/template'=>strtolower($modulename),
+ 'myobject'=>strtolower($objectname),
+ 'MyObject'=>$objectname,
+ 'MYOBJECT'=>strtoupper($objectname),
+ '---Put here your own copyright and developer email---'=>dol_print_date($now, '%Y').' '.$user->getFullName($langs).($user->email ? ' <'.$user->email.'>' : '')
+ );
- dolReplaceInFile($destfile, $arrayreplacement);
- }
- else
- {
- $langs->load("errors");
- setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors');
- }
+ dolReplaceInFile($destfile, $arrayreplacement);
+ }
+ else
+ {
+ $langs->load("errors");
+ setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors');
+ }
}
if ($dirins && $action == 'initsqlextrafields' && !empty($module))
{
@@ -361,105 +361,105 @@ if ($dirins && $action == 'initsqlextrafields' && !empty($module))
}
if ($dirins && $action == 'inithook' && !empty($module))
{
- dol_mkdir($dirins.'/'.strtolower($module).'/class');
- $srcdir = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
- $srcfile = $srcdir.'/class/actions_mymodule.class.php';
- $destfile = $dirins.'/'.strtolower($module).'/class/actions_'.strtolower($module).'.class.php';
- //var_dump($srcfile);var_dump($destfile);
- $result = dol_copy($srcfile, $destfile, 0, 0);
+ dol_mkdir($dirins.'/'.strtolower($module).'/class');
+ $srcdir = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
+ $srcfile = $srcdir.'/class/actions_mymodule.class.php';
+ $destfile = $dirins.'/'.strtolower($module).'/class/actions_'.strtolower($module).'.class.php';
+ //var_dump($srcfile);var_dump($destfile);
+ $result = dol_copy($srcfile, $destfile, 0, 0);
- if ($result > 0)
- {
- $modulename = ucfirst($module); // Force first letter in uppercase
+ if ($result > 0)
+ {
+ $modulename = ucfirst($module); // Force first letter in uppercase
- //var_dump($phpfileval['fullname']);
- $arrayreplacement = array(
- 'mymodule'=>strtolower($modulename),
- 'MyModule'=>$modulename,
- 'MYMODULE'=>strtoupper($modulename),
- 'My module'=>$modulename,
- 'my module'=>$modulename,
- 'Mon module'=>$modulename,
- 'mon module'=>$modulename,
- 'htdocs/modulebuilder/template'=>strtolower($modulename),
- '---Put here your own copyright and developer email---'=>dol_print_date($now, '%Y').' '.$user->getFullName($langs).($user->email ? ' <'.$user->email.'>' : '')
- );
+ //var_dump($phpfileval['fullname']);
+ $arrayreplacement = array(
+ 'mymodule'=>strtolower($modulename),
+ 'MyModule'=>$modulename,
+ 'MYMODULE'=>strtoupper($modulename),
+ 'My module'=>$modulename,
+ 'my module'=>$modulename,
+ 'Mon module'=>$modulename,
+ 'mon module'=>$modulename,
+ 'htdocs/modulebuilder/template'=>strtolower($modulename),
+ '---Put here your own copyright and developer email---'=>dol_print_date($now, '%Y').' '.$user->getFullName($langs).($user->email ? ' <'.$user->email.'>' : '')
+ );
- dolReplaceInFile($destfile, $arrayreplacement);
- }
- else
- {
- $langs->load("errors");
- setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors');
- }
+ dolReplaceInFile($destfile, $arrayreplacement);
+ }
+ else
+ {
+ $langs->load("errors");
+ setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors');
+ }
}
if ($dirins && $action == 'inittrigger' && !empty($module))
{
- dol_mkdir($dirins.'/'.strtolower($module).'/core/triggers');
- $srcdir = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
- $srcfile = $srcdir.'/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php';
- $destfile = $dirins.'/'.strtolower($module).'/core/triggers/interface_99_mod'.$module.'_'.$module.'Triggers.class.php';
- //var_dump($srcfile);var_dump($destfile);
- $result = dol_copy($srcfile, $destfile, 0, 0);
+ dol_mkdir($dirins.'/'.strtolower($module).'/core/triggers');
+ $srcdir = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
+ $srcfile = $srcdir.'/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php';
+ $destfile = $dirins.'/'.strtolower($module).'/core/triggers/interface_99_mod'.$module.'_'.$module.'Triggers.class.php';
+ //var_dump($srcfile);var_dump($destfile);
+ $result = dol_copy($srcfile, $destfile, 0, 0);
- if ($result > 0)
- {
- $modulename = ucfirst($module); // Force first letter in uppercase
+ if ($result > 0)
+ {
+ $modulename = ucfirst($module); // Force first letter in uppercase
- //var_dump($phpfileval['fullname']);
- $arrayreplacement = array(
- 'mymodule'=>strtolower($modulename),
- 'MyModule'=>$modulename,
- 'MYMODULE'=>strtoupper($modulename),
- 'My module'=>$modulename,
- 'my module'=>$modulename,
- 'Mon module'=>$modulename,
- 'mon module'=>$modulename,
- 'htdocs/modulebuilder/template'=>strtolower($modulename),
- '---Put here your own copyright and developer email---'=>dol_print_date($now, '%Y').' '.$user->getFullName($langs).($user->email ? ' <'.$user->email.'>' : '')
- );
+ //var_dump($phpfileval['fullname']);
+ $arrayreplacement = array(
+ 'mymodule'=>strtolower($modulename),
+ 'MyModule'=>$modulename,
+ 'MYMODULE'=>strtoupper($modulename),
+ 'My module'=>$modulename,
+ 'my module'=>$modulename,
+ 'Mon module'=>$modulename,
+ 'mon module'=>$modulename,
+ 'htdocs/modulebuilder/template'=>strtolower($modulename),
+ '---Put here your own copyright and developer email---'=>dol_print_date($now, '%Y').' '.$user->getFullName($langs).($user->email ? ' <'.$user->email.'>' : '')
+ );
- dolReplaceInFile($destfile, $arrayreplacement);
- }
- else
- {
- $langs->load("errors");
- setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors');
- }
+ dolReplaceInFile($destfile, $arrayreplacement);
+ }
+ else
+ {
+ $langs->load("errors");
+ setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors');
+ }
}
if ($dirins && $action == 'initwidget' && !empty($module))
{
- dol_mkdir($dirins.'/'.strtolower($module).'/core/boxes');
- $srcdir = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
- $srcfile = $srcdir.'/core/boxes/mymodulewidget1.php';
- $destfile = $dirins.'/'.strtolower($module).'/core/boxes/'.strtolower($module).'widget1.php';
- //var_dump($srcfile);var_dump($destfile);
- $result = dol_copy($srcfile, $destfile, 0, 0);
+ dol_mkdir($dirins.'/'.strtolower($module).'/core/boxes');
+ $srcdir = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
+ $srcfile = $srcdir.'/core/boxes/mymodulewidget1.php';
+ $destfile = $dirins.'/'.strtolower($module).'/core/boxes/'.strtolower($module).'widget1.php';
+ //var_dump($srcfile);var_dump($destfile);
+ $result = dol_copy($srcfile, $destfile, 0, 0);
- if ($result > 0)
- {
- $modulename = ucfirst($module); // Force first letter in uppercase
+ if ($result > 0)
+ {
+ $modulename = ucfirst($module); // Force first letter in uppercase
- //var_dump($phpfileval['fullname']);
- $arrayreplacement = array(
- 'mymodule'=>strtolower($modulename),
- 'MyModule'=>$modulename,
- 'MYMODULE'=>strtoupper($modulename),
- 'My module'=>$modulename,
- 'my module'=>$modulename,
- 'Mon module'=>$modulename,
- 'mon module'=>$modulename,
- 'htdocs/modulebuilder/template'=>strtolower($modulename),
- '---Put here your own copyright and developer email---'=>dol_print_date($now, '%Y').' '.$user->getFullName($langs).($user->email ? ' <'.$user->email.'>' : '')
- );
+ //var_dump($phpfileval['fullname']);
+ $arrayreplacement = array(
+ 'mymodule'=>strtolower($modulename),
+ 'MyModule'=>$modulename,
+ 'MYMODULE'=>strtoupper($modulename),
+ 'My module'=>$modulename,
+ 'my module'=>$modulename,
+ 'Mon module'=>$modulename,
+ 'mon module'=>$modulename,
+ 'htdocs/modulebuilder/template'=>strtolower($modulename),
+ '---Put here your own copyright and developer email---'=>dol_print_date($now, '%Y').' '.$user->getFullName($langs).($user->email ? ' <'.$user->email.'>' : '')
+ );
- dolReplaceInFile($destfile, $arrayreplacement);
- }
- else
- {
- $langs->load("errors");
- setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors');
- }
+ dolReplaceInFile($destfile, $arrayreplacement);
+ }
+ else
+ {
+ $langs->load("errors");
+ setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors');
+ }
}
if ($dirins && $action == 'initcss' && !empty($module))
{
@@ -490,9 +490,9 @@ if ($dirins && $action == 'initcss' && !empty($module))
dolReplaceInFile($destfile, $arrayreplacement);
// Update descriptor file to uncomment file
- $srcfile = $dirins.'/'.strtolower($module).'/core/modules/mod'.$module.'.class.php';
- $arrayreplacement = array('/\/\/\s*\''.preg_quote('/'.strtolower($module).'/css/'.strtolower($module).'.css.php', '/').'\'/' => '\'/'.strtolower($module).'/css/'.strtolower($module).'.css.php\'');
- dolReplaceInFile($srcfile, $arrayreplacement, '', 0, 0, 1);
+ $srcfile = $dirins.'/'.strtolower($module).'/core/modules/mod'.$module.'.class.php';
+ $arrayreplacement = array('/\/\/\s*\''.preg_quote('/'.strtolower($module).'/css/'.strtolower($module).'.css.php', '/').'\'/' => '\'/'.strtolower($module).'/css/'.strtolower($module).'.css.php\'');
+ dolReplaceInFile($srcfile, $arrayreplacement, '', 0, 0, 1);
}
else
{
@@ -541,93 +541,93 @@ if ($dirins && $action == 'initjs' && !empty($module))
}
if ($dirins && $action == 'initcli' && !empty($module))
{
- dol_mkdir($dirins.'/'.strtolower($module).'/scripts');
- $srcdir = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
- $srcfile = $srcdir.'/scripts/mymodule.php';
- $destfile = $dirins.'/'.strtolower($module).'/scripts/'.strtolower($module).'.php';
- //var_dump($srcfile);var_dump($destfile);
- $result = dol_copy($srcfile, $destfile, 0, 0);
+ dol_mkdir($dirins.'/'.strtolower($module).'/scripts');
+ $srcdir = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
+ $srcfile = $srcdir.'/scripts/mymodule.php';
+ $destfile = $dirins.'/'.strtolower($module).'/scripts/'.strtolower($module).'.php';
+ //var_dump($srcfile);var_dump($destfile);
+ $result = dol_copy($srcfile, $destfile, 0, 0);
- if ($result > 0)
- {
- $modulename = ucfirst($module); // Force first letter in uppercase
+ if ($result > 0)
+ {
+ $modulename = ucfirst($module); // Force first letter in uppercase
- //var_dump($phpfileval['fullname']);
- $arrayreplacement = array(
- 'mymodule'=>strtolower($modulename),
- 'MyModule'=>$modulename,
- 'MYMODULE'=>strtoupper($modulename),
- 'My module'=>$modulename,
- 'my module'=>$modulename,
- 'Mon module'=>$modulename,
- 'mon module'=>$modulename,
- 'htdocs/modulebuilder/template'=>strtolower($modulename),
- '__MYCOMPANY_NAME__'=>$mysoc->name,
- '__KEYWORDS__'=>$modulename,
- '__USER_FULLNAME__'=>$user->getFullName($langs),
- '__USER_EMAIL__'=>$user->email,
- '__YYYY-MM-DD__'=>dol_print_date($now, 'dayrfc'),
- '---Put here your own copyright and developer email---'=>dol_print_date($now, 'dayrfc').' '.$user->getFullName($langs).($user->email ? ' <'.$user->email.'>' : '')
- );
+ //var_dump($phpfileval['fullname']);
+ $arrayreplacement = array(
+ 'mymodule'=>strtolower($modulename),
+ 'MyModule'=>$modulename,
+ 'MYMODULE'=>strtoupper($modulename),
+ 'My module'=>$modulename,
+ 'my module'=>$modulename,
+ 'Mon module'=>$modulename,
+ 'mon module'=>$modulename,
+ 'htdocs/modulebuilder/template'=>strtolower($modulename),
+ '__MYCOMPANY_NAME__'=>$mysoc->name,
+ '__KEYWORDS__'=>$modulename,
+ '__USER_FULLNAME__'=>$user->getFullName($langs),
+ '__USER_EMAIL__'=>$user->email,
+ '__YYYY-MM-DD__'=>dol_print_date($now, 'dayrfc'),
+ '---Put here your own copyright and developer email---'=>dol_print_date($now, 'dayrfc').' '.$user->getFullName($langs).($user->email ? ' <'.$user->email.'>' : '')
+ );
- dolReplaceInFile($destfile, $arrayreplacement);
- }
- else
- {
- $langs->load("errors");
- setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors');
- }
+ dolReplaceInFile($destfile, $arrayreplacement);
+ }
+ else
+ {
+ $langs->load("errors");
+ setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors');
+ }
}
if ($dirins && $action == 'initdoc' && !empty($module))
{
- dol_mkdir($dirins.'/'.strtolower($module).'/doc');
- $srcdir = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
- $srcfile = $srcdir.'/doc/Documentation.asciidoc';
- $destfile = $dirins.'/'.strtolower($module).'/doc/Documentation.asciidoc';
- //var_dump($srcfile);var_dump($destfile);
- $result = dol_copy($srcfile, $destfile, 0, 0);
+ dol_mkdir($dirins.'/'.strtolower($module).'/doc');
+ $srcdir = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
+ $srcfile = $srcdir.'/doc/Documentation.asciidoc';
+ $destfile = $dirins.'/'.strtolower($module).'/doc/Documentation.asciidoc';
+ //var_dump($srcfile);var_dump($destfile);
+ $result = dol_copy($srcfile, $destfile, 0, 0);
- if ($result > 0)
- {
- $modulename = ucfirst($module); // Force first letter in uppercase
- $modulelowercase = strtolower($module);
+ if ($result > 0)
+ {
+ $modulename = ucfirst($module); // Force first letter in uppercase
+ $modulelowercase = strtolower($module);
- //var_dump($phpfileval['fullname']);
- $arrayreplacement = array(
- 'mymodule'=>strtolower($modulename),
- 'MyModule'=>$modulename,
- 'MYMODULE'=>strtoupper($modulename),
- 'My module'=>$modulename,
- 'my module'=>$modulename,
- 'Mon module'=>$modulename,
- 'mon module'=>$modulename,
- 'htdocs/modulebuilder/template'=>strtolower($modulename),
- '__MYCOMPANY_NAME__'=>$mysoc->name,
- '__KEYWORDS__'=>$modulename,
- '__USER_FULLNAME__'=>$user->getFullName($langs),
- '__USER_EMAIL__'=>$user->email,
- '__YYYY-MM-DD__'=>dol_print_date($now, 'dayrfc'),
- '---Put here your own copyright and developer email---'=>dol_print_date($now, 'dayrfc').' '.$user->getFullName($langs).($user->email ? ' <'.$user->email.'>' : '')
- );
+ //var_dump($phpfileval['fullname']);
+ $arrayreplacement = array(
+ 'mymodule'=>strtolower($modulename),
+ 'MyModule'=>$modulename,
+ 'MYMODULE'=>strtoupper($modulename),
+ 'My module'=>$modulename,
+ 'my module'=>$modulename,
+ 'Mon module'=>$modulename,
+ 'mon module'=>$modulename,
+ 'htdocs/modulebuilder/template'=>strtolower($modulename),
+ '__MYCOMPANY_NAME__'=>$mysoc->name,
+ '__KEYWORDS__'=>$modulename,
+ '__USER_FULLNAME__'=>$user->getFullName($langs),
+ '__USER_EMAIL__'=>$user->email,
+ '__YYYY-MM-DD__'=>dol_print_date($now, 'dayrfc'),
+ '---Put here your own copyright and developer email---'=>dol_print_date($now, 'dayrfc').' '.$user->getFullName($langs).($user->email ? ' <'.$user->email.'>' : '')
+ );
- dolReplaceInFile($destfile, $arrayreplacement);
+ dolReplaceInFile($destfile, $arrayreplacement);
- // Delete old documentation files
- $FILENAMEDOC = $modulelowercase.'.html';
- $FILENAMEDOCPDF = $modulelowercase.'.pdf';
- $outputfiledoc = dol_buildpath($modulelowercase, 0).'/doc/'.$FILENAMEDOC;
- $outputfiledocurl = dol_buildpath($modulelowercase, 1).'/doc/'.$FILENAMEDOC;
- $outputfiledocpdf = dol_buildpath($modulelowercase, 0).'/doc/'.$FILENAMEDOCPDF;
- $outputfiledocurlpdf = dol_buildpath($modulelowercase, 1).'/doc/'.$FILENAMEDOCPDF;
+ // Delete old documentation files
+ $FILENAMEDOC = $modulelowercase.'.html';
+ $FILENAMEDOCPDF = $modulelowercase.'.pdf';
+ $outputfiledoc = dol_buildpath($modulelowercase, 0).'/doc/'.$FILENAMEDOC;
+ $outputfiledocurl = dol_buildpath($modulelowercase, 1).'/doc/'.$FILENAMEDOC;
+ $outputfiledocpdf = dol_buildpath($modulelowercase, 0).'/doc/'.$FILENAMEDOCPDF;
+ $outputfiledocurlpdf = dol_buildpath($modulelowercase, 1).'/doc/'.$FILENAMEDOCPDF;
- dol_delete_file($outputfiledoc, 0, 0, 0, null, false, 0);
- dol_delete_file($outputfiledocpdf, 0, 0, 0, null, false, 0);
- }
- else
- {
- $langs->load("errors");
- setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors');
- }
+ dol_delete_file($outputfiledoc, 0, 0, 0, null, false, 0);
+ dol_delete_file($outputfiledocpdf, 0, 0, 0, null, false, 0);
+ }
+ else
+ {
+ $langs->load("errors");
+ setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors');
+ }
}
if ($dirins && $action == 'addlanguage' && !empty($module))
@@ -640,24 +640,24 @@ if ($dirins && $action == 'addlanguage' && !empty($module))
if ($dirins && $action == 'confirm_removefile' && !empty($module))
{
- $relativefilename = dol_sanitizePathName(GETPOST('file', 'none'));
- if ($relativefilename)
- {
- $dirnametodelete = dirname($relativefilename);
- $filetodelete = $dirins.'/'.$relativefilename;
- $dirtodelete = $dirins.'/'.$dirnametodelete;
+ $relativefilename = dol_sanitizePathName(GETPOST('file', 'none'));
+ if ($relativefilename)
+ {
+ $dirnametodelete = dirname($relativefilename);
+ $filetodelete = $dirins.'/'.$relativefilename;
+ $dirtodelete = $dirins.'/'.$dirnametodelete;
- $result = dol_delete_file($filetodelete);
- if (dol_is_dir_empty($dirtodelete)) dol_delete_dir($dirtodelete);
+ $result = dol_delete_file($filetodelete);
+ if (dol_is_dir_empty($dirtodelete)) dol_delete_dir($dirtodelete);
- // Update descriptor file to comment file
- if (in_array($tab, array('css', 'js')))
- {
- $srcfile = $dirins.'/'.strtolower($module).'/core/modules/mod'.$module.'.class.php';
- $arrayreplacement = array('/^\s*\''.preg_quote('/'.$relativefilename, '/').'\',*/m'=>' // \'/'.$relativefilename.'\',');
- dolReplaceInFile($srcfile, $arrayreplacement, '', 0, 0, 1);
- }
- }
+ // Update descriptor file to comment file
+ if (in_array($tab, array('css', 'js')))
+ {
+ $srcfile = $dirins.'/'.strtolower($module).'/core/modules/mod'.$module.'.class.php';
+ $arrayreplacement = array('/^\s*\''.preg_quote('/'.$relativefilename, '/').'\',*/m'=>' // \'/'.$relativefilename.'\',');
+ dolReplaceInFile($srcfile, $arrayreplacement, '', 0, 0, 1);
+ }
+ }
}
// Build the $fields array from SQL table (initfromtablename)
@@ -1001,17 +1001,17 @@ if ($dirins && $action == 'initobject' && $module && $objectname)
//var_dump($phpfileval['fullname']);
$arrayreplacement = array(
- 'mymodule'=>strtolower($module),
- 'MyModule'=>$module,
- 'MYMODULE'=>strtoupper($module),
- 'My module'=>$module,
- 'my module'=>$module,
- 'mon module'=>$module,
- 'Mon module'=>$module,
- 'htdocs/modulebuilder/template/'=>strtolower($modulename),
- 'myobject'=>strtolower($objectname),
- 'MyObject'=>$objectname,
- 'MYOBJECT'=>strtoupper($objectname)
+ 'mymodule'=>strtolower($module),
+ 'MyModule'=>$module,
+ 'MYMODULE'=>strtoupper($module),
+ 'My module'=>$module,
+ 'my module'=>$module,
+ 'mon module'=>$module,
+ 'Mon module'=>$module,
+ 'htdocs/modulebuilder/template/'=>strtolower($modulename),
+ 'myobject'=>strtolower($objectname),
+ 'MyObject'=>$objectname,
+ 'MYOBJECT'=>strtoupper($objectname)
);
$result = dolReplaceInFile($phpfileval['fullname'], $arrayreplacement);
@@ -1378,7 +1378,7 @@ if ($dirins && $action == 'generatedoc')
if ($result > 0)
{
- setEventMessages($langs->trans("DocFileGeneratedInto", $dirofmodule), null);
+ setEventMessages($langs->trans("DocFileGeneratedInto", $dirofmodule), null);
}
else
{
@@ -1415,13 +1415,13 @@ if ($action == 'savefile' && empty($cancel))
$result = file_put_contents($pathoffile, $content);
if ($result)
{
- @chmod($pathoffile, octdec($newmask));
+ @chmod($pathoffile, octdec($newmask));
- setEventMessages($langs->trans("FileSaved"), null);
+ setEventMessages($langs->trans("FileSaved"), null);
}
else
{
- setEventMessages($langs->trans("ErrorFailedToSaveFile"), null, 'errors');
+ setEventMessages($langs->trans("ErrorFailedToSaveFile"), null, 'errors');
}
}
else
@@ -1524,65 +1524,65 @@ $listofmodules = array();
$i = 0;
foreach ($dirsrootforscan as $dirread)
{
- $dirsincustom = dol_dir_list($dirread, 'directories');
- if (is_array($dirsincustom) && count($dirsincustom) > 0) {
- foreach ($dirsincustom as $dircustomcursor) {
- $fullname = $dircustomcursor['fullname'];
- if (dol_is_file($fullname.'/'.$FILEFLAG))
- {
- // Get real name of module (MyModule instead of mymodule)
- $dirtoscanrel = basename($fullname).'/core/modules/';
+ $dirsincustom = dol_dir_list($dirread, 'directories');
+ if (is_array($dirsincustom) && count($dirsincustom) > 0) {
+ foreach ($dirsincustom as $dircustomcursor) {
+ $fullname = $dircustomcursor['fullname'];
+ if (dol_is_file($fullname.'/'.$FILEFLAG))
+ {
+ // Get real name of module (MyModule instead of mymodule)
+ $dirtoscanrel = basename($fullname).'/core/modules/';
- $descriptorfiles = dol_dir_list(dirname($fullname).'/'.$dirtoscanrel, 'files', 0, 'mod.*\.class\.php$');
- if (empty($descriptorfiles)) // If descriptor not found into module dir, we look into main module dir.
- {
- $dirtoscanrel = 'core/modules/';
- $descriptorfiles = dol_dir_list($fullname.'/../'.$dirtoscanrel, 'files', 0, 'mod'.strtoupper(basename($fullname)).'\.class\.php$');
- }
- $modulenamewithcase = '';
- $moduledescriptorrelpath = '';
- $moduledescriptorfullpath = '';
+ $descriptorfiles = dol_dir_list(dirname($fullname).'/'.$dirtoscanrel, 'files', 0, 'mod.*\.class\.php$');
+ if (empty($descriptorfiles)) // If descriptor not found into module dir, we look into main module dir.
+ {
+ $dirtoscanrel = 'core/modules/';
+ $descriptorfiles = dol_dir_list($fullname.'/../'.$dirtoscanrel, 'files', 0, 'mod'.strtoupper(basename($fullname)).'\.class\.php$');
+ }
+ $modulenamewithcase = '';
+ $moduledescriptorrelpath = '';
+ $moduledescriptorfullpath = '';
- foreach ($descriptorfiles as $descriptorcursor) {
- $modulenamewithcase = preg_replace('/^mod/', '', $descriptorcursor['name']);
- $modulenamewithcase = preg_replace('/\.class\.php$/', '', $modulenamewithcase);
- $moduledescriptorrelpath = $dirtoscanrel.$descriptorcursor['name'];
- $moduledescriptorfullpath = $descriptorcursor['fullname'];
- //var_dump($descriptorcursor);
- }
- if ($modulenamewithcase)
- {
- $listofmodules[$dircustomcursor['name']] = array(
- 'modulenamewithcase'=>$modulenamewithcase,
- 'moduledescriptorrelpath'=> $moduledescriptorrelpath,
- 'moduledescriptorfullpath'=>$moduledescriptorfullpath,
- 'moduledescriptorrootpath'=>$dirread
- );
- }
- //var_dump($listofmodules);
- }
- }
- }
+ foreach ($descriptorfiles as $descriptorcursor) {
+ $modulenamewithcase = preg_replace('/^mod/', '', $descriptorcursor['name']);
+ $modulenamewithcase = preg_replace('/\.class\.php$/', '', $modulenamewithcase);
+ $moduledescriptorrelpath = $dirtoscanrel.$descriptorcursor['name'];
+ $moduledescriptorfullpath = $descriptorcursor['fullname'];
+ //var_dump($descriptorcursor);
+ }
+ if ($modulenamewithcase)
+ {
+ $listofmodules[$dircustomcursor['name']] = array(
+ 'modulenamewithcase'=>$modulenamewithcase,
+ 'moduledescriptorrelpath'=> $moduledescriptorrelpath,
+ 'moduledescriptorfullpath'=>$moduledescriptorfullpath,
+ 'moduledescriptorrootpath'=>$dirread
+ );
+ }
+ //var_dump($listofmodules);
+ }
+ }
+ }
- if ($forceddirread && empty($listofmodules)) // $forceddirread is 1 if we forced dir to read with dirins=... or with module=...@mydir
- {
- $listofmodules[strtolower($module)] = array(
- 'modulenamewithcase'=>$module,
- 'moduledescriptorrelpath'=> 'notyetimplemented',
- 'moduledescriptorfullpath'=> 'notyetimplemented',
- 'moduledescriptorrootpath'=> 'notyetimplemented',
- );
- }
+ if ($forceddirread && empty($listofmodules)) // $forceddirread is 1 if we forced dir to read with dirins=... or with module=...@mydir
+ {
+ $listofmodules[strtolower($module)] = array(
+ 'modulenamewithcase'=>$module,
+ 'moduledescriptorrelpath'=> 'notyetimplemented',
+ 'moduledescriptorfullpath'=> 'notyetimplemented',
+ 'moduledescriptorrootpath'=> 'notyetimplemented',
+ );
+ }
- // Show description of content
- $newdircustom = $dirins;
- if (empty($newdircustom)) $newdircustom = img_warning();
- // If dirread was forced to somewhere else, by using URL
- // htdocs/modulebuilder/index.php?module=Inventory@/home/ldestailleur/git/dolibarr/htdocs/product
- if (empty($i)) print $langs->trans("DirScanned").' : ';
- else print ', ';
- print ''.$dirread.'';
- $i++;
+ // Show description of content
+ $newdircustom = $dirins;
+ if (empty($newdircustom)) $newdircustom = img_warning();
+ // If dirread was forced to somewhere else, by using URL
+ // htdocs/modulebuilder/index.php?module=Inventory@/home/ldestailleur/git/dolibarr/htdocs/product
+ if (empty($i)) print $langs->trans("DirScanned").' : ';
+ else print ', ';
+ print ''.$dirread.'';
+ $i++;
}
print '
'; //var_dump($listofmodules); @@ -1792,7 +1792,7 @@ elseif (!empty($module)) // Tabs for module if (!$error) { - $dirread = $listofmodules[strtolower($module)]['moduledescriptorrootpath']; + $dirread = $listofmodules[strtolower($module)]['moduledescriptorrootpath']; $head2 = array(); $h = 0; @@ -2341,7 +2341,7 @@ elseif (!empty($module)) { // tabobj = module if ($action == 'deleteproperty') { - $formconfirm = $form->formconfirm( + $formconfirm = $form->formconfirm( $_SERVER["PHP_SELF"].'?propertykey='.urlencode(GETPOST('propertykey', 'alpha')).'&objectname='.urlencode($objectname).'&tab='.urlencode($tab).'&module='.urlencode($module).'&tabobj='.urlencode($tabobj), $langs->trans('Delete'), $langs->trans('ConfirmDeleteProperty', GETPOST('propertykey', 'alpha')), 'confirm_deleteproperty', '', 0, 1 ); @@ -2403,23 +2403,23 @@ elseif (!empty($module)) print ' '.$langs->trans("ApiClassFile").' : '.($realpathtoapi ? '' : '').$pathtoapi.($realpathtoapi ? '' : '').'';
if ($realpathtoapi)
{
- print ' '.img_picto($langs->trans("Edit"), 'edit').'';
- print ' ';
- print ''.img_picto($langs->trans("Delete"), 'delete').'';
- print ' ';
- if (empty($conf->global->$const_name)) // If module is not activated
- {
- print ''.$langs->trans("GoToApiExplorer").'';
- }
- else
- {
- print ''.$langs->trans("GoToApiExplorer").'';
- }
+ print ' '.img_picto($langs->trans("Edit"), 'edit').'';
+ print ' ';
+ print ''.img_picto($langs->trans("Delete"), 'delete').'';
+ print ' ';
+ if (empty($conf->global->$const_name)) // If module is not activated
+ {
+ print ''.$langs->trans("GoToApiExplorer").'';
+ }
+ else
+ {
+ print ''.$langs->trans("GoToApiExplorer").'';
+ }
}
else
{
- //print ''.$langs->trans("FileNotYetGenerated").' ';
- print '';
+ //print ''.$langs->trans("FileNotYetGenerated").' ';
+ print '';
}
// PHPUnit
print '
'; @@ -2427,14 +2427,14 @@ elseif (!empty($module)) if ($realpathtophpunit) { - print ' '.img_picto($langs->trans("Edit"), 'edit').''; - print ' '; - print ''.img_picto($langs->trans("Delete"), 'delete').''; + print ' '.img_picto($langs->trans("Edit"), 'edit').''; + print ' '; + print ''.img_picto($langs->trans("Delete"), 'delete').''; } else { - //print ''.$langs->trans("FileNotYetGenerated").' '; - print ''; + //print ''.$langs->trans("FileNotYetGenerated").' '; + print ''; } print '
'; @@ -2748,56 +2748,56 @@ elseif (!empty($module)) } else { - if ($tab == 'specifications') - { - if ($action != 'editfile' || empty($file)) - { - print ''.$langs->trans("SpecDefDesc").'
'; - print '
'; + if ($tab == 'specifications') + { + if ($action != 'editfile' || empty($file)) + { + print ''.$langs->trans("SpecDefDesc").'
'; + print '
'; - $specs = dol_dir_list(dol_buildpath($modulelowercase.'/doc', 0), 'files', 1, '(\.md|\.asciidoc)$', array('\/temp\/')); + $specs = dol_dir_list(dol_buildpath($modulelowercase.'/doc', 0), 'files', 1, '(\.md|\.asciidoc)$', array('\/temp\/')); - foreach ($specs as $spec) - { - $pathtofile = $modulelowercase.'/doc/'.$spec['relativename']; - $format = 'asciidoc'; - if (preg_match('/\.md$/i', $spec['name'])) $format = 'markdown'; - print ' '.$langs->trans("SpecificationFile").' : '.$pathtofile.''; - print ' '.img_picto($langs->trans("Edit"), 'edit').''; - print '
'; - } - } - else - { - // Use MD or asciidoc + foreach ($specs as $spec) + { + $pathtofile = $modulelowercase.'/doc/'.$spec['relativename']; + $format = 'asciidoc'; + if (preg_match('/\.md$/i', $spec['name'])) $format = 'markdown'; + print ' '.$langs->trans("SpecificationFile").' : '.$pathtofile.''; + print ' '.img_picto($langs->trans("Edit"), 'edit').''; + print '
'; + } + } + else + { + // Use MD or asciidoc - //print $langs->trans("UseAsciiDocFormat").'
'; + //print $langs->trans("UseAsciiDocFormat").'
'; - $fullpathoffile = dol_buildpath($file, 0); + $fullpathoffile = dol_buildpath($file, 0); - $content = file_get_contents($fullpathoffile); + $content = file_get_contents($fullpathoffile); - // New module - print ''; - } - } - print ''.$langs->trans('Property $field not found into the class. The class was probably not generated by modulebuilder.').' '.$langs->trans('Property $field not found into the class. The class was probably not generated by modulebuilder.').'
';
print '
';
@@ -2860,10 +2860,10 @@ elseif (!empty($module))
if ($action != 'editfile' || empty($file))
{
- print '';
- $htmlhelp = $langs->trans("MenusDefDescTooltip", ''.$langs->trans('Setup').' - '.$langs->trans('Menus').'');
- print $form->textwithpicto($langs->trans("MenusDefDesc"), $htmlhelp, 1, 'help', '', 0, 2, 'helpondesc').'| '; print $langs->trans("AddProductServiceIntoCategory").' '; $form->select_produits('', 'elemid', '', 0, 0, -1, 2, '', 1); - print ' | '; + print ''; print '
'; $param = '&limit='.$limit.'&id='.$id.'&type='.$type; $num = count($prods); $nbtotalofrecords = ''; $newcardbutton = ''; - print_barre_liste($langs->trans("ProductsAndServices"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, '', 0, $newcardbutton, '', $limit); + print_barre_liste($langs->trans("ProductsAndServices"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'products', 0, $newcardbutton, '', $limit); - print "
| '.$langs->trans("Ref").' | '.$prod->label." | \n"; // Link to delete from category print ''; - $permission = 0; - if ($type == Categorie::TYPE_PRODUCT) $permission = ($user->rights->produit->creer || $user->rights->service->creer); - if ($type == Categorie::TYPE_SUPPLIER) $permission = $user->rights->societe->creer; - if ($type == Categorie::TYPE_CUSTOMER) $permission = $user->rights->societe->creer; - if ($type == Categorie::TYPE_MEMBER) $permission = $user->rights->adherent->creer; - if ($type == Categorie::TYPE_PROJECT) $permission = $user->rights->projet->creer; if ($permission) { print ""; print $langs->trans("DeleteFromCat"); - print img_picto($langs->trans("DeleteFromCat"), 'unlink'); + print img_picto($langs->trans("DeleteFromCat"), 'unlink', '', false, 0, 0, '', 'paddingleft'); print ""; } print ' | '; @@ -522,7 +526,7 @@ if ($type == Categorie::TYPE_PRODUCT) } else { - print '
| '.$langs->trans("ThisCategoryHasNoProduct").' | ||
| '.$langs->trans("ThisCategoryHasNoItems").' | ||
'; $param = '&limit='.$limit.'&id='.$id.'&type='.$type; $num = count($socs); $nbtotalofrecords = ''; $newcardbutton = ''; - print_barre_liste($langs->trans("Suppliers"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, '', 0, $newcardbutton, '', $limit); + print_barre_liste($langs->trans("Suppliers"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'companies', 0, $newcardbutton, '', $limit); print '
| '.$langs->trans("Name")." | '; - $permission = 0; - if ($type == Categorie::TYPE_PRODUCT) $permission = ($user->rights->produit->creer || $user->rights->service->creer); - if ($type == Categorie::TYPE_SUPPLIER) $permission = $user->rights->societe->creer; - if ($type == Categorie::TYPE_CUSTOMER) $permission = $user->rights->societe->creer; - if ($type == Categorie::TYPE_MEMBER) $permission = $user->rights->adherent->creer; - if ($type == Categorie::TYPE_PROJECT) $permission = $user->rights->projet->creer; if ($permission) { print ""; print $langs->trans("DeleteFromCat"); - print img_picto($langs->trans("DeleteFromCat"), 'unlink'); + print img_picto($langs->trans("DeleteFromCat"), 'unlink', '', false, 0, 0, '', 'paddingleft'); print ""; } print ' | '; @@ -587,7 +587,7 @@ if ($type == Categorie::TYPE_SUPPLIER) } else { - print '
| '.$langs->trans("ThisCategoryHasNoSupplier").' | |
| '.$langs->trans("ThisCategoryHasNoItems").' | |
'; $param = '&limit='.$limit.'&id='.$id.'&type='.$type; $num = count($socs); $nbtotalofrecords = ''; $newcardbutton = ''; - print_barre_liste($langs->trans("Customers"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, '', 0, $newcardbutton, '', $limit); + print_barre_liste($langs->trans("Customers"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'companies', 0, $newcardbutton, '', $limit); print '
| '.$langs->trans("Name").' | '; - $permission = 0; - if ($type == Categorie::TYPE_PRODUCT) $permission = ($user->rights->produit->creer || $user->rights->service->creer); - if ($type == Categorie::TYPE_SUPPLIER) $permission = $user->rights->societe->creer; - if ($type == Categorie::TYPE_CUSTOMER) $permission = $user->rights->societe->creer; - if ($type == Categorie::TYPE_MEMBER) $permission = $user->rights->adherent->creer; - if ($type == Categorie::TYPE_PROJECT) $permission = $user->rights->projet->creer; if ($permission) { print ""; print $langs->trans("DeleteFromCat"); - print img_picto($langs->trans("DeleteFromCat"), 'unlink'); + print img_picto($langs->trans("DeleteFromCat"), 'unlink', '', false, 0, 0, '', 'paddingleft'); print ""; } print ' | '; @@ -651,7 +647,7 @@ if ($type == Categorie::TYPE_CUSTOMER) } else { - print '
| '.$langs->trans("ThisCategoryHasNoCustomer").' | |
| '.$langs->trans("ThisCategoryHasNoItems").' | |
'; $param = '&limit='.$limit.'&id='.$id.'&type='.$type; $num = count($prods); $nbtotalofrecords = ''; $newcardbutton = ''; - print_barre_liste($langs->trans("Member"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, '', 0, $newcardbutton, '', $limit); + print_barre_liste($langs->trans("Member"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'adherents', 0, $newcardbutton, '', $limit); print "
| '.$langs->trans("Name").' | '.$member->firstname." | \n"; // Link to delete from category print ''; - $permission = 0; - if ($type == Categorie::TYPE_PRODUCT) $permission = ($user->rights->produit->creer || $user->rights->service->creer); - if ($type == Categorie::TYPE_SUPPLIER) $permission = $user->rights->societe->creer; - if ($type == Categorie::TYPE_CUSTOMER) $permission = $user->rights->societe->creer; - if ($type == Categorie::TYPE_MEMBER) $permission = $user->rights->adherent->creer; - if ($type == Categorie::TYPE_PROJECT) $permission = $user->rights->projet->creer; if ($permission) { print ""; print $langs->trans("DeleteFromCat"); - print img_picto($langs->trans("DeleteFromCat"), 'unlink'); + print img_picto($langs->trans("DeleteFromCat"), 'unlink', '', false, 0, 0, '', 'paddingleft'); print ""; } print "\n"; @@ -720,7 +712,7 @@ if ($type == Categorie::TYPE_MEMBER) } else { - print ' | |
| '.$langs->trans("ThisCategoryHasNoMember").' | |||
| '.$langs->trans("ThisCategoryHasNoItems").' | |||
'; - $param = '&limit='.$limit.'&id='.$id.'&type='.$type; $num = count($contacts); $nbtotalofrecords = ''; $newcardbutton = ''; - print_barre_liste($langs->trans("Contact"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, '', 0, $newcardbutton, '', $limit); + $param = '&limit='.$limit.'&id='.$id.'&type='.$type; + $num = count($contacts); + $nbtotalofrecords = ''; + $newcardbutton = ''; + print_barre_liste($langs->trans("Contact"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'contacts', 0, $newcardbutton, '', $limit); print '
| '.$langs->trans("Ref").' | '; - $permission = 0; - if ($type == Categorie::TYPE_PRODUCT) $permission = ($user->rights->produit->creer || $user->rights->service->creer); - if ($type == Categorie::TYPE_SUPPLIER) $permission = $user->rights->societe->creer; - if ($type == Categorie::TYPE_CUSTOMER) $permission = $user->rights->societe->creer; - if ($type == Categorie::TYPE_MEMBER) $permission = $user->rights->adherent->creer; - if ($type == Categorie::TYPE_PROJECT) $permission = $user->rights->projet->creer; if ($permission) { print ""; print $langs->trans("DeleteFromCat"); - print img_picto($langs->trans("DeleteFromCat"), 'unlink'); + print img_picto($langs->trans("DeleteFromCat"), 'unlink', '', false, 0, 0, '', 'paddingleft'); print ""; } print ' | '; @@ -785,7 +776,7 @@ if ($type == Categorie::TYPE_CONTACT) } else { - print '
| '.$langs->trans("ThisCategoryHasNoContact").' | |
| '.$langs->trans("ThisCategoryHasNoItems").' | |
'; $param = '&limit='.$limit.'&id='.$id.'&type='.$type; $num = count($accounts); $nbtotalofrecords = ''; $newcardbutton = ''; - print_barre_liste($langs->trans("Account"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, '', 0, $newcardbutton, '', $limit); + print_barre_liste($langs->trans("Account"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'account', 0, $newcardbutton, '', $limit); print "
| '.$langs->trans("Ref").' | '.$account->number." | \n"; // Link to delete from category print ''; - $permission = 0; - if ($type == Categorie::TYPE_PRODUCT) $permission = ($user->rights->produit->creer || $user->rights->service->creer); - if ($type == Categorie::TYPE_SUPPLIER) $permission = $user->rights->societe->creer; - if ($type == Categorie::TYPE_CUSTOMER) $permission = $user->rights->societe->creer; - if ($type == Categorie::TYPE_MEMBER) $permission = $user->rights->adherent->creer; - if ($type == Categorie::TYPE_PROJECT) $permission = $user->rights->projet->creer; if ($permission) { print ""; print $langs->trans("DeleteFromCat"); - print img_picto($langs->trans("DeleteFromCat"), 'unlink'); + print img_picto($langs->trans("DeleteFromCat"), 'unlink', '', false, 0, 0, '', 'paddingleft'); print ""; } print "\n"; @@ -853,7 +840,7 @@ if ($type == Categorie::TYPE_ACCOUNT) } else { - print ' | |
| '.$langs->trans("ThisCategoryHasNoAccount").' | |||
| '.$langs->trans("ThisCategoryHasNoItems").' | |||
'; - $param = '&limit='.$limit.'&id='.$id.'&type='.$type; $num = count($projects); $nbtotalofrecords = ''; $newcardbutton = ''; - print_barre_liste($langs->trans("Project"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, '', 0, $newcardbutton, '', $limit); + $param = '&limit='.$limit.'&id='.$id.'&type='.$type; $num = count($objects); $nbtotalofrecords = ''; $newcardbutton = ''; + + print_barre_liste($langs->trans("Project"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'projects', 0, $newcardbutton, '', $limit); print "
| '.$langs->trans("Ref").' | '.$project->title." | \n"; // Link to delete from category print ''; - $permission = 0; - if ($type == Categorie::TYPE_PRODUCT) $permission = ($user->rights->produit->creer || $user->rights->service->creer); - if ($type == Categorie::TYPE_SUPPLIER) $permission = $user->rights->societe->creer; - if ($type == Categorie::TYPE_CUSTOMER) $permission = $user->rights->societe->creer; - if ($type == Categorie::TYPE_MEMBER) $permission = $user->rights->adherent->creer; - if ($type == Categorie::TYPE_PROJECT) $permission = $user->rights->projet->creer; if ($permission) { print ""; print $langs->trans("DeleteFromCat"); - print img_picto($langs->trans("DeleteFromCat"), 'unlink'); + print img_picto($langs->trans("DeleteFromCat"), 'unlink', '', false, 0, 0, '', 'paddingleft'); print ""; } print "\n"; @@ -921,7 +905,7 @@ if ($type == Categorie::TYPE_PROJECT) } else { - print ' | |
| '.$langs->trans("ThisCategoryHasNoProject").' | |||
| '.$langs->trans("ThisCategoryHasNoItems").' | |||
"; + print ''."\n"; } } + +// List of Project +if ($type == Categorie::TYPE_WAREHOUSE) +{ + $permission = $user->rights->stock->creer; + + require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php'; + + $objects = $object->getObjectsInCateg($type, 0, $limit, $offset); + if ($objects < 0) + { + dol_print_error($db, $object->error, $object->errors); + } + else + { + print ''."\n"; + } +} + + // End of page llxFooter(); $db->close(); diff --git a/htdocs/langs/en_US/categories.lang b/htdocs/langs/en_US/categories.lang index 1ec9b5bd409..30bace0574c 100644 --- a/htdocs/langs/en_US/categories.lang +++ b/htdocs/langs/en_US/categories.lang @@ -63,13 +63,7 @@ AccountsCategoriesShort=Accounts tags/categories ProjectsCategoriesShort=Projects tags/categories UsersCategoriesShort=Users tags/categories StockCategoriesShort=Warehouse tags/categories -ThisCategoryHasNoProduct=This category does not contain any product. -ThisCategoryHasNoSupplier=This category does not contain any vendor. -ThisCategoryHasNoCustomer=This category does not contain any customer. -ThisCategoryHasNoMember=This category does not contain any member. -ThisCategoryHasNoContact=This category does not contain any contact. -ThisCategoryHasNoAccount=This category does not contain any account. -ThisCategoryHasNoProject=This category does not contain any project. +ThisCategoryHasNoItems=This category does not contain any items. CategId=Tag/category id CatSupList=List of vendor tags/categories CatCusList=List of customer/prospect tags/categories From a55d1fca0aa22aa6ef18df7e23a1ebba01829407 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
'; $param = '&limit='.$limit.'&id='.$id.'&type='.$type; $num = count($prods); $nbtotalofrecords = ''; $newcardbutton = ''; - print_barre_liste($langs->trans("Member"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'adherents', 0, $newcardbutton, '', $limit); + print_barre_liste($langs->trans("Member"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'members', 0, $newcardbutton, '', $limit); print "
| '.$langs->trans("Name").' | ||||||||||||||||||||||||||||||||||||||||||
| '.$langs->trans("Ref").' | ||||||||||||||||||||||||||||||||||||||||||
| '.$langs->trans("Ref").' | "; + print ' | '; if ($objp->url_id) { $companystatic->id = $objp->url_id; @@ -1520,13 +1520,13 @@ if ($resql) { if ($user->rights->banque->modifier || $user->rights->banque->consolidate) { - print ''; + print ''; print img_edit(); print ''; } else { - print ''; + print ''; print img_view(); print ''; } @@ -1574,7 +1574,7 @@ if ($resql) if ($i == 1) { if ($num < $limit && empty($offset)) print ' | '.$langs->trans("Total").' | '; - else print ''.$langs->trans("Totalforthispage").' | '; + else print ''.$langs->trans("Totalforthispage").' | '; } elseif ($totalarray['totaldebfield'] == $i) print ''.price(-1 * $totalarray['totaldeb']).' | '; elseif ($totalarray['totalcredfield'] == $i) print ''.price($totalarray['totalcred']).' | '; diff --git a/htdocs/compta/bank/categ.php b/htdocs/compta/bank/categ.php index 21712e9a36f..e220df40e42 100644 --- a/htdocs/compta/bank/categ.php +++ b/htdocs/compta/bank/categ.php @@ -138,7 +138,7 @@ if ($result) { print "".$objp->label." | "; print ''; - print ''.img_edit().' '; + print ''.img_edit().' '; print ''.img_delete().''; print ' | '; } diff --git a/htdocs/compta/bank/line.php b/htdocs/compta/bank/line.php index 963a3edf26f..c5c4464bf41 100644 --- a/htdocs/compta/bank/line.php +++ b/htdocs/compta/bank/line.php @@ -304,14 +304,14 @@ if ($result) print ''; print ''; - dol_fiche_head($tabs, 0, $langs->trans('LineRecord'), -1, 'account', 0); + dol_fiche_head($tabs, 0, $langs->trans('LineRecord'), 0, 'account', 0); $linkback = ''.$langs->trans("BackToList").''; dol_banner_tab($bankline, 'rowid', $linkback); - print '|||||||||||||||||||||||||||||||||
| '; - print ''; + print ''; print ' | '; } // Label if (!empty($arrayfields['b.label']['checked'])) { print ''; - print ''; + print ''; print ' | '; } // Account type @@ -333,7 +333,7 @@ if (!empty($arrayfields['accountype']['checked'])) if (!empty($arrayfields['b.number']['checked'])) { print ''; - print ''; + print ''; print ' | '; } // Account number @@ -527,26 +527,28 @@ foreach ($accounts as $key=>$type) // Transactions to reconcile if (!empty($arrayfields['toreconcile']['checked'])) { - print ''; - if ($objecttmp->rappro) - { - $result = $objecttmp->load_board($user, $objecttmp->id); - if ($result < 0) { - setEventMessages($objecttmp->error, $objecttmp->errors, 'errors'); - } else { - print ''.$result->nbtodo.''; - if ($result->nbtodolate) { - print ''; - print ' '.$result->nbtodolate; - print ''; - } - } - } - else - { - print ''.$langs->trans("FeatureDisabled").''; - } - print ' | '; + print ''; + + $conciliate = $objecttmp->canBeConciliated(); + if ($conciliate == -2) print ''.$langs->trans("CashAccount").''; + elseif ($conciliate == -3) print ''.$langs->trans("Closed").''; + elseif (empty($objecttmp->rappro)) { + print ''.$langs->trans("ConciliationDisabled").''; + } else { + $result = $objecttmp->load_board($user, $objecttmp->id); + if ($result < 0) { + setEventMessages($objecttmp->error, $objecttmp->errors, 'errors'); + } else { + print ''.$result->nbtodo.''; + if ($result->nbtodolate) { + print ''; + print ' '.$result->nbtodolate; + print ''; + } + } + } + + print ' | '; if (!$i) $totalarray['nbfield']++; } From d204cfe6c64393515c1332ccc6f6b3a3d3948eb6 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur"; - print $memberstatic->getNomUrl(-1, 0, 'card', 'ref'); + print $memberstatic->getNomUrl(-1, 0, 'card', 'ref', '', -1, 0, 1); print " | \n"; if (!$i) $totalarray['nbfield']++; } From 7cee643c05b3bcf4f6932b2fe7142fdfe4d7cc51 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur
'."\n"; if (empty($enabled)) continue; // 0 = Never visible field - if (abs($enabled) != 1 && abs($enabled) != 3 && abs($enabled) != 5) continue; // <> -1 and <> 1 and <> 3 = not visible on forms, only on list + if (abs($enabled) != 1 && abs($enabled) != 3 && abs($enabled) != 5 && abs($enabled) != 4) continue; // <> -1 and <> 1 and <> 3 = not visible on forms, only on list <> 4 = not visible at the creation if (empty($perms)) continue; // 0 = Not visible // Load language if required diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php index 8ca8bd22bfe..d59581fa914 100644 --- a/htdocs/ticket/card.php +++ b/htdocs/ticket/card.php @@ -637,7 +637,7 @@ if ($action == 'create' || $action == 'presend') $defaultref = ''; } - $formticket->showForm(1); + $formticket->showForm(1, 'create'); } if (empty($action) || $action == 'view' || $action == 'addlink' || $action == 'dellink' || $action == 'presend' || $action == 'presend_addmessage' || $action == 'close' || $action == 'delete' || $action == 'editcustomer' || $action == 'progression' || $action == 'reopen' From a5a5fe55f6476b0a0cc2a07366f4c880e196c52f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur
'; + print '
'.$modulestatusinfo;
+ print ' '.$linktoenabledisable.'
';
print ''; From 372d719693dac9da56656b07ba7b4351e514fc96 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur
('.$langs->trans("SeeReportInInputOutputMode",'','').')'; + $calcmode .= '
('.$langs->trans("SeeReportInBookkeepingMode", '', '').')'; + $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0); + $periodlink = ($year_start ? "".img_previous()." ".img_next()."" : ""); + $description = $langs->trans("RulesPurchaseTurnoverDue"); + $builddate = dol_now(); + //$exportlink=$langs->trans("NotYetAvailable"); +} +elseif ($modecompta == "RECETTES-DEPENSES") +{ + $name = $langs->trans("PurchaseTurnoverCollected"); + $calcmode = $langs->trans("CalcModeEngagement"); + //$calcmode.='
('.$langs->trans("SeeReportInDueDebtMode",'','').')'; + //$calcmode.='
('.$langs->trans("SeeReportInBookkeepingMode",'','').')'; + $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0); + $periodlink = ($year_start ? "".img_previous()." ".img_next()."" : ""); + $description = $langs->trans("RulesPurchaseTurnoverIn"); + $builddate = dol_now(); + //$exportlink=$langs->trans("NotYetAvailable"); +} +elseif ($modecompta == "BOOKKEEPING") +{ + $name = $langs->trans("PurchaseTurnover"); + $calcmode = $langs->trans("CalcModeBookkeeping"); + $calcmode .= '
('.$langs->trans("SeeReportInDueDebtMode", '', '').')'; + //$calcmode.='
('.$langs->trans("SeeReportInInputOutputMode",'','').')'; + $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0); + $periodlink = ($year_start ? "".img_previous()." ".img_next()."" : ""); + $description = $langs->trans("RulesPurchaseTurnoverTotalPurchaseJournal"); + $builddate = dol_now(); + //$exportlink=$langs->trans("NotYetAvailable"); +} + +$moreparam = array(); +if (!empty($modecompta)) $moreparam['modecompta'] = $modecompta; +report_header($name, $namelink, $period, $periodlink, $description, $builddate, $exportlink, $moreparam, $calcmode); + +if (!empty($conf->accounting->enabled) && $modecompta != 'BOOKKEEPING') +{ + print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1); +} + + +if ($modecompta == 'CREANCES-DETTES') +{ + $sql = "SELECT date_format(f.datef,'%Y-%m') as dm, sum(f.total_ht) as amount, sum(f.total_ttc) as amount_ttc"; + $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f"; + $sql .= " WHERE f.fk_statut in (1,2)"; + $sql .= " AND f.type IN (0,2)"; + $sql .= " AND f.entity IN (".getEntity('invoice').")"; + if ($socid) $sql .= " AND f.fk_soc = ".$socid; +} +elseif ($modecompta == "RECETTES-DEPENSES") +{ + $sql = "SELECT date_format(p.datep,'%Y-%m') as dm, sum(pf.amount) as amount_ttc"; + $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f"; + $sql .= ", ".MAIN_DB_PREFIX."paiementfourn_facturefourn as pf"; + $sql .= ", ".MAIN_DB_PREFIX."paiementfourn as p"; + $sql .= " WHERE p.rowid = pf.fk_paiementfourn"; + $sql .= " AND pf.fk_facturefourn = f.rowid"; + $sql .= " AND f.entity IN (".getEntity('invoice').")"; + if ($socid) $sql .= " AND f.fk_soc = ".$socid; +} +elseif ($modecompta == "BOOKKEEPING") +{ + $sql = "SELECT date_format(b.doc_date,'%Y-%m') as dm, sum(b.debit) as amount_ttc"; + $sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as b, ".MAIN_DB_PREFIX."accounting_journal as aj"; + $sql .= " WHERE b.entity = ".$conf->entity; // In module double party accounting, we never share entities + $sql .= " AND aj.entity = ".$conf->entity; + $sql .= " AND b.code_journal = aj.code AND aj.nature = 3"; // @todo currently count amount in sale journal, but we need to define a category group for turnover +} + +$sql .= " GROUP BY dm"; +$sql .= " ORDER BY dm"; +// TODO Add a filter on $date_start and $date_end to reduce quantity on data +//print $sql; + +$minyearmonth = $maxyearmonth = 0; + +$result = $db->query($sql); +if ($result) +{ + $num = $db->num_rows($result); + $i = 0; + while ($i < $num) + { + $obj = $db->fetch_object($result); + $cum_ht[$obj->dm] = !empty($obj->amount) ? $obj->amount : 0; + $cum[$obj->dm] = $obj->amount_ttc; + if ($obj->amount_ttc) + { + $minyearmonth = ($minyearmonth ? min($minyearmonth, $obj->dm) : $obj->dm); + $maxyearmonth = max($maxyearmonth, $obj->dm); + } + $i++; + } + $db->free($result); +} +else { + dol_print_error($db); +} + +$moreforfilter = ''; + +print '
';
+print ''."\n";
+
+print '
";
+print '
';
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang
index 5865826dc73..eac579f595b 100644
--- a/htdocs/langs/en_US/compta.lang
+++ b/htdocs/langs/en_US/compta.lang
@@ -159,7 +159,7 @@ SeeReportInBookkeepingMode=See %sBookeeping report%s for a calculation on
RulesAmountWithTaxIncluded=- Amounts shown are with all taxes included
RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.| '; + +for ($annee = $year_start; $annee <= $year_end; $annee++) +{ + if ($modecompta == 'CREANCES-DETTES') print ' | '; + else print ' | '; + if ($modecompta != 'BOOKKEEPING') print ''; + print $annee; + if ($conf->global->SOCIETE_FISCAL_MONTH_START > 1) print '-'.($annee + 1); + if ($modecompta != 'BOOKKEEPING') print ''; + print ' | '; + if ($annee != $year_end) print ''; +} +print ' | |||||||
| '.$langs->trans("Month").' | '; +for ($annee = $year_start; $annee <= $year_end; $annee++) +{ + if ($modecompta == 'CREANCES-DETTES') print ''.$langs->trans("AmountHT").' | '; + print ''.$langs->trans("AmountTTC").' | '; + print ''.$langs->trans("Delta").' | '; + if ($annee != $year_end) print ''; +} +print ' | ||||||
| ".dol_print_date(dol_mktime(12, 0, 0, $mois_modulo, 1, 2000), "%B")." | "; + + for ($annee = $year_start - 1; $annee <= $year_end; $annee++) // We start one year before to have data to be able to make delta + { + $annee_decalage = $annee; + if ($mois > 12) {$annee_decalage = $annee + 1; } + $case = dol_print_date(dol_mktime(1, 1, 1, $mois_modulo, 1, $annee_decalage), "%Y-%m"); + $caseprev = dol_print_date(dol_mktime(1, 1, 1, $mois_modulo, 1, $annee_decalage - 1), "%Y-%m"); + + if ($annee >= $year_start) // We ignore $annee < $year_start, we loop on it to be able to make delta, nothing is output. + { + if ($modecompta == 'CREANCES-DETTES') { + // Valeur CA du mois w/o VAT + print ''; + if ($cum_ht[$case]) + { + $now_show_delta = 1; // On a trouve le premier mois de la premiere annee generant du chiffre. + print ''.price($cum_ht[$case], 1).''; + } + else + { + if ($minyearmonth < $case && $case <= max($maxyearmonth, $nowyearmonth)) { print '0'; } + else { print ' '; } + } + print " | "; + } + + // Valeur CA du mois + print ''; + if ($cum[$case]) + { + $now_show_delta = 1; // On a trouve le premier mois de la premiere annee generant du chiffre. + if ($modecompta != 'BOOKKEEPING') print ''; + print price($cum[$case], 1); + if ($modecompta != 'BOOKKEEPING') print ''; + } + else + { + if ($minyearmonth < $case && $case <= max($maxyearmonth, $nowyearmonth)) { print '0'; } + else { print ' '; } + } + print " | "; + + // Pourcentage du mois + if ($annee_decalage > $minyear && $case <= $casenow) + { + if ($cum[$caseprev] && $cum[$case]) + { + $percent = (round(($cum[$case] - $cum[$caseprev]) / $cum[$caseprev], 4) * 100); + //print "X $cum[$case] - $cum[$caseprev] - $cum[$caseprev] - $percent X"; + print ''.($percent >= 0 ? "+$percent" : "$percent").'% | '; + } + if ($cum[$caseprev] && !$cum[$case]) + { + print '-100% | '; + } + if (!$cum[$caseprev] && $cum[$case]) + { + //print '+Inf% | '; + print '- | '; + } + if (isset($cum[$caseprev]) && !$cum[$caseprev] && !$cum[$case]) + { + print '+0% | '; + } + if (!isset($cum[$caseprev]) && !$cum[$case]) + { + print '- | '; + } + } + else + { + print ''; + if ($minyearmonth <= $case && $case <= $maxyearmonth) { print '-'; } + else { print ' '; } + print ' | '; + } + + if ($annee_decalage < $year_end || ($annee_decalage == $year_end && $mois > 12 && $annee < $year_end)) print ''; + } + + $total_ht[$annee] += ((!empty($cum_ht[$case])) ? $cum_ht[$case] : 0); + $total[$annee] += $cum[$case]; + } + + print ' |
| '.$langs->trans("Total").' | '; +for ($annee = $year_start; $annee <= $year_end; $annee++) +{ + if ($modecompta == 'CREANCES-DETTES') { + // Montant total HT + if ($total_ht[$annee] || ($annee >= $minyear && $annee <= max($nowyear, $maxyear))) + { + print ''.($total_ht[$annee] ?price($total_ht[$annee]) : "0")." | "; + } + else + { + print ''; + } + } + + // Montant total + if ($total[$annee] || ($annee >= $minyear && $annee <= max($nowyear, $maxyear))) + { + print ' | '.($total[$annee] ?price($total[$annee]) : "0")." | "; + } + else + { + print ''; + } + + // Pourcentage total + if ($annee > $minyear && $annee <= max($nowyear, $maxyear)) + { + if ($total[$annee - 1] && $total[$annee]) { + $percent = (round(($total[$annee] - $total[$annee - 1]) / $total[$annee - 1], 4) * 100); + print ' | '.($percent >= 0 ? "+$percent" : "$percent").'% | '; + } + if ($total[$annee - 1] && !$total[$annee]) + { + print '-100% | '; + } + if (!$total[$annee - 1] && $total[$annee]) + { + print '+'.$langs->trans('Inf').'% | '; + } + if (!$total[$annee - 1] && !$total[$annee]) + { + print '+0% | '; + } + } + else + { + print ''; + if ($total[$annee] || ($minyear <= $annee && $annee <= max($nowyear, $maxyear))) { print '-'; } + else { print ' '; } + print ' | '; + } + + if ($annee != $year_end) print ''; +} +print " |
- It is based on the validation date of invoices and VAT and on the due date for expenses. For salaries defined with Salary module, the value date of payment is used. RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries.
- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation. -RulesCADue=- It includes the customer's due invoices whether they are paid or not.
- It is based on the validation date of these invoices.
+RulesCADue=- It includes the customer's due invoices whether they are paid or not.
- It is based on the invoice date of these invoices.
RulesCAIn=- It includes all the effective payments of invoices received from customers.
- It is based on the payment date of these invoices
RulesCATotalSaleJournal=It includes all credit lines from the Sale journal. RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME" @@ -254,4 +254,9 @@ ByVatRate=By sale tax rate TurnoverbyVatrate=Turnover invoiced by sale tax rate TurnoverCollectedbyVatrate=Turnover collected by sale tax rate PurchasebyVatrate=Purchase by sale tax rate -LabelToShow=Short label \ No newline at end of file +LabelToShow=Short label +PurchaseTurnover=Purchase turnover +PurchaseTurnoverCollected=Purchase turnover collected +RulesPurchaseTurnoverDue=- It includes the supplier's due invoices whether they are paid or not.
- It is based on the invoice date of these invoices.
+RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices done to suppliers.
- It is based on the payment date of these invoices
+RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal. From 863f8dd1d6c0b5b9c25d3bfcfffbef858c3ce6a8 Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas
('.$langs->trans("SeeReportInInputOutputMode",'','').')'; + $description = $langs->trans("RulesPurchaseTurnoverDue"); + $builddate = dol_now(); + //$exportlink=$langs->trans("NotYetAvailable"); +} +elseif ($modecompta == "RECETTES-DEPENSES") +{ + $name = $langs->trans("PurchaseTurnoverCollected").', '.$langs->trans("ByThirdParties"); + $calcmode = $langs->trans("CalcModeEngagement"); + //$calcmode.='
('.$langs->trans("SeeReportInDueDebtMode",'','').')'; + $description = $langs->trans("RulesPurchaseTurnoverIn"); + $description .= $langs->trans("DepositsAreIncluded"); + $builddate = dol_now(); + //$exportlink=$langs->trans("NotYetAvailable"); +} +elseif ($modecompta == "BOOKKEEPING") +{ +} +elseif ($modecompta == "BOOKKEEPINGCOLLECTED") +{ +} +$period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0); +if ($date_end == dol_time_plus_duree($date_start, 1, 'y') - 1) $periodlink = ''.img_previous().' '.img_next().''; +else $periodlink = ''; + +report_header($name, $namelink, $period, $periodlink, $description, $builddate, $exportlink, $tableparams, $calcmode); + +if (!empty($conf->accounting->enabled) && $modecompta != 'BOOKKEEPING') +{ + print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1); +} + + +$name = array(); + +// Show Array +$catotal = 0; +if ($modecompta == 'CREANCES-DETTES') { + $sql = "SELECT DISTINCT s.rowid as socid, s.nom as name, s.zip, s.town, s.fk_pays,"; + $sql .= " sum(f.total_ht) as amount, sum(f.total_ttc) as amount_ttc"; + $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f, ".MAIN_DB_PREFIX."societe as s"; + if ($selected_cat === -2) // Without any category + { + $sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_soc"; + } + elseif ($selected_cat) // Into a specific category + { + $sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."categorie_societe as cs"; + } + $sql .= " WHERE f.fk_statut in (1,2)"; + $sql .= " AND f.type IN (0,2)"; + $sql .= " AND f.fk_soc = s.rowid"; + if ($date_start && $date_end) { + $sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'"; + } + if ($selected_cat === -2) // Without any category + { + $sql .= " AND cs.fk_soc is null"; + } + elseif ($selected_cat) { // Into a specific category + $sql .= " AND (c.rowid = ".$db->escape($selected_cat); + if ($subcat) $sql .= " OR c.fk_parent = ".$db->escape($selected_cat); + $sql .= ")"; + $sql .= " AND cs.fk_categorie = c.rowid AND cs.fk_soc = s.rowid"; + } +} else { + $sql = "SELECT s.rowid as socid, s.nom as name, s.zip, s.town, s.fk_pays, sum(pf.amount) as amount_ttc"; + $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f"; + $sql .= ", ".MAIN_DB_PREFIX."paiementfourn_facturefourn as pf"; + $sql .= ", ".MAIN_DB_PREFIX."paiementfourn as p"; + $sql .= ", ".MAIN_DB_PREFIX."societe as s"; + if ($selected_cat === -2) // Without any category + { + $sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_soc"; + } + elseif ($selected_cat) // Into a specific category + { + $sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."categorie_societe as cs"; + } + $sql .= " WHERE p.rowid = pf.fk_paiementfourn"; + $sql .= " AND pf.fk_facturefourn = f.rowid"; + $sql .= " AND f.fk_soc = s.rowid"; + if ($date_start && $date_end) { + $sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'"; + } + if ($selected_cat === -2) // Without any category + { + $sql .= " AND cs.fk_soc is null"; + } + elseif ($selected_cat) { // Into a specific category + $sql .= " AND (c.rowid = ".$selected_cat; + if ($subcat) $sql .= " OR c.fk_parent = ".$selected_cat; + $sql .= ")"; + $sql .= " AND cs.fk_categorie = c.rowid AND cs.fk_soc = s.rowid"; + } +} +if (!empty($search_societe)) $sql .= natural_search('s.nom', $search_societe); +if (!empty($search_zip)) $sql .= natural_search('s.zip', $search_zip); +if (!empty($search_town)) $sql .= natural_search('s.town', $search_town); +if ($search_country > 0) $sql .= ' AND s.fk_pays = '.$search_country.''; +$sql .= " AND f.entity IN (".getEntity('invoice').")"; +if ($socid) $sql .= " AND f.fk_soc = ".$socid; +$sql .= " GROUP BY s.rowid, s.nom, s.zip, s.town, s.fk_pays"; +$sql .= " ORDER BY s.rowid"; +//echo $sql; + +dol_syslog("supplier_turnover_by_thirdparty", LOG_DEBUG); +$result = $db->query($sql); +if ($result) { + $num = $db->num_rows($result); + $i = 0; + while ($i < $num) { + $obj = $db->fetch_object($result); + $amount_ht[$obj->socid] = $obj->amount; + $amount[$obj->socid] = $obj->amount_ttc; + $name[$obj->socid] = $obj->name.' '.$obj->firstname; + $address_zip[$obj->socid] = $obj->zip; + $address_town[$obj->socid] = $obj->town; + $address_pays[$obj->socid] = getCountry($obj->fk_pays); + $catotal_ht += $obj->amount; + $catotal += $obj->amount_ttc; + $i++; + } +} else { + dol_print_error($db); +} + +// Show array +$i = 0; +print ''; + +// End of page +llxFooter(); +$db->close(); From 1adfe5c21f71517b4b97d69bb64e549827865673 Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas
('.$langs->trans("SeeReportInDueDebtMode",'','').')'; $description = $langs->trans("RulesPurchaseTurnoverIn"); - $description .= $langs->trans("DepositsAreIncluded"); $builddate = dol_now(); //$exportlink=$langs->trans("NotYetAvailable"); } From 493a6d9709fe72aa77df9c1639cb400c8df04216 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur
'."\n".'
'."\n".'
'."\n".$obj->fulltext; + $htmltext .= '
'."\n".'
'."\n".'
'."\n"; + $htmltext .= $obj->fulltext; + $htmltext .= "
- It is based on the invoice date of these invoices.
RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices done to suppliers.
- It is based on the payment date of these invoices
RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal. +ReportPurchaseTurnover=Purchase turnover invoiced +ReportPurchaseTurnoverCollected=Purchase turnover collected From fe876b96fe784b9d6e7e5a8798fb89906e79226a Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas
'; - } - - $familytext = empty($familyinfo[$familykey]['label']) ? $familykey : $familyinfo[$familykey]['label']; - print load_fiche_titre($familytext, '', ''); - - if (! empty($conf->global->MAIN_USE_KANBAN_FOR_MODULES)) { - print '
';
- } else {
- print '
'; } - $atleastoneforfamily = 0; - } + $familytext = empty($familyinfo[$familykey]['label']) ? $familykey : $familyinfo[$familykey]['label']; + print load_fiche_titre($familytext, '', ''); - $atleastoneforfamily++; + if (! empty($conf->global->MAIN_USE_KANBAN_FOR_MODULES)) { + print '
';
- print ''."\n";
+ // Print a separator if we change family
+ if ($familykey != $oldfamily) {
+ if ($oldfamily) {
+ print '
'; } - $atleastoneforfamily = 0; - } + $familytext = empty($familyinfo[$familykey]['label']) ? $familykey : $familyinfo[$familykey]['label']; + print load_fiche_titre($familytext, '', ''); - $atleastoneforfamily++; + if (! empty($conf->global->MAIN_USE_KANBAN_FOR_MODULES)) { + print '
';
+ } else {
+ print '';
+ print $versiontrans;
+ if (!empty($conf->global->CHECKLASTVERSION_EXTERNALMODULE)) {
+ require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
+ if (!empty($objMod->url_last_version)) {
+ $newversion = getURLContent($objMod->url_last_version);
+ if (isset($newversion['content'])) {
+ if (version_compare($newversion['content'], $versiontrans) > 0) {
+ print " ".$newversion['content']."";
+ }
+ }
+ }
+ }
+ print " \n";
- dol_fiche_end();
+ // Activate/Disable and Setup (2 columns)
+ if (!empty($conf->global->$const_name)) // If module is already activated
+ {
+ $disableSetup = 0;
- print '
'; + // Link enable/disabme + print '';
+ if (!empty($arrayofwarnings[$modName]))
+ {
+ print ''."\n";
+ }
+ if (!empty($objMod->disabled))
+ {
+ print $langs->trans("Disabled");
+ }
+ elseif (!empty($objMod->always_enabled) || ((!empty($conf->multicompany->enabled) && $objMod->core_enabled) && ($user->entity || $conf->entity != 1)))
+ {
+ if (method_exists($objMod, 'alreadyUsed') && $objMod->alreadyUsed()) print $langs->trans("Used");
+ else {
+ print img_picto($langs->trans("Required"), 'switch_on', '', false, 0, 0, '', 'opacitymedium');
+ //print $langs->trans("Required");
+ }
+ if (!empty($conf->multicompany->enabled) && $user->entity) $disableSetup++;
+ }
+ else
+ {
+ if (!empty($objMod->warnings_unactivation[$mysoc->country_code]) && method_exists($objMod, 'alreadyUsed') && $objMod->alreadyUsed()) {
+ print 'warnings_unactivation[$mysoc->country_code].'&value='.$modName.'&mode='.$mode.$param.'">';
+ print img_picto($langs->trans("Activated"), 'switch_on');
+ print '';
+ }
+ else {
+ print '';
+ print img_picto($langs->trans("Activated"), 'switch_on');
+ print '';
+ }
+ }
+ print ' '."\n";
- // Show warning about external users
- print info_admin(showModulesExludedForExternal($modules))."\n";
+ // Link config
+ print '';
+ if (!empty($objMod->config_page_url) && !$disableSetup)
+ {
+ $backtourlparam = '';
+ if ($search_keyword != '') $backtourlparam .= ($backtourlparam ? '&' : '?').'search_keyword='.$search_keyword; // No urlencode here, done later
+ if ($search_nature > -1) $backtourlparam .= ($backtourlparam ? '&' : '?').'search_nature='.$search_nature;
+ if ($search_version > -1) $backtourlparam .= ($backtourlparam ? '&' : '?').'search_version='.$search_version;
+ if ($search_status > -1) $backtourlparam .= ($backtourlparam ? '&' : '?').'search_status='.$search_status;
+ $backtourl = $_SERVER["PHP_SELF"].$backtourlparam;
- print '';
+ $regs = array();
+ if (is_array($objMod->config_page_url))
+ {
+ $i = 0;
+ foreach ($objMod->config_page_url as $page)
+ {
+ $urlpage = $page;
+ if ($i++)
+ {
+ print ''.img_picto(ucfirst($page), "setup").'';
+ // print ''.ucfirst($page).' ';
+ }
+ else
+ {
+ if (preg_match('/^([^@]+)@([^@]+)$/i', $urlpage, $regs))
+ {
+ $urltouse = dol_buildpath('/'.$regs[2].'/admin/'.$regs[1], 1);
+ print ''.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"').'';
+ }
+ else
+ {
+ $urltouse = $urlpage;
+ print ''.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"').'';
+ }
+ }
+ }
+ }
+ elseif (preg_match('/^([^@]+)@([^@]+)$/i', $objMod->config_page_url, $regs))
+ {
+ print ''.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"').'';
+ }
+ else
+ {
+ print ''.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"').'';
+ }
+ }
+ else
+ {
+ print img_picto($langs->trans("NothingToSetup"), "setup", 'class="opacitytransp" style="padding-right: 6px"');
+ }
+ print ' ';
+ }
+ else // Module not yet activated
+ {
+ // Link enable/disable
+ print '';
+ if (!empty($objMod->always_enabled))
+ {
+ // Should never happened
+ }
+ elseif (!empty($objMod->disabled))
+ {
+ print $langs->trans("Disabled");
+ }
+ else
+ {
+ // Module qualified for activation
+ $warningmessage = '';
+ if (!empty($arrayofwarnings[$modName]))
+ {
+ print ''."\n";
+ foreach ($arrayofwarnings[$modName] as $keycountry => $cursorwarningmessage)
+ {
+ if (preg_match('/^always/', $keycountry) || ($mysoc->country_code && preg_match('/^'.$mysoc->country_code.'/', $keycountry)))
+ {
+ $warningmessage .= ($warningmessage ? "\n" : "").$langs->trans($cursorwarningmessage, $objMod->getName(), $mysoc->country_code);
+ }
+ }
+ }
+ if ($objMod->isCoreOrExternalModule() == 'external' && !empty($arrayofwarningsext))
+ {
+ print ''."\n";
+ foreach ($arrayofwarningsext as $keymodule => $arrayofwarningsextbycountry)
+ {
+ $keymodulelowercase = strtolower(preg_replace('/^mod/', '', $keymodule));
+ if (in_array($keymodulelowercase, $conf->modules)) // If module that request warning is on
+ {
+ foreach ($arrayofwarningsextbycountry as $keycountry => $cursorwarningmessage)
+ {
+ if (preg_match('/^always/', $keycountry) || ($mysoc->country_code && preg_match('/^'.$mysoc->country_code.'/', $keycountry)))
+ {
+ $warningmessage .= ($warningmessage ? "\n" : "").$langs->trans($cursorwarningmessage, $objMod->getName(), $mysoc->country_code, $modules[$keymodule]->getName());
+ $warningmessage .= ($warningmessage ? "\n" : "").($warningmessage ? "\n" : "").$langs->trans("Module").' : '.$objMod->getName();
+ if (!empty($objMod->editor_name)) $warningmessage .= ($warningmessage ? "\n" : "").$langs->trans("Publisher").' : '.$objMod->editor_name;
+ if (!empty($objMod->editor_name)) $warningmessage .= ($warningmessage ? "\n" : "").$langs->trans("ModuleTriggeringThisWarning").' : '.$modules[$keymodule]->getName();
+ }
+ }
+ }
+ }
+ }
+ print ''."\n";
+ print '';
+ print img_picto($langs->trans("Disabled"), 'switch_off');
+ print "\n";
+ }
+ print " \n";
+
+ // Link config
+ print ''.img_picto($langs->trans("NothingToSetup"), "setup", 'class="opacitytransp" style="padding-right: 6px"').' ';
+ }
+
+ print "\n";
+ }
+ }
+
+ if ($oldfamily)
+ {
+ if (! empty($conf->global->MAIN_USE_KANBAN_FOR_MODULES)) {
+ print '
';
+ } else {
+ print "';
+ print ''."\n";
+ }
- if ($familykey != $oldfamily)
- {
- $familytext = empty($familyinfo[$familykey]['label']) ? $familykey : $familyinfo[$familykey]['label'];
- $oldfamily = $familykey;
- }
+ $atleastoneforfamily = 0;
+ }
- // Version (with picto warning or not)
- $version = $objMod->getVersion(0);
- $versiontrans = '';
- if (preg_match('/development/i', $version)) $versiontrans .= img_warning($langs->trans("Development"), 'style="float: left"');
- if (preg_match('/experimental/i', $version)) $versiontrans .= img_warning($langs->trans("Experimental"), 'style="float: left"');
- if (preg_match('/deprecated/i', $version)) $versiontrans .= img_warning($langs->trans("Deprecated"), 'style="float: left"');
- $versiontrans .= $objMod->getVersion(1);
+ $atleastoneforfamily++;
- // Define imginfo
- $imginfo = "info";
- if ($objMod->isCoreOrExternalModule() == 'external')
- {
- $imginfo = "info_black";
- }
+ if ($familykey != $oldfamily)
+ {
+ $familytext = empty($familyinfo[$familykey]['label']) ? $familykey : $familyinfo[$familykey]['label'];
+ $oldfamily = $familykey;
+ }
- if (! empty($conf->global->MAIN_USE_KANBAN_FOR_MODULES)) {
- // Output Kanban
- print $objMod->getKanbanView();
- } else {
- print '
\n";
- print '
';
- }
- }
+ // Version
+ print '| '.++$linenum.' | '; + // Version (with picto warning or not) + $version = $objMod->getVersion(0); + $versiontrans = ''; + if (preg_match('/development/i', $version)) $versiontrans .= img_warning($langs->trans("Development"), 'style="float: left"'); + if (preg_match('/experimental/i', $version)) $versiontrans .= img_warning($langs->trans("Experimental"), 'style="float: left"'); + if (preg_match('/deprecated/i', $version)) $versiontrans .= img_warning($langs->trans("Deprecated"), 'style="float: left"'); + $versiontrans .= $objMod->getVersion(1); - // Picto + Name of module - print ''; - $alttext = ''; - //if (is_array($objMod->need_dolibarr_version)) $alttext.=($alttext?' - ':'').'Dolibarr >= '.join('.',$objMod->need_dolibarr_version); - //if (is_array($objMod->phpmin)) $alttext.=($alttext?' - ':'').'PHP >= '.join('.',$objMod->phpmin); - if (!empty($objMod->picto)) - { - if (preg_match('/^\//i', $objMod->picto)) print img_picto($alttext, $objMod->picto, 'class="valignmiddle pictomodule"', 1); - else print img_object($alttext, $objMod->picto, 'class="valignmiddle pictomodule"'); - } - else - { - print img_object($alttext, 'generic', 'class="valignmiddle"'); - } - print ' '.$objMod->getName().''; - print " | \n"; + // Define imginfo + $imginfo = "info"; + if ($objMod->isCoreOrExternalModule() == 'external') + { + $imginfo = "info_black"; + } - // Desc - print ''; - print nl2br($objMod->getDesc()); - print " | \n"; + if (! empty($conf->global->MAIN_USE_KANBAN_FOR_MODULES)) { + // Output Kanban + print $objMod->getKanbanView(); + } else { + print '||||||
| '.++$linenum.' | '; - // Help - print ''; - //print $form->textwithpicto('', $text, 1, $imginfo, 'minheight20', 0, 2, 1); - print ''.img_picto($langs->trans("ClickToShowDescription"), $imginfo).''; - print ' | '; - - // Version - print ''; - print $versiontrans; - if (!empty($conf->global->CHECKLASTVERSION_EXTERNALMODULE)) { - require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php'; - if (!empty($objMod->url_last_version)) { - $newversion = getURLContent($objMod->url_last_version); - if (isset($newversion['content'])) { - if (version_compare($newversion['content'], $versiontrans) > 0) { - print " ".$newversion['content'].""; - } - } - } - } - print " | \n"; - - // Activate/Disable and Setup (2 columns) - if (!empty($conf->global->$const_name)) // If module is already activated - { - $disableSetup = 0; - - // Link enable/disabme - print ''; - if (!empty($arrayofwarnings[$modName])) - { - print ''."\n"; - } - if (!empty($objMod->disabled)) - { - print $langs->trans("Disabled"); - } - elseif (!empty($objMod->always_enabled) || ((!empty($conf->multicompany->enabled) && $objMod->core_enabled) && ($user->entity || $conf->entity != 1))) - { - if (method_exists($objMod, 'alreadyUsed') && $objMod->alreadyUsed()) print $langs->trans("Used"); - else { - print img_picto($langs->trans("Required"), 'switch_on', '', false, 0, 0, '', 'opacitymedium'); - //print $langs->trans("Required"); - } - if (!empty($conf->multicompany->enabled) && $user->entity) $disableSetup++; - } - else - { - if (!empty($objMod->warnings_unactivation[$mysoc->country_code]) && method_exists($objMod, 'alreadyUsed') && $objMod->alreadyUsed()) { - print 'warnings_unactivation[$mysoc->country_code].'&value='.$modName.'&mode='.$mode.$param.'">'; - print img_picto($langs->trans("Activated"), 'switch_on'); - print ''; - } - else { - print ''; - print img_picto($langs->trans("Activated"), 'switch_on'); - print ''; - } - } - print ' | '."\n"; - - // Link config - print ''; - if (!empty($objMod->config_page_url) && !$disableSetup) - { - $backtourlparam = ''; - if ($search_keyword != '') $backtourlparam .= ($backtourlparam ? '&' : '?').'search_keyword='.$search_keyword; // No urlencode here, done later - if ($search_nature > -1) $backtourlparam .= ($backtourlparam ? '&' : '?').'search_nature='.$search_nature; - if ($search_version > -1) $backtourlparam .= ($backtourlparam ? '&' : '?').'search_version='.$search_version; - if ($search_status > -1) $backtourlparam .= ($backtourlparam ? '&' : '?').'search_status='.$search_status; - $backtourl = $_SERVER["PHP_SELF"].$backtourlparam; - - $regs = array(); - if (is_array($objMod->config_page_url)) - { - $i = 0; - foreach ($objMod->config_page_url as $page) - { - $urlpage = $page; - if ($i++) - { - print ''.img_picto(ucfirst($page), "setup").''; - // print ''.ucfirst($page).' '; - } - else - { - if (preg_match('/^([^@]+)@([^@]+)$/i', $urlpage, $regs)) - { - $urltouse = dol_buildpath('/'.$regs[2].'/admin/'.$regs[1], 1); - print ''.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"').''; - } - else - { - $urltouse = $urlpage; - print ''.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"').''; - } - } - } - } - elseif (preg_match('/^([^@]+)@([^@]+)$/i', $objMod->config_page_url, $regs)) - { - print ''.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"').''; - } - else - { - print ''.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"').''; - } - } - else - { - print img_picto($langs->trans("NothingToSetup"), "setup", 'class="opacitytransp" style="padding-right: 6px"'); - } - print ' | '; - } - else // Module not yet activated + // Picto + Name of module + print ''; + $alttext = ''; + //if (is_array($objMod->need_dolibarr_version)) $alttext.=($alttext?' - ':'').'Dolibarr >= '.join('.',$objMod->need_dolibarr_version); + //if (is_array($objMod->phpmin)) $alttext.=($alttext?' - ':'').'PHP >= '.join('.',$objMod->phpmin); + if (!empty($objMod->picto)) { - // Link enable/disable - print ' | '; - if (!empty($objMod->always_enabled)) - { - // Should never happened - } - elseif (!empty($objMod->disabled)) - { - print $langs->trans("Disabled"); - } - else - { - // Module qualified for activation - $warningmessage = ''; - if (!empty($arrayofwarnings[$modName])) - { - print ''."\n"; - foreach ($arrayofwarnings[$modName] as $keycountry => $cursorwarningmessage) - { - if (preg_match('/^always/', $keycountry) || ($mysoc->country_code && preg_match('/^'.$mysoc->country_code.'/', $keycountry))) - { - $warningmessage .= ($warningmessage ? "\n" : "").$langs->trans($cursorwarningmessage, $objMod->getName(), $mysoc->country_code); - } - } - } - if ($objMod->isCoreOrExternalModule() == 'external' && !empty($arrayofwarningsext)) - { - print ''."\n"; - foreach ($arrayofwarningsext as $keymodule => $arrayofwarningsextbycountry) - { - $keymodulelowercase = strtolower(preg_replace('/^mod/', '', $keymodule)); - if (in_array($keymodulelowercase, $conf->modules)) // If module that request warning is on - { - foreach ($arrayofwarningsextbycountry as $keycountry => $cursorwarningmessage) - { - if (preg_match('/^always/', $keycountry) || ($mysoc->country_code && preg_match('/^'.$mysoc->country_code.'/', $keycountry))) - { - $warningmessage .= ($warningmessage ? "\n" : "").$langs->trans($cursorwarningmessage, $objMod->getName(), $mysoc->country_code, $modules[$keymodule]->getName()); - $warningmessage .= ($warningmessage ? "\n" : "").($warningmessage ? "\n" : "").$langs->trans("Module").' : '.$objMod->getName(); - if (!empty($objMod->editor_name)) $warningmessage .= ($warningmessage ? "\n" : "").$langs->trans("Publisher").' : '.$objMod->editor_name; - if (!empty($objMod->editor_name)) $warningmessage .= ($warningmessage ? "\n" : "").$langs->trans("ModuleTriggeringThisWarning").' : '.$modules[$keymodule]->getName(); - } - } - } - } - } - print ''."\n"; - print ''; - print img_picto($langs->trans("Disabled"), 'switch_off'); - print "\n"; - } - print " | \n"; + if (preg_match('/^\//i', $objMod->picto)) print img_picto($alttext, $objMod->picto, 'class="valignmiddle pictomodule"', 1); + else print img_object($alttext, $objMod->picto, 'class="valignmiddle pictomodule"'); + } + else + { + print img_object($alttext, 'generic', 'class="valignmiddle"'); + } + print ' '.$objMod->getName().''; + print "\n"; - // Link config - print ''.img_picto($langs->trans("NothingToSetup"), "setup", 'class="opacitytransp" style="padding-right: 6px"').' | '; - } + // Desc + print ''; + print nl2br($objMod->getDesc()); + print " | \n"; - print "'; + //print $form->textwithpicto('', $text, 1, $imginfo, 'minheight20', 0, 2, 1); + print ''.img_picto($langs->trans("ClickToShowDescription"), $imginfo).''; + print ' | '; - if ($oldfamily) - { - if (! empty($conf->global->MAIN_USE_KANBAN_FOR_MODULES)) { - print ''; - } else { - print "
'; + // Link enable/disabme + print '
'; + + // Show warning about external users + print info_admin(showModulesExludedForExternal($modules))."\n"; + + print ''; } if ($mode == 'marketplace') { - dol_fiche_head($head, $mode, '', -1); + dol_fiche_head($head, $mode, '', -1); - // Marketplace - print '
';
- print ''."\n";
- print '
\n";
print '
';
- dol_fiche_end();
+ dol_fiche_end();
- print '| '.$form->textwithpicto($langs->trans("Provider"), $langs->trans("WebSiteDesc")).' | '; - print ''; - print ' | '.$langs->trans("URL").' | '; - print '
| '.$form->textwithpicto($langs->trans("Provider"), $langs->trans("WebSiteDesc")).' | '; + print ''; + print ' | '.$langs->trans("URL").' | '; + print '
 | ';
- print ''.$langs->trans("DoliStoreDesc").' | '; - print ''.$url.' | '; - print '
| ';
+ print ''.$langs->trans("DoliStoreDesc").' | '; + print ''.$url.' | '; + print '
'; + print '
'; - if (empty($conf->global->MAIN_DISABLE_DOLISTORE_SEARCH) && $conf->global->MAIN_FEATURES_LEVEL >= 1) - { - // $options is array with filter criterias - //var_dump($options); - $dolistore->getRemoteCategories(); - $dolistore->getRemoteProducts($options); + if (empty($conf->global->MAIN_DISABLE_DOLISTORE_SEARCH) && $conf->global->MAIN_FEATURES_LEVEL >= 1) + { + // $options is array with filter criterias + //var_dump($options); + $dolistore->getRemoteCategories(); + $dolistore->getRemoteProducts($options); - print ''.$langs->trans('DOLISTOREdescriptionLong').'
'; + print ''.$langs->trans('DOLISTOREdescriptionLong').'
'; - $previouslink = $dolistore->get_previous_link(); - $nextlink = $dolistore->get_next_link(); + $previouslink = $dolistore->get_previous_link(); + $nextlink = $dolistore->get_next_link(); - print '
'
+ print '
';
- print '';
+ print ''
- ?>
+ ?>
';
- print '';
+ print $previouslink;
+ print $nextlink;
+ print '
';
+ print '';
- print '-
@@ -979,7 +979,7 @@ if ($mode == 'marketplace')
'; - $s.=$langs->trans("Version").': '.$this->getVersion().'
'; - } - if ($type == 0) $s.=$langs->trans("ProductCodeDesc").'
'; - if ($type == 1) $s.=$langs->trans("ServiceCodeDesc").'
'; - if ($type != -1) $s.=$langs->trans("ValidityControledByModule").': '.$this->getNom($langs).'
'; - $s.='
'; - $s.=''.$langs->trans("ThisIsModuleRules").':
'; - if ($type == 0) - { - $s.=$langs->trans("RequiredIfProduct").': '; - if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='
'; - } - elseif ($type == 1) - { - $s.=$langs->trans("RequiredIfService").': '; - if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='
'; - } - elseif ($type == -1) - { - $s.=$langs->trans("Required").': '; - if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='
'; - } - $s.=$langs->trans("CanBeModifiedIfOk").': '; - $s.=yn($this->code_modifiable, 1, 2); - $s.='
'; - $s.=$langs->trans("CanBeModifiedIfKo").': '.yn($this->code_modifiable_invalide, 1, 2).'
'; - $s.=$langs->trans("AutomaticCode").': '.yn($this->code_auto, 1, 2).'
'; - $s.='
'; - if ($type == 0 || $type == -1) - { - $nextval=$this->getNextValue($product, 0); - if (empty($nextval)) $nextval=$langs->trans("Undefined"); - $s.=$langs->trans("NextValue").($type == -1?' ('.$langs->trans("Product").')':'').': '.$nextval.'
'; - } - if ($type == 1 || $type == -1) - { - $nextval=$this->getNextValue($product, 1); - if (empty($nextval)) $nextval=$langs->trans("Undefined"); - $s.=$langs->trans("NextValue").($type == -1?' ('.$langs->trans("Service").')':'').': '.$nextval.''; - } - return $s; - } + $s=''; + if ($type == -1) { + $s.=$langs->trans("Name").': '.$this->getNom($langs).'
'; + $s.=$langs->trans("Version").': '.$this->getVersion().'
'; + } + if ($type == 0) $s.=$langs->trans("ProductCodeDesc").'
'; + if ($type == 1) $s.=$langs->trans("ServiceCodeDesc").'
'; + if ($type != -1) $s.=$langs->trans("ValidityControledByModule").': '.$this->getNom($langs).'
'; + $s.='
'; + $s.=''.$langs->trans("ThisIsModuleRules").':
'; + if ($type == 0) + { + $s.=$langs->trans("RequiredIfProduct").': '; + if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='
'; + } + elseif ($type == 1) + { + $s.=$langs->trans("RequiredIfService").': '; + if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='
'; + } + elseif ($type == -1) + { + $s.=$langs->trans("Required").': '; + if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='
'; + } + $s.=$langs->trans("CanBeModifiedIfOk").': '; + $s.=yn($this->code_modifiable, 1, 2); + $s.='
'; + $s.=$langs->trans("CanBeModifiedIfKo").': '.yn($this->code_modifiable_invalide, 1, 2).'
'; + $s.=$langs->trans("AutomaticCode").': '.yn($this->code_auto, 1, 2).'
'; + $s.='
'; + if ($type == 0 || $type == -1) + { + $nextval=$this->getNextValue($product, 0); + if (empty($nextval)) $nextval=$langs->trans("Undefined"); + $s.=$langs->trans("NextValue").($type == -1?' ('.$langs->trans("Product").')':'').': '.$nextval.'
'; + } + if ($type == 1 || $type == -1) + { + $nextval=$this->getNextValue($product, 1); + if (empty($nextval)) $nextval=$langs->trans("Undefined"); + $s.=$langs->trans("NextValue").($type == -1?' ('.$langs->trans("Service").')':'').': '.$nextval.''; + } + return $s; + } - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps - /** - * Check if mask/numbering use prefix - * - * @return int 0=no, 1=yes - */ - public function verif_prefixIsUsed() - { - // phpcs:enable - return 0; - } + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps + /** + * Check if mask/numbering use prefix + * + * @return int 0=no, 1=yes + */ + public function verif_prefixIsUsed() + { + // phpcs:enable + return 0; + } } diff --git a/htdocs/core/modules/project/mod_project_simple.php b/htdocs/core/modules/project/mod_project_simple.php index 3d091658619..c5cc9c7bba3 100644 --- a/htdocs/core/modules/project/mod_project_simple.php +++ b/htdocs/core/modules/project/mod_project_simple.php @@ -32,14 +32,14 @@ require_once DOL_DOCUMENT_ROOT .'/core/modules/project/modules_project.php'; class mod_project_simple extends ModeleNumRefProjects { /** - * Dolibarr version of the loaded document - * @var string - */ + * Dolibarr version of the loaded document + * @var string + */ public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' public $prefix='PJ'; - /** + /** * @var string Error code (or message) */ public $error=''; @@ -57,74 +57,74 @@ class mod_project_simple extends ModeleNumRefProjects public $name='Simple'; - /** - * Return description of numbering module - * - * @return string Text with description - */ - public function info() - { - global $langs; - return $langs->trans("SimpleNumRefModelDesc", $this->prefix); - } + /** + * Return description of numbering module + * + * @return string Text with description + */ + public function info() + { + global $langs; + return $langs->trans("SimpleNumRefModelDesc", $this->prefix); + } - /** - * Return an example of numbering module values - * - * @return string Example - */ - public function getExample() - { - return $this->prefix."0501-0001"; - } + /** + * Return an example of numbering module values + * + * @return string Example + */ + public function getExample() + { + return $this->prefix."0501-0001"; + } - /** - * Checks if the numbers already in the database do not - * cause conflicts that would prevent this numbering working. - * - * @return boolean false if conflict, true if ok - */ - public function canBeActivated() - { - global $conf,$langs,$db; + /** + * Checks if the numbers already in the database do not + * cause conflicts that would prevent this numbering working. + * + * @return boolean false if conflict, true if ok + */ + public function canBeActivated() + { + global $conf,$langs,$db; - $coyymm=''; $max=''; + $coyymm=''; $max=''; $posindice=8; $sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max"; - $sql.= " FROM ".MAIN_DB_PREFIX."projet"; + $sql.= " FROM ".MAIN_DB_PREFIX."projet"; $sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'"; - $sql.= " AND entity = ".$conf->entity; - $resql=$db->query($sql); - if ($resql) - { - $row = $db->fetch_row($resql); - if ($row) { $coyymm = substr($row[0], 0, 6); $max=$row[0]; } - } - if (! $coyymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $coyymm)) - { - return true; - } - else - { + $sql.= " AND entity = ".$conf->entity; + $resql=$db->query($sql); + if ($resql) + { + $row = $db->fetch_row($resql); + if ($row) { $coyymm = substr($row[0], 0, 6); $max=$row[0]; } + } + if (! $coyymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $coyymm)) + { + return true; + } + else + { $langs->load("errors"); $this->error=$langs->trans('ErrorNumRefModel', $max); - return false; - } - } + return false; + } + } - /** - * Return next value - * - * @param Societe $objsoc Object third party - * @param Project $project Object project - * @return string Value if OK, 0 if KO - */ - public function getNextValue($objsoc, $project) - { + /** + * Return next value + * + * @param Societe $objsoc Object third party + * @param Project $project Object project + * @return string Value if OK, 0 if KO + */ + public function getNextValue($objsoc, $project) + { global $db,$conf; // D'abord on recupere la valeur max @@ -157,20 +157,20 @@ class mod_project_simple extends ModeleNumRefProjects dol_syslog("mod_project_simple::getNextValue return ".$this->prefix.$yymm."-".$num); return $this->prefix.$yymm."-".$num; - } + } - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps - /** - * Return next reference not yet used as a reference - * - * @param Societe $objsoc Object third party - * @param Project $project Object project - * @return string Next not used reference - */ - public function project_get_num($objsoc = 0, $project = '') - { - // phpcs:enable - return $this->getNextValue($objsoc, $project); - } + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps + /** + * Return next reference not yet used as a reference + * + * @param Societe $objsoc Object third party + * @param Project $project Object project + * @return string Next not used reference + */ + public function project_get_num($objsoc = 0, $project = '') + { + // phpcs:enable + return $this->getNextValue($objsoc, $project); + } } diff --git a/htdocs/core/modules/project/task/mod_task_simple.php b/htdocs/core/modules/project/task/mod_task_simple.php index fbb5f2d4c5d..961b9a732f6 100644 --- a/htdocs/core/modules/project/task/mod_task_simple.php +++ b/htdocs/core/modules/project/task/mod_task_simple.php @@ -32,14 +32,14 @@ require_once DOL_DOCUMENT_ROOT .'/core/modules/project/task/modules_task.php'; class mod_task_simple extends ModeleNumRefTask { /** - * Dolibarr version of the loaded document - * @var string - */ + * Dolibarr version of the loaded document + * @var string + */ public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' public $prefix='TK'; - /** + /** * @var string Error code (or message) */ public $error=''; @@ -57,40 +57,40 @@ class mod_task_simple extends ModeleNumRefTask public $name='Simple'; - /** - * Return description of numbering module - * - * @return string Text with description - */ - public function info() - { - global $langs; - return $langs->trans("SimpleNumRefModelDesc", $this->prefix); - } + /** + * Return description of numbering module + * + * @return string Text with description + */ + public function info() + { + global $langs; + return $langs->trans("SimpleNumRefModelDesc", $this->prefix); + } - /** - * Return an example of numbering module values - * - * @return string Example - */ - public function getExample() - { - return $this->prefix."0501-0001"; - } + /** + * Return an example of numbering module values + * + * @return string Example + */ + public function getExample() + { + return $this->prefix."0501-0001"; + } - /** - * Checks if the numbers already in the database do not - * cause conflicts that would prevent this numbering working. - * - * @return boolean false if conflict, true if ok - */ - public function canBeActivated() - { - global $conf,$langs,$db; + /** + * Checks if the numbers already in the database do not + * cause conflicts that would prevent this numbering working. + * + * @return boolean false if conflict, true if ok + */ + public function canBeActivated() + { + global $conf,$langs,$db; - $coyymm=''; $max=''; + $coyymm=''; $max=''; $posindice=8; $sql = "SELECT MAX(CAST(SUBSTRING(task.ref FROM " . $posindice . ") AS SIGNED)) as max"; @@ -98,34 +98,34 @@ class mod_task_simple extends ModeleNumRefTask $sql .= MAIN_DB_PREFIX . "projet AS project WHERE task.fk_projet=project.rowid"; $sql .= " AND task.ref LIKE '" . $db->escape($this->prefix) . "____-%'"; $sql .= " AND project.entity = " . $conf->entity; - $resql=$db->query($sql); - if ($resql) - { - $row = $db->fetch_row($resql); - if ($row) { $coyymm = substr($row[0], 0, 6); $max=$row[0]; } - } - if (! $coyymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $coyymm)) - { - return true; - } - else - { + $resql=$db->query($sql); + if ($resql) + { + $row = $db->fetch_row($resql); + if ($row) { $coyymm = substr($row[0], 0, 6); $max=$row[0]; } + } + if (! $coyymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $coyymm)) + { + return true; + } + else + { $langs->load("errors"); $this->error=$langs->trans('ErrorNumRefModel', $max); - return false; - } - } + return false; + } + } - /** - * Return next value - * - * @param Societe $objsoc Object third party - * @param Task $object Object Task - * @return string Value if OK, 0 if KO - */ - public function getNextValue($objsoc, $object) - { + /** + * Return next value + * + * @param Societe $objsoc Object third party + * @param Task $object Object Task + * @return string Value if OK, 0 if KO + */ + public function getNextValue($objsoc, $object) + { global $db,$conf; // D'abord on recupere la valeur max @@ -157,19 +157,19 @@ class mod_task_simple extends ModeleNumRefTask dol_syslog("mod_task_simple::getNextValue return ".$this->prefix.$yymm."-".$num); return $this->prefix.$yymm."-".$num; - } + } - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps - /** - * Return next reference not yet used as a reference - * - * @param Societe $objsoc Object third party - * @param Task $object Object task - * @return string Next not used reference - */ - public function task_get_num($objsoc = 0, $object = '') - { - return $this->getNextValue($objsoc, $object); - } + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps + /** + * Return next reference not yet used as a reference + * + * @param Societe $objsoc Object third party + * @param Task $object Object task + * @return string Next not used reference + */ + public function task_get_num($objsoc = 0, $object = '') + { + return $this->getNextValue($objsoc, $object); + } } diff --git a/htdocs/core/modules/propale/mod_propale_marbre.php b/htdocs/core/modules/propale/mod_propale_marbre.php index e8fa9970ef9..9a45ff647f0 100644 --- a/htdocs/core/modules/propale/mod_propale_marbre.php +++ b/htdocs/core/modules/propale/mod_propale_marbre.php @@ -32,9 +32,9 @@ require_once DOL_DOCUMENT_ROOT .'/core/modules/propale/modules_propale.php'; class mod_propale_marbre extends ModeleNumRefPropales { /** - * Dolibarr version of the loaded document - * @var string - */ + * Dolibarr version of the loaded document + * @var string + */ public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' public $prefix='PR'; @@ -57,16 +57,16 @@ class mod_propale_marbre extends ModeleNumRefPropales public $name='Marbre'; - /** - * Return description of numbering module - * - * @return string Text with description - */ - public function info() - { - global $langs; - return $langs->trans("SimpleNumRefModelDesc", $this->prefix); - } + /** + * Return description of numbering module + * + * @return string Text with description + */ + public function info() + { + global $langs; + return $langs->trans("SimpleNumRefModelDesc", $this->prefix); + } /** @@ -81,8 +81,8 @@ class mod_propale_marbre extends ModeleNumRefPropales /** - * Checks if the numbers already in the database do not - * cause conflicts that would prevent this numbering working. + * Checks if the numbers already in the database do not + * cause conflicts that would prevent this numbering working. * * @return boolean false if conflict, true if ok */ diff --git a/htdocs/core/modules/societe/modules_societe.class.php b/htdocs/core/modules/societe/modules_societe.class.php index f76aa6e20d3..d29b2f321fd 100644 --- a/htdocs/core/modules/societe/modules_societe.class.php +++ b/htdocs/core/modules/societe/modules_societe.class.php @@ -33,32 +33,32 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php'; */ abstract class ModeleThirdPartyDoc extends CommonDocGenerator { - /** + /** * @var string Error code (or message) */ public $error=''; - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps - /** - * Return list of active generation modules - * - * @param DoliDB $db Database handler - * @param integer $maxfilenamelength Max length of value to show - * @return array List of templates - */ - public static function liste_modeles($db, $maxfilenamelength = 0) - { - // phpcs:enable - global $conf; + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps + /** + * Return list of active generation modules + * + * @param DoliDB $db Database handler + * @param integer $maxfilenamelength Max length of value to show + * @return array List of templates + */ + public static function liste_modeles($db, $maxfilenamelength = 0) + { + // phpcs:enable + global $conf; - $type='company'; - $liste=array(); + $type='company'; + $liste=array(); - include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; - $liste = getListOfModels($db, $type, $maxfilenamelength); + include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; + $liste = getListOfModels($db, $type, $maxfilenamelength); - return $liste; - } + return $liste; + } } /** @@ -67,197 +67,197 @@ abstract class ModeleThirdPartyDoc extends CommonDocGenerator */ abstract class ModeleThirdPartyCode { - /** - * @var string Error code (or message) + /** + * @var string Error code (or message) */ public $error=''; - /** Renvoi la description par defaut du modele de numerotation - * - * @param Translate $langs Object langs - * @return string Texte descripif - */ - public function info($langs) - { - $langs->load("bills"); - return $langs->trans("NoDescription"); - } + /** Renvoi la description par defaut du modele de numerotation + * + * @param Translate $langs Object langs + * @return string Texte descripif + */ + public function info($langs) + { + $langs->load("bills"); + return $langs->trans("NoDescription"); + } - /** Return name of module - * - * @param Translate $langs Object langs - * @return string Nom du module - */ - public function getNom($langs) - { - return $this->name; - } + /** Return name of module + * + * @param Translate $langs Object langs + * @return string Nom du module + */ + public function getNom($langs) + { + return $this->name; + } - /** Return an example of numbering - * - * @param Translate $langs Object langs - * @return string Example - */ - public function getExample($langs) - { - $langs->load("bills"); - return $langs->trans("NoExample"); - } + /** Return an example of numbering + * + * @param Translate $langs Object langs + * @return string Example + */ + public function getExample($langs) + { + $langs->load("bills"); + return $langs->trans("NoExample"); + } - /** - * Checks if the numbers already in the database do not - * cause conflicts that would prevent this numbering working. - * - * @return boolean false if conflict, true if ok - */ - public function canBeActivated() - { - return true; - } + /** + * Checks if the numbers already in the database do not + * cause conflicts that would prevent this numbering working. + * + * @return boolean false if conflict, true if ok + */ + public function canBeActivated() + { + return true; + } - /** - * Return next value available - * - * @param Societe $objsoc Object thirdparty - * @param int $type Type - * @return string Value - */ - public function getNextValue($objsoc = 0, $type = -1) - { - global $langs; - return $langs->trans("Function_getNextValue_InModuleNotWorking"); - } + /** + * Return next value available + * + * @param Societe $objsoc Object thirdparty + * @param int $type Type + * @return string Value + */ + public function getNextValue($objsoc = 0, $type = -1) + { + global $langs; + return $langs->trans("Function_getNextValue_InModuleNotWorking"); + } - /** - * Return version of module - * - * @return string Version - */ - public function getVersion() - { - global $langs; - $langs->load("admin"); + /** + * Return version of module + * + * @return string Version + */ + public function getVersion() + { + global $langs; + $langs->load("admin"); - if ($this->version == 'development') return $langs->trans("VersionDevelopment"); - if ($this->version == 'experimental') return $langs->trans("VersionExperimental"); - if ($this->version == 'dolibarr') return DOL_VERSION; - if ($this->version) return $this->version; - return $langs->trans("NotAvailable"); - } + if ($this->version == 'development') return $langs->trans("VersionDevelopment"); + if ($this->version == 'experimental') return $langs->trans("VersionExperimental"); + if ($this->version == 'dolibarr') return DOL_VERSION; + if ($this->version) return $this->version; + return $langs->trans("NotAvailable"); + } - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps - /** - * Renvoie la liste des modeles de numérotation - * - * @param DoliDB $db Database handler - * @param integer $maxfilenamelength Max length of value to show - * @return array List of numbers - */ - public static function liste_modeles($db, $maxfilenamelength = 0) - { - // phpcs:enable - $liste=array(); - $sql =""; + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps + /** + * Renvoie la liste des modeles de numérotation + * + * @param DoliDB $db Database handler + * @param integer $maxfilenamelength Max length of value to show + * @return array List of numbers + */ + public static function liste_modeles($db, $maxfilenamelength = 0) + { + // phpcs:enable + $liste=array(); + $sql =""; - $resql = $db->query($sql); - if ($resql) - { - $num = $db->num_rows($resql); - $i = 0; - while ($i < $num) - { - $row = $db->fetch_row($resql); - $liste[$row[0]]=$row[1]; - $i++; - } - } - else - { - return -1; - } - return $liste; - } + $resql = $db->query($sql); + if ($resql) + { + $num = $db->num_rows($resql); + $i = 0; + while ($i < $num) + { + $row = $db->fetch_row($resql); + $liste[$row[0]]=$row[1]; + $i++; + } + } + else + { + return -1; + } + return $liste; + } - /** - * Return description of module parameters - * - * @param Translate $langs Output language - * @param Societe $soc Third party object - * @param int $type -1=Nothing, 0=Customer, 1=Supplier - * @return string HTML translated description - */ - public function getToolTip($langs, $soc, $type) - { - global $conf; + /** + * Return description of module parameters + * + * @param Translate $langs Output language + * @param Societe $soc Third party object + * @param int $type -1=Nothing, 0=Customer, 1=Supplier + * @return string HTML translated description + */ + public function getToolTip($langs, $soc, $type) + { + global $conf; - $langs->load("admin"); + $langs->load("admin"); - $s=''; - if ($type == -1) $s.=$langs->trans("Name").': '.$this->getNom($langs).'
'; - if ($type == -1) $s.=$langs->trans("Version").': '.$this->getVersion().'
'; - if ($type == 0) $s.=$langs->trans("CustomerCodeDesc").'
'; - if ($type == 1) $s.=$langs->trans("SupplierCodeDesc").'
'; - if ($type != -1) $s.=$langs->trans("ValidityControledByModule").': '.$this->getNom($langs).'
'; - $s.='
'; - $s.=''.$langs->trans("ThisIsModuleRules").':
'; - if ($type == 0) - { - $s.=$langs->trans("RequiredIfCustomer").': '; - if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='
'; - } - if ($type == 1) - { - $s.=$langs->trans("RequiredIfSupplier").': '; - if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='
'; - } - if ($type == -1) - { - $s.=$langs->trans("Required").': '; - if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='
'; - } - $s.=$langs->trans("CanBeModifiedIfOk").': '; - $s.=yn($this->code_modifiable, 1, 2); - $s.='
'; - $s.=$langs->trans("CanBeModifiedIfKo").': '.yn($this->code_modifiable_invalide, 1, 2).'
'; - $s.=$langs->trans("AutomaticCode").': '.yn($this->code_auto, 1, 2).'
'; - $s.='
'; - if ($type == 0 || $type == -1) - { - $nextval=$this->getNextValue($soc, 0); - if (empty($nextval)) $nextval=$langs->trans("Undefined"); - $s.=$langs->trans("NextValue").($type == -1?' ('.$langs->trans("Customer").')':'').': '.$nextval.'
'; - } - if ($type == 1 || $type == -1) - { - $nextval=$this->getNextValue($soc, 1); - if (empty($nextval)) $nextval=$langs->trans("Undefined"); - $s.=$langs->trans("NextValue").($type == -1?' ('.$langs->trans("Supplier").')':'').': '.$nextval.''; - } - return $s; - } + $s=''; + if ($type == -1) $s.=$langs->trans("Name").': '.$this->getNom($langs).'
'; + if ($type == -1) $s.=$langs->trans("Version").': '.$this->getVersion().'
'; + if ($type == 0) $s.=$langs->trans("CustomerCodeDesc").'
'; + if ($type == 1) $s.=$langs->trans("SupplierCodeDesc").'
'; + if ($type != -1) $s.=$langs->trans("ValidityControledByModule").': '.$this->getNom($langs).'
'; + $s.='
'; + $s.=''.$langs->trans("ThisIsModuleRules").':
'; + if ($type == 0) + { + $s.=$langs->trans("RequiredIfCustomer").': '; + if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='
'; + } + if ($type == 1) + { + $s.=$langs->trans("RequiredIfSupplier").': '; + if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='
'; + } + if ($type == -1) + { + $s.=$langs->trans("Required").': '; + if (! empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && ! empty($this->code_null)) $s.='
'; + } + $s.=$langs->trans("CanBeModifiedIfOk").': '; + $s.=yn($this->code_modifiable, 1, 2); + $s.='
'; + $s.=$langs->trans("CanBeModifiedIfKo").': '.yn($this->code_modifiable_invalide, 1, 2).'
'; + $s.=$langs->trans("AutomaticCode").': '.yn($this->code_auto, 1, 2).'
'; + $s.='
'; + if ($type == 0 || $type == -1) + { + $nextval=$this->getNextValue($soc, 0); + if (empty($nextval)) $nextval=$langs->trans("Undefined"); + $s.=$langs->trans("NextValue").($type == -1?' ('.$langs->trans("Customer").')':'').': '.$nextval.'
'; + } + if ($type == 1 || $type == -1) + { + $nextval=$this->getNextValue($soc, 1); + if (empty($nextval)) $nextval=$langs->trans("Undefined"); + $s.=$langs->trans("NextValue").($type == -1?' ('.$langs->trans("Supplier").')':'').': '.$nextval.''; + } + return $s; + } - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps /** * Check if mask/numbering use prefix * * @return int 0=no, 1=yes - */ - public function verif_prefixIsUsed() - { - // phpcs:enable - return 0; - } + */ + public function verif_prefixIsUsed() + { + // phpcs:enable + return 0; + } } @@ -266,119 +266,119 @@ abstract class ModeleThirdPartyCode */ abstract class ModeleAccountancyCode { - /** + /** * @var string Error code (or message) */ public $error=''; - /** - * Return description of module - * - * @param Translate $langs Object langs - * @return string Description of module - */ - public function info($langs) - { - $langs->load("bills"); - return $langs->trans("NoDescription"); - } + /** + * Return description of module + * + * @param Translate $langs Object langs + * @return string Description of module + */ + public function info($langs) + { + $langs->load("bills"); + return $langs->trans("NoDescription"); + } - /** - * Return an example of result returned by getNextValue - * - * @param Translate $langs Object langs - * @param societe $objsoc Object thirdparty - * @param int $type Type of third party (1:customer, 2:supplier, -1:autodetect) - * @return string Example - */ - public function getExample($langs, $objsoc = 0, $type = -1) - { - $langs->load("bills"); - return $langs->trans("NoExample"); - } + /** + * Return an example of result returned by getNextValue + * + * @param Translate $langs Object langs + * @param societe $objsoc Object thirdparty + * @param int $type Type of third party (1:customer, 2:supplier, -1:autodetect) + * @return string Example + */ + public function getExample($langs, $objsoc = 0, $type = -1) + { + $langs->load("bills"); + return $langs->trans("NoExample"); + } - /** - * Checks if the numbers already in the database do not - * cause conflicts that would prevent this numbering working. - * - * @return boolean false if conflict, true if ok - */ - public function canBeActivated() - { - return true; - } + /** + * Checks if the numbers already in the database do not + * cause conflicts that would prevent this numbering working. + * + * @return boolean false if conflict, true if ok + */ + public function canBeActivated() + { + return true; + } - /** - * Return version of module - * - * @return string Version - */ - public function getVersion() - { - global $langs; - $langs->load("admin"); + /** + * Return version of module + * + * @return string Version + */ + public function getVersion() + { + global $langs; + $langs->load("admin"); - if ($this->version == 'development') return $langs->trans("VersionDevelopment"); - if ($this->version == 'experimental') return $langs->trans("VersionExperimental"); - if ($this->version == 'dolibarr') return DOL_VERSION; - if ($this->version) return $this->version; - return $langs->trans("NotAvailable"); - } + if ($this->version == 'development') return $langs->trans("VersionDevelopment"); + if ($this->version == 'experimental') return $langs->trans("VersionExperimental"); + if ($this->version == 'dolibarr') return DOL_VERSION; + if ($this->version) return $this->version; + return $langs->trans("NotAvailable"); + } - /** - * Return description of module parameters - * - * @param Translate $langs Output language - * @param Societe $soc Third party object - * @param int $type -1=Nothing, 0=Customer, 1=Supplier - * @return string HTML translated description - */ - public function getToolTip($langs, $soc, $type) - { - global $conf,$db; + /** + * Return description of module parameters + * + * @param Translate $langs Output language + * @param Societe $soc Third party object + * @param int $type -1=Nothing, 0=Customer, 1=Supplier + * @return string HTML translated description + */ + public function getToolTip($langs, $soc, $type) + { + global $conf,$db; - $langs->load("admin"); + $langs->load("admin"); - $s=''; - if ($type == -1) $s.=$langs->trans("Name").': '.$this->name.'
'; - if ($type == -1) $s.=$langs->trans("Version").': '.$this->getVersion().'
'; - //$s.='
'; - //$s.=''.$langs->trans("ThisIsModuleRules").':
'; - $s.='
'; - if ($type == 0 || $type == -1) - { - $result=$this->get_code($db, $soc, 'customer'); - $nextval=$this->code; - if (empty($nextval)) $nextval=$langs->trans("Undefined"); - $s.=$langs->trans("NextValue").($type == -1?' ('.$langs->trans("Customer").')':'').': '.$nextval.'
'; - } - if ($type == 1 || $type == -1) - { - $result=$this->get_code($db, $soc, 'supplier'); - $nextval=$this->code; - if (empty($nextval)) $nextval=$langs->trans("Undefined"); - $s.=$langs->trans("NextValue").($type == -1?' ('.$langs->trans("Supplier").')':'').': '.$nextval.''; - } - return $s; - } + $s=''; + if ($type == -1) $s.=$langs->trans("Name").': '.$this->name.'
'; + if ($type == -1) $s.=$langs->trans("Version").': '.$this->getVersion().'
'; + //$s.='
'; + //$s.=''.$langs->trans("ThisIsModuleRules").':
'; + $s.='
'; + if ($type == 0 || $type == -1) + { + $result=$this->get_code($db, $soc, 'customer'); + $nextval=$this->code; + if (empty($nextval)) $nextval=$langs->trans("Undefined"); + $s.=$langs->trans("NextValue").($type == -1?' ('.$langs->trans("Customer").')':'').': '.$nextval.'
'; + } + if ($type == 1 || $type == -1) + { + $result=$this->get_code($db, $soc, 'supplier'); + $nextval=$this->code; + if (empty($nextval)) $nextval=$langs->trans("Undefined"); + $s.=$langs->trans("NextValue").($type == -1?' ('.$langs->trans("Supplier").')':'').': '.$nextval.''; + } + return $s; + } - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps - /** - * Set accountancy account code for a third party into this->code - * - * @param DoliDB $db Database handler - * @param Societe $societe Third party object - * @param int $type 'customer' or 'supplier' - * @return int >=0 if OK, <0 if KO - */ - public function get_code($db, $societe, $type = '') - { - // phpcs:enable - global $langs; + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps + /** + * Set accountancy account code for a third party into this->code + * + * @param DoliDB $db Database handler + * @param Societe $societe Third party object + * @param int $type 'customer' or 'supplier' + * @return int >=0 if OK, <0 if KO + */ + public function get_code($db, $societe, $type = '') + { + // phpcs:enable + global $langs; - return $langs->trans("NotAvailable"); - } + return $langs->trans("NotAvailable"); + } } @@ -399,7 +399,7 @@ abstract class ModeleAccountancyCode */ function thirdparty_doc_create(DoliDB $db, Societe $object, $message, $modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0) { - dol_syslog(__METHOD__ . " is deprecated", LOG_WARNING); + dol_syslog(__METHOD__ . " is deprecated", LOG_WARNING); - return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref); + return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref); } diff --git a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php index f6bf6480c0f..a4d75326395 100644 --- a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php +++ b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php @@ -32,15 +32,15 @@ require_once DOL_DOCUMENT_ROOT .'/core/modules/supplier_order/modules_commandefo class mod_commande_fournisseur_muguet extends ModeleNumRefSuppliersOrders { /** - * Dolibarr version of the loaded document - * @var string - */ + * Dolibarr version of the loaded document + * @var string + */ public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' /** - * @var string Error code (or message) - */ - public $error = ''; + * @var string Error code (or message) + */ + public $error = ''; /** * @var string Nom du modele @@ -62,118 +62,118 @@ class mod_commande_fournisseur_muguet extends ModeleNumRefSuppliersOrders */ public function __construct() { - global $conf; + global $conf; - if ((float) $conf->global->MAIN_VERSION_LAST_INSTALL >= 5.0) $this->prefix = 'PO'; // We use correct standard code "PO = Purchase Order" + if ((float) $conf->global->MAIN_VERSION_LAST_INSTALL >= 5.0) $this->prefix = 'PO'; // We use correct standard code "PO = Purchase Order" } - /** - * Return description of numbering module - * - * @return string Text with description - */ - public function info() - { - global $langs; - return $langs->trans("SimpleNumRefModelDesc", $this->prefix); - } + /** + * Return description of numbering module + * + * @return string Text with description + */ + public function info() + { + global $langs; + return $langs->trans("SimpleNumRefModelDesc", $this->prefix); + } - /** - * Return an example of numbering - * - * @return string Example - */ - public function getExample() - { - return $this->prefix."0501-0001"; - } + /** + * Return an example of numbering + * + * @return string Example + */ + public function getExample() + { + return $this->prefix."0501-0001"; + } - /** - * Checks if the numbers already in the database do not - * cause conflicts that would prevent this numbering working. - * - * @return boolean false if conflict, true if ok - */ - public function canBeActivated() - { - global $conf,$langs,$db; + /** + * Checks if the numbers already in the database do not + * cause conflicts that would prevent this numbering working. + * + * @return boolean false if conflict, true if ok + */ + public function canBeActivated() + { + global $conf,$langs,$db; - $coyymm=''; $max=''; + $coyymm=''; $max=''; $posindice=8; $sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max"; - $sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur"; + $sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur"; $sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'"; - $sql.= " AND entity = ".$conf->entity; - $resql=$db->query($sql); - if ($resql) - { - $row = $db->fetch_row($resql); - if ($row) { $coyymm = substr($row[0], 0, 6); $max=$row[0]; } - } - if (! $coyymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $coyymm)) - { - return true; - } - else - { + $sql.= " AND entity = ".$conf->entity; + $resql=$db->query($sql); + if ($resql) + { + $row = $db->fetch_row($resql); + if ($row) { $coyymm = substr($row[0], 0, 6); $max=$row[0]; } + } + if (! $coyymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $coyymm)) + { + return true; + } + else + { $langs->load("errors"); $this->error=$langs->trans('ErrorNumRefModel', $max); - return false; - } - } + return false; + } + } - /** - * Return next value + /** + * Return next value * * @param Societe $objsoc Object third party * @param Object $object Object * @return string Value if OK, 0 if KO - */ - public function getNextValue($objsoc = 0, $object = '') - { - global $db,$conf; + */ + public function getNextValue($objsoc = 0, $object = '') + { + global $db,$conf; - // D'abord on recupere la valeur max - $posindice=8; - $sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max"; - $sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur"; + // D'abord on recupere la valeur max + $posindice=8; + $sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max"; + $sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur"; $sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'"; - $sql.= " AND entity = ".$conf->entity; + $sql.= " AND entity = ".$conf->entity; - $resql=$db->query($sql); - if ($resql) - { - $obj = $db->fetch_object($resql); - if ($obj) $max = intval($obj->max); - else $max=0; - } + $resql=$db->query($sql); + if ($resql) + { + $obj = $db->fetch_object($resql); + if ($obj) $max = intval($obj->max); + else $max=0; + } //$date=time(); - $date=$object->date_commande; // Not always defined - if (empty($date)) $date=$object->date; // Creation date is order date for suppliers orders - $yymm = strftime("%y%m", $date); + $date=$object->date_commande; // Not always defined + if (empty($date)) $date=$object->date; // Creation date is order date for suppliers orders + $yymm = strftime("%y%m", $date); - if ($max >= (pow(10, 4) - 1)) $num=$max+1; // If counter > 9999, we do not format on 4 chars, we take number as it is - else $num = sprintf("%04s", $max+1); + if ($max >= (pow(10, 4) - 1)) $num=$max+1; // If counter > 9999, we do not format on 4 chars, we take number as it is + else $num = sprintf("%04s", $max+1); - return $this->prefix.$yymm."-".$num; - } + return $this->prefix.$yymm."-".$num; + } - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps - /** - * Renvoie la reference de commande suivante non utilisee - * + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps + /** + * Renvoie la reference de commande suivante non utilisee + * * @param Societe $objsoc Object third party * @param Object $object Object - * @return string Texte descripif - */ - public function commande_get_num($objsoc = 0, $object = '') - { - // phpcs:enable - return $this->getNextValue($objsoc, $object); - } + * @return string Texte descripif + */ + public function commande_get_num($objsoc = 0, $object = '') + { + // phpcs:enable + return $this->getNextValue($objsoc, $object); + } } diff --git a/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php b/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php index c3499bdbf8d..b10a45dfa8b 100644 --- a/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php +++ b/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php @@ -30,9 +30,9 @@ require_once DOL_DOCUMENT_ROOT .'/core/modules/supplier_payment/modules_supplier class mod_supplier_payment_bronan extends ModeleNumRefSupplierPayments { /** - * Dolibarr version of the loaded document - * @var string - */ + * Dolibarr version of the loaded document + * @var string + */ public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' public $prefix='SPAY'; @@ -55,16 +55,16 @@ class mod_supplier_payment_bronan extends ModeleNumRefSupplierPayments public $name='Bronan'; - /** - * Return description of numbering module - * - * @return string Text with description - */ - public function info() - { - global $langs; - return $langs->trans("SimpleNumRefModelDesc", $this->prefix); - } + /** + * Return description of numbering module + * + * @return string Text with description + */ + public function info() + { + global $langs; + return $langs->trans("SimpleNumRefModelDesc", $this->prefix); + } /** @@ -79,8 +79,8 @@ class mod_supplier_payment_bronan extends ModeleNumRefSupplierPayments /** - * Checks if the numbers already in the database do not - * cause conflicts that would prevent this numbering working. + * Checks if the numbers already in the database do not + * cause conflicts that would prevent this numbering working. * * @return boolean false if conflict, true if ok */ @@ -147,15 +147,15 @@ class mod_supplier_payment_bronan extends ModeleNumRefSupplierPayments $date=$object->datepaye; $yymm = strftime("%y%m", $date); - if ($max >= (pow(10, 4) - 1)) $num=$max+1; // If counter > 9999, we do not format on 4 chars, we take number as it is - else $num = sprintf("%04s", $max+1); + if ($max >= (pow(10, 4) - 1)) $num=$max+1; // If counter > 9999, we do not format on 4 chars, we take number as it is + else $num = sprintf("%04s", $max+1); dol_syslog(__METHOD__." return ".$this->prefix.$yymm."-".$num); return $this->prefix.$yymm."-".$num; } - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps /** * Return next free value * @@ -165,7 +165,7 @@ class mod_supplier_payment_bronan extends ModeleNumRefSupplierPayments */ public function payment_get_num($objsoc, $objforref) { - // phpcs:enable + // phpcs:enable return $this->getNextValue($objsoc, $objforref); } } diff --git a/htdocs/core/modules/supplier_payment/modules_supplier_payment.php b/htdocs/core/modules/supplier_payment/modules_supplier_payment.php index f020e501c1e..88476330d13 100644 --- a/htdocs/core/modules/supplier_payment/modules_supplier_payment.php +++ b/htdocs/core/modules/supplier_payment/modules_supplier_payment.php @@ -28,17 +28,17 @@ abstract class ModelePDFSuppliersPayments extends CommonDocGenerator public $error=''; - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps /** * Return list of active generation models * - * @param DoliDB $db Database handler - * @param integer $maxfilenamelength Max length of value to show - * @return array List of numbers - */ + * @param DoliDB $db Database handler + * @param integer $maxfilenamelength Max length of value to show + * @return array List of numbers + */ public static function liste_modeles($db, $maxfilenamelength = 0) { - // phpcs:enable + // phpcs:enable global $conf; $type='supplier_payment'; @@ -98,11 +98,11 @@ abstract class ModeleNumRefSupplierPayments } /** - * Checks if the numbers already in the database do not - * cause conflicts that would prevent this numbering working. - * - * @return boolean false if conflict, true if ok - */ + * Checks if the numbers already in the database do not + * cause conflicts that would prevent this numbering working. + * + * @return boolean false if conflict, true if ok + */ public function canBeActivated() { return true; diff --git a/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php index a340f3eddd1..2af31145b94 100644 --- a/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php +++ b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php @@ -32,9 +32,9 @@ require_once DOL_DOCUMENT_ROOT .'/core/modules/supplier_proposal/modules_supplie class mod_supplier_proposal_marbre extends ModeleNumRefSupplierProposal { /** - * Dolibarr version of the loaded document - * @var string - */ + * Dolibarr version of the loaded document + * @var string + */ public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' public $prefix='RQ'; // RQ = Request for quotation @@ -57,16 +57,16 @@ class mod_supplier_proposal_marbre extends ModeleNumRefSupplierProposal public $name='Marbre'; - /** - * Return description of numbering module - * - * @return string Text with description - */ - public function info() - { - global $langs; - return $langs->trans("SimpleNumRefModelDesc", $this->prefix); - } + /** + * Return description of numbering module + * + * @return string Text with description + */ + public function info() + { + global $langs; + return $langs->trans("SimpleNumRefModelDesc", $this->prefix); + } /** @@ -81,8 +81,8 @@ class mod_supplier_proposal_marbre extends ModeleNumRefSupplierProposal /** - * Checks if the numbers already in the database do not - * cause conflicts that would prevent this numbering working. + * Checks if the numbers already in the database do not + * cause conflicts that would prevent this numbering working. * * @return boolean false if conflict, true if ok */ diff --git a/htdocs/core/modules/takepos/modules_takepos.php b/htdocs/core/modules/takepos/modules_takepos.php index e077cda7b6b..28ac39c3f0f 100644 --- a/htdocs/core/modules/takepos/modules_takepos.php +++ b/htdocs/core/modules/takepos/modules_takepos.php @@ -47,21 +47,21 @@ abstract class ModeleNumRefTakepos * @return boolean true if module can be used */ public function isEnabled() - { - return true; - } + { + return true; + } /** * Renvoi la description par defaut du modele de numerotation * * @return string Texte descripif */ - public function info() - { - global $langs; - $langs->load("cashdesk@cashdesk"); - return $langs->trans("NoDescription"); - } + public function info() + { + global $langs; + $langs->load("cashdesk@cashdesk"); + return $langs->trans("NoDescription"); + } /** * Return an example of numbering @@ -69,11 +69,11 @@ abstract class ModeleNumRefTakepos * @return string Example */ public function getExample() - { - global $langs; - $langs->load('cashdesk@cashdesk'); - return $langs->trans('NoExample'); - } + { + global $langs; + $langs->load('cashdesk@cashdesk'); + return $langs->trans('NoExample'); + } /** * Checks if the numbers already in the database do not @@ -82,20 +82,20 @@ abstract class ModeleNumRefTakepos * @return boolean false if conflict, true if ok */ public function canBeActivated() - { - return true; - } + { + return true; + } - /** - * Renvoi prochaine valeur attribuee - * - * @return string Valeur - */ + /** + * Renvoi prochaine valeur attribuee + * + * @return string Valeur + */ public function getNextValue() - { - global $langs; - return $langs->trans('NotAvailable'); - } + { + global $langs; + return $langs->trans('NotAvailable'); + } /** * Renvoi version du modele de numerotation @@ -103,14 +103,14 @@ abstract class ModeleNumRefTakepos * @return string Valeur */ public function getVersion() - { - global $langs; - $langs->load("admin"); + { + global $langs; + $langs->load("admin"); - if ($this->version == 'development') return $langs->trans('VersionDevelopment'); - if ($this->version == 'experimental') return $langs->trans('VersionExperimental'); - if ($this->version == 'dolibarr') return DOL_VERSION; - if ($this->version) return $this->version; - return $langs->trans('NotAvailable'); - } + if ($this->version == 'development') return $langs->trans('VersionDevelopment'); + if ($this->version == 'experimental') return $langs->trans('VersionExperimental'); + if ($this->version == 'dolibarr') return DOL_VERSION; + if ($this->version) return $this->version; + return $langs->trans('NotAvailable'); + } } diff --git a/htdocs/core/modules/ticket/mod_ticket_simple.php b/htdocs/core/modules/ticket/mod_ticket_simple.php index a6fbb6fde72..f5e5f025175 100644 --- a/htdocs/core/modules/ticket/mod_ticket_simple.php +++ b/htdocs/core/modules/ticket/mod_ticket_simple.php @@ -30,20 +30,20 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/ticket/modules_ticket.php'; */ class mod_ticket_simple extends ModeleNumRefTicket { - /** - * Dolibarr version of the loaded document - * @var string - */ + /** + * Dolibarr version of the loaded document + * @var string + */ public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' - public $prefix = 'TS'; + public $prefix = 'TS'; - /** - * @var string Error code (or message) - */ - public $error = ''; + /** + * @var string Error code (or message) + */ + public $error = ''; - /** + /** * @var string Nom du modele * @deprecated * @see $name @@ -55,108 +55,108 @@ class mod_ticket_simple extends ModeleNumRefTicket */ public $name='Simple'; - /** - * Return description of numbering module - * - * @return string Text with description - */ - public function info() - { - global $langs; - return $langs->trans("SimpleNumRefModelDesc", $this->prefix); - } + /** + * Return description of numbering module + * + * @return string Text with description + */ + public function info() + { + global $langs; + return $langs->trans("SimpleNumRefModelDesc", $this->prefix); + } - /** - * Return an example of numbering module values - * - * @return string Example - */ - public function getExample() - { - return $this->prefix . "0501-0001"; - } + /** + * Return an example of numbering module values + * + * @return string Example + */ + public function getExample() + { + return $this->prefix . "0501-0001"; + } - /** - * Checks if the numbers already in the database do not - * cause conflicts that would prevent this numbering working. - * - * @return boolean false if conflict, true if ok - */ - public function canBeActivated() - { - global $conf, $langs, $db; + /** + * Checks if the numbers already in the database do not + * cause conflicts that would prevent this numbering working. + * + * @return boolean false if conflict, true if ok + */ + public function canBeActivated() + { + global $conf, $langs, $db; - $coyymm = ''; - $max = ''; + $coyymm = ''; + $max = ''; - $posindice = 8; - $sql = "SELECT MAX(CAST(SUBSTRING(ref FROM " . $posindice . ") AS SIGNED)) as max"; - $sql .= " FROM " . MAIN_DB_PREFIX . "ticket"; - $search = $this->prefix . "____-%"; - $sql .= " WHERE ref LIKE '" . $search ."'"; - $sql .= " AND entity = " . $conf->entity; - $resql = $db->query($sql); - if ($resql) { - $row = $db->fetch_row($resql); - if ($row) { - $coyymm = substr($row[0], 0, 6); - $max = $row[0]; - } - } - if (!$coyymm || preg_match('/' . $this->prefix . '[0-9][0-9][0-9][0-9]/i', $coyymm)) { - return true; - } else { - $langs->load("errors"); - $this->error = $langs->trans('ErrorNumRefModel', $max); - return false; - } - } + $posindice = 8; + $sql = "SELECT MAX(CAST(SUBSTRING(ref FROM " . $posindice . ") AS SIGNED)) as max"; + $sql .= " FROM " . MAIN_DB_PREFIX . "ticket"; + $search = $this->prefix . "____-%"; + $sql .= " WHERE ref LIKE '" . $search ."'"; + $sql .= " AND entity = " . $conf->entity; + $resql = $db->query($sql); + if ($resql) { + $row = $db->fetch_row($resql); + if ($row) { + $coyymm = substr($row[0], 0, 6); + $max = $row[0]; + } + } + if (!$coyymm || preg_match('/' . $this->prefix . '[0-9][0-9][0-9][0-9]/i', $coyymm)) { + return true; + } else { + $langs->load("errors"); + $this->error = $langs->trans('ErrorNumRefModel', $max); + return false; + } + } - /** - * Return next value - * - * @param Societe $objsoc Object third party - * @param Project $ticket Object ticket - * @return string Value if OK, 0 if KO - */ - public function getNextValue($objsoc, $ticket) - { - global $db, $conf; + /** + * Return next value + * + * @param Societe $objsoc Object third party + * @param Project $ticket Object ticket + * @return string Value if OK, 0 if KO + */ + public function getNextValue($objsoc, $ticket) + { + global $db, $conf; - // D'abord on recupere la valeur max - $posindice = 8; - $sql = "SELECT MAX(CAST(SUBSTRING(ref FROM " . $posindice . ") AS SIGNED)) as max"; - $sql .= " FROM " . MAIN_DB_PREFIX . "ticket"; - $search = $this->prefix . "____-%"; - $sql .= " WHERE ref LIKE '" . $search ."'"; - $sql .= " AND entity = " . $conf->entity; + // D'abord on recupere la valeur max + $posindice = 8; + $sql = "SELECT MAX(CAST(SUBSTRING(ref FROM " . $posindice . ") AS SIGNED)) as max"; + $sql .= " FROM " . MAIN_DB_PREFIX . "ticket"; + $search = $this->prefix . "____-%"; + $sql .= " WHERE ref LIKE '" . $search ."'"; + $sql .= " AND entity = " . $conf->entity; - $resql = $db->query($sql); - if ($resql) { - $obj = $db->fetch_object($resql); - if ($obj) { - $max = intval($obj->max); - } else { - $max = 0; - } - } else { - dol_syslog("mod_ticket_simple::getNextValue", LOG_DEBUG); - return -1; - } + $resql = $db->query($sql); + if ($resql) { + $obj = $db->fetch_object($resql); + if ($obj) { + $max = intval($obj->max); + } else { + $max = 0; + } + } else { + dol_syslog("mod_ticket_simple::getNextValue", LOG_DEBUG); + return -1; + } - $date = empty($ticket->datec) ? dol_now() : $ticket->datec; + $date = empty($ticket->datec) ? dol_now() : $ticket->datec; - //$yymm = strftime("%y%m",time()); - $yymm = strftime("%y%m", $date); + //$yymm = strftime("%y%m",time()); + $yymm = strftime("%y%m", $date); - if ($max >= (pow(10, 4) - 1)) { - $num = $max + 1; - } // If counter > 9999, we do not format on 4 chars, we take number as it is - else { - $num = sprintf("%04s", $max + 1); - } + if ($max >= (pow(10, 4) - 1)) { + $num = $max + 1; + } // If counter > 9999, we do not format on 4 chars, we take number as it is + else { + $num = sprintf("%04s", $max + 1); + } - dol_syslog("mod_ticket_simple::getNextValue return " . $this->prefix . $yymm . "-" . $num); - return $this->prefix . $yymm . "-" . $num; - } + dol_syslog("mod_ticket_simple::getNextValue return " . $this->prefix . $yymm . "-" . $num); + return $this->prefix . $yymm . "-" . $num; + } } diff --git a/htdocs/core/modules/ticket/modules_ticket.php b/htdocs/core/modules/ticket/modules_ticket.php index ee50071b591..ad8394fa91e 100644 --- a/htdocs/core/modules/ticket/modules_ticket.php +++ b/htdocs/core/modules/ticket/modules_ticket.php @@ -29,95 +29,95 @@ */ abstract class ModeleNumRefTicket { - /** - * @var string Error code (or message) - */ - public $error = ''; + /** + * @var string Error code (or message) + */ + public $error = ''; - /** - * Return if a module can be used or not - * - * @return boolean true if module can be used - */ - public function isEnabled() - { - return true; - } + /** + * Return if a module can be used or not + * + * @return boolean true if module can be used + */ + public function isEnabled() + { + return true; + } - /** - * Renvoi la description par defaut du modele de numerotation - * - * @return string Texte descripif - */ - public function info() - { - global $langs; - $langs->load("ticket"); - return $langs->trans("NoDescription"); - } + /** + * Renvoi la description par defaut du modele de numerotation + * + * @return string Texte descripif + */ + public function info() + { + global $langs; + $langs->load("ticket"); + return $langs->trans("NoDescription"); + } - /** - * Return an example of numbering - * - * @return string Example - */ - public function getExample() - { - global $langs; - $langs->load("ticket"); - return $langs->trans("NoExample"); - } + /** + * Return an example of numbering + * + * @return string Example + */ + public function getExample() + { + global $langs; + $langs->load("ticket"); + return $langs->trans("NoExample"); + } - /** - * Checks if the numbers already in the database do not - * cause conflicts that would prevent this numbering working. - * - * @return boolean false if conflict, true if ok - */ - public function canBeActivated() - { - return true; - } + /** + * Checks if the numbers already in the database do not + * cause conflicts that would prevent this numbering working. + * + * @return boolean false if conflict, true if ok + */ + public function canBeActivated() + { + return true; + } - /** - * Renvoi prochaine valeur attribuee - * - * @param Societe $objsoc Object third party - * @param Project $project Object project - * @return string Valeur - */ - public function getNextValue($objsoc, $project) - { - global $langs; - return $langs->trans("NotAvailable"); - } + /** + * Renvoi prochaine valeur attribuee + * + * @param Societe $objsoc Object third party + * @param Project $project Object project + * @return string Valeur + */ + public function getNextValue($objsoc, $project) + { + global $langs; + return $langs->trans("NotAvailable"); + } - /** - * Renvoi version du module numerotation - * - * @return string Valeur - */ - public function getVersion() - { - global $langs; - $langs->load("admin"); + /** + * Renvoi version du module numerotation + * + * @return string Valeur + */ + public function getVersion() + { + global $langs; + $langs->load("admin"); - if ($this->version == 'development') { - return $langs->trans("VersionDevelopment"); - } + if ($this->version == 'development') { + return $langs->trans("VersionDevelopment"); + } - if ($this->version == 'experimental') { - return $langs->trans("VersionExperimental"); - } + if ($this->version == 'experimental') { + return $langs->trans("VersionExperimental"); + } - if ($this->version == 'dolibarr') { - return DOL_VERSION; - } + if ($this->version == 'dolibarr') { + return DOL_VERSION; + } - if ($this->version) { - return $this->version; - } + if ($this->version) { + return $this->version; + } - return $langs->trans("NotAvailable"); - } + return $langs->trans("NotAvailable"); + } } diff --git a/htdocs/core/tpl/card_presend.tpl.php b/htdocs/core/tpl/card_presend.tpl.php index 37920ed1ebc..f349251d654 100644 --- a/htdocs/core/tpl/card_presend.tpl.php +++ b/htdocs/core/tpl/card_presend.tpl.php @@ -28,8 +28,8 @@ // Protection to avoid direct call of template if (empty($conf) || ! is_object($conf)) { - print "Error, template page can't be called as URL"; - exit; + print "Error, template page can't be called as URL"; + exit; } @@ -54,7 +54,7 @@ if ($action == 'presend') } else { - $fileparams = dol_most_recent_file($diroutput . '/' . $ref, preg_quote($ref, '/').'[^\-]+'); + $fileparams = dol_most_recent_file($diroutput . '/' . $ref, preg_quote($ref, '/').'[^\-]+'); } $file = $fileparams['fullname']; @@ -102,11 +102,11 @@ if ($action == 'presend') } if ($object->element == 'invoice_supplier') { - $fileparams = dol_most_recent_file($diroutput . '/' . get_exdir($object->id, 2, 0, 0, $object, $object->element).$ref, preg_quote($ref, '/').'([^\-])+'); + $fileparams = dol_most_recent_file($diroutput . '/' . get_exdir($object->id, 2, 0, 0, $object, $object->element).$ref, preg_quote($ref, '/').'([^\-])+'); } else { - $fileparams = dol_most_recent_file($diroutput . '/' . $ref, preg_quote($ref, '/').'[^\-]+'); + $fileparams = dol_most_recent_file($diroutput . '/' . $ref, preg_quote($ref, '/').'[^\-]+'); } $file = $fileparams['fullname']; @@ -212,51 +212,51 @@ if ($action == 'presend') complete_substitutions_array($substitutionarray, $outputlangs, $object, $parameters); // Find the good contact address - $tmpobject = $object; - if (($object->element == 'shipping'|| $object->element == 'reception')) { - $origin = $object->origin; - $origin_id = $object->origin_id; + $tmpobject = $object; + if (($object->element == 'shipping'|| $object->element == 'reception')) { + $origin = $object->origin; + $origin_id = $object->origin_id; - if (!empty($origin) && !empty($origin_id)) { - $element = $subelement = $origin; - $regs = array(); - if (preg_match('/^([^_]+)_([^_]+)/i', $origin, $regs)) { - $element = $regs[1]; - $subelement = $regs[2]; - } - // For compatibility - if ($element == 'order') { - $element = $subelement = 'commande'; - } - if ($element == 'propal') { - $element = 'comm/propal'; - $subelement = 'propal'; - } - if ($element == 'contract') { - $element = $subelement = 'contrat'; - } - if ($element == 'inter') { - $element = $subelement = 'ficheinter'; - } - if ($element == 'shipping') { - $element = $subelement = 'expedition'; - } - if ($element == 'order_supplier') { - $element = 'fourn'; - $subelement = 'fournisseur.commande'; - } - if ($element == 'project') { - $element = 'projet'; - } + if (!empty($origin) && !empty($origin_id)) { + $element = $subelement = $origin; + $regs = array(); + if (preg_match('/^([^_]+)_([^_]+)/i', $origin, $regs)) { + $element = $regs[1]; + $subelement = $regs[2]; + } + // For compatibility + if ($element == 'order') { + $element = $subelement = 'commande'; + } + if ($element == 'propal') { + $element = 'comm/propal'; + $subelement = 'propal'; + } + if ($element == 'contract') { + $element = $subelement = 'contrat'; + } + if ($element == 'inter') { + $element = $subelement = 'ficheinter'; + } + if ($element == 'shipping') { + $element = $subelement = 'expedition'; + } + if ($element == 'order_supplier') { + $element = 'fourn'; + $subelement = 'fournisseur.commande'; + } + if ($element == 'project') { + $element = 'projet'; + } - dol_include_once('/' . $element . '/class/' . $subelement . '.class.php'); - $classname = ucfirst($origin); - $objectsrc = new $classname($db); - $objectsrc->fetch($origin_id); + dol_include_once('/' . $element . '/class/' . $subelement . '.class.php'); + $classname = ucfirst($origin); + $objectsrc = new $classname($db); + $objectsrc->fetch($origin_id); - $tmpobject = $objectsrc; - } - } + $tmpobject = $objectsrc; + } + } $custcontact = ''; $contactarr = array(); @@ -264,11 +264,11 @@ if ($action == 'presend') if (is_array($contactarr) && count($contactarr) > 0) { require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php'; - $contactstatic = new Contact($db); + $contactstatic = new Contact($db); foreach ($contactarr as $contact) { - $contactstatic->fetch($contact['id']); - $substitutionarray['__CONTACT_NAME_'.$contact['code'].'__'] = $contactstatic->getFullName($outputlangs, 1); + $contactstatic->fetch($contact['id']); + $substitutionarray['__CONTACT_NAME_'.$contact['code'].'__'] = $contactstatic->getFullName($outputlangs, 1); } } diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php index 05dd4a6a3ab..6400f032252 100644 --- a/htdocs/expedition/list.php +++ b/htdocs/expedition/list.php @@ -183,13 +183,13 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x' if (empty($reshook)) { - $objectclass = 'Expedition'; - $objectlabel = 'Sendings'; - $permissiontoread = $user->rights->expedition->lire; - $permissiontoadd = $user->rights->expedition->creer; - $permissiontodelete = $user->rights->expedition->supprimer; - $uploaddir = $conf->expedition->dir_output.'/sending'; - include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php'; + $objectclass = 'Expedition'; + $objectlabel = 'Sendings'; + $permissiontoread = $user->rights->expedition->lire; + $permissiontoadd = $user->rights->expedition->creer; + $permissiontodelete = $user->rights->expedition->supprimer; + $uploaddir = $conf->expedition->dir_output.'/sending'; + include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php'; } @@ -313,7 +313,7 @@ if ($resql) { $num = $db->num_rows($resql); - $arrayofselected = is_array($toselect) ? $toselect : array(); + $arrayofselected = is_array($toselect) ? $toselect : array(); $expedition = new Expedition($db); @@ -341,18 +341,18 @@ if ($resql) // Add $param from extra fields include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php'; - $arrayofmassactions = array( - 'builddoc' => $langs->trans("PDFMerge"), - //'classifyclose'=>$langs->trans("Close"), TODO massive close shipment ie: when truck is charged - 'presend' => $langs->trans("SendByMail"), - ); - if (in_array($massaction, array('presend'))) $arrayofmassactions = array(); - $massactionbutton = $form->selectMassAction('', $arrayofmassactions); + $arrayofmassactions = array( + 'builddoc' => $langs->trans("PDFMerge"), + //'classifyclose'=>$langs->trans("Close"), TODO massive close shipment ie: when truck is charged + 'presend' => $langs->trans("SendByMail"), + ); + if (in_array($massaction, array('presend'))) $arrayofmassactions = array(); + $massactionbutton = $form->selectMassAction('', $arrayofmassactions); $newcardbutton = ''; if ($user->rights->expedition->creer) { - $newcardbutton .= dolGetButtonTitle($langs->trans('NewSending'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/expedition/card.php?action=create2'); + $newcardbutton .= dolGetButtonTitle($langs->trans('NewSending'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/expedition/card.php?action=create2'); } $i = 0; @@ -367,11 +367,11 @@ if ($resql) print_barre_liste($langs->trans('ListOfSendings'), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, '', 0, $newcardbutton, '', $limit); - $topicmail = "SendShippingRef"; - $modelmail = "shipping_send"; - $objecttmp = new Expedition($db); - $trackid = 'shi'.$object->id; - include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php'; + $topicmail = "SendShippingRef"; + $modelmail = "shipping_send"; + $objecttmp = new Expedition($db); + $trackid = 'shi'.$object->id; + include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php'; if ($sall) { @@ -583,7 +583,7 @@ if ($resql) print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch '); print "\n"; - $typenArray = $formcompany->typent_array(1); + $typenArray = $formcompany->typent_array(1); $i = 0; $totalarray = array(); while ($i < min($num, $limit)) @@ -736,48 +736,48 @@ if ($resql) if (!$i) $totalarray['nbfield']++; } - // Action column - print '
'; //var_dump($listofmodules); @@ -1792,7 +1792,7 @@ elseif (!empty($module)) // Tabs for module if (!$error) { - $dirread = $listofmodules[strtolower($module)]['moduledescriptorrootpath']; + $dirread = $listofmodules[strtolower($module)]['moduledescriptorrootpath']; $head2 = array(); $h = 0; @@ -2341,7 +2341,7 @@ elseif (!empty($module)) { // tabobj = module if ($action == 'deleteproperty') { - $formconfirm = $form->formconfirm( + $formconfirm = $form->formconfirm( $_SERVER["PHP_SELF"].'?propertykey='.urlencode(GETPOST('propertykey', 'alpha')).'&objectname='.urlencode($objectname).'&tab='.urlencode($tab).'&module='.urlencode($module).'&tabobj='.urlencode($tabobj), $langs->trans('Delete'), $langs->trans('ConfirmDeleteProperty', GETPOST('propertykey', 'alpha')), 'confirm_deleteproperty', '', 0, 1 ); @@ -2403,23 +2403,23 @@ elseif (!empty($module)) print ' '.$langs->trans("ApiClassFile").' : '.($realpathtoapi ? '' : '
'; @@ -2427,14 +2427,14 @@ elseif (!empty($module)) if ($realpathtophpunit) { - print ' '.img_picto($langs->trans("Edit"), 'edit').''; - print ' '; - print ''.img_picto($langs->trans("Delete"), 'delete').''; + print ' '.img_picto($langs->trans("Edit"), 'edit').''; + print ' '; + print ''.img_picto($langs->trans("Delete"), 'delete').''; } else { - //print ''.$langs->trans("FileNotYetGenerated").' '; - print ''; + //print ''.$langs->trans("FileNotYetGenerated").' '; + print ''; } print '
'; @@ -2748,56 +2748,56 @@ elseif (!empty($module)) } else { - if ($tab == 'specifications') - { - if ($action != 'editfile' || empty($file)) - { - print ''.$langs->trans("SpecDefDesc").'
'; - print '
'; + if ($tab == 'specifications') + { + if ($action != 'editfile' || empty($file)) + { + print ''.$langs->trans("SpecDefDesc").'
'; + print '
'; - $specs = dol_dir_list(dol_buildpath($modulelowercase.'/doc', 0), 'files', 1, '(\.md|\.asciidoc)$', array('\/temp\/')); + $specs = dol_dir_list(dol_buildpath($modulelowercase.'/doc', 0), 'files', 1, '(\.md|\.asciidoc)$', array('\/temp\/')); - foreach ($specs as $spec) - { - $pathtofile = $modulelowercase.'/doc/'.$spec['relativename']; - $format = 'asciidoc'; - if (preg_match('/\.md$/i', $spec['name'])) $format = 'markdown'; - print ' '.$langs->trans("SpecificationFile").' : '.$pathtofile.''; - print ' '.img_picto($langs->trans("Edit"), 'edit').''; - print '
'; - } - } - else - { - // Use MD or asciidoc + foreach ($specs as $spec) + { + $pathtofile = $modulelowercase.'/doc/'.$spec['relativename']; + $format = 'asciidoc'; + if (preg_match('/\.md$/i', $spec['name'])) $format = 'markdown'; + print ' '.$langs->trans("SpecificationFile").' : '.$pathtofile.''; + print ' '.img_picto($langs->trans("Edit"), 'edit').''; + print '
'; + } + } + else + { + // Use MD or asciidoc - //print $langs->trans("UseAsciiDocFormat").'
'; + //print $langs->trans("UseAsciiDocFormat").'
'; - $fullpathoffile = dol_buildpath($file, 0); + $fullpathoffile = dol_buildpath($file, 0); - $content = file_get_contents($fullpathoffile); + $content = file_get_contents($fullpathoffile); - // New module - print ''; - } - } - print '
'; - print ''; + print ''; + $htmlhelp = $langs->trans("MenusDefDescTooltip", ''.$langs->trans('Setup').' - '.$langs->trans('Menus').''); + print $form->textwithpicto($langs->trans("MenusDefDesc"), $htmlhelp, 1, 'help', '', 0, 2, 'helpondesc').'
'; + print ''; print '
'; print ' '.$langs->trans("DescriptorFile").' : '.$pathtofile.''; @@ -3000,10 +3000,10 @@ elseif (!empty($module)) if ($action != 'editfile' || empty($file)) { - print ''; - $htmlhelp = $langs->trans("PermissionsDefDescTooltip", ''.$langs->trans('DefaultPermissions').''); - print $form->textwithpicto($langs->trans("PermissionsDefDesc"), $htmlhelp, 1, 'help', '', 0, 2, 'helpondesc').'
'; - print ''; + print ''; + $htmlhelp = $langs->trans("PermissionsDefDescTooltip", ''.$langs->trans('DefaultPermissions').''); + print $form->textwithpicto($langs->trans("PermissionsDefDesc"), $htmlhelp, 1, 'help', '', 0, 2, 'helpondesc').'
'; + print ''; print '
'; print ' '.$langs->trans("DescriptorFile").' : '.$pathtofile.''; @@ -3096,7 +3096,7 @@ elseif (!empty($module)) { if ($action != 'editfile' || empty($file)) { - print ''.$langs->trans("HooksDefDesc").'
'; + print ''.$langs->trans("HooksDefDesc").'
'; print '
'; print '
| '; @@ -3112,14 +3112,14 @@ elseif (!empty($module)) print ' '.$langs->trans("HooksFile").' : '; if (dol_is_file($dirins.'/'.$pathtohook)) { - print ''.$pathtohook.''; - print ' | '.img_picto($langs->trans("Edit"), 'edit').' | '; - print ''.img_picto($langs->trans("Delete"), 'delete').' | '; + print ''.$pathtohook.''; + print ''.img_picto($langs->trans("Edit"), 'edit').' | '; + print ''.img_picto($langs->trans("Delete"), 'delete').' | '; } else { - print ''.$langs->trans("FileNotYetGenerated").''; - print ''; + print ''.$langs->trans("FileNotYetGenerated").''; + print ' | '; } print ' | ||||||||||
| '.img_picto($langs->trans("Edit"), 'edit').' | '; print ''.img_picto($langs->trans("Delete"), 'delete').' | '; - print ''; + print ''; } } else { - print '
| '; - print ' '.$langs->trans("NoTrigger"); - print ' | '; + print ' |
| '; + print ' '.$langs->trans("NoTrigger"); + print ' | '; print ' |
'; - print '
'; + print ''.$langs->trans("WidgetDesc").'
'; + print '
'; - print '
| '.$langs->trans("CLIFile").' : '.$pathtofile.''; - print ' | '.img_picto($langs->trans("Edit"), 'edit').' | '; - print ''.img_picto($langs->trans("Delete"), 'delete').' | '; - print '
| '.$langs->trans("NoCLIFile"); - print ' | '; - print ' |
'; + print ''.$langs->trans("CronJobDefDesc", ''.$langs->transnoentities('CronList').'').'
'; print '
'; print ' '.$langs->trans("DescriptorFile").' : '.$pathtofile.''; @@ -3585,119 +3585,119 @@ elseif (!empty($module)) if ($tab == 'specifications') { - $specs = dol_dir_list(dol_buildpath($modulelowercase.'/doc', 0), 'files', 1, '(\.md|\.asciidoc)$', array('\/temp\/')); + $specs = dol_dir_list(dol_buildpath($modulelowercase.'/doc', 0), 'files', 1, '(\.md|\.asciidoc)$', array('\/temp\/')); - if ($action != 'editfile' || empty($file)) - { - print ''.$langs->trans("SpecDefDesc").'
'; - print '
'; + if ($action != 'editfile' || empty($file)) + { + print ''.$langs->trans("SpecDefDesc").'
'; + print '
'; - print '
| '; - print ' '.$langs->trans("SpecificationFile").' : '.$pathtofile.''; - print ' | '.img_picto($langs->trans("Edit"), 'edit').' | '; - print ''.img_picto($langs->trans("Delete"), 'delete').' | '; - print '
| '; - print ' '.$langs->trans("FileNotYetGenerated"); - print ' | '; - print ' |
| '; + print ' '.$langs->trans("SpecificationFile").' : '.$pathtofile.''; + print ' | '.img_picto($langs->trans("Edit"), 'edit').' | '; + print ''.img_picto($langs->trans("Delete"), 'delete').' | '; + print '
| '; + print ' '.$langs->trans("FileNotYetGenerated"); + print ' | '; + print ' |
'; + //print $langs->trans("UseAsciiDocFormat").'
'; - $fullpathoffile = dol_buildpath($file, 0); + $fullpathoffile = dol_buildpath($file, 0); - $content = file_get_contents($fullpathoffile); + $content = file_get_contents($fullpathoffile); - // New module - print ''; - } + print ''; + } - print '
'; + print '
'; - $FILENAMEDOC = $modulelowercase.'.html'; - $FILENAMEDOCPDF = $modulelowercase.'.pdf'; - $outputfiledoc = dol_buildpath($modulelowercase, 0).'/doc/'.$FILENAMEDOC; - $outputfiledocurl = dol_buildpath($modulelowercase, 1).'/doc/'.$FILENAMEDOC; - $outputfiledocpdf = dol_buildpath($modulelowercase, 0).'/doc/'.$FILENAMEDOCPDF; - $outputfiledocurlpdf = dol_buildpath($modulelowercase, 1).'/doc/'.$FILENAMEDOCPDF; + $FILENAMEDOC = $modulelowercase.'.html'; + $FILENAMEDOCPDF = $modulelowercase.'.pdf'; + $outputfiledoc = dol_buildpath($modulelowercase, 0).'/doc/'.$FILENAMEDOC; + $outputfiledocurl = dol_buildpath($modulelowercase, 1).'/doc/'.$FILENAMEDOC; + $outputfiledocpdf = dol_buildpath($modulelowercase, 0).'/doc/'.$FILENAMEDOCPDF; + $outputfiledocurlpdf = dol_buildpath($modulelowercase, 1).'/doc/'.$FILENAMEDOCPDF; - // HTML - print ' '.$langs->trans("PathToModuleDocumentation", "HTML").' : '; - if (!dol_is_file($outputfiledoc)) print ''.$langs->trans("FileNotYetGenerated").''; - else { - print ''; - print ''; - print $outputfiledoc; - print ''; - print ''; - print ' ('.$langs->trans("GeneratedOn").' '.dol_print_date(dol_filemtime($outputfiledoc), 'dayhour').')'; - } - print '
'; + // HTML + print ' '.$langs->trans("PathToModuleDocumentation", "HTML").' : '; + if (!dol_is_file($outputfiledoc)) print ''.$langs->trans("FileNotYetGenerated").''; + else { + print ''; + print ''; + print $outputfiledoc; + print ''; + print ''; + print ' ('.$langs->trans("GeneratedOn").' '.dol_print_date(dol_filemtime($outputfiledoc), 'dayhour').')'; + } + print '
'; - // PDF - print ' '.$langs->trans("PathToModuleDocumentation", "PDF").' : '; - if (!dol_is_file($outputfiledocpdf)) print ''.$langs->trans("FileNotYetGenerated").''; - else { - print ''; - print ''; - print $outputfiledocpdf; - print ''; - print ''; - print ' ('.$langs->trans("GeneratedOn").' '.dol_print_date(dol_filemtime($outputfiledocpdf), 'dayhour').')'; - } - print '
'; + // PDF + print ' '.$langs->trans("PathToModuleDocumentation", "PDF").' : '; + if (!dol_is_file($outputfiledocpdf)) print ''.$langs->trans("FileNotYetGenerated").''; + else { + print ''; + print ''; + print $outputfiledocpdf; + print ''; + print ''; + print ' ('.$langs->trans("GeneratedOn").' '.dol_print_date(dol_filemtime($outputfiledocpdf), 'dayhour').')'; + } + print '
'; - print '
'; + print '
'; - print ''; + print ''; } if ($tab == 'buildpackage') { - print ''.$langs->trans("BuildPackageDesc").''; - print '
'; + print ''.$langs->trans("BuildPackageDesc").''; + print '
'; if (!class_exists('ZipArchive') && !defined('ODTPHP_PATHTOPCLZIP')) { diff --git a/htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php b/htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php index 42ede9ba800..f621d332003 100644 --- a/htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php +++ b/htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php @@ -35,9 +35,9 @@ dol_include_once('/mymodule/core/modules/mymodule/modules_myobject.php'); class mod_myobject_advanced extends ModeleNumRefMyObject { /** - * Dolibarr version of the loaded document - * @var string - */ + * Dolibarr version of the loaded document + * @var string + */ public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' /** @@ -51,14 +51,14 @@ class mod_myobject_advanced extends ModeleNumRefMyObject public $name = 'advanced'; - /** - * Returns the description of the numbering model - * - * @return string Texte descripif - */ - public function info() - { - global $conf, $langs, $db; + /** + * Returns the description of the numbering model + * + * @return string Texte descripif + */ + public function info() + { + global $conf, $langs, $db; $langs->load("bills"); @@ -89,28 +89,28 @@ class mod_myobject_advanced extends ModeleNumRefMyObject $texte .= ''; return $texte; - } + } - /** - * Return an example of numbering - * - * @return string Example - */ - public function getExample() - { - global $conf, $langs, $mysoc; + /** + * Return an example of numbering + * + * @return string Example + */ + public function getExample() + { + global $conf, $langs, $mysoc; - $object = new MyObject($this->db); - $object->initAsSpecimen(); + $object = new MyObject($this->db); + $object->initAsSpecimen(); - /*$old_code_client = $mysoc->code_client; + /*$old_code_client = $mysoc->code_client; $old_code_type = $mysoc->typent_code; $mysoc->code_client = 'CCCCCCCCCC'; $mysoc->typent_code = 'TTTTTTTTTT';*/ - $numExample = $this->getNextValue($object); + $numExample = $this->getNextValue($object); - /*$mysoc->code_client = $old_code_client; + /*$mysoc->code_client = $old_code_client; $mysoc->typent_code = $old_code_type;*/ if (!$numExample) @@ -118,7 +118,7 @@ class mod_myobject_advanced extends ModeleNumRefMyObject $numExample = $langs->trans('NotConfigured'); } return $numExample; - } + } /** * Return next free value @@ -126,8 +126,8 @@ class mod_myobject_advanced extends ModeleNumRefMyObject * @param Object $object Object we need next value for * @return string Value if KO, <0 if KO */ - public function getNextValue($object) - { + public function getNextValue($object) + { global $db, $conf; require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; diff --git a/htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php b/htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php index 13beaadab95..d3990b562ec 100644 --- a/htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php +++ b/htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php @@ -31,9 +31,9 @@ dol_include_once('/mymodule/core/modules/mymodule/modules_myobject.php'); class mod_myobject_standard extends ModeleNumRefMyObject { /** - * Dolibarr version of the loaded document - * @var string - */ + * Dolibarr version of the loaded document + * @var string + */ public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' public $prefix = 'MYOBJECT'; @@ -49,16 +49,16 @@ class mod_myobject_standard extends ModeleNumRefMyObject public $name = 'standard'; - /** - * Return description of numbering module - * - * @return string Text with description - */ - public function info() - { - global $langs; - return $langs->trans("SimpleNumRefModelDesc", $this->prefix); - } + /** + * Return description of numbering module + * + * @return string Text with description + */ + public function info() + { + global $langs; + return $langs->trans("SimpleNumRefModelDesc", $this->prefix); + } /** @@ -73,8 +73,8 @@ class mod_myobject_standard extends ModeleNumRefMyObject /** - * Checks if the numbers already in the database do not - * cause conflicts that would prevent this numbering working. + * Checks if the numbers already in the database do not + * cause conflicts that would prevent this numbering working. * * @param Object $object Object we need next value for * @return boolean false if conflict, true if ok @@ -151,8 +151,8 @@ class mod_myobject_standard extends ModeleNumRefMyObject $date = $object->date_creation; $yymm = strftime("%y%m", $date); - if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is - else $num = sprintf("%04s", $max + 1); + if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is + else $num = sprintf("%04s", $max + 1); dol_syslog("mod_myobject_standard::getNextValue return ".$this->prefix.$yymm."-".$num); return $this->prefix.$yymm."-".$num; diff --git a/htdocs/modulebuilder/template/core/modules/mymodule/modules_myobject.php b/htdocs/modulebuilder/template/core/modules/mymodule/modules_myobject.php index b052d4538bd..7e22d5d6ca4 100644 --- a/htdocs/modulebuilder/template/core/modules/mymodule/modules_myobject.php +++ b/htdocs/modulebuilder/template/core/modules/mymodule/modules_myobject.php @@ -38,17 +38,17 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; // requir abstract class ModelePDFMyObject extends CommonDocGenerator { - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps - /** - * Return list of active generation modules - * - * @param DoliDB $db Database handler - * @param integer $maxfilenamelength Max length of value to show - * @return array List of templates + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps + /** + * Return list of active generation modules + * + * @param DoliDB $db Database handler + * @param integer $maxfilenamelength Max length of value to show + * @return array List of templates */ public static function liste_modeles($db, $maxfilenamelength = 0) { - // phpcs:enable + // phpcs:enable global $conf; $type = 'mymodule_myobject'; @@ -109,7 +109,7 @@ abstract class ModeleNumRefMyObject /** * Checks if the numbers already in the database do not - * cause conflicts that would prevent this numbering working. + * cause conflicts that would prevent this numbering working. * * @param Object $object Object we need next value for * @return boolean false if conflict, true if ok From 165df931f1ae4f6b1a7126944cf8aebe4e1db2c8 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur
';
print '';
diff --git a/htdocs/core/lib/bank.lib.php b/htdocs/core/lib/bank.lib.php
index 6c23e324f71..da51589b8ac 100644
--- a/htdocs/core/lib/bank.lib.php
+++ b/htdocs/core/lib/bank.lib.php
@@ -179,7 +179,7 @@ function account_statement_prepare_head($object, $num)
// Attached files
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
- $upload_dir = $conf->bank->dir_output."/".$object->id.'/'.dol_sanitizeFileName($num);
+ $upload_dir = $conf->bank->dir_output."/".$object->id.'/statement/'.dol_sanitizeFileName($num);
$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
$nbLinks = Link::count($db, $object->element, $object->id);
From 98dfc7ca71e113f061ac7c6f5569c9ba82615589 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur
Date: Sun, 5 Apr 2020 12:01:05 +0200
Subject: [PATCH 119/336] Fix css
---
htdocs/adherents/subscription/list.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php
index f6a2871a5c0..b99abb47156 100644
--- a/htdocs/adherents/subscription/list.php
+++ b/htdocs/adherents/subscription/list.php
@@ -33,6 +33,7 @@ $langs->loadLangs(array("members", "companies"));
$action = GETPOST('action', 'aZ09');
$massaction = GETPOST('massaction', 'alpha');
+$contextpage = GETPOST('contextpage', 'aZ09');
$confirm = GETPOST('confirm', 'alpha');
$toselect = GETPOST('toselect', 'array');
@@ -116,7 +117,6 @@ if (empty($reshook))
// Purge search criteria
if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
{
- $search = "";
$search_type = "";
$search_ref = "";
$search_lastname = "";
@@ -446,7 +446,7 @@ while ($i < min($num, $limit))
// Type
if (!empty($arrayfields['d.fk_type']['checked']))
{
- print '';
+ print ' ';
if ($typeid > 0)
{
print $adht->getNomUrl(1);
From 5ca9c71449e750bd5d1a72663581ed73f31a41b0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur
Date: Sun, 5 Apr 2020 12:05:27 +0200
Subject: [PATCH 120/336] css
---
htdocs/adherents/subscription/list.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php
index b99abb47156..e02c31cfe90 100644
--- a/htdocs/adherents/subscription/list.php
+++ b/htdocs/adherents/subscription/list.php
@@ -338,7 +338,7 @@ if (!empty($arrayfields['t.libelle']['checked']))
if (!empty($arrayfields['d.bank']['checked']))
{
print '';
- $form->select_comptes($search_account, 'search_account', 0, '', 1);
+ $form->select_comptes($search_account, 'search_account', 0, '', 1, '', 0, 'maxwidth100');
print ' ';
}
@@ -489,7 +489,7 @@ while ($i < min($num, $limit))
// Banque
if (!empty($arrayfields['d.bank']['checked']))
{
- print "";
+ print ' ';
if ($obj->fk_account > 0)
{
$accountstatic->id = $obj->fk_account;
From 5b8c50cb72c2d02e11305670eea91ef08e0fb852 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur
Date: Sun, 5 Apr 2020 12:07:00 +0200
Subject: [PATCH 121/336] css
---
htdocs/adherents/subscription/list.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php
index e02c31cfe90..ac8f2e68680 100644
--- a/htdocs/adherents/subscription/list.php
+++ b/htdocs/adherents/subscription/list.php
@@ -338,7 +338,7 @@ if (!empty($arrayfields['t.libelle']['checked']))
if (!empty($arrayfields['d.bank']['checked']))
{
print '';
- $form->select_comptes($search_account, 'search_account', 0, '', 1, '', 0, 'maxwidth100');
+ $form->select_comptes($search_account, 'search_account', 0, '', 1, '', 0, 'maxwidth150');
print ' ';
}
From e8380007957b9eed19e98b26810e5a3ac09e2054 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur
Date: Sun, 5 Apr 2020 12:11:58 +0200
Subject: [PATCH 122/336] responsive
---
htdocs/adherents/subscription/list.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php
index ac8f2e68680..a582584ae7f 100644
--- a/htdocs/adherents/subscription/list.php
+++ b/htdocs/adherents/subscription/list.php
@@ -466,14 +466,14 @@ while ($i < min($num, $limit))
// Firstname
if (!empty($arrayfields['d.firstname']['checked']))
{
- print ''.$adherent->firstname.' ';
+ print ''.$adherent->firstname.' ';
if (!$i) $totalarray['nbfield']++;
}
// Login
if (!empty($arrayfields['d.login']['checked']))
{
- print ''.$adherent->login.' ';
+ print ''.$adherent->login.' ';
if (!$i) $totalarray['nbfield']++;
}
From bfbc9b303abd6cb12de11e60e32def796230f584 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur
Date: Sun, 5 Apr 2020 12:23:16 +0200
Subject: [PATCH 123/336] Fix phpcs
---
htdocs/core/class/html.formticket.class.php | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index a48cf36c117..ee7be63d22a 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -124,8 +124,9 @@ class FormTicket
/**
* Show the form to input ticket
*
- * @param int $withdolfichehead With dol_fiche_head
- * @return void
+ * @param int $withdolfichehead With dol_fiche_head
+ * @param string Mode ('create' or 'edit')
+ * @return void
*/
public function showForm($withdolfichehead = 0, $mode = 'edit')
{
From 9bbedce3d60f620fe3591bc7012fc03d15cca4d4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur
Date: Sun, 5 Apr 2020 12:23:58 +0200
Subject: [PATCH 124/336] Fix phpcs
---
scripts/user/migrate_picture_path.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/user/migrate_picture_path.php b/scripts/user/migrate_picture_path.php
index f478c42b865..b0ca99dd977 100755
--- a/scripts/user/migrate_picture_path.php
+++ b/scripts/user/migrate_picture_path.php
@@ -83,6 +83,7 @@ $db->close(); // Close $db database opened handler
exit($error);
+
/**
* Migrate file from old path to new one for user $u
*
@@ -105,7 +106,6 @@ function migrate_user_filespath($u)
dol_mkdir($destin);
if (dol_is_dir($origin)) {
-
$handle = opendir($origin_osencoded);
if (is_resource($handle)) {
while (($file = readdir($handle)) !== false) {
From 62387f712c4bcd42dbb0a6000cf8f897614b14aa Mon Sep 17 00:00:00 2001
From: Laurent Destailleur
Date: Sun, 5 Apr 2020 15:26:16 +0200
Subject: [PATCH 125/336] FIX Send email from bulk action of list of
thirdparties
---
htdocs/core/actions_massactions.inc.php | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index 17e063244df..7c16ecb5e5c 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -253,7 +253,11 @@ if (!$error && $massaction == 'confirm_presend')
// Test recipient
if (empty($sendto)) // For the case, no recipient were set (multi thirdparties send)
{
- if ($objectobj->element == 'expensereport')
+ if ($objectobj->element == 'societe')
+ {
+ $sendto = $objectobj->email;
+ }
+ elseif ($objectobj->element == 'expensereport')
{
$fuser = new User($db);
$fuser->fetch($objectobj->fk_user_author);
@@ -289,6 +293,10 @@ if (!$error && $massaction == 'confirm_presend')
if (empty($sendto))
{
+ if ($objectobj->element == 'societe') {
+ $objectobj->thirdparty = $objectobj; // Hack so following code is comaptible when objectobj is a thirdparty
+ }
+
//print "No recipient for thirdparty ".$objectobj->thirdparty->name;
$nbignored++;
if (empty($thirdpartywithoutemail[$objectobj->thirdparty->id]))
From e32ac7644d475e31d73b5a785d7eb18d61331709 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur
Date: Sun, 5 Apr 2020 15:26:16 +0200
Subject: [PATCH 126/336] FIX Send email from bulk action of list of
thirdparties
---
htdocs/core/actions_massactions.inc.php | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index e5734547a95..9211c771fab 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -236,7 +236,11 @@ if (! $error && $massaction == 'confirm_presend')
// Test recipient
if (empty($sendto)) // For the case, no recipient were set (multi thirdparties send)
{
- if ($objectobj->element == 'expensereport')
+ if ($objectobj->element == 'societe')
+ {
+ $sendto = $objectobj->email;
+ }
+ elseif ($objectobj->element == 'expensereport')
{
$fuser = new User($db);
$fuser->fetch($objectobj->fk_user_author);
@@ -257,6 +261,10 @@ if (! $error && $massaction == 'confirm_presend')
if (empty($sendto))
{
+ if ($objectobj->element == 'societe') {
+ $objectobj->thirdparty = $objectobj; // Hack so following code is comaptible when objectobj is a thirdparty
+ }
+
//print "No recipient for thirdparty ".$objectobj->thirdparty->name;
$nbignored++;
if (empty($thirdpartywithoutemail[$objectobj->thirdparty->id]))
From 009cc36355b9fceada94f432a9a136fef8d2393d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur
Date: Sun, 5 Apr 2020 15:39:53 +0200
Subject: [PATCH 127/336] Fix sendocntext for builk action
---
htdocs/core/actions_massactions.inc.php | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index 7c16ecb5e5c..012e9d2d8a5 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -499,9 +499,11 @@ if (!$error && $massaction == 'confirm_presend')
//var_dump($trackid);exit;
//var_dump($subjectreplaced);
+ if (empty($sendcontext)) $sendcontext = 'standard';
+
// Send mail (substitutionarray must be done just before this)
require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
- $mailfile = new CMailFile($subjectreplaced, $sendto, $from, $messagereplaced, $filepath, $mimetype, $filename, $sendtocc, $sendtobcc, $deliveryreceipt, -1, '', '', $trackid);
+ $mailfile = new CMailFile($subjectreplaced, $sendto, $from, $messagereplaced, $filepath, $mimetype, $filename, $sendtocc, $sendtobcc, $deliveryreceipt, -1, '', '', $trackid, '', $sendcontext);
if ($mailfile->error)
{
$resaction .= '
Date: Sun, 5 Apr 2020 15:42:39 +0200
Subject: [PATCH 128/336] Fix trans
---
htdocs/core/lib/admin.lib.php | 2 +-
htdocs/langs/en_US/mails.lang | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index 2433f284a2c..42813a6cf65 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -1807,7 +1807,7 @@ function email_admin_prepare_head()
if ($conf->mailing->enabled)
{
$head[$h][0] = DOL_URL_ROOT."/admin/mails_emailing.php";
- $head[$h][1] = $langs->trans("OutGoingEmailSetupForEmailing");
+ $head[$h][1] = $langs->trans("OutGoingEmailSetupForEmailing", $langs->transnoentitiesnoconv("EMailing"));
$head[$h][2] = 'common_emailing';
$h++;
}
diff --git a/htdocs/langs/en_US/mails.lang b/htdocs/langs/en_US/mails.lang
index 8b92cef3103..7b3bfd3852a 100644
--- a/htdocs/langs/en_US/mails.lang
+++ b/htdocs/langs/en_US/mails.lang
@@ -164,7 +164,7 @@ NoContactWithCategoryFound=No contact/address with a category found
NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
OutGoingEmailSetup=Outgoing email setup
InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
+OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
DefaultOutgoingEmailSetup=Default outgoing email setup
Information=Information
ContactsWithThirdpartyFilter=Contacts with third-party filter
From ed4aa5585700b0272e7ac495e848792d52a86d2f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur
Date: Sun, 5 Apr 2020 15:46:10 +0200
Subject: [PATCH 129/336] Doxygen
---
htdocs/core/class/html.formticket.class.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index ee7be63d22a..b688d408284 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -125,7 +125,7 @@ class FormTicket
* Show the form to input ticket
*
* @param int $withdolfichehead With dol_fiche_head
- * @param string Mode ('create' or 'edit')
+ * @param string $mode Mode ('create' or 'edit')
* @return void
*/
public function showForm($withdolfichehead = 0, $mode = 'edit')
From 93ce4e9e4b5104efec76f34b22e86a8b215b07fe Mon Sep 17 00:00:00 2001
From: Laurent Destailleur
Date: Sun, 5 Apr 2020 15:47:34 +0200
Subject: [PATCH 130/336] Fix phpcs
---
htdocs/main.inc.php | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 0d0f14ba332..ece5ac096c8 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1865,10 +1865,10 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
'.$userDropDownImage.'
Date: Mon, 6 Apr 2020 10:02:11 +0200
Subject: [PATCH 131/336] Fix name of cookie
---
htdocs/core/boxes/box_task.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/htdocs/core/boxes/box_task.php b/htdocs/core/boxes/box_task.php
index 94983ef6bff..6e25fb934ad 100644
--- a/htdocs/core/boxes/box_task.php
+++ b/htdocs/core/boxes/box_task.php
@@ -84,7 +84,7 @@ class box_task extends ModeleBoxes
$projectstatic = new Project($this->db);
$taskstatic = new Task($this->db);
$form = new Form($this->db);
- $cookie_name = 'boxfilter_task';
+ $cookie_name = 'DOLUSERCOOKIE_boxfilter_task';
$boxcontent = '';
$socid = $user->socid;
From 9950295e4132480783922f43a5f4be171271dea8 Mon Sep 17 00:00:00 2001
From: atm-quentin
Date: Mon, 6 Apr 2020 10:12:27 +0200
Subject: [PATCH 132/336] FIX author search supplier proposal list
---
htdocs/supplier_proposal/list.php | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index fe010c95e9c..5d6d2d2e0c3 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -59,7 +59,7 @@ $search_user=GETPOST('search_user', 'int');
$search_sale=GETPOST('search_sale', 'int');
$search_ref=GETPOST('sf_ref')?GETPOST('sf_ref', 'alpha'):GETPOST('search_ref', 'alpha');
$search_societe=GETPOST('search_societe', 'alpha');
-$search_author=GETPOST('search_author', 'alpha');
+$search_login=GETPOST('search_login', 'alpha');
$search_town=GETPOST('search_town', 'alpha');
$search_zip=GETPOST('search_zip', 'alpha');
$search_state=trim(GETPOST("search_state"));
@@ -196,7 +196,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
$search_type='';
$search_country='';
$search_type_thirdparty='';
- $search_author='';
+ $search_login='';
$yearvalid='';
$monthvalid='';
$dayvalid='';
@@ -282,7 +282,7 @@ if ($search_country) $sql .= " AND s.fk_pays IN (".$search_country.')';
if ($search_type_thirdparty) $sql .= " AND s.fk_typent IN (".$search_type_thirdparty.')';
if ($search_ref) $sql .= natural_search('sp.ref', $search_ref);
if ($search_societe) $sql .= natural_search('s.nom', $search_societe);
-if ($search_author) $sql .= natural_search('u.login', $search_author);
+if ($search_login) $sql .= natural_search('u.login', $search_login);
if ($search_montant_ht) $sql.= natural_search('sp.total_ht=', $search_montant_ht, 1);
if ($search_montant_vat != '') $sql.= natural_search("sp.tva", $search_montant_vat, 1);
if ($search_montant_ttc != '') $sql.= natural_search("sp.total", $search_montant_ttc, 1);
@@ -366,7 +366,7 @@ if ($resql)
if ($search_user > 0) $param.='&search_user='.$search_user;
if ($search_sale > 0) $param.='&search_sale='.$search_sale;
if ($search_montant_ht) $param.='&search_montant_ht='.$search_montant_ht;
- if ($search_author) $param.='&search_author='.$search_author;
+ if ($search_login) $param.='&search_login='.$search_login;
if ($search_town) $param.='&search_town='.$search_town;
if ($search_zip) $param.='&search_zip='.$search_zip;
if ($socid > 0) $param.='&socid='.$socid;
@@ -549,7 +549,7 @@ if ($resql)
{
// Author
print '';
- print '';
+ print '';
print ' ';
}
// Extra fields
From 23c48b83e4fb55ce3d054ccd3501735cf3fa3a67 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur
Date: Mon, 6 Apr 2020 11:16:35 +0200
Subject: [PATCH 133/336] Fix change position of session_set_cookie_param /
session_name
---
htdocs/main.inc.php | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index ece5ac096c8..f17579e9d78 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -209,8 +209,8 @@ $prefix = dol_getprefix('');
$sessionname = 'DOLSESSID_'.$prefix;
$sessiontimeout = 'DOLSESSTIMEOUT_'.$prefix;
if (!empty($_COOKIE[$sessiontimeout])) ini_set('session.gc_maxlifetime', $_COOKIE[$sessiontimeout]);
-session_name($sessionname);
session_set_cookie_params(0, '/', null, (empty($dolibarr_main_force_https) ? false : true), true); // Add tag secure and httponly on session cookie (same as setting session.cookie_httponly into php.ini). Must be called before the session_start.
+session_name($sessionname);
// This create lock, released when session_write_close() or end of page.
// We need this lock as long as we read/write $_SESSION ['vars']. We can remove lock when finished.
if (!defined('NOSESSION'))
@@ -256,7 +256,6 @@ if (isset($_SERVER["HTTP_USER_AGENT"]))
if ($conf->browser->layout == 'phone') $conf->dol_no_mouse_hover = 1;
}
-
// Force HTTPS if required ($conf->file->main_force_https is 0/1 or 'https dolibarr root url')
// $_SERVER["HTTPS"] is 'on' when link is https, otherwise $_SERVER["HTTPS"] is empty or 'off'
if (!empty($conf->file->main_force_https) && (empty($_SERVER["HTTPS"]) || $_SERVER["HTTPS"] != 'on'))
@@ -343,7 +342,6 @@ if ((!empty($conf->global->MAIN_VERSION_LAST_UPGRADE) && ($conf->global->MAIN_VE
}
}
-//var_dump(GETPOST('token').' '.$_SESSION['token'].' - '.newToken().' '.$_SERVER['SCRIPT_FILENAME']);
// Creation of a token against CSRF vulnerabilities
if (!defined('NOTOKENRENEWAL'))
@@ -619,8 +617,8 @@ if (!defined('NOLOGIN'))
{
dol_syslog('User not found, connexion refused');
session_destroy();
- session_name($sessionname);
session_set_cookie_params(0, '/', null, (empty($dolibarr_main_force_https) ? false : true), true); // Add tag secure and httponly on session cookie
+ session_name($sessionname);
session_start();
if ($resultFetchUser == 0)
@@ -673,8 +671,8 @@ if (!defined('NOLOGIN'))
// Account has been removed after login
dol_syslog("Can't load user even if session logged. _SESSION['dol_login']=".$login, LOG_WARNING);
session_destroy();
- session_name($sessionname);
session_set_cookie_params(0, '/', null, (empty($dolibarr_main_force_https) ? false : true), true); // Add tag secure and httponly on session cookie
+ session_name($sessionname);
session_start();
if ($resultFetchUser == 0)
From 41b2ed8f89d85cf03c2bac4224e33f561eb2cf44 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur
Date: Mon, 6 Apr 2020 12:03:37 +0200
Subject: [PATCH 134/336] Look and feel v12
---
htdocs/core/class/html.form.class.php | 2 +-
htdocs/projet/activity/perday.php | 11 +++++++----
htdocs/projet/activity/permonth.php | 11 ++++++-----
htdocs/projet/activity/perweek.php | 9 +++++----
4 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 0b8185b3854..8e30c65b409 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5473,7 +5473,7 @@ class Form
* @param int $disabled Disable input fields
* @param int $fullday When a checkbox with this html name is on, hour and day are set with 00:00 or 23:59
* @param string $addplusone Add a link "+1 hour". Value must be name of another selectDate field.
- * @param datetime $adddateof Add a link "Date of invoice" using the following date. See also $labeladddateof for the label used.
+ * @param datetime $adddateof Add a link "Date of ..." using the following date. See also $labeladddateof for the label used.
* @param string $openinghours Specify hour start and hour end for the select ex 8,20
* @param int $stepminutes Specify step for minutes between 1 and 30
* @param string $labeladddateof Label to use for the $adddateof parameter.
diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index db6efca4721..00d70e31c89 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -146,6 +146,7 @@ $search_array_options_task = $extrafields->getOptionalsFromPost($object->table_e
/*
* Actions
*/
+
$parameters = array('id' => $id, 'taskid' => $taskid, 'projectid' => $projectid);
$reshook=$hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -441,9 +442,10 @@ $nav = '".dol_print_date(dol_mktime(0, 0, 0, $month, $day, $year), "day")." \n";
$nav .= ''.img_next($langs->trans("Next"))."\n";
-$nav .= " (".$langs->trans("Today").")";
-$nav .= '
'.$form->selectDate(-1, '', 0, 0, 2, "addtime", 1, 0).' '; -$nav .= ' '; +//$nav .= " (".$langs->trans("Today").")"; +$nav .= ' '.$form->selectDate(-1, '', 0, 0, 2, "addtime", 1, 1).' '; +//$nav .= ' '; +$nav .= ' '; $picto = 'calendarweek'; @@ -484,6 +486,7 @@ print ''; dol_fiche_end(); + print '
'.$form->select_date(-1, '', 0, 0, 2, "addtime", 1, 0, 1).' '; -$nav.=' '; +//$nav.=" (".$langs->trans("Today").")"; +$nav.=' '.$form->selectDate(-1, '', 0, 0, 2, "addtime", 1, 1).' '; +//$nav.=' '; +$nav .= ' '; $picto='calendarweek'; @@ -408,7 +409,7 @@ print ''; dol_fiche_end(); -print '
'.$form->selectDate(-1, '', 0, 0, 2, "addtime", 1, 0).' '; -$nav .= ' '; +//$nav .= " (".$langs->trans("Today").")"; +$nav .= ' '.$form->selectDate(-1, '', 0, 0, 2, "addtime", 1, 1).' '; +//$nav .= ' '; +$nav .= ' '; $picto = 'calendarweek'; @@ -514,7 +515,7 @@ print $formcompany->selectTypeContact($object, '', 'type', 'internal', 'rowid', print ''; print ''; -print ''; +print ''; $startday = dol_mktime(12, 0, 0, $startdayarray['first_month'], $startdayarray['first_day'], $startdayarray['first_year']); From 48da8c315f8935040f1bbaf850a0a9ff65a02744 Mon Sep 17 00:00:00 2001 From: florian HENRY
Date: Mon, 6 Apr 2020 12:21:20 +0200
Subject: [PATCH 135/336] fix php warning
---
htdocs/compta/stats/supplier_turnover_by_thirdparty.php | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/htdocs/compta/stats/supplier_turnover_by_thirdparty.php b/htdocs/compta/stats/supplier_turnover_by_thirdparty.php
index ea55adcc8c2..a9cdef94711 100644
--- a/htdocs/compta/stats/supplier_turnover_by_thirdparty.php
+++ b/htdocs/compta/stats/supplier_turnover_by_thirdparty.php
@@ -195,18 +195,19 @@ $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.
if ($date_end == dol_time_plus_duree($date_start, 1, 'y') - 1) $periodlink = ''.img_previous().' '.img_next().'';
else $periodlink = '';
-report_header($name, $namelink, $period, $periodlink, $description, $builddate, $exportlink, $tableparams, $calcmode);
+report_header($name, '', $period, $periodlink, $description, $builddate, $exportlink, $tableparams, $calcmode);
if (!empty($conf->accounting->enabled) && $modecompta != 'BOOKKEEPING')
{
print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
}
-
-$name = array();
-
// Show Array
$catotal = 0;
+$catotal_ht = 0;
+$name = array();
+$amount = array();
+$amount_ht = array();
if ($modecompta == 'CREANCES-DETTES') {
$sql = "SELECT DISTINCT s.rowid as socid, s.nom as name, s.zip, s.town, s.fk_pays,";
$sql .= " sum(f.total_ht) as amount, sum(f.total_ttc) as amount_ttc";
From 35f30522806764780431173c4fb1d1652ba3bd2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josep=20Llu=C3=ADs?=
Date: Mon, 6 Apr 2020 12:47:57 +0200
Subject: [PATCH 136/336] NEW add VAT ID in sepamandate document
add: VAT ID in sepamandate document
---
.../modules/bank/doc/pdf_sepamandate.modules.php | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php b/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
index 3b627d79d86..3a01ecc8e02 100644
--- a/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
+++ b/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
@@ -1,5 +1,6 @@
+ * Copyright (C) 2020 Josep Lluís Amador
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -282,8 +283,17 @@ class pdf_sepamandate extends ModeleBankAccountDoc
$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $outputlangs->transnoentitiesnoconv("SEPAFormYourName").' * : ', 0, 'L');
$pdf->SetXY(80, $posY);
$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $sepaname, 0, 'L');
+
+ $sepavatid = '__________________________________________________';
+ if (! empty($thirdparty->idprof1)) $sepavatid = $thirdparty->idprof1;
+ $posY=$pdf->GetY();
+ $posY+=1;
+ $pdf->SetXY($this->marge_gauche, $posY);
+ $pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $outputlangs->transnoentitiesnoconv('ProfId1'.$thirdparty->country_code).' * : ', 0, 'L');
+ $pdf->SetXY(80, $posY);
+ $pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $sepavatid, 0, 'L');
- $address = '______________________________________________';
+ $address = '______________________________________________';
if ($thirdparty->id > 0)
{
$address = $thirdparty->getFullAddress();
From 3b9267fd8a16193d366c1768d1051d2e670cea86 Mon Sep 17 00:00:00 2001
From: stickler-ci
Date: Mon, 6 Apr 2020 10:51:06 +0000
Subject: [PATCH 137/336] Fixing style errors.
---
htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php b/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
index 3a01ecc8e02..9bdbf997ead 100644
--- a/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
+++ b/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
@@ -283,7 +283,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $outputlangs->transnoentitiesnoconv("SEPAFormYourName").' * : ', 0, 'L');
$pdf->SetXY(80, $posY);
$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $sepaname, 0, 'L');
-
+
$sepavatid = '__________________________________________________';
if (! empty($thirdparty->idprof1)) $sepavatid = $thirdparty->idprof1;
$posY=$pdf->GetY();
From 721371a08cd50c0ca131c3fd2422fc9ed2c55076 Mon Sep 17 00:00:00 2001
From: ATM john
Date: Mon, 6 Apr 2020 13:08:03 +0200
Subject: [PATCH 138/336] Fix warehouse list
---
htdocs/product/stock/class/entrepot.class.php | 6 +-
htdocs/product/stock/list.php | 188 +++++++++++++-----
2 files changed, 144 insertions(+), 50 deletions(-)
diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index ab3dfde9bf0..6499cc0ce9d 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -108,12 +108,12 @@ class Entrepot extends CommonObject
'entity' =>array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'notnull'=>1, 'position'=>30),
'description' =>array('type'=>'text', 'label'=>'Description', 'enabled'=>1, 'visible'=>-2, 'position'=>35),
'lieu' =>array('type'=>'varchar(64)', 'label'=>'LocationSummary', 'enabled'=>1, 'visible'=>-2, 'position'=>40, 'showoncombobox'=>1),
- 'fk_parent' =>array('type'=>'integer', 'label'=>'ParentWarehouse', 'enabled'=>1, 'visible'=>-2, 'position'=>41),
+ 'fk_parent' =>array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php:1:statut=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'ParentWarehouse', 'enabled'=>1, 'visible'=>-2, 'position'=>41),
'address' =>array('type'=>'varchar(255)', 'label'=>'Address', 'enabled'=>1, 'visible'=>-2, 'position'=>45),
'zip' =>array('type'=>'varchar(10)', 'label'=>'Zip', 'enabled'=>1, 'visible'=>-2, 'position'=>50),
'town' =>array('type'=>'varchar(50)', 'label'=>'Town', 'enabled'=>1, 'visible'=>-2, 'position'=>55),
- 'fk_departement' =>array('type'=>'integer', 'label'=>'State', 'enabled'=>1, 'visible'=>0, 'position'=>60),
- 'fk_pays' =>array('type'=>'integer', 'label'=>'Country', 'enabled'=>1, 'visible'=>-2, 'position'=>65),
+ 'fk_departement' =>array('type'=>'sellist:c_departements:label:rowid::active=1', 'label'=>'State', 'enabled'=>1, 'visible'=>0, 'position'=>60),
+ 'fk_pays' =>array('type'=>'sellist:c_country:label:rowid::active=1', 'label'=>'Country', 'enabled'=>1, 'visible'=>-2, 'position'=>65),
//'fk_user_author' =>array('type'=>'integer', 'label'=>'Fk user author', 'enabled'=>1, 'visible'=>-2, 'position'=>82),
'datec' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-2, 'position'=>500),
'tms' =>array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>501),
diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index 22f86df95a8..91a335758c6 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -89,12 +89,12 @@ $fieldstosearchall = array(
$arrayfields = array(
'stockqty'=>array('type'=>'float', 'label'=>'PhysicalStock', 'enabled'=>1, 'visible'=>-2, 'position'=>70),
'estimatedvalue'=>array('type'=>'float', 'label'=>'EstimatedStockValue', 'enabled'=>1, 'visible'=>-2, 'position'=>71),
- 'sellvalue'=>array('type'=>'float', 'label'=>'EstimatedStockValueSell', 'enabled'=>1, 'visible'=>-2, 'position'=>72),
+ 'estimatedstockvaluesell'=>array('type'=>'float', 'label'=>'EstimatedStockValueSell', 'enabled'=>1, 'visible'=>-2, 'position'=>72),
);
foreach ($object->fields as $key => $val)
{
// If $val['visible']==0, then we never show the field
- if (!empty($val['visible'])) $arrayfields['t.'.$key] = array('label'=>$val['label'], 'checked'=>(($val['visible'] < 0) ? 0 : 1), 'enabled'=>($val['enabled'] && ($val['visible'] != 3)), 'position'=>$val['position']);
+ if (!empty($val['visible'])) $arrayfields['e.'.$key] = array('label'=>$val['label'], 'checked'=>(($val['visible'] < 0) ? 0 : 1), 'enabled'=>($val['enabled'] && ($val['visible'] != 3)), 'position'=>$val['position']);
}
// Extra fields
if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
@@ -158,6 +158,7 @@ if (empty($reshook))
$form = new Form($db);
$warehouse = new Entrepot($db);
+$totalarray = array();
$now = dol_now();
$help_url = 'EN:Module_Stocks_En|FR:Module_Stock|ES:Módulo_Stocks';
@@ -168,10 +169,12 @@ $title = $langs->trans("ListOfWarehouses");
// --------------------------------------------------------------------
$sql = "SELECT e.rowid, e.ref, e.statut, e.lieu, e.address, e.zip, e.town, e.fk_pays, e.fk_parent,";
$sql .= " SUM(p.pmp * ps.reel) as estimatedvalue, SUM(p.price * ps.reel) as sellvalue, SUM(ps.reel) as stockqty";
+$sqlGroupBy = '';
// Add fields from extrafields
if (!empty($extrafields->attributes[$object->table_element]['label'])) {
foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
+ $sqlGroupBy .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key : '');
}
}
// Add fields from hooks
@@ -183,6 +186,8 @@ $sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as e";
if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (e.rowid = ef.fk_object)";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as ps ON e.rowid = ps.fk_entrepot";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON ps.fk_product = p.rowid";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as c_dep ON c_dep.rowid = e.fk_departement";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as ccount ON ccount.rowid = e.fk_pays";
$sql .= " WHERE e.entity IN (".getEntity('stock').")";
if ($search_ref) $sql .= natural_search("e.ref", $search_ref); // ref
if ($search_label) $sql .= natural_search("e.lieu", $search_label); // label
@@ -194,7 +199,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
$parameters = array();
$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object); // Note that $action and $object may have been modified by hook
$sql .= $hookmanager->resPrint;
-$sql .= " GROUP BY e.rowid, e.ref, e.statut, e.lieu, e.address, e.zip, e.town, e.fk_pays, e.fk_parent";
+$sql .= " GROUP BY e.rowid, e.ref, e.statut, e.lieu, e.address, e.zip, e.town, e.fk_pays, e.fk_parent".$sqlGroupBy;
$totalnboflines = 0;
$result = $db->query($sql);
if ($result)
@@ -210,6 +215,9 @@ if ($result)
$totalStock += $objp->stockqty;
$line++;
}
+ $totalarray['val']['stockqty'] = $totalStock;
+ $totalarray['val']['estimatedvalue'] = $total;
+ $totalarray['val']['estimatedstockvaluesell'] = $totalsell;
}
$sql .= $db->order($sortfield, $sortorder);
@@ -337,17 +345,37 @@ print '';
-print '
\n";
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index 9ea058de919..d9cf40f4b68 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -2286,31 +2286,31 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
print '
'.$mailfile->error.'
';
From 47987f239d02c5b37ae0c0348f502f5fc10ae496 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur
'.$profilName.'
';
- if ($user->datepreviouslogin) {
- $btnUser .= ' '.dol_print_date($user->datepreviouslogin, "dayhour", 'tzuser').'
';
- }
- $btnUser .= ' '.$langs->trans("Version").' '.$appli.'
+ if ($user->datepreviouslogin) {
+ $btnUser .= ' '.dol_print_date($user->datepreviouslogin, "dayhour", 'tzuser').'
';
+ }
+ $btnUser .= ' '.$langs->trans("Version").' '.$appli.'
'.$form->selectDate(-1, '', 0, 0, 2, "addtime", 1, 0).' '; -$nav .= ' '; +//$nav .= " (".$langs->trans("Today").")"; +$nav .= ' '.$form->selectDate(-1, '', 0, 0, 2, "addtime", 1, 1).' '; +//$nav .= ' '; +$nav .= ' '; $picto = 'calendarweek'; @@ -484,6 +486,7 @@ print ''; dol_fiche_end(); + print '
'.$nav.'
'; // We move this before the assign to components so, the default submit button is not the assign to.
print '';
@@ -497,7 +500,7 @@ print $formcompany->selectTypeContact($object, '', 'type', 'internal', 'rowid',
print '';
print '
';
-print '';
+print '';
$moreforfilter = '';
diff --git a/htdocs/projet/activity/permonth.php b/htdocs/projet/activity/permonth.php
index da0459f9521..3b90d49b48b 100644
--- a/htdocs/projet/activity/permonth.php
+++ b/htdocs/projet/activity/permonth.php
@@ -368,9 +368,10 @@ $param.=($search_task_label?'&search_task_label='.$search_task_label:'');
$nav =''.img_previous($langs->trans("Previous"))."\n";
$nav.=" ".dol_print_date(dol_mktime(0, 0, 0, $month, 1, $year), "%Y").", ".$langs->trans(date('F', mktime(0, 0, 0, $month, 10)))." \n";
$nav.=''.img_next($langs->trans("Next"))."\n";
-$nav.=" (".$langs->trans("Today").")";
-$nav.=''.$form->select_date(-1, '', 0, 0, 2, "addtime", 1, 0, 1).' '; -$nav.=' '; +//$nav.=" (".$langs->trans("Today").")"; +$nav.=' '.$form->selectDate(-1, '', 0, 0, 2, "addtime", 1, 1).' '; +//$nav.=' '; +$nav .= ' '; $picto='calendarweek'; @@ -408,7 +409,7 @@ print ''; dol_fiche_end(); -print '
'.$nav.'
'; // We move this before the assign to components so, the default submit button is not the assign to.
+print ''.$nav.'
'; // We move this before the assign to components so, the default submit button is not the assign to.
print '';
$titleassigntask = $langs->transnoentities("AssignTaskToMe");
@@ -421,7 +422,7 @@ print $formcompany->selectTypeContact($object, '', 'type', 'internal', 'rowid',
print '';
print '
';
-print '';
+print '';
$moreforfilter='';
diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php
index 3bb024b29f3..81560c44777 100644
--- a/htdocs/projet/activity/perweek.php
+++ b/htdocs/projet/activity/perweek.php
@@ -459,9 +459,10 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
$nav = ''.img_previous($langs->trans("Previous"))."\n";
$nav .= " ".dol_print_date(dol_mktime(0, 0, 0, $first_month, $first_day, $first_year), "%Y").", ".$langs->trans("WeekShort")." ".$week." \n";
$nav .= ''.img_next($langs->trans("Next"))."\n";
-$nav .= " (".$langs->trans("Today").")";
-$nav .= ''.$form->selectDate(-1, '', 0, 0, 2, "addtime", 1, 0).' '; -$nav .= ' '; +//$nav .= " (".$langs->trans("Today").")"; +$nav .= ' '.$form->selectDate(-1, '', 0, 0, 2, "addtime", 1, 1).' '; +//$nav .= ' '; +$nav .= ' '; $picto = 'calendarweek'; @@ -514,7 +515,7 @@ print $formcompany->selectTypeContact($object, '', 'type', 'internal', 'rowid', print ''; print ''; -print ''; +print ''; $startday = dol_mktime(12, 0, 0, $startdayarray['first_month'], $startdayarray['first_day'], $startdayarray['first_year']); From 48da8c315f8935040f1bbaf850a0a9ff65a02744 Mon Sep 17 00:00:00 2001 From: florian HENRY
| '; -print ''; -print ' | '; +foreach ($object->fields as $key => $val) +{ + if($key == 'statut'){ continue; } + $cssforfield = (empty($val['css']) ? '' : $val['css']); + if ($key == 'status') $cssforfield .= ($cssforfield ? ' ' : '').'center'; + elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'center'; + elseif (in_array($val['type'], array('timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'nowrap'; + elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') $cssforfield .= ($cssforfield ? ' ' : '').'right'; + if (!empty($arrayfields['e.'.$key]['checked'])) + { + print ''; + if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75'); + elseif (strpos($val['type'], 'integer:') === 0 || strpos($val['type'], 'sellist:') === 0) { + print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1); + } + elseif (! preg_match('/^(date|timestamp)/', $val['type'])) print ''; + print ' | '; + } +} -print ''; -print ''; -print ' | '; +if (!empty($arrayfields["stockqty"]['checked'])) { + print ''; +} -print ' | '; -print ' | '; -print ' | '; +if (!empty($arrayfields["estimatedvalue"]['checked'])) { + print ' | '; +} + +if (!empty($arrayfields["estimatedstockvaluesell"]['checked'])) { + print ' | '; +} // Extra fields include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php'; @@ -357,9 +385,11 @@ $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $obje print $hookmanager->resPrint; // Status -print ' | '; -print $form->selectarray('search_status', $warehouse->statuts, $search_status, 1, 0, 0, '', 1); -print ' | '; +if (!empty($arrayfields["e.statut"]['checked'])) { + print ''; + print $form->selectarray('search_status', $warehouse->statuts, $search_status, 1, 0, 0, '', 1); + print ' | '; +} // Action column print ''; @@ -371,18 +401,44 @@ print ''."\n"; // Fields title label // -------------------------------------------------------------------- print ' | |||||
| '.$warehouse->getNomUrl(1).' | '; - if (!$i) $totalarray['nbfield']++; - // Location - print ''.$obj->lieu.' | '; - if (!$i) $totalarray['nbfield']++; + + foreach ($warehouse->fields as $key => $val) + { + if($key == 'statut'){ continue; } + $cssforfield = (empty($val['css']) ? '' : $val['css']); + if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'center'; + elseif ($key == 'status') $cssforfield .= ($cssforfield ? ' ' : '').'center'; + + if (in_array($val['type'], array('timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'nowrap'; + elseif ($key == 'ref') $cssforfield .= ($cssforfield ? ' ' : '').'nowrap'; + + if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $key != 'status') $cssforfield .= ($cssforfield ? ' ' : '').'right'; + + if (!empty($arrayfields['e.'.$key]['checked'])) + { + print ''.price2num($obj->stockqty, 5).' | '; - if (!$i) $totalarray['nbfield']++; + if (!empty($arrayfields["stockqty"]['checked'])) { + print '' . price2num($obj->stockqty, 5) . ' | '; + if (!$i) $totalarray['nbfield']++; + if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'stockqty'; + } // PMP value - print ''; - if (price2num($obj->estimatedvalue, 'MT')) print price(price2num($obj->estimatedvalue, 'MT'), 1); - else print ''; - print ' | '; - if (!$i) $totalarray['nbfield']++; + if (!empty($arrayfields["estimatedvalue"]['checked'])) { + print ''; + if (price2num($obj->estimatedvalue, 'MT')) print price(price2num($obj->estimatedvalue, 'MT'), 1); + else print ''; + print ' | '; + if (!$i) $totalarray['nbfield']++; + if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'estimatedvalue'; + } // Selling value - print ''; - if (empty($conf->global->PRODUIT_MULTIPRICES)) print price(price2num($obj->sellvalue, 'MT'), 1); - else - { - $htmltext = $langs->trans("OptionMULTIPRICESIsOn"); - print $form->textwithtooltip($langs->trans("Variable"), $htmltext); + if (!empty($arrayfields["estimatedstockvaluesell"]['checked'])) { + print ' | '; + if (empty($conf->global->PRODUIT_MULTIPRICES)) print price(price2num($obj->sellvalue, 'MT'), 1); + else { + $htmltext = $langs->trans("OptionMULTIPRICESIsOn"); + print $form->textwithtooltip($langs->trans("Variable"), $htmltext); + } + print ' | '; + if (!$i) $totalarray['nbfield']++; + if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'estimatedstockvaluesell'; } - print ''; - if (!$i) $totalarray['nbfield']++; // Extra fields include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php'; @@ -446,8 +535,10 @@ if ($num) print $hookmanager->resPrint; // Status - print ''.$warehouse->LibStatut($obj->statut, 5).' | '; - if (!$i) $totalarray['nbfield']++; + if (!empty($arrayfields["e.statut"]['checked'])) { + print '' . $warehouse->LibStatut($obj->statut, 5) . ' | '; + if (!$i) $totalarray['nbfield']++; + } // Action column print ''; @@ -468,7 +559,10 @@ if ($num) if ($totalnboflines - $offset <= $limit) { - print ' | ||||||
| '.$langs->trans("Total").' | '; print ''.price2num($totalStock, 5).' | '; print ''.price(price2num($total, 'MT'), 1, $langs, 0, 0, -1, $conf->currency).' | '; @@ -482,7 +576,7 @@ if ($num) print ''; print ''; print ' | '; - print " | ||||||||||||
-
Date: Mon, 6 Apr 2020 15:34:28 +0200
Subject: [PATCH 141/336] Can use font awesome as picto of object and modules.
---
htdocs/admin/modulehelp.php | 2 +-
htdocs/core/lib/functions.lib.php | 10 ++++++----
htdocs/core/modules/modCashDesk.class.php | 2 +-
htdocs/core/modules/modTakePos.class.php | 2 +-
4 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/htdocs/admin/modulehelp.php b/htdocs/admin/modulehelp.php
index 1429888405c..5a52dc99e3a 100644
--- a/htdocs/admin/modulehelp.php
+++ b/htdocs/admin/modulehelp.php
@@ -325,7 +325,7 @@ if ($mode == 'desc')
if ($objMod->editor_name != 'dolibarr') $textexternal.='
'.$langs->trans("Publisher").': '.(empty($objMod->editor_name)?$langs->trans("Unknown"):$objMod->editor_name); $editor_url = $objMod->editor_url; if (! preg_match('/^http/', $editor_url)) $editor_url = 'http://'.$editor_url; - if (! empty($objMod->editor_url) && ! preg_match('/dolibarr\.org/i', $objMod->editor_url)) $textexternal.= ($objMod->editor_name != 'dolibarr' ? ' - ' : '').img_object('', 'globe').' '.$objMod->editor_url.''; + if (! empty($objMod->editor_url) && ! preg_match('/dolibarr\.org/i', $objMod->editor_url)) $textexternal.= ($objMod->editor_name != 'dolibarr' ? ' - ' : '').img_picto('', 'globe').' '.$objMod->editor_url.''; $text.=$textexternal; $text.='
'; } diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 751e3ebb0a6..45ddc03e98d 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -3136,6 +3136,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $ 'filter', 'file-code', 'grip', 'grip_title', 'language', 'list', 'listlight', 'note', 'object_phoning', 'object_phoning_fax', 'object_email', 'object_bookmark', 'object_list', 'object_calendar', 'object_calendarweek', 'object_calendarmonth', 'object_calendarday', 'object_calendarperuser', + 'object_cash-register', 'off', 'on', 'play', 'playdisabled', 'printer', 'resize', 'stats', 'note', 'setup', 'sign-out', 'split', 'switch_off', 'switch_on', 'tools', 'unlink', 'uparrow', 'user', 'wrench', 'globe', 'jabber', 'skype', 'twitter', 'facebook', 'linkedin', 'instagram', 'snapchat', 'youtube', 'google-plus-g', 'whatsapp', @@ -3154,14 +3155,15 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $ if (in_array($pictowithouttext, array('skype', 'twitter', 'facebook', 'linkedin', 'instagram', 'snapchat', 'youtube', 'google-plus-g', 'whatsapp'))) { $fa = 'fab'; } + $pictowithouttext = str_replace('object_', '', $pictowithouttext); $arrayconvpictotofa = array( 'address'=> 'address-book', 'setup'=>'cog', 'companies'=>'building', 'products'=>'cube', 'commercial'=>'suitcase', 'invoicing'=>'coins', 'accountancy'=>'money-check-alt', 'hrm'=>'umbrella-beach', 'members'=>'users', 'ticket'=>'ticket-alt', 'generic'=>'folder-open', 'globe'=>'external-link-alt', - 'object_phoning'=>'phone', 'object_phoning_fax'=>'fax', 'object_email'=>'at', - 'switch_off'=>'toggle-off', 'switch_on'=>'toggle-on', 'check'=>'check', 'object_bookmark'=>'star', 'bookmark'=>'star', 'stats' => 'chart-bar', + 'phoning'=>'phone', 'phoning_fax'=>'fax', 'email'=>'at', + 'switch_off'=>'toggle-off', 'switch_on'=>'toggle-on', 'check'=>'check', 'bookmark'=>'star', 'bookmark'=>'star', 'stats' => 'chart-bar', 'bank'=>'university', 'close_title'=>'window-close', 'delete'=>'trash', 'edit'=>'pencil', 'filter'=>'filter', 'split'=>'code-branch', - 'object_list'=>'list-alt', 'object_calendar'=>'calendar-alt', 'object_calendarweek'=>'calendar-week', 'object_calendarmonth'=>'calendar-alt', 'object_calendarday'=>'calendar-day', 'object_calendarperuser'=>'table', + 'list'=>'list-alt', 'calendar'=>'calendar-alt', 'calendarweek'=>'calendar-week', 'calendarmonth'=>'calendar-alt', 'calendarday'=>'calendar-day', 'calendarperuser'=>'table', 'error'=>'exclamation-triangle', 'warning'=>'exclamation-triangle', 'title_setup'=>'tools', 'title_accountancy'=>'money-check-alt', 'title_bank'=>'university', 'title_hrm'=>'umbrella-beach', 'title_agenda'=>'calendar-alt', 'preview'=>'binoculars', 'project'=>'sitemap' @@ -3250,7 +3252,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $ $fakey = 'fa-comment-o'; } // Img for type of views - elseif (in_array($pictowithouttext, array('object_list', 'object_calendar', 'object_calendarweek', 'object_calendarmonth', 'object_calendarday', 'object_calendarperuser'))) { + elseif (in_array($pictowithouttext, array('list', 'calendar', 'calendarweek', 'calendarmonth', 'calendarday', 'calendarperuser'))) { $fakey = 'imgforviewmode fa-'.$arrayconvpictotofa[$pictowithouttext]; $marginleftonlyshort = 0; } diff --git a/htdocs/core/modules/modCashDesk.class.php b/htdocs/core/modules/modCashDesk.class.php index 9bff4afdaf8..b27a1ae30e4 100644 --- a/htdocs/core/modules/modCashDesk.class.php +++ b/htdocs/core/modules/modCashDesk.class.php @@ -55,7 +55,7 @@ class modCashDesk extends DolibarrModules $this->version = 'dolibarr'; $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name); - $this->picto = 'list'; + $this->picto = 'cash-register'; // Data directories to create when module is enabled $this->dirs = array(); diff --git a/htdocs/core/modules/modTakePos.class.php b/htdocs/core/modules/modTakePos.class.php index 8357cb42b2d..400ff6c9b7d 100644 --- a/htdocs/core/modules/modTakePos.class.php +++ b/htdocs/core/modules/modTakePos.class.php @@ -71,7 +71,7 @@ class modTakePos extends DolibarrModules // Name of image file used for this module. // If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue' // If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module' - $this->picto = 'list'; + $this->picto = 'cash-register'; // Defined all module parts (triggers, login, substitutions, menus, css, etc...) // for default path (eg: /takepos/core/xxxxx) (0=disable, 1=enable) From aec1c177e34109eecfa7b4e890248698ddbfee07 Mon Sep 17 00:00:00 2001 From: andreubisquerra
Date: Mon, 6 Apr 2020 16:07:05 +0200
Subject: [PATCH 142/336] Order printer with 'Receipt printers' module
---
htdocs/takepos/admin/terminal.php | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/htdocs/takepos/admin/terminal.php b/htdocs/takepos/admin/terminal.php
index fa62aff1bc3..c83f57173e5 100644
--- a/htdocs/takepos/admin/terminal.php
+++ b/htdocs/takepos/admin/terminal.php
@@ -229,23 +229,31 @@ if ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter") {
foreach ($printer->listprinters as $key => $value) {
$printers[$value['rowid']] = $value['name'];
}
- print ''.$langs->trans("TakeposTerminalPrinterToUse").' ';
+ print ''.$langs->trans("MainPrinterToUse").' ';
print '';
print $form->selectarray('TAKEPOS_PRINTER_TO_USE'.$terminal, $printers, (empty($conf->global->{'TAKEPOS_PRINTER_TO_USE'.$terminal}) ? '0' : $conf->global->{'TAKEPOS_PRINTER_TO_USE'.$terminal}), 1);
print ' '.$langs->trans("OrderPrinterToUse").' ';
+ print '';
+ print $form->selectarray('TAKEPOS_ORDER_PRINTER_TO_USE'.$terminal, $printers, (empty($conf->global->{'TAKEPOS_ORDER_PRINTER_TO_USE'.$terminal}) ? '0' : $conf->global->{'TAKEPOS_ORDER_PRINTER_TO_USE'.$terminal}), 1);
+ print ' '.$langs->trans("TakeposTerminalTemplateToUseForInvoicesTicket").' ';
+ print ''.$langs->trans("MainTemplateToUse").' ';
print '';
print $form->selectarray('TAKEPOS_TEMPLATE_TO_USE_FOR_INVOICES'.$terminal, $templates, (empty($conf->global->{'TAKEPOS_TEMPLATE_TO_USE_FOR_INVOICES'.$terminal}) ? '0' : $conf->global->{'TAKEPOS_TEMPLATE_TO_USE_FOR_INVOICES'.$terminal}), 1);
print ' '.$langs->trans("TakeposTerminalTemplateToUseForOrdersTicket").' ';
- print '';
- print $form->selectarray('TAKEPOS_TEMPLATE_TO_USE_FOR_ORDERS'.$terminal, $templates, (empty($conf->global->{'TAKEPOS_TEMPLATE_TO_USE_FOR_ORDERS'.$terminal}) ? '0' : $conf->global->{'TAKEPOS_TEMPLATE_TO_USE_FOR_ORDERS'.$terminal}), 1);
- print ' '.$langs->trans("OrderTemplateToUse").' ';
+ print '';
+ print $form->selectarray('TAKEPOS_TEMPLATE_TO_USE_FOR_ORDERS'.$terminal, $templates, (empty($conf->global->{'TAKEPOS_TEMPLATE_TO_USE_FOR_ORDERS'.$terminal}) ? '0' : $conf->global->{'TAKEPOS_TEMPLATE_TO_USE_FOR_ORDERS'.$terminal}), 1);
+ print ' '.$langs->trans('CashDeskReaderKeyCodeForEnter').' ';
From 079bfafa26f822a4c963b642b9517554726b20ae Mon Sep 17 00:00:00 2001
From: andreubisquerra
Date: Mon, 6 Apr 2020 16:14:01 +0200
Subject: [PATCH 143/336] Order printer langs
---
htdocs/langs/en_US/cashdesk.lang | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang
index f2bab886b64..85bdc978865 100644
--- a/htdocs/langs/en_US/cashdesk.lang
+++ b/htdocs/langs/en_US/cashdesk.lang
@@ -100,4 +100,8 @@ TakeposGroupSameProduct=Group same products lines
StartAParallelSale=Start a new parallel sale
ControlCashOpening=Control cash box at opening pos
CloseCashFence=Close cash fence
-CashReport=Cash report
\ No newline at end of file
+CashReport=Cash report
+MainPrinterToUse=Main printer to use
+OrderPrinterToUse=Order printer to use
+MainTemplateToUse=Main template to use
+OrderTemplateToUse=Order template to use
\ No newline at end of file
From 34e434a17e8751f6e76ab20d8f7a6053dbc48fc8 Mon Sep 17 00:00:00 2001
From: Regis Houssin
Date: Mon, 6 Apr 2020 16:36:11 +0200
Subject: [PATCH 144/336] FIX missing member entity
---
htdocs/societe/class/societe.class.php | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 87c4956e48e..5ea844a7320 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -3275,6 +3275,7 @@ class Societe extends CommonObject
$this->phone=$member->phone; // Prof phone
$this->email=$member->email;
$this->skype=$member->skype;
+ $this->entity=$member->entity;
$this->client = 1; // A member is a customer by default
$this->code_client = ($customercode?$customercode:-1);
@@ -3778,7 +3779,7 @@ class Societe extends CommonObject
$outstandingOpened+=$obj->total_ttc - $paiement - $creditnotes - $deposits;
}
-
+
//if credit note is converted but not used
if($mode == 'supplier' && $obj->type == FactureFournisseur::TYPE_CREDIT_NOTE && $tmpobject->isCreditNoteUsed())$outstandingOpened-=$tmpobject->getSumFromThisCreditNotesNotUsed();
From 665dc6f8d22e77d03e5467b938e4c674e0e61ad6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur
Date: Mon, 6 Apr 2020 18:16:21 +0200
Subject: [PATCH 145/336] More fontawesome logo
---
htdocs/core/lib/functions.lib.php | 8 +++++---
htdocs/paybox/img/object_paybox.png | Bin 1428 -> 11278 bytes
htdocs/paypal/img/object_paypal.png | Bin 4120 -> 6962 bytes
htdocs/stripe/img/index.html | 0
htdocs/stripe/img/object_stripe.png | Bin 819 -> 0 bytes
htdocs/theme/eldy/img/object_stripe.png | Bin 819 -> 12995 bytes
6 files changed, 5 insertions(+), 3 deletions(-)
delete mode 100644 htdocs/stripe/img/index.html
delete mode 100644 htdocs/stripe/img/object_stripe.png
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 45ddc03e98d..038f1e4f397 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3134,9 +3134,9 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
'1downarrow', '1uparrow', '1leftarrow', '1rightarrow', '1uparrow_selected', '1downarrow_selected', '1leftarrow_selected', '1rightarrow_selected',
'address', 'barcode', 'bank', 'bookmark', 'building', 'cash-register', 'check', 'close_title', 'cubes', 'delete', 'dolly', 'edit', 'ellipsis-h',
'filter', 'file-code', 'grip', 'grip_title', 'language', 'list', 'listlight', 'note',
- 'object_phoning', 'object_phoning_fax', 'object_email',
- 'object_bookmark', 'object_list', 'object_calendar', 'object_calendarweek', 'object_calendarmonth', 'object_calendarday', 'object_calendarperuser',
- 'object_cash-register',
+ 'object_barcode', 'object_phoning', 'object_phoning_fax', 'object_email',
+ 'object_bookmark', 'object_generic', 'object_list', 'object_calendar', 'object_calendarweek', 'object_calendarmonth', 'object_calendarday', 'object_calendarperuser',
+ 'object_cash-register', 'object_printer', 'object_technic',
'off', 'on', 'play', 'playdisabled', 'printer', 'resize', 'stats',
'note', 'setup', 'sign-out', 'split', 'switch_off', 'switch_on', 'tools', 'unlink', 'uparrow', 'user', 'wrench', 'globe',
'jabber', 'skype', 'twitter', 'facebook', 'linkedin', 'instagram', 'snapchat', 'youtube', 'google-plus-g', 'whatsapp',
@@ -3161,10 +3161,12 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
'address'=> 'address-book', 'setup'=>'cog', 'companies'=>'building', 'products'=>'cube', 'commercial'=>'suitcase', 'invoicing'=>'coins', 'accountancy'=>'money-check-alt',
'hrm'=>'umbrella-beach', 'members'=>'users', 'ticket'=>'ticket-alt', 'generic'=>'folder-open', 'globe'=>'external-link-alt',
'phoning'=>'phone', 'phoning_fax'=>'fax', 'email'=>'at',
+ 'generic'=>'file',
'switch_off'=>'toggle-off', 'switch_on'=>'toggle-on', 'check'=>'check', 'bookmark'=>'star', 'bookmark'=>'star', 'stats' => 'chart-bar',
'bank'=>'university', 'close_title'=>'window-close', 'delete'=>'trash', 'edit'=>'pencil', 'filter'=>'filter', 'split'=>'code-branch',
'list'=>'list-alt', 'calendar'=>'calendar-alt', 'calendarweek'=>'calendar-week', 'calendarmonth'=>'calendar-alt', 'calendarday'=>'calendar-day', 'calendarperuser'=>'table',
'error'=>'exclamation-triangle', 'warning'=>'exclamation-triangle',
+ 'printer'=>'print', 'technic'=>'cogs',
'title_setup'=>'tools', 'title_accountancy'=>'money-check-alt', 'title_bank'=>'university', 'title_hrm'=>'umbrella-beach', 'title_agenda'=>'calendar-alt',
'preview'=>'binoculars', 'project'=>'sitemap'
);
diff --git a/htdocs/paybox/img/object_paybox.png b/htdocs/paybox/img/object_paybox.png
index e8bd4253122ec53ac3876f083bf590a44481411c..523a21bb99ef8c96528f600e2ca1db0f3a8a6669 100644
GIT binary patch
literal 11278
zcmaJ{1y3AI*WG1t7MEhh-KE%rEmFM2t+>0p@8VG0-6>LvyDm;~X@M4(7I(Mh>-z`3
zOwQcoCX-CAoSEdF7`2b`*qG#)00016Q9)MYpN0Mp=&1kpK?$>oe+JcDSzZ?K`oC4w
zQ<3`5gW;;6?*RZ{5&jQAKu#X%KPQ@};)nNWyU3_`=rq9rpez7@2B0V_rRDqkB*-t#
zNIU(`rSNHlTr*uO5|a#r)(q@{M`4==m5Ly7wPl7-P@WqcE`7VTzcJW2bT&9yJpI|J
z_bAfb#2Hpn87)^1lmbi1Wg{^pmGNmYrdRvlL(!MpMy)^nq+jKK
zv)*&J_97badh2rLfy2vhogld(Gbt8I2AHJe2V{v@19&_p0j7VmfbdCP5H#BY6~I4Q
zIFZ$F_fPs
zQvJ}r&8@rrl35@d@)1y!`IV^KrTg}f`uVZSWbION#&j@f1||li%~{c5LoFM4>=Q=K
ztTBq5m^OkT)&+BbaOGX!;3byVXT-Pr#goJxTwE6!rb5^r{`O58Yw}K?|J&VSO(X
z6|Q%sqCD?3q-dD|NxZR2WLrd67s$4Qn&wc0!A0Caz$zZct%kNFM4mTFQ)ha(JjCst
zgy#c!4iJKcW5U}TuxE`JK5N^2gX<)Zr{GHk1SiGDu>sLPQV%Pt4dsVFbUAExniaYm
zgG!obSgo}j2y
zH1=DoIzNj{jq+)&GswL=?5XFd5XgKE=RK3Mj}g`9HvjyBWkRK
z_rg)$fuKVTetRshhsnUeyXmRrc0at~xTqSMvW*M}(pJB~{gak0LWu%0Fe(hLc2JtT
zLlwr7&s;AcG5V`qgAJwVV&-RHjG@lvTAe6p8;a(ekc7GK*!z?-j{}-byu!cOZJ`X{qhKBk
zbe#(=jlxe6t1_$yhBME$3U*UVAqGBwH4IyviMhmr@V$sVxLp8_tBr|$&1U?kfq`#s
z;}??%KcHs@l~k|0R;h3_#*$6B$-F=3VJ(E=*eM^VV?)zM2t=}>M@}r=HAuk(#p&q>GYT_XS(#Wz1WgVoghQ`W?P-35d{kWAO#-UXy;!`E38DP3)bKzrPl3CxVjI+pRM~DL
zgn>-M;EhbZj>BTF<{
z{El&Cx;VA`g*59RfRcJAl(AoiK^faT(u}5x%*NLU6;BI<$Im6{gMxVc`L!OA7U8)J
zRI63Yd-xUL+rE3``Qbf7bSgcEI}k^HCsK(ri=vR;t+x{o-{Q_2Pn0(c9}CSN!pWL7Qm)?N&s##de^xdH*0Fq$P#{G^#%Z)3^`<0TSky1Qx*lVcY|4rtS
zx&ncP%*JXaUzL?Cr#8n;Q-M?kXNviE8}v^eUia9LX?0p@8y1ZbgoIA5+0tFzx=!xJdT;BA?N>0NtpXCY0|YS4>rsv>#&uPk}dDIMxqrQ<+m3F}=n*+4Spqgl6k!
zxdj(gI0C&wrw3sVkSsvd?#3(!{1(G)bN;>Vaq=+XwhZ9WU>kIB;15$Fq@G!2VUNrt!3EY=
z7;%Vpbi2xx(qM{5X@F_F+n*18QO9Y1V3ZVn_o`yR*kTje8e`lkRs2B_x=jA5FoWp5
z@wnT8QqGe%?E8P60lWSDdrbucogtSj*E*Ks6&=*H$Y~k}DS`mDU3wlWE&!!?S2S8%
zVv*A{hb5+n<>&gfNKo?qX
zrlmOMNL9Uz(r=};xpkSkx9+JY0xw;;z4{%}W1!qNOebr?9s2-w4^85Z2TodhwjWTu
zuibc%q*TRJ_f5idl!?XIQW?od!mFWqOA$rID0Ml|$C^GcpZ}S^VglW4OJR5byCR(I
z2*%Jrk^#13KvCE-8Jj3TJ@m44J$*MVQ(CCrK||6kk}#36
zXA>IZbb8387)JHf;9ia_&8i8!SX+DqjzI`eXh4cp#M)6jQ^4dVGqM!5O;r6PD0`
zPjrW!>pRNITFPW$mepDk{ZmVeNamZmbjcS(SR@^>sz_0N4$fCK(Rw(#d`l`?_+{7!
zd|{^N+)28(qynRVnrI+wmB^`W`h-}pPqm=nnZU}{kG@Yn^!$zNlY)U&_3ahWK7H;O
zwURDm#O~|K>?mj{ZcjU1_mUw!WIp0;xFV`>dH@4l+z4-iMC#g`PDn6ex>(A$B}b9)
zgO=_`u;4g&@DS-cK|yX_Q|U@>J#eq38Hd_~lP>&I4+?d8yyqx=1R2NIN6(*76|7wF
zdsaC#HRm%K9tWH&lZ3VgbQu*0QM=6sBz6{EHREwmt5v)nI+9?elnSMS<5a(b>lMH
z^0m+)$1AS12IeF|ZH=LR{P%~yr2KP)HpfErU4-ym#cKPsnue6Mm{!-*<{KL+649-b
zx6oxtWOa5R0}XNMF}tD1EnWA+bwsra4{Q6T#?h%MNzM_0Ho}hV$VOTOOkE6wTH%a1Zh3;pnax`oSQ|E7nG?
zd}$@#^uS!rgj+ZhCZr>`x6FgNvonS)ku_f-(5T^6BaR%eas_BCcCE{+>HA#A670pOeCX{m7sadkQ&G@
z4lNVzdSBYvm2c&jpRgY;+&sZ&GJ@vwDUcWbvnBZK~b3A8@Xn+f}S2mDL|Sj#uH_H7||Pv?uJr)Nn>h-|#}1VWU6
z8pXfY;@xfDR6Cs{8Oy0klTo2!A0uI7+g*G{Z-Eq7WDN&Q8^yL2G~mg%v3Rk++$$S)
z95GjlcVMJ(55&^eK%ch>hVppTYEkcz5Yxt!9cDHT03MxR{i+gOcp|EAq>lBQLU}1I
z>%Zpp!}WA*wB+n6@LYzT%GeHcBas3+;~shVQgkqOg(p!fmWoD3)t9&
ztcC$EiK#(pV)_^H>zfnZz!V%(K!AMkAh&aXc8vzpYAg{{x}c#aZMeXlq)XX&C`F%6
z&5Gl&1D%<(ll*f4cWK;G&h(NJCmh?yX{%78kGu+ZzS)RNMY&iSG?R3|NUwzyq3yBa_E7b5-=$k;8^iGR7B|TM
z`A+i1_926to^%;$+|o>1KUu7Y2KuMfF(bp=!%y=mmW7||rz{KxYtW-Ks1F
zdeXrUEJ^J2EEGGxt88Ppovdn)Y@nbDmTG`Y|0hqxloS9eaBtZI`}z|d>Gx;2>(rpy
z)L?3td(yZy0rFF#xF
zK!^O@c8*8J=6vd&W&i>%>bwir;aa;T)}mg9nvUwIan;2$VLVvvuuy7-?vu%@nY&_N
z2-*P{fPZ=`x80~=n$tY5-H4X`?p9&|X>UZEV;7y5T{<2*p=%feUNkHa$CjPPTc?qf
z^yd6nO;GGj6LMICJwjVgaF2lFsH@D%)HiSx{q?*U_-toNv=XVr@`UN6kNf#=^Ugg=
zzFu1=ZUwjac?_vxZBgJ}$kn}zOXTbROObSL!jS;XFa+fxeP`@8QF@UmbngBtrgXk6
z;QL%%$(&1!i5?j?;H;7aX|v;v02+-t+Vt#L2~5bAh{RMH1IR)GlZIUk*pe9BS~plQ
zgvFU^Cf+6A#R>;+J=L3^=JHfrjTytME;n8Lo<~jOZ*bd=0*!o43zH7M71x))&Wb%(macs!Ec<~{L=2bg
zY_^hCk}M`NR#AeaOc-VwfUZ(W#b?UJLNM04IwummV9VhC;mr;u06^|0U?$&f5tO{m
z8@-J?AXCQ1=b+zHn%}Pv+q<*AScZ`Ngn~(l;F#hk%w|*SOFPRbF0^!KN#sT+)Q_GA
zqb3iw57W7{Xg*Lr5ePw&`WQF0{F7ZNo|C|jTfW`p-FS(u{X+On6oc#5zjmp65Ad}<
zA|CVAIzzDX{gz!fQm6m$-ceKZOcor8!X)(6b$nQNakruX&ME0&6;I1De
zBg#(%@_auLhwYF#uBY}dgyo1ill_M7p@t-Ei2a&k|Jw_!;Ce8av={AUG_7>}4Nu3G
zggg|i-0Xr0ploytx^hoByt^3*G8x47U9iJov>yvS{z`?m$AwBmFLIKqmt!ge6cOS{
zf=(Xtz2;NL5el^RsOXj)(+L-xG{?yJPn(V=ayddQnXn5tX)b2Baj}@DOznn$VNpH%
zZaS(!l``S$zvOd1S?jVxEFY4gYIxmi7Y6-mb^NreZ5VV+r6vKQ!Kz!4ce^2tWsXOp
zgLna0oDxp+akNG@!#8&%6s{z@BE1EGcjBvbfOb=YgnnWWSu*KOb&L>CStO+kO;VPx
zD29uvOyU{nDadq#XLf;VGqe0u>yZ%(CpJTAq%Rcj-GZlZnvgOR#`5B^MmZKSBE~_mwgN*1}kdZ0*2{R33J~e#(ob8v7ss$PNw;q0|!3BwE!wslhZ)lCNeNpq2iVS-*aoSmxu=FJ@>
zyo=u`!z@E-U>~>yZIvS87)n`sS{$CkdChs
zY-U&
z(B73UT`F)1eXVXSY+f^JY^s=;SfhrQ
zHhenA%!C6Bv#RG-6aEtSy8txyhk5FeV)xmuR82xj%+U!hL5OKne#BMZ^Yvu$fV?Y1b;
z8suyUjXy9m-ZRW`Yx03~8D+7=p~NJPm@Fd30cv6*E>O93DDycgp&KX@SwMlzqag2b
zGY!q}dV;Cegwg%+UDcAr-tPY1Baa_kspxH$*&ynBFW~z*HV$4Cwf9Qdo|v+W6byeX
z+ZK6}^NukUrgkl@Af-od0noDDx{uL?o*u3g6oUotm`U;3S;;OQlx?R>2C>aC%Ri*=`B~eSB!y;XPW9+YJWWj
zwonyFGMQKe2m!?+uI);l}STQ
zE2yC*lYm)zJ#~g<-;w)yfHeGJEzTGhACH4H6t&#iH3%)`1!38r#Uj9*N@OlKH9_fD
zyWw>eziYf_lYZ&%c(K5`2xQs<>gm2ro)x5;|C+Otujh$OJ0@M?N|j46U=~lGio`XO
zYcTS9@AjXf$`$G{I-8<1Btgz~x$Qb9{783-Tuhkuo*|kBZDGbZCo`;yxm7Nd&k#a4pg(us5oCs-et`*Eva0S}0`$}VX0|7sX%!<dABWXXRx6w+_BCixb(+^ac@D;^e9%-UJ=+5UDkvw@*npF4r54r74gNzx!Q^hhDVX
zGL2P9tBBT+Jvokp#SaO0$_Y$0pY_l$|!f0sI@vVNiANgd#Q@@lJKyo
zotb8p-ok5b*;r%G3V6E<&jG=q6z!@sS_G_g36^}wtaQNd&aCuWlpGm6N<(LZUy_f@
z6homovE8!ox00yJ=AT#%>A#|WGpZU=WfIF#s=`+ZL;tu+eB5rE`LYrr;E3SDjv+kN
zGE0bKj1x*S#EqOi=PGV4!6kDaRbPfidmse_1#sVz*lR;Vc{qAx*ikFAA1&$jT#7Cu
zSj}=)*)`pR%h2C*VgVgx08-GFnhBf<=KQ{{$&Gm@Aq!Iwa(3X9;#^90#7`WB{a10}
zGBr7U6iPKzO6EiY$OjB9eM${hU%Cz<9kBiE_AqN8+=!ZH1iMC-Qsu>%`4-@at?<~7
z)q_qi;x^yC}l@4
z{CVaZzEQT%M@v#Vd#N}+r5Z3>sfj8IP?o*OJ`_!V
z_{YW_y@WXYST@yF6;}0|*Y@A**Z8<01y#dVCs^HG_-?<3(IP)U1TC;n&vCBG>0+{))fJf`
z#wxLY)aE?mS@Px%7ttNZ!y&@_~!Zh;Q*d|_YGB^<_>A_`_j$1vOx
z;hTgWFJ(5|ErM7)Le{!S+H8C|co^DvT#&Icn03!fk_-(hYW5~LgNTVAS((U4b*ne(
zEy~;)LVNa|-;0(O+&aCtc~y)N{6qT@PoP_H{Nczj#L0g%KMR@9JXbQH=1qJWTkQ8m
zUzoeLRF?&ll#+K=FeO;=1EhT*B~Gr}{q}SHp7|BkOx1sl^rTe>p0|8b&Ajz4IkkmH
z*xE~fQfE&@egPSF>dMD^_#zyd$pNhsB*%7bA2H|kRF^5iL=AUYY?Z_G*aVnXs#g3l
zJdXSEbSLWp8Y4ZS6WE6J?Y~e&LsN1!#_hcCK6XNX*j|f@NLGB9v^piqXb)B3Q
zB-Wb#Vk)@XzNW|(l_V_O)NWDQr|wgid&SJK{zGX)meW|l?NtG7P)l0IP2(By@l?oj3qb?R+vpM5!^R-(O!p9T_wk8s!M3QE*{C`}hss?+4a>SHYVbt>A`Zf6$%+o0)hu+l0M6bqVNqRdX*u+yXcnJ#lm}`f(
z9hvCG{5C%~ppBF7ex&LFb-0%WBv1?p5A%EGz=dhU6}c4B2oO#YWLreq2rsp4*d5k*x$A1c#ps`-9GwE2f)9M%q*X|7g@p!p1a
zg_*Vue(1bUkZ6{>OJH(123wHbLTAcD_gY!A;&dSxg%btJjM+IxUxLN~pB{;cZ+Wa|
zh8jtK+4PHCCChMmlhe8~>AwPgLCkqZL#iwus72Y*vZ=5Zus_QD>^*Zu+MDwZf=vbc4fpUOL4q&(9
zf;d#Du1)}u^;59$zt|u#W3te-we(3Y{oS-JBvii0_J-2kWd8S~PFEk@G2P#Vdd4jO
zz=dr62h#CN`%5c~iPsmtx%(TTj$?@Y%FrQ`sMhJ3%_Tbp<4fyHz{{CxcR}V#(t&04H@_uDv
z@_t7bXvbb;Q`D%)bbm$(wC%XMXL?0(wcrw(z34YETD9A8CZ&qudq}hKkWk?Z~q7t6>MJ3=q_zO7ctbN;(aIR@uGvR
zqKuL}znz}P6`AIsH(Pd+U|{8G^76oH7NmiHDO2}^Kdy~YPJ~p2C7nVxUKzZ|z8q1^
zLHcjFJ!oU&myJxy0j;sAKf|EpVF59i5FnAoJHG)dHLUkgkfUpSsZ$cvUfS>k%Kx+^
zu4}$Mi}}<&-x-ivTS!jWm!R867{R}!J^^%feD(AEiSioi9v=_W>+;#jI63nkp8c=w
ztt|-UZ=seOPdLOCF&yXE6PaIBf)3-O9gt|2%|d6Oa8-%A6iNz6P47)x`_B-s(t54O
zj?>uA3t>s3_5n*j?m1?!c(2qXmv1NAQ+avVK|=2B1Ilx`iO~rO#$ej44u(-V_c5Am
zAOcE*(-NQyNcp%_Z$vXtD`ILeXEa6qm%q~me#s1~6IC0}0XQya6!$JDj4aJQIXqgvtA8th8n?SM%D14vK|C&5>
z4F5rs^7}I^wy$952a;i`OAPAUgd-*R#{jy^XMO{+oOHBy3FSk4YwV
zY8)juv4>|SEo)xG`BTH4DQUaYFT{~Th4qst;3IA^C#Iq-Hmha$#=*#I=L~C^>N2th
zvu|TA`Iiqz+i4`+ACm(JO*f&mzc2TFU!rDjM*5iT&;B!w*?}&85IM?X->`;`>MhV>Oa-Zv8$tWp-ovO07p9s=|*kOw!((s$x-+jKN|i`C$)4b@_-38Q^%Xpzx((
zsqo?Mx(8Ru|7_S~aG)T)QcJ`i@Nu<`9cItjZ;8Q&6z1-Q8pZ#k%<5k7<||s*SKc2u
zWh6;S0Z0GpdUw4uy^B!f6}h$$gzD$l-1m1-&vj?kOFZOBe7sidq-e@XTtV3ee_HaC
z{J+t_IL8XprSz#WuNEVelaJBB8Z~`#rfSTxwOWn{ZDhQ`ea{k5WN0po!q5e7F5qe
zp>Y|YcG1Fc)-nnv(oZq(+$4x%q!qKbC}?dzg-JT`M#*_0%2q|Q?TmVZHOf+K>mLf+G9G_CiY`n3J3n!1Y!D!J^QVn?_>MAo$FhQ
zV_xkw`vuol%zA;mZ`jZQKNV}ACi;cj|3fNrGG8ie{h-`9tjxC=FxGe2V;gc4wK-)J
zEK7!nMuIvte_jgA;xfK66Knos^PGw%5y9NLMlnsLX#VctK
zN6I^I8VChrJ}HHb#f~V$F=da4jt_+~!wRA{`cBA@ta6Pl&JTs$Zu%?c9&V$Gs?&PK
zyW(H0C-|&sd=3R{Lrx@RuBSu3lOh<=0C)Ebx7g1wT@ne*KC6l5fw3@WzhQPGT!tccN(x}or65tey)k%9~rN4*uF
zZj+50F{auEy9m!WdKjxoA
zNcQyJD?GFRA_Wy7M!Z
z6(kk`YLR{st|tt9m57}j*fAlA4ABSDkWm%9^#wR2^pbw|UsPGqtJaEqJ;zr0@p+X@
zcOh9h)8?PBl@d;CP1O$uSSS4da@Wy|SK#A#E2y;dI_IBq7ohn5qin6TY3Tm}{>(2b
literal 1428
zcmd^8`%}_+6#XbZ5w#gjN5?J9G!-A9F20gY7F;PI6d&u@YA6q>#3DrVg=uYCnXk#h
z#Uyd^nJwv-k4%%*TD98IZOf#=%ruj<%*-tK?$^I#&&;{!&bf1bxp!^}o%WMC(jEx_
zFsFo*qF}YyqzMA9uGKGI!Qw3>|1A7bz-9`0>3noFFO3b-*a9y!4u|F}h~UNtiw#8M
z{DZK8L0Eq@28+XD6K2wmz)@o%g-SM_)Zb!dV!b^{HVa#(N5kWf1Au(LNj+kl-(}b|
z;D%B|0Z^2gePbE|fB^J}XtI$dFtoL`LxOD%hFcum5stuYmyeGrK<@_rPQWKvAMNiH
zfO9n66^aN>w8q7o1f}gFBnIra3yHGz4RsHp`|V~q+mWc-_b|3G5&$txkCyyh7{_Yg
zQ46++K;aUt!9HscElX^FNZnr}D)EMQUv`Se394nH%Qoh9Jp2w5lc4`pX&oJbX93gw=U_+k@lSXd
zRko8l$K_eBn=0S$Ax$-vON`E>fe&?WcD4_N)yiAFa4R}{7X%`2mErVfg%KdGFG4dhK
z&0+R<0sdKOkmiEN{FQ)@r5LEnYwT2%`fT*v8R}wDSV8HPGHG#HMQ!cny7SHFB<*L;
zHZ)$AH%gkX)iuc*71ixs7iFETO}FnT`V`Fr4Nc156@#+wv5|om=}>3=L{EqE@BW#w
z+mBR_N1jZ*c<}h?#LKB^wQ6SO#oX)35EnatuN}JcOOgrc$4bpvpw5yPIZGB_o3+!(|kak0-`>NCG;E#Z@RfJ)~q7z2Z81Vf63-D|b
zbqwCbIE54%o%K9r-OS)KWVF{vmxpBGfTFK~b?C^ohA!LU-YW7AS7#?oAfdeU0|>{H
z@Lry7Aqm6wJ4ZcNKBp3H$Z{cd|MM}F_#MaoxK`V{xST}p>uy1bJ+HOb3}$Q6<%2!9
z9==71ugB7)9yXsYb#yjov=Wp_Ra^JjOp&0N)}^U`t}5R@6+FCSisOsTNBu?o$mDg5
zJzjj0p-j47v-C%d1|<$TMQoJx>Yg;UeNPWG6b_p*E#`~+M?N7l<_Gw9^UCkdds|NM
Z&{iP!ODdyI-@$0}-V`#8)J{BD_#e8M9WVd@
diff --git a/htdocs/paypal/img/object_paypal.png b/htdocs/paypal/img/object_paypal.png
index 74ac4392ded01a9a13c00027dcef80a6142c39ba..872a0356ac54b06e24b2749ec23b92f497402b2b 100644
GIT binary patch
literal 6962
zcma)BX&{te)W0)hhODU=TS!UC&L9fe3S~=W8>U1d*=3)RgeZHqY#~dsi!5VGBoszj
z!%&vVHp(*Ad7u98r}x|Ye7W~I=bq=Bd+s^Ed+&LoO^q*dunMpO05}XT>6!xogSs%l
zf`S@buVN>tVY+kS$^`(b;@Ea?BB6IthfC&H00=w@0O1h;+YpH`4}h;60KahnsHFjb
z_IS}~b`D~oZW&$Fg<9y@(rLm&4YQBI6+PxD6gL+yYnW>DX#fOH80cQG@E=_oca1-K
zCuDAQWgz5h`cCX^SD#cVXZ_z*;y=d{sE1#U;FfL{_aO-r8u{cEIj(FyMEOXKP
zLgqA6rf8kFE}uIBF4)>0nsyY$+1P2P$2`0I&?;75nSOFhL9u9O1bwlz
zQ#(Jse{FzKl(Ua7wUxY)zKo9Lh7PEJlGHEpQa_}SE1jax&h|uBBndQ%opZ81kaVzA#2Tm}L
z$v%uf%ZBn@UT8=qSXOD%|z%=AFyj)bCV8dNolo7pH0j@`NllWbML
zA#XA=!-^eEkt&q(sM(An7yD+)qSOV);QCh#Lj%Y0ymWAHT
z5%j+WBcUxm#{$@13Cg`IZ{ckFNs9N8mbB~zD!y^!>y;4ez#Ipu64A1iVzUqy8bi#Jxzr%ojR9bl_t=XPq(Hhjj0%*
ztFB*QA`utj2+v@q?WG72Y%4PmV(u_Tui4G@c2=yN0`i*QOX
zkKHgtR|ynyfl9@jwvnt_u`_STdS&`7D$k7J<{DenUya9osbbe9AA!EJpi5#*ZX@1@
z`wWjZm{-7cskkT0;0m=_z!Kbo_|9!Mqds+dLQ*fm$bfUAigQ>D8)-h5R^@5&WYVz&
z0bJkacN0!CbV(eLhT1-b0bwxn+Wel9^#Q&$
zLE2e=CLbQrnTjui)y9ocGs()J(wQUexr|PUI6Fv%tbaj95yTtW`I5?YO4x?Qu_P};
zL9liM_J{biQ1Z(TPk6Tw7~Q`?{2Q7Pn2ykz1E(gbf&`sLp0q#XxjwM&(~jVUU9edu
z=z1_QX+MGX*BBgL*OIeQIwM|~48z5auqEF=;B@Wm^+v)>vI3}tzExN$3aRPh2cwAG
zt|=rH{`~47=;I=kvJ+(?h6^;4>t0LTh_{I~!0mZr;osrfNbw|@Pi!be2Z^e=!w|mN
zldhSM-`kvKex@O@w^{Roj06cs5q^fLW(88%Tors`*=DuRX>mv6JGzhLYg^(bFu-Mmtx^Y9^{LTO5BPs9Ohn>5r=ms{}6+iRJ$d
z?nlJSydY=Vr+o=5u!{3p)dQDpCCWJteSaJ^?Wn@oB38{>QC%&K`4OUYd7x}$^#X6#
z$nMLTDML0w-`qcOvXpx$GHRhMZN9m_|L`Y~ZNjF#OE({QuL28XE1FlaPN}#zm=Dc!
zV%Om1DDZT6)Ufe{=eI~gxu>`x4}cJYqtnk|XzIDRO|U^DOC76~dv=+MiEOEvYwV$+
z$oFaHOj@5&a7UZ>j0oPL4^F2CUy&V)V{kRXF|wN7yKIxk$BE8Z1@)o$a_6(+Y(PeW
z=18i(XV%D6r>|@jy|IEB-tZnP`28KwqTVvP
zWk;KR>ljJSl_Dlib0>9wr>Ii(SVQ^c+~CRfwT@%$m!}&9=pvsN@37fZ8;`&$Hz`L^
zM-jQZck4H7Uq$+*`um@2DQv{uST_CB~naw@bg)e&?fK!-7@QvjnZ%3C>;ZQ_$$3)UL8*5Dz;DCYU@>NGU+}DrYaD{BEYCS_E}N?
zteeaynn-1bkcTf#fk_KF3+^7yEt_spEVpCyMiFv60zBOJ=A~C6pct%CW6mv$t@5mH
zjas>?IqM>CR)L`O&k2v|&YuTXkH0&T3{PkLc#&ZwBYi8S)YW+N@eG~=d8C!MX?`;j
zWi-Z^;aS07Gb?hj^skFS>lRoHMxg`<2C6$62NHgXulA`MW9521tEghlRFzl
z-xl;HG>6`)7O%h#?n`NL5dO#~Jms>zx<;wp`@CqoJpOb7rA2OT%UuAcxZ0bF0-bJQ
z`;ET2%g670$b(pq_<^6%&{QI1TUTetkgcre#IRa}NHYhaNA3zfx&TKVXbpbprao|Y
zfVU*OVt3h64rWCh3Cmt1pKs}#cjhtIvbV}3IFV}3`7ehe$G9Dzk|
zz@&*19q&L>G0Cz_Ym!Em?%9voK_n
z;m}mF4C1=5=RH>yp^YiK&mr#YA~L_vEuQcw@!>J9FinM>c{-XhwARzOp6JF<^jZm_
zDS;0nu;Ok)N;nh>u3v`e9)H8bcfJn+me#!rh^)QWG32O(3Vvtem7}uU9g+1K{u(#~
zy37RTI}`&sukz>iN9SF^JRcD6QbJXaP7UoSA9T}LK?I_~fXZ&-F$gZNBS_wLgVH7Z
zNBgebu6xPvXX<&8?i?ngEf$CZLrHyZW$a*xwqz
z^hQ4PtIpPi3Fb9lNpYVTtUn-$dbv+0K-x{>f7PE*}j&7T~}W(tyA2@m7}yfvAjEKIK%
z+Z9QKV4VIZa)%)PkmCH(#nzhhqf0_xL$-_E(V@stzt&&+V~kKaoi^v68!9%6%FAQ8
zoWd6#o~Dy<(cO(!6hT!{H5qfCak^()dt<%3d&pMkTYW2mQUtTXqApu7J~OVSaU?kg
z{K;A6K{KyIkh=o^_J;H;t-osD75^@Kw{Hc;vcrLUHFDoFEwQ}qw5#v&gU6iq3jgVI
z(ErrD^`+v&fTggvC(eCeq0I64V_zu$TRM&`!A{xLy4|S=9gDlzF?o#Gy(QrgnDZHF>`RczgsdHNG*>B&@v$-YkwEFF4
z@4751b4QA#*vvvG2si;3q^l7c+0%@i{7<|QA!1@SE=SV7X^#C^{d)6`{j(Mp&^Z`B
zB8H7Hf(9M$7*>7v^2ScWP`i_dTy3TZMI)7Y^91Or)vRmCGhyte8!4~-eq$5$c8O)R
zBXS?)?$~CNQZtRA;5y^<_;HQ(UyO4zqg24mVs^P@CYZ<7+n(vyJtC79%^UczYjOU5
zTDDQ@Ixvc1b`U`1X{`5dL@#G8k1{AGP=+!?M>m;lXQgU?#x>{Q_4mW<95<#qG=JI+
zNzlZhv|=iNRk}dafS|?UC*nq?mL?6`nZ!q=Y@e9^cbhp*Ql_feRx7tTjUp<|`#Zk0
z(7RmS&eh4jx_)M?cD(t=*!fXwkB~#F0QiC9WW9!hZh~|#J7;14+U4s_(}oVp_tvH!
zoL+L!d+{-{^)9qr*VgrUSAJx5?8vC}f5mcpzHzD8G74a&M~WH$(gAnTxQMi=1f|ic
z?v9|1(Yrg2^6QNgYnqGM_lwrexh4J_18@OU2^j7|odbHo-+x}m-IS%_w
zh6wMM6(5d9X?f`g2CAV%g*u=;Nh;&Vy)U!Ux;Age?zVME;yau8>}xoS7}-Wj;BxOr
zUO|5_Ja7hv{Fv6Ggpz}{=y$gf{o;bLBXZFrmHlaXQ&A+epXcIn3AHyLLgik(mo@T^zfd$2QCAS$yg4UIpZr+X)iM`z(C)19Du5(R{$iRQq?Pt<=Fl%D|29?Ny{5V!+(fh#X5Pkm#h2dR6$<
zK6YOLx0>D3vh6x)`iZY)>-$zPXVSQY=dJf#9!~7TG7myG?>&FtdC9tU>+L1?&^jiz
zUE|I9D`Hr^TQJ<`LvY5+do{v!g4X;`!*YYvzGVcnCh;gNGlD;crlAh+3W3LwWdFdE
z^YK?*$%y^@Zv!H?cPQZuaChT!p>Bf4-gonTp+%iUCuz42E|p>@f32#jw_
zLcG%23P4)~fwOA0Lug6QjE@_4k37>nBYp^c_FXa)oqwvu$Jfax)CWxG{suVE4^zdo
zenZ#G6p{o?UM=HRY$&jp3*`16Tg{i2<&BPafitzTs~-Njy=s!x+tidbc%v{zRR=*z
ziH(uO5=mZ$w_zV6YyL(mY{~pohCB(cujBYDPgTc8obR%driM}mU#4!@#b_f)miqJVs6*xN-)GG5Ln*(J7
z23kC;OfMIkzj@+MifnbWjgPvZKcM8Y6OJvtj$}^q(2g
z`&+Lsx+j+xnMOdRhS`1=-Zo(-i`Rwh91-Vx&I76mXgDMP6&035D
zjDs{l3n&XH2%5{&qkic6CyZw&$T0ox67yiCE7Mr|kVI54lJ3MmN7?xp0D6?h5;$58
z;Mim1u5Doy^BGE^t8m7Zz(LIzl2H*O0Orr>FW}EhhwYWToy>2|8a#~p`)&1Wp2fD9
z&aZPo%8$K=m&)era`$e6^&1x~;XK8Tl24kGpEbxF5pONc3}r-NQ1>2(oVBiK>dILVxsM!WqztqCx0tx8}?Tp
zw{QWHF0^ecP;OGi{u_}%)S5dv7@>ipFypf0WwhT-LE!2N6^G*1kZRxUQBrF%BzGTm
zwH9TIs$CAx3
zo6O%r!>?Zi2{+GInr%oeqj&2UR%;F&H~YqY{A6NrDfPtif2?00Au>tkcLcbA1^m=e?)SE_XcS
zrZK+*KU=5(?PrIF`F||UTbYg=IK%A^FG`1`b;9#{Ve@`*zc)tmyjPEmA=wS=)2=$?
zTOpO<{Tp~>0}G)=YgpwXW){pJq_BE$12tw*_HC3YOa?l%z9D_cLBzj24^k*%;KMQu
zq_KpulN5Q0XRwdFWQV};*g5ke2DhATovOoa)io7@`-}Nnb7)n9-a(hA7N+47A!d-D
zi#~dCXO&&|5UCuQj5s#oI#tswQ5-WI=1*ZU2srt3Ld4Jn_3l2tjWy+I?;IFqeDC
za+v9{cZ^(g#J(w^3WmZl+4T
zM$S*h^IzZEgmBTZsx$yMIxl+(LTz9OnUIol>@+1UqSr_
z^Tws2sp0y#2i8!50O<^*+z$>^g#kME_FW()yCzIP%e{b7@^c?(AY_Sbi#=kXXi*0FSIK&(_yqu3Zf*J&eJrbO
zE{^g0DH(I>7(`P(zVIhgkRUA)Id^ap%EKylmk>Tp#XmW
zJM{ysXDQzllz>d`n6osTfo~Z-uVbVaV-)
zU=g?mwAK5N;sPTWT!_NXXElavub^K@GJzJBKDTfBII1~#IYJEp{-cTta!NxOxdDt4
zm%LJ)fE#s4Ge=6>7RDd7Jh*%^4O7m@@9dd9lt+PH`R
E1ErhzJ^%m!
literal 4120
zcmbtX4{#La6<;Dy5+GCv7@1nuWk4Lg+uQpWZn;~z+$H1+mp_+Og6NdZ?ss=9cek6}
zJ#z`Aru->G5ESTCM?kbr+O#uDQByR~A+$`90TtUKW0^DoMj{j|AfZ;N?YF!4XS2DJ
z{>kM2?EBvDz4yKEeZTi^bA9cSsU@>Z5CoYTsPTv3XQ}dA&?6)FH&l17XTgt5}yeTrsjraa1aA=kdP$^Bl5;vPq)|8F%PD=5$JY-j;WqnXbIp?5cxdG
zT)4m{l@&EV`CzaZvJvJ@P4>XxdAOl=Fi84=$UOnrYLSntrzX&%1e6SVuuKZ|CVcdVa8&!&^8O>B3cOAUcown!&c#92&aW%
z(q$Qo>
zoU*}+FO$bcnA$d41SINJ`UVe)n|E;M(
zut54mK+C+?#PhJhXc?`K@-i<)c>(n`I?)9|n&A?P;C?s^sFa`MD-Q-Gdg?C7bs21q
zlr*f4oC^|K?x@n7sB1aKhA<|gg3Sa&HEfRZ$3#@HU0`_j)N!SJbjLn=0nSD_LAJQF
zqU==x33xw5?INgmOCyTxO*GuldXbNaK$2kRr4oFas&q1gdL<`I0uTi*1!9yf&5oml
z20(^6RmPX7G#MJC28@Bg^08=|yNo2tkm+WmZ!lS*-VH;>=tLw5Sx85p%1EIcLM0u+
zbz+#6yy|W!j`J)R=JL^`-DS4AY+0Jrsp{g;1~O6`5NmlB)YEd5!Wljx!?8mh0W}pr
z7vW?&=9MG>=Q|0`Ml!9EsDv+x@hx;L{lGyeE(kWOS?#X*?dJ(VrsbqWHL8QER}e%V
zPGW961J_o^!Z=AoP_mc=S@o<`2T-O(QjKxB(w5ZPG0O6)F9V6l82z-+2&fY|m^E6N
z`;|&l?dxSaeFI}rw;?QbaMM#H%R{brr&>Np7_|$2X`zFJn~uU@r^YXkKNOHd3Sf?
zV%N`R{r;(OrBm+i_ZRJnJNv&pymLhdHo4)M-!=D6eD#y#_kKb=Ghq_Fs&Dau<6U?B
zt@P9dM{H@s;JUZOk*|(!`RMiO{KW@N@7?TLD;AA>e)il4ofm88b@o1gYUhQQ?xtSw
zNJB$qOJ^Rn)Ghwjw&K+K(z*}N{d#EjPJevpw*l)gUVNi((j$8&-Vxt=WiC?^+ct0i
z;YYjbuQtEsdppwk{>vNA7k7oY?z4xl_FdB*ne=PwGI(glvC(3&c
z-Qw&!ZeDVT?grQPQ-Q#qj_$wT2yfmS+4uc-uaA4Xde+ip-^hv?uMGU;^hRz<_bjxx
z=$dD9Z~3+DKi*Tc*EXxQ>;4UtTu+_=
diff --git a/htdocs/stripe/img/index.html b/htdocs/stripe/img/index.html
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/htdocs/stripe/img/object_stripe.png b/htdocs/stripe/img/object_stripe.png
deleted file mode 100644
index 287bd24910cb0fc86f886d02789f29b993bad530..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 819
zcmV-31I+x1P)2`81ATls8IUq4NIxsmpFgGA8FflMNTjFhO00007bV*G`2iXD;69^O^U!ddw
z00M_eL_t(IPfb%#NK`=_{$}2L`}XbI#Y*sBfuXLJQs|+mbEhCG$e>Q)sY3?|JV=3r
zhax(3=~@s$cInbJItE!FL?o7(MUj}TmTjx+8d^I5p&UgdzdheUcQK3M;T)V+b@tl3*XuCg;3mUOj+e2U
zwd2~^!rh)@rLp?c;M;Nxy)ah+d=Dn@;pB4g0=lOp!u2Uak~o9^C6#iSj#&I^pe~$z
zZfsma*{F=ym&cj&?dT~oB2$&ib-bP3z`gq=t}DA&glvh4leoChL`!>sv8!F^+ZS50
zjC|g~!2>z&ON_)lfdVBcKuEJB$)Te=k;!n8WBSE!Je(@w>9cjLl%fWyQA$I^CfNSy
z!flXcWU?A_^ILfQwv=yCu
zeJfyS7UeW*Ay6%_B1;q{E1>aXwT|mIm+)$)f+(_wi=M6wE?;a$bBkx)qpU*gQ_M?C
zNI~@=^zgkDSyg78(Ri53(-IKB!LKsGm#2?
zUaH~!$0};Ir2eRGFuPd8t*J8BC;~4PkRAZ)(&!gcV>BC8ggDEh#0=Q&O4M+(L?J0u
zn;4&$3p;rEx_Z2A@_*4}b0y|Y<6Cg^d?(GkiF-nrVjk$^ygQ5TcCHVf&Z4*1;}ez=
xl0Jw_8nqA>;D-U6fJV|l@gnx;>KNIzfxiXLt)E)oqyhi{002ovPDHLkV1kvqX=wle
diff --git a/htdocs/theme/eldy/img/object_stripe.png b/htdocs/theme/eldy/img/object_stripe.png
index 287bd24910cb0fc86f886d02789f29b993bad530..4106bb6b2ee6a93aafc665e8849d7e4bc4b6a52d 100644
GIT binary patch
literal 12995
zcmV;!GCa+RP)Z
z5BTE)34uUD2!Z%SNXX(P0g8kKBIE&qB#vW~#0lxRJKc`mZg<=LuBxu8d(K&N@Uhm~
zd#%0qxplAGoh#+hr_N*Vwbz<+%sIy#lOKQEzaUA{36g-31OOntj{F~%Ua9{#Nf7{u
zFuX3S-xG$f0$?-+5am15mmuU{2LK#hyg*V?{VVnR)n4216Xp8TcS7SESYJc^HUKR5
zrQtg%mCp}9G<-?(E7dp4#;dHqUuNUg51%puO8;r?Wf|IUDfhFm`T)}EL*u8M^^b+g
z1I3Ki_<^UFza0PKrVby{4e7zJr
zG-ov3v81#dd1>-RPfzFKuBI}JBqS6gEXmkdZ*NVdnWd#R
zqXZa1n$!(;e`%9ivj+z|KnQ|BKt`3NX*XJW#`#f=-yoAlZy^AZSw1c_5|EUxSjq>O
z#j4CNa(P!u$jdCsUuzb2{iU}(KEFl)RG?}Ccl<;YB>R@K2?8^OvkdkF$01J>lC54g
zQ?)%!=o%0R3N!;C7)e0@1<9>!90E+XLK^XOgkZG#pp`|^0u0YDX7oXb$^H;&BLlLa
z(QAS*xk#9@p*Le~WX9-chLR^w)NA)?*V_b~Mn_k{YEHpoG7z3^+!Ew3IBFhknHdAR&;dX&n`AqbuQm!KhEuqB
z%BsWNtbX#zBUEkdrF+?wT^*9NR$^TGAyYJQ(Q`D(g(On-{_OjwTfPo$7BejiW=h6n
z$4!_mKQZn_Nr23ZAzPIYLJBfS0xq~zncR}w$!1N{AZhN~hvQPCm=v20erPxZB2|ST
z9on5ZJmew0rP19*Q}ebDRY)HQgYSh8z#^F7O3j3*$>jn8y1FWFF%
z8V=(kYOd{gFiCC$;1WbJCJWAPwKhXAlb5VUta6$v8`)YzR~=1po=4%5;~nANQj}if
z{c?{!7?Lp=$EBz0JSC$TxVR$}27}|Af3Y1}eT=c|LYi}m_eH@)8c4GcXcj_O0PAq`
ziYlhpXl@|g0TM?cB*8ex`!WgR10Nrcshb13rN3!aVT$+L^GSrt
zvD*~s=3UJp1rkCS!AZ=yESaS=O9;U%bRE+h(oH6OIEnHbS5XIGib2l~
znJ`Ox46k=*$)Qi{D$RXbjei#JKy3g~mc)R3EOLO8Q_u>*(z^Fu7gNwn%AGXQlM$*S
zc5A?o#?@a;)7G*2q4jNxPR%>cjrXaEdzif5EpC5rte#CkXTAE1n#q7X1t=XH8Ksyr>9ZtxoqsR?sm1-|lbYPDelW@Y^0nZ7Y7#uo
zU+=QTXmj*UxwROQ3EoaHxq9GZ+CUn2sC!)&B_MYXA*}k)uln_R-S>eZ6ql&^%3}P7
z*|U_AF`8^+Nn8rQC5_d+%H?VX#J@v$e>6UoKVb1d35FhuT8D}*sChN2lyk=qDqmV!
z6f!2iLu2%4#=h@YtMz8H?z-O0LQsqjfOOUVX>{6Eh71s$Ef6RUeA!y+RJ+fdsF?0e
z@Jx1T0q?hnbB_0`tc=(3R(FcsKa`8lwqcU$X+vUng%CEI&1!Ay)jD*Yk$d-2tX7Ol
zajC>58UTEnF%HXRpR-+a?T~$;1a-LBdmg-x!+5_qLaz^56Nt5Tzq$yUCe-WI&yk)G
zV+_Go>-A>6Uak7oYGq~;Xf8=|(Tp%NN6HO!%6@2g1_NT7E`gDb<%+-BI>F)z$mR<}
zg=OWa3o3&&j!rV|d4|3iCo*$FxITdx{Xc&}}yB^?JS8Y^)Cf##HMGmV-|LkULY}
za52v_0=T7Ho!1oS5#K4SDIJKmUK8GLzjKcFr`*7Uc)uLV)+!F6U)NrWxjYzGeSf^Z
zxY=yFuCrAy&si;|T2gwmi^1GIWeEI0rDBtEB*GET3>-A9xfuIocXQJ0Wux3M|suv!jm?>ww
zn)nb^8gfL<2MyPN_l=V?R0R#q{huH2$02Z=0&Y%>Ny^U;Pfn!6jkbjM0k~%MQ~@Y3
zseACD2l{SfmaRMh_q`p+%a0M+?Mz3#`jhB<@%S&8;|Z=^DpHo%W1d4*f)8iM`&{B6
zVYaFBj&AWjF*{iK;(b6zURk7J^+|Sp-;?eVAVD;vPtJHliPh|%=7r)G2%g*SqeXRx
z@P1()7&)a3TdL!p6Yo!`M2i&Q!fl@7{mBPaCHNM;w)*}KaQ94JEX)R{5jAglS}Is(
z;4B8Bx3T*$hYG8qxJ(-ege;(u4YdR=M0d}Jc7RVb7|lXjCQGL8On6^41$K(}E3cbZ
zU!cwM`^;eMklio2dau{5V@XA1!!5H!gs^2_DkQ?pv`pv+>^^J+@O3&Ra&K5m!L$eV
zKoC|CXppuHfGGBY!*()-9dF&ZestX3edXwZ2QJ)mpI^BfcigdB^(zYjz}|hgi?3ea
zUA^Y7yyVZnpl?2R?bTO(yA54`WZg=DxF-T=GINRW4oBdQb_3b~3;rzS_eW5WD^GGc
z=XRe=p}+#^v8|8~o48YxD6>;Aa_zY043YEWeFL_@8tR;TaxVff=gx2pH(?(T_xlLm
zc>6mqf8=BRd*Aoo2ObPP;n)E|FgVOS9Uo6
zmUhg(kG|^yU5eUzr18QSAuRO-%<=xbn_PJF!I%EuGoSz5_Q~Jd?tyOIM<;9zz!>MtDwYDk3~{P0R*jpw
zSQu|PwO%?l#z&Pt_~SqP^My+u=H#b&D0B$#;{e{*3~}as0|W&RCt!ddlhJKUZOpcD
zd*h7{ZGQaI?|jd@FDQ}V9SnQG;1vtSA|OnPdZ{w1IKa=LQVm7{5j5D%9X|hsXa37i
zU%$1z5J_Qc=uqd5N@$&;%Q@axiNF(!Y_R(!?bBiwy4r&>tZFw@wVVx;ddOp(VrpI!
z-j{)qT1g!cVSDpnVDC5n(r4cD@lRaZLtd~bgOFI1#bE);eBSglr}@GF>;R%9)l=y+
zvyp}44xjw^1HbWqfA5JWUv*tDYp6j8$yk&dIgIzMq$_H?k2-jv5140sDjczO=lKzy
zn*N@dxz~*M33Res0?D1QH@_&q@#c5l{9Awfdp1XO?F};a0E7rcT31Y6A+8}}d>BN<
z;s+_LmI!|!A{ePa1nt+3n*iu*)sz&S74Q2D?^j%)>FQ5%Qx4L+JCtb=&SZJMZM-jo
z5NIB$PC@?4_kH4yzxvld1Q#K|NC6QDL>Mtu?p8`BA7f<6Dc~S$@KL`Zz(e_h0387v
zX^Sck@*45}B=b=h8ONFgNb{y1u*d>C^XlIY?@#kQ08dDZp!o%lH$M5POMm&(@5*$}
zobjsL69&J_#?}vBUO@7q!*R}LJ66vpAZ_ksg~3Sou#;{kmfd;qJ}V&J;C&UIDobHw
zDW=P-KX5~*7NhQ5d~JB2v25n*(FOq~gOS)9Uw!x^_$!}&7Zk;4)|w73bB8NXU2W~z
zKLP>cNh$PyfC8DaiYv;&F7fvh9=RRfr|78Haw{vV4c}zAxf^l$GVo?l%?ey#3icfEw@X43-D4
zA>j~dA%WFHV#0uSbC@@a_kDp
z=F*yMpPk9>FX#7{-s4k3X_Jb8!uNgOy>EU~FL#d)bJrjA@((UM_2(VT@8_NoO(I(#
z>A?^H6J~gST5`A2^=y>E(z=Vc!Taq7w_)`~h|m(=_sOHxBpi#|?JIxw$KEL*SZCG&
z+tFi{G
z-wszl`VQ~^;5{xuF77g{KirSDuzwG{DBR{TPSkQ#N}J31{r2_2LX7;PipVs|G>j$u
zB}xF{*3weWj`zp!a@8s-i+JBL5P~?=SrR|!jSn1cdI%1L47`b1P}@*ZA!PLi+E)0@
z-}=^*PhNZR`TpdV7;tpVix+kG8^Rl|9N&Ncl{dZtsgj+ng8-u(k?1H5>{022wh2(=
zl)s;hQOWPmY**&cXF`Q@Y{kYe^42@{
z>E|`(vrob7`N@Q>WA(p&;iZ57A0C(P3LV9hV4c`OiQvBVc#V2S>!W+`UA^mFdjEUx
z{6p`!bYTTV8B9U)B*PTT6wALByM53CA-8Ws
zKl9&T=vNQzu>)^(432fOhdV|K(MXpQTzLmdjNQ>@@9QU?(eM7}tDpVp7axAd9Y6Sk
zcfaecM_WKNz{x!j%NeZzKF0cOUZp`k$29EXm;|#%uiN1LF
zrLVg!)Ay{`ossgwX$Ps(vj#h|55UPyu)8MT5IqDTrs{oQ;*A+$$Q2L=9f&k@g|m2zVq$&+%IdrIdM1R1^6z>MWnND
zGQdE>_QIu(p?x7pipF+3f?Ep
zo6O&U_lwsZc%?%NqbLM4-NO3vD#Kh!BPP7hNpYA}6~WGn_jMbGfx{i0IVn%lg1!9W4VxBCPWy`~
zQo_DpZU4^SfBW0ssgvysw3k6a2AC{3jaZ3+3?5EA?A;^_LYKPVO);qNu~xLutq_9C
zEHLtV>E3L3JIXAzbQ?a>+|`Jf)%pEHcz|{wN2o`YpQuo0R-9@-y;$8?w!VL%M<0_hWu@AfN|K9uF{f;|deERxx&)w`g
zLr{b>bu=izbCSn8SVRB=;I@k)g2AEU`*W)@X))2jtfA@;nf=5{ZTD~9nqJ}h>NYF9
zZ%pDSgTi0F86$}B@cVx9TzG$J?{lJsxxn9VIT|GPyOSUIfqR7{TuH&Kk*b@A0iGYS
zf5a`t#4cdh5D(eJ{qH?a-l%W@dZ9J4Uk@7!ZQ`94IveNTn~F
z;C&5D;1rWpNOWjO@;TYf3f@mGCxiWI3%zK%BwqvGKMQ|gT`l`7hqQ`YNpN5kiDw2!uMg
zIo&K~r7cxG0lq-ssc*)p0oj+O|2FV`(}GYbPlSix|C7sjAEz0wHowm*;?3KC($zh8
z%MQD8W&gIf-3i3v%Phm8gQcs12@$9yX4QMK#g{JOeeb>Vhd%X&_rCX%;o8@qe{r|F
zdBjz410%wo^qhVlFD&KvN43g2zn?iTYI`n-)C-%_tEAEXC(yl43lTJ2+NY6B8}bk>o@Mcr+?_Xj+q;$
zg3%7H{=h&<-jWe?fToTJNV3#!a`mOJJ$s$uVpL}#w;jr+
zt3Tp>^LYkh!sih+CDZ3kJ=%S@(X8iBaOVQlv~X|Adf=Kt+MQ%eG#AiPrv`@le^XW
za*U2JB`XXGdX)^bmh8rW_i-S<-&mg7Yuc0~ntnPw{Qkeb*pafh`qp|~XT8y<-0nfv
zV(!?}g$DF6{Pvfg{Ue{eujpU!6x9!ag&QA6SHV3fW#$Mi3GJoEVC$tM)qHZ{sQdnp
z-1S`#tbg;-SID4DN+Gh+i`94^gC_d4_CmCHzi^m1;(fNyY*-Vv94`(|_yeCgr2IW;
z(4kE+4~yz27w~@ZnpTv5S(~pwHyWYM)mQk{uRZ&*NA4$uNKf``?5s}bGWFu6fRugo5jv$U4+R>jqNh75Cq}`s5$J{N*n{|MGR0g@}#1tz#G5+-7*c#`UM+eP#kn
zjrYslCJ`Q#xS?MCMC}R>fA?q3)VF0z!w_zV_ZN9JiTmo|1f(;-{JC%LpM31)4?pq-
z2AL;oo_x<9+^38}@o)LYDq_c33i;zvWx&TCx$B$XdhYq>j24VE2C&b2tHt{xu0MeH
zi&g~3y*8^uAvn1=tf(#tNLB(*slc_*7!h{9LOj$%AASGbUw!(;=U)`P13ZR6
z%e`|Y9?kWFY_N;jtnaJN^N7qnRU9O3hHOCUs`ni!~3<}Z$uG?K5AxyXIA((0fIRY0asApTfgeU!{7ax+xP1l
zhgjhhyk9?$x^bljtSX1p6u^D3J!!aYCri~l^n^GCK;0OO
zl>SuSmUy@nOr#qL#Ctw)`RD)FbNf{QgW()_zY$kXbapE>?JV3t4I0=pV(D`sirgZ^CNbcOA^qT}#114DNzw{^!2_>W!Os-+TFvW81@pXe^Duxi)^@
z2O!dfE!9(a^LHKp?_YXmYeyV9GI+N9e%FoBI6-)7zwA3(ulvpM>gaeC)}ilHC=#>!
z3A3t8amWfEE+@bb<@YU2%3Bj83Z91dhoZb@t!FYP0UZ+oj3Av+SixL$Q!rZr7ry#6
z{oK!f?MuJ$D(Uy#e`nuO9OLd;Z^rE&28qPKBZ=74uASU^{Fxou-xlwWQxiy+OA5i*
zbF~Vqb-&rH*PGR96~ZdeoJd4O2h|7M^52HO#$Iw53OD;fg{(Lsr{{^*r0f9uihfBTuQKmL_l-I4CO_b9bn
zP!x7bIc4slAeIvQ0eVp?2_!@kr8_Pi|KjIfM8DxV^7|s=rOU^gBkMO70z;RMV?gM#xTC)w
zaV|cOS+HQz9&nna_4ik1;EoOB{)
zi`R~N5E;-%IRj<%&h~cn)HC?GU--u3U%B?sn=W3u*fF))BT@$LPxTF%%OH0eBk0uq_m}e-qjm5mh{WyPtgO;y?N)kN?O2
z^7K9xv=h7Z)Oi}HBwk(7pa<`h51Fls&m%7Ld1OQ|2*GlJ0cL3ygU>37PPmCxj=FCD
zvf3+7GMCPvN`iGD4lU#TX(4mm2=zA)f6>>}F%&w3F@Q%FHqO1*1k6(2bJDSbud-H$
z@_r%^8RGiBpZgX3tIs}@s`nC{r*8k@e@whQrW~u{b5@ndAK>yWcKD*j>70++7RN867;?>z3Ji
zO!JNU`;>vUmw{ND9|d2Tf&nHtuY0H6y8pE=-Tcy{H$j1~>a_esb-42!A70$_U>y5%
zY@A1yxn7g}zE#_+TxXImA9kChn4idqZp-Rtn?`dx#OJB^E2=SDjom+h_nTDN+*>5)
zqwtZB-TZt1@ZAr8@Pzx9>Dy2`9fy=wE^Vi>F#;K3H)UG|I)Z}=vEvGI=Qdni{raQN
zM|8j@_-&(sQNvKqF3i-%ZpY`z&&dX;GcAM+@6XSpHLYp$Yd)lQ}dckbQXO-_^69oT6D
zt#9qQOC7)3-L9=5WwuqO#CXHRIl$*(Jzg+KMs=fC*u&-|bLlV5#twYlV6
znRS%IV`t{Ji#Zkwmf@zQfNY20GSjuUzU2Zz*!F?y&R+lk5=2QvK~!K+CIHw|#4c!)
zlx-q#%feW$%uxU+oypdm81b-0KF=
zBB&GG0l
z?2SM4DPBFnV~@T3=$CIk@q2pqmFp)b9>NM9Lf^Y2cgW!}VE>+X??3%xA3kE_Ua;=8
zd_=a}9fU|2A`zZ?&S-@*TR3>F=JTvHZ;DAsr&y=RF~k`Bwwj!cPrkFEr%&}bD|PzU
zg7@bwP!<1W=ryoZ1QT4=<=!Xh(n=qF|DBI~_a%TQz_(u5zxd+yYuC3|uWq+nb|D-e
z^;h1oe(PKByx75V1CzPI5BFMTT%Q=|sl^fe{b%>i6@XyDOBg(e5oly+4X-B>dy+a4AYgXU~kA_j1O|ca{IJF9Y-$nd0O2`RmmKHh^YZ`Yzt~yR%^UJ4)AW!K9)FD-%-4e
z1DzU{CM_YUGNl77VsD6mCpj5W$^%M@CITr?Fu|Yzh0GR}fE_4Vll=%Kml@m
z?YWb$d~2(z)Xj7T^t^4xk}Q(S__az49{rI8+WhtzjkBZ7|3a-3Tf5Ev7Al-L3Na}odczrLXEig8!0
z+yZ}J(1gIt3EMDt7}ku!wx1w>kI&n@l62w05eMTSG*r0}odNGpo?orQJair)a<0*S
zaFpM<|GK1k!s1{M9Km4;zg#!`^MCz~Eia2MJCbgUThwZ`d7sm#k>s`WeUa6II&(cz
zt)j{V(GKca0J_7I{>Hg0<8Ie!O-oKJFem1`=v+N;bXA&?(t)
zG9p|z{PWK~`|OS6_BIjQTt3hO-ft9_NYQh#Hj|{_0V#gbsd&F$0hP4ULNaa%@8e8(
zpEyukZmy%`_tUJ?4yjiguftz(ho$g7Krp!^*(-bgv(G;LjcXnHV-UjL;E|!30bOx~
z>bnztM!wH-=@_$YSj78{-fq=~)SZg=dG+O{=Dz5m@i5N$3u@vye*8`DaLV
zrCn6mGyK+5H~#HUf8}bpXWt(O>`jvGsTH^z@Pe1_v9t?glNVCK^2!C?d<#C%aS!4B
zVP(8pbHgv*&2Oq#l#u3@S
ze3Sp-e?0re$4}zsO=;K4JUHZ=7!+jndNp*|ab*TX-$=;%w2yij?++!NVM%kr=dXR{
zu{k)cM>qL0OLuDb7b)q30Qsn?ki!dgGFsg3UtRaR4}RdT@BQdq?|IugR9Xefz1dJ|
z2SggnW0Pl|H9j;<*7iKPS0Tl`-+Gn5@GH;%;ul}><2RgGVYU}yX?00HY2zA87lY#+
z*}Lkfi+3IYt`KtujuJgqbdp@AqyR)KAq#0NnX5(J(AsgHUfNr<`xCrBXetcm%gqUH
zv88q1-*Jofh2P%&>KC85c*J+V^UBBGuXnut{yQ&12#G~SPq&h1f@TMn3w279NJmbO
zQU|N93%~W)wO{=8lSiMvsdXPNUBK?-NJm?GIgV$<``NxXBhi7#k||1=z+#PhG0i#E
zC~C-3Gs%u35^iuf=enVdCgY5;!rR&XIo=-{S&PBX2hqY>bQoQG8F=BYYtR>-*njTJ
zVtoAW%i$ewK6=}m?7JSgc;A%^m+ypSsN^L;O^pJ%hzw{;zH|#;|Hh54J$>`bkNXoZ
z+;pt0U#~W+y~U`=Re!@{I49m$XEr#qLHJofahQBNLCl?;=BY?Zm$DyZ&pBdejTTbA8|4
zeIZ^vUL7BY<0J1^Ngho*_pAHv`m6rxtNZIW;;pR^dainy>F83TC@?bknq-W7>o90L
zpAqku3|`YDT=+s#=9MI6vt-n~;Ox}t8q#S9IlG?NXAVM?sIEmj@WV>#3wVDi+G_EB
zqra~zBcwcOD$tE!PkBxvB?}o4NO;c`D8XMi>7GAvdpTk#JfQFX>g>Gj(UpO#SX<|BCygx|UwexieHzmD3D1r_~n9H2%)AZCzZ(m04v$RnJ
z_Bk|R6qP4#!(|XXT9U^Tyi0rsFbF0{VH<6)G_2?Bc)xBTuI0*xcCau`P#4f=;us>d
zqd-$|7`LmSj@|`zi~+l(vNJsaw;Nu9(={O$@c!^s)A_oIgYB7!X`TY_G{Y5X19|~Y
z9hf3#2qq-K4NEL2hJE%ma>}|`_DUBWbPGyz@?qntJ=td`La5;<&xsNt5cB3lIsj{hu5|zvIw%P>W;(XoSJ7)x=
z7zGRH;6?`5E=>wc`7zN1Ph217(#KF5bAwd$PooL+{m@V7oq<7al5;P>*|n*rqQ!au
z?+a|CYYK?VL;}m9BS?olP@SO*FRi6uAQ7~OQWI-FKe=hy6Eg!AA#{$C-&fl`(azUJ
z+c-QC?nqv@>8&kiT$t){riZ=bzVMj`<%gKO6G$-(Za#xOmPWUX-($|Ums!LmOfTM%
zu7a1u)c^<6|INjZ5~B=2QxrkZdQ6$Xm8DE5ncQF)^r`c8o5yotzHSK}t8T(pe?RG%oua>g7XH2$^dJ^D
z!3F-Bm48XxvJ}c$2+}~wiY|Eo0{0!b3Sr$@--Y0@vpvi$dPuB2&#Z_U5hRHpFVqU>
zqJ7KyKZo=C!+hOYzv`*;b(wAgb8G;?W&f^Iii{d48_>-oBBPS2_HbM((~%#%Won=-8FQafZU+7RcHR~z
z{kk}x9%n#d%}AbP;Zm$b7vPLeM2aD(qnU-xiow{Ko1E@}d%6s6qdbwh%q+n(cv@wr
z(MiyUWJTIzb?U8DkDFwi2-YJ*)JC?8S+)l6TN9p)oyIlZFB{XjKrA@dysh)ftz*j#%N$bcCnc$0#GpXc{;k9Kp>10=SE-K&G-H(t3PK=
zt2t;3c)uF&-p<<^+c_!w>4VKCH;M;i=ded2&Rq}f|+?Im&4!&$Z2#-oh*qMmu5Iq
zVn7l6X{bplo0Biw6q3eXIv2&+Mi~thsWO==>lvZY$mmsJ60|6$&ax~$-Ob%^t%Wen
zFmoX!_G0v#O5g!6a+?1B`SCtTt~!zoL0wLdDR9r!sh91Qj8ht46XgsMU((lA6EjXr
zvjcC{i@0B<^kqb)H(Jx$G!LZU(2PawHZ6%^S%6@$Vm=YLR2hM(Dw*{<;eChD2d7}J
zw0x%A<*VV)By}Xs>ghQm5rmn@U73PW)ZKHRn#QTk7}X;*hTv1nTqi$>k@O$)utszZ
z=;XoGpZJ#YpYBVq58Vob-G80%KA0e2N*I)ZvVzmitVq1)Mg%V>K{mFpxcM-QD@~Ls
zoZxJiSRVW^Ku?wvUlk)r6AmYbGDGbR%5Sk$D@Ak>npB@p!Tas*8$x_e@O~_aQ!~6j
z(cgdVcpn(%#K2T!P4k`<%Hjf`89}!!-#UO3aWof2i=#*{%;hlR$2|B$6~iG#cbZ<61@K*2n(1R
z19Q>Ln8!`2UX)aLFtPSDH8dIsqeiy(l?7%v(62`8pC#*uQ`I2?&X1%T%TTqA
zfL_^>oOc^JPG0Q*SK}##3aypRH*)Uk)t}^@b4UO9tJdK9MZ90OY9o8#9EE+q4ZNSL
zsX6;TW#nmI?;VZ^%QLG^=h!hZWEF=NH#Slbs{4M;C%;&iQznJn5{0D9r<$&ua`fx6
z)ev*I$%f}zZi|{>ZSgSPuMGHPmH-Fy$7Q_FL-V%MU}ai8sB+?6YA{x{$(0F<^_3Wx
zyGxoeNDEroE&r@Z0XOxJhQwHJ7iO|a8=|-LhN;~9{|C-EJI(m3SZM$N002ovPDHLk
FV1n?d%Od~)
literal 819
zcmV-31I+x1P)2`81ATls8IUq4NIxsmpFgGA8FflMNTjFhO00007bV*G`2iXD;69^O^U!ddw
z00M_eL_t(IPfb%#NK`=_{$}2L`}XbI#Y*sBfuXLJQs|+mbEhCG$e>Q)sY3?|JV=3r
zhax(3=~@s$cInbJItE!FL?o7(MUj}TmTjx+8d^I5p&UgdzdheUcQK3M;T)V+b@tl3*XuCg;3mUOj+e2U
zwd2~^!rh)@rLp?c;M;Nxy)ah+d=Dn@;pB4g0=lOp!u2Uak~o9^C6#iSj#&I^pe~$z
zZfsma*{F=ym&cj&?dT~oB2$&ib-bP3z`gq=t}DA&glvh4leoChL`!>sv8!F^+ZS50
zjC|g~!2>z&ON_)lfdVBcKuEJB$)Te=k;!n8WBSE!Je(@w>9cjLl%fWyQA$I^CfNSy
z!flXcWU?A_^ILfQwv=yCu
zeJfyS7UeW*Ay6%_B1;q{E1>aXwT|mIm+)$)f+(_wi=M6wE?;a$bBkx)qpU*gQ_M?C
zNI~@=^zgkDSyg78(Ri53(-IKB!LKsGm#2?
zUaH~!$0};Ir2eRGFuPd8t*J8BC;~4PkRAZ)(&!gcV>BC8ggDEh#0=Q&O4M+(L?J0u
zn;4&$3p;rEx_Z2A@_*4}b0y|Y<6Cg^d?(GkiF-nrVjk$^ygQ5TcCHVf&Z4*1;}ez=
xl0Jw_8nqA>;D-U6fJV|l@gnx;>KNIzfxiXLt)E)oqyhi{002ovPDHLkV1kvqX=wle
From af4365ee4d8bf66daca105be43c54334c4e81672 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur
Date: Mon, 6 Apr 2020 18:21:13 +0200
Subject: [PATCH 146/336] More fontawesome logo
---
htdocs/core/lib/functions.lib.php | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 038f1e4f397..f12a59d1032 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3226,6 +3226,10 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
$fakey = 'fa-crop';
$facolor = '#444';
}
+ elseif ($pictowithouttext == 'generic') {
+ $fakey = 'fa-file';
+ $fa = 'far';
+ }
elseif ($pictowithouttext == 'note') {
$fakey = 'fa-sticky-note';
$fa = 'far';
From 0933fefa1df1486a7f7b068c54f5efc1515db6a7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur
Date: Mon, 6 Apr 2020 18:21:13 +0200
Subject: [PATCH 147/336] More fontawesome logo
---
htdocs/categories/index.php | 4 ++--
htdocs/core/lib/functions.lib.php | 9 +++++++--
htdocs/theme/eldy/info-box.inc.php | 4 ++++
htdocs/theme/md/info-box.inc.php | 3 +++
4 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/htdocs/categories/index.php b/htdocs/categories/index.php
index 54a4ff9f1d2..4dfe52dafb6 100644
--- a/htdocs/categories/index.php
+++ b/htdocs/categories/index.php
@@ -67,7 +67,7 @@ if (! empty($user->rights->categorie->creer)) {
$newcardbutton.= dolGetButtonTitle($langs->trans('NewCategory'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/categories/card.php?action=create&type='.$type.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?type='.$type));
}
-print load_fiche_titre($title, $newcardbutton);
+print load_fiche_titre($title, $newcardbutton, 'object_category');
//print '';
//print '
- ';
+
';
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index d5ae9ca5124..cbe3c3e46bf 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -830,6 +830,8 @@ Gender=Gender
Genderman=Man
Genderwoman=Woman
ViewList=List view
+ViewGantt=Gantt view
+ViewKanban=Kanban view
Mandatory=Mandatory
Hello=Hello
GoodBye=GoodBye
diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index 4a4c70d2bb7..810362cfdaf 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -87,8 +87,6 @@ WhichIamLinkedToProject=which I'm linked to project
Time=Time
ListOfTasks=List of tasks
GoToListOfTimeConsumed=Go to list of time consumed
-GoToListOfTasks=Show as list
-GoToGanttView=show as Gantt
GanttView=Gantt View
ListProposalsAssociatedProject=List of the commercial proposals related to the project
ListOrdersAssociatedProject=List of sales orders related to the project
diff --git a/htdocs/projet/ganttview.php b/htdocs/projet/ganttview.php
index db4a5642dec..62a8f2235f2 100644
--- a/htdocs/projet/ganttview.php
+++ b/htdocs/projet/ganttview.php
@@ -30,6 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
$id = GETPOST('id', 'intcomma');
@@ -234,7 +235,7 @@ if ($user->rights->projet->all->creer || $user->rights->projet->creer) {
$linktocreatetask = dolGetButtonTitle($langs->trans('AddTask'), '', 'fa fa-plus-circle paddingleft', DOL_URL_ROOT.'/projet/tasks.php?id='.$object->id.'&action=create'.$param.'&backtopage='.urlencode($_SERVER['PHP_SELF'].'?id='.$object->id), '', $linktocreatetaskUserRight, $linktocreatetaskParam);
-$linktolist = dolGetButtonTitle($langs->trans('GoToListOfTasks'), '', 'fa fa-list-alt paddingleft imgforviewmode', DOL_URL_ROOT.'/projet/tasks.php?id='.$object->id, '', 1, array('morecss'=>'reposition'));
+$linktolist = dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-list-alt paddingleft imgforviewmode', DOL_URL_ROOT.'/projet/tasks.php?id='.$object->id, '', 1, array('morecss'=>'reposition'));
//print_barre_liste($title, 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, $linktotasks, $num, $totalnboflines, 'generic', 0, '', '', 0, 1);
print load_fiche_titre($title, $linktolist.' '.$linktocreatetask, 'generic');
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index a95d7162a87..d473db7c753 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -647,7 +647,7 @@ elseif ($id > 0 || !empty($ref))
print '';
$title = $langs->trans("ListOfTasks");
- $linktotasks = dolGetButtonTitle($langs->trans('GoToGanttView'), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/projet/ganttview.php?id='.$object->id.'&withproject=1', '', 1, array('morecss'=>'reposition'));
+ $linktotasks = dolGetButtonTitle($langs->trans('ViewGantt'), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/projet/ganttview.php?id='.$object->id.'&withproject=1', '', 1, array('morecss'=>'reposition'));
//print_barre_liste($title, 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, $linktotasks, $num, $totalnboflines, 'generic', 0, '', '', 0, 1);
print load_fiche_titre($title, $linktotasks.' '.$linktocreatetask, 'generic');
diff --git a/htdocs/theme/eldy/info-box.inc.php b/htdocs/theme/eldy/info-box.inc.php
index 88357f02404..0bcfe977871 100644
--- a/htdocs/theme/eldy/info-box.inc.php
+++ b/htdocs/theme/eldy/info-box.inc.php
@@ -64,12 +64,15 @@ if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
line-height: 90px;
background: rgba(0, 0, 0, 0.2);
}
-.info-box-sm .info-box-icon{
+.info-box-sm .info-box-icon {
height: 80px;
width: 80px;
font-size: 25px;
line-height: 80px;
}
+.info-box-module .info-box-icon {
+ height: 106px;
+}
.info-box-icon > img {
max-width: 100%;
}
@@ -92,13 +95,33 @@ if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
transition: opacity 0.5s, visibility 0s 0.5s;
}
+.info-box-icon-version {
+ box-sizing: border-box;
+ display: block;
+ position: absolute;
+ width: 90px;
+ bottom: 0px;
+ color: #ffffff;
+ background-color: rgba(0,0,0,0.1);
+ cursor: default;
+
+ font-size: 10px;
+ line-height: 22px;
+ padding: 0px 3px;
+ text-align: center;
+ opacity: 1;
+ -webkit-transition: opacity 0.5s, visibility 0s 0.5s;
+ transition: opacity 0.5s, visibility 0s 0.5s;
+}
+
+
global->MAIN_DISABLE_GLOBAL_BOXSTATS) && !empty($conf->global->MAIN_INCLUDE_GLOBAL_STATS_IN_OPENED_DASHBOARD)) { ?>
.info-box-icon-text{
opacity: 1;
}
-.info-box-sm .info-box-icon-text{
+.info-box-sm .info-box-icon-text, .info-box-sm .info-box-icon-version{
overflow: hidden;
width: 80px;
}
From 809c741d1199dd64b0c7cdd78423db4a7de6d2c5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur
+
';
$alttext = '';
//if (is_array($objMod->need_dolibarr_version)) $alttext.=($alttext?' - ':'').'Dolibarr >= '.join('.',$objMod->need_dolibarr_version);
//if (is_array($objMod->phpmin)) $alttext.=($alttext?' - ':'').'PHP >= '.join('.',$objMod->phpmin);
if (!empty($this->picto))
{
- if (preg_match('/^\//i', $this->picto)) print img_picto($alttext, $this->picto, 'class="inline-block valignmiddle width50"', 1);
- else print img_object($alttext, $this->picto, 'class="inline-block valignmiddle width50"');
+ if (preg_match('/^\//i', $this->picto)) print img_picto($alttext, $this->picto, 'class="inline-block valignmiddle"', 1);
+ else print img_object($alttext, $this->picto, 'class="inline-block valignmiddle"');
}
else
{
- print img_object($alttext, 'generic', 'class="inline-block valignmiddle width50"');
+ print img_object($alttext, 'generic', 'class="inline-block valignmiddle"');
}
-
- print '
+ print '';
+ print '
+ print '';
+ print '
'.$this->getName().'
'.nl2br($this->getDesc()).'';
print ''.img_picto($langs->trans("ClickToShowDescription"), $imginfo).'';
+ //print ''.$this->getVersion(1).'';
print '
- '.$this->getVersion(1).'
'.$langs->trans("Publisher").': '.(empty($objMod->editor_name)?$langs->trans("Unknown"):$objMod->editor_name); $editor_url = $objMod->editor_url; if (! preg_match('/^http/', $editor_url)) $editor_url = 'http://'.$editor_url; - if (! empty($objMod->editor_url) && ! preg_match('/dolibarr\.org/i', $objMod->editor_url)) $textexternal.= ($objMod->editor_name != 'dolibarr' ? ' - ' : '').img_object('', 'globe').' '.$objMod->editor_url.''; + if (! empty($objMod->editor_url) && ! preg_match('/dolibarr\.org/i', $objMod->editor_url)) $textexternal.= ($objMod->editor_name != 'dolibarr' ? ' - ' : '').img_picto('', 'globe').' '.$objMod->editor_url.''; $text.=$textexternal; $text.='
'; } diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 751e3ebb0a6..45ddc03e98d 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -3136,6 +3136,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $ 'filter', 'file-code', 'grip', 'grip_title', 'language', 'list', 'listlight', 'note', 'object_phoning', 'object_phoning_fax', 'object_email', 'object_bookmark', 'object_list', 'object_calendar', 'object_calendarweek', 'object_calendarmonth', 'object_calendarday', 'object_calendarperuser', + 'object_cash-register', 'off', 'on', 'play', 'playdisabled', 'printer', 'resize', 'stats', 'note', 'setup', 'sign-out', 'split', 'switch_off', 'switch_on', 'tools', 'unlink', 'uparrow', 'user', 'wrench', 'globe', 'jabber', 'skype', 'twitter', 'facebook', 'linkedin', 'instagram', 'snapchat', 'youtube', 'google-plus-g', 'whatsapp', @@ -3154,14 +3155,15 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $ if (in_array($pictowithouttext, array('skype', 'twitter', 'facebook', 'linkedin', 'instagram', 'snapchat', 'youtube', 'google-plus-g', 'whatsapp'))) { $fa = 'fab'; } + $pictowithouttext = str_replace('object_', '', $pictowithouttext); $arrayconvpictotofa = array( 'address'=> 'address-book', 'setup'=>'cog', 'companies'=>'building', 'products'=>'cube', 'commercial'=>'suitcase', 'invoicing'=>'coins', 'accountancy'=>'money-check-alt', 'hrm'=>'umbrella-beach', 'members'=>'users', 'ticket'=>'ticket-alt', 'generic'=>'folder-open', 'globe'=>'external-link-alt', - 'object_phoning'=>'phone', 'object_phoning_fax'=>'fax', 'object_email'=>'at', - 'switch_off'=>'toggle-off', 'switch_on'=>'toggle-on', 'check'=>'check', 'object_bookmark'=>'star', 'bookmark'=>'star', 'stats' => 'chart-bar', + 'phoning'=>'phone', 'phoning_fax'=>'fax', 'email'=>'at', + 'switch_off'=>'toggle-off', 'switch_on'=>'toggle-on', 'check'=>'check', 'bookmark'=>'star', 'bookmark'=>'star', 'stats' => 'chart-bar', 'bank'=>'university', 'close_title'=>'window-close', 'delete'=>'trash', 'edit'=>'pencil', 'filter'=>'filter', 'split'=>'code-branch', - 'object_list'=>'list-alt', 'object_calendar'=>'calendar-alt', 'object_calendarweek'=>'calendar-week', 'object_calendarmonth'=>'calendar-alt', 'object_calendarday'=>'calendar-day', 'object_calendarperuser'=>'table', + 'list'=>'list-alt', 'calendar'=>'calendar-alt', 'calendarweek'=>'calendar-week', 'calendarmonth'=>'calendar-alt', 'calendarday'=>'calendar-day', 'calendarperuser'=>'table', 'error'=>'exclamation-triangle', 'warning'=>'exclamation-triangle', 'title_setup'=>'tools', 'title_accountancy'=>'money-check-alt', 'title_bank'=>'university', 'title_hrm'=>'umbrella-beach', 'title_agenda'=>'calendar-alt', 'preview'=>'binoculars', 'project'=>'sitemap' @@ -3250,7 +3252,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $ $fakey = 'fa-comment-o'; } // Img for type of views - elseif (in_array($pictowithouttext, array('object_list', 'object_calendar', 'object_calendarweek', 'object_calendarmonth', 'object_calendarday', 'object_calendarperuser'))) { + elseif (in_array($pictowithouttext, array('list', 'calendar', 'calendarweek', 'calendarmonth', 'calendarday', 'calendarperuser'))) { $fakey = 'imgforviewmode fa-'.$arrayconvpictotofa[$pictowithouttext]; $marginleftonlyshort = 0; } diff --git a/htdocs/core/modules/modCashDesk.class.php b/htdocs/core/modules/modCashDesk.class.php index 9bff4afdaf8..b27a1ae30e4 100644 --- a/htdocs/core/modules/modCashDesk.class.php +++ b/htdocs/core/modules/modCashDesk.class.php @@ -55,7 +55,7 @@ class modCashDesk extends DolibarrModules $this->version = 'dolibarr'; $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name); - $this->picto = 'list'; + $this->picto = 'cash-register'; // Data directories to create when module is enabled $this->dirs = array(); diff --git a/htdocs/core/modules/modTakePos.class.php b/htdocs/core/modules/modTakePos.class.php index 8357cb42b2d..400ff6c9b7d 100644 --- a/htdocs/core/modules/modTakePos.class.php +++ b/htdocs/core/modules/modTakePos.class.php @@ -71,7 +71,7 @@ class modTakePos extends DolibarrModules // Name of image file used for this module. // If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue' // If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module' - $this->picto = 'list'; + $this->picto = 'cash-register'; // Defined all module parts (triggers, login, substitutions, menus, css, etc...) // for default path (eg: /takepos/core/xxxxx) (0=disable, 1=enable) From aec1c177e34109eecfa7b4e890248698ddbfee07 Mon Sep 17 00:00:00 2001 From: andreubisquerra
';
@@ -197,7 +197,7 @@ print '
|