[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
SF.net SVN: ledger-smb:[5072] trunk
- Subject: SF.net SVN: ledger-smb:[5072] trunk
- From: ..hidden..
- Date: Tue, 31 Jul 2012 11:44:04 +0000
Revision: 5072
http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=5072&view=rev
Author: einhverfr
Date: 2012-07-31 11:44:04 +0000 (Tue, 31 Jul 2012)
Log Message:
-----------
Updating menu
Modified Paths:
--------------
trunk/LedgerSMB/Entity/User.pm
trunk/LedgerSMB/Scripts/setup.pm
trunk/sql/Pg-database.sql
trunk/sql/modules/Roles.sql
Modified: trunk/LedgerSMB/Entity/User.pm
===================================================================
--- trunk/LedgerSMB/Entity/User.pm 2012-07-31 10:06:06 UTC (rev 5071)
+++ trunk/LedgerSMB/Entity/User.pm 2012-07-31 11:44:04 UTC (rev 5072)
@@ -59,7 +59,8 @@
=cut
-has password => (is => 'rw', isa => 'Str', required => 0);
+has password => (is => 'rw', isa => 'Str', required => 0,
+ clearer => 'clear_password');
=item role_list
@@ -106,7 +107,7 @@
my ($self, $password) = @_;
$self->password($password);
my ($ref) = $self->exec_method({funcname => 'admin__save_user'});
- $self->password(undef);
+ $self->clear_password();
}
=item create
@@ -118,7 +119,7 @@
sub create{
my ($self) = @_;
my ($ref) = $self->exec_method({funcname => 'admin__save_user'});
- $self->password(undef);
+ $self->clear_password();
}
=item save_roles($role_list)
Modified: trunk/LedgerSMB/Scripts/setup.pm
===================================================================
--- trunk/LedgerSMB/Scripts/setup.pm 2012-07-31 10:06:06 UTC (rev 5071)
+++ trunk/LedgerSMB/Scripts/setup.pm 2012-07-31 11:44:04 UTC (rev 5072)
@@ -700,6 +700,8 @@
sub save_user {
my ($request) = @_;
+ $request->{entity_class} = 3;
+ $request->{name} = "$request->{last_name}, $request->{first_name}";
use LedgerSMB::Entity::Person::Employee;
use LedgerSMB::Entity::User;
use LedgerSMB::PGDate;
Modified: trunk/sql/Pg-database.sql
===================================================================
--- trunk/sql/Pg-database.sql 2012-07-31 10:06:06 UTC (rev 5071)
+++ trunk/sql/Pg-database.sql 2012-07-31 11:44:04 UTC (rev 5072)
@@ -2668,12 +2668,10 @@
102 Sales Orders 101 1
103 Reports 98 4
104 Search 103 1
-105 Transactions 103 2
106 Time Cards 103 3
107 Translations 98 5
108 Description 107 1
111 Trial Balance 109 2
-112 Income Statement 109 3
113 Balance Sheet 109 4
114 Inventory Activity 109 5
117 Sales Invoices 116 1
@@ -2687,10 +2685,8 @@
125 Bin Lists 116 9
126 RFQs 116 10
127 Time Cards 116 11
-129 Audit Control 128 1
130 Taxes 128 2
131 Defaults 128 3
-132 Yearend 128 4
142 Add Warehouse 141 1
143 List Warehouse 141 2
148 Add Business 147 1
@@ -2747,6 +2743,8 @@
40 Transfer 35 6
41 Reports 35 8
45 Reconciliation 35 7
+132 Year End 73 3
+112 Income Statement 6 1
203 Receipts 200 3
204 Reverse Receipts 200 4
201 Payments 200 1
@@ -2790,7 +2788,6 @@
194 Credit Note 1 5
195 Credit Invoice 1 6
245 Import 73 2
-75 Adjust Till 73 3
76 Reports 73 4
139 Add GIFI 136 4
140 List GIFI 136 5
@@ -2818,6 +2815,9 @@
190 Stylesheet 0 22
128 System 0 21
116 Batch Printing 0 20
+6 Profit and Loss 109 1
+8 Customer Margin 6 10
+11 Invoice Margin 6 11
\.
--
@@ -3010,12 +3010,6 @@
73 menu 1 169
74 module gl.pl 170
74 action add 171
-75 module gl.pl 172
-75 action add_pos_adjust 174
-75 rowcount 3 175
-75 pos_adjust 1 176
-75 reference Adjusting Till: (Till) Source: (Source) 177
-75 descripton Adjusting till due to data entry error 178
77 menu 1 182
78 module ic.pl 183
78 action add 184
@@ -3088,9 +3082,6 @@
104 module pe.pl 256
104 type project 258
104 action search 257
-105 action report 260
-105 report projects 261
-105 module rp.pl 262
106 module jc.pl 263
106 action search 264
106 type timecard 265
@@ -3101,9 +3092,6 @@
108 translation project 271
109 menu 1 272
110 action chart_of_accounts 274
-112 action report 278
-112 module rp.pl 279
-112 report income_statement 280
113 action report 281
113 module rp.pl 282
113 report balance_sheet 283
@@ -3161,9 +3149,7 @@
126 type request_quotation 328
127 vc employee 333
128 menu 1 334
-129 module am.pl 337
130 module am.pl 338
-129 action audit_control 340
130 taxes audit_control 341
130 action taxes 343
132 module account.pl 346
@@ -3186,6 +3172,9 @@
147 menu 1 372
148 module am.pl 373
149 module am.pl 374
+112 action start_report 278
+112 module reports.pl 279
+112 report_name income_statement 280
148 action add_business 375
149 action list_business 376
150 menu 1 377
@@ -3483,10 +3472,20 @@
210 action start_report 585
210 module_name gl 44
210 report_name unapproved 45
-210 search_type batches 46
49 report_name contact_search 116
111 module reports.pl 276
111 module_name gl 40
+210 search_type drafts 46
+6 menu 1 38
+6 module menu.pl 41
+8 module reports.pl 42
+8 action start_report 47
+8 report_name customer_margin 48
+8 module_name gl 49
+11 module reports.pl 60
+11 action start_report 61
+11 report_name invoice_margin 78
+112 module_name gl 79
\.
--
Modified: trunk/sql/modules/Roles.sql
===================================================================
--- trunk/sql/modules/Roles.sql 2012-07-31 10:06:06 UTC (rev 5071)
+++ trunk/sql/modules/Roles.sql 2012-07-31 11:44:04 UTC (rev 5072)
@@ -947,8 +947,6 @@
INSERT INTO menu_acl (node_id, acl_type, role_name)
values (74, 'allow', 'lsmb_<?lsmb dbname ?>__gl_transaction_create');
INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (75, 'allow', 'lsmb_<?lsmb dbname ?>__gl_transaction_create');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
values (40, 'allow', 'lsmb_<?lsmb dbname ?>__gl_transaction_create');
INSERT INTO menu_acl (node_id, acl_type, role_name)
values (245, 'allow', 'lsmb_<?lsmb dbname ?>__gl_transaction_create');
@@ -975,8 +973,6 @@
INSERT INTO menu_acl (node_id, acl_type, role_name)
values (76, 'allow', 'lsmb_<?lsmb dbname ?>__gl_reports');
INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (105, 'allow', 'lsmb_<?lsmb dbname ?>__gl_reports');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
values (114, 'allow', 'lsmb_<?lsmb dbname ?>__gl_reports');
@@ -1094,6 +1090,10 @@
GRANT select ON yearend TO "lsmb_<?lsmb dbname ?>__financial_reports";
INSERT INTO menu_acl (node_id, acl_type, role_name)
+values (8, 'allow', 'lsmb_<?lsmb dbname ?>__financial_reports');
+INSERT INTO menu_acl (node_id, acl_type, role_name)
+values (11, 'allow', 'lsmb_<?lsmb dbname ?>__financial_reports');
+INSERT INTO menu_acl (node_id, acl_type, role_name)
values (110, 'allow', 'lsmb_<?lsmb dbname ?>__financial_reports');
INSERT INTO menu_acl (node_id, acl_type, role_name)
values (111, 'allow', 'lsmb_<?lsmb dbname ?>__financial_reports');
@@ -1167,8 +1167,6 @@
WITH INHERIT NOLOGIN;
INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (129, 'allow', 'lsmb_<?lsmb dbname ?>__system_settings_list');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
values (131, 'allow', 'lsmb_<?lsmb dbname ?>__system_settings_list');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.