Merge lp:~vauxoo/openerp-mexico-localization/l10n_mx_upload_ftp-dev-jc into lp:openerp-mexico-localization/7.0

[Juan Carlos Hernandez]

se agregó reglas de registro al módulo l10n_mx_upload_ftp

[lp:~vauxoo/openerp-mexico-localization/l10n_mx_upload_ftp-dev-jc]

353. By Juan Carlos Hernandez on 2014-02-06

[ADD][l10n_mx_upload_ftp]add es_MX.po

[Moisés López - http://www.vauxoo.com (moylop260)]

review: Approve

=== modified file 'l10n_mx_upload_ftp/__openerp__.py'
--- l10n_mx_upload_ftp/__openerp__.py	2012-03-22 21:51:52 +0000
+++ l10n_mx_upload_ftp/__openerp__.py	2014-02-06 01:39:33 +0000
@@ -33,9 +33,9 @@
     "website" : "http://www.vauxoo.com/",
     "license" : "AGPL-3",
     "depends" : ["base"],
-    "init_xml" : [],
-    "demo_xml" : [],
-    "update_xml" : ["upload_ftp_view.xml"],
+    "demo" : [],
+    "data" : ["security/ir.model.access.csv",
+                "upload_ftp_view.xml"],
     "installable" : True,
     "active" : False,
 }

=== added file 'l10n_mx_upload_ftp/i18n/es_MX.po'
--- l10n_mx_upload_ftp/i18n/es_MX.po	1970-01-01 00:00:00 +0000
+++ l10n_mx_upload_ftp/i18n/es_MX.po	2014-02-06 01:39:33 +0000
@@ -0,0 +1,61 @@
+# Spanish translation for openerp-mexico-localization
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openerp-mexico-localization package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-mexico-localization\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-11-08 03:15+0000\n"
+"PO-Revision-Date: 2013-11-12 03:33+0000\n"
+"Last-Translator: Federico Manuel Echeverri Choux <[e-mail]>\n"
+"Language-Team: Spanish <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-01-22 06:15+0000\n"
+"X-Generator: Launchpad (build 16901)\n"
+
+#. module: l10n_mx_upload_ftp
+#: view:ftp.server:0
+#: field:ftp.server,name:0
+#: model:ir.actions.act_window,name:l10n_mx_upload_ftp.action_ftp_server_form
+#: model:ir.ui.menu,name:l10n_mx_upload_ftp.ftp_server_view
+msgid "ftp server"
+msgstr "Servidor ftp"
+
+#. module: l10n_mx_upload_ftp
+#: model:ir.ui.menu,name:l10n_mx_upload_ftp.ftp_server_menu
+msgid "ftp Server"
+msgstr "Servidor ftp"
+
+#. module: l10n_mx_upload_ftp
+#: field:ftp.server,ftp_source:0
+msgid "ftp source"
+msgstr "origen del ftp"
+
+#. module: l10n_mx_upload_ftp
+#: field:ftp.server,ftp_pwd:0
+msgid "ftp pwd"
+msgstr "Contraseña del ftp"
+
+#. module: l10n_mx_upload_ftp
+#: model:ir.model,name:l10n_mx_upload_ftp.model_ir_attachment
+msgid "ir.attachment"
+msgstr "ir.attachment"
+
+#. module: l10n_mx_upload_ftp
+#: help:ftp.server,ftp_source:0
+msgid "Format example \"/done\""
+msgstr "Formato de ejemplo \"/done\""
+
+#. module: l10n_mx_upload_ftp
+#: model:ir.model,name:l10n_mx_upload_ftp.model_ftp_server
+msgid "ftp.server"
+msgstr "ftp.server"
+
+#. module: l10n_mx_upload_ftp
+#: field:ftp.server,ftp_user:0
+msgid "ftp user"
+msgstr "Usuario ftp"

=== modified file 'l10n_mx_upload_ftp/security/ir.model.access.csv'
--- l10n_mx_upload_ftp/security/ir.model.access.csv	2012-03-14 23:38:19 +0000
+++ l10n_mx_upload_ftp/security/ir.model.access.csv	2014-02-06 01:39:33 +0000
@@ -1,2 +1,2 @@
-id	name	model_id:id	group_id:id	perm_read	perm_write	perm_create	perm_unlink
-access_res_user_ftp_server	ftp.sever	model_ftp_server		1	1	1	1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_res_user_ftp_server_manager,ftp_sever_manager,model_ftp_server,,1,1,1,1