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

New: early development of multi-company module

Browse Source
This commit is contained in:
Regis Houssin 2009-04-28 08:42:56 +00:00
parent 9cc8f2fed8
commit 47cde9d686
4 changed files with 238 additions and 234 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/exports/export.class.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2005-2008 Laurent Destailleur <eldy@users.sourceforge.net> /* Copyright (C) 2005-2008 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2007 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -79,7 +79,7 @@ class Export
$i=0; $i=0;
while (($file = readdir($handle))!==false) while (($file = readdir($handle))!==false)
{ {
if (eregi("^(mod.*)\.class\.php",$file,$reg)) if (eregi("^(mod.*)\.class\.php$",$file,$reg))
{ {
$modulename=$reg[1]; $modulename=$reg[1];
@ -168,10 +168,10 @@ class Export
* \brief Lance la generation du fichier * \brief Lance la generation du fichier
* \param user User qui exporte * \param user User qui exporte
* \param model Modele d'export * \param model Modele d'export
* \param datatoexport Lot de donn<EFBFBD>e <EFBFBD> exporter * \param datatoexport Lot de donnee a exporter
* \param array_selected Tableau des champs <EFBFBD> exporter * \param array_selected Tableau des champs a exporter
* \remarks Les tableaux array_export_xxx sont d<EFBFBD>j<EFBFBD> charg<EFBFBD>es pour le bon datatoexport * \remarks Les tableaux array_export_xxx sont deja chargees pour le bon datatoexport
* aussi le parametre datatoexport est inutilis<EFBFBD> * aussi le parametre datatoexport est inutilise
*/ */
function build_file($user, $model, $datatoexport, $array_selected) function build_file($user, $model, $datatoexport, $array_selected)
{ {

6
htdocs/exports/export.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2005-2009 Laurent Destailleur <eldy@users.sourceforge.net> /* Copyright (C) 2005-2009 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2007 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -492,14 +492,14 @@ if ($step == 3 && $datatoexport)
print $objexport->array_export_module[0]->getName(); print $objexport->array_export_module[0]->getName();
print '</td></tr>'; print '</td></tr>';
// Lot de donn<EFBFBD>es <20> exporter // Lot de donnees a exporter
print '<tr><td width="25%">'.$langs->trans("DatasetToExport").'</td>'; print '<tr><td width="25%">'.$langs->trans("DatasetToExport").'</td>';
print '<td>'; print '<td>';
print img_object($objexport->array_export_module[0]->getName(),$objexport->array_export_icon[0]).' '; print img_object($objexport->array_export_module[0]->getName(),$objexport->array_export_icon[0]).' ';
print $objexport->array_export_label[0]; print $objexport->array_export_label[0];
print '</td></tr>'; print '</td></tr>';
// Nbre champs export<EFBFBD>s // Nbre champs exportes
print '<tr><td width="25%">'.$langs->trans("ExportedFields").'</td>'; print '<tr><td width="25%">'.$langs->trans("ExportedFields").'</td>';
$list=''; $list='';
foreach($array_selected as $code=>$value) foreach($array_selected as $code=>$value)

2
htdocs/includes/modules/export/modules_export.php
View File

@ -66,7 +66,7 @@ class ModeleExports
$i=0; $i=0;
while (($file = readdir($handle))!==false) while (($file = readdir($handle))!==false)
{ {
if (eregi("^export_(.*)\.modules\.php",$file,$reg)) if (eregi("^export_(.*)\.modules\.php$",$file,$reg))
{ {
$moduleid=$reg[1]; $moduleid=$reg[1];

4
htdocs/includes/modules/modBanque.class.php
View File

@ -3,6 +3,7 @@
* Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004 Sebastien Di Cintio <sdicintio@ressource-toi.org> * Copyright (C) 2004 Sebastien Di Cintio <sdicintio@ressource-toi.org>
* Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be> * Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be>
* Copyright (C) 2008-2009 Regis Houssin <regis@dolibarr.fr>
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -46,6 +47,8 @@ class modBanque extends DolibarrModules
*/ */
function modBanque($DB) function modBanque($DB)
{ {
global $conf;
$this->db = $DB ; $this->db = $DB ;
$this->numero = 85 ; $this->numero = 85 ;
@ -150,6 +153,7 @@ class modBanque extends DolibarrModules
$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX."bank_url as bu ON (bu.fk_bank = b.rowid AND bu.type = 'company')"; $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX."bank_url as bu ON (bu.fk_bank = b.rowid AND bu.type = 'company')";
$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON bu.url_id = s.rowid'; $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON bu.url_id = s.rowid';
$this->export_sql_end[$r] .=' WHERE ba.rowid = b.fk_account'; $this->export_sql_end[$r] .=' WHERE ba.rowid = b.fk_account';
$this->export_sql_end[$r] .=' AND ba.entity = '.$conf->entity;
$this->export_sql_end[$r] .=' ORDER BY b.datev, b.num_releve'; $this->export_sql_end[$r] .=' ORDER BY b.datev, b.num_releve';
} }