Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 21efea72

Von Tamino Steinert vor etwa 1 Jahr hinzugefügt

  • ID 21efea721244f9be52be5c30b263d5c865f0e956
  • Vorgänger c9bb4db6
  • Nachfolger 07610dd3

DeliveryOrder: Links auf neuen Lieferschein-Controller zeigen lassen

Unterschiede anzeigen:

SL/Controller/TopQuickSearch/DeliveryOrder.pm
71 71

  
72 72
sub redirect_to_object {
73 73
  SL::Controller::Base->new->url_for(
74
    controller => 'do.pl',
75
    action     => 'edit',
76
    type       => $_[0]->type,
77
    vc         => $_[0]->vc,
74
    controller => 'controller.pl',
75
    action     => 'DeliveryOrder/edit',
78 76
    id         => $_[1],
79 77
  );
80 78
}
SL/FU.pm
391 391
  } elsif ($params{trans_type} eq 'sales_delivery_order') {
392 392

  
393 393
    $link = {
394
      'url'   => 'do.pl?action=edit&type=sales_delivery_order&id=' . $params{trans_id} . '&edit_note_id=' . $form->quote($params{note_id}),
394
      'url'   => 'controller.pl?action=DeliveryOrder/edit&id=' . $params{trans_id} . '&edit_note_id=' . $form->quote($params{note_id}),
395 395
      'title' => $locale->text('Sales delivery order') .' '. $params{trans_info},
396 396
    };
397 397

  
398 398
  } elsif ($params{trans_type} eq 'purchase_delivery_order') {
399 399

  
400 400
    $link = {
401
      'url'   => 'do.pl?action=edit&type=purchase_delivery_order&id=' . $params{trans_id} . '&edit_note_id=' . $form->quote($params{note_id}),
401
      'url'   => 'controller.pl?action=DeliveryOrder/edit&id=' . $params{trans_id} . '&edit_note_id=' . $form->quote($params{note_id}),
402 402
      'title' => $locale->text('Purchase delivery order') .' '. $params{trans_info},
403 403
    };
404 404

  
SL/Presenter/DeliveryOrder.pm
60 60

  
61 61
  my $text = escape($delivery_order->donumber);
62 62
  if (! delete $params{no_link}) {
63
    my $href = 'do.pl?action=edit&type=' . $type
63
    my $href = 'controller.pl?action=DeliveryOrder/edit'
64 64
               . '&id=' . escape($delivery_order->id);
65 65
    $text = link_tag($href, $text, %params);
66 66
  }
menus/user/00-erp.yaml
204 204
  icon: delivery_order_add
205 205
  order: 400
206 206
  access: sales_delivery_order_edit
207
  module: do.pl
208 207
  params:
209
    action: add
208
    action: DeliveryOrder/add
210 209
    type: sales_delivery_order
211 210
- parent: ar
212 211
  id: ar_add_sales_reclamation
......
433 432
  name: Add Delivery Note
434 433
  order: 300
435 434
  access: client/allow_new_purchase_delivery_order & purchase_delivery_order_edit
436
  module: do.pl
437 435
  params:
438
    action: add
436
    action: DeliveryOrder/add
439 437
    type: purchase_delivery_order
440 438
- parent: ap
441 439
  id: ap_add_purchase_reclamation
templates/design40_webpages/mass_delivery_order_print/_print_status.html
68 68

  
69 69
 [% FOREACH error = data.conversion_errors %]
70 70
     <tr>
71
      <td valign="top">[% IF error.id %][% L.link(SELF.url_for(controller='do.pl', action='edit', type='sales_delivery_order', id=error.id), HTML.escape(error.number), target="_blank") %][% ELSE %]–[% END %]</td>
71
      <td valign="top">[% IF error.id %][% L.link(SELF.url_for(controller='controller.pl', action='DeliveryOrder/edit', id=error.id), HTML.escape(error.number), target="_blank") %][% ELSE %]–[% END %]</td>
72 72
      <td valign="top">[% HTML.escape(error.message) %]</td>
73 73
     </tr>
74 74
 [% END %]
templates/design40_webpages/mass_delivery_order_print/list_delivery_orders.html
40 40
      <td>[% L.checkbox_tag('id[]', value=delivery_order.id, "data-checkall"=1, checked=selected_ids.$delivery_order_id) %]</td>
41 41
      <td>[% HTML.escape(delivery_order.transdate_as_date) %]</td>
42 42
      <td>[% HTML.escape(delivery_order.reqdate_as_date) %]</td>
43
      <td>[% L.link(SELF.url_for(controller="do.pl", action="edit", type="sales_delivery_order", id=delivery_order.id), delivery_order.donumber) %]</td>
43
      <td>[% L.link(SELF.url_for(controller="controller.pl", action="DeliveryOrder/edit", id=delivery_order.id), delivery_order.donumber) %]</td>
44 44
      <td>[% HTML.escape(delivery_order.ordnumber) %]</td>
45 45
      <td>[% HTML.escape(delivery_order.customer.name) %]</td>
46 46
      <td>[% HTML.escape(SELF.make_shipto_title(delivery_order.shipto || delivery_order.custom_shipto)) %]</td>
templates/design40_webpages/mass_invoice_create_print_from_do/_create_print_all_status.html
67 67

  
68 68
 [% FOREACH error = data.conversion_errors %]
69 69
     <tr>
70
      <td valign="top">[% IF error.id %][% L.link(SELF.url_for(controller='do.pl', action='edit', type='sales_delivery_order', id=error.id), HTML.escape(error.number), target="_blank") %][% ELSE %]–[% END %]</td>
70
      <td valign="top">[% IF error.id %][% L.link(SELF.url_for(controller='controller.pl', action='DeliveryOrder/edit', id=error.id), HTML.escape(error.number), target="_blank") %][% ELSE %]–[% END %]</td>
71 71
      <td valign="top">[% HTML.escape(error.message) %]</td>
72 72
     </tr>
73 73
 [% END %]
templates/design40_webpages/mass_invoice_create_print_from_do/list_invoices.html
41 41
              <td>[% L.link(SELF.url_for(controller="is.pl", action="edit", type="sales_invoice", id=invoice.id), invoice.invnumber) %]</td>
42 42
              <td>
43 43
                [% IF delivery_order %]
44
                  [% L.link(SELF.url_for(controller="do.pl", action="edit", id=delivery_order.id), delivery_order.donumber) %]
44
                  [% L.link(SELF.url_for(controller="controller.pl", action="DeliveryOrder/edit", id=delivery_order.id), delivery_order.donumber) %]
45 45
                [% ELSE %]
46 46
                  [% HTML.escape(invoice.donumber) %]
47 47
                [% END %]
templates/design40_webpages/mass_invoice_create_print_from_do/list_sales_delivery_orders.html
35 35
                <tr class="listrow">
36 36
                  <td>[% L.checkbox_tag('id[]', value=sales_delivery_order.id, "data-checkall"=1) %]</td>
37 37
                  <td>[% HTML.escape(sales_delivery_order.transdate_as_date) %]</td>
38
                  <td>[% L.link(SELF.url_for(controller="do.pl", action="edit", type="sales_delivery_order", id=sales_delivery_order.id), sales_delivery_order.donumber) %]</td>
38
                  <td>[% L.link(SELF.url_for(controller="controller.pl", action="DeliveryOrder/edit", id=sales_delivery_order.id), sales_delivery_order.donumber) %]</td>
39 39
                  [%- IF INSTANCE_CONF.get_feature_experimental_order -%]
40 40
                  <td>[% L.link(SELF.url_for(controller="controller.pl", action="Order/edit", type="sales_order", id=sales_delivery_order.sales_order.id), sales_delivery_order.ordnumber) %]</td>
41 41
                  [%- ELSE -%]
templates/webpages/mass_delivery_order_print/_print_status.html
68 68

  
69 69
 [% FOREACH error = data.conversion_errors %]
70 70
     <tr>
71
      <td valign="top">[% IF error.id %][% L.link(SELF.url_for(controller='do.pl', action='edit', type='sales_delivery_order', id=error.id), HTML.escape(error.number), target="_blank") %][% ELSE %]–[% END %]</td>
71
      <td valign="top">[% IF error.id %][% L.link(SELF.url_for(controller='controller.pl', action='DeliveryOrder/edit', id=error.id), HTML.escape(error.number), target="_blank") %][% ELSE %]–[% END %]</td>
72 72
      <td valign="top">[% HTML.escape(error.message) %]</td>
73 73
     </tr>
74 74
 [% END %]
templates/webpages/mass_delivery_order_print/list_delivery_orders.html
38 38
      <td>[% L.checkbox_tag('id[]', value=delivery_order.id, "data-checkall"=1, checked=selected_ids.$delivery_order_id) %]</td>
39 39
      <td>[% HTML.escape(delivery_order.transdate_as_date) %]</td>
40 40
      <td>[% HTML.escape(delivery_order.reqdate_as_date) %]</td>
41
      <td>[% L.link(SELF.url_for(controller="do.pl", action="edit", type="sales_delivery_order", id=delivery_order.id), delivery_order.donumber) %]</td>
41
      <td>[% L.link(SELF.url_for(controller="controller.pl", action="DeliveryOrder/edit", id=delivery_order.id), delivery_order.donumber) %]</td>
42 42
      <td>[% HTML.escape(delivery_order.ordnumber) %]</td>
43 43
      <td>[% HTML.escape(delivery_order.customer.name) %]</td>
44 44
      <td>[% HTML.escape(SELF.make_shipto_title(delivery_order.shipto || delivery_order.custom_shipto)) %]</td>
templates/webpages/mass_invoice_create_print_from_do/_create_print_all_status.html
68 68

  
69 69
 [% FOREACH error = data.conversion_errors %]
70 70
     <tr>
71
      <td valign="top">[% IF error.id %][% L.link(SELF.url_for(controller='do.pl', action='edit', type='sales_delivery_order', id=error.id), HTML.escape(error.number), target="_blank") %][% ELSE %]–[% END %]</td>
71
      <td valign="top">[% IF error.id %][% L.link(SELF.url_for(controller='controller.pl', action='DeliveryOrder/edit', type='sales_delivery_order', id=error.id), HTML.escape(error.number), target="_blank") %][% ELSE %]–[% END %]</td>
72 72
      <td valign="top">[% HTML.escape(error.message) %]</td>
73 73
     </tr>
74 74
 [% END %]
templates/webpages/mass_invoice_create_print_from_do/list_invoices.html
41 41
      <td>[% L.link(SELF.url_for(controller="is.pl", action="edit", type="sales_invoice", id=invoice.id), invoice.invnumber) %]</td>
42 42
      <td>
43 43
       [% IF delivery_order %]
44
        [% L.link(SELF.url_for(controller="do.pl", action="edit", id=delivery_order.id), delivery_order.donumber) %]
44
        [% L.link(SELF.url_for(controller="controller.pl", action="DeliveryOrder/edit", id=delivery_order.id), delivery_order.donumber) %]
45 45
       [% ELSE %]
46 46
        [% HTML.escape(invoice.donumber) %]
47 47
       [% END %]
templates/webpages/mass_invoice_create_print_from_do/list_sales_delivery_orders.html
35 35
     <tr class="listrow">
36 36
      <td>[% L.checkbox_tag('id[]', value=sales_delivery_order.id, "data-checkall"=1) %]</td>
37 37
      <td>[% HTML.escape(sales_delivery_order.transdate_as_date) %]</td>
38
      <td>[% L.link(SELF.url_for(controller="do.pl", action="edit", type="sales_delivery_order", id=sales_delivery_order.id), sales_delivery_order.donumber) %]</td>
38
      <td>[% L.link(SELF.url_for(controller="controller.pl", action="DeliveryOrder/edit", id=sales_delivery_order.id), sales_delivery_order.donumber) %]</td>
39 39
      [%- IF INSTANCE_CONF.get_feature_experimental_order -%]
40 40
        <td>[% L.link(SELF.url_for(controller="controller.pl", action="Order/edit", type="sales_order", id=sales_delivery_order.sales_order.id), sales_delivery_order.ordnumber) %]</td>
41 41
      [%- ELSE -%]

Auch abrufbar als: Unified diff