[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
SF.net SVN: ledger-smb:[5161] trunk
- Subject: SF.net SVN: ledger-smb:[5161] trunk
- From: ..hidden..
- Date: Mon, 15 Oct 2012 10:37:38 +0000
Revision: 5161
http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=5161&view=rev
Author: einhverfr
Date: 2012-10-15 10:37:38 +0000 (Mon, 15 Oct 2012)
Log Message:
-----------
Merging from branches/1.3
Modified Paths:
--------------
trunk/CONTRIBUTORS
trunk/Changelog
trunk/INSTALL
trunk/LedgerSMB/Database.pm
trunk/LedgerSMB/PE.pm
trunk/Makefile.PL
trunk/bin/am.pl
trunk/bin/io.pl
trunk/configure_apache.sh
trunk/doc/manual/LedgerSMB-manual.tex
trunk/doc/release_notes
trunk/locale/LedgerSMB.pot
trunk/locale/po/es_AR.po
trunk/tools/prepare-company-database.sh
Property Changed:
----------------
trunk/
trunk/LedgerSMB/PE.pm
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3:3711-5135
+ /branches/1.3:3711-5160
Modified: trunk/CONTRIBUTORS
===================================================================
--- trunk/CONTRIBUTORS 2012-10-15 09:02:19 UTC (rev 5160)
+++ trunk/CONTRIBUTORS 2012-10-15 10:37:38 UTC (rev 5161)
@@ -125,8 +125,9 @@
Brian Wolf < brian @ activustech.com > has contributed bug reports.
+Berend Tober < btober @ ieee.org > has contributed some to the
+documentation.
-
Original Authors of SQL-Ledger:
===================================
Dieter Simader <dsimader @ sql-ledger.com>
Modified: trunk/Changelog
===================================================================
--- trunk/Changelog 2012-10-15 09:02:19 UTC (rev 5160)
+++ trunk/Changelog 2012-10-15 10:37:38 UTC (rev 5161)
@@ -77,6 +77,16 @@
Initial Release: Monday, Oct 12 2011
Supported Presently
+Changelog for 1.3.24
+* Fixed error in msgid for "Add Language" (Havard S, h/t Robert C)
+* Moved Makefile.PL to version_from to reduce errors (Chris T, h/t Robert C)
+* Prompts added to configure_apache.sh (Berend T)
+
+berend T is Berend Tober
+Chris T is Chris Travers
+Havard S is Havard Sorli
+Robert C is Robert James Clay
+
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)
@@ -87,13 +97,21 @@
* Fixed action not found on redirect (Chris T, h/t Brian W)
* Fixed issues upgrading from 1.2 if email and bcc are filled in (Chris T)
* Fixed error exporting aging to csv (Havard S, h/t Nick P, 3559403)
+* Fixed receipt reversal screen erroring (Chris T, h/t Nick P)
+* Fixed select all button causing error on aging rpt (Chris T)
+* Fixed query err when generating sales orders from time cards (Erik H, 3559621)
+* Fixed backup does not test for failure (Havard S, h/t Nick P, 3574876)
+* prepre_company_database.sh now only gives user mgmt rights (Berend T)
+* Fixed end date, etc not showing on summary list, (Chris T, 3556279)
+Berend T is Berend Tober
Chris T is Chris Travers
Havard S is Havard Sorli
Erik H is Erik Huelsmann
Istvan P is Istvan Pongracz
Brian W is Brian Wolf
Nick P is Nick Prater
+Robert C is Robert James Clay
Changelog for 1.3.22
* Fixed error when trying to save multiple make/models for a part (Chris T)
Modified: trunk/INSTALL
===================================================================
--- trunk/INSTALL 2012-10-15 09:02:19 UTC (rev 5160)
+++ trunk/INSTALL 2012-10-15 10:37:38 UTC (rev 5161)
@@ -274,12 +274,12 @@
The script assumes your PostgreSQL server runs on 'localhost' with
PostgreSQL's default port (5432).
-Upon completion, it'll have created a company database with the name
+Upon completion, it will have created a company database with the name
'testinc', a user called 'ledgersmb' (password: 'LEDGERSMBINITIALPASSWORD'),
a single user called 'admin' (password: 'admin') and the roles required to
manage authorizations.
-Additionally, it'll have loaded a minimal list of languages required
+Additionally, it will have loaded a minimal list of languages required
to succesfully navigate the various screens.
All these can be adjusted using arguments provided to the setup script. See
Modified: trunk/LedgerSMB/Database.pm
===================================================================
--- trunk/LedgerSMB/Database.pm 2012-10-15 09:02:19 UTC (rev 5160)
+++ trunk/LedgerSMB/Database.pm 2012-10-15 10:37:38 UTC (rev 5161)
@@ -91,6 +91,9 @@
The file is named roles_[date].sql by default where the date is in
yyyy-mm-dd format.
+It returns the full path of the resulting backup file on success, or undef on
+failure.
+
=cut
sub base_backup {
@@ -111,8 +114,13 @@
my $backupfile = $LedgerSMB::Sysconfig::backuppath .
"/roles_${date}.sql";
- system("pg_dumpall -r -f $backupfile");
+ my $exit_code = system("pg_dumpall -r -f $backupfile");
+ if($exit_code != 0) {
+ $backupfile = undef;
+ $logger->error("backup failed: non-zero exit code from pg_dumpall");
+ }
+
$ENV{PGUSER} = $old_pguser;
$ENV{PGPASSWORD} = $old_pgpass;
@@ -130,6 +138,9 @@
The resulting file is named backup_[dbname]_[date].bak with the date in
yyyy-mm-dd format.
+It returns the full path of the resulting backup file on success, or undef on
+failure.
+
=cut
sub db_backup {
@@ -150,8 +161,13 @@
my $backupfile = $LedgerSMB::Sysconfig::backuppath .
"/backup_$self->{company_name}_${date}.bak";
- system("pg_dump -F c -f '$backupfile' '$self->{company_name}'");
+ my $exit_code = system("pg_dump -F c -f '$backupfile' '$self->{company_name}'");
+ if($exit_code != 0) {
+ $backupfile = undef;
+ $logger->error("backup failed: non-zero exit code from pg_dump");
+ }
+
$ENV{PGUSER} = $old_pguser;
$ENV{PGPASSWORD} = $old_pgpass;
Modified: trunk/LedgerSMB/PE.pm
===================================================================
--- trunk/LedgerSMB/PE.pm 2012-10-15 09:02:19 UTC (rev 5160)
+++ trunk/LedgerSMB/PE.pm 2012-10-15 10:37:38 UTC (rev 5161)
@@ -1022,7 +1022,7 @@
LEFT JOIN company c ON eca.entity_id = c.entity_id
WHERE pr.parts_id IS NULL
AND j.allocated != j.qty $where
- ORDER BY pr.projectnumber, c.name, j.checkedin::date|;
+ ORDER BY pr.projectnumber, c.legal_name, j.checkedin::date|;
if ( $form->{summary} ) {
$query =~ s/j\.description/p\.description/;
$query =~ s/c\.name,/c\.name, j\.parts_id, /;
Property changes on: trunk/LedgerSMB/PE.pm
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/1.3/LedgerSMB/PE.pm:3711-5160
/tags/1.3.22/LedgerSMB/PE.pm:5141
Modified: trunk/Makefile.PL
===================================================================
--- trunk/Makefile.PL 2012-10-15 09:02:19 UTC (rev 5160)
+++ trunk/Makefile.PL 2012-10-15 10:37:38 UTC (rev 5161)
@@ -5,7 +5,7 @@
use inc::Module::Install 0.65;
name 'LedgerSMB';
-version 1.3.999;
+version_from 'LedgerSMB.pm';
license 'GPL';
perl_version '5.8.1';
Modified: trunk/bin/am.pl
===================================================================
--- trunk/bin/am.pl 2012-10-15 09:02:19 UTC (rev 5160)
+++ trunk/bin/am.pl 2012-10-15 10:37:38 UTC (rev 5161)
@@ -840,7 +840,7 @@
push @buttons, {
name => 'action',
value => 'add_language',
- text => $locale->text('Add Lanugage'),
+ text => $locale->text('Add Language'),
type => 'submit',
class => 'submit',
};
Modified: trunk/bin/io.pl
===================================================================
--- trunk/bin/io.pl 2012-10-15 09:02:19 UTC (rev 5160)
+++ trunk/bin/io.pl 2012-10-15 10:37:38 UTC (rev 5161)
@@ -375,30 +375,30 @@
$column_data{runningnumber} =
qq|<td><input name="runningnumber_$i" size=3 value=$i></td>|;
- $column_data{partnumber} =
-qq|<td><input name="partnumber_$i" size=15 value="$form->{"partnumber_$i"}" accesskey="$i" title="[Alt-$i]">$skunumber</td>|;
- $column_data{qty} =
-qq|<td align=right><input name="qty_$i" title="$form->{"onhand_$i"}" size="5" value="|
- . $form->format_amount( \%myconfig, $form->{"qty_$i"} )
- . qq|"></td>|;
- $column_data{ship} =
- qq|<td align=right><input name="ship_$i" size="5" value="|
- . $form->format_amount( \%myconfig, $form->{"ship_$i"} )
- . qq|"></td>|;
- $column_data{unit} =
- qq|<td><input name="unit_$i" size=5 value="$form->{"unit_$i"}"></td>|;
- $column_data{sellprice} =
- qq|<td align=right><input name="sellprice_$i" size="9" value="|
- . $form->format_amount( \%myconfig, $form->{"sellprice_$i"},
- $form->{"precision_$i"} )
- . qq|"></td>|;
- $column_data{discount} =
- qq|<td align=right><input name="discount_$i" size="3" value="|
- . $form->format_amount( \%myconfig, $form->{"discount_$i"} )
- . qq|"></td>|;
- $column_data{linetotal} =
- qq|<td align=right>|
- . $form->format_amount( \%myconfig, $linetotal, 2 )
+ $column_data{partnumber} =
+qq|<td><input name="partnumber_$i" size=15 value="$form->{"partnumber_$i"}" accesskey="$i" title="[Alt-$i]">$skunumber</td>|;
+ $column_data{qty} =
+qq|<td align=right><input name="qty_$i" title="$form->{"onhand_$i"}" size="5" value="|
+ . $form->format_amount( \%myconfig, $form->{"qty_$i"} )
+ . qq|"></td>|;
+ $column_data{ship} =
+ qq|<td align=right><input name="ship_$i" size="5" value="|
+ . $form->format_amount( \%myconfig, $form->{"ship_$i"} )
+ . qq|"></td>|;
+ $column_data{unit} =
+ qq|<td><input name="unit_$i" size=5 value="$form->{"unit_$i"}"></td>|;
+ $column_data{sellprice} =
+ qq|<td align=right><input name="sellprice_$i" size="9" value="|
+ . $form->format_amount( \%myconfig, $form->{"sellprice_$i"},
+ $form->{"precision_$i"} )
+ . qq|"></td>|;
+ $column_data{discount} =
+ qq|<td align=right><input name="discount_$i" size="3" value="|
+ . $form->format_amount( \%myconfig, $form->{"discount_$i"} )
+ . qq|"></td>|;
+ $column_data{linetotal} =
+ qq|<td align=right>|
+ . $form->format_amount( \%myconfig, $linetotal, 2 )
. qq|</td>|;
$column_data{bin} = qq|<td>$form->{"bin_$i"}</td>|;
$column_data{onhand} = qq|<td>$form->{"onhand_$i"}</td>|;
Modified: trunk/configure_apache.sh
===================================================================
--- trunk/configure_apache.sh 2012-10-15 09:02:19 UTC (rev 5160)
+++ trunk/configure_apache.sh 2012-10-15 10:37:38 UTC (rev 5161)
@@ -4,13 +4,14 @@
sed -i.orig "s|WORKING_DIR|$CWD|" ledgersmb-httpd.conf;
-echo "Which user does your web server run as?"
-read username
+username="apache"
+read -p "Which user does your web server run as? [$username]"
-chown $username spool templates css
+chown ${REPLY:-$username} spool templates css
-echo "Where do we copy the ledgersmb-httpd.conf file to?"
-read location
-cp ledgersmb-httpd.conf $location
+location="/etc/httpd/conf.d"
+read -p "Where do we copy the ledgersmb-httpd.conf file to? [$location] "
+cp ledgersmb-httpd.conf ${REPLY:-$location}
+
echo "Please restart your web server for the changes to take effect."
Modified: trunk/doc/manual/LedgerSMB-manual.tex
===================================================================
--- trunk/doc/manual/LedgerSMB-manual.tex 2012-10-15 09:02:19 UTC (rev 5160)
+++ trunk/doc/manual/LedgerSMB-manual.tex 2012-10-15 10:37:38 UTC (rev 5161)
@@ -339,12 +339,12 @@
The script assumes your PostgreSQL server runs on 'localhost' with
PostgreSQL's default port (5432).
-Upon completion, it'll have created a company database with the name
+Upon completion, it will have created a company database with the name
'testinc', a user called 'ledgersmb' (password: 'LEDGERSMBINITIALPASSWORD'),
a single user called 'admin' (password: 'admin') and the roles required to
manage authorizations.
-Additionally, it'll have loaded a minimal list of languages required
+Additionally, it will have loaded a minimal list of languages required
to succesfully navigate the various screens.
All these can be adjusted using arguments provided to the setup script. See
@@ -356,7 +356,7 @@
user, by default, only has user management capabilities. Ideally actual work
should be done with accounts which have fewer permissions.
-To set up a user, log in with you administrative credentials (created when
+To set up a user, log in with your administrative credentials (created when
initializing the database) and then go to System/Admin Users/Add User. From
here you can create a user and add appropriate permissions.
@@ -368,9 +368,10 @@
The roles follow a naming convention which allows several LSMB databases to
exist on the same PostgreSQL instance. Each role is named lsmb\_\lbrack
-dbname\rbrack\_\_ followed by the role name. Note that two underscores separate
-the database and role names. If these are followed then the interface will
-pick up on defined groups and display them along with other permissions.
+dbname\rbrack\_\_ followed by the role name. Note that two underscores
+separate the database and role names. If this naming convention is followed,
+then the interface will find the defined groups in the data base and display
+them along with other permissions.
\subsubsection{List of Roles}
@@ -789,7 +790,7 @@
groups. There is not currently a way of doing this from the front-end, but as
long as you follow the conventions, roles you create can be assigned to users
through the front-end. One can also create super-groups that the front-end
-cannot see but can assign permissions to broups of users on multiple databases.
+cannot see but can assign permissions to groups of users on multiple databases.
This section will cover both of these approaches.
\subsubsection{Naming Conventions}
Modified: trunk/doc/release_notes
===================================================================
--- trunk/doc/release_notes 2012-10-15 09:02:19 UTC (rev 5160)
+++ trunk/doc/release_notes 2012-10-15 10:37:38 UTC (rev 5161)
@@ -1,7 +1,7 @@
RELEASE NOTES
LedgerSMB 1.3
-Latest Revision: 1.3.22, June 17, 2012.
+Latest Revision: 1.3.23, June 17, 2012.
1: Welcome to LedgerSMB
Modified: trunk/locale/LedgerSMB.pot
===================================================================
--- trunk/locale/LedgerSMB.pot 2012-10-15 09:02:19 UTC (rev 5160)
+++ trunk/locale/LedgerSMB.pot 2012-10-15 10:37:38 UTC (rev 5161)
@@ -339,8 +339,8 @@
msgid "Languages"
msgstr ""
-#: am.pl:1139
-msgid "Add Lanugage"
+#: am.pl:1152
+msgid "Add Language"
msgstr ""
#: am.pl:1162
Modified: trunk/locale/po/es_AR.po
===================================================================
--- trunk/locale/po/es_AR.po 2012-10-15 09:02:19 UTC (rev 5160)
+++ trunk/locale/po/es_AR.po 2012-10-15 10:37:38 UTC (rev 5161)
@@ -244,7 +244,7 @@
msgid "Languages"
msgstr "Idiomas"
-msgid "Add Lanugage"
+msgid "Add Language"
msgstr "Agregar Idioma"
msgid "%1 Language"
Modified: trunk/tools/prepare-company-database.sh
===================================================================
--- trunk/tools/prepare-company-database.sh 2012-10-15 09:02:19 UTC (rev 5160)
+++ trunk/tools/prepare-company-database.sh 2012-10-15 10:37:38 UTC (rev 5161)
@@ -264,6 +264,6 @@
SELECT admin__add_user_to_role('$ADMIN_USERNAME', rolname)
FROM pg_roles
-WHERE rolname like 'lsmb_${company_name}_%';
+WHERE rolname like 'lsmb_${company_name}__users_manage';
CREATE_USER
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.