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

Fix: Some bug into supplier pdf invoice setup.

Browse Source
This commit is contained in:
Laurent Destailleur 2013-03-19 15:19:31 +01:00
parent 45a6717dd3
commit bf912e2c78
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/admin/supplier_invoice.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2013 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2011 Regis Houssin <regis.houssin@capnetworks.com> * Copyright (C) 2005-2011 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2004 Sebastien Di Cintio <sdicintio@ressource-toi.org> * Copyright (C) 2004 Sebastien Di Cintio <sdicintio@ressource-toi.org>
* Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be> * Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be>
@ -24,7 +24,7 @@
/** /**
* \file htdocs/admin/supplier_invoice.php * \file htdocs/admin/supplier_invoice.php
* \ingroup fournisseur * \ingroup fournisseur
* \brief Page d'administration-configuration du module Fournisseur * \brief Setup to admin supplier invoices
*/ */
require '../main.inc.php'; require '../main.inc.php';
@ -241,7 +241,7 @@ foreach ($dirmodels as $reldir)
while (($file = readdir($handle))!==false) while (($file = readdir($handle))!==false)
{ {
if (substr($file, 0, 25) == 'mod_facture_fournisseur_' && substr($file, dol_strlen($file)-3, 3) == 'php') if (substr($file, 0, 24) == 'mod_facture_fournisseur_' && substr($file, dol_strlen($file)-3, 3) == 'php')
{ {
$file = substr($file, 0, dol_strlen($file)-4); $file = substr($file, 0, dol_strlen($file)-4);

1
htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
View File

@ -93,6 +93,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
// Get source company // Get source company
if (! is_object($object->thirdparty)) $object->fetch_thirdparty(); if (! is_object($object->thirdparty)) $object->fetch_thirdparty();
if (! is_object($object->thirdparty)) $object->thirdparty=$mysoc; // If fetch_thirdparty fails, object has no socid (specimen)
$this->emetteur=$object->thirdparty; $this->emetteur=$object->thirdparty;
if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2); // By default, if was not defined if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2); // By default, if was not defined

19
htdocs/theme/amarok/style.css.php
View File

@ -1137,21 +1137,21 @@ tr.fiche {
.ok { .ok {
color:#159e26; color:#159e26;
background:url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/ok.png',1); ?>) left center no-repeat; background:url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/ok.png',1); ?>) left center no-repeat !important;
padding-left:20px; padding-left:20px;
font-weight:bold; font-weight:bold;
} }
.warning { .warning {
color:#bca936; color:#bca936;
background:url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/warning.png',1); ?>) left center no-repeat; background:url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/warning.png',1); ?>) left center no-repeat !important;
padding-left:20px; padding-left:20px;
font-weight:bold; font-weight:bold;
} }
.error { .error {
color:#a61111; color:#a61111;
background:url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/error.png',1); ?>) left center no-repeat; background:#f58080 url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/error.png',1); ?>) left center no-repeat !important;
padding-left:20px; padding-left:20px;
font-weight:bold; font-weight:bold;
} }
@ -1159,17 +1159,16 @@ tr.fiche {
td.highlights {background:#f9c5c6;} td.highlights {background:#f9c5c6;}
div.ok { div.ok {
background:#61e372 url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/ok.png',1); ?>) 3px center no-repeat; background:#61e372; /* url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/ok.png',1); ?>) 3px center no-repeat; */
color:#ffffff; /*color:#ffffff;*/
padding:2px 4px 2px 24px; padding:2px 4px 2px 24px;
margin:0.5em 0em; margin:0.5em 0em;
border:1px solid #159e26;
font-weight:normal; font-weight:normal;
} }
div.warning, div.info { div.warning, div.info {
background:#fcf5b8 url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/warning.png',1); ?>) 3px center no-repeat; background:#fcf5b8; /* url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/warning.png',1); ?>) 3px center no-repeat; */
color:#232323; /*color:#232323; */
padding:2px 4px 2px 24px; padding:2px 4px 2px 24px;
margin:0.5em 0em; margin:0.5em 0em;
border:1px solid #bca936; border:1px solid #bca936;
@ -1177,8 +1176,8 @@ div.warning, div.info {
} }
div.error { div.error {
background:#f58080 url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/error.png',1); ?>) 3px center no-repeat; background:#f58080; /* url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/error.png',1); ?>) 3px center no-repeat; */
color:#ffffff; /* color:#ffffff; */
padding:2px 4px 2px 24px; padding:2px 4px 2px 24px;
margin:0.5em 0em; margin:0.5em 0em;
border:1px solid #a61111; border:1px solid #a61111;