diff --git a/addons/account/account_analytic_line.py b/addons/account/account_analytic_line.py
index 1fa0a5c6cfa..ba33185119e 100644
--- a/addons/account/account_analytic_line.py
+++ b/addons/account/account_analytic_line.py
@@ -167,7 +167,7 @@ class res_partner(osv.osv):
_columns = {
'contract_ids': fields.one2many('account.analytic.account', \
- 'partner_id', 'Contracts'),
+ 'partner_id', 'Contracts', readonly=True),
}
res_partner()
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 2da7c71021c..ac11b019ec2 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -351,7 +351,7 @@
-
+
@@ -481,21 +481,5 @@
-
-
-
- res.partner.invoice.info.inherit
- res.partner
- form
-
-
-
-
-
-
-
-
-
-
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index dbaa321f329..e4c810fa6be 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -1525,7 +1525,7 @@ class res_partner(osv.osv):
_inherit = 'res.partner'
_columns = {
- 'invoice_ids': fields.one2many('account.invoice.line', 'partner_id', 'Invoices'),
+ 'invoice_ids': fields.one2many('account.invoice.line', 'partner_id', 'Invoices', readonly=True),
}
res_partner()
diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index edbe704d4db..286d0f1d79e 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -74,7 +74,7 @@
-
+
@@ -118,10 +118,27 @@
+
+
+
+
+ res.partner.account.info.inherit
+ res.partner
+ form
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index e57629d2618..b4a7b67a05a 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -67,7 +67,7 @@
-
+
@@ -153,7 +153,7 @@
-
+
@@ -178,7 +178,7 @@
-
+
@@ -288,7 +288,7 @@
-
+
@@ -443,21 +443,6 @@
-
-
-
-
- res.partner.contract.info.inherit
- res.partner
- form
-
-
-
-
-
-
-
-
diff --git a/addons/account/report/account_account_report_view.xml b/addons/account/report/account_account_report_view.xml
index 32e77be341f..f2d6338c951 100644
--- a/addons/account/report/account_account_report_view.xml
+++ b/addons/account/report/account_account_report_view.xml
@@ -57,22 +57,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml
index 41d9c0976f2..e1cd7967b8d 100644
--- a/addons/account/report/account_analytic_entries_report_view.xml
+++ b/addons/account/report/account_analytic_entries_report_view.xml
@@ -55,17 +55,7 @@
-
-
-
-
-
-
-
-
-
-
-
+
@@ -81,6 +71,17 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/account/report/account_analytic_report_view.xml b/addons/account/report/account_analytic_report_view.xml
index 838cefe5898..0d05d5f0d76 100644
--- a/addons/account/report/account_analytic_report_view.xml
+++ b/addons/account/report/account_analytic_report_view.xml
@@ -69,7 +69,34 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -87,24 +114,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml
index c6308ec9928..625d98fa9cb 100644
--- a/addons/account/report/account_entries_report_view.xml
+++ b/addons/account/report/account_entries_report_view.xml
@@ -74,25 +74,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -111,6 +92,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index b974afdb8a3..ae00608b164 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -56,10 +56,10 @@
-
-
@@ -94,29 +94,8 @@
domain="[('user_id','=',False)]"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -138,6 +117,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/account/wizard/account_aged_trial_balance_view.xml b/addons/account/wizard/account_aged_trial_balance_view.xml
index 7984f69e86e..769d7ee268f 100644
--- a/addons/account/wizard/account_aged_trial_balance_view.xml
+++ b/addons/account/wizard/account_aged_trial_balance_view.xml
@@ -8,7 +8,7 @@
form
@@ -67,7 +67,7 @@
-
+
@@ -86,9 +86,9 @@
-
+
-
+
calendar.attendee.search
calendar.attendee
@@ -108,7 +108,7 @@
-
+
+ context="{'group_by':'partner_address_id'}" />
+
-
-
-
Event Invitations
ir.actions.act_window
@@ -136,14 +135,14 @@
{'default_sent_by_uid': uid}
-
+
-
+
-
+
-
+
@@ -183,9 +182,6 @@
-
-
-
Available Alarms
ir.actions.act_window
@@ -193,7 +189,7 @@
form
tree,form
-
+
-
-
+
+
Event Form
calendar.event
@@ -300,7 +296,7 @@
nolabel="1" widget="one2many" mode="tree,form">
-
+
-
+
@@ -379,9 +375,9 @@
-
+
-
+
Calendar Events Search
calendar.event
@@ -402,7 +398,7 @@
-
+
-
+
Events
ir.actions.act_window
@@ -428,12 +424,12 @@
tree,form,calendar
-
+
-
+
diff --git a/addons/base_calendar/security/ir.model.access.csv b/addons/base_calendar/security/ir.model.access.csv
index ebf2ce92092..eba4e092f14 100755
--- a/addons/base_calendar/security/ir.model.access.csv
+++ b/addons/base_calendar/security/ir.model.access.csv
@@ -6,3 +6,4 @@
"access_calendar_todo","calendar.todo","model_calendar_todo",,1,1,1,1
"access_base_calendar_invite_attendee","base_calendar.invite.attendee","model_base_calendar_invite_attendee",,1,1,1,1
"access_calendar_event_edit_all","calendar_event_edit_all","model_calendar_event_edit_all",,1,1,1,1
+"access_base_calendar_set_exrule","base.calendar.set.exrule","model_base_calendar_set_exrule",,1,1,1,1
diff --git a/addons/board_account/i18n/pl.po b/addons/board_account/i18n/pl.po
index 9dcb5a5372b..da427a840fe 100644
--- a/addons/board_account/i18n/pl.po
+++ b/addons/board_account/i18n/pl.po
@@ -7,24 +7,24 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 12:10+0000\n"
-"Last-Translator: Fabien (Open ERP) \n"
+"PO-Revision-Date: 2010-05-25 16:41+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) \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-04-17 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-05-26 03:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: board_account
#: view:board.board:0
msgid "Analytic accounts to close"
-msgstr ""
+msgstr "Konta analityczne do zamknięcia"
#. module: board_account
#: view:board.board:0
msgid "Draft invoices"
-msgstr ""
+msgstr "Projekty faktur"
#. module: board_account
#: constraint:ir.ui.view:0
@@ -35,61 +35,61 @@ msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
#: model:ir.actions.act_window,name:board_account.open_board_account
#: model:ir.ui.menu,name:board_account.menu_board_account
msgid "Accounting Dashboard"
-msgstr ""
+msgstr "Konsola księgowości"
#. module: board_account
#: model:ir.actions.act_window,name:board_account.action_aged_receivable
msgid "Receivable Accounts"
-msgstr ""
+msgstr "Konta wierzytelności"
#. module: board_account
#: view:board.board:0
#: model:ir.actions.act_window,name:board_account.act_my_account
msgid "Accounts to invoice"
-msgstr ""
+msgstr "Konta do faktur"
#. module: board_account
#: view:board.board:0
#: model:ir.actions.act_window,name:board_account.action_account_analytic_line_to_invoice
msgid "Costs to invoice"
-msgstr ""
+msgstr "Koszty do faktur"
#. module: board_account
#: view:board.board:0
msgid "Aged receivables"
-msgstr ""
+msgstr "Przeterminowane wierzytelności"
#. module: board_account
#: model:ir.module.module,shortdesc:board_account.module_meta_information
msgid "Board for accountant"
-msgstr ""
+msgstr "Konsola dla księgowści"
#. module: board_account
#: model:ir.actions.act_window,name:board_account.action_aged_income
msgid "Income Accounts"
-msgstr ""
+msgstr "Konta przychodowe"
#. module: board_account
#: view:board.board:0
msgid "My indicators"
-msgstr ""
+msgstr "Moje wskaźniki"
#. module: board_account
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
#. module: board_account
#: model:ir.ui.menu,name:board_account.next_id_68
msgid "Accounting"
-msgstr ""
+msgstr "Księgowość"
#. module: board_account
#: view:board.board:0
msgid "Account Board"
-msgstr ""
+msgstr "Konsola kont"
#. module: board_account
#: view:board.board:0
msgid "Aged income"
-msgstr ""
+msgstr "Przeterminowany dochód"
diff --git a/addons/crm/__init__.py b/addons/crm/__init__.py
index de0fac56e29..362444ccc2c 100644
--- a/addons/crm/__init__.py
+++ b/addons/crm/__init__.py
@@ -33,6 +33,7 @@ import crm_installer
import report
import wizard
+import res_partner
diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 3bc1f703454..0c98fd51c9c 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -96,7 +96,9 @@ between mails and Open ERP.""",
'report/crm_phonecall_report_view.xml',
'process/crm_configuration_process.xml',
- 'crm_installer_view.xml'
+ 'crm_installer_view.xml',
+
+ 'res_partner_view.xml'
],
'demo_xml': [
'crm_demo.xml',
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 3fbca9d5595..0eddb4aa628 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -306,7 +306,7 @@
help="Show Sales Team"/>
-
+
diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py
index 20ae1176ca6..e45ee85b31d 100644
--- a/addons/crm/crm_meeting.py
+++ b/addons/crm/crm_meeting.py
@@ -175,16 +175,4 @@ class res_users(osv.osv):
res_users()
-class res_partner(osv.osv):
- """ Inherits partner and adds meetings information in the partner form """
- _inherit = 'res.partner'
-
- _columns = {
- 'meeting_ids': fields.one2many('crm.meeting', 'partner_id',\
- 'Meetings'),
- }
-
-res_partner()
-
-
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index ac61809cfad..9136a15d9c0 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -277,7 +277,7 @@
-
+
-
-
-
- res.partner.meeting.info.inherit
- res.partner
- form
-
-
-
-
-
-
-
-
-
-
diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py
index 3bc9fdd6d81..98e4c6f3ded 100644
--- a/addons/crm/crm_opportunity.py
+++ b/addons/crm/crm_opportunity.py
@@ -163,16 +163,4 @@ class crm_opportunity(osv.osv):
crm_opportunity()
-class res_partner(osv.osv):
- """ Inherits partner and adds Opportunities information in the partner form """
- _inherit = 'res.partner'
-
- _columns = {
- 'opportunity_ids': fields.one2many('crm.lead', 'partner_id',\
- 'Opportunities', domain=[('type', '=', 'opportunity')]),
- }
-
-res_partner()
-
-
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 3ce0ce788f6..3dbba04567e 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -307,7 +307,7 @@
help="My Sale Team" />
-
+
-
-
-
-
- res.partner.opportunity.info.inherit
- res.partner
- form
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index 7131a3730d2..205b30d39dc 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -178,15 +178,5 @@ class crm_phonecall(osv.osv, crm_case):
crm_phonecall()
-class res_partner(osv.osv):
- """ Inherits partner and adds Phonecalls information in the partner form """
- _inherit = 'res.partner'
-
- _columns = {
- 'phonecall_ids': fields.one2many('crm.phonecall', 'partner_id', 'Phonecalls'),
- }
-
-res_partner()
-
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index a72a8df9de8..65b77ed5abe 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -289,19 +289,5 @@
-
-
-
- res.partner.phonecall.info.inherit
- res.partner
- form
-
-
-
-
-
-
-
-
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index c1d64ee332c..c65ee0fd285 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -107,7 +107,7 @@
help="My section" />
-
+
-
-
-
-
-
-
-
-
-
-
-
+
@@ -166,6 +152,21 @@
domain="[]" context="{'group_by':'name'}" />
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index 72bc4847608..4e57ba1d474 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -63,7 +63,7 @@
-
+
crm.phonecall.report.select
crm.phonecall.report
@@ -107,7 +107,7 @@
help="My section" />
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -131,39 +162,8 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/addons/crm/res_partner.py b/addons/crm/res_partner.py
new file mode 100644
index 00000000000..93d865d7f74
--- /dev/null
+++ b/addons/crm/res_partner.py
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL ().
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+
+from osv import fields,osv
+
+class res_partner(osv.osv):
+ """ Inherits partner and adds CRM information in the partner form """
+ _inherit = 'res.partner'
+
+ _columns = {
+ 'opportunity_ids': fields.one2many('crm.lead', 'partner_id',\
+ 'Opportunities', domain=[('type', '=', 'opportunity')]),
+ 'meeting_ids': fields.one2many('crm.meeting', 'partner_id',\
+ 'Meetings'),
+ 'phonecall_ids': fields.one2many('crm.phonecall', 'partner_id', 'Phonecalls'),
+ }
+
+res_partner()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
new file mode 100644
index 00000000000..540c8d13186
--- /dev/null
+++ b/addons/crm/res_partner_view.xml
@@ -0,0 +1,63 @@
+
+
+
+
+
+
+
+ res.partner.crm.info.inherit
+ res.partner
+ form
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/crm/wizard/crm_lead_to_partner.py b/addons/crm/wizard/crm_lead_to_partner.py
index a824f279e28..2decc56b806 100644
--- a/addons/crm/wizard/crm_lead_to_partner.py
+++ b/addons/crm/wizard/crm_lead_to_partner.py
@@ -147,7 +147,6 @@ class crm_lead2partner(osv.osv_memory):
'user_id': lead.user_id.id,
'comment': lead.description,
})
- function_id = self.pool.get('res.partner.function').search(cr,uid,[('name','=',lead.function_name)])
contact_id = contact_obj.create(cr, uid, {
'partner_id': partner_id,
'name': lead.name,
@@ -156,7 +155,7 @@ class crm_lead2partner(osv.osv_memory):
'email': lead.email_from,
'fax': lead.fax,
'title': lead.title,
- 'function': function_id and function_id[0] or False,
+ 'function': lead.function_name,
'street': lead.street,
'street2': lead.street2,
'zip': lead.zip,
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 7a3dd4cc829..a625ec4dbc8 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -271,7 +271,7 @@
-
+
diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index 6f906f3d21f..ca6fdb95277 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -67,7 +67,7 @@
-
+
crm.claim.report.select
crm.claim.report
@@ -122,8 +122,47 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -141,46 +180,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 68fcd768d74..908e9c7616d 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -256,7 +256,7 @@
search
-
+
@@ -284,7 +284,7 @@
-
+
diff --git a/addons/crm_fundraising/report/crm_fundraising_report_view.xml b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
index 73f35ddba50..20e8ef68b6b 100644
--- a/addons/crm_fundraising/report/crm_fundraising_report_view.xml
+++ b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
@@ -121,8 +121,38 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -130,44 +160,12 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 27ccee6ef0d..e771e0ba29f 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -243,7 +243,7 @@
help="My section" />
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ domain="[]" context="{'group_by':'user_id'}"
+ default="1" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 2b3dc6e4ea9..ac4efb08599 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -101,7 +101,7 @@
-
+
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index 2ea2d325867..8b9a68575b0 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -55,7 +55,7 @@
-
+
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index 74d1bcd8d7b..77225b1dc59 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -147,7 +147,7 @@
-
+
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index fe25cd7ab23..d02c76bc44c 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -10,10 +10,10 @@
-
+
-
+
@@ -28,7 +28,7 @@
@@ -96,13 +117,13 @@
diagram
-
+
-
+
@@ -112,6 +133,29 @@
+
+ marketing.campaign.search
+ marketing.campaign
+ search
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
All Campaigns
ir.actions.act_window
@@ -119,9 +163,12 @@
form
tree,form,diagram
+ {'group_by': [], 'search_default_draft': 1, 'search_default_test': 1}
+
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -76,22 +91,8 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/addons/mrp_operations/mrp_operations_report.xml b/addons/mrp_operations/mrp_operations_report.xml
index 52122bfd041..826a587de51 100644
--- a/addons/mrp_operations/mrp_operations_report.xml
+++ b/addons/mrp_operations/mrp_operations_report.xml
@@ -8,7 +8,7 @@
model="mrp.workcenter"
name="mrp.wc.barcode"
rml="mrp_operations/report/mrp_wc_barcode.rml"
- header="False"/>
+ header="False" />
-
-
-
-
-
-
+
+
+
+
+
+
@@ -84,6 +84,27 @@
+
+ mrp.production.workcenter.line.select
+ mrp.production.workcenter.line
+ search
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
mrp.production.workcenter.line.calendar
mrp.production.workcenter.line
@@ -121,6 +142,7 @@
form
tree,form,gantt,calendar,graph
[('id','=',active_id)]
+
diff --git a/addons/mrp_procurement/mrp_procurement.py b/addons/mrp_procurement/mrp_procurement.py
index cb20f1561fd..ceaefb4c4db 100644
--- a/addons/mrp_procurement/mrp_procurement.py
+++ b/addons/mrp_procurement/mrp_procurement.py
@@ -91,7 +91,7 @@ class mrp_procurement(osv.osv):
" a make to order method."),
'note': fields.text('Note'),
-
+
'property_ids': fields.many2many('mrp.property', 'mrp_procurement_property_rel', 'procurement_id','property_id', 'Properties'),
'message': fields.char('Latest error', size=64, help="Exception occurred while computing procurement orders."),
@@ -144,7 +144,7 @@ class mrp_procurement(osv.osv):
def check_product(self, cr, uid, ids):
""" Checks product type.
- @return: True or False
+ @return: True or False
"""
for procurement in self.browse(cr, uid, ids):
if procurement.product_id.type in ('product', 'consu'):
@@ -153,7 +153,7 @@ class mrp_procurement(osv.osv):
def check_move_cancel(self, cr, uid, ids, context={}):
""" Checks if move is cancelled or not.
- @return: True or False.
+ @return: True or False.
"""
res = True
ok = False
@@ -166,7 +166,7 @@ class mrp_procurement(osv.osv):
def check_move_done(self, cr, uid, ids, context={}):
""" Checks if move is done or not.
- @return: True or False.
+ @return: True or False.
"""
res = True
for proc in self.browse(cr, uid, ids, context):
@@ -190,7 +190,7 @@ class mrp_procurement(osv.osv):
return False
def _uom_compute_get(self, cr, uid, proc, context={}):
- """ Finds UoS if product is Stockable Product.
+ """ Finds UoS if product is Stockable Product.
@param proc: Current procurement.
@return: UoS or False.
"""
@@ -205,7 +205,7 @@ class mrp_procurement(osv.osv):
#
def quantity_get(self, cr, uid, id, context={}):
""" Finds quantity of product used in procurement.
- @return: Quantity of product.
+ @return: Quantity of product.
"""
proc = self.browse(cr, uid, id, context)
result = self._quantity_compute_get(cr, uid, proc, context)
@@ -215,7 +215,7 @@ class mrp_procurement(osv.osv):
def uom_get(self, cr, uid, id, context=None):
""" Finds UoM of product used in procurement.
- @return: UoM of product.
+ @return: UoM of product.
"""
proc = self.browse(cr, uid, id, context)
result = self._uom_compute_get(cr, uid, proc, context)
@@ -225,7 +225,7 @@ class mrp_procurement(osv.osv):
def check_waiting(self, cr, uid, ids, context=[]):
""" Checks state of move.
- @return: True or False
+ @return: True or False
"""
for procurement in self.browse(cr, uid, ids, context=context):
if procurement.move_id and procurement.move_id.state == 'auto':
@@ -244,7 +244,7 @@ class mrp_procurement(osv.osv):
def check_make_to_stock(self, cr, uid, ids, context={}):
""" Checks product type.
- @return: True or False
+ @return: True or False
"""
ok = True
for procurement in self.browse(cr, uid, ids, context=context):
@@ -299,7 +299,7 @@ class mrp_procurement(osv.osv):
return True
def test_cancel(self, cr, uid, ids):
- """ Tests whether state of move is cancelled or not.
+ """ Tests whether state of move is cancelled or not.
@return: True or False
"""
for record in self.browse(cr, uid, ids):
@@ -338,7 +338,7 @@ class mrp_procurement(osv.osv):
def action_move_assigned(self, cr, uid, ids, context={}):
""" Changes procurement state to Running and writes message.
- @return: True
+ @return: True
"""
self.write(cr, uid, ids, {'state': 'running', 'message': _('from stock: products assigned.')})
return True
@@ -358,12 +358,12 @@ class mrp_procurement(osv.osv):
ok = ok and self.pool.get('stock.move').action_assign(cr, uid, [id])
cr.execute('select count(id) from stock_warehouse_orderpoint where product_id=%s', (procurement.product_id.id,))
if not cr.fetchone()[0]:
- cr.execute('update mrp_procurement set message=%s where id=%s', (_('from stock and no minimum orderpoint rule defined'), procurement.id))
+ cr.execute('update mrp_procurement set message=%s where id=%s', (_('Stock is not enough and No minimum orderpoint rule defined'), procurement.id))
return ok
def action_produce_assign_service(self, cr, uid, ids, context={}):
""" Changes procurement state to Running.
- @return: True
+ @return: True
"""
for procurement in self.browse(cr, uid, ids):
self.write(cr, uid, [procurement.id], {'state': 'running'})
@@ -375,7 +375,7 @@ class mrp_procurement(osv.osv):
"""
return 0
-
+
def action_po_assign(self, cr, uid, ids, context={}):
""" This is action which call from workflow to assign purchase order to procurements
@return: True
@@ -384,7 +384,7 @@ class mrp_procurement(osv.osv):
def action_cancel(self, cr, uid, ids):
""" Cancels procurement and writes move state to Assigned.
- @return: True
+ @return: True
"""
todo = []
todo2 = []
@@ -410,8 +410,8 @@ class mrp_procurement(osv.osv):
return self.check_move_done(cr, uid, ids)
def action_check(self, cr, uid, ids):
- """ Checks procurement move state whether assigned or done.
- @return: True
+ """ Checks procurement move state whether assigned or done.
+ @return: True
"""
ok = False
for procurement in self.browse(cr, uid, ids):
@@ -422,14 +422,14 @@ class mrp_procurement(osv.osv):
def action_ready(self, cr, uid, ids):
""" Changes procurement state to Ready.
- @return: True
+ @return: True
"""
res = self.write(cr, uid, ids, {'state': 'ready'})
return res
def action_done(self, cr, uid, ids):
""" Changes procurement state to Done and writes Closed date.
- @return: True
+ @return: True
"""
move_obj = self.pool.get('stock.move')
for procurement in self.browse(cr, uid, ids):
@@ -451,7 +451,7 @@ class mrp_procurement(osv.osv):
self._procure_confirm(cr, uid, use_new_cursor=use_new_cursor, context=context)
self._procure_orderpoint_confirm(cr, uid, automatic=automatic,\
use_new_cursor=use_new_cursor, context=context)
-
+
mrp_procurement()
@@ -461,7 +461,7 @@ class stock_warehouse_orderpoint(osv.osv):
"""
_name = "stock.warehouse.orderpoint"
_description = "Orderpoint minimum rule"
-
+
_columns = {
'name': fields.char('Name', size=32, required=True),
'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the orderpoint without removing it."),
@@ -489,7 +489,7 @@ class stock_warehouse_orderpoint(osv.osv):
'product_uom': lambda sel, cr, uid, context: context.get('product_uom', False),
'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.warehouse.orderpoint', context=c)
}
-
+
def onchange_warehouse_id(self, cr, uid, ids, warehouse_id, context={}):
""" Finds location id for changed warehouse.
@param warehouse_id: Changed id of warehouse.
@@ -500,7 +500,7 @@ class stock_warehouse_orderpoint(osv.osv):
v = {'location_id': w.lot_stock_id.id}
return {'value': v}
return {}
-
+
def onchange_product_id(self, cr, uid, ids, product_id, context={}):
""" Finds UoM for changed product.
@param product_id: Changed id of product.
@@ -511,7 +511,7 @@ class stock_warehouse_orderpoint(osv.osv):
v = {'product_uom': prod.uom_id.id}
return {'value': v}
return {}
-
+
def copy(self, cr, uid, id, default=None,context={}):
if not default:
default = {}
@@ -519,6 +519,6 @@ class stock_warehouse_orderpoint(osv.osv):
'name': self.pool.get('ir.sequence').get(cr, uid, 'mrp.warehouse.orderpoint') or '',
})
return super(stock_warehouse_orderpoint, self).copy(cr, uid, id, default, context)
-
+
stock_warehouse_orderpoint()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp_procurement/mrp_procurement_view.xml b/addons/mrp_procurement/mrp_procurement_view.xml
index 94ee009d7df..1defa214754 100644
--- a/addons/mrp_procurement/mrp_procurement_view.xml
+++ b/addons/mrp_procurement/mrp_procurement_view.xml
@@ -1,16 +1,16 @@
-
+
-
+
mrp.procurement.tree
mrp.procurement
tree
-
+
@@ -18,6 +18,7 @@
+
@@ -45,10 +46,10 @@
-
+
-
-
+
+
@@ -90,6 +91,7 @@
+
@@ -98,10 +100,11 @@
-
+
+
@@ -114,6 +117,7 @@
{'search_default_current':1}
+ {'search_default_Current':1}
@@ -154,7 +158,7 @@
tree,form
[('state','=','exception'), ('message', '=', '')]
-
+
stock.warehouse.orderpoint.tree
@@ -183,7 +187,7 @@
-
+
@@ -247,6 +251,21 @@
name="Minimum Stock Rules"
res_model="stock.warehouse.orderpoint"
src_model="product.product"/>
-
+
+
+
+
+
-
\ No newline at end of file
+
diff --git a/addons/mrp_procurement/wizard/make_procurement_view.xml b/addons/mrp_procurement/wizard/make_procurement_view.xml
index e98f1c013a0..2e9b44edb63 100644
--- a/addons/mrp_procurement/wizard/make_procurement_view.xml
+++ b/addons/mrp_procurement/wizard/make_procurement_view.xml
@@ -17,6 +17,7 @@
+
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index 667e9763827..47e80be3e31 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -2,174 +2,196 @@
-
- mrp.repair.form
- mrp.repair
- form
-
-
-
-
-
-
+
mrp.repair.tree
mrp.repair
tree
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+ mrp.repair.form
+ mrp.repair
+ form
+
+
+
+
+
+
+
+
+ mrp.repair.select
+ mrp.repair
+ search
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
New Repair
ir.actions.act_window
@@ -184,6 +206,7 @@
mrp.repair
form
tree,form
+
diff --git a/addons/olap/data/olap_wizard.xml b/addons/olap/data/olap_wizard.xml
index beb3453d224..5f677e7a8c6 100644
--- a/addons/olap/data/olap_wizard.xml
+++ b/addons/olap/data/olap_wizard.xml
@@ -10,13 +10,14 @@
multi="True"
id="bi_conf_cube_query_builder"/>
-
+ id="bi_menu_olap_load_table"/>-->
-
+
-
+
-
+
@@ -66,14 +66,14 @@
+ attrs="{'invisible':[('state','!=','paid'),('state','!=','invoiced')]}" context="{'return':'return'}" />
-
+
@@ -143,7 +143,7 @@
-
+
@@ -161,7 +161,7 @@
-
+
@@ -729,7 +729,7 @@
-
+
@@ -825,7 +825,7 @@
-
+
diff --git a/addons/point_of_sale/statement_view.xml b/addons/point_of_sale/statement_view.xml
index cef2748b5e4..69c3232f1a0 100644
--- a/addons/point_of_sale/statement_view.xml
+++ b/addons/point_of_sale/statement_view.xml
@@ -46,7 +46,7 @@
@@ -465,8 +465,7 @@
form
-
+
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index 542bfec9490..919bfc2865e 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -55,10 +55,10 @@
-
-
@@ -98,26 +98,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -133,6 +118,16 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/project_gtd/i18n/pl.po b/addons/project_gtd/i18n/pl.po
index 068c42bee8d..39c8b03565e 100644
--- a/addons/project_gtd/i18n/pl.po
+++ b/addons/project_gtd/i18n/pl.po
@@ -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-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-22 14:25+0000\n"
+"PO-Revision-Date: 2010-05-25 10:02+0000\n"
"Last-Translator: Grzegorz Grzelak (Cirrus.pl) \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-04-17 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-05-26 03:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project_gtd
@@ -37,7 +37,7 @@ msgstr ""
#. module: project_gtd
#: model:ir.actions.act_window,name:project_gtd.act_timebox_tasks_my_deadline_open
msgid "My Deadlines"
-msgstr ""
+msgstr "Moje terminy"
#. module: project_gtd
#: selection:project.gtd.timebox,type:0
@@ -83,7 +83,7 @@ msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
#. module: project_gtd
#: field:project.gtd.timebox,context4_id:0
msgid "Context 4"
-msgstr ""
+msgstr "Kontekst 4"
#. module: project_gtd
#: wizard_field:project.gtd.timebox.fill,init,timebox_to_id:0
@@ -110,7 +110,7 @@ msgstr ""
#. module: project_gtd
#: model:ir.module.module,shortdesc:project_gtd.module_meta_information
msgid "Getting Things Done - Time Management Module"
-msgstr ""
+msgstr "GTD - personalny moduł zarządzania czasem"
#. module: project_gtd
#: model:ir.actions.act_window,name:project_gtd.act_timebox_tasks
@@ -140,7 +140,7 @@ msgstr ""
#. module: project_gtd
#: model:ir.actions.act_window,name:project_gtd.act_timebox_tasks_my_pending
msgid "My Pending Tasks"
-msgstr ""
+msgstr "Moje zadania oczekujące"
#. module: project_gtd
#: view:project.gtd.timebox:0
@@ -166,17 +166,17 @@ msgstr ""
#. module: project_gtd
#: field:project.gtd.timebox,context1_id:0
msgid "Context 1"
-msgstr ""
+msgstr "Kontekst 1"
#. module: project_gtd
#: field:project.gtd.timebox,context2_id:0
msgid "Context 2"
-msgstr ""
+msgstr "Kontekst 2"
#. module: project_gtd
#: field:project.gtd.timebox,context3_id:0
msgid "Context 3"
-msgstr ""
+msgstr "Kontekst 3"
#. module: project_gtd
#: wizard_button:project.gtd.timebox.fill,init,process:0
@@ -186,12 +186,12 @@ msgstr ""
#. module: project_gtd
#: field:project.gtd.timebox,context5_id:0
msgid "Context 5"
-msgstr ""
+msgstr "Kontekst 5"
#. module: project_gtd
#: field:project.gtd.timebox,context6_id:0
msgid "Context 6"
-msgstr ""
+msgstr "Kontekst 6"
#. module: project_gtd
#: model:ir.actions.act_window,name:project_gtd.open_gtd_context_tree
@@ -244,18 +244,18 @@ msgstr "Kontekst"
#. module: project_gtd
#: model:ir.actions.act_window,name:project_gtd.act_timebox_tasks_my_open
msgid "My Open Tasks"
-msgstr ""
+msgstr "Moje otwarte zadania"
#. module: project_gtd
#: model:ir.ui.menu,name:project_gtd.menu_open_gtd_time
#: model:ir.ui.menu,name:project_gtd.menu_open_time
msgid "Time Management"
-msgstr ""
+msgstr "Zarządzanie czasem"
#. module: project_gtd
#: view:project.task:0
msgid "Getting Things Done"
-msgstr ""
+msgstr "GTD - planowanie osobiste"
#. module: project_gtd
#: field:project.gtd.timebox,task1_ids:0
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 210ad4ee737..8b2b14c1cb7 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -196,7 +196,7 @@
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -127,49 +170,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/addons/project_issue_sheet/project_issue_sheet.py b/addons/project_issue_sheet/project_issue_sheet.py
index 353fe6c28c1..c48ff73b0f0 100644
--- a/addons/project_issue_sheet/project_issue_sheet.py
+++ b/addons/project_issue_sheet/project_issue_sheet.py
@@ -34,13 +34,11 @@ from tools.translate import _
class project_issue(osv.osv):
_inherit = 'project.issue'
-
_columns = {
'timesheet_ids' : fields.one2many('hr.analytic.timesheet', 'issue_id', 'Timesheets'),
- 'analytic_account_id' : fields.many2one('account.analytic.account', 'Analytic Account',
- domain="[('partner_id', '=', partner_id)]",
- required=True),
+ 'analytic_account_id': fields.related('project_id','category_id',string='Analytic Account')
}
+project_issue()
class account_analytic_line(osv.osv):
_inherit = 'account.analytic.line'
@@ -53,10 +51,8 @@ account_analytic_line()
class hr_analytic_issue(osv.osv):
_inherit = 'hr.analytic.timesheet'
-
_columns = {
'issue_id' : fields.many2one('project.issue', 'Issue'),
}
-
hr_analytic_issue()
diff --git a/addons/project_issue_sheet/project_issue_sheet_view.xml b/addons/project_issue_sheet/project_issue_sheet_view.xml
index 2ed2e7fbdcc..12171d0a429 100644
--- a/addons/project_issue_sheet/project_issue_sheet_view.xml
+++ b/addons/project_issue_sheet/project_issue_sheet_view.xml
@@ -9,11 +9,11 @@
-
+
-
-
+
+
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index fafc2a14aa4..68acf499551 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -208,7 +208,7 @@
-
+
diff --git a/addons/project_mrp/i18n/pl.po b/addons/project_mrp/i18n/pl.po
index 22c5097c897..4a9dba81362 100644
--- a/addons/project_mrp/i18n/pl.po
+++ b/addons/project_mrp/i18n/pl.po
@@ -7,19 +7,19 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-10 21:08+0000\n"
+"PO-Revision-Date: 2010-05-25 15:08+0000\n"
"Last-Translator: Grzegorz Grzelak (Cirrus.pl) \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-04-17 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-05-26 03:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project_mrp
#: model:process.node,note:project_mrp.process_node_procuretasktask0
msgid "For each product, on type service and on order"
-msgstr ""
+msgstr "Dla każdego produktu o typie usługa i na zamówienie"
#. module: project_mrp
#: model:process.node,name:project_mrp.process_node_mrptask0
@@ -31,7 +31,7 @@ msgstr "Zadanie"
#: model:process.transition,note:project_mrp.process_transition_ordertask0
msgid "If procure method is Make to order and supply method is produce"
msgstr ""
-"Jeśli metoda nabycia jest \"Na zamówienie' i metoda zaopatrzenia jest "
+"Jeśli metoda nabycia jest 'Na zamówienie' i metoda zaopatrzenia jest "
"'Produkcja'"
#. module: project_mrp
@@ -57,29 +57,29 @@ msgstr "Zarządzanie projektami - Integracja ze sprzedażą i MRP"
#. module: project_mrp
#: model:process.transition,name:project_mrp.process_transition_procuretask0
msgid "Procure Task"
-msgstr ""
+msgstr "Utwórz zadanie"
#. module: project_mrp
#: model:process.node,note:project_mrp.process_node_mrptask0
msgid "A task is created to provide the service."
-msgstr ""
+msgstr "Utworzono zadanie dla wykonywanej usługi"
#. module: project_mrp
#: model:process.transition,name:project_mrp.process_transition_ordertask0
msgid "Order Task"
-msgstr ""
+msgstr "Zamów zadanie"
#. module: project_mrp
#: model:process.node,name:project_mrp.process_node_saleordertask0
msgid "Sale Order Task"
-msgstr ""
+msgstr "Zadanie do zamówienia sprzedaży"
#. module: project_mrp
#: model:process.transition,name:project_mrp.process_transition_createtask0
msgid "Create Task"
-msgstr ""
+msgstr "Utwórz zadanie"
#. module: project_mrp
#: model:process.node,note:project_mrp.process_node_saleordertask0
msgid "In case you sell services on sale order"
-msgstr ""
+msgstr "W przypadku sprzedaży usług na zamówienie sprzedaży"
diff --git a/addons/project_timesheet/i18n/pl.po b/addons/project_timesheet/i18n/pl.po
index 6d000c26b4f..79ee7725dc6 100644
--- a/addons/project_timesheet/i18n/pl.po
+++ b/addons/project_timesheet/i18n/pl.po
@@ -7,21 +7,21 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 15:12+0000\n"
-"Last-Translator: Fabien (Open ERP) \n"
+"PO-Revision-Date: 2010-05-25 15:04+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) \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-04-17 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-05-26 03:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project_timesheet
#: model:ir.module.module,shortdesc:project_timesheet.module_meta_information
msgid "Project Timesheet"
-msgstr ""
+msgstr "Karta czasu pracy projektu"
#. module: project_timesheet
#: field:project.task.work,hr_analytic_timesheet_id:0
msgid "Related Timeline Id"
-msgstr ""
+msgstr "ID związanej karty czasu pracy"
diff --git a/addons/project_timesheet/report/task_report_view.xml b/addons/project_timesheet/report/task_report_view.xml
index 7093582d7fc..35a7c9f3de6 100644
--- a/addons/project_timesheet/report/task_report_view.xml
+++ b/addons/project_timesheet/report/task_report_view.xml
@@ -78,7 +78,7 @@
-
+
@@ -96,7 +96,7 @@
domain="[('priority','=','4')]"/>
-
+
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 8f76d4b409b..8aa643d1c43 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -163,7 +163,7 @@
-
+
diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index 49caced7a6b..0cfc357b51f 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -88,7 +88,29 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -113,28 +135,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index 72f11069fcf..4a4587f5f04 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -127,7 +127,7 @@
-
+
diff --git a/addons/report_analytic/i18n/pl.po b/addons/report_analytic/i18n/pl.po
index 906dafc61c1..f3004d61990 100644
--- a/addons/report_analytic/i18n/pl.po
+++ b/addons/report_analytic/i18n/pl.po
@@ -7,19 +7,19 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 16:36+0000\n"
-"Last-Translator: Fabien (Open ERP) \n"
+"PO-Revision-Date: 2010-05-25 16:48+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) \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-04-17 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-05-26 03:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: report_analytic
#: model:ir.model,name:report_analytic.model_report_analytic_account_close
msgid "Analytic account to close"
-msgstr ""
+msgstr "Konto analityczne do zamknięcia"
#. module: report_analytic
#: constraint:ir.model:0
@@ -32,7 +32,7 @@ msgstr ""
#. module: report_analytic
#: field:report.analytic.account.close,quantity_max:0
msgid "Max. Quantity"
-msgstr ""
+msgstr "Maksymalna ilość"
#. module: report_analytic
#: constraint:ir.ui.view:0
@@ -42,27 +42,27 @@ msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
#. module: report_analytic
#: field:report.analytic.account.close,name:0
msgid "Analytic account"
-msgstr ""
+msgstr "Konto analityczne"
#. module: report_analytic
#: field:report.analytic.account.close,state:0
msgid "State"
-msgstr ""
+msgstr "Stan"
#. module: report_analytic
#: field:report.analytic.account.close,date_deadline:0
msgid "Deadline"
-msgstr ""
+msgstr "Termin"
#. module: report_analytic
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
#. module: report_analytic
#: model:ir.module.module,shortdesc:report_analytic.module_meta_information
msgid "Analytic Account Reporting"
-msgstr ""
+msgstr "Raportowanie kont analitycznych"
#. module: report_analytic
#: field:report.analytic.account.close,partner_id:0
@@ -72,16 +72,16 @@ msgstr ""
#. module: report_analytic
#: field:report.analytic.account.close,balance:0
msgid "Balance"
-msgstr ""
+msgstr "Saldo"
#. module: report_analytic
#: model:ir.actions.act_window,name:report_analytic.action_analytic_account_tree
#: model:ir.ui.menu,name:report_analytic.menu_action_analytic_account_tree
#: view:report.analytic.account.close:0
msgid "Expired analytic accounts"
-msgstr ""
+msgstr "Konta analityczne przeterminowane"
#. module: report_analytic
#: field:report.analytic.account.close,quantity:0
msgid "Quantity"
-msgstr ""
+msgstr "Ilość"
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index 68cd5ccbe9b..579f6976814 100644
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -14,10 +14,10 @@
-
+
-
+
@@ -36,7 +36,7 @@
-
+
@@ -50,13 +50,14 @@
-
+
-
+
+
@@ -70,7 +71,7 @@
@@ -85,7 +86,7 @@
-
+
@@ -162,11 +163,11 @@
@@ -177,10 +178,10 @@
-
+
-
+
@@ -200,7 +201,7 @@
@@ -260,7 +260,7 @@
-
+
@@ -380,7 +380,8 @@
-
+
+
@@ -397,12 +398,12 @@
-
-
-
+
+
+
@@ -443,10 +444,14 @@
+ />
+ domain="[('invoiced','<>', 1),('state','<>','draft'),('state','<>','cancel')]"
+ />
+
@@ -468,7 +473,6 @@
sale.order.line
form
tree,form,graph
- {"search_default_uninvoiced":1,"search_default_unshipped":1}
diff --git a/addons/scrum/scrum_view.xml b/addons/scrum/scrum_view.xml
index 394ea4c4219..08c0473e31e 100644
--- a/addons/scrum/scrum_view.xml
+++ b/addons/scrum/scrum_view.xml
@@ -150,7 +150,7 @@
-
+
diff --git a/addons/stock/partner_view.xml b/addons/stock/partner_view.xml
index 487dbcf55ea..be2ed4bfc55 100644
--- a/addons/stock/partner_view.xml
+++ b/addons/stock/partner_view.xml
@@ -14,8 +14,8 @@
-
-
+
+
diff --git a/addons/stock/product.py b/addons/stock/product.py
index ad189ee546a..dc300994232 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -148,10 +148,10 @@ class product_product(osv.osv):
return res
def get_product_available(self,cr,uid,ids,context=None):
- if not context:
+ if context is None:
context = {}
- states=context.get('states',[])
- what=context.get('what',())
+ states = context.get('states',[])
+ what = context.get('what',())
if not ids:
ids = self.search(cr, uid, [])
res = {}.fromkeys(ids, 0.0)
@@ -184,9 +184,9 @@ class product_product(osv.osv):
# build the list of ids of children of the location given by id
if context.get('compute_child',True):
child_location_ids = self.pool.get('stock.location').search(cr, uid, [('location_id', 'child_of', location_ids)])
- location_ids= len(child_location_ids) and child_location_ids or location_ids
+ location_ids = child_location_ids or location_ids
else:
- location_ids= location_ids
+ location_ids = location_ids
uoms_o = {}
product2uom = {}
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index 3a7b233504a..673fd14e76e 100755
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -20,7 +20,7 @@
-
+
@@ -75,7 +75,7 @@
icon="terp-stock"
domain="[('state','=','done')]"
help = "Completed Stock-Moves"/>
-
+
@@ -83,15 +83,8 @@
-
-
-
-
-
-
-
-
+
@@ -102,6 +95,13 @@
+
+
+
+
+
+
+
@@ -118,9 +118,9 @@
+ parent="stock.menu_stock_root" groups="base.group_user"/>
-
+
-
\ No newline at end of file
+
diff --git a/addons/stock/report/report_stock_picking_view.xml b/addons/stock/report/report_stock_picking_view.xml
index 62d1b06fd19..c343b09931a 100644
--- a/addons/stock/report/report_stock_picking_view.xml
+++ b/addons/stock/report/report_stock_picking_view.xml
@@ -54,22 +54,41 @@
-
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -82,20 +101,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 753f3e17433..70cf4df167f 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -55,7 +55,7 @@
-
+
diff --git a/addons/subscription/i18n/pl.po b/addons/subscription/i18n/pl.po
index ecca1a5cb35..0fe13bd3ad7 100644
--- a/addons/subscription/i18n/pl.po
+++ b/addons/subscription/i18n/pl.po
@@ -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-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-02-20 15:53+0000\n"
+"PO-Revision-Date: 2010-05-25 17:33+0000\n"
"Last-Translator: Grzegorz Grzelak (Cirrus.pl) \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-04-17 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-05-26 03:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: subscription
@@ -83,7 +83,7 @@ msgstr "Pola dokumentu subskrypcji"
#. module: subscription
#: field:subscription.subscription,interval_number:0
msgid "Interval Qty"
-msgstr ""
+msgstr "Il. interwał"
#. module: subscription
#: view:subscription.subscription:0