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

[..hidden..]

Revision: 5902
          http://sourceforge.net/p/ledger-smb/code/5902
Author:   tshvr
Date:     2013-07-10 09:29:43 +0000 (Wed, 10 Jul 2013)
Log Message:
-----------
preserve country,css dir forbidden?,remove entity_id on ap ar,recurring fields

Modified Paths:
--------------
    trunk/ledgersmb-httpd-2.0-2.2.conf.template
    trunk/sql/upgrade/1.3-1.4.sql

Modified: trunk/ledgersmb-httpd-2.0-2.2.conf.template
===================================================================
--- trunk/ledgersmb-httpd-2.0-2.2.conf.template	2013-07-04 09:51:33 UTC (rev 5901)
+++ trunk/ledgersmb-httpd-2.0-2.2.conf.template	2013-07-10 09:29:43 UTC (rev 5902)
@@ -72,3 +72,9 @@
   Order Deny,Allow
   Deny from All
 </Directory>
+
+#to avoid 'Directory index forbidden by Options directive' , i had to code follwoing with trailing slash ,tshvr4
+<Directory WORKING_DIR/css/>
+   Order Deny,Allow
+   Allow from All
+</Directory>

Modified: trunk/sql/upgrade/1.3-1.4.sql
===================================================================
--- trunk/sql/upgrade/1.3-1.4.sql	2013-07-04 09:51:33 UTC (rev 5901)
+++ trunk/sql/upgrade/1.3-1.4.sql	2013-07-10 09:29:43 UTC (rev 5902)
@@ -8,6 +8,10 @@
 DELETE FROM entity;
 DELETE FROM lsmb13.session; -- Cleares out locks
 
+--to preserve user modifications tshvr4
+DELETE FROM country;
+INSERT INTO country SELECT * FROM lsmb13.country;
+
 INSERT INTO language SELECT * FROM lsmb13.language where code not in (select code from language);
 
 INSERT INTO account_heading SELECT * FROM lsmb13.account_heading;
@@ -145,7 +149,7 @@
  id,
  invnumber,
  transdate,
- entity_id,
+ --entity_id, --tshvr4 might may be dropped
  taxincluded,
  amount,
  netamount,
@@ -176,7 +180,7 @@
  id,
  invnumber,
  transdate,
- entity_id,
+ --entity_id, --tshvr4 might may be dropped
  taxincluded,
  amount,
  netamount,
@@ -210,7 +214,7 @@
  id,
  invnumber,
  transdate,
- entity_id,
+ --entity_id, --tshvr4 might may be dropped
  taxincluded ,
  amount,
  netamount,
@@ -241,7 +245,7 @@
  id,
  invnumber,
  transdate,
- entity_id,
+ --entity_id, --tshvr4 might may be dropped
  taxincluded ,
  amount,
  netamount,
@@ -507,7 +511,8 @@
 INSERT INTO translation SELECT * FROM lsmb13.translation;
 INSERT INTO parts_translation SELECT * FROM lsmb13.parts_translation;
 INSERT INTO user_preference SELECT * FROM lsmb13.user_preference;
-INSERT INTO recurring SELECT * FROM lsmb13.recurring;
+--INSERT INTO recurring SELECT * FROM lsmb13.recurring;--tshvr4 fields differ
+INSERT INTO recurring(id,reference,startdate,nextdate,enddate,howmany,payment) SELECT id,reference,startdate,nextdate,enddate,howmany,payment FROM lsmb13.recurring;
 INSERT INTO payment_type SELECT * FROM lsmb13.payment_type;
 INSERT INTO recurringemail SELECT * FROM lsmb13.recurringemail;
 INSERT INTO recurringprint SELECT * FROM lsmb13.recurringprint;

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