diff --git a/application/controllers/config.php b/application/controllers/config.php index 8895bd595..d70bafde3 100644 --- a/application/controllers/config.php +++ b/application/controllers/config.php @@ -39,7 +39,10 @@ class Config extends Secure_area 'timezone'=>$this->input->post('timezone'), 'print_after_sale'=>$this->input->post('print_after_sale'), 'tax_included'=>$this->input->post('tax_included'), + 'recv_invoice_enable'=>$this->input->post('recv_invoice_enable'), 'recv_invoice_format'=>$this->input->post('recv_invoice_format'), + 'sales_invoice_enable'=>$this->input->post('sales_invoice_enable'), + 'sales_invoice_format'=>$this->input->post('sales_invoice_format'), 'custom1_name'=>$this->input->post('custom1_name'),/**GARRISON ADDED 4/20/2013**/ 'custom2_name'=>$this->input->post('custom2_name'),/**GARRISON ADDED 4/20/2013**/ 'custom3_name'=>$this->input->post('custom3_name'),/**GARRISON ADDED 4/20/2013**/ diff --git a/application/language/en/config_lang.php b/application/language/en/config_lang.php index 89ea76ad3..f3136a7c3 100644 --- a/application/language/en/config_lang.php +++ b/application/language/en/config_lang.php @@ -36,7 +36,9 @@ $lang['config_custom10'] = 'Custom Field 10'; //GARRISON ADDED 4/21/2013 $lang['config_stock_location'] = 'Stock location'; $lang['config_stock_location_required'] = 'Stock location number is a required field'; $lang['config_tax_included'] = 'Tax Included'; +$lang['config_recv_invoice_enable'] = 'Enable Recvs Inv#'; $lang['config_recv_invoice_format'] = 'Receivings Invoice'; +$lang['config_sales_invoice_enable'] = 'Enable Sales Inv#'; $lang['config_sales_invoice_format'] = 'Sales Invoice'; ?> \ No newline at end of file diff --git a/application/language/en/receivings_lang.php b/application/language/en/receivings_lang.php index 33624c580..668e2bcf9 100644 --- a/application/language/en/receivings_lang.php +++ b/application/language/en/receivings_lang.php @@ -59,4 +59,5 @@ $lang['recvs_delete_confirmation'] = 'Are you sure you want to delete this recei $lang['recvs_invoice_number_duplicate'] = 'Please enter an unique invoice number'; $lang['recvs_one_or_multiple']='receiving(s)'; $lang['recvs_cannot_be_deleted'] = 'Receiving(s) could not be deleted'; +$lang['recvs_invoice_enable']='Create Invoice'; ?> \ No newline at end of file diff --git a/application/language/en/sales_lang.php b/application/language/en/sales_lang.php index d3a6be9f8..00814dbc7 100644 --- a/application/language/en/sales_lang.php +++ b/application/language/en/sales_lang.php @@ -92,4 +92,5 @@ $lang['sales_date_required']='A correct date needs to be filled in'; $lang['sales_date_type']='Date field is required'; $lang['sales_invoice_number_duplicate'] = 'Please enter an unique invoice number'; $lang['sales_one_or_multiple']='sale(s)'; +$lang['sales_invoice_enable']='Create Invoice'; ?> diff --git a/application/views/config.php b/application/views/config.php index c0a0f6ba4..ee1b7db58 100644 --- a/application/views/config.php +++ b/application/views/config.php @@ -268,6 +268,17 @@ echo form_open('config/save/',array('id'=>'config_form')); +
+lang->line('config_sales_invoice_enable').':', 'sales_invoice_enable',array('class'=>'wide')); ?> +
+ 'sales_invoice_enable', + 'id'=>'sales_invoice_enable', + 'value'=>'sales_invoice_enable', + 'checked'=>$this->config->item('sales_invoice_enable')));?> +
+
+
lang->line('config_sales_invoice_format').':', 'sales_invoice_format',array('class'=>'wide')); ?>
@@ -278,6 +289,17 @@ echo form_open('config/save/',array('id'=>'config_form'));
+
+lang->line('config_recv_invoice_enable').':', 'recv_invoice_enable',array('class'=>'wide')); ?> +
+ 'recv_invoice_enable', + 'id'=>'recv_invoice_enable', + 'value'=>'recv_invoice_enable', + 'checked'=>$this->config->item('recv_invoice_enable')));?> +
+
+
lang->line('config_recv_invoice_format').':', 'recv_invoice_format',array('class'=>'wide')); ?>
diff --git a/application/views/receivings/receiving.php b/application/views/receivings/receiving.php index 4f30311cf..4b6c0c8c2 100644 --- a/application/views/receivings/receiving.php +++ b/application/views/receivings/receiving.php @@ -224,6 +224,15 @@ else + + + lang->line('recvs_invoice_enable'); ?> + + + 'recv_invoice_enable','id'=>'recv_invoice_enable','size'=>10,'checked'=>$this->config->item('recv_invoice_enable')));?> + + + lang->line('recvs_invoice_number').': ';?> @@ -342,6 +351,22 @@ $(document).ready(function() $.post('', {recv_invoice_number: $('#recv_invoice_number').val()}); }); + var enable_invoice_number = function() + { + if ($("#recv_invoice_enable").is(":checked")) + { + $("#recv_invoice_number").removeAttr("disabled").parents('tr').show(); + } + else + { + $("#recv_invoice_number").attr("disabled", "disabled").parents('tr').hide(); + } + } + + enable_invoice_number(); + + $("#recv_invoice_enable").change(enable_invoice_number); + $("#finish_sale_button").click(function() { if (confirm('lang->line("recvs_confirm_finish_receiving"); ?>')) diff --git a/application/views/sales/register.php b/application/views/sales/register.php index ec6fb9aba..7a9bd26aa 100644 --- a/application/views/sales/register.php +++ b/application/views/sales/register.php @@ -300,6 +300,14 @@ else + + + lang->line('sales_invoice_enable'); ?> + + + 'sales_invoice_enable','id'=>'sales_invoice_enable','size'=>10,'checked'=>$this->config->item('sales_invoice_enable')));?> + + lang->line('sales_invoice_number').': ';?> @@ -447,6 +455,22 @@ $(document).ready(function() { $.post('', {sales_invoice_number: $('#sales_invoice_number').val()}); }); + + var enable_invoice_number = function() + { + if ($("#sales_invoice_enable").is(":checked")) + { + $("#sales_invoice_number").removeAttr("disabled").parents('tr').show(); + } + else + { + $("#sales_invoice_number").attr("disabled", "disabled").parents('tr').hide(); + } + } + + enable_invoice_number(); + + $("#sales_invoice_enable").change(enable_invoice_number); $('#email_receipt').change(function() { diff --git a/database/2.3_to_2.3.1.sql b/database/2.3_to_2.3.1.sql index b1ad0bea1..ce3effa2f 100644 --- a/database/2.3_to_2.3.1.sql +++ b/database/2.3_to_2.3.1.sql @@ -82,7 +82,9 @@ INSERT INTO `ospos_grants` (`permission_id`, `person_id`) VALUES INSERT INTO `ospos_app_config` (`key`, `value`) VALUES ('tax_included', '0'), ('recv_invoice_format', ''), -('sales_invoice_format', ''); +('sales_invoice_format', ''), +('sales_invoice_enable', '1'), +('recv_invoice_enable', '1'); -- add invoice_number column to receivings table ALTER TABLE `ospos_receivings` diff --git a/database/database.sql b/database/database.sql index 7114510fc..d1611aaa9 100644 --- a/database/database.sql +++ b/database/database.sql @@ -39,7 +39,10 @@ INSERT INTO `ospos_app_config` (`key`, `value`) VALUES ('website', ''), ('recv_invoice_format', ''), ('sales_invoice_format', ''), -('tax_included', '0'); +('tax_included', '0'), +('recv_invoice_enable', '1'), +('sales_invoice_enable', '1'); + -- --------------------------------------------------------