[IMP]:Merged

bzr revid: apa@tinyerp.com-20100222105631-2p6pqycjdjwpkg0f
This commit is contained in:
apa-tiny
2010-02-22 16:26:31 +05:30
8 changed files with 584 additions and 533 deletions
+2 -2
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-12-18 08:39+0000\n"
"PO-Revision-Date: 2010-02-17 16:21+0000\n"
"PO-Revision-Date: 2010-02-18 05:29+0000\n"
"Last-Translator: Boris <boris.t.ivanov@gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-02-18 04:46+0000\n"
"X-Launchpad-Export-Date: 2010-02-19 04:36+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
+523 -486
View File
File diff suppressed because it is too large Load Diff
+2 -2
View File
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-server\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-12-18 08:39+0000\n"
"PO-Revision-Date: 2010-02-17 06:04+0000\n"
"PO-Revision-Date: 2010-02-21 06:03+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: Japanese <ja@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-02-18 04:46+0000\n"
"X-Launchpad-Export-Date: 2010-02-22 04:41+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
+16 -13
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-12-18 08:39+0000\n"
"PO-Revision-Date: 2009-12-24 06:52+0000\n"
"Last-Translator: mra (Open ERP) <mra@tinyerp.com>\n"
"PO-Revision-Date: 2010-02-19 05:34+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-01-14 04:45+0000\n"
"X-Launchpad-Export-Date: 2010-02-20 04:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
@@ -749,7 +749,7 @@ msgstr "Iran"
#: model:ir.actions.act_window,name:base.res_request-act
#: model:ir.ui.menu,name:base.menu_res_request_act
msgid "My Requests"
msgstr ""
msgstr "Mijn verzoeken"
#. module: base
#: field:ir.sequence,name:0
@@ -1119,6 +1119,9 @@ msgid ""
"consider the present one as void. Do not hesitate to contact our accounting "
"department at (+32).81.81.37.00."
msgstr ""
"Mocht uw betaling dit bericht gekruisd hebben, dan verzoeken wij u dit "
"bericht als niet verzonden te beschouwen. Aarzel niet om contact op te nemen "
"met onze financiële administratie op (telefoonnummer)."
#. module: base
#: selection:ir.ui.menu,icon:0
@@ -1157,7 +1160,7 @@ msgstr "7. %H:%M:%S ==> 18:25:20"
#. module: base
#: help:res.users,company_id:0
msgid "The company this user is currently working on."
msgstr ""
msgstr "Het bedrijf waarvoor deze gebruiker op dit moment werkt."
#. module: base
#: help:ir.actions.server,message:0
@@ -1377,7 +1380,7 @@ msgstr "Groepen"
#. module: base
#: constraint:res.users:0
msgid "This user can not connect using this company !"
msgstr ""
msgstr "Deze gebruiker kan geen verbinding maken voor dit bedrijf !"
#. module: base
#: model:res.country,name:base.bz
@@ -1612,7 +1615,7 @@ msgstr "Veldverwijzingen"
#: model:ir.actions.act_window,name:base.res_request-closed
#: model:ir.ui.menu,name:base.next_id_12_close
msgid "My Closed Requests"
msgstr ""
msgstr "Mijn afgesloten verzoeken"
#. module: base
#: model:ir.ui.menu,name:base.menu_custom
@@ -1995,7 +1998,7 @@ msgstr "Module"
#: model:ir.actions.act_window,name:base.action_res_bank_form
#: model:ir.ui.menu,name:base.menu_action_res_bank_form
msgid "Bank List"
msgstr ""
msgstr "Lijst van banken"
#. module: base
#: field:ir.attachment,description:0
@@ -4487,7 +4490,7 @@ msgstr "res.partner.event"
#. module: base
#: field:res.company,user_ids:0
msgid "Accepted Users"
msgstr ""
msgstr "Geaccepteerde gebruikers"
#. module: base
#: selection:ir.ui.menu,icon:0
@@ -5428,7 +5431,7 @@ msgstr "Actieve gebeurtenissen relatie"
#: model:ir.ui.menu,name:base.menu_partner_function_form
#: view:res.partner.function:0
msgid "Contact Functions"
msgstr ""
msgstr "Functies contactpersoon"
#. module: base
#: view:multi_company.default:0
@@ -6081,7 +6084,7 @@ msgstr "Uur 00->24: %(h24)s"
#. module: base
#: help:multi_company.default,field_id:0
msgid "Select field property"
msgstr ""
msgstr "Kies eigenschap veld"
#. module: base
#: field:res.request.history,date_sent:0
@@ -6172,7 +6175,7 @@ msgstr "Bovenliggend"
#. module: base
#: view:multi_company.default:0
msgid "Returning"
msgstr ""
msgstr "Terugkerend"
#. module: base
#: field:ir.actions.act_window,res_model:0
@@ -7444,7 +7447,7 @@ msgstr "Toestemming verwijderen"
#. module: base
#: model:ir.model,name:base.model_multi_company_default
msgid "multi_company.default"
msgstr ""
msgstr "multi_company.default"
#. module: base
#: selection:workflow.activity,join_mode:0
+34 -27
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-12-18 08:39+0000\n"
"PO-Revision-Date: 2009-12-12 06:10+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"PO-Revision-Date: 2010-02-21 06:01+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-01-14 04:47+0000\n"
"X-Launchpad-Export-Date: 2010-02-22 04:41+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
@@ -559,7 +559,7 @@ msgstr "Widok kreatora"
#. module: base
#: model:res.country,name:base.kh
msgid "Cambodia, Kingdom of"
msgstr ""
msgstr "Kambodża, Królestwo Kambodży"
#. module: base
#: model:ir.actions.act_window,name:base.ir_sequence_form
@@ -744,7 +744,7 @@ msgstr "Iran"
#: model:ir.actions.act_window,name:base.res_request-act
#: model:ir.ui.menu,name:base.menu_res_request_act
msgid "My Requests"
msgstr ""
msgstr "Moje zgłoszenia"
#. module: base
#: field:ir.sequence,name:0
@@ -1007,7 +1007,7 @@ msgstr ""
#: code:addons/base/ir/ir_model.py:0
#, python-format
msgid "Model %s Does not Exist !"
msgstr ""
msgstr "Model %s nie istnieje !"
#. module: base
#: code:addons/base/module/module.py:0
@@ -1114,6 +1114,9 @@ msgid ""
"consider the present one as void. Do not hesitate to contact our accounting "
"department at (+32).81.81.37.00."
msgstr ""
"Jeśli dokonali już państwo płatności przed wysłaniem tej wiadomości, to "
"proszę niniejszą wiadomość zignorować. Do dyspozycji jest kontakt z naszą "
"księgowością pod numerem telefonu ....."
#. module: base
#: selection:ir.ui.menu,icon:0
@@ -1152,7 +1155,7 @@ msgstr ""
#. module: base
#: help:res.users,company_id:0
msgid "The company this user is currently working on."
msgstr ""
msgstr "Firma, w której pracuje ten użytkownik."
#. module: base
#: help:ir.actions.server,message:0
@@ -1254,6 +1257,8 @@ msgid ""
"If set, sequence will only be used in case this python expression matches, "
"and will precede other sequences."
msgstr ""
"Jeśli ustawione, to numeracja zostanie zastosowana tylko w przypadku kiedy "
"wyrażenia python jest spełnione. Zastąpi ono inne numeracje."
#. module: base
#: selection:ir.actions.act_window,view_type:0
@@ -1371,7 +1376,7 @@ msgstr "Grupy"
#. module: base
#: constraint:res.users:0
msgid "This user can not connect using this company !"
msgstr ""
msgstr "Ten użytkownik nie może zostać zalogowany w tej firmie !"
#. module: base
#: model:res.country,name:base.bz
@@ -1504,7 +1509,7 @@ msgstr "Akcja do uruchomienia"
#: selection:ir.report.custom.fields,fc3_op:0
#: selection:ir.rule,operator:0
msgid "in"
msgstr ""
msgstr "w"
#. module: base
#: field:ir.actions.url,target:0
@@ -1608,7 +1613,7 @@ msgstr "Mapowanie pól"
#: model:ir.actions.act_window,name:base.res_request-closed
#: model:ir.ui.menu,name:base.next_id_12_close
msgid "My Closed Requests"
msgstr ""
msgstr "Moje zamknięte zgłoszenia"
#. module: base
#: model:ir.ui.menu,name:base.menu_custom
@@ -1991,7 +1996,7 @@ msgstr "Moduł"
#: model:ir.actions.act_window,name:base.action_res_bank_form
#: model:ir.ui.menu,name:base.menu_action_res_bank_form
msgid "Bank List"
msgstr ""
msgstr "Lista banków"
#. module: base
#: field:ir.attachment,description:0
@@ -2333,7 +2338,7 @@ msgstr "Republika Środkowej Afryki"
#. module: base
#: model:res.country,name:base.li
msgid "Liechtenstein"
msgstr ""
msgstr "Liechtenstein"
#. module: base
#: model:res.partner.title,name:base.res_partner_title_ltd
@@ -3874,7 +3879,7 @@ msgstr "Prawo tworzenia"
#. module: base
#: field:res.partner.address,state_id:0
msgid "Fed. State"
msgstr ""
msgstr "woj."
#. module: base
#: model:res.country,name:base.io
@@ -4060,7 +4065,7 @@ msgstr ""
#. module: base
#: model:res.country,name:base.bi
msgid "Burundi"
msgstr ""
msgstr "Burundi"
#. module: base
#: wizard_button:base.module.import,import,open_window:0
@@ -4075,7 +4080,7 @@ msgstr "Zamknij"
#. module: base
#: model:res.country,name:base.bt
msgid "Bhutan"
msgstr ""
msgstr "Butan"
#. module: base
#: model:res.partner.category,name:base.res_partner_category_11
@@ -4472,7 +4477,7 @@ msgstr ""
#. module: base
#: field:res.company,user_ids:0
msgid "Accepted Users"
msgstr ""
msgstr "Akceptowani użytkownicy"
#. module: base
#: selection:ir.ui.menu,icon:0
@@ -4497,7 +4502,7 @@ msgstr ""
#. module: base
#: model:res.country,name:base.hk
msgid "Hong Kong"
msgstr ""
msgstr "Hongkong"
#. module: base
#: help:ir.actions.server,name:0
@@ -6067,7 +6072,7 @@ msgstr "Godzina 00->24: %(h24)s"
#. module: base
#: help:multi_company.default,field_id:0
msgid "Select field property"
msgstr ""
msgstr "Wybierz właściwość pola"
#. module: base
#: field:res.request.history,date_sent:0
@@ -6137,7 +6142,7 @@ msgstr "Stan emocji"
#: model:ir.actions.act_window,name:base.action_country_state
#: model:ir.ui.menu,name:base.menu_country_state_partner
msgid "Fed. States"
msgstr ""
msgstr "Województwa"
#. module: base
#: view:ir.model:0
@@ -6219,7 +6224,7 @@ msgstr "Odn. użytkownika"
#: model:ir.ui.menu,name:base.menu_config
#: view:res.company:0
msgid "Configuration"
msgstr "Ustawienia"
msgstr "Konfiguracja"
#. module: base
#: field:ir.actions.server,expression:0
@@ -6432,7 +6437,7 @@ msgstr "SMS"
#. module: base
#: model:res.country,name:base.cr
msgid "Costa Rica"
msgstr ""
msgstr "Kostaryka"
#. module: base
#: code:addons/base/maintenance/maintenance.py:0
@@ -6533,7 +6538,7 @@ msgstr ""
#. module: base
#: model:res.country,name:base.cd
msgid "Congo, The Democratic Republic of the"
msgstr ""
msgstr "Kongo, Demokratyczna Republika Konga"
#. module: base
#: view:res.request:0
@@ -7173,7 +7178,7 @@ msgstr ""
#. module: base
#: help:ir.actions.report.xml,header:0
msgid "Add or not the coporate RML header"
msgstr ""
msgstr "Możesz dodać nagłówek RML firmy"
#. module: base
#: field:res.partner.event,document:0
@@ -7652,7 +7657,7 @@ msgstr "Azerbejdżan"
#: code:addons/base/res/partner/partner.py:0
#, python-format
msgid "Warning"
msgstr ""
msgstr "Ostrzeżenie"
#. module: base
#: selection:module.lang.install,init,lang:0
@@ -7662,7 +7667,7 @@ msgstr ""
#. module: base
#: model:res.country,name:base.gi
msgid "Gibraltar"
msgstr ""
msgstr "Gibraltar"
#. module: base
#: model:res.country,name:base.vg
@@ -7693,6 +7698,8 @@ msgstr ""
#: constraint:res.partner:0
msgid "The VAT doesn't seem to be correct."
msgstr ""
"Numer NIP wygląda na niepoprawny. Wpisuj numer z PL na początku. Bez kresek "
"i spacji."
#. module: base
#: selection:ir.report.custom.fields,operation:0
@@ -7855,7 +7862,7 @@ msgstr "Reguły rekordu"
#. module: base
#: view:ir.actions.report.custom:0
msgid "Report custom"
msgstr ""
msgstr "Własny raport"
#. module: base
#: field:ir.actions.configuration.wizard,progress:0
@@ -8017,7 +8024,7 @@ msgstr "Podgląd obrazka"
#. module: base
#: model:res.partner.title,name:base.res_partner_title_pvt_ltd
msgid "Corp."
msgstr ""
msgstr "SA"
#. module: base
#: model:res.country,name:base.gw
+2 -1
View File
@@ -360,7 +360,8 @@
<field name="auto_refresh"/>
<newline/>
<field name="view_mode"/>
<field name="filter"/>
<field name="filter"/>
<field name="auto_search"/>
<field name="view_id"/>
<field name="search_view_id"/>
</page>
+2
View File
@@ -245,6 +245,7 @@ class act_window(osv.osv):
'act_id', 'gid', 'Groups'),
'search_view_id': fields.many2one('ir.ui.view', 'Search View Ref.'),
'filter': fields.boolean('Filter'),
'auto_search':fields.boolean('Auto Search'),
'default_user_ids': fields.many2many('res.users', 'ir_act_window_user_rel', 'act_id', 'uid', 'Users'),
'search_view' : fields.function(_search_view, type='text', method=True, string='Search View'),
'menus': fields.char('Menus', size=4096)
@@ -257,6 +258,7 @@ class act_window(osv.osv):
'limit': lambda *a: 80,
'target': lambda *a: 'current',
'auto_refresh': lambda *a: 0,
'auto_search':lambda *a: True
}
act_window()
+3 -2
View File
@@ -229,8 +229,9 @@ class users(osv.osv):
def _get_company(self,cr, uid, context={}, uid2=False):
if not uid2:
uid2 = uid
user = self.pool.get('res.users').browse(cr, uid, uid2, context)
return user.company_id.id
user = self.pool.get('res.users').read(cr, uid, uid2, ['company_id'], context)
company_id = user.get('company_id', False)
return company_id and company_id[0] or False
def _get_menu(self,cr, uid, context={}):
ids = self.pool.get('ir.actions.act_window').search(cr, uid, [('usage','=','menu')])