[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
SF.net SVN: ledger-smb:[6221] trunk
- Subject: SF.net SVN: ledger-smb:[6221] trunk
- From: ..hidden..
- Date: Tue, 5 Nov 2013 10:54:23 +0000
Revision: 6221
http://sourceforge.net/p/ledger-smb/code/6221
Author: einhverfr
Date: 2013-11-05 10:54:21 +0000 (Tue, 05 Nov 2013)
Log Message:
-----------
More of Istvan's creation date changes being merged
Modified Paths:
--------------
trunk/LedgerSMB/AA.pm
trunk/LedgerSMB/Form.pm
trunk/LedgerSMB/IR.pm
trunk/LedgerSMB/IS.pm
trunk/bin/aa.pl
trunk/bin/arapprn.pl
trunk/bin/is.pl
Property Changed:
----------------
trunk/LedgerSMB/AA.pm
trunk/LedgerSMB/Form.pm
trunk/LedgerSMB/IR.pm
trunk/LedgerSMB/IS.pm
trunk/bin/aa.pl
trunk/bin/arapprn.pl
trunk/bin/is.pl
Modified: trunk/LedgerSMB/AA.pm
===================================================================
--- trunk/LedgerSMB/AA.pm 2013-11-05 10:42:44 UTC (rev 6220)
+++ trunk/LedgerSMB/AA.pm 2013-11-05 10:54:21 UTC (rev 6221)
@@ -387,6 +387,7 @@
notes = ?,
intnotes = ?,
ponumber = ?,
+ crdate = ?,
reverse = ?
WHERE id = ?
|;
@@ -399,8 +400,8 @@
$datepaid, $invnetamount,
$form->{currency}, $form->{notes},
$form->{intnotes},
- $form->{ponumber}, $form->{reverse},
- $form->{id}
+ $form->{ponumber}, $form->{crdate},
+ $form->{reverse}, $form->{id}
);
$dbh->prepare($query)->execute(@queryargs) || $form->dberror($query);
if (defined $form->{approved}) {
Property changes on: trunk/LedgerSMB/AA.pm
___________________________________________________________________
Added: svn:text-time
## -0,0 +1 ##
+2013-09-20T13:22:45.000000Z
\ No newline at end of property
Added: svn:unix-mode
## -0,0 +1 ##
+0775
\ No newline at end of property
Added: svn:owner
## -0,0 +1 ##
+33 www-data
\ No newline at end of property
Added: svn:group
## -0,0 +1 ##
+33 www-data
\ No newline at end of property
Modified: trunk/LedgerSMB/Form.pm
===================================================================
--- trunk/LedgerSMB/Form.pm 2013-11-05 10:42:44 UTC (rev 6220)
+++ trunk/LedgerSMB/Form.pm 2013-11-05 10:54:21 UTC (rev 6221)
@@ -2419,7 +2419,7 @@
a.person_id, e.name AS employee,
c.language_code, a.ponumber, a.reverse,
a.approved, ctf.default_reportable,
- a.description, a.on_hold
+ a.description, a.on_hold, a.crdate
FROM $arap a
JOIN entity_credit_account c
ON (a.entity_credit_account = c.id)
Property changes on: trunk/LedgerSMB/Form.pm
___________________________________________________________________
Added: svn:text-time
## -0,0 +1 ##
+2013-09-20T07:22:28.332822Z
\ No newline at end of property
Added: svn:unix-mode
## -0,0 +1 ##
+0600
\ No newline at end of property
Added: svn:owner
## -0,0 +1 ##
+0 root
\ No newline at end of property
Added: svn:group
## -0,0 +1 ##
+0 root
\ No newline at end of property
Modified: trunk/LedgerSMB/IR.pm
===================================================================
--- trunk/LedgerSMB/IR.pm 2013-11-05 10:42:44 UTC (rev 6220)
+++ trunk/LedgerSMB/IR.pm 2013-11-05 10:54:21 UTC (rev 6221)
@@ -779,6 +779,7 @@
language_code = ?,
ponumber = ?,
approved = ?
+ crdate = ?
WHERE id = ?|;
$sth = $dbh->prepare($query);
@@ -790,7 +791,8 @@
$form->{taxincluded}, $form->{notes}, $form->{intnotes},
$form->{currency},
$form->{language_code}, $form->{ponumber},
- $approved, $form->{id}
+ $approved, $form->{crdate},
+ $form->{id}
) || $form->dberror($query);
if ($form->{batch_id}){
@@ -1085,7 +1087,7 @@
SELECT a.invnumber, a.transdate, a.duedate,
a.ordnumber, a.quonumber, a.paid, a.taxincluded,
a.notes, a.intnotes, a.curr AS currency,
- a.entity_credit_account as vendor_id, a.language_code, a.ponumber,
+ a.entity_credit_account as vendor_id, a.language_code, a.ponumber, a.crdate,
a.on_hold, a.reverse, a.description
FROM ap a
WHERE id = ?|;
Property changes on: trunk/LedgerSMB/IR.pm
___________________________________________________________________
Modified: svn:text-time
## -1 +1 ##
-2013-08-30T10:44:38.000000Z
+2013-09-20T07:19:01.126433Z
\ No newline at end of property
Modified: trunk/LedgerSMB/IS.pm
===================================================================
--- trunk/LedgerSMB/IS.pm 2013-11-05 10:42:44 UTC (rev 6220)
+++ trunk/LedgerSMB/IS.pm 2013-11-05 10:54:21 UTC (rev 6221)
@@ -1637,6 +1637,7 @@
language_code = ?,
ponumber = ?,
approved = ?
+ crdate = ?
WHERE id = ?
|;
$sth = $dbh->prepare($query);
@@ -1653,7 +1654,7 @@
$form->{currency},
$form->{employee_id}, $form->{till},
$form->{language_code}, $form->{ponumber}, $approved,
- $form->{id}
+ $form->{crdate}, $form->{id}
) || $form->dberror($query);
# add shipto
@@ -1935,7 +1936,7 @@
a.duedate, a.taxincluded, a.curr AS currency,
a.person_id, e.name AS employee, a.till,
a.reverse,
- a.language_code, a.ponumber,
+ a.language_code, a.ponumber, a.crdate,
a.on_hold, a.description
FROM ar a
LEFT JOIN entity_employee em ON (em.entity_id = a.person_id)
Property changes on: trunk/LedgerSMB/IS.pm
___________________________________________________________________
Modified: svn:text-time
## -1 +1 ##
-2013-08-30T10:45:04.000000Z
+2013-09-20T11:23:17.093428Z
\ No newline at end of property
Modified: trunk/bin/aa.pl
===================================================================
--- trunk/bin/aa.pl 2013-11-05 10:42:44 UTC (rev 6220)
+++ trunk/bin/aa.pl 2013-11-05 10:54:21 UTC (rev 6221)
@@ -195,6 +195,7 @@
&& $form->{type} eq 'invoice');
$duedate = $form->{duedate};
+ $crdate = $form->{crdate};
$taxincluded = $form->{taxincluded};
$form->{formname} = "transaction";
@@ -221,6 +222,7 @@
$form->{currency} =~ s/ //g;
$form->{duedate} = $duedate if $duedate;
+ $form->{crdate} = $crdate if $crdate;
$form->{taxincluded} = $taxincluded if $form->{id};
$form->{notes} = $form->{intnotes} if !$form->{id};
@@ -1355,6 +1357,7 @@
# check if there is an invoice number, invoice and due date
$form->isblank( "transdate", $locale->text('Invoice Date missing!') );
$form->isblank( "duedate", $locale->text('Due Date missing!') );
+ $form->isblank( "crdate", $locale->text('Invoice Created Date missing!') );
$form->isblank( $form->{vc}, $label );
$closedto = $form->datetonum( \%myconfig, $form->{closedto} );
@@ -1682,6 +1685,8 @@
push @a,
qq|<input name="l_paid" class=checkbox type=checkbox value=Y checked> |
. $locale->text('Paid');
+ push @a, qq|<input name="l_crdate" class=checkbox type=checkbox value=Y> |
+ . $locale->text('Invoice Created');
push @a, qq|<input name="l_duedate" class=checkbox type=checkbox value=Y> |
. $locale->text('Due Date');
push @a, qq|<input name="l_due" class=checkbox type=checkbox value=Y> |
Property changes on: trunk/bin/aa.pl
___________________________________________________________________
Modified: svn:text-time
## -1 +1 ##
-2013-08-30T14:18:36.712925Z
+2013-09-20T12:43:54.000000Z
\ No newline at end of property
Modified: svn:owner
## -1 +1 ##
-0 root
+33 www-data
\ No newline at end of property
Modified: svn:group
## -1 +1 ##
-0 root
+33 www-data
\ No newline at end of property
Modified: trunk/bin/arapprn.pl
===================================================================
--- trunk/bin/arapprn.pl 2013-11-05 10:42:44 UTC (rev 6220)
+++ trunk/bin/arapprn.pl 2013-11-05 10:54:21 UTC (rev 6221)
@@ -266,7 +266,7 @@
( $form->{employee} ) = split /--/, $form->{employee};
if ( exists $form->{longformat} ) {
- for (qw(duedate transdate)) {
+ for (qw(duedate transdate crdate)) {
$form->{$_} =
$locale->date( \%myconfig, $form->{$_}, $form->{longformat} );
}
@@ -274,7 +274,7 @@
$form->{notes} =~ s/^\s+//g;
- @a = ( "invnumber", "transdate", "duedate", "notes" );
+ @a = ( "invnumber", "transdate", "duedate", "crdate", "notes" );
push @a,
qw(company address tel fax businessnumber text_amount text_decimal);
Property changes on: trunk/bin/arapprn.pl
___________________________________________________________________
Added: svn:text-time
## -0,0 +1 ##
+2013-09-20T07:42:25.943976Z
\ No newline at end of property
Added: svn:unix-mode
## -0,0 +1 ##
+0775
\ No newline at end of property
Added: svn:owner
## -0,0 +1 ##
+0 root
\ No newline at end of property
Added: svn:group
## -0,0 +1 ##
+0 root
\ No newline at end of property
Modified: trunk/bin/is.pl
===================================================================
--- trunk/bin/is.pl 2013-11-05 10:42:44 UTC (rev 6220)
+++ trunk/bin/is.pl 2013-11-05 10:54:21 UTC (rev 6221)
@@ -278,7 +278,7 @@
$form->{AR} = $form->{AR_1} unless $form->{id};
$form->{transdate} = $form->{current_date} if (!$form->{transdate});
- $form->{crdate} = $form->{current_date};
+ $form->{crdate} = $form->{current_date} if (!$form->{crdate});
$form->{locked} =
( $form->{revtrans} )
? '1'
Property changes on: trunk/bin/is.pl
___________________________________________________________________
Modified: svn:text-time
## -1 +1 ##
-2013-08-28T17:34:15.000000Z
+2013-09-20T14:40:14.000000Z
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
------------------------------------------------------------------------------
November Webinars for C, C++, Fortran Developers
Accelerate application performance with scalable programming models. Explore
techniques for threading, error checking, porting, and tuning. Get the most
from the latest Intel processors and coprocessors. See abstracts and register
http://pubads.g.doubleclick.net/gampad/clk?id=60136231&iu=/4140/ostg.clktrk
_______________________________________________
Ledger-smb-commits mailing list
..hidden..
https://lists.sourceforge.net/lists/listinfo/ledger-smb-commits