From: Janusz Dobrowolski Date: Thu, 6 Jan 2011 20:14:29 +0000 (+0000) Subject: Added cash payment and tax calculation algorithm selection in pucrhase Direct Invoice. X-Git-Tag: v2.4.2~19^2~408 X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=f1612b8d1122d4e0d31d618c3143e2c39d12eea7;p=fa-stable.git Added cash payment and tax calculation algorithm selection in pucrhase Direct Invoice. --- diff --git a/purchasing/includes/ui/po_ui.inc b/purchasing/includes/ui/po_ui.inc index d5ae6fc1..33e7df4c 100644 --- a/purchasing/includes/ui/po_ui.inc +++ b/purchasing/includes/ui/po_ui.inc @@ -19,13 +19,14 @@ function copy_from_cart() $_POST['supplier_id'] = $cart->supplier_id; $_POST['OrderDate'] = $cart->orig_order_date; - if ($cart->trans_type==ST_SUPPINVOICE) + if ($cart->trans_type == ST_SUPPINVOICE) $_POST['due_date'] = $cart->due_date; $_POST['supp_ref'] = $cart->supp_ref; $_POST['ref'] = $cart->reference; $_POST['Comments'] = $cart->Comments; $_POST['StkLocation'] = $cart->Location; $_POST['delivery_address'] = $cart->delivery_address; + $_POST['tax_algorithm'] = $cart->tax_algorithm; } function copy_to_cart() @@ -34,19 +35,21 @@ function copy_to_cart() $cart->supplier_id = $_POST['supplier_id']; $cart->orig_order_date = $_POST['OrderDate']; - if ($cart->trans_type==ST_SUPPINVOICE) + if ($cart->trans_type == ST_SUPPINVOICE) $cart->due_date = $_POST['due_date']; $cart->reference = $_POST['ref']; $cart->supp_ref = $_POST['supp_ref']; $cart->Comments = $_POST['Comments']; $cart->Location = $_POST['StkLocation']; $cart->delivery_address = $_POST['delivery_address']; + if (isset($_POST['tax_algorithm'])) + $cart->tax_algorithm = $_POST['tax_algorithm']; } // ------------------------------------------------------------------------------ function get_supplier_details_to_order(&$order, $supplier_id) { - $sql = "SELECT curr_code, supp_name, tax_group_id, supp.tax_included, + $sql = "SELECT curr_code, supp_name, tax_group_id, supp.tax_included, supp.tax_algorithm, supp.credit_limit - Sum(IFNULL(IF(trans.type=".ST_SUPPCREDIT.", -1, 1) * (ov_amount + ov_gst + ov_discount),0)) as cur_credit, terms.terms, terms.days_before_due, terms.day_in_following_month @@ -71,7 +74,7 @@ function get_supplier_details_to_order(&$order, $supplier_id) $_POST['curr_code'] = $myrow["curr_code"]; $order->set_supplier($supplier_id, $myrow["supp_name"], $myrow["curr_code"], - $myrow["tax_group_id"], $myrow["tax_included"]); + $myrow["tax_group_id"], $myrow["tax_included"], $myrow["tax_algorithm"]); } //--------------------------------------------------------------------------------------------------- @@ -130,6 +133,7 @@ function display_po_header(&$order) get_supplier_details_to_order($order, $_POST['supplier_id']); get_duedate_from_terms($order); $_POST['due_date'] = $order->due_date; + $_POST['tax_algorithm'] = $order->tax_algorithm; // supplier default price update foreach ($order->line_items as $line_no=>$item) { @@ -141,6 +145,7 @@ function display_po_header(&$order) } $Ajax->activate('items_table'); $Ajax->activate('due_date'); + $Ajax->activate('tax_algorithm'); } set_global_supplier($_POST['supplier_id']); diff --git a/purchasing/po_entry_items.php b/purchasing/po_entry_items.php index 84fe0e38..d1713d03 100644 --- a/purchasing/po_entry_items.php +++ b/purchasing/po_entry_items.php @@ -391,6 +391,8 @@ function can_commit() function handle_commit_order() { + global $Refs, $type_shortcuts; + $cart = &$_SESSION['PO']; if (can_commit()) { @@ -437,24 +439,42 @@ function handle_commit_order() $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_discount 'this isn't used at all' - $inv->ov_amount = $inv->ov_gst = 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), ''); - $inv->ov_amount += round2(($line->receive_qty * $line->price), user_price_dec()); + $total += round2(($line->receive_qty * $line->price), user_price_dec()); } - $taxes = $inv->get_taxes($inv->tax_group_id, 0, false); - foreach( $taxes as $taxitem) { - $inv->ov_gst += round2($taxitem['Value'], user_price_dec()); + if (!$inv->tax_included) { + $taxes = $inv->get_taxes($inv->tax_group_id, 0, false, $inv->tax_algorithm); + foreach( $taxes as $taxitem) { + $total += $taxitem['Value']; + } } + $inv_no = add_supp_invoice($inv); - commit_transaction(); // save PO+GRN+PI - // FIXME payment for cash terms. (Needs cash account selection) + // presume supplier data need correction + if ($inv->stored_algorithm != $inv->tax_algorithm) + update_supp_tax_algorithm($inv->supplier_id, $inv->tax_algorithm); + + if (get_post('cash_account')) { + + $pmt_no = add_supp_payment($inv->supplier_id, $inv->tran_date, get_post('cash_account'), + $total, 0, $Refs->get_next(ST_SUPPAYMENT), + _('Payment for:').$inv->supp_reference .' ('.$type_shortcuts[ST_SUPPINVOICE].$inv_no.')'); + add_supp_allocation($total, ST_SUPPAYMENT, $pmt_no, ST_SUPPINVOICE, $inv_no, $inv->tran_date); + update_supp_trans_allocation(ST_SUPPINVOICE, $inv_no, $total); + update_supp_trans_allocation(ST_SUPPAYMENT, $pmt_no, $total); + + } + + commit_transaction(); // save PO+GRN+PI(+SP) + unset($_SESSION['PO']); meta_forward($_SERVER['PHP_SELF'], "AddedPI=$inv_no"); } @@ -501,6 +521,17 @@ echo "
"; display_po_items($_SESSION['PO']); start_table(TABLESTYLE2); + +if (list_updated('tax_algorithm')) { + $_SESSION['PO']->tax_algorithm = $_POST['tax_algorithm']; + $Ajax->activate('items_table'); +} + +if ($_SESSION['PO']->trans_type == ST_SUPPINVOICE) { + tax_algorithm_list_row(_("Tax algorithm:"), 'tax_algorithm', null, true); + cash_accounts_list_row(_("Payment:"), 'cash_account', null, false, _('Delayed')); +} + textarea_row(_("Memo:"), 'Comments', null, 70, 4); end_table(1);