[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
SF.net SVN: ledger-smb:[4508] trunk

Subject: SF.net SVN: ledger-smb:[4508] trunk
From: ..hidden..
Date: Sat, 17 Mar 2012 13:10:31 +0000
Revision: 4508
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=4508&view=rev
Author:   einhverfr
Date:     2012-03-17 13:10:31 +0000 (Sat, 17 Mar 2012)
Log Message:
-----------
Merging pricelist changes from branches/1.3

Modified Paths:
--------------
    trunk/UI/Contact/pricelist.html
    trunk/UI/lib/dynatable.html

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-4505
   + /branches/1.3:3711-4507


Property changes on: trunk/LedgerSMB/Scripts/account.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/account.pm:4369-4505
/branches/1.3/scripts/account.pl:3711-4368
   + /branches/1.3/LedgerSMB/Scripts/account.pm:4369-4507
/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-4505
/branches/1.3/scripts/admin.pl:3711-3903,4273-4287
   + /branches/1.3/LedgerSMB/Scripts/admin.pm:3901-4507
/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-4505
/branches/1.3/scripts/customer.pl:4273-4287
   + /branches/1.3/LedgerSMB/Scripts/customer.pm:4288-4507
/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-4505
/branches/1.3/scripts/employee.pl:3842-3843,4273-4287,4289-4310
   + /branches/1.3/LedgerSMB/Scripts/employee.pm:3712-4507
/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-4505
/branches/1.3/scripts/file.pl:3711-4138
   + /branches/1.3/LedgerSMB/Scripts/file.pm:3711-4507
/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-4505
/branches/1.3/scripts/journal.pl:3711-4328
   + /branches/1.3/LedgerSMB/Scripts/journal.pm:4288-4507
/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-4505
/branches/1.3/scripts/login.pl:3711-4192
   + /branches/1.3/LedgerSMB/Scripts/login.pm:4193-4507
/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-4505
/branches/1.3/scripts/menu.pl:3711-4192,4273-4287
   + /branches/1.3/LedgerSMB/Scripts/menu.pm:4155-4507
/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-4505
/branches/1.3/scripts/payment.pl:3711-4310
   + /branches/1.3/LedgerSMB/Scripts/payment.pm:4010-4507
/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-4505
/branches/1.3/scripts/recon.pl:4194-4271,4273-4287,4393-4438
   + /branches/1.3/LedgerSMB/Scripts/recon.pm:3711-4507
/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-4505
/branches/1.3/scripts/setup.pl:3711-4474
   + /branches/1.3/LedgerSMB/Scripts/setup.pm:3937-4507
/branches/1.3/scripts/setup.pl:3711-4474


Property changes on: trunk/LedgerSMB/Scripts/taxform.pm
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3/LedgerSMB/Scripts/taxform.pm:4193-4505
/branches/1.3/scripts/taxform.pl:3711-4192,4273-4287
   + /branches/1.3/LedgerSMB/Scripts/taxform.pm:4193-4507
/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-4505
/branches/1.3/scripts/vendor.pl:4273-4287
   + /branches/1.3/LedgerSMB/Scripts/vendor.pm:4288-4507
/branches/1.3/scripts/vendor.pl:4273-4287

Modified: trunk/UI/Contact/pricelist.html
===================================================================
--- trunk/UI/Contact/pricelist.html	2012-03-17 13:00:54 UTC (rev 4507)
+++ trunk/UI/Contact/pricelist.html	2012-03-17 13:10:31 UTC (rev 4508)
@@ -39,13 +39,13 @@
          columns.push(
                   {col_id = 'sellprice'
                      name = text('Sell Price') #'
-                     type = 'text_input'},
+                     type = 'input_text'},
                   {col_id = 'validfrom',
                      name = text('Valid From') #'
-                     type = 'text_input'},
+                     type = 'input_text'},
                   {col_id = 'validto',
                      name = text('Valid To') #'
-                     type = 'text_input'},
+                     type = 'input_text'},
          );
                         
      END;
@@ -61,9 +61,22 @@
      FOREACH pm IN pricematrix;
          pm.delete = '[' _ text('Delete') _ ']';
          pm.row_id = pm.entry_id;
-     END;
-     PROCESS dynatable
-         tbody = { rows = pricematrix }; ?>
+     END ?>
+<form name="pricematrix" action="<?lsmb script ?>" method="post">
+ <input type="hidden" name="entity_class"  value="<?lsmb account_class ?>" />
+ <input type="hidden" name="credit_id" value="<?lsmb credit_id ?>" /><?lsmb
+      PROCESS dynatable
+    attributes = { id = 'pricematrix' }
+         tbody = { rows = pricematrix }
+         tfoot = { coltypes = { int_partnumber = 'input_text' }
+                   rows = [{}]} ?>
+<?lsmb PROCESS button element_data = {
+    type = "submit"
+   class = "submit"
+    name = "action"
+    text = text('Save')
+   value = "save_pricelist"
+} ?>
 <?lsmb IF pricematrix_pricegroup;
      PROCESS dynatable
          tbody = { rows = pricematrix_pricegroup };

Modified: trunk/UI/lib/dynatable.html
===================================================================
--- trunk/UI/lib/dynatable.html	2012-03-17 13:00:54 UTC (rev 4507)
+++ trunk/UI/lib/dynatable.html	2012-03-17 13:10:31 UTC (rev 4508)
@@ -12,8 +12,12 @@
 </thead>
 <?lsmb- END -?>
 <tbody>
-   <?lsmb- FOREACH ROW IN tbody.rows -?>
+   <?lsmb- ROWCOUNT = 0;
+   FOREACH ROW IN tbody.rows;
+   ROWCOUNT = ROWCOUNT + 1 -?>
    <tr class="<?lsmb ROW.html_class ?>">
+      <input type="hidden" name="row_<?lsmb loop.count ?>" 
+             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' -?>
@@ -62,7 +66,8 @@
 </tbody>
 <?lsmb- IF tfoot -?>
 <tfoot>
-   <?lsmb- FOREACH ROW IN tfoot.rows -?>
+   <?lsmb- FOREACH ROW IN tfoot.rows;
+    ROWCOUNT = ROWCOUNT + 1; -?>
    <tr>
      <?lsmb- FOREACH COL IN columns;
      IF tfoot.coltypes.${COL.col_id} == 'spacer';
@@ -72,8 +77,9 @@
           <td colspan="<?lsmb SPACECOUNT ?>">&nbsp;</td>
        <?lsmb END ?>
      <td class="<?lsmb COL.col_id ?>">
-       <?lsmb IF tfoot.coltypes.${COL.col_id};
-             TYPE = tfoot.coltypes.${COL.col_id};
+       <?lsmb COL_ID = COL.col_id;
+          IF tfoot.coltypes.$COL_ID;
+             TYPE = tfoot.coltypes.$COL_ID;
           ELSE; 
              TYPE = COL.type;
           END;
@@ -112,12 +118,6 @@
                       HREF = COL.href_base _ ROW.row_id;
                    END
           ?><a href="<?lsmb HREF ?>"><?lsmb ROW.${COL.col_id} ?></a>
-                   IF row.${COL.col_id}_href_suffix;
-                      HREF = COL.href_base _ ROW.${COL.col_id}_href_suffix;
-                   ELSE;
-                      HREF = COL.href_base _ ROW.row_id;
-                   END
-          ?><a href="<?lsmb HREF ?>"><?lsmb ROW.${COL.col_id} ?></a>
          <?lsmb- ELSE -?>
             <?lsmb ROW.${COL.col_id} ?>
          <?lsmb- END -?>
@@ -128,5 +128,7 @@
    <?lsmb- END -?>
 </tfoot>
 <?lsmb- END -?>
+<input type="hidden" name="rowcount_<?lsmb attributes.id ?>" 
+      value="<?lsmb ROWCOUNT ?>" />
 </table>
 <?lsmb END #block ?>


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-4505
/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-4507
/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.
Prev by Date: SF.net SVN: ledger-smb:[4507] branches/1.3/UI
Next by Date: SF.net SVN: ledger-smb:[4509] trunk/UI/Contact/contact.html
Previous by thread: SF.net SVN: ledger-smb:[4507] branches/1.3/UI
Next by thread: SF.net SVN: ledger-smb:[4509] trunk/UI/Contact/contact.html
Index(es):
- Date
- Thread