lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Debug v14

Browse Source
This commit is contained in:
Laurent Destailleur 2021-04-28 23:01:20 +02:00
parent 846bab38da
commit 64374f46da
17 changed files with 36 additions and 220 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/core/lib/functions.lib.php
View File

@ -3526,7 +3526,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
'object_globe', 'object_holiday', 'object_hrm', 'object_invoice', 'object_intervention', 'object_inventory', 'object_intracommreport', 'object_label',
'object_margin', 'object_members', 'object_money-bill-alt', 'object_multicurrency', 'object_order', 'object_payment',
'object_lot', 'object_mrp', 'object_other',
'object_payment', 'object_pdf', 'object_product', 'object_propal',
'object_partnership', 'object_payment', 'object_pdf', 'object_product', 'object_propal',
'object_paragraph', 'object_poll', 'object_printer', 'object_project', 'object_projectpub', 'object_propal', 'object_resource', 'object_rss', 'object_projecttask',
'object_reception', 'object_recruitmentjobposition', 'object_recruitmentcandidature',
'object_salary', 'object_shipment', 'object_share-alt', 'object_supplier_invoice', 'object_supplier_invoicea', 'object_supplier_invoiced', 'object_supplier_order', 'object_supplier_proposal', 'object_service', 'object_stock',
@ -3538,7 +3538,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
'github', 'jabber', 'skype', 'twitter', 'facebook', 'linkedin', 'instagram', 'snapchat', 'youtube', 'google-plus-g', 'whatsapp',
'chevron-left', 'chevron-right', 'chevron-down', 'chevron-top', 'commercial', 'companies',
'generic', 'home', 'hrm', 'members', 'products', 'invoicing',
'payment', 'pencil-ruler', 'preview', 'project', 'projectpub', 'projecttask', 'refresh', 'salary', 'shipment', 'supplier_invoice', 'technic', 'ticket',
'partnership', 'payment', 'pencil-ruler', 'preview', 'project', 'projectpub', 'projecttask', 'refresh', 'salary', 'shipment', 'supplier_invoice', 'technic', 'ticket',
'error', 'warning',
'recruitmentcandidature', 'recruitmentjobposition', 'resource',
'shapes', 'supplier_proposal', 'supplier_order', 'supplier_invoice',
@ -3582,7 +3582,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
'error'=>'exclamation-triangle', 'warning'=>'exclamation-triangle',
'other'=>'square',
'playdisabled'=>'play', 'pdf'=>'file-pdf', 'poll'=>'check-double', 'pos'=>'cash-register', 'preview'=>'binoculars', 'project'=>'project-diagram', 'projectpub'=>'project-diagram', 'projecttask'=>'tasks', 'propal'=>'file-signature',
'payment'=>'money-check-alt', 'phoning'=>'phone', 'phoning_mobile'=>'mobile-alt', 'phoning_fax'=>'fax', 'previous'=>'arrow-alt-circle-left', 'printer'=>'print', 'product'=>'cube', 'service'=>'concierge-bell',
'partnership'=>'handshake', 'payment'=>'money-check-alt', 'phoning'=>'phone', 'phoning_mobile'=>'mobile-alt', 'phoning_fax'=>'fax', 'previous'=>'arrow-alt-circle-left', 'printer'=>'print', 'product'=>'cube', 'service'=>'concierge-bell',
'reception'=>'dolly', 'recruitmentjobposition'=>'id-card-alt', 'recruitmentcandidature'=>'id-badge',
'resize'=>'crop', 'supplier_order'=>'dol-order_supplier', 'supplier_proposal'=>'file-signature',
'refresh'=>'redo', 'resource'=>'laptop-house',

2
htdocs/core/modules/modPartnership.class.php
View File

@ -86,7 +86,7 @@ class modPartnership extends DolibarrModules
// 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'
// To use a supported fa-xxx css style of font awesome, use this->picto='xxx'
$this->picto = 'generic';
$this->picto = 'partnership';
// Define some features supported by module (triggers, login, substitutions, menus, css, etc...)
$this->module_parts = array(

4
htdocs/langs/en_US/partnership.lang
View File

@ -51,4 +51,6 @@ DatePartnershipEnd=End date
PartnershipDraft = Draft
PartnershipAccepted = Accepted
PartnershipRefused = Refused
PartnershipCanceled = Canceled
PartnershipCanceled = Canceled
PartnershipManagedFor=Partners are

86
htdocs/partnership/README.md
View File

@ -1,86 +0,0 @@
# PARTNERSHIP FOR [DOLIBARR ERP CRM](https://www.dolibarr.org)
## Features
Description of the module...
<!--
![Screenshot partnership](img/screenshot_partnership.png?raw=true "Partnership"){imgmd}
-->
Other external modules are available on [Dolistore.com](https://www.dolistore.com).
## Translations
Translations can be completed manually by editing files into directories *langs*.
<!--
This module contains also a sample configuration for Transifex, under the hidden directory [.tx](.tx), so it is possible to manage translation using this service.
For more informations, see the [translator's documentation](https://wiki.dolibarr.org/index.php/Translator_documentation).
There is a [Transifex project](https://transifex.com/projects/p/dolibarr-module-template) for this module.
-->
<!--
## Installation
### From the ZIP file and GUI interface
- If you get the module in a zip file (like when downloading it from the market place [Dolistore](https://www.dolistore.com)), go into
menu ```Home - Setup - Modules - Deploy external module``` and upload the zip file.
Note: If this screen tell you there is no custom directory, check your setup is correct:
- In your Dolibarr installation directory, edit the ```htdocs/conf/conf.php``` file and check that following lines are not commented:
```php
//$dolibarr_main_url_root_alt ...
//$dolibarr_main_document_root_alt ...
```
- Uncomment them if necessary (delete the leading ```//```) and assign a sensible value according to your Dolibarr installation
For example :
- UNIX:
```php
$dolibarr_main_url_root_alt = '/custom';
$dolibarr_main_document_root_alt = '/var/www/Dolibarr/htdocs/custom';
```
- Windows:
```php
$dolibarr_main_url_root_alt = '/custom';
$dolibarr_main_document_root_alt = 'C:/My Web Sites/Dolibarr/htdocs/custom';
```
### From a GIT repository
- Clone the repository in ```$dolibarr_main_document_root_alt/partnership```
```sh
cd ....../custom
git clone git@github.com:gitlogin/partnership.git partnership
```
### <a name="final_steps"></a>Final steps
From your browser:
- Log into Dolibarr as a super-administrator
- Go to "Setup" -> "Modules"
- You should now be able to find and enable the module
-->
## Licenses
### Main code
GPLv3 or (at your option) any later version. See file COPYING for more information.
### Documentation
All texts and readmes are licensed under GFDL.

103
htdocs/partnership/admin/about.php
View File

@ -1,103 +0,0 @@
<?php
/* Copyright (C) 2004-2017 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2021 Dorian Laurent <i.merraha@sofimedmaroc.com>
*
* 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
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
/**
* \file partnership/admin/about.php
* \ingroup partnership
* \brief About page of module Partnership.
*/
// Load Dolibarr environment
$res = 0;
// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
$res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
}
// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) {
$i--; $j--;
}
if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) {
$res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
}
if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) {
$res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
}
// Try main.inc.php using relative path
if (!$res && file_exists("../../main.inc.php")) {
$res = @include "../../main.inc.php";
}
if (!$res && file_exists("../../../main.inc.php")) {
$res = @include "../../../main.inc.php";
}
if (!$res) {
die("Include of main fails");
}
// Libraries
require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
require_once '../lib/partnership.lib.php';
// Translations
$langs->loadLangs(array("errors", "admin", "partnership@partnership"));
// Access control
if (!$user->admin) {
accessforbidden();
}
// Parameters
$action = GETPOST('action', 'aZ09');
$backtopage = GETPOST('backtopage', 'alpha');
/*
* Actions
*/
// None
/*
* View
*/
$form = new Form($db);
$page_name = "PartnershipAbout";
llxHeader('', $langs->trans($page_name));
// Subheader
$linkback = '<a href="'.($backtopage ? $backtopage : DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1').'">'.$langs->trans("BackToModuleList").'</a>';
print load_fiche_titre($langs->trans($page_name), $linkback, 'object_partnership@partnership');
// Configuration header
$head = partnershipAdminPrepareHead();
print dol_get_fiche_head($head, 'about', '', 0, 'partnership@partnership');
dol_include_once('/partnership/core/modules/modPartnership.class.php');
$tmpmodule = new modPartnership($db);
print $tmpmodule->getDescLong();
// Page end
print dol_get_fiche_end();
llxFooter();
$db->close();

7
htdocs/partnership/admin/partnership_extrafields.php
View File

@ -58,7 +58,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
require_once '../lib/partnership.lib.php';
// Load translation files required by the page
$langs->loadLangs(array('partnership@partnership', 'admin'));
$langs->loadLangs(array('partnership', 'admin'));
$extrafields = new ExtraFields($db);
$form = new Form($db);
@ -91,17 +91,18 @@ require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
* View
*/
$help_url = '';
llxHeader('', $langs->trans("PartnershipSetup"), $help_url);
$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
print load_fiche_titre($langs->trans("PartnershipSetup"), $linkback, 'title_setup');
print load_fiche_titre($langs->trans("PartnershipSetup"), $linkback, 'object_partnership');
$head = partnershipAdminPrepareHead();
print dol_get_fiche_head($head, 'partnership_extrafields', $langs->trans("PartnershipExtraFields"), -1, 'account');
print dol_get_fiche_head($head, 'partnership_extrafields', $langs->trans("PartnershipExtraFields"), -1, 'partnership');
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';

11
htdocs/partnership/admin/setup.php
View File

@ -58,7 +58,7 @@ require_once '../lib/partnership.lib.php';
//require_once "../class/myclass.class.php";
// Translations
$langs->loadLangs(array("admin", "partnership@partnership"));
$langs->loadLangs(array("admin", "partnership"));
// Security check
if (!$user->admin) {
@ -71,6 +71,7 @@ $value = GETPOST('value', 'alpha');
$error = 0;
/*
* Actions
*/
@ -91,10 +92,10 @@ if ($action == 'setting') {
$partnership->tabs = array();
if ($modulemenu == 'member') {
$partnership->tabs[] = array('data'=>'member:+partnership:Partnership:partnership@partnership:$user->rights->partnership->read:/partnership/partnership.php?socid=__ID__');
$partnership->tabs[] = array('data'=>'member:+partnership:Partnership:partnership:$user->rights->partnership->read:/partnership/partnership.php?socid=__ID__');
$fk_mainmenu = "members";
} else {
$partnership->tabs[] = array('data'=>'thirdparty:+partnership:Partnership:partnership@partnership:$user->rights->partnership->read:/partnership/partnership.php?socid=__ID__');
$partnership->tabs[] = array('data'=>'thirdparty:+partnership:Partnership:partnership:$user->rights->partnership->read:/partnership/partnership.php?socid=__ID__');
$fk_mainmenu = "companies";
}
@ -131,10 +132,10 @@ $tab = $langs->trans("PartnershipSetup");
llxHeader('', $title);
$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
print load_fiche_titre($title, $linkback, 'title_setup');
print load_fiche_titre($title, $linkback, 'object_partnership');
$head = partnershipAdminPrepareHead();
print dol_get_fiche_head($head, 'settings', $tab, -1, 'partnership');
print dol_get_fiche_head($head, 'settings', $tab, -1, 'object_partnership');
$form = new Form($db);

8
htdocs/partnership/class/partnership.class.php
View File

@ -61,7 +61,7 @@ class Partnership extends CommonObject
/**
* @var string String with name of icon for partnership. Must be the part after the 'object_' into object_partnership.png
*/
public $picto = 'partnership@partnership';
public $picto = 'partnership';
const STATUS_DRAFT = 0;
@ -969,7 +969,7 @@ class Partnership extends CommonObject
// phpcs:enable
if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
global $langs;
//$langs->load("partnership@partnership");
//$langs->load("partnership");
$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('Draft');
$this->labelStatus[self::STATUS_ACCEPTED] = $langs->trans('Accepted');
$this->labelStatus[self::STATUS_REFUSED] = $langs->trans('Refused');
@ -1076,7 +1076,7 @@ class Partnership extends CommonObject
public function getNextNumRef()
{
global $langs, $conf;
$langs->load("partnership@partnership");
$langs->load("partnership");
if (empty($conf->global->PARTNERSHIP_ADDON)) {
$conf->global->PARTNERSHIP_ADDON = 'mod_partnership_standard';
@ -1141,7 +1141,7 @@ class Partnership extends CommonObject
$result = 0;
$includedocgeneration = 0;
$langs->load("partnership@partnership");
$langs->load("partnership");
if (!dol_strlen($modele)) {
$modele = 'standard_partnership';

4
htdocs/partnership/core/modules/partnership/modules_partnership.php
View File

@ -91,7 +91,7 @@ abstract class ModeleNumRefPartnership
public function info()
{
global $langs;
$langs->load("partnership@partnership");
$langs->load("partnership");
return $langs->trans("NoDescription");
}
@ -103,7 +103,7 @@ abstract class ModeleNumRefPartnership
public function getExample()
{
global $langs;
$langs->load("partnership@partnership");
$langs->load("partnership");
return $langs->trans("NoExample");
}

11
htdocs/partnership/lib/partnership.lib.php
View File

@ -30,7 +30,7 @@ function partnershipAdminPrepareHead()
{
global $langs, $conf;
$langs->load("partnership@partnership");
$langs->load("partnership");
$h = 0;
$head = array();
@ -46,11 +46,12 @@ function partnershipAdminPrepareHead()
$head[$h][2] = 'partnership_extrafields';
$h++;
/*
$head[$h][0] = dol_buildpath("/partnership/admin/about.php", 1);
$head[$h][1] = $langs->trans("About");
$head[$h][2] = 'about';
$h++;
*/
// Show more tabs from modules
// Entries must be declared in modules descriptor with line
@ -75,7 +76,7 @@ function partnershipPrepareHead($object)
{
global $db, $langs, $conf;
$langs->load("partnership@partnership");
$langs->load("partnership");
$h = 0;
$head = array();
@ -128,9 +129,9 @@ function partnershipPrepareHead($object)
//$this->tabs = array(
// 'entity:-tabname:Title:@partnership:/partnership/mypage.php?id=__ID__'
//); // to remove a tab
complete_head_from_modules($conf, $langs, $object, $head, $h, 'partnership@partnership');
complete_head_from_modules($conf, $langs, $object, $head, $h, 'partnership');
complete_head_from_modules($conf, $langs, $object, $head, $h, 'partnership@partnership', 'remove');
complete_head_from_modules($conf, $langs, $object, $head, $h, 'partnership', 'remove');
return $head;
}

2
htdocs/partnership/partnership_agenda.php
View File

@ -82,7 +82,7 @@ dol_include_once('/partnership/lib/partnership.lib.php');
// Load translation files required by the page
$langs->loadLangs(array("partnership@partnership", "other"));
$langs->loadLangs(array("partnership", "other"));
// Get parameters
$id = GETPOST('id', 'int');

2
htdocs/partnership/partnership_card.php
View File

@ -81,7 +81,7 @@ dol_include_once('/partnership/class/partnership.class.php');
dol_include_once('/partnership/lib/partnership.lib.php');
// Load translation files required by the page
$langs->loadLangs(array("partnership@partnership", "other"));
$langs->loadLangs(array("partnership", "other"));
// Get parameters
$id = GETPOST('id', 'int');

2
htdocs/partnership/partnership_contact.php
View File

@ -59,7 +59,7 @@ dol_include_once('/partnership/class/partnership.class.php');
dol_include_once('/partnership/lib/partnership.lib.php');
// Load translation files required by the page
$langs->loadLangs(array("partnership@partnership", "companies", "other", "mails"));
$langs->loadLangs(array("partnership", "companies", "other", "mails"));
$id = (GETPOST('id') ?GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
$ref = GETPOST('ref', 'alpha');

2
htdocs/partnership/partnership_document.php
View File

@ -82,7 +82,7 @@ dol_include_once('/partnership/class/partnership.class.php');
dol_include_once('/partnership/lib/partnership.lib.php');
// Load translation files required by the page
$langs->loadLangs(array("partnership@partnership", "companies", "other", "mails"));
$langs->loadLangs(array("partnership", "companies", "other", "mails"));
$action = GETPOST('action', 'aZ09');

2
htdocs/partnership/partnership_list.php
View File

@ -85,7 +85,7 @@ require_once __DIR__.'/class/partnership.class.php';
//dol_include_once('/othermodule/class/otherobject.class.php');
// Load translation files required by the page
$langs->loadLangs(array("partnership@partnership", "other"));
$langs->loadLangs(array("partnership", "other"));
$action = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
$massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)

2
htdocs/partnership/partnership_note.php
View File

@ -78,7 +78,7 @@ dol_include_once('/partnership/class/partnership.class.php');
dol_include_once('/partnership/lib/partnership.lib.php');
// Load translation files required by the page
$langs->loadLangs(array("partnership@partnership", "companies"));
$langs->loadLangs(array("partnership", "companies"));
// Get parameters
$id = GETPOST('id', 'int');

2
htdocs/partnership/partnershipindex.php
View File

@ -58,7 +58,7 @@ if (!$res) {
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
// Load translation files required by the page
$langs->loadLangs(array("partnership@partnership"));
$langs->loadLangs(array("partnership"));
$action = GETPOST('action', 'aZ09');