diff --git a/application/language/english/ip_lang.php b/application/language/english/ip_lang.php index 9108865..4c66c35 100644 --- a/application/language/english/ip_lang.php +++ b/application/language/english/ip_lang.php @@ -3,7 +3,7 @@ $lang = array( 'account_information' => 'Account Information', 'active' => 'Active', 'active_client' => 'Active', - 'add_client' => 'Add Customer', + 'add_client' => 'Add Client', 'add_family' => 'Add Family', 'add_files' => 'Add Files...', 'add_invoice_tax' => 'Add Invoice Tax', @@ -27,8 +27,8 @@ $lang = array( 'approve' => 'Approve', 'approve_this_quote' => 'Approve This Quote', 'approved' => 'Approved', - 'assign_client' => 'Assign Customer', - 'assigned_clients' => 'Assigned Customers', + 'assign_client' => 'Assign Client', + 'assigned_clients' => 'Assigned Clients', 'attachments' => 'Attachments', 'automatic_email_on_recur' => 'Automatically Email recurring invoices', 'balance' => 'Balance', @@ -41,7 +41,7 @@ $lang = array( 'boolean' => 'Boolean', 'bill_to' => 'Bill To', 'body' => 'Body', - 'change_client' => 'Change Customer', + 'change_client' => 'Change Client', 'calculate_discounts' => 'Calculate Discounts', 'calendar_week_1' => '1 Week', 'calendar_week_2' => '2 Weeks', @@ -63,14 +63,14 @@ $lang = array( 'checking_for_updates' => 'Checking for Updates...', 'city' => 'City', 'cldr' => 'en', - 'client' => 'Ccustomer', - 'client_access' => 'Customer Access', - 'client_already_exists' => 'Customer already exists!', - 'client_form' => 'Customer Form', - 'client_name' => 'Customer Name', - 'client_surname' => 'Customer Surname', - 'client_surname_optional' => 'Customer Surname (Optional)', - 'clients' => 'Customers', + 'client' => 'Client', + 'client_access' => 'Client Access', + 'client_already_exists' => 'Client already exists!', + 'client_form' => 'Client Form', + 'client_name' => 'Client Name', + 'client_surname' => 'Client Surname', + 'client_surname_optional' => 'Client Surname (Optional)', + 'clients' => 'Clients', 'close' => 'Close', 'closed' => 'Closed', 'column' => 'Column', @@ -132,8 +132,8 @@ $lang = array( 'default_terms' => 'Default Terms', 'delete' => 'Delete', 'delete_attachment_warning' => 'Are you sure you wish to delete this attachment?', - 'delete_client' => 'Delete Customer', - 'delete_client_warning' => 'If you delete this customer you will also delete any invoices, quotes and payments related to this customer. Are you sure you want to permanently delete this client?', + 'delete_client' => 'Delete Client', + 'delete_client_warning' => 'If you delete this client you will also delete any invoices, quotes and payments related to this client. Are you sure you want to permanently delete this client?', 'delete_invoice' => 'Delete Invoice', 'delete_invoice_warning' => 'If you delete this invoice you will not be able to recover it later. Are you sure you want to permanently delete this invoice?', 'delete_quote' => 'Delete Quote', @@ -171,7 +171,7 @@ $lang = array( 'email_template_overdue' => 'Overdue Email Template', 'email_template_paid' => 'Paid Email Template', 'email_template_tags' => 'Email Template Tags', - 'email_template_tags_instructions' => 'Template tags can be used to add dynamic information like the customer name or an invoice number to the email template. Click on the Body textfield and then select a tag from the drop down. It will be automatically inserted into the textfield.', + 'email_template_tags_instructions' => 'Template tags can be used to add dynamic information like the client name or an invoice number to the email template. Click on the Body textfield and then select a tag from the drop down. It will be automatically inserted into the textfield.', 'email_templates' => 'Email Templates', 'enabled' => 'Enabled', 'enable_debug_mode' => 'Enable the Debug Mode', @@ -193,7 +193,7 @@ $lang = array( 'fax_abbr' => 'F', 'fax_number' => 'Fax Number', 'field' => 'Field', - 'filter_clients' => 'Filter Customers', + 'filter_clients' => 'Filter Clients', 'filter_invoices' => 'Filter Invoices', 'filter_payments' => 'Filter Payments', 'filter_quotes' => 'Filter Quotes', @@ -217,7 +217,7 @@ $lang = array( 'id' => 'ID', 'identifier_format' => 'Identifier formatting', 'identifier_format_template_tags' => 'Template tags for the Identifier', - 'identifier_format_template_tags_instructions' => 'Template tags can be used to add dynamic information like the customer name or an invoice number to the email template. Click on the Identifier formatting field and then select a tag from the drop down. It will be automatically inserted into the textfield.', + 'identifier_format_template_tags_instructions' => 'Template tags can be used to add dynamic information like the client name or an invoice number to the email template. Click on the Identifier formatting field and then select a tag from the drop down. It will be automatically inserted into the textfield.', 'import' => 'Import', 'import_data' => 'Import Data', 'import_from_csv' => 'Import from CSV', @@ -366,7 +366,7 @@ $lang = array( 'product_families' => 'Product families', 'product_name' => 'Product name', 'product_price' => 'Price', - 'product_sku' => 'HSN', + 'product_sku' => 'SKU', 'product_tariff' => 'Tariff', 'product_units' => 'Product Units', 'product_unit' => 'Product Unit', @@ -392,8 +392,8 @@ $lang = array( 'quote_password' => 'Quote PDF password (optional)', 'quote_pre_password' => 'Quote standard PDF password (optional)', 'quote_rejected' => 'This quote has been rejected', - 'quote_status_email_body' => 'The customer %1$s has %2$s the quote %3$s.' . "\n\n" . 'Link to Quote: %4$s', - 'quote_status_email_subject' => 'Customer %1$s %2$s quote %3$s', + 'quote_status_email_body' => 'The client %1$s has %2$s the quote %3$s.' . "\n\n" . 'Link to Quote: %4$s', + 'quote_status_email_subject' => 'Client %1$s %2$s quote %3$s', 'quote_tax' => 'Quote Tax', 'quote_template' => 'Quote Template', 'quote_templates' => 'Quote Templates', @@ -402,7 +402,7 @@ $lang = array( 'quotes_expire_after' => 'Quotes Expire After (Days)', 'quotes_requiring_approval' => 'Quotes Requiring Approval', 'read_only' => 'Read only', - 'recent_clients' => 'Recent Customers', + 'recent_clients' => 'Recent Clients', 'recent_invoices' => 'Recent Invoices', 'recent_payments' => 'Recent Payments', 'recent_quotes' => 'Recent Quotes', @@ -423,7 +423,7 @@ $lang = array( 'run_report' => 'Run Report', 'search_product' => 'Search product', 'sales' => 'Sales', - 'sales_by_client' => 'Sales by Customer', + 'sales_by_client' => 'Sales by Client', 'sales_by_date' => 'Sales by Date', 'sales_with_tax' => 'Sales with Tax', 'save' => 'Save', @@ -433,7 +433,7 @@ $lang = array( 'select_payment_method' => 'Select the Payment Method', 'send' => 'Send', 'send_email' => 'Send Email', - 'sent' => 'Printed', + 'sent' => 'Sent', 'set_new_password' => 'Set a new password', 'settings' => 'Settings', 'settings_successfully_saved' => 'Settings successfully saved', @@ -552,8 +552,8 @@ $lang = array( 'version_history' => 'Version History', 'view' => 'View', 'view_all' => 'View All', - 'view_client' => 'View Customer', - 'view_clients' => 'View Customers', + 'view_client' => 'View Client', + 'view_clients' => 'View Clients', 'view_invoices' => 'View Invoices', 'view_payments' => 'View Payments', 'view_products' => 'View products', @@ -589,8 +589,8 @@ $lang = array( 'new_task' => 'New task', 'select_project' => 'Select project', 'task_finish_date' => 'Finish date', - 'no_client' => 'No customer', - 'alert_no_client_assigned' => 'No customer assigned to this project.', + 'no_client' => 'No client', + 'alert_no_client_assigned' => 'No client assigned to this project.', 'not_started' => 'Not started', 'in_progress' => 'In progress', 'complete' => 'Complete', diff --git a/application/modules/invoices/controllers/Invoices.php b/application/modules/invoices/controllers/Invoices.php index 3e8cd82..0861d83 100644 --- a/application/modules/invoices/controllers/Invoices.php +++ b/application/modules/invoices/controllers/Invoices.php @@ -169,8 +169,6 @@ class Invoices extends Admin_Controller echo $ClientID; */ $PaymentDays = $this->mdl_invoices->GetPaymentDays($invoice_id,$ClientID,'51'); $GetSecondaryAddress = $this->mdl_invoices->GetSecondaryAddress($ClientID); - - $getSecondayAddressSelected = $this->mdl_invoices->getSecondayAddressSelected($invoice_id,'44'); // print_r($GetSecondaryAddress); $custom_fields = $this->mdl_custom_fields->by_table('ip_invoice_custom')->get()->result(); @@ -186,22 +184,10 @@ class Invoices extends Admin_Controller foreach ($fields as $fvalue) { if ($fvalue->invoice_custom_fieldid == $cfield->custom_field_id) { // TODO: Hackish, may need a better optimization - //echo $fvalue->invoice_custom_fieldid ; - if ($fvalue->invoice_custom_fieldid == "7" && $fvalue->invoice_custom_fieldvalue == '') - { - echo 'Mode'. $fvalue->invoice_custom_fieldvalue; - $this->mdl_invoices->set_form_value( - 'custom[' . $cfield->custom_field_id . ']', - 'By Road' - ); - } - else - { $this->mdl_invoices->set_form_value( 'custom[' . $cfield->custom_field_id . ']', $fvalue->invoice_custom_fieldvalue ); - } break; } } @@ -212,7 +198,6 @@ class Invoices extends Admin_Controller 'invoice' => $invoice, 'Duedate' =>$PaymentDays, 'GetSecondary' =>$GetSecondaryAddress, - 'getSecondaySelected' => $getSecondayAddressSelected, 'items' => $this->mdl_items->where('invoice_id', $invoice_id)->get()->result(), 'invoice_id' => $invoice_id, 'tax_rates' => $this->mdl_tax_rates->get()->result(), diff --git a/application/modules/invoices/models/Mdl_invoices.php b/application/modules/invoices/models/Mdl_invoices.php index e821e24..8a184b0 100644 --- a/application/modules/invoices/models/Mdl_invoices.php +++ b/application/modules/invoices/models/Mdl_invoices.php @@ -62,23 +62,13 @@ class Mdl_Invoices extends Response_Model { $subQuery = "select group_concat(client_custom_fieldvalue separator '
') as Secondary from ip_client_custom where - client_id =? and client_custom_fieldid in (12,45,46,47,48,50,49)"; + client_id =? and client_custom_fieldid in (12,45,46,47)"; $query = $this->db->query($subQuery,array($ClientID)); return $query->result(); } - - public function getSecondayAddressSelected($InvID,$client_custom_fieldid) - { - $subQuery = "select invoice_custom_fieldvalue as secondary from ip_invoice_custom where invoice_id=? and - invoice_custom_fieldid=?"; - - $query = $this->db->query($subQuery,array($InvID,$client_custom_fieldid)); - - return $query->result(); - } public function default_select() { diff --git a/application/modules/invoices/views/partial_item_table.php b/application/modules/invoices/views/partial_item_table.php index 47319f7..0312b65 100644 --- a/application/modules/invoices/views/partial_item_table.php +++ b/application/modules/invoices/views/partial_item_table.php @@ -1,59 +1,82 @@
- + - + + - + - - - - + + - + + sumex_id == ""): ?> + + + + + - - - sumex_id == ""): ?> - - - - - - @@ -164,17 +153,55 @@
- + is_read_only == 1) { echo 'disabled="disabled"'; } ?>>
+ + sumex_id == ""): ?> + + + + + + - - sumex_id == ""): ?> - - - - - - + @@ -370,7 +360,7 @@ - + + - + @@ -423,11 +413,11 @@ - --> + - + -->
+
+ + +
+ 		+
+ + is_read_only == 1) { + echo 'disabled="disabled"'; + } ?>> +
+ 		+
+ + +
- + is_read_only == 1) { @@ -184,7 +211,7 @@
- + is_read_only == 1) { @@ -194,7 +221,7 @@
- +
- +
- +
- +
-
- - -
- 		-
- - is_read_only == 1) { - echo 'disabled="disabled"'; - } ?>> -
- 		-
- - -
-
invoice_item_tax_total); ?>
@@ -414,7 +404,7 @@
invoice_total); ?>
invoice_paid); ?>
invoice_balance); ?>
diff --git a/application/modules/invoices/views/view.php b/application/modules/invoices/views/view.php index f8b86c0..04fe51f 100644 --- a/application/modules/invoices/views/view.php +++ b/application/modules/invoices/views/view.php @@ -303,7 +303,7 @@ if ($this->config->item('disable_read_only') == true) { -
+