diff --git a/invoice.info b/invoice.info
index 33094c6..d837a29 100755
--- a/invoice.info
+++ b/invoice.info
@@ -3,3 +3,10 @@ description = "Module to create invoices"
 core = 6.x
 version = "6.x-1.x-dev"
 php = 5.x
+
+; Information added by drupal.org packaging script on 2013-09-30
+version = "6.x-1.1+4-dev"
+core = "6.x"
+project = "invoice"
+datestamp = "1380583498"
+
diff --git a/invoice.install b/invoice.install
index f74d1be..973c8d9 100755
--- a/invoice.install
+++ b/invoice.install
@@ -243,6 +243,15 @@ function invoice_update_5() {
   return array();
 }
 
+function invoice_update_6() {
+  $ret = array(); // Array to which query results will be added.
+  
+  db_add_field($ret, 'invoice_customers', 'state', array('type' => 'varchar', 'length' => 50, 'not null' => FALSE));
+  db_add_field($ret, 'invoice_templates', 'supplier_state', array('type' => 'varchar', 'length' => 100, 'not null' => FALSE));
+
+  return $ret; // Array with query results.
+}
+
 /**
  * Implementation of hook_schema()
  *
@@ -261,6 +270,7 @@ function invoice_schema() {
       'building_number'  => array('type' => 'varchar', 'length' => 15, 'not null' => FALSE),
       'zipcode'          => array('type' => 'varchar', 'length' => 25, 'not null' => FALSE),
       'city'             => array('type' => 'varchar', 'length' => 50, 'not null' => FALSE),
+      'state'            => array('type' => 'varchar', 'length' => 50, 'not null' => FALSE),
       'country'          => array('type' => 'varchar', 'length' => 50, 'not null' => FALSE),
       'coc_number'       => array('type' => 'varchar', 'length' => 25, 'not null' => FALSE),
       'vat_number'       => array('type' => 'varchar', 'length' => 25, 'not null' => FALSE),
@@ -330,6 +340,7 @@ function invoice_schema() {
       'supplier_building_number'   => array('type' => 'varchar', 'length' => 100, 'not null' => FALSE),
       'supplier_zipcode'           => array('type' => 'varchar', 'length' => 100, 'not null' => FALSE),
       'supplier_city'              => array('type' => 'varchar', 'length' => 100, 'not null' => FALSE),
+      'supplier_state'             => array('type' => 'varchar', 'length' => 100, 'not null' => FALSE),
       'supplier_country'           => array('type' => 'varchar', 'length' => 100, 'not null' => FALSE),
       'supplier_phone'             => array('type' => 'varchar', 'length' => 100, 'not null' => FALSE),
       'supplier_fax'               => array('type' => 'varchar', 'length' => 100, 'not null' => FALSE),
diff --git a/invoice.module b/invoice.module
index 4a14d73..2a8529f 100755
--- a/invoice.module
+++ b/invoice.module
@@ -309,6 +309,7 @@ function invoice_load($node) {
     'building_number' => $o_invoice->building_number,
     'zipcode' => $o_invoice->zipcode,
     'city' => $o_invoice->city,
+    'state' => $o_invoice->state,
     'country' => $o_invoice->country,
     'coc_number' => $o_invoice->coc_number,
     'vat_number' => $o_invoice->vat_number,
@@ -439,6 +440,7 @@ function invoice_settings_form_submit(&$form_state, $form) {
   variable_set('invoice_supplier_building_number', $fv['supplier_building_number']);
   variable_set('invoice_supplier_zipcode', $fv['supplier_zipcode']);
   variable_set('invoice_supplier_city', $fv['supplier_city']);
+  variable_set('invoice_supplier_state', $fv['supplier_state']);
   variable_set('invoice_supplier_country', $fv['supplier_country']);
   variable_set('invoice_supplier_phone', $fv['supplier_phone']);
   variable_set('invoice_supplier_fax', $fv['supplier_fax']);
@@ -459,7 +461,7 @@ function invoice_settings_form_submit(&$form_state, $form) {
     // Numeric fields in this query will become a zero if nothing is filled in, instead of the overloading system.
     // So numeric fields that are empty will take over the general setting and update that in the database for this template.
     db_query("UPDATE {invoice_templates} SET locale='%s', date_format='%s', vat=%d, pay_limit=%d,
-      supplier_company_name='%s', supplier_street='%s', supplier_building_number='%s', supplier_zipcode='%s', supplier_city='%s',
+      supplier_company_name='%s', supplier_street='%s', supplier_building_number='%s', supplier_zipcode='%s', supplier_city='%s', supplier_state='%s',
       supplier_country='%s', supplier_phone='%s', supplier_fax='%s', supplier_email='%s', supplier_web='%s', supplier_coc_number='%s',
       supplier_vat_number='%s', display_column_vat=%d, display_column_exunitcost=%d, display_column_incunitcost=%d,
       display_column_extotal=%d, display_column_inctotal=%d
@@ -473,6 +475,7 @@ function invoice_settings_form_submit(&$form_state, $form) {
       $fv[$s_template .'_supplier_building_number'],
       $fv[$s_template .'_supplier_zipcode'],
       $fv[$s_template .'_supplier_city'],
+      $fv[$s_template .'_supplier_state'],
       $fv[$s_template .'_supplier_country'],
       $fv[$s_template .'_supplier_phone'],
       $fv[$s_template .'_supplier_fax'],
@@ -646,7 +649,7 @@ function invoice_insert($node) {
   );
       
   // Create customer
-  db_query("INSERT {invoice_customers} (customer_number,company_name,firstname,lastname,street,building_number,zipcode,city,country,coc_number,vat_number,description,invoice_id)
+  db_query("INSERT {invoice_customers} (customer_number,company_name,firstname,lastname,street,building_number,zipcode,city,state,country,coc_number,vat_number,description,invoice_id)
     VALUES (%d, '%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s',%d)",
     $node->customer_number,
     $node->company_name,
@@ -656,6 +659,7 @@ function invoice_insert($node) {
     $node->building_number,
     $node->zipcode,
     $node->city,
+    $node->state,
     $node->country,
     $node->coc_number,
     $node->vat_number,
@@ -713,7 +717,7 @@ function invoice_update($node) {
         
     // Update customers
     db_query("UPDATE {invoice_customers} SET customer_number=%d, company_name='%s', firstname='%s', lastname='%s', street='%s', building_number='%s',
-      zipcode='%s', city='%s', country='%s', coc_number='%s', vat_number='%s', description='%s'  
+      zipcode='%s', city='%s', state='%s', country='%s', coc_number='%s', vat_number='%s', description='%s'  
       WHERE invoice_id=%d",
       $node->customer_number,
       $node->company_name,
@@ -723,6 +727,7 @@ function invoice_update($node) {
       $node->building_number,
       $node->zipcode,
       $node->city,
+      $node->state,
       $node->country,
       $node->coc_number,
       $node->vat_number,
diff --git a/invoice_ajax.inc b/invoice_ajax.inc
index fc6f25a..6fad22c 100755
--- a/invoice_ajax.inc
+++ b/invoice_ajax.inc
@@ -30,7 +30,7 @@ function invoice_search_customer($value) {
   $result = db_query("SELECT * FROM {invoice_customers} ic
     LEFT JOIN {invoice_invoices} ii ON ic.invoice_id=ii.iid  
     WHERE (company_name LIKE '%%". $customer_value ."%' OR lastname LIKE '%%". $customer_value ."%' OR firstname LIKE '%%". $customer_value ."%')
-    GROUP BY vat_number,coc_number,company_name,country,city,zipcode,building_number,lastname,firstname
+    GROUP BY vat_number,coc_number,company_name,country,city,state,zipcode,building_number,lastname,firstname
     ORDER BY company_name, lastname, firstname, invoice_id DESC");
 
   while ($row = db_fetch_object($result)) {
@@ -41,6 +41,7 @@ function invoice_search_customer($value) {
       $value = !empty($row->zipcode) ? $value ." - ". $row->zipcode : $value;
       $value = !empty($row->building_number) ? $value ." - ". $row->building_number : $value;
       $value = !empty($row->city) ? $value ." - ". $row->city : $value;
+      $value = !empty($row->state) ? $value ." - ". $row->state : $value;
       $value = !empty($row->country) ? $value ." - ". $row->country : $value;
       $value = !empty($row->vat_number) ? $value ." - ". $row->vat_number : $value;
       $value = !empty($row->coc_number) ? $value ." - ". $row->coc_number : $value;
@@ -64,7 +65,7 @@ function invoice_get_customer_info() {
   // Create alias
   $fv =& $_GET;
   
-  $a_data = db_fetch_array(db_query("SELECT company_name,firstname,lastname,street,building_number,zipcode,city,country,coc_number,vat_number,ic.description
+  $a_data = db_fetch_array(db_query("SELECT company_name,firstname,lastname,street,building_number,zipcode,city,state,country,coc_number,vat_number,ic.description
     FROM {invoice_customers} ic
     LEFT JOIN {invoice_invoices} ii ON ic.invoice_id=ii.iid  
     WHERE ic.cid=%d
@@ -321,4 +322,4 @@ function invoice_delete_item() {
    
   drupal_json($a_data);
   exit;
-}
\ No newline at end of file
+}
diff --git a/invoice_form.inc b/invoice_form.inc
index db9f558..d73fce8 100755
--- a/invoice_form.inc
+++ b/invoice_form.inc
@@ -221,6 +221,12 @@ function invoice_form(&$form_state, $node) {
     '#required' => FALSE,
     '#default_value' => $form_state->customer['city'],
   );
+  $form['customer_optional']['state'] = array(
+    '#type' => 'textfield',
+    '#title' => t('State'),
+    '#required' => FALSE,
+    '#default_value' => $form_state->customer['state'],
+  );
   $form['customer_optional']['country'] = array(
     '#type' => 'textfield',
     '#title' => t('Country'),
@@ -457,6 +463,12 @@ function invoice_settings_form() {
     '#required' => FALSE,
     '#default_value' => variable_get('invoice_supplier_city', ''),    
   );
+  $form['general']['supplier']['supplier_state'] = array(
+    '#type' => 'textfield',
+    '#title' => t('State'),
+    '#required' => FALSE,
+    '#default_value' => variable_get('invoice_supplier_state', ''),    
+  );
   $form['general']['supplier']['supplier_country'] = array(
     '#type' => 'textfield',
     '#title' => t('Country'),
@@ -646,6 +658,12 @@ function invoice_settings_form() {
       '#required' => FALSE,
       '#default_value' => _invoice_get_variable($s_template, 'supplier_city', ''),
     );
+    $form[$s_template][$s_template .'_supplier'][$s_template .'_supplier_state'] = array(
+      '#type' => 'textfield',
+      '#title' => t('State'),
+      '#required' => FALSE,
+      '#default_value' => _invoice_get_variable($s_template, 'supplier_state', ''),
+    );
     $form[$s_template][$s_template .'_supplier'][$s_template .'_supplier_country'] = array(
       '#type' => 'textfield',
       '#title' => t('Country'),
@@ -780,4 +798,4 @@ function invoice_form_alter(&$form, $form_state, $form_id) {
     unset($form['revision_information']);    
     unset($form['buttons']['preview']);
   }
-}
\ No newline at end of file
+}
