Revision 2879330b
Von Bernd Blessmann vor fast 13 Jahren hinzugefügt
| SL/DO.pm | ||
|---|---|---|
| 350 | 350 |
conv_i($form->{salesman_id}), conv_i($form->{cp_id}),
|
| 351 | 351 |
$form->{transaction_description},
|
| 352 | 352 |
$form->{type} =~ /^sales/ ? 't' : 'f',
|
| 353 |
conv_i($form->{taxzone_id}), $form->{taxincluded} ? 't' : 'f', conv_i($form->{terms}), $form->{curr},
|
|
| 353 |
conv_i($form->{taxzone_id}), $form->{taxincluded} ? 't' : 'f', conv_i($form->{terms}), substr($form->{currency}, 0, 3),
|
|
| 354 | 354 |
conv_i($form->{id}));
|
| 355 | 355 |
do_query($form, $dbh, $query, @values); |
| 356 | 356 |
|
| ... | ... | |
| 601 | 601 |
d.description AS department, dord.language_id, |
| 602 | 602 |
dord.shipto_id, |
| 603 | 603 |
dord.globalproject_id, dord.delivered, dord.transaction_description, |
| 604 |
dord.taxzone_id, dord.taxincluded, dord.terms, dord.curr |
|
| 604 |
dord.taxzone_id, dord.taxincluded, dord.terms, dord.curr AS currency
|
|
| 605 | 605 |
FROM delivery_orders dord |
| 606 | 606 |
JOIN ${vc} cv ON (dord.${vc}_id = cv.id)
|
| 607 | 607 |
LEFT JOIN employee e ON (dord.employee_id = e.id) |
| ... | ... | |
| 623 | 623 |
} |
| 624 | 624 |
$sth->finish(); |
| 625 | 625 |
|
| 626 |
# remove any trailing whitespace |
|
| 627 |
$form->{currency} =~ s/\s*$//;
|
|
| 628 |
|
|
| 626 | 629 |
$form->{donumber_array} =~ s/\s*$//g;
|
| 627 | 630 |
|
| 628 | 631 |
$form->{saved_donumber} = $form->{donumber};
|
| SL/Form.pm | ||
|---|---|---|
| 2860 | 2860 |
if ($self->{"$self->{vc}_id"}) {
|
| 2861 | 2861 |
|
| 2862 | 2862 |
# only setup currency |
| 2863 |
($self->{currency}) = split(/:/, $self->{currencies});
|
|
| 2863 |
($self->{currency}) = split(/:/, $self->{currencies}) if !$self->{currency};
|
|
| 2864 | 2864 |
|
| 2865 | 2865 |
} else {
|
| 2866 | 2866 |
|
| bin/mozilla/ir.pl | ||
|---|---|---|
| 116 | 116 |
} |
| 117 | 117 |
} |
| 118 | 118 |
|
| 119 |
my ($payment_id, $language_id, $taxzone_id); |
|
| 119 |
my ($payment_id, $language_id, $taxzone_id, $currency);
|
|
| 120 | 120 |
if ($form->{payment_id}) {
|
| 121 | 121 |
$payment_id = $form->{payment_id};
|
| 122 | 122 |
} |
| ... | ... | |
| 126 | 126 |
if ($form->{taxzone_id}) {
|
| 127 | 127 |
$taxzone_id = $form->{taxzone_id};
|
| 128 | 128 |
} |
| 129 |
if ($form->{currency}) {
|
|
| 130 |
$currency = $form->{currency};
|
|
| 131 |
} |
|
| 129 | 132 |
|
| 130 | 133 |
my $cp_id = $form->{cp_id};
|
| 131 | 134 |
IR->get_vendor(\%myconfig, \%$form); |
| ... | ... | |
| 141 | 144 |
if ($taxzone_id) {
|
| 142 | 145 |
$form->{taxzone_id} = $taxzone_id;
|
| 143 | 146 |
} |
| 147 |
if ($currency) {
|
|
| 148 |
$form->{currency} = $currency;
|
|
| 149 |
} |
|
| 144 | 150 |
|
| 145 | 151 |
my @curr = split(/:/, $form->{currencies}); #seems to be missing
|
| 146 | 152 |
map { $form->{selectcurrency} .= "<option>$_\n" } @curr;
|
| bin/mozilla/is.pl | ||
|---|---|---|
| 146 | 146 |
|
| 147 | 147 |
my $editing = $form->{id};
|
| 148 | 148 |
|
| 149 |
$form->backup_vars(qw(payment_id language_id taxzone_id salesman_id taxincluded cp_id intnotes id shipto_id)); |
|
| 149 |
$form->backup_vars(qw(payment_id language_id taxzone_id salesman_id taxincluded currency cp_id intnotes id shipto_id));
|
|
| 150 | 150 |
|
| 151 | 151 |
IS->get_customer(\%myconfig, \%$form); |
| 152 | 152 |
|
| ... | ... | |
| 158 | 158 |
$form->restore_vars(qw(id)); |
| 159 | 159 |
|
| 160 | 160 |
IS->retrieve_invoice(\%myconfig, \%$form); |
| 161 |
$form->restore_vars(qw(payment_id language_id taxzone_id intnotes cp_id shipto_id)); |
|
| 161 |
$form->restore_vars(qw(payment_id language_id taxzone_id currency intnotes cp_id shipto_id));
|
|
| 162 | 162 |
$form->restore_vars(qw(taxincluded)) if $form->{id};
|
| 163 | 163 |
$form->restore_vars(qw(salesman_id)) if $editing; |
| 164 | 164 |
|
| doc/changelog | ||
|---|---|---|
| 67 | 67 |
- Bugfix 1753: Benutzerdefinierte Variable f. Waren: bearbeitbar nicht auswählbar |
| 68 | 68 |
- Bugfix 1738: Entwürfe können nicht gelöscht werden |
| 69 | 69 |
- Bugfix 1759: Währung bei Kunden / Lieferanten vorbelegen |
| 70 |
- Bugfix 1770: Währung / currency überlebt Workflow über Lieferschein nicht |
|
| 70 | 71 |
- Bugfix 1773: SQL Fehler bei Anzeige von Angeboten |
| 71 | 72 |
|
| 72 | 73 |
|
| templates/webpages/do/form_header.html | ||
|---|---|---|
| 64 | 64 |
<input type="hidden" name="cc" value="[% HTML.escape(cc) %]"> |
| 65 | 65 |
<input type="hidden" name="closed" value="[% HTML.escape(closed) %]"> |
| 66 | 66 |
<input type="hidden" name="convert_from_oe_ids" value="[% HTML.escape(convert_from_oe_ids) %]"> |
| 67 |
<input type="hidden" name="curr" value="[% HTML.escape(curr) %]">
|
|
| 67 |
<input type="hidden" name="currency" value="[% HTML.escape(currency) %]">
|
|
| 68 | 68 |
<input type="hidden" name="customer_klass" value="[% HTML.escape(customer_klass) %]"> |
| 69 | 69 |
<input type="hidden" name="discount" value="[% HTML.escape(discount) %]"> |
| 70 | 70 |
<input type="hidden" name="dunning_amount" value="[% HTML.escape(dunning_amount) %]"> |
Auch abrufbar als: Unified diff
Fix für Bug 1770 - Währung / currency überlebt Workflow über Lieferschein nicht