diff --git a/addons/account/wizard/account_invoice_refund.py b/addons/account/wizard/account_invoice_refund.py
index 7820e327256..9396209ccc6 100644
--- a/addons/account/wizard/account_invoice_refund.py
+++ b/addons/account/wizard/account_invoice_refund.py
@@ -18,10 +18,11 @@
# along with this program. If not, see .
#
##############################################################################
+import time
+
from osv import fields, osv
from tools.translate import _
import netsvc
-import time
class account_invoice_refund(osv.osv_memory):
@@ -30,16 +31,15 @@ class account_invoice_refund(osv.osv_memory):
_name = "account.invoice.refund"
_description = "Invoice Refund"
_columns = {
- 'date': fields.date('Operation date', required=False, help='This date will be used as the invoice date for Refund Invoice and Period will be chosen accordingly!'),
- 'period': fields.many2one('account.period', 'Force period', required=False),
- 'description': fields.char('Description', size=150, required=True),
+ 'date': fields.date('Operation date', help='This date will be used as the invoice date for Refund Invoice and Period will be chosen accordingly!'),
+ 'period': fields.many2one('account.period', 'Force period'),
+ 'description': fields.char('Description', size=128, required=True),
}
-
_defaults = {
'date': time.strftime('%Y-%m-%d'),
- }
+ }
- def compute_refund(self, cr, uid, ids, mode, context=None):
+ def compute_refund(self, cr, uid, ids, mode='refund', context=None):
"""
@param cr: the current row, from the database cursor,
@param uid: the current user’s ID for security checks,
@@ -78,21 +78,20 @@ class account_invoice_refund(osv.osv_memory):
result_query = cr.fetchone()
if result_query:
cr.execute("""SELECT id
- from account_period where date('%s')
+ from account_period where date(%s)
between date_start AND date_stop \
and company_id = %s limit 1 """,
- (form['date'], self.pool.get('res.users').browse(cr, uid, uid,context=context).company_id.id,))
+ (date, self.pool.get('res.users').browse(cr, uid, uid,context=context).company_id.id,))
else:
cr.execute("""SELECT id
- from account_period where date('%s')
+ from account_period where date(%s)
between date_start AND date_stop \
- limit 1 """, (form['date'],))
+ limit 1 """, (date,))
res = cr.fetchone()
if res:
period = res[0]
else:
date = inv.date_invoice
-
if form['description'] :
description = form['description']
else:
@@ -129,7 +128,7 @@ class account_invoice_refund(osv.osv_memory):
writeoff_journal_id=inv.journal_id.id,
writeoff_acc_id=inv.account_id.id
)
- if mode == 'modify' :
+ if mode == 'modify':
invoice = inv_obj.read(cr, uid, [inv.id],
['name', 'type', 'number', 'reference',
'comment', 'date_due', 'partner_id',
diff --git a/addons/board_account/i18n/pl.po b/addons/board_account/i18n/pl.po
index da427a840fe..3e9e382ea8c 100644
--- a/addons/board_account/i18n/pl.po
+++ b/addons/board_account/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-26 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-05-27 03:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: board_account
diff --git a/addons/hr/__init__.py b/addons/hr/__init__.py
old mode 100755
new mode 100644
diff --git a/addons/hr/hr.py b/addons/hr/hr.py
old mode 100755
new mode 100644
diff --git a/addons/hr/hr_data.xml b/addons/hr/hr_data.xml
old mode 100755
new mode 100644
diff --git a/addons/hr/hr_demo.xml b/addons/hr/hr_demo.xml
old mode 100755
new mode 100644
diff --git a/addons/hr/hr_department.py b/addons/hr/hr_department.py
old mode 100755
new mode 100644
diff --git a/addons/hr/hr_department_demo.xml b/addons/hr/hr_department_demo.xml
old mode 100755
new mode 100644
diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml
old mode 100755
new mode 100644
diff --git a/addons/hr/hr_installer.xml b/addons/hr/hr_installer.xml
old mode 100755
new mode 100644
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
old mode 100755
new mode 100644
index 65d032dfbfd..210e83c11ad
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -199,6 +199,7 @@
+
diff --git a/addons/hr/i18n/ar.po b/addons/hr/i18n/ar.po
old mode 100755
new mode 100644
diff --git a/addons/hr/i18n/bs.po b/addons/hr/i18n/bs.po
old mode 100755
new mode 100644
diff --git a/addons/hr/i18n/ca.po b/addons/hr/i18n/ca.po
old mode 100755
new mode 100644
diff --git a/addons/hr/i18n/cs.po b/addons/hr/i18n/cs.po
old mode 100755
new mode 100644
diff --git a/addons/hr/i18n/de.po b/addons/hr/i18n/de.po
old mode 100755
new mode 100644
diff --git a/addons/hr/i18n/el.po b/addons/hr/i18n/el.po
old mode 100755
new mode 100644
diff --git a/addons/hr/i18n/es.po b/addons/hr/i18n/es.po
old mode 100755
new mode 100644
diff --git a/addons/hr/i18n/es_AR.po b/addons/hr/i18n/es_AR.po
old mode 100755
new mode 100644
diff --git a/addons/hr/i18n/es_EC.po b/addons/hr/i18n/es_EC.po
old mode 100755
new mode 100644
diff --git a/addons/hr/i18n/et.po b/addons/hr/i18n/et.po
old mode 100755
new mode 100644
diff --git a/addons/hr/i18n/fi.po b/addons/hr/i18n/fi.po
old mode 100755
new mode 100644
diff --git a/addons/hr/i18n/fr.po b/addons/hr/i18n/fr.po
old mode 100755
new mode 100644
diff --git a/addons/hr/i18n/hi.po b/addons/hr/i18n/hi.po
old mode 100755
new mode 100644
diff --git a/addons/hr/i18n/hr.po b/addons/hr/i18n/hr.po
old mode 100755
new mode 100644
diff --git a/addons/hr/i18n/hr.pot b/addons/hr/i18n/hr.pot
old mode 100755
new mode 100644
diff --git a/addons/hr/i18n/hu.po b/addons/hr/i18n/hu.po
old mode 100755
new mode 100644
diff --git a/addons/hr/i18n/id.po b/addons/hr/i18n/id.po
old mode 100755
new mode 100644
diff --git a/addons/hr/i18n/it.po b/addons/hr/i18n/it.po
old mode 100755
new mode 100644
diff --git a/addons/hr/i18n/ko.po b/addons/hr/i18n/ko.po
old mode 100755
new mode 100644
diff --git a/addons/hr/i18n/lt.po b/addons/hr/i18n/lt.po
old mode 100755
new mode 100644
diff --git a/addons/hr/i18n/lv.po b/addons/hr/i18n/lv.po
old mode 100755
new mode 100644
diff --git a/addons/hr/i18n/nl.po b/addons/hr/i18n/nl.po
old mode 100755
new mode 100644
diff --git a/addons/hr/i18n/nl_BE.po b/addons/hr/i18n/nl_BE.po
old mode 100755
new mode 100644
diff --git a/addons/hr/i18n/pl.po b/addons/hr/i18n/pl.po
old mode 100755
new mode 100644
diff --git a/addons/hr/i18n/pt.po b/addons/hr/i18n/pt.po
old mode 100755
new mode 100644
diff --git a/addons/hr/i18n/pt_BR.po b/addons/hr/i18n/pt_BR.po
old mode 100755
new mode 100644
diff --git a/addons/hr/i18n/ro.po b/addons/hr/i18n/ro.po
old mode 100755
new mode 100644
diff --git a/addons/hr/i18n/ru.po b/addons/hr/i18n/ru.po
old mode 100755
new mode 100644
diff --git a/addons/hr/i18n/sk.po b/addons/hr/i18n/sk.po
old mode 100755
new mode 100644
diff --git a/addons/hr/i18n/sl.po b/addons/hr/i18n/sl.po
old mode 100755
new mode 100644
diff --git a/addons/hr/i18n/sq.po b/addons/hr/i18n/sq.po
old mode 100755
new mode 100644
diff --git a/addons/hr/i18n/sr.po b/addons/hr/i18n/sr.po
old mode 100755
new mode 100644
diff --git a/addons/hr/i18n/sv.po b/addons/hr/i18n/sv.po
old mode 100755
new mode 100644
diff --git a/addons/hr/i18n/th.po b/addons/hr/i18n/th.po
old mode 100755
new mode 100644
diff --git a/addons/hr/i18n/th_TH.po b/addons/hr/i18n/th_TH.po
old mode 100755
new mode 100644
diff --git a/addons/hr/i18n/tlh.po b/addons/hr/i18n/tlh.po
old mode 100755
new mode 100644
diff --git a/addons/hr/i18n/tr.po b/addons/hr/i18n/tr.po
old mode 100755
new mode 100644
diff --git a/addons/hr/i18n/uk.po b/addons/hr/i18n/uk.po
old mode 100755
new mode 100644
diff --git a/addons/hr/i18n/vi.po b/addons/hr/i18n/vi.po
old mode 100755
new mode 100644
diff --git a/addons/hr/i18n/zh_CN.po b/addons/hr/i18n/zh_CN.po
old mode 100755
new mode 100644
diff --git a/addons/hr/i18n/zh_TW.po b/addons/hr/i18n/zh_TW.po
old mode 100755
new mode 100644
diff --git a/addons/hr/installer.py b/addons/hr/installer.py
old mode 100755
new mode 100644
diff --git a/addons/hr/process/hr_process.xml b/addons/hr/process/hr_process.xml
old mode 100755
new mode 100644
diff --git a/addons/hr/security/hr_security.xml b/addons/hr/security/hr_security.xml
old mode 100755
new mode 100644
diff --git a/addons/hr/security/ir.model.access.csv b/addons/hr/security/ir.model.access.csv
old mode 100755
new mode 100644
diff --git a/addons/hr_contract/__init__.py b/addons/hr_contract/__init__.py
old mode 100755
new mode 100644
diff --git a/addons/hr_contract/hr_contract.py b/addons/hr_contract/hr_contract.py
old mode 100755
new mode 100644
diff --git a/addons/hr_contract/hr_contract_data.xml b/addons/hr_contract/hr_contract_data.xml
old mode 100755
new mode 100644
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
old mode 100755
new mode 100644
index 2647743ad84..e4e8259bda4
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -147,9 +147,7 @@
-
-
@@ -204,7 +202,6 @@
-
diff --git a/addons/hr_contract/i18n/ar.po b/addons/hr_contract/i18n/ar.po
old mode 100755
new mode 100644
diff --git a/addons/hr_contract/i18n/bg.po b/addons/hr_contract/i18n/bg.po
old mode 100755
new mode 100644
diff --git a/addons/hr_contract/i18n/bs.po b/addons/hr_contract/i18n/bs.po
old mode 100755
new mode 100644
diff --git a/addons/hr_contract/i18n/ca.po b/addons/hr_contract/i18n/ca.po
old mode 100755
new mode 100644
diff --git a/addons/hr_contract/i18n/cs.po b/addons/hr_contract/i18n/cs.po
old mode 100755
new mode 100644
diff --git a/addons/hr_contract/i18n/de.po b/addons/hr_contract/i18n/de.po
old mode 100755
new mode 100644
diff --git a/addons/hr_contract/i18n/el.po b/addons/hr_contract/i18n/el.po
old mode 100755
new mode 100644
diff --git a/addons/hr_contract/i18n/es.po b/addons/hr_contract/i18n/es.po
old mode 100755
new mode 100644
diff --git a/addons/hr_contract/i18n/es_AR.po b/addons/hr_contract/i18n/es_AR.po
old mode 100755
new mode 100644
diff --git a/addons/hr_contract/i18n/es_EC.po b/addons/hr_contract/i18n/es_EC.po
old mode 100755
new mode 100644
diff --git a/addons/hr_contract/i18n/et.po b/addons/hr_contract/i18n/et.po
old mode 100755
new mode 100644
diff --git a/addons/hr_contract/i18n/fi.po b/addons/hr_contract/i18n/fi.po
old mode 100755
new mode 100644
diff --git a/addons/hr_contract/i18n/fr.po b/addons/hr_contract/i18n/fr.po
old mode 100755
new mode 100644
diff --git a/addons/hr_contract/i18n/hi.po b/addons/hr_contract/i18n/hi.po
old mode 100755
new mode 100644
diff --git a/addons/hr_contract/i18n/hr.po b/addons/hr_contract/i18n/hr.po
old mode 100755
new mode 100644
diff --git a/addons/hr_contract/i18n/hr_contract.pot b/addons/hr_contract/i18n/hr_contract.pot
old mode 100755
new mode 100644
diff --git a/addons/hr_contract/i18n/hu.po b/addons/hr_contract/i18n/hu.po
old mode 100755
new mode 100644
diff --git a/addons/hr_contract/i18n/id.po b/addons/hr_contract/i18n/id.po
old mode 100755
new mode 100644
diff --git a/addons/hr_contract/i18n/it.po b/addons/hr_contract/i18n/it.po
old mode 100755
new mode 100644
diff --git a/addons/hr_contract/i18n/ko.po b/addons/hr_contract/i18n/ko.po
old mode 100755
new mode 100644
diff --git a/addons/hr_contract/i18n/lt.po b/addons/hr_contract/i18n/lt.po
old mode 100755
new mode 100644
diff --git a/addons/hr_contract/i18n/lv.po b/addons/hr_contract/i18n/lv.po
old mode 100755
new mode 100644
diff --git a/addons/hr_contract/i18n/nl.po b/addons/hr_contract/i18n/nl.po
old mode 100755
new mode 100644
diff --git a/addons/hr_contract/i18n/nl_BE.po b/addons/hr_contract/i18n/nl_BE.po
old mode 100755
new mode 100644
diff --git a/addons/hr_contract/i18n/pl.po b/addons/hr_contract/i18n/pl.po
old mode 100755
new mode 100644
diff --git a/addons/hr_contract/i18n/pt.po b/addons/hr_contract/i18n/pt.po
old mode 100755
new mode 100644
diff --git a/addons/hr_contract/i18n/pt_BR.po b/addons/hr_contract/i18n/pt_BR.po
old mode 100755
new mode 100644
diff --git a/addons/hr_contract/i18n/ro.po b/addons/hr_contract/i18n/ro.po
old mode 100755
new mode 100644
diff --git a/addons/hr_contract/i18n/ru.po b/addons/hr_contract/i18n/ru.po
old mode 100755
new mode 100644
diff --git a/addons/hr_contract/i18n/sl.po b/addons/hr_contract/i18n/sl.po
old mode 100755
new mode 100644
diff --git a/addons/hr_contract/i18n/sq.po b/addons/hr_contract/i18n/sq.po
old mode 100755
new mode 100644
diff --git a/addons/hr_contract/i18n/sr.po b/addons/hr_contract/i18n/sr.po
old mode 100755
new mode 100644
diff --git a/addons/hr_contract/i18n/sv.po b/addons/hr_contract/i18n/sv.po
old mode 100755
new mode 100644
diff --git a/addons/hr_contract/i18n/tlh.po b/addons/hr_contract/i18n/tlh.po
old mode 100755
new mode 100644
diff --git a/addons/hr_contract/i18n/tr.po b/addons/hr_contract/i18n/tr.po
old mode 100755
new mode 100644
diff --git a/addons/hr_contract/i18n/uk.po b/addons/hr_contract/i18n/uk.po
old mode 100755
new mode 100644
diff --git a/addons/hr_contract/i18n/vi.po b/addons/hr_contract/i18n/vi.po
old mode 100755
new mode 100644
diff --git a/addons/hr_contract/i18n/zh_CN.po b/addons/hr_contract/i18n/zh_CN.po
old mode 100755
new mode 100644
diff --git a/addons/hr_contract/i18n/zh_TW.po b/addons/hr_contract/i18n/zh_TW.po
old mode 100755
new mode 100644
diff --git a/addons/hr_contract/security/hr_contract_security.xml b/addons/hr_contract/security/hr_contract_security.xml
old mode 100755
new mode 100644
diff --git a/addons/hr_contract/security/ir.model.access.csv b/addons/hr_contract/security/ir.model.access.csv
old mode 100755
new mode 100644
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index e47ae1999c4..ab383748fe0 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -232,7 +232,7 @@
help="My Department"/>
-
+
diff --git a/addons/profile_accounting/i18n/pl.po b/addons/profile_accounting/i18n/pl.po
index e1bcf6839fc..be89ead2d63 100644
--- a/addons/profile_accounting/i18n/pl.po
+++ b/addons/profile_accounting/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-26 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-05-27 03:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: profile_accounting
diff --git a/addons/profile_manufacturing/i18n/pl.po b/addons/profile_manufacturing/i18n/pl.po
index 6707d6598b1..9b653d520b3 100644
--- a/addons/profile_manufacturing/i18n/pl.po
+++ b/addons/profile_manufacturing/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-26 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-05-27 03:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: profile_manufacturing
diff --git a/addons/project/i18n/pl.po b/addons/project/i18n/pl.po
index a10b7348ccb..386eb18b18e 100644
--- a/addons/project/i18n/pl.po
+++ b/addons/project/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-26 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-05-27 03:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project
diff --git a/addons/project/project.py b/addons/project/project.py
index a6c703657d0..bdf7e30837e 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -47,6 +47,8 @@ class project(osv.osv):
_inherits = {'account.analytic.account':"category_id"}
def search(self, cr, user, args, offset=0, limit=None, order=None, context=None, count=False):
+ if context is None:
+ context = {}
if user == 1:
return super(project, self).search(cr, user, args, offset=offset, limit=limit, order=order, context=context, count=count)
if context and context.has_key('user_prefence') and context['user_prefence']:
@@ -266,13 +268,11 @@ class task(osv.osv):
hours = dict(cr.fetchall())
for task in self.browse(cr, uid, ids, context=context):
res[task.id] = {'effective_hours': hours.get(task.id, 0.0), 'total_hours': task.remaining_hours + hours.get(task.id, 0.0)}
+ res[task.id]['progress'] = 0.0
if (task.remaining_hours + hours.get(task.id, 0.0)):
- if task.state =='done':
- res[task.id]['progress'] = 100.0
- else:
+ if task.state != 'done':
res[task.id]['progress'] = round(min(100.0 * hours.get(task.id, 0.0) / res[task.id]['total_hours'], 99.99),2)
- else:
- res[task.id]['progress'] = 0.0
+
if task.state in ('done','cancel'):
res[task.id]['progress'] = 100.0
res[task.id]['delay_hours'] = res[task.id]['total_hours'] - task.planned_hours
@@ -559,6 +559,8 @@ class config_compute_remaining(osv.osv_memory):
}
def compute_hours(self, cr, uid, ids, context=None):
+ if context is None:
+ context = {}
task_obj = self.pool.get('project.task')
request = self.pool.get('res.request')
if 'active_id' in context:
diff --git a/addons/project_gtd/i18n/pl.po b/addons/project_gtd/i18n/pl.po
index 39c8b03565e..d5271fc913e 100644
--- a/addons/project_gtd/i18n/pl.po
+++ b/addons/project_gtd/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-26 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-05-27 03:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project_gtd
diff --git a/addons/project_issue/__openerp__.py b/addons/project_issue/__openerp__.py
index 513bae085bd..982d1688014 100644
--- a/addons/project_issue/__openerp__.py
+++ b/addons/project_issue/__openerp__.py
@@ -31,8 +31,10 @@
'author': 'Tiny',
'website': 'http://www.openerp.com',
'depends': [
+ 'crm',
'project',
'hr_timesheet_sheet',
+ 'project_long_term',
],
'init_xml': [
'project_issue_data.xml'
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index f67986526cd..b67ef6a849a 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -113,7 +113,6 @@ class project_issue(osv.osv, crm.crm_case):
'thread_id': fields.many2one('mailgate.thread', 'Thread', required=False),
'id': fields.integer('ID'),
'name': fields.char('Name', size=128, required=True),
- 'active': fields.boolean('Active', required=False),
'create_date': fields.datetime('Creation Date' , readonly=True),
'write_date': fields.datetime('Update Date' , readonly=True),
'date_deadline': fields.date('Deadline'),
@@ -173,7 +172,6 @@ class project_issue(osv.osv, crm.crm_case):
return False
_defaults = {
- 'active': lambda *a: 1,
'user_id': crm.crm_case._get_default_user,
'partner_id': crm.crm_case._get_default_partner,
'partner_address_id': crm.crm_case._get_default_partner_address,
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 8b2b14c1cb7..27b72e459ef 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -82,11 +82,8 @@
-
-
-
@@ -143,6 +140,7 @@
+
@@ -155,6 +153,7 @@
states="open,draft,pending,done,cancel" />
+
@@ -172,21 +171,18 @@
search
-
+
-
-
-
-
+
@@ -196,7 +192,7 @@
-
+
\n"
+"PO-Revision-Date: 2010-05-26 07: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:12+0000\n"
+"X-Launchpad-Export-Date: 2010-05-27 03:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: sale_journal
@@ -25,35 +25,35 @@ msgstr "Sprzedaż miesięczna"
#: model:ir.actions.act_window,name:sale_journal.act_sale_journal_picking_journal_2_stock_picking_assigned
#: model:ir.actions.act_window,name:sale_journal.act_sale_journal_sale_journal_2_stock_picking_assigned
msgid "Assigned packing"
-msgstr ""
+msgstr "Przypisane przesunięcie"
#. module: sale_journal
#: selection:sale_journal.invoice.type.stats,state:0
#: selection:sale_journal.picking.stats,state:0
msgid "assigned"
-msgstr "Przypisany"
+msgstr ""
#. module: sale_journal
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
#. module: sale_journal
#: selection:sale_journal.sale.stats,state:0
msgid "Waiting Schedule"
-msgstr ""
+msgstr "Czeka na planowanie"
#. module: sale_journal
#: selection:sale_journal.invoice.type.stats,invoice_state:0
msgid "to be invoiced"
-msgstr "do zaksięgowania"
+msgstr ""
#. module: sale_journal
#: model:ir.model,name:sale_journal.model_sale_journal_sale_journal
#: view:sale_journal.sale.journal:0
#: field:stock.picking,sale_journal_id:0
msgid "Sale Journal"
-msgstr ""
+msgstr "Dziennik sprzedaży"
#. module: sale_journal
#: field:sale_journal.sale.journal,sale_stats_ids:0
@@ -64,19 +64,19 @@ msgstr "Statystyki sprzedaży"
#: selection:sale_journal.invoice.type.stats,state:0
#: selection:sale_journal.picking.stats,state:0
msgid "waiting"
-msgstr "oczekuje"
+msgstr ""
#. module: sale_journal
#: view:sale_journal.picking.journal:0
#: view:sale_journal.sale.journal:0
msgid "Set to Draft"
-msgstr "Ustaw na wer.roboczą"
+msgstr "Ustaw na projekt"
#. module: sale_journal
#: field:sale_journal.picking.journal,date:0
#: field:sale_journal.sale.journal,date:0
msgid "Journal date"
-msgstr ""
+msgstr "Data dziennika"
#. module: sale_journal
#: model:ir.ui.menu,name:sale_journal.menu_definition_journal_picking_invoice_method
@@ -88,7 +88,7 @@ msgstr "Metoda pakowania wg faktur"
#. module: sale_journal
#: model:ir.ui.menu,name:sale_journal.menu_definition_journal_picking
msgid "Packing Journals"
-msgstr "Dzienniki pakowania"
+msgstr "Dzienniki przesunięć"
#. module: sale_journal
#: view:sale_journal.picking.journal:0
@@ -123,7 +123,7 @@ msgstr "Zarządzanie sprzedażą i dostawami przez dziennik"
#: selection:sale_journal.invoice.type.stats,state:0
#: selection:sale_journal.picking.stats,state:0
msgid "done"
-msgstr "gotowe"
+msgstr ""
#. module: sale_journal
#: field:sale_journal.invoice.type.stats,price_average:0
@@ -165,7 +165,7 @@ msgstr "Cena całkowita"
#. module: sale_journal
#: model:ir.actions.act_window,name:sale_journal.action_definition_picking_journal
msgid "Packing journals"
-msgstr "Dzienniki pakowania"
+msgstr "Dzienniki przesunięć"
#. module: sale_journal
#: model:ir.ui.menu,name:sale_journal.menu_definition_report_sales
@@ -190,27 +190,27 @@ msgstr "Otwarte dzienniki"
#. module: sale_journal
#: view:sale_journal.picking.journal:0
msgid "Packing"
-msgstr ""
+msgstr "Lista przesunięć"
#. module: sale_journal
#: help:res.partner,property_invoice_type:0
msgid "The type of journal used for sales and packing."
-msgstr ""
+msgstr "Typ dziennika stosowany do sprzedaży i list przesunięć"
#. module: sale_journal
#: selection:sale_journal.invoice.type.stats,invoice_state:0
msgid "None"
-msgstr ""
+msgstr "Brak"
#. module: sale_journal
#: model:ir.actions.act_window,name:sale_journal.action_sale_sale_stats_open_menu_month
msgid "Sales by journal (this month)"
-msgstr ""
+msgstr "Sprzedaż wg dziennika (bieżący miesiąc)"
#. module: sale_journal
#: selection:sale_journal.sale.stats,state:0
msgid "Manual in progress"
-msgstr ""
+msgstr "Ręczne w trakcie przetwarzania"
#. module: sale_journal
#: model:ir.actions.act_window,name:sale_journal.action_definition_picking_journal_tree
@@ -218,28 +218,28 @@ msgstr ""
#: model:ir.actions.act_window,name:sale_journal.action_picking_picking_stats_open_menu_all
#: model:ir.actions.act_window,name:sale_journal.action_picking_picking_stats_open_menu_month
msgid "Packing by journal"
-msgstr ""
+msgstr "Listy przesunięć wg dziennika"
#. module: sale_journal
#: view:sale_journal.picking.journal:0
msgid "Cancel Packing"
-msgstr ""
+msgstr "Anuluj listę przesunięć"
#. module: sale_journal
#: model:ir.actions.act_window,name:sale_journal.act_sale_journal_picking_journal_2_stock_picking_confirmed
#: model:ir.actions.act_window,name:sale_journal.act_sale_journal_sale_journal_2_stock_picking_confirmed
msgid "Confirmed packing"
-msgstr ""
+msgstr "Potwierdzone listy przesunięć"
#. module: sale_journal
#: selection:sale_journal.sale.stats,state:0
msgid "In progress"
-msgstr ""
+msgstr "W toku"
#. module: sale_journal
#: view:sale_journal.picking.stats:0
msgid "Packing by journals"
-msgstr ""
+msgstr "Listy przesunięć wg dzienników"
#. module: sale_journal
#: field:sale_journal.invoice.type.stats,name:0
@@ -258,7 +258,7 @@ msgstr "Stan faktury"
#: model:ir.actions.act_window,name:sale_journal.action_invoice_type_picking_stats_open_menu_month
#: view:sale_journal.invoice.type.stats:0
msgid "Packing by invoice method"
-msgstr ""
+msgstr "Listy przesunięć wg metod faktury"
#. module: sale_journal
#: field:sale_journal.sale.stats,state:0
@@ -268,7 +268,7 @@ msgstr "Stan zamówienia"
#. module: sale_journal
#: selection:sale_journal.sale.stats,state:0
msgid "Shipping Exception"
-msgstr ""
+msgstr "Wyjątek wysyłki"
#. module: sale_journal
#: field:sale_journal.invoice.type,note:0
@@ -281,7 +281,7 @@ msgstr "Uwaga"
#: selection:sale_journal.picking.journal,state:0
#: selection:sale_journal.sale.journal,state:0
msgid "Draft"
-msgstr "Roboczy"
+msgstr "Projekt"
#. module: sale_journal
#: selection:sale_journal.invoice.type.stats,state:0
@@ -292,7 +292,7 @@ msgstr ""
#. module: sale_journal
#: selection:sale_journal.sale.stats,state:0
msgid "Invoice Exception"
-msgstr ""
+msgstr "Wyjątek faktury"
#. module: sale_journal
#: field:sale_journal.picking.journal,date_validation:0
@@ -309,17 +309,17 @@ msgstr ""
#. module: sale_journal
#: field:sale_journal.invoice.type,active:0
msgid "Active"
-msgstr ""
+msgstr "Aktywne"
#. module: sale_journal
#: model:ir.actions.act_window,name:sale_journal.act_sale_journal_sale_journal_2_sale_order_draft
msgid "Draft sales"
-msgstr "wer.robocza sprzedaży"
+msgstr "Projekt sprzedaży"
#. module: sale_journal
#: selection:sale_journal.sale.stats,state:0
msgid "Quotation"
-msgstr ""
+msgstr "Oferta"
#. module: sale_journal
#: model:ir.ui.menu,name:sale_journal.menu_definition_journal
@@ -370,7 +370,7 @@ msgstr "Sprzedaż"
#: model:ir.ui.menu,name:sale_journal.menu_definition_journal_reporting
#: view:sale_journal.picking.journal:0
msgid "Packing Journal"
-msgstr ""
+msgstr "Dziennik list przesunięcia"
#. module: sale_journal
#: selection:sale_journal.picking.journal,state:0
@@ -382,7 +382,7 @@ msgstr "Gotowe"
#. module: sale_journal
#: selection:sale_journal.sale.stats,state:0
msgid "Cancel"
-msgstr ""
+msgstr "Anulowano"
#. module: sale_journal
#: field:sale_journal.picking.journal,picking_stats_ids:0
@@ -393,7 +393,7 @@ msgstr "Statystyka dziennika"
#: selection:sale_journal.picking.journal,state:0
#: selection:sale_journal.sale.journal,state:0
msgid "Open"
-msgstr ""
+msgstr "Otwarte"
#. module: sale_journal
#: constraint:ir.model:0
@@ -423,7 +423,7 @@ msgstr "Moje otwarte dzienniki"
#. module: sale_journal
#: model:ir.actions.act_window,name:sale_journal.action_invoice_type_picking_stats_open
msgid "Statistics on packing to invoice"
-msgstr ""
+msgstr "Statystyka list przesunięć wg faktur"
#. module: sale_journal
#: view:sale_journal.sale.journal:0
@@ -436,23 +436,23 @@ msgstr "Anuluj sprzedaż"
#: field:sale_journal.invoice.type,name:0
#: field:stock.picking,invoice_type_id:0
msgid "Invoice Type"
-msgstr ""
+msgstr "Typ faktury"
#. module: sale_journal
#: selection:sale_journal.invoice.type.stats,invoice_state:0
msgid "invoiced"
-msgstr "zafakturowano"
+msgstr ""
#. module: sale_journal
#: selection:sale_journal.invoice.type.stats,state:0
#: selection:sale_journal.picking.stats,state:0
msgid "confirmed"
-msgstr "Potwierdzono"
+msgstr ""
#. module: sale_journal
#: model:ir.model,name:sale_journal.model_sale_journal_picking_stats
msgid "Packing lists by Journal"
-msgstr ""
+msgstr "Listy przesunięć wg dziennika"
#. module: sale_journal
#: field:sale_journal.invoice.type.stats,quantity:0
@@ -483,7 +483,7 @@ msgstr "Metoda fakturowania"
#: model:ir.ui.menu,name:sale_journal.menu_definition_journal_reporting_this
#: model:ir.ui.menu,name:sale_journal.menu_definition_report_sales_this_month
msgid "This Month"
-msgstr ""
+msgstr "W tym miesiącu"
#. module: sale_journal
#: model:ir.ui.menu,name:sale_journal.menu_definition_journal_sales
@@ -506,7 +506,7 @@ msgstr "Nie pogrupowane"
#. module: sale_journal
#: model:ir.actions.act_window,name:sale_journal.action_invoice_type_picking_open
msgid "Packing to invoice"
-msgstr ""
+msgstr "Listy przesunięć do zafakturowania"
#. module: sale_journal
#: view:sale_journal.picking.journal:0
@@ -517,7 +517,7 @@ msgstr "Informacja dziennika"
#. module: sale_journal
#: model:ir.model,name:sale_journal.model_sale_journal_invoice_type_stats
msgid "Stats on packing by invoice method"
-msgstr ""
+msgstr "Statystyka list przesunięć wg metody fakturowania"
#. module: sale_journal
#: model:ir.model,name:sale_journal.model_sale_journal_invoice_type
@@ -535,7 +535,7 @@ msgstr "Stany"
#: model:ir.ui.menu,name:sale_journal.menu_picking_picking_stats_open_all
#: model:ir.ui.menu,name:sale_journal.menu_picking_picking_stats_open_menu
msgid "Packing by Journal"
-msgstr ""
+msgstr "Listy przesunięć wg dziennika"
#. module: sale_journal
#: view:sale_journal.picking.journal:0
@@ -546,7 +546,7 @@ msgstr "Zamknij dziennik"
#. module: sale_journal
#: model:ir.ui.menu,name:sale_journal.menu_definition_journal_picking_invoice
msgid "Packing to Invoice"
-msgstr ""
+msgstr "Lista przesunięć do zafakturowania"
#. module: sale_journal
#: model:ir.actions.act_window,name:sale_journal.act_sale_journal_sale_journal_2_sale_order_approved
diff --git a/addons/subscription/i18n/pl.po b/addons/subscription/i18n/pl.po
index 0fe13bd3ad7..d662d72da64 100644
--- a/addons/subscription/i18n/pl.po
+++ b/addons/subscription/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-26 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-05-27 03:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: subscription