X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fdb%2Finvoice_db.inc;h=ed8c95328e3a0c19c153c6bdab229fa4b7c3e0d7;hb=7561718ee5113232ce917f63085d272884b0929c;hp=72d01f114463311dbc4d634b557c2a115d54cc32;hpb=91bede4226ba8b45151f0501ac88eb946ed5f2a1;p=fa-stable.git diff --git a/purchasing/includes/db/invoice_db.inc b/purchasing/includes/db/invoice_db.inc index 72d01f11..ed8c9532 100644 --- a/purchasing/includes/db/invoice_db.inc +++ b/purchasing/includes/db/invoice_db.inc @@ -10,6 +10,7 @@ See the License here . ***********************************************************************/ include_once($path_to_root . "/purchasing/includes/db/invoice_items_db.inc"); +include_once($path_to_root . "/admin/db/attachments_db.inc"); //-------------------------------------------------------------------------------------------------- @@ -126,7 +127,8 @@ function add_supp_invoice(&$supp_trans) // do not receive as ref because we chan //$company_currency = get_company_currency(); $trans_no = $supp_trans->trans_no; $trans_type = $supp_trans->trans_type; - /*Start an sql transaction */ + $supplier = get_supplier($supp_trans->supplier_id); + begin_transaction(); hook_db_prewrite($supp_trans, $trans_type); $tax_total = 0; @@ -138,8 +140,6 @@ function add_supp_invoice(&$supp_trans) // do not receive as ref because we chan } else $allocs = get_po_prepayments($supp_trans); - $supplier = get_supplier($supp_trans->supplier_id); - add_new_exchange_rate($supplier['curr_code'], $supp_trans->tran_date, $supp_trans->ex_rate); foreach ($taxes as $n => $taxitem) @@ -176,6 +176,8 @@ function add_supp_invoice(&$supp_trans) // do not receive as ref because we chan $invoice_items_total, $item_added_tax, $supp_trans->ov_discount, "", 0, $supp_trans->tax_included, $supp_trans->tax_algorithm); + if ($trans_no) + move_trans_attachments($trans_type, $trans_no, $invoice_id); $supp_trans->trans_no = $invoice_id; @@ -234,8 +236,8 @@ function add_supp_invoice(&$supp_trans) // do not receive as ref because we chan $total += add_gl_trans_supplier($trans_type, $invoice_id, $date_, $entered_gl_code->gl_code, $entered_gl_code->gl_dim, $entered_gl_code->gl_dim2, $entered_gl_code->amount, $supp_trans->supplier_id, "", 0, $memo_); - add_supp_invoice_gl_item($trans_type, $invoice_id, $entered_gl_code->gl_code, - $entered_gl_code->amount, $memo_); + add_supp_invoice_gl_item($trans_type, $invoice_id, $entered_gl_code->gl_code, $entered_gl_code->amount, $memo_, + $entered_gl_code->gl_dim, $entered_gl_code->gl_dim2); // store tax details if the gl account is a tax account if ($trans_type == ST_SUPPCREDIT) @@ -270,8 +272,10 @@ function add_supp_invoice(&$supp_trans) // do not receive as ref because we chan $stock_gl_code = get_stock_gl_code($entered_grn->item_code); - $dim = $supplier['dimension_id'] ? $supplier['dimension_id'] : $stock_gl_code['dimension_id']; - $dim2 = $supplier['dimension2_id'] ? $supplier['dimension2_id'] : $stock_gl_code['dimension2_id']; + $dim = !empty($supp_trans->dimension) ? $supp_trans->dimension : + ($supplier['dimension_id'] ? $supplier['dimension_id'] : $stock_gl_code['dimension_id']); + $dim2 = !empty($supp_trans->dimension2) ? $supp_trans->dimension2 : + ($supplier['dimension2_id'] ? $supplier['dimension2_id'] : $stock_gl_code['dimension2_id']); if ($trans_type == ST_SUPPCREDIT) { $iv_act = (is_inventory_item($entered_grn->item_code) ? $stock_gl_code["inventory_account"] : @@ -368,17 +372,18 @@ function add_supp_invoice(&$supp_trans) // do not receive as ref because we chan if ($invoice_alloc_balance > 0) { //the invoice is not already fully allocated - $trans = get_supp_trans($supp_trans->src_docs, ST_SUPPINVOICE); - $total = $trans['Total']; + $trans = get_supp_trans($invoice_id, ST_SUPPCREDIT); + $total = -$trans['Total']; $allocate_amount = ($invoice_alloc_balance > $total) ? $total : $invoice_alloc_balance; + /*Now insert the allocation record if > 0 */ if ($allocate_amount != 0) { - update_supp_trans_allocation(ST_SUPPINVOICE, $supp_trans->src_docs); - update_supp_trans_allocation(ST_SUPPCREDIT, $invoice_id); - add_supp_allocation($allocate_amount, ST_SUPPCREDIT, $invoice_id, ST_SUPPINVOICE, $supp_trans->src_docs, + add_supp_allocation($allocate_amount, ST_SUPPCREDIT, $invoice_id, ST_SUPPINVOICE, $invoice_no, $date_); + update_supp_trans_allocation(ST_SUPPINVOICE, $invoice_no); + update_supp_trans_allocation(ST_SUPPCREDIT, $invoice_id); exchange_variation(ST_SUPPCREDIT, $invoice_id, ST_SUPPINVOICE, $supp_trans->src_docs, $date_, $allocate_amount, PT_SUPPLIER); @@ -391,6 +396,7 @@ function add_supp_invoice(&$supp_trans) // do not receive as ref because we chan //_vd(get_payments_for($sales_order, ST_PURCHORDER)); //_vd(get_payments_for($invoice_id, ST_SUPPINVOICE)); //exit; + $supp_trans->trans_no = $invoice_id; hook_db_postwrite($supp_trans, $supp_trans->trans_type); commit_transaction(); @@ -488,7 +494,7 @@ function read_supp_invoice($trans_no, $trans_type, &$supp_trans) else { $supp_trans->add_gl_codes_to_trans($details_row["gl_code"], get_gl_account_name($details_row["gl_code"]), 0, 0, - $details_row["FullUnitPrice"], $details_row["memo_"]); + $details_row["FullUnitPrice"], $details_row["memo_"], $details_row["dimension_id"], $details_row["dimension2_id"]); } } $supp_trans->tax_overrides = get_tax_overrides($trans_type, $trans_no); @@ -608,16 +614,9 @@ function void_supp_invoice($type, $type_no) add_audit_trail(ST_JOURNAL, $id, $old_date); add_comments(ST_JOURNAL, $id, $old_date, $memo); - $Refs->save(ST_JOURNAL, $id, $ref); - } - } - /*$deliveries = get_deliveries_between($details_row["stock_id"], $old_date, $date_); - if ($deliveries[0] != 0) // have deliveries been done during the period? - { - update_stock_move_pid(ST_CUSTDELIVERY, $details_row["stock_id"], $old_date, $date_, 0, $mat_cost); + $Refs->save(ST_JOURNAL, $id, $ref); + } } - update_stock_move_pid(ST_SUPPRECEIVE, $details_row["stock_id"], $old_date, $old_date, $grn['supplier_id'], $mat_cost); - */ } } }