diff options
| -rw-r--r-- | LedgerSMB/CP.pm | 26 | ||||
| -rw-r--r-- | UI/menu/expanding.css | 4 |
2 files changed, 18 insertions, 12 deletions
diff --git a/LedgerSMB/CP.pm b/LedgerSMB/CP.pm index 72567a7b..a0537f63 100644 --- a/LedgerSMB/CP.pm +++ b/LedgerSMB/CP.pm @@ -127,10 +127,11 @@ sub get_openvc { my $dbh = $form->{dbh}; my $arap = ( $form->{vc} eq 'customer' ) ? 'ar' : 'ap'; - my $query = qq|SELECT count(*) - FROM $form->{vc} ct, $arap a - WHERE a.entity_id = ct.entity_id - AND a.amount != a.paid|; + my $query = qq| + SELECT count(*) + FROM entity_credit_account ct + JOIN $arap a USING (entity_id) + WHERE a.amount != a.paid|; my ($count) = $dbh->selectrow_array($query); @@ -138,8 +139,7 @@ sub get_openvc { my $ref; my $i = 0; - my $where = qq|WHERE a.entity_id = ct.entity_id - AND a.amount != a.paid|; + my $where = qq|WHERE a.amount != a.paid|; if ( $form->{ $form->{vc} } ) { my $var = $dbh->quote( $form->like( lc $form->{ $form->{vc} } ) ); @@ -147,10 +147,16 @@ sub get_openvc { } # build selection list - $query = qq|SELECT DISTINCT ct.* - FROM $form->{vc} ct, $arap a - $where - ORDER BY name|; + $query = qq| + SELECT DISTINCT ct.*, e.name, c.*, l.* + FROM entity_credit_account ct + JOIN $arap a USING (entity_id) + JOIN company c USING (entity_id) + JOIN entity e ON (e.id = a.entity_id) + LEFT JOIN company_to_location c2l ON (c.id = c2l.company_id) + LEFT JOIN location l ON (l.id = c2l.location_id) + $where + ORDER BY name|; $sth = $dbh->prepare($query); $sth->execute || $form->dberror($query); diff --git a/UI/menu/expanding.css b/UI/menu/expanding.css index 9696413e..c3b30db9 100644 --- a/UI/menu/expanding.css +++ b/UI/menu/expanding.css @@ -2,10 +2,10 @@ div.submenu { display: none; } -A.Menu_Closed::before { +A.Menu_Closed:before { content: '+'; } -A.Menu_Open::before { +A.Menu_Open:before { content: '-'; } |