Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -326,13 +326,13 @@ Map cancelInvoice() {
* @return Success response
*/
Map sendInvoicePerEmail() {
Map ctx = [*: parameters,
xslfoAttachScreenLocation: 'component://accounting/widget/AccountingPrintScreens.xml#InvoicePDF',
bodyParameters: [invoiceId: parameters.invoiceId,
userLogin: parameters.userLogin,
other: parameters.other]] //to print in 'other currency'
Map emailParams = dispatcher.getDispatchContext()
.makeValidContext([*: parameters,
xslfoAttachScreenLocation: 'component://accounting/widget/AccountingPrintScreens.xml#InvoicePDF',
bodyParameters: [invoiceId: parameters.invoiceId,
userLogin: parameters.userLogin,
other: parameters.other] //to print in 'other currency'
])
.makeValidContext('sendMailFromScreen', 'IN', ctx)
dispatcher.runAsync('sendMailFromScreen', emailParams)
return success(label('AccountingUiLabels', 'AccountingEmailScheduledToSend'))
}
Expand Down Expand Up @@ -563,7 +563,7 @@ Map addTaxOnInvoice() {
addTaxMap.itemAmountList << totalAmount
addTaxMap.itemPriceList << it.amount
addTaxMap.itemQuantityList << it.quantity
addTaxMap.itemShippingList << BigDecimal.ZERO
addTaxMap.itemShippingList << 0
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change is out of context of the ticket fix.
Is there any specific reason to include this in the current changes?

}
if (!addTaxMap.itemProductList) {
return error(label('AccountingUiLabels', 'AccountingTaxProductIdCannotCalculate'))
Expand Down