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

Merge pull request #15028 from FHenry/fix_intracom

Browse Source 
fix table creation for intracom and change reserved name column name
This commit is contained in:
Laurent Destailleur 2020-10-15 20:19:05 +02:00 committed by GitHub
commit 24f7a8aeed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/lib/intracommreport.lib.php
View File

@ -54,9 +54,11 @@ function intracommReportAdminPrepareHead()
/**
* Prepare array with list of tabs
*
* @param Object $object Object related to tabs
*
* @return array Array of tabs to show
*/
function intracommReportPrepareHead()
function intracommReportPrepareHead($object)
{
global $langs, $conf;

4
htdocs/install/mysql/migration/12.0.0-13.0.0.sql
View File

@ -134,12 +134,12 @@ CREATE TABLE llx_intracommreport
ref varchar(30) NOT NULL, -- report reference number
entity integer DEFAULT 1 NOT NULL, -- multi company id
type_declaration varchar(32),
period varchar(32),
periods varchar(32),
mode varchar(32),
content_xml text,
type_export varchar(10),
datec datetime,
tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
)ENGINE=innodb;
ALTER TABLE llx_c_incoterms ADD COLUMN label varchar(100) NULL;

2
htdocs/install/mysql/tables/llx_intracommreport.sql
View File

@ -24,7 +24,7 @@ create table llx_intracommreport
ref varchar(30) NOT NULL, -- report reference number
entity integer DEFAULT 1 NOT NULL, -- multi company id
type_declaration varchar(32),
period varchar(32),
periods varchar(32),
mode varchar(32),
content_xml text,
type_export varchar(10),

4
htdocs/intracommreport/admin/intracommreport.php
View File

@ -102,7 +102,7 @@ print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
print '<input type="hidden" name="token" value="'.newToken().'">';
print '<input type="hidden" name="action" value="update">';
print_fiche_titre($langs->trans("Parameters").' (DEB)');
print load_fiche_titre($langs->trans("Parameters").' (DEB)');
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
@ -168,7 +168,7 @@ print "</tr>\n";
print '</table>';
print_fiche_titre($langs->trans("Parameters").' (DES)');
print load_fiche_titre($langs->trans("Parameters").' (DES)');
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';