Update from usntable branch.
[fa-stable.git] / sales / manage / customer_branches.php
index 55c5a0a5145fe423e43872cf6af3845359946697..3850e8baa59738fcfa299ac1f2d264cb1c24044e 100644 (file)
@@ -9,11 +9,13 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-$page_security = 3;
+$page_security = 'SA_CUSTOMER';
+//$page_security = 3;
 $path_to_root="../..";
+include($path_to_root . "/includes/db_pager.inc");
 include($path_to_root . "/includes/session.inc");
 
-page(_("Customer Branches"));
+page(_($help_context = "Customer Branches"), @$_REQUEST['popup']);
 
 include($path_to_root . "/includes/ui.inc");
 
@@ -40,17 +42,11 @@ $_POST['branch_code'] = $selected_id;
 
 if (isset($_GET['SelectedBranch']))
 {
-       $_POST['branch_code'] = strtoupper($_GET['SelectedBranch']);
-       $selected_id = $_GET['SelectedBranch'];
+       $br = get_branch($_GET['SelectedBranch']);
+       $_POST['customer_id'] = $br['debtor_no'];
+       $selected_id = $_POST['branch_code'] = $br['branch_code'];
+       $Mode = 'Edit';
 }
-
-$id = find_submit('Select');
-if ($id != -1)
-{
-       context_return(array('customer_id' => $_POST['customer_id'],
-               'branch_id' => $id)); // return to sales document
-}
-
 //-----------------------------------------------------------------------------------------------
 
 if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
@@ -68,6 +64,13 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
                set_focus('br_name');
        }
 
+       if (strlen($_POST['br_ref']) == 0)
+       {
+               $input_error = 1;
+               display_error(_("The Branch short name cannot be empty."));
+               set_focus('br_ref');
+       }
+
        if ($input_error != 1)
        {
 
@@ -76,8 +79,10 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
                        /*SelectedBranch could also exist if submit had not been clicked this code would not run in this case cos submit is false of course see the     delete code below*/
 
                        $sql = "UPDATE ".TB_PREF."cust_branch SET br_name = " . db_escape($_POST['br_name']) . ",
+                               branch_ref = " . db_escape($_POST['br_ref']) . ",
                                br_address = ".db_escape($_POST['br_address']). ",
                phone=".db_escape($_POST['phone']). ",
+               phone2=".db_escape($_POST['phone2']). ",
                fax=".db_escape($_POST['fax']).",
                contact_name=".db_escape($_POST['contact_name']) . ",
                salesman= ".db_escape($_POST['salesman']) . ",
@@ -92,7 +97,8 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
                br_post_address =".db_escape($_POST['br_post_address']) . ",
                disable_trans=".db_escape($_POST['disable_trans']) . ",
                                group_no=".db_escape($_POST['group_no']) . ", 
-               default_ship_via=".db_escape($_POST['default_ship_via']) . "
+               default_ship_via=".db_escape($_POST['default_ship_via']) . ",
+                notes=".db_escape($_POST['notes']) . "
                WHERE branch_code =".db_escape($_POST['branch_code']) . "
                AND debtor_no=".db_escape($_POST['customer_id']);
 
@@ -101,13 +107,15 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
                else
                {
                        /*Selected branch is null cos no item selected on first time round so must be adding a  record must be submitting new entries in the new Customer Branches form */
-                       $sql = "INSERT INTO ".TB_PREF."cust_branch (debtor_no, br_name, br_address,
-                               salesman, phone, fax,
+                       $sql = "INSERT INTO ".TB_PREF."cust_branch (debtor_no, br_name, branch_ref, br_address,
+                               salesman, phone, phone2, fax,
                                contact_name, area, email, tax_group_id, sales_account, receivables_account, payment_discount_account, sales_discount_account, default_location,
-                               br_post_address, disable_trans, group_no, default_ship_via)
+                               br_post_address, disable_trans, group_no, default_ship_via, notes)
                                VALUES (".db_escape($_POST['customer_id']). ",".db_escape($_POST['br_name']) . ", "
+                                       .db_escape($_POST['br_ref']) . ", "
                                        .db_escape($_POST['br_address']) . ", ".db_escape($_POST['salesman']) . ", "
-                                       .db_escape($_POST['phone']) . ", ".db_escape($_POST['fax']) . ","
+                                       .db_escape($_POST['phone']) . ", ".db_escape($_POST['phone2']) . ", "
+                                       .db_escape($_POST['fax']) . ","
                                        .db_escape($_POST['contact_name']) . ", ".db_escape($_POST['area']) . ","
                                        .db_escape($_POST['email']) . ", ".db_escape($_POST['tax_group_id']) . ", "
                                        .db_escape($_POST['sales_account']) . ", "
@@ -117,16 +125,20 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
                                        .db_escape($_POST['default_location']) . ", "
                                        .db_escape($_POST['br_post_address']) . ","
                                        .db_escape($_POST['disable_trans']) . ", "
-                                       .db_escape($_POST['group_no']) . ", "                                   
-                                       .db_escape($_POST['default_ship_via']) . ")";
+                                       .db_escape($_POST['group_no']) . ", "
+                                       .db_escape($_POST['default_ship_via']). ", "
+                                       .db_escape($_POST['notes']) . ")";
 
                        $note = _('New customer branch has been added');
                }
-
                //run the sql from either of the above possibilites
                db_query($sql,"The branch record could not be inserted or updated");
                display_notification($note);
                $Mode = 'RESET';
+               if (@$_REQUEST['popup']) {
+                       set_focus("Select".($_POST['branch_code'] == -1 
+                               ? db_insert_id(): $_POST['branch_code']));
+               }
        }
 
 }
@@ -168,57 +180,91 @@ if ($Mode == 'RESET' || get_post('_customer_id_update'))
 {
        $selected_id = -1;
        $cust_id = $_POST['customer_id'];
+       $inact = get_post('show_inactive');
        unset($_POST);
+       $_POST['show_inactive'] = $inact;
        $_POST['customer_id'] = $cust_id;
        $Ajax->activate('_page_body');
 }
+
+function branch_email($row) {
+       return  '<a href = "mailto:'.$row["email"].'">'.$row["email"].'</a>';
+}
+
+function edit_link($row) {
+       return button("Edit".$row["branch_code"],_("Edit"), '', ICON_EDIT);
+}
+
+function del_link($row) {
+       return button("Delete".$row["branch_code"],_("Delete"), '', ICON_DELETE);
+}
+
+function select_link($row) {
+       return button("Select".$row["branch_code"],_("Select"), '', ICON_ADD, 'selector');
+}
+
 start_form();
 
 echo "<center>" . _("Select a customer: ") . "&nbsp;&nbsp;";
-customer_list('customer_id', null, false, true);
-echo "</center><br><br>";
+echo customer_list('customer_id', null, false, true);
+echo "</center><br>";
 
 $num_branches = db_customer_has_branches($_POST['customer_id']);
 
+       $sql = "SELECT "
+               ."b.branch_code, "
+               ."b.branch_ref, "
+               ."b.br_name, "
+               ."b.contact_name, "
+               ."s.salesman_name, "
+               ."a.description, "
+               ."b.phone, "
+               ."b.fax, "
+               ."b.email, "
+               ."t.name AS tax_group_name, "
+               ."b.inactive
+               FROM ".TB_PREF."cust_branch b, "
+                       .TB_PREF."debtors_master c, "
+                       .TB_PREF."areas a, "
+                       .TB_PREF."salesman s, "
+                       .TB_PREF."tax_groups t
+               WHERE b.debtor_no=c.debtor_no
+               AND b.tax_group_id=t.id
+               AND b.area=a.area_code
+               AND b.salesman=s.salesman_code
+               AND b.debtor_no = ".db_escape($_POST['customer_id']);
+
+       if (!get_post('show_inactive')) $sql .= " AND !b.inactive";
+//------------------------------------------------------------------------------------------------
 if ($num_branches)
 {
-       $sql = "SELECT ".TB_PREF."debtors_master.name, ".TB_PREF."cust_branch.*, ".TB_PREF."salesman.salesman_name,
-               ".TB_PREF."areas.description, ".TB_PREF."tax_groups.name AS tax_group_name
-               FROM ".TB_PREF."cust_branch, ".TB_PREF."debtors_master, ".TB_PREF."areas, ".TB_PREF."salesman, ".TB_PREF."tax_groups
-               WHERE ".TB_PREF."cust_branch.debtor_no=".TB_PREF."debtors_master.debtor_no
-               AND ".TB_PREF."cust_branch.tax_group_id=".TB_PREF."tax_groups.id
-               AND ".TB_PREF."cust_branch.area=".TB_PREF."areas.area_code
-               AND ".TB_PREF."cust_branch.salesman=".TB_PREF."salesman.salesman_code
-               AND ".TB_PREF."cust_branch.debtor_no = ".db_escape($_POST['customer_id']);
-
-       $result = db_query($sql,"could not get customer branches");
-
-       start_table("$table_style width=60%");
+$cols = array(
+       'branch_code' => 'skip',
+       _("Short Name"),
+       _("Name"),
+       _("Contact"),
+       _("Sales Person"),
+       _("Area"),
+       _("Phone No"),
+       _("Fax No"),
+       _("E-mail") => 'email',
+       _("Tax Group"),
+       _("Inactive") => 'inactive',
+//             array('fun'=>'inactive'),
+               ' '=> array('insert'=>true, 'fun'=>'select_link'),
+               array('insert'=>true, 'fun'=>'edit_link'),
+               array('insert'=>true, 'fun'=>'del_link')
+       );
+
+       if (!@$_REQUEST['popup']) {
+               $cols[' '] = 'skip';
+       }
 
-       $th = array(_("Name"), _("Contact"), _("Sales Person"), _("Area"),
-               _("Phone No"), _("Fax No"), _("E-mail"), _("Tax Group"), "", "");
-       if (count($_SESSION['Context'])) $th[] = '';
-       table_header($th);
+$table =& new_db_pager('branch_tbl', $sql, $cols, 'cust_branch');
+$table->set_inactive_ctrl('cust_branch', 'branch_code');
 
-       while ($myrow = db_fetch($result))
-       {
-               start_row();
-               label_cell($myrow["br_name"]);
-               label_cell($myrow["contact_name"]);
-               label_cell($myrow["salesman_name"]);
-               label_cell($myrow["description"]);
-               label_cell($myrow["phone"]);
-               label_cell($myrow["fax"]);
-               email_cell($myrow["email"]);
-               label_cell($myrow["tax_group_name"]);
-               if (count($_SESSION['Context']))
-                       button_cell("Select".$myrow["branch_code"], _("Select"), '', ICON_ADD);
-               edit_button_cell("Edit".$myrow["branch_code"], _("Edit"));
-               delete_button_cell("Delete".$myrow["branch_code"], _("Delete"));
-               end_row();
-       }
-       end_table();
-       //END WHILE LIST LOOP
+//$table->width = "85%";
+display_db_pager($table);
 }
 else
        display_note(_("The selected customer does not have any branches. Please create at least one branch."));
@@ -241,12 +287,14 @@ if ($selected_id != -1)
                set_focus('br_name');
        $_POST['branch_code'] = $myrow["branch_code"];
            $_POST['br_name']  = $myrow["br_name"];
+           $_POST['br_ref']  = $myrow["branch_ref"];
            $_POST['br_address']  = $myrow["br_address"];
            $_POST['br_post_address']  = $myrow["br_post_address"];
            $_POST['contact_name'] = $myrow["contact_name"];
            $_POST['salesman'] =$myrow["salesman"];
            $_POST['area'] =$myrow["area"];
            $_POST['phone'] =$myrow["phone"];
+           $_POST['phone2'] =$myrow["phone2"];
            $_POST['fax'] =$myrow["fax"];
            $_POST['email'] =$myrow["email"];
            $_POST['tax_group_id'] = $myrow["tax_group_id"];
@@ -258,16 +306,19 @@ if ($selected_id != -1)
            $_POST['receivables_account'] = $myrow['receivables_account'];
            $_POST['payment_discount_account'] = $myrow['payment_discount_account'];
                $_POST['group_no']  = $myrow["group_no"];
+               $_POST['notes']  = $myrow["notes"];
+
        }
 }
 elseif ($Mode != 'ADD_ITEM')
 { //end of if $SelectedBranch only do the else when a new record is being entered
        if(!$num_branches) {
-               $sql = "SELECT name, address, email
+               $sql = "SELECT name, address, email, debtor_ref
                        FROM ".TB_PREF."debtors_master WHERE debtor_no = ".db_escape($_POST['customer_id']);
                $result = db_query($sql,"check failed");
                $myrow = db_fetch($result);
                $_POST['br_name'] = $myrow["name"];
+               $_POST['br_ref'] = $myrow["debtor_ref"];
                $_POST['contact_name'] = _('Main Branch');
                $_POST['br_address'] = $_POST['br_post_address'] = $myrow["address"];
                $_POST['email'] = $myrow['email'];
@@ -279,7 +330,7 @@ elseif ($Mode != 'ADD_ITEM')
 
                // We use the Item Sales Account as default!
            // $_POST['sales_account'] = $company_record["default_sales_act"];
-           $_POST['sales_account'] = "";
+           $_POST['sales_account'] = $_POST['notes']  = '';
            $_POST['sales_discount_account'] = $company_record['default_sales_discount_act'];
            $_POST['receivables_account'] = $company_record['debtors_act'];
            $_POST['payment_discount_account'] = $company_record['default_prompt_payment_act'];
@@ -289,14 +340,17 @@ elseif ($Mode != 'ADD_ITEM')
 }
 hidden('selected_id', $selected_id);
 hidden('branch_code');
+hidden('popup', @$_REQUEST['popup']);
 
 table_section_title(_("Name and Contact"));
 
 text_row(_("Branch Name:"), 'br_name', null, 35, 40);
+text_row(_("Branch Short Name:"), 'br_ref', null, 30, 30);
 text_row(_("Contact Person:"), 'contact_name', null, 35, 40);
 
-text_row(_("Phone Number:"), 'phone', null, 20, 20);
-text_row(_("Fax Number:"), 'fax', null, 20, 20);
+text_row(_("Phone Number:"), 'phone', null, 32, 30);
+text_row(_("Secondary Phone Number:"), 'phone2', null, 32, 30);
+text_row(_("Fax Number:"), 'fax', null, 32, 30);
 
 email_row(_("E-mail:"), 'email', null, 35, 55);
 
@@ -331,13 +385,15 @@ gl_all_accounts_list_row(_("Prompt Payment Discount Account:"), 'payment_discoun
 
 table_section_title(_("Addresses"));
 
-textarea_row(_("Mailing Address:"), 'br_post_address', null, 35, 5);
+textarea_row(_("Mailing Address:"), 'br_post_address', null, 35, 4);
+
+textarea_row(_("Billing Address:"), 'br_address', null, 35, 4);
 
-textarea_row(_("Billing Address:"), 'br_address', null, 35, 5);
+textarea_row(_("General Notes:"), 'notes', null, 35, 4);
 
 end_outer_table(1);
 
-submit_add_or_update_center($selected_id == -1, '', true);
+submit_add_or_update_center($selected_id == -1, '', 'both');
 
 end_form();