Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 0bb0eb67

Von Stephan Köhler vor fast 19 Jahren hinzugefügt

  • ID 0bb0eb67db98f28ec8faf8dfe8c233268332f842
  • Vorgänger e44cbe16
  • Nachfolger 138255b0

Merge von 641,653 aus unstable: Preisgruppen Teil 3
-Preisgruppen Kommentar entfernt, nach Perltidy formatiert
-Menue Berichte Preisgruppen verschoben, Hola raus & locales angepasst

Unterschiede anzeigen:

bin/mozilla/ir.pl
43 43

  
44 44
sub add {
45 45
  $lxdebug->enter_sub();
46
print STDERR "ir.pl-add\n";
46

  
47 47
  $form->{title} = $locale->text('Add Vendor Invoice');
48 48

  
49 49
  &invoice_links;
......
67 67

  
68 68
sub invoice_links {
69 69
  $lxdebug->enter_sub();
70
print STDERR "ir.pl-invoice_links\n";
70

  
71 71
  # create links
72 72
  $form->{webdav} = $webdav;
73 73

  
......
160 160

  
161 161
sub prepare_invoice {
162 162
  $lxdebug->enter_sub();
163
print STDERR "ir.pl-prepare_invoice\n";
163

  
164 164
  if ($form->{id}) {
165 165

  
166 166
    map { $form->{$_} =~ s/\"/"/g } qw(invnumber ordnumber quonumber);
......
176 176
      $form->{"sellprice_$i"} =
177 177
        $form->format_amount(\%myconfig, $form->{"sellprice_$i"},
178 178
                             $decimalplaces);
179
      
179

  
180 180
      (my $dec_qty) = ($form->{"qty_$i"} =~ /\.(\d+)/);
181
      $dec_qty      = length $dec_qty;
182
      
181
      $dec_qty = length $dec_qty;
182

  
183 183
      $form->{"qty_$i"} =
184 184
        $form->format_amount(\%myconfig, ($form->{"qty_$i"} * -1), $dec_qty);
185 185

  
......
192 192

  
193 193
sub form_header {
194 194
  $lxdebug->enter_sub();
195
print STDERR "ir.pl-form_header\n";
195

  
196 196
  # set option selected
197 197
  foreach $item (qw(AP vendor currency department contact)) {
198 198
    $form->{"select$item"} =~ s/ selected//;
......
227 227
    if ($form->{forex}) {
228 228
      $exchangerate .= qq|
229 229
                <th align=right nowrap>|
230
        . $locale->text('Exchangerate')
231
        . qq|</th>
230
        . $locale->text('Exchangerate') . qq|</th>
232 231
                <td>$form->{exchangerate}<input type=hidden name=exchangerate value=$form->{exchangerate}></td>
233 232
|;
234 233
    } else {
235 234
      $exchangerate .= qq|
236 235
                <th align=right nowrap>|
237
        . $locale->text('Exchangerate')
238
        . qq|</th>
236
        . $locale->text('Exchangerate') . qq|</th>
239 237
                <td><input name=exchangerate size=10 value=$form->{exchangerate}></td>
240 238
|;
241 239
    }
......
274 272
    $button1 = qq|
275 273
       <td><input name=invdate id=invdate size=11 title="$myconfig{dateformat}" value=$form->{invdate}></td>
276 274
       <td><input type=button name=invdate id="trigger1" value=|
277
      . $locale->text('button')
278
      . qq|></td>
275
      . $locale->text('button') . qq|></td>
279 276
       |;
280 277
    $button2 = qq|
281 278
       <td width="13"><input name=duedate id=duedate size=11 title="$myconfig{dateformat}" value=$form->{duedate}></td>
282 279
       <td width="4"><input type=button name=duedate id="trigger2" value=|
283
      . $locale->text('button')
284
      . qq|></td></td>
280
      . $locale->text('button') . qq|></td></td>
285 281
     |;
286 282

  
287 283
    #write Trigger
......
335 331
		<td colspan=3>$vendor</td>
336 332

  
337 333
                <th align=richt nowrap>|
338
    . $locale->text('Contact Person')
339
    . qq|</th>
334
    . $locale->text('Contact Person') . qq|</th>
340 335
                <td colspan=3>$contact</td>
341 336

  
342 337
                <input type=hidden name=vendor_id value=$form->{vendor_id}>
......
421 416

  
422 417
sub form_footer {
423 418
  $lxdebug->enter_sub();
424
print STDERR "ir.pl-form_footer\n";
419

  
425 420
  $form->{invtotal} = $form->{invsubtotal};
426 421

  
427 422
  if (($rows = $form->numtextrows($form->{notes}, 25, 8)) < 2) {

Auch abrufbar als: Unified diff