Revision 09c5711c
Von Niclas Zimmermann vor mehr als 11 Jahren hinzugefügt
SL/Controller/ClientConfig.pm | ||
---|---|---|
79 | 79 |
|
80 | 80 |
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); |
81 | 81 |
|
82 |
<<<<<<< HEAD |
|
83 | 82 |
# undef warehouse_id if the empty value is selected |
84 | 83 |
if ( ($::form->{warehouse_id} == 0) && ($::form->{bin_id} == 0) ) { |
85 | 84 |
undef $::form->{warehouse_id}; |
86 | 85 |
undef $::form->{bin_id}; |
87 | 86 |
} |
88 | 87 |
map { SL::DB::Default->get->update_attributes($_ => $::form->{$_}); } qw(warehouse_id bin_id); |
89 |
======= |
|
88 |
|
|
90 | 89 |
SL::DB::Default->get->update_attributes('show_weight' => $::form->{show_weight}); |
91 |
>>>>>>> gewicht |
|
92 | 90 |
|
93 | 91 |
flash_later('info', $::locale->text('Client Configuration saved!')); |
94 | 92 |
|
Auch abrufbar als: Unified diff
Behebt Conflict
Ein Conflict wurde im letzten merge vergessen zu beheben.