From d2f494d5c2217c5197dc94847acc7d24f7b1664a Mon Sep 17 00:00:00 2001
From: andreievg <andrei.evguenov@gmail.com>
Date: Mon, 21 Aug 2017 23:23:37 +0900
Subject: [PATCH 1/4] Localise done in text editor widget

---
 src/localization/buttonStrings.js | 6 ++++--
 src/widgets/TextEditor.js         | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/localization/buttonStrings.js b/src/localization/buttonStrings.js
index 4ed8f16ac..aca2028b4 100644
--- a/src/localization/buttonStrings.js
+++ b/src/localization/buttonStrings.js
@@ -12,6 +12,7 @@ export const buttonStrings = new LocalizedStrings({
     all_items_selected: 'All Items Selected',
     create_automatic_order: 'Create Automatic Order',
     current: 'Current',
+    done: 'Done',
     hide_stockouts: 'Hide Stockouts',
     manage_stocktake: 'Manage Stocktake',
     new_invoice: 'New Invoice',
@@ -23,7 +24,7 @@ export const buttonStrings = new LocalizedStrings({
     use_suggested_quantities: 'Use Suggested Quantities',
     use_requested_quantities: 'Use Requested Quantities',
   },
-  gil: {  // TODO: use_requested_quantities, new_supplier_invoice, add_batch
+  gil: {  // TODO: use_requested_quantities, new_supplier_invoice, add_batch, done
     add_master_list_items: 'Rinea am list',
     all_items_selected: 'Aikai nikabane',
     create_automatic_order: 'Create Automatic Order',
@@ -37,12 +38,13 @@ export const buttonStrings = new LocalizedStrings({
     past: 'Are I mwaina',
     use_suggested_quantities: 'Kabongana te\nmwaiti are e katauaki',
   },
-  tl: { // TODO: use_requested_quantities
+  tl: {
     add_batch: 'Linha Foun',
     add_master_list_items: 'Utiliza Lista Master',
     all_items_selected: 'Hili Item Hotu',
     create_automatic_order: 'Kria Orden Automátiku',
     current: 'Atuál',
+    done: 'Hotu',
     hide_stockouts: 'Hili item ho Qtd ejiste',
     manage_stocktake: 'Maneja Ajustamentu',
     new_invoice: 'Invoice Foun',
diff --git a/src/widgets/TextEditor.js b/src/widgets/TextEditor.js
index 3bc2843d7..e11669daf 100644
--- a/src/widgets/TextEditor.js
+++ b/src/widgets/TextEditor.js
@@ -12,8 +12,10 @@ import {
 
 import { Button } from 'react-native-ui-components';
 import { TextInput } from './index';
+import { buttonStrings } from '../localization';
 import globalStyles from '../globalStyles';
 
+
 /**
  * Renders a View containing a TextInput and confirm Button, to allow editing
  * of the text passed in as a prop.
@@ -43,7 +45,7 @@ export class TextEditor extends React.Component {
         <Button
           style={[globalStyles.button, globalStyles.modalOrangeButton]}
           textStyle={[globalStyles.buttonText, globalStyles.modalButtonText]}
-          text="Done"
+          text={buttonStrings.done}
           onPress={() => this.props.onEndEditing(this.state.text)}
         />
       </View>

From fd8830a4eab0a752c075a253c2ded93519600f11 Mon Sep 17 00:00:00 2001
From: andreievg <andrei.evguenov@gmail.com>
Date: Mon, 21 Aug 2017 23:24:02 +0900
Subject: [PATCH 2/4] Improve stocktake and stock on hand TL columns

---
 src/localization/tableStrings.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/localization/tableStrings.js b/src/localization/tableStrings.js
index a9d1aa7ab..942677627 100644
--- a/src/localization/tableStrings.js
+++ b/src/localization/tableStrings.js
@@ -122,9 +122,9 @@ export const tableStrings = new LocalizedStrings({
     required_quantity: 'QTD.\nHUSU/EZIJE',
     requisition_number: 'NÚMERU REKUIZISAUN',
     selected: 'SELESIONA',
-    snapshot_quantity: 'Qtd. IHA ARMAZEN',
+    snapshot_quantity: 'QTD. IHA\nARMAZEN',
     status: 'ESTATUS',
-    stock_on_hand: 'Qtd. IHA ARMAZEN',
+    stock_on_hand: 'QTD. IHA\nARMAZEN',
     suggested_quantity: 'QTD.\nSUJERE',
     supplier: 'Distribuidor',
     supply_quantity: 'KUANTIDADE\nDISTRIBUI',

From 0dab496496b991a2c604c3fc11cdadca657bb984 Mon Sep 17 00:00:00 2001
From: andreievg <andrei.evguenov@gmail.com>
Date: Mon, 21 Aug 2017 23:24:18 +0900
Subject: [PATCH 3/4] Make sure TL status fits in customer invoice page

---
 src/pages/CustomerInvoicesPage.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/CustomerInvoicesPage.js b/src/pages/CustomerInvoicesPage.js
index 7c7d3e1f9..8dc3fba4f 100644
--- a/src/pages/CustomerInvoicesPage.js
+++ b/src/pages/CustomerInvoicesPage.js
@@ -173,7 +173,7 @@ export class CustomerInvoicesPage extends React.Component {
         columns={[
           {
             key: 'otherPartyName',
-            width: 3,
+            width: 2.5,
             title: tableStrings.customer,
             sortable: true,
           },
@@ -185,7 +185,7 @@ export class CustomerInvoicesPage extends React.Component {
           },
           {
             key: 'status',
-            width: 1,
+            width: 2,
             title: tableStrings.status,
             sortable: true,
           },

From a800f99669735c2eb89c814bbe64eaf87788e77a Mon Sep 17 00:00:00 2001
From: andreievg <andrei.evguenov@gmail.com>
Date: Mon, 21 Aug 2017 23:25:42 +0900
Subject: [PATCH 4/4] Allow long otherStoreName to be more visible in
 Requisitions

---
 src/pages/CustomerRequisitionPage.js | 8 ++++----
 src/pages/SupplierRequisitionPage.js | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/pages/CustomerRequisitionPage.js b/src/pages/CustomerRequisitionPage.js
index 94ff48808..426239ba1 100644
--- a/src/pages/CustomerRequisitionPage.js
+++ b/src/pages/CustomerRequisitionPage.js
@@ -146,8 +146,8 @@ export class CustomerRequisitionPage extends React.Component {
     const infoColumns = [
       [
         {
-          title: `${pageInfoStrings.customer}:`,
-          info: requisition.otherStoreName ? requisition.otherStoreName.name : '',
+          title: `${pageInfoStrings.months_stock_required}:`,
+          info: requisition.monthsToSupply,
         },
         {
           title: `${pageInfoStrings.entry_date}:`,
@@ -156,8 +156,8 @@ export class CustomerRequisitionPage extends React.Component {
       ],
       [
         {
-          title: `${pageInfoStrings.months_stock_required}:`,
-          info: requisition.monthsToSupply,
+          title: `${pageInfoStrings.customer}:`,
+          info: requisition.otherStoreName ? requisition.otherStoreName.name : '',
         },
         {
           title: `${pageInfoStrings.comment}:`,
diff --git a/src/pages/SupplierRequisitionPage.js b/src/pages/SupplierRequisitionPage.js
index 5217d3176..c3141d011 100644
--- a/src/pages/SupplierRequisitionPage.js
+++ b/src/pages/SupplierRequisitionPage.js
@@ -190,10 +190,6 @@ export class SupplierRequisitionPage extends React.Component {
     const { requisition } = this.props;
     const infoColumns = [
       [
-        {
-          title: `${pageInfoStrings.supplier}:`,
-          info: requisition.otherStoreName ? requisition.otherStoreName.name : '',
-        },
         {
           title: `${pageInfoStrings.entry_date}:`,
           info: formatDate(requisition.entryDate),
@@ -204,6 +200,10 @@ export class SupplierRequisitionPage extends React.Component {
         },
       ],
       [
+        {
+          title: `${pageInfoStrings.supplier}:`,
+          info: requisition.otherStoreName ? requisition.otherStoreName.name : '',
+        },
         {
           title: `${pageInfoStrings.months_stock_required}:`,
           info: requisition.monthsToSupply,