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

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



Revision: 4533
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=4533&view=rev
Author:   einhverfr
Date:     2012-03-23 09:24:22 +0000 (Fri, 23 Mar 2012)
Log Message:
-----------
Merging from branches/1.3

Modified Paths:
--------------
    trunk/LedgerSMB/DBObject/Pricelist.pm
    trunk/LedgerSMB/ScriptLib/Common_Search/Part.pm
    trunk/LedgerSMB/ScriptLib/Company.pm
    trunk/UI/lib/dynatable.html
    trunk/sql/modules/Parts.sql

Property Changed:
----------------
    trunk/
    trunk/LedgerSMB/Scripts/account.pm
    trunk/LedgerSMB/Scripts/admin.pm
    trunk/LedgerSMB/Scripts/customer.pm
    trunk/LedgerSMB/Scripts/employee.pm
    trunk/LedgerSMB/Scripts/file.pm
    trunk/LedgerSMB/Scripts/journal.pm
    trunk/LedgerSMB/Scripts/login.pm
    trunk/LedgerSMB/Scripts/menu.pm
    trunk/LedgerSMB/Scripts/payment.pm
    trunk/LedgerSMB/Scripts/recon.pm
    trunk/LedgerSMB/Scripts/setup.pm
    trunk/LedgerSMB/Scripts/taxform.pm
    trunk/LedgerSMB/Scripts/vendor.pm
    trunk/sql/upgrade/1.2-1.3-manual.sql


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3:3711-4530
   + /branches/1.3:3711-4532

Modified: trunk/LedgerSMB/DBObject/Pricelist.pm
===================================================================
--- trunk/LedgerSMB/DBObject/Pricelist.pm	2012-03-23 08:44:40 UTC (rev 4532)
+++ trunk/LedgerSMB/DBObject/Pricelist.pm	2012-03-23 09:24:22 UTC (rev 4533)
@@ -54,7 +54,7 @@
         $line->merge($ref);
         $line->exec_method({funcname => 'pricelist__add'});
     }
-    $dbh->commit;
+    $self->{dbh}->commit;
 }
 
 =back

Modified: trunk/LedgerSMB/ScriptLib/Common_Search/Part.pm
===================================================================
--- trunk/LedgerSMB/ScriptLib/Common_Search/Part.pm	2012-03-23 08:44:40 UTC (rev 4532)
+++ trunk/LedgerSMB/ScriptLib/Common_Search/Part.pm	2012-03-23 09:24:22 UTC (rev 4533)
@@ -70,7 +70,7 @@
 =cut
 
 sub new {
-    my ($request) = @_;
+    my ($self, $request) = @_;
     my $self = {};
     bless $self, __PACKAGE__;
     $self->{_part} = LedgerSMB::DBObject::Part->new({base => $request});
@@ -90,7 +90,7 @@
     my ($self, $args) = @_;
     my @results = $self->{_part}->search_lite($args);
     $self->{_results} = ..hidden..;
-    return $self->{_results};
+    return @{$self->{_results}};
 }
 
 =back

Modified: trunk/LedgerSMB/ScriptLib/Company.pm
===================================================================
--- trunk/LedgerSMB/ScriptLib/Company.pm	2012-03-23 08:44:40 UTC (rev 4532)
+++ trunk/LedgerSMB/ScriptLib/Company.pm	2012-03-23 09:24:22 UTC (rev 4533)
@@ -1061,9 +1061,10 @@
 sub save_pricelist {
     my ($request) = @_;
     use LedgerSMB::ScriptLib::Common_Search::Part;
+    use LedgerSMB::DBObject::Pricelist;
 
-    my $count = $request->{rowcount};
-    my $pricelist = LedgerSMB::DBObject::Pricelist;
+    my $count = $request->{rowcount_pricematrix};
+    my $pricelist = LedgerSMB::DBObject::Pricelist->new({base => $request});
     my @lines;
     my $redirect_to_selection = 0;
 
@@ -1073,6 +1074,7 @@
                    { partnumber => $request->{"int_partnumber_tfoot_$count"},
                     description => $request->{"description_tfoot_$count"}, }
     );
+
     if (scalar @parts == 0) {
         $request->error($request->{_locale}->text('Part not found'));
     } elsif (scalar @parts > 1){


Property changes on: trunk/LedgerSMB/Scripts/account.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/account.pm:4369-4530
/branches/1.3/scripts/account.pl:3711-4368
   + /branches/1.3/LedgerSMB/Scripts/account.pm:4369-4532
/branches/1.3/scripts/account.pl:3711-4368


Property changes on: trunk/LedgerSMB/Scripts/admin.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/admin.pm:3901-4530
/branches/1.3/scripts/admin.pl:3711-3903,4273-4287
   + /branches/1.3/LedgerSMB/Scripts/admin.pm:3901-4532
/branches/1.3/scripts/admin.pl:3711-3903,4273-4287


Property changes on: trunk/LedgerSMB/Scripts/customer.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/customer.pm:4288-4530
/branches/1.3/scripts/customer.pl:4273-4287
   + /branches/1.3/LedgerSMB/Scripts/customer.pm:4288-4532
/branches/1.3/scripts/customer.pl:4273-4287


Property changes on: trunk/LedgerSMB/Scripts/employee.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/employee.pm:3712-4530
/branches/1.3/scripts/employee.pl:3842-3843,4273-4287,4289-4310
   + /branches/1.3/LedgerSMB/Scripts/employee.pm:3712-4532
/branches/1.3/scripts/employee.pl:3842-3843,4273-4287,4289-4310


Property changes on: trunk/LedgerSMB/Scripts/file.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/file.pm:3711-4530
/branches/1.3/scripts/file.pl:3711-4138
   + /branches/1.3/LedgerSMB/Scripts/file.pm:3711-4532
/branches/1.3/scripts/file.pl:3711-4138


Property changes on: trunk/LedgerSMB/Scripts/journal.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/journal.pm:4288-4530
/branches/1.3/scripts/journal.pl:3711-4328
   + /branches/1.3/LedgerSMB/Scripts/journal.pm:4288-4532
/branches/1.3/scripts/journal.pl:3711-4328


Property changes on: trunk/LedgerSMB/Scripts/login.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/login.pm:4193-4530
/branches/1.3/scripts/login.pl:3711-4192
   + /branches/1.3/LedgerSMB/Scripts/login.pm:4193-4532
/branches/1.3/scripts/login.pl:3711-4192


Property changes on: trunk/LedgerSMB/Scripts/menu.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/menu.pm:4155-4530
/branches/1.3/scripts/menu.pl:3711-4192,4273-4287
   + /branches/1.3/LedgerSMB/Scripts/menu.pm:4155-4532
/branches/1.3/scripts/menu.pl:3711-4192,4273-4287


Property changes on: trunk/LedgerSMB/Scripts/payment.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/payment.pm:4010-4530
/branches/1.3/scripts/payment.pl:3711-4310
   + /branches/1.3/LedgerSMB/Scripts/payment.pm:4010-4532
/branches/1.3/scripts/payment.pl:3711-4310


Property changes on: trunk/LedgerSMB/Scripts/recon.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/recon.pm:3711-4530
/branches/1.3/scripts/recon.pl:4194-4271,4273-4287,4393-4438
   + /branches/1.3/LedgerSMB/Scripts/recon.pm:3711-4532
/branches/1.3/scripts/recon.pl:4194-4271,4273-4287,4393-4438


Property changes on: trunk/LedgerSMB/Scripts/setup.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/setup.pm:3937-4530
/branches/1.3/scripts/setup.pl:3711-4525
   + /branches/1.3/LedgerSMB/Scripts/setup.pm:3937-4532
/branches/1.3/scripts/setup.pl:3711-4525


Property changes on: trunk/LedgerSMB/Scripts/taxform.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/taxform.pm:4193-4530
/branches/1.3/scripts/taxform.pl:3711-4192,4273-4287
   + /branches/1.3/LedgerSMB/Scripts/taxform.pm:4193-4532
/branches/1.3/scripts/taxform.pl:3711-4192,4273-4287


Property changes on: trunk/LedgerSMB/Scripts/vendor.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/vendor.pm:4288-4530
/branches/1.3/scripts/vendor.pl:4273-4287
   + /branches/1.3/LedgerSMB/Scripts/vendor.pm:4288-4532
/branches/1.3/scripts/vendor.pl:4273-4287

Modified: trunk/UI/lib/dynatable.html
===================================================================
--- trunk/UI/lib/dynatable.html	2012-03-23 08:44:40 UTC (rev 4532)
+++ trunk/UI/lib/dynatable.html	2012-03-23 09:24:22 UTC (rev 4533)
@@ -12,17 +12,17 @@
 </thead>
 <?lsmb- END -?>
 <tbody>
-   <?lsmb- ROWCOUNT = 1;
+   <?lsmb- ROWCOUNT = 0;
    PFX = attributes.input_prefix;
    FOREACH ROW IN tbody.rows;
    ROWCOUNT = ROWCOUNT + 1 -?>
    <tr class="<?lsmb ROW.html_class ?>">
-      <input type="hidden" name="row_<?lsmb loop.count ?>" 
+      <input type="hidden" name="row_ROWCOUNT" 
              value="<?lsmb row_id ?>" />
       <?lsmb- FOREACH COL IN columns -?>
       <td class="<?lsmb COL.col_id _ ' ' _ COL.class _ ' ' _ COL.type ?>">
           <?lsmb- IF COL.type == 'input_text' -?>
-          <input id="<?lsmb COL.col_id ?>-<?lsmb loop.count ?>"
+          <input id="<?lsmb COL.col_id _ '-' _ ROWCOUNT ?>"
                type="text"
               class="<?lsmb COL.class ?>"
                name="<?lsmb PFX _ COL.col_id _ '_' _ ROW.row_id ?>"
@@ -35,14 +35,14 @@
                       CHECKED = '';
                    END;
                    ?> 
-         <input id="<?lsmb COL.col_id ?>-<?lsmb loop.count ?>"
+         <input id="<?lsmb COL.col_id _ '-' _ ROWCOUNT ?>"
                type="checkbox"
-               name="<?lsmb PFX _ COL.col_id ?>_<?lsmb loop.count ?>"
+               name="<?lsmb PFX _ COL.col_id _ '_' _ ROWCOUNT ?>"
               class="<?lsmb COL.class ?>"
               value="<?lsmb ROW.row_id ?>"
                <?lsmb CHECKED ?> />
          <?lsmb- ELSIF COL.type == 'radio' ?> 
-         <input id="<?lsmb COL.col_id ?>-<?lsmb loop.count ?>"
+         <input id="<?lsmb COL.col_id _ '-' _ ROWCOUNT ?>"
                type="radio"
                name="<?lsmb PFX _ COL.col_id ?>"
               class="<?lsmb COL.class ?>"
@@ -66,7 +66,6 @@
             <?lsmb ROW.${COL.col_id} ?>
          <?lsmb- END -?>
       </td>
-      <?lsmb- COUNT = loop.count -?>
       <?lsmb- END -?>
    </tr>
    <?lsmb- END ?>
@@ -91,10 +90,10 @@
              TYPE = COL.type;
           END;
           IF TYPE == 'input_text' -?>
-          <input id="<?lsmb COL.col_id ?>-<?lsmb loop.count ?>"
+          <input id="<?lsmb COL.col_id _ '-' _ ROWCOUNT ?>"
                type="text"
               class="<?lsmb COL.class ?>"
-               name="<?lsmb PFX _ COL.col_id _ 'tfoot_' _ loop.count ?>"
+               name="<?lsmb PFX _ COL.col_id _ '_tfoot_' _ ROWCOUNT ?>"
               value="<?lsmb ROW.${COL.col_id} ?>"
          />
          <?lsmb- ELSIF TYPE == 'checkbox';
@@ -104,14 +103,14 @@
                       CHECKED = '';
                    END;
                    ?> 
-         <input id="<?lsmb COL.col_id ?>-<?lsmb loop.count ?>"
+          <input id="<?lsmb COL.col_id _ '-' _ ROWCOUNT ?>"
                type="checkbox"
-               name="<?lsmb PFX _ COL.col_id ?>_<?lsmb loop.count ?>"
+               name="<?lsmb PFX _ COL.col_id _ '_' _ ROWCOUNT ?>"
               class="<?lsmb COL.class ?>"
               value="<?lsmb ROW.row_id ?>"
                <?lsmb CHECKED ?> />
          <?lsmb- ELSIF TYPE == 'radio' ?> 
-         <input id="<?lsmb COL.col_id ?>-<?lsmb loop.count ?>"
+         <input id="<?lsmb COL.col_id _ '-' _ ROWCOUNT ?>"
                type="radio"
                name="<?lsmb PFX _ COL.col_id ?>"
               class="<?lsmb COL.class ?>"
@@ -126,7 +125,7 @@
                    END
           ?><a href="<?lsmb HREF ?>"><?lsmb ROW.${COL.col_id} ?></a>
          <?lsmb ELSIF TYPE == 'mirrored';
-         NAME = PFX _ ROW.${COL.col_id} _ '_' _ 'tfoot_' _ ROWCOUNT;
+         NAME = PFX _ ROW.${COL.col_id} _ '_' _ '_tfoot_' _ ROWCOUNT;
          ROW.${COL.col_id} ?>
          <input type="hidden" 
                name="<?lsmb NAME ?>" 

Modified: trunk/sql/modules/Parts.sql
===================================================================
--- trunk/sql/modules/Parts.sql	2012-03-23 08:44:40 UTC (rev 4532)
+++ trunk/sql/modules/Parts.sql	2012-03-23 09:24:22 UTC (rev 4533)
@@ -10,7 +10,8 @@
        AND ($2 IS NULL 
             OR (to_tsvector(get_default_lang()::name, description) 
                 @@
-                plainto_tsquery(get_default_lang()::name, $2::tsvector)))
+                plainto_tsquery(get_default_lang()::name, $2)))
+       AND not obsolete
 ORDER BY partnumber;
 $$ LANGUAGE SQL;
 


Property changes on: trunk/sql/upgrade/1.2-1.3-manual.sql
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/sql/upgrade/1.2-1.3-manual.sql:3712-4530
/branches/1.3/sql/upgrade/1.2-1.3.sql:3711-3851
/trunk/sql/upgrade/1.2-1.3.sql:858-3710
   + /branches/1.3/sql/upgrade/1.2-1.3-manual.sql:3712-4532
/branches/1.3/sql/upgrade/1.2-1.3.sql:3711-3851
/trunk/sql/upgrade/1.2-1.3.sql:858-3710

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