-
-
diff --git a/web/forms/admin/visits/visits.js b/web/forms/admin/visits/visits.js
index bce5c005..a8454491 100755
--- a/web/forms/admin/visits/visits.js
+++ b/web/forms/admin/visits/visits.js
@@ -5,40 +5,18 @@ Vn.Visits = new Class
,activate: function ()
{
- this.$('date-to').value = new Date ();
- this.$('num-sessions').func = this.sessionsFunc;
- this.onSessionsClick ();
- }
-
- ,showStep: function (stepId)
- {
- if (this.currentStep)
- this.currentStep.style.display = 'none';
-
- this.currentStep = this.$(stepId);
- this.currentStep.style.display = 'inline';
+ this.$('from').value = new Date ();
+ this.$('to').value = new Date ();
}
,onRefreshClick: function ()
{
- this.model.refresh ();
+ this.$('visits').refresh ();
}
,onSessionsClick: function ()
{
- this.showStep ('sessions-step');
- this.model = this.$('sessions');
- }
-
- ,onVisitsClick: function ()
- {
- this.showStep ('visits-step');
- this.model = this.$('visits');
- }
-
- ,sessionsFunc: function ()
- {
- return 1;
+ this.hash.set ({'form': 'admin/connections'});
}
});
diff --git a/web/forms/ecomerce/catalog/catalog.js b/web/forms/ecomerce/catalog/catalog.js
index 569a0cde..6529fe68 100755
--- a/web/forms/ecomerce/catalog/catalog.js
+++ b/web/forms/ecomerce/catalog/catalog.js
@@ -35,7 +35,7 @@ Vn.Catalog = new Class
this.popup = new Htk.Popup ();
this.popup.setChildNode (this.$('lots-popup'));
- this.$('items-model').setInfo ('a', 'Articles', 'vn2008', ['Id_Article']);
+ this.$('items-model').setInfo ('a', 'Articles', 'vn2008', ['item_id']);
if (Vn.Cookie.check ('hedera_view'))
this.setView (Vn.Cookie.getInt ('hedera_view'));
@@ -45,6 +45,7 @@ Vn.Catalog = new Class
,deactivate: function ()
{
+ this.hideMenu ();
this.gui.$('top-bar').style.backgroundColor = '';
Vn.Node.remove (this.$('right-panel'));
}
diff --git a/web/forms/ecomerce/catalog/ui.xml b/web/forms/ecomerce/catalog/ui.xml
index c5fee5bf..25a86f42 100755
--- a/web/forms/ecomerce/catalog/ui.xml
+++ b/web/forms/ecomerce/catalog/ui.xml
@@ -239,7 +239,7 @@
- Configure
+ Change
diff --git a/web/js/db/model.js b/web/js/db/model.js
index a803921c..2eeb8e02 100755
--- a/web/js/db/model.js
+++ b/web/js/db/model.js
@@ -1237,14 +1237,28 @@ Db.Model.implement
for (var j = 0; j < tableInfo.pks.length; j++)
{
var colIndex = this.getColumnIndex (tableInfo.pks[j]);
- table.pks.push (colIndex);
+
+ if (colIndex !== -1)
+ table.pks.push (colIndex);
+ else
+ console.warn ('Db.Model: Can\'t repair primary key: `%s`.`%s`'
+ ,tableInfo.orgname
+ ,tableInfo.pks[j]
+ );
}
}
if (tableInfo.ai)
{
var colIndex = this.getColumnIndex (tableInfo.ai);
- this.columns[colIndex].flags |= Db.Conn.Flag.AI;
+
+ if (colIndex !== -1)
+ this.columns[colIndex].flags |= Db.Conn.Flag.AI;
+ else
+ console.warn ('Db.Model: Can\'t repair autoincrement column: `%s`.`%s`'
+ ,tableInfo.orgname
+ ,tableInfo.ai
+ );
}
}
}
diff --git a/web/js/hedera/app.js b/web/js/hedera/app.js
index 837bbcd3..b256cf8c 100644
--- a/web/js/hedera/app.js
+++ b/web/js/hedera/app.js
@@ -69,7 +69,7 @@ Vn.App = new Class
{
this._guestLogged = true;
Vn.Cookie.set ('hedera_guest', true);
- this._showGui ();
+ this._onLogin ();
}
}
@@ -81,17 +81,13 @@ Vn.App = new Class
this.run ();
}
else
- this._showGui ();
+ this._onLogin ();
}
,_onLogin: function ()
{
this._freeLogin ();
- this._showGui ();
- }
-
- ,_showGui: function ()
- {
+
var gui = this._gui = new Vn.Gui ({conn: this._conn});
gui.on ('logout', this._onLogout, this);
gui.show ();
diff --git a/web/js/hedera/gui.js b/web/js/hedera/gui.js
index 6c6b147f..8960bd21 100755
--- a/web/js/hedera/gui.js
+++ b/web/js/hedera/gui.js
@@ -22,7 +22,10 @@ Vn.Gui = new Class
+'SELECT production_domain, test_domain FROM config;'
+'SELECT name FROM customer_user;'
+'CALL form_list ();';
- this.conn.execQuery (sql, this.onMainQueryDone.bind (this));
+ x.execQuery (sql, this.onMainQueryDone.bind (this));
+
+ if (Vn.Cookie.check ('hedera_supplant'))
+ this.supplantUser (Vn.Cookie.get ('hedera_supplant'));
}
,get: function ()
{
@@ -70,9 +73,6 @@ Vn.Gui = new Class
Htk.Toast.showWarning (_('By using this site you accept cookies'));
}
- if (Vn.Cookie.check ('hedera_supplant'))
- this.supplantUser (Vn.Cookie.get ('hedera_supplant'));
-
this.parent (props);
}
@@ -84,12 +84,13 @@ Vn.Gui = new Class
,hide: function ()
{
this.closeForm ();
+ this.hideMenu ();
Vn.Node.remove (this.node);
}
,onLogoutClick: function ()
{
- this.conn.close (this.onConnClose.bind (this));
+ this._conn.close (this.onConnClose.bind (this));
}
,onConnClose: function ()
@@ -500,7 +501,7 @@ Vn.Gui = new Class
var query = 'UPDATE user_session_view SET user_id = #user;'+
'SELECT Cliente FROM vn2008.Clientes WHERE Id_cliente = #user';
- this.conn.execQuery (query,
+ this._conn.execQuery (query,
this._onUserSupplant.bind (this, userId, callback), batch);
}
@@ -531,7 +532,7 @@ Vn.Gui = new Class
,onSupplantExitClick: function ()
{
var query = 'UPDATE user_session_view SET user_id = account.user_get_id ()'
- this.conn.execQuery (query, this.supplantExit.bind (this));
+ this._conn.execQuery (query, this.supplantExit.bind (this));
}
,supplantExit: function ()
diff --git a/web/js/hedera/style.css b/web/js/hedera/style.css
index 293d00f3..f105eaff 100755
--- a/web/js/hedera/style.css
+++ b/web/js/hedera/style.css
@@ -3,7 +3,11 @@
@media screen
{
- body { font-size: 12pt; }
+ body { font-size: 11pt; }
+}
+@media (min-resolution: 95dpi) and (max-resolution: 119dpi)
+{
+ body { font-size: 13pt; }
}
@media (min-resolution: 120dpi) and (orientation: portrait)
{
diff --git a/web/locale/ca/forms/admin/connections.json b/web/locale/ca/forms/admin/connections.json
new file mode 100755
index 00000000..58201417
--- /dev/null
+++ b/web/locale/ca/forms/admin/connections.json
@@ -0,0 +1,8 @@
+{
+ "Connections": "Connexions"
+
+ ,"Refresh": "Actualitzar"
+ ,"Visits": "Visites"
+
+ ,"connections": "connexions"
+}
diff --git a/web/locale/ca/forms/admin/visits.json b/web/locale/ca/forms/admin/visits.json
index 92ee32b4..6d8747ee 100755
--- a/web/locale/ca/forms/admin/visits.json
+++ b/web/locale/ca/forms/admin/visits.json
@@ -1,31 +1,14 @@
{
"Visits": "Visites"
- ,"VisitsManagement": "Gestió de visites"
-
- ,"ActiveSessions": "Usuaris conectats"
- ,"VisitsQuery": "Consulta de visites"
+
,"Refresh": "Actualitzar"
+ ,"Connections": "Connexions"
- ,"ActiveSessions:": "Usuaris conectats:"
- ,"NewVisitsTotal:": "Noves visites:"
+ ,"From": "Desde"
+ ,"To": "Fins"
+ ,"Select date interval": "Selecciona un interval de dates"
- ,"SessionNumber": "N sessió"
- ,"User": "Usuari"
- ,"Login": "Hora d'accés"
- ,"LastActivity": "Última activitat"
- ,"SO": "Sistema Operatiu"
- ,"Version": "Versió"
- ,"NewVisit": "Nova visita"
-
- ,"SelectDateInterval": "Selecciona un intèrval de dates"
- ,"FromDate:": "Des de el dia:"
- ,"ToDate:": "Fins el dia:"
- ,"VisitsTotal:": "Total visites:"
-
- ,"Browser": "Navegador"
- ,"MinVersion": "Versió mínima"
- ,"MaxVersion": "Versió màxima"
- ,"LastVisit": "Última visita"
- ,"NewVisits": "Noves visites"
- ,"%a, %e %b %Y at %T": "%a, %e %b %Y a las %T"
+ ,"visits": "visites"
+ ,"news": "noves"
+ ,"%a, %e %b %Y at %T": "%a, %e %b %Y a les %T"
}
diff --git a/web/locale/ca/forms/ecomerce/catalog.json b/web/locale/ca/forms/ecomerce/catalog.json
index 792017f2..5b62da33 100755
--- a/web/locale/ca/forms/ecomerce/catalog.json
+++ b/web/locale/ca/forms/ecomerce/catalog.json
@@ -11,8 +11,11 @@
,"StartOrder": "Començar comanda"
,"ShoppingBasket": "Cistella de la compra"
+ ,"Agency": "Agència"
+ ,"Warehouse": "Magatzem"
+
,"Search": "Cercar"
- ,"Configure": "Configurar"
+ ,"Change": "Cambiar"
,"Order by": "Ordenar"
,"Available": "Displonible"
,"Size": "Mesura"
diff --git a/web/locale/ca/js/hedera.js b/web/locale/ca/js/hedera.js
index 43ae60dc..3f641a56 100755
--- a/web/locale/ca/js/hedera.js
+++ b/web/locale/ca/js/hedera.js
@@ -43,9 +43,11 @@ Vn.Locale.add
,"Administration": "Administració"
,"Control panel": "Panell de control"
,"Users": "Usuaris"
+ ,"Connections": "Conexions"
,"Visits": "Visites"
,"News": "Noticies"
,"Photos": "Fotos"
+ ,"Reports": "Informes"
,"Shelves": "Estanterías"
,"Items list": "Llistat articles"
,"Contact": "Vull ser client"
diff --git a/web/locale/en/forms/admin/connections.json b/web/locale/en/forms/admin/connections.json
new file mode 100755
index 00000000..11a75f5b
--- /dev/null
+++ b/web/locale/en/forms/admin/connections.json
@@ -0,0 +1,8 @@
+{
+ "Connections": "Connections"
+
+ ,"Refresh": "Refresh"
+ ,"Visits": "Visits"
+
+ ,"connections": "connections"
+}
diff --git a/web/locale/en/forms/admin/visits.json b/web/locale/en/forms/admin/visits.json
index 630f7521..cdb52a6e 100755
--- a/web/locale/en/forms/admin/visits.json
+++ b/web/locale/en/forms/admin/visits.json
@@ -1,31 +1,14 @@
{
"Visits": "Visits"
- ,"VisitsManagement": "Visits management"
-
- ,"ActiveSessions": "Active sessions"
- ,"VisitsQuery": "Visits query"
+
,"Refresh": "Refresh"
+ ,"Connections": "Connections"
- ,"ActiveSessions:": "Active sessions:"
- ,"NewVisitsTotal:": "New visits:"
+ ,"From": "From"
+ ,"To": "To"
+ ,"Select date interval": "Select date interval"
- ,"SessionNumber": "Session number"
- ,"User": "User"
- ,"Login": "Login"
- ,"LastActivity": "Last activity"
- ,"SO": "OS"
- ,"Version": "Version"
- ,"NewVisit": "New visit"
-
- ,"SelectDateInterval": "Select date interval"
- ,"FromDate:": "From date:"
- ,"ToDate:": "To date:"
- ,"VisitsTotal:": "Visits total:"
-
- ,"Browser": "Browser"
- ,"MinVersion": "Minimal version"
- ,"MaxVersion": "Maximum version"
- ,"LastVisit": "Last visit"
- ,"NewVisits": "New visits"
+ ,"visits": "visits"
+ ,"news": "news"
,"%a, %e %b %Y at %T": "%a, %e %b %Y at %T"
}
diff --git a/web/locale/en/forms/ecomerce/catalog.json b/web/locale/en/forms/ecomerce/catalog.json
index 3f8e4afc..080da346 100755
--- a/web/locale/en/forms/ecomerce/catalog.json
+++ b/web/locale/en/forms/ecomerce/catalog.json
@@ -11,8 +11,11 @@
,"StartOrder": "Start order"
,"ShoppingBasket": "Shopping basket"
+ ,"Agency": "Agency"
+ ,"Warehouse": "Warehouse"
+
,"Search": "Search"
- ,"Configure": "Configure"
+ ,"Change": "Change"
,"Order": "Order"
,"Available": "Available"
,"Size": "Size"
diff --git a/web/locale/en/js/hedera.js b/web/locale/en/js/hedera.js
index 8473f770..dc300a97 100755
--- a/web/locale/en/js/hedera.js
+++ b/web/locale/en/js/hedera.js
@@ -43,9 +43,11 @@ Vn.Locale.add
,"Administration": "Administration"
,"Control panel": "Control panel"
,"Users": "Users"
+ ,"Connections": "Connections"
,"Visits": "Visits"
,"News": "News"
,"Photos": "Photos"
+ ,"Reports": "Reports"
,"Shelves": "Shelves"
,"Items list": "Items list"
,"Contact": "Contact"
diff --git a/web/locale/es/forms/admin/connections.json b/web/locale/es/forms/admin/connections.json
new file mode 100755
index 00000000..4ef5a84a
--- /dev/null
+++ b/web/locale/es/forms/admin/connections.json
@@ -0,0 +1,8 @@
+{
+ "Connections": "Conexiones"
+
+ ,"Refresh": "Actualizar"
+ ,"Visits": "Visitas"
+
+ ,"connections": "conexiones"
+}
diff --git a/web/locale/es/forms/admin/visits.json b/web/locale/es/forms/admin/visits.json
index e2cf749b..26d18c86 100755
--- a/web/locale/es/forms/admin/visits.json
+++ b/web/locale/es/forms/admin/visits.json
@@ -1,31 +1,14 @@
{
"Visits": "Visitas"
- ,"VisitsManagement": "Gestión de visitas"
-
- ,"ActiveSessions": "Usuarios conectados"
- ,"VisitsQuery": "Consulta de visitas"
+
,"Refresh": "Actualizar"
+ ,"Connections": "Conexiones"
- ,"ActiveSessions:": "Usuarios conectados:"
- ,"NewVisitsTotal:": "Nuevas visitas:"
+ ,"From": "Desde"
+ ,"To": "Hasta"
+ ,"Select date interval": "Selecciona un intérvalo de fechas"
- ,"SessionNumber": "Nº sesión"
- ,"User": "Usuario"
- ,"Login": "Hora de acceso"
- ,"LastActivity": "Última actividad"
- ,"SO": "Sistema Operativo"
- ,"Version": "Versión"
- ,"NewVisit": "Nueva visita"
-
- ,"SelectDateInterval": "Selecciona un intérvalo de fechas"
- ,"FromDate:": "Desde el día:"
- ,"ToDate:": "Hasta el día:"
- ,"VisitsTotal:": "Total visitas:"
-
- ,"Browser": "Navegador"
- ,"MinVersion": "Versión mínima"
- ,"MaxVersion": "Versión máxima"
- ,"LastVisit": "Última visita"
- ,"NewVisits": "Nuevas visitas"
+ ,"visits": "visitas"
+ ,"news": "nuevas"
,"%a, %e %b %Y at %T": "%a, %e %b %Y a las %T"
}
diff --git a/web/locale/es/forms/ecomerce/catalog.json b/web/locale/es/forms/ecomerce/catalog.json
index 54336f5f..4e7369ac 100755
--- a/web/locale/es/forms/ecomerce/catalog.json
+++ b/web/locale/es/forms/ecomerce/catalog.json
@@ -11,10 +11,13 @@
,"StartOrder": "Empezar pedido"
,"ShoppingBasket": "Cesta de la compra"
+ ,"Agency": "Agencia"
+ ,"Warehouse": "Almacén"
+
,"Search": "Buscar"
- ,"Configure": "Configurar"
- ,"Order by": "Ordenar"
- ,"Available": "Displonible"
+ ,"Change": "Cambiar"
+ ,"Order": "Ordenar"
+ ,"Available": "Disponible"
,"Size": "Medida"
,"Realm": "Reino"
,"Family": "Familia"
diff --git a/web/locale/es/js/hedera.js b/web/locale/es/js/hedera.js
index 3087c6b9..4b556409 100755
--- a/web/locale/es/js/hedera.js
+++ b/web/locale/es/js/hedera.js
@@ -43,9 +43,11 @@ Vn.Locale.add
,"Administration": "Administración"
,"Control panel": "Panel de control"
,"Users": "Usuarios"
+ ,"Connections": "Conexiones"
,"Visits": "Visitas"
,"News": "Noticias"
,"Photos": "Fotos"
+ ,"Reports": "Informes"
,"Shelves": "Estanterías"
,"Items list": "Listado artículos"
,"Contact": "Quiero ser cliente"
diff --git a/web/locale/fr/forms/admin/connections.json b/web/locale/fr/forms/admin/connections.json
new file mode 100755
index 00000000..f8e16b3b
--- /dev/null
+++ b/web/locale/fr/forms/admin/connections.json
@@ -0,0 +1,8 @@
+{
+ "Connections": "Connexions"
+
+ ,"Refresh": "Actualiser"
+ ,"Visits": "Visites"
+
+ ,"connections": "connexions"
+}
diff --git a/web/locale/fr/forms/admin/visits.json b/web/locale/fr/forms/admin/visits.json
index 580ddd89..c9ff95de 100755
--- a/web/locale/fr/forms/admin/visits.json
+++ b/web/locale/fr/forms/admin/visits.json
@@ -1,31 +1,14 @@
{
- "Visits": "Visitas"
- ,"VisitsManagement": "Gestión de visitas"
-
- ,"ActiveSessions": "Usuarios conectados"
- ,"VisitsQuery": "Consulta de visitas"
- ,"Refresh": "Actualizar"
+ "Visits": "Visites"
- ,"ActiveSessions:": "Usuarios conectados:"
- ,"NewVisitsTotal:": "Nuevas visitas:"
+ ,"Refresh": "Actualiser"
+ ,"Connections": "Connexions"
- ,"SessionNumber": "Nº sesión"
- ,"User": "Usuario"
- ,"Login": "Hora de acceso"
- ,"LastActivity": "Última actividad"
- ,"SO": "Sistema Operativo"
- ,"Version": "Versión"
- ,"NewVisit": "Nueva visita"
+ ,"From": "À partir de"
+ ,"To": "À"
+ ,"Select date interval": "Sélectionnez une plage de dates"
- ,"SelectDateInterval": "Sélectionnez une plage de dates"
- ,"FromDate:": "Desde el día:"
- ,"ToDate:": "Hasta el día:"
- ,"VisitsTotal:": "Total visitas:"
-
- ,"Browser": "Navegador"
- ,"MinVersion": "Versión mínima"
- ,"MaxVersion": "Versión máxima"
- ,"LastVisit": "Última visita"
- ,"NewVisits": "Nuevas visitas"
- ,"%a, %e %b %Y at %T": "%a, %e %b %Y a las %T"
+ ,"visits": "visites"
+ ,"news": "nouvelles"
+ ,"%a, %e %b %Y at %T": "%a, %e %b %Y à %T"
}
diff --git a/web/locale/fr/forms/ecomerce/catalog.json b/web/locale/fr/forms/ecomerce/catalog.json
index 667079bb..c749c782 100755
--- a/web/locale/fr/forms/ecomerce/catalog.json
+++ b/web/locale/fr/forms/ecomerce/catalog.json
@@ -11,9 +11,12 @@
,"StartOrder": "Acheter"
,"ShoppingBasket": "Mon panier"
+ ,"Agency": "Agence"
+ ,"Warehouse": "Entrepôt"
+
,"Search": "Recherche"
- ,"Configure": "Régler"
- ,"Order by": "Ordre"
+ ,"Change": "Modifier"
+ ,"Order": "Ordre"
,"Available": "Displonible"
,"Size": "Mesure"
,"Realm": "Famille"
diff --git a/web/locale/fr/js/hedera.js b/web/locale/fr/js/hedera.js
index 4d7d1cf2..982d6ef9 100755
--- a/web/locale/fr/js/hedera.js
+++ b/web/locale/fr/js/hedera.js
@@ -43,9 +43,11 @@ Vn.Locale.add
,"Administration": "Administration"
,"Control panel": "Panneau de contrôle"
,"Users": "Utilisateurs"
+ ,"Connections": "Connexions"
,"Visits": "Visites"
,"News": "Nouvelles"
,"Photos": "Photos"
+ ,"Reports": "Rapport"
,"Shelves": "Etagères"
,"Items list": "Liste des articles"
,"Contact": "Je veux être client"
diff --git a/web/locale/mn/forms/admin/connections.json b/web/locale/mn/forms/admin/connections.json
new file mode 100755
index 00000000..76c41fc0
--- /dev/null
+++ b/web/locale/mn/forms/admin/connections.json
@@ -0,0 +1,8 @@
+{
+ "Connections": "холболт"
+
+ ,"Refresh": "Сэргээх"
+ ,"Visits": "уулзалт"
+
+ ,"connections": "холболт"
+}
diff --git a/web/locale/mn/forms/admin/visits.json b/web/locale/mn/forms/admin/visits.json
index 630f7521..201867e5 100755
--- a/web/locale/mn/forms/admin/visits.json
+++ b/web/locale/mn/forms/admin/visits.json
@@ -1,31 +1,14 @@
{
- "Visits": "Visits"
- ,"VisitsManagement": "Visits management"
-
- ,"ActiveSessions": "Active sessions"
- ,"VisitsQuery": "Visits query"
- ,"Refresh": "Refresh"
+ "Visits": "уулзалт"
- ,"ActiveSessions:": "Active sessions:"
- ,"NewVisitsTotal:": "New visits:"
+ ,"Refresh": "Сэргээх"
+ ,"Connections": "холболт"
- ,"SessionNumber": "Session number"
- ,"User": "User"
- ,"Login": "Login"
- ,"LastActivity": "Last activity"
- ,"SO": "OS"
- ,"Version": "Version"
- ,"NewVisit": "New visit"
+ ,"From": "эхлэн"
+ ,"To": "нь"
+ ,"Select date interval": "Сонгох огноо интервал"
- ,"SelectDateInterval": "Select date interval"
- ,"FromDate:": "From date:"
- ,"ToDate:": "To date:"
- ,"VisitsTotal:": "Visits total:"
-
- ,"Browser": "Browser"
- ,"MinVersion": "Minimal version"
- ,"MaxVersion": "Maximum version"
- ,"LastVisit": "Last visit"
- ,"NewVisits": "New visits"
- ,"%a, %e %b %Y at %T": "%a, %e %b %Y at %T"
+ ,"visits": "уулзалт"
+ ,"news": "мэдээ"
+ ,"%a, %e %b %Y at %T": "%a, %e %b %Y нь %T"
}
diff --git a/web/locale/mn/forms/ecomerce/catalog.json b/web/locale/mn/forms/ecomerce/catalog.json
index d963dd51..73863ad1 100755
--- a/web/locale/mn/forms/ecomerce/catalog.json
+++ b/web/locale/mn/forms/ecomerce/catalog.json
@@ -11,8 +11,11 @@
,"StartOrder": "Start order"
,"ShoppingBasket": "Shopping basket"
+ ,"Agency": "газар"
+ ,"Warehouse": "Агуулахын"
+
,"Search": "Search"
- ,"Configure": "Configure"
+ ,"Change": "Change"
,"Order": "Order"
,"Available": "Available"
,"Size": "Size"
diff --git a/web/locale/mn/js/hedera.js b/web/locale/mn/js/hedera.js
index 124ac1d5..c1390c6d 100755
--- a/web/locale/mn/js/hedera.js
+++ b/web/locale/mn/js/hedera.js
@@ -43,9 +43,11 @@ Vn.Locale.add
,"Administration": "захиргаа"
,"Control panel": "хяналтын самбар"
,"Users": "Хэрэглэгчид нь"
+ ,"Connections": "холболт"
,"Visits": "уулзалт"
,"News": "мэдээ"
,"Photos": "Фото зураг"
+ ,"Reports": "мэдээ"
,"Shelves": "тавиур"
,"Items list": "зүйлс жагсаалт"
,"Contact": "Холбоо барих"
diff --git a/web/locale/pt/forms/admin/connections.json b/web/locale/pt/forms/admin/connections.json
new file mode 100755
index 00000000..62244264
--- /dev/null
+++ b/web/locale/pt/forms/admin/connections.json
@@ -0,0 +1,8 @@
+{
+ "Connections": "Conexões"
+
+ ,"Refresh": "actualização"
+ ,"Visits": "Visualizações"
+
+ ,"connections": "conexões"
+}
diff --git a/web/locale/pt/forms/admin/visits.json b/web/locale/pt/forms/admin/visits.json
old mode 100644
new mode 100755
index 519e2919..147fba11
--- a/web/locale/pt/forms/admin/visits.json
+++ b/web/locale/pt/forms/admin/visits.json
@@ -1,31 +1,14 @@
{
- "Visits": "Visitas"
- ,"VisitsManagement": "Gestão de visitas"
-
- ,"ActiveSessions": "Usuarios conectados"
- ,"VisitsQuery": "Consulta de visitas"
- ,"Refresh": "Actualizar"
+ "Visits": "Visualizações"
- ,"ActiveSessions:": "Usuarios conectados:"
- ,"NewVisitsTotal:": "Novas visitas:"
+ ,"Refresh": "Actualização"
+ ,"Connections": "Conexões"
- ,"SessionNumber": "Nº sessão"
- ,"User": "Usuario"
- ,"Login": "Hora de acceso"
- ,"LastActivity": "Última atividade"
- ,"SO": "Sistema Operativo"
- ,"Version": "Versão"
- ,"NewVisit": "Nova visita"
+ ,"From": "Desde"
+ ,"To": "Até"
+ ,"Select date interval": "Selecciona un intérvalo de datas"
- ,"SelectDateInterval": "Selecciona un intérvalo de datas"
- ,"FromDate:": "Desde o día:"
- ,"ToDate:": "Até o día:"
- ,"VisitsTotal:": "Total visitas:"
-
- ,"Browser": "Navegador"
- ,"MinVersion": "Versão mínima"
- ,"MaxVersion": "Versão máxima"
- ,"LastVisit": "Última visita"
- ,"NewVisits": "Novas visitas"
- ,"%a, %e %b %Y at %T": "%a, %e %b %Y a las %T"
+ ,"visits": "Visualizações"
+ ,"news": "novas"
+ ,"%a, %e %b %Y at %T": "%a, %e %b %Y em %T"
}
diff --git a/web/locale/pt/forms/ecomerce/catalog.json b/web/locale/pt/forms/ecomerce/catalog.json
index 38443db3..4a1d84b5 100644
--- a/web/locale/pt/forms/ecomerce/catalog.json
+++ b/web/locale/pt/forms/ecomerce/catalog.json
@@ -11,9 +11,12 @@
,"StartOrder": "Iniciar pedido"
,"ShoppingBasket": "Cesta da compra"
+ ,"Agency": "Agência"
+ ,"Warehouse": "Armazém"
+
,"Search": "Buscar"
- ,"Configure": "Configurar"
- ,"Order by": "Organizar"
+ ,"Change": "Modificar"
+ ,"Order": "Organizar"
,"Available": "Disponível"
,"Size": "Medida"
,"Realm": "Reino"
diff --git a/web/locale/pt/js/hedera.js b/web/locale/pt/js/hedera.js
index de6c3f61..479da57d 100644
--- a/web/locale/pt/js/hedera.js
+++ b/web/locale/pt/js/hedera.js
@@ -43,9 +43,11 @@ Vn.Locale.add
,"Administration": "Administração"
,"Control panel": "Painel de controle"
,"Users": "Usuarios"
+ ,"Connections": "Conexões"
,"Visits": "Visitas"
,"News": "Noticias"
,"Photos": "Fotos"
+ ,"Reports": "Relatórios"
,"Shelves": "Estantes"
,"Items list": "Lista de Itens"
,"Contact": "Quero ser cliente"
diff --git a/web/pages/main/html.php b/web/pages/main/html.php
index e4a8a53a..59bcd6c1 100755
--- a/web/pages/main/html.php
+++ b/web/pages/main/html.php
@@ -3,8 +3,7 @@