[0005711] Bad Content-type set for invoice mail attachment; malformed invoice mails...

[fa-stable.git] / sales / sales_order_entry.php

diff --git a/sales/sales_order_entry.php b/sales/sales_order_entry.php
index 9d87d93558b59985ccdb8ab20c5b3a136f7a9036..362723d7845af2967281eac6e8a38790d721e0fe 100644 (file)
--- a/sales/sales_order_entry.php
+++ b/sales/sales_order_entry.php
@@ -137,6 +137,8 @@ if (isset($_GET['AddedID'])) {
 
        submenu_option(_("Enter a &New Order"), "/sales/sales_order_entry.php?NewOrder=0");
 
+       submenu_option(_("Add an Attachment"), "/admin/attachments.php?filterType=".ST_SALESORDER."&trans_no=$order_no");
+
        display_footer_exit();
 
 } elseif (isset($_GET['UpdatedID'])) {
@@ -173,6 +175,8 @@ if (isset($_GET['AddedID'])) {
 
        submenu_option(_("Enter a New &Quotation"),     "/sales/sales_order_entry.php?NewQuotation=0");
 
+       submenu_option(_("Add an Attachment"), "/admin/attachments.php?filterType=".ST_SALESQUOTE."&trans_no=$order_no");
+
        display_footer_exit();
 
 } elseif (isset($_GET['UpdatedQU'])) {
@@ -218,6 +222,8 @@ if (isset($_GET['AddedID'])) {
                submenu_option(_("Enter a &New Delivery"), 
                        "/sales/sales_order_entry.php?NewDelivery=0");
 
+       submenu_option(_("Add an Attachment"), "/admin/attachments.php?filterType=".ST_CUSTDELIVERY."&trans_no=$delivery");
+
        display_footer_exit();
 
 } elseif (isset($_GET['AddedDI'])) {
@@ -454,7 +460,8 @@ function can_process() {
                return false;
        }
 
-       if ($_SESSION['Items']->payment_terms['cash_sale']) 
+       if ($_SESSION['Items']->payment_terms['cash_sale'] && 
+               ($_SESSION['Items']->trans_type == ST_CUSTDELIVERY || $_SESSION['Items']->trans_type == ST_SALESINVOICE)) 
                $_SESSION['Items']->due_date = $_SESSION['Items']->document_date;
        return true;
 }