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

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

Browse Source
This commit is contained in:
Maxime Kohlhaas 2013-01-25 15:56:01 +01:00
commit 81d5fa87e0
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
View File

@ -1,5 +1,6 @@
<?php <?php
/* Copyright (C) 2010-2011 Regis Houssin <regis.houssin@capnetworks.com> /* Copyright (C) 2010-2011 Regis Houssin <regis.houssin@capnetworks.com>
* 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
@ -37,6 +38,7 @@ print_titre($langs->trans('RelatedCommercialProposals'));
</tr> </tr>
<?php <?php
$var=true; $var=true;
$total=0;
foreach($linkedObjectBlock as $object) foreach($linkedObjectBlock as $object)
{ {
$var=!$var; $var=!$var;

2
htdocs/commande/tpl/linkedobjectblock.tpl.php
View File

@ -1,5 +1,6 @@
<?php <?php
/* Copyright (C) 2010-2011 Regis Houssin <regis.houssin@capnetworks.com> /* Copyright (C) 2010-2011 Regis Houssin <regis.houssin@capnetworks.com>
* 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
@ -38,6 +39,7 @@ print_titre($langs->trans('RelatedOrders'));
</tr> </tr>
<?php <?php
$var=true; $var=true;
$total=0;
foreach($linkedObjectBlock as $object) foreach($linkedObjectBlock as $object)
{ {
$var=!$var; $var=!$var;

2
htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
View File

@ -1,5 +1,6 @@
<?php <?php
/* Copyright (C) 2010-2011 Regis Houssin <regis.houssin@capnetworks.com> /* Copyright (C) 2010-2011 Regis Houssin <regis.houssin@capnetworks.com>
* 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
@ -38,6 +39,7 @@ else print_titre($langs->trans("RelatedBill"));
</tr> </tr>
<?php <?php
$var=true; $var=true;
$total=0;
foreach($linkedObjectBlock as $object) foreach($linkedObjectBlock as $object)
{ {
$var=!$var; $var=!$var;

2
htdocs/fourn/facture/fiche.php
View File

@ -2078,7 +2078,7 @@ else
$formmail->frommail = $user->email; $formmail->frommail = $user->email;
$formmail->withfrom=1; $formmail->withfrom=1;
$formmail->withto=empty($_POST["sendto"])?1:$_POST["sendto"]; $formmail->withto=empty($_POST["sendto"])?1:$_POST["sendto"];
$formmail->withtosocid=$soc->id; $formmail->withtosocid=$societe->id;
$formmail->withtocc=1; $formmail->withtocc=1;
$formmail->withtoccsocid=0; $formmail->withtoccsocid=0;
$formmail->withtoccc=$conf->global->MAIN_EMAIL_USECCC; $formmail->withtoccc=$conf->global->MAIN_EMAIL_USECCC;