Merge branch 'release/1.1.0'

Author: rdoursenaud

.tx/config

@@ -0,0 +1,9 @@
+[main]
+host = https://www.transifex.com
+lang_map = es: es_ES, fr:fr_FR, uz: uz_UZ, vi: vi_VN
+
+[zenfusionmaps.zenfusionmaps]
+file_filter = langs/<lang>/zenfusionmaps.lang
+source_file = langs/en_US/zenfusionmaps.lang
+source_lang = en_US
+type = MOZILLAPROPERTIES

README.md

@@ -20,7 +20,7 @@ Prerequisites
 License
 -------
 
-Copyright (C) 2013-2014 GPC.solutions
+Copyright (C) 2013-2016 GPC.solutions
 
 GPLv3 or (at your option) any later version.
 

admin/about.php

@@ -1,7 +1,7 @@
 <?php
 /*
  * ZenFusion Maps - A Google Maps module for Dolibarr
- * Copyright (C) 2013-2014  Raphaël Doursenaud  <csalvador@gpcsolutions.fr>
+ * Copyright (C) 2013-2016  Raphaël Doursenaud  <csalvador@gpcsolutions.fr>
  * Copyright (C) 2013       Cédric Salvador     <csalvador@gpcsolutions.fr>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -24,17 +24,9 @@
  * \brief Module about page
  */
 
-$res = 0;
-// from standard dolibarr install
-if (! $res && file_exists("../../main.inc.php")) {
-        $res = @include("../../main.inc.php");
-}
-// from custom dolibarr install
-if (! $res && file_exists("../../../main.inc.php")) {
-        $res = @include("../../../main.inc.php");
-}
-if (! $res) {
-    die("Main include failed");
+// Load Dolibarr environment
+if (false === (@include '../../main.inc.php')) {  // From htdocs directory
+    require '../../../main.inc.php'; // From "custom" directory
 }
 
 require_once '../core/modules/modZenFusionMaps.class.php';
@@ -78,7 +70,7 @@
 echo '<h3>', $langs->trans("Module105005Name"), '</h3>',
      '<em>', $langs->trans("Version"), ' ',
  $langs->trans($module->version), '</em><br>',
-     '<em>&copy;2013-2014 GPC.solutions<br><em>',
+     '<em>&copy;2013-2016 GPC.solutions<br><em>',
      '<a target="_blank" href="http://www.zenfusion.net/">',
  '<img src="../img/logo_zf.png" alt="Logo ZenFusion"></a>',
 
@@ -124,4 +116,6 @@
  '&copy;2010-2014 GPC.solutions',
  '</li>',
  '</ul>';
+
+dol_fiche_end();
 llxFooter();

class/actions_zenfusionmaps.class.php

@@ -1,8 +1,8 @@
 <?php
 /*
  * ZenFusion Maps - A Google Maps module for Dolibarr
- * Copyright (C) 2013 Cédric Salvador       <csalvador@gpcsolutions.fr>
- * Copyright (C) 2014 Raphaël Doursenaud    <rdoursenaud@gpcsolutions.fr>
+ * Copyright (C) 2013       Cédric Salvador     <csalvador@gpcsolutions.fr>
+ * Copyright (C) 2014-2016  Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
  *
  * 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
@@ -189,7 +189,7 @@ public function printAddress($parameters, $object, &$action)
         $id = $parameters['id'];
 
         $staticobject = null;
-        if ($element == 'thirdparty') {
+        if ('thirdparty' == $element || 'societe' == $element) {
             require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
             $staticobject = new Societe($this->db);
         } elseif ($element == 'contact') {
@@ -203,7 +203,7 @@ public function printAddress($parameters, $object, &$action)
             return 0;
         }
 
-        // Get the full object so we can extract zip, town and coutry
+        // Get the full object so we can extract zip, town and country
         $staticobject->fetch($id);
 
         $maps_address = $object;

core/modules/modZenFusionMaps.class.php

@@ -1,8 +1,8 @@
 <?php
 /*
  * ZenFusion Maps - A Google Maps module for Dolibarr
- * Copyright (C) 2013 Cédric Salvador       <csalvador@gpcsolutions.fr>
- * Copyright (C) 2014 Raphaël Doursenaud    <rdoursenaud@gpcsolutions.fr>
+ * Copyright (C) 2013       Cédric Salvador     <csalvador@gpcsolutions.fr>
+ * Copyright (C) 2014-2016  Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
  *
  * 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
@@ -58,7 +58,7 @@ public function __construct($db)
         $this->family = "other";
         $this->name = preg_replace('/^mod/i', '', get_class($this));
         $this->description = "Google Maps";
-        $this->version = '1.0.0';
+        $this->version = '1.1.0';
         $this->const_name = 'MAIN_MODULE_' . strtoupper($this->name);
         $this->special = 1; // Interface
         $this->picto = 'maps@zenfusionmaps';
@@ -97,11 +97,12 @@ public function __construct($db)
      * The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
      * It also creates data directories.
      *
-     * @param string $options Options when enabling module ('', 'noboxes')
-     *
+     * @param string $options Options when enabling module ('', 'newboxdefonly', 'noboxes')
+     *                        'noboxes' = Do not insert boxes
+     *                        'newboxdefonly' = For boxes, insert def of boxes only and not boxes activation
      * @return int 1 if OK, 0 if KO
      */
-    public function init($options='')
+    public function init($options = '')
     {
         $sql = array();
         return $this->_init($sql, $options);
@@ -112,11 +113,12 @@ public function init($options='')
      * Remove from database constants, boxes and permissions from Dolibarr database.
      * Data directories are not deleted.
      *
+     * @param string $options Options when enabling module ('', 'noboxes')
      * @return int 1 if OK, 0 if KO
      */
-    public function remove()
+    public function remove($options = '')
     {
         $sql = array();
-        return $this->_remove($sql);
+        return $this->_remove($sql, $options);
     }
 }