X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=sales%2Fcustomer_delivery.php;h=814ff8dcc7595fd0c4fc0f3375fec6bb242a271f;hb=662016203073a9d4737ad40359169f0b17189ef9;hp=f41b058d6233865cf00134e16ae2598701543a74;hpb=c07e889ccd4c5aa23f93e2b00266f93e370eeab0;p=fa-stable.git
diff --git a/sales/customer_delivery.php b/sales/customer_delivery.php
index f41b058d..814ff8dc 100644
--- a/sales/customer_delivery.php
+++ b/sales/customer_delivery.php
@@ -52,9 +52,9 @@ if (isset($_GET['AddedID'])) {
display_note(get_customer_trans_view_str(ST_CUSTDELIVERY, $dispatch_no, _("&View This Delivery")), 0, 1);
display_note(print_document_link($dispatch_no, _("&Print Delivery Note"), true, ST_CUSTDELIVERY));
- display_note(print_document_link($dispatch_no, _("&Email Delivery Note"), true, ST_CUSTDELIVERY, false, "", "", 1), 1, 1);
- display_note(print_document_link($dispatch_no, _("P&rint as Packing Slip"), true, ST_CUSTDELIVERY, false, "", "", 0, 1));
- display_note(print_document_link($dispatch_no, _("E&mail as Packing Slip"), true, ST_CUSTDELIVERY, false, "", "", 1, 1), 1);
+ display_note(print_document_link($dispatch_no, _("&Email Delivery Note"), true, ST_CUSTDELIVERY, false, "printlink", "", 1), 1, 1);
+ display_note(print_document_link($dispatch_no, _("P&rint as Packing Slip"), true, ST_CUSTDELIVERY, false, "printlink", "", 0, 1));
+ display_note(print_document_link($dispatch_no, _("E&mail as Packing Slip"), true, ST_CUSTDELIVERY, false, "printlink", "", 1, 1), 1);
display_note(get_gl_view_str(13, $dispatch_no, _("View the GL Journal Entries for this Dispatch")),1);
@@ -73,9 +73,9 @@ if (isset($_GET['AddedID'])) {
display_note(get_trans_view_str(ST_CUSTDELIVERY, $delivery_no, _("View this delivery")), 0, 1);
display_note(print_document_link($delivery_no, _("&Print Delivery Note"), true, ST_CUSTDELIVERY));
- display_note(print_document_link($delivery_no, _("&Email Delivery Note"), true, ST_CUSTDELIVERY, false, "", "", 1), 1, 1);
- display_note(print_document_link($delivery_no, _("P&rint as Packing Slip"), true, ST_CUSTDELIVERY, false, "", "", 0, 1));
- display_note(print_document_link($delivery_no, _("E&mail as Packing Slip"), true, ST_CUSTDELIVERY, false, "", "", 1, 1), 1);
+ display_note(print_document_link($delivery_no, _("&Email Delivery Note"), true, ST_CUSTDELIVERY, false, "printlink", "", 1), 1, 1);
+ display_note(print_document_link($delivery_no, _("P&rint as Packing Slip"), true, ST_CUSTDELIVERY, false, "printlink", "", 0, 1));
+ display_note(print_document_link($delivery_no, _("E&mail as Packing Slip"), true, ST_CUSTDELIVERY, false, "printlink", "", 1, 1), 1);
hyperlink_params($path_to_root . "/sales/customer_invoice.php", _("Confirm Delivery and Invoice"), "DeliveryNumber=$delivery_no");
@@ -136,9 +136,10 @@ if (isset($_GET['OrderNumber']) && $_GET['OrderNumber'] > 0) {
if (!check_quantities()) {
display_error(_("Selected quantity cannot be less than quantity invoiced nor more than quantity not dispatched on sales order."));
- } elseif(!check_num('ChargeFreightCost', 0))
+ } elseif(!check_num('ChargeFreightCost', 0)) {
display_error(_("Freight cost cannot be less than zero"));
set_focus('ChargeFreightCost');
+ }
}
//-----------------------------------------------------------------------------
@@ -194,8 +195,6 @@ function check_data()
}
if (!check_quantities()) {
- display_error(_("Selected quantity cannot be less than quantity invoiced nor more than quantity
- not dispatched on sales order."));
return false;
}
@@ -321,10 +320,10 @@ if (isset($_POST['Update']) || isset($_POST['_Location_update'])) {
start_form();
hidden('cart_id');
-start_table("$table_style2 width=80%", 5);
+start_table(TABLESTYLE2, "width=80%", 5);
echo "
"; // outer table
-start_table("$table_style width=100%");
+start_table(TABLESTYLE, "width=100%");
start_row();
label_cells(_("Customer"), $_SESSION['Items']->customer_name, "class='tableheader2'");
label_cells(_("Branch"), get_branch_name($_SESSION['Items']->Branch), "class='tableheader2'");
@@ -373,12 +372,15 @@ end_table();
echo " | ";// outer table
-start_table("$table_style width=90%");
+start_table(TABLESTYLE, "width=90%");
if (!isset($_POST['due_date']) || !is_date($_POST['due_date'])) {
- $_POST['due_date'] = get_invoice_duedate($_SESSION['Items']->customer_id, $_POST['DispatchDate']);
+ $_POST['due_date'] = get_invoice_duedate($_SESSION['Items']->payment, $_POST['DispatchDate']);
}
-date_row(_("Invoice Dead-line"), 'due_date', '', null, 0, 0, 0, "class='tableheader2'");
+customer_credit_row($_SESSION['Items']->customer_id, $_SESSION['Items']->credit, "class='tableheader2'");
+start_row();
+date_cells(_("Invoice Dead-line"), 'due_date', '', null, 0, 0, 0, "class='tableheader2'");
+end_row();
end_table();
echo " |
";
@@ -394,9 +396,13 @@ if ($row['dissallow_invoices'] == 1)
}
display_heading(_("Delivery Items"));
div_start('Items');
-start_table("$table_style width=80%");
-$th = array(_("Item Code"), _("Item Description"), _("Ordered"), _("Units"), _("Delivered"),
+start_table(TABLESTYLE, "width=80%");
+
+$new = $_SESSION['Items']->trans_no==0;
+$th = array(_("Item Code"), _("Item Description"),
+ $new ? _("Ordered") : _("Max. delivery"), _("Units"), $new ? _("Delivered") : _("Invoiced"),
_("This Delivery"), _("Price"), _("Tax Type"), _("Discount"), _("Total"));
+
table_header($th);
$k = 0;
$has_marked = false;
@@ -425,7 +431,11 @@ foreach ($_SESSION['Items']->line_items as $line=>$ln_itm) {
}
view_stock_status_cell($ln_itm->stock_id);
- text_cells(null, 'Line'.$line.'Desc', $ln_itm->item_description, 30, 50);
+ if ($ln_itm->descr_editable)
+ text_cells(null, 'Line'.$line.'Desc', $ln_itm->item_description, 30, 50);
+ else
+ label_cell($ln_itm->item_description);
+
$dec = get_qty_dec($ln_itm->stock_id);
qty_cell($ln_itm->quantity, false, $dec);
label_cell($ln_itm->units);
@@ -448,29 +458,32 @@ foreach ($_SESSION['Items']->line_items as $line=>$ln_itm) {
$_POST['ChargeFreightCost'] = get_post('ChargeFreightCost',
price_format($_SESSION['Items']->freight_cost));
-start_row();
+$colspan = 9;
-small_amount_cells(_("Shipping Cost"), 'ChargeFreightCost', $_SESSION['Items']->freight_cost, "colspan=9 align=right");
+start_row();
+label_cell(_("Shipping Cost"), "colspan=$colspan align=right");
+small_amount_cells(null, 'ChargeFreightCost', $_SESSION['Items']->freight_cost);
+end_row();
$inv_items_total = $_SESSION['Items']->get_items_total_dispatch();
$display_sub_total = price_format($inv_items_total + input_num('ChargeFreightCost'));
-label_row(_("Sub-total"), $display_sub_total, "colspan=9 align=right","align=right");
+label_row(_("Sub-total"), $display_sub_total, "colspan=$colspan align=right","align=right");
$taxes = $_SESSION['Items']->get_taxes(input_num('ChargeFreightCost'));
-$tax_total = display_edit_tax_items($taxes, 9, $_SESSION['Items']->tax_included);
+$tax_total = display_edit_tax_items($taxes, $colspan, $_SESSION['Items']->tax_included);
$display_total = price_format(($inv_items_total + input_num('ChargeFreightCost') + $tax_total));
-label_row(_("Amount Total"), $display_total, "colspan=9 align=right","align=right");
+label_row(_("Amount Total"), $display_total, "colspan=$colspan align=right","align=right");
end_table(1);
if ($has_marked) {
display_note(_("Marked items have insufficient quantities in stock as on day of delivery."), 0, 1, "class='red'");
}
-start_table($table_style2);
+start_table(TABLESTYLE2);
policy_list_row(_("Action For Balance"), "bo_policy", null);