[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

SF.net SVN: ledger-smb:[4946] trunk



Revision: 4946
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=4946&view=rev
Author:   einhverfr
Date:     2012-06-22 11:24:47 +0000 (Fri, 22 Jun 2012)
Log Message:
-----------
moving trial balance to business unit framework on filter screen

Modified Paths:
--------------
    trunk/Changelog
    trunk/sql/modules/Roles.sql

Added Paths:
-----------
    trunk/UI/Reports/filters/trial_balance.html

Removed Paths:
-------------
    trunk/UI/report/

Property Changed:
----------------
    trunk/
    trunk/LedgerSMB/Scripts/account.pm
    trunk/LedgerSMB/Scripts/admin.pm
    trunk/LedgerSMB/Scripts/contact.pm
    trunk/LedgerSMB/Scripts/employee.pm
    trunk/LedgerSMB/Scripts/file.pm
    trunk/LedgerSMB/Scripts/journal.pm
    trunk/LedgerSMB/Scripts/login.pm
    trunk/LedgerSMB/Scripts/menu.pm
    trunk/LedgerSMB/Scripts/payment.pm
    trunk/LedgerSMB/Scripts/recon.pm
    trunk/LedgerSMB/Scripts/setup.pm
    trunk/LedgerSMB/Scripts/taxform.pm
    trunk/sql/upgrade/1.2-1.3-manual.sql


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3:3711-4935
   + /branches/1.3:3711-4945

Modified: trunk/Changelog
===================================================================
--- trunk/Changelog	2012-06-22 08:09:40 UTC (rev 4945)
+++ trunk/Changelog	2012-06-22 11:24:47 UTC (rev 4946)
@@ -64,6 +64,8 @@
 Changelog for 1.3.20
 * Fixes for es_AR translation, duplicate keys removed (Andres B)
 * Demo templates provide better handling of paragraph breaks in notes (Chris T)
+* Fixed menu anomilies due to menu grants on sub-menus (Chris T)
+* Fixed unable to change order or delete it (Chris T, 3535856)
 
 Changelog for 1.3.19
 * New link for customer/vendor when not a dropdown (Chris T)


Property changes on: trunk/LedgerSMB/Scripts/account.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/account.pm:3712-4935
/branches/1.3/scripts/account.pl:3711-4368
   + /branches/1.3/LedgerSMB/Scripts/account.pm:3712-4945
/branches/1.3/scripts/account.pl:3711-4368


Property changes on: trunk/LedgerSMB/Scripts/admin.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/admin.pm:3712-4935
/branches/1.3/scripts/admin.pl:3711-4678
   + /branches/1.3/LedgerSMB/Scripts/admin.pm:3712-4945
/branches/1.3/scripts/admin.pl:3711-4678


Property changes on: trunk/LedgerSMB/Scripts/contact.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/contact.pm:4783-4935
/branches/1.3/LedgerSMB/Scripts/customer.pm:3712-4782
/branches/1.3/scripts/customer.pl:4273-4287
   + /branches/1.3/LedgerSMB/Scripts/contact.pm:4783-4945
/branches/1.3/LedgerSMB/Scripts/customer.pm:3712-4782
/branches/1.3/scripts/customer.pl:4273-4287


Property changes on: trunk/LedgerSMB/Scripts/employee.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/employee.pm:3712-4935
/branches/1.3/scripts/employee.pl:3842-3843,4273-4287,4289-4310
   + /branches/1.3/LedgerSMB/Scripts/employee.pm:3712-4945
/branches/1.3/scripts/employee.pl:3842-3843,4273-4287,4289-4310


Property changes on: trunk/LedgerSMB/Scripts/file.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/file.pm:3711-4935
/branches/1.3/scripts/file.pl:3711-4880
   + /branches/1.3/LedgerSMB/Scripts/file.pm:3711-4945
/branches/1.3/scripts/file.pl:3711-4880


Property changes on: trunk/LedgerSMB/Scripts/journal.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/journal.pm:3712-4935
/branches/1.3/scripts/journal.pl:3711-4328
   + /branches/1.3/LedgerSMB/Scripts/journal.pm:3712-4945
/branches/1.3/scripts/journal.pl:3711-4328


Property changes on: trunk/LedgerSMB/Scripts/login.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/login.pm:3712-4935
/branches/1.3/scripts/login.pl:3711-4192
   + /branches/1.3/LedgerSMB/Scripts/login.pm:3712-4945
/branches/1.3/scripts/login.pl:3711-4192


Property changes on: trunk/LedgerSMB/Scripts/menu.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/menu.pm:3712-4935
/branches/1.3/scripts/menu.pl:3711-4192,4273-4287
   + /branches/1.3/LedgerSMB/Scripts/menu.pm:3712-4945
/branches/1.3/scripts/menu.pl:3711-4192,4273-4287


Property changes on: trunk/LedgerSMB/Scripts/payment.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/payment.pm:3712-4935
/branches/1.3/scripts/payment.pl:3711-4680
   + /branches/1.3/LedgerSMB/Scripts/payment.pm:3712-4945
/branches/1.3/scripts/payment.pl:3711-4680


Property changes on: trunk/LedgerSMB/Scripts/recon.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/recon.pm:3711-4935
/branches/1.3/scripts/recon.pl:4194-4271,4273-4287,4393-4438
   + /branches/1.3/LedgerSMB/Scripts/recon.pm:3711-4945
/branches/1.3/scripts/recon.pl:4194-4271,4273-4287,4393-4438


Property changes on: trunk/LedgerSMB/Scripts/setup.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/setup.pm:3712-4935
/branches/1.3/scripts/setup.pl:3711-4550
   + /branches/1.3/LedgerSMB/Scripts/setup.pm:3712-4945
/branches/1.3/scripts/setup.pl:3711-4550


Property changes on: trunk/LedgerSMB/Scripts/taxform.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/taxform.pm:3712-4935
/branches/1.3/scripts/taxform.pl:3711-4192,4273-4287
   + /branches/1.3/LedgerSMB/Scripts/taxform.pm:3712-4945
/branches/1.3/scripts/taxform.pl:3711-4192,4273-4287

Added: trunk/UI/Reports/filters/trial_balance.html
===================================================================
--- trunk/UI/Reports/filters/trial_balance.html	                        (rev 0)
+++ trunk/UI/Reports/filters/trial_balance.html	2012-06-22 11:24:47 UTC (rev 4946)
@@ -0,0 +1,161 @@
+<?lsmb include_stylesheet = ['css/trial_balance/search.css']?>
+<?lsmb INCLUDE 'ui-header.html' ?> 
+<?lsmb PROCESS elements.html ?>
+
+<body>
+    <form method="post" action="trial_balance.pl">
+        <?lsmb IF report.id;
+            INCLUDE input element_data = {
+                type="hidden",
+                name="report_id",
+                value=report.id
+            };
+        END;?>
+        <table width="100%">
+          <tr><th class="listtop">Trial Balance <?lsmb id ? 'Edit' : 'Create'?> Report</th></tr>
+          <tr><td> </td></tr>
+          <tr>
+            <td>
+              <table>
+                <?lsmb PROCESS business_classes ?>
+                <tr>
+                    <th align="right"><?lsmb text('From') ?></th>
+                    <td>
+                        <?lsmb PROCESS input element_data={
+                        class => 'date',
+                        name => 'date_from',
+                        size => '11',
+                        title => user.dateformat,
+                        value => report.date_from,
+                        } ?>
+                    </td>
+                    <th align="right"><?lsmb text('To') ?></th>
+                    <td>
+                        <?lsmb PROCESS input element_data={
+                        class => 'date',
+                        name => 'date_to',
+                        size => '11',
+                        title => user.dateformat,
+                        value => report.date_to,
+                        } ?>
+                    </td>
+                </tr>
+                <tr>
+                <th colspan=2><?lsmb text('Round Amounts First') ?>
+                <td><?lsmb PROCESS input element_data={
+                              name => 'discrete_amounts',
+                              type => 'checkbox',
+                             value => 'Y',
+                      } -?>
+                </td>
+                </tr>
+            </table>
+          </td>
+        </tr>
+        <tr>
+          <td>
+            <table>
+                <tr>
+                  <th align="right"><?lsmb text('Ignore Year-ends'); ?></th>
+                  <td><?lsmb PROCESS select element_data = {
+                             options = [
+                                 {
+                                     label="All",
+                                     id="all",
+                                 },
+                                 {
+                                     label="Last Only",
+                                     id="last"
+                                 },
+                                 {
+                                     label="None",
+                                     id="none",
+                                 }
+                             ],
+                             default_values = [report.ignore_yearend],
+                             name = 'ignore_yearend',
+                             text_attr = 'label',
+                             value_attr = 'id',
+                             } ?>
+                    </td>
+                </tr>
+                <tr>
+                    <th align="righ"><?lsmb text("Description")?></th>
+                    <td colspan="2">
+                        <?lsmb PROCESS input element_data={
+                            name="description",
+                            value=report.description,
+                            size=65,
+                            class= 'text'
+                        }?>
+                    </td>
+                </tr>
+              </table>
+            </td>
+          </tr>
+          <tr><td><hr size="3" noshade="noshade" /></td></tr>
+      </table>
+      <table width="100%">
+          <?lsmb # Add in the list of accounts here.?>
+          <?lsmb FOR heading IN headings?>
+            <tr class="heading">
+                <td class="title"><?lsmb heading.accno?> -- <?lsmb heading.description?></td>
+                <td class="check">
+                    <?lsmb IF report.heading_id; 
+                            IF report.heading_id == heading.id; 
+                                checked="checked"; 
+                            END; 
+                           ELSE; 
+                            checked=undef;
+                           END; 
+                           PROCESS input element_data = {
+                               type="radio",
+                               name="heading",
+                               value=heading.id,
+                               checked=checked
+                    }?>
+                </td>
+            </tr>
+            <?lsmb FOR account IN heading.accounts?>
+                <tr class="account">
+                    <td class="title"><?lsmb account.accno?> -- <?lsmb account.description?> </td>
+                    <td class="check">
+                        <?lsmb id = account.id; PROCESS input element_data = {
+                            type="checkbox",
+                            name="accounts",
+                            value=account.id
+                            checked=report_accounts.$id
+                        }?>
+                    </td>
+                </tr>
+            <?lsmb END?>
+          <?lsmb END?>
+        </table>
+        <br />
+        
+        <?lsmb PROCESS button element_data={
+            text => 'Save',
+            attributes => {
+                name=>'action',
+                value=>'save'
+            }
+        }?>
+        <?lsmb PROCESS button element_data={
+            text => 'Run',
+            attributes => {
+                name=>'action',
+                value=>'run'
+            }
+        }?>
+
+        <?lsmb PROCESS button element_data={
+            text => 'Save & Run',
+            attributes => {
+                name=>'action',
+                value=>'save_and_run'
+            }
+        }?>
+        
+        </form>
+    </body>
+</html>

Modified: trunk/sql/modules/Roles.sql
===================================================================
--- trunk/sql/modules/Roles.sql	2012-06-22 08:09:40 UTC (rev 4945)
+++ trunk/sql/modules/Roles.sql	2012-06-22 11:24:47 UTC (rev 4946)
@@ -265,8 +265,6 @@
 GRANT INSERT ON acc_trans, business_unit_ac TO "lsmb_<?lsmb dbname ?>__ar_transaction_create_voucher";
 GRANT ALL ON acc_trans_entry_id_seq TO "lsmb_<?lsmb dbname ?>__ar_transaction_create_voucher";
 
-INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (4, 'allow', 'lsmb_<?lsmb dbname ?>__ar_transaction_create');
 INSERT INTO menu_acl (node_id, acl_type, role_name) 
 values (198, 'allow', 'lsmb_<?lsmb dbname ?>__ar_transaction_create_voucher');
 INSERT INTO menu_acl (node_id, acl_type, role_name) 
@@ -356,15 +354,13 @@
    TO "lsmb_<?lsmb dbname ?>__sales_order_create";
 
 
-GRANT INSERT, UPDATE ON oe TO "lsmb_<?lsmb dbname ?>__sales_order_create";
+GRANT ALL ON oe TO "lsmb_<?lsmb dbname ?>__sales_order_create";
 GRANT ALL ON oe_id_seq TO "lsmb_<?lsmb dbname ?>__sales_order_create";
 GRANT INSERT, UPDATE ON orderitems, business_unit_oitem TO "lsmb_<?lsmb dbname ?>__sales_order_create";
 GRANT ALL ON orderitems_id_seq TO "lsmb_<?lsmb dbname ?>__sales_order_create";
 GRANT ALL on inventory TO "lsmb_<?lsmb dbname ?>__sales_order_create";
 
 INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (50, 'allow', 'lsmb_<?lsmb dbname ?>__sales_order_create');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (51, 'allow', 'lsmb_<?lsmb dbname ?>__sales_order_create');
 
 CREATE ROLE "lsmb_<?lsmb dbname ?>__sales_order_edit";
@@ -379,14 +375,12 @@
 GRANT "lsmb_<?lsmb dbname ?>__exchangerate_edit"
    TO "lsmb_<?lsmb dbname ?>__sales_quotation_create";
 
-GRANT INSERT, UPDATE ON oe TO "lsmb_<?lsmb dbname ?>__sales_quotation_create";
+GRANT ALL ON oe TO "lsmb_<?lsmb dbname ?>__sales_quotation_create";
 GRANT ALL ON oe_id_seq TO "lsmb_<?lsmb dbname ?>__sales_quotation_create";
 GRANT INSERT, UPDATE ON orderitems, business_unit_oitem TO "lsmb_<?lsmb dbname ?>__sales_quotation_create";
 GRANT ALL ON orderitems_id_seq TO "lsmb_<?lsmb dbname ?>__sales_quotation_create";
 
 INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (67, 'allow', 'lsmb_<?lsmb dbname ?>__sales_quotation_create');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (68, 'allow', 'lsmb_<?lsmb dbname ?>__sales_quotation_create');
 
 
@@ -399,10 +393,6 @@
 GRANT SELECT ON orderitems, business_unit_oitem TO "lsmb_<?lsmb dbname ?>__sales_order_list";
 
 INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (50, 'allow', 'lsmb_<?lsmb dbname ?>__sales_order_list');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (53, 'allow', 'lsmb_<?lsmb dbname ?>__sales_order_list');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (54, 'allow', 'lsmb_<?lsmb dbname ?>__sales_order_list');
 
 
@@ -415,10 +405,6 @@
 GRANT SELECT ON orderitems, business_unit_oitem TO "lsmb_<?lsmb dbname ?>__sales_quotation_list";
 
 INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (67, 'allow', 'lsmb_<?lsmb dbname ?>__sales_quotation_list');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (70, 'allow', 'lsmb_<?lsmb dbname ?>__sales_quotation_list');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (71, 'allow', 'lsmb_<?lsmb dbname ?>__sales_quotation_list');
 
 
@@ -562,8 +548,6 @@
 GRANT DELETE ON new_shipto TO "lsmb_<?lsmb dbname ?>__purchase_order_edit";
 
 INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (50, 'allow', 'lsmb_<?lsmb dbname ?>__purchase_order_create');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (52, 'allow', 'lsmb_<?lsmb dbname ?>__purchase_order_create');
 
 
@@ -581,8 +565,6 @@
 GRANT ALL ON orderitems_id_seq TO "lsmb_<?lsmb dbname ?>__rfq_create";
 
 INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (67, 'allow', 'lsmb_<?lsmb dbname ?>__rfq_create');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (69, 'allow', 'lsmb_<?lsmb dbname ?>__rfq_create');
 
 
@@ -594,10 +576,6 @@
 GRANT SELECT ON orderitems, business_unit_oitem TO "lsmb_<?lsmb dbname ?>__purchase_order_list";
 
 INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (50, 'allow', 'lsmb_<?lsmb dbname ?>__purchase_order_list');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (53, 'allow', 'lsmb_<?lsmb dbname ?>__purchase_order_list');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (55, 'allow', 'lsmb_<?lsmb dbname ?>__purchase_order_list');
 
 
@@ -609,10 +587,6 @@
 GRANT SELECT ON orderitems, business_unit_oitem TO "lsmb_<?lsmb dbname ?>__rfq_list";
 
 INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (67, 'allow', 'lsmb_<?lsmb dbname ?>__rfq_list');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (70, 'allow', 'lsmb_<?lsmb dbname ?>__rfq_list');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (72, 'allow', 'lsmb_<?lsmb dbname ?>__rfq_list');
 
 
@@ -710,8 +684,6 @@
  GRANT ALL ON cr_report_id_seq TO "lsmb_<?lsmb dbname ?>__reconciliation_enter";
 
 INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (35, 'allow', 'lsmb_<?lsmb dbname ?>__reconciliation_enter');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (45, 'allow', 'lsmb_<?lsmb dbname ?>__reconciliation_enter');
 
 
@@ -730,10 +702,6 @@
 "lsmb_<?lsmb dbname ?>__reconciliation_approve";
 
 INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (35, 'allow', 'lsmb_<?lsmb dbname ?>__reconciliation_approve');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (41, 'allow', 'lsmb_<?lsmb dbname ?>__reconciliation_approve');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (44, 'allow', 'lsmb_<?lsmb dbname ?>__reconciliation_approve');
 INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (211, 'allow', 'lsmb_<?lsmb dbname ?>__reconciliation_approve');
@@ -760,8 +728,6 @@
 
 
 INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (35, 'allow', 'lsmb_<?lsmb dbname ?>__payment_process');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (38, 'allow', 'lsmb_<?lsmb dbname ?>__payment_process');
 INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (43, 'allow', 'lsmb_<?lsmb dbname ?>__payment_process');
@@ -785,16 +751,12 @@
 GRANT UPDATE ON ar TO "lsmb_<?lsmb dbname ?>__receipt_process";
 
 INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (35, 'allow', 'lsmb_<?lsmb dbname ?>__receipt_process');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (36, 'allow', 'lsmb_<?lsmb dbname ?>__receipt_process');
 INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (37, 'allow', 'lsmb_<?lsmb dbname ?>__receipt_process');
 INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (42, 'allow', 'lsmb_<?lsmb dbname ?>__receipt_process');
 INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (47, 'allow', 'lsmb_<?lsmb dbname ?>__receipt_process');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (203, 'allow', 'lsmb_<?lsmb dbname ?>__receipt_process');
 INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (204, 'allow', 'lsmb_<?lsmb dbname ?>__receipt_process');
@@ -821,8 +783,6 @@
    "lsmb_<?lsmb dbname ?>__contact_create";
 
 INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (77, 'allow', 'lsmb_<?lsmb dbname ?>__part_create');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (78, 'allow', 'lsmb_<?lsmb dbname ?>__part_create');
 INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (79, 'allow', 'lsmb_<?lsmb dbname ?>__part_create');
@@ -852,10 +812,6 @@
 GRANT ALL ON partstax TO "lsmb_<?lsmb dbname ?>__part_edit";
 
 INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (77, 'allow', 'lsmb_<?lsmb dbname ?>__part_edit');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (85, 'allow', 'lsmb_<?lsmb dbname ?>__part_edit');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (86, 'allow', 'lsmb_<?lsmb dbname ?>__part_edit');
 INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (87, 'allow', 'lsmb_<?lsmb dbname ?>__part_edit');
@@ -881,10 +837,6 @@
 GRANT SELECT ON acc_trans TO "lsmb_<?lsmb dbname ?>__inventory_reports";
 
 INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (77, 'allow', 'lsmb_<?lsmb dbname ?>__inventory_reports');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (85, 'allow', 'lsmb_<?lsmb dbname ?>__inventory_reports');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (88, 'allow', 'lsmb_<?lsmb dbname ?>__inventory_reports');
 INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (94, 'allow', 'lsmb_<?lsmb dbname ?>__inventory_reports');
@@ -899,8 +851,6 @@
 GRANT UPDATE ON entity_credit_account TO "lsmb_<?lsmb dbname ?>__pricegroup_create";
 
 INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (77, 'allow', 'lsmb_<?lsmb dbname ?>__pricegroup_create');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (83, 'allow', 'lsmb_<?lsmb dbname ?>__pricegroup_create');
 
 
@@ -912,10 +862,6 @@
 GRANT UPDATE ON entity_credit_account TO "lsmb_<?lsmb dbname ?>__pricegroup_edit";
 
 INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (77, 'allow', 'lsmb_<?lsmb dbname ?>__pricegroup_edit');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (85, 'allow', 'lsmb_<?lsmb dbname ?>__pricegroup_edit');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (92, 'allow', 'lsmb_<?lsmb dbname ?>__pricegroup_edit');
 
 CREATE ROLE "lsmb_<?lsmb dbname ?>__assembly_stock"
@@ -924,8 +870,6 @@
 GRANT UPDATE ON parts TO "lsmb_<?lsmb dbname ?>__assembly_stock";
 
 INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (77, 'allow', 'lsmb_<?lsmb dbname ?>__assembly_stock');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (84, 'allow', 'lsmb_<?lsmb dbname ?>__assembly_stock');
 
 
@@ -937,8 +881,6 @@
 GRANT ALL ON inventory_entry_id_seq TO "lsmb_<?lsmb dbname ?>__inventory_ship";
 
 INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (63, 'allow', 'lsmb_<?lsmb dbname ?>__inventory_ship');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (64, 'allow', 'lsmb_<?lsmb dbname ?>__inventory_ship');
 
 
@@ -950,8 +892,6 @@
 GRANT ALL ON inventory_entry_id_seq TO "lsmb_<?lsmb dbname ?>__inventory_receive";
 
 INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (63, 'allow', 'lsmb_<?lsmb dbname ?>__inventory_receive');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (65, 'allow', 'lsmb_<?lsmb dbname ?>__inventory_receive');
 
 
@@ -962,8 +902,6 @@
 GRANT ALL ON inventory_entry_id_seq TO "lsmb_<?lsmb dbname ?>__inventory_transfer";
 
 INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (63, 'allow', 'lsmb_<?lsmb dbname ?>__inventory_transfer');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (66, 'allow', 'lsmb_<?lsmb dbname ?>__inventory_transfer');
 
 CREATE ROLE "lsmb_<?lsmb dbname ?>__warehouse_create"
@@ -973,10 +911,6 @@
 GRANT ALL ON warehouse_id_seq TO "lsmb_<?lsmb dbname ?>__warehouse_create";
 
 INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (128, 'allow', 'lsmb_<?lsmb dbname ?>__warehouse_create');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (141, 'allow', 'lsmb_<?lsmb dbname ?>__warehouse_create');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (142, 'allow', 'lsmb_<?lsmb dbname ?>__warehouse_create');
 
 
@@ -986,10 +920,6 @@
 GRANT UPDATE ON warehouse TO "lsmb_<?lsmb dbname ?>__warehouse_edit";
 
 INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (128, 'allow', 'lsmb_<?lsmb dbname ?>__warehouse_edit');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (141, 'allow', 'lsmb_<?lsmb dbname ?>__warehouse_edit');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (143, 'allow', 'lsmb_<?lsmb dbname ?>__warehouse_edit');
 
 
@@ -1015,14 +945,10 @@
 GRANT ALL ON acc_trans_entry_id_seq TO "lsmb_<?lsmb dbname ?>__gl_transaction_create";
 
 INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (73, 'allow', 'lsmb_<?lsmb dbname ?>__gl_transaction_create');
-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 (35, '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');
@@ -1047,8 +973,6 @@
 TO "lsmb_<?lsmb dbname ?>__gl_reports";
 
 INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (73, 'allow', 'lsmb_<?lsmb dbname ?>__gl_reports');
-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');
@@ -1065,8 +989,6 @@
 GRANT ALL ON account_checkpoint_id_seq TO "lsmb_<?lsmb dbname ?>__yearend_run";
 
 INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (128, 'allow', 'lsmb_<?lsmb dbname ?>__yearend_run');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (132, 'allow', 'lsmb_<?lsmb dbname ?>__yearend_run');
 
 
@@ -1093,12 +1015,8 @@
 GRANT ALL ON jcitems_id_seq TO "lsmb_<?lsmb dbname ?>__project_timecard_add";
 
 INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (98, 'allow', 'lsmb_<?lsmb dbname ?>__project_timecard_add');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (100, 'allow', 'lsmb_<?lsmb dbname ?>__project_timecard_add');
 INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (103, 'allow', 'lsmb_<?lsmb dbname ?>__project_timecard_add');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (106, 'allow', 'lsmb_<?lsmb dbname ?>__project_timecard_add');
 
 CREATE ROLE "lsmb_<?lsmb dbname ?>__project_timecard_list"
@@ -1108,10 +1026,6 @@
 GRANT SELECT ON jcitems TO "lsmb_<?lsmb dbname ?>__project_timecard_list";
 
 INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (98, 'allow', 'lsmb_<?lsmb dbname ?>__project_timecard_list');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (103, 'allow', 'lsmb_<?lsmb dbname ?>__project_timecard_list');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (106, 'allow', 'lsmb_<?lsmb dbname ?>__project_timecard_list');
 
 
@@ -1132,10 +1046,6 @@
 "lsmb_<?lsmb dbname ?>__project_timecard_list";
 
 INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (98, 'allow', 'lsmb_<?lsmb dbname ?>__project_order_generate');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (101, 'allow', 'lsmb_<?lsmb dbname ?>__project_order_generate');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (102, 'allow', 'lsmb_<?lsmb dbname ?>__project_order_generate');
 
 
@@ -1144,10 +1054,6 @@
 IN ROLE "lsmb_<?lsmb dbname ?>__orders_generate";
 
 INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (50, 'allow', 'lsmb_<?lsmb dbname ?>__orders_sales_to_purchase');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (56, 'allow', 'lsmb_<?lsmb dbname ?>__orders_sales_to_purchase');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (57, 'allow', 'lsmb_<?lsmb dbname ?>__orders_sales_to_purchase');
 INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (58, 'allow', 'lsmb_<?lsmb dbname ?>__orders_sales_to_purchase');
@@ -1158,8 +1064,6 @@
 IN ROLE "lsmb_<?lsmb dbname ?>__orders_generate";
 
 INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (50, 'allow', 'lsmb_<?lsmb dbname ?>__orders_purchase_consolidate');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (60, 'allow', 'lsmb_<?lsmb dbname ?>__orders_purchase_consolidate');
 INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (62, 'allow', 'lsmb_<?lsmb dbname ?>__orders_purchase_consolidate');
@@ -1170,8 +1074,6 @@
 IN ROLE "lsmb_<?lsmb dbname ?>__orders_generate";
 
 INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (50, 'allow', 'lsmb_<?lsmb dbname ?>__orders_sales_consolidate');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (60, 'allow', 'lsmb_<?lsmb dbname ?>__orders_sales_consolidate');
 INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (61, 'allow', 'lsmb_<?lsmb dbname ?>__orders_sales_consolidate');
@@ -1192,8 +1094,6 @@
 GRANT select ON yearend TO "lsmb_<?lsmb dbname ?>__financial_reports";
 
 INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (109, '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');
@@ -1218,8 +1118,6 @@
 WITH INHERIT NOLOGIN;
 
 INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (116, 'allow', 'lsmb_<?lsmb dbname ?>__print_jobs_list');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (117, 'allow', 'lsmb_<?lsmb dbname ?>__print_jobs_list');
 INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (118, 'allow', 'lsmb_<?lsmb dbname ?>__print_jobs_list');
@@ -1269,8 +1167,6 @@
 WITH INHERIT NOLOGIN;
 
 INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (128, 'allow', 'lsmb_<?lsmb dbname ?>__system_settings_list');
-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');
@@ -1286,8 +1182,6 @@
 GRANT INSERT, UPDATE ON tax TO "lsmb_<?lsmb dbname ?>__taxes_set";
 
 INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (128, 'allow', 'lsmb_<?lsmb dbname ?>__taxes_set');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (130, 'allow', 'lsmb_<?lsmb dbname ?>__taxes_set');
 
 
@@ -1306,10 +1200,6 @@
 --GRANT ALL ON account_link_id_seq TO "lsmb_<?lsmb dbname ?>__account_create";
 
 INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (128, 'allow', 'lsmb_<?lsmb dbname ?>__account_create');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (136, 'allow', 'lsmb_<?lsmb dbname ?>__account_create');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (137, 'allow', 'lsmb_<?lsmb dbname ?>__account_create');
 INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (246, 'allow', 'lsmb_<?lsmb dbname ?>__account_create');
@@ -1342,10 +1232,6 @@
 GRANT INSERT ON gifi TO "lsmb_<?lsmb dbname ?>__gifi_create";
 
 INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (128, 'allow', 'lsmb_<?lsmb dbname ?>__gifi_create');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (136, 'allow', 'lsmb_<?lsmb dbname ?>__gifi_create');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (139, 'allow', 'lsmb_<?lsmb dbname ?>__gifi_create');
 INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (247, 'allow', 'lsmb_<?lsmb dbname ?>__gifi_create');
@@ -1357,10 +1243,6 @@
 GRANT UPDATE ON gifi TO "lsmb_<?lsmb dbname ?>__gifi_edit";
 
 INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (128, 'allow', 'lsmb_<?lsmb dbname ?>__gifi_edit');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (136, 'allow', 'lsmb_<?lsmb dbname ?>__gifi_edit');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (140, 'allow', 'lsmb_<?lsmb dbname ?>__gifi_edit');
 
 
@@ -1379,10 +1261,6 @@
 GRANT ALL ON business_id_seq TO "lsmb_<?lsmb dbname ?>__business_type_create";
 
 INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (128, 'allow', 'lsmb_<?lsmb dbname ?>__business_type_create');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (147, 'allow', 'lsmb_<?lsmb dbname ?>__business_type_create');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (148, 'allow', 'lsmb_<?lsmb dbname ?>__business_type_create');
 
 
@@ -1392,10 +1270,6 @@
 GRANT UPDATE, DELETE ON business TO "lsmb_<?lsmb dbname ?>__business_type_edit";
 
 INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (128, 'allow', 'lsmb_<?lsmb dbname ?>__business_type_edit');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (147, 'allow', 'lsmb_<?lsmb dbname ?>__business_type_edit');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (149, 'allow', 'lsmb_<?lsmb dbname ?>__business_type_edit');
 
 
@@ -1410,10 +1284,6 @@
 GRANT INSERT ON sic TO "lsmb_<?lsmb dbname ?>__sic_create";
 
 INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (128, 'allow', 'lsmb_<?lsmb dbname ?>__sic_create');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (153, 'allow', 'lsmb_<?lsmb dbname ?>__sic_create');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (154, 'allow', 'lsmb_<?lsmb dbname ?>__sic_create');
 INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (248, 'allow', 'lsmb_<?lsmb dbname ?>__sic_create');
@@ -1425,10 +1295,6 @@
 GRANT UPDATE ON sic TO "lsmb_<?lsmb dbname ?>__sic_edit";
 
 INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (128, 'allow', 'lsmb_<?lsmb dbname ?>__sic_edit');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (153, 'allow', 'lsmb_<?lsmb dbname ?>__sic_edit');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (155, 'allow', 'lsmb_<?lsmb dbname ?>__sic_edit');
 
 
@@ -1445,10 +1311,6 @@
 -- TODO Add db permissions as templates get moved into db.
 
 INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (128, 'allow', 'lsmb_<?lsmb dbname ?>__template_edit');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (156, 'allow', 'lsmb_<?lsmb dbname ?>__template_edit');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (157, 'allow', 'lsmb_<?lsmb dbname ?>__template_edit');
 INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (158, 'allow', 'lsmb_<?lsmb dbname ?>__template_edit');
@@ -1479,8 +1341,6 @@
 INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (171, 'allow', 'lsmb_<?lsmb dbname ?>__template_edit');
 INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (172, 'allow', 'lsmb_<?lsmb dbname ?>__template_edit');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (173, 'allow', 'lsmb_<?lsmb dbname ?>__template_edit');
 INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (174, 'allow', 'lsmb_<?lsmb dbname ?>__template_edit');
@@ -1511,8 +1371,6 @@
 INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (187, 'allow', 'lsmb_<?lsmb dbname ?>__template_edit');
 INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (188, 'allow', 'lsmb_<?lsmb dbname ?>__template_edit');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (189, 'allow', 'lsmb_<?lsmb dbname ?>__template_edit');
 INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (190, 'allow', 'lsmb_<?lsmb dbname ?>__template_edit');
@@ -1573,10 +1431,6 @@
 GRANT INSERT ON language TO "lsmb_<?lsmb dbname ?>__language_create";
 
 INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (128, 'allow', 'lsmb_<?lsmb dbname ?>__language_create');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (150, 'allow', 'lsmb_<?lsmb dbname ?>__language_create');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (151, 'allow', 'lsmb_<?lsmb dbname ?>__language_create');
 
 
@@ -1586,10 +1440,6 @@
 GRANT UPDATE ON language TO "lsmb_<?lsmb dbname ?>__language_edit";
 
 INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (128, 'allow', 'lsmb_<?lsmb dbname ?>__language_edit');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (150, 'allow', 'lsmb_<?lsmb dbname ?>__language_edit');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (152, 'allow', 'lsmb_<?lsmb dbname ?>__language_edit');
 
 
@@ -1600,10 +1450,6 @@
 TO "lsmb_<?lsmb dbname ?>__part_translation_create";
 
 INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (77, 'allow', 'lsmb_<?lsmb dbname ?>__part_translation_create');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (95, 'allow', 'lsmb_<?lsmb dbname ?>__part_translation_create');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (96, 'allow', 'lsmb_<?lsmb dbname ?>__part_translation_create');
 INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (97, 'allow', 'lsmb_<?lsmb dbname ?>__part_translation_create');
@@ -1615,10 +1461,6 @@
 GRANT ALL ON partsgroup_translation
 TO "lsmb_<?lsmb dbname ?>__partsgroup_translation_create";
 INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (98, 'allow', 'lsmb_<?lsmb dbname ?>__partsgroup_translation_create');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (107, 'allow', 'lsmb_<?lsmb dbname ?>__partsgroup_translation_create');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (108, 'allow', 'lsmb_<?lsmb dbname ?>__partsgroup_translation_create');
 
 
@@ -1758,8 +1600,6 @@
 INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (191, 'allow', 'public');
 INSERT INTO menu_acl (node_id, acl_type, role_name)
-values (192, 'allow', 'public');
-INSERT INTO menu_acl (node_id, acl_type, role_name)
 values (193, 'allow', 'public');
 
 -- PERMISSIONS ENFORCEMENT PER ENTITY CLASS


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-4935
/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-4945
/branches/1.3/sql/upgrade/1.2-1.3.sql:3711-3851
/trunk/sql/upgrade/1.2-1.3.sql:858-3710

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.