Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision d8b2ca90

Von Bernd Bleßmann vor etwa 12 Jahren hinzugefügt

"Löschen"-Knopf anzeigen in Mandantenkonfiguration einstellbar

für Aufträge und Lieferscheine.

Unterschiede anzeigen:

SL/Controller/ClientConfig.pm
41 41
  #check_on_dunning = 0
42 42
  #check_on_sepa_import = 0
43 43

  
44
  map { $self->{$_} = SL::DB::Default->get->$_ } qw(sales_order_show_delete purchase_order_show_delete sales_delivery_order_show_delete purchase_delivery_order_show_delete);
45

  
44 46
  $self->render('client_config/form', title => $::locale->text('Client Configuration'));
45 47
}
46 48

  
......
60 62

  
61 63
  map { SL::DB::Default->get->update_attributes($_ => $::form->{$_}); } qw(datev_check_on_sales_invoice datev_check_on_purchase_invoice datev_check_on_ar_transaction datev_check_on_ap_transaction datev_check_on_gl_transaction);
62 64

  
65
  map { SL::DB::Default->get->update_attributes($_ => $::form->{$_}); } qw(sales_order_show_delete purchase_order_show_delete sales_delivery_order_show_delete purchase_delivery_order_show_delete);
66

  
63 67
  flash_later('info', $::locale->text('Client Configuration saved!'));
64 68

  
65 69
  $self->redirect_to(action => 'edit');
SL/DB/MetaSetup/Default.pm
10 10
  table   => 'defaults',
11 11

  
12 12
  columns => [
13
    inventory_accno_id              => { type => 'integer' },
14
    income_accno_id                 => { type => 'integer' },
15
    expense_accno_id                => { type => 'integer' },
16
    fxgain_accno_id                 => { type => 'integer' },
17
    fxloss_accno_id                 => { type => 'integer' },
18
    invnumber                       => { type => 'text' },
19
    sonumber                        => { type => 'text' },
20
    weightunit                      => { type => 'varchar', length => 5 },
21
    businessnumber                  => { type => 'text' },
22
    version                         => { type => 'varchar', length => 8 },
23
    curr                            => { type => 'text' },
24
    closedto                        => { type => 'date' },
25
    revtrans                        => { type => 'boolean', default => 'false' },
26
    ponumber                        => { type => 'text' },
27
    sqnumber                        => { type => 'text' },
28
    rfqnumber                       => { type => 'text' },
29
    customernumber                  => { type => 'text' },
30
    vendornumber                    => { type => 'text' },
31
    audittrail                      => { type => 'boolean', default => 'false' },
32
    articlenumber                   => { type => 'text' },
33
    servicenumber                   => { type => 'text' },
34
    coa                             => { type => 'text' },
35
    itime                           => { type => 'timestamp', default => 'now()' },
36
    mtime                           => { type => 'timestamp' },
37
    rmanumber                       => { type => 'text' },
38
    cnnumber                        => { type => 'text' },
39
    dunning_ar_amount_fee           => { type => 'integer' },
40
    dunning_ar_amount_interest      => { type => 'integer' },
41
    dunning_ar                      => { type => 'integer' },
42
    pdonumber                       => { type => 'text' },
43
    sdonumber                       => { type => 'text' },
44
    ar_paid_accno_id                => { type => 'integer' },
45
    id                              => { type => 'serial', not_null => 1 },
46
    accounting_method               => { type => 'text' },
47
    inventory_system                => { type => 'text' },
48
    profit_determination            => { type => 'text' },
49
    language_id                     => { type => 'integer' },
50
    payments_changeable             => { type => 'integer', default => '0', not_null => 1 },
51
    show_bestbefore                 => { type => 'boolean', default => 'false' },
52
    datev_check_on_sales_invoice    => { type => 'boolean', default => 'true' },
53
    datev_check_on_purchase_invoice => { type => 'boolean', default => 'true' },
54
    datev_check_on_ar_transaction   => { type => 'boolean', default => 'true' },
55
    datev_check_on_ap_transaction   => { type => 'boolean', default => 'true' },
56
    datev_check_on_gl_transaction   => { type => 'boolean', default => 'true' },
57
    is_changeable                   => { type => 'integer', default => 2, not_null => 1 },
58
    ir_changeable                   => { type => 'integer', default => 2, not_null => 1 },
59
    ar_changeable                   => { type => 'integer', default => 2, not_null => 1 },
60
    ap_changeable                   => { type => 'integer', default => 2, not_null => 1 },
61
    gl_changeable                   => { type => 'integer', default => 2, not_null => 1 },
62
    is_show_mark_as_paid            => { type => 'boolean', default => 'true' },
63
    ir_show_mark_as_paid            => { type => 'boolean', default => 'true' },
64
    ar_show_mark_as_paid            => { type => 'boolean', default => 'true' },
65
    ap_show_mark_as_paid            => { type => 'boolean', default => 'true' },
13
    inventory_accno_id                  => { type => 'integer' },
14
    income_accno_id                     => { type => 'integer' },
15
    expense_accno_id                    => { type => 'integer' },
16
    fxgain_accno_id                     => { type => 'integer' },
17
    fxloss_accno_id                     => { type => 'integer' },
18
    invnumber                           => { type => 'text' },
19
    sonumber                            => { type => 'text' },
20
    weightunit                          => { type => 'varchar', length => 5 },
21
    businessnumber                      => { type => 'text' },
22
    version                             => { type => 'varchar', length => 8 },
23
    curr                                => { type => 'text' },
24
    closedto                            => { type => 'date' },
25
    revtrans                            => { type => 'boolean', default => 'false' },
26
    ponumber                            => { type => 'text' },
27
    sqnumber                            => { type => 'text' },
28
    rfqnumber                           => { type => 'text' },
29
    customernumber                      => { type => 'text' },
30
    vendornumber                        => { type => 'text' },
31
    audittrail                          => { type => 'boolean', default => 'false' },
32
    articlenumber                       => { type => 'text' },
33
    servicenumber                       => { type => 'text' },
34
    coa                                 => { type => 'text' },
35
    itime                               => { type => 'timestamp', default => 'now()' },
36
    mtime                               => { type => 'timestamp' },
37
    rmanumber                           => { type => 'text' },
38
    cnnumber                            => { type => 'text' },
39
    accounting_method                   => { type => 'text' },
40
    inventory_system                    => { type => 'text' },
41
    profit_determination                => { type => 'text' },
42
    dunning_ar_amount_fee               => { type => 'integer' },
43
    dunning_ar_amount_interest          => { type => 'integer' },
44
    dunning_ar                          => { type => 'integer' },
45
    pdonumber                           => { type => 'text' },
46
    sdonumber                           => { type => 'text' },
47
    ar_paid_accno_id                    => { type => 'integer' },
48
    id                                  => { type => 'serial', not_null => 1 },
49
    language_id                         => { type => 'integer' },
50
    payments_changeable                 => { type => 'integer', default => '0', not_null => 1 },
51
    show_bestbefore                     => { type => 'boolean', default => 'false' },
52
    datev_check_on_sales_invoice        => { type => 'boolean', default => 'true' },
53
    datev_check_on_purchase_invoice     => { type => 'boolean', default => 'true' },
54
    datev_check_on_ar_transaction       => { type => 'boolean', default => 'true' },
55
    datev_check_on_ap_transaction       => { type => 'boolean', default => 'true' },
56
    datev_check_on_gl_transaction       => { type => 'boolean', default => 'true' },
57
    is_changeable                       => { type => 'integer', default => 2, not_null => 1 },
58
    ir_changeable                       => { type => 'integer', default => 2, not_null => 1 },
59
    ar_changeable                       => { type => 'integer', default => 2, not_null => 1 },
60
    ap_changeable                       => { type => 'integer', default => 2, not_null => 1 },
61
    gl_changeable                       => { type => 'integer', default => 2, not_null => 1 },
62
    is_show_mark_as_paid                => { type => 'boolean', default => 'true' },
63
    ir_show_mark_as_paid                => { type => 'boolean', default => 'true' },
64
    ar_show_mark_as_paid                => { type => 'boolean', default => 'true' },
65
    ap_show_mark_as_paid                => { type => 'boolean', default => 'true' },
66
    sales_order_show_delete             => { type => 'boolean', default => 'true' },
67
    purchase_order_show_delete          => { type => 'boolean', default => 'true' },
68
    sales_delivery_order_show_delete    => { type => 'boolean', default => 'true' },
69
    purchase_delivery_order_show_delete => { type => 'boolean', default => 'true' },
66 70
  ],
67 71

  
68 72
  primary_key_columns => [ 'id' ],
SL/InstanceConfiguration.pm
124 124
  return $self->{data}->{ap_show_mark_as_paid};
125 125
}
126 126

  
127
sub get_sales_order_show_delete {
128
  my ($self) = @_;
129
  return $self->{data}->{sales_order_show_delete};
130
}
131

  
132
sub get_purchase_order_show_delete {
133
  my ($self) = @_;
134
  return $self->{data}->{purchase_order_show_delete};
135
}
136

  
137
sub get_sales_delivery_order_show_delete {
138
  my ($self) = @_;
139
  return $self->{data}->{sales_delivery_order_show_delete};
140
}
141

  
142
sub get_purchase_delivery_order_show_delete {
143
  my ($self) = @_;
144
  return $self->{data}->{purchase_delivery_order_show_delete};
145
}
146

  
127 147
1;
128 148

  
129 149
__END__
......
225 245
Returns the default behavior for showing the mark as paid button for the
226 246
corresponding record type (true or false).
227 247

  
248
=item C<get_sales_order_show_delete>
249

  
250
=item C<get_purchase_order_show_delete>
251

  
252
=item C<get_sales_delivery_order_show_delete>
253

  
254
=item C<get_purchase_delivery_order_show_delete>
255

  
256
Returns the default behavior for showing the delete button for the
257
corresponding record type (true or false).
258

  
228 259
=back
229 260

  
230 261
=head1 BUGS
locale/de/all
1329 1329
  'Order Number missing!'       => 'Auftragsnummer fehlt!',
1330 1330
  'Order deleted!'              => 'Auftrag gelöscht!',
1331 1331
  'Ordered'                     => 'Vom Kunde bestellt',
1332
  'Orders / Delivery Orders deleteable' => 'Aufträge / Lieferscheine löschbar',
1332 1333
  'Orientation'                 => 'Seitenformat',
1333 1334
  'Orphaned'                    => 'Nie benutzt',
1334 1335
  'Other users\' follow-ups'    => 'Wiedervorlagen anderer Benutzer',
......
1500 1501
  'Projects'                    => 'Projekte',
1501 1502
  'Projecttransactions'         => 'Projektbuchungen',
1502 1503
  'Prozentual/Absolut'          => 'Prozentual/Absolut',
1504
  'Purchase Delivery Orders deleteable' => 'Einkaufslieferscheine löschbar',
1503 1505
  'Purchase Invoice'            => 'Einkaufsrechnung',
1504 1506
  'Purchase Order'              => 'Lieferantenauftrag',
1505 1507
  'Purchase Orders'             => 'Lieferantenaufträge',
1508
  'Purchase Orders deleteable'  => 'Lieferantenaufträge löschbar',
1506 1509
  'Purchase Price'              => 'Einkaufspreis',
1507 1510
  'Purchase Prices'             => 'Einkaufspreise',
1508 1511
  'Purchase delivery order'     => 'Lieferschein (Einkauf)',
......
1605 1608
  'Saldo neu'                   => 'Saldo neu',
1606 1609
  'Saldo per'                   => 'Saldo per',
1607 1610
  'Sale Prices'                 => 'Verkaufspreise',
1611
  'Sales Delivery Orders deleteable' => 'Verkaufslieferscheine löschbar',
1608 1612
  'Sales Invoice'               => 'Rechnung',
1609 1613
  'Sales Invoices'              => 'Kundenrechnung',
1610 1614
  'Sales Order'                 => 'Kundenauftrag',
1611 1615
  'Sales Orders'                => 'Aufträge',
1616
  'Sales Orders deleteable'     => 'Kundenaufträge löschbar',
1612 1617
  'Sales Price information'     => 'Verkaufspreisinformation',
1613 1618
  'Sales Report'                => 'Verkaufsbericht',
1614 1619
  'Sales and purchase invoices with inventory transactions with taxkeys' => 'Einkaufs- und Verkaufsrechnungen mit Warenbestandsbuchungen mit Steuerschlüsseln',
......
1726 1731
  'Show TODO list'              => 'Aufgabenliste anzeigen',
1727 1732
  'Show by default'             => 'Standardm&auml;&szlig;ig anzeigen',
1728 1733
  'Show custom variable search inputs' => 'Suchoptionen für Benutzerdefinierte Variablen verstecken',
1734
  'Show delete button in purchase delivery orders?' => 'Soll der "Löschen"-Knopf bei Einkaufslieferscheinen angezeigt werden?',
1735
  'Show delete button in purchase orders?' => 'Soll der "Löschen"-Knopf bei Lieferantenaufträgen angezeigt werden?',
1736
  'Show delete button in sales delivery orders?' => 'Soll der "Löschen"-Knopf bei Verkaufslieferscheinen angezeigt werden?',
1737
  'Show delete button in sales orders?' => 'Soll der "Löschen"-Knopf bei Kundenaufträgen angezeigt werden?',
1729 1738
  'Show details'                => 'Detailsanzeige',
1730 1739
  'Show fields used for the best before date?' => 'Felder zur Eingabe des Mindesthaltbarkeitsdatums anzeigen?',
1731 1740
  'Show follow ups...'          => 'Zeige Wiedervorlagen...',
locale/de_DE/all
1294 1294
  'Order Number missing!'       => 'Auftragsnummer fehlt!',
1295 1295
  'Order deleted!'              => 'Auftrag gelöscht!',
1296 1296
  'Ordered'                     => 'Vom Kunde bestellt',
1297
  'Orders / Delivery Orders deleteable' => 'Aufträge / Lieferscheine löschbar',
1297 1298
  'Orientation'                 => 'Seitenformat',
1298 1299
  'Orphaned'                    => 'Nie benutzt',
1299 1300
  'Other users\' follow-ups'    => 'Wiedervorlagen anderer Benutzer',
......
1463 1464
  'Projects'                    => 'Projekte',
1464 1465
  'Projecttransactions'         => 'Projektbuchungen',
1465 1466
  'Prozentual/Absolut'          => 'Prozentual/Absolut',
1467
  'Purchase Delivery Orders deleteable' => 'Einkaufslieferscheine löschbar',
1466 1468
  'Purchase Invoice'            => 'Einkaufsrechnung',
1467 1469
  'Purchase Order'              => 'Lieferantenauftrag',
1468 1470
  'Purchase Orders'             => 'Einkaufsbestellungen',
1471
  'Purchase Orders deleteable'  => 'Lieferantenaufträge löschbar',
1469 1472
  'Purchase Price'              => 'Einkaufspreis',
1470 1473
  'Purchase Prices'             => 'Einkaufspreise',
1471 1474
  'Purchase delivery order'     => 'Lieferschein (Einkauf)',
......
1564 1567
  'Saldo neu'                   => 'Saldo neu',
1565 1568
  'Saldo per'                   => 'Saldo per',
1566 1569
  'Sale Prices'                 => 'Verkaufspreise',
1570
  'Sales Delivery Orders deleteable' => 'Verkaufslieferscheine löschbar',
1567 1571
  'Sales Invoice'               => 'Rechnung',
1568 1572
  'Sales Invoices'              => 'Ausgangsrechnungen',
1569 1573
  'Sales Order'                 => 'Kundenauftrag',
1570 1574
  'Sales Orders'                => 'Aufträge',
1575
  'Sales Orders deleteable'     => 'Kundenaufträge löschbar',
1571 1576
  'Sales Price information'     => '',
1572 1577
  'Sales Report'                => 'Verkaufsbericht',
1573 1578
  'Sales and purchase invoices with inventory transactions with taxkeys' => 'Einkaufs- und Verkaufsrechnungen mit Warenbestandsbuchungen mit Steuerschlüsseln',
......
1680 1685
  'Show TODO list'              => 'Meine Aufgaben',
1681 1686
  'Show by default'             => 'Standardm&auml;&szlig;ig anzeigen',
1682 1687
  'Show custom variable search inputs' => 'Suche in erweiterten Datenfeldern',
1688
  'Show delete button in purchase delivery orders?' => 'Soll der "Löschen"-Knopf bei Einkaufslieferscheinen angezeigt werden?',
1689
  'Show delete button in purchase orders?' => 'Soll der "Löschen"-Knopf bei Lieferantenaufträgen angezeigt werden?',
1690
  'Show delete button in sales delivery orders?' => 'Soll der "Löschen"-Knopf bei Verkaufslieferscheinen angezeigt werden?',
1691
  'Show delete button in sales orders?' => 'Soll der "Löschen"-Knopf bei Kundenaufträgen angezeigt werden?',
1683 1692
  'Show details'                => 'Detailsanzeige',
1684 1693
  'Show fields used for the best before date?' => 'Felder zur Eingabe des Mindesthaltbarkeitsdatums anzeigen?',
1685 1694
  'Show follow ups...'          => 'Zeige Wiedervorlagen...',
locale/en/all
1310 1310
  'Order Number missing!'       => '',
1311 1311
  'Order deleted!'              => '',
1312 1312
  'Ordered'                     => '',
1313
  'Orders / Delivery Orders deleteable' => '',
1313 1314
  'Orientation'                 => '',
1314 1315
  'Orphaned'                    => '',
1315 1316
  'Other users\' follow-ups'    => '',
......
1480 1481
  'Projects'                    => '',
1481 1482
  'Projecttransactions'         => '',
1482 1483
  'Prozentual/Absolut'          => '',
1484
  'Purchase Delivery Orders deleteable' => '',
1483 1485
  'Purchase Invoice'            => '',
1484 1486
  'Purchase Order'              => '',
1485 1487
  'Purchase Orders'             => '',
1488
  'Purchase Orders deleteable'  => '',
1486 1489
  'Purchase Price'              => '',
1487 1490
  'Purchase Prices'             => '',
1488 1491
  'Purchase delivery order'     => '',
......
1583 1586
  'Saldo neu'                   => '',
1584 1587
  'Saldo per'                   => '',
1585 1588
  'Sale Prices'                 => '',
1589
  'Sales Delivery Orders deleteable' => '',
1586 1590
  'Sales Invoice'               => '',
1587 1591
  'Sales Invoices'              => '',
1588 1592
  'Sales Order'                 => '',
1589 1593
  'Sales Orders'                => '',
1594
  'Sales Orders deleteable'     => '',
1590 1595
  'Sales Price information'     => '',
1591 1596
  'Sales Report'                => '',
1592 1597
  'Sales and purchase invoices with inventory transactions with taxkeys' => '',
......
1703 1708
  'Show TODO list'              => '',
1704 1709
  'Show by default'             => '',
1705 1710
  'Show custom variable search inputs' => '',
1711
  'Show delete button in purchase delivery orders?' => '',
1712
  'Show delete button in purchase orders?' => '',
1713
  'Show delete button in sales delivery orders?' => '',
1714
  'Show delete button in sales orders?' => '',
1706 1715
  'Show details'                => '',
1707 1716
  'Show fields used for the best before date?' => '',
1708 1717
  'Show follow ups...'          => '',
sql/Pg-upgrade2/defaults_show_delete_on_orders.sql
1
-- @tag: defaults_show_delete_on_orders
2
-- @description: Einstellung, ob der "Löschen"-Knopf bei Aufträgen und Lieferscheinen angezeigt wird.
3
-- @depends: release_2_7_0
4
-- @charset: utf-8
5

  
6
ALTER TABLE defaults ADD COLUMN sales_order_show_delete             boolean DEFAULT TRUE;
7
ALTER TABLE defaults ADD COLUMN purchase_order_show_delete          boolean DEFAULT TRUE;
8
ALTER TABLE defaults ADD COLUMN sales_delivery_order_show_delete    boolean DEFAULT TRUE;
9
ALTER TABLE defaults ADD COLUMN purchase_delivery_order_show_delete boolean DEFAULT TRUE;
templates/webpages/client_config/form.html
131 131
 <tr> </tr>
132 132
 <tr> </tr>
133 133

  
134
 <tr class='listheading'>
135
   <th colspan="3">[% 'Orders / Delivery Orders deleteable' | $T8 %]</th>
136
 </tr>
137
 <tr>
138
   <td align="right">[% 'Sales Orders deleteable' | $T8 %]</td>
139
   <td>[% L.yes_no_tag('sales_order_show_delete', SELF.sales_order_show_delete) %]</td>
140
   <td>[% 'Show delete button in sales orders?' | $T8 %]</td>
141
 </tr>
142
 <tr>
143
   <td align="right">[% 'Purchase Orders deleteable' | $T8 %]</td>
144
   <td>[% L.yes_no_tag('purchase_order_show_delete', SELF.purchase_order_show_delete) %]</td>
145
   <td>[% 'Show delete button in purchase orders?' | $T8 %]</td>
146
 </tr>
147
 <tr>
148
   <td align="right">[% 'Sales Delivery Orders deleteable' | $T8 %]</td>
149
   <td>[% L.yes_no_tag('sales_delivery_order_show_delete', SELF.sales_delivery_order_show_delete) %]</td>
150
   <td>[% 'Show delete button in sales delivery orders?' | $T8 %]</td>
151
 </tr>
152
 <tr>
153
   <td align="right">[% 'Purchase Delivery Orders deleteable' | $T8 %]</td>
154
   <td>[% L.yes_no_tag('purchase_delivery_order_show_delete', SELF.purchase_delivery_order_show_delete) %]</td>
155
   <td>[% 'Show delete button in purchase delivery orders?' | $T8 %]</td>
156
 </tr>
157

  
158
 <tr> </tr>
159
 <tr> </tr>
160

  
134 161
 <tr class='listheading'>
135 162
   <th colspan="3">[% 'Warehouse' | $T8 %]</th>
136 163
 </tr>
......
157 184
[%- L.hidden_tag('action',  'ClientConfig/dispatch')  %]
158 185
[%- L.submit_tag('action_save',  LxERP.t8('Save'))  %]
159 186

  
187
<br><br>
188

  
160 189
</form>
templates/webpages/do/form_footer.html
82 82
  <p>
83 83
   [% 'Workflow Delivery Order' | $T8 %]<br>
84 84
   <input class="submit" type="submit" name="action_save_as_new" value="[% 'Save as new' | $T8 %]">
85
   [% UNLESS delivered %]
86
   <input class="submit" type="submit" name="action_delete" value="[% 'Delete' | $T8 %]">
85
   [% UNLESS delivered || (vc == 'customer' && !INSTANCE_CONF.get_sales_delivery_order_show_delete) || (vc == 'vendor' && !INSTANCE_CONF.get_purchase_delivery_order_show_delete) %]
86
     <input class="submit" type="submit" name="action_delete" value="[% 'Delete' | $T8 %]">
87 87
   [% END %]
88 88
   <input class="submit" type="submit" name="action_invoice" value="[% 'Invoice' | $T8 %]">
89 89
  </p>
templates/webpages/oe/form_footer.html
146 146

  
147 147
  <br>[% label_workflow %]<br>
148 148
  <input class="submit" type="submit" name="action_save_as_new" value="[% 'Save as new' | $T8 %]">
149
  <input class="submit" type="submit" name="action_delete" value="[% 'Delete' | $T8 %]">
149

  
150
  [%- UNLESS (is_sales_ord && !INSTANCE_CONF.get_sales_order_show_delete) || (is_pur_ord && !INSTANCE_CONF.get_purchase_order_show_delete) %]
151
    <input class="submit" type="submit" name="action_delete" value="[% 'Delete' | $T8 %]">
152
  [%- END %]
150 153

  
151 154
  [%- IF is_sales_quo %]
152 155
    <input class="submit" type="submit" name="action_sales_order" value="[% 'Sales Order' | $T8 %]">

Auch abrufbar als: Unified diff