projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[0003780] Sales Invoice to partial delivery was improperly issued as final prepayment...
[fa-stable.git]
/
sales
/
sales_order_entry.php
diff --git
a/sales/sales_order_entry.php
b/sales/sales_order_entry.php
index aba35ebd108e82f151afb3f69e265ac0702c1899..618030a450d3a3855a42d386ef9e3778228232ef 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';
@@
-380,7
+385,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');
@@
-526,7
+531,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)
{
@@
-688,7
+693,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."));