[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
SF.net SVN: ledger-smb:[5138] trunk/LedgerSMB/Report
- Subject: SF.net SVN: ledger-smb:[5138] trunk/LedgerSMB/Report
- From: ..hidden..
- Date: Thu, 04 Oct 2012 07:07:39 +0000
Revision: 5138
http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=5138&view=rev
Author: einhverfr
Date: 2012-10-04 07:07:39 +0000 (Thu, 04 Oct 2012)
Log Message:
-----------
Fixing reports' text translation routine calling syntax
Modified Paths:
--------------
trunk/LedgerSMB/Report/Aging.pm
trunk/LedgerSMB/Report/Budget/Search.pm
trunk/LedgerSMB/Report/Budget/Variance.pm
trunk/LedgerSMB/Report/COA.pm
trunk/LedgerSMB/Report/Contact/History.pm
trunk/LedgerSMB/Report/Contact/Purchase.pm
trunk/LedgerSMB/Report/Contact/Search.pm
trunk/LedgerSMB/Report/GL.pm
trunk/LedgerSMB/Report/Inventory/Adj_Details.pm
trunk/LedgerSMB/Report/Inventory/Search_Adj.pm
trunk/LedgerSMB/Report/Margin/ECA.pm
trunk/LedgerSMB/Report/Margin/Invoice.pm
trunk/LedgerSMB/Report/PNL/Income_Statement.pm
trunk/LedgerSMB/Report/Payroll/Deduction_Types.pm
trunk/LedgerSMB/Report/Payroll/Income_Types.pm
trunk/LedgerSMB/Report/Trial_Balance/List.pm
trunk/LedgerSMB/Report/Trial_Balance.pm
trunk/LedgerSMB/Report/Unapproved/Batch_Detail.pm
trunk/LedgerSMB/Report/Unapproved/Batch_Overview.pm
trunk/LedgerSMB/Report/Unapproved/Drafts.pm
trunk/LedgerSMB/Report/co/Balance_y_Mayor.pm
trunk/LedgerSMB/Report/co/Caja_Diaria.pm
Modified: trunk/LedgerSMB/Report/Aging.pm
===================================================================
--- trunk/LedgerSMB/Report/Aging.pm 2012-10-03 09:20:40 UTC (rev 5137)
+++ trunk/LedgerSMB/Report/Aging.pm 2012-10-04 07:07:39 UTC (rev 5138)
@@ -75,9 +75,9 @@
our @COLUMNS = ();
my $credit_label;
if ($self->entity_class == 1) {
- $credit_label = text('Vendor');
+ $credit_label = LedgerSMB::Report::text('Vendor');
} elsif ($self->entity_class == 2){
- $credit_label = text('Customer');
+ $credit_label = LedgerSMB::Report::text('Customer');
}
push @COLUMNS,
{col_id => 'select',
@@ -89,57 +89,57 @@
pwidth => 1, },
{col_id => 'language',
- name => text('Language'),
+ name => LedgerSMB::Report::text('Language'),
type => 'select',
pwidth => '0', };
if ($self->report_type eq 'detail'){
push @COLUMNS,
{col_id => 'invnumber',
- name => text('Invoice'),
+ name => LedgerSMB::Report::text('Invoice'),
type => 'href',
href_base => '',
pwidth => '3', },
{col_id => 'ordnumber',
- name => text('Description'),
+ name => LedgerSMB::Report::text('Description'),
type => 'text',
pwidth => '6', },
{col_id => 'transdate',
- name => text('Date'),
+ name => LedgerSMB::Report::text('Date'),
type => 'text',
pwidth => '1', },
{col_id => 'duedate',
- name => text('Due Date'),
+ name => LedgerSMB::Report::text('Due Date'),
type => 'text',
pwidth => '2', };
}
push @COLUMNS,
{col_id => 'c0',
- name => text('Current'),
+ name => LedgerSMB::Report::text('Current'),
type => 'text',
pwidth => '2', },
{col_id => 'c30',
- name => text('30'),
+ name => LedgerSMB::Report::text('30'),
type => 'text',
pwidth => '3', },
{col_id => 'c60',
- name => text('60'),
+ name => LedgerSMB::Report::text('60'),
type => 'text',
pwidth => '3', },
{col_id => 'c90',
- name => text('90'),
+ name => LedgerSMB::Report::text('90'),
type => 'text',
pwidth => '3', },
{col_id => 'total',
- name => text('Total'),
+ name => LedgerSMB::Report::text('Total'),
type => 'text',
pwidth => '1', };
return ..hidden..;
@@ -164,7 +164,7 @@
=cut
sub name {
- return text('Aging Report');
+ return LedgerSMB::Report::text('Aging Report');
}
=item template
Modified: trunk/LedgerSMB/Report/Budget/Search.pm
===================================================================
--- trunk/LedgerSMB/Report/Budget/Search.pm 2012-10-03 09:20:40 UTC (rev 5137)
+++ trunk/LedgerSMB/Report/Budget/Search.pm 2012-10-04 07:07:39 UTC (rev 5138)
@@ -65,34 +65,34 @@
return [ {col_id => 'start_date',
type => 'href',
href_base => 'budget_reports.pl?action=variance_report&id=',
- name => text('Start Date') },
+ name => LedgerSMB::Report::text('Start Date') },
{col_id => 'end_date',
type => 'href',
href_base => 'budget_reports.pl?action=variance_report&id=',
- name => text('End Date') },
+ name => LedgerSMB::Report::text('End Date') },
{col_id => 'reference',
type => 'href',
href_base => 'budgets.pl?action=view_budget&id=',
- name => text('Reference') },
+ name => LedgerSMB::Report::text('Reference') },
{col_id => 'description',
type => 'href',
href_base => 'budgets.pl?action=view_budget&id=',
- name => text('Description') },
+ name => LedgerSMB::Report::text('Description') },
{col_id => 'entered_by_name',
type => 'text',
- name => text('Entered By') },
+ name => LedgerSMB::Report::text('Entered By') },
{col_id => 'approved_by_name',
type => 'text',
- name => text('Approved By') },
+ name => LedgerSMB::Report::text('Approved By') },
{col_id => 'obsolete_by_name',
type => 'text',
- name => text('Obsolete By') },
+ name => LedgerSMB::Report::text('Obsolete By') },
];
}
@@ -104,7 +104,7 @@
=cut
sub name {
- return text('Budget Search Results');
+ return LedgerSMB::Report::text('Budget Search Results');
}
=item header_lines
@@ -115,15 +115,15 @@
sub header_lines {
return [{name => 'date_from',
- text => text('Start Date')},
+ text => LedgerSMB::Report::text('Start Date')},
{name => 'date_to',
- text => text('End Date')},
+ text => LedgerSMB::Report::text('End Date')},
{name => 'accno',
- text => text('Account Number')},
+ text => LedgerSMB::Report::text('Account Number')},
{name => 'reference',
- text => text('Reference')},
+ text => LedgerSMB::Report::text('Reference')},
{name => 'source',
- text => text('Source')}];
+ text => LedgerSMB::Report::text('Source')}];
}
=back
Modified: trunk/LedgerSMB/Report/Budget/Variance.pm
===================================================================
--- trunk/LedgerSMB/Report/Budget/Variance.pm 2012-10-03 09:20:40 UTC (rev 5137)
+++ trunk/LedgerSMB/Report/Budget/Variance.pm 2012-10-04 07:07:39 UTC (rev 5138)
@@ -63,27 +63,27 @@
return [
{col_id => 'budget_description',
type => 'text',
- name => text('Description')},
+ name => LedgerSMB::Report::text('Description')},
{col_id => 'accno',
type => 'text',
- name => text('Account Number')},
+ name => LedgerSMB::Report::text('Account Number')},
{col_id => 'account_label',
type => 'text',
- name => text('Account Label')},
+ name => LedgerSMB::Report::text('Account Label')},
{col_id => 'budget_amount',
type => 'text',
- name => text('Amount Budgetted')},
+ name => LedgerSMB::Report::text('Amount Budgetted')},
{col_id => 'used_amount',
type => 'text',
- name => '- ' . text('Used')},
+ name => '- ' . LedgerSMB::Report::text('Used')},
{col_id => 'variance',
type => 'text',
- name => '= ' . text('Variance')},
+ name => '= ' . LedgerSMB::Report::text('Variance')},
];
}
@@ -94,7 +94,7 @@
=cut
sub name {
- return text('Budget Variance Report');
+ return LedgerSMB::Report::text('Budget Variance Report');
}
=item header_lines
@@ -105,13 +105,13 @@
sub header_lines {
return [{name => 'reference',
- text => text('Budget Number')},
+ text => LedgerSMB::Report::text('Budget Number')},
{name => 'description',
- text => text('Description')},
+ text => LedgerSMB::Report::text('Description')},
{name => 'start_date',
- text => text('Start Date')},
+ text => LedgerSMB::Report::text('Start Date')},
{name => 'end_date',
- text => text('End Date')},];
+ text => LedgerSMB::Report::text('End Date')},];
}
=back
Modified: trunk/LedgerSMB/Report/COA.pm
===================================================================
--- trunk/LedgerSMB/Report/COA.pm 2012-10-03 09:20:40 UTC (rev 5137)
+++ trunk/LedgerSMB/Report/COA.pm 2012-10-04 07:07:39 UTC (rev 5138)
@@ -82,45 +82,45 @@
our @COLUMNS = (
{col_id => 'accno',
- name => text('Account Number'),
+ name => LedgerSMB::Report::text('Account Number'),
type => 'href',
href_base => '',
pwidth => '2', },
{col_id => 'description',
- name => text('Description'),
+ name => LedgerSMB::Report::text('Description'),
type => 'href',
href_base => '',
pwidth => '6', },
{col_id => 'gifi_accno',
- name => text('GIFI'),
+ name => LedgerSMB::Report::text('GIFI'),
type => 'text',
pwidth => '1', },
{col_id => 'debit_balance',
- name => text('Debits'),
+ name => LedgerSMB::Report::text('Debits'),
type => 'text',
pwidth => '2', },
{col_id => 'credit_balance',
- name => text('Credits'),
+ name => LedgerSMB::Report::text('Credits'),
type => 'text',
pwidth => '2', },
{col_id => 'link',
- name => text('Dropdowns'),
+ name => LedgerSMB::Report::text('Dropdowns'),
type => 'text',
pwidth => '3', },
{col_id => 'edit',
- name => text('Edit'),
+ name => LedgerSMB::Report::text('Edit'),
type => 'href',
href_base => '',
pwidth => '3', },
{col_id => 'delete',
- name => text('Delete'),
+ name => LedgerSMB::Report::text('Delete'),
type => 'href',
href_base => '',
pwidth => '3', },
@@ -138,7 +138,7 @@
=cut
sub name {
- return text('Chart of Accounts');
+ return LedgerSMB::Report::text('Chart of Accounts');
}
=item header_lines
@@ -187,8 +187,8 @@
} else {
$ct = 'A';
}
- $r->{edit} = '['.text('Edit').']';
- $r->{delete} = '['.text('Delete').']'
+ $r->{edit} = '['.LedgerSMB::Report::text('Edit').']';
+ $r->{delete} = '['.LedgerSMB::Report::text('Delete').']'
if !$r->{rowcount} and !$r->{is_heading};
$r->{edit_href_suffix} = 'account.pl?action=edit&id='.$r->{id} .
"&charttype=$ct";
Modified: trunk/LedgerSMB/Report/Contact/History.pm
===================================================================
--- trunk/LedgerSMB/Report/Contact/History.pm 2012-10-03 09:20:40 UTC (rev 5137)
+++ trunk/LedgerSMB/Report/Contact/History.pm 2012-10-04 07:07:39 UTC (rev 5138)
@@ -49,60 +49,60 @@
return [
{col_id => 'name',
type => 'text',
- name => text('Name') },
+ name => LedgerSMB::Report::text('Name') },
{col_id => 'meta_number',
type => 'text',
- name => text('Account Number') },
+ name => LedgerSMB::Report::text('Account Number') },
{col_id => 'invnumber',
type => 'href',
href_base => 'is.pl?action=edit&id=',
- name => text('Invoice Number') },
+ name => LedgerSMB::Report::text('Invoice Number') },
{col_id => 'curr',
type => 'text',
- name => text('Currency') },
+ name => LedgerSMB::Report::text('Currency') },
{col_id => 'partnumber',
type => 'text',
- name => text('Part Number') },
+ name => LedgerSMB::Report::text('Part Number') },
{col_id => 'description',
type => 'text',
- name => text('Description') },
+ name => LedgerSMB::Report::text('Description') },
{col_id => 'qty',
type => 'text',
- name => text('Qty') },
+ name => LedgerSMB::Report::text('Qty') },
{col_id => 'unit',
type => 'text',
- name => text('Unit') },
+ name => LedgerSMB::Report::text('Unit') },
{col_id => 'sellprice',
type => 'text',
- name => text('Sell Price') },
+ name => LedgerSMB::Report::text('Sell Price') },
{col_id => 'discount',
type => 'text',
- name => text('Disc') },
+ name => LedgerSMB::Report::text('Disc') },
{col_id => 'delivery_date',
type => 'text',
- name => text('Delivery Date') },
+ name => LedgerSMB::Report::text('Delivery Date') },
{col_id => 'serialnumber',
type => 'text',
- name => text('Serial Number') },
+ name => LedgerSMB::Report::text('Serial Number') },
{col_id => 'exchangerate',
type => 'text',
- name => text('Exchange Rate') },
+ name => LedgerSMB::Report::text('Exchange Rate') },
{col_id => 'salesperson_name',
type => 'text',
- name => text('Salesperson') },
+ name => LedgerSMB::Report::text('Salesperson') },
];
}
@@ -111,7 +111,7 @@
=cut
-sub name { return text('Purchase History') }
+sub name { return LedgerSMB::Report::text('Purchase History') }
=item header_lines
@@ -120,15 +120,15 @@
sub header_lines {
return [
{name => 'name',
- text => text('Name')},
+ text => LedgerSMB::Report::text('Name')},
{name => 'meta_number',
- text => text('Account Number')},
+ text => LedgerSMB::Report::text('Account Number')},
{name => 'from_date',
- text => text('Start Date')},
+ text => LedgerSMB::Report::text('Start Date')},
{name => 'to_date',
- text => text('End Date')},
+ text => LedgerSMB::Report::text('End Date')},
];
Modified: trunk/LedgerSMB/Report/Contact/Purchase.pm
===================================================================
--- trunk/LedgerSMB/Report/Contact/Purchase.pm 2012-10-03 09:20:40 UTC (rev 5137)
+++ trunk/LedgerSMB/Report/Contact/Purchase.pm 2012-10-04 07:07:39 UTC (rev 5138)
@@ -52,63 +52,63 @@
{col_id => 'id',
type => 'text',
- name => text('ID') },
+ name => LedgerSMB::Report::text('ID') },
{col_id => 'entity_name',
type => 'text',
- name => text('Name') },
+ name => LedgerSMB::Report::text('Name') },
{col_id => 'invnumber',
type => 'href',
href_base => '',
- name => text('Invoice Number') },
+ name => LedgerSMB::Report::text('Invoice Number') },
{col_id => 'ordnumber',
type => 'text',
- name => text('Order Number') },
+ name => LedgerSMB::Report::text('Order Number') },
{col_id => 'ponumber',
type => 'text',
- name => text('PO Number') },
+ name => LedgerSMB::Report::text('PO Number') },
{col_id => 'curr',
type => 'text',
- name => text('Currency') },
+ name => LedgerSMB::Report::text('Currency') },
{col_id => 'amount',
type => 'text',
- name => text('Amount') },
+ name => LedgerSMB::Report::text('Amount') },
{col_id => 'tax',
type => 'text',
- name => text('Tax') },
+ name => LedgerSMB::Report::text('Tax') },
{col_id => 'paid',
type => 'text',
- name => text('Paid') },
+ name => LedgerSMB::Report::text('Paid') },
{col_id => 'due',
type => 'text',
- name => text('Due') },
+ name => LedgerSMB::Report::text('Due') },
{col_id => 'date_paid',
type => 'text',
- name => text('Date Paid') },
+ name => LedgerSMB::Report::text('Date Paid') },
{col_id => 'due_date',
type => 'text',
- name => text('Due Date') },
+ name => LedgerSMB::Report::text('Due Date') },
{col_id => 'notes',
type => 'text',
- name => text('Notes') },
+ name => LedgerSMB::Report::text('Notes') },
{col_id => 'shipping_point',
type => 'text',
- name => text('Shipping Point') },
+ name => LedgerSMB::Report::text('Shipping Point') },
{col_id => 'ship_via',
type => 'text',
- name => text('Ship Via') },
+ name => LedgerSMB::Report::text('Ship Via') },
];
}
@@ -119,9 +119,9 @@
sub name {
my ($self) = @_;
if ($self->entity_class == 1){
- return text('AP Transactions');
+ return LedgerSMB::Report::text('AP Transactions');
} elsif ($self->entity_class == 2){
- return text('AR Transactions');
+ return LedgerSMB::Report::text('AR Transactions');
}
}
@@ -132,9 +132,9 @@
sub header_lines {
return [
{name => 'name_part',
- text => text('Name')},
+ text => LedgerSMB::Report::text('Name')},
{name => 'meta_number',
- text => text('Account Number')}
+ text => LedgerSMB::Report::text('Account Number')}
];
}
Modified: trunk/LedgerSMB/Report/Contact/Search.pm
===================================================================
--- trunk/LedgerSMB/Report/Contact/Search.pm 2012-10-03 09:20:40 UTC (rev 5137)
+++ trunk/LedgerSMB/Report/Contact/Search.pm 2012-10-04 07:07:39 UTC (rev 5138)
@@ -50,33 +50,33 @@
return [
{col_id => 'name',
type => 'text',
- name => text('Name') },
+ name => LedgerSMB::Report::text('Name') },
{col_id => 'entity_control_code',
type => 'href',
href_base =>($self->entity_class == 3)
? "employee.pl?action=get"
:"contact.pl?action=get&entity_class=".$self->entity_class,
- name => text('Control Code') },
+ name => LedgerSMB::Report::text('Control Code') },
{col_id => 'meta_number',
type => 'href',
href_base => ($self->entity_class == 3)
? "employee.pl?action=get"
: "contact.pl?action=get&entity_class=".$self->entity_class,
- name => text('Credit Account Number') },
+ name => LedgerSMB::Report::text('Credit Account Number') },
{col_id => 'credit_description',
type => 'text',
- name => text('Description') },
+ name => LedgerSMB::Report::text('Description') },
{col_id => 'business_type',
type => 'text',
- name => text('Business Type') },
+ name => LedgerSMB::Report::text('Business Type') },
{col_id => 'curr',
type => 'text',
- name => text('Currency') },
+ name => LedgerSMB::Report::text('Currency') },
];
}
@@ -84,7 +84,7 @@
=cut
-sub name { return text('Contact Search') }
+sub name { return LedgerSMB::Report::text('Contact Search') }
=item header_lines
@@ -93,9 +93,9 @@
sub header_lines {
return [
{name => 'name_part',
- text => text('Name')},
+ text => LedgerSMB::Report::text('Name')},
{name => 'meta_number',
- text => text('Account Number')}
+ text => LedgerSMB::Report::text('Account Number')}
];
}
Modified: trunk/LedgerSMB/Report/GL.pm
===================================================================
--- trunk/LedgerSMB/Report/GL.pm 2012-10-03 09:20:40 UTC (rev 5137)
+++ trunk/LedgerSMB/Report/GL.pm 2012-10-04 07:07:39 UTC (rev 5138)
@@ -79,90 +79,90 @@
my @COLS = (
{col_id => 'id',
- name => text('ID'),
+ name => LedgerSMB::Report::text('ID'),
type => 'text',
pwidth => 1, },
{col_id => 'transdate',
- name => text('Date'),
+ name => LedgerSMB::Report::text('Date'),
type => 'text',
pwidth => '4', },
{col_id => 'reference',
- name => text('Reference'),
+ name => LedgerSMB::Report::text('Reference'),
type => 'href',
href_base => '',
pwidth => '3', },
{col_id => 'description',
- name => text('Description'),
+ name => LedgerSMB::Report::text('Description'),
type => 'text',
pwidth => '6', },
{col_id => 'entry_id',
- name => text('Entry ID'),
+ name => LedgerSMB::Report::text('Entry ID'),
type => 'text',
pwidth => '1', },
{col_id => 'debits',
- name => text('Debits'),
+ name => LedgerSMB::Report::text('Debits'),
type => 'text',
pwidth => '2', },
{col_id => 'credits',
- name => text('Credits'),
+ name => LedgerSMB::Report::text('Credits'),
type => 'text',
pwidth => '2', },
{col_id => 'source',
- name => text('Source'),
+ name => LedgerSMB::Report::text('Source'),
type => 'text',
pwidth => '3', },
{col_id => 'memo',
- name => text('Memo'),
+ name => LedgerSMB::Report::text('Memo'),
type => 'text',
pwidth => '3', },
{col_id => 'cleared',
- name => text('Cleared'),
+ name => LedgerSMB::Report::text('Cleared'),
type => 'text',
pwidth => '3', },
{col_id => 'till',
- name => text('Till'),
+ name => LedgerSMB::Report::text('Till'),
type => 'text',
pwidth => '1', },
{col_id => 'chart_id',
- name => text('Chart ID'),
+ name => LedgerSMB::Report::text('Chart ID'),
type => 'text',
pwidth => '1', },
{col_id => 'accno',
- name => text('Account No.'),
+ name => LedgerSMB::Report::text('Account No.'),
type => 'text',
pwidth => '3', },
{col_id => 'accname',
- name => text('Account Name'),
+ name => LedgerSMB::Report::text('Account Name'),
type => 'text',
pwidth => '3', },
{col_id => 'gifi_accno',
- name => text('GIFI'),
+ name => LedgerSMB::Report::text('GIFI'),
type => 'text',
pwidth => '3', },
{col_id => 'running_balance',
- name => text('Balance'),
+ name => LedgerSMB::Report::text('Balance'),
type => 'text',
pwidth => '3', },
);
my @bclasses = LedgerSMB::DBObject::Business_Unit_Class->list('1', 'gl');
for my $class (@bclasses){
push @COLS, {col_id => "bc_" . $class->id,
- name => text($class->label),
+ name => LedgerSMB::Report::text($class->label),
type => 'text',
pwidth => '2'};
}
@@ -186,7 +186,7 @@
=cut
sub name {
- return text('General Ledger Report');
+ return LedgerSMB::Report::text('General Ledger Report');
}
=item header_lines
@@ -197,15 +197,15 @@
sub header_lines {
return [{name => 'from_date',
- text => text('Start Date')},
+ text => LedgerSMB::Report::text('Start Date')},
{name => 'to_date',
- text => text('End Date')},
+ text => LedgerSMB::Report::text('End Date')},
{name => 'accno',
- text => text('Account Number')},
+ text => LedgerSMB::Report::text('Account Number')},
{name => 'reference',
- text => text('Reference')},
+ text => LedgerSMB::Report::text('Reference')},
{name => 'source',
- text => text('Source')}];
+ text => LedgerSMB::Report::text('Source')}];
}
=item subtotal_cols
Modified: trunk/LedgerSMB/Report/Inventory/Adj_Details.pm
===================================================================
--- trunk/LedgerSMB/Report/Inventory/Adj_Details.pm 2012-10-03 09:20:40 UTC (rev 5137)
+++ trunk/LedgerSMB/Report/Inventory/Adj_Details.pm 2012-10-04 07:07:39 UTC (rev 5138)
@@ -56,14 +56,14 @@
=cut
-sub name { return text('Inventory Adjustment Details') }
+sub name { return LedgerSMB::Report::text('Inventory Adjustment Details') }
=item header_lines
=cut
sub header_lines {
- return [{name => 'source', text => text('Source') }];
+ return [{name => 'source', text => LedgerSMB::Report::text('Source') }];
}
=item columns
@@ -75,19 +75,19 @@
{col_id => 'partnumber',
type => 'href',
href_base => 'ic.pl?action=edit&id='.
- name => text('Part Number') },
+ name => LedgerSMB::Report::text('Part Number') },
{col_id => 'description',
type => 'text',
- name => text('Description') },
+ name => LedgerSMB::Report::text('Description') },
{col_id => 'counted',
type => 'text',
- name => text('Counted') },
+ name => LedgerSMB::Report::text('Counted') },
{col_id => 'expected',
type => 'text',
- name => text('Expected') },
+ name => LedgerSMB::Report::text('Expected') },
{col_id => 'variance',
type => 'text',
- name => text('Variance') },
+ name => LedgerSMB::Report::text('Variance') },
];
}
Modified: trunk/LedgerSMB/Report/Inventory/Search_Adj.pm
===================================================================
--- trunk/LedgerSMB/Report/Inventory/Search_Adj.pm 2012-10-03 09:20:40 UTC (rev 5137)
+++ trunk/LedgerSMB/Report/Inventory/Search_Adj.pm 2012-10-04 07:07:39 UTC (rev 5138)
@@ -64,7 +64,7 @@
=cut
-sub name { return text('Inventory Adjustments') };
+sub name { return LedgerSMB::Report::text('Inventory Adjustments') };
=item header_lines
@@ -72,13 +72,13 @@
sub header_lines {
return [{name => 'from_date',
- text => text('Start Date') },
+ text => LedgerSMB::Report::text('Start Date') },
{name => 'to_date',
- text => text('End Date') },
+ text => LedgerSMB::Report::text('End Date') },
{name => 'partnumber',
- text => text('Including partnumber') },
+ text => LedgerSMB::Report::text('Including partnumber') },
{name => 'source',
- text => text('Source starting with') },
+ text => LedgerSMB::Report::text('Source starting with') },
];
}
@@ -90,18 +90,18 @@
return [{col_id => 'transdate',
type => 'href',
href_base => 'inv_reports.pl?action=adj_detail&id=',
- name => text('Date')},
+ name => LedgerSMB::Report::text('Date')},
{col_id => 'source',
type => 'href',
href_base => 'inv_reports.pl?action=adj_detail&id=',
- name => text('Reference')},
+ name => LedgerSMB::Report::text('Reference')},
{col_id => 'ar_invnumber',
type => 'href',
- name => text('AR Invoice'),
+ name => LedgerSMB::Report::text('AR Invoice'),
href_base => 'is.pl?action=edit&id='},
{col_id => 'ap_invnumber',
type => 'href',
- name => text('AP Invoice'),
+ name => LedgerSMB::Report::text('AP Invoice'),
href_base => 'ir.pl?action=edit&id='},
];
}
Modified: trunk/LedgerSMB/Report/Margin/ECA.pm
===================================================================
--- trunk/LedgerSMB/Report/Margin/ECA.pm 2012-10-03 09:20:40 UTC (rev 5137)
+++ trunk/LedgerSMB/Report/Margin/ECA.pm 2012-10-04 07:07:39 UTC (rev 5138)
@@ -64,7 +64,7 @@
=cut
-sub name { return text('Margin Report for Customer'); }
+sub name { return LedgerSMB::Report::text('Margin Report for Customer'); }
=item columns
@@ -80,7 +80,7 @@
sub header_lines {
return [{ name => 'meta_number',
- text => text('Customer Number')}
+ text => LedgerSMB::Report::text('Customer Number')}
];
}
Modified: trunk/LedgerSMB/Report/Margin/Invoice.pm
===================================================================
--- trunk/LedgerSMB/Report/Margin/Invoice.pm 2012-10-03 09:20:40 UTC (rev 5137)
+++ trunk/LedgerSMB/Report/Margin/Invoice.pm 2012-10-04 07:07:39 UTC (rev 5138)
@@ -50,7 +50,7 @@
=cut
-sub name { return text('Margin Report for Invoice') };
+sub name { return LedgerSMB::Report::text('Margin Report for Invoice') };
=item columns
@@ -66,7 +66,7 @@
sub header_lines {
return [{ name => 'invnumber',
- text => text('Invoice Number')}
+ text => LedgerSMB::Report::text('Invoice Number')}
];
}
Modified: trunk/LedgerSMB/Report/PNL/Income_Statement.pm
===================================================================
--- trunk/LedgerSMB/Report/PNL/Income_Statement.pm 2012-10-03 09:20:40 UTC (rev 5137)
+++ trunk/LedgerSMB/Report/PNL/Income_Statement.pm 2012-10-04 07:07:39 UTC (rev 5138)
@@ -51,7 +51,7 @@
=cut
-sub name { return text('Income Statement') }
+sub name { return LedgerSMB::Report::text('Income Statement') }
=item header_lines
@@ -59,7 +59,7 @@
sub header_lines {
return [{name => 'basis',
- text => text('Reporting Basis') }];
+ text => LedgerSMB::Report::text('Reporting Basis') }];
}
=item columns
@@ -81,7 +81,7 @@
sub report_base {
my ($self, $from_date, $to_date) = @_;
- die text('Invalid Reporting Basis')
+ die LedgerSMB::Report::text('Invalid Reporting Basis')
if ($self->basis ne 'accrual') and ($self->basis ne 'cash');
my $procname = 'pnl__income_statement_' . $self->basis;
return $self->call_procedure(
Modified: trunk/LedgerSMB/Report/Payroll/Deduction_Types.pm
===================================================================
--- trunk/LedgerSMB/Report/Payroll/Deduction_Types.pm 2012-10-03 09:20:40 UTC (rev 5137)
+++ trunk/LedgerSMB/Report/Payroll/Deduction_Types.pm 2012-10-04 07:07:39 UTC (rev 5138)
@@ -27,14 +27,14 @@
sub columns {
return [
{ col_id => 'country_name',
- name => text('Country'),
+ name => LedgerSMB::Report::text('Country'),
type => 'text',
},
{ col_id => 'deduction_class',
- name => text('Deduction Class'),
+ name => LedgerSMB::Report::text('Deduction Class'),
type => 'text' },
{ col_id => 'label',
- name => text('Label'),
+ name => LedgerSMB::Report::text('Label'),
type => 'href',
href_base => 'payrol.pl?action=edit&id=' },
];
@@ -52,7 +52,7 @@
=cut
-sub name { return text('Deduction Types') }
+sub name { return LedgerSMB::Report::text('Deduction Types') }
=back
Modified: trunk/LedgerSMB/Report/Payroll/Income_Types.pm
===================================================================
--- trunk/LedgerSMB/Report/Payroll/Income_Types.pm 2012-10-03 09:20:40 UTC (rev 5137)
+++ trunk/LedgerSMB/Report/Payroll/Income_Types.pm 2012-10-04 07:07:39 UTC (rev 5138)
@@ -27,14 +27,14 @@
sub columns {
return [
{ col_id => 'country_name',
- name => text('Country'),
+ name => LedgerSMB::Report::text('Country'),
type => 'text',
},
{ col_id => 'income_class',
- name => text('Income Class'),
+ name => LedgerSMB::Report::text('Income Class'),
type => 'text' },
{ col_id => 'label',
- name => text('Label'),
+ name => LedgerSMB::Report::text('Label'),
type => 'href',
href_base => 'payrol.pl?action=edit&id=' },
];
@@ -52,7 +52,7 @@
=cut
-sub name { return text('Income Types') }
+sub name { return LedgerSMB::Report::text('Income Types') }
=back
Modified: trunk/LedgerSMB/Report/Trial_Balance/List.pm
===================================================================
--- trunk/LedgerSMB/Report/Trial_Balance/List.pm 2012-10-03 09:20:40 UTC (rev 5137)
+++ trunk/LedgerSMB/Report/Trial_Balance/List.pm 2012-10-04 07:07:39 UTC (rev 5138)
@@ -32,7 +32,7 @@
=cut
-sub name { return $locale->text('Trial Balance List') }
+sub name { return $locale->LedgerSMB::Report::text('Trial Balance List') }
=item header_lines
@@ -48,16 +48,16 @@
return [{ col_id => 'description',
type => 'href',
href_base => 'trial_balance.pl?action=get&id=',
- name => $locale->text('Description') },
+ name => $locale->LedgerSMB::Report::text('Description') },
{ col_id => 'date_from',
type => 'text',
- name => $locale->text('Start Date') },
+ name => $locale->LedgerSMB::Report::text('Start Date') },
{ col_id => 'date_to',
type => 'text',
- name => $locale->text('End Date') },
+ name => $locale->LedgerSMB::Report::text('End Date') },
{ col_id => 'yearend',
type => 'text',
- name => $locale->text('Ignore Yearends') },
+ name => $locale->LedgerSMB::Report::text('Ignore Yearends') },
];
}
Modified: trunk/LedgerSMB/Report/Trial_Balance.pm
===================================================================
--- trunk/LedgerSMB/Report/Trial_Balance.pm 2012-10-03 09:20:40 UTC (rev 5137)
+++ trunk/LedgerSMB/Report/Trial_Balance.pm 2012-10-04 07:07:39 UTC (rev 5138)
@@ -112,7 +112,7 @@
=cut
sub name {
- return text('Trial Balance');
+ return LedgerSMB::Report::text('Trial Balance');
};
=item columns
@@ -124,33 +124,33 @@
{col_id => 'account_number',
type => 'href',
href_base => 'journal.pl?action=search&col_transdate=Y&col_reference=Y&col_description=Y&col_debits=Y&col_credits=Y&col_source=Y&col_accno=Y',
- name => text('Account Number') },
+ name => LedgerSMB::Report::text('Account Number') },
{col_id => 'account_desc',
type => 'href',
href_base => 'journal.pl?action=search&col_transdate=Y&col_reference=Y&col_description=Y&col_debits=Y&col_credits=Y&col_source=Y&col_accno=Y',
- name => text('Account Description') },
+ name => LedgerSMB::Report::text('Account Description') },
{col_id => 'gifi_accno',
type => 'href',
href_base => 'journal.pl?action=search&col_transdate=Y&col_reference=Y&col_description=Y&col_debits=Y&col_credits=Y&col_source=Y&col_accno=Y',
- name => text('GIFI') } ,
+ name => LedgerSMB::Report::text('GIFI') } ,
{col_id => 'starting_balance',
type => 'text',
- name => text('Starting Balance') } ,
+ name => LedgerSMB::Report::text('Starting Balance') } ,
{col_id => 'debits',
type => 'text',
- name => text('Debits') } ,
+ name => LedgerSMB::Report::text('Debits') } ,
{col_id => 'credits',
type => 'text',
- name => text('Credits') } ,
+ name => LedgerSMB::Report::text('Credits') } ,
{col_id => 'ending_balance',
type => 'text',
- name => text('Ending Balance') } ,
+ name => LedgerSMB::Report::text('Ending Balance') } ,
];
}
@@ -161,11 +161,11 @@
sub header_lines {
return [{name => 'date_from',
- text => text('From date') },
+ text => LedgerSMB::Report::text('From date') },
{name => 'date_to',
- text => text('To Date') },
+ text => LedgerSMB::Report::text('To Date') },
{name => 'yearend',
- text => text('Ignore Yearends') },
+ text => LedgerSMB::Report::text('Ignore Yearends') },
];
}
Modified: trunk/LedgerSMB/Report/Unapproved/Batch_Detail.pm
===================================================================
--- trunk/LedgerSMB/Report/Unapproved/Batch_Detail.pm 2012-10-03 09:20:40 UTC (rev 5137)
+++ trunk/LedgerSMB/Report/Unapproved/Batch_Detail.pm 2012-10-04 07:07:39 UTC (rev 5138)
@@ -87,33 +87,33 @@
type => 'checkbox' },
{col_id => 'id',
- name => text('ID'),
+ name => LedgerSMB::Report::text('ID'),
type => 'text',
pwidth => 1, },
{col_id => 'batch_class',
- name => text('Batch Class'),
+ name => LedgerSMB::Report::text('Batch Class'),
type => 'text',
pwidth => 2, },
{col_id => 'default_date',
- name => text('Date'),
+ name => LedgerSMB::Report::text('Date'),
type => 'text',
pwidth => '4', },
{col_id => 'Reference',
- name => text('Reference'),
+ name => LedgerSMB::Report::text('Reference'),
type => 'href',
href_base => '',
pwidth => '3', },
{col_id => 'description',
- name => text('Description'),
+ name => LedgerSMB::Report::text('Description'),
type => 'text',
pwidth => '6', },
{col_id => 'amount',
- name => text('Amount'),
+ name => LedgerSMB::Report::text('Amount'),
type => 'text',
pwidth => '2', },
];
@@ -128,7 +128,7 @@
=cut
sub name {
- return text('Voucher List');
+ return LedgerSMB::Report::text('Voucher List');
}
=item header_lines
@@ -139,7 +139,7 @@
sub header_lines {
return [{name => 'batch_id',
- text => text('Batch ID')}, ]
+ text => LedgerSMB::Report::text('Batch ID')}, ]
}
=item subtotal_cols
@@ -185,19 +185,19 @@
$self->buttons([{
name => 'action',
type => 'submit',
- text => text('Post Batch'),
+ text => LedgerSMB::Report::text('Post Batch'),
value => 'batch_approve',
class => 'submit',
},{
name => 'action',
type => 'submit',
- text => text('Delete Batch'),
+ text => LedgerSMB::Report::text('Delete Batch'),
value => 'batch_delete',
class => 'submit',
},{
name => 'action',
type => 'submit',
- text => text('Delete Vouchers'),
+ text => LedgerSMB::Report::text('Delete Vouchers'),
value => 'vouchers_delete',
class => 'submit',
}]);
Modified: trunk/LedgerSMB/Report/Unapproved/Batch_Overview.pm
===================================================================
--- trunk/LedgerSMB/Report/Unapproved/Batch_Overview.pm 2012-10-03 09:20:40 UTC (rev 5137)
+++ trunk/LedgerSMB/Report/Unapproved/Batch_Overview.pm 2012-10-04 07:07:39 UTC (rev 5138)
@@ -83,33 +83,33 @@
type => 'checkbox' },
{col_id => 'id',
- name => text('ID'),
+ name => LedgerSMB::Report::text('ID'),
type => 'text',
pwidth => 1, },
{col_id => 'default_date',
- name => text('Date'),
+ name => LedgerSMB::Report::text('Date'),
type => 'text',
pwidth => '4', },
{col_id => 'control_code',
- name => text('Control Code'),
+ name => LedgerSMB::Report::text('Control Code'),
type => 'href',
href_base => 'vouchers.pl?action=get_batch&id=',
pwidth => '3', },
{col_id => 'description',
- name => text('Description'),
+ name => LedgerSMB::Report::text('Description'),
type => 'text',
pwidth => '6', },
{col_id => 'transaction_total',
- name => text('AR/AP/GL Amount'),
+ name => LedgerSMB::Report::text('AR/AP/GL Amount'),
type => 'text',
pwidth => '2', },
{col_id => 'payment_total',
- name => text('Payment Amount'),
+ name => LedgerSMB::Report::text('Payment Amount'),
type => 'text',
pwidth => '2', },
@@ -128,7 +128,7 @@
=cut
sub name {
- return text('Batch Search');
+ return LedgerSMB::Report::text('Batch Search');
}
=item header_lines
@@ -139,13 +139,13 @@
sub header_lines {
return [{name => 'type',
- text => text('Batch Type')},
+ text => LedgerSMB::Report::text('Batch Type')},
{name => 'reference',
- text => text('Reference')},
+ text => LedgerSMB::Report::text('Reference')},
{name => 'amount_gt',
- text => text('Amount Greater Than')},
+ text => LedgerSMB::Report::text('Amount Greater Than')},
{name => 'amount_lt',
- text => text('Amount Less Than')}, ]
+ text => LedgerSMB::Report::text('Amount Less Than')}, ]
}
=item subtotal_cols
@@ -159,7 +159,7 @@
}
sub text {
- return LedgerSMB::Report::text(@_);
+ return LedgerSMB::Report::LedgerSMB::Report::text(@_);
}
=back
@@ -219,13 +219,13 @@
$self->buttons([{
name => 'action',
type => 'submit',
- text => text('Post'),
+ text => LedgerSMB::Report::text('Post'),
value => 'batch_approve',
class => 'submit',
},{
name => 'action',
type => 'submit',
- text => text('Delete'),
+ text => LedgerSMB::Report::text('Delete'),
value => 'batch_delete',
class => 'submit',
}]);
Modified: trunk/LedgerSMB/Report/Unapproved/Drafts.pm
===================================================================
--- trunk/LedgerSMB/Report/Unapproved/Drafts.pm 2012-10-03 09:20:40 UTC (rev 5137)
+++ trunk/LedgerSMB/Report/Unapproved/Drafts.pm 2012-10-04 07:07:39 UTC (rev 5138)
@@ -76,28 +76,28 @@
type => 'checkbox' },
{col_id => 'id',
- name => text('ID'),
+ name => LedgerSMB::Report::text('ID'),
type => 'text',
pwidth => 1, },
{col_id => 'transdate',
- name => text('Date'),
+ name => LedgerSMB::Report::text('Date'),
type => 'text',
pwidth => '4', },
{col_id => 'reference',
- name => text('Reference'),
+ name => LedgerSMB::Report::text('Reference'),
type => 'href',
href_base => '',
pwidth => '3', },
{col_id => 'description',
- name => text('Description'),
+ name => LedgerSMB::Report::text('Description'),
type => 'text',
pwidth => '6', },
{col_id => 'amount',
- name => text('AR/AP/GL Amount'),
+ name => LedgerSMB::Report::text('AR/AP/GL Amount'),
type => 'text',
pwidth => '2', },
];
@@ -112,7 +112,7 @@
=cut
sub name {
- return text('Draft Search');
+ return LedgerSMB::Report::text('Draft Search');
}
=item header_lines
@@ -123,13 +123,13 @@
sub header_lines {
return [{name => 'type',
- text => text('Draft Type')},
+ text => LedgerSMB::Report::text('Draft Type')},
{name => 'reference',
- text => text('Reference')},
+ text => LedgerSMB::Report::text('Reference')},
{name => 'amount_gt',
- text => text('Amount Greater Than')},
+ text => LedgerSMB::Report::text('Amount Greater Than')},
{name => 'amount_lt',
- text => text('Amount Less Than')}, ]
+ text => LedgerSMB::Report::text('Amount Less Than')}, ]
}
=item subtotal_cols
Modified: trunk/LedgerSMB/Report/co/Balance_y_Mayor.pm
===================================================================
--- trunk/LedgerSMB/Report/co/Balance_y_Mayor.pm 2012-10-03 09:20:40 UTC (rev 5137)
+++ trunk/LedgerSMB/Report/co/Balance_y_Mayor.pm 2012-10-04 07:07:39 UTC (rev 5138)
@@ -61,32 +61,32 @@
my @COLS = (
{col_id => 'accno',
- name => text('Account'),
+ name => LedgerSMB::Report::text('Account'),
type => 'href',
pwidth => 3,
href_base => '', },
{col_id => 'description',
- name => text('Description'),
+ name => LedgerSMB::Report::text('Description'),
type => 'text',
pwidth => '12', },
{col_id => 'starting_balance',
- name => text('Starting Balance'),
+ name => LedgerSMB::Report::text('Starting Balance'),
type => 'text',
pwidth => '3', },
{col_id => 'debits',
- name => text('Debit'),
+ name => LedgerSMB::Report::text('Debit'),
type => 'text',
pwidth => '4', },
{col_id => 'credits',
- name => text('Credit'),
+ name => LedgerSMB::Report::text('Credit'),
type => 'text',
pwidth => '4', },
{col_id => 'ending_balance',
- name => text('Balance'),
+ name => LedgerSMB::Report::text('Balance'),
type => 'text',
pwidth => '3', },
@@ -111,7 +111,7 @@
=cut
sub name {
- return text('Balance y Mayor');
+ return LedgerSMB::Report::text('Balance y Mayor');
}
=item header_lines
@@ -122,9 +122,9 @@
sub header_lines {
return [{name => 'date_from',
- text => text('Start Date')},
+ text => LedgerSMB::Report::text('Start Date')},
{name => 'date_to',
- text => text('End Date')},]
+ text => LedgerSMB::Report::text('End Date')},]
}
=back
Modified: trunk/LedgerSMB/Report/co/Caja_Diaria.pm
===================================================================
--- trunk/LedgerSMB/Report/co/Caja_Diaria.pm 2012-10-03 09:20:40 UTC (rev 5137)
+++ trunk/LedgerSMB/Report/co/Caja_Diaria.pm 2012-10-04 07:07:39 UTC (rev 5138)
@@ -62,28 +62,28 @@
sub columns {
return [
{col_id => 'accno',
- name => text('Account'),
+ name => LedgerSMB::Report::text('Account'),
type => 'href',
pwidth => 3,
href_base => '', },
{col_id => 'description',
- name => text('Description'),
+ name => LedgerSMB::Report::text('Description'),
type => 'text',
pwidth => '12', },
{col_id => 'document_type',
- name => text('Document'),
+ name => LedgerSMB::Report::text('Document'),
type => 'text',
pwidth => '3', },
{col_id => 'debits',
- name => text('Debit'),
+ name => LedgerSMB::Report::text('Debit'),
type => 'text',
pwidth => '4', },
{col_id => 'credits',
- name => text('Credit'),
+ name => LedgerSMB::Report::text('Credit'),
type => 'text',
pwidth => '4', },
];
@@ -107,7 +107,7 @@
=cut
sub name {
- return text('Caja Diaria');
+ return LedgerSMB::Report::text('Caja Diaria');
}
=item header_lines
@@ -118,13 +118,13 @@
sub header_lines {
return [{name => 'date_from',
- text => text('Start Date')},
+ text => LedgerSMB::Report::text('Start Date')},
{name => 'date_to',
- text => text('End Date')},
+ text => LedgerSMB::Report::text('End Date')},
{name => 'accno',
- text => text('Account Number Start')},
+ text => LedgerSMB::Report::text('Account Number Start')},
{name => 'reference',
- text => text('Account Number End')},]
+ text => LedgerSMB::Report::text('Account Number End')},]
}
=back
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.