X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fdb%2Finvoice_db.inc;h=59366cceb172c64cf839cbe0ee25091adb961f7a;hb=f12dbe7523bb1abc6cd69b009ef8f0be838f5348;hp=84d205a2cc35a29513c63dbbefb9e549879b6a84;hpb=e28f3fe01f168d761393ce2f10409284eef2adb4;p=fa-stable.git diff --git a/purchasing/includes/db/invoice_db.inc b/purchasing/includes/db/invoice_db.inc index 84d205a2..59366cce 100644 --- a/purchasing/includes/db/invoice_db.inc +++ b/purchasing/includes/db/invoice_db.inc @@ -51,11 +51,14 @@ function update_supp_received_items_for_invoice($id, $po_detail_item, $qty_invoi { if ($chg_price != null) { - $sql = "SELECT act_price FROM ".TB_PREF."purch_order_details WHERE + $sql = "SELECT act_price, unit_price FROM ".TB_PREF."purch_order_details WHERE po_detail_item = $po_detail_item"; $result = db_query($sql, "The old actual price of the purchase order line could not be retrieved"); $row = db_fetch_row($result); $ret = $row[0]; + + $unit_price = $row[1]; //Added by Rasmus + $sql = "SELECT delivery_date FROM ".TB_PREF."grn_batch,".TB_PREF."grn_items WHERE ".TB_PREF."grn_batch.id = ".TB_PREF."grn_items.grn_batch_id AND ".TB_PREF."grn_items.id=$id"; $result = db_query($sql, "The old delivery date from the received record cout not be retrieved"); @@ -66,6 +69,7 @@ function update_supp_received_items_for_invoice($id, $po_detail_item, $qty_invoi { $ret = 0; $date = ""; + $unit_price = 0; // Added by Rasmus } $sql = "UPDATE ".TB_PREF."purch_order_details SET qty_invoiced = qty_invoiced + $qty_invoiced "; @@ -80,19 +84,16 @@ function update_supp_received_items_for_invoice($id, $po_detail_item, $qty_invoi SET quantity_inv = quantity_inv + $qty_invoiced WHERE id = $id"; db_query($sql, "The quantity invoiced off the items received record could not be updated"); - return array($ret, $date); + return array($ret, $date, $unit_price); } function get_deliveries_between($stock_id, $from, $to) { $from = date2sql($from); $to = date2sql($to); - $sql = "SELECT SUM(quantity), AVG(standard_cost) FROM ".TB_PREF."debtor_trans, ".TB_PREF."debtor_trans_details - WHERE ".TB_PREF."debtor_trans.trans_no = ".TB_PREF."debtor_trans_details.debtor_trans_no AND - ".TB_PREF."debtor_trans.tran_date >= '$from' AND - ".TB_PREF."debtor_trans.tran_date <= '$to' AND - ".TB_PREF."debtor_trans_details.stock_id = '$stock_id' AND - ".TB_PREF."debtor_trans_details.debtor_trans_type = 13"; + $sql = "SELECT SUM(-qty), AVG(standard_cost) FROM ".TB_PREF."stock_moves + WHERE type=13 AND stock_id='$stock_id' AND + tran_date>='$from' AND tran_date<='$to' GROUP BY stock_id"; $result = db_query($sql, "The deliveries could not be updated"); return db_fetch_row($result); } @@ -167,59 +168,72 @@ function add_supp_invoice($supp_trans) // do not receive as ref because we chang add_supp_invoice_gl_item($trans_type, $invoice_id, $entered_gl_code->gl_code, $entered_gl_code->amount, $memo_); } - foreach ($supp_trans->grn_items as $entered_grn) { if (!$supp_trans->is_invoice) { $entered_grn->this_quantity_inv = -$entered_grn->this_quantity_inv; + set_grn_item_credited($entered_grn, $supp_trans->supplier_id, $invoice_id, $date_); } $line_taxfree = $entered_grn->taxfree_charge_price($supp_trans->tax_group_id); $line_tax = $entered_grn->full_charge_price($supp_trans->tax_group_id) - $line_taxfree; - - $old = update_supp_received_items_for_invoice($entered_grn->id, $entered_grn->po_detail_item, - $entered_grn->this_quantity_inv, $entered_grn->chg_price); $stock_gl_code = get_stock_gl_code($entered_grn->item_code); - $stock_entry_account = $stock_gl_code["inventory_account"]; - add_gl_trans_supplier($trans_type, $invoice_id, $date_, $stock_entry_account, + add_gl_trans_supplier($trans_type, $invoice_id, $date_, $stock_gl_code["inventory_account"], $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], $entered_grn->this_quantity_inv * $line_taxfree, $supp_trans->supplier_id); // -------------- if price changed since po received. 16 Aug 2008 Joe Hunt - $old_price = $old[0]; - if ($old_price != $entered_grn->chg_price) // price-change, so update + if($supp_trans->is_invoice) { - $diff = $entered_grn->chg_price - $old_price; - $old_date = sql2date($old[1]); - // only update the diff (last parameter, adj_only is set to true). - $mat_cost = update_average_material_cost($supp_trans->supplier_id, $entered_grn->item_code, - $diff, $entered_grn->this_quantity_inv, $old_date, true); - // function just above this - $deliveries = get_deliveries_between($entered_grn->item_code, $old_date, $date_); - if ($deliveries[0] != 0) // have deliveries been done during the period? - { - - $amt = ($mat_cost - $deliveries[1]) * $deliveries[0]; // $amt in home currency - - add_gl_trans($trans_type, $invoice_id, $date_, $stock_gl_code["cogs_account"], - $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], _("Cost diff."), - $amt, null, null, null, - "The general ledger transaction could not be added for the price variance of the inventory item"); - add_gl_trans($trans_type, $invoice_id, $date_, $stock_gl_code["inventory_account"], - 0, 0, _("Cost diff."), -$amt, null, null, null, - "The general ledger transaction could not be added for the price variance of the inventory item"); - } - } - + $old = update_supp_received_items_for_invoice($entered_grn->id, $entered_grn->po_detail_item, + $entered_grn->this_quantity_inv, $entered_grn->chg_price); + // Since the standard cost is always calculated on basis of the po unit_price, + // this is also the price that should be the base of calculating the price diff. + // In cases where there is two different po invoices on the same delivery with different unit prices this will not work either + + //$old_price = $old[0]; + + $old_price = $old[2]; + + + + /* + If statement is removed. Should always check for deliveries nomatter if there has been a price change. + */ + //if ($old_price != $entered_grn->chg_price) // price-change, so update + //{ + $diff = $entered_grn->chg_price - $old_price; + $old_date = sql2date($old[1]); + // only update the diff (last parameter, adj_only is set to true). + $mat_cost = update_average_material_cost($supp_trans->supplier_id, $entered_grn->item_code, + $diff, $entered_grn->this_quantity_inv, $old_date, true); + // function just above this + $deliveries = get_deliveries_between($entered_grn->item_code, $old_date, $date_); + if ($deliveries[0] != 0) // have deliveries been done during the period? + { + + $amt = ($mat_cost - $deliveries[1]) * $deliveries[0]; // $amt in home currency + + add_gl_trans($trans_type, $invoice_id, $date_, $stock_gl_code["cogs_account"], + $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], _("Cost diff."), + $amt, null, null, null, + "The general ledger transaction could not be added for the price variance of the inventory item"); + add_gl_trans($trans_type, $invoice_id, $date_, $stock_gl_code["inventory_account"], + 0, 0, _("Cost diff."), -$amt, null, null, null, + "The general ledger transaction could not be added for the price variance of the inventory item"); + update_stock_move_pid(13, $entered_grn->item_code, $old_date, $date_, 0, $mat_cost); + } + update_stock_move_pid(25, $entered_grn->item_code, $old_date, $old_date, $supp_trans->supplier_id, $mat_cost); + //} + } // ---------------------------------------------------------------------- add_supp_invoice_item($trans_type, $invoice_id, $entered_grn->item_code, $entered_grn->item_description, 0, $line_taxfree, $line_tax, $entered_grn->this_quantity_inv, $entered_grn->id, $entered_grn->po_detail_item, ""); } /* end of GRN postings */ - /* Now the TAX account */ foreach ($taxes as $taxitem) { @@ -362,4 +376,4 @@ function void_supp_invoice($type, $type_no) //---------------------------------------------------------------------------------------- -?> \ No newline at end of file +?>