[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
SF.net SVN: ledger-smb:[4080] trunk
- Subject: SF.net SVN: ledger-smb:[4080] trunk
- From: ..hidden..
- Date: Fri, 25 Nov 2011 13:51:32 +0000
Revision: 4080
http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=4080&view=rev
Author: einhverfr
Date: 2011-11-25 13:51:31 +0000 (Fri, 25 Nov 2011)
Log Message:
-----------
Merging from 1.3
Modified Paths:
--------------
trunk/Changelog
trunk/LedgerSMB/AM.pm
trunk/LedgerSMB/DBObject/Company.pm
trunk/LedgerSMB/DBObject/Employee.pm
trunk/LedgerSMB/DBObject.pm
trunk/LedgerSMB/Database.pm
trunk/LedgerSMB/ScriptLib/Company.pm
trunk/LedgerSMB/Scripts/file.pm
trunk/LedgerSMB/Scripts/setup.pm
trunk/LedgerSMB/Template.pm
trunk/LedgerSMB/User.pm
trunk/UI/Contact/contact.html
trunk/UI/am-defaults.html
trunk/UI/setup/begin_backup.html
trunk/bin/am.pl
trunk/sql/Pg-database.sql
trunk/sql/modules/Company.sql
trunk/sql/modules/Fixes.sql
trunk/templates/demo/timecard.tex
trunk/templates/xedemo/timecard.tex
Added Paths:
-----------
trunk/UI/logout/epiphany.js
trunk/UI/logout/konqueror.js
trunk/UI/logout/opera.js
trunk/UI/logout/safari.js
Property Changed:
----------------
trunk/
trunk/LedgerSMB/Scripts/admin.pm
trunk/LedgerSMB/Scripts/employee.pm
trunk/LedgerSMB/Scripts/file.pm
trunk/LedgerSMB/Scripts/payment.pm
trunk/LedgerSMB/Scripts/setup.pm
trunk/sql/upgrade/1.2-1.3-manual.sql
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3:3711-4069
+ /branches/1.3:3711-4079
Modified: trunk/Changelog
===================================================================
--- trunk/Changelog 2011-11-25 13:32:53 UTC (rev 4079)
+++ trunk/Changelog 2011-11-25 13:51:31 UTC (rev 4080)
@@ -25,6 +25,9 @@
* Corrected permissions issue for editing assembly (Chris T)
* Database administration interface more consistent (Chris T)
* Backup functionality moved to database administration interface (Chris T)
+* Default language handling for invoices (Herman V)
+* Fixed LaTeX errors in timecard templates (Chris T)
+* Reduced warnings in logs (Chris T)
Changelog for LedgerSMB 1.3.6
* Including xelatex templates under directory templates/xedemo (Chris T)
Modified: trunk/LedgerSMB/AM.pm
===================================================================
--- trunk/LedgerSMB/AM.pm 2011-11-25 13:32:53 UTC (rev 4079)
+++ trunk/LedgerSMB/AM.pm 2011-11-25 13:51:31 UTC (rev 4080)
@@ -2065,6 +2065,16 @@
push @{$form->{countries}}, $ref;
}
$sth->finish;
+ #HV do not know if i can use 'sub language' here which fills $form->{ALL}
+ $query = "select code,description from language order by code";
+ $sth = $dbh->prepare($query);
+ $sth->execute;
+ $form->{languages} = [];
+ while ($ref = $sth->fetchrow_hashref('NAME_lc')) {
+ push @{$form->{languages}}, $ref;
+ }
+ $sth->finish;
+
$self->defaultaccounts( undef, $form );
$dbh->commit;
my $dirname = "./templates";
Modified: trunk/LedgerSMB/DBObject/Company.pm
===================================================================
--- trunk/LedgerSMB/DBObject/Company.pm 2011-11-25 13:32:53 UTC (rev 4079)
+++ trunk/LedgerSMB/DBObject/Company.pm 2011-11-25 13:51:31 UTC (rev 4080)
@@ -410,6 +410,13 @@
for my $ref (@{$self->{cash_acc_list}}){
$ref->{text} = "$ref->{accno}--$ref->{description}";
}
+
+ @{$self->{language_code_list}} =
+ $self->exec_method(funcname => 'person__list_languages');
+
+ for my $ref (@{$self->{language_code_list}}){
+ $ref->{text} = "$ref->{code}--$ref->{description}";
+ }
@{$self->{discount_acc_list}} =
$self->exec_method(funcname => 'chart_list_discount');
@@ -437,10 +444,14 @@
@{$self->{contact_class_list}} =
$self->exec_method(funcname => 'entity_list_contact_class');
- my $country_setting = LedgerSMB::Setting->new({base => $self, copy => 'base'});
- $country_setting->{key} = 'default_country';
- $country_setting->get;
- $self->{default_country} = $country_setting->{value};
+ #HV was $country_setting , given it a more general name, not only for country
+ my $setting_module = LedgerSMB::Setting->new({base => $self, copy => 'base'});
+ $setting_module->{key} = 'default_country';
+ $setting_module->get;
+ $self->{default_country} = $setting_module->{value};
+ $setting_module->{key} = 'default_language';
+ $setting_module->get;
+ $self->{default_language} = $setting_module->{value};
}
=item save_contact
Modified: trunk/LedgerSMB/DBObject/Employee.pm
===================================================================
--- trunk/LedgerSMB/DBObject/Employee.pm 2011-11-25 13:32:53 UTC (rev 4079)
+++ trunk/LedgerSMB/DBObject/Employee.pm 2011-11-25 13:51:31 UTC (rev 4080)
@@ -80,6 +80,8 @@
my $ENTITY_CLASS = 3;
+my $logger = Log::Log4perl->get_logger('LedgerSMB::DBObject::Employee');
+
=item set_entity_class
Sets the entity class to 3.
Modified: trunk/LedgerSMB/DBObject.pm
===================================================================
--- trunk/LedgerSMB/DBObject.pm 2011-11-25 13:32:53 UTC (rev 4079)
+++ trunk/LedgerSMB/DBObject.pm 2011-11-25 13:51:31 UTC (rev 4080)
@@ -61,6 +61,7 @@
my %args = (ref($_[0]) eq 'HASH')? %{$_[0]}: @_;
my $base = $args{base};
my $mode = $args{copy};
+ $mode = '' if (!defined $mode);
my $self = bless {}, $class;
my @mergelist;
if ( defined $args{merge} ){
Modified: trunk/LedgerSMB/Database.pm
===================================================================
--- trunk/LedgerSMB/Database.pm 2011-11-25 13:32:53 UTC (rev 4079)
+++ trunk/LedgerSMB/Database.pm 2011-11-25 13:51:31 UTC (rev 4080)
@@ -99,12 +99,12 @@
$t[5] += 1900;
$t[3] = substr( "0$t[3]", -2 );
$t[4] = substr( "0$t[4]", -2 );
- my $date = "$5-$4-$3";
+ my $date = "$t[5]-$t[4]-$t[3]";
my $backupfile = $LedgerSMB::Sysconfig::backuppath .
"/roles_${date}.sql";
- system("pgdumpall -r -f '$backupfile'") || $self->error('Backup failed');
+ system("pg_dumpall -r -f $backupfile");
$ENV{PGUSER} = $old_pguser;
$ENV{PGPASSWORD} = $old_pgpass;
@@ -138,13 +138,12 @@
$t[5] += 1900;
$t[3] = substr( "0$t[3]", -2 );
$t[4] = substr( "0$t[4]", -2 );
- my $date = "$5-$4-$3";
+ my $date = "$t[5]-$t[4]-$t[3]";
my $backupfile = $LedgerSMB::Sysconfig::backuppath .
- "/backup_$self->{company_name}_${date}.sql";
+ "/backup_$self->{company_name}_${date}.bak";
- system("pgdump -d '$self->{company_name}' -F c -f '$backupfile'")
- || $self->error('Backup failed');
+ system("pg_dump -F c -f '$backupfile' '$self->{company_name}'");
$ENV{PGUSER} = $old_pguser;
$ENV{PGPASSWORD} = $old_pgpass;
Modified: trunk/LedgerSMB/ScriptLib/Company.pm
===================================================================
--- trunk/LedgerSMB/ScriptLib/Company.pm 2011-11-25 13:32:53 UTC (rev 4079)
+++ trunk/LedgerSMB/ScriptLib/Company.pm 2011-11-25 13:51:31 UTC (rev 4080)
@@ -637,6 +637,7 @@
my ($request) = @_;
my $company = new_company($request);
if (_close_form($company)){
+ #$logger->debug("\$company = " . Data::Dumper::Dumper($company));
$company->save();
}
_render_main_screen($company);
@@ -748,6 +749,12 @@
value => 3},
];
$company->{threshold} = $company->format_amount(amount => $company->{threshold});
+ if(! $company->{language_code})
+ {
+ #$logger->debug("company->language code not set!");
+ $company->{language_code}=$company->{default_language}
+ }
+ #$logger->debug("\$company = " . Data::Dumper::Dumper($company));
my $template = LedgerSMB::Template->new(
user => $company->{_user},
Property changes on: trunk/LedgerSMB/Scripts/admin.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/admin.pm:3901-4069
/branches/1.3/scripts/admin.pl:3711-3903
+ /branches/1.3/LedgerSMB/Scripts/admin.pm:3901-4079
/branches/1.3/scripts/admin.pl:3711-3903
Property changes on: trunk/LedgerSMB/Scripts/employee.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/employee.pm:3712-4069
/branches/1.3/scripts/employee.pl:3842-3843
+ /branches/1.3/LedgerSMB/Scripts/employee.pm:3712-4079
/branches/1.3/scripts/employee.pl:3842-3843
Modified: trunk/LedgerSMB/Scripts/file.pm
===================================================================
--- trunk/LedgerSMB/Scripts/file.pm 2011-11-25 13:32:53 UTC (rev 4079)
+++ trunk/LedgerSMB/Scripts/file.pm 2011-11-25 13:51:31 UTC (rev 4080)
@@ -55,6 +55,9 @@
-charset => 'utf-8',
-attachment => $file->file_name,
);
+ print $file->content;
+
+ exit;
}
=item show_attachment_screen
Property changes on: trunk/LedgerSMB/Scripts/file.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/file.pm:3711-4069
/branches/1.3/scripts/file.pl:3711-4065
+ /branches/1.3/LedgerSMB/Scripts/file.pm:3711-4079
/branches/1.3/scripts/file.pl:3711-4079
Property changes on: trunk/LedgerSMB/Scripts/payment.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/payment.pm:4010-4069
/branches/1.3/scripts/payment.pl:3711-4011
+ /branches/1.3/LedgerSMB/Scripts/payment.pm:4010-4079
/branches/1.3/scripts/payment.pl:3711-4011
Modified: trunk/LedgerSMB/Scripts/setup.pm
===================================================================
--- trunk/LedgerSMB/Scripts/setup.pm 2011-11-25 13:32:53 UTC (rev 4079)
+++ trunk/LedgerSMB/Scripts/setup.pm 2011-11-25 13:51:31 UTC (rev 4080)
@@ -52,7 +52,7 @@
$request->error($request->{_locale}->text('No database specified'));
}
my $database = LedgerSMB::Database->new(
- {username => $creds->{username},
+ {username => $creds->{login},
company_name => $request->{database},
password => $creds->{password}}
);
@@ -173,9 +173,11 @@
sub run_backup {
use LedgerSMB::Company_Config;
+ my $creds = LedgerSMB::Auth::get_credentials();
my $request = shift @_;
+
my $database = LedgerSMB::Database->new(
- {username => $creds->{username},
+ {username => $creds->{login},
company_name => $request->{database},
password => $creds->{password}}
);
@@ -210,14 +212,20 @@
} elsif ($request->{backup_type} eq 'browser'){
open BAK, '<', $backupfile;
my $cgi = CGI::Simple->new();
+ $backupfile =~ s/$LedgerSMB::Sysconfig::backuppath(\/)?//;
print $cgi->header(
-type => $mimetype,
-status => '200',
-charset => 'utf-8',
-attachment => $backupfile,
);
+ my $data;
+ while (read(BAK, $data, 1024 * 1024)){ # Read 1MB at a time
+ print $data;
+ }
+ exit;
} else {
- $request->error($request->{_locale}->text("Don't know what to do with backup");
+ $request->error($request->{_locale}->text("Don't know what to do with backup"));
}
my $template = LedgerSMB::Template->new(
path => 'UI/setup',
@@ -239,7 +247,7 @@
my ($request) = @_;
my $creds = LedgerSMB::Auth::get_credentials();
my $database = LedgerSMB::Database->new(
- {username => $creds->{username},
+ {username => $creds->{login},
company_name => $request->{database},
password => $creds->{password}}
);
@@ -255,7 +263,7 @@
my ($request) = @_;
my $creds = LedgerSMB::Auth::get_credentials();
my $database = LedgerSMB::Database->new(
- {username => $creds->{username},
+ {username => $creds->{login},
company_name => $request->{database},
password => $creds->{password}}
);
@@ -656,7 +664,7 @@
my ($request) = @_;
my $creds = LedgerSMB::Auth::get_credentials();
my $database = LedgerSMB::Database->new(
- {username => $creds->{username},
+ {username => $creds->{login},
company_name => $request->{database},
password => $creds->{password}}
);
@@ -729,7 +737,7 @@
my ($request) = @_;
my $creds = LedgerSMB::Auth::get_credentials();
my $database = LedgerSMB::Database->new(
- {username => $creds->{username},
+ {username => $creds->{login},
company_name => $request->{database},
password => $creds->{password}}
);
Property changes on: trunk/LedgerSMB/Scripts/setup.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/setup.pm:3937-4069
/branches/1.3/scripts/setup.pl:3711-4070
+ /branches/1.3/LedgerSMB/Scripts/setup.pm:3937-4079
/branches/1.3/scripts/setup.pl:3711-4079
Modified: trunk/LedgerSMB/Template.pm
===================================================================
--- trunk/LedgerSMB/Template.pm 2011-11-25 13:32:53 UTC (rev 4079)
+++ trunk/LedgerSMB/Template.pm 2011-11-25 13:51:31 UTC (rev 4080)
@@ -280,7 +280,7 @@
$format->can('process')->($self, $cleanvars);
#return $format->can('postprocess')->($self);
my $post = $format->can('postprocess')->($self);
- $logger->debug("\$format=$format \$self->{'noauto'}=$self->{'noauto'} \$self->{rendered}=$self->{rendered}");
+ #$logger->debug("\$format=$format \$self->{'noauto'}=$self->{'noauto'} \$self->{rendered}=$self->{rendered}");
if (!$self->{'noauto'}) {
# Clean up
$logger->debug("before self output");
Modified: trunk/LedgerSMB/User.pm
===================================================================
--- trunk/LedgerSMB/User.pm 2011-11-25 13:32:53 UTC (rev 4079)
+++ trunk/LedgerSMB/User.pm 2011-11-25 13:51:31 UTC (rev 4080)
@@ -60,6 +60,8 @@
use LedgerSMB::Auth;
use Data::Dumper;
+my $logger = Log::Log4perl->get_logger('LedgerSMB::User');
+
=item LedgerSMB::User->new($login);
Create a LedgerSMB::User object. If the user $login exists, set the fields
Modified: trunk/UI/Contact/contact.html
===================================================================
--- trunk/UI/Contact/contact.html 2011-11-25 13:32:53 UTC (rev 4079)
+++ trunk/UI/Contact/contact.html 2011-11-25 13:51:31 UTC (rev 4080)
@@ -429,7 +429,7 @@
type= "text",
name = "meta_number",
value = meta_number,
- size = "20"
+ size = "10"
} # " ?></td>
<td><?lsmb PROCESS input element_data = {
label = text("Description"),
@@ -438,13 +438,22 @@
value = description,
size = "20"
} ?></td>
+ <td> <?lsmb INCLUDE select element_data = {
+ label = text("language_code")
+ name = "language_code"
+ default_values = [language_code],
+ options = language_code_list
+ text_attr = "text"
+ value_attr = "code"
+ } ?>
+ </td>
</tr>
<tr class="pay_to_row">
<td colspan = "2">
<?lsmb PROCESS input element_data = {
label = text('Pay To') #'
type = "text"
- sixe = "50"
+ size = "50"
name = "pay_to_name"
value = pay_to_name
class = "name"
Modified: trunk/UI/am-defaults.html
===================================================================
--- trunk/UI/am-defaults.html 2011-11-25 13:32:53 UTC (rev 4079)
+++ trunk/UI/am-defaults.html 2011-11-25 13:51:31 UTC (rev 4080)
@@ -33,7 +33,13 @@
<tr>
<th align="right"><?lsmb text('Separate Duties') ?></th>
<td><input name="separate_duties" size="5" value="<?lsmb form.separate_duties ?>" /></td>
- </tr
+ </tr>
+ <tr>
+ <th align="right"><?lsmb text('default_language') ?></th>
+ <td>
+ <?lsmb PROCESS select element_data=selects.default_language ?>
+ </td>
+ </tr>
</table>
</td>
</tr>
Copied: trunk/UI/logout/epiphany.js (from rev 4079, branches/1.3/UI/logout/epiphany.js)
===================================================================
--- trunk/UI/logout/epiphany.js (rev 0)
+++ trunk/UI/logout/epiphany.js 2011-11-25 13:51:31 UTC (rev 4080)
@@ -0,0 +1 @@
+// Logout routines for Epiphany go here
Copied: trunk/UI/logout/konqueror.js (from rev 4079, branches/1.3/UI/logout/konqueror.js)
===================================================================
--- trunk/UI/logout/konqueror.js (rev 0)
+++ trunk/UI/logout/konqueror.js 2011-11-25 13:51:31 UTC (rev 4080)
@@ -0,0 +1 @@
+// logout routines for Konqueror go here
Copied: trunk/UI/logout/opera.js (from rev 4079, branches/1.3/UI/logout/opera.js)
===================================================================
--- trunk/UI/logout/opera.js (rev 0)
+++ trunk/UI/logout/opera.js 2011-11-25 13:51:31 UTC (rev 4080)
@@ -0,0 +1 @@
+// Logout routines for Opera go here
Copied: trunk/UI/logout/safari.js (from rev 4079, branches/1.3/UI/logout/safari.js)
===================================================================
--- trunk/UI/logout/safari.js (rev 0)
+++ trunk/UI/logout/safari.js 2011-11-25 13:51:31 UTC (rev 4080)
@@ -0,0 +1 @@
+// logout routines for Safari go here
Modified: trunk/UI/setup/begin_backup.html
===================================================================
--- trunk/UI/setup/begin_backup.html 2011-11-25 13:32:53 UTC (rev 4079)
+++ trunk/UI/setup/begin_backup.html 2011-11-25 13:51:31 UTC (rev 4080)
@@ -1,6 +1,6 @@
<?lsmb INCLUDE "ui-header.html"
stylesheet="ledgersmb.css"
-include_stylesheet=["UI/setup/stylesheet.css"] ?>
+#include_stylesheet=["UI/setup/stylesheet.css"] ?>
<?lsmb PROCESS elements.html ?>
<body>
<h2><?lsmb text('Database Management Console') ?></h2>
@@ -25,12 +25,12 @@
label = text('To email') #'
value = 'email'
}, label_pos = 1 ?>
-<?lsmb INCLUDE inout element_data = {
+<?lsmb INCLUDE input element_data = {
type = "text"
name = "email"
value = email
class = "email"
-?>
+} ?>
</div>
<div class="inputrow" id="browseropt">
<?lsmb INCLUDE input element_data = {
Modified: trunk/bin/am.pl
===================================================================
--- trunk/bin/am.pl 2011-11-25 13:32:53 UTC (rev 4079)
+++ trunk/bin/am.pl 2011-11-25 13:51:31 UTC (rev 4080)
@@ -77,7 +77,7 @@
{ name => 'company_fax', label => $locale->text('Company Fax') },
);
-my @default_others = qw(businessnumber weightunit separate_duties
+my @default_others = qw(businessnumber weightunit separate_duties default_language
IC IC_income IC_expense
FX_gain FX_loss default_country templates curr);
@@ -1443,6 +1443,12 @@
text_attr => 'name',
value_attr => 'id',
},
+ 'default_language' => {name => 'default_language',
+ options => $form->{languages},
+ default_values => [$form->{'default_language'}],
+ text_attr => 'description',
+ value_attr => 'code',
+ },
'templates' => {name => 'templates', options => []}
);
foreach $key ( keys %{ $form->{accno} } ) {
Modified: trunk/sql/Pg-database.sql
===================================================================
--- trunk/sql/Pg-database.sql 2011-11-25 13:32:53 UTC (rev 4079)
+++ trunk/sql/Pg-database.sql 2011-11-25 13:51:31 UTC (rev 4080)
@@ -2245,8 +2245,6 @@
130 Taxes 128 2
131 Defaults 128 3
132 Yearend 128 4
-134 Send to File 133 1
-135 Send to Email 133 2
137 Add Accounts 136 1
138 List Accounts 136 2
139 Add GIFI 136 3
@@ -2329,7 +2327,6 @@
144 Departments 128 9
141 Warehouses 128 8
136 Chart of Accounts 128 7
-133 Backup 128 6
220 Add User 219 1
221 Search Users 219 2
222 Sessions 219 3
@@ -2744,13 +2741,6 @@
130 action taxes 343
132 module account.pl 346
132 action yearend_info 347
-133 menu 1 348
-134 module am.pl 349
-135 module am.pl 350
-134 action backup 351
-135 action backup 352
-134 media file 353
-135 media email 354
138 module am.pl 356
139 module am.pl 357
140 module am.pl 358
Modified: trunk/sql/modules/Company.sql
===================================================================
--- trunk/sql/modules/Company.sql 2011-11-25 13:32:53 UTC (rev 4079)
+++ trunk/sql/modules/Company.sql 2011-11-25 13:51:31 UTC (rev 4080)
@@ -695,7 +695,7 @@
) is
$$ Saves a company. Returns the id number of the record stored.$$;
-CREATE OR REPLACE FUNCTION entity_credit_save (
+DROP FUNCTION IF EXISTS entity_credit_save (
in_credit_id int, in_entity_class int,
in_entity_id int, in_description text,
in_discount numeric, in_taxincluded bool, in_creditlimit numeric,
@@ -707,6 +707,20 @@
in_ar_ap_account_id int,
in_cash_account_id int,
in_pay_to_name text,
+ in_taxform_id int);
+
+CREATE OR REPLACE FUNCTION entity_credit_save (
+ in_credit_id int, in_entity_class int,
+ in_entity_id int, in_description text,
+ in_discount numeric, in_taxincluded bool, in_creditlimit numeric,
+ in_discount_terms int,
+ in_terms int, in_meta_number varchar(32), in_business_id int,
+ in_language_code varchar(6), in_pricegroup_id int,
+ in_curr char, in_startdate date, in_enddate date,
+ in_threshold NUMERIC,
+ in_ar_ap_account_id int,
+ in_cash_account_id int,
+ in_pay_to_name text,
in_taxform_id int
) returns INT as $$
@@ -738,7 +752,7 @@
cash_account_id = in_cash_account_id,
meta_number = t_meta_number,
business_id = in_business_id,
- language_code = in_language,
+ language_code = in_language_code,
pricegroup_id = in_pricegroup_id,
curr = in_curr,
startdate = in_startdate,
@@ -785,7 +799,7 @@
in_terms,
t_meta_number,
in_business_id,
- in_language,
+ in_language_code,
in_pricegroup_id,
in_curr,
in_startdate,
@@ -810,7 +824,7 @@
in_discount numeric, in_taxincluded bool, in_creditlimit numeric,
in_discount_terms int,
in_terms int, in_meta_number varchar(32), in_business_id int,
- in_language varchar(6), in_pricegroup_id int,
+ in_language_code varchar(6), in_pricegroup_id int,
in_curr char, in_startdate date, in_enddate date,
in_threshold NUMERIC,
in_ar_ap_account_id int,
Modified: trunk/sql/modules/Fixes.sql
===================================================================
--- trunk/sql/modules/Fixes.sql 2011-11-25 13:32:53 UTC (rev 4079)
+++ trunk/sql/modules/Fixes.sql 2011-11-25 13:51:31 UTC (rev 4080)
@@ -29,6 +29,12 @@
-- what is working! --CT
UPDATE menu_attribute SET value = 'begin_import' WHERE id = 631 and value = 'import' and node_id = '235';
+-- Getting rid of System/Backup menu since this is broken
+
+DELETE FROM menu_acl WHERE node_id BETWEEN 133 AND 135;
+DELETE FROM menu_attribute WHERE node_id BETWEEN 133 AND 135;
+DELETE FROM menu_node WHERE id BETWEEN 133 AND 135;
+
COMMIT;
BEGIN;
Property changes on: trunk/sql/upgrade/1.2-1.3-manual.sql
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/sql/upgrade/1.2-1.3-manual.sql:3712-4069
/branches/1.3/sql/upgrade/1.2-1.3.sql:3711-3851
/trunk/sql/upgrade/1.2-1.3.sql:858-3710
+ /branches/1.3/sql/upgrade/1.2-1.3-manual.sql:3712-4079
/branches/1.3/sql/upgrade/1.2-1.3.sql:3711-3851
/trunk/sql/upgrade/1.2-1.3.sql:858-3710
Modified: trunk/templates/demo/timecard.tex
===================================================================
--- trunk/templates/demo/timecard.tex 2011-11-25 13:32:53 UTC (rev 4079)
+++ trunk/templates/demo/timecard.tex 2011-11-25 13:51:31 UTC (rev 4080)
@@ -19,7 +19,7 @@
\vspace*{0.5cm}
\begin{tabular}[t]{ll}
- \textbf<?lsmb text('Employee') ?>} & <?lsmb employee ?> \\
+ \textbf{<?lsmb text('Employee') ?>} & <?lsmb employee ?> \\
\textbf{<?lsmb text('ID') ?>} & <?lsmb employee_id ?> \\
\end{tabular}
\hfill
Modified: trunk/templates/xedemo/timecard.tex
===================================================================
--- trunk/templates/xedemo/timecard.tex 2011-11-25 13:32:53 UTC (rev 4079)
+++ trunk/templates/xedemo/timecard.tex 2011-11-25 13:51:31 UTC (rev 4080)
@@ -18,7 +18,7 @@
\vspace*{0.5cm}
\begin{tabular}[t]{ll}
- \textbf<?lsmb text('Employee') ?>} & <?lsmb employee ?> \\
+ \textbf{<?lsmb text('Employee') ?>} & <?lsmb employee ?> \\
\textbf{<?lsmb text('ID') ?>} & <?lsmb employee_id ?> \\
\end{tabular}
\hfill
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.