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

[..hidden..]

Revision: 3744
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=3744&view=rev
Author:   einhverfr
Date:     2011-09-24 23:08:53 +0000 (Sat, 24 Sep 2011)
Log Message:
-----------
merging in from branches/1.3

Modified Paths:
--------------
    trunk/UI/lib/elements.html
    trunk/UI/setup/new_user.html
    trunk/sql/modules/Assets.sql
    trunk/sql/modules/Company.sql

Property Changed:
----------------
    trunk/


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3:3711-3740
   + /branches/1.3:3711-3743

Modified: trunk/UI/lib/elements.html
===================================================================
--- trunk/UI/lib/elements.html	2011-09-24 23:07:13 UTC (rev 3743)
+++ trunk/UI/lib/elements.html	2011-09-24 23:08:53 UTC (rev 3744)
@@ -11,7 +11,7 @@
 
   #file
   file_defaults = {
-    size => '60'
+    size = '60'
   }
 
   #password
@@ -59,6 +59,7 @@
 	      CASE ['radio'];
 	        input_type_keys = input_keys.merge(['checked']);
 	      CASE ['password'];
+                element_data.type = 'password';
 	        input_defaults = password_defaults;
 	      CASE 'text';
 	        input_type_keys = input_keys.merge(['maxlength', 'readonly']);

Modified: trunk/UI/setup/new_user.html
===================================================================
--- trunk/UI/setup/new_user.html	2011-09-24 23:07:13 UTC (rev 3743)
+++ trunk/UI/setup/new_user.html	2011-09-24 23:08:53 UTC (rev 3744)
@@ -20,12 +20,9 @@
 } ?>
 </div>
 <div class="input_row">
-<?lsmb INCLUDE input element_data = {
-                            name  = 'password'
-                            type  = 'password'
-                           label  = text('Password')
-                            class = 'password'
-} ?>
+<label id="password-label" for="password" class="password"><?lsmb 
+text('Password') ?></label>
+<input name='password' type='password' class = 'password' size='60' />
 </div>
 <div class="input_row">
 <label><?lsmb text('Import') ?></label>

Modified: trunk/sql/modules/Assets.sql
===================================================================
--- trunk/sql/modules/Assets.sql	2011-09-24 23:07:13 UTC (rev 3743)
+++ trunk/sql/modules/Assets.sql	2011-09-24 23:08:53 UTC (rev 3744)
@@ -656,6 +656,7 @@
      JOIN asset_dep_method adm ON (adm.id = ac.method)
 LEFT JOIN asset_report_line rl ON (ai.id = rl.asset_id)
 LEFT JOIN asset_report r on (rl.report_id = r.id)
+    WHERE r.approved_at IS NOT NULL
  GROUP BY ai.id, ai.tag, ai.description, ai.start_depreciation, ai.purchase_date,
           adm.short_name, ai.usable_life, ai.purchase_value, salvage_value
    HAVING (NOT 2 = ANY(as_array(r.report_class))) 

Modified: trunk/sql/modules/Company.sql
===================================================================
--- trunk/sql/modules/Company.sql	2011-09-24 23:07:13 UTC (rev 3743)
+++ trunk/sql/modules/Company.sql	2011-09-24 23:08:53 UTC (rev 3744)
@@ -530,7 +530,7 @@
 RETURNS SETOF entity AS $$
 SELECT * FROM entity WHERE control_code = $1 $$ language sql;
 
-COMMENT ON entity__get_by_cc (in_control_code text) IS
+COMMENT ON FUNCTION entity__get_by_cc (in_control_code text) IS
 $$ Returns the entity row attached to the control code. $$;
 
 create or replace function save_taxform 

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