From: Bernd Bleßmann Date: Wed, 5 Jan 2022 13:57:12 +0000 (+0100) Subject: Anzahlungs-Rg.: files und Webdav-Zuordnungen für neue Typen X-Git-Tag: kivitendo-mebil_0.1-0~10^2~2^2~217^2~11 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=3f9da67be7a7a671fe4536f476c0587cb2dd358c;p=kivitendo-erp.git Anzahlungs-Rg.: files und Webdav-Zuordnungen für neue Typen --- diff --git a/SL/Controller/File.pm b/SL/Controller/File.pm index 7cd9406d0..77e1d9bee 100644 --- a/SL/Controller/File.pm +++ b/SL/Controller/File.pm @@ -59,6 +59,8 @@ my %file_types = ( 'sales_order' => { gen => 5, gltype => '', dir =>'SalesOrder', model => 'Order', right => 'import_ar' }, 'sales_delivery_order' => { gen => 1, gltype => '', dir =>'SalesDeliveryOrder', model => 'DeliveryOrder', right => 'import_ar' }, 'invoice' => { gen => 1, gltype => 'ar', dir =>'SalesInvoice', model => 'Invoice', right => 'import_ar' }, + 'invoice_for_advance_payment' => { gen => 1, gltype => 'ar', dir =>'SalesInvoice', model => 'Invoice', right => 'import_ar' }, + 'final_invoice' => { gen => 1, gltype => 'ar', dir =>'SalesInvoice', model => 'Invoice', right => 'import_ar' }, 'credit_note' => { gen => 1, gltype => '', dir =>'CreditNote', model => 'Invoice', right => 'import_ar' }, 'request_quotation' => { gen => 7, gltype => '', dir =>'RequestForQuotation', model => 'Order', right => 'import_ap' }, 'purchase_order' => { gen => 7, gltype => '', dir =>'PurchaseOrder', model => 'Order', right => 'import_ap' }, diff --git a/SL/File/Backend/Webdav.pm b/SL/File/Backend/Webdav.pm index 2956e03f9..9721dfc3f 100644 --- a/SL/File/Backend/Webdav.pm +++ b/SL/File/Backend/Webdav.pm @@ -121,6 +121,8 @@ my %type_to_path = ( purchase_delivery_order => 'einkaufslieferscheine', credit_note => 'gutschriften', invoice => 'rechnungen', + invoice_for_advance_payment => 'rechnungen', + final_invoice => 'rechnungen', purchase_invoice => 'einkaufsrechnungen', part => 'waren', service => 'dienstleistungen', @@ -143,6 +145,8 @@ my %type_to_model = ( purchase_delivery_order => 'DeliveryOrder', credit_note => 'Invoice', invoice => 'Invoice', + invoice_for_advance_payment => 'Invoice', + final_invoice => 'Invoice', purchase_invoice => 'PurchaseInvoice', part => 'Part', service => 'Part', diff --git a/SL/Webdav.pm b/SL/Webdav.pm index 0b27d7dc6..474041a83 100644 --- a/SL/Webdav.pm +++ b/SL/Webdav.pm @@ -25,6 +25,8 @@ my %type_to_path = ( purchase_delivery_order => 'einkaufslieferscheine', credit_note => 'gutschriften', invoice => 'rechnungen', + invoice_for_advance_payment => 'rechnungen', + final_invoice => 'rechnungen', purchase_invoice => 'einkaufsrechnungen', part => 'waren', service => 'dienstleistungen', diff --git a/sql/Pg-upgrade2/file_storage_partial_invoices.sql b/sql/Pg-upgrade2/file_storage_partial_invoices.sql new file mode 100644 index 000000000..7fed883ac --- /dev/null +++ b/sql/Pg-upgrade2/file_storage_partial_invoices.sql @@ -0,0 +1,18 @@ +-- @tag: file_storage_partial_invoices +-- @description: Dateispeicher auch für Anzahlungs- und Schlussrechnung +-- @depends: file_storage_project + +ALTER TABLE files + DROP CONSTRAINT valid_type; +ALTER TABLE files + ADD CONSTRAINT valid_type CHECK ( + (object_type = 'credit_note' ) OR (object_type = 'invoice' ) OR (object_type = 'sales_order' ) + OR (object_type = 'sales_quotation' ) OR (object_type = 'sales_delivery_order' ) OR (object_type = 'request_quotation' ) + OR (object_type = 'purchase_order' ) OR (object_type = 'purchase_delivery_order' ) OR (object_type = 'purchase_invoice' ) + OR (object_type = 'vendor' ) OR (object_type = 'customer' ) OR (object_type = 'part' ) + OR (object_type = 'gl_transaction' ) OR (object_type = 'dunning' ) OR (object_type = 'dunning1' ) + OR (object_type = 'dunning2' ) OR (object_type = 'dunning3' ) OR (object_type = 'dunning_orig_invoice' ) + OR (object_type = 'dunning_invoice' ) OR (object_type = 'draft' ) OR (object_type = 'statement' ) + OR (object_type = 'shop_image' ) OR (object_type = 'letter' ) OR (object_type = 'project' ) + OR (object_type = 'invoice_for_advance_payment') OR (object_type = 'final_invoice') + );