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

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

Revision: 4046
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=4046&view=rev
Author:   einhverfr
Date:     2011-11-24 10:33:46 +0000 (Thu, 24 Nov 2011)
Log Message:
-----------
Adding Hermans fkey to upgrade scripts, 
Fixing more issues on the pricematrix side

Modified Paths:
--------------
    branches/1.3/Changelog
    branches/1.3/UI/Contact/pricelist.html
    branches/1.3/sql/modules/Company.sql
    branches/1.3/sql/modules/Fixes.sql

Modified: branches/1.3/Changelog
===================================================================
--- branches/1.3/Changelog	2011-11-24 10:04:06 UTC (rev 4045)
+++ branches/1.3/Changelog	2011-11-24 10:33:46 UTC (rev 4046)
@@ -2,6 +2,9 @@
 Initial Release:  Monday, Oct 12 2011
 Supported Presently
 
+Changelog for LedgerSMB 1.3.7
+* Added foreign key of entity_credit_account.language_code (Herman V)
+
 Changelog for LedgerSMB 1.3.6
 * Including xelatex templates under directory templates/xedemo (Chris T)
 * Fix for company name in order entry (David B)

Modified: branches/1.3/UI/Contact/pricelist.html
===================================================================
--- branches/1.3/UI/Contact/pricelist.html	2011-11-24 10:04:06 UTC (rev 4045)
+++ branches/1.3/UI/Contact/pricelist.html	2011-11-24 10:33:46 UTC (rev 4046)
@@ -11,7 +11,7 @@
 
 -->
 <body>
-<div class="listtop"><?lsmb text('Pricelist') ?></div>
+<div class="listtop"><?lsmb text('Pricelist') ?> <?lsmb pricematrix.length ?></div>
 <table>
 <tr class="listheading">
 <th class="listheading"><?lsmb text('Partnumber') ?></th>

Modified: branches/1.3/sql/modules/Company.sql
===================================================================
--- branches/1.3/sql/modules/Company.sql	2011-11-24 10:04:06 UTC (rev 4045)
+++ branches/1.3/sql/modules/Company.sql	2011-11-24 10:33:46 UTC (rev 4046)
@@ -1334,7 +1334,7 @@
 
 -- pricematrix
 
-CREATE OR REPLACE FUNCTION eca__get_pricematrix_by_pricegroup(in_id int)
+CREATE OR REPLACE FUNCTION eca__get_pricematrix_by_pricegroup(in_credit_id int)
 RETURNS SETOF eca__pricematrix AS
 $$
 SELECT pc.parts_id, p.partnumber, p.description, pc.credit_id, pc.pricebreak,
@@ -1346,7 +1346,7 @@
  WHERE eca.id = $1 AND eca.entity_class = 2
 $$ LANGUAGE SQL;
 
-CREATE OR REPLACE FUNCTION eca__get_pricematrix(in_id int) 
+CREATE OR REPLACE FUNCTION eca__get_pricematrix(in_credit_id int) 
 RETURNS SETOF eca__pricematrix AS
 $$
 
@@ -1369,7 +1369,7 @@
 
 $$ language sql;
 
-COMMENT ON FUNCTION eca__get_pricematrix(in_id int) IS
+COMMENT ON FUNCTION eca__get_pricematrix(in_credit_id int) IS
 $$ This returns the pricematrix for the customer or vendor 
 (entity_credit_account identified by in_id), orderd by partnumber, validfrom
 $$;

Modified: branches/1.3/sql/modules/Fixes.sql
===================================================================
--- branches/1.3/sql/modules/Fixes.sql	2011-11-24 10:04:06 UTC (rev 4045)
+++ branches/1.3/sql/modules/Fixes.sql	2011-11-24 10:33:46 UTC (rev 4046)
@@ -25,3 +25,11 @@
 UPDATE menu_attribute SET value = 'pricegroup' WHERE node_id = 92 and attribute = 'type';
 
 COMMIT;
+
+BEGIN;
+ALTER TABLE entity_credit_account drop constraint "entity_credit_account_language_code_fkey";
+COMMIT;
+
+BEGIN;
+ALTER TABLE entity_credit_account ADD FOREIGN KEY (language_code) REFERENCES language(code);
+COMMIT;

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