Hi Dolibarr developers,
Please find attached a patch which addresses the following issues:
- deprecation warning on mysql_db_query() using the mysql db module
- use "PaymentTypeShortXXX" prefix in crabe PDF generator instead of "XXX"
- language fixes for nb_NO
The patch is in diff --git format, I believe this is as close to unified diff
as I get?
Thanks for your time.
--
Best regards,
Kim Tore Jensen
http://www.kimtore.no/
diff --git a/htdocs/includes/modules/facture/pdf_crabe.modules.php
b/htdocs/includes/modules/facture/pdf_crabe.modules.php
index 77a3800..2d6e4cd 100644
--- a/htdocs/includes/modules/facture/pdf_crabe.modules.php
+++ b/htdocs/includes/modules/facture/pdf_crabe.modules.php
@@ -518,6 +518,7 @@ class pdf_crabe extends ModelePDFFactures
$oper = 'CHQ';
break;
}
+ $oper =
$outputlangs->transnoentities("PaymentTypeShort" . $oper);
$pdf->MultiCell(20, 3, $oper, 0, 'L', 0);
$pdf->SetXY ($tab3_posx+60, $tab3_top+$y);
$pdf->MultiCell(20, 3, $row[3], 0, 'L', 0);
diff --git a/htdocs/langs/nb_NO/bills.lang b/htdocs/langs/nb_NO/bills.lang
index 59f5d7d..f86ab69 100644
--- a/htdocs/langs/nb_NO/bills.lang
+++ b/htdocs/langs/nb_NO/bills.lang
@@ -32,6 +32,7 @@ CardBill=Fakturakort
PredefinedInvoices=Forhåndsdefinerte fakturaer
Invoice=Faktura
Invoices=Fakturaer
+InvoiceDeposit=Faktura
InvoiceLine=Fakturalinje
InvoiceCustomer=Kundefaktura
CustomerInvoice=Kundefaktura
@@ -112,7 +113,7 @@ ErrorInvoiceAvoirMustBeNegative=Feil: Korrigeringsfaktura
må ha negativt beløp
ErrorInvoiceOfThisTypeMustBePositive=Feil: Denne fakturatypen må ha postitivt
beløp
ErrorCantCancelIfReplacementInvoiceNotValidated=Feil: Kan ikke kansellere en
faktura som er erstattet av en annen faktura som fortsatt er i klademodus
BillFrom=Fra
-BillTo=Fakturamottager
+BillTo=Fakturamottaker
ActionsOnBill=Handlinger på faktura
NewBill=Ny faktura
Prélèvements=Utestående ordre
@@ -183,7 +184,7 @@ SendReminderBillByMail=Send påminnelse med e-post
RelatedCommercialProposals=Relaterte tilbud
MenuToValid=Til godkjenning
DateMaxPayment=Forfallsdato
-DateEcheance=Forfallsadato
+DateEcheance=Forfallsdato
DateInvoice=Fakturadato
NoInvoice=Ingen faktura
ClassifyBill=Klassifiser faktura
@@ -256,10 +257,10 @@ PaymentCondition60D=60 dager
PaymentConditionShort60DENDMONTH=Leveringsmåned + 60 dager
PaymentCondition60DENDMONTH=Leveringsmåned + 60 dager
# PaymentType
-PaymentTypeVIR=Bankinnskudd
-PaymentTypeShortVIR=Bankinskudd
-PaymentTypePRE=Bankgiro
-PaymentTypeShortPRE=Bankgiro
+PaymentTypeVIR=Bankgiro
+PaymentTypeShortVIR=Bankgiro
+PaymentTypePRE=Bankinnskudd
+PaymentTypeShortPRE=Bankinnskudd
PaymentTypeLIQ=Kontant
PaymentTypeShortLIQ=Kontant
PaymentTypeCB=Kredittkort
@@ -276,8 +277,8 @@ BankDetails=Bankopplysninger
BankCode=Bank code (ikke i Norge)
DeskCode=Desk code (ikke i Norge)
BankAccountNumber=Kontonummer
-BankAccountNumberKey=Key (ikke i Norge)
-Residence=Domiciliation (ikke i Norge)
+BankAccountNumberKey=Nøkkel
+Residence=Kontoadresse
IBANNumber=IBAN-nummer
IBAN=IBAN
BIC=BIC/SWIFT
@@ -297,7 +298,7 @@ IntracommunityVATNumber=Intracommunity number of VAT (ikke
i Norge)
PaymentByChequeOrderedTo=Sjekkbetaling til %s send til
PaymentByChequeOrderedToShort=Sjekkbetaling til
SendTo=sendt til
-PaymentByTransferOnThisBankAccount=Vennligst betal til følgende bakkonto
+PaymentByTransferOnThisBankAccount=Vennligst betal til følgende bankkonto
VATIsNotUsedForInvoice=* Avgiftsfritt
LawApplicationPart1=Alle varer forblir vår eiendom
LawApplicationPart2=intil de er fullt ut betalt.
diff --git a/htdocs/langs/nb_NO/dict.lang b/htdocs/langs/nb_NO/dict.lang
index ef3756c..89c43b9 100644
--- a/htdocs/langs/nb_NO/dict.lang
+++ b/htdocs/langs/nb_NO/dict.lang
@@ -255,6 +255,7 @@ CivilityMTRE=-
##### Currencies #####
Currencyeuros=Euro
+CurrencyNOK=NOK
CurrencyAUD=Australske dollar
CurrencyCAD=Kanadiske dollar
CurrencyCHF=Sveitsiske franc
diff --git a/htdocs/langs/nb_NO/main.lang b/htdocs/langs/nb_NO/main.lang
index 564b789..c9a3aaf 100644
--- a/htdocs/langs/nb_NO/main.lang
+++ b/htdocs/langs/nb_NO/main.lang
@@ -375,7 +375,7 @@ File=Fil
Files=Filer
NotAllowed=Ikke tillatt
ReadPermissionNotAllowed=Lesetilgang ikke tillatt
-AmountInCurrency=Beløp i %s valuta
+AmountInCurrency=Beløp i %s
Example=Eksempel
NoExample=Ingen eksempler
FindBug=Rapporter en feil
diff --git a/htdocs/lib/databases/mysql.lib.php
b/htdocs/lib/databases/mysql.lib.php
index 02e56a9..264e2d1 100644
--- a/htdocs/lib/databases/mysql.lib.php
+++ b/htdocs/lib/databases/mysql.lib.php
@@ -369,7 +369,8 @@ class DoliDb
}
else
{
- $ret = mysql_db_query($this->database_name, $query,
$this->db);
+ mysql_select_db($this->database_name);
+ $ret = mysql_query($query, $this->db);
}
if (! preg_match("/^COMMIT/i",$query) && !
preg_match("/^ROLLBACK/i",$query))
_______________________________________________
Dolibarr-dev mailing list
[email protected]
http://lists.nongnu.org/mailman/listinfo/dolibarr-dev
