Revision 629097c7
Von Bernd Bleßmann vor 8 Monaten hinzugefügt
| SL/DB/Order.pm | ||
|---|---|---|
| 595 | 595 |
if ( $is_abbr_any->(qw(soiso pocpoc pocpo popoc)) ) {
|
| 596 | 596 |
$args{ordnumber} = undef;
|
| 597 | 597 |
} |
| 598 |
if ( $is_abbr_any->(qw(rqpqi pqisq)) ) {
|
|
| 598 |
if ( $is_abbr_any->(qw(rqpqi pqisq rqpo)) ) {
|
|
| 599 | 599 |
$args{quonumber} = undef;
|
| 600 | 600 |
} |
| 601 | 601 |
|
| SL/Presenter/Record.pm | ||
|---|---|---|
| 174 | 174 |
columns => [ |
| 175 | 175 |
[ $::locale->text('Order Date'), 'transdate' ],
|
| 176 | 176 |
[ $::locale->text('Order Number'), sub { $_[0]->presenter->purchase_order(display => 'table-cell') } ],
|
| 177 |
[ $::locale->text('Purchase Quotation Intake'), sub { my $order = $_[0]; join ', ', map { $_->quonumber } @{$order->preceding_purchase_quotation_intakes()} } ],
|
|
| 177 |
[ $::locale->text('Purchase Quotation Intake'), 'quonumber' ],
|
|
| 178 | 178 |
[ $::locale->text('Request for Quotation'), sub { my $order = $_[0]; join ', ', map { $_->quonumber } @{$order->preceding_request_quotations()} } ],
|
| 179 | 179 |
[ $::locale->text('Vendor'), 'vendor' ],
|
| 180 | 180 |
[ $::locale->text('Net amount'), 'netamount' ],
|
| ... | ... | |
| 194 | 194 |
[ $::locale->text('Confirmation Date'), 'transdate' ],
|
| 195 | 195 |
[ $::locale->text('Confirmation Number'), sub { $_[0]->presenter->purchase_order_confirmation(display => 'table-cell') } ],
|
| 196 | 196 |
[ $::locale->text('Purchase Order'), sub { my $order = $_[0]; join ', ', map { $_->ordnumber } @{$order->preceding_purchase_orders()} } ],
|
| 197 |
[ $::locale->text('Purchase Quotation Intake'), sub { my $order = $_[0]; join ', ', map { $_->quonumber } @{$order->preceding_purchase_quotation_intakes()} } ],
|
|
| 197 |
[ $::locale->text('Purchase Quotation Intake'), 'quonumber' ],
|
|
| 198 | 198 |
[ $::locale->text('Vendor'), 'vendor' ],
|
| 199 | 199 |
[ $::locale->text('Net amount'), 'netamount' ],
|
| 200 | 200 |
[ $::locale->text('Transaction description'), 'transaction_description' ],
|
| templates/design40_webpages/order/tabs/basic_data.html | ||
|---|---|---|
| 295 | 295 |
</tr> |
| 296 | 296 |
[% END %] |
| 297 | 297 |
|
| 298 |
[% IF !(SELF.type == "purchase_order" || SELF.type == "purchase_order_confirmation") %] |
|
| 299 |
[% IF (SELF.type == "sales_order_intake" || SELF.type == "sales_order" || SELF.type == "sales_quotation" || SELF.type == "purchase_quotation_intake") %] |
|
| 300 |
[% SET quo_nr_txt = 'Quotation Number' %] |
|
| 301 |
[% ELSE %] |
|
| 298 |
[% IF (SELF.type == "request_quotation") %] |
|
| 302 | 299 |
[% SET quo_nr_txt = 'RFQ Number' %] |
| 300 |
[% ELSE %] |
|
| 301 |
[% SET quo_nr_txt = 'Quotation Number' %] |
|
| 303 | 302 |
[% END %] |
| 304 | 303 |
<tr> |
| 305 | 304 |
<th>[% quo_nr_txt | $T8 %]</th> |
| 306 | 305 |
<td> |
| 307 |
[%- IF (SELF.type == "sales_order_intake" || SELF.type == "sales_order" || SELF.type == "purchase_order") -%] |
|
| 306 |
[%- IF (SELF.type == "sales_order_intake" || SELF.type == "sales_order" || SELF.type == "purchase_order" || SELF.type == "purchase_order_confirmation") -%]
|
|
| 308 | 307 |
[% L.input_tag('order.quonumber', SELF.order.quonumber, class='wi-normal') %]
|
| 309 | 308 |
[%- ELSIF INSTANCE_CONF.get_sales_purchase_record_numbers_changeable %] |
| 310 | 309 |
[% L.input_tag('order.quonumber', SELF.order.quonumber, onchange='kivi.Order.set_number_in_title(this)', class='wi-normal') %]
|
| ... | ... | |
| 316 | 315 |
[%- END %] |
| 317 | 316 |
</td> |
| 318 | 317 |
</tr> |
| 319 |
[% END %] |
|
| 320 |
[% IF (SELF.type == "purchase_order" || SELF.type == "purchase_order_confirmation") %] |
|
| 321 |
<tr> |
|
| 322 |
<th>[% 'Quotation Number' | $T8 %]</th> |
|
| 323 |
[%- |
|
| 324 |
numbers = []; |
|
| 325 |
FOREACH p = SELF.order.preceding_purchase_quotation_intakes(); |
|
| 326 |
numbers.push(HTML.escape(p.quonumber)); |
|
| 327 |
END; |
|
| 328 |
%] |
|
| 329 |
<td><span class="data wi-normal">[% numbers.join(', ') %]</span></td>
|
|
| 330 |
</tr> |
|
| 331 |
[% END %] |
|
| 332 | 318 |
[% IF (SELF.type == "purchase_quotation_intake" || SELF.type == "purchase_order" || SELF.type == "purchase_order_confirmation") %] |
| 333 | 319 |
<tr> |
| 334 | 320 |
<th>[% 'RFQ Number' | $T8 %]</th> |
| templates/webpages/order/tabs/basic_data.html | ||
|---|---|---|
| 224 | 224 |
</tr> |
| 225 | 225 |
[% END %] |
| 226 | 226 |
|
| 227 |
[% IF !(SELF.type == "purchase_order" || SELF.type == "purchase_order_confirmation") %] |
|
| 228 |
[%- IF (SELF.type == "sales_order_intake" || SELF.type == "sales_order" || SELF.type == "sales_quotation" || SELF.type == "purchase_quotation_intake") -%] |
|
| 229 |
[%- SET quo_nr_txt = 'Quotation Number' -%] |
|
| 230 |
[%- ELSE -%] |
|
| 227 |
[%- IF (SELF.type == "request_quotation") -%] |
|
| 231 | 228 |
[%- SET quo_nr_txt = 'RFQ Number' -%] |
| 229 |
[%- ELSE -%] |
|
| 230 |
[%- SET quo_nr_txt = 'Quotation Number' -%] |
|
| 232 | 231 |
[%- END -%] |
| 233 | 232 |
<tr> |
| 234 | 233 |
<th width="70%" align="right" nowrap>[% quo_nr_txt | $T8 %]</th> |
| 235 | 234 |
<td> |
| 236 |
[%- IF (SELF.type == "sales_order_intake" || SELF.type == "sales_order" || SELF.type == "purchase_order") -%] |
|
| 235 |
[%- IF (SELF.type == "sales_order_intake" || SELF.type == "sales_order" || SELF.type == "purchase_order" || SELF.type == "purchase_order_confirmation") -%]
|
|
| 237 | 236 |
[% L.input_tag('order.quonumber', SELF.order.quonumber, size = 11) %]
|
| 238 | 237 |
[%- ELSIF INSTANCE_CONF.get_sales_purchase_record_numbers_changeable %] |
| 239 | 238 |
[% L.input_tag('order.quonumber', SELF.order.quonumber, size = 11, onchange='kivi.Order.set_number_in_title(this)') %]
|
| ... | ... | |
| 245 | 244 |
[%- END %] |
| 246 | 245 |
</td> |
| 247 | 246 |
</tr> |
| 248 |
[%- END %] |
|
| 249 |
|
|
| 250 |
[% IF (SELF.type == "purchase_order" || SELF.type == "purchase_order_confirmation") %] |
|
| 251 |
<tr> |
|
| 252 |
<th width="70%" align="right" nowrap>[% 'Quotation Number' | $T8 %]</th> |
|
| 253 |
[%- |
|
| 254 |
numbers = []; |
|
| 255 |
FOREACH p = SELF.order.preceding_purchase_quotation_intakes(); |
|
| 256 |
numbers.push(HTML.escape(p.quonumber)); |
|
| 257 |
END; |
|
| 258 |
%] |
|
| 259 |
<td>[% numbers.join(', ') %]</td>
|
|
| 260 |
</tr> |
|
| 261 |
[%- END %] |
|
| 262 | 247 |
|
| 263 | 248 |
[% IF (SELF.type == "purchase_quotation_intake" || SELF.type == "purchase_order" || SELF.type == "purchase_order_confirmation") %] |
| 264 | 249 |
<tr> |
Auch abrufbar als: Unified diff
Lieferantenauftrag/-bestätigung: Angebotsfeld nicht aus verknüpften Belegen
Maske und Verknüpfte Belege.
Damit sich im Einkauf die Angebotsnummer ändern/eingeben lässt, wird
diese nicht aus den Verknüpften Angebotseingang geholt, sondern aus
dem quonumber-Feld.
Das erscheint sinnvoll, da die Angebotsnummer ja von außen kommt und
man evtl. einen Lieferantenauftrag ohne Angebotseingang erfassen mag.
Damit es nicht mit dem Feld aus der Preisanfrage durcheinander kommt,
wird quonumber beim Workflow von Preisanfrage zu Lieferantenauftrag
nicht mitgeschiffen.