diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index 0afe7f878e0..abd3d1f459d 100644
--- a/addons/account/__openerp__.py
+++ b/addons/account/__openerp__.py
@@ -46,14 +46,18 @@ module named account_voucherss
'security/account_security.xml',
'security/ir.model.access.csv',
'account_menuitem.xml',
+ 'account_wizard.xml',
+ 'wizard/account_statement_from_invoice_view.xml',
+ 'wizard/account_move_bank_reconcile_view.xml',
+ 'wizard/account_use_model_view.xml',
+ 'account_view.xml',
+ 'account_report.xml',
'wizard/account_invoice_refund_view.xml',
'wizard/account_period_close_view.xml',
'wizard/account_fiscalyear_close_state.xml',
'wizard/account_chart_view.xml',
- 'wizard/account_move_bank_reconcile_view.xml',
- 'wizard/account_move_line_reconcile_select_view.xml',
'wizard/account_move_journal_view.xml',
- 'account_wizard.xml',
+ 'wizard/account_move_line_reconcile_select_view.xml',
'wizard/account_open_closed_fiscalyear_view.xml',
'wizard/account_move_line_unreconcile_select_view.xml',
'wizard/account_vat_view.xml',
@@ -66,15 +70,19 @@ module named account_voucherss
'wizard/account_journal_select_view.xml',
'wizard/account_change_currency_view.xml',
'wizard/account_validate_move_view.xml',
- 'wizard/account_statement_from_invoice_view.xml',
'wizard/account_pay_invoice_view.xml',
'wizard/account_unreconcile_view.xml',
+ 'wizard/account_general_ledger_report_view.xml',
'wizard/account_invoice_state_view.xml',
+ 'wizard/account_partner_balance_report_view.xml',
+ 'wizard/account_balance_report_view.xml',
+ 'wizard/account_move_line_select_view.xml',
+ 'wizard/account_aged_trial_balance_view.xml',
+ 'wizard/account_compare_account_balance_report_view.xml',
+ 'wizard/account_third_party_ledger.xml',
'project/wizard/project_account_analytic_line_view.xml',
- 'account_view.xml',
'account_end_fy.xml',
'account_invoice_view.xml',
- 'account_report.xml',
'partner_view.xml',
'data/account_invoice.xml',
'data/account_data2.xml',
@@ -91,17 +99,16 @@ module named account_voucherss
'account_installer.xml',
'report/account_invoice_report_view.xml',
'report/account_report_view.xml',
+ 'report/account_analytic_report_view.xml',
],
'demo_xml': [
+ #'demo/price_accuracy00.yml',
'account_demo.xml',
'project/project_demo.xml',
'project/analytic_account_demo.xml',
'demo/account_minimal.xml',
'account_unit_test.xml',
],
- 'test': [
- 'test/price_accuracy00.yml',
- ],
'installable': True,
'active': False,
'certificate': '0080331923549',
diff --git a/addons/account/account.py b/addons/account/account.py
index 12868487c49..74531102073 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -291,7 +291,7 @@ class account_account(osv.osv):
"special effects in Open ERP: view can not have entries, consolidation are accounts that "\
"can have children accounts for multi-company consolidations, payable/receivable are for "\
"partners accounts (for debit/credit computations), closed for depreciated accounts."),
- 'user_type': fields.many2one('account.account.type', 'Account Type', required=True,
+ 'user_type': fields.many2one('account.account.type', 'Account Type', required=True,
help="These types are defined according to your country. The type contains more information "\
"about the account and its specificities."),
'parent_id': fields.many2one('account.account', 'Parent', ondelete='cascade'),
@@ -437,18 +437,18 @@ class account_account(osv.osv):
elif method == 'unlink':
raise osv.except_osv(_('Error !'), _('You cannot remove an account which has account entries!. '))
return True
-
+
def write(self, cr, uid, ids, vals, context=None):
if not context:
context = {}
if 'active' in vals and not vals['active']:
self._check_moves(cr, uid, ids, "write", context)
return super(account_account, self).write(cr, uid, ids, vals, context=context)
-
+
def unlink(self, cr, uid, ids, context={}):
self._check_moves(cr, uid, ids, "unlink", context)
return super(account_account, self).unlink(cr, uid, ids, context)
-
+
account_account()
class account_journal_view(osv.osv):
@@ -791,7 +791,7 @@ class account_move(osv.osv):
for id in ids:
result.setdefault(id, 0.0)
return result
-
+
def _search_amount(self, cr, uid, obj, name, args, context):
ids = []
cr.execute('select move_id,sum(debit) from account_move_line group by move_id')
@@ -801,10 +801,10 @@ class account_move(osv.osv):
if item[1] == '>=':
res = [('id', 'in', [k for k,v in result.iteritems() if v >= item[2]])]
else:
- res = [('id', 'in', [k for k,v in result.iteritems() if v <= item[2]])]
+ res = [('id', 'in', [k for k,v in result.iteritems() if v <= item[2]])]
ids += res
- if not ids:
+ if not ids:
return [('id', '>', '0')]
return ids
@@ -1056,7 +1056,13 @@ class account_move(osv.osv):
if line.account_id.currency_id.id != line.currency_id.id and (line.account_id.currency_id.id != line.account_id.company_id.currency_id.id or line.currency_id):
raise osv.except_osv(_('Error'), _("""Couldn't create move with currency different from the secondary currency of the account "%s - %s". Clear the secondary currency field of the account definition if you want to accept all currencies.""" % (line.account_id.code, line.account_id.name)))
- if abs(amount) < 0.0001:
+ # Check that the move balances, the tolerance for debit/credit must
+ # be smaller than the smallest value according to price accuracy
+ # (hence the +1 below)
+ # Example:
+ # difference == 0.01 is OK iff price_accuracy <= 1!
+ # difference == 0.0001 is OK iff price_accuracy <= 3!
+ if abs(amount) < 10 ** -(int(config['price_accuracy'])+1):
if not len(line_draft_ids):
continue
self.pool.get('account.move.line').write(cr, uid, line_draft_ids, {
@@ -1126,7 +1132,7 @@ class account_move_reconcile(osv.osv):
'name': lambda self,cr,uid,ctx={}: self.pool.get('ir.sequence').get(cr, uid, 'account.reconcile') or '/',
}
def reconcile_partial_check(self, cr, uid, ids, type='auto', context={}):
- total = 0.0
+ total = 0.0
for rec in self.browse(cr, uid, ids, context):
for line in rec.line_partial_ids:
total += (line.debit or 0.0) - (line.credit or 0.0)
@@ -1880,7 +1886,7 @@ account_account_template()
class account_add_tmpl_wizard(osv.osv_memory):
"""Add one more account from the template.
-
+
With the 'nocreate' option, some accounts may not be created. Use this to add them later."""
_name = 'account.addtmpl.wizard'
@@ -1906,7 +1912,7 @@ class account_add_tmpl_wizard(osv.osv_memory):
_defaults = {
'cparent_id': _get_def_cparent,
}
-
+
def action_create(self,cr,uid,ids,context=None):
acc_obj=self.pool.get('account.account')
tmpl_obj=self.pool.get('account.account.template')
@@ -1933,7 +1939,7 @@ class account_add_tmpl_wizard(osv.osv_memory):
# print "Creating:", vals
new_account = acc_obj.create(cr,uid,vals)
return {'type':'state', 'state': 'end' }
-
+
def action_cancel(self,cr,uid,ids,context=None):
return { 'type': 'state', 'state': 'end' }
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index c0bd50eb7bc..9ace27294fa 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1176,7 +1176,7 @@
-
+
@@ -1382,14 +1382,14 @@
[('account_id','child_of', [active_id]),('state','<>','draft')]
{'account_id':active_id}
-
-
-
-
- Account Entries
-
-
-
+
+
+
+
+
+
+
+
diff --git a/addons/account/account_wizard.xml b/addons/account/account_wizard.xml
index 148491fb2a1..93dba0e5249 100644
--- a/addons/account/account_wizard.xml
+++ b/addons/account/account_wizard.xml
@@ -1,12 +1,12 @@
-
+
+
+
+
+
+
@@ -71,19 +71,21 @@
-->
-
-
-
+
-
-
+
+
+
-
-
+
+
+
-
-
@@ -96,20 +98,20 @@
-->
-
-
+
+
-
+
-
-
+
+
-
-
+
+
+
+
+
+
@@ -44,60 +50,85 @@
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -110,6 +141,7 @@
account.invoice.report
form
tree,graph
+ {'search_default_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}
diff --git a/addons/account/report/aged_trial_balance.py b/addons/account/report/aged_trial_balance.py
index c13ea96ea50..26e24031c3a 100644
--- a/addons/account/report/aged_trial_balance.py
+++ b/addons/account/report/aged_trial_balance.py
@@ -18,8 +18,8 @@
# along with this program. If not, see .
#
##############################################################################
-
import time
+
import pooler
import rml_parse
from report import report_sxw
@@ -45,7 +45,6 @@ class aged_trial_report(rml_parse.rml_parse):
def _get_lines(self, form):
-
if (form['result_selection'] == 'customer' ):
self.ACCOUNT_TYPE = ['receivable']
elif (form['result_selection'] == 'supplier'):
diff --git a/addons/account/report/compare_account_balance.py b/addons/account/report/compare_account_balance.py
index 52205055298..28054377834 100755
--- a/addons/account/report/compare_account_balance.py
+++ b/addons/account/report/compare_account_balance.py
@@ -368,15 +368,15 @@ class account_balance(report_sxw.rml_parse):
self.total_for_perc=self.linesForTotal(form,ids={},doneAccount={},level=1)
self.done_total=0
- for t1 in range(0,len(form['fiscalyear'][0][2])):
+ for t1 in range(0,len(form['fiscalyear'])):
locale.setlocale(locale.LC_ALL, '')
self.result_total["sum_credit" + str(t1)]=locale.format("%.2f", self.result_total["sum_credit" + str(t1)], grouping=True)
self.result_total["sum_debit" + str(t1)]=locale.format("%.2f", self.result_total["sum_debit" + str(t1)], grouping=True)
# self.flag=1
# self.result_total = {}
- for temp in range(0,len(form['fiscalyear'][0][2])):
- fy=self.pool.get('account.fiscalyear').name_get(self.cr,self.uid,form['fiscalyear'][0][2][temp])
+ for temp in range(0,len(form['fiscalyear'])):
+ fy=self.pool.get('account.fiscalyear').name_get(self.cr,self.uid,form['fiscalyear'][temp])
years["year"+str(temp)]=fy[0][1][12:16]
return [years]
@@ -395,11 +395,11 @@ class account_balance(report_sxw.rml_parse):
ctx = self.context.copy()
result_total_parent=[]
- for id in form['fiscalyear'][0][2]:
+ for id in form['fiscalyear']:
tmp=[]
ctx['fiscalyear'] = id
- ctx['periods'] = form['periods'][0][2]
+ ctx['periods'] = form['periods']
ctx['period_manner'] = form['period_manner']
ctx['state'] = form['context'].get('state','all')
tmp = self.pool.get('account.account').browse(self.cr, self.uid, ids, ctx.copy())
@@ -453,10 +453,10 @@ class account_balance(report_sxw.rml_parse):
result = []
ctx = self.context.copy()
tmp1=[]
- for id in form['fiscalyear'][0][2]:
+ for id in form['fiscalyear']:
ctx['fiscalyear'] = id
- ctx['periods'] = form['periods'][0][2]
+ ctx['periods'] = form['periods']
ctx['period_manner']=form['period_manner']
ctx['state'] = form['context'].get('state','all')
tmp1 = self.pool.get('account.account').browse(self.cr, self.uid, ids,ctx.copy())
@@ -571,7 +571,7 @@ class account_balance(report_sxw.rml_parse):
if entry[0].child_id:
- for q in range(0,len(form['fiscalyear'][0][2])):
+ for q in range(0,len(form['fiscalyear'])):
self.baldiv["baldiv"+str(level)+str(q)]=entry[q].balance
ids2 = [(x.code,x.id) for x in entry[0].child_id]
@@ -579,7 +579,7 @@ class account_balance(report_sxw.rml_parse):
dir=[]
dir += self.lines(form, [x[1] for x in ids2], done, level+1)
if dir==[]:
- for w in range(0,len(form['fiscalyear'][0][2])):
+ for w in range(0,len(form['fiscalyear'])):
if entry[w].credit <> 0.0 or entry[w].debit <> 0.0 or entry[w].balance<>0.00:
dont_pop=1
break
@@ -597,9 +597,9 @@ class account_balance(report_sxw.rml_parse):
def get_years(self,form):
result =[]
res={}
- for temp in range(0,len(form['fiscalyear'][0][2])):
+ for temp in range(0,len(form['fiscalyear'])):
res={}
- fy=self.pool.get('account.fiscalyear').name_get(self.cr,self.uid,form['fiscalyear'][0][2][temp])
+ fy=self.pool.get('account.fiscalyear').name_get(self.cr,self.uid,form['fiscalyear'][temp])
res['year']=fy[0][1]
res['last_str']=temp
diff --git a/addons/account/report/general_ledger.py b/addons/account/report/general_ledger.py
index b06aa1198fc..00031a77ed8 100644
--- a/addons/account/report/general_ledger.py
+++ b/addons/account/report/general_ledger.py
@@ -41,7 +41,7 @@ class general_ledger(rml_parse.rml_parse):
##
new_ids = []
if (data['model'] == 'account.account'):
- new_ids = ids
+ new_ids = 'active_ids' in data['form']['context'] and data['form']['context']['active_ids'] or []
else:
new_ids.append(data['form']['Account_list'])
@@ -117,7 +117,7 @@ class general_ledger(rml_parse.rml_parse):
borne_max = res[0]['stop_date']
if form['state'] == 'byperiod':
## This function will return the most aged date
- periods = form['periods'][0][2]
+ periods = form['periods']
if not periods:
self.cr.execute("""
Select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.fiscalyear_id = %s""",(form['fiscalyear'],))
@@ -131,13 +131,16 @@ class general_ledger(rml_parse.rml_parse):
borne_min = form['date_from']
borne_max = form['date_to']
elif form['state'] == 'all':
- periods = form['periods'][0][2]
+ periods = form['periods']
if not periods:
- self.cr.execute("""
- Select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.fiscalyear_id = %s""",(form['fiscalyear'],))
+ if form['fiscalyear'] == False:
+ fiscalyears = self.pool.get('account.fiscalyear').search(self.cr, self.uid, [('state', '=', 'draft')])
+ else:
+ fiscalyears = [form['fiscalyear']]
+ self.cr.execute("select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.fiscalyear_id =ANY(%s)" ,(fiscalyears,))
else:
- self.cr.execute("""
- Select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.id =ANY(%s)""",(periods,))
+ self.cr.execute("""
+ Select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.id =ANY(%s)""",(periods,))
res = self.cr.dictfetchall()
period_min = res[0]['start_date']
period_max = res[0]['stop_date']
@@ -180,7 +183,7 @@ class general_ledger(rml_parse.rml_parse):
ctx['state'] = form['context'].get('state','all')
if form.has_key('fiscalyear'):
ctx['fiscalyear'] = form['fiscalyear']
- ctx['periods'] = form['periods'][0][2]
+ ctx['periods'] = form['periods']
else:
ctx['date_from'] = form['date_from']
ctx['date_to'] = form['date_to']
diff --git a/addons/account/report/general_ledger_landscape.py b/addons/account/report/general_ledger_landscape.py
index c888994622b..472f0675519 100644
--- a/addons/account/report/general_ledger_landscape.py
+++ b/addons/account/report/general_ledger_landscape.py
@@ -42,12 +42,10 @@ class general_ledger_landscape(rml_parse.rml_parse):
##
new_ids = []
if (data['model'] == 'account.account'):
- new_ids = ids
+ new_ids = 'active_ids' in data['form']['context'] and data['form']['context']['active_ids'] or []
else:
new_ids.append(data['form']['Account_list'])
-
objects = self.pool.get('account.account').browse(self.cr, self.uid, new_ids)
-
super(general_ledger_landscape, self).set_context(objects, data, new_ids,report_type)
def __init__(self, cr, uid, name, context):
@@ -118,7 +116,7 @@ class general_ledger_landscape(rml_parse.rml_parse):
borne_max = res[0]['stop_date']
if form['state'] == 'byperiod':
## This function will return the most aged date
- periods = form['periods'][0][2]
+ periods = form['periods']
if not periods:
self.cr.execute("""
Select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.fiscalyear_id = %s""" ,(form['fiscalyear'],))
@@ -133,11 +131,13 @@ class general_ledger_landscape(rml_parse.rml_parse):
borne_min = form['date_from']
borne_max = form['date_to']
elif form['state'] == 'all':
- periods = form['periods'][0][2]
+ periods = form['periods']
if not periods:
- self.cr.execute("""
- Select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.fiscalyear_id = = %s""" ,(form['fiscalyear'],))
-
+ if form['fiscalyear'] == False:
+ fiscalyears = self.pool.get('account.fiscalyear').search(self.cr, self.uid, [('state', '=', 'draft')])
+ else:
+ fiscalyears = [form['fiscalyear']]
+ self.cr.execute("select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.fiscalyear_id =ANY(%s)" ,(fiscalyears,))
else:
self.cr.execute("""
Select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.id =ANY(%s)""",(periods,))
@@ -182,7 +182,7 @@ class general_ledger_landscape(rml_parse.rml_parse):
ctx['state'] = form['context'].get('state','all')
if form.has_key('fiscalyear'):
ctx['fiscalyear'] = form['fiscalyear']
- ctx['periods'] = form['periods'][0][2]
+ ctx['periods'] = form['periods']
else:
ctx['date_from'] = form['date_from']
ctx['date_to'] = form['date_to']
diff --git a/addons/account/report/partner_balance.py b/addons/account/report/partner_balance.py
index a5b746a0bde..f296475cb3f 100755
--- a/addons/account/report/partner_balance.py
+++ b/addons/account/report/partner_balance.py
@@ -67,10 +67,10 @@ class partner_balance(report_sxw.rml_parse):
## Get All Period Date
#
# If we have no period we will take all perdio in the FiscalYear.
- if not data['form']['periods'][0][2] :
+ if not data['form']['periods']:
periods_id = self.pool.get('account.period').search(self.cr, self.uid, [('fiscalyear_id','=',data['form']['fiscalyear'])])
else:
- periods_id = data['form']['periods'][0][2]
+ periods_id = data['form']['periods']
date_array = []
for period_id in periods_id:
period_obj = self.pool.get('account.period').browse(self.cr, self.uid, period_id)
@@ -85,35 +85,38 @@ class partner_balance(report_sxw.rml_parse):
self.date_lst.sort()
def transform_both_into_date_array(self,data):
- if not data['form']['periods'][0][2] :
+ final_date_array = []
+ date_start_date = data['form']['date1']
+ date_stop_date = data['form']['date2']
+ if not data['form']['periods']:
periods_id = self.pool.get('account.period').search(self.cr, self.uid, [('fiscalyear_id','=',data['form']['fiscalyear'])])
else:
- periods_id = data['form']['periods'][0][2]
+ periods_id = data['form']['periods']
date_array = []
- for period_id in periods_id:
- period_obj = self.pool.get('account.period').browse(self.cr, self.uid, period_id)
- date_array = date_array + self.date_range(period_obj.date_start,period_obj.date_stop)
+ if periods_id:
+ for period_id in periods_id:
+ period_obj = self.pool.get('account.period').browse(self.cr, self.uid, period_id)
+ date_array = date_array + self.date_range(period_obj.date_start,period_obj.date_stop)
+ period_start_date = date_array[0]
+ period_stop_date = date_array[-1]
- period_start_date = date_array[0]
- date_start_date = data['form']['date1']
- period_stop_date = date_array[-1]
- date_stop_date = data['form']['date2']
+ if period_start_date).
+#
+# 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 .
+#
+##############################################################################
+
+#
+# TODO: move this in a YAML test with !python tag
+#
+
+import xmlrpclib
+
+DB = 'training3'
+USERID = 1
+USERPASS = 'admin'
+
+
+sock = xmlrpclib.ServerProxy('http://%s:%s/xmlrpc/object' % ('localhost',8069))
+
+ids = sock.execute(DB, USERID, USERPASS, 'account.account', 'search', [], {})
+account_lists = sock.execute(DB, USERID, USERPASS, 'account.account', 'read', ids, ['parent_id','parent_left','parent_right'])
+
+accounts = dict(map(lambda x: (x['id'],x), account_lists))
+for a in account_lists:
+ if a['parent_id']:
+ assert a['parent_left'] > accounts[a['parent_id'][0]]['parent_left']
+ assert a['parent_right'] < accounts[a['parent_id'][0]]['parent_right']
+ assert a['parent_left'] < a['parent_right']
+ for a2 in account_lists:
+ assert not ((a2['parent_right']>a['parent_left']) and
+ (a2['parent_left']a['parent_left']) and (a2['parent_right'] parent_right of all childs
- . if an account is a child it is included in parent_left-parent_right
- . if an account is not a child it is not included in parent_left-parent_right
+-
+ We retrieve all accounts and test they are in a tree data structure.
-
!python {model: account.account}: |
ids = self.search(cr, uid, [])
diff --git a/addons/account/wizard/__init__.py b/addons/account/wizard/__init__.py
index e9ca2487604..91fb10e5205 100644
--- a/addons/account/wizard/__init__.py
+++ b/addons/account/wizard/__init__.py
@@ -30,25 +30,24 @@ import account_move_journal
import account_journal_select
import account_move_bank_reconcile
import account_subscription_generate
-import wizard_aged_trial_balance
-import wizard_general_ledger_report
-import wizard_third_party_ledger
-import wizard_account_balance_report
-import wizard_partner_balance_report
+import account_aged_trial_balance
+import account_general_ledger_report
+import account_third_party_ledger
+import account_partner_balance_report
+import account_balance_report
import account_period_close
import account_fiscalyear_close
import account_fiscalyear_close_state
import account_vat
import account_open_closed_fiscalyear
-import wizard_compare_account_balance_report
+import account_compare_account_balance_report
import account_invoice_state
-import wizard_account_duplicate
import account_chart
-import wizard_move_line_select
+import account_move_line_select
import account_validate_account_move
-import wizard_use_model
+import account_use_model
import account_state_open
diff --git a/addons/account/wizard/account_aged_trial_balance.py b/addons/account/wizard/account_aged_trial_balance.py
new file mode 100755
index 00000000000..bdcb8af735a
--- /dev/null
+++ b/addons/account/wizard/account_aged_trial_balance.py
@@ -0,0 +1,106 @@
+# -*- 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 .
+#
+##############################################################################
+import time
+import datetime
+from mx.DateTime import *
+
+from osv import osv, fields
+from tools.translate import _
+
+class account_aged_trial_balance(osv.osv_memory):
+
+ _name = 'account.aged.trial.balance'
+ _description = 'Account Aged Trial balance Report'
+
+ _columns = {
+ 'company_id': fields.many2one('res.company', 'Company', required=True),
+ 'period_length':fields.integer('Period length (days)', required=True),
+ 'date1': fields.date('Start of period', required=True),
+ 'result_selection': fields.selection([('customer','Receivable'),
+ ('supplier','Payable'),
+ ('all','Receivable and Payable')],
+ 'Filter on Partners', required=True),
+ 'direction_selection': fields.selection([('past','Past'),
+ ('future','Future')],
+ 'Analysis Direction', required=True),
+ }
+
+ def _get_company(self, cr, uid, ids, context=None):
+ user_obj = self.pool.get('res.users')
+ company_obj = self.pool.get('res.company')
+ if context is None:
+ context = {}
+ user = user_obj.browse(cr, uid, uid, context=context)
+ if user.company_id:
+ return user.company_id.id
+ else:
+ return company_obj.search(cr, uid, [('parent_id', '=', False)])[0]
+
+ _defaults = {
+ 'company_id' : _get_company,
+ 'period_length' : 30,
+ 'date1' : time.strftime('%Y-%m-%d'),
+ 'result_selection' : 'all',
+ 'direction_selection' : 'past',
+ }
+
+ def calc_dates(self, cr, uid, ids, context=None):
+ fiscalyear_obj = self.pool.get('account.fiscalyear')
+ data={}
+ res = {}
+ if context is None:
+ context = {}
+ data['ids'] = context.get('active_ids',[])
+ data['model'] = 'res.partner'
+ data['form'] = self.read(cr, uid, ids, [])[0]
+ data['form']['fiscalyear'] = fiscalyear_obj.find(cr, uid)
+ period_length = data['form']['period_length']
+ if period_length<=0:
+ raise osv.except_osv(_('UserError'), _('You must enter a period length that cannot be 0 or below !'))
+ start = datetime.date.fromtimestamp(time.mktime(time.strptime(data['form']['date1'],"%Y-%m-%d")))
+ start = DateTime(int(start.year),int(start.month),int(start.day))
+ if data['form']['direction_selection'] == 'past':
+ for i in range(5)[::-1]:
+ stop = start - RelativeDateTime(days=period_length)
+ res[str(i)] = {
+ 'name' : str((5-(i+1))*period_length) + '-' + str((5-i)*period_length),
+ 'stop': start.strftime('%Y-%m-%d'),
+ 'start' : stop.strftime('%Y-%m-%d'),
+ }
+ start = stop - RelativeDateTime(days=1)
+ else:
+ for i in range(5):
+ stop = start + RelativeDateTime(days=period_length)
+ res[str(5-(i+1))] = {
+ 'name' : str((i)*period_length)+'-'+str((i+1)*period_length),
+ 'start': start.strftime('%Y-%m-%d'),
+ 'stop' : stop.strftime('%Y-%m-%d'),
+ }
+ start = stop + RelativeDateTime(days=1)
+ data['form'].update(res)
+ return {
+ 'type': 'ir.actions.report.xml',
+ 'report_name': 'account.aged_trial_balance',
+ 'datas': data,
+ }
+
+account_aged_trial_balance()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_aged_trial_balance_view.xml b/addons/account/wizard/account_aged_trial_balance_view.xml
new file mode 100644
index 00000000000..7984f69e86e
--- /dev/null
+++ b/addons/account/wizard/account_aged_trial_balance_view.xml
@@ -0,0 +1,48 @@
+
+
+
+
+
+ Aged Partner Balance
+ account.aged.trial.balance
+ form
+
+
+
+
+
+
+ Aged Partner Balance
+ account.aged.trial.balance
+ ir.actions.act_window
+ form
+ tree,form
+
+ {'record_id':active_id}
+ new
+
+
+
+
+
+
diff --git a/addons/account/wizard/account_balance_report.py b/addons/account/wizard/account_balance_report.py
new file mode 100644
index 00000000000..2873f479629
--- /dev/null
+++ b/addons/account/wizard/account_balance_report.py
@@ -0,0 +1,136 @@
+# -*- 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 .
+#
+##############################################################################
+import time
+
+from osv import osv, fields
+from tools.translate import _
+
+class account_balance_report(osv.osv_memory):
+ """
+ This wizard will provide the account balance report by periods, between any two dates.
+ """
+ _name = 'account.balance.report'
+ _description = 'Account Balance Report'
+ _columns = {
+ 'Account_list': fields.many2one('account.account', 'Chart account',
+ required=True, domain = [('parent_id','=',False)]),
+ 'company_id': fields.many2one('res.company', 'Company', required=True),
+ 'display_account': fields.selection([('bal_mouvement','With movements'),
+ ('bal_all','All'),
+ ('bal_solde','With balance is not equal to 0'),
+ ],'Display accounts'),
+ 'fiscalyear': fields.many2one('account.fiscalyear', 'Fiscal year', help='Keep empty for all open fiscal year'),
+ 'state': fields.selection([('bydate','By Date'),
+ ('byperiod','By Period'),
+ ('all','By Date and Period'),
+ ('none','No Filter')
+ ],'Date/Period Filter'),
+ 'periods': fields.many2many('account.period', 'period_account_balance_rel',
+ 'report_id', 'period_id', 'Periods',
+ help='Keep empty for all open fiscal year'),
+ 'date_from': fields.date('Start date', required=True),
+ 'date_to': fields.date('End date', required=True),
+ }
+
+ def _get_company(self, cr, uid, ids, context=None):
+ user_obj = self.pool.get('res.users')
+ company_obj = self.pool.get('res.company')
+ user = user_obj.browse(cr, uid, uid, context=context)
+ if user.company_id:
+ return user.company_id.id
+ else:
+ return company_obj.search(cr, uid, [('parent_id', '=', False)])[0]
+
+ _defaults={
+ 'state' : 'none',
+ 'date_from' : time.strftime('%Y-01-01'),
+ 'date_to' : time.strftime('%Y-%m-%d'),
+ 'company_id' : _get_company,
+ 'fiscalyear' : False,
+ 'display_account': 'bal_all',
+ }
+
+ def next_view(self, cr, uid, ids, context=None):
+ obj_model = self.pool.get('ir.model.data')
+ if context is None:
+ context = {}
+ data = self.read(cr, uid, ids, [])[0]
+ context.update({'Account_list': data['Account_list']})
+ model_data_ids = obj_model.search(cr,uid,[('model','=','ir.ui.view'),('name','=','account_balance_report_view')])
+ resource_id = obj_model.read(cr, uid, model_data_ids, fields=['res_id'])[0]['res_id']
+ return {
+ 'view_type': 'form',
+ 'view_mode': 'form',
+ 'res_model': 'account.balance.report',
+ 'views': [(resource_id,'form')],
+ 'type': 'ir.actions.act_window',
+ 'target': 'new',
+ 'context': context
+ }
+
+ def check_state(self, cr, uid, ids, context=None):
+ if context is None:
+ context = {}
+ data={}
+ data['ids'] = context['active_ids']
+ data['form'] = self.read(cr, uid, ids, ['date_from', 'company_id', 'state', 'periods', 'date_to', 'display_account', 'fiscalyear'])[0]
+ data['form']['Account_list'] = context.get('Account_list',[])
+ data['form']['context'] = context
+ if data['form']['Account_list']:
+ data['model'] = 'ir.ui.menu'
+ else:
+ data['model'] = 'account.account'
+
+ if data['form']['state'] == 'bydate' :
+ return self._check_date(cr, uid, data, context)
+ elif data['form']['state'] == 'byperiod':
+ if not data['form']['periods']:
+ raise osv.except_osv(_('Warning'),_('Please Enter Periods ! '))
+
+ return {
+ 'type': 'ir.actions.report.xml',
+ 'report_name': 'account.account.balance',
+ 'datas': data,
+ }
+
+ def _check_date(self, cr, uid, data, context=None):
+ if context is None:
+ context = {}
+ sql = """
+ SELECT f.id, f.date_start, f.date_stop FROM account_fiscalyear f Where %s between f.date_start and f.date_stop """
+ cr.execute(sql,(data['form']['date_from'],))
+ res = cr.dictfetchall()
+ if res:
+
+ if (data['form']['date_to'] > res[0]['date_stop'] or data['form']['date_to'] < res[0]['date_start']):
+ raise osv.except_osv(_('UserError'),_('Date to must be set between %s and %s') % (res[0]['date_start'], res[0]['date_stop']))
+ else:
+ return {
+ 'type': 'ir.actions.report.xml',
+ 'report_name': 'account.account.balance',
+ 'datas': data,
+ }
+ else:
+ raise osv.except_osv(_('UserError'),_('Date not in a defined fiscal year'))
+
+account_balance_report()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_balance_report_view.xml b/addons/account/wizard/account_balance_report_view.xml
new file mode 100644
index 00000000000..dd1b7147f13
--- /dev/null
+++ b/addons/account/wizard/account_balance_report_view.xml
@@ -0,0 +1,93 @@
+
+
+
+
+
+ Select period
+ account.balance.report
+ form
+
+
+
+
+
+
+ Account Balance
+ account.balance.report
+ ir.actions.act_window
+ form
+ form
+
+ new
+
+
+
+
+
+ Account Balance
+ client_print_multi
+
+ action
+ account.account
+
+
+
+ Account Balance
+ account.balance.report
+ form
+
+
+
+
+
+
+ Select Account
+ account.balance.report
+ ir.actions.act_window
+ form
+ tree,form
+
+ {'record_id':active_id}
+ new
+
+
+
+
+
+
diff --git a/addons/account/wizard/account_compare_account_balance_report.py b/addons/account/wizard/account_compare_account_balance_report.py
new file mode 100755
index 00000000000..fd1d4d55ada
--- /dev/null
+++ b/addons/account/wizard/account_compare_account_balance_report.py
@@ -0,0 +1,136 @@
+# -*- 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 .
+#
+##############################################################################
+
+import time
+
+from osv import osv, fields
+from tools.translate import _
+
+class account_compare_account_balance_report(osv.osv_memory):
+ """
+ This wizard will provide the account balance comparision report by fiscal years.
+ """
+ _name = 'account.compare.account.balance.report'
+ _description = 'Account Balance Report'
+ _columns = {
+ 'fiscalyear': fields.many2many('account.fiscalyear', 'account_fiscalyear_rel','account_id','fiscalyear_id','Fiscal year', help='Keep empty for all open fiscal year'),
+ 'select_account': fields.many2one('account.account','Select Reference Account(for % comparision)',help='Keep empty for comparision to its parent'),
+ 'account_choice': fields.selection([('all','All accounts'),
+ ('bal_zero','With balance is not equal to 0'),
+ ('moves','With movements')],'Show Accounts'),
+ 'show_columns': fields.boolean('Show Debit/Credit Information'),
+ 'landscape': fields.boolean('Show Report in Landscape Form'),
+ 'format_perc': fields.boolean('Show Comparision in %'),
+ 'compare_pattern': fields.selection([('bal_cash','Cash'),
+ ('bal_perc','Percentage'),
+ ('none','Don'+ "'" +'t Compare')],'Compare Selected Years In Terms Of'),
+ 'period_manner': fields.selection([('actual','Financial Period'),('created','Creation Date')],'Entries Selection Based on'),
+ 'periods': fields.many2many('account.period', 'period_account_balance_rel',
+ 'report_id', 'period_id', 'Periods',
+ help='Keep empty for all open fiscal year'),
+ }
+
+ _defaults={
+ 'compare_pattern': 'none',
+ 'account_choice': 'moves',
+ 'period_manner': 'actual',
+ }
+
+ def check(self, cr, uid, ids, context=None):
+ data={}
+ if context is None:
+ context = {}
+ data = {
+ 'ids':context['active_ids'],
+ 'form': self.read(cr, uid, ids, ['fiscalyear', 'select_account', 'account_choice', 'periods', 'show_columns', 'landscape', 'format_perc','compare_pattern','period_manner'])[0],
+ }
+
+ data['form']['context'] = context
+ if (len(data['form']['fiscalyear'])==0) or (len(data['form']['fiscalyear'])>1 and (data['form']['compare_pattern']!='none') and (data['form']['format_perc']==1) and (data['form']['show_columns']==1) and (data['form']['landscape']!=1)):
+ raise osv.except_osv(_('Warning !'), _('You have to select at least 1 Fiscal Year. \nYou may have selected the compare options with more than 1 year with credit/debit columns and % option.This can lead contents to be printed out of the paper.Please try again.'))
+
+
+ if ((len(data['form']['fiscalyear'])==3) and (data['form']['format_perc']!=1) and (data['form']['show_columns']!=1)):
+ if data['form']['landscape']==1:
+ return {
+ 'type': 'ir.actions.report.xml',
+ 'report_name': 'account.account.balance.landscape',
+ 'datas': data,
+ }
+ else:
+ return {
+ 'type': 'ir.actions.report.xml',
+ 'report_name': 'account.balance.account.balance',
+ 'datas': data,
+ }
+ if data['form']['format_perc']==1:
+ if len(data['form']['fiscalyear'])<=2:
+ if data['form']['landscape']==1:
+ return {
+ 'type': 'ir.actions.report.xml',
+ 'report_name': 'account.account.balance.landscape',
+ 'datas': data,
+ }
+ else:
+ return {
+ 'type': 'ir.actions.report.xml',
+ 'report_name': 'account.balance.account.balance',
+ 'datas': data,
+ }
+ else:
+ if len(data['form']['fiscalyear'])==3:
+ if data['form']['landscape']==1:
+ return {
+ 'type': 'ir.actions.report.xml',
+ 'report_name': 'account.account.balance.landscape',
+ 'datas': data,
+ }
+ else:
+ raise osv.except_osv(_('Warning !'), _('You might have done following mistakes. Please correct them and try again. \n 1. You have selected more than 3 years in any case. \n 2. You have not selected Percentage option, but you have selected more than 2 years. \n You can select maximum 3 years. Please check again. \n 3. You have selected Percentage option with more than 2 years, but you have not selected landscape format. You have to select Landscape option. Please Check it.'))
+ else:
+ raise osv.except_osv(_('Warning !'), _('You might have done following mistakes. Please correct them and try again. \n 1. You have selected more than 3 years in any case. \n 2. You have not selected Percentage option, but you have selected more than 2 years. \n You can select maximum 3 years. Please check again. \n 3. You have selected Percentage option with more than 2 years, but you have not selected landscape format. You have to select Landscape option. Please Check it.'))
+ else:
+ if len(data['form']['fiscalyear'])>2:
+ if data['form']['landscape']==1:
+ return {
+ 'type': 'ir.actions.report.xml',
+ 'report_name': 'account.account.balance.landscape',
+ 'datas': data,
+ }
+ else:
+ raise osv.except_osv(_('Warning !'), _('You might have done following mistakes. Please correct them and try again. \n 1. You have selected more than 3 years in any case. \n 2. You have not selected Percentage option, but you have selected more than 2 years. \n You can select maximum 3 years. Please check again. \n 3. You have selected Percentage option with more than 2 years, but you have not selected landscape format. You have to select Landscape option. Please Check it.'))
+ else:
+ if data['form']['landscape']==1:
+ return {
+ 'type': 'ir.actions.report.xml',
+ 'report_name': 'account.account.balance.landscape',
+ 'datas': data,
+ }
+ else:
+ return {
+ 'type': 'ir.actions.report.xml',
+ 'report_name': 'account.balance.account.balance',
+ 'datas': data,
+ }
+account_compare_account_balance_report()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/account/wizard/account_compare_account_balance_report_view.xml b/addons/account/wizard/account_compare_account_balance_report_view.xml
new file mode 100644
index 00000000000..e153d11bfaa
--- /dev/null
+++ b/addons/account/wizard/account_compare_account_balance_report_view.xml
@@ -0,0 +1,51 @@
+
+
+
+
+
+ account.compare.account.balance.report.form
+ account.compare.account.balance.report
+ form
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/addons/account/wizard/account_general_ledger_report.py b/addons/account/wizard/account_general_ledger_report.py
new file mode 100644
index 00000000000..6292709e29d
--- /dev/null
+++ b/addons/account/wizard/account_general_ledger_report.py
@@ -0,0 +1,151 @@
+# -*- 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 .
+#
+##############################################################################
+import time
+
+from osv import fields, osv
+from tools.translate import _
+import tools
+
+class account_general_ledger_report(osv.osv_memory):
+ _name = "account.general.ledger.report"
+ _description = "General Ledger Report"
+
+ _columns = {
+ 'Account_list': fields.many2one('account.account', 'Chart account', required=True, domain = [('parent_id','=',False)]),
+
+ 'company_id': fields.many2one('res.company', 'Company', required=True),
+ 'state': fields.selection([('bydate','By Date'),
+ ('byperiod','By Period'),
+ ('all','By Date and Period'),
+ ('none','No Filter')],"Date/Period Filter"),
+ 'fiscalyear': fields.many2one('account.fiscalyear', 'Fiscal year', help='Keep empty for all open fiscal year'),
+ 'periods': fields.many2many('account.period', 'ledger_period_rel', 'ledger_id', 'period_id', 'Periods', help='All periods if empty' ),
+ 'sortbydate': fields.selection([('sort_date','Date'),
+ ('sort_mvt','Movement')],"Sort by:"),
+ 'display_account': fields.selection([('bal_mouvement','With movements'),
+ ('bal_all','All'),
+ ('bal_solde','With balance is not equal to 0')],"Display accounts"),
+ 'landscape': fields.boolean("Landscape Mode"),
+ 'soldeinit': fields.boolean("Include initial balances"),
+ 'amount_currency': fields.boolean("With Currency"),
+ 'date_from': fields.date("Start date", required=True),
+ 'date_to': fields.date("End date", required=True)
+ }
+
+ def _get_company(self, cr, uid, ids, context=None):
+ user_obj = self.pool.get('res.users')
+ company_obj = self.pool.get('res.company')
+ if context is None:
+ context = {}
+ user = user_obj.browse(cr, uid, uid, context=context)
+ if user.company_id:
+ return user.company_id.id
+ else:
+ return company_obj.search(cr, uid, [('parent_id', '=', False)])[0]
+
+ _defaults = {
+ 'state' : 'none',
+ 'date_from' : lambda *a: time.strftime('%Y-01-01'),
+ 'date_to' : lambda *a: time.strftime('%Y-%m-%d'),
+ 'company_id' : _get_company,
+ 'display_account' : 'bal_all',
+ 'sortbydate' : 'sort_date',
+ 'fiscalyear' : False,
+ 'landscape': True,
+ 'amount_currency' : True,
+ }
+
+ def next_view(self, cr, uid, ids, context=None):
+ obj_model = self.pool.get('ir.model.data')
+ if context is None:
+ context = {}
+ data = self.read(cr, uid, ids, [])[0]
+ context.update({'Account_list': data['Account_list']})
+ model_data_ids = obj_model.search(cr,uid,[('model','=','ir.ui.view'),('name','=','account_general_ledger_report_view')])
+ resource_id = obj_model.read(cr, uid, model_data_ids, fields=['res_id'])[0]['res_id']
+ return {
+ 'view_type': 'form',
+ 'view_mode': 'form',
+ 'res_model': 'account.general.ledger.report',
+ 'views': [(resource_id,'form')],
+ 'type': 'ir.actions.act_window',
+ 'target': 'new',
+ 'context': context
+ }
+
+ def _check_date(self, cr, uid, data, context=None):
+ if context is None:
+ context = {}
+ sql = """
+ SELECT f.id, f.date_start, f.date_stop FROM account_fiscalyear f Where %s between f.date_start and f.date_stop """
+ cr.execute(sql,(data['form']['date_from'],))
+ res = cr.dictfetchall()
+ if res:
+ if (data['form']['date_to'] > res[0]['date_stop'] or data['form']['date_to'] < res[0]['date_start']):
+ raise osv.except_osv(_('UserError'),_('Date to must be set between %s and %s') % (str(res[0]['date_start']), str(res[0]['date_stop'])))
+ else:
+ if data['form']['landscape'] == True:
+ return {
+ 'type': 'ir.actions.report.xml',
+ 'report_name': 'account.general.ledger_landscape',
+ 'datas': data,
+ }
+ else:
+ return {
+ 'type': 'ir.actions.report.xml',
+ 'report_name': 'account.general.ledger',
+ 'datas': data,
+ }
+ else:
+ raise osv.except_osv(_('UserError'),_('Date not in a defined fiscal year'))
+
+ def check_report(self, cr, uid, ids, context=None):
+ if context is None:
+ context = {}
+ data={}
+ data['ids'] = context.get('active_ids',[])
+ data['form'] = self.read(cr, uid, ids, ['date_from', 'sortbydate', 'company_id', 'soldeinit', 'state', 'periods', 'date_to', 'amount_currency', 'display_account', 'landscape', 'fiscalyear'])[0]
+ data['form']['Account_list'] = context.get('Account_list',[])
+ if data['form']['Account_list']:
+ data['model'] = 'ir.ui.menu'
+ else:
+ data['model'] = 'account.account'
+ data['form']['context'] = context
+ if data['form']['state'] == 'bydate':
+ return self._check_date(cr, uid, data, context)
+ elif data['form']['state'] == 'byperiod':
+ if not data['form']['periods']:
+ raise osv.except_osv(_('Data Insufficient !'),_('Please select periods.'))
+ if data['form']['landscape'] == True:
+ return {
+ 'type': 'ir.actions.report.xml',
+ 'report_name': 'account.general.ledger_landscape',
+ 'datas': data,
+ }
+ else:
+ return {
+ 'type': 'ir.actions.report.xml',
+ 'report_name': 'account.general.ledger',
+ 'datas': data,
+ }
+account_general_ledger_report()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_general_ledger_report_view.xml b/addons/account/wizard/account_general_ledger_report_view.xml
new file mode 100644
index 00000000000..0790a1654b9
--- /dev/null
+++ b/addons/account/wizard/account_general_ledger_report_view.xml
@@ -0,0 +1,102 @@
+
+
+
+
+
+ General Ledger
+ account.general.ledger.report
+ form
+
+
+
+
+
+
+ General Ledger
+ ir.actions.act_window
+ account.general.ledger.report
+ form
+ form
+
+ new
+
+
+
+
+
+ Account General Ledger
+ client_print_multi
+
+ action
+ account.account
+
+
+
+ General Ledger
+ account.general.ledger.report
+ form
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/account/wizard/account_move_line_reconcile_select_view.xml b/addons/account/wizard/account_move_line_reconcile_select_view.xml
index ae7f9567748..dbd25408fe1 100644
--- a/addons/account/wizard/account_move_line_reconcile_select_view.xml
+++ b/addons/account/wizard/account_move_line_reconcile_select_view.xml
@@ -31,9 +31,6 @@
new
-
-
diff --git a/addons/account/wizard/wizard_move_line_select.py b/addons/account/wizard/account_move_line_select.py
similarity index 58%
rename from addons/account/wizard/wizard_move_line_select.py
rename to addons/account/wizard/account_move_line_select.py
index 76ff699e4e9..474018e2fde 100644
--- a/addons/account/wizard/wizard_move_line_select.py
+++ b/addons/account/wizard/account_move_line_select.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL ().
#
@@ -15,54 +15,61 @@
# 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 .
+# along with this program. If not, see .
#
##############################################################################
-import wizard
-import pooler
+from osv import fields, osv
+from tools.translate import _
-class wizard_move_line_select(wizard.interface):
- def _open_window(self, cr, uid, data, context):
- mod_obj = pooler.get_pool(cr.dbname).get('ir.model.data')
- act_obj = pooler.get_pool(cr.dbname).get('ir.actions.act_window')
- account_obj = pooler.get_pool(cr.dbname).get('account.account')
- fiscalyear_obj = pooler.get_pool(cr.dbname).get('account.fiscalyear')
+class account_move_line_select(osv.osv_memory):
+ """
+ Account move line select
+ """
+ _name = "account.move.line.select"
+ _description = "Account move line select"
- if not context.get('fiscalyear', False):
+ def open_window(self, cr, uid, ids, context=None):
+ mod_obj = self.pool.get('ir.model.data')
+ act_obj = self.pool.get('ir.actions.act_window')
+ account_obj = self.pool.get('account.account')
+ fiscalyear_obj = self.pool.get('account.fiscalyear')
+
+ if context is None:
+ context = {}
+
+ if 'fiscalyear' not in context:
fiscalyear_ids = fiscalyear_obj.search(cr, uid, [('state', '=', 'draft')])
else:
fiscalyear_ids = [context['fiscalyear']]
+ fiscalyear_ids = fiscalyear_obj.search(cr, uid, [('state', '=', 'draft')])
fiscalyears = fiscalyear_obj.browse(cr, uid, fiscalyear_ids)
+
period_ids = []
- for fiscalyear in fiscalyears:
- for period in fiscalyear.period_ids:
- period_ids.append(period.id)
- domain = str(('period_id', 'in', period_ids))
+ if fiscalyears :
+ for fiscalyear in fiscalyears:
+ for period in fiscalyear.period_ids:
+ period_ids.append(period.id)
+ domain = str(('period_id', 'in', period_ids))
result = mod_obj._get_id(cr, uid, 'account', 'action_move_line_tree1')
id = mod_obj.read(cr, uid, [result], ['res_id'])[0]['res_id']
result = act_obj.read(cr, uid, [id])[0]
result['context'] = {
- 'fiscalyear': context.get('fiscalyear', False),
- 'account_id': data['id']
+ 'fiscalyear': False ,
+ 'account_id': context['active_id'],
+ 'active_id': context['active_id'],
}
- if data['id']:
- acc_data = account_obj.browse(cr, uid, data['id']).child_consol_ids
+
+ if context['active_id']:
+ acc_data = account_obj.browse(cr, uid, context['active_id']).child_consol_ids
if acc_data:
result['context'].update({'consolidate_childs': True})
result['domain']=result['domain'][0:-1]+','+domain+result['domain'][-1]
return result
- states = {
- 'init': {
- 'actions': [],
- 'result': {'type': 'action', 'action': _open_window, 'state': 'end'}
- }
- }
-wizard_move_line_select('account.move.line.select')
-
+account_move_line_select()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_move_line_select_view.xml b/addons/account/wizard/account_move_line_select_view.xml
new file mode 100644
index 00000000000..d0b6a2f709a
--- /dev/null
+++ b/addons/account/wizard/account_move_line_select_view.xml
@@ -0,0 +1,39 @@
+
+
+
+
+
+ Open Move Line Button
+ account.move.line.select
+ form
+
+
+
+
+
+
+ Open Account
+ account.move.line.select
+ form
+ form
+
+ new
+
+
+
+ tree_but_open
+ account.account
+ Open Account
+
+
+
+
+
+
diff --git a/addons/account/wizard/account_partner_balance_report.py b/addons/account/wizard/account_partner_balance_report.py
new file mode 100644
index 00000000000..b1b283feef6
--- /dev/null
+++ b/addons/account/wizard/account_partner_balance_report.py
@@ -0,0 +1,109 @@
+# -*- 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 .
+#
+##############################################################################
+
+import time
+
+from tools.translate import _
+from osv import fields, osv
+
+class account_partner_balance(osv.osv_memory):
+ """
+ This wizard will provide the partner balance report by periods, between any two dates.
+ """
+ _name = 'account.partner.balance'
+ _description = 'Account Partner Balance'
+ _columns = {
+ 'company_id': fields.many2one('res.company', 'Company', required=True),
+ 'state': fields.selection([('bydate','By Date'),
+ ('byperiod','By Period'),
+ ('all','By Date and Period'),
+ ('none','No Filter')
+ ],'Date/Period Filter'),
+ 'fiscalyear': fields.many2one('account.fiscalyear', 'Fiscal year', help='Keep empty for all open fiscal year'),
+ 'periods': fields.many2many('account.period', 'period_report_rel', 'report_id', 'period_id', 'Periods', help='All periods if empty'),
+ 'result_selection': fields.selection([('customer','Receivable Accounts'),
+ ('supplier','Payable Accounts'),
+ ('all','Receivable and Payable Accounts')],
+ 'Partner', required=True),
+ 'soldeinit': fields.boolean('Include initial balances'),
+ 'date1': fields.date('Start date', required=True),
+ 'date2': fields.date('End date', required=True),
+ }
+
+ def _get_company(self, cr, uid, ids, context=None):
+ user_obj = self.pool.get('res.users')
+ company_obj = self.pool.get('res.company')
+ user = user_obj.browse(cr, uid, uid, context=context)
+ if user.company_id:
+ return user.company_id.id
+ else:
+ return company_obj.search(cr, uid, [('parent_id', '=', False)])[0]
+
+ _defaults={
+ 'state' : 'none',
+ 'date1' : lambda *a: time.strftime('%Y-01-01'),
+ 'date2' : lambda *a: time.strftime('%Y-%m-%d'),
+ 'result_selection' : lambda *a: 'all',
+ 'soldeinit' : True,
+ 'company_id' : _get_company,
+ 'fiscalyear' : False,
+ }
+
+ def check_state(self, cr, uid, ids, context=None):
+ data = {
+ 'ids':[],
+ 'model': 'res.partner',
+ 'form': self.read(cr, uid, ids, [])[0],
+ }
+
+ if data['form']['state'] == 'bydate' :
+ return self._check_date(cr, uid, data, context)
+ if data['form']['state'] == 'byperiod':
+ if not data['form']['periods']:
+ raise osv.except_osv(_('Warning'),_('Please Enter Periods ! '))
+
+ return {
+ 'type': 'ir.actions.report.xml',
+ 'report_name': 'account.partner.balance',
+ 'datas': data,
+ }
+
+ def _check_date(self, cr, uid, data, context):
+ sql = """
+ SELECT f.id, f.date_start, f.date_stop FROM account_fiscalyear f Where %s between f.date_start and f.date_stop """
+ cr.execute(sql,(data['form']['date1'],))
+ res = cr.dictfetchall()
+ if res:
+ if (data['form']['date2'] > res[0]['date_stop'] or data['form']['date2'] < res[0]['date_start']):
+ raise osv.except_osv(_('UserError'),_('Date to must be set between %s and %s') % (str(res[0]['date_start']), str(res[0]['date_stop'])))
+ else:
+ return {
+ 'type': 'ir.actions.report.xml',
+ 'report_name': 'account.partner.balance',
+ 'datas': data,
+ }
+ else:
+ raise osv.except_osv(_('UserError'),_('Date not in a defined fiscal year'))
+
+account_partner_balance()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/account/wizard/account_partner_balance_report_view.xml b/addons/account/wizard/account_partner_balance_report_view.xml
new file mode 100644
index 00000000000..02c2ec03a25
--- /dev/null
+++ b/addons/account/wizard/account_partner_balance_report_view.xml
@@ -0,0 +1,59 @@
+
+
+
+
+
+ Select period
+ account.partner.balance
+ form
+
+
+
+
+
+
+ Select Period
+ account.partner.balance
+ ir.actions.act_window
+ form
+ tree,form
+
+ {'record_id':active_id}
+ new
+
+
+
+
+
+
\ No newline at end of file
diff --git a/addons/account/wizard/account_third_party_ledger.py b/addons/account/wizard/account_third_party_ledger.py
new file mode 100755
index 00000000000..a40c469a184
--- /dev/null
+++ b/addons/account/wizard/account_third_party_ledger.py
@@ -0,0 +1,129 @@
+# -*- 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 .
+#
+##############################################################################
+import time
+
+from tools.translate import _
+from osv import fields, osv
+
+class account_partner_ledger(osv.osv_memory):
+ """
+ This wizard will provide the partner Ledger report by periods, between any two dates.
+ """
+ _name = 'account.partner.ledger'
+ _description = 'Account Partner Ledger'
+ _columns = {
+ 'company_id': fields.many2one('res.company', 'Company', required=True),
+ 'state': fields.selection([('bydate','By Date'),
+ ('byperiod','By Period'),
+ ('all','By Date and Period'),
+ ('none','No Filter')
+ ],'Date/Period Filter'),
+ 'fiscalyear': fields.many2one('account.fiscalyear', 'Fiscal year', help='Keep empty for all open fiscal year'),
+ 'periods': fields.many2many('account.period', 'period_ledger_rel', 'report_id', 'period_id', 'Periods', help='All periods if empty', states={'none':[('readonly',True)],'bydate':[('readonly',True)]}),
+ 'result_selection': fields.selection([('customer','Receivable Accounts'),
+ ('supplier','Payable Accounts'),
+ ('all','Receivable and Payable Accounts')],
+ 'Partner', required=True),
+ 'soldeinit': fields.boolean('Include initial balances'),
+ 'reconcil': fields.boolean('Include Reconciled Entries'),
+ 'page_split': fields.boolean('One Partner Per Page'),
+ 'date1': fields.date('Start date', required=True),
+ 'date2': fields.date('End date', required=True),
+ }
+
+ def _get_company(self, cr, uid, ids, context=None):
+ user_obj = self.pool.get('res.users')
+ company_obj = self.pool.get('res.company')
+ if context is None:
+ context = {}
+ user = user_obj.browse(cr, uid, uid, context=context)
+ if user.company_id:
+ return user.company_id.id
+ else:
+ return company_obj.search(cr, uid, [('parent_id', '=', False)])[0]
+
+ _defaults={
+ 'state' : 'none',
+ 'date1' : time.strftime('%Y-01-01'),
+ 'date2' : time.strftime('%Y-%m-%d'),
+ 'result_selection' : 'all',
+ 'reconcile' : True,
+ 'soldeinit' : True,
+ 'page_split' : False,
+ 'company_id' : _get_company,
+ 'fiscalyear' : False,
+ }
+
+ def check_state(self, cr, uid, ids, context=None):
+ obj_fiscalyear = self.pool.get('account.fiscalyear')
+ obj_periods = self.pool.get('account.period')
+ if context is None:
+ context = {}
+ data={}
+ data['ids'] = context.get('active_ids',[])
+ data['form'] = self.read(cr, uid, ids, [])[0]
+ data['form']['fiscalyear'] = obj_fiscalyear.find(cr, uid)
+ data['form']['periods'] = obj_periods.search(cr, uid, [('fiscalyear_id','=',data['form']['fiscalyear'])])
+ data['form']['display_account']='bal_all'
+ data['model'] = 'ir.ui.menu'
+ acc_id = self.pool.get('account.invoice').search(cr, uid, [('state','=','open')])
+ if not acc_id:
+ raise osv.except_osv(_('No Data Available'), _('No records found for your selection!'))
+ if data['form']['state'] == 'bydate' or data['form']['state'] == 'all':
+ data['form']['fiscalyear'] = False
+ else :
+ data['form']['fiscalyear'] = True
+ return self._check_date(cr, uid, data, context)
+ if data['form']['page_split']:
+ return {
+ 'type': 'ir.actions.report.xml',
+ 'report_name': 'account.third_party_ledger',
+ 'datas': data,
+ }
+ else:
+ return {
+ 'type': 'ir.actions.report.xml',
+ 'report_name': 'account.third_party_ledger_other',
+ 'datas': data,
+ }
+
+ def _check_date(self, cr, uid, data, context=None):
+ if context is None:
+ context = {}
+ sql = """
+ SELECT f.id, f.date_start, f.date_stop FROM account_fiscalyear f Where %s between f.date_start and f.date_stop """
+ cr.execute(sql,(data['form']['date1'],))
+ res = cr.dictfetchall()
+ if res:
+ if (data['form']['date2'] > res[0]['date_stop'] or data['form']['date2'] < res[0]['date_start']):
+ raise osv.except_osv(_('UserError'),_('Date to must be set between %s and %s') % (str(res[0]['date_start']), str(res[0]['date_stop'])))
+ else:
+ return {
+ 'type': 'ir.actions.report.xml',
+ 'report_name': 'account.third_party_ledger',
+ 'datas': data,
+ }
+ else:
+ raise osv.except_osv(_('UserError'),_('Date not in a defined fiscal year'))
+
+account_partner_ledger()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_third_party_ledger.xml b/addons/account/wizard/account_third_party_ledger.xml
new file mode 100644
index 00000000000..6ddc9a1e847
--- /dev/null
+++ b/addons/account/wizard/account_third_party_ledger.xml
@@ -0,0 +1,66 @@
+
+
+
+
+
+ Select period
+ account.partner.ledger
+ form
+
+
+
+
+
+
+ Select Period
+ account.partner.ledger
+ ir.actions.act_window
+ form
+ tree,form
+
+ {'record_id':active_id}
+ new
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/account/wizard/account_use_model.py b/addons/account/wizard/account_use_model.py
new file mode 100644
index 00000000000..28a892a398b
--- /dev/null
+++ b/addons/account/wizard/account_use_model.py
@@ -0,0 +1,116 @@
+# -*- 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 .
+#
+##############################################################################
+import time
+import datetime
+
+from osv import fields, osv
+from tools.translate import _
+
+class account_use_model(osv.osv_memory):
+
+ _name = 'account.use.model'
+ _description = 'Use model'
+ _columns = {
+ 'model': fields.many2many('account.model', 'account_use_model_relation','account_id','model_id','Account Model'),
+ }
+
+ def create_entries(self, cr, uid, ids, context=None):
+ account_model_obj = self.pool.get('account.model')
+ account_period_obj = self.pool.get('account.period')
+ account_move_obj = self.pool.get('account.move')
+ account_move_line_obj = self.pool.get('account.move.line')
+ mod_obj = self.pool.get('ir.model.data')
+ if context is None:
+ context = {}
+
+ data = self.read(cr, uid, ids,context=context)[0]
+ record_id = context and context.get('model_line', False) or False
+ if record_id:
+ data_model = account_model_obj.browse(cr,uid,data['model'])
+ else:
+ data_model = account_model_obj.browse(cr,uid,context['active_ids'])
+ move_ids = []
+ for model in data_model:
+ period_id = account_period_obj.find(cr, uid, context=context)
+ if not period_id:
+ raise osv.except_osv(_('No period found !'), _('Unable to find a valid period !'))
+ period_id = period_id[0]
+ move_id = account_move_obj.create(cr, uid, {
+ 'ref': model.ref,
+ 'period_id': period_id,
+ 'journal_id': model.journal_id.id,
+ })
+ move_ids.append(move_id)
+ for line in model.lines_id:
+ val = {
+ 'move_id': move_id,
+ 'journal_id': model.journal_id.id,
+ 'period_id': period_id
+ }
+ val.update({
+ 'name': line.name,
+ 'quantity': line.quantity,
+ 'debit': line.debit,
+ 'credit': line.credit,
+ 'account_id': line.account_id.id,
+ 'move_id': move_id,
+ 'ref': line.ref,
+ 'partner_id': line.partner_id.id,
+ 'date': time.strftime('%Y-%m-%d'),
+ 'date_maturity': time.strftime('%Y-%m-%d')
+ })
+ c = context.copy()
+ c.update({'journal_id': model.journal_id.id,'period_id': period_id})
+ id_line = account_move_line_obj.create(cr, uid, val, context=c)
+ context.update({'move_ids':move_ids})
+ model_data_ids = mod_obj.search(cr, uid,[('model','=','ir.ui.view'),('name','=','view_account_use_model_open_entry')], context=context)
+ resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
+ return {
+ 'name': _('Use Model'),
+ 'context': context,
+ 'view_type': 'form',
+ 'view_mode': 'form',
+ 'res_model': 'account.use.model',
+ 'views': [(resource_id,'form')],
+ 'type': 'ir.actions.act_window',
+ 'target': 'new',
+ }
+
+ def open_moves(self, cr, uid, ids, context=None):
+ mod_obj = self.pool.get('ir.model.data')
+ if context is None:
+ context = {}
+ model_data_ids = mod_obj.search(cr, uid,[('model','=','ir.ui.view'),('name','=','view_move_form')], context=context)
+ resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
+ return {
+ 'domain': "[('id','in', ["+','.join(map(str,context['move_ids']))+"])]",
+ 'name': 'Entries',
+ 'view_type': 'form',
+ 'view_mode': 'tree,form',
+ 'res_model': 'account.move',
+ 'views': [(False,'tree'),(resource_id,'form')],
+ 'type': 'ir.actions.act_window',
+ }
+
+account_use_model()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/account/wizard/account_use_model_view.xml b/addons/account/wizard/account_use_model_view.xml
new file mode 100644
index 00000000000..877a83dbb00
--- /dev/null
+++ b/addons/account/wizard/account_use_model_view.xml
@@ -0,0 +1,88 @@
+
+
+
+
+
+ account.use.model.form
+ account.use.model
+ form
+
+
+
+
+
+
+ Create Entries From Models
+ account.use.model
+ form
+ tree,form
+
+ new
+ {'model_line':'model_line'}
+
+
+
+
+
+ Create Entries From Models
+ client_action_multi
+
+ action
+ account.move.line
+
+
+
+
+
+ account.use.model.open.entry.form
+ account.use.model
+ form
+
+
+
+
+
+
+ account.use.model.create.entry.form
+ account.use.model
+ form
+
+
+
+
+
+
+ Create Entries From Models
+ account.use.model
+ form
+ tree,form
+
+ new
+
+
+
+
diff --git a/addons/account/wizard/account_vat_view.xml b/addons/account/wizard/account_vat_view.xml
index edd6eaf7874..7662594bb79 100644
--- a/addons/account/wizard/account_vat_view.xml
+++ b/addons/account/wizard/account_vat_view.xml
@@ -2,11 +2,6 @@
-
-
Account Vat Declaration
account.vat.declaration
diff --git a/addons/account/wizard/wizard_account_balance_report.py b/addons/account/wizard/wizard_account_balance_report.py
deleted file mode 100644
index 26538d06b4b..00000000000
--- a/addons/account/wizard/wizard_account_balance_report.py
+++ /dev/null
@@ -1,145 +0,0 @@
-# -*- 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 .
-#
-##############################################################################
-
-import wizard
-import pooler
-import time
-from tools.translate import _
-
-period_form = '''
-'''
-
-period_fields = {
- 'company_id': {'string': 'Company', 'type': 'many2one', 'relation': 'res.company', 'required': True},
- 'state':{
- 'string':"Date/Period Filter",
- 'type':'selection',
- 'selection':[('bydate','By Date'),('byperiod','By Period'),('all','By Date and Period'),('none','No Filter')],
- 'default': lambda *a:'none'
- },
- 'fiscalyear': {
- 'string':'Fiscal year',
- 'type':'many2one',
- 'relation':'account.fiscalyear',
- 'help':'Keep empty for all open fiscal year'
- },
- 'periods': {'string': 'Periods', 'type': 'many2many', 'relation': 'account.period', 'help': 'All periods if empty'},
- 'display_account':{'string':"Display accounts ",'type':'selection','selection':[('bal_mouvement','With movements'),('bal_all','All'),('bal_solde','With balance is not equal to 0')]},
- 'date_from': {'string':"Start date",'type':'date','required':True ,'default': lambda *a: time.strftime('%Y-01-01')},
- 'date_to': {'string':"End date",'type':'date','required':True, 'default': lambda *a: time.strftime('%Y-%m-%d')},
-}
-
-account_form = '''
-'''
-
-account_fields = {
- 'Account_list': {'string':'Account', 'type':'many2one', 'relation':'account.account', 'required':True ,'domain':[('parent_id','=',False)]},
-}
-
-class wizard_report(wizard.interface):
- def _get_defaults(self, cr, uid, data, context={}):
- user = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, uid, context=context)
- if user.company_id:
- company_id = user.company_id.id
- else:
- company_id = pooler.get_pool(cr.dbname).get('res.company').search(cr, uid, [('parent_id', '=', False)])[0]
- data['form']['company_id'] = company_id
- fiscalyear_obj = pooler.get_pool(cr.dbname).get('account.fiscalyear')
-# periods_obj=pooler.get_pool(cr.dbname).get('account.period')
- data['form']['fiscalyear'] = fiscalyear_obj.find(cr, uid)
-# data['form']['periods'] = periods_obj.search(cr, uid, [('fiscalyear_id','=',data['form']['fiscalyear'])])
-# data['form']['fiscalyear'] = False
- data['form']['display_account'] = 'bal_all'
- data['form']['context'] = context
- return data['form']
-
- def _check_state(self, cr, uid, data, context):
-
- if data['form']['state'] == 'bydate':
- self._check_date(cr, uid, data, context)
-# data['form']['fiscalyear'] = 0
-# else :
-# data['form']['fiscalyear'] = 1
- return data['form']
-
- def _check_path(self, cr, uid, data, context):
- if data['model'] == 'account.account':
- return 'checktype'
- else:
- return 'account_selection'
-
- def _check_date(self, cr, uid, data, context):
- sql = """
- SELECT f.id, f.date_start, f.date_stop FROM account_fiscalyear f Where %s between f.date_start and f.date_stop """
- cr.execute(sql,(data['form']['date_from'],))
- res = cr.dictfetchall()
- if res:
- if (data['form']['date_to'] > res[0]['date_stop'] or data['form']['date_to'] < res[0]['date_start']):
- raise wizard.except_wizard(_('UserError'),_('Date to must be set between %s and %s') % (res[0]['date_start'], res[0]['date_stop']))
- else:
- return 'report'
- else:
- raise wizard.except_wizard(_('UserError'),_('Date not in a defined fiscal year'))
-
- states = {
-
- 'init': {
- 'actions': [],
- 'result': {'type':'choice','next_state':_check_path}
- },
- 'account_selection': {
- 'actions': [],
- 'result': {'type':'form', 'arch':account_form,'fields':account_fields, 'state':[('end','Cancel','gtk-cancel'),('checktype','Next','gtk-go-forward')]}
- },
- 'checktype': {
- 'actions': [_get_defaults],
- 'result': {'type':'form', 'arch':period_form, 'fields':period_fields, 'state':[('end','Cancel','gtk-cancel'),('report','Print','gtk-print')]}
- },
- 'report': {
- 'actions': [_check_state],
- 'result': {'type':'print', 'report':'account.account.balance', 'state':'end'}
- }
- }
-wizard_report('account.account.balance.report')
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/wizard_aged_trial_balance.py b/addons/account/wizard/wizard_aged_trial_balance.py
deleted file mode 100755
index d21a64c0bbf..00000000000
--- a/addons/account/wizard/wizard_aged_trial_balance.py
+++ /dev/null
@@ -1,113 +0,0 @@
-# -*- 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 .
-#
-##############################################################################
-
-import wizard
-import time
-import datetime
-import pooler
-
-from mx.DateTime import *
-from tools.translate import _
-
-_aged_trial_form = """
-"""
-
-_aged_trial_fields = {
- 'company_id': {'string': 'Company', 'type': 'many2one', 'relation': 'res.company', 'required': True},
- 'period_length': {'string': 'Period length (days)', 'type': 'integer', 'required': True, 'default': lambda *a:30},
- 'date1': {'string':'Start of period', 'type':'date', 'required':True, 'default': lambda *a: time.strftime('%Y-%m-%d')},
- 'result_selection':{
- 'string':"Filter on Partners",
- 'type':'selection',
- 'selection':[('customer','Receivable'),('supplier','Payable'),('all','Receivable and Payable')],
- 'required':True,
- 'default': lambda *a: 'all',
- },
- 'direction_selection':{
- 'string':"Analysis Direction",
- 'type':'selection',
- 'selection':[('past','Past'),('future','Future')],
- 'required':True,
- 'default': lambda *a: 'past',
- },
-}
-
-def _calc_dates(self, cr, uid, data, context):
- res = {}
- period_length = data['form']['period_length']
- if period_length<=0:
- raise wizard.except_wizard(_('UserError'), _('You must enter a period length that cannot be 0 or below !'))
- start = datetime.date.fromtimestamp(time.mktime(time.strptime(data['form']['date1'],"%Y-%m-%d")))
- start = DateTime(int(start.year),int(start.month),int(start.day))
- if data['form']['direction_selection'] == 'past':
- for i in range(5)[::-1]:
- stop = start - RelativeDateTime(days=period_length)
- res[str(i)] = {
- 'name' : str((5-(i+1))*period_length) + '-' + str((5-i)*period_length),
-
- 'stop': start.strftime('%Y-%m-%d'),
- 'start' : stop.strftime('%Y-%m-%d'),
- }
- start = stop - RelativeDateTime(days=1)
- else:
- for i in range(5):
- stop = start + RelativeDateTime(days=period_length)
- res[str(5-(i+1))] = {
- 'name' : str((i)*period_length)+'-'+str((i+1)*period_length),
- 'start': start.strftime('%Y-%m-%d'),
- 'stop' : stop.strftime('%Y-%m-%d'),
- }
- start = stop + RelativeDateTime(days=1)
- return res
-
-class wizard_report(wizard.interface):
- def _get_defaults(self, cr, uid, data, context):
- fiscalyear_obj = pooler.get_pool(cr.dbname).get('account.fiscalyear')
- data['form']['fiscalyear'] = fiscalyear_obj.find(cr, uid)
- user = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, uid, context=context)
- if user.company_id:
- company_id = user.company_id.id
- else:
- company_id = pooler.get_pool(cr.dbname).get('res.company').search(cr, uid, [('parent_id', '=', False)])[0]
- data['form']['company_id'] = company_id
- return data['form']
- states = {
- 'init': {
- 'actions': [_get_defaults],
- 'result': {'type':'form', 'arch':_aged_trial_form, 'fields':_aged_trial_fields, 'state':[('end','Cancel', 'gtk-cancel'),('print','Print', 'gtk-ok')]},
- },
- 'print': {
- 'actions': [_calc_dates],
- 'result': {'type':'print', 'report':'account.aged_trial_balance', 'state':'end'},
- },
- }
-wizard_report('account.aged.trial.balance')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/wizard_compare_account_balance_report.py b/addons/account/wizard/wizard_compare_account_balance_report.py
deleted file mode 100755
index 8000d37536d..00000000000
--- a/addons/account/wizard/wizard_compare_account_balance_report.py
+++ /dev/null
@@ -1,175 +0,0 @@
-# -*- 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 .
-#
-##############################################################################
-
-import wizard
-import ir
-import pooler
-import time
-import netsvc
-from osv import fields, osv
-import mx.DateTime
-from mx.DateTime import RelativeDateTime
-
-from tools import config
-
-
-dates_form = '''
-'''
-
-dates_fields = {
- 'fiscalyear': {'string': 'Fiscal year', 'type': 'many2many', 'relation': 'account.fiscalyear'},
- 'select_account': {'string': 'Select Reference Account(for % comparision)', 'type': 'many2one', 'relation': 'account.account','help': 'Keep empty for comparision to its parent'},
- 'account_choice': {'string': 'Show Accounts', 'type': 'selection','selection':[('all','All accounts'),('bal_zero','With balance is not equal to 0'),('moves','With movements')]},
- 'show_columns': {'string': 'Show Debit/Credit Information', 'type': 'boolean'},
- 'landscape': {'string': 'Show Report in Landscape Form', 'type': 'boolean'},
- 'format_perc': {'string': 'Show Comparision in %', 'type': 'boolean'},
- 'compare_pattern':{'string':"Compare Selected Years In Terms Of",'type':'selection','selection':[('bal_cash','Cash'),('bal_perc','Percentage'),('none','Don'+ "'" +'t Compare')]},
- 'period_manner':{'string':"Entries Selection Based on",'type':'selection','selection':[('actual','Financial Period'),('created','Creation Date')]},
- 'periods': {'string': 'Periods', 'type': 'many2many', 'relation': 'account.period', 'help': 'All periods if empty'}
-}
-
-back_form='''
-'''
-
-back_fields={
-}
-
-zero_form='''
-'''
-
-zero_fields={
-}
-
-def _check(self, cr, uid, data, context):
- if (len(data['form']['fiscalyear'][0][2])==0) or (len(data['form']['fiscalyear'][0][2])>1 and (data['form']['compare_pattern']!='none') and (data['form']['format_perc']==1) and (data['form']['show_columns']==1) and (data['form']['landscape']!=1)):
- return 'zero_years'
-
- if ((len(data['form']['fiscalyear'][0][2])==3) and (data['form']['format_perc']!=1) and (data['form']['show_columns']!=1)):
- if data['form']['landscape']==1:
- return 'report_landscape'
- else:
- return 'report'
-
-
- if data['form']['format_perc']==1:
- if len(data['form']['fiscalyear'][0][2])<=2:
- if data['form']['landscape']==1:
- return 'report_landscape'
- else:
- return 'report'
- else:
- if len(data['form']['fiscalyear'][0][2])==3:
- if data['form']['landscape']==1:
- return 'report_landscape'
- else:
- return 'backtoinit'
- else:
- return 'backtoinit'
-
- else:
- if len(data['form']['fiscalyear'][0][2])>2:
- if data['form']['landscape']==1:
- return 'report_landscape'
- else:
- return 'backtoinit'
- else:
- if data['form']['landscape']==1:
- return 'report_landscape'
- else:
- return 'report'
-
-
-
-
-class wizard_report(wizard.interface):
- def _get_defaults(self, cr, uid, data, context={}):
- data['form']['context'] = context
- fiscalyear_obj = pooler.get_pool(cr.dbname).get('account.fiscalyear')
- data['form']['fiscalyear']=[fiscalyear_obj.find(cr, uid)]
-# p_ids=pooler.get_pool(cr.dbname).get('account.period').search(cr,uid,[('fiscalyear_id','=',fiscalyear_obj.find(cr, uid))])
-# data['form']['periods']=p_ids
- data['form']['compare_pattern']='none'
- data['form']['account_choice']='moves'
- data['form']['period_manner']='actual'
- return data['form']
-
-
- states = {
- 'init': {
- 'actions': [_get_defaults],
- 'result': {'type':'form', 'arch':dates_form, 'fields':dates_fields, 'state':[('end','Cancel', 'gtk-cancel'),('checkyear','Print', 'gtk-ok')]}
- },
- 'backtoinit': {
- 'actions': [],
- 'result': {'type':'form','arch':back_form,'fields':back_fields,'state':[('end','Ok')]}
- },
- 'zero_years': {
- 'actions': [],
- 'result': {'type':'form','arch':zero_form,'fields':zero_fields,'state':[('end','Ok')]}
- },
- 'checkyear': {
- 'actions': [],
- 'result': {'type':'choice','next_state':_check}
- },
- 'report_landscape': {
- 'actions': [],
- 'result': {'type':'print', 'report':'account.account.balance.landscape', 'state':'end'}
- },
- 'report': {
- 'actions': [],
- 'result': {'type':'print', 'report':'account.balance.account.balance', 'state':'end'}
- }
- }
-wizard_report('account.balance.account.balance.report')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/account/wizard/wizard_general_ledger_report.py b/addons/account/wizard/wizard_general_ledger_report.py
deleted file mode 100644
index d5f8ac0fa98..00000000000
--- a/addons/account/wizard/wizard_general_ledger_report.py
+++ /dev/null
@@ -1,179 +0,0 @@
-# -*- 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 .
-#
-##############################################################################
-
-import wizard
-import pooler
-import locale
-import time
-from tools.translate import _
-
-account_form = '''
-'''
-
-account_fields = {
- 'Account_list': {'string':'Chart of Accounts', 'type':'many2one', 'relation':'account.account', 'required':True ,'domain':[('parent_id','=',False)]},
-}
-
-period_form = '''
-'''
-
-period_fields = {
- 'company_id': {'string': 'Company', 'type': 'many2one', 'relation': 'res.company', 'required': True},
- 'state':{
- 'string':"Date/Period Filter",
- 'type':'selection',
- 'selection':[('bydate','By Date'),('byperiod','By Period'),('all','By Date and Period'),('none','No Filter')],
- 'default': lambda *a:'none'
- },
- 'fiscalyear': {'string': 'Fiscal year', 'type': 'many2one', 'relation': 'account.fiscalyear',
- 'help': 'Keep empty for all open fiscal year'},
- 'periods': {'string': 'Periods', 'type': 'many2many', 'relation': 'account.period', 'help': 'All periods if empty'},
- 'sortbydate':{'string':"Sort by:",'type':'selection','selection':[('sort_date','Date'),('sort_mvt','Movement')]},
- 'display_account':{'string':"Display accounts ",'type':'selection','selection':[('bal_mouvement','With movements'),('bal_all','All'),('bal_solde','With balance is not equal to 0')]},
- 'landscape':{'string':"Landscape Mode",'type':'boolean'},
- 'soldeinit':{'string':"Include initial balances",'type':'boolean'},
- 'amount_currency':{'string':"With Currency",'type':'boolean'},
- 'date_from': {'string':" Start date",'type':'date','required':True ,'default': lambda *a: time.strftime('%Y-01-01')},
- 'date_to': {'string':"End date",'type':'date','required':True, 'default': lambda *a: time.strftime('%Y-%m-%d')},
-}
-def _check_path(self, cr, uid, data, context):
- if data['model'] == 'account.account':
- return 'checktype'
- else:
- return 'account_selection'
-
-def _check(self, cr, uid, data, context):
- if data['form']['landscape']==True:
- return 'report_landscape'
- else:
- return 'report'
-
-def _check_date(self, cr, uid, data, context):
-
- sql = """
- SELECT f.id, f.date_start, f.date_stop FROM account_fiscalyear f Where %s between f.date_start and f.date_stop """
- cr.execute(sql,(data['form']['date_from'],))
- res = cr.dictfetchall()
- if res:
- if (data['form']['date_to'] > res[0]['date_stop'] or data['form']['date_to'] < res[0]['date_start']):
- raise wizard.except_wizard(_('UserError'),_('Date to must be set between %s and %s') % (str(res[0]['date_start']), str(res[0]['date_stop'])))
- else:
- return 'checkreport'
-
- else:
- raise wizard.except_wizard(_('UserError'),_('Date not in a defined fiscal year'))
-
-def _check_state(self, cr, uid, data, context):
-
- if data['form']['state'] == 'bydate':
- _check_date(self, cr, uid, data, context)
-# data['form']['fiscalyear'] = 0
-# else :
-#
-# data['form']['fiscalyear'] = 1
- return data['form']
-
-
-class wizard_report(wizard.interface):
- def _get_defaults(self, cr, uid, data, context={}):
- user = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, uid, context=context)
- if user.company_id:
- company_id = user.company_id.id
- else:
- company_id = pooler.get_pool(cr.dbname).get('res.company').search(cr, uid, [('parent_id', '=', False)])[0]
- data['form']['company_id'] = company_id
- fiscalyear_obj = pooler.get_pool(cr.dbname).get('account.fiscalyear')
-
- data['form']['fiscalyear'] = fiscalyear_obj.find(cr, uid)
- #periods_obj=pooler.get_pool(cr.dbname).get('account.period')
- #data['form']['periods'] =periods_obj.search(cr, uid, [('fiscalyear_id','=',data['form']['fiscalyear'])])
- data['form']['sortbydate'] = 'sort_date'
- data['form']['display_account']='bal_all'
- data['form']['landscape']=True
- data['form']['fiscalyear'] = False
- data['form']['amount_currency'] = True
- data['form']['context'] = context
- return data['form']
-
- states = {
- 'init': {
- 'actions': [],
- 'result': {'type':'choice','next_state':_check_path}
- },
- 'account_selection': {
- 'actions': [],
- 'result': {'type':'form', 'arch':account_form,'fields':account_fields, 'state':[('end','Cancel','gtk-cancel'),('checktype','Next','gtk-go-forward')]}
- },
- 'checktype': {
- 'actions': [_get_defaults],
- 'result': {'type':'form', 'arch':period_form, 'fields':period_fields, 'state':[('end','Cancel','gtk-cancel'),('checkreport','Print','gtk-print')]}
- },
- 'checkreport': {
- 'actions': [],
- 'result': {'type':'choice','next_state':_check}
- },
- 'report_landscape': {
- 'actions': [_check_state],
- 'result': {'type':'print', 'report':'account.general.ledger_landscape', 'state':'end'}
- },
- 'report': {
- 'actions': [_check_state],
- 'result': {'type':'print', 'report':'account.general.ledger', 'state':'end'}
- }
- }
-wizard_report('account.general.ledger.report')
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/wizard_partner_balance_report.py b/addons/account/wizard/wizard_partner_balance_report.py
deleted file mode 100644
index f7b049a4f0f..00000000000
--- a/addons/account/wizard/wizard_partner_balance_report.py
+++ /dev/null
@@ -1,127 +0,0 @@
-# -*- 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 .
-#
-##############################################################################
-
-import time
-import wizard
-import pooler
-from tools.translate import _
-
-period_form = '''
-'''
-
-period_fields = {
- 'company_id': {'string': 'Company', 'type': 'many2one', 'relation': 'res.company', 'required': True},
- 'state':{
- 'string':"Date/Period Filter",
- 'type':'selection',
- 'selection':[('bydate','By Date'),('byperiod','By Period'),('all','By Date and Period'),('none','No Filter')],
- 'default': lambda *a:'none'
- },
- 'fiscalyear': {
- 'string':'Fiscal year', 'type': 'many2one', 'relation': 'account.fiscalyear',
- 'default': lambda *a:False,
- 'help': 'Keep empty for all open fiscal year'
- },
- 'periods': {'string': 'Periods', 'type': 'many2many', 'relation': 'account.period', 'help': 'All periods if empty'},
- 'result_selection':{
- 'string':"Partner",
- 'type':'selection',
- 'selection':[('customer','Receivable Accounts'),('supplier','Payable Accounts'),('all','Receivable and Payable Accounts')],
- 'required':True
- },
- 'soldeinit':{'string':"Include initial balances",'type':'boolean'},
- 'date1': {'string':' Start date', 'type':'date', 'required':True,'default': lambda *a: time.strftime('%Y-01-01')},
- 'date2': {'string':'End date', 'type':'date', 'required':True,'default': lambda *a: time.strftime('%Y-%m-%d')},
-}
-
-class wizard_report(wizard.interface):
-
- def _get_defaults(self,cr,uid,data,context):
- user = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, uid, context=context)
- if user.company_id:
- company_id = user.company_id.id
- else:
- company_id = pooler.get_pool(cr.dbname).get('res.company').search(cr, uid, [('parent_id', '=', False)])[0]
-
- fiscalyear_obj = pooler.get_pool(cr.dbname).get('account.fiscalyear')
- periods_obj=pooler.get_pool(cr.dbname).get('account.period')
- data['form']['fiscalyear'] = fiscalyear_obj.find(cr, uid)
- data['form']['periods'] =periods_obj.search(cr, uid, [('fiscalyear_id','=',data['form']['fiscalyear'])])
- data['form']['company_id'] = company_id
- data['form']['soldeinit'] = True
- data['form']['fiscalyear'] = False
- data['form']['result_selection'] = 'all'
- return data['form']
-
- def _check_state(self, cr, uid, data, context):
-
- if data['form']['state'] == 'bydate' :
- self._check_date(cr, uid, data, context)
- return data['form']
-
- def _check_date(self, cr, uid, data, context):
- sql = """
- SELECT f.id, f.date_start, f.date_stop FROM account_fiscalyear f Where %s between f.date_start and f.date_stop """
- cr.execute(sql,(data['form']['date1'],))
- res = cr.dictfetchall()
- if res:
- if (data['form']['date2'] > res[0]['date_stop'] or data['form']['date2'] < res[0]['date_start']):
- raise wizard.except_wizard(_('UserError'),_('Date to must be set between %s and %s') % (str(res[0]['date_start']), str(res[0]['date_stop'])))
- else:
- return 'report'
-
- else:
- raise wizard.except_wizard(_('UserError'),_('Date not in a defined fiscal year'))
-
- states = {
- 'init': {
- 'actions': [_get_defaults],
- 'result': {'type':'form', 'arch':period_form, 'fields':period_fields, 'state':[('end','Cancel','gtk-cancel'),('report','Print','gtk-print')]}
- },
-
- 'report': {
- 'actions': [_check_state],
- 'result': {'type':'print', 'report':'account.partner.balance', 'state':'end'}
- }
- }
-wizard_report('account.partner.balance.report')
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/wizard_third_party_ledger.py b/addons/account/wizard/wizard_third_party_ledger.py
deleted file mode 100755
index 6bf415d0ca6..00000000000
--- a/addons/account/wizard/wizard_third_party_ledger.py
+++ /dev/null
@@ -1,161 +0,0 @@
-# -*- 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 .
-#
-##############################################################################
-
-import time
-import wizard
-import pooler
-from tools.translate import _
-
-
-period_form = '''
-'''
-
-period_fields = {
- 'company_id': {'string': 'Company', 'type': 'many2one', 'relation': 'res.company', 'required': True},
- 'state':{
- 'string':"Date/Period Filter",
- 'type':'selection',
- 'selection':[('bydate','By Date'),('byperiod','By Period'),('all','By Date and Period'),('none','No Filter')],
- 'default': lambda *a:'none'
- },
- 'fiscalyear': {
- 'string':'Fiscal year', 'type': 'many2one', 'relation': 'account.fiscalyear',
- 'help': 'Keep empty for all open fiscal year',
- 'default': lambda *a:False,
- },
- 'periods': {'string': 'Periods', 'type': 'many2many', 'relation': 'account.period', 'help': 'All periods if empty','states':{'none':[('readonly',True)],'bydate':[('readonly',True)]}},
- 'result_selection':{
- 'string':"Partner",
- 'type':'selection',
- 'selection':[('customer','Receivable Accounts'),('supplier','Payable Accounts'),('all','Receivable and Payable Accounts')],
- 'required':True
- },
- 'soldeinit':{'string':"Include initial balances",'type':'boolean'},
- 'reconcil':{'string':" Include Reconciled Entries",'type':'boolean'},
- 'page_split':{'string':"One Partner Per Page",'type':'boolean'},
- 'date1': {'string':' Start date', 'type':'date', 'required':True, 'default': lambda *a: time.strftime('%Y-01-01')},
- 'date2': {'string':'End date', 'type':'date', 'required':True, 'default': lambda *a: time.strftime('%Y-%m-%d')},
-}
-
-
-class wizard_report(wizard.interface):
-
- def _get_defaults(self, cr, uid, data, context):
- fiscalyear_obj = pooler.get_pool(cr.dbname).get('account.fiscalyear')
- data['form']['fiscalyear'] = fiscalyear_obj.find(cr, uid)
- data['form']['display_account']='bal_all'
- data['form']['result_selection'] = 'all'
- user = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, uid, context=context)
- if user.company_id:
- company_id = user.company_id.id
- else:
- company_id = pooler.get_pool(cr.dbname).get('res.company').search(cr, uid, [('parent_id', '=', False)])[0]
- data['form']['company_id'] = company_id
- periods_obj=pooler.get_pool(cr.dbname).get('account.period')
- data['form']['periods'] =periods_obj.search(cr, uid, [('fiscalyear_id','=',data['form']['fiscalyear'])])
- data['form']['fiscalyear'] =False
- data['form']['page_split'] = False
- data['form']['reconcil'] = False
- data['form']['soldeinit'] = True
- return data['form']
-
- def _check(self, cr, uid, data, context):
- if data['form']['page_split']:
- return 'report'
- else:
- return 'report_other'
-
- def _check_date(self, cr, uid, data, context):
-
- sql = """
- SELECT f.id, f.date_start, f.date_stop FROM account_fiscalyear f Where %s between f.date_start and f.date_stop """
- cr.execute(sql,(data['form']['date1'],))
- res = cr.dictfetchall()
- if res:
- if (data['form']['date2'] > res[0]['date_stop'] or data['form']['date2'] < res[0]['date_start']):
- raise wizard.except_wizard(_('UserError'),_('Date to must be set between %s and %s') % (str(res[0]['date_start']) , str(res[0]['date_stop'])))
- else:
- return 'report'
- else:
- raise wizard.except_wizard(_('UserError'),_('Date not in a defined fiscal year'))
-
- def _check_state(self, cr, uid, data, context):
- if data['form']['state'] == 'bydate' or data['form']['state'] == 'all':
- data['form']['fiscalyear'] = False
- else :
- data['form']['fiscalyear'] = True
- self._check_date(cr, uid, data, context)
- acc_id = pooler.get_pool(cr.dbname).get('account.invoice').search(cr, uid, [('state','=','open')])
- if not acc_id:
- raise wizard.except_wizard(_('No Data Available'), _('No records found for your selection!'))
- return data['form']
-
-
- states = {
- 'init': {
- 'actions': [_get_defaults],
- 'result': {'type':'form', 'arch':period_form, 'fields':period_fields, 'state':[('end','Cancel','gtk-cancel'),('checkreport','Print','gtk-print')]}
- },
- 'checkreport': {
- 'actions': [],
- 'result': {'type':'choice','next_state':_check}
- },
- 'report': {
- 'actions': [_check_state],
- 'result': {'type':'print', 'report':'account.third_party_ledger', 'state':'end'}
- },
- 'report_other': {
- 'actions': [_check_state],
- 'result': {'type':'print', 'report':'account.third_party_ledger_other', 'state':'end'}
- }
-
- }
-wizard_report('account.third_party_ledger.report')
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/wizard_use_model.py b/addons/account/wizard/wizard_use_model.py
deleted file mode 100644
index ef3a4ba1310..00000000000
--- a/addons/account/wizard/wizard_use_model.py
+++ /dev/null
@@ -1,131 +0,0 @@
-# -*- 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 .
-#
-##############################################################################
-
-import wizard
-import time
-import datetime
-import pooler
-from tools.translate import _
-
-model_form = """
-"""
-
-model_fields = {
- 'model': {'string': 'Account Model', 'type': 'many2many', 'relation': 'account.model', 'required': True},
- }
-
-form = """
-
-"""
-fields = {
- }
-def _create_entries(self, cr, uid, data, context):
- pool_obj = pooler.get_pool(cr.dbname)
- if data['model']=='ir.ui.menu' or data['model']=='account.move.line':
- model_ids = data['form']['model'][0][2]
- data_model = pool_obj.get('account.model').browse(cr,uid,model_ids)
- else:
- data_model = pool_obj.get('account.model').browse(cr,uid,data['ids'])
- move_ids = []
- for model in data_model:
-
- period_id = pool_obj.get('account.period').find(cr,uid, context=context)
- if not period_id:
- raise wizard.except_wizard(_('No period found !'), _('Unable to find a valid period !'))
- period_id = period_id[0]
- move_id = pool_obj.get('account.move').create(cr, uid, {
- 'ref': model.ref,
- 'period_id': period_id,
- 'journal_id': model.journal_id.id,
- })
- move_ids.append(move_id)
- for line in model.lines_id:
- val = {
- 'move_id': move_id,
- 'journal_id': model.journal_id.id,
- 'period_id': period_id
- }
- val.update({
- 'name': line.name,
- 'quantity': line.quantity,
- 'debit': line.debit,
- 'credit': line.credit,
- 'account_id': line.account_id.id,
- 'move_id': move_id,
- 'ref': line.ref,
- 'partner_id': line.partner_id.id,
- 'date': time.strftime('%Y-%m-%d'),
- 'date_maturity': time.strftime('%Y-%m-%d')
- })
- c = context.copy()
- c.update({'journal_id': model.journal_id.id,'period_id': period_id})
- id_line = pool_obj.get('account.move.line').create(cr, uid, val, context=c)
- data['form']['move_ids']=move_ids
- return data['form']
-
-class use_model(wizard.interface):
-
- def _open_moves(self, cr, uid, data, context):
- pool_obj = pooler.get_pool(cr.dbname)
- model_data_ids = pool_obj.get('ir.model.data').search(cr,uid,[('model','=','ir.ui.view'),('name','=','view_move_form')])
- resource_id = pool_obj.get('ir.model.data').read(cr,uid,model_data_ids,fields=['res_id'])[0]['res_id']
- return {
- 'domain': "[('id','in', ["+','.join(map(str,data['form']['move_ids']))+"])]",
- 'name': 'Entries',
- 'view_type': 'form',
- 'view_mode': 'tree,form',
- 'res_model': 'account.move',
- 'views': [(False,'tree'),(resource_id,'form')],
- 'type': 'ir.actions.act_window'
- }
-
- def _check(self, cr, uid, data, context):
- if data['model']=='ir.ui.menu' or data['model']=='account.move.line':
- return 'init_form'
- return 'create'
-
- states = {
- 'init': {
- 'actions': [],
- 'result': {'type':'choice','next_state':_check}
- },
- 'init_form': {
- 'actions': [],
- 'result': {'type':'form', 'arch':model_form, 'fields':model_fields, 'state':[('end','Cancel', 'gtk-cancel'),('create','Create', 'gtk-ok')]},
- },
- 'create': {
- 'actions': [_create_entries],
- 'result': {'type': 'form','arch':form, 'fields':fields, 'state':[('end','Ok'),('open_move','Open')]},
- },
- 'open_move': {
- 'actions': [],
- 'result': {'type':'action', 'action':_open_moves, 'state':'end'}
- }
- }
-
-use_model("account_use_models")# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/account_anglo_saxon/i18n/et.po b/addons/account_anglo_saxon/i18n/et.po
new file mode 100644
index 00000000000..9c23ce3caf4
--- /dev/null
+++ b/addons/account_anglo_saxon/i18n/et.po
@@ -0,0 +1,64 @@
+# Estonian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2009-11-24 12:50+0000\n"
+"PO-Revision-Date: 2010-04-23 09:43+0000\n"
+"Last-Translator: lyyser \n"
+"Language-Team: Estonian \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-24 03:53+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_anglo_saxon
+#: view:product.category:0
+msgid " Accounting Property"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.module.module,description:account_anglo_saxon.module_meta_information
+msgid ""
+"This module will support the Anglo-Saxons accounting methodology by \n"
+" changing the accounting logic with stock transactions. The difference "
+"between the Anglo-Saxon accounting countries \n"
+" and the Rhine or also called Continental accounting countries is the "
+"moment of taking the Cost of Goods Sold versus Cost of Sales. \n"
+" Anglo-Saxons accounting does take the cost when sales invoice is "
+"created, Continental accounting will take the cost at he moment the goods "
+"are shipped.\n"
+" This module will add this functionality by using a interim account, to "
+"store the value of shipped goods and will contra book this interim account \n"
+" when the invoice is created to transfer this amount to the debtor or "
+"creditor account."
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
+msgid "Stock Account"
+msgstr "Laoarvestuse"
+
+#. module: account_anglo_saxon
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Vigane XML vaate arhitektuurile!"
+
+#. module: account_anglo_saxon
+#: field:product.category,property_account_creditor_price_difference_categ:0
+#: field:product.template,property_account_creditor_price_difference:0
+msgid "Price Difference Account"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: help:product.category,property_account_creditor_price_difference_categ:0
+#: help:product.template,property_account_creditor_price_difference:0
+msgid ""
+"This account will be used to value price difference between purchase price "
+"and cost price."
+msgstr ""
diff --git a/addons/account_payment/i18n/cs.po b/addons/account_payment/i18n/cs.po
index 7139ac0c822..1b10c28c59e 100644
--- a/addons/account_payment/i18n/cs.po
+++ b/addons/account_payment/i18n/cs.po
@@ -7,13 +7,17 @@ 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-04-07 22:24+0000\n"
-"Last-Translator: mitev.dmitry \n"
+"PO-Revision-Date: 2009-02-03 06:24+0000\n"
+"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+=======
"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
+>>>>>>> MERGE-SOURCE
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment
@@ -46,7 +50,7 @@ msgstr ""
#: field:payment.line,info_owner:0
#: view:payment.order:0
msgid "Owner Account"
-msgstr "Majitel účtu"
+msgstr ""
#. module: account_payment
#: help:account.invoice,amount_to_pay:0
@@ -65,17 +69,17 @@ msgstr ""
#. module: account_payment
#: field:payment.order,date_prefered:0
msgid "Preferred date"
-msgstr "Preferované datum"
+msgstr ""
#. module: account_payment
#: selection:payment.line,state:0
msgid "Free"
-msgstr "Volný"
+msgstr ""
#. module: account_payment
#: wizard_field:populate_payment,search,entries:0
msgid "Entries"
-msgstr "Příspěvky"
+msgstr ""
#. module: account_payment
#: wizard_field:populate_payment,init,duedate:0
@@ -96,7 +100,7 @@ msgstr ""
#: rml:payment.order:0
#: view:payment.order:0
msgid "Amount"
-msgstr "Částka"
+msgstr ""
#. module: account_payment
#: rml:payment.order:0
@@ -111,7 +115,7 @@ msgstr ""
#. module: account_payment
#: selection:payment.order,state:0
msgid "Cancelled"
-msgstr "Zrušeno"
+msgstr ""
#. module: account_payment
#: model:ir.actions.act_window,name:account_payment.action_payment_order_tree_new
@@ -123,7 +127,7 @@ msgstr ""
#: rml:payment.order:0
#: field:payment.order,reference:0
msgid "Reference"
-msgstr "Odkaz"
+msgstr ""
#. module: account_payment
#: model:ir.actions.act_window,name:account_payment.action_payment_order_tree
@@ -134,7 +138,7 @@ msgstr ""
#. module: account_payment
#: selection:payment.order,date_prefered:0
msgid "Directly"
-msgstr "Přímo"
+msgstr ""
#. module: account_payment
#: model:ir.actions.act_window,name:account_payment.action_payment_line_form
@@ -157,7 +161,7 @@ msgstr ""
#. module: account_payment
#: selection:payment.order,state:0
msgid "Confirmed"
-msgstr "Potvrzeno"
+msgstr ""
#. module: account_payment
#: help:payment.line,ml_date_created:0
@@ -177,12 +181,12 @@ msgstr ""
#. module: account_payment
#: selection:payment.line,state:0
msgid "Structured"
-msgstr "Strukturované"
+msgstr ""
#. module: account_payment
#: field:payment.order,state:0
msgid "State"
-msgstr "Stav"
+msgstr ""
#. module: account_payment
#: view:payment.line:0
@@ -223,17 +227,17 @@ msgstr ""
#. module: account_payment
#: field:payment.order,date_done:0
msgid "Execution date"
-msgstr "Datum představení"
+msgstr ""
#. module: account_payment
#: selection:payment.order,date_prefered:0
msgid "Fixed date"
-msgstr "Pevné datum"
+msgstr ""
#. module: account_payment
#: field:payment.line,info_partner:0
msgid "Destination Account"
-msgstr "Protiúčet"
+msgstr ""
#. module: account_payment
#: view:payment.line:0
@@ -251,12 +255,12 @@ msgstr ""
#: wizard_button:populate_payment,search,end:0
#: wizard_button:populate_statement,init,end:0
msgid "_Cancel"
-msgstr "Zrušit"
+msgstr ""
#. module: account_payment
#: field:payment.line,create_date:0
msgid "Created"
-msgstr "Vytvořeno"
+msgstr ""
#. module: account_payment
#: view:payment.line:0
@@ -281,12 +285,12 @@ msgstr ""
#. module: account_payment
#: field:payment.line,communication:0
msgid "Communication"
-msgstr "Komunikace"
+msgstr ""
#. module: account_payment
#: selection:payment.order,date_prefered:0
msgid "Due date"
-msgstr "Termín dokončení"
+msgstr ""
#. module: account_payment
#: field:account.invoice,amount_to_pay:0
@@ -307,7 +311,7 @@ msgstr ""
#: view:payment.type:0
#: help:payment.type,name:0
msgid "Payment Type"
-msgstr "Typ platby"
+msgstr ""
#. module: account_payment
#: help:payment.line,amount_currency:0
diff --git a/addons/account_payment/i18n/oc.po b/addons/account_payment/i18n/oc.po
new file mode 100644
index 00000000000..a5cac75343f
--- /dev/null
+++ b/addons/account_payment/i18n/oc.po
@@ -0,0 +1,618 @@
+# Occitan (post 1500) translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-04-22 12:18+0000\n"
+"Last-Translator: Cédric VALMARY (Tot en òc) \n"
+"Language-Team: Occitan (post 1500) \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-23 03:45+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_payment
+#: field:payment.order,date_planned:0
+msgid "Scheduled date if fixed"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,currency:0
+msgid "Partner Currency"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Set to draft"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.order,mode:0
+msgid "Select the Payment Mode to be applied."
+msgstr ""
+
+#. module: account_payment
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nom del Modèl invalid per la definicion de l'accion."
+
+#. module: account_payment
+#: view:payment.line:0
+#: field:payment.line,info_owner:0
+#: view:payment.order:0
+msgid "Owner Account"
+msgstr ""
+
+#. module: account_payment
+#: help:account.invoice,amount_to_pay:0
+msgid ""
+"The amount which should be paid at the current date\n"
+"minus the amount which is already in payment order"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,date:0
+msgid ""
+"If no payment date is specified, the bank will treat this payment line "
+"directly"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.order,date_prefered:0
+msgid "Preferred date"
+msgstr ""
+
+#. module: account_payment
+#: selection:payment.line,state:0
+msgid "Free"
+msgstr "Liure"
+
+#. module: account_payment
+#: wizard_field:populate_payment,search,entries:0
+msgid "Entries"
+msgstr "Entradas"
+
+#. module: account_payment
+#: wizard_field:populate_payment,init,duedate:0
+msgid "Due Date"
+msgstr "Data d'escasença"
+
+#. module: account_payment
+#: view:account.move.line:0
+msgid "Account Entry Line"
+msgstr "Linha d'escritura comptabla"
+
+#. module: account_payment
+#: wizard_button:populate_payment,search,create:0
+msgid "_Add to payment order"
+msgstr ""
+
+#. module: account_payment
+#: rml:payment.order:0
+#: view:payment.order:0
+msgid "Amount"
+msgstr "Soma"
+
+#. module: account_payment
+#: rml:payment.order:0
+msgid "Execution date:"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Total in Company Currency"
+msgstr ""
+
+#. module: account_payment
+#: selection:payment.order,state:0
+msgid "Cancelled"
+msgstr "Anullat"
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_payment_order_tree_new
+#: model:ir.ui.menu,name:account_payment.menu_action_payment_order_form_new
+msgid "New Payment Order"
+msgstr ""
+
+#. module: account_payment
+#: rml:payment.order:0
+#: field:payment.order,reference:0
+msgid "Reference"
+msgstr "Referéncia"
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_payment_order_tree
+#: model:ir.ui.menu,name:account_payment.menu_action_payment_order_form
+msgid "Payment Orders"
+msgstr ""
+
+#. module: account_payment
+#: selection:payment.order,date_prefered:0
+msgid "Directly"
+msgstr "Dirèctament"
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_payment_line_form
+#: model:ir.model,name:account_payment.model_payment_line
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "Payment Line"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.type,suitable_bank_types:0
+msgid "Suitable bank types"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.line:0
+msgid "Amount Total"
+msgstr ""
+
+#. module: account_payment
+#: selection:payment.order,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,ml_date_created:0
+msgid "Invoice Effective Date"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.order,line_ids:0
+msgid "Payment lines"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.order,date_planned:0
+msgid "Select a date if you have chosen Preferred Date to be fixed."
+msgstr ""
+
+#. module: account_payment
+#: selection:payment.line,state:0
+msgid "Structured"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.order,state:0
+msgid "State"
+msgstr "Estat"
+
+#. module: account_payment
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "Transaction Information"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_payment_mode_form
+#: model:ir.ui.menu,name:account_payment.menu_action_payment_mode_form
+#: view:payment.mode:0
+msgid "Payment Mode"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,ml_date_created:0
+msgid "Effective Date"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,ml_inv_ref:0
+msgid "Invoice Ref."
+msgstr ""
+
+#. module: account_payment
+#: help:payment.order,date_prefered:0
+msgid ""
+"Choose an option for the Payment Order:'Fixed' stands for a date specified "
+"by you.'Directly' stands for the direct execution.'Due date' stands for the "
+"scheduled date of execution."
+msgstr ""
+
+#. module: account_payment
+#: view:account.move.line:0
+msgid "Total debit"
+msgstr "Debit total"
+
+#. module: account_payment
+#: field:payment.order,date_done:0
+msgid "Execution date"
+msgstr ""
+
+#. module: account_payment
+#: selection:payment.order,date_prefered:0
+msgid "Fixed date"
+msgstr "Data fixa"
+
+#. module: account_payment
+#: field:payment.line,info_partner:0
+msgid "Destination Account"
+msgstr "Compte de destinacion"
+
+#. module: account_payment
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "Desitination Account"
+msgstr "Compte de destinacion"
+
+#. module: account_payment
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML invalid per l'arquitectura de la vista"
+
+#. module: account_payment
+#: wizard_button:populate_payment,init,end:0
+#: wizard_button:populate_payment,search,end:0
+#: wizard_button:populate_statement,init,end:0
+msgid "_Cancel"
+msgstr "_Anullar"
+
+#. module: account_payment
+#: field:payment.line,create_date:0
+msgid "Created"
+msgstr "Creat"
+
+#. module: account_payment
+#: view:payment.line:0
+msgid "Currency Amount Total"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Make Payments"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,state:0
+msgid "Communication Type"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.module.module,shortdesc:account_payment.module_meta_information
+msgid "Payment Management"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,communication:0
+msgid "Communication"
+msgstr "Comunicacion"
+
+#. module: account_payment
+#: selection:payment.order,date_prefered:0
+msgid "Due date"
+msgstr "Data de tèrme"
+
+#. module: account_payment
+#: field:account.invoice,amount_to_pay:0
+msgid "Amount to be paid"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,info_owner:0
+msgid "Address of the Main Partner"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.mode,name:0
+msgid "Mode of Payment"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.type:0
+#: help:payment.type,name:0
+msgid "Payment Type"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,amount_currency:0
+msgid "Payment amount in the partner currency"
+msgstr ""
+
+#. module: account_payment
+#: selection:payment.order,state:0
+msgid "Draft"
+msgstr "Borrolhon"
+
+#. module: account_payment
+#: field:payment.line,partner_id:0
+#: rml:payment.order:0
+msgid "Partner"
+msgstr "Partenari"
+
+#. module: account_payment
+#: help:payment.line,communication2:0
+msgid "The successor message of Communication."
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,info_partner:0
+msgid "Address of the Ordering Customer."
+msgstr ""
+
+#. module: account_payment
+#: view:account.move.line:0
+msgid "Total credit"
+msgstr "Credit total"
+
+#. module: account_payment
+#: model:ir.actions.wizard,name:account_payment.wizard_populate_payment
+msgid "Populate payment"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.order,user_id:0
+msgid "User"
+msgstr "Utilizaire"
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.act_account_invoice_2_payment_line
+#: wizard_field:populate_statement,init,lines:0
+msgid "Payment Lines"
+msgstr ""
+
+#. module: account_payment
+#: rml:payment.order:0
+msgid "Date"
+msgstr "Data"
+
+#. module: account_payment
+#: rml:payment.order:0
+msgid "Reference:"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,move_line_id:0
+msgid ""
+"This Entry Line will be referred for the information of the ordering "
+"customer."
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,date:0
+msgid "Payment Date"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.order,date_created:0
+msgid "Creation date"
+msgstr "Data de creacion"
+
+#. module: account_payment
+#: field:payment.line,ml_maturity_date:0
+msgid "Maturity Date"
+msgstr ""
+
+#. module: account_payment
+#: view:account.bank.statement:0
+msgid "Import payment lines"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.type,code:0
+msgid "Specify the Code for Payment Type"
+msgstr ""
+
+#. module: account_payment
+#: field:account.move.line,amount_to_pay:0
+msgid "Amount to pay"
+msgstr "Soma de pagar"
+
+#. module: account_payment
+#: field:payment.line,amount:0
+msgid "Amount in Company Currency"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,partner_id:0
+msgid "The Ordering Customer"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.type,code:0
+msgid "Code"
+msgstr "Còde"
+
+#. module: account_payment
+#: field:payment.line,name:0
+msgid "Your Reference"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Payment order"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "General Information"
+msgstr "Informacions generalas"
+
+#. module: account_payment
+#: selection:payment.order,state:0
+msgid "Done"
+msgstr "Acabat"
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Select Invoices to Pay"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Cancel"
+msgstr "Anullar"
+
+#. module: account_payment
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "Information"
+msgstr "Informacion"
+
+#. module: account_payment
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Lo nom de l'objècte deu començar amb x_ e conténer pas de caractèrs "
+"especials !"
+
+#. module: account_payment
+#: model:ir.actions.wizard,name:account_payment.wizard_pay_payment
+msgid "Pay"
+msgstr "Pagar"
+
+#. module: account_payment
+#: model:ir.actions.report.xml,name:account_payment.payment_order1
+#: model:ir.model,name:account_payment.model_payment_order
+msgid "Payment Order"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_payment_order_draft
+#: model:ir.ui.menu,name:account_payment.menu_action_payment_order_draft
+msgid "Draft Payment Order"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,amount:0
+msgid "Payment amount in the company currency"
+msgstr ""
+
+#. module: account_payment
+#: wizard_view:populate_payment,init:0
+msgid "Search Payment lines"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,amount_currency:0
+msgid "Amount in Partner Currency"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,communication2:0
+msgid "Communication 2"
+msgstr "Comunicacion 2"
+
+#. module: account_payment
+#: field:payment.line,bank_id:0
+msgid "Destination Bank account"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.mode,journal:0
+msgid "Cash Journal for the Payment Mode"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.mode,bank_id:0
+#: rml:payment.order:0
+msgid "Bank account"
+msgstr "Compte bancari"
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Confirm Payments"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,company_currency:0
+msgid "Company Currency"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.ui.menu,name:account_payment.menu_main
+#: model:ir.ui.menu,name:account_payment.next_id_44
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "Payment"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,move_line_id:0
+msgid "Entry line"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,communication:0
+msgid ""
+"Used as the message between ordering customer and current company. Depicts "
+"'What do you want to say to the recipient about this order ?'"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.mode,name:0
+#: field:payment.type,name:0
+msgid "Name"
+msgstr "Nom"
+
+#. module: account_payment
+#: wizard_button:populate_payment,init,search:0
+msgid "_Search"
+msgstr "_Recercar"
+
+#. module: account_payment
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "Entry Information"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.actions.wizard,name:account_payment.wizard_populate_statement
+msgid "Populate Statement with Payment lines"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,order_id:0
+msgid "Order"
+msgstr "Òrdre"
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_payment_order_open
+#: model:ir.ui.menu,name:account_payment.menu_action_payment_order_open
+msgid "Payment Orders to Validate"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.model,name:account_payment.model_payment_type
+#: field:payment.mode,type:0
+msgid "Payment type"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.order,total:0
+msgid "Total"
+msgstr "Total"
+
+#. module: account_payment
+#: wizard_button:populate_statement,init,add:0
+msgid "_Add"
+msgstr "_Apondre"
+
+#. module: account_payment
+#: help:payment.mode,type:0
+msgid "Select the Payment Type for the Payment Mode."
+msgstr ""
+
+#. module: account_payment
+#: model:ir.model,name:account_payment.model_payment_mode
+#: field:payment.order,mode:0
+msgid "Payment mode"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.mode,bank_id:0
+msgid "Bank Account for the Payment Mode"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.mode,journal:0
+msgid "Journal"
+msgstr "Jornal"
diff --git a/addons/account_report/i18n/nl.po b/addons/account_report/i18n/nl.po
index 1469c0a8c2b..361ff83fe61 100644
--- a/addons/account_report/i18n/nl.po
+++ b/addons/account_report/i18n/nl.po
@@ -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-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-11 22:21+0000\n"
-"Last-Translator: Pieter J. Kersten (EduSense BV) \n"
+"PO-Revision-Date: 2010-04-22 08:49+0000\n"
+"Last-Translator: Jan Verlaan (Veritos) \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:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-23 03:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_report
@@ -354,7 +354,7 @@ msgstr "Dochters"
msgid ""
"The Object name must start with x_ and not contain any special character !"
msgstr ""
-"De objectnaam moet beginnen met x_ en mag geen speciale karakters bevatten !"
+"De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten!"
#. module: account_report
#: help:account.report.report,goodness_limit:0
diff --git a/addons/account_tax_include/i18n/cs.po b/addons/account_tax_include/i18n/cs.po
index 1b6c23eccc0..cd4dfc6f3ed 100644
--- a/addons/account_tax_include/i18n/cs.po
+++ b/addons/account_tax_include/i18n/cs.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-04-17 18:14+0000\n"
-"Last-Translator: Valerie Engel \n"
+"PO-Revision-Date: 2010-04-25 21:20+0000\n"
+"Last-Translator: Martin Volf \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-21 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-26 03:41+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
@@ -34,19 +34,19 @@ msgstr ""
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax included"
-msgstr ""
+msgstr "Daně zahrnuty"
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax excluded"
-msgstr ""
+msgstr "Daně vyloučeny"
#. module: account_tax_include
#: view:account.tax:0
msgid "Compute Code for Taxes included prices"
-msgstr ""
+msgstr "Výpočetní kód pro ceny včetně daně"
#. module: account_tax_include
#: field:account.invoice.line,price_subtotal_incl:0
msgid "Subtotal"
-msgstr ""
+msgstr "Mezisoučet"
diff --git a/addons/analytic/project.py b/addons/analytic/project.py
index 0c3c46690ac..9194bd9906b 100644
--- a/addons/analytic/project.py
+++ b/addons/analytic/project.py
@@ -63,13 +63,13 @@ class account_analytic_account(osv.osv):
res = {}
ids2 = self.search(cr, uid, [('parent_id', 'child_of', ids)])
acc_set = ",".join(map(str, ids2))
-
+
for i in ids:
res.setdefault(i,0.0)
-
+
if not ids2:
return res
-
+
where_date = ''
if context.get('from_date',False):
where_date += " AND l.date >= '" + context['from_date'] + "'"
@@ -78,18 +78,18 @@ class account_analytic_account(osv.osv):
cr.execute("SELECT a.id, COALESCE(SUM(l.amount_currency),0) FROM account_analytic_account a LEFT JOIN account_analytic_line l ON (a.id=l.account_id "+where_date+") WHERE l.amount_currency<0 and a.id =ANY(%s) GROUP BY a.id",(ids2,))
r = dict(cr.fetchall())
return self._compute_currency_for_level_tree(cr, uid, ids, ids2, r, acc_set, context)
-
+
def _debit_calc(self, cr, uid, ids, name, arg, context={}):
res = {}
ids2 = self.search(cr, uid, [('parent_id', 'child_of', ids)])
acc_set = ",".join(map(str, ids2))
-
+
for i in ids:
res.setdefault(i,0.0)
-
+
if not ids2:
return res
-
+
where_date = ''
if context.get('from_date',False):
where_date += " AND l.date >= '" + context['from_date'] + "'"
@@ -98,48 +98,48 @@ class account_analytic_account(osv.osv):
cr.execute("SELECT a.id, COALESCE(SUM(l.amount_currency),0) FROM account_analytic_account a LEFT JOIN account_analytic_line l ON (a.id=l.account_id "+where_date+") WHERE l.amount_currency>0 and a.id =ANY(%s) GROUP BY a.id" ,(ids2,))
r= dict(cr.fetchall())
return self._compute_currency_for_level_tree(cr, uid, ids, ids2, r, acc_set, context)
-
+
def _balance_calc(self, cr, uid, ids, name, arg, context={}):
res = {}
ids2 = self.search(cr, uid, [('parent_id', 'child_of', ids)])
acc_set = ",".join(map(str, ids2))
-
+
for i in ids:
res.setdefault(i,0.0)
-
+
if not ids2:
return res
-
+
where_date = ''
if context.get('from_date',False):
where_date += " AND l.date >= '" + context['from_date'] + "'"
if context.get('to_date',False):
where_date += " AND l.date <= '" + context['to_date'] + "'"
cr.execute("SELECT a.id, COALESCE(SUM(l.amount_currency),0) FROM account_analytic_account a LEFT JOIN account_analytic_line l ON (a.id=l.account_id "+where_date+") WHERE a.id =ANY(%s) GROUP BY a.id",(ids2,))
-
+
for account_id, sum in cr.fetchall():
res[account_id] = sum
return self._compute_currency_for_level_tree(cr, uid, ids, ids2, res, acc_set, context)
-
+
def _quantity_calc(self, cr, uid, ids, name, arg, context={}):
#XXX must convert into one uom
res = {}
ids2 = self.search(cr, uid, [('parent_id', 'child_of', ids)])
acc_set = ",".join(map(str, ids2))
-
+
for i in ids:
res.setdefault(i,0.0)
-
+
if not ids2:
return res
-
+
where_date = ''
if context.get('from_date',False):
where_date += " AND l.date >= '" + context['from_date'] + "'"
if context.get('to_date',False):
where_date += " AND l.date <= '" + context['to_date'] + "'"
-
+
cr.execute('SELECT a.id, COALESCE(SUM(l.unit_amount), 0) \
FROM account_analytic_account a \
LEFT JOIN account_analytic_line l ON (a.id = l.account_id ' + where_date + ') \
@@ -182,7 +182,7 @@ class account_analytic_account(osv.osv):
def _get_account_currency(self, cr, uid, ids, field_name, arg, context={}):
result=self._get_company_currency(cr, uid, ids, field_name, arg, context={})
return result
-
+
_columns = {
'name' : fields.char('Account Name', size=128, required=True),
'complete_name': fields.function(_complete_name_calc, method=True, type='char', string='Full Account Name'),
@@ -192,10 +192,10 @@ class account_analytic_account(osv.osv):
'parent_id': fields.many2one('account.analytic.account', 'Parent Analytic Account', select=2),
'child_ids': fields.one2many('account.analytic.account', 'parent_id', 'Child Accounts'),
'line_ids': fields.one2many('account.analytic.line', 'account_id', 'Analytic Entries'),
- 'balance' : fields.function(_balance_calc, method=True, type='float', string='Balance'),
- 'debit' : fields.function(_debit_calc, method=True, type='float', string='Debit'),
- 'credit' : fields.function(_credit_calc, method=True, type='float', string='Credit'),
- 'quantity': fields.function(_quantity_calc, method=True, type='float', string='Quantity'),
+ 'balance' : fields.function(_balance_calc, method=True, type='float', string='Balance',store=True),
+ 'debit' : fields.function(_debit_calc, method=True, type='float', string='Debit',store=True),
+ 'credit' : fields.function(_credit_calc, method=True, type='float', string='Credit',store=True),
+ 'quantity': fields.function(_quantity_calc, method=True, type='float', string='Quantity',store=True),
'quantity_max': fields.float('Maximum Quantity', help='Sets the higher limit of quantity of hours.'),
'partner_id' : fields.many2one('res.partner', 'Associated Partner'),
'contact_id' : fields.many2one('res.partner.address', 'Contact'),
diff --git a/addons/audittrail/i18n/it.po b/addons/audittrail/i18n/it.po
index 5ba61eb14a7..f795546b2fe 100644
--- a/addons/audittrail/i18n/it.po
+++ b/addons/audittrail/i18n/it.po
@@ -7,19 +7,23 @@ 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-04-07 08:27+0000\n"
-"Last-Translator: iTuxer \n"
+"PO-Revision-Date: 2009-02-03 12:33+0000\n"
+"Last-Translator: Fabien (Open ERP) \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+=======
"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
+>>>>>>> MERGE-SOURCE
"X-Generator: Launchpad (build Unknown)\n"
#. module: audittrail
#: model:ir.module.module,shortdesc:audittrail.module_meta_information
msgid "Audit Trail"
-msgstr "Audit Trail"
+msgstr ""
#. module: audittrail
#: constraint:ir.model:0
@@ -32,22 +36,22 @@ msgstr ""
#. module: audittrail
#: field:audittrail.log.line,log_id:0
msgid "Log"
-msgstr "Log"
+msgstr ""
#. module: audittrail
#: selection:audittrail.rule,state:0
msgid "Subscribed"
-msgstr "Iscritto"
+msgstr ""
#. module: audittrail
#: view:audittrail.log:0
msgid "Old Value : "
-msgstr "Valore precendente : "
+msgstr ""
#. module: audittrail
#: selection:audittrail.log,method:0
msgid "Create"
-msgstr "Crea"
+msgstr ""
#. module: audittrail
#: wizard_view:audittrail.view.log,init:0
@@ -67,7 +71,7 @@ msgstr ""
#. module: audittrail
#: field:audittrail.log.line,old_value:0
msgid "Old Value"
-msgstr "Valore precedente"
+msgstr ""
#. module: audittrail
#: constraint:ir.actions.act_window:0
diff --git a/addons/base_action_rule/base_action_rule.py b/addons/base_action_rule/base_action_rule.py
index f4129998bcc..df2d43d3a53 100644
--- a/addons/base_action_rule/base_action_rule.py
+++ b/addons/base_action_rule/base_action_rule.py
@@ -310,6 +310,7 @@ class base_action_rule_line(osv.osv):
('create','Creation Date'),
('action_last','Last Action Date'),
('date','Date'),
+ ('deadline', 'Deadline'),
], 'Trigger Date', size=16),
'trg_date_range': fields.integer('Delay after trigger date',help="Delay After Trigger Date,\
specifies you can put a negative number " \
diff --git a/addons/base_contact/i18n/ko.po b/addons/base_contact/i18n/ko.po
index a5dbaad3f46..d209a3d2db3 100644
--- a/addons/base_contact/i18n/ko.po
+++ b/addons/base_contact/i18n/ko.po
@@ -14,7 +14,11 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
+"X-Launchpad-Export-Date: 2010-04-07 03:46+0000\n"
+=======
"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
+>>>>>>> MERGE-SOURCE
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_contact
diff --git a/addons/base_module_quality/i18n/et.po b/addons/base_module_quality/i18n/et.po
index bdaff69d207..d770836ddcd 100644
--- a/addons/base_module_quality/i18n/et.po
+++ b/addons/base_module_quality/i18n/et.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-09 16:43+0000\n"
-"Last-Translator: Fabien (Open ERP) \n"
+"PO-Revision-Date: 2010-04-23 09:48+0000\n"
+"Last-Translator: lyyser \n"
"Language-Team: Estonian \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:20+0000\n"
+"X-Launchpad-Export-Date: 2010-04-24 03:53+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_module_quality
@@ -42,22 +42,22 @@ msgstr ""
#. module: base_module_quality
#: view:module.quality.detail:0
msgid "Detail"
-msgstr ""
+msgstr "Detail"
#. module: base_module_quality
#: field:module.quality.detail,note:0
msgid "Note"
-msgstr ""
+msgstr "Märkus"
#. module: base_module_quality
#: field:module.quality.detail,state:0
msgid "State"
-msgstr ""
+msgstr "Olek"
#. module: base_module_quality
#: field:module.quality.detail,detail:0
msgid "Details"
-msgstr ""
+msgstr "Detailid"
#. module: base_module_quality
#: field:module.quality.detail,ponderation:0
@@ -75,12 +75,12 @@ msgstr ""
#: view:module.quality.check:0
#: field:module.quality.check,check_detail_ids:0
msgid "Tests"
-msgstr ""
+msgstr "Testid"
#. module: base_module_quality
#: selection:module.quality.detail,state:0
msgid "Skipped"
-msgstr ""
+msgstr "Vahele jäetud"
#. module: base_module_quality
#: help:module.quality.detail,state:0
@@ -102,17 +102,17 @@ msgstr ""
#. module: base_module_quality
#: field:module.quality.detail,name:0
msgid "Name"
-msgstr ""
+msgstr "Nimi"
#. module: base_module_quality
#: wizard_field:quality_detail_save,init,module_file:0
msgid "Save report"
-msgstr ""
+msgstr "Salvesta aruanne"
#. module: base_module_quality
#: wizard_field:quality_detail_save,init,name:0
msgid "File name"
-msgstr ""
+msgstr "Failinimi"
#. module: base_module_quality
#: field:module.quality.detail,score:0
@@ -122,13 +122,13 @@ msgstr ""
#. module: base_module_quality
#: help:quality_detail_save,init,name:0
msgid "Save report as .html format"
-msgstr ""
+msgstr "Salvesta aruanne .html vormingus"
#. module: base_module_quality
#: view:module.quality.detail:0
#: field:module.quality.detail,summary:0
msgid "Summary"
-msgstr ""
+msgstr "Kokkuvõte"
#. module: base_module_quality
#: model:ir.actions.wizard,name:base_module_quality.quality_detail_save
@@ -143,7 +143,7 @@ msgstr ""
#. module: base_module_quality
#: view:module.quality.detail:0
msgid "Save Report"
-msgstr ""
+msgstr "Aruande salvestamine"
#. module: base_module_quality
#: model:ir.actions.wizard,name:base_module_quality.create_quality_check_id
@@ -158,25 +158,25 @@ msgstr ""
#. module: base_module_quality
#: selection:module.quality.detail,state:0
msgid "Done"
-msgstr ""
+msgstr "Valmis"
#. module: base_module_quality
#: view:module.quality.check:0
#: view:module.quality.detail:0
msgid "Result"
-msgstr ""
+msgstr "Tulemus"
#. module: base_module_quality
#: wizard_button:quality_detail_save,init,end:0
msgid "Cancel"
-msgstr ""
+msgstr "Katkesta"
#. module: base_module_quality
#: field:module.quality.detail,message:0
msgid "Message"
-msgstr ""
+msgstr "Sõnum"
#. module: base_module_quality
#: field:module.quality.detail,quality_check_id:0
msgid "Quality"
-msgstr ""
+msgstr "Kvaliteet"
diff --git a/addons/base_report_creator/i18n/ru.po b/addons/base_report_creator/i18n/ru.po
index 7eeef699005..f61c7019e69 100644
--- a/addons/base_report_creator/i18n/ru.po
+++ b/addons/base_report_creator/i18n/ru.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-11 18:58+0000\n"
-"Last-Translator: Auduf <5097@mail.ru>\n"
+"PO-Revision-Date: 2010-04-23 16:38+0000\n"
+"Last-Translator: Nikita Shehov \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-04-24 03:52+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_report_creator
@@ -23,6 +23,8 @@ msgid ""
"records.\n"
" e.g. res_partner.id=3"
msgstr ""
+"Введите параметр для поиска нужных записей.\n"
+"Например: res_partner.id=3"
#. module: base_report_creator
#: field:base_report_creator.report,view_graph_type:0
@@ -408,6 +410,11 @@ msgid ""
"After installing the module, it adds a menu to define custom report in\n"
"the \"Dashboard\" menu.\n"
msgstr ""
+"С помощью этих модулей вы сможете создать статистический отчет\n"
+"выбранных объектов. Это создатель и браузер SQL-запросов для пользователей.\n"
+"\n"
+"После установки модуля, в главном меню появится ссылка для выбора отчета по "
+"умолчанию.\n"
#. module: base_report_creator
#: selection:base_report_creator.report.fields,calendar_mode:0
diff --git a/addons/base_setup/i18n/fa.po b/addons/base_setup/i18n/fa.po
deleted file mode 100644
index 4977c9a4a3f..00000000000
--- a/addons/base_setup/i18n/fa.po
+++ /dev/null
@@ -1,283 +0,0 @@
-# Persian translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-04-08 14:27+0000\n"
-"Last-Translator: Sadegh Ismael Nattaj \n"
-"Language-Team: Persian \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:05+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: base_setup
-#: wizard_field:base_setup.base_setup,company,city:0
-#: wizard_field:base_setup.base_setup,init,city:0
-#: wizard_field:base_setup.base_setup,update,city:0
-msgid "City"
-msgstr "شهر"
-
-#. module: base_setup
-#: wizard_view:base_setup.base_setup,finish:0
-msgid ""
-"You can start configuring the system or connect directly to the database "
-"using the default setup."
-msgstr ""
-"شما میتوانید با بکارگیری از سوارسازی پیشفرض آغاز به پیکربندی سامانه کنید و "
-"یا یکراست به دادگان متصل شوید."
-
-#. module: base_setup
-#: wizard_field:base_setup.base_setup,company,zip:0
-#: wizard_field:base_setup.base_setup,init,zip:0
-#: wizard_field:base_setup.base_setup,update,zip:0
-msgid "Zip code"
-msgstr "کد پستی"
-
-#. module: base_setup
-#: wizard_view:base_setup.base_setup,init:0
-msgid "Select a Profile"
-msgstr "یک پروفایل را برگزینید"
-
-#. module: base_setup
-#: wizard_view:base_setup.base_setup,company:0
-msgid "Report header"
-msgstr "سرنویس گزارش"
-
-#. module: base_setup
-#: wizard_button:base_setup.base_setup,finish,config:0
-msgid "Start Configuration"
-msgstr "آغاز پیکربندی"
-
-#. module: base_setup
-#: wizard_view:base_setup.base_setup,init:0
-msgid ""
-"You'll be able to install more modules later through the Administration menu."
-msgstr ""
-"شما میتوانید از طریق منوی راهبری پیمانههای بیشتری را در آینده برپاسازی "
-"نمایید."
-
-#. module: base_setup
-#: wizard_view:base_setup.base_setup,init:0
-msgid ""
-"A profile sets a pre-selection of modules for specific needs. These profiles "
-"have been setup to help you discover the different aspects of OpenERP. This "
-"is just an overview, we have 300+ available modules."
-msgstr ""
-"یک پروفایل دارای پیمانههای از پیش گزینش شده برای نیازهای خاص است. این "
-"پروفایلها برای این سوار میشوند تا به شما برای شناخت بیشتر جنبههای متفاوت "
-"اپن ایآرپی کمک نماید. این تنها یک پیشنمایش است، ما بیش از ۳۰۰ پیمانه "
-"آماده داریم."
-
-#. module: base_setup
-#: wizard_button:base_setup.base_setup,company,update:0
-#: wizard_button:base_setup.base_setup,init,company:0
-msgid "Next"
-msgstr "پس"
-
-#. module: base_setup
-#: wizard_field:base_setup.base_setup,company,email:0
-#: wizard_field:base_setup.base_setup,init,email:0
-#: wizard_field:base_setup.base_setup,update,email:0
-msgid "E-mail"
-msgstr "ایمیل"
-
-#. module: base_setup
-#: wizard_field:base_setup.base_setup,company,state_id:0
-#: wizard_field:base_setup.base_setup,init,state_id:0
-#: wizard_field:base_setup.base_setup,update,state_id:0
-msgid "State"
-msgstr "استان"
-
-#. module: base_setup
-#: wizard_view:base_setup.base_setup,finish:0
-msgid "Your new database is now fully installed."
-msgstr "دادگان نو شما بطور کامل برپاسازی گردید."
-
-#. module: base_setup
-#: wizard_field:base_setup.base_setup,company,profile:0
-#: wizard_field:base_setup.base_setup,init,profile:0
-#: wizard_field:base_setup.base_setup,update,profile:0
-msgid "Profile"
-msgstr "پروفایل"
-
-#. module: base_setup
-#: wizard_field:base_setup.base_setup,company,rml_footer1:0
-#: wizard_field:base_setup.base_setup,init,rml_footer1:0
-#: wizard_field:base_setup.base_setup,update,rml_footer1:0
-msgid "Report Footer 1"
-msgstr "پانویس گزارش ۱"
-
-#. module: base_setup
-#: wizard_field:base_setup.base_setup,company,rml_footer2:0
-#: wizard_field:base_setup.base_setup,init,rml_footer2:0
-#: wizard_field:base_setup.base_setup,update,rml_footer2:0
-msgid "Report Footer 2"
-msgstr "پانویس گزارش ۲"
-
-#. module: base_setup
-#: wizard_view:base_setup.base_setup,company:0
-msgid "General Information"
-msgstr "آگهگان عمومی"
-
-#. module: base_setup
-#: wizard_field:base_setup.base_setup,company,street2:0
-#: wizard_field:base_setup.base_setup,init,street2:0
-#: wizard_field:base_setup.base_setup,update,street2:0
-msgid "Street2"
-msgstr "خیابان۲"
-
-#. module: base_setup
-#: wizard_view:base_setup.base_setup,company:0
-msgid "Report Information"
-msgstr "آگهگان گزارش"
-
-#. module: base_setup
-#: wizard_field:base_setup.base_setup,company,phone:0
-#: wizard_field:base_setup.base_setup,init,phone:0
-#: wizard_field:base_setup.base_setup,update,phone:0
-msgid "Phone"
-msgstr "تلفن"
-
-#. module: base_setup
-#: wizard_view:base_setup.base_setup,company:0
-msgid "Define Main Company"
-msgstr "تعریف شرکت اصلی"
-
-#. module: base_setup
-#: wizard_field:base_setup.base_setup,company,name:0
-#: wizard_field:base_setup.base_setup,init,name:0
-#: wizard_field:base_setup.base_setup,update,name:0
-msgid "Company Name"
-msgstr "نام شرکت"
-
-#. module: base_setup
-#: help:base_setup.base_setup,company,rml_footer2:0
-#: help:base_setup.base_setup,init,rml_footer2:0
-#: help:base_setup.base_setup,update,rml_footer2:0
-msgid ""
-"This sentence will appear at the bottom of your reports.\n"
-"We suggest you to put bank information here:\n"
-"IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-msgstr ""
-"این جمله در پایین گزارشهای شما ظاهر خواهد شد.\n"
-"پیشنهاد میکنیم آگهگان بانکی را اینجا وارد نمایید:\n"
-"IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-
-#. module: base_setup
-#: wizard_field:base_setup.base_setup,company,country_id:0
-#: wizard_field:base_setup.base_setup,init,country_id:0
-#: wizard_field:base_setup.base_setup,update,country_id:0
-msgid "Country"
-msgstr "کشور"
-
-#. module: base_setup
-#: wizard_view:base_setup.base_setup,company:0
-#: wizard_view:base_setup.base_setup,finish:0
-#: wizard_view:base_setup.base_setup,init:0
-#: wizard_view:base_setup.base_setup,update:0
-#: model:ir.actions.wizard,name:base_setup.action_wizard_setup
-#: model:ir.actions.wizard,name:base_setup.wizard_base_setup
-msgid "Setup"
-msgstr "سوارکردن"
-
-#. module: base_setup
-#: help:base_setup.base_setup,company,rml_footer1:0
-#: help:base_setup.base_setup,init,rml_footer1:0
-#: help:base_setup.base_setup,update,rml_footer1:0
-msgid ""
-"This sentence will appear at the bottom of your reports.\n"
-"We suggest you to write legal sentences here:\n"
-"Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-msgstr ""
-"این جمله در پایین گزارشهای شما ظاهر خواهد شد.\n"
-"پیشنهاد میکنیم تا از عبارات قانونی در اینجا بکار ببرید:\n"
-"Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-
-#. module: base_setup
-#: wizard_view:base_setup.base_setup,update:0
-msgid "Summary"
-msgstr "چکیده"
-
-#. module: base_setup
-#: wizard_button:base_setup.base_setup,update,finish:0
-msgid "Install"
-msgstr "برپایی"
-
-#. module: base_setup
-#: wizard_view:base_setup.base_setup,finish:0
-msgid "Installation Done"
-msgstr "برپایی انجام شد"
-
-#. module: base_setup
-#: help:base_setup.base_setup,company,rml_header1:0
-#: help:base_setup.base_setup,init,rml_header1:0
-#: help:base_setup.base_setup,update,rml_header1:0
-msgid ""
-"This sentence will appear at the top right corner of your reports.\n"
-"We suggest you to put a slogan here:\n"
-"\"Open Source Business Solutions\"."
-msgstr ""
-"این جمله در گوشه بالا سمت راست گزارشهای شما ظاهر خواهد شد.\n"
-"پیشنهاد میکنیم شعار خود را اینجا قرار دهید:\n"
-"\"راهکارهای بازمتن برای تجارت\"."
-
-#. module: base_setup
-#: wizard_field:base_setup.base_setup,company,rml_header1:0
-#: wizard_field:base_setup.base_setup,init,rml_header1:0
-#: wizard_field:base_setup.base_setup,update,rml_header1:0
-msgid "Report Header"
-msgstr "سرنویس گزارش"
-
-#. module: base_setup
-#: wizard_view:base_setup.base_setup,company:0
-msgid "Your Logo - Use a size of about 450x150 pixels."
-msgstr "نشان شما - اندازه تصویری ۱۵۰×۴۵۰ پیکسل را بکار برید."
-
-#. module: base_setup
-#: wizard_field:base_setup.base_setup,company,currency:0
-#: wizard_field:base_setup.base_setup,init,currency:0
-#: wizard_field:base_setup.base_setup,update,currency:0
-msgid "Currency"
-msgstr "ارز"
-
-#. module: base_setup
-#: wizard_field:base_setup.base_setup,company,street:0
-#: wizard_field:base_setup.base_setup,init,street:0
-#: wizard_field:base_setup.base_setup,update,street:0
-msgid "Street"
-msgstr "خیابان"
-
-#. module: base_setup
-#: wizard_button:base_setup.base_setup,finish,menu:0
-msgid "Use Directly"
-msgstr "بکارگیری آنی"
-
-#. module: base_setup
-#: wizard_button:base_setup.base_setup,init,menu:0
-msgid "Cancel"
-msgstr "لغو"
-
-#. module: base_setup
-#: wizard_field:base_setup.base_setup,company,logo:0
-#: wizard_field:base_setup.base_setup,init,logo:0
-#: wizard_field:base_setup.base_setup,update,logo:0
-msgid "Logo"
-msgstr "نشان"
-
-#. module: base_setup
-#: model:ir.module.module,shortdesc:base_setup.module_meta_information
-msgid "Base Setup"
-msgstr "سوارکردن پایه"
-
-#. module: base_setup
-#: wizard_button:base_setup.base_setup,company,init:0
-#: wizard_button:base_setup.base_setup,update,company:0
-msgid "Previous"
-msgstr "پیش"
diff --git a/addons/base_setup/i18n/nl.po b/addons/base_setup/i18n/nl.po
index fb194a33bec..ee892e6fc0e 100644
--- a/addons/base_setup/i18n/nl.po
+++ b/addons/base_setup/i18n/nl.po
@@ -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-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 12:12+0000\n"
-"Last-Translator: Freerk Kalsbeek (Mindswitch BV) \n"
+"PO-Revision-Date: 2010-04-22 08:50+0000\n"
+"Last-Translator: Jan Verlaan (Veritos) \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:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-23 03:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_setup
@@ -272,7 +272,7 @@ msgstr "Logo"
#. module: base_setup
#: model:ir.module.module,shortdesc:base_setup.module_meta_information
msgid "Base Setup"
-msgstr ""
+msgstr "Basis setup"
#. module: base_setup
#: wizard_button:base_setup.base_setup,company,init:0
diff --git a/addons/board_account/__openerp__.py b/addons/board_account/__openerp__.py
index 82ecb16fa37..58de913f2ea 100644
--- a/addons/board_account/__openerp__.py
+++ b/addons/board_account/__openerp__.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL ().
#
@@ -15,7 +15,7 @@
# 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 .
+# along with this program. If not, see .
#
##############################################################################
@@ -38,9 +38,6 @@
'account',
'hr_timesheet_invoice',
'board',
- 'report_account',
- 'report_analytic',
- 'report_analytic_line',
'account_report'
],
'update_xml': ['board_account_view.xml'],
diff --git a/addons/board_account/board_account_view.xml b/addons/board_account/board_account_view.xml
index 50b0fedd37e..2beb9899cb6 100644
--- a/addons/board_account/board_account_view.xml
+++ b/addons/board_account/board_account_view.xml
@@ -41,7 +41,7 @@
-
+
diff --git a/addons/board_association/i18n/nl.po b/addons/board_association/i18n/nl.po
index 4582b384d3a..0e69af4027e 100644
--- a/addons/board_association/i18n/nl.po
+++ b/addons/board_association/i18n/nl.po
@@ -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-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-28 07:55+0000\n"
-"Last-Translator: Fabien (Open ERP) \n"
+"PO-Revision-Date: 2010-04-22 08:51+0000\n"
+"Last-Translator: Jan Verlaan (Veritos) \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:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-23 03:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: board_association
@@ -55,7 +55,7 @@ msgstr "Onbetaalde facturen"
#. module: board_association
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Ongeldige modelnaam in de definitie van de actie."
#. module: board_association
#: view:board.board:0
diff --git a/addons/board_association/i18n/oc.po b/addons/board_association/i18n/oc.po
new file mode 100644
index 00000000000..477a9bff006
--- /dev/null
+++ b/addons/board_association/i18n/oc.po
@@ -0,0 +1,69 @@
+# Occitan (post 1500) translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-04-22 12:09+0000\n"
+"Last-Translator: Cédric VALMARY (Tot en òc) \n"
+"Language-Team: Occitan (post 1500) \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-23 03:45+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: board_association
+#: model:ir.ui.menu,name:board_association.menu_board_associations_manager
+msgid "Associations"
+msgstr "Associacions"
+
+#. module: board_association
+#: model:ir.module.module,shortdesc:board_association.module_meta_information
+msgid "Dashboard for Associations"
+msgstr "Tablèu de Bòrd per las Associacions"
+
+#. module: board_association
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML invalid per l'arquitectura de la vista"
+
+#. module: board_association
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board_association.open_board_associations_manager
+msgid "Association Dashboard"
+msgstr "Tablèu de Bòrd Associacion"
+
+#. module: board_association
+#: view:board.board:0
+msgid "My tasks"
+msgstr "Mos Prètzfaches"
+
+#. module: board_association
+#: view:board.board:0
+msgid "New members"
+msgstr "Membres novèls"
+
+#. module: board_association
+#: view:board.board:0
+msgid "Unpaid Invoices"
+msgstr "Facturas impagadas"
+
+#. module: board_association
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nom del Modèl invalid per la definicion de l'accion."
+
+#. module: board_association
+#: view:board.board:0
+msgid "Next Events"
+msgstr "Eveniments que venon"
+
+#. module: board_association
+#: view:board.board:0
+msgid "Registrations by Events"
+msgstr "Inscripcions per eveniment"
diff --git a/addons/board_crm_configuration/__init__.py b/addons/board_crm/__init__.py
similarity index 100%
rename from addons/board_crm_configuration/__init__.py
rename to addons/board_crm/__init__.py
diff --git a/addons/board_crm_configuration/__openerp__.py b/addons/board_crm/__openerp__.py
similarity index 100%
rename from addons/board_crm_configuration/__openerp__.py
rename to addons/board_crm/__openerp__.py
diff --git a/addons/board_crm_configuration/board_crm_demo.xml b/addons/board_crm/board_crm_demo.xml
similarity index 100%
rename from addons/board_crm_configuration/board_crm_demo.xml
rename to addons/board_crm/board_crm_demo.xml
diff --git a/addons/board_crm_configuration/board_crm_statistical_view.xml b/addons/board_crm/board_crm_statistical_view.xml
similarity index 91%
rename from addons/board_crm_configuration/board_crm_statistical_view.xml
rename to addons/board_crm/board_crm_statistical_view.xml
index 2b3c348c6a4..9a43e4e96c2 100644
--- a/addons/board_crm_configuration/board_crm_statistical_view.xml
+++ b/addons/board_crm/board_crm_statistical_view.xml
@@ -6,40 +6,38 @@
-->
Leads By Stage - Graph
- report.crm.lead.section.stage
+ crm.lead.report
graph
-
report.crm.opportunity.categ.graph
- report.crm.opportunity.categ
+ crm.opportunity.report
graph
-
- report.crm.lead.section.stage
+ crm.lead.report
form
graph,tree,form
@@ -48,7 +46,7 @@
+
+
+
+ CRM Configuration
+
+
+ crm.opportunity.user.graph1
+ crm.opportunity.report
+ graph
+
+
+
+
+
+
+
+
+ crm.lead
+ form
+ tree,form
+
+ [('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]
+
+
+ crm.meeting
+ form
+ tree,form
+
+ [('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]
+
+
+
+ crm.lead.report
+ form
+ graph,tree,form
+
+ [('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]
+
+
+
+ crm.opportunity.report
+ form
+ graph,tree,form
+
+ [('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]
+
+
+
+ CRM - Dashboard Form
+ board.board
+ form
+
+
+
+
+
+ CRM Dashboard
+ board.board
+ form
+ form
+ menu
+
+
+
+
+
+
+
+
diff --git a/addons/board_crm_configuration/i18n/ar.po b/addons/board_crm/i18n/ar.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/ar.po
rename to addons/board_crm/i18n/ar.po
diff --git a/addons/board_crm_configuration/i18n/bg.po b/addons/board_crm/i18n/bg.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/bg.po
rename to addons/board_crm/i18n/bg.po
diff --git a/addons/board_crm_configuration/i18n/board_crm_configuration.pot b/addons/board_crm/i18n/board_crm_configuration.pot
similarity index 100%
rename from addons/board_crm_configuration/i18n/board_crm_configuration.pot
rename to addons/board_crm/i18n/board_crm_configuration.pot
diff --git a/addons/board_crm_configuration/i18n/bs.po b/addons/board_crm/i18n/bs.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/bs.po
rename to addons/board_crm/i18n/bs.po
diff --git a/addons/board_crm_configuration/i18n/ca.po b/addons/board_crm/i18n/ca.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/ca.po
rename to addons/board_crm/i18n/ca.po
diff --git a/addons/board_crm_configuration/i18n/cs.po b/addons/board_crm/i18n/cs.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/cs.po
rename to addons/board_crm/i18n/cs.po
diff --git a/addons/board_crm_configuration/i18n/de.po b/addons/board_crm/i18n/de.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/de.po
rename to addons/board_crm/i18n/de.po
diff --git a/addons/board_crm_configuration/i18n/el.po b/addons/board_crm/i18n/el.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/el.po
rename to addons/board_crm/i18n/el.po
diff --git a/addons/board_crm_configuration/i18n/es.po b/addons/board_crm/i18n/es.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/es.po
rename to addons/board_crm/i18n/es.po
diff --git a/addons/board_crm_configuration/i18n/es_AR.po b/addons/board_crm/i18n/es_AR.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/es_AR.po
rename to addons/board_crm/i18n/es_AR.po
diff --git a/addons/board_crm_configuration/i18n/et.po b/addons/board_crm/i18n/et.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/et.po
rename to addons/board_crm/i18n/et.po
diff --git a/addons/board_crm_configuration/i18n/fr.po b/addons/board_crm/i18n/fr.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/fr.po
rename to addons/board_crm/i18n/fr.po
diff --git a/addons/board_crm_configuration/i18n/hr.po b/addons/board_crm/i18n/hr.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/hr.po
rename to addons/board_crm/i18n/hr.po
diff --git a/addons/board_crm_configuration/i18n/hu.po b/addons/board_crm/i18n/hu.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/hu.po
rename to addons/board_crm/i18n/hu.po
diff --git a/addons/board_crm_configuration/i18n/id.po b/addons/board_crm/i18n/id.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/id.po
rename to addons/board_crm/i18n/id.po
diff --git a/addons/board_crm_configuration/i18n/it.po b/addons/board_crm/i18n/it.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/it.po
rename to addons/board_crm/i18n/it.po
diff --git a/addons/board_crm_configuration/i18n/ko.po b/addons/board_crm/i18n/ko.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/ko.po
rename to addons/board_crm/i18n/ko.po
diff --git a/addons/board_crm_configuration/i18n/lt.po b/addons/board_crm/i18n/lt.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/lt.po
rename to addons/board_crm/i18n/lt.po
diff --git a/addons/board_crm_configuration/i18n/nl.po b/addons/board_crm/i18n/nl.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/nl.po
rename to addons/board_crm/i18n/nl.po
diff --git a/addons/board_crm_configuration/i18n/nl_BE.po b/addons/board_crm/i18n/nl_BE.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/nl_BE.po
rename to addons/board_crm/i18n/nl_BE.po
diff --git a/addons/board_crm_configuration/i18n/pl.po b/addons/board_crm/i18n/pl.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/pl.po
rename to addons/board_crm/i18n/pl.po
diff --git a/addons/board_crm_configuration/i18n/pt.po b/addons/board_crm/i18n/pt.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/pt.po
rename to addons/board_crm/i18n/pt.po
diff --git a/addons/board_crm_configuration/i18n/pt_BR.po b/addons/board_crm/i18n/pt_BR.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/pt_BR.po
rename to addons/board_crm/i18n/pt_BR.po
diff --git a/addons/board_crm_configuration/i18n/ro.po b/addons/board_crm/i18n/ro.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/ro.po
rename to addons/board_crm/i18n/ro.po
diff --git a/addons/board_crm_configuration/i18n/ru.po b/addons/board_crm/i18n/ru.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/ru.po
rename to addons/board_crm/i18n/ru.po
diff --git a/addons/board_crm_configuration/i18n/sk.po b/addons/board_crm/i18n/sk.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/sk.po
rename to addons/board_crm/i18n/sk.po
diff --git a/addons/board_crm_configuration/i18n/sl.po b/addons/board_crm/i18n/sl.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/sl.po
rename to addons/board_crm/i18n/sl.po
diff --git a/addons/board_crm_configuration/i18n/sq.po b/addons/board_crm/i18n/sq.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/sq.po
rename to addons/board_crm/i18n/sq.po
diff --git a/addons/board_crm_configuration/i18n/sv.po b/addons/board_crm/i18n/sv.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/sv.po
rename to addons/board_crm/i18n/sv.po
diff --git a/addons/board_crm_configuration/i18n/tlh.po b/addons/board_crm/i18n/tlh.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/tlh.po
rename to addons/board_crm/i18n/tlh.po
diff --git a/addons/board_crm_configuration/i18n/tr.po b/addons/board_crm/i18n/tr.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/tr.po
rename to addons/board_crm/i18n/tr.po
diff --git a/addons/board_crm_configuration/i18n/uk.po b/addons/board_crm/i18n/uk.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/uk.po
rename to addons/board_crm/i18n/uk.po
diff --git a/addons/board_crm_configuration/i18n/vi.po b/addons/board_crm/i18n/vi.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/vi.po
rename to addons/board_crm/i18n/vi.po
diff --git a/addons/board_crm_configuration/i18n/zh_CN.po b/addons/board_crm/i18n/zh_CN.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/zh_CN.po
rename to addons/board_crm/i18n/zh_CN.po
diff --git a/addons/board_crm_configuration/i18n/zh_TW.po b/addons/board_crm/i18n/zh_TW.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/zh_TW.po
rename to addons/board_crm/i18n/zh_TW.po
diff --git a/addons/board_crm_configuration/board_crm_view.xml b/addons/board_crm_configuration/board_crm_view.xml
deleted file mode 100644
index 51f09c25d62..00000000000
--- a/addons/board_crm_configuration/board_crm_view.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-
-
-
-
- CRM Configuration
-
-
-
- crm.opportunity.user.graph1
- report.crm.opportunity.user
- graph
-
-
-
-
-
-
-
-
-
- crm.lead
- form
- tree,form
-
- [('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]
-
-
-
- crm.meeting
- form
- tree,form
-
- [('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]
-
-
-
-
-
- report.crm.lead.section.stage
- form
- graph,tree,form
-
- [('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]
-
-
-
- report.crm.opportunity.user
- form
- graph,tree,form
-
- [('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]
-
-
-
- CRM - Dashboard Form
- board.board
- form
-
-
-
-
-
- CRM Dashboard
- board.board
- form
- form
- menu
-
-
-
-
-
-
-
-
diff --git a/addons/board_hr/__openerp__.py b/addons/board_hr/__openerp__.py
index b64d09c1b33..500887abb52 100644
--- a/addons/board_hr/__openerp__.py
+++ b/addons/board_hr/__openerp__.py
@@ -32,7 +32,7 @@ This module implements a dashboard for human resource management that includes:
""",
'author': 'Tiny',
'depends': [ 'project_issue','board','hr_expense','hr_timesheet_sheet','hr_holidays'
- ],
+ , 'hr_evaluation'],
'update_xml': ['board_hr_view.xml'],
'demo_xml': [],
'installable': True,
diff --git a/addons/board_hr/board_hr_view.xml b/addons/board_hr/board_hr_view.xml
index 710a6d88b4a..d26b4b2e6cf 100644
--- a/addons/board_hr/board_hr_view.xml
+++ b/addons/board_hr/board_hr_view.xml
@@ -15,25 +15,52 @@
-
- Timesheets
+
+ My Current Evaluations
ir.actions.act_window
- hr_timesheet_sheet.sheet
+ hr_evaluation.evaluation
form
- [('date_to','>=',time.strftime('%Y-%m-01')),('date_from','<=',time.strftime('%Y-%m-01'))]
-
+ [('state','!=','done'),('create_uid','=',uid)]
+
My Leaves
ir.actions.act_window
- hr.holidays.per.user
+ hr.holidays
form
tree,form
-
+ [('user_id','=',uid)]
+
+
+ Timesheets by Month
+ ir.actions.act_window
+ timesheet.report
+ form
+ graph,tree
+ [('user_id','=',uid), ('month', '=' , time.strftime('%m')), ('year', '=', time.strftime('%Y'))]
+
+
+
+ Remaining Leaves by User
+ ir.actions.act_window
+ hr.holidays.remaining.leaves.user
+ form
+ graph,tree
+ [('user_id','=',uid)]
+
+
+
+ Timesheets
+ ir.actions.act_window
+ hr_timesheet_sheet.sheet
+ form
+ graph,tree
+
+
board.hr.form
board.board
@@ -42,11 +69,13 @@
diff --git a/addons/board_manufacturing/i18n/nl.po b/addons/board_manufacturing/i18n/nl.po
index ff549ec53ab..d3b0991b311 100644
--- a/addons/board_manufacturing/i18n/nl.po
+++ b/addons/board_manufacturing/i18n/nl.po
@@ -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-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-14 21:34+0000\n"
-"Last-Translator: Pieter J. Kersten (EduSense BV) \n"
+"PO-Revision-Date: 2010-04-22 08:52+0000\n"
+"Last-Translator: Jan Verlaan (Veritos) \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:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-23 03:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: board_manufacturing
@@ -44,7 +44,7 @@ msgstr "Fabricage dashboard"
#. module: board_manufacturing
#: model:ir.ui.menu,name:board_manufacturing.next_id_87
msgid "Production"
-msgstr ""
+msgstr "Productie"
#. module: board_manufacturing
#: constraint:ir.actions.act_window:0
diff --git a/addons/board_project/__openerp__.py b/addons/board_project/__openerp__.py
index 92a8aeb1518..f934c7d3bc5 100644
--- a/addons/board_project/__openerp__.py
+++ b/addons/board_project/__openerp__.py
@@ -34,16 +34,14 @@ This module implements a dashboard for project member that includes:
'author': 'Tiny',
'depends': [
'project',
- 'report_timesheet',
'board',
'project_planning',
- 'report_analytic_line',
- 'report_task',
'hr_timesheet_sheet',
'project_issue',
- 'resource'
+ 'resource',
+ 'scrum'
],
- 'update_xml': ['board_project_view.xml', 'board_project_manager_view.xml'],
+ 'update_xml': ['board_project_view.xml', 'board_project_manager_view.xml','board_project_issue_view.xml','board_scrum_view.xml'],
'demo_xml': ['board_project_demo.xml'],
'installable': True,
'active': False,
diff --git a/addons/board_project/board_project_issue_view.xml b/addons/board_project/board_project_issue_view.xml
new file mode 100644
index 00000000000..eaf3a2f8612
--- /dev/null
+++ b/addons/board_project/board_project_issue_view.xml
@@ -0,0 +1,45 @@
+
+
+
+
+
+ Project issues
+ project.issue
+ form
+ tree,form
+ [('create_date', '>=', time.strftime('%Y-%m-%d 00:00:00')),('create_date', '<=', time.strftime('%Y-%m-%d 23:59:59'))]
+
+
+
+
+ board.project.issue.form
+ board.board
+ form
+
+
+
+
+
+
+ Project Issue Dashboard
+ board.board
+ form
+ form
+ menu
+
+
+
+
+
diff --git a/addons/board_project/board_project_manager_view.xml b/addons/board_project/board_project_manager_view.xml
index f22a2acde55..e2ce251e49b 100644
--- a/addons/board_project/board_project_manager_view.xml
+++ b/addons/board_project/board_project_manager_view.xml
@@ -13,13 +13,13 @@
-
- Pipeline of tasks
- report.task.user.pipeline.open
- form
- graph,tree
- [('user_id','in',department_users_get())]
-
+
+
+
+
+
+
+
hr.timesheet.sheet.tree.simplified.board
@@ -66,7 +66,6 @@
-
diff --git a/addons/board_project/board_project_view.xml b/addons/board_project/board_project_view.xml
index 231aebdb110..1c5093cb047 100644
--- a/addons/board_project/board_project_view.xml
+++ b/addons/board_project/board_project_view.xml
@@ -47,6 +47,14 @@
[('user_id','=',uid),('state','=','open')]
+
+ My Pending Tasks
+ project.task
+ form
+ tree,form
+ [('user_id','=',uid),('state','=','pending')]
+
+
My Task's Deadlines
project.task
@@ -91,13 +99,18 @@
-
-
+
+
+
+
+
+
+
+
diff --git a/addons/board_project/board_scrum_view.xml b/addons/board_project/board_scrum_view.xml
new file mode 100644
index 00000000000..daf3cb375ca
--- /dev/null
+++ b/addons/board_project/board_scrum_view.xml
@@ -0,0 +1,63 @@
+
+
+
+
+ scrum.sprint.dashboard.tree
+ scrum.sprint
+ tree
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Sprint's List
+ scrum.sprint
+ form
+ tree,form
+
+
+
+ board.project.form
+ board.board
+ form
+
+
+
+
+
+ Scrum Dashboard
+ board.board
+ form
+ form
+ menu
+
+
+
+
+
diff --git a/addons/account/wizard/wizard_account_duplicate.py b/addons/board_purchase/__init__.py
similarity index 50%
rename from addons/account/wizard/wizard_account_duplicate.py
rename to addons/board_purchase/__init__.py
index abded25e9ad..3c3121d954a 100644
--- a/addons/account/wizard/wizard_account_duplicate.py
+++ b/addons/board_purchase/__init__.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL ().
#
@@ -15,39 +15,10 @@
# 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 .
+# along with this program. If not, see .
#
##############################################################################
-import wizard
-import pooler
-
-duplicate_form = '''
-'''
-
-duplicate_fields = {
- 'company_id': {'string': 'Company', 'type': 'many2one', 'relation': 'res.company', 'required': True},
-}
-
-def _do_duplicate(self, cr, uid, data, context):
- account_obj = pooler.get_pool(cr.dbname).get('account.account')
- account_obj.copy(cr, uid, data['id'], data['form'], context=context)
- return {}
-
-class wizard_account_duplicate(wizard.interface):
- states = {
- 'init': {
- 'actions': [],
- 'result': {'type': 'form', 'arch': duplicate_form, 'fields': duplicate_fields, 'state': (('end', 'Cancel', 'gtk-cancel'), ('duplicate', 'Duplicate', 'gtk-ok'))},
- },
- 'duplicate': {
- 'actions': [_do_duplicate],
- 'result': {'type': 'state', 'state': 'end'},
- },
- }
-wizard_account_duplicate('account.wizard.account.duplicate')
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_timesheet_invoice/wizard/wizard_account_analytic_cost_ledger_report.py b/addons/board_purchase/__terp__.py
similarity index 52%
rename from addons/hr_timesheet_invoice/wizard/wizard_account_analytic_cost_ledger_report.py
rename to addons/board_purchase/__terp__.py
index 632f7f84268..f5ada7cfe46 100644
--- a/addons/hr_timesheet_invoice/wizard/wizard_account_analytic_cost_ledger_report.py
+++ b/addons/board_purchase/__terp__.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL ().
#
@@ -15,38 +15,27 @@
# 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 .
+# along with this program. If not, see .
#
##############################################################################
-import time
-import wizard
-dates_form = '''
-'''
-
-dates_fields = {
- 'date1': {'string':'Start of period', 'type':'date', 'required':True, 'default': lambda *a: time.strftime('%Y-01-01')},
- 'date2': {'string':'End of period', 'type':'date', 'required':True, 'default': lambda *a: time.strftime('%Y-%m-%d')},
+{
+ 'name': 'Board for Purchase Management',
+ 'version': '1.0',
+ 'category': 'Board/Purchase',
+ 'description': """
+This module implements a dashboard for purcgase management that includes:
+ * Current Purchase Orders
+ * Draft Purchase Orders
+ * Graph for quantity and amount per month
+ """,
+ 'author': 'Tiny',
+ 'depends': [ 'purchase','board',
+ ],
+ 'update_xml': ['board_purchase_view.xml'],
+ 'demo_xml': [],
+ 'installable': True,
+ 'active': False,
}
-
-class wizard_report(wizard.interface):
- states = {
- 'init': {
- 'actions': [],
- 'result': {'type':'form', 'arch':dates_form, 'fields':dates_fields, 'state':[('end','Cancel'),('report','Print')]}
- },
- 'report': {
- 'actions': [],
- 'result': {'type':'print', 'report':'hr.timesheet.invoice.account.analytic.account.cost_ledger', 'state':'end'}
- }
- }
-wizard_report('hr.timesheet.invoice.account.analytic.account.cost_ledger.report')
-
-
-
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/board_purchase/board_purchase_view.xml b/addons/board_purchase/board_purchase_view.xml
new file mode 100644
index 00000000000..2370e247eec
--- /dev/null
+++ b/addons/board_purchase/board_purchase_view.xml
@@ -0,0 +1,57 @@
+
+
+
+
+
+
+
+
+ Quotation Request
+ ir.actions.act_window
+ purchase.order
+ form
+ tree,form
+ [('date_order','>',time.strftime('%Y-01-01 00:00:00')),('date_order','<',time.strftime('%Y-12-31 23:59:59')), ('state','in',('wait','confirmed'))]
+
+
+
+
+ board.purchase.form
+ board.board
+ form
+
+
+
+
+
+
+ Purchase Dashboard
+ board.board
+ form
+ form
+ menu
+
+
+
+
+
+
diff --git a/addons/board_sale/__openerp__.py b/addons/board_sale/__openerp__.py
index bf4e572d031..1c9d01d376a 100644
--- a/addons/board_sale/__openerp__.py
+++ b/addons/board_sale/__openerp__.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL ().
#
@@ -15,7 +15,7 @@
# 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 .
+# along with this program. If not, see .
#
##############################################################################
diff --git a/addons/board_sale/board_sale_view.xml b/addons/board_sale/board_sale_view.xml
index c58a4983185..d04b6204940 100644
--- a/addons/board_sale/board_sale_view.xml
+++ b/addons/board_sale/board_sale_view.xml
@@ -5,39 +5,37 @@
Sales
-
- crm.phonecall
- form
- tree,calendar
-
- [('user_id','=',uid)]
-
-
-
-
-
- crm.meeting
- tree,form,gantt
-
- [('user_id','=',uid)]
- [('date','>=',time.strftime('%Y-%m-%d')),('date','<=',(datetime.datetime.today() + datetime.timedelta(days=2)).strftime('%Y-%m-%d'))]
-
-
+
board.sales.manager.form
board.board
form
-
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index c6ff5f99159..0c7d2e295ad 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -631,7 +631,9 @@ class crm_case(osv.osv):
cases = self.browse(cr, uid, ids)
cases[0].state # to fill the browse record cache
self.__history(cr, uid, cases, _('Close'))
- self.write(cr, uid, ids, {'state': 'done', 'date_closed': time.strftime('%Y-%m-%d %H:%M:%S')})
+ self.write(cr, uid, ids, {'state': 'done',
+ 'date_closed': time.strftime('%Y-%m-%d %H:%M:%S'),
+ 'probability' : 100.0})
#
# We use the cache of cases to keep the old case state
#
@@ -692,7 +694,9 @@ class crm_case(osv.osv):
cases = self.browse(cr, uid, ids)
cases[0].state # to fill the browse record cache
self.__history(cr, uid, cases, _('Cancel'))
- self.write(cr, uid, ids, {'state': 'cancel', 'active': True})
+ self.write(cr, uid, ids, {'state': 'cancel',
+ 'active': True,
+ 'probability' : 0.0})
self._action(cr, uid, cases, 'cancel')
return True
@@ -775,7 +779,7 @@ class crm_case_history(osv.osv):
_columns = {
'description': fields.text('Description'),
'note': fields.function(_note_get, method=True, string="Description", type="text"),
- 'email_to': fields.char('Email TO', size=84),
+ 'email_to': fields.char('Email To', size=84),
'email_from' : fields.char('Email From', size=84),
'log_id': fields.many2one('crm.case.log','Log',ondelete='cascade'),
'message_id': fields.char('Message Id', size=1024, readonly=True, help="Message Id on Email Server.", select=True),
diff --git a/addons/crm/crm_claims_menu.xml b/addons/crm/crm_claims_menu.xml
index 7b52343342e..16711036100 100644
--- a/addons/crm/crm_claims_menu.xml
+++ b/addons/crm/crm_claims_menu.xml
@@ -14,7 +14,7 @@
form
tree,calendar,form,graph
- {"search_default_section_id":section_id,"search_default_current":1,"search_default_my_claims":1}
+ {"search_default_section_id":section_id,"search_default_current":1,"search_default_my_claims":1}
diff --git a/addons/crm/crm_claims_view.xml b/addons/crm/crm_claims_view.xml
index 722c1f3db94..39cc8778e0b 100644
--- a/addons/crm/crm_claims_view.xml
+++ b/addons/crm/crm_claims_view.xml
@@ -161,7 +161,7 @@
-
+
@@ -183,7 +183,7 @@
@@ -245,9 +245,9 @@
search
-
-
+
+ widget="selection"
+ default="context.get('section_id', False)">
diff --git a/addons/crm/crm_fund_menu.xml b/addons/crm/crm_fund_menu.xml
index bc4b91fa409..7a53ab1aa18 100644
--- a/addons/crm/crm_fund_menu.xml
+++ b/addons/crm/crm_fund_menu.xml
@@ -13,7 +13,6 @@
crm.fundraising
tree,form,graph
- {"search_default_my_funds":1,"search_default_section_id":section_id}
diff --git a/addons/crm/crm_fund_view.xml b/addons/crm/crm_fund_view.xml
index a2a104adf15..20d3f5a286a 100644
--- a/addons/crm/crm_fund_view.xml
+++ b/addons/crm/crm_fund_view.xml
@@ -196,7 +196,7 @@
@@ -257,7 +257,7 @@
diff --git a/addons/crm/crm_helpdesk_menu.xml b/addons/crm/crm_helpdesk_menu.xml
index b1a7dfcc428..bd3f0889bd1 100644
--- a/addons/crm/crm_helpdesk_menu.xml
+++ b/addons/crm/crm_helpdesk_menu.xml
@@ -11,7 +11,6 @@
crm.helpdesk
tree,calendar,form
- {"search_default_my_hd_request":1,"search_default_section_id":section_id}
diff --git a/addons/crm/crm_helpdesk_view.xml b/addons/crm/crm_helpdesk_view.xml
index dc11b071a4c..fa2071f950b 100644
--- a/addons/crm/crm_helpdesk_view.xml
+++ b/addons/crm/crm_helpdesk_view.xml
@@ -104,7 +104,7 @@
-
+
@@ -126,7 +126,7 @@
@@ -224,8 +224,9 @@
-
+
date_until:
- break
+ break
duration = len(no_days)
res[lead.id][field] = abs(int(duration))
return res
@@ -126,9 +126,9 @@ class crm_lead(osv.osv):
'referred': fields.char('Referred By', size=64),
'date_open': fields.datetime('Opened', readonly=True),
'day_open': fields.function(_compute_day, string='Days to Open', \
- method=True, multi='day_open', type="integer", store=True),
+ method=True, multi='day_open', type="float", store=True),
'day_close': fields.function(_compute_day, string='Days to Close', \
- method=True, multi='day_close', type="integer", store=True),
+ method=True, multi='day_close', type="float", store=True),
'function_name': fields.char('Function', size=64),
}
diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index d9424b77fc4..4d752ca8a9b 100644
--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@ -7,8 +7,6 @@
crm.lead
tree,form
- {"search_default_current":1,"search_default_my_lead":1,"search_default_section_id":section_id}
- {"search_default_current":1,"search_default_my_lead":1,"search_default_section_id":section_id}
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 829372fb30b..03318270e9b 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -264,8 +264,9 @@
search
-
-
-
+
gantt
-
-
+
gantt
@@ -85,7 +85,6 @@
crm.meeting
calendar,tree,form,gantt
- {"search_default_current":1,"search_default_section_id":section_id}
@@ -116,27 +115,26 @@
+ parent="base.menu_base_partner" sequence="3" />
+ action="crm_case_categ_meet" parent="menu_meeting_sale"
+ sequence="1" />
- Meeting Invitations
- ir.actions.act_window
- calendar.attendee
- form
- tree,form
-
+ Meeting Invitations
+ ir.actions.act_window
+ calendar.attendee
+ form
+ tree,form
+
[('ref','like','crm.meeting,')]
- {'default_sent_by_uid': uid}
-
+ {'default_sent_by_uid': uid}
+
+ name="Meeting Invitations" parent="crm.menu_meeting_sale"
+ sequence="10" action="action_view_attendee_form" />
@@ -146,7 +144,7 @@
tree,calendar,form,gantt
+ eval="[('state','in',('pending','draft','open')),('date','>=',time.strftime('%Y-%m-%d'))]" />
@@ -170,7 +168,7 @@
-
+
gantt
diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py
index 3e1fc24a803..204890e348c 100644
--- a/addons/crm/crm_opportunity.py
+++ b/addons/crm/crm_opportunity.py
@@ -27,7 +27,7 @@ import time
import mx.DateTime
AVAILABLE_STATES = [
- ('draft','New'),
+ ('draft','Draft'),
('open','Open'),
('cancel', 'Lost'),
('done', 'Converted'),
@@ -62,9 +62,9 @@ class crm_opportunity(osv.osv):
@param ids: List of Openday’s IDs
@return: difference between current date and log date
@param context: A standard dictionary for contextual values
- """
- cal_obj = self.pool.get('resource.calendar')
- res_obj = self.pool.get('resource.resource')
+ """
+ cal_obj = self.pool.get('resource.calendar')
+ res_obj = self.pool.get('resource.resource')
res = {}
for opportunity in self.browse(cr, uid, ids , context):
@@ -93,7 +93,7 @@ class crm_opportunity(osv.osv):
duration = float(ans.days)
if opportunity.section_id.resource_calendar_id:
- duration = float(ans.days) * 24
+ duration = float(ans.days) * 24
new_dates = cal_obj.interval_get(cr,
uid,
opportunity.section_id.resource_calendar_id and opportunity.section_id.resource_calendar_id.id or False,
@@ -105,9 +105,9 @@ class crm_opportunity(osv.osv):
date_until = mx.DateTime.strptime(date_until, '%Y-%m-%d %H:%M:%S')
for in_time, out_time in new_dates:
if in_time.date not in no_days:
- no_days.append(in_time.date)
+ no_days.append(in_time.date)
if out_time > date_until:
- break
+ break
duration = len(no_days)
res[opportunity.id][field] = abs(int(duration))
return res
@@ -138,9 +138,9 @@ class crm_opportunity(osv.osv):
'date_open': fields.datetime('Opened', readonly=True),
'day_open': fields.function(_compute_day, string='Days to Open', \
- method=True, multi='day_open', type="integer", store=True),
+ method=True, multi='day_open', type="float", store=True),
'day_close': fields.function(_compute_day, string='Days to Close', \
- method=True, multi='day_close', type="integer", store=True),
+ method=True, multi='day_close', type="float", store=True),
}
def onchange_stage_id(self, cr, uid, ids, stage_id, context={}):
@@ -190,6 +190,7 @@ class crm_opportunity(osv.osv):
_defaults = {
'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.opportunity', context=c),
'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
+ 'state' : 'draft',
}
def action_makeMeeting(self, cr, uid, ids, context=None):
diff --git a/addons/crm/crm_opportunity_menu.xml b/addons/crm/crm_opportunity_menu.xml
index ba01ca72be4..3bcdbc7bb9f 100644
--- a/addons/crm/crm_opportunity_menu.xml
+++ b/addons/crm/crm_opportunity_menu.xml
@@ -27,7 +27,6 @@
crm.opportunity
tree,form,graph
- {"search_default_my_oprtnit":1,"search_default_new_oprtnit":1,"search_default_section_id":section_id}
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index b7019885a4a..4bdc0d90158 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -86,13 +86,15 @@
-
+
+ on_change="onchange_partner_id(partner_id, email_from)"
+ colspan="2" />
+ on_change="onchange_partner_address_id(partner_address_id, email_from)"
+ colspan="1" />
@@ -104,7 +106,7 @@
domain="[('object_id.model', '=', 'crm.opportunity')]" />
-
+
@@ -216,7 +218,7 @@
-
+
@@ -264,6 +266,7 @@
-
+ help="My Opportunities" default="1"
+ />
form
tree,calendar
- {"set_editable":True,"default_state":'open',"search_default_my_calls":1,"search_default_state":1,"search_default_section_id":section_id}
@@ -56,7 +55,7 @@
tree,calendar
- {"default_state":'open',"search_default_my_calls":1,"search_default_state":1,"search_default_section_id":section_id}
+ {'set_editable':True,'default_state':'open'}
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index dfa949ad0b7..e5d6c7565df 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -176,9 +176,9 @@
-
+
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 5757ccc555d..5c171236836 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -406,7 +406,7 @@
@@ -438,7 +438,7 @@
+ default="1" help="Cases Related to Current User" />
+ default="context.get('section_id', False)" select="1"
+ widget="selection"/>
@@ -530,6 +531,7 @@
@@ -706,9 +708,9 @@
- view.res.partner.form.crm.inherited2
+ view.res.partner.tree.crm.inherited2
res.partner
- form
+ tree
@@ -720,9 +722,9 @@
- view.res.partner.form.crm.inherited3
+ view.res.partner.search.crm.inherited3
res.partner
- form
+ search
diff --git a/addons/crm/i18n/fi.po b/addons/crm/i18n/fi.po
index ee51240f4c7..d8d7144e92c 100644
--- a/addons/crm/i18n/fi.po
+++ b/addons/crm/i18n/fi.po
@@ -14,7 +14,11 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
+"X-Launchpad-Export-Date: 2010-04-07 03:46+0000\n"
+=======
"X-Launchpad-Export-Date: 2010-04-17 04:01+0000\n"
+>>>>>>> MERGE-SOURCE
"X-Generator: Launchpad (build Unknown)\n"
#. module: crm
diff --git a/addons/crm/report/crm_claim_report.py b/addons/crm/report/crm_claim_report.py
index 03e439d889e..4148a834810 100644
--- a/addons/crm/report/crm_claim_report.py
+++ b/addons/crm/report/crm_claim_report.py
@@ -21,6 +21,7 @@
from osv import fields,osv
import tools
+import crm_report
class crm_claim_report(osv.osv):
@@ -32,7 +33,7 @@ class crm_claim_report(osv.osv):
_description = "CRM Claim Report"
_columns = {
- 'delay_close': fields.char('Delay to close', size=20, readonly=True),
+ 'delay_close': fields.float('Delay to close', digits=(16,2),readonly=True, group_operator="avg",help="Number of Days to close the case"),
'stage_id': fields.many2one ('crm.case.stage', 'Stage', \
domain="[('section_id','=',section_id),\
('object_id.model', '=', 'crm.claim')]", readonly=True),
@@ -41,6 +42,10 @@ class crm_claim_report(osv.osv):
('object_id.model', '=', 'crm.claim')]", readonly=True),
'partner_id': fields.many2one('res.partner', 'Partner', readonly=True),
'company_id': fields.many2one('res.company', 'Company', readonly=True),
+ 'priority': fields.selection(crm_report.AVAILABLE_PRIORITIES, 'Priority'),
+ 'type_id': fields.many2one('crm.case.resource.type', 'Claim Type',\
+ domain="[('section_id','=',section_id),\
+ ('object_id.model', '=', 'crm.claim')]"),
}
def init(self, cr):
@@ -56,6 +61,7 @@ class crm_claim_report(osv.osv):
min(c.id) as id,
to_char(c.create_date, 'YYYY') as name,
to_char(c.create_date, 'MM') as month,
+ to_char(c.create_date, 'YYYY-MM-DD') as day,
c.state,
c.user_id,
c.stage_id,
@@ -67,12 +73,16 @@ class crm_claim_report(osv.osv):
0 as avg_answers,
0.0 as perc_done,
0.0 as perc_cancel,
- to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close
+ c.priority as priority,
+ c.type_id as type_id,
+ date_trunc('day',c.create_date) as create_date,
+ avg(extract('epoch' from (c.date_closed-c.create_date)))/(3600*24) as delay_close
from
crm_claim c
group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), \
c.state, c.user_id,c.section_id, c.stage_id,\
- c.categ_id,c.partner_id,c.company_id
+ c.categ_id,c.partner_id,c.company_id,c.create_date,to_char(c.create_date, 'YYYY-MM-DD')
+ ,c.priority,c.type_id,c.som
)""")
crm_claim_report()
diff --git a/addons/crm/report/crm_claim_report_view.xml b/addons/crm/report/crm_claim_report_view.xml
index 4d544c97711..647a0125179 100644
--- a/addons/crm/report/crm_claim_report_view.xml
+++ b/addons/crm/report/crm_claim_report_view.xml
@@ -10,17 +10,20 @@
tree
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -66,12 +69,33 @@
search
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -81,9 +105,9 @@
Claims
crm.claim.report
form
- tree,graph
+ tree,graph
+ {"search_default_User":1,"search_default_This Month":1,'group_by_no_leaf':1,'group_by':[]}
- {"search_default_section_id":section_id,"search_default_this_year":1,"search_default_this_month":1,"search_default_by_user":1}
diff --git a/addons/crm/report/crm_fundraising_report.py b/addons/crm/report/crm_fundraising_report.py
index d0ff60a4055..af867ea0008 100644
--- a/addons/crm/report/crm_fundraising_report.py
+++ b/addons/crm/report/crm_fundraising_report.py
@@ -35,10 +35,10 @@ class crm_fundraising_report(osv.osv):
'categ_id': fields.many2one('crm.case.categ', 'Category', \
domain="[('section_id','=',section_id),\
('object_id.model', '=', 'crm.fundraising')]"),
- 'probability': fields.float('Avg. Probability', readonly=True),
- 'amount_revenue': fields.float('Est.Revenue', readonly=True),
- 'amount_revenue_prob': fields.float('Est. Rev*Prob.', readonly=True),
- 'delay_close': fields.char('Delay to close', size=20, readonly=True),
+ 'probability': fields.float('Avg. Probability',digits=(16,2),readonly=True, group_operator="avg"),
+ 'amount_revenue': fields.float('Est.Revenue',readonly=True,digits=(16,2)),
+ 'amount_revenue_prob': fields.float('Est. Rev*Prob.',digits=(16,2),readonly=True),
+ 'delay_close': fields.float('Delay to close', digits=(16,2),readonly=True, group_operator="avg",help="Number of Days to close the case"),
'partner_id': fields.many2one('res.partner', 'Partner'),
'company_id': fields.many2one('res.company', 'Company'),
}
@@ -56,6 +56,7 @@ class crm_fundraising_report(osv.osv):
min(c.id) as id,
to_char(c.create_date, 'YYYY') as name,
to_char(c.create_date, 'MM') as month,
+ to_char(c.create_date, 'YYYY-MM-DD') as day,
c.state,
c.user_id,
c.section_id,
@@ -66,14 +67,16 @@ class crm_fundraising_report(osv.osv):
0 as avg_answers,
0.0 as perc_done,
0.0 as perc_cancel,
+ date_trunc('day',c.create_date) as create_date,
sum(planned_revenue) as amount_revenue,
sum(planned_revenue*probability)::decimal(16,2) as amount_revenue_prob,
avg(probability)::decimal(16,2) as probability,
- to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close
+ avg(extract('epoch' from (c.date_closed-c.create_date)))/(3600*24) as delay_close
from
crm_fundraising c
group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'),\
- c.state, c.user_id,c.section_id,c.categ_id,c.partner_id,c.company_id
+ c.state, c.user_id,c.section_id,c.categ_id,c.partner_id,c.company_id,
+ c.create_date,to_char(c.create_date, 'YYYY-MM-DD')
)""")
crm_fundraising_report()
diff --git a/addons/crm/report/crm_fundraising_report_view.xml b/addons/crm/report/crm_fundraising_report_view.xml
index c051ab8dcb8..e1c32726b4f 100644
--- a/addons/crm/report/crm_fundraising_report_view.xml
+++ b/addons/crm/report/crm_fundraising_report_view.xml
@@ -9,20 +9,21 @@
crm.fundraising.report
tree
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -67,8 +68,14 @@
search
-
-
+
+
+
+
+
+
+
+
@@ -79,8 +86,8 @@
crm.fundraising.report
form
tree,graph
+ {"search_default_User":1,"search_default_This Month":1,'group_by_no_leaf':1,'group_by':[]}
- {"search_default_section_id":section_id,"search_default_this_year":1,"search_default_this_month":1,"search_default_by_user":1}
diff --git a/addons/crm/report/crm_helpdesk_report_view.xml b/addons/crm/report/crm_helpdesk_report_view.xml
index 0852d343c95..b10f51162e7 100644
--- a/addons/crm/report/crm_helpdesk_report_view.xml
+++ b/addons/crm/report/crm_helpdesk_report_view.xml
@@ -66,40 +66,40 @@
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
-
+
+
-
-
-
-
+
+
+
+ domain="[]" context="{'group_by':'user_id'}"
+ default="1" />
form
tree,graph
- {"search_default_section_id":section_id,"search_default_this_year":1,"search_default_this_month":1,"search_default_by_user":1}
diff --git a/addons/crm/report/crm_lead_report.py b/addons/crm/report/crm_lead_report.py
index 6c092f4f984..d400700c0b5 100644
--- a/addons/crm/report/crm_lead_report.py
+++ b/addons/crm/report/crm_lead_report.py
@@ -22,6 +22,14 @@
from osv import fields,osv
import tools
+AVAILABLE_STATES = [
+ ('draft','Draft'),
+ ('open','Open'),
+ ('cancel', 'Cancelled'),
+ ('done', 'Closed'),
+ ('pending','Pending')
+]
+
class crm_lead_report(osv.osv):
""" CRM Lead Report """
_name = "crm.lead.report"
@@ -30,7 +38,7 @@ class crm_lead_report(osv.osv):
_description = "CRM Lead Report"
_columns = {
- 'delay_close': fields.char('Delay to close', size=20, readonly=True),
+ 'delay_close': fields.float('Delay to close',digits=(16,2),readonly=True, group_operator="avg",help="Number of Days to close the case"),
'categ_id': fields.many2one('crm.case.categ', 'Category',\
domain="[('section_id','=',section_id),\
('object_id.model', '=', 'crm.lead')]" , readonly=True),
@@ -54,7 +62,8 @@ class crm_lead_report(osv.osv):
min(c.id) as id,
to_char(c.create_date, 'YYYY') as name,
to_char(c.create_date, 'MM') as month,
- c.state,
+ to_char(c.create_date, 'YYYY-MM-DD') as day,
+ c.state as state,
c.user_id,
c.stage_id,
c.company_id,
@@ -65,11 +74,13 @@ class crm_lead_report(osv.osv):
0 as avg_answers,
0.0 as perc_done,
0.0 as perc_cancel,
- to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close
+ date_trunc('day',c.create_date) as create_date,
+ avg(extract('epoch' from (c.date_closed-c.create_date)))/(3600*24) as delay_close
from
crm_lead c
group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'),\
c.state, c.user_id,c.section_id,c.stage_id,categ_id,c.partner_id,c.company_id
+ ,c.create_date,to_char(c.create_date, 'YYYY-MM-DD')
)""")
crm_lead_report()
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index 30c1ab2135c..d6502c190d9 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -10,14 +10,15 @@
tree
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -63,12 +64,21 @@
search
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -78,8 +88,8 @@
Leads
crm.lead.report
form
+ {"search_default_User":1,"search_default_This Month":1,'group_by_no_leaf':1,'group_by':[]}
tree,graph
- {"search_default_section_id":section_id,"search_default_this_year":1,"search_default_this_month":1,"search_default_by_user":1}
diff --git a/addons/crm/report/crm_opportunity_report.py b/addons/crm/report/crm_opportunity_report.py
index 36dec45ddf7..a3af4be8b7c 100644
--- a/addons/crm/report/crm_opportunity_report.py
+++ b/addons/crm/report/crm_opportunity_report.py
@@ -22,6 +22,14 @@
from osv import fields,osv
import tools
+AVAILABLE_STATES = [
+ ('draft','Draft'),
+ ('open','Open'),
+ ('cancel', 'Cancelled'),
+ ('done', 'Closed'),
+ ('pending','Pending')
+]
+
class crm_opportunity_report(osv.osv):
""" CRM Opportunity Report """
_name = "crm.opportunity.report"
@@ -29,11 +37,10 @@ class crm_opportunity_report(osv.osv):
_inherit = "crm.case.report"
_description = "CRM Opportunity Report"
_columns = {
- 'probability': fields.float('Avg. Probability', readonly=True, group_operator="avg"),
+ 'probability': fields.float('Avg. Probability', readonly=True,group_operator='avg'),
'amount_revenue': fields.float('Est.Revenue', readonly=True),
'amount_revenue_prob': fields.float('Est. Rev*Prob.', readonly=True),
- 'delay_close': fields.float('Days to Close', digits=(16,2), readonly=True, group_operator="avg",
- help="Number of Days to close the opportunities"),
+ 'delay_close': fields.float('Delay to close',digits=(16,2),readonly=True, group_operator="avg",help="Number of Days to close the case"),
'categ_id': fields.many2one('crm.case.categ', 'Category',\
domain="[('section_id','=',section_id),\
('object_id.model', '=', 'crm.opportunity')]", readonly=True),
@@ -57,7 +64,8 @@ class crm_opportunity_report(osv.osv):
min(c.id) as id,
to_char(c.create_date, 'YYYY') as name,
to_char(c.create_date, 'MM') as month,
- c.state,
+ to_char(c.create_date, 'YYYY-MM-DD') as day,
+ c.state as state,
c.user_id,
c.section_id,
c.categ_id,
@@ -68,21 +76,25 @@ class crm_opportunity_report(osv.osv):
0 as avg_answers,
0.0 as perc_done,
0.0 as perc_cancel,
+ date_trunc('day',c.create_date) as create_date,
sum(planned_revenue) as amount_revenue,
sum((planned_revenue*probability)/100.0)::decimal(16,2) as amount_revenue_prob,
avg(probability)::decimal(16,2) as probability,
- avg(extract('epoch' from (date_closed-c.create_date)))/(3600*24) as delay_close
+ avg(extract('epoch' from (c.date_closed-c.create_date)))/(3600*24) as delay_close
from
crm_opportunity c
group by
to_char(c.create_date, 'YYYY'),
to_char(c.create_date, 'MM'),
+ to_char(c.create_date, 'YYYY-MM-DD'),
c.state,
c.user_id,
c.section_id,
c.stage_id,
c.categ_id,
- c.partner_id,company_id
+ c.partner_id,
+ company_id,
+ create_date
)""")
crm_opportunity_report()
diff --git a/addons/crm/report/crm_opportunity_report_view.xml b/addons/crm/report/crm_opportunity_report_view.xml
index 58768ebceef..29a66b838f0 100644
--- a/addons/crm/report/crm_opportunity_report_view.xml
+++ b/addons/crm/report/crm_opportunity_report_view.xml
@@ -9,21 +9,22 @@
crm.opportunity.report
tree
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
+
@@ -69,15 +70,24 @@
search
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -88,7 +98,7 @@
crm.opportunity.report
form
tree,graph
- {"search_default_section_id":section_id,"search_default_this_year":1,"search_default_this_month":1,"search_default_by_user":1, "group_by": [], 'group_by_no_leaf': 1}
+ {"search_default_User":1,"search_default_This Month":1,'group_by_no_leaf':1,'group_by':[]}
diff --git a/addons/crm/report/crm_phonecall_report.py b/addons/crm/report/crm_phonecall_report.py
index a72bfbd9c1f..40b34779aba 100644
--- a/addons/crm/report/crm_phonecall_report.py
+++ b/addons/crm/report/crm_phonecall_report.py
@@ -31,7 +31,7 @@ class crm_phonecall_report(osv.osv):
_inherit = "crm.case.report"
_columns = {
- 'delay_close': fields.char('Delay to close', size=20, readonly=True),
+ 'delay_close': fields.float('Delay to close', digits=(16,2),readonly=True, group_operator="avg",help="Number of Days to close the case"),
'categ_id': fields.many2one('crm.case.categ', 'Category', \
domain="[('section_id','=',section_id),\
('object_id.model', '=', 'crm.phonecall')]"),
@@ -52,6 +52,7 @@ class crm_phonecall_report(osv.osv):
min(c.id) as id,
to_char(c.create_date, 'YYYY') as name,
to_char(c.create_date, 'MM') as month,
+ to_char(c.create_date, 'YYYY-MM-DD') as day,
c.state,
c.user_id,
c.section_id,
@@ -62,11 +63,13 @@ class crm_phonecall_report(osv.osv):
0 as avg_answers,
0.0 as perc_done,
0.0 as perc_cancel,
- to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close
+ date_trunc('day',c.create_date) as create_date,
+ avg(extract('epoch' from (c.date_closed-c.create_date)))/(3600*24) as delay_close
from
crm_phonecall c
group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'),\
c.state, c.user_id,c.section_id, c.categ_id,c.partner_id,c.company_id
+ ,to_char(c.create_date, 'YYYY-MM-DD'),c.create_date
)""")
crm_phonecall_report()
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index e937ef6bd22..698a9b88fa3 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -10,17 +10,18 @@
tree
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
+
@@ -64,8 +65,14 @@
search
-
-
+
+
+
+
+
+
+
+
@@ -76,8 +83,8 @@
crm.phonecall.report
form
tree,graph
+ {"search_default_User":1,"search_default_This Month":1,'group_by_no_leaf':1,'group_by':[]}
- {"search_default_section_id":section_id,"search_default_this_year":1,"search_default_this_month":1,"search_default_by_user":1}
diff --git a/addons/crm/report/crm_report.py b/addons/crm/report/crm_report.py
index 82f3a049de4..f2b3a48d339 100644
--- a/addons/crm/report/crm_report.py
+++ b/addons/crm/report/crm_report.py
@@ -29,6 +29,13 @@ AVAILABLE_STATES = [
('done', 'Closed'),
('pending','Pending')
]
+AVAILABLE_PRIORITIES = [
+ ('5', 'Lowest'),
+ ('4', 'Low'),
+ ('3', 'Normal'),
+ ('2', 'High'),
+ ('1', 'Highest')
+]
class crm_case_report(osv.osv):
""" Cases and section """
@@ -89,6 +96,8 @@ class crm_case_report(osv.osv):
('09', 'September'), ('10', 'October'),\
('11', 'November'), ('12', 'December')], 'Month', readonly=True),
'company_id': fields.many2one('res.company', 'Company', readonly=True),
+ 'create_date': fields.datetime('Create Date', readonly=True),
+ 'day': fields.char('Day', size=128, readonly=True)
}
_order = 'name desc, user_id'
@@ -104,15 +113,18 @@ class crm_case_report(osv.osv):
min(c.id) as id,
to_char(c.create_date, 'YYYY') as name,
to_char(c.create_date, 'MM') as month,
+ to_char(c.create_date, 'YYYY-MM-DD') as day,
c.state,
c.user_id,
c.section_id,
c.company_id,
- count(*) as nbr
+ count(*) as nbr,
+ c.create_date as create_date
from
crm_case c
- group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'),\
+ group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'),
c.state, c.user_id,c.section_id,c.company_id
+ ,c.create_date,to_char(c.create_date, 'YYYY-MM-DD')
)""")
crm_case_report()
@@ -124,7 +136,6 @@ class report_crm_case_service_dashboard(osv.osv):
_name = "report.crm.case.service.dashboard"
_description = "Report of Closed and Open CRM Cases within past 15 days"
_auto = False
-
_columns = {
'date_deadline': fields.datetime('Deadline', readonly=True),
'name': fields.char('Description', size=64, readonly=True),
@@ -143,7 +154,7 @@ class report_crm_case_service_dashboard(osv.osv):
select
cse.id as id, cse.date_deadline as date_deadline,
cse.name as name, cse.user_id as user_id,
- cse.state as state,
+ cse.state as state,
cse.create_date as create_date
from
crm_case cse
diff --git a/addons/crm/report/crm_report_view.xml b/addons/crm/report/crm_report_view.xml
index 5a72758514e..814b056dbf1 100644
--- a/addons/crm/report/crm_report_view.xml
+++ b/addons/crm/report/crm_report_view.xml
@@ -63,26 +63,33 @@
+
+ domain="[('create_date','<=', time.strftime('%%Y-%%m-%%d')), ('create_date','>',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"/>
-
+
+
+
+
-
-
-
-
-
+
+
+
@@ -100,14 +107,23 @@
-
+
-
-
+
+
+
+
+
+
+
+
+
+
@@ -145,7 +164,6 @@
crm.case.report
form
tree,graph
- {"search_default_section_id":section_id,"search_default_this_year":1,"search_default_this_month":1}
diff --git a/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py b/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py
index bb0adb0444a..5e6ab5a094c 100755
--- a/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py
+++ b/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py
@@ -168,8 +168,8 @@ class email_parser(object):
def _decode_header(self, s):
from email.Header import decode_header
- s = decode_header(s)
- return ''.join(map(lambda x:self._to_decode(x[0], [x[1]]), s))
+ s = decode_header(s)
+ return ''.join(map(lambda x:self._to_decode(x[0], [x[1]]), s or []))
def msg_new(self, msg):
message = self.msg_body_get(msg)
@@ -183,6 +183,7 @@ class email_parser(object):
'email_cc': msg_cc,
'user_id': False,
'description': message['body'],
+ 'state' : 'draft',
}
data.update(self.partner_get(msg_from))
diff --git a/addons/crm/wizard/crm_email_add_cc_view.xml b/addons/crm/wizard/crm_email_add_cc_view.xml
index 45ae389ba72..7c6ea96df23 100644
--- a/addons/crm/wizard/crm_email_add_cc_view.xml
+++ b/addons/crm/wizard/crm_email_add_cc_view.xml
@@ -1,43 +1,39 @@
-
+
-
+
-
+
Add CC
crm.email.add.cc
form
-
+
-
+
Add CC
@@ -48,5 +44,5 @@
new
-
+
diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index f4b97ad2f14..c8cce059f09 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -51,74 +51,82 @@ class crm_lead2opportunity(osv.osv_memory):
@return : Dictionary value for created Opportunity form
"""
- value = {}
record_id = context and context.get('active_id', False) or False
- if record_id:
- lead_obj = self.pool.get('crm.lead')
- opp_obj = self. pool.get('crm.opportunity')
- data_obj = self.pool.get('ir.model.data')
- history_obj = self.pool.get('crm.case.history')
- model_obj = self.pool.get('ir.model')
+ if not record_id:
+ return {}
- # Get Opportunity views
- result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_opportunities_filter')
- res = data_obj.read(cr, uid, result, ['res_id'])
- id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_form_view_oppor')
- id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_tree_view_oppor')
- if id2:
- id2 = data_obj.browse(cr, uid, id2, context=context).res_id
- if id3:
- id3 = data_obj.browse(cr, uid, id3, context=context).res_id
+ lead_obj = self.pool.get('crm.lead')
+ opp_obj = self. pool.get('crm.opportunity')
+ data_obj = self.pool.get('ir.model.data')
+ history_obj = self.pool.get('crm.case.history')
+ model_obj = self.pool.get('ir.model')
- lead = lead_obj.browse(cr, uid, record_id, context=context)
- model_ids = model_obj.search(cr, uid, [('model', '=', 'crm.opportunity')])
+ # Get Opportunity views
+ result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_opportunities_filter')
+ res = data_obj.read(cr, uid, result, ['res_id'])
+ id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_form_view_oppor')
+ id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_tree_view_oppor')
+ if id2:
+ id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+ if id3:
+ id3 = data_obj.browse(cr, uid, id3, context=context).res_id
+
+ lead = lead_obj.browse(cr, uid, record_id, context=context)
+ model_ids = model_obj.search(cr, uid, [('model', '=', 'crm.opportunity')])
- for this in self.browse(cr, uid, ids, context=context):
- new_opportunity_id = opp_obj.create(cr, uid, {
- 'name': this.name,
- 'referred': this.referred,
- 'planned_revenue': this.planned_revenue,
- 'probability': this.probability,
- 'partner_id': lead.partner_id and lead.partner_id.id or False ,
- 'section_id': lead.section_id and lead.section_id.id or False,
- 'description': lead.description or False,
- 'date_deadline': lead.date_deadline or False,
- 'partner_address_id': lead.partner_address_id and \
- lead.partner_address_id.id or False ,
- 'priority': lead.priority,
- 'phone': lead.phone,
- 'email_from': lead.email_from
- })
- new_opportunity = opp_obj.browse(cr, uid, new_opportunity_id)
- vals = {
- 'partner_id': this.partner_id and this.partner_id.id or False,
- }
- if not lead.opportunity_id:
- vals.update({'opportunity_id' : new_opportunity.id})
+ for this in self.browse(cr, uid, ids, context=context):
+ new_opportunity_id = opp_obj.create(cr, uid, {
+ 'name': this.name,
+ 'referred': lead.referred,
+ 'planned_revenue': this.planned_revenue,
+ 'probability': this.probability,
+ 'partner_id': lead.partner_id and lead.partner_id.id or False,
+ 'section_id': lead.section_id and lead.section_id.id or False,
+ 'description': lead.description or False,
+ 'date_deadline': lead.date_deadline or False,
+ 'partner_address_id': lead.partner_address_id and lead.partner_address_id.id or False ,
+ 'priority': lead.priority,
+ 'phone': lead.phone,
+ 'email_from': lead.email_from
+ })
+ new_opportunity = opp_obj.browse(cr, uid, new_opportunity_id)
+ vals = {
+ 'partner_id': this.partner_id and this.partner_id.id or False,
+ }
+ if not lead.opportunity_id:
+ vals.update({'opportunity_id' : new_opportunity.id})
- lead_obj.write(cr, uid, [lead.id], vals)
- lead_obj.case_close(cr, uid, [lead.id])
-
- # Copy lead history to opportunity
- for his_id in lead.history_line:
- history_ids = history_obj.copy(cr, uid, his_id.id, \
- {'model_id': model_ids[0], \
- 'res_id': new_opportunity_id})
+ model_opportunity_id = self.pool.get('ir.model').search(cr, uid, [('model', '=', 'crm.opportunity')], context=context)[0]
- opp_obj.case_open(cr, uid, [new_opportunity_id])
+ for model in ('crm.case.log', 'crm.case.history'):
+ log_proxy = self.pool.get(model)
+ log_ids = log_proxy.search(cr, uid, [('model_id.model', '=', 'crm.lead'),('res_id', '=', lead.id)], context=context)
+ for log_id in log_ids:
+ log_proxy.copy(cr, uid, log_id, {'model_id':model_opportunity_id}, context=context)
- value = {
- 'name': _('Opportunity'),
- 'view_type': 'form',
- 'view_mode': 'form,tree',
- 'res_model': 'crm.opportunity',
- 'res_id': int(new_opportunity_id),
- 'view_id': False,
- 'views': [(id2, 'form'), (id3, 'tree'), (False, 'calendar'), (False, 'graph')],
- 'type': 'ir.actions.act_window',
- 'search_view_id': res['res_id']
- }
+ lead_obj.write(cr, uid, [lead.id], vals)
+ lead_obj.case_close(cr, uid, [lead.id])
+
+ # Copy lead history to opportunity
+ for his_id in lead.history_line:
+ history_ids = history_obj.copy(cr, uid, his_id.id, \
+ {'model_id': model_ids[0], \
+ 'res_id': new_opportunity_id})
+
+ #opp_obj.case_open(cr, uid, [new_opportunity_id])
+
+ value = {
+ 'name': _('Opportunity'),
+ 'view_type': 'form',
+ 'view_mode': 'form,tree',
+ 'res_model': 'crm.opportunity',
+ 'res_id': int(new_opportunity_id),
+ 'view_id': False,
+ 'views': [(id2, 'form'), (id3, 'tree'), (False, 'calendar'), (False, 'graph')],
+ 'type': 'ir.actions.act_window',
+ 'search_view_id': res['res_id']
+ }
return value
_columns = {
diff --git a/addons/crm/wizard/crm_send_email.py b/addons/crm/wizard/crm_send_email.py
index 434035cd2df..a0f91fb2ae5 100644
--- a/addons/crm/wizard/crm_send_email.py
+++ b/addons/crm/wizard/crm_send_email.py
@@ -97,7 +97,6 @@ class crm_send_new_email(osv.osv_memory):
}
flag = False
if case.section_id and case.section_id.server_id:
-
flag = smtp_pool.send_email(
cr=cr,
uid=uid,
@@ -166,7 +165,7 @@ class crm_send_new_email(osv.osv_memory):
if 'email_cc' in fields:
res.update({'email_cc': case.email_cc or ''})
if 'text' in fields:
- res.update({'text': '\n\n'+(case.user_id.signature or '')})
+ res.update({'text': '\n\n'+(case.user_id.signature or '') + '\n\n' + (case.description or '')})
if 'state' in fields:
res.update({'state': 'pending'})
return res
diff --git a/addons/crm/wizard/crm_send_email_view.xml b/addons/crm/wizard/crm_send_email_view.xml
index 976e0578d05..4db670de61f 100644
--- a/addons/crm/wizard/crm_send_email_view.xml
+++ b/addons/crm/wizard/crm_send_email_view.xml
@@ -9,27 +9,26 @@
crm.send.mail
form
-
diff --git a/addons/google_map/i18n/oc.po b/addons/google_map/i18n/oc.po
new file mode 100644
index 00000000000..b5359a8e82d
--- /dev/null
+++ b/addons/google_map/i18n/oc.po
@@ -0,0 +1,48 @@
+# Occitan (post 1500) translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-04-22 12:06+0000\n"
+"Last-Translator: Cédric VALMARY (Tot en òc) \n"
+"Language-Team: Occitan (post 1500) \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-23 03:45+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: google_map
+#: model:ir.actions.wizard,name:google_map.wizard_google_map
+msgid "Launch Google Map"
+msgstr "Aviar Google Map"
+
+#. module: google_map
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML invalid per l'arquitectura de la vista"
+
+#. module: google_map
+#: view:res.partner:0
+#: view:res.partner.address:0
+msgid "Street2 : "
+msgstr "Adreça seguida : "
+
+#. module: google_map
+#: model:ir.module.module,description:google_map.module_meta_information
+msgid ""
+"The module adds google map field in partner address\n"
+"so that we can directly open google map from the\n"
+"url widget."
+msgstr ""
+
+#. module: google_map
+#: view:res.partner:0
+#: view:res.partner.address:0
+msgid "Map"
+msgstr "Mapa"
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 5125052c499..5e04cf1aaad 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -314,7 +314,7 @@
-
+
diff --git a/addons/hr/i18n/sv.po b/addons/hr/i18n/sv.po
index e3acd524000..661e079515f 100644
--- a/addons/hr/i18n/sv.po
+++ b/addons/hr/i18n/sv.po
@@ -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-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-09 21:10+0000\n"
-"Last-Translator: Anders Eriksson (Mobila System) \n"
+"PO-Revision-Date: 2010-04-21 15:10+0000\n"
+"Last-Translator: djn (XCLUDE) \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-04-22 03:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr
@@ -189,7 +189,7 @@ msgstr "Medlemmar"
#. module: hr
#: field:hr.employee,ssnid:0
msgid "SSN No"
-msgstr ""
+msgstr "Personnummer"
#. module: hr
#: model:process.transition,note:hr.process_transition_contactofemployee0
@@ -315,7 +315,7 @@ msgstr "Aktiv"
#. module: hr
#: constraint:hr.employee:0
msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr ""
+msgstr "Fel! Du kan inte skapa omvänd rangordning av anställda."
#. module: hr
#: model:process.process,name:hr.process_process_employeecontractprocess0
diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index 1d0be1f288e..a1d89f67b28 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -318,8 +318,7 @@ class hr_evaluation_interview(osv.osv):
record = record and record[0]
context.update({'survey_id': record.survey_id.id, 'response_id' : [record.response.id], 'response_no':0,})
value = self.pool.get("survey").action_print_survey(cr, uid, ids, context)
- return value
-
+ return value
hr_evaluation_interview()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:1
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index bf6e45376e7..cff66266686 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -202,14 +202,24 @@
-
+
+ hr_evaluation.evaluation.graph
+ hr_evaluation.evaluation
+ graph
+
+
+
+
+
+
+
hr_evaluation.evaluation_search
hr_evaluation.evaluation
search
-
+
@@ -242,7 +252,7 @@
hr_evaluation.evaluation
form
- tree,form
+ tree,form,graph
@@ -297,8 +307,8 @@
-
+
diff --git a/addons/hr_evaluation/report/hr_evaluation_report.py b/addons/hr_evaluation/report/hr_evaluation_report.py
index 3b318905bbe..504bdcd08f4 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report.py
+++ b/addons/hr_evaluation/report/hr_evaluation_report.py
@@ -27,14 +27,24 @@ class hr_evaluation_report(osv.osv):
_auto = False
_rec_name = 'date'
_columns = {
- 'create_date': fields.datetime('Create Date', readonly=True),
+ 'create_date': fields.date('Create Date', readonly=True),
+ 'day': fields.char('Day', size=128, readonly=True),
'deadline': fields.date("Deadline", readonly=True),
+ 'request_id': fields.many2one('survey.request','Request_id', readonly=True),
'closed': fields.date("closed", readonly=True),
'year': fields.char('Year', size=4, readonly=True),
'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
+ 'plan_id': fields.many2one('hr_evaluation.plan', 'Plan', readonly=True),
'employee_id': fields.many2one('hr.employee', "Employee", readonly=True),
+ 'rating': fields.selection([
+ ('0','Significantly bellow expectations'),
+ ('1','Did not meet expectations'),
+ ('2','Meet expectations'),
+ ('3','Exceeds expectations'),
+ ('4','Significantly exceeds expectations'),
+ ], "Overall Rating", readonly=True),
'nbr':fields.integer('# of Requests', readonly=True),
'state': fields.selection([
('draft','Draft'),
@@ -51,21 +61,35 @@ class hr_evaluation_report(osv.osv):
create or replace view hr_evaluation_report as (
select
min(l.id) as id,
- s.create_date as create_date,
+ date_trunc('day',s.create_date) as create_date,
+ to_char(s.create_date, 'YYYY-MM-DD') as day,
s.employee_id,
+ l.request_id,
+ s.plan_id,
+ s.rating,
s.date as deadline,
s.date_close as closed,
to_char(s.create_date, 'YYYY') as year,
to_char(s.create_date, 'MM') as month,
- count(*) as nbr,
+ count(l.*) as nbr,
s.state
from
hr_evaluation_interview l
left join
hr_evaluation_evaluation s on (s.id=l.evaluation_id)
group by
- s.create_date,s.state,s.employee_id,
- s.date,s.date_close
+ s.create_date,
+ date_trunc('day',s.create_date),
+ to_char(s.create_date, 'YYYY-MM-DD'),
+ to_char(s.create_date, 'YYYY'),
+ to_char(s.create_date, 'MM'),
+ s.state,
+ s.employee_id,
+ s.date,
+ s.date_close,
+ l.request_id,
+ s.rating,
+ s.plan_id
)
""")
hr_evaluation_report()
diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
index 2048c8337db..0417fb0ffd2 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml
+++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
@@ -7,49 +7,95 @@
tree
-
-
-
+
+
+
+
+
+
-
+
+
+ hr.evaluation.report.graph
+ hr.evaluation.report
+ graph
+
+
+
+
+
+
+
+
+
hr.evaluation.report.search
hr.evaluation.report
search
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
@@ -61,7 +107,8 @@
Evaluations
hr.evaluation.report
form
- tree
+ tree,graph
+ {'search_default_month':1,'search_default_employee':1,'group_by_no_leaf':1,'group_by':[]}
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index b8f3c1928ed..292cbf6f027 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -66,6 +66,7 @@
@@ -172,9 +172,9 @@
+ name="%(crm.action_crm_send_mail)d"
+ context="{'mail':'new', 'model': 'hr.applicant'}"
+ icon="gtk-go-forward" type="action" />
@@ -201,10 +201,10 @@
search
-
-
-
-
+
@@ -232,9 +231,8 @@
domain="[('department_id','=',context.get('department_id',False))]"
help="My Department"/>
-
-
+
diff --git a/addons/hr_recruitment/hr_recruitment_wizard.xml b/addons/hr_recruitment/hr_recruitment_wizard.xml
index b2ef149d604..d82153eabbb 100644
--- a/addons/hr_recruitment/hr_recruitment_wizard.xml
+++ b/addons/hr_recruitment/hr_recruitment_wizard.xml
@@ -9,6 +9,14 @@
multi="True"
string="Schedule Phone Call" />
+
+
tree
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -39,57 +44,88 @@
search
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -100,7 +136,7 @@
hr.recruitment.report
form
tree,graph
- {"search_default_user_id":1,"search_default_by_user":1}
+ {'search_default_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}
diff --git a/addons/hr_recruitment/wizard/__init__.py b/addons/hr_recruitment/wizard/__init__.py
index 48e225c5a54..c946ed7264f 100644
--- a/addons/hr_recruitment/wizard/__init__.py
+++ b/addons/hr_recruitment/wizard/__init__.py
@@ -20,10 +20,8 @@
##############################################################################
-import hr_recruitment_wizard
-
-
-
+import hr_recruitment_phonecall
+import hr_recruitment_create_partner_job
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py b/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py
new file mode 100644
index 00000000000..4627751f731
--- /dev/null
+++ b/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py
@@ -0,0 +1,92 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2009 Tiny SPRL (). All Rights Reserved
+# $Id$
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+
+from osv import osv, fields
+from tools.translate import _
+
+class hr_recruitment_partner_create(osv.osv_memory):
+ _name = 'hr.recruitment.partner.create'
+ _description = 'Create Partner from job application'
+ _columns = {
+ 'close': fields.boolean('Close job request'),
+ }
+
+ def view_init(self, cr , uid , fields_list, context=None):
+ case_obj = self.pool.get('hr.applicant')
+ for case in case_obj.browse(cr, uid, context['active_ids']):
+ if case.partner_id:
+ raise osv.except_osv(_('Warning !'),
+ _('A partner is already defined on this job request.'))
+ pass
+
+ def make_order(self, cr, uid, ids, context=None):
+ mod_obj = self.pool.get('ir.model.data')
+ partner_obj = self.pool.get('res.partner')
+ contact_obj = self.pool.get('res.partner.address')
+ case_obj = self.pool.get('hr.applicant')
+
+ if context is None:
+ context = {}
+ data = self.read(cr, uid, ids, [], context)[0]
+ result = mod_obj._get_id(cr, uid, 'base', 'view_res_partner_filter')
+ res = mod_obj.read(cr, uid, result, ['res_id'])
+
+ for case in case_obj.browse(cr, uid, context['active_ids']):
+ partner_id = partner_obj.search(cr, uid, [('name', '=', case.partner_name or case.name)])
+ if partner_id:
+ raise osv.except_osv(_('Warning !'),_('A partner is already existing with the same name.'))
+ else:
+ partner_id = partner_obj.create(cr, uid, {
+ 'name': case.partner_name or case.name,
+ 'user_id': case.user_id.id,
+ 'comment': case.description,
+ })
+ contact_id = contact_obj.create(cr, uid, {
+ 'partner_id': partner_id,
+ 'name': case.partner_name,
+ 'phone': case.partner_phone,
+ 'mobile': case.partner_mobile,
+ 'email': case.email_from
+ })
+
+ case_obj.write(cr, uid, context['active_ids'], {
+ 'partner_id': partner_id,
+ 'partner_address_id': contact_id
+ })
+ if data['close']:
+ case_obj.case_close(cr, uid, context['active_ids'])
+
+ value = {
+ 'domain': "[]",
+ 'view_type': 'form',
+ 'view_mode': 'form,tree',
+ 'res_model': 'res.partner',
+ 'res_id': int(partner_id),
+ 'view_id': False,
+ 'type': 'ir.actions.act_window',
+ 'search_view_id': res['res_id']
+ }
+ return value
+
+hr_recruitment_partner_create()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job_view.xml b/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job_view.xml
new file mode 100644
index 00000000000..1eaaa2fefdd
--- /dev/null
+++ b/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job_view.xml
@@ -0,0 +1,45 @@
+
+
+
+
+
+ hr.recruitment.partner.create.form
+ hr.recruitment.partner.create
+ form
+
+
+
+
+
+
+ Create Partner
+ ir.actions.act_window
+ hr.recruitment.partner.create
+ form
+ form
+ new
+
+
+
+
+
+ Create Partner
+ client_action_multi
+
+ action
+ hr.applicant
+
+
+
+
\ No newline at end of file
diff --git a/addons/hr_recruitment/wizard/hr_recruitment_phonecall.py b/addons/hr_recruitment/wizard/hr_recruitment_phonecall.py
new file mode 100644
index 00000000000..27c0a2c49bd
--- /dev/null
+++ b/addons/hr_recruitment/wizard/hr_recruitment_phonecall.py
@@ -0,0 +1,116 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2009 Tiny SPRL (). All Rights Reserved
+# $Id$
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+
+import time
+
+from osv import osv, fields
+from tools.translate import _
+
+class job2phonecall(osv.osv_memory):
+ _name = 'hr.recruitment.job2phonecall'
+ _description = 'Schedule Phone Call'
+ _columns = {
+ 'user_id': fields.many2one('res.users', 'Assign To'),
+ 'deadline': fields.datetime('Planned Date'),
+ 'note': fields.text('Goals'),
+ 'category_id': fields.many2one('crm.case.categ', 'Category', required=True),
+ }
+
+ def _date_user(self, cr, uid, context=None):
+ case_obj = self.pool.get('hr.applicant')
+ case = case_obj.browse(cr, uid, context['active_id'])
+ return case.user_id and case.user_id.id or False
+
+ def _date_category(self, cr, uid, context=None):
+ categ_id = self.pool.get('crm.case.categ').search(cr, uid, [('name','=','Outbound')])
+ return categ_id and categ_id[0] or case.categ_id and case.categ_id.id or False
+
+ def _get_note(self, cr, uid, context=None):
+ case_obj = self.pool.get('hr.applicant')
+ case = case_obj.browse(cr, uid, context['active_id'])
+ return case.description or ''
+
+ _defaults = {
+ 'user_id': _date_user,
+ 'category_id': _date_category,
+ 'note': _get_note
+ }
+
+ def make_phonecall(self, cr, uid, ids, context=None):
+ mod_obj = self.pool.get('ir.model.data')
+ job_case_obj = self.pool.get('hr.applicant')
+ data_obj = self.pool.get('ir.model.data')
+ phonecall_case_obj = self.pool.get('crm.phonecall')
+
+ form = self.read(cr, uid, ids, [], context=context)[0]
+# form = data['form']
+ result = mod_obj._get_id(cr, uid, 'crm', 'view_crm_case_phonecalls_filter')
+ res = mod_obj.read(cr, uid, result, ['res_id'])
+ # Select the view
+
+ id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_phone_tree_view')
+ id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_phone_form_view')
+ if id2:
+ id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+ if id3:
+ id3 = data_obj.browse(cr, uid, id3, context=context).res_id
+
+ for job in job_case_obj.browse(cr, uid, context['active_ids']):
+ #TODO : Take other info from job
+ new_phonecall_id = phonecall_case_obj.create(cr, uid, {
+ 'name' : job.name,
+ 'user_id' : form['user_id'],
+ 'categ_id' : form['category_id'],
+ 'description' : form['note'],
+ 'date' : form['deadline'],
+# 'section_id' : form['section_id'],
+ 'description':job.description,
+ 'partner_id':job.partner_id.id,
+ 'partner_address_id':job.partner_address_id.id,
+ 'partner_phone':job.partner_phone,
+ 'partner_mobile':job.partner_mobile,
+ 'description':job.description,
+ 'date':job.date,
+ }, context=context)
+ new_phonecall = phonecall_case_obj.browse(cr, uid, new_phonecall_id)
+ vals = {}
+# if not job.case_id:
+# vals.update({'phonecall_id' : new_phonecall.id})
+ job_case_obj.write(cr, uid, [job.id], vals)
+ job_case_obj.case_cancel(cr, uid, [job.id])
+ phonecall_case_obj.case_open(cr, uid, [new_phonecall_id])
+
+ value = {
+ 'name': _('Phone Call'),
+ 'view_type': 'form',
+ 'view_mode': 'tree,form',
+ 'res_model': 'crm.phonecall',
+ 'res_id' : new_phonecall_id,
+ 'views': [(id3,'form'),(id2,'tree'),(False,'calendar'),(False,'graph')],
+ 'type': 'ir.actions.act_window',
+ 'search_view_id': res['res_id']
+ }
+ return value
+
+job2phonecall()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:>>>>>>> MERGE-SOURCE
diff --git a/addons/hr_recruitment/wizard/hr_recruitment_phonecall_view.xml b/addons/hr_recruitment/wizard/hr_recruitment_phonecall_view.xml
new file mode 100644
index 00000000000..f7c162594d2
--- /dev/null
+++ b/addons/hr_recruitment/wizard/hr_recruitment_phonecall_view.xml
@@ -0,0 +1,50 @@
+
+
+
+
+
+ hr.recruitment.job2phonecall.form
+ hr.recruitment.job2phonecall
+ form
+
+
+
+
+
+
+ Schedule Phone Call
+ ir.actions.act_window
+ hr.recruitment.job2phonecall
+ form
+ form
+ new
+
+
+
+
+
+
\ No newline at end of file
diff --git a/addons/hr_recruitment/wizard/hr_recruitment_wizard.py b/addons/hr_recruitment/wizard/hr_recruitment_wizard.py
deleted file mode 100644
index a12ff4957eb..00000000000
--- a/addons/hr_recruitment/wizard/hr_recruitment_wizard.py
+++ /dev/null
@@ -1,218 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2009 Tiny SPRL (). All Rights Reserved
-# $Id$
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
-#
-##############################################################################
-
-from mx.DateTime import now
-
-import wizard
-import netsvc
-import ir
-import pooler
-import time
-
-from tools.translate import _
-
-class job2phonecall(wizard.interface):
- case_form = """
- """
-
- case_fields = {
- 'user_id' : {'string' : 'Assign To', 'type' : 'many2one', 'relation' : 'res.users'},
- 'deadline' : {'string' : 'Planned Date', 'type' : 'datetime'},
- 'note' : {'string' : 'Goals', 'type' : 'text'},
- 'category_id' : {'string' : 'Category', 'type' : 'many2one', 'relation' : 'crm.case.categ', 'required' : True},
- 'section_id' : {'string' : 'Section', 'type' : 'many2one', 'relation' : 'hr.case.section'},
-
- }
- def _default_values(self, cr, uid, data, context):
-
- case_obj = pooler.get_pool(cr.dbname).get('hr.applicant')
- categ_id=pooler.get_pool(cr.dbname).get('crm.case.categ').search(cr, uid, [('name','=','Outbound')])
- case = case_obj.browse(cr, uid, data['id'])
- return {
- 'user_id' : case.user_id and case.user_id.id,
- 'category_id' : categ_id and categ_id[0] or case.categ_id and case.categ_id.id,
- 'section_id' : case.section_id and case.section_id.id or False,
- 'note' : case.description
- }
-
- def _doIt(self, cr, uid, data, context):
- form = data['form']
- pool = pooler.get_pool(cr.dbname)
- mod_obj = pool.get('ir.model.data')
- result = mod_obj._get_id(cr, uid, 'hr', 'view_hr_case_phonecalls_filter')
- res = mod_obj.read(cr, uid, result, ['res_id'])
- phonecall_case_obj = pool.get('hr.phonecall')
- job_case_obj = pool.get('hr.applicant')
- # Select the view
-
- data_obj = pool.get('ir.model.data')
- id2 = data_obj._get_id(cr, uid, 'hr', 'hr_case_phone_tree_view')
- id3 = data_obj._get_id(cr, uid, 'hr', 'hr_case_phone_form_view')
- if id2:
- id2 = data_obj.browse(cr, uid, id2, context=context).res_id
- if id3:
- id3 = data_obj.browse(cr, uid, id3, context=context).res_id
-
- for job in job_case_obj.browse(cr, uid, data['ids']):
- #TODO : Take other info from job
- new_phonecall_id = phonecall_case_obj.create(cr, uid, {
- 'name' : job.name,
- 'user_id' : form['user_id'],
- 'categ_id' : form['category_id'],
- 'description' : form['note'],
- 'date' : form['deadline'],
- 'section_id' : form['section_id'],
- 'description':job.description,
- 'partner_id':job.partner_id.id,
- 'partner_address_id':job.partner_address_id.id,
- 'partner_phone':job.partner_phone,
- 'partner_mobile':job.partner_mobile,
- 'description':job.description,
- 'date':job.date,
- }, context=context)
- new_phonecall = phonecall_case_obj.browse(cr, uid, new_phonecall_id)
- vals = {}
- if not job.case_id:
- vals.update({'phonecall_id' : new_phonecall.id})
- job_case_obj.write(cr, uid, [job.id], vals)
- job_case_obj.case_cancel(cr, uid, [job.id])
- phonecall_case_obj.case_open(cr, uid, [new_phonecall_id])
- value = {
- 'name': _('Phone Call'),
- 'view_type': 'form',
- 'view_mode': 'tree,form',
- 'res_model': 'hr.phonecall',
- 'res_id' : new_phonecall_id,
- 'views': [(id3,'form'),(id2,'tree'),(False,'calendar'),(False,'graph')],
- 'type': 'ir.actions.act_window',
- 'search_view_id': res['res_id']
- }
- return value
-
- states = {
- 'init': {
- 'actions': [_default_values],
- 'result': {'type': 'form', 'arch': case_form, 'fields': case_fields,
- 'state' : [('end', 'Cancel','gtk-cancel'),('order', 'Schedule Phone Call','gtk-go-forward')]}
- },
- 'order': {
- 'actions': [],
- 'result': {'type': 'action', 'action': _doIt, 'state': 'end'}
- }
- }
-
-job2phonecall('hr.applicant.reschedule_phone_call')
-
-class partner_create(wizard.interface):
-
- case_form = """
- """
-
- case_fields = {
- 'close': {'type':'boolean', 'string':'Close job request'}
- }
-
- def _selectPartner(self, cr, uid, data, context):
- pool = pooler.get_pool(cr.dbname)
- case_obj = pool.get('hr.applicant')
- for case in case_obj.browse(cr, uid, data['ids']):
- if case.partner_id:
- raise wizard.except_wizard(_('Warning !'),
- _('A partner is already defined on this job request.'))
- return {}
-
- def _makeOrder(self, cr, uid, data, context):
- pool = pooler.get_pool(cr.dbname)
- mod_obj = pool.get('ir.model.data')
- result = mod_obj._get_id(cr, uid, 'base', 'view_res_partner_filter')
- res = mod_obj.read(cr, uid, result, ['res_id'])
- case_obj = pool.get('hr.applicant')
- partner_obj = pool.get('res.partner')
- contact_obj = pool.get('res.partner.address')
- for case in case_obj.browse(cr, uid, data['ids']):
- partner_id = partner_obj.search(cr, uid, [('name', '=', case.partner_name or case.name)])
- if partner_id:
- raise wizard.except_wizard(_('Warning !'),_('A partner is already existing with the same name.'))
- else:
- partner_id = partner_obj.create(cr, uid, {
- 'name': case.partner_name or case.name,
- 'user_id': case.user_id.id,
- 'comment': case.description,
- })
- contact_id = contact_obj.create(cr, uid, {
- 'partner_id': partner_id,
- 'name': case.partner_name2,
- 'phone': case.partner_phone,
- 'mobile': case.partner_mobile,
- 'email': case.email_from
- })
-
-
- case_obj.write(cr, uid, data['ids'], {
- 'partner_id': partner_id,
- 'partner_address_id': contact_id
- })
- if data['form']['close']:
- case_obj.case_close(cr, uid, data['ids'])
-
- value = {
- 'domain': "[]",
- 'view_type': 'form',
- 'view_mode': 'form,tree',
- 'res_model': 'res.partner',
- 'res_id': int(partner_id),
- 'view_id': False,
- 'type': 'ir.actions.act_window',
- 'search_view_id': res['res_id']
- }
- return value
-
- states = {
- 'init': {
- 'actions': [_selectPartner],
- 'result': {'type': 'form', 'arch': case_form, 'fields': case_fields,
- 'state' : [('end', 'Cancel', 'gtk-cancel'),('confirm', 'Create Partner', 'gtk-go-forward')]}
- },
- 'confirm': {
- 'actions': [],
- 'result': {'type': 'action', 'action': _makeOrder, 'state': 'end'}
- }
- }
-
-partner_create('hr.applicant.partner_create')
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_timesheet/__openerp__.py b/addons/hr_timesheet/__openerp__.py
index a917ed2df4c..4bd6d3525fc 100644
--- a/addons/hr_timesheet/__openerp__.py
+++ b/addons/hr_timesheet/__openerp__.py
@@ -46,7 +46,8 @@ to set up a management by affair.
'hr_timesheet_wizard.xml',
'process/hr_timesheet_process.xml',
'wizard/hr_timesheet_print_employee_view.xml',
- 'wizard/hr_timesheet_print_users_view.xml'
+ 'wizard/hr_timesheet_print_users_view.xml',
+ 'wizard/hr_timesheet_sign_in_out_view.xml',
],
'demo_xml': ['hr_timesheet_demo.xml'],
'installable': True,
diff --git a/addons/hr_timesheet/hr_timesheet_wizard.xml b/addons/hr_timesheet/hr_timesheet_wizard.xml
index f0a2d7175b3..fa36c03ae10 100644
--- a/addons/hr_timesheet/hr_timesheet_wizard.xml
+++ b/addons/hr_timesheet/hr_timesheet_wizard.xml
@@ -1,8 +1,8 @@
-
+
diff --git a/addons/hr_timesheet/i18n/de.po b/addons/hr_timesheet/i18n/de.po
index c0dc16b4145..8da6cb5fbef 100644
--- a/addons/hr_timesheet/i18n/de.po
+++ b/addons/hr_timesheet/i18n/de.po
@@ -13,7 +13,11 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
+"X-Launchpad-Export-Date: 2010-04-07 03:46+0000\n"
+=======
"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
+>>>>>>> MERGE-SOURCE
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr_timesheet
diff --git a/addons/hr_timesheet/wizard/__init__.py b/addons/hr_timesheet/wizard/__init__.py
index 8619dcbcfea..5f2bc1443e3 100644
--- a/addons/hr_timesheet/wizard/__init__.py
+++ b/addons/hr_timesheet/wizard/__init__.py
@@ -19,7 +19,7 @@
#
##############################################################################
-import sign_in_out
+import hr_timesheet_sign_in_out
import hr_timesheet_print_employee
import hr_timesheet_print_users
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
new file mode 100644
index 00000000000..fa57cfdd1a5
--- /dev/null
+++ b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
@@ -0,0 +1,169 @@
+# -*- 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 .
+#
+##############################################################################
+import time
+
+from osv import osv, fields
+from tools.translate import _
+
+class hr_so_project(osv.osv_memory):
+ _name = 'hr.sign.out.project'
+ _description = 'Sign Out By Project'
+ _columns = {
+ 'account_id': fields.many2one('account.analytic.account', 'Analytic Account', required=True, domain=[('type','=','normal')]),
+ 'info': fields.char('Work Description', size=256, required=True),
+ 'date_start': fields.datetime('Starting Date', readonly=True),
+ 'date': fields.datetime('Closing Date'),
+ 'analytic_amount': fields.float('Minimum Analytic Amount'),
+ 'name': fields.char('Employees name', size=32, required=True, readonly=True),
+ 'state': fields.char('Current state', size=32, required=True, readonly=True),
+ 'server_date': fields.datetime('Current Date', required=True, readonly=True),
+ 'emp_id': fields.char('Employee ID', size=256, required=False),
+ }
+
+ def _get_empid(self, cr, uid, context=None):
+ emp_obj = self.pool.get('hr.employee')
+ emp_id = emp_obj.search(cr, uid, [('user_id', '=', uid)])
+ if emp_id:
+ employee = emp_obj.read(cr, uid, emp_id)[0]
+ return {'name': employee['name'], 'state': employee['state'], 'emp_id': emp_id[0], 'server_date':time.strftime('%Y-%m-%d %H:%M:%S')}
+ raise osv.except_osv(_('UserError'), _('No employee defined for your user !'))
+
+ def _get_empid2(self, cr, uid, context):
+ res = self._get_empid(cr, uid, context)
+ cr.execute('select name,action from hr_attendance where employee_id=%s order by name desc limit 1', (res['emp_id'],))
+ res['server_date'] = time.strftime('%Y-%m-%d %H:%M:%S')
+ res['date_start'] = cr.fetchone()[0]
+ return res
+
+ def default_get(self, cr, uid, fields_list, context=None):
+ res = super(hr_so_project, self).default_get(cr, uid, fields_list, context=context)
+ res.update(self._get_empid2(cr, uid, context=context))
+ return res
+
+ def _write(self, cr, uid, data, emp_id, context=None):
+ timesheet_obj = self.pool.get('hr.analytic.timesheet')
+ emp_obj = self.pool.get('hr.employee')
+ hour = (time.mktime(time.strptime(data['date'] or time.strftime('%Y-%m-%d %H:%M:%S'), '%Y-%m-%d %H:%M:%S')) -
+ time.mktime(time.strptime(data['date_start'], '%Y-%m-%d %H:%M:%S'))) / 3600.0
+ minimum = data['analytic_amount']
+ if minimum:
+ hour = round(round((hour + minimum / 2) / minimum) * minimum, 2)
+ res = timesheet_obj.default_get(cr, uid, ['product_id','product_uom_id'])
+ if not res['product_uom_id']:
+ raise osv.except_osv(_('UserError'), _('No cost unit defined for this employee !'))
+ up = timesheet_obj.on_change_unit_amount(cr, uid, False, res['product_id'], hour, res['product_uom_id'])['value']
+ res['name'] = data['info']
+ res['account_id'] = data['account_id']
+ res['unit_amount'] = hour
+ emp_journal = emp_obj.browse(cr, uid, emp_id, context).journal_id
+ res['journal_id'] = emp_journal and emp_journal.id or False
+ res.update(up)
+ up = timesheet_obj.on_change_account_id(cr, uid, [], res['account_id']).get('value', {})
+ res.update(up)
+ return timesheet_obj.create(cr, uid, res, context=context)
+
+ def sign_out_result_end(self, cr, uid, ids, context=None):
+ emp_obj = self.pool.get('hr.employee')
+ data = self.read(cr, uid, ids, [])[0]
+ emp_id = data['emp_id']
+ emp_obj.attendance_action_change(cr, uid, [emp_id], type='sign_out',dt=data['date'])
+ self._write(cr, uid, data, emp_id, context=context)
+ return {}
+
+ def sign_out_result(self, cr, uid, ids, context=None):
+ emp_obj = self.pool.get('hr.employee')
+ data = self.read(cr, uid, ids, [])[0]
+ emp_id = data['emp_id']
+ emp_obj.attendance_action_change(cr, uid, [emp_id], type='action', dt=data['date'])
+ self._write(cr, uid, data, emp_id, context=context)
+ return {}
+
+hr_so_project()
+
+class hr_si_project(osv.osv_memory):
+ _name = 'hr.sign.in.project'
+ _description = 'Sign In By Project'
+ _columns = {
+ 'name': fields.char('Employees name', size=32, required=True, readonly=True),
+ 'state': fields.char('Current state', size=32, required=True, readonly=True),
+ 'date': fields.datetime('Starting Date'),
+ 'server_date': fields.datetime('Current Date', required=True, readonly=True),
+ 'emp_id': fields.char('Employee ID', size=512, required=False),
+ }
+
+ def check_state(self, cr, uid, ids, context=None):
+ obj_model = self.pool.get('ir.model.data')
+ emp_id = self._get_empid(cr, uid, context)['emp_id']
+ # get the latest action (sign_in or out) for this employee
+ cr.execute('select action from hr_attendance where employee_id=%s and action in (\'sign_in\',\'sign_out\') order by name desc limit 1', (emp_id,))
+ res = (cr.fetchone() or ('sign_out',))[0]
+ #TODO: invert sign_in et sign_out
+ if res == 'sign_out':
+ model_data_ids = obj_model.search(cr,uid,[('model','=','ir.ui.view'),('name','=','view_hr_timesheet_sign_in')])
+ resource_id = obj_model.read(cr,uid,model_data_ids,fields=['res_id'])[0]['res_id']
+ return {
+ 'name': 'Sign in / Sign out',
+ 'view_type': 'form',
+ 'view_mode': 'tree,form',
+ 'res_model': 'hr.sign.in.project',
+ 'views': [(False,'tree'), (resource_id,'form')],
+ 'type': 'ir.actions.act_window',
+ 'target': 'new'
+ }
+ else:
+ model_data_ids = obj_model.search(cr,uid,[('model','=','ir.ui.view'),('name','=','view_hr_timesheet_sign_out')])
+ resource_id = obj_model.read(cr,uid,model_data_ids,fields=['res_id'])[0]['res_id']
+ return {
+ 'name': 'Sign in / Sign out',
+ 'view_type': 'form',
+ 'view_mode': 'tree,form',
+ 'res_model': 'hr.sign.out.project',
+ 'views': [(False,'tree'), (resource_id,'form')],
+ 'type': 'ir.actions.act_window',
+ 'target': 'new'
+ }
+
+ def _get_empid(self, cr, uid, context=None):
+ emp_obj = self.pool.get('hr.employee')
+ emp_id = emp_obj.search(cr, uid, [('user_id', '=', uid)])
+ if emp_id:
+ employee = emp_obj.read(cr, uid, emp_id)[0]
+ return {'name': employee['name'], 'state': employee['state'], 'emp_id': emp_id[0], 'server_date':time.strftime('%Y-%m-%d %H:%M:%S')}
+ raise osv.except_osv(_('UserError'), _('No employee defined for your user !'))
+
+ def sign_in_result(self, cr, uid, ids, context):
+ emp_obj = self.pool.get('hr.employee')
+ data = self.read(cr, uid, ids, [], context)[0]
+ emp_id = data['emp_id']
+ try:
+ success = emp_obj.attendance_action_change(cr, uid, [emp_id], type = 'sign_in' ,dt=data['date'] or False)
+ except except_osv, e:
+ raise osv.except_osv(e.name, e.value)
+ return {}
+
+ def default_get(self, cr, uid, fields_list, context=None):
+ res = super(hr_si_project, self).default_get(cr, uid, fields_list, context=context)
+ res.update(self._get_empid(cr, uid, context=context))
+ return res
+
+hr_si_project()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
new file mode 100644
index 00000000000..487208bfbf6
--- /dev/null
+++ b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
@@ -0,0 +1,95 @@
+
+
+
+
+ hr.sign.in.project.message.form
+ hr.sign.in.project
+ form
+
+
+
+
+
+
+ hr.sign.in.project.form
+ hr.sign.in.project
+ form
+
+
+
+
+
+
+ Sign in / Sign out by project
+ hr.sign.in.project
+ form
+ tree,form
+
+ new
+
+
+
+
+
+ hr.sign.out.project.form
+ hr.sign.out.project
+ form
+
+
+
+
+
+
+ Sign in / Sign out by project
+ hr.sign.out.project
+ form
+ tree,form
+
+ new
+
+
+
+
diff --git a/addons/hr_timesheet/wizard/sign_in_out.py b/addons/hr_timesheet/wizard/sign_in_out.py
deleted file mode 100644
index ff532afc260..00000000000
--- a/addons/hr_timesheet/wizard/sign_in_out.py
+++ /dev/null
@@ -1,174 +0,0 @@
-# -*- 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 .
-#
-##############################################################################
-
-
-import wizard
-import time
-import pooler
-from tools.translate import _
-
-si_form ='''
-'''
-
-si_fields = {
- 'name': {'string': "Employee's name", 'type':'char', 'required':True, 'readonly':True},
- 'state': {'string': "Current state", 'type' : 'char', 'required' : True, 'readonly': True},
- 'date': {'string':"Starting Date", 'type':'datetime'},
- 'server_date': {'string':"Current Date", 'type':'datetime', 'readonly':True},
-}
-
-so_form = '''
-'''
-
-so_fields = {
- 'name': {'string':"Employee's name", 'type':'char', 'required':True, 'readonly':True},
- 'state': {'string':"Current state", 'type':'char', 'required':True, 'readonly':True},
- 'account_id': {'string':"Analytic Account", 'type':'many2one', 'relation':'account.analytic.account', 'required':True, 'domain':"[('type','=','normal')]"},
- 'info': {'string':"Work Description", 'type':'char', 'size':256, 'required':True},
- 'date': {'string':"Closing Date", 'type':'datetime'},
- 'date_start': {'string':"Starting Date", 'type':'datetime', 'readonly':True},
- 'server_date': {'string':"Current Server Date", 'type':'datetime', 'readonly':True},
- 'analytic_amount': {'string':"Minimum Analytic Amount", 'type':'float'},
-}
-
-def _get_empid(self, cr, uid, data, context):
- emp_obj = pooler.get_pool(cr.dbname).get('hr.employee')
- emp_id = emp_obj.search(cr, uid, [('user_id', '=', uid)])
- if emp_id:
- employee = emp_obj.read(cr, uid, emp_id)[0]
- return {'name': employee['name'], 'state': employee['state'], 'emp_id': emp_id[0], 'date':False, 'server_date':time.strftime('%Y-%m-%d %H:%M:%S')}
- raise wizard.except_wizard(_('UserError'), _('No employee defined for your user !'))
-
-def _get_empid2(self, cr, uid, data, context):
- res = _get_empid(self,cr, uid, data, context)
- cr.execute('select name,action from hr_attendance where employee_id=%s order by name desc limit 1', (res['emp_id'],))
- res['server_date'] = time.strftime('%Y-%m-%d %H:%M:%S')
- res['date_start'] = cr.fetchone()[0]
- res['info'] = ''
- res['account_id'] = False
- return res
-
-def _sign_in_result(self, cr, uid, data, context):
- emp_obj = pooler.get_pool(cr.dbname).get('hr.employee')
- emp_id = data['form']['emp_id']
- from osv.osv import except_osv
- try:
- success = emp_obj.attendance_action_change(cr, uid, [emp_id], type = 'sign_in' ,dt=data['form']['date'] or False)
- except except_osv, e:
- raise wizard.except_wizard(e.name, e.value)
- return {}
-
-def _write(self, cr, uid, data, emp_id, context):
- timesheet_obj = pooler.get_pool(cr.dbname).get('hr.analytic.timesheet')
- emp_obj = pooler.get_pool(cr.dbname).get('hr.employee')
- hour = (time.mktime(time.strptime(data['form']['date'] or time.strftime('%Y-%m-%d %H:%M:%S'), '%Y-%m-%d %H:%M:%S')) -
- time.mktime(time.strptime(data['form']['date_start'], '%Y-%m-%d %H:%M:%S'))) / 3600.0
- minimum = data['form']['analytic_amount']
- if minimum:
- hour = round(round((hour + minimum / 2) / minimum) * minimum, 2)
- res = timesheet_obj.default_get(cr, uid, ['product_id','product_uom_id'])
- if not res['product_uom_id']:
- raise wizard.except_wizard(_('UserError'), _('No cost unit defined for this employee !'))
- up = timesheet_obj.on_change_unit_amount(cr, uid, False, res['product_id'], hour, res['product_uom_id'])['value']
- res['name'] = data['form']['info']
- res['account_id'] = data['form']['account_id']
- res['unit_amount'] = hour
- emp_journal = emp_obj.browse(cr, uid, emp_id, context).journal_id
- res['journal_id'] = emp_journal and emp_journal.id or False
- res.update(up)
- up = timesheet_obj.on_change_account_id(cr, uid, [], res['account_id']).get('value', {})
- res.update(up)
- return timesheet_obj.create(cr, uid, res, context)
-
-def _sign_out_result_end(self, cr, uid, data, context):
- emp_obj = pooler.get_pool(cr.dbname).get('hr.employee')
- emp_id = data['form']['emp_id']
- emp_obj.attendance_action_change(cr, uid, [emp_id], type='sign_out',dt=data['form']['date'])
- _write(self, cr, uid, data, emp_id, context)
- return {}
-
-def _sign_out_result(self, cr, uid, data, context):
- emp_obj = pooler.get_pool(cr.dbname).get('hr.employee')
- emp_id = data['form']['emp_id']
- emp_obj.attendance_action_change(cr, uid, [emp_id], type='action',dt=data['form']['date'])
- _write(self, cr, uid, data, emp_id, context)
- return {}
-
-def _state_check(self, cr, uid, data, context):
- emp_id = _get_empid(self, cr, uid, data, context)['emp_id']
- # get the latest action (sign_in or out) for this employee
- cr.execute('select action from hr_attendance where employee_id=%s and action in (\'sign_in\',\'sign_out\') order by name desc limit 1', (emp_id,))
- res = (cr.fetchone() or ('sign_out',))[0]
-#TODO: invert sign_in et sign_out
- return res
-
-class wiz_si_so(wizard.interface):
- states = {
- 'init' : {
- 'actions' : [_get_empid],
- 'result' : {'type' : 'choice', 'next_state': _state_check}
- },
- 'sign_out' : { # this means sign_in...
- 'actions' : [_get_empid],
- 'result' : {'type':'form', 'arch':si_form, 'fields' : si_fields, 'state':[('end', 'Cancel'),('si_result', 'Start Working') ] }
- },
- 'si_result' : {
- 'actions' : [_sign_in_result],
- 'result' : {'type':'state', 'state':'end'}
- },
- 'sign_in' : { # this means sign_out...
- 'actions' : [_get_empid2],
- 'result' : {'type':'form', 'arch':so_form, 'fields':so_fields, 'state':[('end', 'Cancel'),('so_result', 'Change Work'),('so_result_end', 'Stop Working') ] }
- },
- 'so_result' : {
- 'actions' : [_sign_out_result],
- 'result' : {'type':'state', 'state':'end'}
- },
- 'so_result_end' : {
- 'actions' : [_sign_out_result_end],
- 'result' : {'type':'state', 'state':'end'}
- },
- }
-wiz_si_so('hr_timesheet.si_so')
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/hr_timesheet_invoice/__openerp__.py b/addons/hr_timesheet_invoice/__openerp__.py
index f335c7dbd77..72148b83f63 100644
--- a/addons/hr_timesheet_invoice/__openerp__.py
+++ b/addons/hr_timesheet_invoice/__openerp__.py
@@ -39,6 +39,10 @@ reports, eso.""",
'hr_timesheet_invoice_report.xml',
'report/report_analytic_view.xml',
'report/hr_timesheet_invoice_report_view.xml',
+ 'wizard/hr_timesheet_invoice_analytic_cost_ledger_view.xml',
+ 'wizard/hr_timesheet_analytic_profit_view.xml',
+ 'wizard/hr_timesheet_invoice_create_view.xml',
+ 'wizard/hr_timesheet_invoice_create_final_view.xml',
],
'demo_xml': ['hr_timesheet_invoice_demo.xml'],
'installable': True,
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml
index 5db8bfeb921..f2d9f5a8c4a 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml
@@ -13,7 +13,7 @@
sequence="2" />
-
+
-
+ groups="hr.group_hr_manager"/>-->
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_wizard.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_wizard.xml
index 350f30c780d..50ca292d39d 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_wizard.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_wizard.xml
@@ -1,8 +1,8 @@
-
-
-
+
+
+
diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report.py b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report.py
index 28f129dce22..b7cf2e8a2df 100644
--- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report.py
+++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL ().
#
@@ -15,13 +15,67 @@
# 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 .
+# along with this program. If not, see .
#
##############################################################################
from osv import fields,osv
from tools.sql import drop_view_if_exists
+class report_timesheet_line(osv.osv):
+ _name = "report.timesheet.line"
+ _description = "Timesheet Line"
+ _auto = False
+ _columns = {
+ 'name': fields.char('Year',size=64,required=False, readonly=True),
+ 'user_id':fields.many2one('res.users', 'User', readonly=True),
+ 'date' : fields.date('Date', readonly=True),
+ 'day': fields.char('Day', size=128, readonly=True),
+ 'quantity': fields.float('Quantity', readonly=True),
+ 'cost': fields.float('Cost', readonly=True),
+ 'product_id' : fields.many2one('product.product', 'Product',readonly=True),
+ 'account_id' : fields.many2one('account.analytic.account', 'Analytic Account', readonly=True),
+ 'general_account_id' : fields.many2one('account.account', 'General Account', readonly=True),
+ 'invoice_id': fields.many2one('account.invoice', 'Invoiced', readonly=True),
+ 'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
+ ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
+ }
+ _order = 'name desc,user_id desc'
+ def init(self, cr):
+ drop_view_if_exists(cr, 'report_timesheet_line')
+ cr.execute("""
+ create or replace view report_timesheet_line as (
+ select
+ min(l.id) as id,
+ l.date as date,
+ to_char(l.date,'YYYY') as name,
+ to_char(l.date,'MM') as month,
+ l.user_id,
+ to_char(l.date, 'YYYY-MM-DD') as day,
+ l.invoice_id,
+ l.product_id,
+ l.account_id,
+ l.general_account_id,
+ sum(l.unit_amount) as quantity,
+ sum(l.amount) as cost
+ from
+ account_analytic_line l
+ where
+ l.user_id is not null
+ group by
+ l.date,
+ l.user_id,
+ l.product_id,
+ l.account_id,
+ l.general_account_id,
+ l.invoice_id
+ )
+ """)
+report_timesheet_line()
+
+
+
+
class report_timesheet_user(osv.osv):
_name = "report_timesheet.user"
_description = "Timesheet per day"
@@ -102,7 +156,7 @@ class report_timesheet_account_date(osv.osv):
('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
}
_order = 'name desc,account_id desc,user_id desc'
-
+
def init(self, cr):
drop_view_if_exists(cr, 'report_timesheet_account_date')
cr.execute("""
@@ -167,7 +221,7 @@ class report_random_timsheet(osv.osv):
_name = "report.random.timesheet"
_description = "Random Timesheet Report"
_auto = False
-
+
_columns = {
'analytic_account_id' : fields.many2one('account.analytic.account','Analytic Account', readonly=True),
'name': fields.char('Description', size=64, readonly=True),
@@ -176,34 +230,34 @@ class report_random_timsheet(osv.osv):
'user_id' : fields.many2one('res.users', 'User', readonly=True)
}
_order = "date desc"
-
+
def __init__(self, pool, cr):
super(report_random_timsheet, self).__init__(pool, cr)
self.called = False
-
+
def fields_view_get(self, cr, user, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
""" To call the init() method timely
"""
if not self.called:
self.init(cr, user)
self.called = True # To make sure that init doesn't get called multiple times
-
+
res = super(report_random_timsheet, self).fields_view_get(cr, user, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
return res
-
+
def init(self, cr, uid=1):
drop_view_if_exists(cr, 'report_random_timesheet')
-
+
cr.execute("""create or replace view report_random_timesheet as (
- select
+ select
line.id as id, line.account_id as analytic_account_id, line.name as name,
line.unit_amount as quantity, line.date as date, line.user_id as user_id
- from
+ from
account_analytic_line line, hr_department dept,hr_department_user_rel dept_user
where
(dept.id = dept_user.department_id AND dept_user.user_id=line.user_id AND line.user_id is not null)
- AND (dept.manager_id = """ + str(uid) + """ )
+ AND (dept.manager_id = """ + str(uid) + """ )
AND (line.date <= CURRENT_DATE AND line.date > (CURRENT_DATE-3))
LIMIT 10
)
@@ -215,32 +269,32 @@ class random_timesheet_lines(osv.osv):
_name = "random.timesheet.lines"
_description = "Random Timesheet Lines"
_auto = False
-
+
_columns = {
- 'date': fields.date('Date', readonly=True),
+ 'date': fields.date('Date', readonly=True),
'name': fields.char('Description', size=64, readonly=True),
'user_id' : fields.many2one('res.users', 'User', readonly=True),
'quantity' : fields.float('Quantity', readonly=True),
- 'product_id' : fields.many2one('product.product', 'Product', readonly=True),
+ 'product_id' : fields.many2one('product.product', 'Product', readonly=True),
'analytic_account_id' : fields.many2one('account.analytic.account','Analytic Account', readonly=True),
'uom_id' : fields.many2one('product.uom', 'UoM', readonly=True),
'amount' : fields.float('Amount', readonly=True),
'to_invoice': fields.many2one('hr_timesheet_invoice.factor', 'Invoicing', readonly=True),
'general_account_id' : fields.many2one('account.account', 'General Account', readonly=True)
}
-
+
_order = "date desc"
-
+
def init(self, cr):
drop_view_if_exists(cr, 'random_timesheet_lines')
-
+
cr.execute("""create or replace view random_timesheet_lines as (
- select
+ select
line.id as id, line.date as date, line.name as name, line.unit_amount as quantity,
line.product_id as product_id, line.account_id as analytic_account_id,
line.product_uom_id as uom_id, line.amount as amount, line.to_invoice as to_invoice,
- line.general_account_id as general_account_id, line.user_id as user_id
- from
+ line.general_account_id as general_account_id, line.user_id as user_id
+ from
account_analytic_line line
where
(line.date <= CURRENT_DATE AND line.date > (CURRENT_DATE-15))
diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
index c895250284e..4de60162d1a 100644
--- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
+++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
@@ -6,6 +6,106 @@
name="Reporting"
parent="hr.menu_hr_root"
sequence="40" />
+
+
+ report.timesheet.line.graph
+ report.timesheet.line
+ graph
+
+
+
+
+
+
+
+
+
+
+ report.timesheet.line.tree
+ report.timesheet.line
+ tree
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ report.timesheet.line.search
+ report.timesheet.line
+ search
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Timesheet Line
+ report.timesheet.line
+ form
+ tree,graph
+ {'search_default_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}
+
+
+
+
+
@@ -89,7 +189,7 @@
graph,tree
-
+
@@ -155,7 +255,7 @@
graph,tree
-
+
@@ -229,7 +329,7 @@
graph,tree
-
+
@@ -304,7 +404,7 @@
graph,tree
-
+
diff --git a/addons/hr_timesheet_invoice/wizard/__init__.py b/addons/hr_timesheet_invoice/wizard/__init__.py
index e1948e45406..6dce6a7b651 100644
--- a/addons/hr_timesheet_invoice/wizard/__init__.py
+++ b/addons/hr_timesheet_invoice/wizard/__init__.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL ().
#
@@ -15,14 +15,14 @@
# 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 .
+# along with this program. If not, see .
#
##############################################################################
import hr_timesheet_invoice_create
-import account_analytic_profit
+import hr_timesheet_analytic_profit
import hr_timesheet_final_invoice_create
-import wizard_account_analytic_cost_ledger_report
+import hr_timesheet_analytic_cost_ledger_report
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_timesheet_invoice/wizard/account_analytic_profit.py b/addons/hr_timesheet_invoice/wizard/account_analytic_profit.py
deleted file mode 100644
index 90861b6f5a9..00000000000
--- a/addons/hr_timesheet_invoice/wizard/account_analytic_profit.py
+++ /dev/null
@@ -1,99 +0,0 @@
-# -*- 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 .
-#
-##############################################################################
-
-import wizard
-import datetime
-import pooler
-from tools.translate import _
-
-form='''
-'''
-
-class wizard_report(wizard.interface):
- def _date_from(*a):
- return datetime.datetime.today().strftime('%Y-%m-1')
-
- def _date_to(*a):
- return datetime.datetime.today().strftime('%Y-%m-%d')
-
- def _check(self, cr, uid, data, context):
- pool = pooler.get_pool(cr.dbname)
- line_obj = pool.get('account.analytic.line')
- product_obj = pool.get('product.product')
- price_obj = pool.get('product.pricelist')
- ids = line_obj.search(cr, uid, [
- ('date', '>=', data['form']['date_from']),
- ('date', '<=', data['form']['date_to']),
- ('journal_id', 'in', data['form']['journal_ids'][0][2]),
- ('user_id', 'in', data['form']['employee_ids'][0][2]),
- ])
- if not ids:
- raise wizard.except_wizard(_('Data Insufficient!'), _('No Records Found for Report!'))
-
- return data['form']
-
-
- fields={
- 'date_from':{
- 'string':'From',
- 'type':'date',
- 'required':True,
- 'default':_date_from,
- },
- 'date_to':{
- 'string':'To',
- 'type':'date',
- 'required':True,
- 'default':_date_to,
- },
- 'journal_ids':{
- 'string':'Journal',
- 'type':'many2many',
- 'relation':'account.analytic.journal',
- 'required':True,
- },
- 'employee_ids':{
- 'string':'Employee',
- 'type':'many2many',
- 'relation':'res.users',
- 'required':True,
- },
- }
-
- states={
- 'init':{
- 'actions':[],
- 'result':{'type':'form', 'arch':form, 'fields':fields, 'state':[('end', 'Cancel', 'gtk-cancel'), ('report', 'Print', 'gtk-ok')]}
- },
- 'report':{
- 'actions':[_check],
- 'result':{'type':'print', 'report':'account.analytic.profit', 'state':'end'}
- }
- }
-wizard_report('account.analytic.profit')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_cost_ledger_report.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_cost_ledger_report.py
new file mode 100644
index 00000000000..418aac5edd3
--- /dev/null
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_cost_ledger_report.py
@@ -0,0 +1,52 @@
+# -*- 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 .
+#
+##############################################################################
+import time
+
+from osv import osv, fields
+
+class hr_timesheet_analytic_cost_ledger(osv.osv_memory):
+ _name = 'hr.timesheet.analytic.cost.ledger'
+ _description = 'hr.timesheet.analytic.cost.ledger'
+ _columns = {
+ 'date1': fields.date('Start of period', required=True),
+ 'date2': fields.date('End of period', required=True)
+ }
+ _defaults = {
+ 'date1': lambda *a: time.strftime('%Y-01-01'),
+ 'date2': lambda *a: time.strftime('%Y-%m-%d')
+ }
+ def print_report(self, cr, uid, ids, context=None):
+ if context is None:
+ context = {}
+ datas = {
+ 'ids': 'active_ids' in context and context['active_ids'] or [],
+ 'model': 'account.analytic.account',
+ 'form': self.read(cr, uid, ids)[0]
+ }
+ return {
+ 'type': 'ir.actions.report.xml',
+ 'report_name': 'hr.timesheet.invoice.account.analytic.account.cost_ledger',
+ 'datas': datas,
+ }
+
+hr_timesheet_analytic_cost_ledger()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py
new file mode 100644
index 00000000000..f5b37256a02
--- /dev/null
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py
@@ -0,0 +1,79 @@
+# -*- 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 .
+#
+##############################################################################
+import datetime
+
+from osv import osv, fields
+from tools.translate import _
+
+class account_analytic_profit(osv.osv_memory):
+ _name = 'hr.timesheet.analytic.profit'
+ _description = 'Print Timesheet Profit'
+ _columns = {
+ 'date_from': fields.date('From', required=True),
+ 'date_to': fields.date('To', required=True),
+ 'journal_ids': fields.many2many('account.analytic.journal', 'analytic_profit_journal_rel', 'analytic_id', 'journal_id', 'Journal', required=True),
+ 'employee_ids': fields.many2many('res.users', 'analytic_profit_emp_rel', 'analytic_id', 'emp_id', 'Employee', required=True),
+ }
+
+ def _date_from(*a):
+ return datetime.datetime.today().strftime('%Y-%m-1')
+
+ def _date_to(*a):
+ return datetime.datetime.today().strftime('%Y-%m-%d')
+
+ _defaults = {
+ 'date_from': _date_from,
+ 'date_to': _date_to
+ }
+
+ def print_report(self, cr, uid, ids, context=None):
+ line_obj = self.pool.get('account.analytic.line')
+ product_obj = self.pool.get('product.product')
+ price_obj = self.pool.get('product.pricelist')
+ data = {}
+ data['form'] = self.read(cr, uid , ids, [], context=context)[0]
+ if context is None:
+ context = {}
+ ids_chk = line_obj.search(cr, uid, [
+ ('date', '>=', data['form']['date_from']),
+ ('date', '<=', data['form']['date_to']),
+ ('journal_id', 'in', data['form']['journal_ids']),
+ ('user_id', 'in', data['form']['employee_ids']),
+ ])
+ if not ids_chk:
+ raise osv.except_osv(_('Data Insufficient!'), _('No Records Found for Report!'))
+
+ data['form']['journal_ids'] = [(6, 0, data['form']['journal_ids'])] # Improve me => Change the rml/sxw so that it can support withou [0][2]
+ data['form']['employee_ids'] = [(6, 0, data['form']['employee_ids'])]
+ datas = {
+ 'ids': [],
+ 'model': 'account.analytic.line',
+ 'form': data['form']
+ }
+ return {
+ 'type': 'ir.actions.report.xml',
+ 'report_name': 'account.analytic.profit',
+ 'datas': datas,
+ }
+
+account_analytic_profit()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
new file mode 100644
index 00000000000..f79cae2eef8
--- /dev/null
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
@@ -0,0 +1,40 @@
+
+
+
+
+
+ Timesheet Profit
+ hr.timesheet.analytic.profit
+ form
+
+
+
+
+
+
+ Timesheet Profit
+ ir.actions.act_window
+ hr.timesheet.analytic.profit
+ form
+ form
+ new
+
+
+
+
+
+
\ No newline at end of file
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py
index 1f9efe9641f..e8309d84921 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL ().
#
@@ -15,15 +15,14 @@
# 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 .
+# along with this program. If not, see .
#
##############################################################################
-import wizard
-import pooler
import time
-from tools.translate import _
+from osv import osv, fields
+from tools.translate import _
#
# Create an final invoice based on selected timesheet lines
#
@@ -31,26 +30,37 @@ from tools.translate import _
#
# TODO: check unit of measure !!!
#
-class final_invoice_create(wizard.interface):
- def _get_defaults(self, cr, uid, data, context):
- return {}
+class final_invoice_create(osv.osv_memory):
+ _name = 'hr.timesheet.invoice.create.final'
+ _description = 'Create invoice from timesheet final'
+ _columns = {
+ 'date': fields.boolean('Date', help='Display date in the history of works'),
+ 'time': fields.boolean('Time spent', help='Display time in the history of works'),
+ 'name': fields.boolean('Name of entry', help='Display detail of work in the invoice line.'),
+ 'price': fields.boolean('Cost', help='Display cost of the item you reinvoice'),
+ 'balance_product': fields.many2one('product.product', 'Balance product', help='The product that will be used to invoice the remaining amount'),
+ }
- def _do_create(self, cr, uid, data, context):
- pool = pooler.get_pool(cr.dbname)
- mod_obj = pool.get('ir.model.data')
+ def do_create(self, cr, uid, ids, context=None):
+ mod_obj = self.pool.get('ir.model.data')
+ analytic_account_obj = self.pool.get('account.analytic.account')
+ res_partner_obj = self.pool.get('res.partner')
+ account_payment_term_obj = self.pool.get('account.payment.term')
+ invoices = []
+
+ if context is None:
+ context = {}
result = mod_obj._get_id(cr, uid, 'account', 'view_account_invoice_filter')
res = mod_obj.read(cr, uid, result, ['res_id'])
- analytic_account_obj = pool.get('account.analytic.account')
- res_partner_obj = pool.get('res.partner')
- account_payment_term_obj = pool.get('account.payment.term')
- account_ids = data['ids']
- invoices = []
+ data = self.read(cr, uid, ids, [], context)[0]
+ account_ids = 'active_ids' in context and context['active_ids'] or []
+
for account in analytic_account_obj.browse(cr, uid, account_ids, context):
partner = account.partner_id
amount_total=0.0
if (not partner) or not (account.pricelist_id):
- raise wizard.except_wizard(_('Analytic account incomplete'),
+ raise osv.except_osv(_('Analytic account incomplete'),
_('Please fill in the partner and pricelist field '
'in the analytic account:\n%s') % (account.name,))
@@ -67,15 +77,15 @@ class final_invoice_create(wizard.interface):
curr_invoice = {
'name': time.strftime('%D')+' - '+account.name,
'partner_id': account.partner_id.id,
- 'address_contact_id': pool.get('res.partner').address_get(cr, uid, [account.partner_id.id], adr_pref=['contact'])['contact'],
- 'address_invoice_id': pool.get('res.partner').address_get(cr, uid, [account.partner_id.id], adr_pref=['invoice'])['invoice'],
+ 'address_contact_id': self.pool.get('res.partner').address_get(cr, uid, [account.partner_id.id], adr_pref=['contact'])['contact'],
+ 'address_invoice_id': self.pool.get('res.partner').address_get(cr, uid, [account.partner_id.id], adr_pref=['invoice'])['invoice'],
'payment_term': partner.property_payment_term.id or False,
'account_id': partner.property_account_receivable.id,
'currency_id': account.pricelist_id.currency_id.id,
'date_due': date_due,
'fiscal_position': account.partner_id.property_account_position.id
}
- last_invoice = pool.get('account.invoice').create(cr, uid, curr_invoice)
+ last_invoice = self.pool.get('account.invoice').create(cr, uid, curr_invoice)
invoices.append(last_invoice)
context2=context.copy()
@@ -106,14 +116,14 @@ class final_invoice_create(wizard.interface):
line.product_uom_id,
move_line.ref""", (account.id,))
for product_id, amount, account_id, product_uom_id, ref in cr.fetchall():
- product = pool.get('product.product').browse(cr, uid, product_id, context2)
+ product = self.pool.get('product.product').browse(cr, uid, product_id, context2)
if product:
taxes = product.taxes_id
else:
taxes = []
- tax = pool.get('account.fiscal.position').map_tax(cr, uid, account.partner_id.property_account_position, taxes)
+ tax = self.pool.get('account.fiscal.position').map_tax(cr, uid, account.partner_id.property_account_position, taxes)
curr_line = {
'price_unit': -amount,
'quantity': 1.0,
@@ -126,14 +136,14 @@ class final_invoice_create(wizard.interface):
'account_id': account_id,
'account_analytic_id': account.id
}
- pool.get('account.invoice.line').create(cr, uid, curr_line)
+ self.pool.get('account.invoice.line').create(cr, uid, curr_line)
- if not data['form']['balance_product']:
- raise wizard.except_wizard(_('Balance product needed'), _('Please fill a Balance product in the wizard'))
- product = pool.get('product.product').browse(cr, uid, data['form']['balance_product'], context2)
+ if not data['balance_product']:
+ raise osv.except_osv(_('Balance product needed'), _('Please fill a Balance product in the wizard'))
+ product = self.pool.get('product.product').browse(cr, uid, data['balance_product'], context2)
taxes = product.taxes_id
- tax = pool.get('account.fiscal.position').map_tax(cr, uid, account.partner_id.property_account_position, taxes)
+ tax = self.pool.get('account.fiscal.position').map_tax(cr, uid, account.partner_id.property_account_position, taxes)
account_id = product.product_tmpl_id.property_account_income.id or product.categ_id.property_account_income_categ.id
curr_line = {
'price_unit': account.amount_max - amount_total,
@@ -147,9 +157,9 @@ class final_invoice_create(wizard.interface):
'account_id': account_id,
'account_analytic_id': account.id
}
- pool.get('account.invoice.line').create(cr, uid, curr_line)
+ self.pool.get('account.invoice.line').create(cr, uid, curr_line)
if account.amount_max < amount_total:
- pool.get('account.invoice').write(cr, uid, [last_invoice], {'type': 'out_refund',})
+ self.pool.get('account.invoice').write(cr, uid, [last_invoice], {'type': 'out_refund',})
cr.execute('update account_analytic_line set invoice_id=%s where invoice_id is null and account_id=%s', (last_invoice, account.id))
return {
@@ -161,40 +171,9 @@ class final_invoice_create(wizard.interface):
'view_id': False,
'context': "{'type':'out_invoice'}",
'type': 'ir.actions.act_window',
- 'search_view_id': res['res_id']
- }
+ 'search_view_id': res['res_id']
+ }
+final_invoice_create()
- _create_form = """
- """
-
- _create_fields = {
- 'date': {'string':'Date', 'type':'boolean', 'help':"Display date in the history of works"},
- 'time': {'string':'Time spent', 'type':'boolean', 'help':"Display time in the history of works"},
- 'name': {'string':'Name of entry', 'type':'boolean', 'help':"Display detail of work in the invoice line."},
- 'price': {'string':'Cost', 'type':'boolean', 'help':"Display cost of the item you reinvoice"},
- 'balance_product': {'string':'Balance product', 'type': 'many2one', 'relation':'product.product', 'help':"The product that will be used to invoice the remaining amount."},
- }
-
- states = {
- 'init' : {
- 'actions' : [_get_defaults],
- 'result' : {'type':'form', 'arch':_create_form, 'fields':_create_fields, 'state': [('end','Cancel', 'gtk-cancel'),('create','Create invoices', 'gtk-ok')]},
- },
- 'create' : {
- 'actions' : [],
- 'result' : {'type':'action', 'action':_do_create, 'state':'end'},
- },
- }
-final_invoice_create('hr.timesheet.final.invoice.create')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_analytic_cost_ledger_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_analytic_cost_ledger_view.xml
new file mode 100644
index 00000000000..c8f9806a309
--- /dev/null
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_analytic_cost_ledger_view.xml
@@ -0,0 +1,44 @@
+
+
+
+
+
+ Cost Ledger
+ hr.timesheet.analytic.cost.ledger
+ form
+
+
+
+
+
+
+ Cost Ledger
+ ir.actions.act_window
+ hr.timesheet.analytic.cost.ledger
+ form
+ form
+ new
+
+
+
+
+
+ Cost Ledger
+ client_print_multi
+
+ action
+ account.analytic.account
+
+
+
+
\ No newline at end of file
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
index 7e5edca5474..89ff5e92697 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
@@ -19,52 +19,69 @@
#
##############################################################################
-import wizard
-import pooler
import time
+
+from osv import osv, fields
from tools.translate import _
-#
-# Create an invoice based on selected timesheet lines
+## Create an invoice based on selected timesheet lines
#
#
# TODO: check unit of measure !!!
#
-class invoice_create(wizard.interface):
- def _get_accounts(self, cr, uid, data, context):
- if not len(data['ids']):
+class hr_timesheet_invoice_create(osv.osv_memory):
+
+ _name = 'hr.timesheet.invoice.create'
+ _description = 'Create invoice from timesheet'
+ _columns = {
+ 'accounts': fields.many2many('account.analytic.account', 'invoice_id', 'account_id', 'Analytic Accounts', required=True),
+ 'date': fields.boolean('Date', help='The real date of each work will be displayed on the invoice'),
+ 'time': fields.boolean('Time spent', help='The time of each work done will be displayed on the invoice'),
+ 'name': fields.boolean('Name of entry', help='The detail of each work done will be displayed on the invoice'),
+ 'price': fields.boolean('Cost', help='The cost of each work done will be displayed on the invoice. You probably don\'t want to check this'),
+ 'product': fields.many2one('product.product', 'Product', help='Complete this field only if you want to force to use a specific product. Keep empty to use the real product that comes from the cost.'),
+ }
+
+ def _get_accounts(self, cr, uid, context=None):
+ if context is None:
+ context = {}
+ if not len(context['active_ids']):
return {}
#Checking whether the analytic line is invoiced or not
- pool = pooler.get_pool(cr.dbname)
- analytic_line_obj = pool.get('account.analytic.line').browse(cr, uid, data['ids'], context)
+ analytic_line_obj = self.pool.get('account.analytic.line').browse(cr, uid, context['active_ids'], context)
for obj_acc in analytic_line_obj:
if obj_acc.invoice_id and obj_acc.invoice_id.state !='cancel':
- raise wizard.except_wizard(_('Warning'),_('The analytic entry "%s" is already invoiced!')%(obj_acc.name,))
-
- cr.execute("SELECT distinct(account_id) from account_analytic_line where id =ANY(%s)",(data['ids'],))
- account_ids = cr.fetchall()
- return {'accounts': [x[0] for x in account_ids]}
+ raise osv.except_osv(_('Warning'),_('The analytic entry "%s" is already invoiced!')%(obj_acc.name,))
+
+ cr.execute("SELECT distinct(account_id) from account_analytic_line where id =ANY(%s)",(context['active_ids'],))
+ account_ids = cr.fetchall()
+ return [x[0] for x in account_ids]
+
+ _defaults = {
+ 'accounts': _get_accounts
+ }
+
+ def do_create(self, cr, uid, ids, context=None):
+ mod_obj = self.pool.get('ir.model.data')
+ analytic_account_obj = self.pool.get('account.analytic.account')
+ res_partner_obj = self.pool.get('res.partner')
+ account_payment_term_obj = self.pool.get('account.payment.term')
+ invoices = []
- def _do_create(self, cr, uid, data, context):
- pool = pooler.get_pool(cr.dbname)
- mod_obj = pool.get('ir.model.data')
result = mod_obj._get_id(cr, uid, 'account', 'view_account_invoice_filter')
res = mod_obj.read(cr, uid, result, ['res_id'])
- analytic_account_obj = pool.get('account.analytic.account')
- res_partner_obj = pool.get('res.partner')
- account_payment_term_obj = pool.get('account.payment.term')
- account_ids = data['form']['accounts'][0][2]
- invoices = []
+ data = self.read(cr, uid, ids, [], context)[0]
+ account_ids = data['accounts']
for account in analytic_account_obj.browse(cr, uid, account_ids, context):
partner = account.partner_id
if (not partner) or not (account.pricelist_id):
- raise wizard.except_wizard(_('Analytic Account incomplete'),
+ raise osv.except_osv(_('Analytic Account incomplete'),
_('Please fill in the Associate Partner and Sale Pricelist fields in the Analytic Account:\n%s') % (account.name,))
if not partner.address:
- raise wizard.except_wizard(_('Partner incomplete'),
+ raise osv.except_osv(_('Partner incomplete'),
_('Please fill in the Address field in the Partner: %s.') % (partner.name,))
date_due = False
@@ -90,7 +107,7 @@ class invoice_create(wizard.interface):
'date_due': date_due,
'fiscal_position': account.partner_id.property_account_position.id
}
- last_invoice = pool.get('account.invoice').create(cr, uid, curr_invoice)
+ last_invoice = self.pool.get('account.invoice').create(cr, uid, curr_invoice)
invoices.append(last_invoice)
context2=context.copy()
@@ -99,26 +116,26 @@ class invoice_create(wizard.interface):
"FROM account_analytic_line as line " \
"WHERE account_id = %s " \
"AND id =ANY(%s) AND to_invoice IS NOT NULL " \
- "GROUP BY product_id,to_invoice", (account.id,data['ids'],))
+ "GROUP BY product_id,to_invoice", (account.id,context['active_ids'],))
for product_id,factor_id,qty in cr.fetchall():
product = pool.get('product.product').browse(cr, uid, product_id, context2)
if not product:
- raise wizard.except_wizard(_('Error'), _('At least one line has no product !'))
+ raise osv.except_osv(_('Error'), _('At least one line has no product !'))
factor_name = ''
factor = pool.get('hr_timesheet_invoice.factor').browse(cr, uid, factor_id, context2)
- if not data['form']['product']:
+ if not data['product']:
if factor.customer_name:
factor_name = product.name+' - '+factor.customer_name
else:
factor_name = product.name
else:
- factor_name = pool.get('product.product').name_get(cr, uid, [data['form']['product']], context=context)[0][1]
+ factor_name = pool.get('product.product').name_get(cr, uid, [data['product']], context=context)[0][1]
if account.pricelist_id:
pl = account.pricelist_id.id
- price = pool.get('product.pricelist').price_get(cr,uid,[pl], data['form']['product'] or product_id, qty or 1.0, account.partner_id.id)[pl]
+ price = pool.get('product.pricelist').price_get(cr,uid,[pl], data['product'] or product_id, qty or 1.0, account.partner_id.id)[pl]
else:
price = 0.0
@@ -132,7 +149,7 @@ class invoice_create(wizard.interface):
'invoice_line_tax_id': [(6,0,tax )],
'invoice_id': last_invoice,
'name': factor_name,
- 'product_id': data['form']['product'] or product_id,
+ 'product_id': data['product'] or product_id,
'invoice_line_tax_id': [(6,0,tax)],
'uos_id': product.uom_id.id,
'account_id': account_id,
@@ -149,27 +166,27 @@ class invoice_create(wizard.interface):
for line in line_ids:
# set invoice_line_note
details = []
- if data['form']['date']:
+ if data['date']:
details.append(line['date'])
- if data['form']['time']:
+ if data['time']:
if line['product_uom_id']:
details.append("%s %s" % (line['unit_amount'], pool.get('product.uom').browse(cr, uid, [line['product_uom_id']])[0].name))
else:
details.append("%s" % (line['unit_amount'], ))
- if data['form']['name']:
+ if data['name']:
details.append(line['name'])
- #if data['form']['price']:
+ #if data['price']:
# details.append(abs(line['amount']))
note.append(u' - '.join(map(lambda x: unicode(x) or '',details)))
curr_line['note'] = "\n".join(map(lambda x: unicode(x) or '',note))
pool.get('account.invoice.line').create(cr, uid, curr_line)
- cr.execute("update account_analytic_line set invoice_id=%s WHERE account_id = %s and id =ANY(%s)" ,(last_invoice,account.id,data['ids']))
+ cr.execute("update account_analytic_line set invoice_id=%s WHERE account_id = %s and id =ANY(%s)" ,(last_invoice, account.id,data['ids']))
- pool.get('account.invoice').button_reset_taxes(cr, uid, [last_invoice], context)
+ self.pool.get('account.invoice').button_reset_taxes(cr, uid, [last_invoice], context)
- mod_obj = pooler.get_pool(cr.dbname).get('ir.model.data')
- act_obj = pooler.get_pool(cr.dbname).get('ir.actions.act_window')
+ mod_obj = self.pool.get('ir.model.data')
+ act_obj = self.pool.get('ir.actions.act_window')
mod_id = mod_obj.search(cr, uid, [('name', '=', 'action_invoice_tree1')])[0]
res_id = mod_obj.read(cr, uid, mod_id, ['res_id'])['res_id']
@@ -190,45 +207,8 @@ class invoice_create(wizard.interface):
# 'search_view_id': res['res_id']
# }
- _create_form = """
- """
- _create_fields = {
- 'accounts': {'string':'Analytic Accounts', 'type':'many2many', 'required':'true', 'relation':'account.analytic.account'},
- 'date': {'string':'Date', 'type':'boolean', 'help':'The real date of each work will be displayed on the invoice'},
- 'time': {'string':'Time spent', 'type':'boolean', 'help':'The time of each work done will be displayed on the invoice'},
- 'name': {'string':'Name of entry', 'type':'boolean', 'help':'The detail of each work done will be displayed on the invoice'},
- 'price': {'string':'Cost', 'type':'boolean', 'help':'The cost of each work done will be displayed on the invoice. You probably don\'t want to check this.'},
- 'product': {'string':'Product', 'type':'many2one', 'relation': 'product.product', 'help':"Complete this field only if you want to force to use a specific product. Keep empty to use the real product that comes from the cost."},
- }
-
- states = {
- 'init' : {
- 'actions' : [_get_accounts],
- 'result' : {'type':'form', 'arch':_create_form, 'fields':_create_fields, 'state': [('end','Cancel', 'gtk-cancel'),('create','Create Invoices', 'gtk-ok')]},
- },
- 'create' : {
- 'actions' : [],
- 'result' : {'type':'action', 'action':_do_create, 'state':'end'},
- },
- }
-invoice_create('hr.timesheet.invoice.create')
+hr_timesheet_invoice_create()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml
new file mode 100644
index 00000000000..7b3f5ed4d6a
--- /dev/null
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml
@@ -0,0 +1,49 @@
+
+
+
+
+
+ hr.timesheet.invoice.create.final.form
+ hr.timesheet.invoice.create.final
+ form
+
+
+
+
+
+
+ Final Invoice
+ ir.actions.act_window
+ hr.timesheet.invoice.create.final
+ form
+ form
+ new
+
+
+
+
+
+ Final Invoice
+ client_action_multi
+
+ action
+ account.analytic.account
+
+
+
+
\ No newline at end of file
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
new file mode 100644
index 00000000000..7ddf3bc99a7
--- /dev/null
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
@@ -0,0 +1,57 @@
+
+
+
+
+
+ hr.timesheet.invoice.create.form
+ hr.timesheet.invoice.create
+ form
+
+
+
+
+
+
+ Invoice analytic lines
+ ir.actions.act_window
+ hr.timesheet.invoice.create
+ form
+ form
+ new
+
+
+
+
+
+ Invoice analytic lines
+ client_action_multi
+
+ action
+ account.analytic.line
+
+
+
+
\ No newline at end of file
diff --git a/addons/hr_timesheet_sheet/__init__.py b/addons/hr_timesheet_sheet/__init__.py
index 46961316bb4..d7635359c74 100644
--- a/addons/hr_timesheet_sheet/__init__.py
+++ b/addons/hr_timesheet_sheet/__init__.py
@@ -21,6 +21,6 @@
import hr_timesheet_sheet
import wizard
-
+import report
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_timesheet_sheet/__openerp__.py b/addons/hr_timesheet_sheet/__openerp__.py
index 9042d4200f1..44058d048cb 100644
--- a/addons/hr_timesheet_sheet/__openerp__.py
+++ b/addons/hr_timesheet_sheet/__openerp__.py
@@ -52,7 +52,8 @@ The validation can be configured in te company:
'security/hr_timesheet_data.xml',
'hr_timesheet_sheet_view.xml',
'hr_timesheet_workflow.xml',
- 'process/hr_timesheet_sheet_process.xml'
+ 'process/hr_timesheet_sheet_process.xml',
+ 'report/timesheet_report_view.xml',
],
'demo_xml': ['hr_timesheet_sheet_demo.xml'],
'installable': True,
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 81b86fecfa6..1a8b110d690 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -20,7 +20,18 @@
-
+
+ hr.timesheet.sheet.graph
+ hr_timesheet_sheet.sheet
+ graph
+
+
+
+
+
+
+
+
hr.timesheet.account.form
hr_timesheet_sheet.sheet.account
@@ -181,10 +192,10 @@
-
+
-
-
+
+
diff --git a/addons/hr_timesheet_sheet/report/__init__.py b/addons/hr_timesheet_sheet/report/__init__.py
new file mode 100644
index 00000000000..89f12b7c9a6
--- /dev/null
+++ b/addons/hr_timesheet_sheet/report/__init__.py
@@ -0,0 +1,25 @@
+# -*- 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 .
+#
+##############################################################################
+
+import timesheet_report
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report.py b/addons/hr_timesheet_sheet/report/timesheet_report.py
new file mode 100644
index 00000000000..ee016df56d7
--- /dev/null
+++ b/addons/hr_timesheet_sheet/report/timesheet_report.py
@@ -0,0 +1,94 @@
+# -*- 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 .
+#
+##############################################################################
+
+import tools
+from osv import fields,osv
+
+class timesheet_report(osv.osv):
+ _name = "timesheet.report"
+ _description = "Timesheet"
+ _auto = False
+ _columns = {
+ 'year': fields.char('Year',size=64,required=False, readonly=True),
+ 'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
+ ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
+ ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
+ 'day': fields.char('Day', size=128, readonly=True),
+ 'name': fields.char('Description', size=64,readonly=True),
+ 'user_id': fields.many2one('res.users', 'User',readonly=True),
+ 'nbr': fields.integer('#Nbr',readonly=True),
+ 'company_id': fields.many2one('res.company', 'Company',readonly=True),
+ 'department_id':fields.many2one('hr.department','Department',readonly=True),
+ 'date_from': fields.date('Date from',readonly=True,),
+ 'date_to': fields.date('Date to',readonly=True),
+ 'date_current': fields.date('Current date', required=True),
+ 'state' : fields.selection([
+ ('new', 'New'),
+ ('draft','Draft'),
+ ('confirm','Confirmed'),
+ ('done','Done')], 'State', readonly=True),
+ 'total_att': fields.float('Total Timesheet',readonly=True),
+ 'total_ts': fields.float('Total Attendance',readonly=True),
+ 'total_diff': fields.float('Difference', readonly=True),
+ }
+
+ def init(self, cr):
+ tools.drop_view_if_exists(cr, 'timesheet_report')
+ cr.execute("""
+ create or replace view timesheet_report as (
+ select
+ min(aal.id) as id,
+ htss.date_current,
+ htss.name,
+ htss.date_from,
+ htss.date_to,
+ to_char(htss.date_current,'YYYY') as year,
+ to_char(htss.date_current,'MM') as month,
+ to_char(htss.date_current, 'YYYY-MM-DD') as day,
+ count(*) as nbr,
+ sum(day.total_attendance) as total_att,
+ sum(day.total_timesheet) as total_ts,
+ sum(day.total_difference) as total_diff,
+ aal.account_id,
+ htss.user_id,
+ htss.company_id,
+ htss.department_id,
+ htss.state
+ from account_analytic_line as aal
+ left join hr_analytic_timesheet as hat ON (hat.line_id=aal.id)
+ left join hr_timesheet_sheet_sheet as htss ON (hat.line_id=htss.id)
+ left join hr_timesheet_sheet_sheet_day AS day ON (htss.id = day.sheet_id)
+ group by
+ to_char(htss.date_current,'YYYY'),
+ to_char(htss.date_current,'MM'),
+ to_char(htss.date_current, 'YYYY-MM-DD'),
+ aal.account_id,
+ htss.date_from,
+ htss.date_to,
+ htss.date_current,
+ htss.name,
+ htss.company_id,
+ htss.state,
+ htss.department_id,
+ htss.user_id
+ )
+ """)
+timesheet_report()
\ No newline at end of file
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
new file mode 100644
index 00000000000..976b2a6f8ea
--- /dev/null
+++ b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
@@ -0,0 +1,119 @@
+
+
+
+
+ timesheet.report.graph
+ timesheet.report
+ graph
+
+
+
+
+
+
+
+
+
+
+ timesheet.report.tree
+ timesheet.report
+ tree
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ timesheet.report.search
+ timesheet.report
+ search
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Timesheet
+ timesheet.report
+ form
+ tree,graph
+ {'search_default_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}
+
+
+
+
+
diff --git a/addons/hr_timesheet_sheet/wizard/__init__.py b/addons/hr_timesheet_sheet/wizard/__init__.py
index f6fba6021af..485bfbe5db2 100644
--- a/addons/hr_timesheet_sheet/wizard/__init__.py
+++ b/addons/hr_timesheet_sheet/wizard/__init__.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL ().
#
@@ -15,12 +15,11 @@
# 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 .
+# along with this program. If not, see .
#
##############################################################################
-import wizard_timesheet_current
-import wizard_timesheet_department
+import hr_timesheet_current
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_timesheet_sheet/wizard/wizard_timesheet_current.py b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py
similarity index 73%
rename from addons/hr_timesheet_sheet/wizard/wizard_timesheet_current.py
rename to addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py
index 8613df3bc82..4d9998014c8 100644
--- a/addons/hr_timesheet_sheet/wizard/wizard_timesheet_current.py
+++ b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL ().
#
@@ -15,27 +15,27 @@
# 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 .
+# along with this program. If not, see .
#
##############################################################################
-
-
-import wizard
-import netsvc
import time
-import pooler
-from osv import osv
+
+from osv import osv, fields
from tools.translate import _
-class wiz_timesheet_open(wizard.interface):
- def _open_timesheet(self, cr, uid, data, context):
- pool = pooler.get_pool(cr.dbname)
- user_ids = pool.get('hr.employee').search(cr, uid, [('user_id','=',uid)])
- if not len(user_ids):
- raise wizard.except_wizard(_('Error !'), _('No employee defined for your user !'))
- ts = pool.get('hr_timesheet_sheet.sheet')
- ids = ts.search(cr, uid, [('user_id','=',uid),('state','=','draft'),('date_from','<=',time.strftime('%Y-%m-%d')), ('date_to','>=',time.strftime('%Y-%m-%d'))])
+class hr_timesheet_current_open(osv.osv_memory):
+ _name = 'hr.timesheet.current.open'
+ _description = 'hr.timesheet.current.open'
+
+ def open_timesheet(self, cr, uid, ids, context=None):
+ ts = self.pool.get('hr_timesheet_sheet.sheet')
view_type = 'form,tree'
+
+ user_ids = self.pool.get('hr.employee').search(cr, uid, [('user_id','=',uid)])
+ if not len(user_ids):
+ raise osv.except_osv(_('Error !'), _('No employee defined for your user !'))
+ ids = ts.search(cr, uid, [('user_id','=',uid),('state','=','draft'),('date_from','<=',time.strftime('%Y-%m-%d')), ('date_to','>=',time.strftime('%Y-%m-%d'))])
+
if len(ids) > 1:
view_type = 'tree,form'
domain = "[('id','in',["+','.join(map(str, ids))+"]),('user_id', '=', uid)]"
@@ -46,7 +46,7 @@ class wiz_timesheet_open(wizard.interface):
domain = "[('user_id', '=', uid)]"
value = {
'domain': domain,
- 'name': 'Open timesheet',
+ 'name': 'Open Timesheet',
'view_type': 'form',
'view_mode': view_type,
'res_model': 'hr_timesheet_sheet.sheet',
@@ -57,14 +57,6 @@ class wiz_timesheet_open(wizard.interface):
value['res_id'] = ids[0]
return value
- states = {
- 'init' : {
- 'actions' : [],
- 'result' : {'type':'action', 'action':_open_timesheet, 'state':'end'}
- }
- }
-wiz_timesheet_open('hr_timesheet_sheet.current.open')
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+hr_timesheet_current_open()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/hr_timesheet_sheet/wizard/wizard_timesheet_department.py b/addons/hr_timesheet_sheet/wizard/wizard_timesheet_department.py
deleted file mode 100644
index 93aa12045ba..00000000000
--- a/addons/hr_timesheet_sheet/wizard/wizard_timesheet_department.py
+++ /dev/null
@@ -1,114 +0,0 @@
-# -*- 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 .
-#
-##############################################################################
-
-
-import wizard
-import netsvc
-import time
-import pooler
-from osv import osv
-
-class wiz_timesheet_open(wizard.interface):
- def _open_timesheet(self, cr, uid, data, context):
- pool = pooler.get_pool(cr.dbname)
- dep_ids = pool.get('hr.department').search(cr, uid, [('manager_id','=',uid)])
- user_ids = {}
- for dep in pool.get('hr.department').browse(cr, uid, dep_ids, context):
- for user in dep.member_ids:
- user_ids[user.id] = 1
- value = {
- 'domain': "[('user_id', 'in', "+str(user_ids.keys())+")]",
- 'name': 'Timesheets',
- 'view_type': 'form',
- 'view_mode': 'tree,form',
- 'res_model': 'hr_timesheet_sheet.sheet',
- 'view_id': False,
- 'type': 'ir.actions.act_window'
- }
- return value
-
- states = {
- 'init' : {
- 'actions' : [],
- 'result' : {'type':'action', 'action':_open_timesheet, 'state':'end'}
- }
- }
-wiz_timesheet_open('hr_timesheet_sheet.department.open')
-
-class wiz_timesheet_confirm_open(wizard.interface):
- def _open_timesheet(self, cr, uid, data, context):
- pool = pooler.get_pool(cr.dbname)
- dep_ids = pool.get('hr.department').search(cr, uid, [('manager_id','=',uid)])
- user_ids = {}
- for dep in pool.get('hr.department').browse(cr, uid, dep_ids, context):
- for user in dep.member_ids:
- user_ids[user.id] = 1
- value = {
- 'domain': "[('user_id', 'in', "+str(user_ids.keys())+"),('state','=','draft')]",
- 'name': 'Timesheets',
- 'view_type': 'form',
- 'view_mode': 'tree,form',
- 'res_model': 'hr_timesheet_sheet.sheet',
- 'view_id': False,
- 'type': 'ir.actions.act_window'
- }
- return value
-
- states = {
- 'init' : {
- 'actions' : [],
- 'result' : {'type':'action', 'action':_open_timesheet, 'state':'end'}
- }
- }
-wiz_timesheet_confirm_open('hr_timesheet_sheet.department.confirm.open')
-
-
-class wiz_timesheet_validate_open(wizard.interface):
- def _open_timesheet(self, cr, uid, data, context):
- pool = pooler.get_pool(cr.dbname)
- dep_ids = pool.get('hr.department').search(cr, uid, [('manager_id','=',uid)])
- user_ids = {}
- for dep in pool.get('hr.department').browse(cr, uid, dep_ids, context):
- for user in dep.member_ids:
- user_ids[user.id] = 1
- value = {
- 'domain': "[('user_id', 'in', "+str(user_ids.keys())+"),('state','=','confirm')]",
- 'name': 'Timesheets',
- 'view_type': 'form',
- 'view_mode': 'tree,form',
- 'res_model': 'hr_timesheet_sheet.sheet',
- 'view_id': False,
- 'type': 'ir.actions.act_window'
- }
- return value
-
- states = {
- 'init' : {
- 'actions' : [],
- 'result' : {'type':'action', 'action':_open_timesheet, 'state':'end'}
- }
- }
-wiz_timesheet_validate_open('hr_timesheet_sheet.department.validate.open')
-
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 429a3497634..675c4a73bb0 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -162,16 +162,25 @@ class mrp_bom(osv.osv):
"""
result = {}
bom_obj = self.pool.get('mrp.bom')
+ bom_id = context and context.get('active_id', False) or False
+ cr.execute('select id from mrp_bom')
+ if all(bom_id != r[0] for r in cr.fetchall()):
+ ids.sort()
+ bom_id = ids[0]
+ bom_parent = bom_obj.browse(cr, uid, bom_id)
for bom in self.browse(cr, uid, ids, context=context):
- result[bom.id] = map(lambda x: x.id, bom.bom_lines)
+ if (bom_parent and bom_parent.multi_level_bom) or bom.id == bom_id:
+ result[bom.id] = map(lambda x: x.id, bom.bom_lines)
+ else:
+ result[bom.id] = []
if bom.bom_lines:
continue
ok = ((name=='child_complete_ids') and (bom.product_id.supply_method=='produce'))
- if bom.type=='phantom' or ok:
+ if (bom.type=='phantom' or ok) and bom_parent.multi_level_bom:
sids = bom_obj.search(cr, uid, [('bom_id','=',False),('product_id','=',bom.product_id.id)])
if sids:
bom2 = bom_obj.browse(cr, uid, sids[0], context=context)
- result[bom.id] += map(lambda x: x.id, bom2.bom_lines)
+ result[bom.id] += map(lambda x: x.id, bom2.bom_lines)
return result
@@ -267,7 +276,7 @@ class mrp_bom(osv.osv):
v['name'] = prod.name
return {'value': v}
return {}
-
+
def _bom_find(self, cr, uid, product_id, product_uom, properties=[]):
""" Finds BoM for particular product and product uom.
@param product_id: Selected product.
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 6e7a1afb6dc..5b8b7c41084 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -253,13 +253,13 @@
-
+
-
+
@@ -618,7 +618,8 @@
-
form
tree,form,calendar,graph,gantt
- {"search_default_current":1}
@@ -852,7 +852,7 @@
-
+
mrp.procurement
form
- {"search_default_current":1}
@@ -322,7 +322,7 @@
-
+
@@ -337,9 +337,5 @@
id="menu_view_olap_application_field_form"
parent="menu_bi_conf_known_application"/>
-
-
-
-
diff --git a/addons/olap/test/olap_test00.yml b/addons/olap/test/olap_test00.yml
new file mode 100644
index 00000000000..af87950468f
--- /dev/null
+++ b/addons/olap/test/olap_test00.yml
@@ -0,0 +1,111 @@
+-
+ In order to check olap module which is used to configure BI from OpenERP client.I create olap fact database record.
+-
+ !record {model: olap.fact.database, id: olap_fact_database_openerp0}:
+ connection_type: port
+ db_host: localhost
+ db_login: postgres
+ db_name: tiny
+ db_password: '123456'
+ db_port: 5432
+ name: OpenERP
+ type: postgres
+-
+ I will check the connection for successful login. >>>>>>(Problem)
+# !python {model: olap.fact.database}: |
+ # self.test_connection(cr, uid,[ref('olap_fact_database_openerp0')], context)
+-
+ In order to test schema,I create a new schema record.
+-
+ !record {model: olap.schema, id: olap_schema_Partners0}:
+ database_id: olap_fact_database_openerp0
+ name: Partners
+-
+ I press "Connect to Database" and I see that the Schema State is "Database Connected" now
+-
+ !workflow {model: olap.schema, action: dbconnect, ref: olap_schema_Partners0}
+-
+ Now I will load the structure of the database. by structure we mean tables, columns and the relations. This will help in defining cube easily.
+-
+ !record {model: bi.load.db.wizard, id: bi_load_db_wizard_0}:
+ db_name: OpenERP
+ fact_table: Partners
+-
+ I can see two buttons for Configuration one for manually and the other is for Automatically.I press "Configure Automatically".After configuration I can see that the Boolean Configuring Data-structure is True now Schema State is "The Structure is Configured" and there is one button "Mark as Configured"
+-
+ !record {model: bi.auto.configure.wizard, id: bi_auto_configure_wizard_Partners0}:
+ name: Partners
+-
+ Performing a workflow action load on module olap.schema
+-
+ !workflow {model: olap.schema, action: dbload, ref: olap_schema_Partners0}
+-
+ Performing a workflow action configure on module olap.schema
+-
+ !workflow {model: olap.schema, action: dbconfigure, ref: olap_schema_Partners0}
+-
+ Performing a workflow action dbready on module olap.schema
+-
+ !workflow {model: olap.schema, action: dbready, ref: olap_schema_Partners0}
+-
+ In order to create Cube I first define the fact table.Fact table are the key tables in which measures are stored and we can branch to other tables for other parameters.
+-
+ !record {model: olap.database.tables, id: database_table_res_partner}:
+ active: True
+ fact_database_id: fact_database_terp
+ name: res_partner
+ table_db_name: res_partner
+-
+ I create cube table and select ID of as Relational Column.Then I select related record in Joined tables.
+-
+ !record {model: olap.cube.table, id: olap_cube_table_partnercubetable0}:
+ column_link_id: olap.columns_res_partner_id
+ name: Partner cube table
+ available_table_ids:
+ - olap.columns_res_partner_date
+ - olap.columns_res_partner_id
+ - olap.columns_res_partner_credit_limit
+ - olap.columns_res_partner_user_id
+
+-
+ I can configure Cube from BI Cube Designer.I make sure that OpenERP BI web-client is running.From Configuration I click on "Cube Designer" and It will open Cube Designer in my system browser.I can see that the schema "Partners" is visible through Cube Designer.
+-
+ Creating olap cube
+-
+ !record {model: olap.cube, id: olap_cube_partnercube0}:
+ name: Partner cube
+ query_log: true
+ schema_id: olap_schema_Partners0
+ table_id: olap_cube_table_partnercubetable0
+-
+ After cube we can decide upon the dimensions to be used for the cube.In order to analyze Partner I create one dimension.
+-
+ !record {model: olap.dimension, id: olap_dimension_products0}:
+ name: Products
+ cube_id: olap_cube_partnercube0
+-
+ After adding the dimension I create hierarchy.
+-
+ !record {model: olap.hierarchy, id: olap_hierarchy_allproducts0}:
+ dimension_id: olap_dimension_products0
+ name: All Products
+ sequence: 1
+ table_id: olap_cube_table_partnercubetable0
+-
+ After adding the hierarchy I create level.I select Product's default_code as Columns Name that is loaded in Fact columns.
+-
+ !record {model: olap.level, id: olap_level_productscode0}:
+ column_id_name: name
+ column_name: olap.columns_res_user_name
+ hierarchy_id: olap_hierarchy_allproducts0
+ name: Products code
+ sequence: 1
+ table_name: res_users
+ type: normal
+-
+ I will check that columns is loaded in Fact Table.
+-
+ !python {model: olap.load.column}: |
+ ids = self.search(cr, uid, [])
+ self.get_table_data(cr, uid, ids, {'active_ids': [ref('olap_cube_table_partnercubetable0')]})
+
diff --git a/addons/olap/wizard/olap_load_column.py b/addons/olap/wizard/olap_load_column.py
index 422a50abcff..65517626d62 100644
--- a/addons/olap/wizard/olap_load_column.py
+++ b/addons/olap/wizard/olap_load_column.py
@@ -26,7 +26,6 @@ class olap_load_column(osv.osv_memory):
_description = "Olap Load Column"
def get_table_data(self, cr, uid, ids, context={}):
-
"""
This function load column
@param cr: the current row, from the database cursor,
diff --git a/addons/olap_extract/i18n/zh_CN.po b/addons/olap_extract/i18n/zh_CN.po
deleted file mode 100644
index d38f5a530e8..00000000000
--- a/addons/olap_extract/i18n/zh_CN.po
+++ /dev/null
@@ -1,56 +0,0 @@
-# Chinese (Simplified) translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2009-11-26 05:29+0000\n"
-"PO-Revision-Date: 2010-04-08 02:07+0000\n"
-"Last-Translator: Silence \n"
-"Language-Team: Chinese (Simplified) \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:21+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: olap_extract
-#: model:ir.module.module,shortdesc:olap_extract.module_meta_information
-msgid "olap_extract"
-msgstr ""
-
-#. module: olap_extract
-#: wizard_button:olap.extract.schema,init,ok:0
-msgid "OK"
-msgstr "确定"
-
-#. module: olap_extract
-#: model:ir.actions.wizard,name:olap_extract.bi_olap_extract_schema
-msgid "Olap Extract"
-msgstr "Olap提取"
-
-#. module: olap_extract
-#: model:ir.module.module,description:olap_extract.module_meta_information
-msgid ""
-"\n"
-" Extracts the schema structure.\n"
-" "
-msgstr ""
-
-#. module: olap_extract
-#: wizard_field:olap.extract.schema,init,module_name:0
-msgid "Module Name"
-msgstr "模块名称"
-
-#. module: olap_extract
-#: wizard_button:olap.extract.schema,init,end:0
-msgid "Cancel"
-msgstr "取消"
-
-#. module: olap_extract
-#: wizard_view:olap.extract.schema,init:0
-msgid "New Module Name"
-msgstr "新的模块名"
diff --git a/addons/product/partner_view.xml b/addons/product/partner_view.xml
index 61ef58b8941..66e4ba84c37 100644
--- a/addons/product/partner_view.xml
+++ b/addons/product/partner_view.xml
@@ -9,7 +9,7 @@
-
+
diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml
index 0d4685593c3..604c2b75324 100644
--- a/addons/product/pricelist_view.xml
+++ b/addons/product/pricelist_view.xml
@@ -2,10 +2,7 @@
-
+
product.pricelist.version.form
diff --git a/addons/profile_manufacturing/i18n/nl.po b/addons/profile_manufacturing/i18n/nl.po
index 3b07c5da62a..43fc7db315a 100644
--- a/addons/profile_manufacturing/i18n/nl.po
+++ b/addons/profile_manufacturing/i18n/nl.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: 2010-04-15 09:57+0000\n"
-"Last-Translator: The Loeki \n"
+"PO-Revision-Date: 2010-04-22 10:54+0000\n"
+"Last-Translator: Jan Verlaan (Veritos) \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-21 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-04-23 03:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: profile_manufacturing
#: field:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
msgid "Manufacturing Operations"
-msgstr ""
+msgstr "Productie operaties"
#. module: profile_manufacturing
#: model:ir.module.module,description:profile_manufacturing.module_meta_information
msgid "Profile for manufacturing industries"
-msgstr ""
+msgstr "Profiel voor productie industrie"
#. module: profile_manufacturing
#: constraint:ir.model:0
@@ -36,22 +36,22 @@ msgstr ""
#. module: profile_manufacturing
#: field:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
msgid "Just in Time Scheduling"
-msgstr ""
+msgstr "Just in time planning"
#. module: profile_manufacturing
#: field:profile.manufacturing.config.install_modules_wizard,sale_journal:0
msgid "Manage by Journals"
-msgstr ""
+msgstr "Beheer middels dagboeken"
#. module: profile_manufacturing
#: view:profile.manufacturing.config.install_modules_wizard:0
msgid "Relationship Management"
-msgstr ""
+msgstr "Relatiebeheer"
#. module: profile_manufacturing
#: help:profile.manufacturing.config.install_modules_wizard,portal:0
msgid "This module allows you to manage a Portal system."
-msgstr ""
+msgstr "Deze module helpt u het portaal-systeem te beheren."
#. module: profile_manufacturing
#: help:profile.manufacturing.config.install_modules_wizard,board_document:0
@@ -61,6 +61,11 @@ msgid ""
"documents, printed reports, calendar system). It opens an FTP access for the "
"users to easily browse association's document."
msgstr ""
+"Met het documentbeheersysteem van OpenERP kunt u allerlei documenten "
+"(interne documenten, afgedrukte overzichten, agenda's) opslaan, "
+"doorbladeren, automatisch indexeren, zoeken en inzien.\r\n"
+"Het systeem maakt gebruik van FTP toegang zodat gebruikers eenvoudig bij de "
+"documenten kunnen komen."
#. module: profile_manufacturing
#: help:profile.manufacturing.config.install_modules_wizard,sale_journal:0
@@ -69,17 +74,20 @@ msgid ""
"journals. You can define journals for trucks, salesman, departments, "
"invoicing date delivery period, etc."
msgstr ""
+"Deze module help u uw verkopen, facturatie en materiaal picking the beheren "
+"middels dagboeken. U kunt dagboeken definiëren voor vrachtwagens, verkopers, "
+"afdelingen, factuurdatum aflever periode, enz."
#. module: profile_manufacturing
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Ongeldige modelnaam in de definitie van de actie."
#. module: profile_manufacturing
#: model:ir.actions.act_window,name:profile_manufacturing.action_config_install_module
#: view:profile.manufacturing.config.install_modules_wizard:0
msgid "Manufacturing Profile: Install Extra Modules"
-msgstr ""
+msgstr "Installeer extra modulen"
#. module: profile_manufacturing
#: help:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
@@ -88,6 +96,11 @@ msgid ""
"and faster for real time stock computation but, in counter-part, it manages "
"less efficiently priorities in procurements."
msgstr ""
+"De JIT (Just in Time) module stelt u in staat een directe mrp-planningsrun "
+"van het actieve product bij wijzigingen te laten uitvoeren. Dit is "
+"makkelijker en sneller in gebruik voor real time voorraad berekening, maar "
+"heeft als nadeel dat het minder efficiënt prioriteiten kan stellen bij "
+"genereren van inkoopaanvragen."
#. module: profile_manufacturing
#: help:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
@@ -96,16 +109,20 @@ msgid ""
"work order/operation. You will be able to planify, analyse the cost, check "
"times, ... on all operations of each manufacturing order"
msgstr ""
+"Deze module stelt u in staat om niet alleen de productie order te beheren, "
+"maar ook de operaties. U zult in staat zijn om te plannen, haar kosten te "
+"analyseren, tijden te controleren, ... over alle operaties van elke "
+"productieorder."
#. module: profile_manufacturing
#: field:profile.manufacturing.config.install_modules_wizard,board_document:0
msgid "Document Management"
-msgstr ""
+msgstr "Documentbeheer"
#. module: profile_manufacturing
#: field:profile.manufacturing.config.install_modules_wizard,portal:0
msgid "Portal"
-msgstr ""
+msgstr "Portaal"
#. module: profile_manufacturing
#: view:profile.manufacturing.config.install_modules_wizard:0
@@ -118,6 +135,8 @@ msgid ""
"Allow to manage product repairs. Handle the guarantee limit date and the "
"invoicing of products and services."
msgstr ""
+"Deze module stelt u in staat om productreparaties te beheren. Beheer "
+"garantietermeinen en de facturatie van producten en services."
#. module: profile_manufacturing
#: constraint:ir.ui.view:0
@@ -131,21 +150,27 @@ msgid ""
"manufacturing profile you selected. You will be able to install them based "
"on our requirements."
msgstr ""
+"Installeer meer modules. Enkele modules worden voorgesteld in "
+"overeenstemming met dit productieprofiel dat u heeft geselecteerd. U zult in "
+"staat om deze modules te installeren waarbij OpenERP rekening houd met de "
+"benodigde afhankelijkheden."
#. module: profile_manufacturing
#: help:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
msgid "This module allows you to add sub poducts in mrp bom."
msgstr ""
+"Deze module stelt u in staat om subproducten toe te voegen in de BOM (Bill "
+"of Materials)"
#. module: profile_manufacturing
#: model:ir.module.module,shortdesc:profile_manufacturing.module_meta_information
msgid "Manufacturing industry profile"
-msgstr ""
+msgstr "Productie industrie profiel"
#. module: profile_manufacturing
#: model:ir.model,name:profile_manufacturing.model_profile_manufacturing_config_install_modules_wizard
msgid "profile.manufacturing.config.install_modules_wizard"
-msgstr ""
+msgstr "profile.manufacturing.config.install_modules_wizard"
#. module: profile_manufacturing
#: help:profile.manufacturing.config.install_modules_wizard,sale_crm:0
@@ -154,6 +179,9 @@ msgid ""
"opportunities tracking, shared calendar, jobs tracking, bug tracker, and so "
"on."
msgstr ""
+"Deze module installeert de Customer Relation Management (CRM) uitbreidingen "
+"als: volgen van leads en kansen, gedeelde agenda's, HRM werving- & "
+"selectieproces, foutenrapportbeheer, enz."
#. module: profile_manufacturing
#: view:profile.manufacturing.config.install_modules_wizard:0
@@ -163,7 +191,7 @@ msgstr "Installeren"
#. module: profile_manufacturing
#: field:profile.manufacturing.config.install_modules_wizard,sale_crm:0
msgid "CRM and Calendars"
-msgstr ""
+msgstr "CRM en calenders"
#. module: profile_manufacturing
#: field:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
@@ -173,7 +201,7 @@ msgstr "Reparatie"
#. module: profile_manufacturing
#: help:profile.manufacturing.config.install_modules_wizard,sale_margin:0
msgid "Display margins on the sale order form."
-msgstr ""
+msgstr "Toont marges op het verkooporderformulier."
#. module: profile_manufacturing
#: help:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
@@ -183,16 +211,20 @@ msgid ""
"a perfect ergonomy with touchscreen materials and payment processing "
"hardware."
msgstr ""
+"Deze module stelt u in staat om een kassa systeem (POS) te beheren. Het bied "
+"een basis formulier voor kassa operaties. Selecteert u ook onze "
+"gebruikersinterface kassa systeem voor een uitstekende ergonomy met "
+"touchscreen schermen en betaalautomaten hardware."
#. module: profile_manufacturing
#: field:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
msgid "Mrp Sub Product"
-msgstr ""
+msgstr "Mrp sub-product"
#. module: profile_manufacturing
#: view:profile.manufacturing.config.install_modules_wizard:0
msgid "Sales Management"
-msgstr ""
+msgstr "Verkoopbeheer"
#. module: profile_manufacturing
#: field:profile.manufacturing.config.install_modules_wizard,warning:0
@@ -213,6 +245,11 @@ msgid ""
"managing a manufacturing chain, a quality control location, product that you "
"rent, etc."
msgstr ""
+"Stelt u in staat om geavanceerde logistiek te beheren met diverse locaties "
+"en magazijnen. U kunt per product definiëren: standaard locaties voor "
+"verschillende operaties, etc. Deze module wordt vaak gebruikt voor "
+"lokalisatie van producten, beheren van en productieketen, kwaliteitscontrole "
+"lokaties, bij verhuur van producten, enz."
#. module: profile_manufacturing
#: view:profile.manufacturing.config.install_modules_wizard:0
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 86f10e46b97..196b70eceb1 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -30,7 +30,7 @@
-
+
@@ -49,7 +49,7 @@
-
@@ -110,18 +110,22 @@
-
+
-
+
-
+
+
+
+
+
@@ -152,7 +156,6 @@
form
[]
- {"search_default_open":1,"search_default_member":1}
@@ -403,25 +406,25 @@
-
+
-
+
-
+
-
-
+
+
@@ -440,8 +443,8 @@
tree,form,calendar,gantt,graph
- {"search_default_current":1,"search_default_my_task":1}
+
@@ -535,25 +538,25 @@
- res.users.project.form1
- res.users
- form
-
-
-
-
-
-
-
+ res.users.project.form1
+ res.users
+ form
+
+
+
+
+
+
+
- view.users.form.project.modif.inherited1
- res.users
-
- form
-
-
+ view.users.form.project.modif.inherited1
+ res.users
+
+ form
+
+
@@ -603,12 +606,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/addons/project/report/__init__.py b/addons/project/report/__init__.py
index 3c104dc54ec..295b8c9674d 100644
--- a/addons/project/report/__init__.py
+++ b/addons/project/report/__init__.py
@@ -19,5 +19,6 @@
#
##############################################################################
import project_report
+
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project/report/project_report.py b/addons/project/report/project_report.py
index 5c28d106c22..e4cd21f0b48 100644
--- a/addons/project/report/project_report.py
+++ b/addons/project/report/project_report.py
@@ -27,25 +27,42 @@ class report_project_task_user(osv.osv):
_description = "Tasks by user and project"
_auto = False
_columns = {
- 'name': fields.char('Year',size=64,required=False, readonly=True),
+ 'name': fields.char('Task Summary', size=128, readonly=True),
+ 'day': fields.char('Day', size=128, readonly=True),
+ 'year': fields.char('Year',size=64,required=False, readonly=True),
'user_id':fields.many2one('res.users', 'User', readonly=True),
- 'date_start': fields.datetime('Starting Date'),
- 'date_end': fields.datetime('Ending Date'),
- 'date_deadline': fields.date('Deadline'),
+ 'date_start': fields.datetime('Starting Date',readonly=True),
+ 'no_of_days': fields.integer('#Days', size=128, readonly=True),
+ 'description': fields.text('Description',readonly=True),
+ 'date_end': fields.datetime('Ending Date',readonly=True),
+ 'date_deadline': fields.date('Deadline',readonly=True),
'project_id':fields.many2one('project.project', 'Project', readonly=True),
'hours_planned': fields.float('Planned Hours', readonly=True),
'hours_effective': fields.float('Effective Hours', readonly=True),
'hours_delay': fields.float('Avg. Plan.-Eff.', readonly=True),
- 'closing_days': fields.char('Avg Closing Delay', size=64, readonly=True),
+# 'closing_days': fields.char('Avg Closing Delay', size=64, readonly=True),
+ 'closing_days': fields.float('Avg Closing Delay', digits=(16,2), readonly=True, group_operator="avg",
+ help="Number of Days to close the task"),
+
'nbr': fields.integer('#Number of tasks', readonly=True),
+ 'priority' : fields.selection([('4','Very Low'),
+ ('3','Low'),
+ ('2','Medium'),
+ ('1','Urgent'),
+ ('0','Very urgent')],
+ 'Importance',readonly=True),
'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
- 'state': fields.selection([('draft', 'Draft'),
+ 'state': fields.selection([
+ ('draft', 'Draft'),
('open', 'In Progress'),
('pending', 'Pending'),
('cancelled', 'Cancelled'),
('done', 'Done')],
'State', readonly=True),
+ 'company_id': fields.many2one('res.company', 'Company',readonly=True),
+ 'partner_id': fields.many2one('res.partner', 'Partner',readonly=True),
+ 'type': fields.many2one('project.task.type', 'Stage',readonly=True),
}
_order = 'name desc, project_id'
@@ -55,17 +72,24 @@ class report_project_task_user(osv.osv):
create or replace view report_project_task_user as (
select
min(t.id) as id,
- to_char(date_start, 'YYYY') as name,
+ to_char(date_start, 'YYYY') as year,
to_char(date_start, 'MM') as month,
+ to_char(date_start, 'YYYY-MM-DD') as day,
count(distinct t.id) as nbr,
date_trunc('day',t.date_start) as date_start,
date_trunc('day',t.date_end) as date_end,
- date_trunc('day',t.date_deadline) as date_deadline,
+ to_date(to_char(t.date_deadline, 'dd-MM-YYYY'),'dd-MM-YYYY') as date_deadline,
+ sum(cast(to_char(date_trunc('day',t.date_end) - date_trunc('day',t.date_start),'DD') as int)) as no_of_days,
t.user_id,
t.project_id,
t.state,
+ t.priority,
+ t.name,
+ t.company_id,
+ t.partner_id,
+ t.type,
sum(planned_hours) as hours_planned,
- to_char(avg(date_end::abstime-t.create_date::timestamp), 'DD"d" HH24:MI:SS') as closing_days,
+ avg(extract('epoch' from (t.date_end-t.create_date)))/(3600*24) as closing_days,
sum(w.hours) as hours_effective,
((sum(planned_hours)-sum(w.hours))/count(distinct t.id))::decimal(16,2) as hours_delay
from project_task t
@@ -73,12 +97,119 @@ class report_project_task_user(osv.osv):
group by
to_char(date_start, 'YYYY'),
to_char(date_start, 'MM'),
- t.user_id,t.state,t.date_end,
- t.date_deadline,t.date_start,
- t.project_id
+ t.priority,
+ t.user_id,
+ t.state,
+ date_trunc('day',t.date_end),
+ to_date(to_char(t.date_deadline, 'dd-MM-YYYY'),'dd-MM-YYYY'),
+ date_trunc('day',t.date_start),
+ t.company_id,
+ t.partner_id,
+ t.type,
+ t.name,
+ t.project_id,
+ t.date_start
)
""")
report_project_task_user()
+#This class is generated for project deshboard purpose
+class project_vs_remaining_hours(osv.osv):
+ _name = "project.vs.remaining.hours"
+ _description = " Project vs Remaining hours"
+ _auto = False
+ _columns = {
+ 'project': fields.char('Project', size=128, required=True),
+ 'remaining_hours': fields.float('Remaining Hours', readonly=True),
+ 'state': fields.selection([('draft','Draft'),('open','Open'), ('pending','Pending'),('cancelled', 'Cancelled'),('close','Close'),('template', 'Template')], 'State', required=True,readonly=True)
+ }
+ _order = 'project desc'
+ def init(self, cr):
+ tools.sql.drop_view_if_exists(cr, 'project_vs_remaining_hours')
+ cr.execute("""
+ create or replace view project_vs_remaining_hours as (
+ select
+ min(pt.id) as id,
+ aaa.user_id as uid,
+ aaa.name as project,
+ aaa.state,
+ sum(pt.remaining_hours) as remaining_hours
+ from project_project as pp,
+ account_analytic_account as aaa,
+ project_task as pt
+ where aaa.id=pp.category_id and pt.project_id=pp.id and pp.category_id=aaa.id
+ group by aaa.user_id,aaa.state,aaa.name
+ UNION All
+ select
+ min(pt.id) as id,
+ pur.uid as uid,
+ aaa.name as project,
+ aaa.state,
+ sum(pt.remaining_hours) as remaining_hours
+ from project_project as pp,
+ project_user_rel as pur,
+ account_analytic_account as aaa,
+ project_task as pt
+ where pur.project_id=pp.id and pt.project_id=pp.id and pp.category_id=aaa.id
+ group by pur.uid,aaa.state,aaa.name
+ )
+ """)
+project_vs_remaining_hours()
+
+class task_by_days(osv.osv):
+ _name = "task.by.days"
+ _description = "Task By Days"
+ _auto = False
+ _columns = {
+ 'day': fields.char('Day', size=128, required=True),
+ 'state': fields.selection([('draft', 'Draft'),('open', 'In Progress'),('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', readonly=True, required=True),
+ 'total_task': fields.float('Total tasks', readonly=True),
+ 'project_id':fields.many2one('project.project','Project')
+ }
+ _order = 'day desc'
+ def init(self, cr):
+ tools.sql.drop_view_if_exists(cr, 'task_by_days')
+ cr.execute("""
+ create or replace view task_by_days as (
+ select
+ min(pt.id) as id,
+ to_char(pt.create_date, 'YYYY-MM-DD') as day,
+ count(*) as total_task,
+ pt.state as state,
+ pt.project_id
+ from
+ project_task as pt
+ group by
+ to_char(pt.create_date, 'YYYY-MM-DD'),pt.state,pt.project_id
+ )
+ """)
+task_by_days()
+
+class task_by_days_vs_planned_hours(osv.osv):
+ _name = "task.by.days.vs.planned.hours"
+ _description = "Task By Days vs Planned Hours"
+ _auto = False
+ _columns = {
+ 'day': fields.char('Day', size=128, required=True),
+ 'planned_hour': fields.float('Planned Hours', readonly=True),
+ 'project_id':fields.many2one('project.project','Project')
+ }
+ _order = 'day desc'
+ def init(self, cr):
+ tools.sql.drop_view_if_exists(cr, 'task_by_days_vs_planned_hours')
+ cr.execute("""
+ create or replace view task_by_days_vs_planned_hours as (
+ select
+ min(pt.id) as id,
+ to_char(pt.create_date, 'YYYY-MM-DD') as day,
+ sum(planned_hours) as planned_hour,
+ pt.project_id
+ from
+ project_task as pt
+ group by
+ to_char(pt.create_date, 'YYYY-MM-DD'),pt.project_id
+ )
+ """)
+task_by_days_vs_planned_hours()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index 09a4374b156..9ee400e6472 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -9,51 +9,128 @@
tree
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+ report.project.task.user.graph
+ report.project.task.user
+ graph
+
+
+
+
+
+
+
+
+
report.project.task.user.search
report.project.task.user
search
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
-
+
+
-
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -63,11 +140,117 @@
Tasks
report.project.task.user
form
- tree
- {"search_default_my_task":1}
+ tree,graph
+ {'search_default_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}
+
+
+
+ project.vs.remaining.hour.tree
+ project.vs.remaining.hours
+ tree
+
+
+
+
+
+
+
+
+
+
+ project.vs.remaining.hour.graph
+ project.vs.remaining.hours
+ graph
+
+
+
+
+
+
+
+
+
+
+ Project and remaining hours
+ project.vs.remaining.hours
+ form
+ graph,tree
+ [('uid','=',uid)]
+
+
+
+
+ task.by.days.tree
+ task.by.days
+ tree
+
+
+
+
+
+
+
+
+
+
+ task.by.days.graph
+ task.by.days
+ graph
+
+
+
+
+
+
+
+
+
+
+
+ Task By Days
+ task.by.days
+ form
+ graph,tree
+ [('day','<=',time.strftime('%Y-%m-%d')),('day','>=', time.strftime('%Y-%m-%d', time.localtime(time.time()-(15*24*3600))))]
+
+
+
+
+
+ task.by.days.vs.planned.hours.tree
+ task.by.days.vs.planned.hours
+ tree
+
+
+
+
+
+
+
+
+
+ task.by.days.vs.planned.hours.graph
+ task.by.days.vs.planned.hours
+ graph
+
+
+
+
+
+
+
+
+
+
+ Task By Days vs Planned Hours
+ task.by.days.vs.planned.hours
+ form
+ graph,tree
+
+
diff --git a/addons/project/security/ir.model.access.csv b/addons/project/security/ir.model.access.csv
index abedc99cfd6..f31c6f0401f 100644
--- a/addons/project/security/ir.model.access.csv
+++ b/addons/project/security/ir.model.access.csv
@@ -14,3 +14,6 @@
"access_project_message","project.message","model_project_message","project.group_project_user",1,0,0,0
"access_project_installer","project.installer","model_project_installer","project.group_project_user",1,0,0,0
"access_report_project_task_user","report.project.task.user","model_report_project_task_user","project.group_project_manager",1,0,0,0
+"access_project_vs_remaining_hours","project.vs.remaining.hours","model_project_vs_remaining_hours","project.group_project_user",1,1,1,1
+"access_task_by_days_vs_planned_hours","task.by.days.vs.planned.hour","model_task_by_days_vs_planned_hours","project.group_project_user",1,1,1,1
+"access_task_by_days","task.by.days","model_task_by_days","project.group_project_user",1,1,1,1
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 3f35913ae75..74e1b5045bf 100755
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -84,7 +84,7 @@ class project_issue(osv.osv):
resource_id = False
if issue.user_id:
resource_ids = res_obj.search(cr, uid, [('user_id','=',issue.user_id.id)])
- resource_id = len(resource_ids) or resource_ids[0]
+ resource_id = len(resource_ids) and resource_ids[0] or False
duration = float(ans.days)
if issue.section_id.resource_calendar_id:
diff --git a/addons/project_issue/report/project_issue_report.py b/addons/project_issue/report/project_issue_report.py
index ef1e002ae78..775e4b933f0 100755
--- a/addons/project_issue/report/project_issue_report.py
+++ b/addons/project_issue/report/project_issue_report.py
@@ -7,15 +7,20 @@ class project_issue_report(osv.osv):
_auto = False
_inherit = "crm.case.report"
_columns = {
- 'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'project.issue.report')]"),
- 'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('object_id.model', '=', 'project.issue.report')]"),
- 'nbr': fields.integer('# of Issues', reaadonly=True),
- 'delay_close': fields.char('Delay to close', size=20, readonly=True),
+ 'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'project.issue')]"),
+ 'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('object_id.model', '=', 'project.issue')]"),
+ 'nbr': fields.integer('# of Issues', readonly=True),
+ 'delay_close': fields.float('Avg Closing Delay', digits=(16,2), readonly=True, group_operator="avg",
+ help="Number of Days to close the project issue"),
'company_id' : fields.many2one('res.company', 'Company'),
'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
- 'project_id':fields.many2one('project.project', 'Project'),
- 'type_id': fields.many2one('crm.case.resource.type', 'Bug Type', domain="[('object_id.model', '=', 'project.issue')]"),
+ 'project_id':fields.many2one('project.project', 'Project',readonly=True),
+ 'type_id': fields.many2one('crm.case.resource.type', 'Type', domain="[('object_id.model', '=', 'project.issue')]"),
'date_closed': fields.datetime('Close Date', readonly=True),
+ 'assigned_to' : fields.many2one('res.users', 'Assigned to',readonly=True),
+ 'partner_id': fields.many2one('res.partner','Partner',domain="[('object_id.model', '=', 'project.issue')]"),
+ 'canal_id': fields.many2one('res.partner.canal', 'Channel',readonly=True),
+ 'task_id': fields.many2one('project.task', 'Task',domain="[('object_id.model', '=', 'project.issue')]" )
}
def init(self, cr):
tools.drop_view_if_exists(cr, 'project_issue_report')
@@ -25,6 +30,7 @@ class project_issue_report(osv.osv):
min(c.id) as id,
to_char(c.create_date, 'YYYY') as name,
to_char(c.create_date, 'MM') as month,
+ to_char(c.create_date, 'YYYY-MM-DD') as day,
c.state,
c.user_id,
c.section_id,
@@ -35,18 +41,41 @@ class project_issue_report(osv.osv):
c.priority as priority,
c.project_id as project_id,
c.type_id as type_id,
- count(*) as nbr,
- to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close
+ count(*) as nbr,
+ c.assigned_to,
+ c.partner_id,
+ c.canal_id,
+ c.task_id,
+ date_trunc('day',c.create_date) as create_date,
+ avg(extract('epoch' from (c.date_closed-c.create_date)))/(3600*24) as delay_close
from
project_issue c
left join
res_users u on (c.id = u.id)
- group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), c.state, c.user_id,c.section_id,c.categ_id,c.stage_id
- ,c.date_closed,u.company_id,c.priority,c.project_id,c.type_id
+ group by
+ to_char(c.create_date, 'YYYY'),
+ to_char(c.create_date, 'MM'),
+ to_char(c.create_date, 'YYYY-MM-DD'),
+ c.state,
+ c.user_id,
+ c.section_id,
+ c.categ_id,
+ c.stage_id,
+ c.date_closed,
+ u.company_id,
+ c.priority,
+ c.project_id,
+ c.type_id,
+ date_trunc('day',c.create_date),
+ c.assigned_to,
+ c.partner_id,
+ c.canal_id,
+ c.task_id
)""")
project_issue_report()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index 72d665cdff0..24290530be7 100755
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -7,23 +7,28 @@
project.issue.report
tree
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
+
+
+
+
-
+
+
+
+
+
@@ -45,39 +50,34 @@
search
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -85,8 +85,15 @@
-
-
+
+
+
+
+
+
+
+
+
@@ -97,6 +104,7 @@
project.issue.report
form
graph,tree
+ {"search_default_This Month":1,"search_default_User":1,'group_by_no_leaf':1,'group_by':[]}
@@ -117,5 +125,7 @@
+
+
-
+
\ No newline at end of file
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 0be0f88a576..ae06ebb3b71 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -196,7 +196,7 @@
-
+
@@ -205,7 +205,7 @@
-
+
@@ -225,7 +225,6 @@
project.phase
form
tree,form,calendar,gantt
- {"search_default_current":1,"search_default_my_phase":1}
diff --git a/addons/project_timesheet/report/task_report_view.xml b/addons/project_timesheet/report/task_report_view.xml
index 3b10af43026..e44e399b292 100644
--- a/addons/project_timesheet/report/task_report_view.xml
+++ b/addons/project_timesheet/report/task_report_view.xml
@@ -71,7 +71,7 @@
search
-
+
@@ -81,7 +81,7 @@
-
+
@@ -102,7 +102,7 @@
domain="[('priority','=','4')]"/>
-
+
@@ -124,7 +124,6 @@
form
tree,graph
[]
- {"search_default_my_task":1}
@@ -163,7 +162,7 @@
-
+
@@ -175,7 +174,6 @@
report.timesheet.task.user
form
tree
- {"search_default_by_user":1}
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 75f1a4d5e8d..c301116db2a 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -17,12 +17,12 @@
-
-
+ name="Incoming Products" parent="menu_procurement_management_inventory" sequence="10"/>
-
+
@@ -161,13 +161,13 @@
-
+
-
-
+
+
@@ -203,7 +203,7 @@
{'search_default_draft': 1}
tree,form,graph,calendar
-
@@ -247,12 +247,12 @@
-
+
-
+
@@ -290,7 +290,7 @@
name="Product purchases"
res_model="purchase.order.line"
src_model="product.product"/>
-
-
- Purchase Order Lines
- ir.actions.act_window
- purchase.order.line
- tree,form
-
-
-
- tree
-
-
-
-
-
- form
-
-
-
-
- Uninvoiced Purchase Order Lines
+ Lines To Invoices
ir.actions.act_window
purchase.order.line
[('state','in',('confirmed','done')), ('invoiced','=',False)]
@@ -340,8 +321,8 @@
-
-
+
+
diff --git a/addons/purchase/report/purchase_report.py b/addons/purchase/report/purchase_report.py
index f5c0a09b95d..76d018680d2 100644
--- a/addons/purchase/report/purchase_report.py
+++ b/addons/purchase/report/purchase_report.py
@@ -26,13 +26,14 @@
from osv import fields,osv
import tools
-class report_purchase_order(osv.osv):
- _name = "report.purchase.order"
+class purchase_report(osv.osv):
+ _name = "purchase.report"
_description = "Purchases Orders"
_auto = False
_columns = {
'date': fields.date('Date', readonly=True),
'name': fields.char('Year',size=64,required=False, readonly=True),
+ 'day': fields.char('Day', size=128, readonly=True),
'state': fields.selection([
('draft','Quotation'),
('waiting_date','Waiting Schedule'),
@@ -43,54 +44,133 @@ class report_purchase_order(osv.osv):
('done','Done'),
('cancel','Cancel')
], 'Order State', readonly=True),
+ 'invoice_method': fields.selection([
+ ('manual','Manual'),
+ ('order','From Order'),
+ ('picking','From Picking')
+ ],'Invoicing Control', readonly=True),
'product_id':fields.many2one('product.product', 'Product', readonly=True),
'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse', readonly=True),
- 'category_id': fields.many2one('product.category', 'Categories', readonly=True),
- 'partner_id':fields.many2one('res.partner', 'Supplier', readonly=True),
+ 'location_id': fields.many2one('stock.location', 'Destination', readonly=True),
+ 'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position',readonly=True),
+ 'partner_id':fields.many2one('res.partner', 'Partner', readonly=True),
'company_id':fields.many2one('res.company', 'Company', readonly=True),
'user_id':fields.many2one('res.users', 'Responsible', readonly=True),
'quantity': fields.float('# of Products', readonly=True),
'price_total': fields.float('Total Price', readonly=True),
'price_average': fields.float('Average Price', readonly=True),
- 'count': fields.integer('# of Lines', readonly=True),
+ 'nbr': fields.integer('# of Lines', readonly=True),
'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
}
_order = 'name desc,price_total desc'
def init(self, cr):
- tools.sql.drop_view_if_exists(cr, 'report_purchase_order')
+ tools.sql.drop_view_if_exists(cr, 'purchase_report')
cr.execute("""
- create or replace view report_purchase_order as (
+ create or replace view purchase_report as (
select
min(l.id) as id,
s.date_order as date,
to_char(s.date_order, 'YYYY') as name,
to_char(s.date_order, 'MM') as month,
+ to_char(s.date_order, 'YYYY-MM-DD') as day,
s.state,
s.warehouse_id as warehouse_id,
s.partner_id as partner_id,
+ s.fiscal_position,
s.create_uid as user_id,
s.company_id as company_id,
+ s.invoice_method,
l.product_id,
- t.categ_id as category_id,
+ s.location_id as location_id,
sum(l.product_qty*u.factor) as quantity,
- count(*),
+ count(*) as nbr,
sum(l.product_qty*l.price_unit) as price_total,
(sum(l.product_qty*l.price_unit)/sum(l.product_qty*u.factor))::decimal(16,2) as price_average
from purchase_order s
left join purchase_order_line l on (s.id=l.order_id)
- left join product_product p on (p.id=l.product_id)
- left join product_template t on (t.id=p.product_tmpl_id)
left join product_uom u on (u.id=l.product_uom)
where l.product_id is not null
- group by s.company_id,s.create_uid,s.partner_id,
- t.categ_id,l.product_id,s.date_order,
- to_char(s.date_order, 'YYYY'),to_char(s.date_order, 'MM'),s.state,
- s.warehouse_id
+ group by
+ s.company_id,
+ s.create_uid,
+ s.partner_id,
+ s.location_id,
+ l.product_id,
+ s.date_order,
+ to_char(s.date_order, 'YYYY'),
+ to_char(s.date_order, 'MM'),
+ to_char(s.date_order, 'YYYY-MM-DD'),
+ s.state,
+ s.warehouse_id,
+ s.fiscal_position,
+ s.invoice_method
)
""")
-report_purchase_order()
+purchase_report()
+class purchase_order_qty_amount(osv.osv):
+ _name = "purchase.order.qty.amount"
+ _description = "Quantity and amount per month"
+ _auto = False
+ _columns = {
+ 'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
+ ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
+ 'total_qty' : fields.float('Total Qty'),
+ 'total_amount' : fields.float('Total Amount'),
+
+ }
+ def init(self, cr):
+ tools.sql.drop_view_if_exists(cr, 'purchase_order_qty_amount')
+ cr.execute("""
+ create or replace view purchase_order_qty_amount as (
+ select
+ min(id) as id,
+ to_char(create_date, 'MM') as month,
+ sum(product_qty) as total_qty,
+ sum(price_unit*product_qty) as total_amount
+ from
+ purchase_order_line
+ where
+ to_char(create_date,'YYYY') = to_char(current_date,'YYYY')
+ group by
+ to_char(create_date, 'MM')
+
+ )
+ """)
+purchase_order_qty_amount()
+
+class purchase_order_by_user(osv.osv):
+ _name = "purchase.order.by.user"
+ _description = "Purchase Order by user per month"
+ _auto = False
+ _columns = {
+ 'name' : fields.char('User',size=64,required=True),
+ 'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
+ ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
+ 'nbr' : fields.integer('Total Orders'),
+
+ }
+ _order = 'name desc'
+ def init(self, cr):
+ tools.sql.drop_view_if_exists(cr, 'purchase_order_by_user')
+ cr.execute("""
+ create or replace view purchase_order_by_user as (
+ select
+ min(po.id) as id,
+ rs.name as name,
+ count(po.id) as nbr,
+ to_char(po.date_order, 'MM') as month
+ from
+ purchase_order as po,res_users as rs
+ where
+ po.create_uid = rs.id
+ group by
+ rs.name,po.date_order
+
+ )
+ """)
+purchase_order_by_user()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index 7946d99ba37..93918160bd1 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -3,7 +3,7 @@
product.month.graph
- report.purchase.order
+ purchase.report
graph
@@ -15,73 +15,106 @@
- report.purchase.order.tree
- report.purchase.order
+ purchase.order.tree
+ purchase.report
tree
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
report.purchase.order.search
- report.purchase.order
+ purchase.report
search
-
-
-
+
+
+
+
+ string="Quotations"
+ domain="[('state','=','draft')]"/>
+ string="Waiting Schedule"
+ domain="[('state','=','waiting_date')]"/>
+
+
-
+ string="My Purchaes"
+ help = "My Purchaes"
+ domain="[('user_id','=',uid)]" />
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
+
+
-
-
-
+
+
+
-
+
+
@@ -90,15 +123,80 @@
Purchase Orders
- report.purchase.order
+ purchase.report
form
tree,graph
- {"search_default_this_year":1,"search_default_this_month":1,"search_default_purchase":1,"search_default_by_product":1}
+ {'search_default_month':1,'search_default_Responsible':1,'group_by_no_leaf':1,'group_by':[]}
+
+ purchase.order.qty.amount.graph
+ purchase.order.qty.amount
+ graph
+
+
+
+
+
+
+
+
+
+
+ purchase.order.qty.amount.tree
+ purchase.order.qty.amount
+ tree
+
+
+
+
+
+
+
+
+
+
+ Total Qty and Amount by month
+ purchase.order.qty.amount
+ form
+ graph,tree
+
+
+
+ purchase.order.by.user.graph
+ purchase.order.by.user
+ graph
+
+
+
+
+
+
+
+
+
+
+ purchase.order.by.user.tree
+ purchase.order.by.user
+ tree
+
+
+
+
+
+
+
+
+
+
+ Total Orders by User per month
+ purchase.order.by.user
+ form
+ graph,tree
+
diff --git a/addons/purchase/security/ir.model.access.csv b/addons/purchase/security/ir.model.access.csv
index e1eb2cdf199..7d7b78d0cdb 100644
--- a/addons/purchase/security/ir.model.access.csv
+++ b/addons/purchase/security/ir.model.access.csv
@@ -8,4 +8,4 @@
"access_purchase_order_stock_worker","purchase.order stock_worker","model_purchase_order","stock.group_stock_user",1,0,0,0
"access_purchase_order_line_stock_worker","purchase.order.line stock_worker","model_purchase_order_line","stock.group_stock_user",1,0,0,0
"access_account_tax_purchase_user","account.tax purchase_user","account.model_account_tax","purchase.group_purchase_user",1,0,0,0
-"access_report_purchase_order","report.purchase.order","model_report_purchase_order","purchase.group_purchase_manager",1,0,0,0
+"access_report_purchase_order","purchase.report","model_purchase_report","purchase.group_purchase_manager",1,0,0,0
diff --git a/addons/purchase/wizard/purchase_installer.xml b/addons/purchase/wizard/purchase_installer.xml
index efa8ec19887..77bbef10453 100644
--- a/addons/purchase/wizard/purchase_installer.xml
+++ b/addons/purchase/wizard/purchase_installer.xml
@@ -8,16 +8,21 @@
-
-
- This module allows you to manage your Purchase Requisition.
-
-
+
+
+
+ Configure Your Purchase System
+
+
+ After having installed the core purchase application, you can extend it with more modules on needs of your organization
+
+
-
+
diff --git a/addons/purchase_requisition/purchase_requisition.py b/addons/purchase_requisition/purchase_requisition.py
index a1e295b1c58..8e4b4bc194c 100644
--- a/addons/purchase_requisition/purchase_requisition.py
+++ b/addons/purchase_requisition/purchase_requisition.py
@@ -36,46 +36,40 @@ class purchase_requisition(osv.osv):
'user_id': fields.many2one('res.users', 'Responsible'),
'exclusive': fields.selection([('exclusive','Purchase Tender (exclusive)'),('multiple','Multiple Requisitions')],'Requisition Type', help="If the requisition is exclusive, it will cancel all purchase orders when you confirm one of them", required=True),
'description': fields.text('Description'),
- 'company_id': fields.many2one('res.company', 'Company', required=True),
+ 'company_id': fields.many2one('res.company', 'Company', required=True),
'purchase_ids' : fields.one2many('purchase.order','requisition_id','Purchase Orders'),
'line_ids' : fields.one2many('purchase.requisition.line','requisition_id','Products to Purchase'),
- 'state': fields.selection([('draft','Draft'),('open','Open'),('cancel','Cancelled'),('close','Close'),('done','Done')], 'State', required=True)
+ 'state': fields.selection([('draft','Draft'),('in_progress','In Progress'),('cancel','Cancelled'),('done','Done')], 'State', required=True)
}
_defaults = {
'date_start': lambda *args: time.strftime('%Y-%m-%d %H:%M:%S'),
- 'state': lambda *args: 'open',
+ 'state': lambda *args: 'draft',
'exclusive': lambda *args: 'multiple',
'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
- 'user_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).id ,
+ 'user_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).id ,
'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'purchase.order.requisition'),
}
- def tender_close(self, cr, uid, ids, context={}):
- self.write(cr, uid, ids, {'state': 'done', 'date_end': time.strftime('%Y-%m-%d %H:%M:%S')})
- return True
-
- def tender_open(self, cr, uid, ids, context={}):
- self.write(cr, uid, ids, {'state':'open'}, context=context)
- return True
+
def tender_cancel(self, cr, uid, ids, context={}):
purchase_order_obj = self.pool.get('purchase.order')
for purchase in self.browse(cr, uid, ids):
for purchase_id in purchase.purchase_ids:
if str(purchase_id.state) in('draft','wait'):
- purchase_order_obj.action_cancel(cr,uid,[purchase_id.id])
+ purchase_order_obj.action_cancel(cr,uid,[purchase_id.id])
self.write(cr, uid, ids, {'state': 'cancel'})
- return True
- def tender_confirm(self, cr, uid, ids, context={}):
- self.write(cr, uid, ids, {'state':'done','date_end':time.strftime('%Y-%m-%d %H:%M:%S')}, context=context)
- return True
+ return True
+ def tender_in_progress(self, cr, uid, ids, context={}):
+ self.write(cr, uid, ids, {'state':'in_progress'} ,context=context)
+ return True
def tender_reset(self, cr, uid, ids, context={}):
self.write(cr, uid, ids, {'state': 'draft'})
- return True
+ return True
def tender_done(self, cr, uid, ids, context={}):
- self.write(cr, uid, ids, {'state':'done'}, context=context)
- return True
-
-
+ self.write(cr, uid, ids, {'state':'done', 'date_end':time.strftime('%Y-%m-%d %H:%M:%S')}, context=context)
+ return True
+
+
purchase_requisition()
@@ -84,7 +78,7 @@ class purchase_requisition_line(osv.osv):
_description="Purchase Requisition Line"
_rec_name = 'product_id'
_columns = {
- 'product_id': fields.many2one('product.product', 'Product'),
+ 'product_id': fields.many2one('product.product', 'Product' , domain=[('purchase_requisition', '=', True)]),
'product_uom_id': fields.many2one('product.uom', 'Product UoM'),
'product_qty': fields.float('Quantity', digits=(16,2)),
'requisition_id' : fields.many2one('purchase.requisition','Purchase Requisition', ondelete='cascade'),
@@ -93,21 +87,21 @@ class purchase_requisition_line(osv.osv):
}
def onchange_product_id(self, cr, uid, ids, product_id, context={}):
-
+
""" Changes UoM and name if product_id changes.
@param name: Name of the field
@param product_id: Changed product_id
@return: Dictionary of changed values
"""
value = {}
-
+
if product_id:
prod = self.pool.get('product.product').browse(cr, uid, [product_id])[0]
-
+
value = {'product_uom_id': prod.uom_id.id}
-
+
return {'value': value}
- _defaults = {
+ _defaults = {
'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
}
@@ -131,8 +125,8 @@ class purchase_order(osv.osv):
self.pool.get('purchase.requisition').write(cr, uid, [po.requisition_id.id], {'state':'close','date_end':time.strftime('%Y-%m-%d %H:%M:%S')})
return res
-
-
+
+
purchase_order()
@@ -156,10 +150,10 @@ class mrp_procurement(osv.osv):
procurement = self.browse(cr, uid, proc_id)
if procurement.product_id.purchase_requisition:
self.pool.get('purchase.requisition').create(cr, uid, {
- 'name': procurement.name,
+ 'name': sequence_obj.get(cr, uid, 'purchase.order.requisition'),
'origin': procurement.name,
'date_end': procurement.date_planned,
- 'lines_ids': [(0,0,{
+ 'line_ids': [(0,0,{
'product_id': procurement.product_id.id,
'product_uom_id': procurement.product_uom.id,
'product_qty': procurement.product_qty
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index f5165eaa394..5ce49ec3693 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -39,7 +39,7 @@
-
+
@@ -52,11 +52,11 @@
-
+
@@ -73,14 +73,13 @@
-
-
-
-
+
+
+
-
+
@@ -107,42 +106,41 @@
-
-
+
-
+
-
+
-
+
Purchase Requisitions
ir.actions.act_window
purchase.requisition
form
- tree,form
-
+ tree,form
+
-
@@ -159,6 +157,5 @@
-
diff --git a/addons/purchase_requisition/wizard/purchase_requisition_partner.py b/addons/purchase_requisition/wizard/purchase_requisition_partner.py
index b0ba9d0b41d..ea5195936cc 100644
--- a/addons/purchase_requisition/wizard/purchase_requisition_partner.py
+++ b/addons/purchase_requisition/wizard/purchase_requisition_partner.py
@@ -31,7 +31,7 @@ class purchase_requisition_partner(osv.osv_memory):
_name = "purchase.requisition.partner"
_description = "Purchase Requisition Partner"
_columns = {
- 'partner_id': fields.many2one('res.partner', 'Partner', required=True),
+ 'partner_id': fields.many2one('res.partner', 'Partner', required=True,domain=[('supplier', '=', True)]),
'partner_address_id':fields.many2one('res.partner.address', 'Address', required=True),
}
diff --git a/addons/report_purchase/i18n/ko.po b/addons/report_purchase/i18n/ko.po
index 4bdec1193dd..3fc2f47e73f 100644
--- a/addons/report_purchase/i18n/ko.po
+++ b/addons/report_purchase/i18n/ko.po
@@ -14,7 +14,11 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
+"X-Launchpad-Export-Date: 2010-04-07 03:46+0000\n"
+=======
"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
+>>>>>>> MERGE-SOURCE
"X-Generator: Launchpad (build Unknown)\n"
#. module: report_purchase
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index 8617e8a8f4c..4fbcdd1c284 100755
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -10,10 +10,10 @@
search
-
+
-
+
@@ -98,7 +98,6 @@
form
tree,form
- {"search_default_my_resources":1}
diff --git a/addons/sale/report/sale_report.py b/addons/sale/report/sale_report.py
index 3ba814b438f..d1081a4b21f 100644
--- a/addons/sale/report/sale_report.py
+++ b/addons/sale/report/sale_report.py
@@ -34,11 +34,14 @@ class sale_report(osv.osv):
'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
+ 'day': fields.char('Day', size=128, readonly=True),
'product_id':fields.many2one('product.product', 'Product', readonly=True),
'product_qty':fields.float('Qty', readonly=True),
'partner_id':fields.many2one('res.partner', 'Partner', readonly=True),
'shop_id':fields.many2one('sale.shop', 'Shop', readonly=True),
'company_id':fields.many2one('res.company', 'Company', readonly=True),
+ 'payment_term': fields.many2one('account.payment.term', 'Payment Term',readonly=True),
+ 'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position',readonly=True),
'user_id':fields.many2one('res.users', 'Salesman', readonly=True),
'price_total':fields.float('Total Price', readonly=True),
'delay':fields.float('Avg Closing Days', digits=(16,2), readonly=True),
@@ -65,11 +68,14 @@ class sale_report(osv.osv):
s.date_order as date,
to_char(s.date_order, 'YYYY') as year,
to_char(s.date_order, 'MM') as month,
+ to_char(s.date_order, 'YYYY-MM-DD') as day,
l.product_id as product_id,
sum(l.product_uom_qty * u.factor) as product_qty,
s.partner_id as partner_id,
s.user_id as user_id,
s.shop_id as shop_id,
+ s.fiscal_position as fiscal_position,
+ s.payment_term as payment_term,
s.company_id as company_id,
extract(epoch from avg(s.date_confirm-s.create_date))/(24*60*60)::decimal(16,2) as delay,
sum(l.product_uom_qty*l.price_unit) as price_total,
@@ -82,10 +88,139 @@ class sale_report(osv.osv):
sale_order s on (s.id=l.order_id)
left join product_uom u on (u.id=l.product_uom)
group by
- s.date_order, s.partner_id, l.product_id,
- l.product_uom, s.user_id, s.state, s.shop_id,
- s.company_id
+ s.date_order,
+ s.partner_id,
+ l.product_id,
+ l.product_uom,
+ s.user_id,
+ s.state,
+ s.shop_id,
+ s.company_id,
+ s.fiscal_position,
+ s.payment_term
)
""")
sale_report()
+class sale_order_by_clients(osv.osv):
+ _name = "sale.order.by.clients"
+ _description = "Sales order by clients"
+ _auto = False
+ _rec_name = 'partner'
+ _columns = {
+ 'total_orders': fields.integer('Total'),
+ 'partner_id':fields.many2one('res.partner', 'Partner', readonly=True)
+ }
+ _order = 'total_orders desc'
+ def init(self, cr):
+ tools.drop_view_if_exists(cr, 'sale_order_by_clients')
+ cr.execute("""
+ create or replace view sale_order_by_clients as (
+ select
+ min(s.id) as id,
+ count(*) as total_orders,
+ s.partner_id as partner_id
+ from
+ sale_order s
+ where
+ s.state='manual' or s.state='progress'
+ group by
+ s.partner_id
+ )
+ """)
+sale_order_by_clients()
+
+class uninvoiced_lines_per_month(osv.osv):
+ _name = "uninvoiced.lines.per.month"
+ _description = "Uninvoiced lines per month"
+ _auto = False
+ _rec_name = 'month'
+ _columns = {
+ 'number_of_lines': fields.integer('Total Lines', readonly=True),
+ 'year': fields.char('Year', size=10, readonly=True),
+ 'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
+ ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
+ ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
+
+ }
+ _order = 'number_of_lines desc'
+ def init(self, cr):
+ tools.drop_view_if_exists(cr, 'uninvoiced_lines_per_month')
+ cr.execute("""
+ create or replace view uninvoiced_lines_per_month as (
+ select
+ min(s.id) as id,
+ count(*) as number_of_lines,
+ to_char(s.create_date, 'MM') as month,
+ to_char(s.create_date, 'YYYY') as year
+ from
+ sale_order_line s
+ where
+ s.state='draft'
+ group by
+ to_char(s.create_date, 'MM'),to_char(s.create_date, 'YYYY')
+ )
+ """)
+uninvoiced_lines_per_month()
+
+class product_bought_by_sale_order(osv.osv):
+ _name = "product.bought.by.sale.order"
+ _description = "Product bought by sale order"
+ _auto = False
+ _rec_name = 'partner'
+ _columns = {
+ 'total_products': fields.integer('Total Products', readonly=True),
+ 'name': fields.char('Sale order', size=64, readonly=True)
+ }
+ _order = 'total_products desc'
+ def init(self, cr):
+ tools.drop_view_if_exists(cr, 'product_bought_by_sale_order')
+ cr.execute("""
+ create or replace view product_bought_by_sale_order as (
+ select
+ min(s.id) as id,
+ count(*) as total_products,
+ s.name as name
+ from
+ sale_order_line l
+ left join
+ sale_order s on (s.id=l.order_id)
+ where
+ s.state='manual' or s.state='progress'
+ group by
+ s.name
+ )
+ """)
+product_bought_by_sale_order()
+
+class sales_by_regions(osv.osv):
+ _name = "sales.by.regions"
+ _description = "Sales by regions"
+ _auto = False
+ _rec_name = 'name'
+ _columns = {
+ 'total_sales': fields.integer('Total Sales', readonly=True),
+ 'name': fields.char('Country', size=64, readonly=True),
+ }
+ _order = 'total_sales desc'
+ def init(self, cr):
+ tools.drop_view_if_exists(cr, 'sales_by_regions')
+ cr.execute("""
+ create or replace view sales_by_regions as (
+ select
+ min(s.id) as id,
+ rc.name as name,
+ count(s.name) as total_sales
+ from
+ sale_order s,res_partner_address p,res_country rc
+ where
+ s.partner_id=p.id and
+ p.country_id=rc.id and
+ (s.state='manual' or s.state='progress')
+ group by
+ rc.name
+ )
+ """)
+sales_by_regions()
+
+
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index fb0ae387000..72707f6e01d 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -7,20 +7,23 @@
tree
-
-
+
+
+
-
-
-
+
+
+
+
+
@@ -43,42 +46,74 @@
search
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
-
+
+
+
+
@@ -91,12 +126,141 @@
sale.report
form
tree,graph
- {"search_default_this_year":1,"search_default_this_month":1,"search_default_sales":1,"search_default_by_user":1}
+ {'search_default_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}
+
+
+ sale.order.by.clients.tree
+ sale.order.by.clients
+ tree
+
+
+
+
+
+
+
+
+
+ sale.order.by.clients.graph
+ sale.order.by.clients
+ graph
+
+
+
+
+
+
+
+
+
+ Sales Orders
+ sale.order.by.clients
+ form
+ tree,graph
+
+
+
+
+ uninvoiced.lines.per.month.tree
+ uninvoiced.lines.per.month
+ tree
+
+
+
+
+
+
+
+
+
+
+ uninvoiced.lines.per.month.graph
+ uninvoiced.lines.per.month
+ graph
+
+
+
+
+
+
+
+
+
+ Uninvoiced Lines
+ uninvoiced.lines.per.month
+ form
+ tree,graph
+
+
+
+
+ product.bought.by.sale.order.tree
+ product.bought.by.sale.order
+ tree
+
+
+
+
+
+
+
+
+
+ product.bought.by.sale.order.graph
+ product.bought.by.sale.order
+ graph
+
+
+
+
+
+
+
+
+
+ Product bought by sale order
+ product.bought.by.sale.order
+ form
+ tree,graph
+
+
+
+
+ sales.by.regions.tree
+ sales.by.regions
+ tree
+
+
+
+
+
+
+
+
+
+ sales.by.regions.graph
+ sales.by.regions
+ graph
+
+
+
+
+
+
+
+
+
+ Sales by regions
+ sales.by.regions
+ form
+ tree,graph
+
+
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 156ede282d0..0c5a1252d59 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -16,7 +16,7 @@
-
+
@@ -29,7 +29,7 @@
-
+
@@ -111,7 +111,7 @@
-
@@ -259,7 +259,7 @@
-
+
@@ -279,7 +279,6 @@
sale.order
form
tree,form,calendar,graph
- {"search_default_my_sale":1}
@@ -427,7 +426,7 @@
-
+
@@ -442,22 +441,20 @@
search
-
-
-
-
+
diff --git a/addons/scrum/i18n/ko.po b/addons/scrum/i18n/ko.po
index 53022cb34d4..7715e88937c 100644
--- a/addons/scrum/i18n/ko.po
+++ b/addons/scrum/i18n/ko.po
@@ -14,7 +14,11 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
+"X-Launchpad-Export-Date: 2010-04-07 03:46+0000\n"
+=======
"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
+>>>>>>> MERGE-SOURCE
"X-Generator: Launchpad (build Unknown)\n"
#. module: scrum
diff --git a/addons/scrum/scrum_report.xml b/addons/scrum/scrum_report.xml
index 845a677c356..8d95d8bdc37 100644
--- a/addons/scrum/scrum_report.xml
+++ b/addons/scrum/scrum_report.xml
@@ -1,6 +1,6 @@
-
-
+
+
diff --git a/addons/scrum/scrum_view.xml b/addons/scrum/scrum_view.xml
index 8824f9dad62..329a77bc56d 100644
--- a/addons/scrum/scrum_view.xml
+++ b/addons/scrum/scrum_view.xml
@@ -103,7 +103,7 @@
-
- Product Backlogs
scrum.product.backlog
form
- {"search_default_current":1,"search_default_my_features":1,"search_default_project_id":project_id}
-
+
@@ -338,7 +337,7 @@
-
+
@@ -357,7 +356,6 @@
scrum.meeting
form
tree,form
- {"search_default_current":1}
-
+
diff --git a/addons/smtpclient/smtpclient.py b/addons/smtpclient/smtpclient.py
index 3cb6c4854c0..eff5e240dff 100644
--- a/addons/smtpclient/smtpclient.py
+++ b/addons/smtpclient/smtpclient.py
@@ -483,10 +483,6 @@ class smtpclient(osv.osv):
return result
def _send_emails(self, cr, uid, ids, context={}):
- fp = os.popen('ping www.google.com -c 1 -w 5',"r")
- if not fp.read():
- return False
-
queue = self.pool.get('email.smtpclient.queue')
history = self.pool.get('email.smtpclient.history')
queue.write(cr, uid, ids, {'state':'sending'})
diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py
index 86d743c5a6d..d1ab1f2b577 100644
--- a/addons/stock/__openerp__.py
+++ b/addons/stock/__openerp__.py
@@ -52,13 +52,10 @@ Thanks to the double entry management, the inventory controlling is powerful and
"wizard/stock_location_product_view.xml",
"wizard/stock_inventory_line_split_view.xml",
"wizard/stock_change_standard_price_view.xml",
- "wizard/stock_picking_make_view.xml",
"wizard/stock_traceability_view.xml",
- "wizard/stock_picking_make_view.xml",
- "wizard/stock_return_picking_view.xml",
"stock_workflow.xml",
"stock_incoterms.xml",
- "stock_wizard.xml",
+ "stock_wizard.xml",
"stock_view.xml",
"stock_report.xml",
"stock_sequence.xml",
diff --git a/addons/stock/report/report_stock_picking.py b/addons/stock/report/report_stock_picking.py
index 2fe450d60de..7f4ac801399 100644
--- a/addons/stock/report/report_stock_picking.py
+++ b/addons/stock/report/report_stock_picking.py
@@ -26,38 +26,50 @@ class report_stock_picking(osv.osv):
_description = "Stock Picking Report"
_auto = False
_columns = {
- 'name': fields.char('Year',size=64,required=False, readonly=True),
+ 'year': fields.char('Year',size=64,required=False, readonly=True),
'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
+ 'day': fields.char('Day', size=128, readonly=True),
'reference': fields.char('Reference', size=64, select=True),
- 'nbr': fields.integer('# of Orders', readonly=True),
+ 'nbr': fields.integer('# of Lines', readonly=True),
+ 'nbp': fields.integer('# of Picking', readonly=True),
+ 'partner_id':fields.many2one('res.partner', 'Partner', readonly=True),
+ 'product_qty': fields.float('# of Products', readonly=True),
+ 'date': fields.date('Date', readonly=True),
+ 'avg_days_to_deliver': fields.float('Avg Days to Deliver', digits=(16,2), readonly=True, group_operator="avg",
+ help="Number of Avg Days to deliver"),
'origin': fields.char('Origin', size=64),
- 'order_date':fields.date('Order Date'),
'state': fields.selection([('draft', 'Draft'),('auto', 'Waiting'),('confirmed', 'Confirmed'),('assigned', 'Available'),('done', 'Done'),('cancel', 'Cancelled')], 'State'),
'type': fields.selection([('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal'), ('delivery', 'Delivery')], 'Shipping Type', required=True),
- 'address_id': fields.many2one('res.partner.address', 'Partner'),
- 'expected_date': fields.date('Expected Date'),
-
}
def init(self, cr):
tools.drop_view_if_exists(cr, 'report_stock_picking')
cr.execute("""
create or replace view report_stock_picking as (
select
- min(c.id) as id,
- to_char(c.create_date, 'YYYY') as name,
- to_char(c.create_date, 'MM') as month,
- c.name as reference,
- c.origin,
- c.state,
- c.type,
- c.address_id,
- to_date(to_char(c.date, 'MM-dd-YYYY'),'MM-dd-YYYY') as order_date,
- to_date(to_char(c.min_date, 'MM-dd-YYYY'),'MM-dd-YYYY') as expected_date,
- count(*) as nbr
- from
- stock_picking c
- group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'),c.name,c.origin,c.date,c.state,c.type,c.address_id,c.min_date
+ min(sm.id) as id,
+ to_char(sp.create_date, 'YYYY') as year,
+ to_char(sp.create_date, 'MM') as month,
+ to_char(sp.create_date, 'YYYY-MM-DD') as day,
+ sp.address_id as partner_id,
+ to_date(to_char(sp.create_date, 'MM-dd-YYYY'),'MM-dd-YYYY') as date,
+ count(sm.id) as nbr,
+ count(distinct sp.id) as nbp,
+ sum(sm.product_qty) as product_qty,
+ sp.type,
+ sp.name as reference,
+ sp.origin,
+ avg(extract('epoch' from (sp.date_done-sp.create_date)))/(3600*24) as avg_days_to_deliver,
+ sp.state
+ from stock_move as sm
+ left join stock_picking as sp ON (sm.picking_id=sp.id)
+ group by sp.type,
+ sp.create_date,
+ sp.address_id,
+ sp.name,
+ sp.origin,
+ sp.state
+
)""")
report_stock_picking()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/report/report_stock_picking_view.xml b/addons/stock/report/report_stock_picking_view.xml
index f8ce77cd7d0..5d54634d72b 100644
--- a/addons/stock/report/report_stock_picking_view.xml
+++ b/addons/stock/report/report_stock_picking_view.xml
@@ -11,32 +11,22 @@
tree
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
- report.stock.picking.form
- report.stock.picking
- form
-
-
-
-
report.stock.picking.graph
@@ -44,8 +34,10 @@
graph
-
+
+
+
@@ -56,39 +48,34 @@
search
-
-
-
+
+
+
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
-
-
-
+
+
+
+
+
+
+
@@ -99,8 +86,8 @@
form
tree,graph
- {"search_default_this_year":1,"search_default_this_month":1}
+ {'search_default_Partner':1,'search_default_month':1,'group_by_no_leaf':1,'group_by':[]}
diff --git a/addons/stock/report/report_stock_view.xml b/addons/stock/report/report_stock_view.xml
index 1bf4e675dcd..f2606e764b4 100644
--- a/addons/stock/report/report_stock_view.xml
+++ b/addons/stock/report/report_stock_view.xml
@@ -9,9 +9,9 @@
-
-
-
+
+
+
@@ -72,8 +72,8 @@
ir.actions.act_window
stock.report.prodlots
form
- tree,graph
- {'full':'1',"search_default_in_location":1}
+ tree,form
+ {'full':'1'}
diff --git a/addons/stock/security/ir.model.access.csv b/addons/stock/security/ir.model.access.csv
index 5622557e834..91941341ccf 100644
--- a/addons/stock/security/ir.model.access.csv
+++ b/addons/stock/security/ir.model.access.csv
@@ -36,12 +36,13 @@
"access_stock_invoice_onshipping","stock.invoice.onshipping","model_stock_invoice_onshipping","stock.group_stock_user",1,0,0,0
"access_stock_location_product","stock.location.product","model_stock_location_product","stock.group_stock_user",1,0,0,0
"access_report_stock_picking","report.stock.picking","model_report_stock_picking","stock.group_stock_user",1,0,0,0
+"access_stock_delivery","stock.delivery","model_stock_delivery","stock.group_stock_user",1,0,0,0
+
"access_stock_traceability_upstream","stock.traceability.upstream","model_stock_traceability_upstream","stock.group_stock_user",1,0,0,0
"access_stock_traceability_downstream","stock.traceability.downstream","model_stock_traceability_downstream","stock.group_stock_user",1,0,0,0
"access_stock_traceability_lot_upstream","stock.traceability.lot.upstream","model_stock_traceability_lot_upstream","stock.group_stock_user",1,0,0,0
"access_stock_traceability_lot_downstream","stock.traceability.lot.downstream","model_stock_traceability_lot_downstream","stock.group_stock_user",1,0,0,0
"access_stock_partial_picking",stock.partial.picking","model_stock_partial_picking","stock.group_stock_user",1,0,0,0
"access_stock_partial_move","stock.partial.move","model_stock_partial_move","stock.group_stock_user",1,0,0,0
-"access_stock_picking_make","stock.picking.make","model_stock_picking_make","stock.group_stock_user",1,0,0,0
"access_stock_inventory_merge","stock.inventory.merge","model_stock_inventory_merge","stock.group_stock_user",1,0,0,0
-"access_stock_change_standard_price","stock.change.standard.price","model_stock_change_standard_price","stock.group_stock_user",1,0,0,0
+"access_stock_change_standard_price","stock.change.standard.price","model_stock_change_standard_price","stock.group_stock_user",1,0,0,0
\ No newline at end of file
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 7d8fd5b97c1..d28effc83c0 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -492,6 +492,7 @@ class stock_picking(osv.osv):
'max_date': fields.function(get_min_max_date, fnct_inv=_set_maximum_date, multi="min_max_date",
method=True, store=True, type='datetime', string='Max. Expected Date', select=2),
'move_lines': fields.one2many('stock.move', 'picking_id', 'Entry lines', states={'done': [('readonly', True)], 'cancel': [('readonly', True)]}),
+ 'delivery_line':fields.one2many('stock.delivery', 'picking_id', 'Delivery lines', readonly=True),
'auto_picking': fields.boolean('Auto-Picking'),
'address_id': fields.many2one('res.partner.address', 'Partner', help="Address of partner"),
'invoice_state': fields.selection([
@@ -876,6 +877,7 @@ class stock_picking(osv.osv):
"""
res = {}
move_obj = self.pool.get('stock.move')
+ delivery_obj = self.pool.get('stock.delivery')
product_obj = self.pool.get('product.product')
currency_obj = self.pool.get('res.currency')
users_obj = self.pool.get('res.users')
@@ -1001,6 +1003,14 @@ class stock_picking(osv.osv):
delivered_pack_id = pick.id
delivered_pack = self.browse(cr, uid, delivered_pack_id, context=context)
+ delivery_id = delivery_obj.create(cr, uid, {
+ 'name': delivered_pack.name,
+ 'partner_id': partner_id,
+ 'address_id': address_id,
+ 'date': delivery_date,
+ 'picking_id' : pick.id,
+ 'move_delivered' : [(6,0, map(lambda x:x.id, delivered_pack.move_lines))]
+ }, context=context)
res[pick.id] = {'delivered_picking': delivered_pack.id or False}
return res
@@ -1102,6 +1112,26 @@ class stock_production_lot_revision(osv.osv):
stock_production_lot_revision()
+class stock_delivery(osv.osv):
+
+ """ Tracability of partialdeliveries """
+
+ _name = "stock.delivery"
+ _description = "Delivery"
+ _columns = {
+ 'name': fields.char('Name', size=60, required=True),
+ 'date': fields.datetime('Date', required=True),
+ 'partner_id': fields.many2one('res.partner', 'Partner', required=True),
+ 'address_id': fields.many2one('res.partner.address', 'Address', required=True),
+ 'move_delivered':fields.one2many('stock.move', 'delivered_id', 'Move Delivered'),
+ 'picking_id': fields.many2one('stock.picking', 'Picking list'),
+
+ }
+stock_delivery()
+# ----------------------------------------------------
+# Move
+# ----------------------------------------------------
+
#
# Fields:
# location_dest_id is only used for predicting futur stocks
@@ -1181,6 +1211,7 @@ class stock_move(osv.osv):
'backorder_id': fields.related('picking_id','backorder_id',type='many2one', relation="stock.picking", string="Back Orders"),
'origin': fields.related('picking_id','origin',type='char', size=64, relation="stock.picking", string="Origin"),
'move_stock_return_history': fields.many2many('stock.move', 'stock_move_return_history', 'move_id', 'return_move_id', 'Move Return History',readonly=True),
+ 'delivered_id': fields.many2one('stock.delivery', 'Product delivered'),
'scraped': fields.boolean('Scraped'),
}
_constraints = [
@@ -1339,8 +1370,11 @@ class stock_move(osv.osv):
new_moves = []
for picking, todo in self._chain_compute(cr, uid, moves, context).items():
ptype = self.pool.get('stock.location').picking_type_get(cr, uid, todo[0][0].location_dest_id, todo[0][1][0])
+ pick_name = ''
+ if ptype == 'delivery':
+ pick_name = self.pool.get('ir.sequence').get(cr, uid, 'stock.picking.delivery')
pickid = self.pool.get('stock.picking').create(cr, uid, {
- 'name': picking.name,
+ 'name': pick_name or picking.name,
'origin': str(picking.origin or ''),
'type': ptype,
'note': picking.note,
@@ -1772,6 +1806,7 @@ class stock_move(osv.osv):
"""
res = {}
picking_obj = self.pool.get('stock.picking')
+ delivery_obj = self.pool.get('stock.delivery')
product_obj = self.pool.get('product.product')
currency_obj = self.pool.get('res.currency')
users_obj = self.pool.get('res.users')
@@ -1877,6 +1912,18 @@ class stock_move(osv.osv):
done_move_ids = []
for move in complete:
done_move_ids.append(move.id)
+ if move.picking_id.id not in ref:
+ delivery_id = delivery_obj.create(cr, uid, {
+ 'partner_id': partner_id,
+ 'address_id': address_id,
+ 'date': delivery_date,
+ 'name' : move.picking_id.name,
+ 'picking_id': move.picking_id.id
+ }, context=context)
+ ref[move.picking_id.id] = delivery_id
+ delivery_obj.write(cr, uid, ref[move.picking_id.id], {
+ 'move_delivered' : [(4,move.id)]
+ })
return done_move_ids
stock_move()
@@ -2077,7 +2124,7 @@ class report_products_to_received_planned(osv.osv):
tools.drop_view_if_exists(cr, 'report_products_to_received_planned')
cr.execute("""
create or replace view report_products_to_received_planned as (
- select stock.date, min(stock.id), sum(stock.product_qty) as qty, 0 as planned_qty
+ select stock.date, min(stock.id) as id, sum(stock.product_qty) as qty, 0 as planned_qty
from stock_picking picking
inner join stock_move stock
on picking.id = stock.picking_id and picking.type = 'in'
@@ -2086,7 +2133,7 @@ class report_products_to_received_planned(osv.osv):
union
- select stock.date_planned, min(stock.id), 0 as actual_qty, sum(stock.product_qty) as planned_qty
+ select stock.date_planned, min(stock.id) as id, 0 as actual_qty, sum(stock.product_qty) as planned_qty
from stock_picking picking
inner join stock_move stock
on picking.id = stock.picking_id and picking.type = 'in'
@@ -2111,7 +2158,7 @@ class report_delivery_products_planned(osv.osv):
tools.drop_view_if_exists(cr, 'report_delivery_products_planned')
cr.execute("""
create or replace view report_delivery_products_planned as (
- select stock.date, min(stock.id), sum(stock.product_qty) as qty, 0 as planned_qty
+ select stock.date, min(stock.id) as id, sum(stock.product_qty) as qty, 0 as planned_qty
from stock_picking picking
inner join stock_move stock
on picking.id = stock.picking_id and picking.type = 'out'
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 03fb721959b..ee0dfa9cd13 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -601,18 +601,6 @@
-
-
@@ -763,18 +751,6 @@
-
-
@@ -953,18 +929,6 @@
-
-
@@ -1140,18 +1104,6 @@
-
-
diff --git a/addons/stock/wizard/__init__.py b/addons/stock/wizard/__init__.py
index 9ce9e7036de..8fac3041fb3 100644
--- a/addons/stock/wizard/__init__.py
+++ b/addons/stock/wizard/__init__.py
@@ -23,9 +23,7 @@ import stock_traceability
import stock_move
import stock_partial_picking
import stock_partial_move
-import stock_picking_make
import wizard_replacement
-import stock_return_picking
import wizard_ups
import stock_inventory_merge
import stock_inventory_set_stock_zero
diff --git a/addons/stock/wizard/stock_location_product.py b/addons/stock/wizard/stock_location_product.py
index d3ee334bac0..b41809b67bd 100755
--- a/addons/stock/wizard/stock_location_product.py
+++ b/addons/stock/wizard/stock_location_product.py
@@ -25,35 +25,34 @@ class stock_location_product(osv.osv_memory):
_name = "stock.location.product"
_description = "Products by Location"
_columns = {
- 'from_date': fields.datetime('From'),
- 'to_date': fields.datetime('To'),
+ 'from_date': fields.datetime('From'),
+ 'to_date': fields.datetime('To'),
}
def action_open_window(self, cr, uid, ids, context):
"""
- To open location wise product information specific to given duration
-
- @param self: The object pointer.
- @param cr: A database cursor
- @param uid: ID of the user currently logged in
- @param ids: the ID or list of IDs if we want more than one
- @param context: A standard dictionary
-
- @return: invoice type
+ To open location wise product information specific to given duration
- """
+ @param self: The object pointer.
+ @param cr: A database cursor
+ @param uid: ID of the user currently logged in
+ @param ids: the ID or list of IDs if we want more than one
+ @param context: A standard dictionary
+
+ @return: invoice type
+ """
mod_obj = self.pool.get('ir.model.data')
for location_obj in self.read(cr, uid, ids, ['from_date', 'to_date']):
return {
- 'name': False,
- 'view_type': 'form',
- 'view_mode': 'tree,form',
- 'res_model': 'product.product',
- 'type': 'ir.actions.act_window',
- 'context': {'location': context['active_id'],
- 'from_date': location_obj['from_date'],
- 'to_date': location_obj['to_date']},
- 'domain': [('type', '<>', 'service')],
+ 'name': False,
+ 'view_type': 'form',
+ 'view_mode': 'tree,form',
+ 'res_model': 'product.product',
+ 'type': 'ir.actions.act_window',
+ 'context': {'location': context['active_id'],
+ 'from_date': location_obj['from_date'],
+ 'to_date': location_obj['to_date']},
+ 'domain': [('type', '<>', 'service')],
}
stock_location_product()
diff --git a/addons/stock/wizard/stock_partial_move.py b/addons/stock/wizard/stock_partial_move.py
index 7094be0706f..bf8d1058aa2 100644
--- a/addons/stock/wizard/stock_partial_move.py
+++ b/addons/stock/wizard/stock_partial_move.py
@@ -27,19 +27,22 @@ import pooler
import time
class stock_partial_move(osv.osv_memory):
- _name = "stock.partial.move"
- _description = "Partial Move"
+ _name = "stock.partial.move"
+ _description = "Partial Move"
_columns = {
- 'date': fields.datetime('Date', required=True),
- }
+ 'date': fields.datetime('Date', required=True),
+ 'partner_id': fields.many2one('res.partner',string="Partner", required=True),
+ 'address_id': fields.many2one('res.partner.address', 'Delivery Address', help="Address where goods are to be delivered", required=True),
+
+ }
def view_init(self, cr, uid, fields_list, context=None):
res = super(stock_partial_move, self).view_init(cr, uid, fields_list, context=context)
- move_obj = self.pool.get('stock.move')
+ move_obj = self.pool.get('stock.move')
if not context:
context={}
moveids = []
- for m in move_obj.browse(cr, uid, context.get('active_ids', [])):
+ for m in move_obj.browse(cr, uid, context.get('active_ids', [])):
if m.state in ('done', 'cancel'):
continue
if 'move%s_product_id'%(m.id) not in self._columns:
@@ -54,53 +57,55 @@ class stock_partial_move(osv.osv_memory):
self._columns['move%s_product_price'%(m.id)] = fields.float("Price")
if 'move%s_product_currency'%(m.id) not in self._columns:
self._columns['move%s_product_currency'%(m.id)] = fields.many2one('res.currency',string="Currency")
- return res
+ return res
def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False,submenu=False):
- result = super(stock_partial_move, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar,submenu)
+ result = super(stock_partial_move, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar,submenu)
move_obj = self.pool.get('stock.move')
- move_ids = context.get('active_ids', False)
+ move_ids = context.get('active_ids', False)
move_ids = move_obj.search(cr, uid, [('id','in',move_ids)])
_moves_arch_lst = """"""
result['arch'] = _moves_arch_lst
- result['fields'] = _moves_fields
+ result['fields'] = _moves_fields
return result
def default_get(self, cr, uid, fields, context=None):
- """
+ """
To get default values for the object.
-
+
@param self: The object pointer.
@param cr: A database cursor
@param uid: ID of the user currently logged in
- @param fields: List of fields for which we want default values
- @param context: A standard dictionary
-
- @return: A dictionary which of fields with values.
-
- """
+ @param fields: List of fields for which we want default values
+ @param context: A standard dictionary
+
+ @return: A dictionary which of fields with values.
+
+ """
res = super(stock_partial_move, self).default_get(cr, uid, fields, context=context)
- move_obj = self.pool.get('stock.move')
+ move_obj = self.pool.get('stock.move')
if not context:
context={}
moveids = []
if 'date' in fields:
res.update({'date': time.strftime('%Y-%m-%d %H:%M:%S')})
- for m in move_obj.browse(cr, uid, context.get('active_ids', [])):
+ for m in move_obj.browse(cr, uid, context.get('active_ids', [])):
if m.state in ('done', 'cancel'):
continue
if 'move%s_product_id'%(m.id) in fields:
@@ -173,21 +178,23 @@ class stock_partial_move(osv.osv_memory):
currency = False
if hasattr(m.picking_id, 'purchase_id') and m.picking_id.purchase_id:
currency = m.picking_id.purchase_id.pricelist_id.currency_id.id
-
+
if 'move%s_product_price'%(m.id) in fields:
res['move%s_product_price'%(m.id)] = price
if 'move%s_product_currency'%(m.id) in fields:
res['move%s_product_currency'%(m.id)] = currency
- return res
+ return res
- def do_partial(self, cr, uid, ids, context):
- move_obj = self.pool.get('stock.move')
+ def do_partial(self, cr, uid, ids, context):
+ move_obj = self.pool.get('stock.move')
move_ids = context.get('active_ids', False)
partial = self.browse(cr, uid, ids[0], context)
partial_datas = {
- 'delivery_date' : partial.date
+ 'partner_id' : partial.partner_id and partial.partner_id.id or False,
+ 'address_id' : partial.address_id and partial.address_id.id or False,
+ 'delivery_date' : partial.date
}
- for m in move_obj.browse(cr, uid, move_ids):
+ for m in move_obj.browse(cr, uid, move_ids):
if m.state in ('done', 'cancel'):
continue
partial_datas['move%s'%(m.id)] = {
@@ -196,14 +203,15 @@ class stock_partial_move(osv.osv_memory):
'product_uom' : getattr(partial, 'move%s_product_uom'%(m.id)).id
}
- if (m.picking_id.type == 'in') and (m.product_id.cost_method == 'average'):
- partial_datas['move%s'%(m.id)].update({
+ if (m.picking_id.type == 'in') and (m.product_id.cost_method == 'average'):
+ partial_datas['move%s'%(m.id)].update({
'product_price' : getattr(partial, 'move%s_product_price'%(m.id)),
'product_currency': getattr(partial, 'move%s_product_currency'%(m.id)).id
- })
-
+ })
+
res = move_obj.do_partial(cr, uid, move_ids, partial_datas, context=context)
return {}
-
-stock_partial_move()
+
+stock_partial_move()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/wizard/stock_picking_make.py b/addons/stock/wizard/stock_picking_make.py
deleted file mode 100644
index 9d26595f00e..00000000000
--- a/addons/stock/wizard/stock_picking_make.py
+++ /dev/null
@@ -1,80 +0,0 @@
-# -*- 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
-import netsvc
-
-class stock_picking_make(osv.osv_memory):
- _name = 'stock.picking.make'
- _description = "Make Picking"
-
- _columns = {
- 'picking_ids': fields.many2many('stock.picking', 'stock_picking_ids', 'parent_id', 'child_id', 'Pickings'),
- }
-
- def default_get(self, cursor, user, fields, context):
- """
- To get default values for the object.
- @param self: The object pointer.
- @param cr: A database cursor
- @param uid: ID of the user currently logged in
- @param fields: List of fields for which we want default values
- @param context: A standard dictionary
- @return: A dictionary which of fields with values.
- """
- res = super(stock_picking_make, self).default_get(cursor, user, fields, context=context)
- record_ids = context and context.get('active_ids',False) or False
- if record_ids:
- picking_obj = self.pool.get('stock.picking')
- picking_ids = picking_obj.search(cursor, user, [
- ('id', 'in', record_ids),
- ('state', '<>', 'done'),
- ('state', '<>', 'cancel')], context=context)
- res['picking_ids'] = picking_ids
- return res
-
- def make_packing(self, cursor, user, ids, context):
- """
- Make Picking.
- @param self: The object pointer.
- @param cr: A database cursor
- @param uid: ID of the user currently logged in
- @param fields: List of fields for which we want default values
- @param context: A standard dictionary
- @return: A dictionary which of fields with values.
- """
- record_ids = context and context.get('active_ids',False) or False
- wkf_service = netsvc.LocalService('workflow')
- picking_obj = self.pool.get('stock.picking')
- data = self.read(cursor, user, ids[0])
- pick_ids = data['picking_ids']
- picking_obj.force_assign(cursor, user, pick_ids)
- picking_obj.action_move(cursor, user, pick_ids)
- for picking_id in ids:
- wkf_service.trg_validate(user, 'stock.picking', picking_id,
- 'button_done', cursor)
- return {}
-
-stock_picking_make()
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/stock/wizard/stock_picking_make_view.xml b/addons/stock/wizard/stock_picking_make_view.xml
deleted file mode 100644
index fa77042c5d8..00000000000
--- a/addons/stock/wizard/stock_picking_make_view.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
- Make Picking
- stock.picking.make
- form
-
-
-
-
-
-
- Make Picking
- ir.actions.act_window
- stock.picking.make
- form
- form
- new
-
-
-
diff --git a/addons/stock/wizard/stock_return_picking.py b/addons/stock/wizard/stock_return_picking.py
deleted file mode 100644
index b0f15406ddb..00000000000
--- a/addons/stock/wizard/stock_return_picking.py
+++ /dev/null
@@ -1,221 +0,0 @@
-# -*- 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 .
-#
-##############################################################################
-
-import netsvc
-import time
-
-from osv import osv,fields
-from tools.translate import _
-
-class stock_return_picking(osv.osv_memory):
- _name = 'stock.return.picking'
- _description = 'Return Picking'
-
- def default_get(self, cr, uid, fields, context):
- """
- To get default values for the object.
- @param self: The object pointer.
- @param cr: A database cursor
- @param uid: ID of the user currently logged in
- @param fields: List of fields for which we want default values
- @param context: A standard dictionary
- @return: A dictionary which of fields with values.
- """
- res = super(stock_return_picking, self).default_get(cr, uid, fields, context=context)
- record_id = context and context.get('active_id', False) or False
- pick_obj = self.pool.get('stock.picking')
- pick = pick_obj.browse(cr, uid, record_id)
- for m in [line for line in pick.move_lines]:
- res['return%s'%(m.id)] = m.product_qty
- if pick.invoice_state=='invoiced':
- res['invoice_state'] = '2binvoiced'
- else:
- res['invoice_state'] = 'none'
- return res
-
- def view_init(self, cr, uid, fields_list, context=None):
- """
- Creates view dynamically and adding fields at runtime.
- @param self: The object pointer.
- @param cr: A database cursor
- @param uid: ID of the user currently logged in
- @param context: A standard dictionary
- @return: New arch of view with new columns.
- """
- res = super(stock_return_picking, self).view_init(cr, uid, fields_list, context=context)
- record_id = context and context.get('active_id', False) or False
- if record_id:
- pick_obj = self.pool.get('stock.picking')
- try:
- pick = pick_obj.browse(cr, uid, record_id)
- for m in [line for line in pick.move_lines]:
- if 'return%s'%(m.id) not in self._columns:
- self._columns['return%s'%(m.id)] = fields.float(string=m.name, required=True)
- if 'invoice_state' not in self._columns:
- self._columns['invoice_state'] = fields.selection([('2binvoiced', 'To be Invoiced'), ('none', 'None')], string='Invoice State', required=True)
- except Exception, e:
- return res
- return res
-
- def fields_view_get(self, cr, uid, view_id=None, view_type='form',
- context=None, toolbar=False, submenu=False):
- """
- Changes the view dynamically
- @param self: The object pointer.
- @param cr: A database cursor
- @param uid: ID of the user currently logged in
- @param context: A standard dictionary
- @return: New arch of view.
- """
- res = super(stock_return_picking, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
- record_id = context and context.get('active_id', False) or False
- assert record_id,'Active ID not found'
- if record_id:
- pick_obj = self.pool.get('stock.picking')
- pick = pick_obj.browse(cr, uid, record_id)
-
- try:
- if pick.state != 'done':
- raise osv.except_osv(_('Warning !'), _("The Picking is not completed yet!\nYou cannot return picking which is not in 'Done' state!"))
-
- return_history = {}
- for m_line in pick.move_lines:
- return_history[m_line.id] = 0
- for rec in m_line.move_stock_return_history:
- return_history[m_line.id] += rec.product_qty
-
- res['fields'].clear()
- arch_lst=['', '')
- res['arch'] = '\n'.join(arch_lst)
- except Exception,e:
- return res
- return res
-
- def _create_returns(self, cr, uid, ids, context):
- """
- Creates return picking.
- @param self: The object pointer.
- @param cr: A database cursor
- @param uid: ID of the user currently logged in
- @param ids: List of ids selected
- @param context: A standard dictionary
- @return: A dictionary which of fields with values.
- """
- record_id = context and context.get('active_id', False) or False
- move_obj = self.pool.get('stock.move')
- pick_obj = self.pool.get('stock.picking')
- uom_obj = self.pool.get('product.uom')
- wf_service = netsvc.LocalService("workflow")
-
- pick = pick_obj.browse(cr, uid, record_id)
- data = self.read(cr, uid, ids[0])
- new_picking = None
- date_cur = time.strftime('%Y-%m-%d %H:%M:%S')
-
- move_ids = [m.id for m in [line for line in pick.move_lines]]
- set_invoice_state_to_none = True
- for move in move_obj.browse(cr, uid, move_ids):
- if not new_picking:
- if pick.type=='out':
- new_type = 'in'
- elif pick.type=='in':
- new_type = 'out'
- else:
- new_type = 'internal'
- new_picking = pick_obj.copy(cr, uid, pick.id, {'name':'%s (return)' % pick.name,
- 'move_lines':[], 'state':'draft', 'type':new_type,
- 'date':date_cur, 'invoice_state':data['invoice_state'],})
- new_location=move.location_dest_id.id
-
- new_qty = data['return%s' % move.id]
- returned_qty = move.product_qty
-
- for rec in move.move_stock_return_history:
- returned_qty -= rec.product_qty
-
- if returned_qty != new_qty:
- set_invoice_state_to_none = False
-
- new_move=move_obj.copy(cr, uid, move.id, {
- 'product_qty': new_qty,
- 'product_uos_qty': uom_obj._compute_qty(cr, uid, move.product_uom.id,
- new_qty, move.product_uos.id),
- 'picking_id':new_picking, 'state':'draft',
- 'location_id':new_location, 'location_dest_id':move.location_id.id,
- 'date':date_cur, 'date_planned':date_cur,})
- move_obj.write(cr, uid, [move.id], {'move_stock_return_history':[(4,new_move)]})
-
- if set_invoice_state_to_none:
- pick_obj.write(cr, uid, [pick.id], {'invoice_state':'none'})
-
- if new_picking:
- if new_picking:
- wf_service.trg_validate(uid, 'stock.picking', new_picking, 'button_confirm', cr)
- pick_obj.force_assign(cr, uid, [new_picking], context)
- return new_picking
-
- def action_open_window(self, cr, uid, ids, context):
- """
- Opens return picking list.
- @param self: The object pointer.
- @param cr: A database cursor
- @param uid: ID of the user currently logged in
- @param ids: List of ids selected
- @param context: A standard dictionary
- @return: A dictionary which of fields with values.
- """
- res = self._create_returns(cr, uid, ids, context)
- if not res:
- return {}
- return {
- 'domain': "[('id', 'in', ["+str(res)+"])]",
- 'name': 'Picking List',
- 'view_type':'form',
- 'view_mode':'tree,form',
- 'res_model':'stock.picking',
- 'view_id':False,
- 'type':'ir.actions.act_window',
- }
-
-stock_return_picking()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/stock/wizard/stock_return_picking_view.xml b/addons/stock/wizard/stock_return_picking_view.xml
deleted file mode 100644
index 005c3a05b07..00000000000
--- a/addons/stock/wizard/stock_return_picking_view.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
- Return Picking
- ir.actions.act_window
- stock.return.picking
- form
- form
- new
-
-
-
-
diff --git a/addons/stock/wizard/stock_split_move.py b/addons/stock/wizard/stock_split_move.py
new file mode 100644
index 00000000000..0092656f83d
--- /dev/null
+++ b/addons/stock/wizard/stock_split_move.py
@@ -0,0 +1,125 @@
+# -*- 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 osv, fields
+
+class stock_split_move_line(osv.osv_memory):
+ _name = 'stock.move.line.split'
+ _description = "Split Moves"
+
+ def default_get(self, cr, uid, fields, context):
+ """
+ To get default values for the object.
+ @param self: The object pointer.
+ @param cr: A database cursor
+ @param uid: ID of the user currently logged in
+ @param fields: List of fields for which we want default values
+ @param context: A standard dictionary
+ @return: A dictionary which of fields with values.
+ """
+ res = super(stock_split_move_line, self).default_get(cr, uid, fields, context=context)
+ record_id = context and context.get('active_id', False) or False
+ pick_obj = self.pool.get('stock.picking')
+ pick = pick_obj.browse(cr, uid, record_id)
+ for m in [line for line in pick.move_lines]:
+ res['move%s'%(m.id)] = m.product_qty
+ return res
+
+ def view_init(self, cr, uid, fields_list, context=None):
+ """
+ Creates view dynamically and adding fields at runtime.
+ @param self: The object pointer.
+ @param cr: A database cursor
+ @param uid: ID of the user currently logged in
+ @param context: A standard dictionary
+ @return: New arch of view with new columns.
+ """
+ res = super(stock_split_move_line, self).view_init(cr, uid, fields_list, context=context)
+ record_id = context and context.get('active_id', False) or False
+ if record_id:
+ pick_obj = self.pool.get('stock.picking')
+ try:
+ pick = pick_obj.browse(cr, uid, record_id)
+ for m in [line for line in pick.move_lines]:
+ if 'move%s' % m.id not in self._columns:
+ self._columns['move%s' % m.id] = fields.float(string=m.product_id.name)
+ except:
+ return res
+ return res
+
+ def fields_view_get(self, cr, uid, view_id=None, view_type='form',
+ context=None, toolbar=False, submenu=False):
+ """
+ Changes the view dynamically
+ @param self: The object pointer.
+ @param cr: A database cursor
+ @param uid: ID of the user currently logged in
+ @param context: A standard dictionary
+ @return: New arch of view.
+ """
+ res = super(stock_split_move_line, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
+ record_id = context and context.get('active_id', False) or False
+ assert record_id,'Active ID not found'
+ pick_obj = self.pool.get('stock.picking')
+ pick = pick_obj.browse(cr, uid, record_id)
+ arch_lst = ['', '')
+ res['arch'] = '\n'.join(arch_lst)
+ return res
+
+ def split_lines(self, cr, uid, ids, context):
+ """
+ Splits moves in quantity given in the wizard.
+ @param self: The object pointer.
+ @param cr: A database cursor
+ @param uid: ID of the user currently logged in
+ @param ids: List of ids selected
+ @param context: A standard dictionary
+ @return: A dictionary which of fields with values.
+ """
+ move_obj = self.pool.get('stock.move')
+ record_id = context and context.get('active_id', False) or False
+ pick_obj = self.pool.get('stock.picking')
+ pick = pick_obj.browse(cr, uid, record_id)
+ data = self.read(cr, uid, ids[0])
+ move_ids = [m.id for m in [line for line in pick.move_lines]]
+ for move in move_obj.browse(cr, uid, move_ids):
+ quantity = data['move%s' % move.id]
+ if 0 < quantity < move.product_qty:
+ new_qty = move.product_qty - quantity
+ new_uos_qty = new_qty / move.product_qty * move.product_uos_qty
+ new_obj = move_obj.copy(cr, uid, move.id, {'product_qty' : new_qty, 'product_uos_qty': new_uos_qty, 'state':move.state})
+ uos_qty = quantity / move.product_qty * move.product_uos_qty
+ move_obj.write(cr, uid, [move.id], {'product_qty' : quantity, 'product_uos_qty': uos_qty})
+ return {}
+
+stock_split_move_line()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/stock/wizard/stock_split_move_view.xml b/addons/stock/wizard/stock_split_move_view.xml
index 30816750035..de89f83cb32 100644
--- a/addons/stock/wizard/stock_split_move_view.xml
+++ b/addons/stock/wizard/stock_split_move_view.xml
@@ -1,6 +1,17 @@
-
-
-
+
+
+
+
+ Split Moves
+ ir.actions.act_window
+ stock.move.line.split
+ form
+ form
+ new
+
+
+
+
diff --git a/addons/stock_invoice_directly/i18n/ru.po b/addons/stock_invoice_directly/i18n/ru.po
index b0015c39163..6e9c05f8114 100644
--- a/addons/stock_invoice_directly/i18n/ru.po
+++ b/addons/stock_invoice_directly/i18n/ru.po
@@ -7,16 +7,16 @@ 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-04-10 14:08+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-04-25 14:27+0000\n"
+"Last-Translator: Andrey Kulakov \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:20+0000\n"
+"X-Launchpad-Export-Date: 2010-04-26 03:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: stock_invoice_directly
#: model:ir.module.module,shortdesc:stock_invoice_directly.module_meta_information
msgid "Invoice Picking Directly"
-msgstr ""
+msgstr "Напрямую выставляемый счет"
diff --git a/addons/survey/i18n/zh_CN.po b/addons/survey/i18n/zh_CN.po
deleted file mode 100644
index 11deb3583d9..00000000000
--- a/addons/survey/i18n/zh_CN.po
+++ /dev/null
@@ -1,695 +0,0 @@
-# Chinese (Simplified) translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2009-11-26 06:01+0000\n"
-"PO-Revision-Date: 2010-04-08 01:37+0000\n"
-"Last-Translator: Silence \n"
-"Language-Team: Chinese (Simplified) \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:21+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: survey
-#: model:ir.ui.menu,name:survey.menu_survey_form
-msgid "Surveys"
-msgstr "调查"
-
-#. module: survey
-#: model:ir.actions.report.xml,name:survey.survey
-msgid "Survey Analysis Report"
-msgstr "调查分析报告"
-
-#. module: survey
-#: model:ir.actions.act_window,name:survey.act_survey_page_question
-#: model:ir.ui.menu,name:survey.menu_survey_question_form1
-msgid "Survey Questions"
-msgstr "调查问题"
-
-#. module: survey
-#: view:survey:0
-#: view:survey.response:0
-msgid "Set to draft"
-msgstr "设为草稿"
-
-#. module: survey
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "在动作定义使用了无效的模型名称。"
-
-#. module: survey
-#: field:survey.history,date:0
-msgid "Date started"
-msgstr "开始日期"
-
-#. module: survey
-#: field:survey,history:0
-msgid "History Lines"
-msgstr "日志明细"
-
-#. module: survey
-#: wizard_field:wizard.send.invitation,init,mail:0
-msgid "Body"
-msgstr "内容"
-
-#. module: survey
-#: model:ir.actions.act_window,name:survey.action_view_survey_name
-#: model:ir.ui.menu,name:survey.menu_run_survey_form
-msgid "Give Survey Response"
-msgstr "调查回答"
-
-#. module: survey
-#: model:ir.actions.act_window,name:survey.act_survey_question
-msgid "All Questions"
-msgstr "所有问题"
-
-#. module: survey
-#: field:survey,date_open:0
-msgid "Survey Open Date"
-msgstr "调查开展日期"
-
-#. module: survey
-#: model:ir.model,name:survey.model_survey_name_wiz
-msgid "survey.name.wiz"
-msgstr ""
-
-#. module: survey
-#: view:survey:0
-msgid "Users Details"
-msgstr "用户详细信息"
-
-#. module: survey
-#: model:ir.actions.act_window,name:survey.action_view_survey_question_message
-#: model:ir.model,name:survey.model_survey_question
-#: view:survey:0
-#: view:survey.page:0
-#: view:survey.question:0
-msgid "Survey Question"
-msgstr "调查问题"
-
-#. module: survey
-#: help:survey,response_user:0
-msgid "Set to one if you require only one response per user"
-msgstr "如果你只需要每个用户回答，设为1"
-
-#. module: survey
-#: field:survey.page,title:0
-msgid "Page Title"
-msgstr "页面标题"
-
-#. module: survey
-#: model:ir.model,name:survey.model_survey_history
-msgid "Survey History"
-msgstr "调查历史"
-
-#. module: survey
-#: field:survey.response,comment:0
-#: field:survey.response.answer,comment:0
-msgid "Notes"
-msgstr "备注"
-
-#. module: survey
-#: field:survey.question,tot_resp:0
-msgid "Total Response"
-msgstr "回答合计"
-
-#. module: survey
-#: view:survey.question.wiz:0
-msgid "Your Messages"
-msgstr "你的消息"
-
-#. module: survey
-#: selection:survey,state:0
-msgid "Cancelled"
-msgstr "已取消"
-
-#. module: survey
-#: field:survey.question,allow_comment:0
-msgid "Allow Comment Field"
-msgstr "允许注释字段"
-
-#. module: survey
-#: code:addons/survey/survey.py:0
-#, python-format
-msgid "Warning !"
-msgstr "警告！"
-
-#. module: survey
-#: wizard_view:wizard.send.invitation,init:0
-#: wizard_field:wizard.send.invitation,init,send_mail_existing:0
-msgid "Send reminder for existing user"
-msgstr "为现有用户发送提醒"
-
-#. module: survey
-#: model:ir.actions.act_window,name:survey.action_new_survey_question_form
-#: model:ir.ui.menu,name:survey.menu_new_survey_question_form1
-msgid "New Survey Question"
-msgstr "新的调查问题"
-
-#. module: survey
-#: view:survey.response:0
-msgid "Skip"
-msgstr "跳过"
-
-#. module: survey
-#: wizard_field:wizard.send.invitation,init,partner_ids:0
-msgid "Partner"
-msgstr "伙伴"
-
-#. module: survey
-#: wizard_field:wizard.send.invitation,init,mail_subject:0
-#: wizard_field:wizard.send.invitation,init,mail_subject_existing:0
-msgid "Subject"
-msgstr "主题"
-
-#. module: survey
-#: field:survey,max_response_limit:0
-msgid "Maximum Response Limit"
-msgstr ""
-
-#. module: survey
-#: wizard_field:wizard.send.invitation,init,mail_from:0
-msgid "From"
-msgstr "发件人"
-
-#. module: survey
-#: field:survey.response,response_type:0
-msgid "Response Type"
-msgstr ""
-
-#. module: survey
-#: field:survey.name.wiz,transfer:0
-msgid "Page Transfer"
-msgstr ""
-
-#. module: survey
-#: field:survey.answer,question_id:0
-#: field:survey.page,question_ids:0
-#: field:survey.question,question:0
-#: field:survey.response,question_id:0
-msgid "Question"
-msgstr ""
-
-#. module: survey
-#: wizard_button:wizard.send.invitation,init,send:0
-msgid "Send"
-msgstr ""
-
-#. module: survey
-#: field:survey.answer,response:0
-msgid "#Response"
-msgstr ""
-
-#. module: survey
-#: field:survey.response,response_answer_ids:0
-msgid "Response Answer"
-msgstr ""
-
-#. module: survey
-#: rml:survey_analysis_report:0
-msgid "Response Summary"
-msgstr ""
-
-#. module: survey
-#: wizard_view:wizard.send.invitation,init:0
-#: wizard_field:wizard.send.invitation,init,send_mail:0
-msgid "Send mail for new user"
-msgstr ""
-
-#. module: survey
-#: code:addons/survey/survey.py:0
-#, python-format
-msgid "Error !"
-msgstr ""
-
-#. module: survey
-#: rml:survey_analysis_report:0
-msgid "Skipped Question"
-msgstr ""
-
-#. module: survey
-#: wizard_button:wizard.send.invitation,send,end:0
-msgid "_Ok"
-msgstr ""
-
-#. module: survey
-#: selection:survey.response,response_type:0
-msgid "Link"
-msgstr ""
-
-#. module: survey
-#: model:ir.ui.menu,name:survey.menu_survey_config
-msgid "Configuration"
-msgstr ""
-
-#. module: survey
-#: model:ir.model,name:survey.model_survey_question_wiz
-msgid "survey.question.wiz"
-msgstr ""
-
-#. module: survey
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: survey
-#: model:ir.model,name:survey.model_survey_response_answer
-#: view:survey.response.answer:0
-msgid "Survey Response Answer"
-msgstr ""
-
-#. module: survey
-#: rml:survey_analysis_report:0
-msgid "Page :-"
-msgstr ""
-
-#. module: survey
-#: field:survey,response_user:0
-msgid "Maximum Response per User"
-msgstr ""
-
-#. module: survey
-#: rml:survey_analysis_report:0
-msgid "Total Started Survey :-"
-msgstr ""
-
-#. module: survey
-#: view:survey.response:0
-msgid "Comment"
-msgstr ""
-
-#. module: survey
-#: field:survey.response,date_modify:0
-msgid "Modify Date"
-msgstr ""
-
-#. module: survey
-#: rml:survey_analysis_report:0
-msgid "Answered Question"
-msgstr ""
-
-#. module: survey
-#: code:addons/survey/survey.py:0
-#, python-format
-msgid "You can not give response for this survey more than %s times"
-msgstr ""
-
-#. module: survey
-#: selection:survey.response,response_type:0
-msgid "Manually"
-msgstr ""
-
-#. module: survey
-#: model:ir.actions.act_window,name:survey.action_survey_form1
-msgid "All Surveys"
-msgstr ""
-
-#. module: survey
-#: view:survey:0
-#: field:survey,users:0
-msgid "Users"
-msgstr ""
-
-#. module: survey
-#: wizard_view:wizard.send.invitation,init:0
-msgid "Message"
-msgstr ""
-
-#. module: survey
-#: field:survey.name.wiz,page_no:0
-msgid "Page Number"
-msgstr ""
-
-#. module: survey
-#: wizard_field:wizard.send.invitation,send,note:0
-msgid "Log"
-msgstr ""
-
-#. module: survey
-#: model:ir.actions.act_window,name:survey.action_survey_question_form
-msgid "All Survey Questions"
-msgstr ""
-
-#. module: survey
-#: field:survey,date_close:0
-msgid "Survey Close Date"
-msgstr ""
-
-#. module: survey
-#: view:survey.name.wiz:0
-msgid "Start"
-msgstr ""
-
-#. module: survey
-#: selection:survey,state:0
-#: selection:survey.response,state:0
-msgid "Draft"
-msgstr ""
-
-#. module: survey
-#: selection:survey,state:0
-msgid "Closed"
-msgstr ""
-
-#. module: survey
-#: view:survey:0
-#: field:survey.answer,answer:0
-#: view:survey.page:0
-#: view:survey.question:0
-#: field:survey.question,answer_choice_ids:0
-#: field:survey.response.answer,answer_id:0
-msgid "Answer"
-msgstr ""
-
-#. module: survey
-#: model:ir.actions.act_window,name:survey.action_survey_page_form
-msgid "All Survey Pages"
-msgstr ""
-
-#. module: survey
-#: field:survey.name.wiz,store_ans:0
-msgid "Store Answer"
-msgstr ""
-
-#. module: survey
-#: field:survey,state:0
-#: field:survey.response,state:0
-msgid "Status"
-msgstr ""
-
-#. module: survey
-#: model:ir.module.module,shortdesc:survey.module_meta_information
-msgid "Survey Module"
-msgstr ""
-
-#. module: survey
-#: model:ir.module.module,description:survey.module_meta_information
-msgid ""
-"\n"
-" This module is used for surveing. It depends on the answers or reviews "
-"of some questions by different users.\n"
-" A survey may have multiple pages. Each page may contain multiple "
-"questions and each question may have multiple answers.\n"
-" Different users may give different answers of question and according to "
-"that survey is done. \n"
-" Partners are also sent mails with user name and password for the "
-"invitation of the survey\n"
-" "
-msgstr ""
-
-#. module: survey
-#: view:survey:0
-#: view:survey.name.wiz:0
-msgid "Survey Details"
-msgstr ""
-
-#. module: survey
-#: field:survey.question,is_require_answer:0
-msgid "Required Answer"
-msgstr ""
-
-#. module: survey
-#: field:survey.history,user_id:0
-#: field:survey.response,response_id:0
-msgid "User"
-msgstr ""
-
-#. module: survey
-#: field:res.users,survey_id:0
-msgid "Groups"
-msgstr ""
-
-#. module: survey
-#: view:survey:0
-#: view:survey.page:0
-#: view:survey.question:0
-#: field:survey.question,response_ids:0
-#: view:survey.response:0
-#: field:survey.response.answer,response_id:0
-msgid "Response"
-msgstr ""
-
-#. module: survey
-#: model:ir.actions.act_window,name:survey.action_new_survey_form1
-#: model:ir.ui.menu,name:survey.menu_new_survey_form
-msgid "New Survey"
-msgstr ""
-
-#. module: survey
-#: model:ir.ui.menu,name:survey.main_menu_survey
-msgid "Survey Management"
-msgstr ""
-
-#. module: survey
-#: selection:survey.response,state:0
-msgid "Skiped"
-msgstr ""
-
-#. module: survey
-#: model:ir.model,name:survey.model_survey_answer
-#: view:survey.answer:0
-msgid "Survey Answer"
-msgstr ""
-
-#. module: survey
-#: code:addons/survey/wizard/wizard_survey.py:0
-#, python-format
-msgid "Attention!"
-msgstr ""
-
-#. module: survey
-#: model:ir.model,name:survey.model_survey
-#: view:res.users:0
-#: view:survey:0
-#: field:survey.history,survey_id:0
-#: view:survey.name.wiz:0
-#: field:survey.name.wiz,survey_id:0
-#: field:survey.page,survey_id:0
-#: field:survey.question,survey:0
-msgid "Survey"
-msgstr ""
-
-#. module: survey
-#: rml:survey_analysis_report:0
-msgid "Total Completed Survey :-"
-msgstr ""
-
-#. module: survey
-#: view:survey:0
-msgid "History"
-msgstr ""
-
-#. module: survey
-#: view:survey:0
-#: view:survey.answer:0
-#: view:survey.page:0
-#: view:survey.question:0
-msgid "Seq"
-msgstr ""
-
-#. module: survey
-#: field:survey,tot_comp_survey:0
-msgid "Total Completed Survey"
-msgstr ""
-
-#. module: survey
-#: rml:survey_analysis_report:0
-msgid "Response Percentage"
-msgstr ""
-
-#. module: survey
-#: field:survey.question.wiz,name:0
-msgid "Number"
-msgstr ""
-
-#. module: survey
-#: rml:survey_analysis_report:0
-msgid "Survey Title :-"
-msgstr ""
-
-#. module: survey
-#: view:survey.response:0
-msgid "Done"
-msgstr ""
-
-#. module: survey
-#: code:addons/survey/survey.py:0
-#, python-format
-msgid "'\" + que_rec[0]['question'] + \"' This question requires an answer."
-msgstr ""
-
-#. module: survey
-#: view:survey:0
-#: view:survey.name.wiz:0
-#: wizard_button:wizard.send.invitation,init,end:0
-msgid "Cancel"
-msgstr ""
-
-#. module: survey
-#: view:survey:0
-msgid "Close"
-msgstr ""
-
-#. module: survey
-#: view:survey:0
-#: selection:survey,state:0
-msgid "Open"
-msgstr ""
-
-#. module: survey
-#: field:survey,tot_start_survey:0
-msgid "Total Started Survey"
-msgstr ""
-
-#. module: survey
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: survey
-#: model:ir.model,name:survey.model_survey_response
-#: view:survey.response:0
-msgid "Survey Response"
-msgstr ""
-
-#. module: survey
-#: field:survey.answer,average:0
-msgid "#Avg"
-msgstr ""
-
-#. module: survey
-#: field:survey,responsible_id:0
-msgid "Responsible"
-msgstr ""
-
-#. module: survey
-#: selection:survey.response,state:0
-msgid "Answered"
-msgstr ""
-
-#. module: survey
-#: view:survey:0
-msgid "Other"
-msgstr ""
-
-#. module: survey
-#: model:ir.actions.wizard,name:survey.wizard_send_invitation
-#: wizard_view:wizard.send.invitation,init:0
-msgid "Send Invitation"
-msgstr ""
-
-#. module: survey
-#: field:survey,title:0
-msgid "Survey Title"
-msgstr ""
-
-#. module: survey
-#: rml:survey_analysis_report:0
-msgid "%"
-msgstr ""
-
-#. module: survey
-#: view:survey:0
-#: field:survey,note:0
-#: field:survey.name.wiz,note:0
-#: view:survey.page:0
-#: field:survey.page,note:0
-#: view:survey.response:0
-msgid "Description"
-msgstr ""
-
-#. module: survey
-#: view:survey.name.wiz:0
-msgid "Select Survey"
-msgstr ""
-
-#. module: survey
-#: model:ir.actions.act_window,name:survey.action_new_survey_page_form
-#: model:ir.ui.menu,name:survey.menu_new_survey_page_form1
-msgid "New Survey Page"
-msgstr ""
-
-#. module: survey
-#: view:survey:0
-#: view:survey.page:0
-#: field:survey.question,page_id:0
-msgid "Survey Page"
-msgstr ""
-
-#. module: survey
-#: model:ir.actions.act_window,name:survey.act_survey_answer
-msgid "Survey Answers"
-msgstr ""
-
-#. module: survey
-#: view:survey.page:0
-msgid "#Questions"
-msgstr ""
-
-#. module: survey
-#: rml:survey_analysis_report:0
-msgid "Que:"
-msgstr ""
-
-#. module: survey
-#: field:survey,page_ids:0
-msgid "Page"
-msgstr ""
-
-#. module: survey
-#: wizard_view:wizard.send.invitation,send:0
-msgid "User creation"
-msgstr ""
-
-#. module: survey
-#: field:survey.answer,sequence:0
-#: field:survey.page,sequence:0
-#: field:survey.question,sequence:0
-msgid "Sequence"
-msgstr ""
-
-#. module: survey
-#: wizard_view:wizard.send.invitation,send:0
-msgid "Results :"
-msgstr ""
-
-#. module: survey
-#: code:addons/survey/wizard/wizard_survey.py:0
-#, python-format
-msgid "%sSurvey is not in open state"
-msgstr ""
-
-#. module: survey
-#: wizard_view:wizard.send.invitation,init:0
-msgid "Select Partner"
-msgstr ""
-
-#. module: survey
-#: field:survey.response,date_create:0
-msgid "Create Date"
-msgstr ""
-
-#. module: survey
-#: model:ir.actions.act_window,name:survey.act_survey_pages
-#: model:ir.model,name:survey.model_survey_page
-#: model:ir.ui.menu,name:survey.menu_survey_page_form1
-msgid "Survey Pages"
-msgstr ""
-
-#. module: survey
-#: rml:survey_analysis_report:0
-msgid "Response Count"
-msgstr ""
-
-#. module: survey
-#: field:survey.name.wiz,page:0
-msgid "Page Position"
-msgstr ""
diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index 968590a5d07..c7ceb796bae 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -128,7 +128,7 @@ class survey(osv.osv):
'context' : context
}
else:
-
+
datas['form'] = page_setting
datas['model'] = 'survey.print'
report = {
@@ -139,7 +139,6 @@ class survey(osv.osv):
'context' : context
}
return report
-
survey()
class survey_history(osv.osv):
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 4f9eff96b84..8a574edc169 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -260,7 +260,7 @@
-
+
@@ -1070,7 +1070,7 @@
-
+
diff --git a/addons/thunderbird/__openerp__.py b/addons/thunderbird/__openerp__.py
index 1b7c752d1b1..2cb470bf886 100644
--- a/addons/thunderbird/__openerp__.py
+++ b/addons/thunderbird/__openerp__.py
@@ -3,7 +3,7 @@
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (). All Rights Reserved
-# $Id$
+# Copyright (c) 2004 Axelor SPRL. (http://www.axelor.com) All Rights Reserved.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -19,54 +19,27 @@
# along with this program. If not, see .
#
##############################################################################
-##############################################################################
-#
-# Copyright (c) 2004 Axelor SPRL. (http://www.axelor.com) All Rights Reserved.
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-##############################################################################
-
{
- "name" : "Thunderbird Interface",
- "version" : "1.0",
- "author" : "Axelor",
- "website" : "http://www.axelor.com/",
- "depends" : ["base","crm"],
- "category" : "Generic Modules/Thunderbird interface",
- "description": '''
- This module is required for the thuderbird plug-in to work
- properly.
+ "name" : "Thunderbird Interface",
+ "version" : "1.0",
+ "author" : "Axelor",
+ "website" : "http://www.axelor.com/",
+ "depends" : ["base","crm"],
+ "category" : "Generic Modules/Thunderbird interface",
+ "description": '''
+ This module is required for the thuderbird plug-in to work
+ properly.
- This allows you to select an object that you’d like to add
- to your email and its attachments. You can select a partner, a task,
- a project, an analytical account, or any other object and attach selected
- mail as .eml file in attachment of selected record.
+ This allows you to select an object that you’d like to add
+ to your email and its attachments. You can select a partner, a task,
+ a project, an analytical account, or any other object and attach selected
+ mail as .eml file in attachment of selected record.
- You can create new case in crm using Create Case button.
- Select a section for which you want to create case.''',
- "init_xml" : [],
- "demo_xml" : [],
- "update_xml" : ['security/ir.model.access.csv'],
- "active": False,
- "installable": True
+ You can create new case in crm using Create Case button.
+ Select a section for which you want to create case.''',
+ "init_xml" : [],
+ "demo_xml" : [],
+ "update_xml" : ['security/ir.model.access.csv'],
+ "active": False,
+ "installable": True
}
diff --git a/addons/thunderbird/i18n/zh_CN.po b/addons/thunderbird/i18n/zh_CN.po
deleted file mode 100644
index f25ba3b39f7..00000000000
--- a/addons/thunderbird/i18n/zh_CN.po
+++ /dev/null
@@ -1,85 +0,0 @@
-# Chinese (Simplified) translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2009-11-26 06:05+0000\n"
-"PO-Revision-Date: 2010-04-08 00:41+0000\n"
-"Last-Translator: Silence \n"
-"Language-Team: Chinese (Simplified) \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:21+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: thunderbird
-#: field:tinythunderbird.partner,copy_to:0
-msgid "Copy To"
-msgstr "复制到"
-
-#. module: thunderbird
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr "对象名必须是以x_开头并且不能含有特殊字符"
-
-#. module: thunderbird
-#: field:tinythunderbird.partner,description:0
-msgid "Description"
-msgstr "描述"
-
-#. module: thunderbird
-#: field:tinythunderbird.partner,reference:0
-msgid "Reference"
-msgstr "参考"
-
-#. module: thunderbird
-#: model:ir.model,name:thunderbird.model_tinythunderbird_partner
-msgid "Thunderbid mails"
-msgstr ""
-
-#. module: thunderbird
-#: field:tinythunderbird.partner,attachments:0
-msgid "Attached Files"
-msgstr "添加附件"
-
-#. module: thunderbird
-#: field:tinythunderbird.partner,res_user_id:0
-msgid "User"
-msgstr "用户"
-
-#. module: thunderbird
-#: field:tinythunderbird.partner,receiver:0
-msgid "Receiver"
-msgstr "收件人"
-
-#. module: thunderbird
-#: field:tinythunderbird.partner,date:0
-msgid "Date"
-msgstr "日期"
-
-#. module: thunderbird
-#: field:tinythunderbird.partner,title:0
-msgid "Subject"
-msgstr "主题"
-
-#. module: thunderbird
-#: code:addons/thunderbird/partner/partner.py:0
-#, python-format
-msgid "Archive"
-msgstr "存档"
-
-#. module: thunderbird
-#: model:ir.module.module,shortdesc:thunderbird.module_meta_information
-msgid "Thunderbird Interface"
-msgstr "Thunderbird接口"
-
-#. module: thunderbird
-#: field:tinythunderbird.partner,sender:0
-msgid "Sender"
-msgstr "发件人"
diff --git a/addons/warning/i18n/nl.po b/addons/warning/i18n/nl.po
index 938f2ac746f..17d9afcefbc 100644
--- a/addons/warning/i18n/nl.po
+++ b/addons/warning/i18n/nl.po
@@ -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-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-16 17:45+0000\n"
-"Last-Translator: Fabien (Open ERP) \n"
+"PO-Revision-Date: 2010-04-22 09:28+0000\n"
+"Last-Translator: Jan Verlaan (Veritos) \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:19+0000\n"
+"X-Launchpad-Export-Date: 2010-04-23 03:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: warning
@@ -39,7 +39,7 @@ msgstr "Verkooporderregel"
#. module: warning
#: view:product.product:0
msgid "Warning when Purchasing this Product"
-msgstr ""
+msgstr "Waarschuw wanneer dit product gekocht wordt"
#. module: warning
#: view:product.product:0
@@ -54,12 +54,12 @@ msgstr "Waarschuwingen"
#: selection:res.partner,purchase_warn:0
#: selection:res.partner,sale_warn:0
msgid "Blocking Message"
-msgstr ""
+msgstr "Blokkerend bericht"
#. module: warning
#: view:res.partner:0
msgid "Warning on the Invoice"
-msgstr ""
+msgstr "Waarschuwing op de factuur"
#. module: warning
#: selection:product.product,purchase_line_warn:0
@@ -69,12 +69,12 @@ msgstr ""
#: selection:res.partner,purchase_warn:0
#: selection:res.partner,sale_warn:0
msgid "No Message"
-msgstr ""
+msgstr "Geen bericht"
#. module: warning
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr "Ongeldige XML voor overzicht"
+msgstr "Ongeldige XML, kan overzicht niet weergeven!"
#. module: warning
#: field:res.partner,invoice_warn:0
@@ -89,7 +89,7 @@ msgstr ""
#. module: warning
#: view:product.product:0
msgid "Warning when Selling this Product"
-msgstr ""
+msgstr "Waarschuw bij verkopen van dit product"
#. module: warning
#: field:res.partner,sale_warn:0
@@ -128,6 +128,10 @@ msgid ""
"Selecting \"Blocking Message\" will throw an exception with the message and "
"block the flow. The Message has to be written in the next field."
msgstr ""
+"Door de 'Waarschuwingsoptie' te selecteren wordt het bericht naar de "
+"gebruiker gestuurd. Door het 'Blokkerend bericht' te kiezen wordt een fout "
+"gegenereerd met de boodschap en het proces wordt geblokkeerd. Het bericht "
+"moet in het volgende veld worden ingevoerd."
#. module: warning
#: field:res.partner,invoice_warn_msg:0
@@ -142,17 +146,17 @@ msgstr ""
#. module: warning
#: view:res.partner:0
msgid "Warning on the Picking"
-msgstr ""
+msgstr "Waarschuwing op de pickinglijst"
#. module: warning
#: view:res.partner:0
msgid "Warning on the Purchase Order"
-msgstr ""
+msgstr "Waarschuwing op de inkooporder"
#. module: warning
#: view:res.partner:0
msgid "Warning on the Sale Order"
-msgstr ""
+msgstr "Waarschuwing bij de verkooporder."
#. module: warning
#: selection:product.product,purchase_line_warn:0
@@ -162,7 +166,7 @@ msgstr ""
#: selection:res.partner,purchase_warn:0
#: selection:res.partner,sale_warn:0
msgid "Warning"
-msgstr ""
+msgstr "Waarschuwing"
#. module: warning
#: field:res.partner,picking_warn_msg:0
diff --git a/addons/wiki/test/wiki_test00.yml b/addons/wiki/test/wiki_test00.yml
index ef3f490fd85..cdaa28c1829 100755
--- a/addons/wiki/test/wiki_test00.yml
+++ b/addons/wiki/test/wiki_test00.yml
@@ -69,3 +69,4 @@
# ids = self.search(cr, uid, [])
# self.wiki_menu_create(cr, uid, ids, context)
+