X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fpurchasing_db.inc;h=121c90df0345d1b318b68b8869ed1c9c3473e25f;hb=aa8ff706b747f6d5d157e500025e3d18c3d5e2ab;hp=5182313a5b7c0e1f682b8d8c207ddea7f82da4ef;hpb=3b431d909abc53e4a4d712cbafa39ca556409d0e;p=fa-stable.git

diff --git a/purchasing/includes/purchasing_db.inc b/purchasing/includes/purchasing_db.inc
index 5182313a..121c90df 100644
--- a/purchasing/includes/purchasing_db.inc
+++ b/purchasing/includes/purchasing_db.inc
@@ -12,10 +12,10 @@
 include_once($path_to_root . "/purchasing/includes/supp_trans_class.inc");
 
 include_once($path_to_root . "/includes/banking.inc");
+include_once($path_to_root . "/includes/inventory.inc");
 
 include_once($path_to_root . "/includes/date_functions.inc");
 
-include_once($path_to_root . "/includes/db/inventory_db.inc");
 include_once($path_to_root . "/includes/db/allocations_db.inc");
 
 include_once($path_to_root . "/purchasing/includes/db/supp_trans_db.inc");
@@ -95,6 +95,8 @@ function get_purchase_data($supplier_id, $stock_id)
 function add_or_update_purchase_data($supplier_id, $stock_id, $price, $description="", $uom="")
 {
 	$data = get_purchase_data($supplier_id, $stock_id);
+
+	$description = substr($description, 0, 50); // FIXME: temporary constraint to avoid db errors on long descriptions, see [0005170]
 	if ($data === false)
 	{
 		$sql = "INSERT INTO ".TB_PREF."purch_data (supplier_id, stock_id, price, suppliers_uom,
@@ -121,7 +123,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 +133,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))
@@ -189,8 +192,6 @@ function add_direct_supp_trans($cart)
 	$inv->reference = $ref;
 	$inv->supp_reference = $cart->supp_ref;
 	$inv->tax_included = $cart->tax_included;
-	$inv->tax_algorithm = $cart->tax_algorithm;
-	$inv->stored_algorithm = $cart->stored_algorithm;
 	$supp = get_supplier($cart->supplier_id);
 	$inv->tax_group_id = $supp['tax_group_id'];
 	$inv->ov_amount = $inv->ov_gst = $inv->ov_discount = 0;
@@ -198,27 +199,24 @@ function add_direct_supp_trans($cart)
 		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), '');
+			$line->price, $line->price, true, get_unit_cost($line->stock_id), '');
 		$total += round2(($line->receive_qty * $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, $inv->tax_algorithm);
+		$taxes = $inv->get_taxes($inv->tax_group_id, 0, false);
 		foreach( $taxes as $taxitem) {
 			$total += isset($taxitem['Override']) ? $taxitem['Override'] : $taxitem['Value'];
 		}
 	}
+	$inv->currency = $cart->curr_code;
 	$inv->ex_rate = $cart->ex_rate;
 
 	$inv_no = add_supp_invoice($inv);
 
-	// presume supplier data need correction
-	if ($inv->stored_algorithm != $inv->tax_algorithm)
-		update_supp_tax_algorithm($inv->supplier_id, $inv->tax_algorithm);
-
 	if ($cart->cash_account) {
-		$pmt_no = write_supp_payment(0, $inv->supplier_id, $cart->cash_account,	$inv->tran_date, $Refs->get_next(ST_SUPPAYMENT), 
-			$total, 0, _('Payment for:').$inv->supp_reference .' ('.$type_shortcuts[ST_SUPPINVOICE].$inv_no.')');
+		$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.')' . ' ' . $cart->Comments, 0, 0, $cart->dimension, $cart->dimension2);
 		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);
 		update_supp_trans_allocation(ST_SUPPAYMENT, $pmt_no, $inv->supplier_id);