From 0a21178170ff1917204172a7cc1c3f7e73b8f379 Mon Sep 17 00:00:00 2001 From: einhverfr Date: Tue, 12 Aug 2008 16:39:00 +0000 Subject: Undoing svn commit rev 2250 git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/trunk@2251 4979c152-3d1c-0410-bac9-87ea11338e46 --- LedgerSMB/CA.pm | 9 +++++ LedgerSMB/DBObject/Company.pm | 82 ++++++---------------------------------- UI/payments/payments_detail.html | 9 +++-- scripts/payment.pl | 1 + sql/Pg-database.sql | 49 ++++-------------------- sql/modules/Payment.sql | 7 +--- 6 files changed, 34 insertions(+), 123 deletions(-) diff --git a/LedgerSMB/CA.pm b/LedgerSMB/CA.pm index 117d9d1e..fa10a985 100644 --- a/LedgerSMB/CA.pm +++ b/LedgerSMB/CA.pm @@ -403,6 +403,9 @@ sub all_transactions { $dpt_where AND ($approved OR (a.approved AND ac.approved)) $project|; + if ($d_id) { + push @queryargs, $d_id; + } push @queryargs, $id; if ($fdate) { push @queryargs, $fdate; @@ -434,6 +437,9 @@ sub all_transactions { $dpt_where $project|; + if ($d_id) { + push @queryargs, $d_id; + } push @queryargs, $id; if ($fdate) { push @queryargs, $fdate; @@ -465,6 +471,9 @@ sub all_transactions { $dpt_where $project |; + if ($d_id) { + push @queryargs, $d_id; + } push @queryargs, $id; if ($fdate) { push @queryargs, $fdate; diff --git a/LedgerSMB/DBObject/Company.pm b/LedgerSMB/DBObject/Company.pm index b2eed72c..23a56cec 100644 --- a/LedgerSMB/DBObject/Company.pm +++ b/LedgerSMB/DBObject/Company.pm @@ -88,16 +88,8 @@ This method saves an address for a company. sub save_location { my $self = shift @_; - $self->{country_id} = $self->{country_code}; - - if($self->{credit_id}){ - $self->exec_method(funcname => 'eca__location_save'); - } else { - my ($ref) = $self->exec_method(funcname => 'company__location_save'); - my @vals = values %$ref; - $self->{location_id} = $vals[0]; - } + $self->exec_method(funcname => 'company__location_save'); $self->{dbh}->commit; } @@ -162,15 +154,13 @@ sub get_metadata { @{$self->{contact_class_list}} = $self->exec_method(funcname => 'entity_list_contact_class'); + @{$self->{credit_list}} = + $self->exec_method(funcname => 'entity__list_credit'); } sub save_contact { my ($self) = @_; - if ($self->{credit_id}){ - $self->exec_method(funcname => 'eca__save_contact'); - } else { - $self->exec_method(funcname => 'company__save_contact'); - } + $self->exec_method(funcname => 'company__save_contact'); $self->{dbh}->commit; } @@ -182,11 +172,7 @@ sub save_bank_account { sub save_notes { my $self = shift @_; - if ($self->{credit_id} && $self->{note_class} eq '3'){ - $self->exec_method(funcname => 'eca__save_notes'); - } else { - $self->exec_method(funcname => 'entity__save_notes'); - } + $self->exec_method(funcname => 'entity__save_notes'); $self->{dbh}->commit; } @@ -212,65 +198,19 @@ sub get { $self->merge($ref); $self->{threshold} = $self->format_amount(amount => $self->{threshold}); - @{$self->{credit_list}} = - $self->exec_method(funcname => 'entity__list_credit'); - - for (@{$self->{credit_list}}){ - print STDERR "credit_id: $_->{credit_id}\n"; - if (($_->{credit_id} eq $self->{credit_id}) - or ($_->{meta_number} eq $self->{meta_number})){ - $self->merge($_); - last; - } - } $self->{name} = $self->{legal_name}; - if ($self->{credit_id} and $self->{meta_number}){ - $self->get_credit_id; - } - if ($self->{credit_id}){ - @{$self->{locations}} = $self->exec_method( - funcname => 'eca__list_locations'); - @{$self->{contacts}} = $self->exec_method( - funcname => 'eca__list_contacts'); - @{$self->{notes}} = $self->exec_method( - funcname => 'eca__list_notes'); - - } - else { - @{$self->{locations}} = $self->exec_method( + @{$self->{locations}} = $self->exec_method( funcname => 'company__list_locations'); - @{$self->{contacts}} = $self->exec_method( - funcname => 'company__list_contacts'); - @{$self->{notes}} = $self->exec_method( - funcname => 'company__list_notes'); - } - - if ($self->{location_id}){ - for (@{$self->{locations}}){ - if ($_->{id} = $self->{location_id}){ - my $old_id = $self->{id}; - $self->merge($_); - $self->{id} = $old_id; - last; - } - } - } - - if ($self->{contact_id}){ - for (@{$self->{contacts}}){ - if ($_->{id} = $self->{contact_id}){ - my $old_id = $self->{id}; - $self->merge($_); - $self->{id} = $old_id; - last; - } - } - } + @{$self->{contacts}} = $self->exec_method( + funcname => 'company__list_contacts'); @{$self->{bank_account}} = $self->exec_method( funcname => 'company__list_bank_account'); + + @{$self->{notes}} = $self->exec_method( + funcname => 'company__list_notes'); }; 1; diff --git a/UI/payments/payments_detail.html b/UI/payments/payments_detail.html index 6fabf8ca..206d0d59 100644 --- a/UI/payments/payments_detail.html +++ b/UI/payments/payments_detail.html @@ -198,8 +198,7 @@ ELSE ; 'name_has_no_vouchers' ; END ?>"> - - + diff --git a/scripts/payment.pl b/scripts/payment.pl index 6dfbed05..295ad60e 100644 --- a/scripts/payment.pl +++ b/scripts/payment.pl @@ -307,6 +307,7 @@ sub print { } for my $inv (1 .. $inv_count){ + print STDERR "Invoice $inv of " .$payment->{"invoice_count_$id"} . "\n"; my $invhash = {}; my $inv_id = $payment->{"invoice_${id}_$inv"}; for (qw(invnumber invdate)){ diff --git a/sql/Pg-database.sql b/sql/Pg-database.sql index 0c720e0f..e1d8251e 100644 --- a/sql/Pg-database.sql +++ b/sql/Pg-database.sql @@ -1,6 +1,10 @@ begin; CREATE SEQUENCE id; --- As of 1.3 there is no central db anymore. --CT +-- Central DB structure +-- This is the central database stuff which is used across all datasets +-- in the ledger-smb.conf it is called 'ledgersmb' by default, but obviously +-- can be named anything. + -- BEGIN new entity management CREATE TABLE entity_class ( @@ -18,8 +22,7 @@ CREATE TABLE entity ( name text check (name ~ '[[:alnum:]_]'), entity_class integer references entity_class(id) not null , created date not null default current_date, - control_code text, - PRIMARY KEY(control_code, entity_class)); + PRIMARY KEY(name,entity_class)); COMMENT ON TABLE entity IS $$ The primary entity table to map to all contacts $$; COMMENT ON COLUMN entity.name IS $$ This is the common name of an entity. If it was a person it may be Joshua Drake, a company Acme Corp. You may also choose to use a domain such as commandprompt.com $$; @@ -160,24 +163,6 @@ CREATE TABLE company_to_location ( company_id integer not null references company(id) ON DELETE CASCADE, PRIMARY KEY(location_id,company_id)); -COMMENT ON TABLE company_to_location IS -$$ This table is used for locations generic to companies. For contract-bound -addresses, use eca_to_location instead $$; - -CREATE TABLE eca_to_location ( - location_id integer references location(id) not null, - location_class integer not null references location_class(id), - credit_id integer not null references entity_credit_account(id) - ON DELETE CASCADE, - PRIMARY KEY(location_id,credit_id)); - -CREATE UNIQUE INDEX eca_to_location_billing_u ON eca_to_location(credit_id) - WHERE location_class = 1; - -COMMENT ON TABLE eca_to_location IS -$$ This table is used for locations bound to contracts. For generic contact -addresses, use company_to_location instead $$; - CREATE TABLE salutation ( id serial unique, salutation text primary key); @@ -290,23 +275,10 @@ CREATE TABLE company_to_contact ( COMMENT ON TABLE company_to_contact IS $$ To keep track of the relationship between multiple contact methods and a single company $$; -CREATE TABLE eca_to_contact ( - credit_id integer not null references entity_credit_account(id) - ON DELETE CASCADE, - contact_class_id integer references contact_class(id) not null, - contact text check(contact ~ '[[:alnum:]_]') not null, - description text, - PRIMARY KEY (credit_id, contact_class_id, contact)); - -COMMENT ON TABLE eca_to_contact IS $$ To keep track of the relationship between multiple contact methods and a single vendor or customer account. For generic -contacts, use company_to_contact or person_to_contact instead.$$; - --- Begin rocking notes interface -- Begin rocking notes interface CREATE TABLE note_class(id serial primary key, class text not null check (class ~ '[[:alnum:]_]')); INSERT INTO note_class(id,class) VALUES (1,'Entity'); INSERT INTO note_class(id,class) VALUES (2,'Invoice'); -INSERT INTO note_class(id,class) VALUES (3,'Entity Credit Account'); CREATE UNIQUE INDEX note_class_idx ON note_class(lower(class)); CREATE TABLE note (id serial primary key, note_class integer not null references note_class(id), @@ -325,13 +297,6 @@ CREATE INDEX invoice_note_id_idx ON invoice_note(id); CREATE UNIQUE INDEX invoice_note_class_idx ON note_class(lower(class)); CREATE INDEX invoice_note_vectors_idx ON invoice_note USING gist(vector); -CREATE TABLE eca_note() - INHERITS (note); -ALTER TABLE eca_note ADD CHECK (note_class = 3); -ALTER TABLE eca_note ADD FOREIGN KEY (ref_key) - REFERENCES entity_credit_account(id) - ON DELETE CASCADE; - -- END entity -- @@ -2542,7 +2507,7 @@ COPY menu_attribute (node_id, attribute, value, id) FROM stdin; 198 module vouchers.pl 553 199 module vouchers.pl 559 199 action create_batch 560 -199 batch_type ap 561 +199 batch_type payable 561 201 module vouchers.pl 562 201 action create_batch 563 203 module vouchers.pl 565 diff --git a/sql/modules/Payment.sql b/sql/modules/Payment.sql index bee243f8..2a7e6e56 100644 --- a/sql/modules/Payment.sql +++ b/sql/modules/Payment.sql @@ -187,12 +187,7 @@ BEGIN FOR payment_item IN SELECT c.id AS contact_id, e.name AS contact_name, c.meta_number AS account_number, - sum (coalesce(p.due, 0) - - CASE WHEN c.discount_terms - > extract('days' FROM age(a.transdate)) - THEN 0 - ELSE (coalesce(p.due, 0)) * coalesce(c.discount, 0) / 100 - END) AS total_due, + sum(p.due) AS total_due, compound_array(ARRAY[[ a.id::text, a.invnumber, a.transdate::text, a.amount::text, (a.amount - p.due)::text, -- cgit v1.2.3