From 2cf88e784784d48d25e24a2f415544b8b56bdaaa Mon Sep 17 00:00:00 2001 From: simnandez Date: Wed, 17 Oct 2012 10:40:17 +0200 Subject: [PATCH 1/9] New: More import options. Categories Trad: Add es_ES and ca_ES missing translations --- htdocs/core/modules/modCategorie.class.php | 19 +++++++++++++++++++ htdocs/langs/ca_ES/exports.lang | 3 +++ htdocs/langs/es_ES/exports.lang | 5 ++++- 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/htdocs/core/modules/modCategorie.class.php b/htdocs/core/modules/modCategorie.class.php index 5efe476ef34..430de2ca9eb 100644 --- a/htdocs/core/modules/modCategorie.class.php +++ b/htdocs/core/modules/modCategorie.class.php @@ -157,6 +157,25 @@ class modCategorie extends DolibarrModules $this->export_sql_end[$r] .=' WHERE u.rowid = cp.fk_categorie AND cp.fk_member = p.rowid'; $this->export_sql_end[$r] .=' AND u.entity = '.$conf->entity; $this->export_sql_end[$r] .=' AND u.type = 3'; // Supplier categories + + // Imports + //-------- + + $r=0; + + $r++; + $this->import_code[$r]=$this->rights_class.'_'.$r; + $this->import_label[$r]="CatList"; // Translation key + $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 + $this->import_tables_array[$r]=array('ca'=>MAIN_DB_PREFIX.'categorie'); + $this->import_fields_array[$r]=array('ca.label'=>"Label*", + 'ca.type'=>"Type*",'ca.description'=>"Description" + ); + + $this->import_regex_array[$r]=array('ca.type'=>'^[0|1|2|3]'); + $this->import_examplevalues_array[$r]=array('ca.label'=>"Supplier Category", + 'ca.type'=>"1", 'ca.description'=>"Imported category"); } diff --git a/htdocs/langs/ca_ES/exports.lang b/htdocs/langs/ca_ES/exports.lang index dc5bdc0a2a1..d93843631ef 100644 --- a/htdocs/langs/ca_ES/exports.lang +++ b/htdocs/langs/ca_ES/exports.lang @@ -116,3 +116,6 @@ Excel95FormatDesc=Arxiu amb format Excel (.xls)
Aquest és el format n Excel2007FormatDesc=Arxiu amb format Excel (.xlsx)
Aquest és el format natiu d'Excel 2007 (SpreadsheetML). TsvFormatDesc=Arxiu amb format Valors separats per tabulador (. Tsv)
Aquest és un format d'arxiu de text en què els camps són separats per un tabulador [tab]. ExportFieldAutomaticallyAdded=S'ha afegit automàticament el camp %s, ja que evitarà que línies idèntiques siguin considerades com duplicades (amb aquest camp, cada línia tindrà un id propi). +CsvOptions=Opcions de l'arxiu CSV +Separator=Separador +Enclosure=Delimitador de camps \ No newline at end of file diff --git a/htdocs/langs/es_ES/exports.lang b/htdocs/langs/es_ES/exports.lang index 6a65a260046..ccfeba6dfd4 100644 --- a/htdocs/langs/es_ES/exports.lang +++ b/htdocs/langs/es_ES/exports.lang @@ -115,4 +115,7 @@ CSVFormatDesc=Archivo con formato Valores separados por coma (.csv).
E Excel95FormatDesc=Archivo con formato Excel (.xls)
Este es el formato nativo de Excel 95 (BIFF5). Excel2007FormatDesc=Archivo con formato Excel (.xlsx)
Este es el formato nativo de Excel 2007 (SpreadsheetML). TsvFormatDesc=Archivo con formato Valores separados por tabulador (.tsv)
Este es un formato de archivo de texto en el que los campos son separados por un tabulador [tab]. -ExportFieldAutomaticallyAdded=Se ha añadido automáticamente el campo %s, ya que evitará que líneas idénticas sean consideradas como duplicadas (con este campo, cada línea tendrá un id propio). \ No newline at end of file +ExportFieldAutomaticallyAdded=Se ha añadido automáticamente el campo %s, ya que evitará que líneas idénticas sean consideradas como duplicadas (con este campo, cada línea tendrá un id propio). +CsvOptions=Opciones del archivo CSV +Separator=Separador +Enclosure=Delimitador de campos \ No newline at end of file From cf814dc7fd9cbc0ca46284d3ef9cc0d4972be174 Mon Sep 17 00:00:00 2001 From: simnandez Date: Wed, 17 Oct 2012 10:42:16 +0200 Subject: [PATCH 2/9] New: More import options. Categories Trad: Add es_ES and ca_ES missing translations --- htdocs/core/modules/modCategorie.class.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/core/modules/modCategorie.class.php b/htdocs/core/modules/modCategorie.class.php index 430de2ca9eb..be6ecb3e8de 100644 --- a/htdocs/core/modules/modCategorie.class.php +++ b/htdocs/core/modules/modCategorie.class.php @@ -1,6 +1,7 @@ * Copyright (C) 2005-2010 Laurent Destailleur + * Copyright (C) 2012 Juanjo Menent * * 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 From 6f430cc630931883292f12b3bf7dbd9b41e90a45 Mon Sep 17 00:00:00 2001 From: simnandez Date: Wed, 17 Oct 2012 11:43:26 +0200 Subject: [PATCH 3/9] New: More import options. Supplier Products --- htdocs/core/modules/modFournisseur.class.php | 26 ++++++++++++++++++++ htdocs/langs/ca_ES/exports.lang | 3 ++- htdocs/langs/en_US/exports.lang | 3 ++- htdocs/langs/es_ES/exports.lang | 3 ++- htdocs/langs/fr_FR/exports.lang | 1 + 5 files changed, 33 insertions(+), 3 deletions(-) diff --git a/htdocs/core/modules/modFournisseur.class.php b/htdocs/core/modules/modFournisseur.class.php index 91c52370bc9..ebaf2da4e23 100644 --- a/htdocs/core/modules/modFournisseur.class.php +++ b/htdocs/core/modules/modFournisseur.class.php @@ -2,6 +2,7 @@ /* Copyright (C) 2003 Rodolphe Quiedeville * Copyright (C) 2004-2012 Laurent Destailleur * Copyright (C) 2005-2011 Regis Houssin + * Copyright (C) 2012 Juanjo Menent * * 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 @@ -287,6 +288,31 @@ class modFournisseur extends DolibarrModules $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_commande'; $this->export_sql_end[$r] .=' AND f.entity = '.$conf->entity; + + + // Imports + //-------- + // Import product suppliers + $r++; + $this->import_code[$r]=$this->rights_class.'_'.$r; + $this->import_label[$r]="SuppliersProducts"; // Translation key + $this->import_icon[$r]='product'; + $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('sp'=>MAIN_DB_PREFIX.'product_fournisseur_price'); + $this->import_tables_creator_array[$r]=array('sp'=>'fk_user'); + $this->import_fields_array[$r]=array('sp.fk_product'=>"Product*", + 'sp.fk_soc'=>"Supplier*", 'sp.ref_fourn'=>'RefSupplier', 'sp.price'=>"Price*", + 'sp.quantity'=>"Quantity*",'sp.unitprice'=>'UnitPrice*','sp.tva_tx'=>'VAT' + ); + + $this->import_convertvalue_array[$r]=array( + 'sp.fk_soc'=>array('rule'=>'fetchidfromref','classfile'=>'/societe/class/societe.class.php','class'=>'Societe','method'=>'fetch','element'=>'ThirdParty'), + 'spd.fk_product'=>array('rule'=>'fetchidfromref','classfile'=>'/product/class/product.class.php','class'=>'Product','method'=>'fetch','element'=>'Product') + ); + $this->import_examplevalues_array[$r]=array('sp.fk_product'=>"PR123456", + 'sp.fk_soc'=>"My Supplier",'sp.ref_fourn'=>"SupplierRef",'sp.price'=>"50", + 'sp.quantity'=>"1",'sp.unitprice'=>'50','sp.tva_tx'=>'21' + ); } diff --git a/htdocs/langs/ca_ES/exports.lang b/htdocs/langs/ca_ES/exports.lang index d93843631ef..be2f30d45c8 100644 --- a/htdocs/langs/ca_ES/exports.lang +++ b/htdocs/langs/ca_ES/exports.lang @@ -118,4 +118,5 @@ TsvFormatDesc=Arxiu amb format Valors separats per tabulador (. Tsv)
ExportFieldAutomaticallyAdded=S'ha afegit automàticament el camp %s, ja que evitarà que línies idèntiques siguin considerades com duplicades (amb aquest camp, cada línia tindrà un id propi). CsvOptions=Opcions de l'arxiu CSV Separator=Separador -Enclosure=Delimitador de camps \ No newline at end of file +Enclosure=Delimitador de camps +SuppliersProducts=Productes de proveïdors \ No newline at end of file diff --git a/htdocs/langs/en_US/exports.lang b/htdocs/langs/en_US/exports.lang index 02a04cb3c1a..2d332ff25ca 100644 --- a/htdocs/langs/en_US/exports.lang +++ b/htdocs/langs/en_US/exports.lang @@ -118,4 +118,5 @@ TsvFormatDesc=Tab Separated Value file format (.tsv)
This is a text fi ExportFieldAutomaticallyAdded=Field %s was automatically added. It will avoid you to have similar lines to be treated as duplicate records (with this field added, all ligne will own its own id and will differ). CsvOptions=Csv Options Separator=Separator -Enclosure=Enclosure \ No newline at end of file +Enclosure=Enclosure +SuppliersProducts=Suppliers Products \ No newline at end of file diff --git a/htdocs/langs/es_ES/exports.lang b/htdocs/langs/es_ES/exports.lang index ccfeba6dfd4..0889e50e1f9 100644 --- a/htdocs/langs/es_ES/exports.lang +++ b/htdocs/langs/es_ES/exports.lang @@ -118,4 +118,5 @@ TsvFormatDesc=Archivo con formato Valores separados por tabulador (.tsv)< ExportFieldAutomaticallyAdded=Se ha añadido automáticamente el campo %s, ya que evitará que líneas idénticas sean consideradas como duplicadas (con este campo, cada línea tendrá un id propio). CsvOptions=Opciones del archivo CSV Separator=Separador -Enclosure=Delimitador de campos \ No newline at end of file +Enclosure=Delimitador de campos +SuppliersProducts=Productos de proveedores \ No newline at end of file diff --git a/htdocs/langs/fr_FR/exports.lang b/htdocs/langs/fr_FR/exports.lang index 3c99687cd29..e14fb9ace31 100644 --- a/htdocs/langs/fr_FR/exports.lang +++ b/htdocs/langs/fr_FR/exports.lang @@ -119,3 +119,4 @@ ExportFieldAutomaticallyAdded=Le champ %s a été ajouté automatiquement CsvOptions=Options du fichier Csv Separator=Séparateur Enclosure=Délimiteur de champs +SuppliersProducts=Produits Fournisseurs \ No newline at end of file From 23d3b6a7836995dacba02a2489b63abb249b8694 Mon Sep 17 00:00:00 2001 From: simnandez Date: Wed, 17 Oct 2012 12:36:30 +0200 Subject: [PATCH 4/9] New: More import options. Supplier Products --- htdocs/core/modules/modFournisseur.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/modules/modFournisseur.class.php b/htdocs/core/modules/modFournisseur.class.php index ebaf2da4e23..f50742b70ed 100644 --- a/htdocs/core/modules/modFournisseur.class.php +++ b/htdocs/core/modules/modFournisseur.class.php @@ -307,7 +307,7 @@ class modFournisseur extends DolibarrModules $this->import_convertvalue_array[$r]=array( 'sp.fk_soc'=>array('rule'=>'fetchidfromref','classfile'=>'/societe/class/societe.class.php','class'=>'Societe','method'=>'fetch','element'=>'ThirdParty'), - 'spd.fk_product'=>array('rule'=>'fetchidfromref','classfile'=>'/product/class/product.class.php','class'=>'Product','method'=>'fetch','element'=>'Product') + 'sp.fk_product'=>array('rule'=>'fetchidfromref','classfile'=>'/product/class/product.class.php','class'=>'Product','method'=>'fetch','element'=>'Product') ); $this->import_examplevalues_array[$r]=array('sp.fk_product'=>"PR123456", 'sp.fk_soc'=>"My Supplier",'sp.ref_fourn'=>"SupplierRef",'sp.price'=>"50", From d7dcd3c14b691d6b675981dd515d1e20d3373d65 Mon Sep 17 00:00:00 2001 From: simnandez Date: Wed, 17 Oct 2012 19:02:12 +0200 Subject: [PATCH 5/9] New: More import options. Supplier Products --- htdocs/core/modules/modFournisseur.class.php | 25 ------------------ htdocs/core/modules/modProduct.class.php | 27 ++++++++++++++++++++ 2 files changed, 27 insertions(+), 25 deletions(-) diff --git a/htdocs/core/modules/modFournisseur.class.php b/htdocs/core/modules/modFournisseur.class.php index f50742b70ed..4cf2a554868 100644 --- a/htdocs/core/modules/modFournisseur.class.php +++ b/htdocs/core/modules/modFournisseur.class.php @@ -288,31 +288,6 @@ class modFournisseur extends DolibarrModules $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_commande'; $this->export_sql_end[$r] .=' AND f.entity = '.$conf->entity; - - - // Imports - //-------- - // Import product suppliers - $r++; - $this->import_code[$r]=$this->rights_class.'_'.$r; - $this->import_label[$r]="SuppliersProducts"; // Translation key - $this->import_icon[$r]='product'; - $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('sp'=>MAIN_DB_PREFIX.'product_fournisseur_price'); - $this->import_tables_creator_array[$r]=array('sp'=>'fk_user'); - $this->import_fields_array[$r]=array('sp.fk_product'=>"Product*", - 'sp.fk_soc'=>"Supplier*", 'sp.ref_fourn'=>'RefSupplier', 'sp.price'=>"Price*", - 'sp.quantity'=>"Quantity*",'sp.unitprice'=>'UnitPrice*','sp.tva_tx'=>'VAT' - ); - - $this->import_convertvalue_array[$r]=array( - 'sp.fk_soc'=>array('rule'=>'fetchidfromref','classfile'=>'/societe/class/societe.class.php','class'=>'Societe','method'=>'fetch','element'=>'ThirdParty'), - 'sp.fk_product'=>array('rule'=>'fetchidfromref','classfile'=>'/product/class/product.class.php','class'=>'Product','method'=>'fetch','element'=>'Product') - ); - $this->import_examplevalues_array[$r]=array('sp.fk_product'=>"PR123456", - 'sp.fk_soc'=>"My Supplier",'sp.ref_fourn'=>"SupplierRef",'sp.price'=>"50", - 'sp.quantity'=>"1",'sp.unitprice'=>'50','sp.tva_tx'=>'21' - ); } diff --git a/htdocs/core/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php index 72fe5a31249..b5686489744 100644 --- a/htdocs/core/modules/modProduct.class.php +++ b/htdocs/core/modules/modProduct.class.php @@ -4,6 +4,7 @@ * Copyright (C) 2004 Sebastien Di Cintio * Copyright (C) 2004 Benoit Mortier * Copyright (C) 2005-2009 Regis Houssin + * Copyright (C) 2012 Juanjo Menent * * 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 @@ -191,6 +192,32 @@ class modProduct extends DolibarrModules $this->import_fieldshidden_array[$r]=array('extra.fk_object'=>'lastrowid-'.MAIN_DB_PREFIX.'product'); // aliastable.field => ('user->id' or 'lastrowid-'.tableparent) $this->import_regex_array[$r]=array('p.ref'=>'[^ ]','p.tosell'=>'^[0|1]$','p.tobuy'=>'^[0|1]$','p.fk_product_type'=>'^[0|1]$','p.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$'); $this->import_examplevalues_array[$r]=array('p.ref'=>"PR123456",'p.label'=>"My product",'p.description'=>"This is a description example for record",'p.note'=>"Some note",'p.price'=>"100",'p.price_ttc'=>"110",'p.tva_tx'=>'10','p.tosell'=>"0 or 1",'p.tobuy'=>"0 or 1",'p.fk_product_type'=>"0 for product/1 for service",'p.finished'=>'','p.duration'=>"1y",'p.datec'=>'2008-12-31'); + + + if (! empty($conf->fournisseur->enabled)) + { + // Import product suppliers + $r++; + $this->import_code[$r]=$this->rights_class.'_'.$r; + $this->import_label[$r]="SuppliersProducts"; // Translation key + $this->import_icon[$r]='product'; + $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('sp'=>MAIN_DB_PREFIX.'product_fournisseur_price'); + $this->import_tables_creator_array[$r]=array('sp'=>'fk_user'); + $this->import_fields_array[$r]=array('sp.fk_product'=>"Product*", + 'sp.fk_soc'=>"Supplier*", 'sp.ref_fourn'=>'RefSupplier', 'sp.price'=>"Price*", + 'sp.quantity'=>"Quantity*",'sp.unitprice'=>'UnitPrice*','sp.tva_tx'=>'VAT' + ); + + $this->import_convertvalue_array[$r]=array( + 'sp.fk_soc'=>array('rule'=>'fetchidfromref','classfile'=>'/societe/class/societe.class.php','class'=>'Societe','method'=>'fetch','element'=>'ThirdParty'), + 'sp.fk_product'=>array('rule'=>'fetchidfromref','classfile'=>'/product/class/product.class.php','class'=>'Product','method'=>'fetch','element'=>'Product') + ); + $this->import_examplevalues_array[$r]=array('sp.fk_product'=>"PR123456", + 'sp.fk_soc'=>"My Supplier",'sp.ref_fourn'=>"SupplierRef",'sp.price'=>"50", + 'sp.quantity'=>"1",'sp.unitprice'=>'50','sp.tva_tx'=>'21' + ); + } } From 446a81b4c4aece59852d1b779434a7f89010a348 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Thu, 18 Oct 2012 10:35:55 +0200 Subject: [PATCH 6/9] Fix: move class in template --- htdocs/comm/propal.php | 3 --- htdocs/commande/fiche.php | 11 ++++------- htdocs/compta/facture.php | 12 ++++-------- htdocs/contrat/fiche.php | 13 +++++-------- htdocs/core/tpl/contacts.tpl.php | 8 ++++++++ htdocs/fichinter/fiche.php | 12 ++++-------- htdocs/fourn/commande/fiche.php | 12 ++++-------- htdocs/fourn/facture/fiche.php | 21 ++++++++------------- 8 files changed, 37 insertions(+), 55 deletions(-) diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 56a4e4cc754..0f9d67113fd 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -1591,9 +1591,6 @@ print '
'; if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) { - require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; - $formcompany= new FormCompany($db); - $blocname = 'contacts'; $title = $langs->trans('ContactsAddresses'); include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php'; diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index 2d348b131e8..641fcbce1ae 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -1260,9 +1260,9 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G } } - if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) + if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->commande->creer) { - if ($action == 'addcontact' && $user->rights->commande->creer) + if ($action == 'addcontact') { if ($object->id > 0) { @@ -1290,7 +1290,7 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G } // bascule du statut d'un contact - else if ($action == 'swapstatut' && $user->rights->commande->creer) + else if ($action == 'swapstatut') { if ($object->id > 0) { @@ -1303,7 +1303,7 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G } // Efface un contact - else if ($action == 'deletecontact' && $user->rights->commande->creer) + else if ($action == 'deletecontact') { $result = $object->delete_contact($lineid); @@ -2101,9 +2101,6 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) { - require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; - $formcompany= new FormCompany($db); - $blocname = 'contacts'; $title = $langs->trans('ContactsAddresses'); include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php'; diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 47ccaa16292..1d230ad7406 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -1629,9 +1629,9 @@ else if ($action == 'remove_file') } } -if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) +if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->facture->creer) { - if ($action == 'addcontact' && $user->rights->facture->creer) + if ($action == 'addcontact') { $result = $object->fetch($id); @@ -1661,7 +1661,7 @@ if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) } // bascule du statut d'un contact - else if ($action == 'swapstatut' && $user->rights->facture->creer) + else if ($action == 'swapstatut') { if ($object->fetch($id)) { @@ -1674,7 +1674,7 @@ if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) } // Efface un contact - else if ($action == 'deletecontact' && $user->rights->facture->creer) + else if ($action == 'deletecontact') { $object->fetch($id); $result = $object->delete_contact($lineid); @@ -2980,10 +2980,6 @@ else if ($id > 0 || ! empty($ref)) if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) { - require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; - require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; - $formcompany= new FormCompany($db); - $blocname = 'contacts'; $title = $langs->trans('ContactsAddresses'); include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php'; diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php index 40bf8d84396..d980a8fac2d 100644 --- a/htdocs/contrat/fiche.php +++ b/htdocs/contrat/fiche.php @@ -486,9 +486,9 @@ else if ($action == 'setnote' && $user->rights->contrat->creer) if ($result < 0) dol_print_error($db,$object->error); } -if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) +if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->contrat->creer) { - if ($action == 'addcontact' && $user->rights->contrat->creer) + if ($action == 'addcontact') { $result = $object->fetch($id); @@ -518,7 +518,7 @@ if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) } // bascule du statut d'un contact - else if ($action == 'swapstatut' && $user->rights->contrat->creer) + else if ($action == 'swapstatut') { if ($object->fetch($id)) { @@ -531,7 +531,7 @@ if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) } // Efface un contact - else if ($action == 'deletecontact' && $user->rights->contrat->creer) + else if ($action == 'deletecontact') { $object->fetch($id); $result = $object->delete_contact(GETPOST('lineid')); @@ -814,9 +814,6 @@ else if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) { - require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; - $formcompany= new FormCompany($db); - $blocname = 'contacts'; $title = $langs->trans('ContactsAddresses'); include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php'; @@ -830,7 +827,7 @@ else } - $servicepos=(isset($_REQUEST["servicepos"])?$_REQUEST["servicepos"]:1); + $servicepos=(GETPOST('servicepos')?GETPOST('servicepos'):1); // FIXME : not used ? $colorb='666666'; $arrayothercontracts=$object->getListOfContracts('others'); diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php index 2625a1ef23d..886a1d20b90 100644 --- a/htdocs/core/tpl/contacts.tpl.php +++ b/htdocs/core/tpl/contacts.tpl.php @@ -16,6 +16,13 @@ * */ +if (! class_exists('Contact')) { + require DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; +} +if (! class_exists('FormCompany')) { + require DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; +} + $module = $object->element; // Special cases @@ -25,6 +32,7 @@ elseif ($module == 'invoice_supplier') { $permission=$user->rights->fournisseur- elseif ($module == 'order_supplier') { $permission=$user->rights->fournisseur->commande->creer; } elseif (! isset($permission)) { $permission=$user->rights->$module->creer; } // If already defined by caller page +$formcompany= new FormCompany($db); $companystatic=new Societe($db); $contactstatic=new Contact($db); $userstatic=new User($db); diff --git a/htdocs/fichinter/fiche.php b/htdocs/fichinter/fiche.php index 4edf8a95091..7914a475f96 100644 --- a/htdocs/fichinter/fiche.php +++ b/htdocs/fichinter/fiche.php @@ -648,9 +648,9 @@ if ($action == 'send' && ! GETPOST('cancel','alpha') && (empty($conf->global->MA $action='presend'; } -if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) +if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->ficheinter->creer) { - if ($action == 'addcontact' && $user->rights->ficheinter->creer) + if ($action == 'addcontact') { $result = $object->fetch($id); @@ -680,7 +680,7 @@ if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) } // bascule du statut d'un contact - else if ($action == 'swapstatut' && $user->rights->ficheinter->creer) + else if ($action == 'swapstatut') { if ($object->fetch($id)) { @@ -693,7 +693,7 @@ if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) } // Efface un contact - else if ($action == 'deletecontact' && $user->rights->ficheinter->creer) + else if ($action == 'deletecontact') { $object->fetch($id); $result = $object->delete_contact(GETPOST('lineid','int')); @@ -957,10 +957,6 @@ else if ($id > 0 || ! empty($ref)) if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) { - require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; - require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; - $formcompany= new FormCompany($db); - $blocname = 'contacts'; $title = $langs->trans('ContactsAddresses'); include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php'; diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php index 7c3db50683a..937e2156561 100644 --- a/htdocs/fourn/commande/fiche.php +++ b/htdocs/fourn/commande/fiche.php @@ -876,9 +876,9 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G } } -if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) +if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->fournisseur->commande->creer) { - if ($action == 'addcontact' && $user->rights->fournisseur->commande->creer) + if ($action == 'addcontact') { $result = $object->fetch($id); @@ -908,7 +908,7 @@ if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) } // bascule du statut d'un contact - else if ($action == 'swapstatut' && $user->rights->fournisseur->commande->creer) + else if ($action == 'swapstatut') { if ($object->fetch($id)) { @@ -921,7 +921,7 @@ if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) } // Efface un contact - else if ($action == 'deletecontact' && $user->rights->fournisseur->commande->creer) + else if ($action == 'deletecontact') { $object->fetch($id); $result = $object->delete_contact($_GET["lineid"]); @@ -1253,10 +1253,6 @@ if ($id > 0 || ! empty($ref)) if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) { - require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; - require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; - $formcompany= new FormCompany($db); - $blocname = 'contacts'; $title = $langs->trans('ContactsAddresses'); include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php'; diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php index b21eeff9870..82839fc40e3 100644 --- a/htdocs/fourn/facture/fiche.php +++ b/htdocs/fourn/facture/fiche.php @@ -443,7 +443,7 @@ elseif ($action == 'update_line') $localtax1tx= get_localtax($_POST['tauxtva'], 1, $object->thirdparty); $localtax2tx= get_localtax($_POST['tauxtva'], 2, $object->thirdparty); $remise_percent=GETPOST('remise_percent'); - + $result=$object->updateline(GETPOST('lineid'), $label, $pu, GETPOST('tauxtva'), $localtax1tx, $localtax2tx, GETPOST('qty'), GETPOST('idprod'), $price_base_type, 0, $type, $remise_percent); if ($result >= 0) { @@ -500,7 +500,7 @@ elseif ($action == 'addline') $localtax1tx= get_localtax($tauxtva, 1, $object->thirdparty); $localtax2tx= get_localtax($tauxtva, 2, $object->thirdparty); $remise_percent=GETPOST('remise_percent'); - + if (! $_POST['dp_desc']) { $mesg='
'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("Description")).'
'; @@ -842,9 +842,9 @@ elseif ($action == 'remove_file') } } -if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) +if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->fournisseur->facture->creer) { - if ($action == 'addcontact' && $user->rights->fournisseur->facture->creer) + if ($action == 'addcontact') { $result = $object->fetch($id); @@ -874,7 +874,7 @@ if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) } // bascule du statut d'un contact - else if ($action == 'swapstatut' && $user->rights->fournisseur->facture->creer) + else if ($action == 'swapstatut') { if ($object->fetch($id)) { @@ -887,7 +887,7 @@ if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) } // Efface un contact - else if ($action == 'deletecontact' && $user->rights->fournisseur->facture->creer) + else if ($action == 'deletecontact') { $object->fetch($id); $result = $object->delete_contact($_GET["lineid"]); @@ -1526,11 +1526,6 @@ else if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) { print '
'; - - require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; - require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; - $formcompany= new FormCompany($db); - $blocname = 'contacts'; $title = $langs->trans('ContactsAddresses'); include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php'; @@ -1643,7 +1638,7 @@ else print ''; print '%'; - + print ' '; print ' '; @@ -1701,7 +1696,7 @@ else print ''.$object->lines[$i]->qty.''; print ''.(($object->lines[$i]->remise_percent > 0)?$object->lines[$i]->remise_percent.'%':'').''; - + print ''.price($object->lines[$i]->total_ht).''; print ''.price($object->lines[$i]->total_ttc).''; From d705995a491325401ba731a38c90cd8db5b3afdd Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Thu, 18 Oct 2012 10:36:53 +0200 Subject: [PATCH 7/9] Fix: convert line delimiters --- htdocs/admin/index.php | 6 +-- htdocs/comm/fiche.php | 4 +- htdocs/contrat/fiche.php | 12 ++--- htdocs/core/modules/modStock.class.php | 50 +++++++++---------- htdocs/fourn/fiche.php | 6 +-- htdocs/product/stock/class/entrepot.class.php | 4 +- .../stock/class/mouvementstock.class.php | 4 +- 7 files changed, 43 insertions(+), 43 deletions(-) diff --git a/htdocs/admin/index.php b/htdocs/admin/index.php index fa1b5405127..d63da5ea882 100644 --- a/htdocs/admin/index.php +++ b/htdocs/admin/index.php @@ -56,9 +56,9 @@ print $langs->trans("SetupDescription2")."

"; print '
'; //print '
'; print img_picto('','puce').' '.$langs->trans("SetupDescription3",DOL_URL_ROOT.'/admin/company.php?mainmenu=home'); -if (empty($conf->global->MAIN_INFO_SOCIETE_NOM) || empty($conf->global->MAIN_INFO_SOCIETE_PAYS)) -{ - $langs->load("errors"); +if (empty($conf->global->MAIN_INFO_SOCIETE_NOM) || empty($conf->global->MAIN_INFO_SOCIETE_PAYS)) +{ + $langs->load("errors"); $warnpicto=img_warning($langs->trans("WarningMandatorySetupNotComplete")); print '
'.$warnpicto.' '.$langs->trans("WarningMandatorySetupNotComplete").''; } diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php index 5680cfb676c..1f22f42eb4e 100644 --- a/htdocs/comm/fiche.php +++ b/htdocs/comm/fiche.php @@ -776,8 +776,8 @@ if ($id > 0) { if ($user->rights->facture->creer) { - $langs->load("bills"); - $langs->load("orders"); + $langs->load("bills"); + $langs->load("orders"); if (! empty($conf->commande->enabled)) { diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php index d980a8fac2d..ca6b2eadae1 100644 --- a/htdocs/contrat/fiche.php +++ b/htdocs/contrat/fiche.php @@ -627,9 +627,9 @@ if ($action == 'create') print ''.$langs->trans("NotePublic").''; - require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; - $doleditor=new DolEditor('note_public', GETPOST('note_public'), '', '100', 'dolibarr_notes', 'In', 1, true, true, ROWS_3, 70); - print $doleditor->Create(1); + require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; + $doleditor=new DolEditor('note_public', GETPOST('note_public'), '', '100', 'dolibarr_notes', 'In', 1, true, true, ROWS_3, 70); + print $doleditor->Create(1); /* print '