projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Top manufactored dashboard shows wrong statistics. Fixed
[fa-stable.git]
/
sales
/
sales_order_entry.php
diff --git
a/sales/sales_order_entry.php
b/sales/sales_order_entry.php
index 638bf263c678873ef33b9f7a91f82a81fe020e89..07f51d3bacaeb4890c7da93eea8b70ec9f5437e5 100644
(file)
--- a/
sales/sales_order_entry.php
+++ b/
sales/sales_order_entry.php
@@
-66,9
+66,14
@@
if (isset($_GET['NewDelivery']) && is_numeric($_GET['NewDelivery'])) {
} elseif (isset($_GET['NewInvoice']) && is_numeric($_GET['NewInvoice'])) {
} elseif (isset($_GET['NewInvoice']) && is_numeric($_GET['NewInvoice'])) {
- $_SESSION['page_title'] = _($help_context = "Direct Sales Invoice");
create_cart(ST_SALESINVOICE, $_GET['NewInvoice']);
create_cart(ST_SALESINVOICE, $_GET['NewInvoice']);
+ if (isset($_GET['FixedAsset'])) {
+ $_SESSION['page_title'] = _($help_context = "Fixed Assets Sale");
+ $_SESSION['Items']->fixed_asset = true;
+ } else
+ $_SESSION['page_title'] = _($help_context = "Direct Sales Invoice");
+
} elseif (isset($_GET['ModifyOrderNumber']) && is_numeric($_GET['ModifyOrderNumber'])) {
$help_context = 'Modifying Sales Order';
} elseif (isset($_GET['ModifyOrderNumber']) && is_numeric($_GET['ModifyOrderNumber'])) {
$help_context = 'Modifying Sales Order';
@@
-96,6
+101,11
@@
if (isset($_GET['NewDelivery']) && is_numeric($_GET['NewDelivery'])) {
page($_SESSION['page_title'], false, false, "", $js);
page($_SESSION['page_title'], false, false, "", $js);
+if (isset($_GET['ModifyOrderNumber']) && is_prepaid_order_open($_GET['ModifyOrderNumber']))
+{
+ display_error(_("This order cannot be edited because there are invoices or payments related to it, and prepayment terms were used."));
+ end_page(); exit;
+}
if (isset($_GET['ModifyOrderNumber']))
check_is_editable(ST_SALESORDER, $_GET['ModifyOrderNumber']);
elseif (isset($_GET['ModifyQuotationNumber']))
if (isset($_GET['ModifyOrderNumber']))
check_is_editable(ST_SALESORDER, $_GET['ModifyOrderNumber']);
elseif (isset($_GET['ModifyQuotationNumber']))
@@
-332,10
+342,10
@@
function copy_from_cart()
//--------------------------------------------------------------------------------
function line_start_focus() {
//--------------------------------------------------------------------------------
function line_start_focus() {
-
global
$Ajax;
+
global
$Ajax;
- $Ajax->activate('items_table');
- set_focus('_stock_id_edit');
+
$Ajax->activate('items_table');
+
set_focus('_stock_id_edit');
}
//--------------------------------------------------------------------------------
}
//--------------------------------------------------------------------------------
@@
-380,7
+390,7
@@
function can_process() {
return false;
}
if ($_SESSION['Items']->payment_terms['cash_sale'] == 0) {
return false;
}
if ($_SESSION['Items']->payment_terms['cash_sale'] == 0) {
- if (!$_SESSION['Items']->is_started() && ($_SESSION['Items']->payment_terms['days_before_due']
< 0
) && ((input_num('prep_amount')<=0) ||
+ if (!$_SESSION['Items']->is_started() && ($_SESSION['Items']->payment_terms['days_before_due']
== -1
) && ((input_num('prep_amount')<=0) ||
input_num('prep_amount')>$_SESSION['Items']->get_trans_total())) {
display_error(_("Pre-payment required have to be positive and less than total amount."));
set_focus('prep_amount');
input_num('prep_amount')>$_SESSION['Items']->get_trans_total())) {
display_error(_("Pre-payment required have to be positive and less than total amount."));
set_focus('prep_amount');
@@
-465,10
+475,9
@@
if (isset($_POST['ProcessOrder']) && can_process()) {
$ref = $Refs->get_next($_SESSION['Items']->trans_type, null, array('date' => Today()));
if ($ref != $_SESSION['Items']->reference)
{
$ref = $Refs->get_next($_SESSION['Items']->trans_type, null, array('date' => Today()));
if ($ref != $_SESSION['Items']->reference)
{
+ unset($_POST['ref']); // force refresh reference
display_error(_("The reference number field has been increased. Please save the document again."));
display_error(_("The reference number field has been increased. Please save the document again."));
- $_POST['ref'] = $_SESSION['Items']->reference = $ref;
- $Ajax->activate('ref');
- }
+ }
set_focus('ref');
}
else
set_focus('ref');
}
else
@@
-526,7
+535,7
@@
function check_item_data()
return false;
}
return false;
}
- $cost_home = get_
standard
_cost(get_post('stock_id')); // Added 2011-03-27 Joe Hunt
+ $cost_home = get_
unit
_cost(get_post('stock_id')); // Added 2011-03-27 Joe Hunt
$cost = $cost_home / get_exchange_rate_from_home_currency($_SESSION['Items']->customer_currency, $_SESSION['Items']->document_date);
if (input_num('price') < $cost)
{
$cost = $cost_home / get_exchange_rate_from_home_currency($_SESSION['Items']->customer_currency, $_SESSION['Items']->document_date);
if (input_num('price') < $cost)
{
@@
-565,7
+574,7
@@
function handle_delete_item($line_no)
if ($_SESSION['Items']->some_already_delivered($line_no) == 0) {
$_SESSION['Items']->remove_from_cart($line_no);
} else {
if ($_SESSION['Items']->some_already_delivered($line_no) == 0) {
$_SESSION['Items']->remove_from_cart($line_no);
} else {
- display_error(_("This item cannot be deleted because some of it has already been delivered."));
+
display_error(_("This item cannot be deleted because some of it has already been delivered."));
}
line_start_focus();
}
}
line_start_focus();
}
@@
-688,7
+697,10
@@
if (isset($_POST['CancelItemChanges'])) {
}
//--------------------------------------------------------------------------------
}
//--------------------------------------------------------------------------------
-check_db_has_stock_items(_("There are no inventory items defined in the system."));
+if ($_SESSION['Items']->fixed_asset)
+ check_db_has_disposable_fixed_assets(_("There are no fixed assets defined in the system."));
+else
+ check_db_has_stock_items(_("There are no inventory items defined in the system."));
check_db_has_customer_branches(_("There are no customers, or there are no customers with branches. Please define customers and customer branches."));
check_db_has_customer_branches(_("There are no customers, or there are no customers with branches. Please define customers and customer branches."));