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

New: More import options. Customer and suppliers categories

Browse Source
This commit is contained in:
simnandez 2012-10-26 18:34:49 +02:00
parent 425ebae802
commit d4df585e3c
4 changed files with 46 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
htdocs/core/modules/modCategorie.class.php
View File

@ -197,38 +197,44 @@ class modCategorie extends DolibarrModules
); );
$this->import_examplevalues_array[$r]=array('cp.fk_categorie'=>"Imported category",'cp.fk_product'=>"PREF123456"); $this->import_examplevalues_array[$r]=array('cp.fk_categorie'=>"Imported category",'cp.fk_product'=>"PREF123456");
} }
//Customers if (! empty($conf->societe->enabled))
$r++; {
$this->import_code[$r]=$this->rights_class.'_'.$r; //Customers
$this->import_label[$r]="Clientes por categoría"; // Translation key $r++;
$this->import_icon[$r]=$this->picto; $this->import_code[$r]=$this->rights_class.'_'.$r;
$this->import_entities_array[$r]=array(); // We define here only fields that use another icon that the one defined into import_icon $this->import_label[$r]="CatCusList"; // Translation key
$this->import_tables_array[$r]=array('co'=>MAIN_DB_PREFIX.'categorie_societe'); $this->import_icon[$r]=$this->picto;
$this->import_fields_array[$r]=array('co.fk_categorie'=>"Categorie*",'co.fk_societe'=>"Tercero*" $this->import_entities_array[$r]=array(); // We define here only fields that use another icon that the one defined into import_icon
); $this->import_tables_array[$r]=array('cs'=>MAIN_DB_PREFIX.'categorie_societe');
$this->import_fields_array[$r]=array('cs.fk_categorie'=>"Categorie*",'cs.fk_societe'=>"ThirdParty*"
$this->import_convertvalue_array[$r]=array( );
'co.fk_categorie'=>array('rule'=>'fetchidfromref','classfile'=>'/categories/class/categorie.class.php','class'=>'Categorie','method'=>'fetch','element'=>'category'),
'co.fk_societe'=>array('rule'=>'fetchidfromref','classfile'=>'/societe/class/societe.class.php','class'=>'Societe','method'=>'fetch','element'=>'ThirdParty') $this->import_convertvalue_array[$r]=array(
); 'cs.fk_categorie'=>array('rule'=>'fetchidfromref','classfile'=>'/categories/class/categorie.class.php','class'=>'Categorie','method'=>'fetch','element'=>'category'),
$this->import_examplevalues_array[$r]=array('co.fk_categorie'=>"Nombre categoría",'co.fk_societe'=>"Nombre cliente"); 'cs.fk_societe'=>array('rule'=>'fetchidfromref','classfile'=>'/societe/class/societe.class.php','class'=>'Societe','method'=>'fetch','element'=>'ThirdParty')
);
// Suppliers $this->import_examplevalues_array[$r]=array('cs.fk_categorie'=>"Imported category",'cs.fk_societe'=>"MyBigCompany");
$r++; }
$this->import_code[$r]=$this->rights_class.'_'.$r;
$this->import_label[$r]="Proveedores por categoría"; // Translation key if (! empty($conf->fournisseur->enabled))
$this->import_icon[$r]=$this->picto; {
$this->import_entities_array[$r]=array(); // We define here only fields that use another icon that the one defined into import_icon // Suppliers
$this->import_tables_array[$r]=array('co'=>MAIN_DB_PREFIX.'categorie_fournisseur'); $r++;
$this->import_fields_array[$r]=array('co.fk_categorie'=>"Categorie*",'co.fk_societe'=>"Tercero*" $this->import_code[$r]=$this->rights_class.'_'.$r;
); $this->import_label[$r]="CatSupList"; // Translation key
$this->import_icon[$r]=$this->picto;
$this->import_convertvalue_array[$r]=array( $this->import_entities_array[$r]=array(); // We define here only fields that use another icon that the one defined into import_icon
'co.fk_categorie'=>array('rule'=>'fetchidfromref','classfile'=>'/categories/class/categorie.class.php','class'=>'Categorie','method'=>'fetch','element'=>'category'), $this->import_tables_array[$r]=array('cs'=>MAIN_DB_PREFIX.'categorie_fournisseur');
'co.fk_societe'=>array('rule'=>'fetchidfromref','classfile'=>'/societe/class/societe.class.php','class'=>'Societe','method'=>'fetch','element'=>'ThirdParty') $this->import_fields_array[$r]=array('cs.fk_categorie'=>"Categorie*",'co.fk_societe'=>"Supplier*"
); );
$this->import_examplevalues_array[$r]=array('co.fk_categorie'=>"Nombre categoria",'co.fk_societe'=>"Nombre proveedor");
$this->import_convertvalue_array[$r]=array(
'cs.fk_categorie'=>array('rule'=>'fetchidfromref','classfile'=>'/categories/class/categorie.class.php','class'=>'Categorie','method'=>'fetch','element'=>'category'),
'cs.fk_societe'=>array('rule'=>'fetchidfromref','classfile'=>'/societe/class/societe.class.php','class'=>'Societe','method'=>'fetch','element'=>'ThirdParty')
);
$this->import_examplevalues_array[$r]=array('cs.fk_categorie'=>"Imported category",'cs.fk_societe'=>"MyBigCompany");
}
} }

2
htdocs/install/mysql/migration/3.2.0-3.3.0.sql
View File

@ -773,6 +773,8 @@ ALTER TABLE llx_product_fournisseur_price ADD COLUMN import_key varchar(14) AFTE
ALTER TABLE llx_product_stock ADD COLUMN import_key varchar(14) AFTER pmp; ALTER TABLE llx_product_stock ADD COLUMN import_key varchar(14) AFTER pmp;
ALTER TABLE llx_societe_rib ADD COLUMN import_key varchar(14) AFTER adresse_proprio; ALTER TABLE llx_societe_rib ADD COLUMN import_key varchar(14) AFTER adresse_proprio;
ALTER TABLE llx_categorie_product ADD COLUMN import_key varchar(14) AFTER fk_product; ALTER TABLE llx_categorie_product ADD COLUMN import_key varchar(14) AFTER fk_product;
ALTER TABLE llx_categorie_societe ADD COLUMN import_key varchar(14) AFTER fk_societe;
ALTER TABLE llx_categorie_fournisseur ADD COLUMN import_key varchar(14) AFTER fk_societe;
-- Export filter -- Export filter
ALTER TABLE llx_export_model ADD COLUMN filter text AFTER field; ALTER TABLE llx_export_model ADD COLUMN filter text AFTER field;

4
htdocs/install/mysql/tables/llx_categorie_fournisseur.sql
View File

@ -2,6 +2,7 @@
-- Copyright (C) 2006 Rodolphe Quiedeville <rodolphe@quiedeville.org> -- Copyright (C) 2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
-- Copyright (C) 2012 Laurent Destailleur <eldy@users.sourceforge.net> -- Copyright (C) 2012 Laurent Destailleur <eldy@users.sourceforge.net>
-- Copyright (C) 2012 Regis Houssin <regis@dolibarr.fr> -- Copyright (C) 2012 Regis Houssin <regis@dolibarr.fr>
-- Copyright (C) 2012 Juanjo Menent <jmenent@2byte.es>
-- --
-- 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
@ -21,5 +22,6 @@
create table llx_categorie_fournisseur create table llx_categorie_fournisseur
( (
fk_categorie integer NOT NULL, fk_categorie integer NOT NULL,
fk_societe integer NOT NULL fk_societe integer NOT NUL,
import_key varchar(14)
)ENGINE=innodb; )ENGINE=innodb;

4
htdocs/install/mysql/tables/llx_categorie_societe.sql
View File

@ -1,5 +1,6 @@
-- ============================================================================ -- ============================================================================
-- Copyright (C) 2007 Patrick Raguin <patrick.raguin@gmail.com> -- Copyright (C) 2007 Patrick Raguin <patrick.raguin@gmail.com>
-- Copyright (C) 2012 Juanjo Menent <jmenent@2byte.es>
-- --
-- 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
@ -19,5 +20,6 @@
create table llx_categorie_societe create table llx_categorie_societe
( (
fk_categorie integer NOT NULL, fk_categorie integer NOT NULL,
fk_societe integer NOT NULL fk_societe integer NOT NULL,
import_key varchar(14)
)ENGINE=innodb; )ENGINE=innodb;