[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
SF.net SVN: ledger-smb:[5126] trunk
- Subject: SF.net SVN: ledger-smb:[5126] trunk
- From: ..hidden..
- Date: Tue, 04 Sep 2012 09:06:54 +0000
Revision: 5126
http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=5126&view=rev
Author: einhverfr
Date: 2012-09-04 09:06:54 +0000 (Tue, 04 Sep 2012)
Log Message:
-----------
Merging from branches/1.3
Modified Paths:
--------------
trunk/Changelog
trunk/bin/io.pl
trunk/bin/oe.pl
trunk/common.pl
trunk/locale/po/ar_EG.po
trunk/locale/po/fi.po
trunk/locale/po/nb.po
Property Changed:
----------------
trunk/
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3:3711-5097
+ /branches/1.3:3711-5125
Modified: trunk/Changelog
===================================================================
--- trunk/Changelog 2012-09-04 09:01:13 UTC (rev 5125)
+++ trunk/Changelog 2012-09-04 09:06:54 UTC (rev 5126)
@@ -77,6 +77,14 @@
Initial Release: Monday, Oct 12 2011
Supported Presently
+Changelog for 1.3.23
+* Fixed query string/stdin handling where both stdin and query string are set
+* Moved http error framework to use header methods (Chris T)
+* Fixed warning about incorrect method for ar/ap transactions (Chris T)
+* Fixed fatal gettext errors in ar_EG, fi, nb po's (Havard S)
+* Fixed prices being selected on RFQ (Chris T, h/t Erik H)
+* Fixed discount wrong after multiple parts selection (Chris T, h/T Istvan P)
+
Changelog for 1.3.22
* Fixed error when trying to save multiple make/models for a part (Chris T)
* Better error handling when date is entered into statement balance (Chris T)
@@ -97,8 +105,6 @@
perform reasonably well.
-Niel S is Neil Smith
-
Changelog for 1.3.21
* Added a default numberformat in Form.pm (Chris T)
* Added a container div for theming saved and/or posted docs (Chris T)
Modified: trunk/bin/io.pl
===================================================================
--- trunk/bin/io.pl 2012-09-04 09:01:13 UTC (rev 5125)
+++ trunk/bin/io.pl 2012-09-04 09:06:54 UTC (rev 5126)
@@ -666,7 +666,8 @@
$i++;
$form->{"qty_$i"} = $qty;
- $form->{"discount_$i"} = $form->{discount} * 100;
+ # We should unset this since it is pulling from the customer/vendor
+ # $form->{"discount_$i"} = $form->{discount};
$form->{"reqdate_$i"} = $form->{reqdate}
if $form->{type} !~ /_quotation/;
Modified: trunk/bin/oe.pl
===================================================================
--- trunk/bin/oe.pl 2012-09-04 09:01:13 UTC (rev 5125)
+++ trunk/bin/oe.pl 2012-09-04 09:06:54 UTC (rev 5126)
@@ -1087,6 +1087,12 @@
&{"$retrieve_item"}( "", \%myconfig, \%$form );
$rows = scalar @{ $form->{item_list} };
+ if ($form->{type} eq 'request_quotation'){
+ for my $ref (@{ $form->{item_list} }){
+ $ref->{sellprice} = 0;
+ $ref->{lastcost} = 0;
+ }
+ }
if ( $form->{language_code} && $rows == 0 ) {
$language_code = $form->{language_code};
Modified: trunk/common.pl
===================================================================
--- trunk/common.pl 2012-09-04 09:01:13 UTC (rev 5125)
+++ trunk/common.pl 2012-09-04 09:06:54 UTC (rev 5126)
@@ -29,7 +29,6 @@
my @common_attrs = qw(
dbh login favicon stylesheet titlebar password custom_db_fields vc header
- action
);
if ( !$script ) { # http redirect to login.pl if called w/no args
@@ -52,6 +51,7 @@
for (@common_attrs) {
$temphash{$_} = $form->{$_};
}
+ $temphash{action} = $form->{action};
undef $form;
$form = new Form($argv);
@@ -59,6 +59,7 @@
for (@common_attrs) {
$form->{$_} = $temphash{$_};
}
+ $form->{action} ||= $temphash{action}; # default to old action if not set
$form->{script} = $script;
Modified: trunk/locale/po/ar_EG.po
===================================================================
--- trunk/locale/po/ar_EG.po 2012-09-04 09:01:13 UTC (rev 5125)
+++ trunk/locale/po/ar_EG.po 2012-09-04 09:06:54 UTC (rev 5126)
@@ -32,6 +32,10 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
msgid "A"
msgstr ""
@@ -1006,7 +1010,7 @@
msgstr ""
msgid "Enter up to 3 letters separated by a colon (i.e CAD:USD:EUR) for your native and foreign currencies"
-msgstr "ØØØÙ 3 ØØÙÙ ÙÙØÙÙØ ÙÙØÙÙØ ":" )CAD:USD:EUR) ÙÙØÙÙØ ØÙÙØÙÙØ Ù ØÙØÙÙØØ ØÙØØÙØÙØ"
+msgstr "ØØØÙ 3 ØØÙÙ ÙÙØÙÙØ ÙÙØÙÙØ \":\" )CAD:USD:EUR) ÙÙØÙÙØ ØÙÙØÙÙØ Ù ØÙØÙÙØØ ØÙØØÙØÙØ"
msgid "Equity"
msgstr "ØØØ ØÙÙØÙ"
Modified: trunk/locale/po/fi.po
===================================================================
--- trunk/locale/po/fi.po 2012-09-04 09:01:13 UTC (rev 5125)
+++ trunk/locale/po/fi.po 2012-09-04 09:06:54 UTC (rev 5126)
@@ -30,7 +30,12 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+
msgid "A"
msgstr "A"
@@ -2129,7 +2134,7 @@
msgstr "Vaatimukset"
msgid "Retained Earnings"
-msgstr "KÃyttÃrahasto\jakamaton voitto"
+msgstr "KÃyttÃrahasto\\jakamaton voitto"
msgid "Role"
msgstr "Rooli"
Modified: trunk/locale/po/nb.po
===================================================================
--- trunk/locale/po/nb.po 2012-09-04 09:01:13 UTC (rev 5125)
+++ trunk/locale/po/nb.po 2012-09-04 09:06:54 UTC (rev 5126)
@@ -1,6 +1,6 @@
######################################################################
# LedgerSMB Small Medium Business Accounting
-# Copyright (c) 2001, 2004
+# Copyright (c) 2001, 2004, 2012
#
# Norwegian BokmÃl texts:
#
@@ -9,6 +9,7 @@
# Finn-Arne Johansen <..hidden..>
# Petter Reinholdtsen <..hidden..>
# Erik Inge Bolsà <..hidden..>
+# HÃvard SÃrli <..hidden..>
#
# 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
@@ -24,13 +25,18 @@
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#
#######################################################################
-
msgid ""
msgstr ""
"Project-Id-Version: LedgerSMB 1.1.1\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: HÃvard SÃrli <..hidden..>\n"
+"Language-Team: \n"
+"X-Poedit-Language: Norwegian Bokmal\n"
+"X-Poedit-Country: NORWAY\n"
msgid "A"
msgstr "A"
@@ -408,7 +414,7 @@
msgstr "InnkjÃp"
msgid "COGS account does not exist!"
-msgstr ""
+msgstr "InnkjÃps konto finnes ikke"
msgid "Cannot add timecard for a completed job!"
msgstr ""
@@ -417,19 +423,19 @@
msgstr ""
msgid "Cannot create Assembly"
-msgstr ""
+msgstr "Kan ikke opprette sammensetning"
msgid "Cannot create Labor"
-msgstr ""
+msgstr "Kan ikke opprette arbeide"
msgid "Cannot create Lock!"
msgstr "Kan ikke opprette lÃs"
msgid "Cannot create Part"
-msgstr ""
+msgstr "Kan ikke opprette vare"
msgid "Cannot create Service"
-msgstr ""
+msgstr "Kan ikke opprette tjeneste"
msgid "Cannot delete Timecard!"
msgstr ""
@@ -480,7 +486,7 @@
msgstr "Kan ikke bokfÃre postering for en avsluttet periode!"
msgid "Cannot post transaction with a debit and credit entry for the same account!"
-msgstr ""
+msgstr "Kan ikke bokfÃre postering med debit og kredit pà samme konto!"
msgid "Cannot post transaction!"
msgstr "Kan ikke bokfÃre postering!"
@@ -516,10 +522,10 @@
msgstr "Kan ikke sette flere valg for"
msgid "Cannot set multiple options for Item"
-msgstr ""
+msgstr "Kan ikke sette flere valg for vare"
msgid "Cannot stock Assembly!"
-msgstr ""
+msgstr "Kan ikke plasere sammensetninger!"
msgid "Cannot stock assemblies!"
msgstr "Kan ikke plasere sammensetninger!"
@@ -558,7 +564,7 @@
msgstr "Poststed"
msgid "Cleared"
-msgstr ""
+msgstr "Slettet"
msgid "Click on login name to edit!"
msgstr "Klikk pà brukernavn for à redigere!"
@@ -588,7 +594,7 @@
msgstr "Sammenlign med"
msgid "Completed"
-msgstr ""
+msgstr "FullfÃrt"
msgid "Components"
msgstr "Komponenter"
@@ -621,7 +627,7 @@
msgstr "Kostpris"
msgid "Cost Center"
-msgstr ""
+msgstr "Kostnadssted"
msgid "Could not save pricelist!"
msgstr "Kunne ikke lagre prisliste!"
@@ -738,13 +744,13 @@
msgstr ""
msgid "Day"
-msgstr ""
+msgstr "Dag"
msgid "Day(s)"
-msgstr ""
+msgstr "Dag(er)"
msgid "Days"
-msgstr ""
+msgstr "Dager"
msgid "Debit"
msgstr "Debet"
@@ -774,7 +780,7 @@
msgstr "Fradrag"
msgid "Default Template"
-msgstr ""
+msgstr "Standard mal"
msgid "Defaults"
msgstr "Standardinnstillinger"
@@ -795,7 +801,7 @@
msgstr ""
msgid "Deleting a language will also delete the templates for the language"
-msgstr ""
+msgstr "à slette et sprÃk vil ogsà slette malene for det aktuelle sprÃket"
msgid "Delivery Date"
msgstr "Leveringsdato"
@@ -864,7 +870,7 @@
msgstr "Epost-adresse mangler!"
msgid "E-mail message"
-msgstr ""
+msgstr "E-post melding"
msgid "E-mailed"
msgstr "Epost sendt"
@@ -915,7 +921,7 @@
msgstr "Endre gruppe"
msgid "Edit Job"
-msgstr ""
+msgstr "Endre jobb"
msgid "Edit Labor/Overhead"
msgstr "Endre arbeide/overhead"
@@ -1077,7 +1083,7 @@
msgstr "Tap pà valutahandel"
msgid "Friday"
-msgstr ""
+msgstr "Fredag"
msgid "From"
msgstr "Fra"
@@ -1110,25 +1116,25 @@
msgstr "Hovedbok"
msgid "Generate"
-msgstr ""
+msgstr "Generer"
msgid "Generate Orders"
-msgstr ""
+msgstr "Generer orderere"
msgid "Generate Purchase Orders"
-msgstr ""
+msgstr "Generer innkjÃpsorderere"
msgid "Generate Purchase Orders from Sales Order"
-msgstr ""
+msgstr "Generer innkjÃpsorderere fra salgsordere"
msgid "Generate Sales Order"
-msgstr ""
+msgstr "Generer salgsordere"
msgid "Generate Sales Order from Purchase Orders"
-msgstr ""
+msgstr "Generer salgsordere fra innkjÃpsorderer"
msgid "Generate Sales Orders"
-msgstr ""
+msgstr "Generer salgsorderer"
msgid "Goods & Services"
msgstr "Varer og tjenester"
@@ -1194,7 +1200,7 @@
msgstr "Inkluder forskjell i vekslingsrate"
msgid "Include Payment"
-msgstr ""
+msgstr "Inkluder betaling"
msgid "Include in Report"
msgstr "InkludÃr i rapport"
@@ -1209,7 +1215,7 @@
msgstr "Driftsregnskap"
msgid "Income account does not exist!"
-msgstr ""
+msgstr "Inntektskonto finnes ikke."
msgid "Incorrect Dataset version!"
msgstr "Gal versjon av datasett!"
@@ -1284,25 +1290,25 @@
msgstr "januar"
msgid "Job"
-msgstr ""
+msgstr "Jobb"
msgid "Job Name"
-msgstr ""
+msgstr "Jobb navn"
msgid "Job Number"
-msgstr ""
+msgstr "Jobb nummer"
msgid "Job Number missing!"
-msgstr ""
+msgstr "Jobb nummer mangeler!"
msgid "Job deleted!"
-msgstr ""
+msgstr "Jobb slettet"
msgid "Job saved!"
-msgstr ""
+msgstr "Jobb lagret!"
msgid "Jobs"
-msgstr ""
+msgstr "Jobber"
msgid "Jul"
msgstr "jul"
@@ -1467,16 +1473,16 @@
msgstr "Modell"
msgid "Monday"
-msgstr ""
+msgstr "Mandag"
msgid "Month"
msgstr "MÃned"
msgid "Month(s)"
-msgstr ""
+msgstr "MÃned(er)"
msgid "Months"
-msgstr ""
+msgstr "MÃneder"
msgid "Multibyte Encoding"
msgstr "Tegnsett"
@@ -1494,16 +1500,16 @@
msgstr "Nye maler"
msgid "New Window"
-msgstr ""
+msgstr "Nytt vindu"
msgid "Next"
-msgstr ""
+msgstr "Neste"
msgid "Next Date"
-msgstr ""
+msgstr "Neste dato"
msgid "Next Number"
-msgstr ""
+msgstr "Neste nr"
msgid "No"
msgstr "Nei"
@@ -1524,10 +1530,10 @@
msgstr "Ingen emailadresse for"
msgid "No open Jobs!"
-msgstr ""
+msgstr "Ingen Ãpne jobber!"
msgid "No open Projects!"
-msgstr ""
+msgstr "Ignen Ãpne prosjekter!"
msgid "No."
msgstr "Nr."
@@ -1674,7 +1680,7 @@
msgstr "Del"
msgid "Part Number"
-msgstr ""
+msgstr "Delenummer"
msgid "Partnumber"
msgstr "Delenummer"
@@ -1710,7 +1716,7 @@
msgstr "Betalinger"
msgid "Payments posted!"
-msgstr ""
+msgstr "Betalinger bokfÃrt!"
msgid "Payroll Deduction"
msgstr "Fradrag i lÃnn"
@@ -1752,10 +1758,10 @@
msgstr "BokfÃrt!"
msgid "Posting"
-msgstr ""
+msgstr "BokfÃrer"
msgid "Posting failed!"
-msgstr ""
+msgstr "BokfÃring feilet!"
msgid "Postscript"
msgstr "Postscript"
@@ -1797,19 +1803,19 @@
msgstr "Skriv ut og bokfÃr"
msgid "Print and Post as new"
-msgstr ""
+msgstr "Skriv ut og bokfÃr som ny"
msgid "Print and Save"
msgstr "Skriv ut og lagre"
msgid "Print and Save as new"
-msgstr ""
+msgstr "Skriv ut og lagre som ny"
msgid "Print and post as new"
-msgstr ""
+msgstr "Skriv ut og bokfÃr som ny"
msgid "Print and save as new"
-msgstr ""
+msgstr "Skriv ut og lagre som ny"
msgid "Printed"
msgstr "Skrevet ut"
@@ -1818,19 +1824,19 @@
msgstr "Skriver"
msgid "Printing"
-msgstr ""
+msgstr "Skriver ut"
msgid "Printing ... "
-msgstr "Skriver ut"
+msgstr "Skriver ut ..."
msgid "Process Transactions"
-msgstr ""
+msgstr "Behandle transaksjoner"
msgid "Production"
-msgstr ""
+msgstr "Produksjon"
msgid "Profit Center"
-msgstr ""
+msgstr "Resultatenhet"
msgid "Project"
msgstr "Prosjekt"
@@ -1839,7 +1845,7 @@
msgstr "Oversettelser av prosjektbeskrivelser"
msgid "Project Name"
-msgstr ""
+msgstr "Prosjektnavn"
msgid "Project Number"
msgstr "Prosjektnummer"
@@ -1860,10 +1866,10 @@
msgstr "Prosjekt lagret!"
msgid "Project/Job Name"
-msgstr ""
+msgstr "Prosjekt/Jobb navn"
msgid "Project/Job Number"
-msgstr ""
+msgstr "Prosjekt/Jobb nummer"
msgid "Projects"
msgstr "Prosjekter"
@@ -2073,7 +2079,7 @@
msgstr "Selger"
msgid "Saturday"
-msgstr ""
+msgstr "LÃrdag"
msgid "Save"
msgstr "Lagre"
@@ -2109,22 +2115,22 @@
msgstr "Velg"
msgid "Select Customer"
-msgstr ""
+msgstr "Velg kunde"
msgid "Select Vendor"
-msgstr ""
+msgstr "Velg leverandÃr"
msgid "Select a Printer!"
-msgstr ""
+msgstr "Velg en skriver!"
msgid "Select a printer!"
-msgstr ""
+msgstr "Velg en skriver!"
msgid "Select all"
msgstr "Velg alt"
msgid "Select from one of the items below"
-msgstr "Velg en fra listen under, og trykk "Fortsett""
+msgstr "Velg en fra listen under, og trykk \"Fortsett\""
msgid "Select from one of the names below"
msgstr "Velg ett av navnene under"
@@ -2136,7 +2142,7 @@
msgstr ""
msgid "Select payment"
-msgstr ""
+msgstr "Velg betaling"
msgid "Select postscript or PDF!"
msgstr "Velg postscript eller PDF!"
@@ -2172,10 +2178,10 @@
msgstr "Tjeneste"
msgid "Service Code"
-msgstr ""
+msgstr "Tjeneste kode"
msgid "Service/Labor Code"
-msgstr ""
+msgstr "Tjeneste/Arbeids kode"
msgid "Services"
msgstr "Tjenester"
@@ -2280,7 +2286,7 @@
msgstr "Oppsummert"
msgid "Sunday"
-msgstr ""
+msgstr "SÃndag"
msgid "Supervisor"
msgstr "Overordnet"
@@ -2325,7 +2331,7 @@
msgstr "VilkÃr"
msgid "Text"
-msgstr ""
+msgstr "Tekst"
msgid "Text Templates"
msgstr "Tekstmaler"
@@ -2340,16 +2346,16 @@
msgstr "Dette er en innledende kontroll for eksisterende kilder. Ingenting vil bli opprettet eller slettet pà dette trinnet!"
msgid "Thursday"
-msgstr ""
+msgstr "Torsdag"
msgid "Till"
msgstr "Kasse"
msgid "Time In"
-msgstr ""
+msgstr "Tid in"
msgid "Time Out"
-msgstr ""
+msgstr "Tid ut"
msgid "Timecard"
msgstr ""
@@ -2370,7 +2376,7 @@
msgstr "Til"
msgid "To Warehouse"
-msgstr ""
+msgstr "Til lager"
msgid "To add a user to a group edit a name, change the login name and save. A new user with the same variables will then be saved under the new login name."
msgstr "For à tilfÃye en bruker til en gruppe mà du endre et brukernavn og sà lagre. Den nye brukeren vil sà bli lagret med de samme variablene under det nye loginnavnet."
@@ -2418,7 +2424,7 @@
msgstr "OverfÃr varebeholdning"
msgid "Transfer from"
-msgstr ""
+msgstr "OverfÃr fra"
msgid "Transfer to"
msgstr "OverfÃr til"
@@ -2442,7 +2448,7 @@
msgstr "ForelÃpig balanse"
msgid "Tuesday"
-msgstr ""
+msgstr "Tirsdag"
msgid "Type of Business"
msgstr "Organisasjonstype"
@@ -2541,16 +2547,16 @@
msgstr "Advarsel"
msgid "Wednesday"
-msgstr ""
+msgstr "Onsdag"
msgid "Week"
-msgstr ""
+msgstr "Uke"
msgid "Week(s)"
-msgstr ""
+msgstr "Uke(r)"
msgid "Weeks"
-msgstr ""
+msgstr "Uker"
msgid "Weight"
msgstr "Vekt"
@@ -2574,7 +2580,7 @@
msgstr "Ãr"
msgid "Year(s)"
-msgstr ""
+msgstr "Ãr"
msgid "Yearend"
msgstr "Ãrsavslutning"
@@ -2589,7 +2595,7 @@
msgstr "BokfÃring av Ãrsavslutning feilet!"
msgid "Years"
-msgstr ""
+msgstr "Ãr"
msgid "Yes"
msgstr "Ja"
@@ -2685,7 +2691,7 @@
msgstr ""
msgid "unexpected error!"
-msgstr ""
+msgstr "uventet feil!"
msgid "website"
msgstr "nettsted"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.