Implemented automatic price calculation of items from std. cost.

[fa-stable.git] / admin / db / company_db.inc

diff --git a/admin/db/company_db.inc b/admin/db/company_db.inc
index ba56c4b905d8c55e3549566488ca8ec708145afd..ed2b18f1356ae1653d1e319a7bf21d89160bbc04 100644 (file)
--- a/admin/db/company_db.inc
+++ b/admin/db/company_db.inc
@@ -1,17 +1,19 @@
 <?php
 /**********************************************************************
     Copyright (C) FrontAccounting, LLC.
-       Released under the terms of the GNU Affero General Public License,
-       AGPL, as published by the Free Software Foundation, either version 
-       3 of the License, or (at your option) any later version.
+       Released under the terms of the GNU General Public License, GPL, 
+       as published by the Free Software Foundation, either version 3 
+       of the License, or (at your option) any later version.
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
-    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-function update_company_gl_setup($debtors_act, $pyt_discount_act, $creditors_act,
+
+function update_company_gl_setup($retained_act, $profit_loss_act, $debtors_act, $pyt_discount_act, $creditors_act,
                $freight_act,
                $exchange_diff_act,
+               $bank_charge_act,
                $default_sales_act,
                $default_sales_discount_act,
                $default_prompt_payment_act,
@@ -28,13 +30,16 @@ function update_company_gl_setup($debtors_act, $pyt_discount_act, $creditors_act
                $past_due_days,
                $default_credit_limit,
                $default_workorder_required,
-               $default_dim_required)
+               $default_dim_required,
+               $default_delivery_required)
 {
        $sql = "UPDATE ".TB_PREF."company SET
+               retained_earnings_act=".db_escape($retained_act).", profit_loss_year_act=".db_escape($profit_loss_act).",
                debtors_act=".db_escape($debtors_act).", pyt_discount_act=".db_escape($pyt_discount_act).",
                creditors_act=".db_escape($creditors_act).",
                freight_act=".db_escape($freight_act).",
                exchange_diff_act=".db_escape($exchange_diff_act).",
+               bank_charge_act=".db_escape($bank_charge_act).",
                default_sales_act=".db_escape($default_sales_act).",
                default_sales_discount_act=".db_escape($default_sales_discount_act).",
                default_prompt_payment_act=".db_escape($default_prompt_payment_act).",
@@ -51,16 +56,17 @@ function update_company_gl_setup($debtors_act, $pyt_discount_act, $creditors_act
                past_due_days=$past_due_days,
                default_credit_limit=$default_credit_limit,
                default_workorder_required=$default_workorder_required,
-               default_dim_required=$default_dim_required
+               default_dim_required=$default_dim_required,
+               default_delivery_required=$default_delivery_required
                WHERE coy_code=1";
 
        db_query($sql, "The company gl setup could not be updated ");
 }
 
-function update_company_setup($coy_name, $coy_no, $gst_no, $tax_prd, $tax_last, $postal_address, $phone, $fax, $email,
-               $coy_logo, $domicile, $Dimension, $custom1_name, $custom2_name, $custom3_name,
-               $custom1_value, $custom2_value, $custom3_value, $curr_default, $f_year, $no_item_list, $no_customer_list,
-               $no_supplier_list, $base_sales)
+function update_company_setup($coy_name, $coy_no, $gst_no, $tax_prd, $tax_last, 
+       $postal_address, $phone, $fax, $email, $coy_logo, $domicile, $Dimension, 
+       $curr_default, $f_year, $no_item_list, $no_customer_list, $no_supplier_list, 
+       $base_sales, $time_zone, $add_pct, $round_to)
 {
        if ($f_year == null)
                $f_year = 0;
@@ -78,15 +84,12 @@ function update_company_setup($coy_name, $coy_no, $gst_no, $tax_prd, $tax_last,
                no_item_list=$no_item_list,
                no_customer_list=$no_customer_list,
                no_supplier_list=$no_supplier_list,
-        custom1_name=".db_escape($custom1_name).",
-        custom2_name=".db_escape($custom2_name).",
-        custom3_name=".db_escape($custom3_name).",
-        custom1_value=".db_escape($custom1_value).",
-        custom2_value=".db_escape($custom2_value).",
-        custom3_value=".db_escape($custom3_value).",
                curr_default=".db_escape($curr_default).",
                f_year=$f_year,
-               base_sales=$base_sales
+               base_sales=$base_sales,
+               time_zone=$time_zone,
+               add_pct=$add_pct,
+               round_to=$round_to
                WHERE coy_code=1";
 
        db_query($sql, "The company setup could not be updated ");