summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authoreinhverfr <einhverfr@4979c152-3d1c-0410-bac9-87ea11338e46>2008-02-24 03:15:55 +0000
committereinhverfr <einhverfr@4979c152-3d1c-0410-bac9-87ea11338e46>2008-02-24 03:15:55 +0000
commita8c675b5c7481a9f8a26462961e863bffde2cdeb (patch)
tree5436b45a1069bfe7db59f4e2dfc07656215720a1 /bin
parent6e70663c6f44a527786859b6390a092dda33fed8 (diff)
Closing bug 1895526-- exchange rate double parse on check payments
git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/branches/1.2@2078 4979c152-3d1c-0410-bac9-87ea11338e46
Diffstat (limited to 'bin')
-rwxr-xr-xbin/hr.pl26
-rwxr-xr-xbin/ir.pl7
-rwxr-xr-xbin/is.pl4
-rwxr-xr-xbin/oe.pl6
4 files changed, 36 insertions, 7 deletions
diff --git a/bin/hr.pl b/bin/hr.pl
index 78b098c0..dee1b0e2 100755
--- a/bin/hr.pl
+++ b/bin/hr.pl
@@ -528,6 +528,16 @@ sub employee_links {
for ( keys %$form ) { $form->{$_} = $form->quote( $form->{$_} ) }
+ $form->all_departments;
+ if ( @{ $form->{all_department} } ) {
+ $form->{selectdepartment} = "<option>\n";
+
+ for ( @{ $form->{all_department} } ) {
+ $form->{selectdepartment} .=
+qq|<option value="$_->{description}--$_->{id}">$_->{description}\n|;
+ }
+ }
+ $form->{selectdepartment} =~ s/("$form->{department}")/$1 selected/;
if ( @{ $form->{all_deduction} } ) {
$form->{selectdeduction} = "<option>\n";
for ( @{ $form->{all_deduction} } ) {
@@ -731,6 +741,11 @@ sub employee_header {
<th align=right nowrap>| . $locale->text('BIC') . qq|</th>
<td><input name=bic size=11 maxlength=11 value="$form->{bic}"></td>
</tr>
+ <tr>
+ <th align=right nowrap>| . $locale->text('Department') . qq|</th>
+ <td><select name="department">
+ $form->{selectdepartment}
+ </select>
</table>
</td>
</tr>
@@ -1411,6 +1426,17 @@ sub update_employee {
@flds = qw(before after);
$count = 0;
@a = ();
+ $form->all_departments;
+ if ( @{ $form->{all_department} } ) {
+ $form->{selectdepartment} = "<option>\n";
+
+ for ( @{ $form->{all_department} } ) {
+ $form->{selectdepartment} .=
+qq|<option value="$_->{description}--$_->{id}">$_->{description}\n|;
+ }
+ }
+ $form->{selectdepartment} =~ s/ selected//;
+ $form->{selectdepartment} =~ s/("$form->{department}")/$1 selected/;
for $i ( 1 .. $form->{deduction_rows} ) {
for (@flds) {
$form->{"${_}_$i"} =
diff --git a/bin/ir.pl b/bin/ir.pl
index ba3c3524..502602d6 100755
--- a/bin/ir.pl
+++ b/bin/ir.pl
@@ -139,14 +139,15 @@ qq|<option value="$_->{projectnumber}--$_->{id}">$_->{projectnumber}\n|;
# departments
if ( @{ $form->{all_department} } ) {
$form->{selectdepartment} = "<option>\n";
- $form->{department} = "$form->{department}--$form->{department_id}"
- if $form->{department_id};
for ( @{ $form->{all_department} } ) {
$form->{selectdepartment} .=
qq|<option value="$_->{description}--$_->{id}">$_->{description}\n|;
}
}
+ $form->{department} = "$form->{department}--$myconfig{department_id}"
+ if $myconfig{department_id};
+
if ( @{ $form->{all_language} } ) {
$form->{selectlanguage} = "<option>\n";
@@ -273,7 +274,7 @@ sub form_header {
for (qw(vendor department)) {
$form->{"select$_"} = $form->unescape( $form->{"select$_"} );
$form->{"select$_"} =~ s/ selected//;
- $form->{"select$_"} =~ s/(<option value="\Q$form->{$_}\E")/$1 selected/;
+ $form->{"select$_"} =~ s/(<option value="[^"]*\Q$form->{$_}\E")/$1 selected/;
}
if ( $form->{selectlanguage} ) {
diff --git a/bin/is.pl b/bin/is.pl
index f615a234..e6c6d601 100755
--- a/bin/is.pl
+++ b/bin/is.pl
@@ -153,6 +153,8 @@ qq|<option value="$_->{projectnumber}--$_->{id}">$_->{projectnumber}\n|;
qq|<option value="$_->{description}--$_->{id}">$_->{description}\n|;
}
}
+ $form->{department} = "$form->{department}--$myconfig{department_id}"
+ if $myconfig{department_id};
$form->{employee} = "$form->{employee}--$form->{employee_id}";
@@ -306,7 +308,7 @@ sub form_header {
for (qw(customer department employee)) {
$form->{"select$_"} = $form->unescape( $form->{"select$_"} );
$form->{"select$_"} =~ s/ selected//;
- $form->{"select$_"} =~ s/(<option value="\Q$form->{$_}\E")/$1 selected/;
+ $form->{"select$_"} =~ s/(<option value="[^"]*\Q$form->{$_}\E")/$1 selected/;
}
$form->{exchangerate} =
diff --git a/bin/oe.pl b/bin/oe.pl
index d14167a4..a4ed267a 100755
--- a/bin/oe.pl
+++ b/bin/oe.pl
@@ -192,8 +192,6 @@ qq|<option value="$_->{projectnumber}--$_->{id}">$_->{projectnumber}\n|;
# departments
if ( @{ $form->{all_department} } ) {
$form->{selectdepartment} = "<option>\n";
- $form->{department} = "$form->{department}--$form->{department_id}"
- if $form->{department_id};
for ( @{ $form->{all_department} } ) {
$form->{selectdepartment} .=
@@ -373,7 +371,7 @@ sub form_header {
for ( "$form->{vc}", "department", "employee" ) {
$form->{"select$_"} = $form->unescape( $form->{"select$_"} );
$form->{"select$_"} =~ s/ selected//;
- $form->{"select$_"} =~ s/(<option value="\Q$form->{$_}\E")/$1 selected/;
+ $form->{"select$_"} =~ s/(<option value="[^"]*\Q$form->{$_}\E")/$1 selected/;
}
$form->{exchangerate} =
@@ -1513,6 +1511,8 @@ sub transactions {
# split vendor / customer
( $form->{ $form->{vc} }, $form->{"$form->{vc}_id"} ) =
split( /--/, $form->{ $form->{vc} } );
+ $form->{department} = "$form->{department}--$myconfig{department_id}"
+ if $myconfig{department_id};
OE->transactions( \%myconfig, \%$form );