From a321264a2a249fee99e8eeb06526f79c9846f4ec Mon Sep 17 00:00:00 2001 From: simnandez Date: Thu, 29 Aug 2013 10:03:32 +0200 Subject: [PATCH 1/2] Fix: Localtaxes balance not showing Conflicts: ChangeLog --- ChangeLog | 2 ++ htdocs/core/lib/tax.lib.php | 9 +++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4b89f125915..c30c9c54360 100644 --- a/ChangeLog +++ b/ChangeLog @@ -116,6 +116,8 @@ Fix: Link "Show all supplier invoice" on suplier card not working Fix: [ bug #1039 ] Pre-defined invoices conversion Fix: If only service module is activated, it's impossible to delete service Fix: [ bug #1043 ] Bad interventions ref numbering +Fix: Mailing module : if an email is already in destinaires list all other email from selector was not inserted +Fix: Localtaxes balance not showing ***** ChangeLog for 3.4 compared to 3.3.* ***** For users: diff --git a/htdocs/core/lib/tax.lib.php b/htdocs/core/lib/tax.lib.php index 507f6f615b2..a368561d8af 100644 --- a/htdocs/core/lib/tax.lib.php +++ b/htdocs/core/lib/tax.lib.php @@ -2,6 +2,7 @@ /* Copyright (C) 2004-2009 Laurent Destailleur * Copyright (C) 2006-2007 Yannick Warnier * Copyright (C) 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 @@ -372,8 +373,8 @@ function vat_by_date($db, $y, $q, $date_start, $date_end, $modetax, $direction, { if (! isset($list[$assoc['rate']]['totalht'])) $list[$assoc['rate']]['totalht']=0; if (! isset($list[$assoc['rate']]['vat'])) $list[$assoc['rate']]['vat']=0; - if (! isset($list[$assoc['rate']]['locatax1'])) $list[$assoc['rate']]['localtax1']=0; - if (! isset($list[$assoc['rate']]['locatax2'])) $list[$assoc['rate']]['localtax2']=0; + if (! isset($list[$assoc['rate']]['localtax1'])) $list[$assoc['rate']]['localtax1']=0; + if (! isset($list[$assoc['rate']]['localtax2'])) $list[$assoc['rate']]['localtax2']=0; if ($assoc['rowid'] != $oldrowid) // Si rupture sur d.rowid { @@ -536,8 +537,8 @@ function vat_by_date($db, $y, $q, $date_start, $date_end, $modetax, $direction, { if (! isset($list[$assoc['rate']]['totalht'])) $list[$assoc['rate']]['totalht']=0; if (! isset($list[$assoc['rate']]['vat'])) $list[$assoc['rate']]['vat']=0; - if (! isset($list[$assoc['rate']]['locatax1'])) $list[$assoc['rate']]['localtax1']=0; - if (! isset($list[$assoc['rate']]['locatax2'])) $list[$assoc['rate']]['localtax2']=0; + if (! isset($list[$assoc['rate']]['localtax1'])) $list[$assoc['rate']]['localtax1']=0; + if (! isset($list[$assoc['rate']]['localtax2'])) $list[$assoc['rate']]['localtax2']=0; if ($assoc['rowid'] != $oldrowid) // Si rupture sur d.rowid { From 2a8aa50163d0ac171d5d536681ed44ba2dcd1049 Mon Sep 17 00:00:00 2001 From: simnandez Date: Thu, 29 Aug 2013 12:12:02 +0200 Subject: [PATCH 2/2] Fix: Intervention box links to contracts id Conflicts: htdocs/core/boxes/box_ficheinter.php --- ChangeLog | 1 + htdocs/core/boxes/box_ficheinter.php | 10 ++++++---- htdocs/langs/ca_ES/boxes.lang | 1 + htdocs/langs/en_US/boxes.lang | 3 ++- htdocs/langs/es_ES/boxes.lang | 1 + htdocs/langs/fr_FR/boxes.lang | 3 ++- 6 files changed, 13 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index c30c9c54360..c1b6443fa18 100644 --- a/ChangeLog +++ b/ChangeLog @@ -118,6 +118,7 @@ Fix: If only service module is activated, it's impossible to delete service Fix: [ bug #1043 ] Bad interventions ref numbering Fix: Mailing module : if an email is already in destinaires list all other email from selector was not inserted Fix: Localtaxes balance not showing +Fix: Intervention box links to contracts id ***** ChangeLog for 3.4 compared to 3.3.* ***** For users: diff --git a/htdocs/core/boxes/box_ficheinter.php b/htdocs/core/boxes/box_ficheinter.php index 4d199c3d642..245ea4cbc13 100644 --- a/htdocs/core/boxes/box_ficheinter.php +++ b/htdocs/core/boxes/box_ficheinter.php @@ -1,5 +1,6 @@ + * Copyright (C) 2013 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 @@ -95,11 +96,11 @@ class box_ficheinter extends ModeleBoxes $this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"', 'logo' => $this->boximg, - 'url' => DOL_URL_ROOT."/ficheinter/fiche.php?id=".$objp->rowid); + 'url' => DOL_URL_ROOT."/fichinter/fiche.php?id=".$objp->rowid); $this->info_box_contents[$i][1] = array('td' => 'align="left"', - 'text' => ($objp->ref?$objp->ref:$objp->rowid), // Some contracts have no ref - 'url' => DOL_URL_ROOT."/contrat/fiche.php?id=".$objp->rowid); + 'text' => ($objp->ref?$objp->ref:$objp->rowid), // Some interventions have no ref + 'url' => DOL_URL_ROOT."/fichinter/fiche.php?id=".$objp->rowid); $this->info_box_contents[$i][2] = array('td' => 'align="left" width="16"', 'logo' => 'company', @@ -120,9 +121,10 @@ class box_ficheinter extends ModeleBoxes $i++; } - if ($num==0) $this->info_box_contents[$i][0] = array('td' => 'align="center"','text'=>$langs->trans("NoRecordedContracts")); + if ($num==0) $this->info_box_contents[$i][0] = array('td' => 'align="center"','text'=>$langs->trans("NoRecordedInterventions")); $db->free($resql); + } else { diff --git a/htdocs/langs/ca_ES/boxes.lang b/htdocs/langs/ca_ES/boxes.lang index a37876da522..0b6f186c798 100644 --- a/htdocs/langs/ca_ES/boxes.lang +++ b/htdocs/langs/ca_ES/boxes.lang @@ -75,6 +75,7 @@ NoRecordedProducts=Sense productes/serveis registrats NoRecordedProspects=Sense clients potencials registrats NoContractedProducts=Sense productes/serveis contractats NoRecordedContracts=Sense contractes registrats +NoRecordedInterventions=Sense intervencions registrades BoxLatestSupplierOrders=Últimes comandes a proveïdors BoxTitleLatestSupplierOrders=Les %s últimes comandes a proveïdors NoSupplierOrder=Sense comandes a proveïdors diff --git a/htdocs/langs/en_US/boxes.lang b/htdocs/langs/en_US/boxes.lang index 65fd3dec7cd..9e924c0de72 100644 --- a/htdocs/langs/en_US/boxes.lang +++ b/htdocs/langs/en_US/boxes.lang @@ -75,6 +75,7 @@ NoRecordedProducts=No recorded products/services NoRecordedProspects=No recorded prospects NoContractedProducts=No products/services contracted NoRecordedContracts=No recorded contracts +NoRecordedInterventions=No recorded interventions BoxLatestSupplierOrders=Latest supplier orders BoxTitleLatestSupplierOrders=%s latest supplier orders NoSupplierOrder=No recorded supplier order @@ -88,4 +89,4 @@ BoxProductDistribution=Products/Services distribution BoxProductDistributionFor=Distribution of %s for %s ForCustomersInvoices=Customers invoices ForCustomersOrders=Customers orders -ForProposals=Proposals \ No newline at end of file +ForProposals=Proposals diff --git a/htdocs/langs/es_ES/boxes.lang b/htdocs/langs/es_ES/boxes.lang index 6494fd234df..7734edea817 100644 --- a/htdocs/langs/es_ES/boxes.lang +++ b/htdocs/langs/es_ES/boxes.lang @@ -75,6 +75,7 @@ NoRecordedProducts=Sin productos/servicios registrados NoRecordedProspects=Sin clientes potenciales registrados NoContractedProducts=Sin productos/servicios contratados NoRecordedContracts=Sin contratos registrados +NoRecordedInterventions=Sin intervenciones registradas BoxLatestSupplierOrders=Últimos pedidos a proveedores BoxTitleLatestSupplierOrders=Los %s últimos pedidos a proveedores NoSupplierOrder=Sin pedidos a proveedores diff --git a/htdocs/langs/fr_FR/boxes.lang b/htdocs/langs/fr_FR/boxes.lang index 48f8459c1bc..ae394cbe719 100644 --- a/htdocs/langs/fr_FR/boxes.lang +++ b/htdocs/langs/fr_FR/boxes.lang @@ -75,6 +75,7 @@ NoRecordedProducts=Pas de produit/service enregistré NoRecordedProspects=Pas de prospect enregistré NoContractedProducts=Pas de produit/service contracté NoRecordedContracts=Pas de contrat enregistré +NoRecordedInterventions=Pas fiche d'intervention enregistrée BoxLatestSupplierOrders=Dernières commandes fournisseur BoxTitleLatestSupplierOrders=Les %s dernières commandes fournisseur enregistrées NoSupplierOrder=Pas de commande fournisseur enregistrée @@ -88,4 +89,4 @@ BoxProductDistribution=Répartition des produis/services BoxProductDistributionFor=Répartition des %s pour les %s ForCustomersInvoices=Factures clients ForCustomersOrders=Commandes clients -ForProposals=Propositions \ No newline at end of file +ForProposals=Propositions