Removed company custom fields, added default delivery required by

[fa-stable.git] / admin / company_preferences.php

diff --git a/admin/company_preferences.php b/admin/company_preferences.php
index d020398a8bd94937751d10ec5b36a8fe23c9d8f6..ac5eb4496e74d5ad3c20ff00a84b4a1255f50c6a 100644 (file)
--- a/admin/company_preferences.php
+++ b/admin/company_preferences.php
@@ -95,11 +95,12 @@ if (isset($_POST['update']) && $_POST['update'] != "")
        }
        if ($input_error != 1)
        {
-               update_company_setup($_POST['coy_name'], $_POST['coy_no'], $_POST['gst_no'], $_POST['tax_prd'], $_POST['tax_last'],
-                       $_POST['postal_address'], $_POST['phone'], $_POST['fax'], $_POST['email'], $_POST['coy_logo'], $_POST['domicile'],
-                       $_POST['use_dimension'], $_POST['custom1_name'], $_POST['custom2_name'], $_POST['custom3_name'],
-                       $_POST['custom1_value'], $_POST['custom2_value'], $_POST['custom3_value'],
-                       $_POST['curr_default'], $_POST['f_year'], check_value('no_item_list'), check_value('no_customer_list'),
+               update_company_setup($_POST['coy_name'], $_POST['coy_no'], 
+                       $_POST['gst_no'], $_POST['tax_prd'], $_POST['tax_last'],
+                       $_POST['postal_address'], $_POST['phone'], $_POST['fax'], 
+                       $_POST['email'], $_POST['coy_logo'], $_POST['domicile'],
+                       $_POST['use_dimension'], $_POST['curr_default'], $_POST['f_year'], 
+                       check_value('no_item_list'), check_value('no_customer_list'), 
                        check_value('no_supplier_list'), $_POST['base_sales']);
 
                display_notification_centered(_("Company setup has been updated."));
@@ -131,12 +132,6 @@ $_POST['base_sales']  = $myrow["base_sales"];
 $_POST['no_item_list']  = $myrow["no_item_list"];
 $_POST['no_customer_list']  = $myrow["no_customer_list"];
 $_POST['no_supplier_list']  = $myrow["no_supplier_list"];
-$_POST['custom1_name']  = $myrow["custom1_name"];
-$_POST['custom2_name']  = $myrow["custom2_name"];
-$_POST['custom3_name']  = $myrow["custom3_name"];
-$_POST['custom1_value']  = $myrow["custom1_value"];
-$_POST['custom2_value']  = $myrow["custom2_value"];
-$_POST['custom3_value']  = $myrow["custom3_value"];
 $_POST['curr_default']  = $myrow["curr_default"];
 $_POST['f_year']  = $myrow["f_year"];
 $_POST['del_coy_logo']  = 0;
@@ -146,7 +141,7 @@ start_outer_table($table_style2);
 table_section(1);
 
 text_row_ex(_("Name (to appear on reports):"), 'coy_name', 42, 50);
-textarea_row(_("Address:"), 'postal_address', $_POST['postal_address'], 35, 5);
+textarea_row(_("Address:"), 'postal_address', $_POST['postal_address'], 35, 6);
 
 text_row_ex(_("Phone Number:"), 'phone', 25, 55);
 text_row_ex(_("Fax Number:"), 'fax', 25);
@@ -155,13 +150,13 @@ email_row_ex(_("Email Address:"), 'email', 25, 55);
 text_row_ex(_("Official Company Number:"), 'coy_no', 25);
 text_row_ex(_("GSTNo:"), 'gst_no', 25);
 
-text_row_ex(_("Tax Periods:"), 'tax_prd', 10, 10, '', null, null, _('Months.'));
-text_row_ex(_("Tax Last Period:"), 'tax_last', 10, 10, '', null, null, _('Months back.'));
-
 currencies_list_row(_("Home Currency:"), 'curr_default', $_POST['curr_default']);
 
 table_section(2);
 
+text_row_ex(_("Tax Periods:"), 'tax_prd', 10, 10, '', null, null, _('Months.'));
+text_row_ex(_("Tax Last Period:"), 'tax_last', 10, 10, '', null, null, _('Months back.'));
+
 fiscalyears_list_row(_("Fiscal Year:"), 'f_year', $_POST['f_year']);
 label_row(_("Company Logo:"), $_POST['coy_logo']);
 label_row(_("New Company Logo (.jpg)") . ":", "<input type='file' id='pic' name='pic'>");
@@ -178,23 +173,6 @@ check_row(_("Search Supplier List"), 'no_supplier_list', $_POST['no_supplier_lis
 
 start_row();
 end_row();
-label_row(_("Custom Field Name"), _("Custom Field Value"));
-
-start_row();
-text_cells(null, 'custom1_name', $_POST['custom1_name'], 25, 25);
-text_cells(null, 'custom1_value', $_POST['custom1_value'], 30, 30);
-end_row();
-
-start_row();
-text_cells(null, 'custom2_name', $_POST['custom2_name'], 25, 25);
-text_cells(null, 'custom2_value', $_POST['custom2_value'], 30, 30);
-end_row();
-
-start_row();
-text_cells(null, 'custom3_name', $_POST['custom3_name'], 25, 25);
-text_cells(null, 'custom3_value', $_POST['custom3_value'], 30, 30);
-end_row();
-
 end_outer_table(1);
 
 hidden('coy_logo', $_POST['coy_logo']);