Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into devh
Browse files Browse the repository at this point in the history
  • Loading branch information
frederic34 committed Oct 27, 2024
2 parents e10564f + 59ef690 commit ffb1f31
Show file tree
Hide file tree
Showing 10 changed files with 29 additions and 34 deletions.
15 changes: 15 additions & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# These are supported funding model platforms

github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
patreon: # Replace with a single Patreon username
open_collective: # Replace with a single Open Collective username
ko_fi: # Replace with a single Ko-fi username
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
liberapay: # Replace with a single Liberapay username
issuehunt: # Replace with a single IssueHunt username
lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
polar: # Replace with a single Polar username
buy_me_a_coffee: frederic34
thanks_dev: # Replace with a single thanks.dev username
custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
2 changes: 1 addition & 1 deletion .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
uses: Net-Logic/github-dolibarr-action@main
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
REPO_OWNER: Net-Logic
REPO_OWNER: frederic34
RELEASE_BRANCH: main
RELEASE_BRANCHES: main
MODULE: easytooltip
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
uses: Net-Logic/github-dolibarr-action@main
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
REPO_OWNER: Net-Logic
REPO_OWNER: frederic34
RELEASE_BRANCH: main
RELEASE_BRANCHES: main
MODULE: easytooltip
Expand Down
6 changes: 3 additions & 3 deletions ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@

## Unreleased (2024-01-11)
## Unreleased (2024-09-23)

#### :rocket: Enhancement
* [#5](https://github.com/Net-Logic/dolibarr_module_easytooltip/pull/5) add service duration ([@frederic34](https://github.com/frederic34))
* [#5](https://github.com/frederic34/dolibarr_module_easytooltip/pull/5) add service duration ([@frederic34](https://github.com/frederic34))

#### :bug: Bug Fix
* [#1](https://github.com/Net-Logic/dolibarr_module_easytooltip/pull/1) add some objects that can have an underscore ([@frederic34](https://github.com/frederic34))
* [#1](https://github.com/frederic34/dolibarr_module_easytooltip/pull/1) add some objects that can have an underscore ([@frederic34](https://github.com/frederic34))

#### Committers: 1
- Frédéric FRANCE ([@frederic34](https://github.com/frederic34))
2 changes: 1 addition & 1 deletion admin/about.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2004-2017 Laurent Destailleur <[email protected]>
* Copyright (C) 2023 Frédéric France <frederic.france@netlogic.fr>
* Copyright (C) 2023 Frédéric France <frederic.france@free.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
Expand Down
2 changes: 1 addition & 1 deletion admin/setup.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2004-2017 Laurent Destailleur <[email protected]>
* Copyright (C) 2019-2023 Frédéric France <frederic.france@netlogic.fr>
* Copyright (C) 2019-2023 Frédéric France <frederic.france@free.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
Expand Down
Binary file modified build/module_easytooltip-1.0.0.zip
Binary file not shown.
20 changes: 1 addition & 19 deletions class/actions_easytooltip.class.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
/* Copyright (C) 2023-2024 Frédéric France <frederic.france@netlogic.fr>
/* Copyright (C) 2023-2024 Frédéric France <frederic.france@free.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
Expand Down Expand Up @@ -70,24 +70,6 @@ public function __construct($db)
$this->db = $db;
}



/**
* Overloading the formAddObjectLine function : replacing the parent's function with the one below
*
* @param array $parameters Hook metadatas (context, etc...)
* @param CommonObject $object The object to process (an invoice if you are in invoice module, a propale in propale's module, etc...)
* @param string $action Current action (if set). Generally create or edit or null
* @param HookManager $hookmanager Hook manager propagated to allow calling another hook
* @return integer < 0 on error, 0 on success, 1 to replace standard code
*/
public function formAddObjectLine($parameters, &$object, &$action, $hookmanager)
{
print '<tr class="liste_titre_create"><td></td><td>TEST</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>';

return 0;
}

/**
* Overloading the getTooltipContent function : replacing the parent's function with the one below
*
Expand Down
2 changes: 1 addition & 1 deletion config.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/*
* Copyright (C) 2019-2023 Frédéric France <frederic.france@netlogic.fr>
* Copyright (C) 2019-2023 Frédéric France <frederic.france@free.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
Expand Down
12 changes: 5 additions & 7 deletions core/modules/modEasyTooltip.class.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
/* Copyright (C) 2004-2018 Laurent Destailleur <[email protected]>
* Copyright (C) 2018-2019 Nicolas ZABOURI <[email protected]>
* Copyright (C) 2019-2020 Frédéric France <frederic.france@netlogic.fr>
* Copyright (C) 2019-2020 Frédéric France <frederic.france@free.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
Expand Down Expand Up @@ -47,14 +47,14 @@ public function __construct($db)

// Id for module (must be unique).
// Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
$this->numero = 135650; // TODO Go on page https://wiki.dolibarr.org/index.php/List_of_modules_id to reserve an id number for your module
$this->numero = 491360; // TODO Go on page https://wiki.dolibarr.org/index.php/List_of_modules_id to reserve an id number for your module

// Key text used to identify module (for permissions, menus, etc...)
$this->rights_class = 'easytooltip';

// Family can be 'base' (core modules),'crm','financial','hr','projects','products','ecm','technic' (transverse modules),'interface' (link with external tools),'other','...'
// It is used to group modules by family in module setup page
$this->family = "Net-Logic";
$this->family = "other";

// Module position in the family on 2 digits ('01', '10', '20', ...)
$this->module_position = '90';
Expand All @@ -70,14 +70,12 @@ public function __construct($db)
$this->descriptionlong = "EasyTooltipDescription";

// Author
$this->editor_name = 'Net Logic';
$this->editor_url = 'https://netlogic.fr';
$this->editor_name = 'frederic34';
$this->editor_url = '';

// Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated', 'experimental_deprecated' or a version string like 'x.y.z'
$this->version = '1.0.0';
// Url to the file with your last numberversion of this module
$url = 'https://wiki.netlogic.fr/versionmodule.php?module=' . strtolower($this->name) . '&number=' . $this->numero . '&version=' . $this->version . '&dolversion=' . DOL_VERSION;
$this->url_last_version = $url;

// Key used in llx_const table to save module status enabled/disabled (where EASYTOOLTIP is value of property name of module in uppercase)
$this->const_name = 'MAIN_MODULE_' . strtoupper($this->name);
Expand Down

0 comments on commit ffb1f31

Please sign in to comment.