From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Tue, 31 Oct 2017 08:58:09 +0000 (+0100)
Subject: Merge branch 'master' of https://git.code.sf.net/p/frontaccounting/git
X-Git-Tag: v2.4.3~10
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=7c7cabc03b76e916ff540aca45545042d3b327bb;hp=ea3fd3b07585cbf1438ed587125e38051262819b;p=fa-stable.git

Merge branch 'master' of https://git.code.sf.net/p/frontaccounting/git
---

diff --git a/sql/alter2.4.sql b/sql/alter2.4.sql
index 6359598a..f51e1d2c 100644
--- a/sql/alter2.4.sql
+++ b/sql/alter2.4.sql
@@ -307,3 +307,13 @@ UPDATE `0_bank_trans` SET person_id=trans_no WHERE person_type_id=26;
 
 ALTER TABLE `0_budget_trans` CHANGE `counter` `id` int(11) NOT NULL AUTO_INCREMENT;
 ALTER TABLE `0_sys_prefs` CHANGE `value` `value` text NOT NULL default '';
+
+ALTER TABLE `0_debtor_trans`
+	CHANGE `debtor_no` `debtor_no` int(11) unsigned NOT NULL,
+	DROP PRIMARY KEY,
+	ADD PRIMARY KEY (`type`,`trans_no`,`debtor_no`);
+	
+ALTER TABLE `0_supp_trans`
+	CHANGE `supplier_id` `supplier_id` int(11) unsigned NOT NULL,
+	DROP PRIMARY KEY,
+	ADD PRIMARY KEY (`type`,`trans_no`,`supplier_id`);
diff --git a/sql/alter2.4rc1.sql b/sql/alter2.4rc1.sql
index d71a92dc..81908dfe 100644
--- a/sql/alter2.4rc1.sql
+++ b/sql/alter2.4rc1.sql
@@ -49,3 +49,13 @@ UPDATE `0_bank_trans` SET person_id=trans_no WHERE person_type_id=26;
 
 ALTER TABLE `0_budget_trans` CHANGE `counter` `id` int(11) NOT NULL AUTO_INCREMENT;
 ALTER TABLE `0_sys_prefs` CHANGE `value` `value` text NOT NULL default '';
+
+ALTER TABLE `0_debtor_trans`
+	CHANGE `debtor_no` `debtor_no` int(11) unsigned NOT NULL,
+	DROP PRIMARY KEY,
+	ADD PRIMARY KEY (`type`,`trans_no`,`debtor_no`);
+	
+ALTER TABLE `0_supp_trans`
+	CHANGE `supplier_id` `supplier_id` int(11) unsigned NOT NULL,
+	DROP PRIMARY KEY,
+	ADD PRIMARY KEY (`type`,`trans_no`,`supplier_id`);