From 7511f626b3d5eb4bc34afc2d014761c226b6f312 Mon Sep 17 00:00:00 2001 From: simnandez Date: Wed, 19 Feb 2014 17:32:20 +0100 Subject: [PATCH 01/15] Fix: Action event SHIPPING_VALIDATE is not implemented --- ChangeLog | 1 + ...terface_50_modAgenda_ActionsAuto.class.php | 21 ++++++++++++++++++- htdocs/langs/ca_ES/agenda.lang | 1 + htdocs/langs/en_US/agenda.lang | 1 + htdocs/langs/es_ES/agenda.lang | 1 + htdocs/langs/fr_FR/agenda.lang | 1 + 6 files changed, 25 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index a90f737ab4d..d58f3278d2c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -29,6 +29,7 @@ Fix: user right on Holiday for month report nor working. Fix: [ bug #1250 ] "Supplier Ref. product" sidebar search box does not work Fix: Bad space in predefined messages. Fix: Signature was not added for email sent from thirdparty page. +Fix: Action event SHIPPING_VALIDATE is not implemented ***** ChangeLog for 3.5 compared to 3.4.* ***** For users: diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php index b089b5487a7..6ab80b6ad88 100644 --- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php +++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php @@ -1,7 +1,7 @@ * Copyright (C) 2009-2011 Regis Houssin - * Copyright (C) 2011 Juanjo Menent + * Copyright (C) 2011-2013 Juanjo Menent * Copyright (C) 2013 Cedric GROSS * * This program is free software; you can redistribute it and/or modify @@ -373,6 +373,25 @@ class InterfaceActionsAuto // Parameters $object->sendotid defined by caller //$object->sendtoid=0; $ok=1; + } + elseif ($action == 'SHIPPING_VALIDATE') + { + dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); + $langs->load("other"); + $langs->load("sendings"); + $langs->load("agenda"); + + $object->actiontypecode='AC_OTH_AUTO'; + if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ShippingValidated",$object->ref); + if (empty($object->actionmsg)) + { + $object->actionmsg=$langs->transnoentities("ShippingValidated",$object->ref); + $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login; + } + + // Parameters $object->sendtoid defined by caller + //$object->sendtoid=0; + $ok=1; } elseif ($action == 'SHIPPING_SENTBYMAIL') { diff --git a/htdocs/langs/ca_ES/agenda.lang b/htdocs/langs/ca_ES/agenda.lang index 238911047e3..f0612d4abe2 100644 --- a/htdocs/langs/ca_ES/agenda.lang +++ b/htdocs/langs/ca_ES/agenda.lang @@ -52,6 +52,7 @@ InvoiceSentByEMail=Factura a client %s enviada per e-mail SupplierOrderSentByEMail=Comanda a proveïdor %s enviada per e-mail SupplierInvoiceSentByEMail=Factura de proveïdor %s enviada per e-mail ShippingSentByEMail=Expedició %s enviada per e-mail +ShippingValidated=Expedició %s validada InterventionSentByEMail=Intervenció %s enviada per e-mail NewCompanyToDolibarr= Tercer creat DateActionPlannedStart= Data d'inici prevista diff --git a/htdocs/langs/en_US/agenda.lang b/htdocs/langs/en_US/agenda.lang index 187f818210e..0e37d3290f7 100644 --- a/htdocs/langs/en_US/agenda.lang +++ b/htdocs/langs/en_US/agenda.lang @@ -52,6 +52,7 @@ InvoiceSentByEMail=Customer invoice %s sent by EMail SupplierOrderSentByEMail=Supplier order %s sent by EMail SupplierInvoiceSentByEMail=Supplier invoice %s sent by EMail ShippingSentByEMail=Shipping %s sent by EMail +ShippingValidated= Shipping %s validated InterventionSentByEMail=Intervention %s sent by EMail NewCompanyToDolibarr= Third party created DateActionPlannedStart= Planned start date diff --git a/htdocs/langs/es_ES/agenda.lang b/htdocs/langs/es_ES/agenda.lang index 3a70851d276..f25d183a111 100644 --- a/htdocs/langs/es_ES/agenda.lang +++ b/htdocs/langs/es_ES/agenda.lang @@ -52,6 +52,7 @@ InvoiceSentByEMail=Factura a cliente %s enviada por e-mail SupplierOrderSentByEMail=Pedido a proveedor %s enviada por e-mail SupplierInvoiceSentByEMail=Factura de proveedor %s enviada por e-mail ShippingSentByEMail=Expedición %s enviada por e-mail +ShippingValidated= Expedición %s validada InterventionSentByEMail=Intervención %s enviada por e-mail NewCompanyToDolibarr=Tercero creado DateActionPlannedStart=Fecha de inicio prevista diff --git a/htdocs/langs/fr_FR/agenda.lang b/htdocs/langs/fr_FR/agenda.lang index 190c08ad2ac..d21617fde47 100644 --- a/htdocs/langs/fr_FR/agenda.lang +++ b/htdocs/langs/fr_FR/agenda.lang @@ -52,6 +52,7 @@ InvoiceSentByEMail=Facture client %s envoyée par EMail SupplierOrderSentByEMail=Commande fournisseur %s envoyée par EMail SupplierInvoiceSentByEMail=Facture fournisseur %s envoyée par Email ShippingSentByEMail=Bon d'expédition %s envoyé par Email +ShippingValidated=Bon d'expédition %s validée InterventionSentByEMail=Intervention %s envoyée par Email NewCompanyToDolibarr= Tiers créé DateActionPlannedStart= Date de début de réalisation prévue From e5136487bd924317d98c357b8462789b8876547f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 20 Feb 2014 16:51:37 +0100 Subject: [PATCH 02/15] Fix: The customer code was set to uppercase when using numbering module leopard. We must keep data safe of any change. --- ChangeLog | 2 ++ .../core/modules/societe/mod_codeclient_leopard.php | 11 +++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index d58f3278d2c..0432585483a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -30,6 +30,8 @@ Fix: [ bug #1250 ] "Supplier Ref. product" sidebar search box does not work Fix: Bad space in predefined messages. Fix: Signature was not added for email sent from thirdparty page. Fix: Action event SHIPPING_VALIDATE is not implemented +Fix: The customer code was set to uppercase when using numbering module leopard. We + must keep data safe of any change. ***** ChangeLog for 3.5 compared to 3.4.* ***** For users: diff --git a/htdocs/core/modules/societe/mod_codeclient_leopard.php b/htdocs/core/modules/societe/mod_codeclient_leopard.php index 584a4941777..affee5274ca 100644 --- a/htdocs/core/modules/societe/mod_codeclient_leopard.php +++ b/htdocs/core/modules/societe/mod_codeclient_leopard.php @@ -1,6 +1,6 @@ - * Copyright (C) 2006-2009 Laurent Destailleur + * Copyright (C) 2006-2014 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 @@ -27,8 +27,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/societe/modules_societe.class.php' /** - * \class mod_codeclient_leopard - * \brief Classe permettant la gestion leopard des codes tiers + * Class to manage numbering of thirdparties code */ class mod_codeclient_leopard extends ModeleThirdPartyCode { @@ -104,7 +103,7 @@ class mod_codeclient_leopard extends ModeleThirdPartyCode global $conf; $result=0; - $code = strtoupper(trim($code)); + $code = trim($code); if (empty($code) && $this->code_null && empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)) { @@ -115,9 +114,9 @@ class mod_codeclient_leopard extends ModeleThirdPartyCode $result=-2; } - dol_syslog("mod_codeclient_leopard::verif type=".$type." result=".$result); + dol_syslog(get_class($this)."::verif type=".$type." result=".$result); return $result; } } -?> +?> \ No newline at end of file From b1eef7cd4213031f96f1afb7726537cfa89764a8 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 24 Feb 2014 17:29:52 +0100 Subject: [PATCH 03/15] Fix: [ bug #1254 ] Error when using "Enter" on qty input box of a product --- htdocs/comm/propal.php | 8 ++++++-- htdocs/commande/fiche.php | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 48cd8531a69..fce3661c0ce 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -637,7 +637,9 @@ else if ($action == "setabsolutediscount" && $user->rights->propal->creer) else if (($action == 'addline' || $action == 'addline_predef') && $user->rights->propal->creer) { // Set if we used free entry or predefined product - if (GETPOST('addline_libre')) + if (GETPOST('addline_libre') + || (GETPOST('dp_desc') && ! GETPOST('addline_libre') && ! GETPOST('idprod', 'int')>0) // we push enter onto qty field + ) { $predef=''; $idprod=0; @@ -645,7 +647,9 @@ else if (($action == 'addline' || $action == 'addline_predef') && $user->rights- $price_ht = GETPOST('price_ht'); $tva_tx=(GETPOST('tva_tx')?GETPOST('tva_tx'):0); } - if (GETPOST('addline_predefined')) + if (GETPOST('addline_predefined') + || (! GETPOST('dp_desc') && ! GETPOST('addline_predefined') && GETPOST('idprod', 'int')>0) // we push enter onto qty field + ) { $predef=(($conf->global->MAIN_FEATURES_LEVEL < 2) ? '_predef' : ''); $idprod=GETPOST('idprod', 'int'); diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index 7a5b74165bb..bfafd72d307 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -571,7 +571,9 @@ else if ($action == 'addline' && $user->rights->commande->creer) $error = false; // Set if we used free entry or predefined product - if (GETPOST('addline_libre')) + if (GETPOST('addline_libre') + || (GETPOST('dp_desc') && ! GETPOST('addline_libre') && ! GETPOST('idprod', 'int')>0) // we push enter onto qty field + ) { $predef=''; $idprod=0; @@ -579,7 +581,9 @@ else if ($action == 'addline' && $user->rights->commande->creer) $price_ht = GETPOST('price_ht'); $tva_tx=(GETPOST('tva_tx')?GETPOST('tva_tx'):0); } - if (GETPOST('addline_predefined')) + if (GETPOST('addline_predefined') + || (! GETPOST('dp_desc') && ! GETPOST('addline_predefined') && GETPOST('idprod', 'int')>0) // we push enter onto qty field + ) { $predef=(($conf->global->MAIN_FEATURES_LEVEL < 2) ? '_predef' : ''); $idprod=GETPOST('idprod', 'int'); From 8ec10f8efae0d49ee269f7653f1317ab9ea554dd Mon Sep 17 00:00:00 2001 From: Peter Fontaine Date: Mon, 24 Feb 2014 21:20:06 +0100 Subject: [PATCH 04/15] Add state_id in contact for individual third party --- htdocs/societe/class/societe.class.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index 4f00cef5f9f..f4ba0197e47 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -313,6 +313,7 @@ class Societe extends CommonObject $contact->zip = $this->zip; $contact->town = $this->town; $contact->phone_pro = $this->phone; + $contact->state_id = $this->state_id; $result = $contact->create($user); if ($result < 0) { $this->error = $contact->error; From 7ac405e06727aae1d3b9f9d7c7a508d6867425e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Tue, 25 Feb 2014 03:17:26 +0100 Subject: [PATCH 05/15] Added SpecialCode translation key --- htdocs/langs/en_US/exports.lang | 1 + htdocs/langs/es_ES/exports.lang | 1 + 2 files changed, 2 insertions(+) diff --git a/htdocs/langs/en_US/exports.lang b/htdocs/langs/en_US/exports.lang index f1defa94c36..f6ea95c4ae8 100644 --- a/htdocs/langs/en_US/exports.lang +++ b/htdocs/langs/en_US/exports.lang @@ -123,6 +123,7 @@ BankCode=Bank code DeskCode=Desk code BankAccountNumber=Account number BankAccountNumberKey=Key +SpecialCode=Special code ## filters SelectFilterFields=If you want to filter on some values, just input values here. FilterableFields=Champs Filtrables diff --git a/htdocs/langs/es_ES/exports.lang b/htdocs/langs/es_ES/exports.lang index 61517a81dc5..f90475ce24a 100644 --- a/htdocs/langs/es_ES/exports.lang +++ b/htdocs/langs/es_ES/exports.lang @@ -123,6 +123,7 @@ BankCode=Código banco DeskCode=Código oficina BankAccountNumber=Número cuenta BankAccountNumberKey=Dígito Control +SpecialCode=Código especial ## filters SelectFilterFields=Si quiere aplicar un filtro sobre algunos valores, introdúzcalos aquí. FilterableFields=Campos filtrables From 4157452c6d37b33f101aa078d3d4697149b9cdbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Tue, 25 Feb 2014 03:19:21 +0100 Subject: [PATCH 06/15] Translated export filters --- htdocs/exports/class/export.class.php | 15 +++++---------- htdocs/langs/en_US/exports.lang | 3 +++ htdocs/langs/es_ES/exports.lang | 3 +++ htdocs/langs/fr_FR/exports.lang | 3 +++ 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/htdocs/exports/class/export.class.php b/htdocs/exports/class/export.class.php index 39225d26d6e..42299a755b5 100644 --- a/htdocs/exports/class/export.class.php +++ b/htdocs/exports/class/export.class.php @@ -430,30 +430,25 @@ class Export * * @param string $TypeField Type of Field to filter * @return string html string of the input field ex : "" - * TODO replace by translation */ function genDocFilter($TypeField) { + global $langs; + $szMsg=''; $InfoFieldList = explode(":", $TypeField); // build the input field on depend of the type of file switch ($InfoFieldList[0]) { case 'Text': - $szMsg="% permet de remplacer un ou plusieurs caractères dans la chaine"; + $szMsg= $langs->trans('ExportStringFilter'); break; case 'Date': - $szMsg ="'AAAA' 'AAAAMM' 'AAAAMMJJ' : filtre sur une année/mois/jour
"; - $szMsg.="'AAAA+AAAA' 'AAAAMM+AAAAMM' 'AAAAMMJJ+AAAAMMJJ': filtre sur une plage d'année/mois/jour
"; - $szMsg.="'>AAAA' '>AAAAMM' '>AAAAMMJJ' filtre sur les année/mois/jour suivants
"; - $szMsg.="'‹AAAA' '‹AAAAMM' '‹AAAAMMJJ' filtre sur les année/mois/jour précédent
"; + $szMsg = $langs->trans('ExportDateFilter'); break; case 'Duree': break; case 'Numeric': - $szMsg ="'NNNNN' filtre sur une valeur
"; - $szMsg.="'NNNNN+NNNNN' filtre sur une plage de valeur
"; - $szMsg.="'‹NNNNN' filtre sur les valeurs inférieurs
"; - $szMsg.="'>NNNNN' filtre sur les valeurs supérieurs
"; + $szMsg = $langs->trans('ExportNumericFilter'); break; case 'Boolean': break; diff --git a/htdocs/langs/en_US/exports.lang b/htdocs/langs/en_US/exports.lang index f6ea95c4ae8..38d25738a64 100644 --- a/htdocs/langs/en_US/exports.lang +++ b/htdocs/langs/en_US/exports.lang @@ -124,6 +124,9 @@ DeskCode=Desk code BankAccountNumber=Account number BankAccountNumberKey=Key SpecialCode=Special code +ExportStringFilter=%% allows replacing one or more characters in the text +ExportDateFilter='AAAA' 'AAAAMM' 'AAAAMMJJ': filters by one year/month/day
'AAAA+AAAA' 'AAAAMM+AAAAMM' 'AAAAMMJJ+AAAAMMJJ': filters over a range of years/months/days
'>AAAA' '>AAAAMM' '>AAAAMMJJ': filters on the following years/months/days
'>AAAA' '>AAAAMM' '>AAAAMMJJ': filters on the previous years/months/days +ExportNumericFilter='NNNNN' filters by one value
'NNNNN+NNNNN' filters over a range of values
'>NNNNN' filters by lower values
'>NNNNN' filters by higher values ## filters SelectFilterFields=If you want to filter on some values, just input values here. FilterableFields=Champs Filtrables diff --git a/htdocs/langs/es_ES/exports.lang b/htdocs/langs/es_ES/exports.lang index f90475ce24a..a04d2977479 100644 --- a/htdocs/langs/es_ES/exports.lang +++ b/htdocs/langs/es_ES/exports.lang @@ -124,6 +124,9 @@ DeskCode=Código oficina BankAccountNumber=Número cuenta BankAccountNumberKey=Dígito Control SpecialCode=Código especial +ExportStringFilter=%% permite reemplazar uno o más caracteres en el texto +ExportDateFilter='AAAA' 'AAAAMM' 'AAAAMMJJ': filtra por un año/mes/día
'AAAA+AAAA' 'AAAAMM+AAAAMM' 'AAAAMMJJ+AAAAMMJJ': filtra entre un rango de años/meses/días
'>AAAA' '>AAAAMM' '>AAAAMMJJ': filtra por los siguientes años/meses/días
'‹AAAA' '‹AAAAMM' '‹AAAAMMJJ': filtra por los anteriores años/meses/días +ExportNumericFilter='NNNNN' filtra por un valor
'NNNNN+NNNNN' filtra entre un rango de valores
'‹NNNNN' filtra por valores inferiores
'>NNNNN' filtra por valores superiores ## filters SelectFilterFields=Si quiere aplicar un filtro sobre algunos valores, introdúzcalos aquí. FilterableFields=Campos filtrables diff --git a/htdocs/langs/fr_FR/exports.lang b/htdocs/langs/fr_FR/exports.lang index f16e90a5399..5dd55e14781 100644 --- a/htdocs/langs/fr_FR/exports.lang +++ b/htdocs/langs/fr_FR/exports.lang @@ -123,6 +123,9 @@ BankCode=Code banque DeskCode=Code guichet BankAccountNumber=Numéro de compte BankAccountNumberKey=Clé RIB +ExportStringFilter=%% permet de remplacer un ou plusieurs caractères dans la chaine +ExportDateFilter='AAAA' 'AAAAMM' 'AAAAMMJJ': filtre sur une année/mois/jour
'AAAA+AAAA' 'AAAAMM+AAAAMM' 'AAAAMMJJ+AAAAMMJJ': filtre sur une plage d'année/mois/jour
'>AAAA' '>AAAAMM' '>AAAAMMJJ': filtre sur les année/mois/jour suivants
'>AAAA' '>AAAAMM' '>AAAAMMJJ' filtre sur les année/mois/jour précédent +ExportNumericFilter='NNNNN' filtre sur une valeur
'NNNNN+NNNNN' filtre sur une plage de valeur
'>NNNNN' filtre sur les valeurs inférieurs
'>NNNNN' filtre sur les valeurs supérieurs ## filters SelectFilterFields=Si vous voulez filtrer sur certaines valeurs, saisissez ces valeurs. FilterableFields=Champs filtrables From 4411908b23bbc13d48245dd5e7d8f45c5defaefe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Tue, 25 Feb 2014 04:18:13 +0100 Subject: [PATCH 07/15] Fixed translations of project export wizard --- htdocs/core/modules/modProjet.class.php | 12 ++++++------ htdocs/exports/export.php | 5 ++++- htdocs/langs/en_US/projects.lang | 9 +++++++++ htdocs/langs/es_ES/projects.lang | 9 +++++++++ htdocs/theme/eldy/img/object_task_time.png | Bin 0 -> 199 bytes 5 files changed, 28 insertions(+), 7 deletions(-) create mode 100644 htdocs/theme/eldy/img/object_task_time.png diff --git a/htdocs/core/modules/modProjet.class.php b/htdocs/core/modules/modProjet.class.php index fb7fa20533b..e606a2db5a5 100644 --- a/htdocs/core/modules/modProjet.class.php +++ b/htdocs/core/modules/modProjet.class.php @@ -187,8 +187,8 @@ class modProjet extends DolibarrModules $this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','s.fk_pays'=>'Country', 's.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.code_compta'=>'CustomerAccountancyCode','s.code_compta_fournisseur'=>'SupplierAccountancyCode', - 'p.rowid'=>"ProjectId",'p.ref'=>"ProjectRef",'p.datec'=>"DateCreation",'p.dateo'=>"DateDebutProjet",'p.datee'=>"DateFinProjet",'p.fk_statut'=>'ProjectStatus','p.description'=>"projectNote", - 'pt.rowid'=>'RefTask','pt.dateo'=>"TaskDateo",'pt.datee'=>"TaskDatee",'pt.duration_effective'=>"DurationEffective",'pt.planned_workload'=>"DurationPlanned",'pt.progress'=>"Progress",'pt.description'=>"TaskDesc", + 'p.rowid'=>"ProjectId",'p.ref'=>"RefProject",'p.datec'=>"DateCreation",'p.dateo'=>"DateStart",'p.datee'=>"DateEnd",'p.fk_statut'=>'Status','p.description'=>"Description", + 'pt.rowid'=>'RefTask','pt.dateo'=>"TaskDateStart",'pt.datee'=>"TaskDateEnd",'pt.duration_effective'=>"DurationEffective",'pt.planned_workload'=>"PlannedWorkload",'pt.progress'=>"Progress",'pt.description'=>"TaskDescription", 'ptt.task_date'=>'TaskTimeDate','ptt.task_duration'=>"TimesSpent",'ptt.fk_user'=>"TaskTimeUser",'ptt.note'=>"TaskTimeNote"); $this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','s.fk_pays'=>'List:c_pays:libelle', @@ -197,10 +197,10 @@ class modProjet extends DolibarrModules 'pt.dateo'=>"Date",'pt.datee'=>"Date",'pt.duration_effective'=>"Duree",'pt.planned_workload'=>"Number",'pt.progress'=>"Number",'pt.description'=>"Text", 'ptt.task_date'=>'Date','ptt.task_duration'=>"Duree",'ptt.fk_user'=>"List:user:Name",'ptt.note'=>"Text"); - $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'=>"project",'f.ref'=>"project",'f.datec'=>"project",'f.duree'=>"project",'f.fk_statut'=>"project",'f.description'=>"project", - 'pt.rowid'=>'task','pt.dateo'=>"task",'pt.datee'=>"task",'pt.duration_effective'=>"task",'pt.planned_workload'=>"task",'pt.progress'=>"task",'pt.description'=>"task", + $this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','s.fk_pays'=>'company', + 's.phone'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.code_compta'=>'company','s.code_compta_fournisseur'=>'company', + 'p.rowid'=>"project",'p.ref'=>"project",'p.datec'=>"project",'p.dateo'=>"project",'p.datee'=>"project",'p.duree'=>"project",'p.fk_statut'=>"project",'p.description'=>"project", + 'pt.rowid'=>'projecttask','pt.dateo'=>"projecttask",'pt.datee'=>"projecttask",'pt.duration_effective'=>"projecttask",'pt.planned_workload'=>"projecttask",'pt.progress'=>"projecttask",'pt.description'=>"projecttask", 'ptt.task_date'=>'task_time','ptt.task_duration'=>"task_time",'ptt.fk_user'=>"task_time",'ptt.note'=>"task_time"); diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php index aefe5490802..9d8c59f8eaa 100644 --- a/htdocs/exports/export.php +++ b/htdocs/exports/export.php @@ -91,7 +91,10 @@ $entitytolang = array( 'other' => 'Other', 'trip' => 'TripsAndExpenses', 'shipment' => 'Shipments', - 'shipment_line'=> 'ShipmentLine' + 'shipment_line'=> 'ShipmentLine', + 'project' => 'Projects', + 'projecttask' => 'Tasks', + 'task_time' => 'TaskTimeSpent' ); $array_selected=isset($_SESSION["export_selected_fields"])?$_SESSION["export_selected_fields"]:array(); diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang index ba0b6b6dcd2..c6355cdec95 100644 --- a/htdocs/langs/en_US/projects.lang +++ b/htdocs/langs/en_US/projects.lang @@ -1,4 +1,6 @@ # Dolibarr language file - Source file is en_US - projects +RefProject=Ref. project +ProjectId=Project Id Project=Project Projects=Projects SharedProject=Everybody @@ -30,11 +32,18 @@ TimeSpent=Time spent TimesSpent=Time spent RefTask=Ref. task LabelTask=Label task +TaskTimeSpent=Time spent on tasks +TaskTimeUser=Task time user +TaskTimeNote=Task time note +TaskTimeDate=Task time date NewTimeSpent=New time spent MyTimeSpent=My time spent MyTasks=My tasks Tasks=Tasks Task=Task +TaskDateStart=Task start date +TaskDateEnd=Task end date +TaskDescription=Task description NewTask=New task AddTask=Add task AddDuration=Add duration diff --git a/htdocs/langs/es_ES/projects.lang b/htdocs/langs/es_ES/projects.lang index 1df7fd8d92a..04e5723e9f2 100644 --- a/htdocs/langs/es_ES/projects.lang +++ b/htdocs/langs/es_ES/projects.lang @@ -1,4 +1,6 @@ # Dolibarr language file - Source file is en_US - projects +RefProject=Ref. proyecto +ProjectId=Id proyecto Project=Proyecto Projects=Proyectos SharedProject=Proyecto compartido @@ -30,11 +32,18 @@ TimeSpent=Tiempo dedicado TimesSpent=Tiempos dedicados RefTask=Ref. tarea LabelTask=Etiqueta tarea +TaskTimeSpent=Tiempo dedicado a tareas +TaskTimeUser=Usuario de tiempo dedicado +TaskTimeNote=Nota de tiempo dedicado +TaskTimeDate=Fecha de tiempo dedicado NewTimeSpent=Nuevo tiempo dedicado MyTimeSpent=Mi tiempo dedicado MyTasks=Mis tareas Tasks=Tareas Task=Tarea +TaskDateStart=Fecha inicio tarea +TaskDateEnd=Fecha fin tarea +TaskDescription=Descripción de tarea NewTask=Nueva tarea AddTask=Añadir tarea AddDuration=Indicar duración diff --git a/htdocs/theme/eldy/img/object_task_time.png b/htdocs/theme/eldy/img/object_task_time.png new file mode 100644 index 0000000000000000000000000000000000000000..8cda1f3f2202f020c2aa7f0438b72e06f559c83e GIT binary patch literal 199 zcmeAS@N?(olHy`uVBq!ia0vp^JV4CN!VDyL#uerODaPU;cPEB*=VV?2IYI$GA+G=b z|6jIj*|b?Nu3o(gWX~_#;#?)61X7yh?e4vL>4nJaD4z_MyE9? lK9WujUNMOxAp(mS8H6JFu1;5C6$k2M@O1TaS?83{1OOqAH4Oj& literal 0 HcmV?d00001 From f7eb4c5b145bddcf39a7f893e979070a19926933 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Tue, 25 Feb 2014 04:39:41 +0100 Subject: [PATCH 08/15] Updated user export labels --- htdocs/core/modules/modUser.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/modules/modUser.class.php b/htdocs/core/modules/modUser.class.php index 257f37c5411..e0be7ece744 100644 --- a/htdocs/core/modules/modUser.class.php +++ b/htdocs/core/modules/modUser.class.php @@ -209,7 +209,7 @@ class modUser extends DolibarrModules $this->export_code[$r]=$this->rights_class.'_'.$r; $this->export_label[$r]='Liste des utilisateurs Dolibarr et attributs'; $this->export_permission[$r]=array(array("user","user","export")); - $this->export_fields_array[$r]=array('u.rowid'=>"Id",'u.login'=>"Login",'u.lastname'=>"Lastname",'u.firstname'=>"Firstname",'u.office_phone'=>'Telephone','u.office_fax'=>'Fax','u.email'=>'EMail','u.datec'=>"DateCreation",'u.tms'=>"DateLastModification",'u.admin'=>"Admin",'u.statut'=>'Status','u.note'=>"Note",'u.datelastlogin'=>'LastConnexion','u.datepreviouslogin'=>'PreviousConnexion','u.fk_socpeople'=>"IdContact",'u.fk_societe'=>"IdCompany",'u.fk_member'=>"MemberId"); + $this->export_fields_array[$r]=array('u.rowid'=>"Id",'u.login'=>"Login",'u.lastname'=>"Lastname",'u.firstname'=>"Firstname",'u.office_phone'=>'Phone','u.office_fax'=>'Fax','u.email'=>'EMail','u.datec'=>"DateCreation",'u.tms'=>"DateLastModification",'u.admin'=>"Administrator",'u.statut'=>'Status','u.note'=>"Note",'u.datelastlogin'=>'LastConnexion','u.datepreviouslogin'=>'PreviousConnexion','u.fk_socpeople'=>"IdContact",'u.fk_societe'=>"IdCompany",'u.fk_member'=>"MemberId"); $this->export_TypeFields_array[$r]=array('u.login'=>"Text",'u.lastname'=>"Text",'u.firstname'=>"Text",'u.office_phone'=>'Text','u.office_fax'=>'Text','u.email'=>'Text','u.datec'=>"Date",'u.tms'=>"Date",'u.admin'=>"Boolean",'u.statut'=>'Status','u.note'=>"Text",'u.datelastlogin'=>'Date','u.datepreviouslogin'=>'Date','u.fk_societe'=>"List:societe:nom:rowid",'u.fk_member'=>"List:adherent:nom"); $this->export_entities_array[$r]=array('u.rowid'=>"user",'u.login'=>"user",'u.lastname'=>"user",'u.firstname'=>"user",'u.office_phone'=>'user','u.office_fax'=>'user','u.email'=>'user','u.datec'=>"user",'u.tms'=>"user",'u.admin'=>"user",'u.statut'=>'user','u.note'=>"user",'u.datelastlogin'=>'user','u.datepreviouslogin'=>'user','u.fk_socpeople'=>"contact",'u.fk_societe'=>"company",'u.fk_member'=>"member"); From 63a2aa3365386cbbd2b2a42d70ede409be344f9b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 25 Feb 2014 15:48:13 +0100 Subject: [PATCH 09/15] Fix: sql error with postgres when creating extrafield with an upper cas character. code for new fields must be always lowercase. --- htdocs/core/actions_extrafields.inc.php | 6 +++--- htdocs/core/tpl/admin_extrafields_add.tpl.php | 2 +- htdocs/langs/en_US/admin.lang | 1 + htdocs/langs/en_US/errors.lang | 1 + htdocs/langs/fr_FR/admin.lang | 1 + htdocs/langs/fr_FR/errors.lang | 1 + 6 files changed, 8 insertions(+), 4 deletions(-) diff --git a/htdocs/core/actions_extrafields.inc.php b/htdocs/core/actions_extrafields.inc.php index 74bf7c40ad8..70b173ab014 100644 --- a/htdocs/core/actions_extrafields.inc.php +++ b/htdocs/core/actions_extrafields.inc.php @@ -117,8 +117,8 @@ if ($action == 'add') if (! $error) { - // Type et taille non encore pris en compte => varchar(255) - if (isset($_POST["attrname"]) && preg_match("/^\w[a-zA-Z0-9-_]*$/",$_POST['attrname'])) + // attrname must be alphabetical and lower case only + if (isset($_POST["attrname"]) && preg_match("/^[a-z0-9-_]+$/",$_POST['attrname'])) { // Construct array for parameter (value of select list) $default_value = GETPOST('default_value'); @@ -159,7 +159,7 @@ if ($action == 'add') { $error++; $langs->load("errors"); - $mesg=$langs->trans("ErrorFieldCanNotContainSpecialCharacters",$langs->transnoentities("AttributeCode")); + $mesg=$langs->trans("ErrorFieldCanNotContainSpecialNorUpperCharacters",$langs->transnoentities("AttributeCode")); setEventMessage($mesg,'errors'); $action = 'create'; } diff --git a/htdocs/core/tpl/admin_extrafields_add.tpl.php b/htdocs/core/tpl/admin_extrafields_add.tpl.php index d1f8fc6bb37..e4c4d75c85e 100644 --- a/htdocs/core/tpl/admin_extrafields_add.tpl.php +++ b/htdocs/core/tpl/admin_extrafields_add.tpl.php @@ -70,7 +70,7 @@ trans("Label"); ?> -trans("AttributeCode"); ?> (trans("AlphaNumOnlyCharsAndNoSpace"); ?>) +trans("AttributeCode"); ?> (trans("AlphaNumOnlyLowerCharsAndNoSpace"); ?>) trans("Type"); ?> selectarray('type',$type2label,GETPOST('type')); ?> diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index a72ab80eb3f..ee651563845 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -983,6 +983,7 @@ ExtraFieldsProject=Complementary attributes (projects) ExtraFieldsProjectTask=Complementary attributes (tasks) ExtraFieldHasWrongValue=Attribut %s has a wrong value. AlphaNumOnlyCharsAndNoSpace=only alphanumericals characters without space +AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space SendingMailSetup=Setup of sendings by email SendmailOptionNotComplete=Warning, on some Linux systems, to send email from your email, sendmail execution setup must contains option -ba (parameter mail.force_extra_parameters into your php.ini file). If some recipients never receive emails, try to edit this PHP parameter with mail.force_extra_parameters = -ba). PathToDocuments=Path to documents diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang index ac4d439a208..3ebd9720118 100644 --- a/htdocs/langs/en_US/errors.lang +++ b/htdocs/langs/en_US/errors.lang @@ -62,6 +62,7 @@ ErrorNoValueForCheckBoxType=Please fill value for checkbox list ErrorNoValueForRadioType=Please fill value for radio list ErrorBadFormatValueList=The list value cannot have more than one come : %s, but need at least one: llave,valores ErrorFieldCanNotContainSpecialCharacters=Field %s must not contains special characters. +ErrorFieldCanNotContainSpecialNorUpperCharacters=Field %s must not contains special characters, nor upper case characters. ErrorNoAccountancyModuleLoaded=No accountancy module activated ErrorExportDuplicateProfil=This profil name already exists for this export set. ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete. diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index 9562d51fd58..244dc51d3db 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -983,6 +983,7 @@ ExtraFieldsProject=Attributs supplémentaires (projets) ExtraFieldsProjectTask=Attributs supplémentaires (tâches) ExtraFieldHasWrongValue=L'attribut %s a une valeur incorrecte. AlphaNumOnlyCharsAndNoSpace=uniquement caractères alphanumériques sans espace +AlphaNumOnlyLowerCharsAndNoSpace=uniquement caractères minuscules alphanumériques sans espace SendingMailSetup=Configuration de l'envoi par email SendmailOptionNotComplete=Attention, sur certains systèmes Linux, avec cette méthode d'envoi, pour pouvoir envoyer des emails en votre nom, la configuration d'exécution de sendmail doit contenir l'option -ba (paramètre mail.force_extra_parameters dans le fichier php.ini). Si certains de vos destinataires ne reçoivent pas de message, essayer de modifier ce paramètre PHP avec mail.force_extra_parameters = -ba. PathToDocuments=Chemin d'accès aux documents diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang index 5dea9e06d48..a1ed822619e 100644 --- a/htdocs/langs/fr_FR/errors.lang +++ b/htdocs/langs/fr_FR/errors.lang @@ -62,6 +62,7 @@ ErrorNoValueForCheckBoxType=Les valeurs de la liste de case a cochées doivent ErrorNoValueForRadioType=Les valeurs de la liste d'options doivent être renseignées ErrorBadFormatValueList=Les valeurs de la liste ne peuvent pas contenir plus d'une virgule : %s, mais doivent en avoir au moins une: clef,valeur ErrorFieldCanNotContainSpecialCharacters=Le champ %s ne peut contenir de caractères spéciaux. +ErrorFieldCanNotContainSpecialNorUpperCharacters=Le champ %s ne peut contenir de caractères spéciaux, ni de caractères en majuscules. ErrorNoAccountancyModuleLoaded=Aucun module de comptabilité activé ErrorExportDuplicateProfil=Ce nom de profil existe déjà pour ce lot d'export. ErrorLDAPSetupNotComplete=Le matching Dolibarr-LDAP est incomplet. From 473b0f73be5be19c60bc4dbb452ada1911b25614 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 26 Feb 2014 10:42:45 +0100 Subject: [PATCH 10/15] New: build_class_from_table can work with a distant database server. --- dev/skeletons/build_class_from_table.php | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/dev/skeletons/build_class_from_table.php b/dev/skeletons/build_class_from_table.php index cc6d557c58c..cae093ef89f 100755 --- a/dev/skeletons/build_class_from_table.php +++ b/dev/skeletons/build_class_from_table.php @@ -1,6 +1,6 @@ #!/usr/bin/php +/* Copyright (C) 2008-2014 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 @@ -50,12 +50,18 @@ print "***** $script_file ($version) *****\n"; // -------------------- START OF BUILD_CLASS_FROM_TABLE SCRIPT -------------------- // Check parameters -if (! isset($argv[1])) +if (! isset($argv[1]) || (isset($argv[2]) && ! isset($argv[6]))) { - print "Usage: $script_file tablename\n"; + print "Usage: $script_file tablename [server port databasename user pass]\n"; exit; } +if (isset($argv[2]) && isset($argv[3]) && isset($argv[4]) && isset($argv[5]) && isset($argv[6])) +{ + print 'Use specific database ids'."\n"; + $db=getDoliDBInstance('mysqli',$argv[2],$argv[5],$argv[6],$argv[4],$argv[3]); +} + if ($db->type != 'mysql' && $db->type != 'mysqli') { print "Error: This script works with mysql or mysqli driver only\n"; @@ -184,7 +190,7 @@ $varprop="\n"; $cleanparam=''; foreach($property as $key => $prop) { - if ($prop['field'] != 'rowid') + if ($prop['field'] != 'rowid' && $prop['field'] != 'id') { $varprop.="\tvar \$".$prop['field']; if ($prop['istime']) $varprop.="=''"; @@ -201,7 +207,7 @@ $varprop="\n"; $cleanparam=''; foreach($property as $key => $prop) { - if ($prop['field'] != 'rowid' && ! $prop['istime']) + if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime']) { $varprop.="\t\tif (isset(\$this->".$prop['field'].")) \$this->".$prop['field']."=trim(\$this->".$prop['field'].");"; $varprop.="\n"; @@ -283,7 +289,7 @@ $i=0; foreach($property as $key => $prop) { $i++; - if ($prop['field'] != 'rowid') + if ($prop['field'] != 'rowid' && $prop['field'] != 'id') { $varprop.="\t\t\$sql.= \" "; $varprop.=$prop['field'].'='; @@ -324,7 +330,7 @@ $i=0; foreach($property as $key => $prop) { $i++; - if ($prop['field'] != 'rowid') + if ($prop['field'] != 'rowid' && $prop['field'] != 'id') { $varprop.="\t\t\t\t\$this->".$prop['field']." = "; if ($prop['istime']) $varprop.='$this->db->jdate('; @@ -343,7 +349,7 @@ $varprop="\n"; $cleanparam=''; foreach($property as $key => $prop) { - if ($prop['field'] != 'rowid') + if ($prop['field'] != 'rowid' && $prop['field'] != 'id') { $varprop.="\t\t\$this->".$prop['field']."='';"; $varprop.="\n"; @@ -462,6 +468,6 @@ else $error++; // -------------------- END OF BUILD_CLASS_FROM_TABLE SCRIPT -------------------- -print "You can now rename generated files by removing the 'out.' prefix in their name and store them in a directory of your choice.\n"; +print "You can now rename generated files by removing the 'out.' prefix in their name and store them into directory /yourmodule/class.\n"; return $error; ?> From 0918fd21b0a8ae1231628a514788cbf58f2edaab Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 26 Feb 2014 14:48:53 +0100 Subject: [PATCH 11/15] Fix: Css errors --- htdocs/theme/cameleo/style.css.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/theme/cameleo/style.css.php b/htdocs/theme/cameleo/style.css.php index 2d5c1bc337d..7a8277a4cdc 100644 --- a/htdocs/theme/cameleo/style.css.php +++ b/htdocs/theme/cameleo/style.css.php @@ -1345,7 +1345,7 @@ div.divButAction { margin-bottom: 1.4em; } .butActionRefused { background: #FFe7ec; - color: #666; + color: #aaa !important; } global->MAIN_BUTTON_HIDE_UNAUTHORIZED)) { ?> @@ -1602,6 +1602,7 @@ tr.pair td.nohover { -webkit-box-shadow: 4px 4px 4px #DDD; box-shadow: 4px 4px 4px #DDD; margin-bottom: 8px !important;*/ + background: #FFFFFF; border: 1px solid #AAA; text-align: center; border-radius: 5px; From 855dac45eae6ee34b2604822de19232a2059a213 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 26 Feb 2014 15:29:40 +0100 Subject: [PATCH 12/15] Fix: select_comptes was always making a filter on field clos making other filter field not working in some case. --- htdocs/core/class/html.form.class.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 7aa09f556b9..452d0e7110d 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -2364,7 +2364,7 @@ class Form * * @param string $selected Id account pre-selected * @param string $htmlname Name of select zone - * @param int $statut Status of searched accounts (0=open, 1=closed) + * @param int $statut Status of searched accounts (0=open, 1=closed, 2=both) * @param string $filtre To filter list * @param int $useempty 1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries. * @param string $moreattrib To add more attribute on select @@ -2376,10 +2376,10 @@ class Form $langs->load("admin"); - $sql = "SELECT rowid, label, bank"; + $sql = "SELECT rowid, label, bank, clos as status"; $sql.= " FROM ".MAIN_DB_PREFIX."bank_account"; - $sql.= " WHERE clos = '".$statut."'"; - $sql.= " AND entity IN (".getEntity('bank_account', 1).")"; + $sql.= " WHERE entity IN (".getEntity('bank_account', 1).")"; + if ($statut != 2) $sql.= " AND clos = '".$statut."'"; if ($filtre) $sql.=" AND ".$filtre; $sql.= " ORDER BY label"; @@ -2409,6 +2409,7 @@ class Form print ''; $i++; } From 9505f9e47caf48eba2b03fa6707842ce1a460803 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 25 Feb 2014 19:07:42 +0100 Subject: [PATCH 13/15] Fix: The delivery date was missing. --- .../commande/doc/pdf_einstein.modules.php | 28 ++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php index a954c68c906..4aa428f23fa 100644 --- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php +++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php @@ -152,7 +152,8 @@ class pdf_einstein extends ModelePDFCommandes $outputlangs->load("bills"); $outputlangs->load("products"); $outputlangs->load("orders"); - + $outputlangs->load("deliveries"); + if ($conf->commande->dir_output) { $object->fetch_thirdparty(); @@ -582,6 +583,31 @@ class pdf_einstein extends ModelePDFCommandes $posy=$pdf->GetY()+1; } */ + if (! empty($object->date_livraison)) + { + $pdf->SetXY($this->marge_gauche, $posy); + $pdf->SetFont('','B', $default_font_size - 2); + $text=$outputlangs->transnoentities("DeliveryDate").':'; + $pdf->MultiCell(80, 3, $text, 0, 'L', 0); + + $pdf->SetFont('','', $default_font_size - 2); + $pdf->SetXY($posxval, $posy); + $text=dol_print_date($object->date_livraison,'day','',$outputlangs); + $pdf->MultiCell(80, 3, $text, 0, 'L', 0); + + $posy=$pdf->GetY()+1; + } + /* TODO + else if (! empty($object->availability_code)) + { + $pdf->SetXY($this->marge_gauche, $posy); + $pdf->SetTextColor(200,0,0); + $pdf->SetFont('','B', $default_font_size - 2); + $pdf->MultiCell(80, 3, $outputlangs->transnoentities("AvailabilityPeriod").': '.,0,'L',0); + $pdf->SetTextColor(0,0,0); + + $posy=$pdf->GetY()+1; + }*/ // Show payment mode if ($object->mode_reglement_code From df2eb95882009299a0402903204428dfdcbdd662 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 25 Feb 2014 19:14:58 +0100 Subject: [PATCH 14/15] Fix: Right to left support --- htdocs/theme/eldy/style.css.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index c767f5b956e..d41df53975e 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -444,7 +444,7 @@ td.showDragHandle { float: none; vertical-align: top; } -#id- { +#id-right { /* This must stay id-right ant not be replaced with echo $right */ width: 100%; } @@ -477,7 +477,7 @@ div.fichehalfright { dol_optimize_smallscreen)) { print "width: 50%;\n"; } ?> } div.ficheaddleft { - dol_optimize_smallscreen)) { print "padding-left: 16px;\n"; } + dol_optimize_smallscreen)) { print "padding-".$left.": 16px;\n"; } else print "margin-top: 10px;\n"; ?> } .containercenter { @@ -510,7 +510,7 @@ div#tmenu_tooltip { display:none; height: px; - padding-right: 100px; + padding-: 100px; background: ; box-shadow: 0 0 6px rgba(0, 0, 0, .4) !important; From afebf86bf159deaa8a0727dc289897383f9a1a97 Mon Sep 17 00:00:00 2001 From: simnandez Date: Wed, 26 Feb 2014 16:55:42 +0100 Subject: [PATCH 15/15] Fix: Loading actions extrafields fails. Conflicts: htdocs/comm/action/fiche.php --- ChangeLog | 1 + htdocs/comm/action/fiche.php | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4ac20917630..f561168c23b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -88,6 +88,7 @@ Fix: Signature was not added for email sent from thirdparty page. Fix: Action event SHIPPING_VALIDATE is not implemented Fix: The customer code was set to uppercase when using numbering module leopard. We must keep data safe of any change. +Fix: Loading actions extrafields fails. ***** ChangeLog for 3.5 compared to 3.4.* ***** For users: diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php index 0f2d9b8447c..f017009fe79 100644 --- a/htdocs/comm/action/fiche.php +++ b/htdocs/comm/action/fiche.php @@ -3,7 +3,7 @@ * Copyright (C) 2004-2013 Laurent Destailleur * Copyright (C) 2005 Simon TOSSER * Copyright (C) 2005-2012 Regis Houssin - * Copyright (C) 2010 Juanjo Menent + * Copyright (C) 2010-2013 Juanjo Menent * Copyright (C) 2013 Florian Henry * * This program is free software; you can redistribute it and/or modify @@ -863,7 +863,6 @@ if ($id > 0) if (empty($reshook) && ! empty($extrafields->attribute_label)) { print $object->showOptionals($extrafields,'edit'); - } print '';