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

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



Revision: 4373
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=4373&view=rev
Author:   einhverfr
Date:     2012-03-02 02:18:26 +0000 (Fri, 02 Mar 2012)
Log Message:
-----------
Merging from branches/1.3

Modified Paths:
--------------
    trunk/Changelog
    trunk/LedgerSMB/Scripts/asset.pm
    trunk/UI/asset/edit_class.html
    trunk/contrib/replication/configure-replication.sh

Property Changed:
----------------
    trunk/
    trunk/LedgerSMB/Scripts/account.pm
    trunk/LedgerSMB/Scripts/admin.pm
    trunk/LedgerSMB/Scripts/customer.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/LedgerSMB/Scripts/vendor.pm
    trunk/sql/upgrade/1.2-1.3-manual.sql


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3:3711-4368
   + /branches/1.3:3711-4372

Modified: trunk/Changelog
===================================================================
--- trunk/Changelog	2012-03-02 02:03:12 UTC (rev 4372)
+++ trunk/Changelog	2012-03-02 02:18:26 UTC (rev 4373)
@@ -50,10 +50,14 @@
 * Corrected missing "search assets" menu item (Chris T)
 * Net Book Value report now shows undepreciated assets (Chris T)
 * Permissions fixes to fixed asset module (Chris T)
+* Corrected NULL being saved in method for asset class (Chris T)
+* Corrected UI glitch on saving asset class (Chris T)
+* Updated Slony setup scripts (Chris T)
 
 Hilton D is Hilton Day
 Frans S is Frans van der Star
 Chris T is Chris Travers
+
 Changelog for 1.3.11
 * Fixed outstanding report for payment reversal and partial payments (Chris T)
 * Fixed handling of non-existing roles in menu grants (Chris T)


Property changes on: trunk/LedgerSMB/Scripts/account.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/scripts/account.pl:3711-4368
   + /branches/1.3/LedgerSMB/Scripts/account.pm:4369-4372
/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:3901-4368
/branches/1.3/scripts/admin.pl:3711-3903,4273-4287
   + /branches/1.3/LedgerSMB/Scripts/admin.pm:3901-4372
/branches/1.3/scripts/admin.pl:3711-3903,4273-4287

Modified: trunk/LedgerSMB/Scripts/asset.pm
===================================================================
--- trunk/LedgerSMB/Scripts/asset.pm	2012-03-02 02:03:12 UTC (rev 4372)
+++ trunk/LedgerSMB/Scripts/asset.pm	2012-03-02 02:18:26 UTC (rev 4373)
@@ -123,14 +123,7 @@
     my ($request) = @_;
     my $ac = LedgerSMB::DBObject::Asset_Class->new(base => $request);
     $ac->save;
-    my $template = LedgerSMB::Template->new(
-        user =>$request->{_user}, 
-        locale => $request->{_locale},
-        path => 'UI/asset',
-        template => 'edit_class',
-        format => 'HTML'
-    );
-    $template->render($ac);
+    asset_category_screen($ac);
 }
 
 # Is this even working at the moment?  Not documenting unil I know.


Property changes on: trunk/LedgerSMB/Scripts/customer.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/customer.pm:4288-4368
/branches/1.3/scripts/customer.pl:4273-4287
   + /branches/1.3/LedgerSMB/Scripts/customer.pm:4288-4372
/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-4368
/branches/1.3/scripts/employee.pl:3842-3843,4273-4287,4289-4310
   + /branches/1.3/LedgerSMB/Scripts/employee.pm:3712-4372
/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-4368
/branches/1.3/scripts/file.pl:3711-4138
   + /branches/1.3/LedgerSMB/Scripts/file.pm:3711-4372
/branches/1.3/scripts/file.pl:3711-4138


Property changes on: trunk/LedgerSMB/Scripts/journal.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/journal.pm:4288-4368
/branches/1.3/scripts/journal.pl:3711-4328
   + /branches/1.3/LedgerSMB/Scripts/journal.pm:4288-4372
/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:4193-4368
/branches/1.3/scripts/login.pl:3711-4192
   + /branches/1.3/LedgerSMB/Scripts/login.pm:4193-4372
/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:4155-4368
/branches/1.3/scripts/menu.pl:3711-4192,4273-4287
   + /branches/1.3/LedgerSMB/Scripts/menu.pm:4155-4372
/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:4010-4368
/branches/1.3/scripts/payment.pl:3711-4310
   + /branches/1.3/LedgerSMB/Scripts/payment.pm:4010-4372
/branches/1.3/scripts/payment.pl:3711-4310


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


Property changes on: trunk/LedgerSMB/Scripts/setup.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/setup.pm:3937-4368
/branches/1.3/scripts/setup.pl:3711-4216,4273-4287
   + /branches/1.3/LedgerSMB/Scripts/setup.pm:3937-4372
/branches/1.3/scripts/setup.pl:3711-4216,4273-4287


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


Property changes on: trunk/LedgerSMB/Scripts/vendor.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/vendor.pm:4288-4368
/branches/1.3/scripts/vendor.pl:4273-4287
   + /branches/1.3/LedgerSMB/Scripts/vendor.pm:4288-4372
/branches/1.3/scripts/vendor.pl:4273-4287

Modified: trunk/UI/asset/edit_class.html
===================================================================
--- trunk/UI/asset/edit_class.html	2012-03-02 02:03:12 UTC (rev 4372)
+++ trunk/UI/asset/edit_class.html	2012-03-02 02:18:26 UTC (rev 4373)
@@ -24,8 +24,8 @@
 	options = dep_methods
 	value_attr = 'id'
 	text_attr = 'method'
-	default_values = [method_id]
-	name = 'method_id'
+	default_values = [method]
+	name = 'method'
 } ?>
 </span>
 </div>

Modified: trunk/contrib/replication/configure-replication.sh
===================================================================
--- trunk/contrib/replication/configure-replication.sh	2012-03-02 02:03:12 UTC (rev 4372)
+++ trunk/contrib/replication/configure-replication.sh	2012-03-02 02:18:26 UTC (rev 4373)
@@ -108,20 +108,56 @@
 done
 
 
-SEQUENCES=" acc_trans_entry_id_seq audittrail_entry_id_seq
- custom_field_catalog_field_id_seq custom_table_catalog_table_id_seq
- id inventory_entry_id_seq invoiceid jcitemsid orderitemsid
- partscustomer_entry_id_seq partsvendor_entry_id_seq
- session_session_id_seq shipto_entry_id_seq "
+SEQUENCES=" asset_report_id_seq asset_dep_method_id_seq 
+            asset_disposal_method_id_seq audittrail_entry_id_seq
+            batch_class_id_seq budget_info_id_seq
+            custom_field_catalog_field_id_seq asset_class_id_seq
+            asset_item_id_seq contact_class_id_seq country_id_seq
+            custom_table_catalog_table_id_seq entity_class_id_seq
+            file_class_id_seq batch_id_seq department_id_seq new_shipto_id_seq
+            entity_bank_account_id_seq location_class_id_seq note_class_id_seq
+            menu_acl_id_seq menu_attribute_id_seq menu_node_id_seq
+            mime_type_id_seq file_base_id_seq payment_type_id_seq 
+            location_id_seq open_forms_id_seq partscustomer_entry_id_seq
+            partsvendor_entry_id_seq payment_id_seq jcitems_id_seq
+            pending_job_id_seq salutation_id_seq taxcategory_taxcategory_id_seq
+            warehouse_id_seq acc_trans_entry_id_seq account_checkpoint_id_seq
+            company_id_seq note_id_seq account_heading_id_seq id
+            business_id_seq parts_id_seq oe_id_seq invoice_id_seq
+            orderitems_id_seq country_tax_form_id_seq pricegroup_id_seq
+            cr_report_line_id_seq session_session_id_seq inventory_entry_id_seq
+            project_id_seq cr_report_id_seq entity_credit_account_id_seq 
+            taxmodule_taxmodule_id_seq users_id_seq voucher_id_seq 
+            person_id_seq entity_id_seq partsgroup_id_seq account_id_seq"
 
-TABLES=" acc_trans ap ar assembly audittrail business chart
- custom_field_catalog custom_table_catalog customer customertax
- defaults department dpt_trans employee exchangerate gifi gl inventory
- invoice jcitems language makemodel oe orderitems parts partscustomer
- partsgroup partstax partsvendor pricegroup project recurring
- recurringemail recurringprint session shipto sic status tax
- transactions translation vendor vendortax warehouse yearend"
+TABLES=" ac_tax_form acc_trans account account_checkpoint account_heading
+         account_link account_link_description ap ar assembly asset_class
+         asset_dep_method asset_disposal_method asset_item asset_note
+         asset_report asset_report_class asset_report_line
+         asset_rl_to_disposal_method asset_unit_class audittrail batch
+         batch_class budget_info budget_line budget_note budget_to_department
+         budget_to_project business company company_to_contact company_to_entity
+         company_to_location contact_class country country_tax_form
+         cr_coa_to_account cr_report cr_report_line custom_field_catalog
+         custom_is custom_table_catalog customertax defaults department
+         dpt_trans eca_note eca_to_contact eca_to_location entity
+         entity_bank_account entity_class entity_class_to_entity
+         entity_credit_account entity_employee entity_note entity_other_name
+         exchangerate file_base file_class file_order file_order_to_order
+         file_order_to_tx file_part file_secondary_attachment file_transaction
+         file_tx_to_order file_view_catalog gifi gl inventory invoice
+         invoice_note invoice_tax_form jcitems language location location_class
+         lsmb_roles makemodel menu_acl menu_attribute menu_node mime_type
+         new_shipto note note_class oe oe_class open_forms orderitems parts
+         parts_translation partscustomer partsgroup partsgroup_translation
+         partstax partsvendor payment payment_links payment_type payments_queue
+         pending_job person person_to_company person_to_contact person_to_entity
+         person_to_location pricegroup project project_translation recurring
+         recurringemail recurringprint salutation session sic status tax
+         tax_extended taxcategory taxmodule transactions translation
+         user_preference users vendortax voucher warehouse yearend"
 
+
 SETUPSET=${mktmp}/create_set.slonik
 
 echo "include <${PREAMBLE}>;" > $SETUPSET


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-4368
/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-4372
/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.