X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fpurchasing_db.inc;h=eb4a1ac47057284908b04e82a7e4f79c7e3a7be8;hb=5a7ef37131354aabdcf04c639a903e5876b743e4;hp=7b18d6ca13a9a75e129c65f59ddf44581e84a7f6;hpb=d1babda7c01b314d35fb89f2d195553b55936532;p=fa-stable.git

diff --git a/purchasing/includes/purchasing_db.inc b/purchasing/includes/purchasing_db.inc
index 7b18d6ca..eb4a1ac4 100644
--- a/purchasing/includes/purchasing_db.inc
+++ b/purchasing/includes/purchasing_db.inc
@@ -33,14 +33,11 @@ include_once($path_to_root . "/purchasing/includes/db/suppliers_db.inc");
 // $amount is in SUPPLIERS'S currency
 
 function add_gl_trans_supplier($type, $type_no, $date_, $account, $dimension, $dimension2,  
-	$amount, $supplier_id, $err_msg="", $rate=0, $memo="")
+	$amount, $supplier_id, $rate=0, $memo="")
 {
-	if ($err_msg == "")
-		$err_msg = "The supplier GL transaction could not be inserted";	
-		
 	return add_gl_trans($type, $type_no, $date_, $account, $dimension, $dimension2, $memo, 
 		$amount, get_supplier_currency($supplier_id), 
-		PT_SUPPLIER, $supplier_id, $err_msg, $rate);
+		PT_SUPPLIER, $supplier_id, $rate);
 }
 
 //----------------------------------------------------------------------------------------
@@ -121,7 +118,8 @@ function get_po_prepayments($supp_trans)
 	$allocations = array();
 	$line_ids = array();
 	foreach($supp_trans->grn_items as $item)
-		$line_ids[] = $item->po_detail_item;
+		if ($item->po_detail_item)
+			$line_ids[] = $item->po_detail_item;
 
 	if (!count($line_ids))
 		return $allocations;
@@ -130,7 +128,7 @@ function get_po_prepayments($supp_trans)
 		FROM ".TB_PREF."supp_allocations allocs 
 			LEFT JOIN ".TB_PREF."purch_order_details line ON line.order_no=allocs.trans_no_to AND trans_type_to=".ST_PURCHORDER."
 		WHERE line.po_detail_item IN(".implode(',', array_values($line_ids)).")";
-//_vd($sql);
+
 	$result = db_query($sql, "Cannot retrieve po prepayments");
 
 	while($dat = db_fetch($result))
@@ -152,7 +150,7 @@ function add_direct_supp_trans($cart)
 	if ($cart->trans_type != ST_PURCHORDER) {
 		// for direct grn/invoice set same dates for lines as for whole document
 		foreach ($cart->line_items as $line_no =>$line)
-			$cart->line_items[$line_no]->req_del_date = $cart->orig_order_date;
+			$cart->line_items[$line_no]->req_del_date = $cart->tran_date;
 	}
 
 	$ref = $cart->reference;
@@ -171,9 +169,8 @@ function add_direct_supp_trans($cart)
 		$cart->reference = $ref;
 	if ($cart->trans_type != ST_SUPPINVOICE)
 		$cart->Comments = $cart->reference; //grn does not hold supp_ref
-	foreach($cart->line_items as $key => $line)
-		$cart->line_items[$key]->receive_qty = $line->quantity;
-	$grn_no = add_grn($cart);
+
+	$grn_no = write_grn($cart);
 	if ($cart->trans_type == ST_SUPPRECEIVE) {
 		commit_transaction(); // save PO+GRN
 		return $grn_no;
@@ -182,7 +179,7 @@ function add_direct_supp_trans($cart)
 	$inv = new supp_trans(ST_SUPPINVOICE);
 	$inv->Comments = $cart->Comments;
 	$inv->supplier_id = $cart->supplier_id;
-	$inv->tran_date = $cart->orig_order_date;
+	$inv->tran_date = $cart->tran_date;
 	$inv->due_date = $cart->due_date;
 	$inv->dimension = $cart->dimension;
 	$inv->dimension2 = $cart->dimension2;
@@ -194,14 +191,15 @@ function add_direct_supp_trans($cart)
 	$inv->ov_amount = $inv->ov_gst = $inv->ov_discount = 0;
 	$total = 0;
 		foreach($cart->line_items as $key => $line) {
-		$inv->add_grn_to_trans($line->grn_item_id, $line->po_detail_rec, $line->stock_id,
-			$line->item_description, $line->receive_qty, 0, $line->receive_qty,
-			$line->price, $line->price, true, get_standard_cost($line->stock_id), '');
-		$total += round2(($line->receive_qty * $line->price), user_price_dec());
+		$inv->add_grn_to_trans($line->grn_item_id, $line->po_item_id, $line->stock_id,
+			$line->item_description, $line->quantity, 0, $line->quantity,
+			$line->price, $line->price, true, get_unit_cost($line->stock_id), '');
+
+		$total += round2(($line->quantity * $line->price), user_price_dec());
 	}
 	$inv->tax_overrides = $cart->tax_overrides;
 	if (!$inv->tax_included) {
-		$taxes = $inv->get_taxes($inv->tax_group_id, 0, false);
+		$taxes = $inv->get_taxes();
 		foreach( $taxes as $taxitem) {
 			$total += isset($taxitem['Override']) ? $taxitem['Override'] : $taxitem['Value'];
 		}
@@ -211,7 +209,7 @@ function add_direct_supp_trans($cart)
 	$inv_no = add_supp_invoice($inv);
 
 	if ($cart->cash_account) {
-		$pmt_no = write_supp_payment(0, $inv->supplier_id, $cart->cash_account,	$inv->tran_date, $Refs->get_next(ST_SUPPAYMENT), 
+		$pmt_no = write_supp_payment(0, $inv->supplier_id, $cart->cash_account,	$inv->tran_date, $Refs->get_next(ST_SUPPAYMENT, null, $inv->tran_date), 
 			$total, 0, _('Payment for:').$inv->supp_reference .' ('.$type_shortcuts[ST_SUPPINVOICE].$inv_no.')');
 		add_supp_allocation($total, ST_SUPPAYMENT, $pmt_no, ST_SUPPINVOICE, $inv_no, $inv->supplier_id, $inv->tran_date);
 		update_supp_trans_allocation(ST_SUPPINVOICE, $inv_no, $inv->supplier_id);