Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 5ee57de8

Von Sven Schöling vor fast 15 Jahren hinzugefügt

  • ID 5ee57de8a130f13418e9013102963e4336e72f6d
  • Vorgänger 73116cec
  • Nachfolger 37d1a010

Lieferungen für Lieferanten in der Stammdaten->Lieferantenmaske hatte ein paar Daten nicht korrekt auf Lieferant geändert.

Fix für Bug 1130.

Unterschiede anzeigen:

bin/mozilla/ct.pl
659 659
}
660 660

  
661 661
sub get_delivery {
662
  $main::lxdebug->enter_sub();
662
  $::lxdebug->enter_sub;
663 663

  
664
  $main::auth->assert('customer_vendor_edit');
665
  $main::auth->assert('sales_all_edit');
664
  $::auth->assert('customer_vendor_edit');
665
  $::auth->assert('sales_all_edit');
666 666

  
667
  my $form     = $main::form;
668
  my %myconfig = %main::myconfig;
667
  CT->get_delivery(\%::myconfig, $::form );
669 668

  
670
  CT->get_delivery(\%myconfig, \%$form );
671
  $form->{IS_CUSTOMER} = $form->{db} eq 'customer';
672

  
673
  print $form->ajax_response_header(), $form->parse_html_template('ct/get_delivery');
669
  print $::form->ajax_response_header,
670
        $::form->parse_html_template('ct/get_delivery', {
671
          is_customer =>  $::form->{db} eq 'customer',
672
        });
674 673

  
675
  $main::lxdebug->leave_sub();
674
  $::lxdebug->leave_sub;
676 675
}
677 676

  
678 677
sub delete_shipto {
templates/webpages/ct/get_delivery_de.html
11 11
          <th class="listheading">Beschreibung</th>
12 12
          <th class="listheading">Menge</th>
13 13
          <th class="listheading">Einheit</th>
14
[%- IF is_customer %]
14 15
          <th class="listheading">Verkaufspreis</th>
16
[%- ELSE %]
17
          <th class="listheading">Einkaufspreis</th>
18
[%- END %]
15 19
        </tr>
16 20
[%- FOREACH row = DELIVERY %]
17 21
        <tr class="listrow[% loop.count % 2 %]">
18 22
          <td>[% HTML.escape(row.shiptoname) UNLESS loop.prev.shiptoname == row.shiptoname %]&nbsp;</td>
19
          <td>[% IF row.id %]<a href='[% IF IS_CUSTOMER %]is[% ELSE %]ir[% END %].pl?action=edit&id=[% HTML.escape(row.id) %]'>[% END %][% HTML.escape(row.invnumber)   || '&nbsp;' %][% IF row.id %]</a>[% END %]</td>
20
          <td>[% IF row.oe_id %]<a href='oe.pl?action=edit&type=sales_order&vc=customer&id=[% HTML.escape(row.oe_id) %]'>[% END %][% HTML.escape(row.ordnumber)   || '&nbsp;' %][% IF row.oe_id %]</a>[% END %]</td>
23
          <td>[% IF row.id %]<a href='[% IF is_customer %]is[% ELSE %]ir[% END %].pl?action=edit&id=[% HTML.escape(row.id) %]'>[% END %][% HTML.escape(row.invnumber)   || '&nbsp;' %][% IF row.id %]</a>[% END %]</td>
24
          <td>[% IF row.oe_id %]<a href='oe.pl?action=edit&type=[% IF is_customer %]sales_order[% ELSE %]purchase_order[% END %]&vc=customer&id=[% HTML.escape(row.oe_id) %]'>[% END %][% HTML.escape(row.ordnumber)   || '&nbsp;' %][% IF row.oe_id %]</a>[% END %]</td>
21 25
          <td>[% HTML.escape(row.transdate)   || '&nbsp;' %]</td>
22 26
          <td>[% HTML.escape(row.description) || '&nbsp;' %]</td>
23 27
          <td>[% HTML.escape(row.qty)         || '&nbsp;' %]</td>
templates/webpages/ct/get_delivery_master.html
11 11
          <th class="listheading"><translate>Description</translate></th>
12 12
          <th class="listheading"><translate>Qty</translate></th>
13 13
          <th class="listheading"><translate>Unit</translate></th>
14
[%- IF is_customer %]
14 15
          <th class="listheading"><translate>Sell Price</translate></th>
16
[%- ELSE %]
17
          <th class="listheading"><translate>Last Cost</translate></th>
18
[%- END %]
15 19
        </tr>
16 20
[%- FOREACH row = DELIVERY %]
17 21
        <tr class="listrow[% loop.count % 2 %]">
18 22
          <td>[% HTML.escape(row.shiptoname) UNLESS loop.prev.shiptoname == row.shiptoname %]&nbsp;</td>
19
          <td>[% IF row.id %]<a href='[% IF IS_CUSTOMER %]is[% ELSE %]ir[% END %].pl?action=edit&id=[% HTML.escape(row.id) %]'>[% END %][% HTML.escape(row.invnumber)   || '&nbsp;' %][% IF row.id %]</a>[% END %]</td>
20
          <td>[% IF row.oe_id %]<a href='oe.pl?action=edit&type=sales_order&vc=customer&id=[% HTML.escape(row.oe_id) %]'>[% END %][% HTML.escape(row.ordnumber)   || '&nbsp;' %][% IF row.oe_id %]</a>[% END %]</td>
23
          <td>[% IF row.id %]<a href='[% IF is_customer %]is[% ELSE %]ir[% END %].pl?action=edit&id=[% HTML.escape(row.id) %]'>[% END %][% HTML.escape(row.invnumber)   || '&nbsp;' %][% IF row.id %]</a>[% END %]</td>
24
          <td>[% IF row.oe_id %]<a href='oe.pl?action=edit&type=[% IF is_customer %]sales_order[% ELSE %]purchase_order[% END %]&vc=customer&id=[% HTML.escape(row.oe_id) %]'>[% END %][% HTML.escape(row.ordnumber)   || '&nbsp;' %][% IF row.oe_id %]</a>[% END %]</td>
21 25
          <td>[% HTML.escape(row.transdate)   || '&nbsp;' %]</td>
22 26
          <td>[% HTML.escape(row.description) || '&nbsp;' %]</td>
23 27
          <td>[% HTML.escape(row.qty)         || '&nbsp;' %]</td>

Auch abrufbar als: Unified diff