SF.net SVN: ledger-smb:[5703] branches/1.3

[..hidden..]

Revision: 5703
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=5703&view=rev
Author:   einhverfr
Date:     2013-03-24 02:16:08 +0000 (Sun, 24 Mar 2013)
Log Message:
-----------
fix for not saving country_id for companies in 1.3

Modified Paths:
--------------
    branches/1.3/Changelog
    branches/1.3/LedgerSMB/DBObject/Company.pm
    branches/1.3/sql/modules/Company.sql

Property Changed:
----------------
    branches/1.3/
    branches/1.3/Changelog


Property changes on: branches/1.3
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:3711-3712,5424,5446-5448,5451,5457,5459,5461,5466,5473,5475,5482-5483,5485,5487,5489,5495-5496,5515,5519,5524,5526,5528-5529,5533,5544-5546,5548-5549,5554-5555,5563,5565,5569,5576,5579,5589-5590,5597,5602-5603,5608,5610,5615,5617,5620,5622,5633-5634,5649-5650,5655-5657,5668,5670,5675,5677,5680-5682,5684,5687-5688,5690,5694,5696,5698,5700
   + /trunk:3711-3712,5424,5446-5448,5451,5457,5459,5461,5466,5473,5475,5482-5483,5485,5487,5489,5495-5496,5515,5519,5524,5526,5528-5529,5533,5544-5546,5548-5549,5554-5555,5563,5565,5569,5576,5579,5589-5590,5597,5602-5603,5608,5610,5615,5617,5620,5622,5633-5634,5649-5650,5655-5657,5668,5670,5675,5677,5680-5682,5684,5687-5688,5690,5694,5696,5698,5700,5702

Modified: branches/1.3/Changelog
===================================================================
--- branches/1.3/Changelog	2013-03-24 00:09:02 UTC (rev 5702)
+++ branches/1.3/Changelog	2013-03-24 02:16:08 UTC (rev 5703)
@@ -17,6 +17,7 @@
 * Fixed handling of invoice numbers on recurring (Chris T, 3602382)
 * Fixed language code changes delayed (Chris T, 3607220) 
 * Fixed order by on reconciliation screen not working (Chris T, 3607223)
+* Fixed country changes to companies not saving (Chris T, 3607437)
 
 Changelog for 1.3.30
 * Documented behavior of Outstanding Summary report (Chris T, 3601314)


Property changes on: branches/1.3/Changelog
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/Changelog:3711-3712,5424,5446-5448,5451,5457,5459,5461,5466,5473,5475,5482-5483,5485,5487,5489,5495-5496,5513,5515,5519,5524,5529,5548,5563,5565,5578-5579,5581,5583,5587,5590,5593,5595,5597,5608,5610,5612,5615,5617,5620,5622,5626,5633-5634,5649-5650,5652,5655,5668,5670,5675,5677,5680-5682,5684,5687-5688,5690,5694,5696,5698,5700
   + /trunk/Changelog:3711-3712,5424,5446-5448,5451,5457,5459,5461,5466,5473,5475,5482-5483,5485,5487,5489,5495-5496,5513,5515,5519,5524,5529,5548,5563,5565,5578-5579,5581,5583,5587,5590,5593,5595,5597,5608,5610,5612,5615,5617,5620,5622,5626,5633-5634,5649-5650,5652,5655,5668,5670,5675,5677,5680-5682,5684,5687-5688,5690,5694,5696,5698,5700,5702

Modified: branches/1.3/LedgerSMB/DBObject/Company.pm
===================================================================
--- branches/1.3/LedgerSMB/DBObject/Company.pm	2013-03-24 00:09:02 UTC (rev 5702)
+++ branches/1.3/LedgerSMB/DBObject/Company.pm	2013-03-24 02:16:08 UTC (rev 5703)
@@ -657,6 +657,8 @@
             last;
         }
     }
+    my ($ref) = $self->exec_method({funcname => 'entity__get_by_cc'});
+    $self->merge($ref);
     $self->{name} = $self->{legal_name};
     if ($self->{credit_id} and $self->{meta_number}){
         $self->get_credit_id;

Modified: branches/1.3/sql/modules/Company.sql
===================================================================
--- branches/1.3/sql/modules/Company.sql	2013-03-24 00:09:02 UTC (rev 5702)
+++ branches/1.3/sql/modules/Company.sql	2013-03-24 02:16:08 UTC (rev 5703)
@@ -664,6 +664,7 @@
 	UPDATE entity 
 	SET name = in_name, 
 		entity_class = in_entity_class,
+                country_id   = in_country_id,
 		control_code = in_control_code
 	WHERE id = in_entity_id;
 

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