Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision ee8cd38f

Von Jan Büren vor etwa 7 Jahren hinzugefügt

  • ID ee8cd38f439e1c8136fe7c1cbb31c5852d1cfd49
  • Vorgänger 36927d81
  • Nachfolger 0c121016

Vorbelegte E-Mail-Texte um Vorbelegung periodic invoices ergänzt

Unterschiede anzeigen:

bin/mozilla/generictranslations.pl
10 10
# and will be preset in $form email dialog if the form name matches
11 11

  
12 12
my %mail_strings = (
13
  salutation_male                     => t8('Salutation male'),
14
  salutation_female                   => t8('Salutation female'),
15
  salutation_general                  => t8('Salutation general'),
16
  salutation_punctuation_mark         => t8('Salutation punctuation mark'),
17
  preset_text_sales_quotation         => t8('Preset email text for sales quotations'),
18
  preset_text_sales_order             => t8('Preset email text for sales orders'),
19
  preset_text_sales_delivery_order    => t8('Preset email text for sales delivery orders'),
20
  preset_text_invoice                 => t8('Preset email text for sales invoices'),
21
  preset_text_request_quotation       => t8('Preset email text for requests (rfq)'),
22
  preset_text_purchase_order          => t8('Preset email text for purchase orders'),
13
  salutation_male                             => t8('Salutation male'),
14
  salutation_female                           => t8('Salutation female'),
15
  salutation_general                          => t8('Salutation general'),
16
  salutation_punctuation_mark                 => t8('Salutation punctuation mark'),
17
  preset_text_sales_quotation                 => t8('Preset email text for sales quotations'),
18
  preset_text_sales_order                     => t8('Preset email text for sales orders'),
19
  preset_text_sales_delivery_order            => t8('Preset email text for sales delivery orders'),
20
  preset_text_invoice                         => t8('Preset email text for sales invoices'),
21
  preset_text_request_quotation               => t8('Preset email text for requests (rfq)'),
22
  preset_text_purchase_order                  => t8('Preset email text for purchase orders'),
23
  preset_text_periodic_invoices_email_body    => t8('Preset email body for periodic invoices'),
24
  preset_text_periodic_invoices_email_subject => t8('Preset email subject for periodic invoices'),
23 25
);
24 26

  
25 27
sub edit_greetings {
bin/mozilla/oe.pl
2117 2117
  $config = YAML::Load($::form->{periodic_invoices_config}) if $::form->{periodic_invoices_config};
2118 2118

  
2119 2119
  if ('HASH' ne ref $config) {
2120
    my $lang_id = $::form->{language_id};
2120 2121
    $config =  { periodicity             => 'm',
2121 2122
                 order_value_periodicity => 'p', # = same as periodicity
2122 2123
                 start_date_as_date      => $::form->{transdate} || $::form->current_date,
2123 2124
                 extend_automatically_by => 12,
2124 2125
                 active                  => 1,
2126
                 email_subject           => GenericTranslations->get(language_id => $lang_id,
2127
                                              translation_type =>"preset_text_periodic_invoices_email_subject"),
2128
                 email_body              => GenericTranslations->get(language_id => $lang_id,
2129
                                              translation_type =>"preset_text_periodic_invoices_email_body"),
2125 2130
               };
2126 2131
  }
2127 2132

  
js/edit_periodic_invoices_config.js
6 6
  var config    = $('#periodic_invoices_config').val();
7 7
  var cus_id    = $('[name=customer_id]').val();
8 8
  var transdate = $('#transdate').val();
9
  var lang_id   = $('#language_id').val();
9 10

  
10 11
  var url       = "oe.pl?" +
11 12
    "action=edit_periodic_invoices_config&" +
12
    "customer_id="              + encodeURIComponent(cus_id) + "&" +
13
    "periodic_invoices_config=" + encodeURIComponent(config) + "&" +
13
    "customer_id="              + encodeURIComponent(cus_id)  + "&" +
14
    "language_id="              + encodeURIComponent(lang_id) + "&" +
15
    "periodic_invoices_config=" + encodeURIComponent(config)  + "&" +
14 16
    "transdate="                + encodeURIComponent(transdate || '');
15 17

  
16 18
  // alert(url);
locale/de/all
2277 2277
  'Prepare bank collection via SEPA XML' => 'Einzug via SEPA XML vorbereiten',
2278 2278
  'Prepare bank transfer via SEPA XML' => 'Überweisung via SEPA XML vorbereiten',
2279 2279
  'Prepayment'                  => 'Vorauszahlung',
2280
  'Preset email body for periodic invoices' => 'Vorbelegter E-Mail-Text für wiederkehrende Rechnungen',
2280 2281
  'Preset email strings'        => 'Vorbelegte E-Mail-Texte',
2282
  'Preset email subject for periodic invoices' => 'Vorbelegter E-Mail-Betreff für wiederkehrende Rechnungen',
2281 2283
  'Preset email text for purchase orders' => 'Vorbelegter E-Mail-Text für Einkaufsaufträge',
2282 2284
  'Preset email text for requests (rfq)' => 'Vorbelegter E-Mail-Text für Anfragen',
2283 2285
  'Preset email text for sales delivery orders' => 'Vorbelegter E-Mail-Text für Verkaufs-Lieferscheine',
templates/webpages/generictranslations/edit_email_strings.html
22 22
       [%- ELSE %]
23 23
       [%- HTML.escape(language.description) %]
24 24
       [%- END %]
25
       [%- IF mail_string.search('preset_text_periodic_invoices') %]
26
        <br />
27
        <a href="doc/html/ch03.html#features.periodic-invoices.variables" target="_blank">?</a>
28
       [%- END %]
25 29
      </td>
26 30
      <td>
27 31
       [%- IF mail_string.search('preset') %]

Auch abrufbar als: Unified diff