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

Retrograde intracommreport from experimental to dev

Browse Source
This commit is contained in:
Laurent Destailleur 2022-05-02 20:21:58 +02:00
parent 1dd8cfe559
commit 6aa32e7c70
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/compta/index.php
View File

@ -527,9 +527,8 @@ if (!empty($conf->tax->enabled) && !empty($user->rights->tax->charges->lire)) {
if ($i >= $max) {
$othernb += 1;
$tot_ttc += $obj->amount;
$i++;
$total_ht += $obj->total_ht;
$total_ttc += $obj->total_ttc;
continue;
}

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

@ -50,7 +50,7 @@ class modIntracommreport extends DolibarrModules
$this->description = "Intracomm report management (Support for French DEB/DES format)";
// Possible values for version are: 'development', 'experimental', 'dolibarr' or 'dolibarr_deprecated' or version
$this->version = 'experimental';
$this->version = 'development';
$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
$this->picto = 'intracommreport';

10
htdocs/intracommreport/card.php
View File

@ -23,7 +23,8 @@
*/
/** Terms
/**
* Terms
*
* DEB = Declaration d'Exchanges de Biens (FR) = Declaration of Exchange of Goods (EN)
* DES = Déclaration Européenne de Services (FR) = European Declaration of Services (EN)
@ -32,7 +33,6 @@
*
*/
require '../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
@ -40,6 +40,7 @@ require_once DOL_DOCUMENT_ROOT.'/intracommreport/class/intracommreport.class.php
$langs->loadLangs(array("intracommreport"));
$id = GETPOST('id', 'int');
$action = GETPOST('action');
$exporttype = GETPOSTISSET('exporttype') ? GETPOST('exporttype', 'alphanohtml') : 'deb'; // DEB or DES
$year = GETPOSTINT('year');
@ -65,9 +66,13 @@ $formother = new FormOther($db);
// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
$hookmanager->initHooks(array('intracommcard', 'globalcard'));
$error = 0;
/*
* Actions
*/
$parameters = array('id' => $id);
// Note that $action and $object may have been modified by some hooks
$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action);
@ -132,6 +137,7 @@ if ($action == 'add' && $user->rights->intracommreport->write) {
}
}
/*
* View
*/