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

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2013-08-31 12:44:13 +02:00
commit 4272209832
7 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -116,6 +116,9 @@ Fix: Link "Show all supplier invoice" on suplier card not working
Fix: [ bug #1039 ] Pre-defined invoices conversion Fix: [ bug #1039 ] Pre-defined invoices conversion
Fix: If only service module is activated, it's impossible to delete service Fix: If only service module is activated, it's impossible to delete service
Fix: [ bug #1043 ] Bad interventions ref numbering 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.* ***** ***** ChangeLog for 3.4 compared to 3.3.* *****
For users: For users:

10
htdocs/core/boxes/box_ficheinter.php
View File

@ -1,5 +1,6 @@
<?php <?php
/* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro> /* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2013 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
@ -95,11 +96,11 @@ class box_ficheinter extends ModeleBoxes
$this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"', $this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"',
'logo' => $this->boximg, '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"', $this->info_box_contents[$i][1] = array('td' => 'align="left"',
'text' => ($objp->ref?$objp->ref:$objp->rowid), // Some contracts have no ref 'text' => ($objp->ref?$objp->ref:$objp->rowid), // Some interventions have no ref
'url' => DOL_URL_ROOT."/contrat/fiche.php?id=".$objp->rowid); 'url' => DOL_URL_ROOT."/fichinter/fiche.php?id=".$objp->rowid);
$this->info_box_contents[$i][2] = array('td' => 'align="left" width="16"', $this->info_box_contents[$i][2] = array('td' => 'align="left" width="16"',
'logo' => 'company', 'logo' => 'company',
@ -120,9 +121,10 @@ class box_ficheinter extends ModeleBoxes
$i++; $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); $db->free($resql);
} }
else else
{ {

9
htdocs/core/lib/tax.lib.php
View File

@ -2,6 +2,7 @@
/* Copyright (C) 2004-2009 Laurent Destailleur <eldy@users.sourceforge.net> /* Copyright (C) 2004-2009 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2006-2007 Yannick Warnier <ywarnier@beeznest.org> * Copyright (C) 2006-2007 Yannick Warnier <ywarnier@beeznest.org>
* Copyright (C) 2011 Regis Houssin <regis.houssin@capnetworks.com> * Copyright (C) 2011 Regis Houssin <regis.houssin@capnetworks.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
@ -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']]['totalht'])) $list[$assoc['rate']]['totalht']=0;
if (! isset($list[$assoc['rate']]['vat'])) $list[$assoc['rate']]['vat']=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']]['localtax1'])) $list[$assoc['rate']]['localtax1']=0;
if (! isset($list[$assoc['rate']]['locatax2'])) $list[$assoc['rate']]['localtax2']=0; if (! isset($list[$assoc['rate']]['localtax2'])) $list[$assoc['rate']]['localtax2']=0;
if ($assoc['rowid'] != $oldrowid) // Si rupture sur d.rowid 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']]['totalht'])) $list[$assoc['rate']]['totalht']=0;
if (! isset($list[$assoc['rate']]['vat'])) $list[$assoc['rate']]['vat']=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']]['localtax1'])) $list[$assoc['rate']]['localtax1']=0;
if (! isset($list[$assoc['rate']]['locatax2'])) $list[$assoc['rate']]['localtax2']=0; if (! isset($list[$assoc['rate']]['localtax2'])) $list[$assoc['rate']]['localtax2']=0;
if ($assoc['rowid'] != $oldrowid) // Si rupture sur d.rowid if ($assoc['rowid'] != $oldrowid) // Si rupture sur d.rowid
{ {

1
htdocs/langs/ca_ES/boxes.lang
View File

@ -75,6 +75,7 @@ NoRecordedProducts=Sense productes/serveis registrats
NoRecordedProspects=Sense clients potencials registrats NoRecordedProspects=Sense clients potencials registrats
NoContractedProducts=Sense productes/serveis contractats NoContractedProducts=Sense productes/serveis contractats
NoRecordedContracts=Sense contractes registrats NoRecordedContracts=Sense contractes registrats
NoRecordedInterventions=Sense intervencions registrades
BoxLatestSupplierOrders=Últimes comandes a proveïdors BoxLatestSupplierOrders=Últimes comandes a proveïdors
BoxTitleLatestSupplierOrders=Les %s últimes comandes a proveïdors BoxTitleLatestSupplierOrders=Les %s últimes comandes a proveïdors
NoSupplierOrder=Sense comandes a proveïdors NoSupplierOrder=Sense comandes a proveïdors

1
htdocs/langs/en_US/boxes.lang
View File

@ -75,6 +75,7 @@ NoRecordedProducts=No recorded products/services
NoRecordedProspects=No recorded prospects NoRecordedProspects=No recorded prospects
NoContractedProducts=No products/services contracted NoContractedProducts=No products/services contracted
NoRecordedContracts=No recorded contracts NoRecordedContracts=No recorded contracts
NoRecordedInterventions=No recorded interventions
BoxLatestSupplierOrders=Latest supplier orders BoxLatestSupplierOrders=Latest supplier orders
BoxTitleLatestSupplierOrders=%s latest supplier orders BoxTitleLatestSupplierOrders=%s latest supplier orders
NoSupplierOrder=No recorded supplier order NoSupplierOrder=No recorded supplier order

1
htdocs/langs/es_ES/boxes.lang
View File

@ -75,6 +75,7 @@ NoRecordedProducts=Sin productos/servicios registrados
NoRecordedProspects=Sin clientes potenciales registrados NoRecordedProspects=Sin clientes potenciales registrados
NoContractedProducts=Sin productos/servicios contratados NoContractedProducts=Sin productos/servicios contratados
NoRecordedContracts=Sin contratos registrados NoRecordedContracts=Sin contratos registrados
NoRecordedInterventions=Sin intervenciones registradas
BoxLatestSupplierOrders=Últimos pedidos a proveedores BoxLatestSupplierOrders=Últimos pedidos a proveedores
BoxTitleLatestSupplierOrders=Los %s últimos pedidos a proveedores BoxTitleLatestSupplierOrders=Los %s últimos pedidos a proveedores
NoSupplierOrder=Sin pedidos a proveedores NoSupplierOrder=Sin pedidos a proveedores

1
htdocs/langs/fr_FR/boxes.lang
View File

@ -75,6 +75,7 @@ NoRecordedProducts=Pas de produit/service enregistré
NoRecordedProspects=Pas de prospect enregistré NoRecordedProspects=Pas de prospect enregistré
NoContractedProducts=Pas de produit/service contracté NoContractedProducts=Pas de produit/service contracté
NoRecordedContracts=Pas de contrat enregistré NoRecordedContracts=Pas de contrat enregistré
NoRecordedInterventions=Pas fiche d'intervention enregistrée
BoxLatestSupplierOrders=Dernières commandes fournisseur BoxLatestSupplierOrders=Dernières commandes fournisseur
BoxTitleLatestSupplierOrders=Les %s dernières commandes fournisseur enregistrées BoxTitleLatestSupplierOrders=Les %s dernières commandes fournisseur enregistrées
NoSupplierOrder=Pas de commande fournisseur enregistrée NoSupplierOrder=Pas de commande fournisseur enregistrée