diff --git a/htdocs/MCCImport/index.php b/htdocs/MCCImport/index.php deleted file mode 100644 index 043126b1c19..00000000000 --- a/htdocs/MCCImport/index.php +++ /dev/null @@ -1,369 +0,0 @@ - - * Copyright (C) ---Put here your own copyright and developer email--- - * - * 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 2 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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -/** - * \file dev/skeletons/skeleton_page.php - * \ingroup mymodule othermodule1 othermodule2 - * \brief This file is an example of a php page - * \version $Id$ - * \author Put author name here - * \remarks Put here some comments - */ -require("./pre.inc.php"); -//require_once(DOL_DOCUMENT_ROOT."/../dev/skeletons/skeleton_class.class.php"); - -require_once(DOL_DOCUMENT_ROOT."/compta/bank/account.class.php"); - -// Load traductions files requiredby by page -$langs->load("companies"); -$langs->load("bills"); -$langs->load("other"); - -// Get parameters -$myparam = isset($_GET["myparam"])?$_GET["myparam"]:''; - -// Protection if external user -if ($user->societe_id > 0) -{ - accessforbidden(); -} - - - -/******************************************************************* -* ACTIONS -* -* Put here all code to do according to value of "action" parameter -********************************************************************/ - -llxHeader('','',''); - -if ($_REQUEST["action"] == 'import') -{ - - $account = $_REQUEST['account']; - - if (isset($_REQUEST[separatorTAB])){ - $delimiter = "\t"; - } else if (isset($_REQUEST[separator]) && trim($_REQUEST[separator]) != ""){ - $delimiter = trim($_REQUEST[separator]); - } else{ - print ('DEBE ELEGIR EL DELIMITADOR DE CAMPO!

'); - print ('begin(); - $line = ""; - $count = 0; - $fail = false; - $html = ""; - - - while (($line = fgets($file))!= ""){ - - - $line = trim($line); - if ($line == ""){ - continue; - } - - $html .= ""; - $fail = true; - break; - } - - $db->query("update llx_bank set num_releve = '".date(Ymd)."' where rowid = ".$insertid); - - - $html .= "OK"; - }else{ - $html .= "DUPLICADO"; - } - - - $count++; - } - $db->commit(); - $html .= "
#RegistroEstado
".($count+1).""; - - $data = split($delimiter,$line); - - $html .= $line.""; - - - - $data[0] = str_replace("/","-",$data[0]); - - $datePart = split("-",$data[0]); - - $dateop = dol_mktime(12,0,0,$datePart[0],$datePart[1],$datePart[2]); - - $dateop2 = $datePart[2]."-".$datePart[0]."-".$datePart[1]; - - $operation=$_REQUEST['operation']; - - $num_chq=split(" ",trim($data[1])); - $num_chq=$num_chq[count($num_chq)-1]; - - $label=$data[1]." - ".$data[3]; - $cat1=NULL; - - - - - $tmpAmount = trim($data[2]); - if ($tmpAmount{0} == "="){ - $tmpAmount = substr($tmpAmount,1); - - if (strpos($tmpAmount,"/") != FALSE){ - $amountPart = split("/",$tmpAmount); - $amount = (float)$amountPart[0]/(float)$amountPart[1]; - } else{ - $amount = $tmpAmount; - } - }else{ - $amount= str_replace(",","@",$data[2]); - $amount= str_replace(".",",",$amount); - $amount= str_replace("@",".",$amount); - } - - - $acct=new Account($db,$account); - - $exist = $db->query("Select rowid from llx_bank where datev ='".$dateop2."' AND label = '".$label."' AND amount = ".$amount." AND num_chq = '".$num_chq."'"); - - - if ($db->num_rows($exist) == 0){ - $insertid = $acct->addline($dateop, $operation, $label, $amount, $num_chq, $cat1, $user); - if ($insertid <= 0){ - //dol_print_error($db,$acct->error); - $db->rollback(); - $html .= "ERROR
"; - - print ($html); - if ($fail){ - dol_print_error($db,$acct->error); - } - - - print ('

query("Select * from llx_bank_account"); -if ($resql) -{ - $num = $db->num_rows($resql); - $i = 0; - if ($num) - { - while ($i < $num) - { - $obj = $db->fetch_object($resql); - if ($obj) - { - $accounts[] = $obj; - } - $i++; - } - } -} - - -?> - -'; - - - - -?> - - - - - - - - - - - - - - - - - - - - - - - - -
- Seleccione la cuenta destino: - - - -
- Tipo de Transacción: - - - - - - -
- select_types_paiements('CHQ','operation','1,2',2,1); ?> - - textwithhelp('',"Todas las transacciones serán cargadas con este tipo.",3); ?> -
-
- Seleccione el archivo a importar: - - -
- Omitir primer línea: - - - - - - -
- - - textwithhelp('',"Elija esta opción cuando la primer línea del archivo deba ser omitida debido a que contiene el encabezado en vez de datos.",3); ?> -
- -
- Delimitador de campo: - - - - - - - -
-  TAB. - -  Otro:   - - textwithhelp('',"Seleccione el separador de campos utilizado en el archivo. Si el caracter es TAB, utilice el checkbox; sino ingreselo en el campo de texto.",3); ?> -
- -
- - -
- -close(); -llxFooter('$Date$ - $Revision$'); -?> diff --git a/htdocs/MCCImport/pre.inc.php b/htdocs/MCCImport/pre.inc.php deleted file mode 100644 index 5b1847f3fa7..00000000000 --- a/htdocs/MCCImport/pre.inc.php +++ /dev/null @@ -1,58 +0,0 @@ - - * - * 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 2 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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -/** - * \file htdocs/dev/skeletons/pre.inc.php - * \brief File to manage left menu by default - * \version $Id$ - */ - -// Include environment and check authentification -require ("../main.inc.php"); // This include must use a relative link to the main.inc.php file - - -/** - * \brief Function called by page to show menus (top and left) - * \param head Text to show as head line - * \param title Not used - * \param helppagename Name of a help page ('' by default). - * Syntax is: For a wiki page: EN:EnglishPage|FR:FrenchPage|ES:SpanishPage - * For other external page: http://server/url - */ -function llxHeader($head = '', $title='', $help_url='') -{ - global $user, $conf, $langs; - - top_menu($head); - - $menu = new Menu(); - - // Create default menu. - - // No code here is required if you already added menu entries in - // the module descriptor (recommanded). - // If not you must manually add menu entries here (not recommanded). - /* - $langs->load("mylangfile"); - $menu->add(DOL_URL_ROOT."/mylink.php", $langs->trans("MyMenuLabel")); - } - */ - - left_menu($menu->liste, $help_url); -} -?> diff --git a/htdocs/includes/modules/modMCCImport.class.php b/htdocs/includes/modules/modMCCImport.class.php deleted file mode 100644 index 79cf31438fd..00000000000 --- a/htdocs/includes/modules/modMCCImport.class.php +++ /dev/null @@ -1,238 +0,0 @@ - - * Copyright (C) 2004-2009 Laurent Destailleur - * - * 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 2 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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -/** \defgroup mymodule Module MyModule - * \brief Example of a module descriptor. - * Such a file must be copied into htdocs/includes/module directory. - */ - -/** - * \file htdocs/includes/modules/modMyModule.class.php - * \ingroup mymodule - * \brief Description and activation file for module MyModule - * \version $Id$ - */ -include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); - - -/** \class modMyModule - * \brief Description and activation class for module MyModule - */ -class modMCCImport extends DolibarrModules -{ - /** - * \brief Constructor. Define names, constants, directories, boxes, permissions - * \param DB Database handler - */ - function modMCCImport($DB) - { - $this->db = $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 = 12345678; - // Key text used to identify module (for permissions, menus, etc...) - $this->rights_class = 'MCCImport'; - - // Family can be 'crm','financial','hr','projects','products','ecm','technic','other' - // It is used to group modules in module setup page - $this->family = "financial"; - // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module) - $this->name = eregi_replace('^mod','',get_class($this)); - // Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module) - $this->description = "Importacion de MCC"; - // Possible values for version are: 'development', 'experimental', 'dolibarr' or version - $this->version = '1.0'; - // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase) - $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name); - // Where to store the module in setup page (0=common,1=interface,2=others,3=very specific) - $this->special = 0; - // Name of png file (without png) used for this module. - // Png file must be in theme/yourtheme/img directory under name object_pictovalue.png. - $this->picto='generic'; - - // Data directories to create when module is enabled. - $this->dirs = array(); - //$this->dirs[0] = DOL_DATA_ROOT.'/mymodule; - //$this->dirs[1] = DOL_DATA_ROOT.'/mymodule/temp; - - // Relative path to module style sheet if exists. Example: '/mymodule/mycss.css'. - $this->style_sheet = ''; - - // Config pages. Put here list of php page names stored in admmin directory used to setup module. - //$this->config_page_url = array("mymodulesetuppage.php"); - - // Dependencies - $this->depends = array(); // List of modules id that must be enabled if this module is enabled - $this->requiredby = array(); // List of modules id to disable if this one is disabled - $this->phpmin = array(4,3); // Minimum version of PHP required by module - $this->need_dolibarr_version = array(2,5); // Minimum version of Dolibarr required by module - $this->langfiles = array("mymodule"); - - // Constants - $this->const = array(); // List of particular constants to add when module is enabled - //Example: $this->const=array(0=>array('MODULE_MY_NEW_CONST1','chaine','myvalue','This is a constant to add',0), - // 1=>array('MODULE_MY_NEW_CONST2','chaine','myvalue','This is another constant to add',0) ); - - // Array to add new pages in new tabs - $this->tabs = array('thirdparty:Importacion:@importMCC:/importMCC/newImport.php?id=__ID__'); - // where entity can be - // 'thirdparty' to add a tab in third party view - // 'intervention' to add a tab in intervention view - // 'supplier_order' to add a tab in supplier order view - // 'supplier_invoice' to add a tab in supplier invoice view - // 'invoice' to add a tab in customer invoice view - // 'order' to add a tab in customer order view - // 'product' to add a tab in product view - // 'propal' to add a tab in propal view - // 'member' to add a tab in fundation member view - - - // Boxes - $this->boxes = array(); // List of boxes - $r=0; - - // Add here list of php file(s) stored in includes/boxes that contains class to show a box. - // Example: - //$this->boxes[$r][1] = "myboxa.php"; - //$r++; - //$this->boxes[$r][1] = "myboxb.php"; - //$r++; - - - // Permissions - $this->rights = array(); // Permission array used by this module - $r=0; - - // Add here list of permission defined by an id, a label, a boolean and two constant strings. - // Example: - // $this->rights[$r][0] = 2000; // Permission id (must not be already used) - // $this->rights[$r][1] = 'Permision label'; // Permission label - // $this->rights[$r][3] = 1; // Permission by default for new user (0/1) - // $this->rights[$r][4] = 'level1'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2) - // $this->rights[$r][5] = 'level2'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2) - // $r++; - - - // Main menu entries - $this->menus = array(); // List of menus to add - $r=0; - - // Add here entries to declare new menus - // Example to declare the Top Menu entry: - $this->menu[$r]=array( 'fk_menu'=>0, - 'type'=>'top', - 'titre'=>'Importación', - 'mainmenu'=>'mymodule', - 'leftmenu'=>'1', - 'url'=>'/MCCImport/index.php', - 'langs'=>'mylangfile', - 'position'=>100, - 'perms'=>'1', - 'target'=>'', - 'user'=>2); - $r++; - // - // Example to declare a Left Menu entry: - // $this->menu[$r]=array( 'fk_menu'=>'r=0', // Use r=value where r is index key used for the parent menu entry (higher parent must be a top menu entry) - // 'type'=>'left', // This is a Left menu entry - // 'titre'=>'MyModule left menu 1', - // 'mainmenu'=>'mymodule', - // 'url'=>'/mymodule/pagelevel1.php', - // 'langs'=>'mylangfile', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory. - // 'position'=>100, - // 'perms'=>'1', // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules - // 'target'=>'', - // 'user'=>2); // 0=Menu for internal users, 1=external users, 2=both - // $r++; - // - // Example to declare another Left Menu entry: - // $this->menu[$r]=array( 'fk_menu'=>'r=1', // Use r=value where r is index key used for the parent menu entry (higher parent must be a top menu entry) - // 'type'=>'left', // This is a Left menu entry - // 'titre'=>'MyModule left menu 2', - // 'mainmenu'=>'mymodule', - // 'url'=>'/mymodule/pagelevel2.php', - // 'langs'=>'mylangfile', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory. - // 'position'=>100, - // 'perms'=>'1', // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules - // 'target'=>'', - // 'user'=>2); // 0=Menu for internal users, 1=external users, 2=both - // $r++; - - - // Exports - $r=1; - - // Example: - // $this->export_code[$r]=$this->rights_class.'_'.$r; - // $this->export_label[$r]='CustomersInvoicesAndInvoiceLines'; // Translation key (used only if key ExportDataset_xxx_z not found) - // $this->export_permission[$r]=array(array("facture","facture","export")); - // $this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.cp'=>'Zip','s.ville'=>'Town','s.fk_pays'=>'Country','s.tel'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.code_compta'=>'CustomerAccountancyCode','s.code_compta_fournisseur'=>'SupplierAccountancyCode','f.rowid'=>"InvoiceId",'f.facnumber'=>"InvoiceRef",'f.datec'=>"InvoiceDateCreation",'f.datef'=>"DateInvoice",'f.total'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.tva'=>"TotalVAT",'f.paye'=>"InvoicePayed",'f.fk_statut'=>'InvoiceStatus','f.note'=>"InvoiceNote",'fd.rowid'=>'LineId','fd.description'=>"LineDescription",'fd.price'=>"LineUnitPrice",'fd.tva_taux'=>"LineVATRate",'fd.qty'=>"LineQty",'fd.total_ht'=>"LineTotalHT",'fd.total_tva'=>"LineTotalTVA",'fd.total_ttc'=>"LineTotalTTC",'fd.date_start'=>"DateStart",'fd.date_end'=>"DateEnd",'fd.fk_product'=>'ProductId','p.ref'=>'ProductRef'); - // $this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.cp'=>'company','s.ville'=>'company','s.fk_pays'=>'company','s.tel'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.code_compta'=>'company','s.code_compta_fournisseur'=>'company','f.rowid'=>"invoice",'f.facnumber'=>"invoice",'f.datec'=>"invoice",'f.datef'=>"invoice",'f.total'=>"invoice",'f.total_ttc'=>"invoice",'f.tva'=>"invoice",'f.paye'=>"invoice",'f.fk_statut'=>'invoice','f.note'=>"invoice",'fd.rowid'=>'invoice_line','fd.description'=>"invoice_line",'fd.price'=>"invoice_line",'fd.total_ht'=>"invoice_line",'fd.total_tva'=>"invoice_line",'fd.total_ttc'=>"invoice_line",'fd.tva_taux'=>"invoice_line",'fd.qty'=>"invoice_line",'fd.date_start'=>"invoice_line",'fd.date_end'=>"invoice_line",'fd.fk_product'=>'product','p.ref'=>'product'); - // $this->export_alias_array[$r]=array('s.rowid'=>"socid",'s.nom'=>'soc_name','s.address'=>'soc_adres','s.cp'=>'soc_zip','s.ville'=>'soc_ville','s.fk_pays'=>'soc_pays','s.tel'=>'soc_tel','s.siren'=>'soc_siren','s.siret'=>'soc_siret','s.ape'=>'soc_ape','s.idprof4'=>'soc_idprof4','s.code_compta'=>'soc_customer_accountancy','s.code_compta_fournisseur'=>'soc_supplier_accountancy','f.rowid'=>"invoiceid",'f.facnumber'=>"ref",'f.datec'=>"datecreation",'f.datef'=>"dateinvoice",'f.total'=>"totalht",'f.total_ttc'=>"totalttc",'f.tva'=>"totalvat",'f.paye'=>"paid",'f.fk_statut'=>'status','f.note'=>"note",'fd.rowid'=>'lineid','fd.description'=>"linedescription",'fd.price'=>"lineprice",'fd.total_ht'=>"linetotalht",'fd.total_tva'=>"linetotaltva",'fd.total_ttc'=>"linetotalttc",'fd.tva_taux'=>"linevatrate",'fd.qty'=>"lineqty",'fd.date_start'=>"linedatestart",'fd.date_end'=>"linedateend",'fd.fk_product'=>'productid','p.ref'=>'productref'); - // $this->export_sql_start[$r]='SELECT DISTINCT '; - // $this->export_sql_end[$r] =' FROM ('.MAIN_DB_PREFIX.'facture as f, '.MAIN_DB_PREFIX.'facturedet as fd, '.MAIN_DB_PREFIX.'societe as s)'; - // $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (fd.fk_product = p.rowid)'; - // $this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_facture'; - // $r++; - } - - /** - * \brief Function called when module is enabled. - * The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database. - * It also creates data directories. - * \return int 1 if OK, 0 if KO - */ - function init() - { - $sql = array(); - - $result=$this->load_tables(); - - return $this->_init($sql); - } - - /** - * \brief Function called when module is disabled. - * Remove from database constants, boxes and permissions from Dolibarr database. - * Data directories are not deleted. - * \return int 1 if OK, 0 if KO - */ - function remove() - { - $sql = array(); - - return $this->_remove($sql); - } - - - /** - * \brief Create tables and keys required by module - * Files mymodule.sql and mymodule.key.sql with create table and create keys - * commands must be stored in directory /mymodule/sql/ - * This function is called by this->init. - * \return int <=0 if KO, >0 if OK - */ - function load_tables() - { - return $this->_load_tables('/mymodule/sql/'); - } -} - -?> diff --git a/htdocs/support/Thumbs.db b/htdocs/support/Thumbs.db index 76c93668dc5..b6acb21009f 100644 Binary files a/htdocs/support/Thumbs.db and b/htdocs/support/Thumbs.db differ