[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
SF.net SVN: ledger-smb:[4774] trunk
- Subject: SF.net SVN: ledger-smb:[4774] trunk
- From: ..hidden..
- Date: Fri, 25 May 2012 02:44:14 +0000
Revision: 4774
http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=4774&view=rev
Author: einhverfr
Date: 2012-05-25 02:44:14 +0000 (Fri, 25 May 2012)
Log Message:
-----------
GL search screen moved to generic reporting framework
Menu structure fixed
Tried reversing toggle arrows. Seeing which affords greater ease of use.
Menu added for ar/ap vouchers (for new invoice vouchers that are forthcoming)
budgets menu added
Added logic for printing statements
Modified Paths:
--------------
trunk/LedgerSMB/DBObject/Report/Aging.pm
trunk/LedgerSMB/Scripts/journal.pm
trunk/LedgerSMB/Scripts/report_aging.pm
trunk/css/ledgersmb.css
trunk/sql/Pg-database.sql
trunk/sql/modules/Roles.sql
Added Paths:
-----------
trunk/UI/Reports/filters/gl.html
Removed Paths:
-------------
trunk/UI/journal/search.html
Modified: trunk/LedgerSMB/DBObject/Report/Aging.pm
===================================================================
--- trunk/LedgerSMB/DBObject/Report/Aging.pm 2012-05-24 13:36:23 UTC (rev 4773)
+++ trunk/LedgerSMB/DBObject/Report/Aging.pm 2012-05-25 02:44:14 UTC (rev 4774)
@@ -91,7 +91,7 @@
push @COLUMNS,
{col_id => 'select',
type => 'checkbox'},
-
+
{col_id => 'name',
name => $credit_label,
type => 'text',
@@ -267,6 +267,10 @@
my ($self) = @_;
my @rows = $self->exec_method({funcname => 'report__invoice_aging_' .
$self->report_type});
+ for my $row(@rows){
+ $row->{row_id} = "$row->{account_number}:$row->{entity_id}";
+ $row->{total} = $row->{c0} + $row->{c30} + $row->{c60} + $row->{c90};
+ }
$self->rows(..hidden..);
}
Modified: trunk/LedgerSMB/Scripts/journal.pm
===================================================================
--- trunk/LedgerSMB/Scripts/journal.pm 2012-05-24 13:36:23 UTC (rev 4773)
+++ trunk/LedgerSMB/Scripts/journal.pm 2012-05-25 02:44:14 UTC (rev 4774)
@@ -58,36 +58,6 @@
$template->render($request);
}
-=item start_search
-
-Displays the search screen
-
-=cut
-
-sub start_search {
- my ($request) = @_;
- $request->{class_id} = 0;
- $request->{control_code} = '';
- my $buc = LedgerSMB::DBObject::Business_Unit_Class->new(%$request);
- my $bu = LedgerSMB::DBObject::Business_Unit->new(%$request);
- @{$request->{bu_classes}} = $buc->list(1, 'gl');
- for my $bc (@{$request->{bu_classes}}){
- @{$request->{b_units}->{$bc->{id}}}
- = $bu->list($bc->{id}, undef, 0, undef);
- for my $bu (@{$request->{b_units}->{$bc->{id}}}){
- $bu->{text} = $bu->control_code . ' -- '. $bu->description;
- }
- }
- my $template = LedgerSMB::Template->new(
- user => $request->{_user},
- locale => $request->{_locale},
- path => 'UI/journal',
- template => 'search',
- format => 'HTML'
- );
- $template->render($request);
-}
-
=item search
Runs a search and displays results.
Modified: trunk/LedgerSMB/Scripts/report_aging.pm
===================================================================
--- trunk/LedgerSMB/Scripts/report_aging.pm 2012-05-24 13:36:23 UTC (rev 4773)
+++ trunk/LedgerSMB/Scripts/report_aging.pm 2012-05-25 02:44:14 UTC (rev 4774)
@@ -53,12 +53,82 @@
run_report(@_);
}
-=item THE FOLLOWING ARE TODO
+=item generate_statement
-=item retrieve_statement
+This generates a statement and sends it off to the printer, the screen, or
+email.
-=item print_statement
+=cut
-=item email_screen
+sub generate_statement {
+ my ($request) = @_;
+ use LedgerSMB::DBObject::Entity::Company;
+ use LedgerSMB::DBObject::Entity::Credit_Account;
+ use LedgerSMB::DBObject::Entity::Location;
+ use LedgerSMB::DBObject::Entity::Contact;
-=item email_statement
+ my $rtype = $request->{report_type}; # in case we need it later
+ $request->{report_type} = 'detail'; # needed to generate statement
+
+ my $template_suffix;
+ my @statements;
+ my $old_meta = $request->{meta_number};
+
+ # The reason to work backwards here is that if we are sending emails out, we
+ # can hide form submission info and not lose track of where we are. This
+ # will need additional documentation, however. --CT
+ while ($request->{rowcount} > 0){
+ my $rc = $request->{rowcount};
+ --$request->{rowcount};
+ next unless $request->{"select_$rc"};
+ my ($entity_id, $meta_number) = split /:/, $request->{"select_$rc"};
+ my $company = LedgerSMB::DBobject::Entity::Company->get($entity_id);
+ my $credit_act =
+ LedgerSMB::DBobject::Entity::Credit_Account->get_by_meta_number(
+ $meta_number, $request->{entity_class}
+ );
+ my @loc = LedgerSMB::DBobject::Entity::Location->get_active(
+ $request, {entity_id => $entity_id,
+ credit_id => $credit_act->{id},
+ only_class => 1}
+ );
+ my $location = pop @loc;
+ my @contact_info = LedgerSMB::DBObject::Entity::Contact->list(
+ {entity_id => $entity_id, credit_id => $credit_act->{id} }
+ );
+ $request->{meta_number} = $meta_number;
+ LedgerSMB::DBObject::Report::Aging->prepare_criteria($request);
+ my $aging_report = LedgerSMB::DBObject::Report::Aging->new(%$request);
+ my $statement = {
+ aging => $aging_report,
+ entity => $company,
+ address => $location,
+ contacts => @contact_info
+ };
+ push @statements, $statement;
+ last if $request->{print_to} eq 'email';
+ }
+ $request->{report_type} = $rtype;
+ $request->{meta_number} = $old_meta;
+
+ my $template = LedgerSMB::Template->new(
+ locale => $LedgerSMB::App_Date::Locale,
+ template => $request->{print_template},
+ # language => $form->{language_code}, TODO
+ format => uc $request->{print_format},
+ method => $request->{print_to},
+ );
+
+ if ($request->{print_to} eq 'email'){
+ #TODO -- mailer stuff
+ } elsif ($request->{print_to} eq 'screen'){
+ $template->render({statements => ..hidden..);
+ } else {
+ $template->render({statements => ..hidden..);
+ use LedgerSMB::Scripts::reports;
+ $request->{module_name}='gl';
+ $request->{report_type}='aging';
+ LedgerSMB::Scripts::reports::start_report($request);
+ }
+
+}
Copied: trunk/UI/Reports/filters/gl.html (from rev 4756, trunk/UI/journal/search.html)
===================================================================
--- trunk/UI/Reports/filters/gl.html (rev 0)
+++ trunk/UI/Reports/filters/gl.html 2012-05-25 02:44:14 UTC (rev 4774)
@@ -0,0 +1,349 @@
+<?lsmb INCLUDE 'ui-header.html'
+ include_script = ["UI/ajax/scriptaculous/lib/prototype.js","UI/ajax/scriptaculous/src/scriptaculous.js?load=builder,effects,dragdrop,controls","UI/ajax/helpers.js"]
+?>
+<?lsmb PROCESS 'elements.html' ?>
+<body>
+
+<form method="get" action="<?lsmb script ?>">
+<?lsmb PROCESS input element_data = {
+ type = "hidden"
+ name = "sort"
+ value = "transdate"
+} ?>
+
+<table width="100%">
+ <tr>
+ <th class="listtop"><?lsmb text('General Ledger Reports') ?></th>
+
+ </tr>
+ <tr height="5"></tr>
+ <tr>
+ <td>
+ <table>
+ <tr>
+ <th align="right"><?lsmb text('Reference') ?></th>
+ <td><?lsmb PROCESS input element_data = {
+ name = "reference"
+ size = "20"
+ type = "text"
+ } ?></td>
+ </tr>
+ <tr>
+ <th align="right"><?lsmb text('Account') ?></th>
+ <td colspan="3">
+ <?lsmb PROCESS ajaxselect element_data = {
+ name = "accno"
+ initial_value = ""
+ text_attr = 'accno'
+ value_attr = 'id'
+ ajax_target = 'journal.pl'
+ } ?> </td>
+ </tr>
+ <tr>
+ <th align="right"><?lsmb text('Source') ?></th>
+ <td><?lsmb PROCESS input element_data = {
+ name = 'source'
+ type = 'text'
+ size = 20 } ?></td>
+ <th align="right"><?lsmb text('Memo') ?></th>
+ <td><?lsmb PROCESS input element_data = {
+ name="memo"
+ size="20"
+ type="text"
+ } ?></td>
+ </tr>
+
+ <tr>
+
+ <th align="right"><?lsmb text('Description') ?></th>
+ <td colspan="5"><?lsmb PROCESS input element_data = {
+ name='description'
+ size='60'
+ type='text' } ?></td>
+ </tr>
+ <tr>
+ <th align="right"><?lsmb text('Notes') ?></th>
+ <td colspan="5"><?lsmb PROCESS input element_data = {
+ name='notes'
+ size='60'
+ type='text' } ?></td>
+ </tr>
+ <?lsmb FOREACH BUC IN bu_classes ?>
+ <tr>
+ <th align="right"><?lsmb text(BUC.label) ?></th>
+ <?lsmb b_units.${BUC.id}.unshift({}) ?>
+ <td><?lsmb PROCESS select element_data = {
+ name = 'business_unit_' _ loop.count
+ options = b_units.${BUC.id}
+ text_attr = 'text'
+ value_attr = 'id'
+ class = 'business_unit'
+ } ?></td>
+ </tr>
+ <?lsmb END; # FOREACH BUC
+ PROCESS input element_data = {
+ type = 'hidden'
+ name = 'bc_count'
+ value = bu_classes.size
+ } ?>
+ <tr>
+
+ <th align="right"><?lsmb text('From') ?></th>
+ <td><?lsmb PROCESS input element_data = {
+ class="date"
+ name="date_from"
+ size="11"
+ title=datestyle } ?></td>
+ <th align="right"><?lsmb text('To') ?></th>
+ <td><?lsmb PROCESS input element_data = {
+ class="date"
+ name="date_to"
+ size="11"
+ title=datestyle } ?></td>
+ </tr>
+
+ <tr>
+ <th align="right"><?lsmb text('Period') ?></th>
+
+ <td colspan="5">
+ <?lsmb PROCESS select element_data = {
+ name = "month"
+ options = accountingmonths
+ text_attr = "month"
+ value_attr = "id"
+ } ?>
+
+ <?lsmb PROCESS select element_data = {
+ name="year"
+ options = all_years
+ text_attr = "year"
+ value_attr = "year"
+ } ?>
+ <?lsmb PROCESS input element_data = {
+ name="interval"
+ class="radio"
+ type="radio"
+ value="0"
+ checked="checked" } ?> <?lsmb text('Current') ?>
+ <?lsmb PROCESS input element_data = {
+ name="interval"
+ class="radio"
+ type="radio"
+ value="1" } ?> <?lsmb text('Month') ?>
+ <?lsmb PROCESS input element_data = {
+ name="interval"
+ class="radio"
+ type="radio"
+ value="3" } ?> <?lsmb text('Quarter') ?>
+ <input name=interval class=radio type=radio value=12> Year
+ </td>
+ </tr>
+
+ <tr>
+
+ <th align="right"><?lsmb text('Amount') ?> >=</th>
+ <td><?lsmb PROCESS input element_data = {
+ name="amountfrom"
+ size="11"
+ type="text"
+ } ?></td>
+ <th align="right">Amount <=</th>
+ <td><?lsmb PROCESS input element_data = {
+ name="amountto"
+ size="11"
+ type="text"
+ } ?></td>
+ </tr>
+ <tr>
+ <th align="right"><?lsmb text('Include in Report') ?></th>
+
+ <td colspan="5">
+ <table>
+ <tr>
+ <td>
+ <?lsmb PROCESS input element_data = {
+ name="category"
+ class="radio"
+ type="radio"
+ value="X"
+ checked = "checked"
+ } ?> <?lsmb text('All') ?>
+ <?lsmb PROCESS input element_data = {
+ name="category"
+ class="radio"
+ type="radio"
+ value="A"
+ } ?> <?lsmb text('Asset') ?>
+ <?lsmb PROCESS input element_data = {
+ name="category"
+ class="radio"
+ type="radio"
+ value="L"
+ } ?> <?lsmb text('Liability') ?>
+ <?lsmb PROCESS input element_data = {
+ name="category"
+ class="radio"
+ type="radio"
+ value="Q"
+ } ?> <?lsmb text('Equity') ?>
+ <?lsmb PROCESS input element_data = {
+ name="category"
+ class="radio"
+ type="radio"
+ value="I"
+ } ?> <?lsmb text('Income') ?>
+ <?lsmb PROCESS input element_data = {
+ name="category"
+ class="radio"
+ type="radio"
+ value="E"
+ } ?> <?lsmb text('Expense') ?>
+ </td>
+ </tr>
+
+ <tr>
+ <table>
+ <tr>
+ <td nowrap><?lsmb PROCESS input element_data = {
+ name="col_id"
+ class="checkbox"
+ type="checkbox"
+ value="Y"
+ } ?> <?lsmb text('ID') ?></td>
+ <td nowrap><?lsmb PROCESS input element_data = {
+ name="col_transdate"
+ class="checkbox"
+ type="checkbox"
+ value="Y"
+ checked="checked"
+ } ?> <?lsmb text('Date') ?></td>
+ <td nowrap><?lsmb PROCESS input element_data = {
+ name="col_reference"
+ class="checkbox"
+ type="checkbox"
+ value="Y"
+ checked="checked"
+ } ?> <?lsmb text('Reference') ?></td>
+ <td nowrap><?lsmb PROCESS input element_data = {
+ name="col_description"
+ class="checkbox"
+ type="checkbox"
+ value="Y"
+ checked="checked"
+ } ?> <?lsmb text('Description') ?></td>
+
+ </tr>
+ <tr>
+ <td nowrap><?lsmb PROCESS input element_data = {
+ name="col_debits"
+ class="checkbox"
+ type="checkbox"
+ value="Y"
+ checked="checked"
+ } ?> <?lsmb text('Debit') ?></td>
+ <td nowrap><?lsmb PROCESS input element_data = {
+ name="col_credits"
+ class="checkbox"
+ type="checkbox"
+ value="Y"
+ checked="checked"
+ } ?> <?lsmb text('Credit') ?></td>
+ <td nowrap><?lsmb PROCESS input element_data = {
+ name="col_source"
+ class="checkbox"
+ type="checkbox"
+ value="Y"
+ checked="checked"
+ } ?> <?lsmb text('Source') ?></td>
+ <td nowrap><?lsmb PROCESS input element_data = {
+ name="col_memo"
+ class="checkbox"
+ type="checkbox"
+ value="Y"
+ } ?> <?lsmb text('Memo') ?></td>
+ <td nowrap><?lsmb PROCESS input element_data = {
+ name="col_cleared"
+ class="checkbox"
+ type="checkbox"
+ value="Y"
+ } ?> <?lsmb text('Cleared') ?></td>
+ </tr>
+ <tr>
+ <td nowrap><?lsmb PROCESS input element_data = {
+ name="col_till"
+ class="checkbox"
+ type="checkbox"
+ value="Y"
+ } ?> <?lsmb text('Till') ?></td>
+ <td nowrap><?lsmb PROCESS input element_data = {
+ name="col_accno"
+ class="checkbox"
+ type="checkbox"
+ value="Y"
+ checked="checked"
+ } ?> <?lsmb text('Account') ?></td>
+ <td nowrap><?lsmb PROCESS input element_data = {
+ name="col_gifi_accno"
+ class="checkbox"
+ type="checkbox"
+ value="Y"
+ } ?> <?lsmb text('GIFI') ?></td>
+ <td nowrap><?lsmb PROCESS input element_data = {
+ name="col_accname"
+ class="checkbox"
+ type="checkbox"
+ value="Y"
+ } ?> <?lsmb text('Account Name') ?></td>
+ <td nowrap><?lsmb PROCESS input element_data = {
+ name="col_balance"
+ class="checkbox"
+ type="checkbox"
+ value="Y"
+ } ?> <?lsmb text('Balance') ?></td>
+ </tr>
+ <tr>
+ <td nowrap><?lsmb PROCESS input element_data = {
+ name="show_subtotal"
+ class="checkbox"
+ type="checkbox"
+ value="Y"
+ } ?> <?lsmb text('Subtotal') ?></td>
+ </tr>
+ </table>
+ </tr>
+ </table>
+ </tr>
+
+ </table>
+ </td>
+ </tr>
+ <tr>
+ <td><hr size=3 noshade></td>
+ </tr>
+</table>
+
+<?lsmb PROCESS input element_data = {
+ type="hidden"
+ name="path"
+ value=path
+} ?>
+<?lsmb PROCESS input element_data = {
+ type="hidden"
+ name="login"
+ value=login
+} ?>
+
+<br>
+<?lsmb PROCESS button element_data = {
+ text = text('Continue')
+ class="submit"
+ type="submit"
+ name="action"
+ value="search"
+} ?>
+</form>
+
+
+</body>
+</html>
+
Deleted: trunk/UI/journal/search.html
===================================================================
--- trunk/UI/journal/search.html 2012-05-24 13:36:23 UTC (rev 4773)
+++ trunk/UI/journal/search.html 2012-05-25 02:44:14 UTC (rev 4774)
@@ -1,349 +0,0 @@
-<?lsmb INCLUDE 'ui-header.html'
- include_script = ["UI/ajax/scriptaculous/lib/prototype.js","UI/ajax/scriptaculous/src/scriptaculous.js?load=builder,effects,dragdrop,controls","UI/ajax/helpers.js"]
-?>
-<?lsmb PROCESS 'elements.html' ?>
-<body>
-
-<form method="get" action="<?lsmb script ?>">
-<?lsmb PROCESS input element_data = {
- type = "hidden"
- name = "sort"
- value = "transdate"
-} ?>
-
-<table width="100%">
- <tr>
- <th class="listtop"><?lsmb text('General Ledger Reports') ?></th>
-
- </tr>
- <tr height="5"></tr>
- <tr>
- <td>
- <table>
- <tr>
- <th align="right"><?lsmb text('Reference') ?></th>
- <td><?lsmb PROCESS input element_data = {
- name = "reference"
- size = "20"
- type = "text"
- } ?></td>
- </tr>
- <tr>
- <th align="right"><?lsmb text('Account') ?></th>
- <td colspan="3">
- <?lsmb PROCESS ajaxselect element_data = {
- name = "accno"
- initial_value = ""
- text_attr = 'accno'
- value_attr = 'id'
- ajax_target = 'journal.pl'
- } ?> </td>
- </tr>
- <tr>
- <th align="right"><?lsmb text('Source') ?></th>
- <td><?lsmb PROCESS input element_data = {
- name = 'source'
- type = 'text'
- size = 20 } ?></td>
- <th align="right"><?lsmb text('Memo') ?></th>
- <td><?lsmb PROCESS input element_data = {
- name="memo"
- size="20"
- type="text"
- } ?></td>
- </tr>
-
- <tr>
-
- <th align="right"><?lsmb text('Description') ?></th>
- <td colspan="5"><?lsmb PROCESS input element_data = {
- name='description'
- size='60'
- type='text' } ?></td>
- </tr>
- <tr>
- <th align="right"><?lsmb text('Notes') ?></th>
- <td colspan="5"><?lsmb PROCESS input element_data = {
- name='notes'
- size='60'
- type='text' } ?></td>
- </tr>
- <?lsmb FOREACH BUC IN bu_classes ?>
- <tr>
- <th align="right"><?lsmb text(BUC.label) ?></th>
- <?lsmb b_units.${BUC.id}.unshift({}) ?>
- <td><?lsmb PROCESS select element_data = {
- name = 'business_unit_' _ loop.count
- options = b_units.${BUC.id}
- text_attr = 'text'
- value_attr = 'id'
- class = 'business_unit'
- } ?></td>
- </tr>
- <?lsmb END; # FOREACH BUC
- PROCESS input element_data = {
- type = 'hidden'
- name = 'bc_count'
- value = bu_classes.size
- } ?>
- <tr>
-
- <th align="right"><?lsmb text('From') ?></th>
- <td><?lsmb PROCESS input element_data = {
- class="date"
- name="date_from"
- size="11"
- title=datestyle } ?></td>
- <th align="right"><?lsmb text('To') ?></th>
- <td><?lsmb PROCESS input element_data = {
- class="date"
- name="date_to"
- size="11"
- title=datestyle } ?></td>
- </tr>
-
- <tr>
- <th align="right"><?lsmb text('Period') ?></th>
-
- <td colspan="5">
- <?lsmb PROCESS select element_data = {
- name = "month"
- options = accountingmonths
- text_attr = "month"
- value_attr = "id"
- } ?>
-
- <?lsmb PROCESS select element_data = {
- name="year"
- options = all_years
- text_attr = "year"
- value_attr = "year"
- } ?>
- <?lsmb PROCESS input element_data = {
- name="interval"
- class="radio"
- type="radio"
- value="0"
- checked="checked" } ?> <?lsmb text('Current') ?>
- <?lsmb PROCESS input element_data = {
- name="interval"
- class="radio"
- type="radio"
- value="1" } ?> <?lsmb text('Month') ?>
- <?lsmb PROCESS input element_data = {
- name="interval"
- class="radio"
- type="radio"
- value="3" } ?> <?lsmb text('Quarter') ?>
- <input name=interval class=radio type=radio value=12> Year
- </td>
- </tr>
-
- <tr>
-
- <th align="right"><?lsmb text('Amount') ?> >=</th>
- <td><?lsmb PROCESS input element_data = {
- name="amountfrom"
- size="11"
- type="text"
- } ?></td>
- <th align="right">Amount <=</th>
- <td><?lsmb PROCESS input element_data = {
- name="amountto"
- size="11"
- type="text"
- } ?></td>
- </tr>
- <tr>
- <th align="right"><?lsmb text('Include in Report') ?></th>
-
- <td colspan="5">
- <table>
- <tr>
- <td>
- <?lsmb PROCESS input element_data = {
- name="category"
- class="radio"
- type="radio"
- value="X"
- checked = "checked"
- } ?> <?lsmb text('All') ?>
- <?lsmb PROCESS input element_data = {
- name="category"
- class="radio"
- type="radio"
- value="A"
- } ?> <?lsmb text('Asset') ?>
- <?lsmb PROCESS input element_data = {
- name="category"
- class="radio"
- type="radio"
- value="L"
- } ?> <?lsmb text('Liability') ?>
- <?lsmb PROCESS input element_data = {
- name="category"
- class="radio"
- type="radio"
- value="Q"
- } ?> <?lsmb text('Equity') ?>
- <?lsmb PROCESS input element_data = {
- name="category"
- class="radio"
- type="radio"
- value="I"
- } ?> <?lsmb text('Income') ?>
- <?lsmb PROCESS input element_data = {
- name="category"
- class="radio"
- type="radio"
- value="E"
- } ?> <?lsmb text('Expense') ?>
- </td>
- </tr>
-
- <tr>
- <table>
- <tr>
- <td nowrap><?lsmb PROCESS input element_data = {
- name="col_id"
- class="checkbox"
- type="checkbox"
- value="Y"
- } ?> <?lsmb text('ID') ?></td>
- <td nowrap><?lsmb PROCESS input element_data = {
- name="col_transdate"
- class="checkbox"
- type="checkbox"
- value="Y"
- checked="checked"
- } ?> <?lsmb text('Date') ?></td>
- <td nowrap><?lsmb PROCESS input element_data = {
- name="col_reference"
- class="checkbox"
- type="checkbox"
- value="Y"
- checked="checked"
- } ?> <?lsmb text('Reference') ?></td>
- <td nowrap><?lsmb PROCESS input element_data = {
- name="col_description"
- class="checkbox"
- type="checkbox"
- value="Y"
- checked="checked"
- } ?> <?lsmb text('Description') ?></td>
-
- </tr>
- <tr>
- <td nowrap><?lsmb PROCESS input element_data = {
- name="col_debits"
- class="checkbox"
- type="checkbox"
- value="Y"
- checked="checked"
- } ?> <?lsmb text('Debit') ?></td>
- <td nowrap><?lsmb PROCESS input element_data = {
- name="col_credits"
- class="checkbox"
- type="checkbox"
- value="Y"
- checked="checked"
- } ?> <?lsmb text('Credit') ?></td>
- <td nowrap><?lsmb PROCESS input element_data = {
- name="col_source"
- class="checkbox"
- type="checkbox"
- value="Y"
- checked="checked"
- } ?> <?lsmb text('Source') ?></td>
- <td nowrap><?lsmb PROCESS input element_data = {
- name="col_memo"
- class="checkbox"
- type="checkbox"
- value="Y"
- } ?> <?lsmb text('Memo') ?></td>
- <td nowrap><?lsmb PROCESS input element_data = {
- name="col_cleared"
- class="checkbox"
- type="checkbox"
- value="Y"
- } ?> <?lsmb text('Cleared') ?></td>
- </tr>
- <tr>
- <td nowrap><?lsmb PROCESS input element_data = {
- name="col_till"
- class="checkbox"
- type="checkbox"
- value="Y"
- } ?> <?lsmb text('Till') ?></td>
- <td nowrap><?lsmb PROCESS input element_data = {
- name="col_accno"
- class="checkbox"
- type="checkbox"
- value="Y"
- checked="checked"
- } ?> <?lsmb text('Account') ?></td>
- <td nowrap><?lsmb PROCESS input element_data = {
- name="col_gifi_accno"
- class="checkbox"
- type="checkbox"
- value="Y"
- } ?> <?lsmb text('GIFI') ?></td>
- <td nowrap><?lsmb PROCESS input element_data = {
- name="col_accname"
- class="checkbox"
- type="checkbox"
- value="Y"
- } ?> <?lsmb text('Account Name') ?></td>
- <td nowrap><?lsmb PROCESS input element_data = {
- name="col_balance"
- class="checkbox"
- type="checkbox"
- value="Y"
- } ?> <?lsmb text('Balance') ?></td>
- </tr>
- <tr>
- <td nowrap><?lsmb PROCESS input element_data = {
- name="show_subtotal"
- class="checkbox"
- type="checkbox"
- value="Y"
- } ?> <?lsmb text('Subtotal') ?></td>
- </tr>
- </table>
- </tr>
- </table>
- </tr>
-
- </table>
- </td>
- </tr>
- <tr>
- <td><hr size=3 noshade></td>
- </tr>
-</table>
-
-<?lsmb PROCESS input element_data = {
- type="hidden"
- name="path"
- value=path
-} ?>
-<?lsmb PROCESS input element_data = {
- type="hidden"
- name="login"
- value=login
-} ?>
-
-<br>
-<?lsmb PROCESS button element_data = {
- text = text('Continue')
- class="submit"
- type="submit"
- name="action"
- value="search"
-} ?>
-</form>
-
-
-</body>
-</html>
-
Modified: trunk/css/ledgersmb.css
===================================================================
--- trunk/css/ledgersmb.css 2012-05-24 13:36:23 UTC (rev 4773)
+++ trunk/css/ledgersmb.css 2012-05-25 02:44:14 UTC (rev 4774)
@@ -119,14 +119,14 @@
}
.menu_open {
-background-image: url('../images/down.gif');
+background-image: url('../images/up.gif');
background-repeat: no-repeat;
background-position: 0px 0px;
padding-left: 12px;
}
.menu_closed {
-background-image: url('../images/up.gif');
+background-image: url('../images/down.gif');
background-repeat: no-repeat;
background-position: 0px 0px;
padding-left: 12px;
Modified: trunk/sql/Pg-database.sql
===================================================================
--- trunk/sql/Pg-database.sql 2012-05-24 13:36:23 UTC (rev 4773)
+++ trunk/sql/Pg-database.sql 2012-05-25 02:44:14 UTC (rev 4774)
@@ -2518,7 +2518,7 @@
-- Name: menu_node_id_seq; Type: SEQUENCE SET; Schema: public; Owner: ledgersmb
--
-SELECT pg_catalog.setval('menu_node_id_seq', 248, true);
+SELECT pg_catalog.setval('menu_node_id_seq', 253, true);
--
-- Data for Name: menu_node; Type: TABLE DATA; Schema: public; Owner: ledgersmb
@@ -2527,12 +2527,6 @@
COPY menu_node (id, label, parent, "position") FROM stdin;
205 Transaction Approval 0 5
206 Batches 205 1
-46 HR 0 6
-50 Order Entry 0 7
-63 Shipping 0 8
-67 Quotations 0 9
-73 General Journal 0 10
-77 Goods and Services 0 11
0 Top-level \N 0
1 AR 0 1
2 Add Transaction 1 1
@@ -2542,8 +2536,6 @@
9 Taxable Sales 4 4
10 Non-Taxable 4 5
12 Add Customer 11 1
-13 Reports 11 2
-14 Search 13 1
15 History 13 2
16 Budgets 109 6
17 Add Budget 16 1
@@ -2556,8 +2548,6 @@
28 Taxable 24 4
29 Non-taxable 24 5
31 Add Vendor 30 1
-32 Reports 30 2
-33 Search 32 1
34 History 32 2
35 Cash 0 4
36 Receipt 35 1
@@ -2676,6 +2666,10 @@
180 Purchase Order 172 8
181 Bin List 172 9
182 Statement 172 10
+13 Reports 11 3
+14 Search 11 2
+32 Reports 30 3
+33 Search 30 2
183 Check 172 11
184 Receipt 172 12
185 Quotation 172 13
@@ -2683,8 +2677,6 @@
187 Timecard 172 15
242 Letterhead 172 16
189 POS Invoice 188 1
-198 AR Voucher 1 2
-199 AP Voucher 21 2
200 Vouchers 35 5
40 Transfer 35 6
41 Reports 35 8
@@ -2693,12 +2685,8 @@
204 Reverse Receipts 200 4
201 Payments 200 1
202 Reverse Payment 200 2
-98 Projects 0 12
-109 Reports 0 13
-115 Recurring Transactions 0 14
210 Drafts 205 2
211 Reconciliation 205 3
-217 Tax Forms 0 15
218 Add Tax Form 217 1
219 Admin Users 128 5
188 Text Templates 128 15
@@ -2715,13 +2703,6 @@
222 Sessions 219 3
225 List Tax Forms 217 2
226 Reports 217 3
-227 Fixed Assets 0 17
-193 Logout 0 23
-192 New Window 0 22
-191 Preferences 0 21
-190 Stylesheet 0 20
-128 System 0 19
-116 Batch Printing 0 18
228 Asset Classes 227 1
229 Assets 227 2
230 Add Class 228 1
@@ -2737,14 +2718,10 @@
240 Disposal 236 3
243 Import Batch 21 3
23 Vendor Invoice 21 4
-24 Reports 21 7
-30 Vendors 21 8
196 Debit Note 21 5
197 Debit Invoice 21 6
244 Import Batch 1 3
3 Sales Invoice 1 4
-11 Customers 1 8
-4 Reports 1 7
194 Credit Note 1 5
195 Credit Invoice 1 6
245 Import 73 2
@@ -2755,6 +2732,34 @@
140 List GIFI 136 5
247 Import GIFI 136 6
248 Import 153 3
+249 Vouchers 1 7
+11 Customers 1 9
+4 Reports 1 8
+250 Vouchers 21 7
+24 Reports 21 8
+30 Vendors 21 9
+198 AR Voucher 249 1
+199 AP Voucher 250 1
+251 Budgets 0 6
+46 HR 0 7
+50 Order Entry 0 8
+63 Shipping 0 9
+67 Quotations 0 10
+73 General Journal 0 11
+77 Goods and Services 0 12
+98 Projects 0 13
+109 Reports 0 14
+115 Recurring Transactions 0 15
+217 Tax Forms 0 16
+227 Fixed Assets 0 18
+193 Logout 0 24
+192 New Window 0 23
+191 Preferences 0 22
+190 Stylesheet 0 21
+128 System 0 20
+116 Batch Printing 0 19
+252 Add Budget 251 1
+253 Search 251 2
\.
--
@@ -2807,7 +2812,7 @@
-- Name: menu_attribute_id_seq; Type: SEQUENCE SET; Schema: public; Owner: ledgersmb
--
-SELECT pg_catalog.setval('menu_attribute_id_seq', 667, true);
+SELECT pg_catalog.setval('menu_attribute_id_seq', 681, true);
--
@@ -2832,9 +2837,6 @@
6 module ar.pl 12
6 action search 13
6 nextsub transactions 14
-7 module rp.pl 15
-7 action report 16
-7 report ar_aging 17
6 outstanding 1 18
9 module rp.pl 21
9 action report 22
@@ -2868,12 +2870,9 @@
26 action search 61
26 nextsub transactions 62
26 module ap.pl 60
-27 module rp.pl 63
-27 action report 64
28 module rp.pl 66
28 action report 67
28 report tax_collected 68
-27 report tax_paid 65
29 module rp.pl 69
29 action report 70
29 report nontaxable_purchases 71
@@ -2969,7 +2968,12 @@
71 type sales_quotation 165
71 action search 164
72 module oe.pl 166
+7 module reports.pl 15
64 type ship_order 149
+7 action start_report 16
+7 report_name aging 17
+27 module reports.pl 63
+27 report_name aging 65
72 action search 168
72 type request_quotation 167
73 menu 1 169
@@ -2981,8 +2985,6 @@
75 pos_adjust 1 176
75 reference Adjusting Till: (Till) Source: (Source) 177
75 descripton Adjusting till due to data entry error 178
-76 module journal.pl 180
-76 action start_search 181
77 menu 1 182
78 module ic.pl 183
78 action add 184
@@ -3119,6 +3121,8 @@
127 action search 331
127 type timecard 332
125 type bin_list 324
+76 module reports.pl 180
+76 action start_report 181
117 type invoice 296
118 type sales_order 301
126 type request_quotation 328
@@ -3206,8 +3210,8 @@
166 template purchase_order 427
167 template bin_list 428
168 template statement 429
-169 template sales_quotation 430
-170 template request_quotation 431
+169 template quotation 430
+170 template rfq 431
171 template timecard 432
241 template letterhead 644
157 format HTML 433
@@ -3301,7 +3305,6 @@
193 module login.pl 532
193 action logout 533
193 target _top 534
-192 menu 1 530
192 new 1 531
0 menu 1 535
136 menu 1 536
@@ -3393,13 +3396,8 @@
239 depreciation 1 639
240 module asset.pl 640
240 action search_reports 641
-65 type receive_order 149
-83 type pricegroup 200
-82 type partsgroup 197
-91 type partsgroup 222
-92 type pricegroup 225
235 action begin_import 631
-203 batch_type receipt 567
+249 menu 1 668
243 module import_csv.pl 650
243 action begin_import 651
243 type ap_multi 652
@@ -3418,6 +3416,27 @@
248 module import_csv.pl 665
248 action begin_import 666
248 type sic 667
+65 type receive_order 149
+83 type pricegroup 200
+82 type partsgroup 197
+91 type partsgroup 222
+92 type pricegroup 225
+203 batch_type receipt 567
+250 menu 1 669
+7 module_name gl 671
+7 entity_class 2 672
+27 entity_class 1 673
+76 report_name gl 530
+27 action start_report 64
+27 module_name gl 674
+251 menu 1 675
+252 module budgets.pl 676
+253 module reports.pl 677
+252 action new_budget 678
+253 report_name budget_search 680
+253 module_name gl 681
+253 action start_report 679
+76 module_name gl 670
\.
--
Modified: trunk/sql/modules/Roles.sql
===================================================================
--- trunk/sql/modules/Roles.sql 2012-05-24 13:36:23 UTC (rev 4773)
+++ trunk/sql/modules/Roles.sql 2012-05-25 02:44:14 UTC (rev 4774)
@@ -2,9 +2,18 @@
CREATE ROLE "lsmb_<?lsmb dbname ?>__budget_enter" WITH INHERIT NOLOGIN;
CREATE ROLE "lsmb_<?lsmb dbname ?>__budget_view" WITH INHERIT NOLOGIN;
-CREATE ROLE "lsmb_<?lsmb dbname ?>__budget_approve" WITH INHERIT NOLOGIN;
-CREATE ROLE "lsmb_<?lsmb dbname ?>__budget_obsolete" WITH INHERIT NOLOGIN;
+CREATE ROLE "lsmb_<?lsmb dbname ?>__budget_approve" WITH INHERIT NOLOGIN
+IN ROLE "lsmb_<?lsmb dbname ?>__budget_view";
+CREATE ROLE "lsmb_<?lsmb dbname ?>__budget_obsolete" WITH INHERIT NOLOGIN
+IN ROLE "lsmb_<?lsmb dbname ?>__budget_view";
+
+INSERT INTO menu_acl (node_id, acl_type, role_name)
+values (252, 'allow', 'lsmb_<?lsmb dbname ?>__budget_enter');
+
+INSERT INTO menu_acl (node_id, acl_type, role_name)
+values (253, 'allow', 'lsmb_<?lsmb dbname ?>__budget_view');
+
GRANT SELECT
ON budget_info, budget_line, budget_to_department, budget_to_project
TO "lsmb_<?lsmb dbname ?>__budget_view";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.