projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cannot add received items to invoice if there are empty prev. items. Fixed.
[fa-stable.git]
/
sales
/
customer_payments.php
diff --git
a/sales/customer_payments.php
b/sales/customer_payments.php
index 7612a2b4b68cf66bb30bc3432644cdc6b431ec9b..be442b1c993f2aec3b244c67637fed001fbd57df 100644
(file)
--- a/
sales/customer_payments.php
+++ b/
sales/customer_payments.php
@@
-49,7
+49,8
@@
if (!isset($_POST['bank_account'])) { // first page call
if (isset($_GET['SInvoice'])) {
// get date and supplier
$type = !isset($_GET['Type']) ? ST_SALESINVOICE : $_GET['Type'];
if (isset($_GET['SInvoice'])) {
// get date and supplier
$type = !isset($_GET['Type']) ? ST_SALESINVOICE : $_GET['Type'];
- $inv = get_customer_trans($_GET['SInvoice'], $type);
+ $cust = !isset($_GET['customer_id']) ? null : $_GET['customer_id'];
+ $inv = get_customer_trans($_GET['SInvoice'], $type, $cust);
$dflt_act = get_default_bank_account($inv['curr_code']);
$_POST['bank_account'] = $dflt_act['id'];
if ($inv) {
$dflt_act = get_default_bank_account($inv['curr_code']);
$_POST['bank_account'] = $dflt_act['id'];
if ($inv) {
@@
-260,8
+261,8
@@
function read_customer_data()
$myrow = get_customer_habit($_POST['customer_id']);
$myrow = get_customer_habit($_POST['customer_id']);
- $_POST['HoldAccount'] = $myrow["dissallow_invoices"];
- $_POST['pymt_discount'] = $myrow["pymt_discount"];
+ $_POST['HoldAccount'] =
!$myrow ? false :
$myrow["dissallow_invoices"];
+ $_POST['pymt_discount'] =
!$myrow ? 0 :
$myrow["pymt_discount"];
// To support Edit feature
// If page is called first time and New entry fetch the nex reference number
if (!$_SESSION['alloc']->trans_no && !isset($_POST['charge']))
// To support Edit feature
// If page is called first time and New entry fetch the nex reference number
if (!$_SESSION['alloc']->trans_no && !isset($_POST['charge']))
@@
-367,8
+368,8
@@
if ($cust_currency != $bank_currency)
amount_row(_("Bank Charge:"), 'charge', null, '', $bank_currency);
$row = get_customer($_POST['customer_id']);
amount_row(_("Bank Charge:"), 'charge', null, '', $bank_currency);
$row = get_customer($_POST['customer_id']);
-$_POST['dimension_id'] = $row['dimension_id'];
-$_POST['dimension2_id'] = $row['dimension2_id'];
+$_POST['dimension_id'] =
!$row ? 0 :
$row['dimension_id'];
+$_POST['dimension2_id'] =
!$row ? 0 :
$row['dimension2_id'];
$dim = get_company_pref('use_dimension');
if ($dim > 0)
dimensions_list_row(_("Dimension").":", 'dimension_id',
$dim = get_company_pref('use_dimension');
if ($dim > 0)
dimensions_list_row(_("Dimension").":", 'dimension_id',