Record status edition added.

diff --git a/sales/manage/customers.php b/sales/manage/customers.php
index dd77466b32efccf7c8feb12387af54eb7b42c400..effc0c9e0a59edc06d66a2103713241e9f24013e 100644 (file)
--- a/sales/manage/customers.php
+++ b/sales/manage/customers.php
@@ -87,6 +87,11 @@ function handle_submit()
             WHERE debtor_no = '". $_POST['customer_id'] . "'";
 
                db_query($sql,"The customer could not be updated");
+
+               update_record_status($_POST['customer_id'], $_POST['inactive'],
+                       'debtors_master', 'debtor_no');
+
+               $Ajax->activate('customer_id'); // in case of status change
                display_notification(_("Customer has been updated."));
        } 
        else 
@@ -189,19 +194,20 @@ start_form();
 if (db_has_customers()) 
 {
        start_table("class = 'tablestyle_noborder'");
-       customer_list_row(_("Select a customer: "), 'customer_id', null,
-         _('New customer'), true);
+       start_row();
+       check_cells(_("Show inactive:"), 'show_inactive', null, true);
+       customer_list_cells(_("Select a customer: "), 'customer_id', null,
+               _('New customer'), true, check_value('show_inactive'));
+       end_row();
        end_table();
+       if (get_post('_show_inactive_update'))
+               $Ajax->activate('customer_id');
 } 
 else 
 {
        hidden('customer_id');
 }
 
-start_outer_table($table_style2, 5);
-
-table_section(1);
-
 if ($new_customer) 
 {
        $_POST['CustName'] = $_POST['address'] = $_POST['tax_id']  = '';
@@ -214,6 +220,7 @@ if ($new_customer)
        $_POST['payment_terms']  = '';
        $_POST['discount']  = $_POST['pymt_discount'] = percent_format(0);
        $_POST['credit_limit']  = price_format(sys_prefs::default_credit_limit());
+       $_POST['inactive'] = 0;
 } 
 else 
 {
@@ -236,8 +243,11 @@ else
        $_POST['discount']  = percent_format($myrow["discount"] * 100);
        $_POST['pymt_discount']  = percent_format($myrow["pymt_discount"] * 100);
        $_POST['credit_limit']  = price_format($myrow["credit_limit"]);
+       $_POST['inactive'] = $myrow["inactive"];
 }
 
+start_outer_table($table_style2, 5);
+table_section(1);
 table_section_title(_("Name and Address"));
 
 text_row(_("Customer Name:"), 'CustName', $_POST['CustName'], 40, 80);
@@ -256,12 +266,12 @@ else
        label_row(_("Customer's Currency:"), $_POST['curr_code']);
        hidden('curr_code', $_POST['curr_code']);                               
 }      
+sales_types_list_row(_("Sales Type/Price List:"), 'sales_type', $_POST['sales_type']);
 
 table_section(2);
 
 table_section_title(_("Sales"));
 
-sales_types_list_row(_("Sales Type/Price List:"), 'sales_type', $_POST['sales_type']);
 percent_row(_("Discount Percent:"), 'discount', $_POST['discount']);
 percent_row(_("Prompt Payment Discount Percent:"), 'pymt_discount', $_POST['pymt_discount']);
 amount_row(_("Credit Limit:"), 'credit_limit', $_POST['credit_limit']);
@@ -285,8 +295,10 @@ if (!$new_customer)  {
                '<b>'. (count($_SESSION['Context']) ?  _("Select or &Add") : _("&Add or Edit ")).'</b>', 
                "debtor_no=".$_POST['customer_id']);
        end_row();
+
 }
 
+record_status_list_row(_("Customer status:"), 'inactive');
 end_outer_table(1);
 
 div_start('controls');

diff --git a/sales/manage/sales_areas.php b/sales/manage/sales_areas.php
index 48ec735225fab0c65523b8454670f41650ae4c56..e8acb9120e85653a0880ab1f43d7e46dbeeb0712 100644 (file)
--- a/sales/manage/sales_areas.php
+++ b/sales/manage/sales_areas.php
@@ -78,16 +78,28 @@ if ($Mode == 'Delete')
 if ($Mode == 'RESET')
 {
        $selected_id = -1;
+       $sav = get_post('show_inactive');
        unset($_POST);
+       if ($sav) $_POST['show_inactive'] = 1;
 }
+
 //-------------------------------------------------------------------------------------------------
 
 $sql = "SELECT * FROM ".TB_PREF."areas";
+if (!check_value('show_inactive')) $sql .= " WHERE !inactive";
 $result = db_query($sql,"could not get areas");
 
 start_form();
 start_table("$table_style width=30%");
+
 $th = array(_("Area Name"), "", "");
+
+if (check_value('show_inactive')) 
+       array_insert($th, 1 , _("Inactive"));
+if (get_post('_show_inactive_update')) {
+       $Ajax->activate('_page_body');
+}
+
 table_header($th);
 $k = 0; 
 
@@ -97,19 +109,22 @@ while ($myrow = db_fetch($result))
        alt_table_row_color($k);
                
        label_cell($myrow["description"]);
+       
+       inactive_status_cell($myrow["area_code"], $myrow["inactive"], 'areas', 'area_code');
+
        edit_button_cell("Edit".$myrow["area_code"], _("Edit"));
        delete_button_cell("Delete".$myrow["area_code"], _("Delete"));
        end_row();
 }
-
-
+       
+show_inactive_row($th);
 end_table();
-end_form();
+//end_form();
 echo '<br>';
 
 //-------------------------------------------------------------------------------------------------
 
-start_form();
+//start_form();
 
 start_table($table_style2);