Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 5f6d6d4e

Von Moritz Bunkus vor mehr als 10 Jahren hinzugefügt

  • ID 5f6d6d4eaca3a3d238c678ef3f2a1fe676c3a77a
  • Vorgänger 52131da1
  • Nachfolger 1f0a135c

Verkaufs-/Einkaufsmasken: HTML in Langtexten nutzen

Unterschiede anzeigen:

SL/DO.pm
42 42
use SL::DB::DeliveryOrder;
43 43
use SL::DB::Status;
44 44
use SL::DBUtils;
45
use SL::HTML::Restrict;
45 46
use SL::RecordLinks;
46 47
use SL::IC;
47 48
use SL::TransNumber;
......
216 217

  
217 218
  # connect to database, turn off autocommit
218 219
  my $dbh = $form->get_standard_dbh($myconfig);
220
  my $restricter = SL::HTML::Restrict->create;
219 221

  
220 222
  my ($query, @values, $sth, $null);
221 223

  
......
323 325

  
324 326
    # save detail record in delivery_order_items table
325 327
    @values = (conv_i($item_id), conv_i($form->{id}), conv_i($form->{"id_$i"}),
326
               $form->{"description_$i"}, $form->{"longdescription_$i"},
328
               $form->{"description_$i"}, $restricter->process($form->{"longdescription_$i"}),
327 329
               $form->{"qty_$i"}, $baseqty,
328 330
               $form->{"sellprice_$i"}, $form->{"discount_$i"} / 100,
329 331
               $form->{"unit_$i"}, conv_date($items_reqdate), conv_i($form->{"project_id_$i"}),
SL/IR.pm
42 42
use SL::DBUtils;
43 43
use SL::DO;
44 44
use SL::GenericTranslations;
45
use SL::HTML::Restrict;
45 46
use SL::IO;
46 47
use SL::MoreCommon;
47 48
use SL::DB::Default;
......
56 57

  
57 58
  # connect to database, turn off autocommit
58 59
  my $dbh = $provided_dbh ? $provided_dbh : $form->dbconnect_noauto($myconfig);
60
  my $restricter = SL::HTML::Restrict->create;
61

  
59 62
  $form->{defaultcurrency} = $form->get_default_currency($myconfig);
60 63
  my $defaultcurrency = $form->{defaultcurrency};
61 64

  
......
378 381
                              project_id, serialnumber, price_factor_id, price_factor, marge_price_factor)
379 382
         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, (SELECT factor FROM price_factors WHERE id = ?), ?)|;
380 383
    @values = ($invoice_id, conv_i($form->{id}), conv_i($form->{"id_$i"}),
381
               $form->{"description_$i"}, $form->{"longdescription_$i"}, $form->{"qty_$i"} * -1,
384
               $form->{"description_$i"}, $restricter->process($form->{"longdescription_$i"}), $form->{"qty_$i"} * -1,
382 385
               $baseqty * -1, $form->{"sellprice_$i"}, $fxsellprice, $form->{"discount_$i"}, $allocated,
383 386
               $form->{"unit_$i"}, conv_date($form->{deliverydate}),
384 387
               conv_i($form->{"project_id_$i"}), $form->{"serialnumber_$i"},
SL/IS.pm
44 44
use SL::DBUtils;
45 45
use SL::DO;
46 46
use SL::GenericTranslations;
47
use SL::HTML::Restrict;
47 48
use SL::MoreCommon;
48 49
use SL::IC;
49 50
use SL::IO;
......
546 547

  
547 548
  # connect to database, turn off autocommit
548 549
  my $dbh = $provided_dbh ? $provided_dbh : $form->get_standard_dbh;
550
  my $restricter = SL::HTML::Restrict->create;
549 551

  
550 552
  my ($query, $sth, $null, $project_id, @values);
551 553
  my $exchangerate = 0;
......
749 751
                   (SELECT factor FROM price_factors WHERE id = ?), ?)|;
750 752

  
751 753
      @values = ($invoice_id, conv_i($form->{id}), conv_i($form->{"id_$i"}),
752
                 $form->{"description_$i"}, $form->{"longdescription_$i"}, $form->{"qty_$i"},
754
                 $form->{"description_$i"}, $restricter->process($form->{"longdescription_$i"}), $form->{"qty_$i"},
753 755
                 $form->{"sellprice_$i"}, $fxsellprice,
754 756
                 $form->{"discount_$i"}, $allocated, 'f',
755 757
                 $form->{"unit_$i"}, conv_date($form->{"reqdate_$i"}), conv_i($form->{"project_id_$i"}),
SL/OE.pm
45 45
use SL::DB::Status;
46 46
use SL::DB::Tax;
47 47
use SL::DBUtils;
48
use SL::HTML::Restrict;
48 49
use SL::IC;
49 50
use SL::TransNumber;
50 51

  
......
330 331

  
331 332
  # connect to database, turn off autocommit
332 333
  my $dbh = $form->get_standard_dbh;
334
  my $restricter = SL::HTML::Restrict->create;
333 335

  
334 336
  my ($query, @values, $sth, $null);
335 337
  my $exchangerate = 0;
......
500 502
                          (SELECT factor FROM price_factors WHERE id = ?), ?)|;
501 503
      push(@values,
502 504
           conv_i($orderitems_id), conv_i($form->{id}), conv_i($form->{"id_$i"}),
503
           $form->{"description_$i"}, $form->{"longdescription_$i"},
505
           $form->{"description_$i"}, $restricter->process($form->{"longdescription_$i"}),
504 506
           $form->{"qty_$i"}, $baseqty,
505 507
           $fxsellprice, $form->{"discount_$i"},
506 508
           $form->{"unit_$i"}, conv_date($reqdate), conv_i($form->{"project_id_$i"}),
bin/mozilla/do.pl
310 310

  
311 311
  $form->{follow_up_trans_info} = $form->{donumber} .'('. $follow_up_vc .')';
312 312

  
313
  $::request->{layout}->use_javascript(map { "${_}.js" } qw(kivi.SalesPurchase));
313
  $::request->{layout}->use_javascript(map { "${_}.js" } qw(kivi.SalesPurchase ckeditor/ckeditor ckeditor/adapters/jquery));
314 314

  
315 315
  $form->header();
316 316
  # Fix für Bug 1082 Erwartet wird: 'abteilungsNAME--abteilungsID'
bin/mozilla/ir.pl
331 331
  ), @custom_hiddens,
332 332
  map { $_.'_rate', $_.'_description', $_.'_taxnumber' } split / /, $form->{taxaccounts}];
333 333

  
334
  $::request->{layout}->use_javascript(map { "${_}.js" } qw(kivi.SalesPurchase));
334
  $::request->{layout}->use_javascript(map { "${_}.js" } qw(kivi.SalesPurchase ckeditor/ckeditor ckeditor/adapters/jquery));
335 335

  
336 336
  $form->header();
337 337

  
bin/mozilla/is.pl
383 383
  ), @custom_hiddens,
384 384
  map { $_.'_rate', $_.'_description', $_.'_taxnumber' } split / /, $form->{taxaccounts}];
385 385

  
386
  $::request->{layout}->use_javascript(map { "${_}.js" } qw(kivi.SalesPurchase));
386
  $::request->{layout}->use_javascript(map { "${_}.js" } qw(kivi.SalesPurchase ckeditor/ckeditor ckeditor/adapters/jquery));
387 387

  
388 388
  $form->header();
389 389

  
bin/mozilla/oe.pl
429 429
    }
430 430
  }
431 431

  
432
  $::request->{layout}->use_javascript(map { "${_}.js" } qw(kivi.SalesPurchase show_form_details show_history show_vc_details));
432
  $::request->{layout}->use_javascript(map { "${_}.js" } qw(kivi.SalesPurchase show_form_details show_history show_vc_details ckeditor/ckeditor ckeditor/adapters/jquery));
433 433

  
434 434
  $form->header;
435 435
  if ($form->{CFDD_shipto} && $form->{CFDD_shipto_id} ) {
js/kivi.SalesPurchase.js
22 22
    kivi.popup_dialog({
23 23
      id:    'edit_longdescription_dialog',
24 24
      dialog: {
25
        title: kivi.t8('Enter longdescription')
25
        title: kivi.t8('Enter longdescription'),
26
        open:  function() { kivi.set_focus('#popup_edit_longdescription_input'); }
26 27
      }
27 28
    });
28 29
  };
js/kivi.js
190 190

  
191 191
    if (!params.url) {
192 192
      // Use existing DOM element and show it. No AJAX call.
193
      dialog = $('#' + id).dialog(dialog_params);
193
      dialog =
194
        $('#' + id)
195
        .bind('dialogopen', function() {
196
          ns.run_once_for('.texteditor-in-dialog,.texteditor-dialog', 'texteditor', kivi.init_text_editor);
197
        })
198
        .dialog(dialog_params);
194 199
      return true;
195 200
    }
196 201

  
templates/webpages/generic/set_longdescription.html
20 20
  </table>
21 21
 </p>
22 22

  
23
 <p>[% L.textarea_tag("popup_edit_longdescription_input", "", wrap="soft", style="width: 750px; height: 240px;") %]</p>
23
 <p>[% L.textarea_tag("popup_edit_longdescription_input", "", class="texteditor-in-dialog" wrap="soft", style="width: 750px; height: 220px;") %]</p>
24 24

  
25 25
 <p>
26 26
  [% L.button_tag("kivi.SalesPurchase.set_longdescription()", LxERP.t8("Close")) %]

Auch abrufbar als: Unified diff