projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'bankerweiterung_und_skonto'
[kivitendo-erp.git]
/
SL
/
DB
/
MetaSetup
/
Default.pm
diff --git
a/SL/DB/MetaSetup/Default.pm
b/SL/DB/MetaSetup/Default.pm
index
d615345
..
5671a4b
100644
(file)
--- a/
SL/DB/MetaSetup/Default.pm
+++ b/
SL/DB/MetaSetup/Default.pm
@@
-40,6
+40,9
@@
__PACKAGE__->meta->columns(
datev_check_on_gl_transaction => { type => 'boolean', default => 'true' },
datev_check_on_purchase_invoice => { type => 'boolean', default => 'true' },
datev_check_on_sales_invoice => { type => 'boolean', default => 'true' },
datev_check_on_gl_transaction => { type => 'boolean', default => 'true' },
datev_check_on_purchase_invoice => { type => 'boolean', default => 'true' },
datev_check_on_sales_invoice => { type => 'boolean', default => 'true' },
+ delivery_plan_calculate_transferred_do => { type => 'boolean', default => 'false', not_null => 1 },
+ delivery_plan_show_value_of_goods => { type => 'boolean', default => 'false', not_null => 1 },
+ disabled_price_sources => { type => 'array' },
dunning_ar => { type => 'integer' },
dunning_ar_amount_fee => { type => 'integer' },
dunning_ar_amount_interest => { type => 'integer' },
dunning_ar => { type => 'integer' },
dunning_ar_amount_fee => { type => 'integer' },
dunning_ar_amount_interest => { type => 'integer' },
@@
-48,6
+51,7
@@
__PACKAGE__->meta->columns(
fxgain_accno_id => { type => 'integer' },
fxloss_accno_id => { type => 'integer' },
gl_changeable => { type => 'integer', default => 2, not_null => 1 },
fxgain_accno_id => { type => 'integer' },
fxloss_accno_id => { type => 'integer' },
gl_changeable => { type => 'integer', default => 2, not_null => 1 },
+ global_bcc => { type => 'text', default => '' },
id => { type => 'serial', not_null => 1 },
income_accno_id => { type => 'integer' },
inventory_accno_id => { type => 'integer' },
id => { type => 'serial', not_null => 1 },
income_accno_id => { type => 'integer' },
inventory_accno_id => { type => 'integer' },
@@
-57,8
+61,10
@@
__PACKAGE__->meta->columns(
ir_show_mark_as_paid => { type => 'boolean', default => 'true' },
is_changeable => { type => 'integer', default => 2, not_null => 1 },
is_show_mark_as_paid => { type => 'boolean', default => 'true' },
ir_show_mark_as_paid => { type => 'boolean', default => 'true' },
is_changeable => { type => 'integer', default => 2, not_null => 1 },
is_show_mark_as_paid => { type => 'boolean', default => 'true' },
+ is_transfer_out => { type => 'boolean', default => 'false', not_null => 1 },
itime => { type => 'timestamp', default => 'now()' },
language_id => { type => 'integer' },
itime => { type => 'timestamp', default => 'now()' },
language_id => { type => 'integer' },
+ letternumber => { type => 'integer' },
max_future_booking_interval => { type => 'integer', default => 360 },
mtime => { type => 'timestamp' },
normalize_part_descriptions => { type => 'boolean', default => 'true' },
max_future_booking_interval => { type => 'integer', default => 360 },
mtime => { type => 'timestamp' },
normalize_part_descriptions => { type => 'boolean', default => 'true' },
@@
-80,6
+86,7
@@
__PACKAGE__->meta->columns(
rmanumber => { type => 'text' },
sales_delivery_order_show_delete => { type => 'boolean', default => 'true' },
sales_order_show_delete => { type => 'boolean', default => 'true' },
rmanumber => { type => 'text' },
sales_delivery_order_show_delete => { type => 'boolean', default => 'true' },
sales_order_show_delete => { type => 'boolean', default => 'true' },
+ sales_purchase_order_ship_missing_column => { type => 'boolean', default => 'false' },
sdonumber => { type => 'text' },
sepa_creditor_id => { type => 'text' },
servicenumber => { type => 'text' },
sdonumber => { type => 'text' },
sepa_creditor_id => { type => 'text' },
servicenumber => { type => 'text' },