diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..c17f248a5 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +application/config/database.php +*.patch +patches/ +git-svn-diff.py diff --git a/WHATS_NEW.txt b/WHATS_NEW.txt index 2d0365644..f1acccdc5 100644 --- a/WHATS_NEW.txt +++ b/WHATS_NEW.txt @@ -1,12 +1,12 @@ -* Ver. 2.1.0 -+ Various upgrades, too numerous to list here. -+ Removed dependancy on ofc upload library due to vulnerability found. -------------------------------------------------------------------------------- -* Ver. 2.0.2 -+ Fixed multiple giftcards issue per Bug #4 reported on Sourceforge where a - second giftcard added would have its balance set to $0 even if the sale did - not require the total of the second giftcard to pay the remaining amount due. -+ Small code cleanup -------------------------------------------------------------------------------- -* Upgrade to CodeIgniter 2.1.0 +* Ver. 2.1.0 ++ Various upgrades, too numerous to list here. ++ Removed dependancy on ofc upload library due to vulnerability found. +------------------------------------------------------------------------------- +* Ver. 2.0.2 ++ Fixed multiple giftcards issue per Bug #4 reported on Sourceforge where a + second giftcard added would have its balance set to $0 even if the sale did + not require the total of the second giftcard to pay the remaining amount due. ++ Small code cleanup +------------------------------------------------------------------------------- +* Upgrade to CodeIgniter 2.1.0 * Various small improvements \ No newline at end of file diff --git a/application/config/autoload.php b/application/config/autoload.php index cb62d45fa..9cd3f57ff 100644 --- a/application/config/autoload.php +++ b/application/config/autoload.php @@ -64,8 +64,7 @@ $autoload['libraries'] = array('database','form_validation','session','user_agen | $autoload['helper'] = array('url', 'file'); */ -$autoload['helper'] = array('form','url','table','text','currency', 'html', 'download'); - +$autoload['helper'] = array('form','url','table','text','currency', 'html', 'download', 'directory'); /* | ------------------------------------------------------------------- @@ -96,7 +95,7 @@ $autoload['config'] = array(); | */ -$autoload['language'] = array('common', 'config', 'customers', 'employees', 'error', 'items', 'login', 'module', 'reports', 'sales','suppliers','receivings','giftcards', 'item_kits'); +$autoload['language'] = array(); /* diff --git a/application/config/config.php b/application/config/config.php index b20a45d73..470cbf463 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -9,7 +9,7 @@ | | */ -$config['application_version'] = '2.1.1'; +$config['application_version'] = '2.2.0_RC1'; /* |-------------------------------------------------------------------------- @@ -258,13 +258,13 @@ $config['encryption_key'] = 'PUT_YOUR_ENCRYPTION_KEY_HERE'; | */ $config['sess_cookie_name'] = 'ci_session'; -$config['sess_expiration'] = 7200; +$config['sess_expiration'] = 0; $config['sess_expire_on_close'] = FALSE; $config['sess_encrypt_cookie'] = FALSE; $config['sess_use_database'] = TRUE; $config['sess_table_name'] = 'ospos_sessions'; $config['sess_match_ip'] = FALSE; -$config['sess_match_useragent'] = TRUE; +$config['sess_match_useragent'] = FALSE; $config['sess_time_to_update'] = 300; /* diff --git a/application/config/migration.php b/application/config/migration.php index afa264562..f00855fd2 100644 --- a/application/config/migration.php +++ b/application/config/migration.php @@ -37,5 +37,4 @@ $config['migration_version'] = 0; $config['migration_path'] = APPPATH . 'migrations/'; -/* End of file migration.php */ -/* Location: ./application/config/migration.php */ \ No newline at end of file +/* End of file migration.php */ diff --git a/application/config/routes.php b/application/config/routes.php index a56a9e9fe..331fff2ff 100644 --- a/application/config/routes.php +++ b/application/config/routes.php @@ -54,6 +54,7 @@ $route['reports/detailed_receivings'] = "reports/date_input"; $route['reports/(specific_:any)/(:any)/(:any)/(:any)'] = "reports/$1/$2/$3/$4"; $route['reports/specific_customer'] = "reports/specific_customer_input"; $route['reports/specific_employee'] = "reports/specific_employee_input"; +$route['reports/specific_discount'] = "reports/specific_discount_input"; $route['scaffolding_trigger'] = ""; diff --git a/application/controllers/items.php b/application/controllers/items.php index b04a9bd37..7f5b504f0 100644 --- a/application/controllers/items.php +++ b/application/controllers/items.php @@ -28,15 +28,17 @@ class Items extends Secure_area implements iData_controller $is_serialized=$this->input->post('is_serialized'); $no_description=$this->input->post('no_description'); $search_custom=$this->input->post('search_custom');//GARRISON ADDED 4/13/2013 + $is_deleted=$this->input->post('is_deleted'); // Parq 131215 $data['search_section_state']=$this->input->post('search_section_state'); $data['low_inventory']=$this->input->post('low_inventory'); $data['is_serialized']=$this->input->post('is_serialized'); $data['no_description']=$this->input->post('no_description'); $data['search_custom']=$this->input->post('search_custom');//GARRISON ADDED 4/13/2013 + $data['is_deleted']=$this->input->post('is_deleted'); // Parq 131215 $data['controller_name']=strtolower(get_class()); $data['form_width']=$this->get_form_width(); - $data['manage_table']=get_items_manage_table($this->Item->get_all_filtered($low_inventory,$is_serialized,$no_description,$search_custom),$this);//GARRISON MODIFIED 4/13/2013 + $data['manage_table']=get_items_manage_table($this->Item->get_all_filtered($low_inventory,$is_serialized,$no_description,$search_custom,$is_deleted),$this);//GARRISON MODIFIED 4/13/2013, Parq 131215 $this->load->view('items/manage',$data); } @@ -176,6 +178,7 @@ class Items extends Secure_area implements iData_controller $suggestions = $this->Item->get_custom10_suggestions($this->input->post('q')); echo implode("\n",$suggestions); } + /**END GARRISON ADDED**/ function get_row() @@ -240,7 +243,7 @@ class Items extends Secure_area implements iData_controller $suppliers[$row['person_id']] = $row['first_name'] .' '. $row['last_name']; } $data['suppliers'] = $suppliers; - $data['allow_alt_desciption_choices'] = array( + $data['allow_alt_description_choices'] = array( ''=>$this->lang->line('items_do_nothing'), 1 =>$this->lang->line('items_change_all_to_allow_alt_desc'), 0 =>$this->lang->line('items_change_all_to_not_allow_allow_desc')); @@ -267,6 +270,8 @@ class Items extends Secure_area implements iData_controller 'location'=>$this->input->post('location'), 'allow_alt_description'=>$this->input->post('allow_alt_description'), 'is_serialized'=>$this->input->post('is_serialized'), + 'deleted'=>$this->input->post('is_deleted'), /** Parq 131215 **/ + 'custom1'=>$this->input->post('custom1'), /**GARRISON ADDED 4/21/2013**/ 'custom2'=>$this->input->post('custom2'),/**GARRISON ADDED 4/21/2013**/ 'custom3'=>$this->input->post('custom3'),/**GARRISON ADDED 4/21/2013**/ diff --git a/application/controllers/receivings.php b/application/controllers/receivings.php index 766fe1c02..7945064d7 100644 --- a/application/controllers/receivings.php +++ b/application/controllers/receivings.php @@ -193,5 +193,5 @@ class Receivings extends Secure_area $this->_reload(); } -} +} ?> \ No newline at end of file diff --git a/application/controllers/reports.php b/application/controllers/reports.php index ed759f047..4e1e0fc1f 100644 --- a/application/controllers/reports.php +++ b/application/controllers/reports.php @@ -703,6 +703,56 @@ class Reports extends Secure_area $this->load->view("reports/tabular_details",$data); } + + function specific_discount_input() + { + $data = $this->_get_common_report_data(); + $data['specific_input_name'] = $this->lang->line('reports_discount'); + + $discounts = array(); + for($i = 0; $i <= 100; $i += 10) + { + $discounts[$i] = $i . '%'; + } + $data['specific_input_data'] = $discounts; + $this->load->view("reports/specific_input",$data); + } + + function specific_discount($start_date, $end_date, $discount, $sale_type, $export_excel = 0) + { + $this->load->model('reports/Specific_discount'); + $model = $this->Specific_discount; + + $headers = $model->getDataColumns(); + $report_data = $model->getData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'discount' =>$discount, 'sale_type' => $sale_type)); + + $summary_data = array(); + $details_data = array(); + + foreach($report_data['summary'] as $key=>$row) + { + $summary_data[] = array(anchor('sales/receipt/'.$row['sale_id'], 'POS '.$row['sale_id'], array('target' => '_blank')), $row['sale_date'], $row['items_purchased'], $row['customer_name'], to_currency($row['subtotal']), to_currency($row['total']), to_currency($row['tax']),/*to_currency($row['profit']),*/ $row['payment_type'], $row['comment']); + + foreach($report_data['details'][$key] as $drow) + { + $details_data[$key][] = array($drow['name'], $drow['category'], $drow['description'], $drow['quantity_purchased'], to_currency($drow['subtotal']), to_currency($drow['total']), to_currency($drow['tax']),/*to_currency($drow['profit']),*/ $drow['discount_percent'].'%'); + } + } + + $data = array( + "title" => $discount. '% '.$this->lang->line('reports_discount') . ' ' . $this->lang->line('reports_report'), + "subtitle" => date('m/d/Y', strtotime($start_date)) .'-'.date('m/d/Y', strtotime($end_date)), + "headers" => $headers, + "summary_data" => $summary_data, + "details_data" => $details_data, + "header_width" => intval(100 / count($headers['summary'])), + "overall_summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date,'discount' =>$discount, 'sale_type' => $sale_type)), + "export_excel" => $export_excel + ); + + $this->load->view("reports/tabular_details",$data); + + } function detailed_sales($start_date, $end_date, $sale_type, $export_excel=0) { diff --git a/application/controllers/sales.php b/application/controllers/sales.php index 3e6ddd7f5..73f582e32 100644 --- a/application/controllers/sales.php +++ b/application/controllers/sales.php @@ -269,8 +269,10 @@ class Sales extends Secure_area $data['employees'][$employee->person_id] = $employee->first_name . ' '. $employee->last_name; } - $data['sale_info'] = $this->Sale->get_info($sale_id)->row_array(); - + $sale_info = $this->Sale->get_info($sale_id)->row_array(); + $person_name = $sale_info['first_name'] . " " . $sale_info['last_name']; + $data['selected_customer'] = !empty($sale_info['customer_id']) ? $sale_info['customer_id'] . "|" . $person_name : ""; + $data['sale_info'] = $sale_info; $this->load->view('sales/edit', $data); } @@ -428,4 +430,4 @@ class Sales extends Secure_area $this->_reload(); } } -?> \ No newline at end of file +?> diff --git a/application/controllers/suppliers.php b/application/controllers/suppliers.php index 684e4c685..ba8ebf57b 100644 --- a/application/controllers/suppliers.php +++ b/application/controllers/suppliers.php @@ -127,5 +127,5 @@ class Suppliers extends Person_controller { return 360; } -} +} ?> \ No newline at end of file diff --git a/application/helpers/table_helper.php b/application/helpers/table_helper.php index 9f5927a11..ce162fd29 100644 --- a/application/helpers/table_helper.php +++ b/application/helpers/table_helper.php @@ -40,7 +40,7 @@ function get_people_manage_table_data_rows($people,$controller) if($people->num_rows()==0) { - $table_data_rows.="
".$CI->lang->line('common_no_persons_to_display')."
"; + $table_data_rows.="
".$CI->lang->line('common_no_persons_to_display')."
"; } return $table_data_rows; diff --git a/application/hooks/load_config.php b/application/hooks/load_config.php index 7f24ea02c..d1f969771 100644 --- a/application/hooks/load_config.php +++ b/application/hooks/load_config.php @@ -2,31 +2,38 @@ //Loads configuration from database into global CI config function load_config() { - $CI =& get_instance(); - foreach( $CI->Appconfig->get_all()->result() as $app_config ) - { - $CI->config->set_item( $app_config->key, $app_config->value ); - } - - if ( $CI->config->item( 'language' ) ) - { - $CI->config->set_item( 'language', $CI->config->item( 'language' ) ); - $loaded = $CI->lang->is_loaded; - $CI->lang->is_loaded = array(); - - foreach($loaded as $file) + $CI =& get_instance(); + foreach( $CI->Appconfig->get_all()->result() as $app_config ) { - $CI->lang->load( str_replace( '_lang.php', '', $file ) ); + $CI->config->set_item( $app_config->key, $app_config->value ); + } + + //Set language from config database + //Loads all the language files from the language directory + + if ( $CI->config->item( 'language' ) ) + { + $CI->config->set_item( 'language', $CI->config->item( 'language' ) ); + + $map = directory_map('./application/language/' . $CI->config->item( 'language' )); + + foreach($map as $file) + { + if ( substr(strrchr($file,'.'),1) == "php") + { + $CI->lang->load( str_replace( '_lang.php', '', $file ) ); + } + } + } + + //Set timezone from config database + if ( $CI->config->item( 'timezone' ) ) + { + date_default_timezone_set( $CI->config->item( 'timezone' ) ); + } + else + { + date_default_timezone_set( 'America/New_York' ); } - } - - if ( $CI->config->item( 'timezone' ) ) - { - date_default_timezone_set( $CI->config->item( 'timezone' ) ); - } - else - { - date_default_timezone_set( 'America/New_York' ); - } } ?> \ No newline at end of file diff --git a/application/.htaccess b/application/language/.htaccess similarity index 100% rename from application/.htaccess rename to application/language/.htaccess diff --git a/application/language/Azerbaijan/common_lang.php b/application/language/Azerbaijan/common_lang.php deleted file mode 100644 index 3ddf42837..000000000 --- a/application/language/Azerbaijan/common_lang.php +++ /dev/null @@ -1,41 +0,0 @@ - \ No newline at end of file diff --git a/application/language/Azerbaijan/config_lang.php b/application/language/Azerbaijan/config_lang.php deleted file mode 100644 index 6c7686880..000000000 --- a/application/language/Azerbaijan/config_lang.php +++ /dev/null @@ -1,35 +0,0 @@ - \ No newline at end of file diff --git a/application/language/Azerbaijan/customers_lang.php b/application/language/Azerbaijan/customers_lang.php deleted file mode 100644 index d6978d458..000000000 --- a/application/language/Azerbaijan/customers_lang.php +++ /dev/null @@ -1,16 +0,0 @@ - diff --git a/application/language/Azerbaijan/employees_lang.php b/application/language/Azerbaijan/employees_lang.php deleted file mode 100644 index a30c32b99..000000000 --- a/application/language/Azerbaijan/employees_lang.php +++ /dev/null @@ -1,27 +0,0 @@ - diff --git a/application/language/Azerbaijan/error_lang.php b/application/language/Azerbaijan/error_lang.php deleted file mode 100644 index cfcd2f0c9..000000000 --- a/application/language/Azerbaijan/error_lang.php +++ /dev/null @@ -1,4 +0,0 @@ - diff --git a/application/language/Azerbaijan/giftcards_lang.php b/application/language/Azerbaijan/giftcards_lang.php deleted file mode 100644 index edd7fc95b..000000000 --- a/application/language/Azerbaijan/giftcards_lang.php +++ /dev/null @@ -1,70 +0,0 @@ - diff --git a/application/language/Azerbaijan/items_lang.php b/application/language/Azerbaijan/items_lang.php deleted file mode 100644 index c0ed72e0a..000000000 --- a/application/language/Azerbaijan/items_lang.php +++ /dev/null @@ -1,80 +0,0 @@ - diff --git a/application/language/Azerbaijan/receivings_lang.php b/application/language/Azerbaijan/receivings_lang.php deleted file mode 100644 index 2564d4d42..000000000 --- a/application/language/Azerbaijan/receivings_lang.php +++ /dev/null @@ -1,26 +0,0 @@ - diff --git a/application/language/Azerbaijan/reports_lang.php b/application/language/Azerbaijan/reports_lang.php deleted file mode 100644 index 12e1f3598..000000000 --- a/application/language/Azerbaijan/reports_lang.php +++ /dev/null @@ -1,87 +0,0 @@ - diff --git a/application/language/Azerbaijan/sales_lang.php b/application/language/Azerbaijan/sales_lang.php deleted file mode 100644 index 836446372..000000000 --- a/application/language/Azerbaijan/sales_lang.php +++ /dev/null @@ -1,79 +0,0 @@ - \ No newline at end of file diff --git a/application/language/Azerbaijan/suppliers_lang.php b/application/language/Azerbaijan/suppliers_lang.php deleted file mode 100644 index 97191a352..000000000 --- a/application/language/Azerbaijan/suppliers_lang.php +++ /dev/null @@ -1,17 +0,0 @@ - diff --git a/application/language/BahasaIndonesia/common_lang.php b/application/language/BahasaIndonesia/common_lang.php deleted file mode 100644 index 53e4e9c6d..000000000 --- a/application/language/BahasaIndonesia/common_lang.php +++ /dev/null @@ -1,41 +0,0 @@ - diff --git a/application/language/BahasaIndonesia/config_lang.php b/application/language/BahasaIndonesia/config_lang.php deleted file mode 100644 index b28d95ff8..000000000 --- a/application/language/BahasaIndonesia/config_lang.php +++ /dev/null @@ -1,24 +0,0 @@ - \ No newline at end of file diff --git a/application/language/BahasaIndonesia/customers_lang.php b/application/language/BahasaIndonesia/customers_lang.php deleted file mode 100644 index 4ce03c357..000000000 --- a/application/language/BahasaIndonesia/customers_lang.php +++ /dev/null @@ -1,16 +0,0 @@ - \ No newline at end of file diff --git a/application/language/BahasaIndonesia/employees_lang.php b/application/language/BahasaIndonesia/employees_lang.php deleted file mode 100644 index 5f2fc811e..000000000 --- a/application/language/BahasaIndonesia/employees_lang.php +++ /dev/null @@ -1,27 +0,0 @@ - \ No newline at end of file diff --git a/application/language/BahasaIndonesia/error_lang.php b/application/language/BahasaIndonesia/error_lang.php deleted file mode 100644 index 5fb55ba97..000000000 --- a/application/language/BahasaIndonesia/error_lang.php +++ /dev/null @@ -1,4 +0,0 @@ - \ No newline at end of file diff --git a/application/language/BahasaIndonesia/giftcards_lang.php b/application/language/BahasaIndonesia/giftcards_lang.php deleted file mode 100644 index c6ba2ebe1..000000000 --- a/application/language/BahasaIndonesia/giftcards_lang.php +++ /dev/null @@ -1,71 +0,0 @@ - \ No newline at end of file diff --git a/application/language/BahasaIndonesia/item_kits_lang.php b/application/language/BahasaIndonesia/item_kits_lang.php deleted file mode 100644 index ebd06926b..000000000 --- a/application/language/BahasaIndonesia/item_kits_lang.php +++ /dev/null @@ -1,20 +0,0 @@ - \ No newline at end of file diff --git a/application/language/BahasaIndonesia/items_lang.php b/application/language/BahasaIndonesia/items_lang.php deleted file mode 100644 index 2cc620e96..000000000 --- a/application/language/BahasaIndonesia/items_lang.php +++ /dev/null @@ -1,78 +0,0 @@ - diff --git a/application/language/BahasaIndonesia/login_lang.php b/application/language/BahasaIndonesia/login_lang.php deleted file mode 100644 index 7b0150f00..000000000 --- a/application/language/BahasaIndonesia/login_lang.php +++ /dev/null @@ -1,8 +0,0 @@ - diff --git a/application/language/BahasaIndonesia/module_lang.php b/application/language/BahasaIndonesia/module_lang.php deleted file mode 100644 index b45605a1f..000000000 --- a/application/language/BahasaIndonesia/module_lang.php +++ /dev/null @@ -1,33 +0,0 @@ - diff --git a/application/language/BahasaIndonesia/receivings_lang.php b/application/language/BahasaIndonesia/receivings_lang.php deleted file mode 100644 index 6702394ef..000000000 --- a/application/language/BahasaIndonesia/receivings_lang.php +++ /dev/null @@ -1,26 +0,0 @@ - \ No newline at end of file diff --git a/application/language/BahasaIndonesia/suppliers_lang.php b/application/language/BahasaIndonesia/suppliers_lang.php deleted file mode 100644 index a99265701..000000000 --- a/application/language/BahasaIndonesia/suppliers_lang.php +++ /dev/null @@ -1,17 +0,0 @@ - \ No newline at end of file diff --git a/application/language/Language code definition b/application/language/Language code definition new file mode 100644 index 000000000..be122151f --- /dev/null +++ b/application/language/Language code definition @@ -0,0 +1,244 @@ +ISO Language Code Table +----------------------- + +Code Name +af Afrikaans +af-ZA Afrikaans (South Africa) +ar Arabic +ar-AE Arabic (U.A.E.) +ar-BH Arabic (Bahrain) +ar-DZ Arabic (Algeria) +ar-EG Arabic (Egypt) +ar-IQ Arabic (Iraq) +ar-JO Arabic (Jordan) +ar-KW Arabic (Kuwait) +ar-LB Arabic (Lebanon) +ar-LY Arabic (Libya) +ar-MA Arabic (Morocco) +ar-OM Arabic (Oman) +ar-QA Arabic (Qatar) +ar-SA Arabic (Saudi Arabia) +ar-SY Arabic (Syria) +ar-TN Arabic (Tunisia) +ar-YE Arabic (Yemen) +az Azeri (Latin) +az-AZ Azeri (Latin) (Azerbaijan) +az-AZ Azeri (Cyrillic) (Azerbaijan) +be Belarusian +be-BY Belarusian (Belarus) +bg Bulgarian +bg-BG Bulgarian (Bulgaria) +bs-BA Bosnian (Bosnia and Herzegovina) +ca Catalan +ca-ES Catalan (Spain) +cs Czech +cs-CZ Czech (Czech Republic) +cy Welsh +cy-GB Welsh (United Kingdom) +da Danish +da-DK Danish (Denmark) +de German +de-AT German (Austria) +de-CH German (Switzerland) +de-DE German (Germany) +de-LI German (Liechtenstein) +de-LU German (Luxembourg) +dv Divehi +dv-MV Divehi (Maldives) +el Greek +el-GR Greek (Greece) +en English +en-AU English (Australia) +en-BZ English (Belize) +en-CA English (Canada) +en-CB English (Caribbean) +en-GB English (United Kingdom) +en-IE English (Ireland) +en-JM English (Jamaica) +en-NZ English (New Zealand) +en-PH English (Republic of the Philippines) +en-TT English (Trinidad and Tobago) +en-US English (United States) +en-ZA English (South Africa) +en-ZW English (Zimbabwe) +eo Esperanto +es Spanish +es-AR Spanish (Argentina) +es-BO Spanish (Bolivia) +es-CL Spanish (Chile) +es-CO Spanish (Colombia) +es-CR Spanish (Costa Rica) +es-DO Spanish (Dominican Republic) +es-EC Spanish (Ecuador) +es-ES Spanish (Castilian) +es-ES Spanish (Spain) +es-GT Spanish (Guatemala) +es-HN Spanish (Honduras) +es-MX Spanish (Mexico) +es-NI Spanish (Nicaragua) +es-PA Spanish (Panama) +es-PE Spanish (Peru) +es-PR Spanish (Puerto Rico) +es-PY Spanish (Paraguay) +es-SV Spanish (El Salvador) +es-UY Spanish (Uruguay) +es-VE Spanish (Venezuela) +et Estonian +et-EE Estonian (Estonia) +eu Basque +eu-ES Basque (Spain) +fa Farsi +fa-IR Farsi (Iran) +fi Finnish +fi-FI Finnish (Finland) +fo Faroese +fo-FO Faroese (Faroe Islands) +fr French +fr-BE French (Belgium) +fr-CA French (Canada) +fr-CH French (Switzerland) +fr-FR French (France) +fr-LU French (Luxembourg) +fr-MC French (Principality of Monaco) +gl Galician +gl-ES Galician (Spain) +gu Gujarati +gu-IN Gujarati (India) +he Hebrew +he-IL Hebrew (Israel) +hi Hindi +hi-IN Hindi (India) +hr Croatian +hr-BA Croatian (Bosnia and Herzegovina) +hr-HR Croatian (Croatia) +hu Hungarian +hu-HU Hungarian (Hungary) +hy Armenian +hy-AM Armenian (Armenia) +id Indonesian +id-ID Indonesian (Indonesia) +is Icelandic +is-IS Icelandic (Iceland) +it Italian +it-CH Italian (Switzerland) +it-IT Italian (Italy) +ja Japanese +ja-JP Japanese (Japan) +ka Georgian +ka-GE Georgian (Georgia) +kk Kazakh +kk-KZ Kazakh (Kazakhstan) +kn Kannada +kn-IN Kannada (India) +ko Korean +ko-KR Korean (Korea) +kok Konkani +kok-IN Konkani (India) +ky Kyrgyz +ky-KG Kyrgyz (Kyrgyzstan) +lt Lithuanian +lt-LT Lithuanian (Lithuania) +lv Latvian +lv-LV Latvian (Latvia) +mi Maori +mi-NZ Maori (New Zealand) +mk FYRO Macedonian +mk-MK FYRO Macedonian (Former Yugoslav Republic of Macedonia) +mn Mongolian +mn-MN Mongolian (Mongolia) +mr Marathi +mr-IN Marathi (India) +ms Malay +ms-BN Malay (Brunei Darussalam) +ms-MY Malay (Malaysia) +mt Maltese +mt-MT Maltese (Malta) +nb Norwegian (Bokm?l) +nb-NO Norwegian (Bokm?l) (Norway) +nl Dutch +nl-BE Dutch (Belgium) +nl-NL Dutch (Netherlands) +nn-NO Norwegian (Nynorsk) (Norway) +ns Northern Sotho +ns-ZA Northern Sotho (South Africa) +pa Punjabi +pa-IN Punjabi (India) +pl Polish +pl-PL Polish (Poland) +ps Pashto +ps-AR Pashto (Afghanistan) +pt Portuguese +pt-BR Portuguese (Brazil) +pt-PT Portuguese (Portugal) +qu Quechua +qu-BO Quechua (Bolivia) +qu-EC Quechua (Ecuador) +qu-PE Quechua (Peru) +ro Romanian +ro-RO Romanian (Romania) +ru Russian +ru-RU Russian (Russia) +sa Sanskrit +sa-IN Sanskrit (India) +se Sami (Northern) +se-FI Sami (Northern) (Finland) +se-FI Sami (Skolt) (Finland) +se-FI Sami (Inari) (Finland) +se-NO Sami (Northern) (Norway) +se-NO Sami (Lule) (Norway) +se-NO Sami (Southern) (Norway) +se-SE Sami (Northern) (Sweden) +se-SE Sami (Lule) (Sweden) +se-SE Sami (Southern) (Sweden) +sk Slovak +sk-SK Slovak (Slovakia) +sl Slovenian +sl-SI Slovenian (Slovenia) +sq Albanian +sq-AL Albanian (Albania) +sr-BA Serbian (Latin) (Bosnia and Herzegovina) +sr-BA Serbian (Cyrillic) (Bosnia and Herzegovina) +sr-SP Serbian (Latin) (Serbia and Montenegro) +sr-SP Serbian (Cyrillic) (Serbia and Montenegro) +sv Swedish +sv-FI Swedish (Finland) +sv-SE Swedish (Sweden) +sw Swahili +sw-KE Swahili (Kenya) +syr Syriac +syr-SY Syriac (Syria) +ta Tamil +ta-IN Tamil (India) +te Telugu +te-IN Telugu (India) +th Thai +th-TH Thai (Thailand) +tl Tagalog +tl-PH Tagalog (Philippines) +tn Tswana +tn-ZA Tswana (South Africa) +tr Turkish +tr-TR Turkish (Turkey) +tt Tatar +tt-RU Tatar (Russia) +ts Tsonga +uk Ukrainian +uk-UA Ukrainian (Ukraine) +ur Urdu +ur-PK Urdu (Islamic Republic of Pakistan) +uz Uzbek (Latin) +uz-UZ Uzbek (Latin) (Uzbekistan) +uz-UZ Uzbek (Cyrillic) (Uzbekistan) +vi Vietnamese +vi-VN Vietnamese (Viet Nam) +xh Xhosa +xh-ZA Xhosa (South Africa) +zh Chinese +zh-CN Chinese (S) +zh-HK Chinese (Hong Kong) +zh-MO Chinese (Macau) +zh-SG Chinese (Singapore) +zh-TW Chinese (T) +zu Zulu +zu-ZA Zulu (South Africa) + diff --git a/application/language/Russian/common_lang.php b/application/language/Russian/common_lang.php deleted file mode 100644 index c501ddf2e..000000000 --- a/application/language/Russian/common_lang.php +++ /dev/null @@ -1,41 +0,0 @@ - \ No newline at end of file diff --git a/application/language/Russian/config_lang.php b/application/language/Russian/config_lang.php deleted file mode 100644 index 05f6082ee..000000000 --- a/application/language/Russian/config_lang.php +++ /dev/null @@ -1,35 +0,0 @@ - \ No newline at end of file diff --git a/application/language/Russian/customers_lang.php b/application/language/Russian/customers_lang.php deleted file mode 100644 index 685e72bc1..000000000 --- a/application/language/Russian/customers_lang.php +++ /dev/null @@ -1,16 +0,0 @@ - diff --git a/application/language/Russian/employees_lang.php b/application/language/Russian/employees_lang.php deleted file mode 100644 index 4de2d6300..000000000 --- a/application/language/Russian/employees_lang.php +++ /dev/null @@ -1,27 +0,0 @@ - diff --git a/application/language/Russian/error_lang.php b/application/language/Russian/error_lang.php deleted file mode 100644 index 3efc57ae5..000000000 --- a/application/language/Russian/error_lang.php +++ /dev/null @@ -1,4 +0,0 @@ - diff --git a/application/language/Russian/giftcards_lang.php b/application/language/Russian/giftcards_lang.php deleted file mode 100644 index 8885c5fac..000000000 --- a/application/language/Russian/giftcards_lang.php +++ /dev/null @@ -1,70 +0,0 @@ - diff --git a/application/language/Russian/items_lang.php b/application/language/Russian/items_lang.php deleted file mode 100644 index 8972dd6fe..000000000 --- a/application/language/Russian/items_lang.php +++ /dev/null @@ -1,80 +0,0 @@ - diff --git a/application/language/Russian/login_lang.php b/application/language/Russian/login_lang.php deleted file mode 100644 index b0bdae042..000000000 --- a/application/language/Russian/login_lang.php +++ /dev/null @@ -1,8 +0,0 @@ - diff --git a/application/language/Russian/module_lang.php b/application/language/Russian/module_lang.php deleted file mode 100644 index c618f6e73..000000000 --- a/application/language/Russian/module_lang.php +++ /dev/null @@ -1,34 +0,0 @@ - diff --git a/application/language/Russian/receivings_lang.php b/application/language/Russian/receivings_lang.php deleted file mode 100644 index 4f1aecbf9..000000000 --- a/application/language/Russian/receivings_lang.php +++ /dev/null @@ -1,26 +0,0 @@ - diff --git a/application/language/Russian/suppliers_lang.php b/application/language/Russian/suppliers_lang.php deleted file mode 100644 index ed2daec00..000000000 --- a/application/language/Russian/suppliers_lang.php +++ /dev/null @@ -1,17 +0,0 @@ - diff --git a/application/language/Spanish/common_lang.php b/application/language/Spanish/common_lang.php deleted file mode 100644 index 474db8325..000000000 --- a/application/language/Spanish/common_lang.php +++ /dev/null @@ -1,40 +0,0 @@ - diff --git a/application/language/Spanish/config_lang.php b/application/language/Spanish/config_lang.php deleted file mode 100644 index a39aa873e..000000000 --- a/application/language/Spanish/config_lang.php +++ /dev/null @@ -1,24 +0,0 @@ - diff --git a/application/language/Spanish/customers_lang.php b/application/language/Spanish/customers_lang.php deleted file mode 100644 index d36370d53..000000000 --- a/application/language/Spanish/customers_lang.php +++ /dev/null @@ -1,16 +0,0 @@ - diff --git a/application/language/Spanish/employees_lang.php b/application/language/Spanish/employees_lang.php deleted file mode 100644 index 52be3d99c..000000000 --- a/application/language/Spanish/employees_lang.php +++ /dev/null @@ -1,27 +0,0 @@ - diff --git a/application/language/Spanish/error_lang.php b/application/language/Spanish/error_lang.php deleted file mode 100644 index aef9e8c43..000000000 --- a/application/language/Spanish/error_lang.php +++ /dev/null @@ -1,4 +0,0 @@ - diff --git a/application/language/Spanish/giftcards_lang.php b/application/language/Spanish/giftcards_lang.php deleted file mode 100644 index 4a358491c..000000000 --- a/application/language/Spanish/giftcards_lang.php +++ /dev/null @@ -1,69 +0,0 @@ - diff --git a/application/language/Spanish/items_lang.php b/application/language/Spanish/items_lang.php deleted file mode 100644 index cc4f39bed..000000000 --- a/application/language/Spanish/items_lang.php +++ /dev/null @@ -1,77 +0,0 @@ - diff --git a/application/language/Spanish/login_lang.php b/application/language/Spanish/login_lang.php deleted file mode 100644 index 8c60ff3a4..000000000 --- a/application/language/Spanish/login_lang.php +++ /dev/null @@ -1,8 +0,0 @@ - diff --git a/application/language/Spanish/module_lang.php b/application/language/Spanish/module_lang.php deleted file mode 100644 index d00dc9862..000000000 --- a/application/language/Spanish/module_lang.php +++ /dev/null @@ -1,33 +0,0 @@ - diff --git a/application/language/Spanish/receivings_lang.php b/application/language/Spanish/receivings_lang.php deleted file mode 100644 index e86080793..000000000 --- a/application/language/Spanish/receivings_lang.php +++ /dev/null @@ -1,26 +0,0 @@ - diff --git a/application/language/Spanish/suppliers_lang.php b/application/language/Spanish/suppliers_lang.php deleted file mode 100644 index c2a436b1e..000000000 --- a/application/language/Spanish/suppliers_lang.php +++ /dev/null @@ -1,17 +0,0 @@ - diff --git a/application/language/en/common_lang.php b/application/language/en/common_lang.php new file mode 100644 index 000000000..5b430fd63 --- /dev/null +++ b/application/language/en/common_lang.php @@ -0,0 +1,41 @@ + \ No newline at end of file diff --git a/application/language/en/config_lang.php b/application/language/en/config_lang.php new file mode 100644 index 000000000..6f9a5a8ac --- /dev/null +++ b/application/language/en/config_lang.php @@ -0,0 +1,35 @@ + \ No newline at end of file diff --git a/application/language/en/customers_lang.php b/application/language/en/customers_lang.php new file mode 100644 index 000000000..3f8804144 --- /dev/null +++ b/application/language/en/customers_lang.php @@ -0,0 +1,16 @@ + diff --git a/application/language/en/employees_lang.php b/application/language/en/employees_lang.php new file mode 100644 index 000000000..f70776bd7 --- /dev/null +++ b/application/language/en/employees_lang.php @@ -0,0 +1,26 @@ + diff --git a/application/language/en/error_lang.php b/application/language/en/error_lang.php new file mode 100644 index 000000000..eedaaaac9 --- /dev/null +++ b/application/language/en/error_lang.php @@ -0,0 +1,4 @@ + diff --git a/system/language/english/form_validation_lang.php b/application/language/en/form_validation_lang.php similarity index 100% rename from system/language/english/form_validation_lang.php rename to application/language/en/form_validation_lang.php diff --git a/application/language/en/giftcards_lang.php b/application/language/en/giftcards_lang.php new file mode 100644 index 000000000..bc79fbc2d --- /dev/null +++ b/application/language/en/giftcards_lang.php @@ -0,0 +1,69 @@ + diff --git a/application/language/Azerbaijan/index.html b/application/language/en/index.html similarity index 100% rename from application/language/Azerbaijan/index.html rename to application/language/en/index.html diff --git a/application/language/Azerbaijan/item_kits_lang.php b/application/language/en/item_kits_lang.php similarity index 100% rename from application/language/Azerbaijan/item_kits_lang.php rename to application/language/en/item_kits_lang.php diff --git a/application/language/en/items_lang.php b/application/language/en/items_lang.php new file mode 100644 index 000000000..84a3118ad --- /dev/null +++ b/application/language/en/items_lang.php @@ -0,0 +1,81 @@ + diff --git a/application/language/Azerbaijan/login_lang.php b/application/language/en/login_lang.php similarity index 100% rename from application/language/Azerbaijan/login_lang.php rename to application/language/en/login_lang.php diff --git a/application/language/Azerbaijan/module_lang.php b/application/language/en/module_lang.php similarity index 100% rename from application/language/Azerbaijan/module_lang.php rename to application/language/en/module_lang.php diff --git a/application/language/en/receivings_lang.php b/application/language/en/receivings_lang.php new file mode 100644 index 000000000..5212e5b22 --- /dev/null +++ b/application/language/en/receivings_lang.php @@ -0,0 +1,26 @@ + diff --git a/application/language/english/reports_lang.php b/application/language/en/reports_lang.php similarity index 98% rename from application/language/english/reports_lang.php rename to application/language/en/reports_lang.php index 12e1f3598..4a228da09 100644 --- a/application/language/english/reports_lang.php +++ b/application/language/en/reports_lang.php @@ -84,4 +84,5 @@ $lang['reports_detailed_receivings_report'] = 'Detailed Receivings Report'; $lang['reports_sale_type'] = 'Sale Type'; $lang['reports_all'] = 'All'; $lang['reports_returns'] = 'Returns'; +$lang['reports_discount'] = 'Discounts'; ?> diff --git a/application/language/english/sales_lang.php b/application/language/en/sales_lang.php similarity index 60% rename from application/language/english/sales_lang.php rename to application/language/en/sales_lang.php index 836446372..cdb53f9a8 100644 --- a/application/language/english/sales_lang.php +++ b/application/language/en/sales_lang.php @@ -1,41 +1,41 @@ \ No newline at end of file diff --git a/application/language/en/suppliers_lang.php b/application/language/en/suppliers_lang.php new file mode 100644 index 000000000..8f90785d4 --- /dev/null +++ b/application/language/en/suppliers_lang.php @@ -0,0 +1,17 @@ + diff --git a/application/language/english/common_lang.php b/application/language/english/common_lang.php deleted file mode 100644 index 3ddf42837..000000000 --- a/application/language/english/common_lang.php +++ /dev/null @@ -1,41 +0,0 @@ - \ No newline at end of file diff --git a/application/language/english/config_lang.php b/application/language/english/config_lang.php deleted file mode 100644 index 6c7686880..000000000 --- a/application/language/english/config_lang.php +++ /dev/null @@ -1,35 +0,0 @@ - \ No newline at end of file diff --git a/application/language/english/customers_lang.php b/application/language/english/customers_lang.php deleted file mode 100644 index d6978d458..000000000 --- a/application/language/english/customers_lang.php +++ /dev/null @@ -1,16 +0,0 @@ - diff --git a/application/language/english/employees_lang.php b/application/language/english/employees_lang.php deleted file mode 100644 index a30c32b99..000000000 --- a/application/language/english/employees_lang.php +++ /dev/null @@ -1,27 +0,0 @@ - diff --git a/application/language/english/error_lang.php b/application/language/english/error_lang.php deleted file mode 100644 index cfcd2f0c9..000000000 --- a/application/language/english/error_lang.php +++ /dev/null @@ -1,4 +0,0 @@ - diff --git a/application/language/english/giftcards_lang.php b/application/language/english/giftcards_lang.php deleted file mode 100644 index cfd96a74e..000000000 --- a/application/language/english/giftcards_lang.php +++ /dev/null @@ -1,70 +0,0 @@ - diff --git a/application/language/english/items_lang.php b/application/language/english/items_lang.php deleted file mode 100644 index 7535f42bb..000000000 --- a/application/language/english/items_lang.php +++ /dev/null @@ -1,80 +0,0 @@ - diff --git a/application/language/english/login_lang.php b/application/language/english/login_lang.php deleted file mode 100644 index a5aa1bb26..000000000 --- a/application/language/english/login_lang.php +++ /dev/null @@ -1,8 +0,0 @@ - diff --git a/application/language/english/module_lang.php b/application/language/english/module_lang.php deleted file mode 100644 index 9e95a2d81..000000000 --- a/application/language/english/module_lang.php +++ /dev/null @@ -1,34 +0,0 @@ - diff --git a/application/language/english/receivings_lang.php b/application/language/english/receivings_lang.php deleted file mode 100644 index 2564d4d42..000000000 --- a/application/language/english/receivings_lang.php +++ /dev/null @@ -1,26 +0,0 @@ - diff --git a/application/language/english/suppliers_lang.php b/application/language/english/suppliers_lang.php deleted file mode 100644 index 97191a352..000000000 --- a/application/language/english/suppliers_lang.php +++ /dev/null @@ -1,17 +0,0 @@ - diff --git a/application/language/es/common_lang.php b/application/language/es/common_lang.php new file mode 100644 index 000000000..d05cd1dc1 --- /dev/null +++ b/application/language/es/common_lang.php @@ -0,0 +1,41 @@ + \ No newline at end of file diff --git a/application/language/es/config_lang.php b/application/language/es/config_lang.php new file mode 100644 index 000000000..80c6bc951 --- /dev/null +++ b/application/language/es/config_lang.php @@ -0,0 +1,36 @@ + diff --git a/application/language/es/customers_lang.php b/application/language/es/customers_lang.php new file mode 100644 index 000000000..2c20d3c92 --- /dev/null +++ b/application/language/es/customers_lang.php @@ -0,0 +1,16 @@ + diff --git a/application/language/es/employees_lang.php b/application/language/es/employees_lang.php new file mode 100644 index 000000000..172f7afe2 --- /dev/null +++ b/application/language/es/employees_lang.php @@ -0,0 +1,27 @@ + diff --git a/application/language/es/error_lang.php b/application/language/es/error_lang.php new file mode 100644 index 000000000..0e0425c66 --- /dev/null +++ b/application/language/es/error_lang.php @@ -0,0 +1,4 @@ + \ No newline at end of file diff --git a/application/language/es/form_validation_lang.php b/application/language/es/form_validation_lang.php new file mode 100644 index 000000000..3418f29ab --- /dev/null +++ b/application/language/es/form_validation_lang.php @@ -0,0 +1,29 @@ + \ No newline at end of file diff --git a/application/language/Spanish/index.html b/application/language/es/index.html similarity index 100% rename from application/language/Spanish/index.html rename to application/language/es/index.html diff --git a/application/language/Spanish/item_kits_lang.php b/application/language/es/item_kits_lang.php similarity index 93% rename from application/language/Spanish/item_kits_lang.php rename to application/language/es/item_kits_lang.php index 2ffd7b807..927555e8f 100644 --- a/application/language/Spanish/item_kits_lang.php +++ b/application/language/es/item_kits_lang.php @@ -4,7 +4,7 @@ $lang['item_kits_description'] = 'Descripción del Kit de Artículos'; $lang['item_kits_no_item_kits_to_display'] = 'No hay kits de artículos para mostrar'; $lang['item_kits_update'] = 'Actualizar Kit de Artículos'; $lang['item_kits_new'] = 'Nuevo Kit de Artículos'; -$lang['item_kits_none_selected'] = "No has seleccionado kits de artículos"; +$lang['item_kits_none_selected'] = "No has seleccionado Kits de Artículos"; $lang['item_kits_info'] = 'Info de Kit de Artículos'; $lang['item_kits_successful_adding'] = 'Has agregado satisfactoriamente un Kit de Artículos'; $lang['item_kits_successful_updating'] = 'Has actualizado satisfactoriamente un Kit de Artículos'; diff --git a/application/language/es/items_lang.php b/application/language/es/items_lang.php new file mode 100644 index 000000000..f87e7266c --- /dev/null +++ b/application/language/es/items_lang.php @@ -0,0 +1,81 @@ + \ No newline at end of file diff --git a/application/language/es/login_lang.php b/application/language/es/login_lang.php new file mode 100644 index 000000000..e1a4a4998 --- /dev/null +++ b/application/language/es/login_lang.php @@ -0,0 +1,8 @@ + diff --git a/application/language/es/module_lang.php b/application/language/es/module_lang.php new file mode 100644 index 000000000..adb46c4ee --- /dev/null +++ b/application/language/es/module_lang.php @@ -0,0 +1,34 @@ + diff --git a/application/language/es/receivings_lang.php b/application/language/es/receivings_lang.php new file mode 100644 index 000000000..6aade0795 --- /dev/null +++ b/application/language/es/receivings_lang.php @@ -0,0 +1,26 @@ + diff --git a/application/language/Spanish/reports_lang.php b/application/language/es/reports_lang.php similarity index 85% rename from application/language/Spanish/reports_lang.php rename to application/language/es/reports_lang.php index 94d67239c..93b7df5a4 100644 --- a/application/language/Spanish/reports_lang.php +++ b/application/language/es/reports_lang.php @@ -12,8 +12,6 @@ $lang['reports_taxes_summary_report'] = 'Reporte de Resumen de Impuestos'; $lang['reports_date'] = 'Fecha'; $lang['reports_name'] = 'Nombre'; $lang['reports_quantity_purchased'] = 'Cantidad Comprada'; -$lang['reports_serial_number'] = 'Serial #'; -$lang['reports_description'] = 'Descripción'; $lang['reports_sale_id'] = 'ID de Venta'; $lang['reports_items_purchased'] = 'Artículos Comprados'; $lang['reports_sold_by'] = 'Vendido Por'; @@ -25,7 +23,6 @@ $lang['reports_item'] = 'Artículo'; $lang['reports_items'] = 'Artículos'; $lang['reports_supplier'] = 'Proveedor'; $lang['reports_employees'] = 'Empleados'; -$lang['reports_taxes'] = 'Impuestos'; $lang['reports_subtotal'] = 'Subtotal'; $lang['reports_total'] = 'Total'; $lang['reports_tax'] = 'Impuesto'; @@ -37,10 +34,10 @@ $lang['reports_today'] = 'Hoy'; $lang['reports_yesterday'] = 'Ayer'; $lang['reports_last_7'] = 'Últimos 7 Días'; $lang['reports_this_month'] = 'Este Mes'; -$lang['reports_last_month'] = 'Mes Pasado'; +$lang['reports_last_month'] = 'Último Mes'; $lang['reports_this_year'] = 'Este Año'; -$lang['reports_last_year'] = 'Año Pasado'; -$lang['reports_all_time'] = 'Todos los Tiempos'; +$lang['reports_last_year'] = 'Último Año'; +$lang['reports_all_time'] = 'Todos'; $lang['reports_detailed_sales_report'] = 'Reporte de Ventas Detallado'; $lang['reports_comments'] = 'Comentarios'; $lang['reports_discount'] = 'Descuento'; @@ -51,24 +48,29 @@ $lang['reports_customers'] = 'Clientes'; $lang['reports_suppliers'] = 'Proveedores'; $lang['reports_items'] = 'Artículos'; $lang['reports_employees'] = 'Empleados'; +$lang['reports_taxes'] = 'Impuestos'; $lang['reports_customer'] = 'Cliente'; $lang['reports_employee'] = 'Empleado'; $lang['reports_tax_percent'] = 'Porcentaje de Impuestos'; +$lang['reports_quantity_purchased'] = 'Cantidad Comprada'; +$lang['reports_serial_number'] = 'S/N:'; +$lang['reports_description'] = 'Descripción'; +$lang['reports_date'] = 'Fecha'; $lang['reports_sales_amount'] = 'Monto de ventas'; $lang['reports_revenue'] = 'Ingresos'; $lang['reports_discounts'] = 'Descuentos'; $lang['reports_discounts_summary_report'] = 'Reporte de Resumen de Descuentos'; -$lang['reports_discount_percent'] = 'Porcentaje de Decuento'; +$lang['reports_discount_percent'] = 'Porcentaje de Descuento'; $lang['reports_count'] = 'Cuenta'; -$lang['reports_summary_reports'] = 'Reportes de Resumen'; +$lang['reports_summary_reports'] = 'Reportes Resumidos'; $lang['reports_graphical_reports'] = 'Reportes Gráficos'; $lang['reports_detailed_reports'] = 'Reportes Detallados'; $lang['reports_inventory_reports'] = 'Reportes de Inventario'; -$lang['reports_low_inventory'] = 'Inventario Escaso'; +$lang['reports_low_inventory'] = 'Inventario Bajo'; $lang['reports_inventory_summary'] = 'Resumen de Inventario'; $lang['reports_item_number'] = 'Número de Artículo'; -$lang['reports_reorder_level'] = 'Nivel de Reordenamiento'; -$lang['reports_low_inventory_report'] = 'Reporte de Inventario Escaso'; +$lang['reports_reorder_level'] = 'Cantidad Mínima'; +$lang['reports_low_inventory_report'] = 'Reporte de Inventario Bajo'; $lang['reports_item_name'] = 'Nombre del Artículo'; $lang['reports_inventory_summary_report'] = 'Reporte de Resumen de Inventario'; $lang['reports_payment_type'] = 'Tipo de Pago'; @@ -82,4 +84,5 @@ $lang['reports_detailed_receivings_report'] = 'Reporte Detallado de Entradas'; $lang['reports_sale_type'] = 'Tipo de Venta'; $lang['reports_all'] = 'Todo'; $lang['reports_returns'] = 'Devoluciones'; -?> +$lang['reports_discount'] = 'Descuento mayor que '; +?> \ No newline at end of file diff --git a/application/language/Spanish/sales_lang.php b/application/language/es/sales_lang.php similarity index 54% rename from application/language/Spanish/sales_lang.php rename to application/language/es/sales_lang.php index d1612d701..448a0ff11 100644 --- a/application/language/Spanish/sales_lang.php +++ b/application/language/es/sales_lang.php @@ -1,47 +1,48 @@ diff --git a/application/language/es/suppliers_lang.php b/application/language/es/suppliers_lang.php new file mode 100644 index 000000000..143ffeb54 --- /dev/null +++ b/application/language/es/suppliers_lang.php @@ -0,0 +1,17 @@ + \ No newline at end of file diff --git a/application/language/id/common_lang.php b/application/language/id/common_lang.php new file mode 100644 index 000000000..bad1431db --- /dev/null +++ b/application/language/id/common_lang.php @@ -0,0 +1,41 @@ + \ No newline at end of file diff --git a/application/language/id/config_lang.php b/application/language/id/config_lang.php new file mode 100644 index 000000000..b91030b62 --- /dev/null +++ b/application/language/id/config_lang.php @@ -0,0 +1,36 @@ + \ No newline at end of file diff --git a/application/language/id/customers_lang.php b/application/language/id/customers_lang.php new file mode 100644 index 000000000..ca8c9a200 --- /dev/null +++ b/application/language/id/customers_lang.php @@ -0,0 +1,16 @@ + \ No newline at end of file diff --git a/application/language/id/employees_lang.php b/application/language/id/employees_lang.php new file mode 100644 index 000000000..f2152d70c --- /dev/null +++ b/application/language/id/employees_lang.php @@ -0,0 +1,27 @@ + \ No newline at end of file diff --git a/application/language/id/error_lang.php b/application/language/id/error_lang.php new file mode 100644 index 000000000..9c2e268af --- /dev/null +++ b/application/language/id/error_lang.php @@ -0,0 +1,4 @@ + \ No newline at end of file diff --git a/application/language/id/form_validation_lang.php b/application/language/id/form_validation_lang.php new file mode 100644 index 000000000..3418f29ab --- /dev/null +++ b/application/language/id/form_validation_lang.php @@ -0,0 +1,29 @@ + \ No newline at end of file diff --git a/application/language/BahasaIndonesia/index.html b/application/language/id/index.html similarity index 100% rename from application/language/BahasaIndonesia/index.html rename to application/language/id/index.html diff --git a/application/language/english/item_kits_lang.php b/application/language/id/item_kits_lang.php similarity index 100% rename from application/language/english/item_kits_lang.php rename to application/language/id/item_kits_lang.php diff --git a/application/language/id/items_lang.php b/application/language/id/items_lang.php new file mode 100644 index 000000000..a6cf78e93 --- /dev/null +++ b/application/language/id/items_lang.php @@ -0,0 +1,81 @@ + \ No newline at end of file diff --git a/application/language/id/login_lang.php b/application/language/id/login_lang.php new file mode 100644 index 000000000..e3e540262 --- /dev/null +++ b/application/language/id/login_lang.php @@ -0,0 +1,8 @@ + diff --git a/application/language/id/module_lang.php b/application/language/id/module_lang.php new file mode 100644 index 000000000..4aaaed19c --- /dev/null +++ b/application/language/id/module_lang.php @@ -0,0 +1,34 @@ + diff --git a/application/language/id/receivings_lang.php b/application/language/id/receivings_lang.php new file mode 100644 index 000000000..efeb84355 --- /dev/null +++ b/application/language/id/receivings_lang.php @@ -0,0 +1,26 @@ + diff --git a/application/language/BahasaIndonesia/reports_lang.php b/application/language/id/reports_lang.php similarity index 96% rename from application/language/BahasaIndonesia/reports_lang.php rename to application/language/id/reports_lang.php index a32b1bd22..f2c7156fb 100644 --- a/application/language/BahasaIndonesia/reports_lang.php +++ b/application/language/id/reports_lang.php @@ -12,8 +12,6 @@ $lang['reports_taxes_summary_report'] = 'Taxes Summary Report'; $lang['reports_date'] = 'Tanggal'; $lang['reports_name'] = 'Nama'; $lang['reports_quantity_purchased'] = 'Jumlah Dibeli'; -$lang['reports_serial_number'] = 'Serial #'; -$lang['reports_description'] = 'Description'; $lang['reports_sale_id'] = 'ID Penjualan '; $lang['reports_items_purchased'] = 'Produk Dibeli'; $lang['reports_sold_by'] = 'Dijual Oleh'; @@ -25,7 +23,6 @@ $lang['reports_item'] = 'Produk/Item'; $lang['reports_items'] = 'Produk/Item'; $lang['reports_supplier'] = 'Pemasok'; $lang['reports_employees'] = 'Karyawan'; -$lang['reports_taxes'] = 'Taxes'; $lang['reports_subtotal'] = 'Subtotal'; $lang['reports_total'] = 'Total'; $lang['reports_tax'] = 'Pajak'; @@ -51,9 +48,14 @@ $lang['reports_customers'] = 'Pelanggan'; $lang['reports_suppliers'] = 'Pemasok'; $lang['reports_items'] = 'Item'; $lang['reports_employees'] = 'Karyawan'; +$lang['reports_taxes'] = 'Taxes'; $lang['reports_customer'] = 'Pelanggan'; $lang['reports_employee'] = 'Karyawan'; $lang['reports_tax_percent'] = 'Tax Percent'; +$lang['reports_quantity_purchased'] = 'Quantity Purchased'; +$lang['reports_serial_number'] = 'Serial #'; +$lang['reports_description'] = 'Description'; +$lang['reports_date'] = 'Date'; $lang['reports_sales_amount'] = 'Sales amount'; $lang['reports_revenue'] = 'Revenue'; $lang['reports_discounts'] = 'Discounts'; @@ -82,4 +84,5 @@ $lang['reports_detailed_receivings_report'] = 'Detailed Receivings Report'; $lang['reports_sale_type'] = 'Sale Type'; $lang['reports_all'] = 'All'; $lang['reports_returns'] = 'Returns'; -?> +$lang['reports_discount'] = 'A discount greater than '; +?> \ No newline at end of file diff --git a/application/language/BahasaIndonesia/sales_lang.php b/application/language/id/sales_lang.php similarity index 59% rename from application/language/BahasaIndonesia/sales_lang.php rename to application/language/id/sales_lang.php index 089c3ef23..47d6e60ca 100644 --- a/application/language/BahasaIndonesia/sales_lang.php +++ b/application/language/id/sales_lang.php @@ -1,47 +1,48 @@ +$lang['sales_discount_short']='%'; +$lang["sales_discount_included"]='% Discount'; +$lang['sales_sale_time']='Time'; +$lang['sales_payments_total'] = 'Payments Total'; +$lang['sales_amount_due'] = 'Amount Due'; +?> \ No newline at end of file diff --git a/application/language/id/suppliers_lang.php b/application/language/id/suppliers_lang.php new file mode 100644 index 000000000..d38485dac --- /dev/null +++ b/application/language/id/suppliers_lang.php @@ -0,0 +1,17 @@ + \ No newline at end of file diff --git a/application/language/nl-BE/.site_lang.php.swp b/application/language/nl-BE/.site_lang.php.swp new file mode 100644 index 000000000..20cb117b0 Binary files /dev/null and b/application/language/nl-BE/.site_lang.php.swp differ diff --git a/application/language/nl-BE/common_lang.php b/application/language/nl-BE/common_lang.php new file mode 100755 index 000000000..415efc9b6 --- /dev/null +++ b/application/language/nl-BE/common_lang.php @@ -0,0 +1,41 @@ + \ No newline at end of file diff --git a/application/language/nl-BE/config_lang.php b/application/language/nl-BE/config_lang.php new file mode 100755 index 000000000..96aedb140 --- /dev/null +++ b/application/language/nl-BE/config_lang.php @@ -0,0 +1,36 @@ + diff --git a/application/language/nl-BE/customers_lang.php b/application/language/nl-BE/customers_lang.php new file mode 100755 index 000000000..6277e342b --- /dev/null +++ b/application/language/nl-BE/customers_lang.php @@ -0,0 +1,16 @@ + \ No newline at end of file diff --git a/application/language/nl-BE/employees_lang.php b/application/language/nl-BE/employees_lang.php new file mode 100755 index 000000000..8266fc80e --- /dev/null +++ b/application/language/nl-BE/employees_lang.php @@ -0,0 +1,27 @@ + diff --git a/application/language/nl-BE/error_lang.php b/application/language/nl-BE/error_lang.php new file mode 100755 index 000000000..a6f58faa1 --- /dev/null +++ b/application/language/nl-BE/error_lang.php @@ -0,0 +1,4 @@ + \ No newline at end of file diff --git a/application/language/nl-BE/form_validation_lang.php b/application/language/nl-BE/form_validation_lang.php new file mode 100644 index 000000000..49b3513c7 --- /dev/null +++ b/application/language/nl-BE/form_validation_lang.php @@ -0,0 +1,28 @@ + \ No newline at end of file diff --git a/application/language/nl-BE/index.html b/application/language/nl-BE/index.html new file mode 100644 index 000000000..7f684dff4 --- /dev/null +++ b/application/language/nl-BE/index.html @@ -0,0 +1,10 @@ + + + 403 Forbidden + + + +

Directory access is forbidden.

+ + + diff --git a/application/language/nl-BE/item_kits_lang.php b/application/language/nl-BE/item_kits_lang.php new file mode 100644 index 000000000..4d6c87bbc --- /dev/null +++ b/application/language/nl-BE/item_kits_lang.php @@ -0,0 +1,20 @@ + diff --git a/application/language/nl-BE/items_lang.php b/application/language/nl-BE/items_lang.php new file mode 100755 index 000000000..fcbf8ce85 --- /dev/null +++ b/application/language/nl-BE/items_lang.php @@ -0,0 +1,81 @@ + diff --git a/application/language/nl-BE/login_lang.php b/application/language/nl-BE/login_lang.php new file mode 100755 index 000000000..2cf132f89 --- /dev/null +++ b/application/language/nl-BE/login_lang.php @@ -0,0 +1,8 @@ + diff --git a/application/language/nl-BE/module_lang.php b/application/language/nl-BE/module_lang.php new file mode 100755 index 000000000..95443e686 --- /dev/null +++ b/application/language/nl-BE/module_lang.php @@ -0,0 +1,34 @@ + diff --git a/application/language/nl-BE/receivings_lang.php b/application/language/nl-BE/receivings_lang.php new file mode 100755 index 000000000..5fb8a18cf --- /dev/null +++ b/application/language/nl-BE/receivings_lang.php @@ -0,0 +1,26 @@ + diff --git a/application/language/nl-BE/reports_lang.php b/application/language/nl-BE/reports_lang.php new file mode 100755 index 000000000..9975b6af3 --- /dev/null +++ b/application/language/nl-BE/reports_lang.php @@ -0,0 +1,88 @@ + \ No newline at end of file diff --git a/application/language/nl-BE/sales_lang.php b/application/language/nl-BE/sales_lang.php new file mode 100755 index 000000000..460c40472 --- /dev/null +++ b/application/language/nl-BE/sales_lang.php @@ -0,0 +1,83 @@ + \ No newline at end of file diff --git a/application/language/nl-BE/suppliers_lang.php b/application/language/nl-BE/suppliers_lang.php new file mode 100755 index 000000000..d75e45b5b --- /dev/null +++ b/application/language/nl-BE/suppliers_lang.php @@ -0,0 +1,17 @@ + \ No newline at end of file diff --git a/application/language/ru/common_lang.php b/application/language/ru/common_lang.php new file mode 100644 index 000000000..beaa1681b --- /dev/null +++ b/application/language/ru/common_lang.php @@ -0,0 +1,41 @@ + \ No newline at end of file diff --git a/application/language/ru/config_lang.php b/application/language/ru/config_lang.php new file mode 100644 index 000000000..63b0e6689 --- /dev/null +++ b/application/language/ru/config_lang.php @@ -0,0 +1,36 @@ + \ No newline at end of file diff --git a/application/language/ru/customers_lang.php b/application/language/ru/customers_lang.php new file mode 100644 index 000000000..f82ff8ee5 --- /dev/null +++ b/application/language/ru/customers_lang.php @@ -0,0 +1,16 @@ + diff --git a/application/language/ru/employees_lang.php b/application/language/ru/employees_lang.php new file mode 100644 index 000000000..0feb5ced9 --- /dev/null +++ b/application/language/ru/employees_lang.php @@ -0,0 +1,27 @@ + diff --git a/application/language/ru/error_lang.php b/application/language/ru/error_lang.php new file mode 100644 index 000000000..2d13b3219 --- /dev/null +++ b/application/language/ru/error_lang.php @@ -0,0 +1,4 @@ + \ No newline at end of file diff --git a/application/language/ru/form_validation_lang.php b/application/language/ru/form_validation_lang.php new file mode 100644 index 000000000..3418f29ab --- /dev/null +++ b/application/language/ru/form_validation_lang.php @@ -0,0 +1,29 @@ + \ No newline at end of file diff --git a/application/language/Russian/index.html b/application/language/ru/index.html similarity index 100% rename from application/language/Russian/index.html rename to application/language/ru/index.html diff --git a/application/language/Russian/item_kits_lang.php b/application/language/ru/item_kits_lang.php similarity index 100% rename from application/language/Russian/item_kits_lang.php rename to application/language/ru/item_kits_lang.php diff --git a/application/language/ru/items_lang.php b/application/language/ru/items_lang.php new file mode 100644 index 000000000..7e6639a63 --- /dev/null +++ b/application/language/ru/items_lang.php @@ -0,0 +1,81 @@ + \ No newline at end of file diff --git a/application/language/ru/login_lang.php b/application/language/ru/login_lang.php new file mode 100644 index 000000000..88c4d324b --- /dev/null +++ b/application/language/ru/login_lang.php @@ -0,0 +1,8 @@ + diff --git a/application/language/ru/module_lang.php b/application/language/ru/module_lang.php new file mode 100644 index 000000000..546567b54 --- /dev/null +++ b/application/language/ru/module_lang.php @@ -0,0 +1,34 @@ + diff --git a/application/language/ru/receivings_lang.php b/application/language/ru/receivings_lang.php new file mode 100644 index 000000000..c6eb0b72d --- /dev/null +++ b/application/language/ru/receivings_lang.php @@ -0,0 +1,26 @@ + diff --git a/application/language/Russian/reports_lang.php b/application/language/ru/reports_lang.php similarity index 98% rename from application/language/Russian/reports_lang.php rename to application/language/ru/reports_lang.php index e47cac200..2fd82dab8 100644 --- a/application/language/Russian/reports_lang.php +++ b/application/language/ru/reports_lang.php @@ -84,4 +84,5 @@ $lang['reports_detailed_receivings_report'] = 'Детальный отчет о $lang['reports_sale_type'] = 'Вид Продажи'; $lang['reports_all'] = 'все'; $lang['reports_returns'] = 'Возвраты'; -?> +$lang['reports_discount'] = 'A discount greater than '; +?> \ No newline at end of file diff --git a/application/language/Russian/sales_lang.php b/application/language/ru/sales_lang.php similarity index 61% rename from application/language/Russian/sales_lang.php rename to application/language/ru/sales_lang.php index ff9426671..58ca33b26 100644 --- a/application/language/Russian/sales_lang.php +++ b/application/language/ru/sales_lang.php @@ -1,41 +1,41 @@ \ No newline at end of file diff --git a/application/language/ru/suppliers_lang.php b/application/language/ru/suppliers_lang.php new file mode 100644 index 000000000..1478ff440 --- /dev/null +++ b/application/language/ru/suppliers_lang.php @@ -0,0 +1,17 @@ + \ No newline at end of file diff --git a/application/language/zh/common_lang.php b/application/language/zh/common_lang.php new file mode 100755 index 000000000..34e5a307e --- /dev/null +++ b/application/language/zh/common_lang.php @@ -0,0 +1,41 @@ + \ No newline at end of file diff --git a/application/language/zh/config_lang.php b/application/language/zh/config_lang.php new file mode 100755 index 000000000..27a90d9a8 --- /dev/null +++ b/application/language/zh/config_lang.php @@ -0,0 +1,36 @@ + \ No newline at end of file diff --git a/application/language/zh/customers_lang.php b/application/language/zh/customers_lang.php new file mode 100755 index 000000000..738672b8e --- /dev/null +++ b/application/language/zh/customers_lang.php @@ -0,0 +1,16 @@ + diff --git a/application/language/zh/employees_lang.php b/application/language/zh/employees_lang.php new file mode 100755 index 000000000..bdce1d9d9 --- /dev/null +++ b/application/language/zh/employees_lang.php @@ -0,0 +1,27 @@ + diff --git a/application/language/zh/error_lang.php b/application/language/zh/error_lang.php new file mode 100755 index 000000000..d76faec43 --- /dev/null +++ b/application/language/zh/error_lang.php @@ -0,0 +1,4 @@ + \ No newline at end of file diff --git a/application/language/zh/form_validation_lang.php b/application/language/zh/form_validation_lang.php new file mode 100644 index 000000000..3418f29ab --- /dev/null +++ b/application/language/zh/form_validation_lang.php @@ -0,0 +1,29 @@ + \ No newline at end of file diff --git a/application/language/english/index.html b/application/language/zh/index.html old mode 100644 new mode 100755 similarity index 100% rename from application/language/english/index.html rename to application/language/zh/index.html diff --git a/application/language/zh/item_kits_lang.php b/application/language/zh/item_kits_lang.php new file mode 100755 index 000000000..44cb53bfb --- /dev/null +++ b/application/language/zh/item_kits_lang.php @@ -0,0 +1,20 @@ + diff --git a/application/language/zh/items_lang.php b/application/language/zh/items_lang.php new file mode 100755 index 000000000..0c4c27202 --- /dev/null +++ b/application/language/zh/items_lang.php @@ -0,0 +1,81 @@ + \ No newline at end of file diff --git a/application/language/zh/login_lang.php b/application/language/zh/login_lang.php new file mode 100755 index 000000000..3b0e4c1f1 --- /dev/null +++ b/application/language/zh/login_lang.php @@ -0,0 +1,8 @@ + diff --git a/application/language/zh/module_lang.php b/application/language/zh/module_lang.php new file mode 100755 index 000000000..a3dbc7f27 --- /dev/null +++ b/application/language/zh/module_lang.php @@ -0,0 +1,34 @@ + diff --git a/application/language/zh/receivings_lang.php b/application/language/zh/receivings_lang.php new file mode 100755 index 000000000..89f5c56c5 --- /dev/null +++ b/application/language/zh/receivings_lang.php @@ -0,0 +1,26 @@ + diff --git a/application/language/zh/reports_lang.php b/application/language/zh/reports_lang.php new file mode 100755 index 000000000..7b1b1501c --- /dev/null +++ b/application/language/zh/reports_lang.php @@ -0,0 +1,88 @@ + \ No newline at end of file diff --git a/application/language/zh/sales_lang.php b/application/language/zh/sales_lang.php new file mode 100755 index 000000000..64df4ab0e --- /dev/null +++ b/application/language/zh/sales_lang.php @@ -0,0 +1,82 @@ + \ No newline at end of file diff --git a/application/language/zh/suppliers_lang.php b/application/language/zh/suppliers_lang.php new file mode 100755 index 000000000..986d608de --- /dev/null +++ b/application/language/zh/suppliers_lang.php @@ -0,0 +1,17 @@ + \ No newline at end of file diff --git a/application/libraries/MY_Session.php b/application/libraries/MY_Session.php new file mode 100644 index 000000000..05b165374 --- /dev/null +++ b/application/libraries/MY_Session.php @@ -0,0 +1,19 @@ +CI->input->is_ajax_request()) ) { + parent::sess_update(); + } + } +} + diff --git a/application/models/giftcard.php b/application/models/giftcard.php index c081858da..10e894b65 100644 --- a/application/models/giftcard.php +++ b/application/models/giftcard.php @@ -233,7 +233,7 @@ class Giftcard extends CI_Model $this->db->or_like("giftcards.person_id",$this->db->escape_like_str($search)); $this->db->where('deleted',$this->db->escape('0')); $this->db->order_by("giftcard_number", "asc"); - return $this->db->get(); + return $this->db->get(); } public function get_giftcard_value( $giftcard_number ) diff --git a/application/models/item.php b/application/models/item.php index 00a5b640d..ab9a9c8f1 100644 --- a/application/models/item.php +++ b/application/models/item.php @@ -33,7 +33,7 @@ class Item extends CI_Model return $this->db->count_all_results(); } - function get_all_filtered($low_inventory=0,$is_serialized=0,$no_description,$search_custom)/**GARRISON MODIFIED 4/21/2013**/ + function get_all_filtered($low_inventory=0,$is_serialized=0,$no_description,$search_custom,$is_deleted)/**GARRISON MODIFIED 4/21/2013, Parq 131215 **/ { $this->db->from('items'); if ($low_inventory !=0 ) @@ -64,7 +64,14 @@ class Item extends CI_Model $this->db->or_like('custom10',$search); } **/ - $this->db->where('deleted',0); +/* Parq 131215 start*/ + if ($is_deleted !=0 ) + { + $this->db->where('deleted',1); + } else { + $this->db->where('deleted',0); + } +/* Parq 131215 end*/ $this->db->order_by("name", "asc"); return $this->db->get(); } @@ -107,6 +114,7 @@ class Item extends CI_Model { $this->db->from('items'); $this->db->where('item_number',$item_number); + $this->db->where('deleted',0); // Parq 131226 $query = $this->db->get(); @@ -228,7 +236,7 @@ class Item extends CI_Model /** GARRISON ADDED 4/22/2013 **/ //Search by custom fields - $this->db->from('items'); + $this->db->from('items'); $this->db->like('custom1', $search); $this->db->or_like('custom2', $search); $this->db->or_like('custom3', $search); @@ -245,7 +253,7 @@ class Item extends CI_Model foreach($by_name->result() as $row) { $suggestions[]=$row->name; - } + } /** END GARRISON ADDED **/ //only return $limit suggestions @@ -295,7 +303,7 @@ class Item extends CI_Model /** GARRISON ADDED 4/22/2013 **/ //Search by custom fields $this->db->from('items'); - $this->db->where('deleted',0); + $this->db->where('deleted',0); $this->db->like('custom1', $search); $this->db->or_like('custom2', $search); $this->db->or_like('custom3', $search); @@ -311,7 +319,7 @@ class Item extends CI_Model foreach($by_description->result() as $row) { $suggestions[]=$row->item_id.'|'.$row->name; - } + } /** END GARRISON ADDED **/ //only return $limit suggestions @@ -375,7 +383,7 @@ class Item extends CI_Model } return $suggestions; - } + } function get_custom2_suggestions($search) { diff --git a/application/models/person.php b/application/models/person.php index d44f52456..5461f1041 100644 --- a/application/models/person.php +++ b/application/models/person.php @@ -96,7 +96,7 @@ class Person extends CI_Model // $this->db->from('people'); // $this->db->where('deleted',0); // $this->db->where('person_id',$this->db->escape($search)); -// $this->db->like('first_name',$this->db->escape_like_str($search)); +// $this->db->like('first_name',$this->db->escape_like_str($search)); // $this->db->or_like('last_name',$this->db->escape_like_str($search)); // $this->db->or_like("CONCAT(`first_name`,' ',`last_name`)",$this->db->escape_like_str($search)); // $this->db->or_like('email',$search); @@ -114,7 +114,7 @@ class Person extends CI_Model { $suggestions = array_slice($suggestions, 0,$limit); } - return $suggestions; + return $suggestions; } /* diff --git a/application/models/receiving.php b/application/models/receiving.php index 868aea60c..48ae9dca1 100644 --- a/application/models/receiving.php +++ b/application/models/receiving.php @@ -115,4 +115,4 @@ class Receiving extends CI_Model } -?> +?> diff --git a/application/models/reports/specific_discount.php b/application/models/reports/specific_discount.php new file mode 100755 index 000000000..679275756 --- /dev/null +++ b/application/models/reports/specific_discount.php @@ -0,0 +1,70 @@ + array($this->lang->line('reports_sale_id'), $this->lang->line('reports_date'), $this->lang->line('reports_items_purchased'), $this->lang->line('reports_customer'), $this->lang->line('reports_subtotal'), $this->lang->line('reports_total'), $this->lang->line('reports_tax'), /*$this->lang->line('reports_profit'),*/ $this->lang->line('reports_payment_type'), $this->lang->line('reports_comments')), + 'details' => array($this->lang->line('reports_name'), $this->lang->line('reports_category'), $this->lang->line('reports_description'), $this->lang->line('reports_quantity_purchased'), $this->lang->line('reports_subtotal'), $this->lang->line('reports_total'), $this->lang->line('reports_tax'), /*$this->lang->line('reports_profit'),*/$this->lang->line('reports_discount')) + ); + } + + public function getData(array $inputs) + { + $this->db->select('sale_id, DATE_FORMAT(sale_time, "%d-%m-%Y") AS sale_date, sum(quantity_purchased) as items_purchased, CONCAT(first_name," ",last_name) as customer_name, sum(subtotal) as subtotal, sum(total) as total, sum(tax) as tax, sum(profit) as profit, payment_type, comment', false); + $this->db->from('sales_items_temp'); + $this->db->join('people as customer', 'sales_items_temp.customer_id = customer.person_id', 'left'); + $this->db->where('sale_date BETWEEN "'. $inputs['start_date']. '" and "'. $inputs['end_date'].'" and discount_percent >='.$inputs['discount']); + + if ($inputs['sale_type'] == 'sales') + { + $this->db->where('quantity_purchased > 0'); + } + elseif ($inputs['sale_type'] == 'returns') + { + $this->db->where('quantity_purchased < 0'); + } + + $this->db->group_by('sale_id'); + $this->db->order_by('sale_date'); + + $data = array(); + $data['summary'] = $this->db->get()->result_array(); + $data['details'] = array(); + + foreach($data['summary'] as $key=>$value) + { + $this->db->select('name, serialnumber, sales_items_temp.description, quantity_purchased, subtotal,total, tax, profit, discount_percent'); + $this->db->from('sales_items_temp'); + $this->db->join('items', 'sales_items_temp.item_id = items.item_id'); + $this->db->where('sale_id = '.$value['sale_id'] . " AND discount_percent >= " . $inputs['discount']); + $data['details'][$key] = $this->db->get()->result_array(); + } + + return $data; + } + + public function getSummaryData(array $inputs) + { + $this->db->select('sum(subtotal) as subtotal, sum(total) as total, sum(tax) as tax, sum(profit) as profit'); + $this->db->from('sales_items_temp'); + $this->db->where('sale_date BETWEEN "'. $inputs['start_date']. '" and "'. $inputs['end_date'].'" and discount_percent >= '.$inputs['discount']); + + if ($inputs['sale_type'] == 'sales') + { + $this->db->where('quantity_purchased > 0'); + } + elseif ($inputs['sale_type'] == 'returns') + { + $this->db->where('quantity_purchased < 0'); + } + + return $this->db->get()->row_array(); + } +} +?> \ No newline at end of file diff --git a/application/models/sale.php b/application/models/sale.php index 6867fc803..493644111 100644 --- a/application/models/sale.php +++ b/application/models/sale.php @@ -3,7 +3,10 @@ class Sale extends CI_Model { public function get_info($sale_id) { + $this->db->select('sales.*', FALSE); + $this->db->select('people.*', FALSE); $this->db->from('sales'); + $this->db->join('people', 'people.person_id = sales.customer_id', 'LEFT'); $this->db->where('sale_id',$sale_id); return $this->db->get(); } @@ -173,8 +176,9 @@ class Sale extends CI_Model //We create a temp table that allows us to do easy report/sales queries public function create_sales_items_temp_table() { + $this->db->query("DROP TABLE IF EXISTS phppos_sales_items_temp"); $this->db->query("CREATE TEMPORARY TABLE ".$this->db->dbprefix('sales_items_temp')." - (SELECT date(sale_time) as sale_date, ".$this->db->dbprefix('sales_items').".sale_id, comment,payment_type, customer_id, employee_id, + (SELECT date(sale_time) as sale_date, sale_time, ".$this->db->dbprefix('sales_items').".sale_id, comment,payments.payment_type, customer_id, employee_id, ".$this->db->dbprefix('items').".item_id, supplier_id, quantity_purchased, item_cost_price, item_unit_price, SUM(percent) as item_tax_percent, discount_percent, (item_unit_price*quantity_purchased-item_unit_price*quantity_purchased*discount_percent/100) as subtotal, ".$this->db->dbprefix('sales_items').".line as line, serialnumber, ".$this->db->dbprefix('sales_items').".description as description, @@ -184,6 +188,10 @@ class Sale extends CI_Model FROM ".$this->db->dbprefix('sales_items')." INNER JOIN ".$this->db->dbprefix('sales')." ON ".$this->db->dbprefix('sales_items').'.sale_id='.$this->db->dbprefix('sales').'.sale_id'." INNER JOIN ".$this->db->dbprefix('items')." ON ".$this->db->dbprefix('sales_items').'.item_id='.$this->db->dbprefix('items').'.item_id'." + INNER JOIN (SELECT sale_id, SUM(payment_amount) AS sale_payment_amount, + GROUP_CONCAT(payment_type SEPARATOR ', ') AS payment_type FROM " .$this->db->dbprefix('sales_payments') . " + WHERE payment_type <> '" . $this->lang->line('sales_check') . "' GROUP BY sale_id) AS payments + ON " . $this->db->dbprefix('sales_items') . '.sale_id'. "=" . "payments.sale_id LEFT OUTER JOIN ".$this->db->dbprefix('suppliers')." ON ".$this->db->dbprefix('items').'.supplier_id='.$this->db->dbprefix('suppliers').'.person_id'." LEFT OUTER JOIN ".$this->db->dbprefix('sales_items_taxes')." ON " .$this->db->dbprefix('sales_items').'.sale_id='.$this->db->dbprefix('sales_items_taxes').'.sale_id'." and " diff --git a/application/views/config.php b/application/views/config.php index 5e46b263a..75053ee39 100644 --- a/application/views/config.php +++ b/application/views/config.php @@ -143,11 +143,12 @@ echo form_open('config/save/',array('id'=>'config_form')); lang->line('config_language').':', 'language',array('class'=>'wide required')); ?>
'Azerbaijan', - 'BahasaIndonesia' => 'BahasaIndonesia', - 'english' => 'English', - 'Spanish' => 'Spanish', - 'Russian' => 'Russian' + 'en' => 'English', + 'es' => 'Spanish', + 'ru' => 'Russian', + 'nl-BE' => 'Dutch', + 'zh' => 'Chinese', + 'id' => 'Indonesia' ), $this->config->item('language')); ?> diff --git a/application/views/items/form.php b/application/views/items/form.php index 1b7f452b2..5b0db5da9 100644 --- a/application/views/items/form.php +++ b/application/views/items/form.php @@ -160,7 +160,7 @@ echo form_open('items/save/'.$item_info->item_id,array('id'=>'item_form'));
-lang->line('items_allow_alt_desciption').':', 'allow_alt_description',array('class'=>'wide')); ?> +lang->line('items_allow_alt_description').':', 'allow_alt_description',array('class'=>'wide')); ?>
'allow_alt_description', diff --git a/application/views/items/form_bulk.php b/application/views/items/form_bulk.php index 5bfedc9b2..1ec3d67d7 100644 --- a/application/views/items/form_bulk.php +++ b/application/views/items/form_bulk.php @@ -131,10 +131,9 @@ echo form_open('items/bulk_update/',array('id'=>'item_form'));
-lang->line('items_allow_alt_desciption').':', 'allow_alt_description',array('class'=>'wide')); ?> +lang->line('items_allow_alt_description').':', 'allow_alt_description',array('class'=>'wide')); ?>
- - +
diff --git a/application/views/items/manage.php b/application/views/items/manage.php index 094c0702a..732cd1ce3 100644 --- a/application/views/items/manage.php +++ b/application/views/items/manage.php @@ -42,8 +42,13 @@ $(document).ready(function() $('#items_filter_form').submit(); }); //END GARRISON ADDED + $("#is_deleted").click(function() + { + $('#items_filter_form').submit(); + }); // Parq 131215 }); + function init_table_sorting() { //Only init if there is more than one row @@ -158,6 +163,8 @@ function show_hide_search_filter(search_filter_section, switchImgTag) { 'no_description','id'=>'no_description','value'=>1,'checked'=> isset($no_description)? ( ($no_description)? 1 : 0) : 0)).' | ';?> lang->line('items_search_custom_items').' '.':', 'search_custom');//GARRISON ADDED 4/21/2013?> 'search_custom','id'=>'search_custom','value'=>1,'checked'=> isset($search_custom)? ( ($search_custom)? 1 : 0) : 0)).' | ';//GARRISON ADDED 4/21/2013?> + lang->line('items_is_deleted').' '.':', 'is_deleted');// Parq 131215?> + 'is_deleted','id'=>'is_deleted','value'=>1,'checked'=> isset($is_deleted)? ( ($is_deleted)? 1 : 0) : 0)).' | ';// Parq 131215?>
@@ -180,4 +187,4 @@ function show_hide_search_filter(search_filter_section, switchImgTag) {
-load->view("partial/footer"); ?> \ No newline at end of file +load->view("partial/footer"); ?> diff --git a/application/views/partial/header.php b/application/views/partial/header.php index 722c5ac8a..3f65a343f 100644 --- a/application/views/partial/header.php +++ b/application/views/partial/header.php @@ -4,7 +4,7 @@ - <?php echo $this->config->item('company').' -- '.$this->lang->line('common_powered_by').' Open Source Point Of Sale' ?> + <?php echo $this->config->item('company').' -- '.$this->lang->line('common_powered_by').' OS Point Of Sale' ?> diff --git a/application/views/reports/date_input.php b/application/views/reports/date_input.php index 7e98c9bed..3f2095ad2 100644 --- a/application/views/reports/date_input.php +++ b/application/views/reports/date_input.php @@ -14,6 +14,7 @@ if(isset($error))
+ @@ -21,11 +22,22 @@ if(isset($error)) -
- - lang->line('reports_sale_type'), 'reports_sale_type_label', array('class'=>'required')); ?> -
- $this->lang->line('reports_all'), 'sales' => $this->lang->line('reports_sales'), 'returns' => $this->lang->line('reports_returns')), 'all', 'id="sale_type"'); ?> + + +
+ + lang->line('reports_discount_prefix') .' ' .form_input(array( + 'name'=>'selected_discount', + 'id'=>'selected_discount', + 'value'=>'0')). ' '. $this->lang->line('reports_discount_suffix') + ?> + +
+
lang->line('reports_sales'); ?>
  • lang->line('reports_receivings'); ?>
  • lang->line('reports_customer'); ?>
    • +
  • lang->line('reports_discount'); ?>
  • lang->line('reports_employee'); ?>
    • @@ -56,8 +57,3 @@ if(isset($error)) ?> load->view("partial/footer"); ?> - diff --git a/application/views/reports/tabular_details.php b/application/views/reports/tabular_details.php index 133a749a4..c1379710a 100644 --- a/application/views/reports/tabular_details.php +++ b/application/views/reports/tabular_details.php @@ -13,7 +13,7 @@ if($export_excel == 1){ - + @@ -80,6 +80,22 @@ if($export_excel == 1){ \ No newline at end of file + diff --git a/application/views/sales/register.php b/application/views/sales/register.php index d206ede20..15ba5a50a 100644 --- a/application/views/sales/register.php +++ b/application/views/sales/register.php @@ -273,11 +273,11 @@ else
    ++
    - + - +
    lang->line('sales_payments_total').':';?>
    lang->line('sales_amount_due').':';?>
    diff --git a/application/views/suppliers/form.php b/application/views/suppliers/form.php index fb7bffff1..e3fcac17f 100644 --- a/application/views/suppliers/form.php +++ b/application/views/suppliers/form.php @@ -75,4 +75,5 @@ $(document).ready(function() } }); }); + \ No newline at end of file diff --git a/css/general.css b/css/general.css index 5d8373ba9..19629b365 100644 --- a/css/general.css +++ b/css/general.css @@ -65,7 +65,7 @@ label.required top:30%; left:0%; color:#FFF; - font-size:11px; + font-size:0.9em; font-weight:bold; text-align:center; } @@ -96,7 +96,7 @@ label.required width:100%; top:35%; color:#FFF; - font-size:13px; + font-size:0.8em; font-weight:bold; text-align:center; } @@ -140,6 +140,16 @@ input padding: 3px; } +input#search +{ + padding: 0px; +} + +#select_customer_form input, #select_supplier_form input +{ + width: 95%; +} + .clearfix:after { content: "."; diff --git a/css/ospos.css b/css/ospos.css index 7cbf4c522..b1cf81c01 100644 --- a/css/ospos.css +++ b/css/ospos.css @@ -15,6 +15,8 @@ body margin:0px; padding:0px; background-color:#f7f7f7; + font-family: "Lucida Grande", "Trebuchet MS", Tahoma, Verdana, sans-serif; + font-size: 0.9em; } a.none @@ -93,8 +95,6 @@ a.none { position:absolute; display:none; - right:21%; - top:5px; } #feedback_bar diff --git a/css/reports.css b/css/reports.css index 088071ab3..88b175a32 100644 --- a/css/reports.css +++ b/css/reports.css @@ -2,9 +2,9 @@ { margin-left: 35px; } -#report_date_range_simple +#report_date_range_simple, #report_date_range_complex { - margin-bottom: 3px; + margin-bottom: 10px; } .report { diff --git a/css/tables.css b/css/tables.css index d734ab881..a584c61a7 100644 --- a/css/tables.css +++ b/css/tables.css @@ -8,7 +8,7 @@ border-top:1px solid #CCCCCC; background-position:5px 10px; background-repeat:no-repeat; - padding:3px 0px 3px 0px; + padding:5px 0px 5px 0px; } #table_action_header ul @@ -30,7 +30,6 @@ { background-color:#0a6184; border:2px solid #DDDDDD; - font-size:14px; padding:2px 5px 2px 5px; } @@ -61,6 +60,7 @@ table.tablesorter thead tr th, table.tablesorter tfoot tr th text-align:left; background-color:#4386a1; padding: 0px 5px 0px 5px; + } table.tablesorter thead tr .header @@ -77,7 +77,6 @@ table.tablesorter tbody td background-color: #FFF; vertical-align: top; padding: 0px 5px 0px 5px; - } table.tablesorter tbody td @@ -113,6 +112,7 @@ table.tablesorter thead tr .headerSortDown, table.tablesorter thead tr .headerSo table.innertable { display: none; + width: 100%; } table.innertable thead tr th diff --git a/git-svn-diff.sh b/git-svn-diff.sh new file mode 100755 index 000000000..207fbd354 --- /dev/null +++ b/git-svn-diff.sh @@ -0,0 +1,60 @@ +#!/bin/bash +# +# git-svn-diff originally by (http://mojodna.net/2009/02/24/my-work-git-workflow.html) +# modified by mike@mikepearce.net +# modified by aconway@[redacted] - handle diffs that introduce new files +# modified by t.broyer@ltgt.net - fixes diffs that introduce new files +# modified by m@rkj.me - fix sed syntax issue in OS X +# modified by rage-shadowman - cleaned up finding of SVN info and handling of path parameters +# modified by tianyapiaozi - cleaned up some diff context lines +# +# Generate an SVN-compatible diff against the tip of the tracking branch + +# Usage: git-svn-diff.sh FROM TO +# or: git-svn-diff.sh TO +# or: git-svn-diff.sh +# +# Gets the SVN diff from the latest dcommitted version of FROM to the latest version of TO + +usage_exit () +{ +echo +echo "Gets the SVN compatible diff from the latest dcommitted version of FROM to the latest version of TO" +echo +echo "Usage: $0 FROM TO" +echo " or: $0 TO" +echo " or: $0" +echo +echo "If FROM is not supplied we will use the latest dcommitted version of HEAD" +echo +echo "If TO is not supplied we will use the latest (possibly non-committed) version of HEAD" +echo +exit 1; +} + +FROM=${2:+$1} +TO=${2:-$1} + +# make sure FROM and TO exist or were not specified +if ! git show-branch $FROM >/dev/null 2>&1 +then +usage_exit +fi + +if ! git show-branch $TO >/dev/null 2>&1 +then +usage_exit +fi + +LATEST_DCOMMIT_HASH=`git log $FROM --grep=^git-svn-id: --first-parent -1 --pretty=format:'%H'` +SVN_REV=`git svn find-rev $LATEST_DCOMMIT_HASH` + +# do the diff and masssage into SVN format +git diff --no-prefix $LATEST_DCOMMIT_HASH $TO | +sed -e "/--- \/dev\/null/{ N; s|^--- /dev/null\n+++ \(.*\)|--- \1 (revision 0)\n+++ \1 (working copy)|;}" \ +-e "s/^--- .*/& (revision $SVN_REV)/" \ +-e "s/^+++ .*/& (working copy)/" \ +-e "s/^\(@@.*@@\).*/\1/" \ +-e "s/^diff --git [^[:space:]]*/Index:/" \ +-e "s/^index.*/===================================================================/" \ +-e "/^new file mode [0-9]\+$/d" diff --git a/import_items.csv b/import_items.csv index 8c5d91866..10f71bc52 100644 --- a/import_items.csv +++ b/import_items.csv @@ -1,2 +1,2 @@ -UPC/EAN/ISBN,Item Name,Category,Supplier ID,Cost Price,Unit Price,Tax 1 Name,Tax 1 Percent,Tax 2 Name ,Tax 2 Percent,Quantity,Reorder Level,Location,Description,Allow Alt Description,Item has Serial Number,custom1,custom2,custom3,custom4,custom5,custom6,custom7,custom8,custom9,custom10 +UPC/EAN/ISBN,Item Name,Category,Supplier ID,Cost Price,Unit Price,Tax 1 Name,Tax 1 Percent,Tax 2 Name ,Tax 2 Percent,Quantity,Reorder Level,Location,Description,Allow Alt Description,Item has Serial Number,custom1,custom2,custom3,custom4,custom5,custom6,custom7,custom8,custom9,custom10 33333333,Apple iMac,Computers,,800,1200,Tax 1,8,Tax 2,10,10,1,Earth,Best Computer ever,y,,"Oz, Frank",The Bunny and the Hill,"Monkeys,Giraffes,Gorillas",English,New,Apple,,1999,D3lk3jlkjs,Hardbound \ No newline at end of file diff --git a/license/license.txt b/license/license.txt index 7af154728..3c6b4410f 100644 --- a/license/license.txt +++ b/license/license.txt @@ -1,19 +1,19 @@ -Copyright (C) 2011 by Pappas Technologies, LLC - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +Copyright (C) 2011 by Pappas Technologies, LLC + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/system/language/english/calendar_lang.php b/system/language/en/calendar_lang.php similarity index 100% rename from system/language/english/calendar_lang.php rename to system/language/en/calendar_lang.php diff --git a/system/language/english/date_lang.php b/system/language/en/date_lang.php similarity index 100% rename from system/language/english/date_lang.php rename to system/language/en/date_lang.php diff --git a/system/language/english/db_lang.php b/system/language/en/db_lang.php similarity index 100% rename from system/language/english/db_lang.php rename to system/language/en/db_lang.php diff --git a/system/language/english/email_lang.php b/system/language/en/email_lang.php similarity index 100% rename from system/language/english/email_lang.php rename to system/language/en/email_lang.php diff --git a/system/language/en/form_validation_lang.php b/system/language/en/form_validation_lang.php new file mode 100644 index 000000000..3418f29ab --- /dev/null +++ b/system/language/en/form_validation_lang.php @@ -0,0 +1,29 @@ + + + 403 Forbidden + + + +

    Directory access is forbidden.

    + + + \ No newline at end of file diff --git a/system/language/nl-BE/migration_lang.php b/system/language/nl-BE/migration_lang.php new file mode 100644 index 000000000..4763ca243 --- /dev/null +++ b/system/language/nl-BE/migration_lang.php @@ -0,0 +1,13 @@ +