diff options
| author | einhverfr <einhverfr@4979c152-3d1c-0410-bac9-87ea11338e46> | 2008-05-12 19:13:22 +0000 |
|---|---|---|
| committer | einhverfr <einhverfr@4979c152-3d1c-0410-bac9-87ea11338e46> | 2008-05-12 19:13:22 +0000 |
| commit | 063d52183edfcd6d2a766bd6c9de0642d1731c13 (patch) | |
| tree | 57318fe44d7a8eeff6e2adc3310571f27a91b223 | |
| parent | 7480fc1040a0eff27db089200f3b17aecc930f60 (diff) | |
Merging in fix for 1870069
git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/trunk@2137 4979c152-3d1c-0410-bac9-87ea11338e46
| -rw-r--r-- | LedgerSMB/AA.pm | 2 | ||||
| -rw-r--r-- | sql/Pg-database.sql | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/LedgerSMB/AA.pm b/LedgerSMB/AA.pm index 344d95ac..997d893b 100644 --- a/LedgerSMB/AA.pm +++ b/LedgerSMB/AA.pm @@ -329,7 +329,7 @@ sub post_transaction { # record last payment date in ar/ap table $form->{datepaid} = $form->{transdate} unless $form->{datepaid}; - my $datepaid = ($paid) ? qq|'$form->{datepaid}'| : 'NOW'; + my $datepaid = ($paid) ? qq|'$form->{datepaid}'| : undef; $query = qq| diff --git a/sql/Pg-database.sql b/sql/Pg-database.sql index b93f47f4..26f5f29e 100644 --- a/sql/Pg-database.sql +++ b/sql/Pg-database.sql @@ -77,7 +77,9 @@ session_id int REFERENCES session(session_id) ON DELETE CASCADE CREATE TABLE transactions ( id int PRIMARY KEY, table_name text, - locked_by int references "session" (session_id) ON DELETE SET NULL + locked_by int references "session" (session_id) ON DELETE SET NULL, + approved_by int references "users" (entity_id), + approved_at timestamp ); COMMENT on TABLE transactions IS @@ -357,12 +359,14 @@ glnumber|1 projectnumber|1 queue_payments|0 poll_frequency|1 +separate_duties|1 \. COMMENT ON TABLE defaults IS $$ Note that poll_frequency is in seconds. poll_frequency and queue_payments are not exposed via the admin interface as they are advanced features best -handled via DBAs. $$; +handled via DBAs. Also, separate_duties is not yet included in the admin +interface.$$; -- */ -- batch stuff |