projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Zu Kontoauszug Zuordnung verbessern, alte Logik auch entfernen
[kivitendo-erp.git]
/
js
/
kivi.SalesPurchase.js
diff --git
a/js/kivi.SalesPurchase.js
b/js/kivi.SalesPurchase.js
index
98a538c
..
a350e19
100644
(file)
--- a/
js/kivi.SalesPurchase.js
+++ b/
js/kivi.SalesPurchase.js
@@
-18,7
+18,7
@@
namespace('kivi.SalesPurchase', function(ns) {
this.edit_longdescription_with_params = function(params) {
var $container = $('#popup_edit_longdescription_input_container');
this.edit_longdescription_with_params = function(params) {
var $container = $('#popup_edit_longdescription_input_container');
- var $edit = $('<textarea id="popup_edit_longdescription_input" class="texteditor-in-dialog" wrap="soft" style="width: 750px; height: 220px;"></textarea>');
+ var $edit = $('<textarea id="popup_edit_longdescription_input" class="texteditor-in-dialog
texteditor-space-for-toolbar
" wrap="soft" style="width: 750px; height: 220px;"></textarea>');
$container.children().remove();
$container.append($edit);
$container.children().remove();
$container.append($edit);
@@
-241,9
+241,17
@@
namespace('kivi.SalesPurchase', function(ns) {
if (!kivi.SalesPurchase.check_required_email_fields())
return false;
if (!kivi.SalesPurchase.check_required_email_fields())
return false;
+ // ckeditor gets de-initialized when removing the children from
+ // the DOM. Therefore we have to manually preserve its content
+ // over the children's relocation.
+
+ var message = $('#email_form_message').val();
+
$('#send_email_dialog').children().remove().appendTo('#email_inputs');
$('#send_email_dialog').dialog('close');
$('#send_email_dialog').children().remove().appendTo('#email_inputs');
$('#send_email_dialog').dialog('close');
+ $('#email_form_message').val(message);
+
kivi.submit_form_with_action('#form', $('#form').data('send-email-action'));
return true;
kivi.submit_form_with_action('#form', $('#form').data('send-email-action'));
return true;
@@
-255,6
+263,8
@@
namespace('kivi.SalesPurchase', function(ns) {
$('#print_options').children().remove().appendTo('#email_form_print_options');
$('#print_options').children().remove().appendTo('#email_form_print_options');
+ kivi.reinit_widgets();
+
var to_focus = $('#email_form_to').val() === '' ? 'to' : 'subject';
$('#email_form_' + to_focus).focus();
};
var to_focus = $('#email_form_to').val() === '' ? 'to' : 'subject';
$('#email_form_' + to_focus).focus();
};
@@
-264,10
+274,13
@@
namespace('kivi.SalesPurchase', function(ns) {
return true;
};
return true;
};
- this.show_email_dialog = function(send_action) {
+ this.show_email_dialog = function(send_action
, vc, vc_id_selector
) {
$('#form').data('send-email-action', send_action || 'send_sales_purchase_email');
$('#form').data('send-email-action', send_action || 'send_sales_purchase_email');
- var vc = $('#vc').val();
+ vc = vc || $('#vc').val();
+ vc_id_selector = vc_id_selector || '#' + vc + '_id';
+ var vc_id = $(vc_id_selector).val();
+
var data = {
action: 'show_sales_purchase_email_dialog',
cp_id: $('#cp_id').val(),
var data = {
action: 'show_sales_purchase_email_dialog',
cp_id: $('#cp_id').val(),
@@
-285,7
+298,7
@@
namespace('kivi.SalesPurchase', function(ns) {
quonumber: $('#quonumber').val(),
type: $('#type').val(),
vc: vc,
quonumber: $('#quonumber').val(),
type: $('#type').val(),
vc: vc,
- vc_id:
$('#' + vc + '_id').val()
,
+ vc_id:
vc_id
,
project_id: $('#globalproject_id').val(),
};
project_id: $('#globalproject_id').val(),
};
@@
-313,7
+326,7
@@
namespace('kivi.SalesPurchase', function(ns) {
this.activate_send_email_actions_regarding_printout = function() {
var selected = $('#email_form_attachment_policy').val();
$('#email_form_attachment_filename').parents('tr')[selected !== 'no_file' ? 'show' : 'hide']();
this.activate_send_email_actions_regarding_printout = function() {
var selected = $('#email_form_attachment_policy').val();
$('#email_form_attachment_filename').parents('tr')[selected !== 'no_file' ? 'show' : 'hide']();
- $('#email_form_print_options')[selected
=== 'normal
' ? 'show' : 'hide']();
+ $('#email_form_print_options')[selected
!== 'no_file
' ? 'show' : 'hide']();
};
// Printing records.
};
// Printing records.