Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 6f01c56f

Von Bernd Bleßmann vor etwa 2 Jahren hinzugefügt

  • ID 6f01c56fd2cac094d630a2910c3fc6d535b91090
  • Vorgänger 35b2dbb1
  • Nachfolger 4cef82ae

Auftrags-Controller: js: benannte Parameter für save und show_print_options

Unterschiede anzeigen:

SL/Controller/Order.pm
2222 2222
      combobox => [
2223 2223
        action => [
2224 2224
          t8('Save'),
2225
          call      => [ 'kivi.Order.save', 'save', $::instance_conf->get_order_warn_duplicate_parts,
2226
                                                    $::instance_conf->get_order_warn_no_deliverydate,
2225
          call      => [ 'kivi.Order.save', { action             => 'save',
2226
                                              warn_on_duplicates => $::instance_conf->get_order_warn_duplicate_parts,
2227
                                              warn_on_reqdate    => $::instance_conf->get_order_warn_no_deliverydate },
2227 2228
          ],
2228 2229
          checks    => [ 'kivi.Order.check_save_active_periodic_invoices', ['kivi.validate_form','#order_form'],
2229 2230
                         @req_trans_cost_art, @req_cusordnumber,
......
2233 2234
        ],
2234 2235
        action => [
2235 2236
          t8('Save and Close'),
2236
          call      => [ 'kivi.Order.save', 'save', $::instance_conf->get_order_warn_duplicate_parts,
2237
                                                    $::instance_conf->get_order_warn_no_deliverydate,
2238
                                                    1
2237
          call      => [ 'kivi.Order.save', { action             => 'save',
2238
                                              warn_on_duplicates => $::instance_conf->get_order_warn_duplicate_parts,
2239
                                              warn_on_reqdate    => $::instance_conf->get_order_warn_no_deliverydate,
2240
                                              back_to_caller     => 1 },
2239 2241
          ],
2240 2242
          checks    => [ 'kivi.Order.check_save_active_periodic_invoices', ['kivi.validate_form','#order_form'],
2241 2243
                         @req_trans_cost_art, @req_cusordnumber,
......
2245 2247
        ],
2246 2248
        action => [
2247 2249
          t8('Create Sub-Version'),
2248
          call      => [ 'kivi.Order.save', 'add_subversion', ],
2250
          call      => [ 'kivi.Order.save', { action => 'add_subversion' }, ],
2249 2251
          only_if   => $::instance_conf->get_lock_oe_subversions,
2250 2252
          disabled => !$may_edit_create  ? t8('You do not have the permissions to access this function.')
2251 2253
                    : !$is_final_version ? t8('This sub-version is not yet finalized')
......
2253 2255
        ],
2254 2256
        action => [
2255 2257
          t8('Save as new'),
2256
          call      => [ 'kivi.Order.save', 'save_as_new', $::instance_conf->get_order_warn_duplicate_parts ],
2258
          call      => [ 'kivi.Order.save', { action             => 'save_as_new',
2259
                                              warn_on_duplicates => $::instance_conf->get_order_warn_duplicate_parts },
2260
          ],
2257 2261
          checks    => [ 'kivi.Order.check_save_active_periodic_invoices',
2258 2262
                         @req_trans_cost_art, @req_cusordnumber,
2259 2263
          ],
......
2296 2300
        ],
2297 2301
        action => [
2298 2302
          t8('Save and Delivery Order'),
2299
          call      => [ 'kivi.Order.save', 'save_and_delivery_order', $::instance_conf->get_order_warn_duplicate_parts,
2300
                                                                       $::instance_conf->get_order_warn_no_deliverydate,
2301
                                                                                                                        ],
2303
          call      => [ 'kivi.Order.save', { action             => 'save_and_delivery_order',
2304
                                              warn_on_duplicates => $::instance_conf->get_order_warn_duplicate_parts,
2305
                                              warn_on_reqdate    => $::instance_conf->get_order_warn_no_deliverydate },
2306
          ],
2302 2307
          checks    => [ 'kivi.Order.check_save_active_periodic_invoices',
2303 2308
                         @req_trans_cost_art, @req_cusordnumber,
2304 2309
          ],
......
2307 2312
        ],
2308 2313
        action => [
2309 2314
          t8('Save and Supplier Delivery Order'),
2310
          call      => [ 'kivi.Order.save', 'save_and_supplier_delivery_order', $::instance_conf->get_order_warn_duplicate_parts,
2311
                                                                       $::instance_conf->get_order_warn_no_deliverydate,
2312
                                                                                                                        ],
2315
          call      => [ 'kivi.Order.save', { action             => 'save_and_supplier_delivery_order',
2316
                                              warn_on_duplicates => $::instance_conf->get_order_warn_duplicate_parts,
2317
                                              warn_on_reqdate    => $::instance_conf->get_order_warn_no_deliverydate },
2318
          ],
2313 2319
          checks    => [ 'kivi.Order.check_save_active_periodic_invoices',
2314 2320
                         @req_trans_cost_art, @req_cusordnumber,
2315 2321
          ],
......
2318 2324
        ],
2319 2325
        action => [
2320 2326
          t8('Save and Invoice'),
2321
          call      => [ 'kivi.Order.save', 'save_and_invoice', $::instance_conf->get_order_warn_duplicate_parts ],
2327
          call      => [ 'kivi.Order.save', { action             => 'save_and_invoice',
2328
                                              warn_on_duplicates => $::instance_conf->get_order_warn_duplicate_parts },
2329
          ],
2322 2330
          checks    => [ 'kivi.Order.check_save_active_periodic_invoices',
2323 2331
                         @req_trans_cost_art, @req_cusordnumber,
2324 2332
          ],
......
2326 2334
        ],
2327 2335
        action => [
2328 2336
          ($has_invoice_for_advance_payment ? t8('Save and Further Invoice for Advance Payment') : t8('Save and Invoice for Advance Payment')),
2329
          call      => [ 'kivi.Order.save', 'save_and_invoice_for_advance_payment', $::instance_conf->get_order_warn_duplicate_parts ],
2337
          call      => [ 'kivi.Order.save', { action             => 'save_and_invoice_for_advance_payment',
2338
                                              warn_on_duplicates => $::instance_conf->get_order_warn_duplicate_parts },
2339
          ],
2330 2340
          checks    => [ 'kivi.Order.check_save_active_periodic_invoices',
2331 2341
                         @req_trans_cost_art, @req_cusordnumber,
2332 2342
          ],
......
2337 2347
        ],
2338 2348
        action => [
2339 2349
          t8('Save and Final Invoice'),
2340
          call      => [ 'kivi.Order.save', 'save_and_final_invoice', $::instance_conf->get_order_warn_duplicate_parts ],
2350
          call      => [ 'kivi.Order.save', { action             => 'save_and_final_invoice',
2351
                                              warn_on_duplicates => $::instance_conf->get_order_warn_duplicate_parts },
2352
          ],
2341 2353
          checks    => [ 'kivi.Order.check_save_active_periodic_invoices',
2342 2354
                         @req_trans_cost_art, @req_cusordnumber,
2343 2355
          ],
......
2348 2360
        ],
2349 2361
        action => [
2350 2362
          t8('Save and AP Transaction'),
2351
          call      => [ 'kivi.Order.save', 'save_and_ap_transaction', $::instance_conf->get_order_warn_duplicate_parts ],
2363
          call      => [ 'kivi.Order.save', { action             => 'save_and_ap_transaction',
2364
                                              warn_on_duplicates => $::instance_conf->get_order_warn_duplicate_parts },
2365
          ],
2352 2366
          only_if   => (any { $self->type eq $_ } (purchase_order_type())),
2353 2367
          disabled  => !$may_edit_create  ? t8('You do not have the permissions to access this function.') : undef,
2354 2368
        ],
......
2361 2375
        ],
2362 2376
        action => [
2363 2377
          t8('Save and preview PDF'),
2364
          call     => [ 'kivi.Order.save', 'preview_pdf', $::instance_conf->get_order_warn_duplicate_parts,
2365
                                                          $::instance_conf->get_order_warn_no_deliverydate,
2366
                      ],
2378
          call     => [ 'kivi.Order.save', { action             => 'preview_pdf',
2379
                                             warn_on_duplicates => $::instance_conf->get_order_warn_duplicate_parts,
2380
                                             warn_on_reqdate    => $::instance_conf->get_order_warn_no_deliverydate },
2381
          ],
2367 2382
          checks   => [ @req_trans_cost_art, @req_cusordnumber ],
2368 2383
          disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.')
2369 2384
                    : $is_final_version ? t8('This record is the final version. Please create a new sub-version') : undef,
2370 2385
        ],
2371 2386
        action => [
2372 2387
          t8('Save and print'),
2373
          call     => [ 'kivi.Order.show_print_options', $::instance_conf->get_order_warn_duplicate_parts,
2374
                                                         $::instance_conf->get_order_warn_no_deliverydate,
2375
                      ],
2388
          call     => [ 'kivi.Order.show_print_options', { warn_on_duplicates => $::instance_conf->get_order_warn_duplicate_parts,
2389
                                                           warn_on_reqdate    => $::instance_conf->get_order_warn_no_deliverydate },
2390
          ],
2376 2391
          checks   => [ @req_trans_cost_art, @req_cusordnumber ],
2377 2392
          disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.')
2378 2393
                    : $is_final_version ? t8('This record is the final version. Please create a new sub-version') : undef,
......
2380 2395
        action => [
2381 2396
          t8('Save and E-mail'),
2382 2397
          id       => 'save_and_email_action',
2383
          call     => [ 'kivi.Order.save', 'save_and_show_email_dialog', $::instance_conf->get_order_warn_duplicate_parts,
2384
                                                                         $::instance_conf->get_order_warn_no_deliverydate,
2385
                      ],
2398
          call     => [ 'kivi.Order.save', { action             => 'save_and_show_email_dialog',
2399
                                             warn_on_duplicates => $::instance_conf->get_order_warn_duplicate_parts,
2400
                                             warn_on_reqdate    => $::instance_conf->get_order_warn_no_deliverydate },
2401
          ],
2386 2402
          disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.')
2387 2403
                    : !$self->order->id ? t8('This object has not been saved yet.')
2388 2404
                    : $is_final_version ? t8('This record is the final version. Please create a new sub-version') : undef,

Auch abrufbar als: Unified diff