[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
SF.net SVN: ledger-smb:[3864] addons/1.3/budgetting/trunk
- Subject: SF.net SVN: ledger-smb:[3864] addons/1.3/budgetting/trunk
- From: ..hidden..
- Date: Fri, 14 Oct 2011 10:11:42 +0000
Revision: 3864
http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=3864&view=rev
Author: einhverfr
Date: 2011-10-14 10:11:41 +0000 (Fri, 14 Oct 2011)
Log Message:
-----------
More budget entry fixes:
Modified Paths:
--------------
addons/1.3/budgetting/trunk/LedgerSMB/DBObject/Budget.pm
addons/1.3/budgetting/trunk/LedgerSMB/DBObject/Budget_Report.pm
addons/1.3/budgetting/trunk/UI/budgetting/budget_entry.html
addons/1.3/budgetting/trunk/scripts/budgets.pl
Modified: addons/1.3/budgetting/trunk/LedgerSMB/DBObject/Budget.pm
===================================================================
--- addons/1.3/budgetting/trunk/LedgerSMB/DBObject/Budget.pm 2011-10-14 09:02:25 UTC (rev 3863)
+++ addons/1.3/budgetting/trunk/LedgerSMB/DBObject/Budget.pm 2011-10-14 10:11:41 UTC (rev 3864)
@@ -268,6 +268,22 @@
);
}
+=item list_projects
+Lists all projects available for the start date of the budget.
+
+=cut
+
+sub list_projects {
+}
+
+=item list_departments
+Lists all departments
+
+=cut
+
+sub list_departments {
+}
+
1;
=back
Modified: addons/1.3/budgetting/trunk/LedgerSMB/DBObject/Budget_Report.pm
===================================================================
--- addons/1.3/budgetting/trunk/LedgerSMB/DBObject/Budget_Report.pm 2011-10-14 09:02:25 UTC (rev 3863)
+++ addons/1.3/budgetting/trunk/LedgerSMB/DBObject/Budget_Report.pm 2011-10-14 10:11:41 UTC (rev 3864)
@@ -134,6 +134,22 @@
);
}
+=item list_projects
+Lists all projects available for the start date of the budget.
+
+=cut
+
+sub list_projects {
+}
+
+=item list_departments
+Lists all departments
+
+=cut
+
+sub list_departments {
+}
+
1;
=back
Modified: addons/1.3/budgetting/trunk/UI/budgetting/budget_entry.html
===================================================================
--- addons/1.3/budgetting/trunk/UI/budgetting/budget_entry.html 2011-10-14 09:02:25 UTC (rev 3863)
+++ addons/1.3/budgetting/trunk/UI/budgetting/budget_entry.html 2011-10-14 10:11:41 UTC (rev 3864)
@@ -9,98 +9,68 @@
<body>
<form method="post" action="<?lsmb form.script ?>">
-
-<table width="100%">
-<tr>
- <th class="listtop" ><?lsmb form.title ?></th>
-</tr>
-
-<tr>
- <td>
- <table>
- <tr>
- <th align="right"><?lsmb text('Reference') ?></th>
- <td>
- <?lsmb INCLUDE input element_data = {
+<div id="budget-header">
+<div class="listtop"><?lsmb form.title ?></div>
+<div class="input_row" id = "reference_row">
+<div class="input_group">
+ <?lsmb INCLUDE input element_data = {
name = "reference",
value = form.reference,
type = "text",
size = "20",
- class = 'reference'
- id = "ref_1"
- } ?>
+ class = 'reference',
+ label = text('Reference')
+ } ?>
+</div>
+<div class="input_group">
+ <?lsmb INCLUDE input element_data = {
+ name = "transdate"
+ value = form.transdate
+ type = "text"
+ size = "11"
+ class = 'date'
+ label = text('Date')
+ } ?>
+</div></div>
+<div class="input_row" id = "description_row">
+<div class="input_group">
- </td>
- <th align="right"><?lsmb text('Date') ?></th>
- <td>
- <?lsmb INCLUDE input element_data = {
- name = "transdate"
- value = form.transdate
- type = "text"
- size = "11"
- class = 'date'
- id = "tra_1"
- } ?>
- </td>
- </tr>
- <?lsmb IF form.departmentset == 1 ?>
- <tr>
- <th align="right" ><?lsmb text('Department') ?></th>
- <td>
- <?lsmb INCLUDE select element_data = {
+ <?lsmb INCLUDE input element_data = {
+ name = "description",
+ value = form.description,
+ type = "text",
+ size = "50",
+ class = 'description'
+ label = text('Description')
+ }
+ ?>
+</div></div>
+<div class="input_row" id = "description_row">
+<div class="input_group">
+ <?lsmb INCLUDE select element_data = {
text_attr = "description"
value_attr = "departmentstyle"
default_values = [form.department]
options = form.all_department
name = "department"
- id = "dep_1"
- } ?>
+ label = text('Department')
+ } ?>
- </td>
- </tr>
- <?lsmb END ?>
- <?lsmb IF form.projects.length ?>
- <tr>
- <th align="right" ><?lsmb text('Project') ?></th>
- <td>
- <?lsmb INCLUDE select element_data = {
+</div>
+<div class="input_group">
+ <?lsmb INCLUDE select element_data = {
text_attr = "description"
value_attr = "id"
default_values = [form.projects]
options = form.projects
name = "project"
- } ?>
+ label = text('Project')
+ } ?>
- </td>
- </tr>
+</div></div>
+ <!-- Move notes to bottom and add subject line
<tr>
- <th align="right"><?lsmb text('Description') ?></th>
- <td colspan="3">
- <?lsmb IF form.colrowdesc ==1 ?>
- <?lsmb INCLUDE textarea element_data={
- name = "description"
- rows = form.rowsdesc
- cols = form.colsdesc
- value = form.description
- id = "des_1"
- }
- ?>
- <?lsmb ELSE ?>
- <?lsmb INCLUDE input element_data = {
- name = "description",
- value = form.description,
- type = "text",
- size = "50",
- class = 'description'
- id = "des_1"
- }
- ?>
-
- <?lsmb END ?>
- </td>
- </tr>
- <tr>
<th align="right"><?lsmb text('Notes') ?></th>
<td colspan="3">
<?lsmb IF form.colrownotes ==1 ?>
@@ -127,13 +97,7 @@
</td>
- </tr>
- </table>
- </td>
- </tr>
-
-<tr>
- <td>
+ </tr> -->
<table width="100%">
<tr class="listheading">
<th class="listheading"><?lsmb text('Account') ?></th>
@@ -148,7 +112,7 @@
<th class="listheading"><?lsmb text('Project') ?></th>
<?lsmb END ?>
</tr>
- <?lsmb FOREACH displayrow IN displayrows ?>
+ <?lsmb FOREACH displayrow IN display_rows ?>
<tr>
<?lsmb INDEX=displayrow.index ?>
<td>
@@ -241,12 +205,7 @@
</tr>
</table>
- </td>
-</tr>
- <tr>
- <td><hr size="3"></hr></td>
- </tr>
-</table>
+ <hr size="3">
<?lsmb FOREACH hidden IN hiddens.keys;
PROCESS input element_data={
@@ -256,7 +215,6 @@
}; END ?>
<?lsmb FOREACH button IN buttons; PROCESS button element_data=button; END ?>
-<?lsmb END ?>
</form>
</body>
</html>
Modified: addons/1.3/budgetting/trunk/scripts/budgets.pl
===================================================================
--- addons/1.3/budgetting/trunk/scripts/budgets.pl 2011-10-14 09:02:25 UTC (rev 3863)
+++ addons/1.3/budgetting/trunk/scripts/budgets.pl 2011-10-14 10:11:41 UTC (rev 3864)
@@ -44,6 +44,10 @@
my $budget = LedgerSMB::DBObject::Budget->new({base => $request});
@{$budget->{projects}} = $budget->list_projects;
@{$budget->{departments}} = $budget->list_departments;
+ $budget->{display_rows} = [];
+ for (1 .. 25) {
+ push @{$budget->{display_rows}}, {accnoset => 0, index => $_};
+ }
# TODO: Add buttons
my $template = LedgerSMB::Template->new(
user => $request->{_user},
@@ -158,6 +162,8 @@
$template->render($budget);
}
+1;
+
=item search
See LedgerSMB::Budget's search routine for expected inputs.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.