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

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

Revision: 6124
          http://sourceforge.net/p/ledger-smb/code/6124
Author:   einhverfr
Date:     2013-10-11 09:10:28 +0000 (Fri, 11 Oct 2013)
Log Message:
-----------
Fixing some errors saving entity and eca notes

Modified Paths:
--------------
    trunk/LedgerSMB/Entity/Note.pm
    trunk/LedgerSMB/Scripts/contact.pm
    trunk/UI/timecards/timecard-week.html

Modified: trunk/LedgerSMB/Entity/Note.pm
===================================================================
--- trunk/LedgerSMB/Entity/Note.pm	2013-10-09 08:44:19 UTC (rev 6123)
+++ trunk/LedgerSMB/Entity/Note.pm	2013-10-11 09:10:28 UTC (rev 6124)
@@ -124,13 +124,12 @@
 sub save {
     my ($self) = @_;
     my $ref;
-    if ($self->credit_id){
+    if (3 == $self->note_class){
         ($ref) = $self->exec_method({funcname => 'eca__save_notes'});
     } else {
         ($ref) = $self->exec_method({funcname => 'entity__save_notes'});
     }
-    $self->prepare_dbhash($ref);
-    $self = $self->new(%$ref);
+    return $ref;
 }
 
 =back

Modified: trunk/LedgerSMB/Scripts/contact.pm
===================================================================
--- trunk/LedgerSMB/Scripts/contact.pm	2013-10-09 08:44:19 UTC (rev 6123)
+++ trunk/LedgerSMB/Scripts/contact.pm	2013-10-11 09:10:28 UTC (rev 6124)
@@ -691,9 +691,6 @@
 sub save_notes {
     my ($request) = @_;
     my $note = LedgerSMB::Entity::Note->new(%$request);
-    if ($request->{note_class} == 1){
-       $note->credit_id(undef);
-    }
     $note->save;
     get($request);
 }

Modified: trunk/UI/timecards/timecard-week.html
===================================================================
--- trunk/UI/timecards/timecard-week.html	2013-10-09 08:44:19 UTC (rev 6123)
+++ trunk/UI/timecards/timecard-week.html	2013-10-11 09:10:28 UTC (rev 6124)
@@ -1,8 +1,47 @@
-<?lsmb INCLUDE "ui-header.html";
+<?lsmb INCLUDE "ui-header.html" dojo-parse='onload';
 PROCESS "elements.html" ?>
 <body class="<?lsmb dojo_theme ?>">
 <form action="timecard.pl" method="post">
-<table width="100%">
+<?lsmb 
+PROCESS input element_data = {
+    type = "hidden"
+    name = "transdate_0"
+   value = transdates[0]
+};
+PROCESS input element_data = {
+    type = "hidden"
+    name = "transdate_1"
+   value = transdates[1]
+};
+PROCESS input element_data = {
+    type = "hidden"
+    name = "transdate_2"
+   value = transdates[2]
+};
+PROCESS input element_data = {
+    type = "hidden"
+    name = "transdate_3"
+   value = transdates[3]
+};
+PROCESS input element_data = {
+    type = "hidden"
+    name = "transdate_4"
+   value = transdates[4]
+};
+PROCESS input element_data = {
+    type = "hidden"
+    name = "transdate_5"
+   value = transdates[5]
+};
+PROCESS input element_data = {
+    type = "hidden"
+    name = "transdate_6"
+   value = transdates[6]
+};
+?>
+<div class="listtop"><?lsmb text('Weekly Time and Materials Entry') ?></div>
+<table width="100%" cols=7 data-dojo-type="dijit/layout/TableContainer"
+ id="timecard-weekly">
 <tr class="listtop">
  <th><?lsmb transdates[0] ?></th>
  <th><?lsmb transdates[1] ?></th>
@@ -13,7 +52,14 @@
  <th><?lsmb transdates[6] ?></th>
 </tr>
 <?lsmb FOR 1 .. num_lines ?>
+<tr>
+<?lsmb FOR 0 .. 6 ?>
+<td>
+
+</td>
 <?lsmb END ?>
+</tr>
+<?lsmb END ?>
 </form>
 </body>
 </html>

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


------------------------------------------------------------------------------
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from 
the latest Intel processors and coprocessors. See abstracts and register >
http://pubads.g.doubleclick.net/gampad/clk?id=60134071&iu=/4140/ostg.clktrk
_______________________________________________
Ledger-smb-commits mailing list
..hidden..
https://lists.sourceforge.net/lists/listinfo/ledger-smb-commits