projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Webdav: neue typen für Lieferscheine
[kivitendo-erp.git]
/
bin
/
mozilla
/
io.pl
diff --git
a/bin/mozilla/io.pl
b/bin/mozilla/io.pl
index
46bad90
..
2f0fb95
100644
(file)
--- a/
bin/mozilla/io.pl
+++ b/
bin/mozilla/io.pl
@@
-1205,6
+1205,15
@@
sub print_form {
if ($form->{formname} eq "invoice") {
$form->{label} = $locale->text('Invoice');
}
if ($form->{formname} eq "invoice") {
$form->{label} = $locale->text('Invoice');
}
+
+ if ($form->{formname} eq "invoice_for_advance_payment") {
+ $form->{label} = $locale->text('Invoice for Advance Payment');
+ }
+
+ if ($form->{formname} eq "final_invoice") {
+ $form->{label} = $locale->text('Final Invoice');
+ }
+
if ($form->{formname} eq 'sales_order') {
$inv = "ord";
$due = "req";
if ($form->{formname} eq 'sales_order') {
$inv = "ord";
$due = "req";
@@
-1302,7
+1311,7
@@
sub print_form {
}
$form->{TEMPLATE_DRIVER_OPTIONS} = { };
}
$form->{TEMPLATE_DRIVER_OPTIONS} = { };
- if (any { $form->{type} eq $_ } qw(sales_quotation sales_order sales_delivery_order invoice request_quotation purchase_order purchase_delivery_order credit_note)) {
+ if (any { $form->{type} eq $_ } qw(sales_quotation sales_order sales_delivery_order invoice
invoice_for_advance_payment final_invoice
request_quotation purchase_order purchase_delivery_order credit_note)) {
$form->{TEMPLATE_DRIVER_OPTIONS}->{variable_content_types} = $form->get_variable_content_types();
}
$form->{TEMPLATE_DRIVER_OPTIONS}->{variable_content_types} = $form->get_variable_content_types();
}
@@
-1886,6
+1895,7
@@
sub _make_record_item {
request_quotation => 'OrderItem',
invoice => 'InvoiceItem',
invoice_for_advance_payment => 'InvoiceItem',
request_quotation => 'OrderItem',
invoice => 'InvoiceItem',
invoice_for_advance_payment => 'InvoiceItem',
+ final_invoice => 'InvoiceItem',
credit_note => 'InvoiceItem',
purchase_invoice => 'InvoiceItem',
purchase_delivery_order => 'DeliveryOrderItem',
credit_note => 'InvoiceItem',
purchase_invoice => 'InvoiceItem',
purchase_delivery_order => 'DeliveryOrderItem',
@@
-1966,7
+1976,7
@@
sub _make_record {
sales_delivery_order => 'DeliveryOrder',
}->{$::form->{type}};
sales_delivery_order => 'DeliveryOrder',
}->{$::form->{type}};
- if ($::form->{type} =~ /invoice|
invoice_for_advance_payment|
credit_note/) {
+ if ($::form->{type} =~ /invoice|credit_note/) {
$class = $::form->{vc} eq 'customer' ? 'Invoice'
: $::form->{vc} eq 'vendor' ? 'PurchaseInvoice'
: do { die 'unknown invoice type' };
$class = $::form->{vc} eq 'customer' ? 'Invoice'
: $::form->{vc} eq 'vendor' ? 'PurchaseInvoice'
: do { die 'unknown invoice type' };