[Frontaccounting-cvs_updates] frontaccount/admin attachments.php, 1.1.2.14, 1.1.2.15 create_coy.php
Brought to you by:
frontaccounting,
itronics
Menu
▾
▴
[Frontaccounting-cvs_updates] frontaccount/admin attachments.php, 1.1.2.14, 1.1.2.15 create_coy.php, 1.3.2.20, 1.3.2.21 fiscalyears.php, 1.2.2.28, 1.2.2.29 gl_setup.php, 1.1.2.19, 1.1.2.20 payment_terms.php, 1.1.2.13, 1.1.2.14 printers.php, 1.1.2.8, 1.1.2.9 shipping_companies.php, 1.1.2.13, 1.1.2.14 view_print_transaction.php, 1.2.2.20, 1.2.2.21
|
From: FrontAccounting <fro...@us...> - 2009-11-30 09:02:41
|
Update of /cvsroot/frontaccounting/frontaccount/admin In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv1678/admin Modified Files: Tag: unstable attachments.php create_coy.php fiscalyears.php gl_setup.php payment_terms.php printers.php shipping_companies.php view_print_transaction.php Log Message: Moved all SQL statements from PHP files into relevant *_db.inc files. Index: payment_terms.php =================================================================== RCS file: /cvsroot/frontaccounting/frontaccount/admin/payment_terms.php,v retrieving revision 1.1.2.13 retrieving revision 1.1.2.14 diff -C2 -d -r1.1.2.13 -r1.1.2.14 *** payment_terms.php 29 Oct 2009 22:05:39 -0000 1.1.2.13 --- payment_terms.php 30 Nov 2009 09:02:32 -0000 1.1.2.14 *************** *** 58,98 **** if ($selected_id != -1) { ! if (check_value('DaysOrFoll')) ! { ! $sql = "UPDATE ".TB_PREF."payment_terms SET terms=" . db_escape($_POST['terms']) . ", ! day_in_following_month=0, ! days_before_due=" . db_escape($_POST['DayNumber']) . " ! WHERE terms_indicator = " .db_escape($selected_id); ! } ! else ! { ! $sql = "UPDATE ".TB_PREF."payment_terms SET terms=" . db_escape($_POST['terms']) . ", ! day_in_following_month=" . db_escape($_POST['DayNumber']) . ", ! days_before_due=0 ! WHERE terms_indicator = " .db_escape( $selected_id ); ! } $note = _('Selected payment terms have been updated'); } else { ! ! if (check_value('DaysOrFoll')) ! { ! $sql = "INSERT INTO ".TB_PREF."payment_terms (terms, ! days_before_due, day_in_following_month) ! VALUES (" . ! db_escape($_POST['terms']) . ", " . db_escape($_POST['DayNumber']) . ", 0)"; ! } ! else ! { ! $sql = "INSERT INTO ".TB_PREF."payment_terms (terms, ! days_before_due, day_in_following_month) ! VALUES (" . db_escape($_POST['terms']) . ", ! 0, " . db_escape($_POST['DayNumber']) . ")"; ! } $note = _('New payment terms have been added'); } //run the sql from either of the above possibilites - db_query($sql,"The payment term could not be added or updated"); display_notification($note); $Mode = 'RESET'; --- 58,70 ---- if ($selected_id != -1) { ! update_payment_terms($selected_id, check_value('DaysOrFoll'), $_POST['terms'], $_POST['DayNumber']); $note = _('Selected payment terms have been updated'); } else { ! add_payment_terms(check_value('DaysOrFoll'), $_POST['terms'], $_POST['DayNumber']); $note = _('New payment terms have been added'); } //run the sql from either of the above possibilites display_notification($note); $Mode = 'RESET'; *************** *** 103,111 **** { // PREVENT DELETES IF DEPENDENT RECORDS IN debtors_master ! ! $sql= "SELECT COUNT(*) FROM ".TB_PREF."debtors_master WHERE payment_terms = ".db_escape($selected_id); ! $result = db_query($sql,"check failed"); ! $myrow = db_fetch_row($result); ! if ($myrow[0] > 0) { display_error(_("Cannot delete this payment term, because customer accounts have been created referring to this term.")); --- 75,79 ---- { // PREVENT DELETES IF DEPENDENT RECORDS IN debtors_master ! if (customer_has_terms($selected_id)) { display_error(_("Cannot delete this payment term, because customer accounts have been created referring to this term.")); *************** *** 113,120 **** else { ! $sql= "SELECT COUNT(*) FROM ".TB_PREF."suppliers WHERE payment_terms = ".db_escape($selected_id); ! $result = db_query($sql,"check failed"); ! $myrow = db_fetch_row($result); ! if ($myrow[0] > 0) { display_error(_("Cannot delete this payment term, because supplier accounts have been created referring to this term")); --- 81,85 ---- else { ! if (supplier_has_terms($selected_id)) { display_error(_("Cannot delete this payment term, because supplier accounts have been created referring to this term")); *************** *** 123,129 **** { //only delete if used in neither customer or supplier accounts ! ! $sql="DELETE FROM ".TB_PREF."payment_terms WHERE terms_indicator=".db_escape($selected_id); ! db_query($sql,"could not delete a payment terms"); display_notification(_('Selected payment terms have been deleted')); } --- 88,92 ---- { //only delete if used in neither customer or supplier accounts ! delete_payment_terms($selected_id); display_notification(_('Selected payment terms have been deleted')); } *************** *** 142,148 **** //------------------------------------------------------------------------------------------------- ! $sql = "SELECT * FROM ".TB_PREF."payment_terms"; ! if (!check_value('show_inactive')) $sql .= " WHERE !inactive"; ! $result = db_query($sql,"could not get payment terms"); start_form(); --- 105,109 ---- //------------------------------------------------------------------------------------------------- ! $result = get_payment_terms_all(check_value('show_inactive')); start_form(); *************** *** 198,206 **** if ($Mode == 'Edit') { //editing an existing payment terms ! $sql = "SELECT * FROM ".TB_PREF."payment_terms ! WHERE terms_indicator=".db_escape($selected_id); ! ! $result = db_query($sql,"could not get payment term"); ! $myrow = db_fetch($result); $_POST['terms'] = $myrow["terms"]; --- 159,163 ---- if ($Mode == 'Edit') { //editing an existing payment terms ! $myrow = get_payment_terms($selected_id); $_POST['terms'] = $myrow["terms"]; Index: printers.php =================================================================== RCS file: /cvsroot/frontaccounting/frontaccount/admin/printers.php,v retrieving revision 1.1.2.8 retrieving revision 1.1.2.9 diff -C2 -d -r1.1.2.8 -r1.1.2.9 *** printers.php 29 Oct 2009 22:05:39 -0000 1.1.2.8 --- printers.php 30 Nov 2009 09:02:32 -0000 1.1.2.9 *************** *** 60,67 **** // PREVENT DELETES IF DEPENDENT RECORDS IN print_profiles ! $sql= "SELECT COUNT(*) FROM ".TB_PREF."print_profiles WHERE printer = ".db_escape($selected_id); ! $result = db_query($sql,"check printers relations failed"); ! $myrow = db_fetch_row($result); ! if ($myrow[0] > 0) { display_error(_("Cannot delete this printer definition, because print profile have been created using it.")); --- 60,64 ---- // PREVENT DELETES IF DEPENDENT RECORDS IN print_profiles ! if (printer_has_profile($selected_id)) { display_error(_("Cannot delete this printer definition, because print profile have been created using it.")); *************** *** 69,75 **** else { ! $sql="DELETE FROM ".TB_PREF."printers WHERE id=".db_escape($selected_id); ! db_query($sql,"could not delete printer definition"); ! display_notification(_('Selected printer definition has been deleted')); } $Mode = 'RESET'; --- 66,71 ---- else { ! delete_printer($selected_id); ! display_notification(_('Selected printer definition has been deleted')); } $Mode = 'RESET'; Index: shipping_companies.php =================================================================== RCS file: /cvsroot/frontaccounting/frontaccount/admin/shipping_companies.php,v retrieving revision 1.1.2.13 retrieving revision 1.1.2.14 diff -C2 -d -r1.1.2.13 -r1.1.2.14 *** shipping_companies.php 29 Oct 2009 22:05:39 -0000 1.1.2.13 --- shipping_companies.php 30 Nov 2009 09:02:32 -0000 1.1.2.14 *************** *** 15,18 **** --- 15,19 ---- page(_($help_context = "Shipping Company")); include($path_to_root . "/includes/ui.inc"); + include($path_to_root . "/admin/db/shipping_db.inc"); simple_page_mode(true); *************** *** 33,45 **** if ($Mode=='ADD_ITEM' && can_process()) { ! ! $sql = "INSERT INTO ".TB_PREF."shippers (shipper_name, contact, phone, phone2, address) ! VALUES (" . db_escape($_POST['shipper_name']) . ", " . ! db_escape($_POST['contact']). ", " . ! db_escape($_POST['phone']). ", " . ! db_escape($_POST['phone2']). ", " . ! db_escape($_POST['address']) . ")"; ! ! db_query($sql,"The Shipping Company could not be added"); display_notification(_('New shipping company has been added')); $Mode = 'RESET'; --- 34,38 ---- if ($Mode=='ADD_ITEM' && can_process()) { ! add_shipper($_POST['shipper_name'], $_POST['contact'], $_POST['phone'], $_POST['phone2'], $_POST['address']); display_notification(_('New shipping company has been added')); $Mode = 'RESET'; *************** *** 50,62 **** if ($Mode=='UPDATE_ITEM' && can_process()) { ! ! $sql = "UPDATE ".TB_PREF."shippers SET shipper_name=" . db_escape($_POST['shipper_name']). " , ! contact =" . db_escape($_POST['contact']). " , ! phone =" . db_escape($_POST['phone']). " , ! phone2 =" . db_escape($_POST['phone2']). " , ! address =" . db_escape($_POST['address']). " ! WHERE shipper_id = ".db_escape($selected_id); ! ! db_query($sql,"The shipping company could not be updated"); display_notification(_('Selected shipping company has been updated')); $Mode = 'RESET'; --- 43,47 ---- if ($Mode=='UPDATE_ITEM' && can_process()) { ! update_shipper($selected_id, $_POST['shipper_name'], $_POST['contact'], $_POST['phone'], $_POST['phone2'], $_POST['address']); display_notification(_('Selected shipping company has been updated')); $Mode = 'RESET'; *************** *** 69,76 **** // PREVENT DELETES IF DEPENDENT RECORDS IN 'sales_orders' ! $sql= "SELECT COUNT(*) FROM ".TB_PREF."sales_orders WHERE ship_via=".db_escape($selected_id); ! $result = db_query($sql,"check failed"); ! $myrow = db_fetch_row($result); ! if ($myrow[0] > 0) { $cancel_delete = 1; --- 54,58 ---- // PREVENT DELETES IF DEPENDENT RECORDS IN 'sales_orders' ! if (sales_orders_has_shipper($selected_id)) { $cancel_delete = 1; *************** *** 81,88 **** // PREVENT DELETES IF DEPENDENT RECORDS IN 'debtor_trans' ! $sql= "SELECT COUNT(*) FROM ".TB_PREF."debtor_trans WHERE ship_via=".db_escape($selected_id); ! $result = db_query($sql,"check failed"); ! $myrow = db_fetch_row($result); ! if ($myrow[0] > 0) { $cancel_delete = 1; --- 63,67 ---- // PREVENT DELETES IF DEPENDENT RECORDS IN 'debtor_trans' ! if (debtor_trans_has_shipper($selected_id)) { $cancel_delete = 1; *************** *** 91,96 **** else { ! $sql="DELETE FROM ".TB_PREF."shippers WHERE shipper_id=".db_escape($selected_id); ! db_query($sql,"could not delete shipper"); display_notification(_('Selected shipping company has been deleted')); } --- 70,74 ---- else { ! delete_shipper($selected_id); display_notification(_('Selected shipping company has been deleted')); } *************** *** 108,115 **** //---------------------------------------------------------------------------------------------- ! $sql = "SELECT * FROM ".TB_PREF."shippers"; ! if (!check_value('show_inactive')) $sql .= " WHERE !inactive"; ! $sql .= " ORDER BY shipper_id"; ! $result = db_query($sql,"could not get shippers"); start_form(); --- 86,90 ---- //---------------------------------------------------------------------------------------------- ! $result = get_shippers(check_value('show_inactive')); start_form(); *************** *** 147,154 **** //editing an existing Shipper ! $sql = "SELECT * FROM ".TB_PREF."shippers WHERE shipper_id=".db_escape($selected_id); ! ! $result = db_query($sql, "could not get shipper"); ! $myrow = db_fetch($result); $_POST['shipper_name'] = $myrow["shipper_name"]; --- 122,126 ---- //editing an existing Shipper ! $myrow = get_shipper($selected_id); $_POST['shipper_name'] = $myrow["shipper_name"]; Index: gl_setup.php =================================================================== RCS file: /cvsroot/frontaccounting/frontaccount/admin/gl_setup.php,v retrieving revision 1.1.2.19 retrieving revision 1.1.2.20 diff -C2 -d -r1.1.2.19 -r1.1.2.20 *** gl_setup.php 29 Oct 2009 22:05:39 -0000 1.1.2.19 --- gl_setup.php 30 Nov 2009 09:02:32 -0000 1.1.2.20 *************** *** 129,137 **** table_section_title(_("General GL")); - // Not used in FA2.0. - //gl_all_accounts_list_row(_("Retained Earning Clearing Account:"), 'retained_earnings_act', $_POST['retained_earnings_act']); - // Not used in FA2.0. - //gl_all_accounts_list_row(_("Payroll Account:"), 'payroll_act', $_POST['payroll_act']); - text_row(_("Past Due Days Interval:"), 'past_due_days', $_POST['past_due_days'], 6, 6, '', "", _("days")); --- 129,132 ---- Index: attachments.php =================================================================== RCS file: /cvsroot/frontaccounting/frontaccount/admin/attachments.php,v retrieving revision 1.1.2.14 retrieving revision 1.1.2.15 diff -C2 -d -r1.1.2.14 -r1.1.2.15 *** attachments.php 29 Oct 2009 22:05:39 -0000 1.1.2.14 --- attachments.php 30 Nov 2009 09:02:32 -0000 1.1.2.15 *************** *** 18,21 **** --- 18,22 ---- include_once($path_to_root . "/includes/ui.inc"); include_once($path_to_root . "/includes/data_checks.inc"); + include_once($path_to_root . "/admin/db/attachments_db.inc"); if (isset($_GET['vw'])) *************** *** 109,138 **** $filesize = 0; } - $date = date2sql(Today()); if ($Mode == 'ADD_ITEM') { ! $sql = "INSERT INTO ".TB_PREF."attachments (type_no, trans_no, description, filename, unique_name, ! filesize, filetype, tran_date) VALUES (".db_escape($_POST['filterType'])."," ! .db_escape($_POST['trans_no']).",".db_escape($_POST['description']).", " ! .db_escape($filename).", ".db_escape($unique_name).", ".db_escape($filesize) ! .", ".db_escape($filetype).", '$date')"; ! db_query($sql, "Attachment could not be inserted"); display_notification(_("Attachment has been inserted.")); } else { ! $sql = "UPDATE ".TB_PREF."attachments SET ! type_no=".db_escape($_POST['filterType']).", ! trans_no=".db_escape($_POST['trans_no']).", ! description=".db_escape($_POST['description']).", "; ! if ($filename != "") ! { ! $sql .= "filename=".db_escape($filename).", ! unique_name=".db_escape($unique_name).", ! filesize=".db_escape($filesize).", ! filetype=".db_escape($filetype); ! } ! $sql .= "tran_date='$date' WHERE id=".db_escape($selected_id); ! db_query($sql, "Attachment could not be updated"); display_notification(_("Attachment has been updated.")); } --- 110,123 ---- $filesize = 0; } if ($Mode == 'ADD_ITEM') { ! add_attachment($_POST['filterType'], $_POST['trans_no'], $_POST['description'], ! $filename, $unique_name, $filesize, $filetype); display_notification(_("Attachment has been inserted.")); } else { ! update_attachment($selected_id, $_POST['filterType'], $_POST['trans_no'], $_POST['description'], ! $filename, $unique_name, $filesize, $filetype); display_notification(_("Attachment has been updated.")); } *************** *** 146,151 **** if (file_exists($dir."/".$row['unique_name'])) unlink($dir."/".$row['unique_name']); ! $sql = "DELETE FROM ".TB_PREF."attachments WHERE id = ".db_escape($selected_id); ! db_query($sql, "Could not delete attachment"); display_notification(_("Attachment has been deleted.")); $Mode = 'RESET'; --- 131,135 ---- if (file_exists($dir."/".$row['unique_name'])) unlink($dir."/".$row['unique_name']); ! delete_attachment($selected_id); display_notification(_("Attachment has been deleted.")); $Mode = 'RESET'; *************** *** 172,191 **** } - //---------------------------------------------------------------------------------------- - - function get_attached_documents($type) - { - $sql = "SELECT * FROM ".TB_PREF."attachments WHERE type_no=".db_escape($type) - ." ORDER BY trans_no"; - return db_query($sql, "Could not retrieve attachments"); - } - - function get_attachment($id) - { - $sql = "SELECT * FROM ".TB_PREF."attachments WHERE id=".db_escape($id); - $result = db_query($sql, "Could not retrieve attachments"); - return db_fetch($result); - } - function display_rows($type) { --- 156,159 ---- Index: view_print_transaction.php =================================================================== RCS file: /cvsroot/frontaccounting/frontaccount/admin/view_print_transaction.php,v retrieving revision 1.2.2.20 retrieving revision 1.2.2.21 diff -C2 -d -r1.2.2.20 -r1.2.2.21 *** view_print_transaction.php 29 Oct 2009 22:05:39 -0000 1.2.2.20 --- view_print_transaction.php 30 Nov 2009 09:02:32 -0000 1.2.2.21 *************** *** 19,22 **** --- 19,23 ---- include_once($path_to_root . "/includes/ui.inc"); include_once($path_to_root . "/includes/data_checks.inc"); + include_once($path_to_root . "/admin/db/transactions_db.inc"); include_once($path_to_root . "/reporting/includes/reporting.inc"); *************** *** 94,122 **** if (check_valid_entries()==true) { ! $db_info = get_systype_db_info($_POST['filterType']); ! ! if ($db_info == null) return; - $table_name = $db_info[0]; - $type_name = $db_info[1]; - $trans_no_name = $db_info[2]; - $trans_ref = $db_info[3]; - - $sql = "SELECT DISTINCT $trans_no_name as trans_no"; - - if ($trans_ref) - $sql .= " ,$trans_ref "; - - $sql .= ", ".$_POST['filterType']." as type FROM $table_name - WHERE $trans_no_name >= ".db_escape($_POST['FromTransNo']). " - AND $trans_no_name <= ".db_escape($_POST['ToTransNo']); - - if ($type_name != null) - $sql .= " AND `$type_name` = ".db_escape($_POST['filterType']); - - $sql .= " ORDER BY $trans_no_name"; - - $print_type = $_POST['filterType']; $print_out = ($print_type == ST_SALESINVOICE || $print_type == ST_CUSTCREDIT || $print_type == ST_CUSTDELIVERY || --- 95,103 ---- if (check_valid_entries()==true) { ! $trans_ref = false; ! $sql = get_sql_for_view_transactions($_POST['filterType'], $_POST['FromTransNo'], $_POST['ToTransNo'], $trans_ref); ! if ($sql == "") return; $print_type = $_POST['filterType']; $print_out = ($print_type == ST_SALESINVOICE || $print_type == ST_CUSTCREDIT || $print_type == ST_CUSTDELIVERY || Index: fiscalyears.php =================================================================== RCS file: /cvsroot/frontaccounting/frontaccount/admin/fiscalyears.php,v retrieving revision 1.2.2.28 retrieving revision 1.2.2.29 diff -C2 -d -r1.2.2.28 -r1.2.2.29 *** fiscalyears.php 29 Oct 2009 22:05:39 -0000 1.2.2.28 --- fiscalyears.php 30 Nov 2009 09:02:32 -0000 1.2.2.29 *************** *** 16,19 **** --- 16,20 ---- include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/admin/db/company_db.inc"); + include_once($path_to_root . "/admin/db/fiscalyears_db.inc"); include_once($path_to_root . "/includes/ui.inc"); include_once($path_to_root . "/sales/includes/db/cust_trans_db.inc"); *************** *** 27,64 **** //--------------------------------------------------------------------------------------------- - function is_date_in_fiscalyears($date) - { - $date = date2sql($date); - $sql = "SELECT * FROM ".TB_PREF."fiscal_year WHERE '$date' >= begin AND '$date' <= end"; - - $result = db_query($sql, "could not get all fiscal years"); - return db_fetch($result) !== false; - } - - function is_bad_begin_date($date) - { - $bdate = date2sql($date); - $sql = "SELECT MAX(end) FROM ".TB_PREF."fiscal_year WHERE begin < '$bdate'"; - - $result = db_query($sql, "could not retrieve last fiscal years"); - $row = db_fetch_row($result); - if ($row[0] === null) - return false; - $max = add_days(sql2date($row[0]), 1); - return ($max !== $date); - } - - function check_years_before($date, $closed=false) - { - $date = date2sql($date); - $sql = "SELECT COUNT(*) FROM ".TB_PREF."fiscal_year WHERE begin < '$date'"; - if (!$closed) - $sql .= " AND closed=0"; - - $result = db_query($sql, "could not check fiscal years before"); - $row = db_fetch_row($result); - return ($row[0] > 0); - } - function check_data() { --- 28,31 ---- *************** *** 83,136 **** return true; } - //--------------------------------------------------------------------------------------------- - function close_year($year) - { - $co = get_company_prefs(); - if (get_gl_account($co['retained_earnings_act']) == false || get_gl_account($co['profit_loss_year_act']) == false) - { - display_error(_("The Retained Earnings Account or the Profit and Loss Year Account has not been set in System and General GL Setup")); - return false; - } - begin_transaction(); - - $myrow = get_fiscalyear($year); - $to = $myrow['end']; - // retrieve total balances from balance sheet accounts - $sql = "SELECT SUM(amount) FROM ".TB_PREF."gl_trans INNER JOIN ".TB_PREF."chart_master ON account=account_code - INNER JOIN ".TB_PREF."chart_types ON account_type=id INNER JOIN ".TB_PREF."chart_class ON class_id=cid - WHERE ctype>=".CL_ASSETS." AND ctype <=".CL_EQUITY." AND tran_date <= '$to'"; - $result = db_query($sql, "The total balance could not be calculated"); - - $row = db_fetch_row($result); - $balance = round2($row[0], user_price_dec()); - - $to = sql2date($to); - - if ($balance != 0.0) - { - $trans_type = ST_JOURNAL; - $trans_id = get_next_trans_no($trans_type); - - add_gl_trans($trans_type, $trans_id, $to, $co['retained_earnings_act'], - 0, 0, _("Closing Year"), -$balance); - add_gl_trans($trans_type, $trans_id, $to, $co['profit_loss_year_act'], - 0, 0, _("Closing Year"), $balance); - - } - close_transactions($to); - - commit_transaction(); - return true; - } - - function open_year($year) - { - $myrow = get_fiscalyear($year); - $from = sql2date($myrow['begin']); - - begin_transaction(); - open_transactions($from); - commit_transaction(); - } function handle_submit() --- 50,53 ---- *************** *** 188,370 **** } - //--------------------------------------------------------------------------------------------- - function delete_attachments_and_comments($type_no, $trans_no) - { - global $comp_path; - - $sql = "SELECT * FROM ".TB_PREF."attachments WHERE type_no = $type_no AND trans_no = $trans_no"; - $result = db_query($sql, "Could not retrieve attachments"); - while ($row = db_fetch($result)) - { - $dir = $comp_path."/".user_company(). "/attachments"; - if (file_exists($dir."/".$row['unique_name'])) - unlink($dir."/".$row['unique_name']); - $sql = "DELETE FROM ".TB_PREF."attachments WHERE type_no = $type_no AND trans_no = $trans_no"; - db_query($sql, "Could not delete attachment"); - } - $sql = "DELETE FROM ".TB_PREF."comments WHERE type = $type_no AND id = $trans_no"; - db_query($sql, "Could not delete comments"); - } - - function delete_this_fiscalyear($selected_id) - { - global $db_connections; - - db_backup($db_connections[$_SESSION["wa_current_user"]->company], 'Security backup before Fiscal Year Removal'); - begin_transaction(); - $ref = _("Open Balance"); - $myrow = get_fiscalyear($selected_id); - $to = $myrow['end']; - $sql = "SELECT order_no, trans_type FROM ".TB_PREF."sales_orders WHERE ord_date <= '$to' AND type <> 1"; // don't take the templates - $result = db_query($sql, "Could not retrieve sales orders"); - while ($row = db_fetch($result)) - { - $sql = "SELECT SUM(qty_sent), SUM(quantity) FROM ".TB_PREF."sales_order_details WHERE order_no = {$row['order_no']} AND trans_type = {$row['trans_type']}"; - $res = db_query($sql, "Could not retrieve sales order details"); - $row2 = db_fetch_row($res); - if ($row2[0] == $row2[1]) - { - $sql = "DELETE FROM ".TB_PREF."sales_order_details WHERE order_no = {$row['order_no']} AND trans_type = {$row['trans_type']}"; - db_query($sql, "Could not delete sales order details"); - $sql = "DELETE FROM ".TB_PREF."sales_orders WHERE order_no = {$row['order_no']} AND trans_type = {$row['trans_type']}"; - db_query($sql, "Could not delete sales order"); - delete_attachments_and_comments($row['trans_type'], $row['order_no']); - } - } - $sql = "SELECT order_no FROM ".TB_PREF."purch_orders WHERE ord_date <= '$to'"; - $result = db_query($sql, "Could not retrieve purchase orders"); - while ($row = db_fetch($result)) - { - $sql = "SELECT SUM(quantity_ordered), SUM(quantity_received) FROM ".TB_PREF."purch_order_details WHERE order_no = {$row['order_no']}"; - $res = db_query($sql, "Could not retrieve purchase order details"); - $row2 = db_fetch_row($res); - if ($row2[0] == $row2[1]) - { - $sql = "DELETE FROM ".TB_PREF."purch_order_details WHERE order_no = {$row['order_no']}"; - db_query($sql, "Could not delete purchase order details"); - $sql = "DELETE FROM ".TB_PREF."purch_orders WHERE order_no = {$row['order_no']}"; - db_query($sql, "Could not delete purchase order"); - delete_attachments_and_comments(ST_PURCHORDER, $row['order_no']); - } - } - $sql = "SELECT id FROM ".TB_PREF."grn_batch WHERE delivery_date <= '$to'"; - $result = db_query($sql, "Could not retrieve grn batch"); - while ($row = db_fetch($result)) - { - $sql = "DELETE FROM ".TB_PREF."grn_items WHERE grn_batch_id = {$row['id']}"; - db_query($sql, "Could not delete grn items"); - $sql = "DELETE FROM ".TB_PREF."grn_batch WHERE id = {$row['id']}"; - db_query($sql, "Could not delete grn batch"); - delete_attachments_and_comments(25, $row['id']); - } - $sql = "SELECT trans_no, type FROM ".TB_PREF."debtor_trans WHERE tran_date <= '$to' AND - (ov_amount + ov_gst + ov_freight + ov_freight_tax + ov_discount) = alloc"; - $result = db_query($sql, "Could not retrieve debtor trans"); - while ($row = db_fetch($result)) - { - if ($row['type'] == ST_SALESINVOICE) - { - $deliveries = get_parent_trans(ST_SALESINVOICE,$row['trans_no']); - foreach ($deliveries as $delivery) - { - $sql = "DELETE FROM ".TB_PREF."debtor_trans_details WHERE debtor_trans_no = $delivery AND debtor_trans_type = ".ST_CUSTDELIVERY; - db_query($sql, "Could not delete debtor trans details"); - $sql = "DELETE FROM ".TB_PREF."debtor_trans WHERE trans_no = $delivery AND type = ".ST_CUSTDELIVERY; - db_query($sql, "Could not delete debtor trans"); - } - } - $sql = "DELETE FROM ".TB_PREF."cust_allocations WHERE trans_no_from = {$row['trans_no']} AND type_no_from = {$row['type']}"; - db_query($sql, "Could not delete cust allocations"); - $sql = "DELETE FROM ".TB_PREF."debtor_trans_details WHERE debtor_trans_no = {$row['trans_no']} AND debtor_trans_type = {$row['type']}"; - db_query($sql, "Could not delete debtor trans details"); - $sql = "DELETE FROM ".TB_PREF."debtor_trans WHERE trans_no = {$row['trans_no']} AND type = {$row['type']}"; - db_query($sql, "Could not delete debtor trans"); - delete_attachments_and_comments($row['type'], $row['trans_no']); - } - $sql = "SELECT trans_no, type FROM ".TB_PREF."supp_trans WHERE tran_date <= '$to' AND - ABS(ov_amount + ov_gst + ov_discount) = alloc"; - $result = db_query($sql, "Could not retrieve supp trans"); - while ($row = db_fetch($result)) - { - $sql = "DELETE FROM ".TB_PREF."supp_allocations WHERE trans_no_from = {$row['trans_no']} AND type_no_from = {$row['type']}"; - db_query($sql, "Could not delete supp allocations"); - $sql = "DELETE FROM ".TB_PREF."supp_invoice_items WHERE supp_trans_no = {$row['trans_no']} AND supp_trans_type = {$row['type']}"; - db_query($sql, "Could not delete supp invoice items"); - $sql = "DELETE FROM ".TB_PREF."supp_trans WHERE trans_no = {$row['trans_no']} AND type = {$row['type']}"; - db_query($sql, "Could not delete supp trans"); - delete_attachments_and_comments($row['type'], $row['trans_no']); - } - $sql = "SELECT id FROM ".TB_PREF."workorders WHERE released_date <= '$to' AND closed=1"; - $result = db_query($sql, "Could not retrieve supp trans"); - while ($row = db_fetch($result)) - { - $sql = "SELECT issue_no FROM ".TB_PREF."wo_issues WHERE workorder_id = {$row['id']}"; - $res = db_query($sql, "Could not retrieve wo issues"); - while ($row2 = db_fetch_row($res)) - { - $sql = "DELETE FROM ".TB_PREF."wo_issue_items WHERE issue_id = {$row2[0]}"; - db_query($sql, "Could not delete wo issue items"); - } - delete_attachments_and_comments(28, $row['id']); - $sql = "DELETE FROM ".TB_PREF."wo_issues WHERE workorder_id = {$row['id']}"; - db_query($sql, "Could not delete wo issues"); - $sql = "DELETE FROM ".TB_PREF."wo_manufacture WHERE workorder_id = {$row['id']}"; - db_query($sql, "Could not delete wo manufacture"); - $sql = "DELETE FROM ".TB_PREF."wo_requirements WHERE workorder_id = {$row['id']}"; - db_query($sql, "Could not delete wo requirements"); - $sql = "DELETE FROM ".TB_PREF."workorders WHERE id = {$row['id']}"; - db_query($sql, "Could not delete workorders"); - delete_attachments_and_comments(26, $row['id']); - } - $sql = "SELECT loc_code, stock_id, SUM(qty) AS qty, SUM(qty*standard_cost) AS std_cost FROM ".TB_PREF."stock_moves WHERE tran_date <= '$to' GROUP by - loc_code, stock_id"; - $result = db_query($sql, "Could not retrieve supp trans"); - while ($row = db_fetch($result)) - { - $sql = "DELETE FROM ".TB_PREF."stock_moves WHERE tran_date <= '$to' AND loc_code = '{$row['loc_code']}' AND stock_id = '{$row['stock_id']}'"; - db_query($sql, "Could not delete stock moves"); - $qty = $row['qty']; - $std_cost = ($qty == 0 ? 0 : round2($row['std_cost'] / $qty, user_price_dec())); - $sql = "INSERT INTO ".TB_PREF."stock_moves (stock_id, loc_code, tran_date, reference, qty, standard_cost) VALUES - ('{$row['stock_id']}', '{$row['loc_code']}', '$to', '$ref', $qty, $std_cost)"; - db_query($sql, "Could not insert stock move"); - } - $sql = "DELETE FROM ".TB_PREF."voided WHERE date_ <= '$to'"; - db_query($sql, "Could not delete voided items"); - $sql = "DELETE FROM ".TB_PREF."trans_tax_details WHERE tran_date <= '$to'"; - db_query($sql, "Could not delete trans tax details"); - $sql = "DELETE FROM ".TB_PREF."exchange_rates WHERE date_ <= '$to'"; - db_query($sql, "Could not delete exchange rates"); - $sql = "DELETE FROM ".TB_PREF."budget_trans WHERE tran_date <= '$to'"; - db_query($sql, "Could not delete exchange rates"); - $sql = "SELECT account, SUM(amount) AS amount FROM ".TB_PREF."gl_trans WHERE tran_date <= '$to' GROUP by account"; - $result = db_query($sql, "Could not retrieve gl trans"); - while ($row = db_fetch($result)) - { - $sql = "DELETE FROM ".TB_PREF."gl_trans WHERE tran_date <= '$to' AND account = '{$row['account']}'"; - db_query($sql, "Could not delete gl trans"); - if (is_account_balancesheet($row['account'])) - { - $trans_no = get_next_trans_no(0); - if (is_bank_account($row['account'])) - { - $sql = "SELECT SUM(amount) FROM ".TB_PREF."bank_trans WHERE trans_date <= '$to' AND bank_act = '{$row['account']}'"; - $res = db_query($sql, "Could not retrieve bank trans"); - $row2 = db_fetch_row($res); - $sql = "DELETE FROM ".TB_PREF."bank_trans WHERE trans_date <= '$to' AND bank_act = '{$row['account']}'"; - db_query($sql, "Could not delete bank trans"); - $sql = "INSERT INTO ".TB_PREF."bank_trans (type, trans_no, trans_date, bank_act, ref, amount) VALUES - (0, $trans_no, '$to', '{$row['account']}', '$ref', {$row2[0]})"; - db_query($sql, "Could not insert bank trans"); - } - $sql = "INSERT INTO ".TB_PREF."gl_trans (type, type_no, tran_date, account, memo_, amount) VALUES - (0, $trans_no, '$to', '{$row['account']}', '$ref', {$row['amount']})"; - db_query($sql, "Could not insert gl trans"); - } - } - delete_fiscalyear($selected_id); - commit_transaction(); - } - function handle_delete() { --- 105,108 ---- Index: create_coy.php =================================================================== RCS file: /cvsroot/frontaccounting/frontaccount/admin/create_coy.php,v retrieving revision 1.3.2.20 retrieving revision 1.3.2.21 diff -C2 -d -r1.3.2.20 -r1.3.2.21 *** create_coy.php 29 Oct 2009 22:05:39 -0000 1.3.2.20 --- create_coy.php 30 Nov 2009 09:02:32 -0000 1.3.2.21 *************** *** 125,130 **** { db_import($filename, $conn, $id); ! if (isset($_POST['admpassword']) && $_POST['admpassword'] != "") ! db_query("UPDATE ".$conn['tbpref']."users set password = '".md5($_POST['admpassword']). "' WHERE user_id = 'admin'"); } else --- 125,130 ---- { db_import($filename, $conn, $id); ! if (isset($_POST['admpassword']) && $_POST['admpassword'] != "") ! update_admin_password($conn, md5($_POST['admpassword'])); } else |