View | Details | Raw Unified | Return to bug 20644
Collapse All | Expand All

(-)a/Koha/Schema/Result/Itemtype.pm (-1 / +18 lines)
Lines 176-181 Group this item type with others with the same value on OPAC search options Link Here
176
176
177
If automatic checkin is enabled for items of this type
177
If automatic checkin is enabled for items of this type
178
178
179
<<<<<<< HEAD
179
=head2 bookable
180
=head2 bookable
180
181
181
  data_type: 'tinyint'
182
  data_type: 'tinyint'
Lines 183-188 If automatic checkin is enabled for items of this type Link Here
183
  is_nullable: 0
184
  is_nullable: 0
184
185
185
Activate bookable feature for items related to this item type
186
Activate bookable feature for items related to this item type
187
=======
188
=head2 checkprevcheckout
189
190
  data_type: 'varchar'
191
  default_value: 'inherit'
192
  is_nullable: 0
193
  size: 7
194
195
Produce a warning for a patron if a item of this type has previously been checked out to the same patron if 'yes', not if 'no', defer to category setting if 'inherit'.
196
>>>>>>> Bug 20644: [DO NOT PUSH] DBIC Update
186
197
187
=cut
198
=cut
188
199
Lines 232-237 __PACKAGE__->add_columns( Link Here
232
  { data_type => "tinyint", default_value => 0, is_nullable => 0 },
243
  { data_type => "tinyint", default_value => 0, is_nullable => 0 },
233
  "bookable",
244
  "bookable",
234
  { data_type => "tinyint", default_value => 0, is_nullable => 0 },
245
  { data_type => "tinyint", default_value => 0, is_nullable => 0 },
246
  "checkprevcheckout",
247
  {
248
    data_type => "varchar",
249
    default_value => "inherit",
250
    is_nullable => 0,
251
    size => 7,
252
  },
235
);
253
);
236
254
237
=head1 PRIMARY KEY
255
=head1 PRIMARY KEY
238
- 

Return to bug 20644