- Axis Bank
+ [[o.bank or 'Bank']]
@@ -172,7 +174,7 @@
- [[ o.name ]] for period [[ get_month(o.date)['mname'] ]] [[ o.name ]] for period [[ get_month(o.date)['mname'] ]]
@@ -335,3 +337,4 @@
+
From bef2f4f82ade6a7713ab90d89d69452676757db3 Mon Sep 17 00:00:00 2001
From: "p_christ@hol.gr" <>
Date: Thu, 5 Aug 2010 10:58:15 +0530
Subject: [PATCH 02/18] [FIX] Project: Task search fix regression
bzr revid: mra@mra-laptop-20100805052815-3gum037ihtbp5bp3
---
addons/project/project.py | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/addons/project/project.py b/addons/project/project.py
index f0e1ceaaddd..fd839149422 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -335,28 +335,29 @@ class task(osv.osv):
_description = "Task"
_log_create = True
_date_name = "date_start"
-
+
def search(self, cr, user, args, offset=0, limit=None, order=None, context=None, count=False):
+ obj_project = self.pool.get('project.project')
for domain in args:
if domain[0] == 'project_id' and (not isinstance(domain[2], str)):
- id = isinstance(domain[2], list) and int(domain[2][0]) or int(domain[2])
- if id:
- if self.pool.get('project.project').read(cr, user, id, ['state'])['state'] == 'template':
- args.append(['active', '=', False])
+ id = isinstance(domain[2], list) and domain[2][0] or domain[2]
+ if id and isinstance(id, (long, int)):
+ if obj_project.read(cr, user, id, ['state'])['state'] == 'template':
+ args.append(('active', '=', False))
return super(task, self).search(cr, user, args, offset=offset, limit=limit, order=order, context=context, count=count)
def _str_get(self, task, level=0, border='***', context=None):
return border+' '+(task.user_id and task.user_id.name.upper() or '')+(level and (': L'+str(level)) or '')+(' - %.1fh / %.1fh'%(task.effective_hours or 0.0,task.planned_hours))+' '+border+'\n'+ \
border[0]+' '+(task.name or '')+'\n'+ \
(task.description or '')+'\n\n'
-
+
# Compute: effective_hours, total_hours, progress
def _hours_get(self, cr, uid, ids, field_names, args, context=None):
project_obj = self.pool.get('project.project')
res = {}
cr.execute("SELECT task_id, COALESCE(SUM(hours),0) FROM project_task_work WHERE task_id IN %s GROUP BY task_id",(tuple(ids),))
hours = dict(cr.fetchall())
-
+
uom_obj = self.pool.get('product.uom')
user_uom, default_uom = project_obj._get_user_and_default_uom_ids(cr, uid)
if user_uom != default_uom:
From fa1990b532f9602beee7e955c0a61ab4d9299b66 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)"
Date: Thu, 5 Aug 2010 11:09:52 +0530
Subject: [PATCH 03/18] [Fix] stock : Fix the packing report
bzr revid: sbh@tinyerp.com-20100805053952-8suzix8brrra4x8s
---
addons/stock/report/packing.rml | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/addons/stock/report/packing.rml b/addons/stock/report/packing.rml
index 3db817996d9..7288615da6d 100644
--- a/addons/stock/report/packing.rml
+++ b/addons/stock/report/packing.rml
@@ -276,12 +276,11 @@
- [[ (move_lines.state == 'done' or move_lines.state == 'confirmed') and removeParentNode('para') ]]
- Non Assigned Products: [[ ( move_lines.state == 'assigned' or move_lines.state == 'done' or move_lines.state == 'confirmed' ) and removeParentNode('para') ]]
- [[ (move_lines.state == 'done' or move_lines.state == 'confirmed') and removeParentNode('para') ]]
-
- [[ repeatIn([line for line in picking.move_lines if (line.state != 'assigned' )],'move_lines') ]]
+
+ [[ ([line for line in picking.move_lines if (line.state == 'draft' )]) and 'Non Assigned Products:' or removeParentNode('para') ]]
+
+ [[ repeatIn([line for line in picking.move_lines if (line.state != 'assigned' )],'move_lines') ]]
[ [[ move_lines.product_id.default_code ]] ] [[ move_lines.product_id.name ]] [[ move_lines.product_id.variants or '']]
From 5b52666f71e44d2478ab2399b30360acf6db717b Mon Sep 17 00:00:00 2001
From: "atp (Open ERP)"
Date: Thu, 5 Aug 2010 11:18:57 +0530
Subject: [PATCH 04/18] [IMP]: Use Tooltips in auction form and change menu
name.
bzr revid: atp@tinyerp.co.in-20100805054857-iw21bieed73n29ns
---
addons/auction/auction.py | 16 ++++++++--------
addons/auction/auction_view.xml | 10 +++++-----
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/addons/auction/auction.py b/addons/auction/auction.py
index 41c75e0fe7b..6a241873f98 100644
--- a/addons/auction/auction.py
+++ b/addons/auction/auction.py
@@ -72,14 +72,14 @@ class auction_dates(osv.osv):
_columns = {
'name': fields.char('Auction Name', size=64, required=True),
- 'expo1': fields.date('First Exposition Day', required=True),
- 'expo2': fields.date('Last Exposition Day', required=True),
- 'auction1': fields.date('First Auction Day', required=True),
- 'auction2': fields.date('Last Auction Day', required=True),
- 'journal_id': fields.many2one('account.journal', 'Buyer Journal', required=True),
- 'journal_seller_id': fields.many2one('account.journal', 'Seller Journal', required=True),
- 'buyer_costs': fields.many2many('account.tax', 'auction_buyer_taxes_rel', 'auction_id', 'tax_id', 'Buyer Costs'),
- 'seller_costs': fields.many2many('account.tax', 'auction_seller_taxes_rel', 'auction_id', 'tax_id', 'Seller Costs'),
+ 'expo1': fields.date('First Exposition Day', required=True, help="Beginning Exposition Date For Auction"),
+ 'expo2': fields.date('Last Exposition Day', required=True, help="Last Exposition Date For Auction"),
+ 'auction1': fields.date('First Auction Day', required=True, help="Start Date Of Auction"),
+ 'auction2': fields.date('Last Auction Day', required=True, help="End Date Of Auction"),
+ 'journal_id': fields.many2one('account.journal', 'Buyer Journal', required=True, help="Account Journal For Buyer"),
+ 'journal_seller_id': fields.many2one('account.journal', 'Seller Journal', required=True, help="Account Journal For Seller"),
+ 'buyer_costs': fields.many2many('account.tax', 'auction_buyer_taxes_rel', 'auction_id', 'tax_id', 'Buyer Costs', help="Account Tax For Buyer"),
+ 'seller_costs': fields.many2many('account.tax', 'auction_seller_taxes_rel', 'auction_id', 'tax_id', 'Seller Costs', help="Account Tax For Seller"),
'acc_income': fields.many2one('account.account', 'Income Account', required=True),
'acc_expense': fields.many2one('account.account', 'Expense Account', required=True),
'adj_total': fields.function(_adjudication_get, method=True, string='Total Adjudication', store=True),
diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml
index 46d49754d16..6079081c417 100644
--- a/addons/auction/auction_view.xml
+++ b/addons/auction/auction_view.xml
@@ -55,6 +55,7 @@
+
auction.lot.category.form
auction.lot.category
@@ -91,7 +92,6 @@
@@ -183,7 +183,7 @@
+ date_start="auction1" color="">
@@ -191,7 +191,7 @@
- Next Auctions Dates
+ Auctions
auction.dates
form
tree,form,calendar
@@ -206,8 +206,8 @@
id="act_auction_lot_line_open"/>
-
-
+
+
From 724c4ebb44cdf20db0a925e91b3937fd3b168b8b Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)"
Date: Thu, 5 Aug 2010 11:51:57 +0530
Subject: [PATCH 05/18] [REF] stock,delivery :Remove the unused import
statemnet, and comment code
bzr revid: sbh@tinyerp.com-20100805062157-a6dm6rmqd8nwdqq3
---
addons/delivery/delivery.py | 1 -
addons/delivery/stock.py | 2 --
addons/stock/report/report_stock.py | 3 ---
addons/stock/report/stock_graph.py | 2 +-
addons/stock/wizard/stock_inventory_merge.py | 6 ------
addons/stock/wizard/stock_partial_move.py | 10 ++--------
6 files changed, 3 insertions(+), 21 deletions(-)
diff --git a/addons/delivery/delivery.py b/addons/delivery/delivery.py
index f1fadd81bd4..6501e0aa230 100644
--- a/addons/delivery/delivery.py
+++ b/addons/delivery/delivery.py
@@ -20,7 +20,6 @@
##############################################################################
import time
-import netsvc
from osv import fields,osv
from tools.translate import _
diff --git a/addons/delivery/stock.py b/addons/delivery/stock.py
index 6193a6299a1..76897d46e58 100644
--- a/addons/delivery/stock.py
+++ b/addons/delivery/stock.py
@@ -19,10 +19,8 @@
#
##############################################################################
-import netsvc
from osv import fields,osv
from tools.translate import _
-import tools
import decimal_precision as dp
diff --git a/addons/stock/report/report_stock.py b/addons/stock/report/report_stock.py
index 81e2bb125fd..5ea8c83c602 100644
--- a/addons/stock/report/report_stock.py
+++ b/addons/stock/report/report_stock.py
@@ -24,9 +24,6 @@ from tools.translate import _
import tools
from tools.sql import drop_view_if_exists
-#
-# Check if it works with UoM ???
-#
class stock_report_prodlots(osv.osv):
_name = "stock.report.prodlots"
_description = "Stock report by production lots"
diff --git a/addons/stock/report/stock_graph.py b/addons/stock/report/stock_graph.py
index d20baa08d58..bb97119c299 100644
--- a/addons/stock/report/stock_graph.py
+++ b/addons/stock/report/stock_graph.py
@@ -24,7 +24,7 @@ import time
from report.misc import choice_colors
#
-# dRAw a graph for stocks
+# Draw a graph for stocks
#
class stock_graph(object):
def __init__(self, io):
diff --git a/addons/stock/wizard/stock_inventory_merge.py b/addons/stock/wizard/stock_inventory_merge.py
index 30450e4d253..b08f0ca79c8 100644
--- a/addons/stock/wizard/stock_inventory_merge.py
+++ b/addons/stock/wizard/stock_inventory_merge.py
@@ -20,13 +20,7 @@
##############################################################################
from osv import fields, osv
-from service import web_services
-from tools.misc import UpdateableStr, UpdateableDict
from tools.translate import _
-import netsvc
-import pooler
-import time
-import wizard
class stock_inventory_merge(osv.osv_memory):
_name = "stock.inventory.merge"
diff --git a/addons/stock/wizard/stock_partial_move.py b/addons/stock/wizard/stock_partial_move.py
index 01e8a712dca..f3af091d58b 100644
--- a/addons/stock/wizard/stock_partial_move.py
+++ b/addons/stock/wizard/stock_partial_move.py
@@ -186,8 +186,7 @@ class stock_partial_move(osv.osv_memory):
res['move%s_product_qty'%(m.id)] = m.product_qty
if 'move%s_product_uom'%(m.id) in fields:
res['move%s_product_uom'%(m.id)] = m.product_uom.id
-
- if (m.picking_id.type == 'out') and (m.product_id.cost_method == 'average'):
+ if (m.picking_id.type == 'out') and (m.product_id.cost_method == 'average') and 'sale_id' in m.picking_id._columns.keys():
price = 0
if hasattr(m, 'sale_line_id') and m.sale_line_id:
price = m.sale_line_id.price_unit
@@ -201,7 +200,7 @@ class stock_partial_move(osv.osv_memory):
if 'move%s_product_currency'%(m.id) in fields:
res['move%s_product_currency'%(m.id)] = currency
- if (m.picking_id.type == 'in') and (m.product_id.cost_method == 'average'):
+ if (m.picking_id.type == 'in') and (m.product_id.cost_method == 'average') and 'purchase_id' in m.picking_id._columns.keys():
price = 0
if hasattr(m, 'purchase_line_id') and m.purchase_line_id:
price = m.purchase_line_id.price_unit
@@ -227,11 +226,6 @@ class stock_partial_move(osv.osv_memory):
"""
rec_id = context and context.get('active_id', False)
- #tracking_lot = context.get('tracking_lot', False)
- #if tracking_lot:
- # tracking = self.pool.get('stock.tracking')
- # tracking_lot = tracking.get_create_tracking_lot(cr, uid,[rec_id], tracking_lot)
- # context ['tracking_lot'] = tracking_lot
move_obj = self.pool.get('stock.move')
move_ids = context.get('active_ids', False)
partial = self.browse(cr, uid, ids[0], context)
From 90fd4877f711c14d822ff51add54805eebf35f8c Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)"
Date: Thu, 5 Aug 2010 12:18:18 +0530
Subject: [PATCH 06/18] [REF] purchase : Remove the comment code
bzr revid: sbh@tinyerp.com-20100805064818-0vnoc9uw3vxa8scz
---
addons/purchase/purchase.py | 1 -
1 file changed, 1 deletion(-)
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index e7f5473b42a..afefebd4bb9 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -535,7 +535,6 @@ class purchase_order(osv.osv):
'fiscal_position': porder.fiscal_position and porder.fiscal_position.id or False,
})
else:
- #order_infos['name'] += ', %s' % porder.name
if porder.notes:
order_infos['notes'] = (order_infos['notes'] or '') + ('\n%s' % (porder.notes,))
if porder.origin:
From 1cf2f0aeb5e6c4a5136120f95a8e2d58ee54d9c1 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala
Date: Thu, 5 Aug 2010 12:50:23 +0530
Subject: [PATCH 07/18] [IMP] Project: improve code
bzr revid: mra@mra-laptop-20100805072023-lhqjd5eb6g38d6dn
---
addons/project/project.py | 149 +++++++++++++++++---------------------
1 file changed, 66 insertions(+), 83 deletions(-)
diff --git a/addons/project/project.py b/addons/project/project.py
index fd839149422..211fc78a6a6 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -29,12 +29,12 @@ from osv import fields, osv
class project_task_type(osv.osv):
_name = 'project.task.type'
_description = 'Task Stage'
+ _order = 'sequence'
_columns = {
'name': fields.char('Stage Name', required=True, size=64, translate=True),
'description': fields.text('Description'),
'sequence': fields.integer('Sequence'),
}
- _order = 'sequence'
_defaults = {
'sequence': 1
@@ -55,8 +55,7 @@ class project(osv.osv):
LEFT JOIN account_analytic_account account ON account.id = project.analytic_account_id
LEFT JOIN project_user_rel rel ON rel.project_id = project.analytic_account_id
WHERE (account.user_id = %s or rel.uid = %s)"""%(user, user))
- res = cr.fetchall()
- return [(r[0]) for r in res]
+ return [(r[0]) for r in cr.fetchall()]
return super(project, self).search(cr, user, args, offset=offset, limit=limit, order=order,
context=context, count=count)
@@ -66,10 +65,6 @@ class project(osv.osv):
res[m.id] = (m.parent_id and (m.parent_id.name + '/') or '') + m.name
return res
- def check_recursion(self, cursor, user, ids, parent=None):
- return super(project, self).check_recursion(cursor, user, ids,
- parent=parent)
-
def onchange_partner_id(self, cr, uid, ids, part=False, context=None):
partner_obj = self.pool.get('res.partner')
if not part:
@@ -80,30 +75,29 @@ class project(osv.osv):
return {'value':{'contact_id': addr['contact'], 'pricelist_id': pricelist_id}}
def get_all_child_projects(self, cr, uid, ids, context=None):
+ # Calculate child project for Given project id => For progress rate + planned time + Time spent
cr.execute('''select prpc.id as id from account_analytic_account as p
-join account_analytic_account as c on p.id = c.parent_id
-join project_project as prp on prp.analytic_account_id = p.id
-join project_project as prpc on prpc.analytic_account_id = c.id
-where prp.id in %s''',(tuple(ids),))
+ join account_analytic_account as c on p.id = c.parent_id
+ join project_project as prp on prp.analytic_account_id = p.id
+ join project_project as prpc on prpc.analytic_account_id = c.id
+ where prp.id in %s''',(tuple(ids),))
child_ids = cr.fetchall()
if child_ids:
- child_ids = [x[0] for x in child_ids]
- child_ids = self.get_all_child_projects(cr, uid, child_ids)
+ child_ids = [x[0] for x in child_ids]
+ child_ids = self.get_all_child_projects(cr, uid, child_ids)
+ return ids + child_ids
- return ids+child_ids
-
def _get_user_and_default_uom_ids(self, cr, uid):
users_obj = self.pool.get('res.users')
model_data_obj = self.pool.get('ir.model.data')
-
model_data_id = model_data_obj._get_id(cr, uid, 'product', 'uom_hour')
default_uom = user_uom = model_data_obj.read(cr, uid, [model_data_id], ['res_id'])[0]['res_id']
obj_tm = users_obj.browse(cr, uid, uid).company_id.project_time_mode_id
if obj_tm:
user_uom = obj_tm.id
return user_uom, default_uom
-
+
def _progress_rate(self, cr, uid, ids, names, arg, context=None):
res = {}.fromkeys(ids, 0.0)
progress = {}
@@ -138,19 +132,19 @@ where prp.id in %s''',(tuple(ids),))
p = tocompute.pop()
for i in range(3):
s[i] += progress.get(p, (0.0, 0.0, 0.0))[i]
-
- uom_obj = self.pool.get('product.uom')
+
+ uom_obj = self.pool.get('product.uom')
user_uom, def_uom = self._get_user_and_default_uom_ids(cr, uid)
if user_uom != def_uom:
s[0] = uom_obj._compute_qty(cr, uid, user_uom, s[0], def_uom)
s[1] = uom_obj._compute_qty(cr, uid, user_uom, s[1], def_uom)
s[2] = uom_obj._compute_qty(cr, uid, user_uom, s[2], def_uom)
-
+
if project.state == 'close':
progress_rate = 100.0
else:
progress_rate = s[1] and round(min(100.0 * s[2] / s[1], 99.99), 2)
-
+
res[project.id] = {
'planned_hours': s[0],
'effective_hours': s[2],
@@ -164,7 +158,7 @@ where prp.id in %s''',(tuple(ids),))
if proj.tasks:
raise osv.except_osv(_('Operation Not Permitted !'), _('You can not delete a project with tasks. I suggest you to deactivate it.'))
return super(project, self).unlink(cr, uid, ids, *args, **kwargs)
-
+
_columns = {
'complete_name': fields.function(_complete_name, method=True, string="Project Name", type='char', size=250),
'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the project without removing it."),
@@ -253,21 +247,20 @@ where prp.id in %s''',(tuple(ids),))
default['name'] = proj.name+_(' (copy)')
res = super(project, self).copy(cr, uid, id, default, context)
- task_ids = task_obj.search(cr, uid, [('project_id','=', res), ('active','=',True)])
- tasks = task_obj.browse(cr, uid, task_ids)
- for task in tasks:
- date_deadline = None
- if task.date_start:
- ds = date(*time.strptime(task.date_start,'%Y-%m-%d %H:%M:%S')[:3])
- if task.date_deadline:
- dd = date(*time.strptime(task.date_deadline,'%Y-%m-%d')[:3])
- diff = dd-ds
- date_deadline = (datetime.now()+diff).strftime('%Y-%m-%d %H:%M:%S')
- task_obj.write(cr, uid, task.id, {'active':True,
- 'date_start': False,
- 'date_end': False,
- 'date_deadline':date_deadline,
- })
+# task_ids = task_obj.search(cr, uid, [('project_id','=', res), ('active','=',True)])
+# tasks = task_obj.browse(cr, uid, task_ids)
+# for task in tasks:
+# date_deadline = None
+# if task.date_start:
+# ds = date(*time.strptime(task.date_start,'%Y-%m-%d %H:%M:%S')[:3])
+# if task.date_deadline:
+# dd = date(*time.strptime(task.date_deadline,'%Y-%m-%d')[:3])
+# diff = dd-ds
+# date_deadline = (datetime.now()+diff).strftime('%Y-%m-%d %H:%M:%S')
+# task_obj.write(cr, uid, task.id, {'date_start': False,
+# 'date_end': False,
+# 'date_deadline':date_deadline,
+# })
return res
@@ -365,7 +358,7 @@ class task(osv.osv):
if hours.get(task.id, False):
dur_in_user_uom = uom_obj._compute_qty(cr, uid, default_uom, hours.get(task.id, 0.0), user_uom)
hours[task.id] = dur_in_user_uom
-
+
for task in self.browse(cr, uid, ids, context=context):
res[task.id] = {'effective_hours': hours.get(task.id, 0.0), 'total_hours': task.remaining_hours + hours.get(task.id, 0.0)}
res[task.id]['delay_hours'] = res[task.id]['total_hours'] - task.planned_hours
@@ -413,7 +406,7 @@ class task(osv.osv):
if task.project_id.active == False or task.project_id.state == 'template':
res[task.id] = False
return res
-
+
_columns = {
'active': fields.function(_is_template, method=True, store=True, string='Not a Template Task', type='boolean', help="This field is computed automatically and have the same behavior than the boolean 'active' field: if the task is linked to a template or unactivated project, it will be hidden unless specifically asked."),
'name': fields.char('Task Summary', size=128, required=True),
@@ -461,7 +454,7 @@ class task(osv.osv):
_order = "sequence, priority, date_start, id"
_constraints = [
- (_check_dates, 'Error! task start-date must be lower then task end-date.', ['date_start', 'date_end'])
+ (_check_dates, 'Error! Task start-date must be lower then task end-date.', ['date_start', 'date_end'])
]
#
# Override view according to the company definition
@@ -493,7 +486,6 @@ class task(osv.osv):
for f in res['fields']:
if 'Hours' in res['fields'][f]['string']:
res['fields'][f]['string'] = res['fields'][f]['string'].replace('Hours',tm)
-
return res
def do_close(self, cr, uid, ids, *args):
@@ -602,7 +594,6 @@ class task(osv.osv):
self.write(cr, uid, ids, {'state': 'draft'})
return True
-
def do_pending(self, cr, uid, ids, *args):
self.write(cr, uid, ids, {'state': 'pending'})
for (id, name) in self.name_get(cr, uid, ids):
@@ -636,7 +627,7 @@ task()
class project_work(osv.osv):
_name = "project.task.work"
- _description = "Task Work"
+ _description = "Project Task Work"
_columns = {
'name': fields.char('Work summary', size=128),
'date': fields.datetime('Date'),
@@ -652,34 +643,36 @@ class project_work(osv.osv):
}
_order = "date desc"
-
+
def create(self, cr, uid, vals, *args, **kwargs):
- if (not 'task_id' in vals) or (not 'hours' in vals):
- return super(project_work,self).create(cr, uid, vals, *args, **kwargs)
- if not vals['hours']:
- vals['hours'] = 0.00
-
project_obj = self.pool.get('project.project')
uom_obj = self.pool.get('product.uom')
+
+ if (not 'task_id' in vals) or (not 'hours' in vals):
+ return super(project_work, self).create(cr, uid, vals, *args, **kwargs)
+ if not vals['hours']:
+ vals['hours'] = 0.00
+
user_uom, default_uom = project_obj._get_user_and_default_uom_ids(cr, uid)
duration = vals['hours']
-
+
if user_uom != default_uom:
duration = uom_obj._compute_qty(cr, uid, default_uom, duration, user_uom)
cr.execute('update project_task set remaining_hours=remaining_hours - %s where id=%s', (duration, vals['task_id']))
return super(project_work,self).create(cr, uid, vals, *args, **kwargs)
def write(self, cr, uid, ids, vals, context=None):
+ project_obj = self.pool.get('project.project')
+ uom_obj = self.pool.get('product.uom')
+
if context is None:
context = {}
if not vals['hours']:
- vals['hours'] = 0.00
-
- project_obj = self.pool.get('project.project')
- uom_obj = self.pool.get('product.uom')
- user_uom, default_uom = project_obj._get_user_and_default_uom_ids(cr, uid)
+ vals['hours'] = 0.00
+
+ user_uom, default_uom = project_obj._get_user_and_default_uom_ids(cr, uid)
duration = vals['hours']
-
+
if user_uom == default_uom:
for work in self.browse(cr, uid, ids, context):
cr.execute('update project_task set remaining_hours=remaining_hours - %s + (%s) where id=%s', (duration, work.hours, work.task_id.id))
@@ -688,14 +681,14 @@ class project_work(osv.osv):
duration = uom_obj._compute_qty(cr, uid, default_uom, duration, user_uom)
del_work = uom_obj._compute_qty(cr, uid, default_uom, work.hours, user_uom)
cr.execute('update project_task set remaining_hours=remaining_hours - %s + (%s) where id=%s', (duration, del_work, work.task_id.id))
-
+
return super(project_work,self).write(cr, uid, ids, vals, context)
def unlink(self, cr, uid, ids, *args, **kwargs):
context = kwargs.get('context', {})
project_obj = self.pool.get('project.project')
- user_uom, default_uom = project_obj._get_user_and_default_uom_ids(cr, uid)
-
+ user_uom, default_uom = project_obj._get_user_and_default_uom_ids(cr, uid)
+
if user_uom == default_uom:
for work in self.browse(cr, uid, ids, context):
cr.execute('update project_task set remaining_hours=remaining_hours + %s where id=%s', (work.hours, work.task_id.id))
@@ -710,64 +703,54 @@ project_work()
class config_compute_remaining(osv.osv_memory):
_name='config.compute.remaining'
- def _get_remaining(self,cr, uid, ctx):
- task_obj = self.pool.get('project.task')
- if 'active_id' in ctx:
- return task_obj.browse(cr, uid, ctx['active_id'], context=ctx).remaining_hours
+ def _get_remaining(self,cr, uid, context=None):
+ if context and 'active_id' in context:
+ return self.pool.get('project.task').browse(cr, uid, ctx['active_id'], context=context).remaining_hours
return False
_columns = {
'remaining_hours' : fields.float('Remaining Hours', digits=(16,2), help="Put here the remaining hours required to close the task."),
}
- def _get_analytic_account(self, cr, uid, context={}):
- if context.get('account_id', False):
- return context.get('account_id')
- return False
-
- _defaults = {
- 'account_id' : _get_analytic_account,
- }
-
_defaults = {
'remaining_hours': _get_remaining
}
-
+
def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
users_obj = self.pool.get('res.users')
obj_tm = users_obj.browse(cr, uid, uid, context).company_id.project_time_mode_id
tm = obj_tm and obj_tm.name or 'Hours'
-
+
res = super(config_compute_remaining, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu=submenu)
-
+
if tm in ['Hours','Hour']:
return res
-
+
eview = etree.fromstring(res['arch'])
-
+
def _check_rec(eview):
if eview.attrib.get('widget','') == 'float_time':
eview.set('widget','float')
for child in eview:
_check_rec(child)
return True
-
+
_check_rec(eview)
-
+
res['arch'] = etree.tostring(eview)
-
+
for f in res['fields']:
if 'Hours' in res['fields'][f]['string']:
res['fields'][f]['string'] = res['fields'][f]['string'].replace('Hours',tm)
-
return res
+
def compute_hours(self, cr, uid, ids, context=None):
if context is None:
context = {}
task_obj = self.pool.get('project.task')
request = self.pool.get('res.request')
if 'active_id' in context:
- remaining_hrs=self.browse(cr,uid,ids)[0].remaining_hours
+ remaining_hrs = self.browse(cr,uid,ids)[0].remaining_hours
task_obj.write(cr,uid,context['active_id'],{'remaining_hours':remaining_hrs})
if context.get('button_reactivate', False):
tasks = task_obj.browse(cr, uid, [context['active_id']], context=context)
@@ -787,7 +770,7 @@ class config_compute_remaining(osv.osv_memory):
return {
'type': 'ir.actions.act_window_close',
}
-
+
config_compute_remaining()
class message(osv.osv):
From d7744b204fe8a0ef62dce6b1c49e8efafe41e529 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)"
Date: Thu, 5 Aug 2010 14:34:12 +0530
Subject: [PATCH 08/18] [REMOVE] configuration wizard : profile_bookstore
option from module list
bzr revid: vir@tinyerp.com-20100805090412-0dp02g6ox0bz05i3
---
addons/base_setup/base_setup_installer.xml | 21 ++++++++++-----------
addons/base_setup/installer.py | 4 ----
2 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index 3af1a070104..08a85d32436 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -23,18 +23,17 @@
Install Generic Modules
-
diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index 3e340ca8c6f..9c02c5f20c1 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -86,10 +86,6 @@ class base_setup_installer(osv.osv_memory):
help="Installs a preselected set of OpenERP "
"applications selected to help you manage your auctions "
"as well as the business processes around them."),
- 'profile_bookstore':fields.boolean('Book Stores',
- help="Installs a preselected set of OpenERP "
- "applications which will help you manage your book store "
- "or your library."),
}
_defaults = {
'crm': True,
From c4f3dc085d65a102c2c0824b3a0d2d8109efec2a Mon Sep 17 00:00:00 2001
From: Olivier Dony
Date: Thu, 5 Aug 2010 11:19:09 +0200
Subject: [PATCH 09/18] [IMP] mail_gateway: improve email headers detection for
mail user agents that do not set the References but just the In-Reply-To
headers
bzr revid: odo@openerp.com-20100805091909-cv91l3380kkpr4a7
---
addons/mail_gateway/mail_gateway.py | 29 ++++++++++++++++-------------
1 file changed, 16 insertions(+), 13 deletions(-)
diff --git a/addons/mail_gateway/mail_gateway.py b/addons/mail_gateway/mail_gateway.py
index ef36be3a3ef..81050b1dac9 100644
--- a/addons/mail_gateway/mail_gateway.py
+++ b/addons/mail_gateway/mail_gateway.py
@@ -234,16 +234,16 @@ class mailgate_tool(osv.osv_memory):
msg_pool = self.pool.get('mailgate.message')
for res_id in res_ids:
msg_data = {
- 'name': msg.get('subject', 'No subject'),
- 'date': msg.get('date') ,
- 'description': msg.get('body', msg.get('from')),
+ 'name': msg.get('subject', 'No subject'),
+ 'date': msg.get('date'),
+ 'description': msg.get('body', msg.get('from')),
'history': True,
- 'res_model': model,
- 'email_cc': msg.get('cc'),
- 'email_from': msg.get('from'),
+ 'res_model': model,
+ 'email_cc': msg.get('cc'),
+ 'email_from': msg.get('from'),
'email_to': msg.get('to'),
- 'message_id': msg.get('message-id'),
- 'references': msg.get('references'),
+ 'message_id': msg.get('message-id'),
+ 'references': msg.get('references') or msg.get('in-reply-to'),
'res_id': res_id,
'user_id': uid,
'attachment_ids': [(6, 0, attach)]
@@ -380,6 +380,9 @@ class mailgate_tool(osv.osv_memory):
if 'References' in fields:
msg['references'] = msg_txt.get('References')
+ if 'In-Reply-To' in fields:
+ msg['in-reply-to'] = msg_txt.get('In-Reply-To')
+
if 'X-Priority' in fields:
msg['priority'] = msg_txt.get('X-Priority', '3 (Normal)').split(' ')[0]
@@ -425,12 +428,12 @@ class mailgate_tool(osv.osv_memory):
res_ids = []
attachment_ids = []
new_res_id = False
- if msg.get('references'):
- references = msg.get('references')
+ if msg.get('references') or msg.get('in-reply-to'):
+ references = msg.get('references') or msg.get('in-reply-to')
if '\r\n' in references:
- references = msg.get('references').split('\r\n')
+ references = references.split('\r\n')
else:
- references = msg.get('references').split(' ')
+ references = references.split(' ')
for ref in references:
ref = ref.strip()
res_id = tools.misc.reference_re.search(ref)
@@ -464,7 +467,7 @@ class mailgate_tool(osv.osv_memory):
email_from = msg.get('from'),
email_cc = msg.get('cc'),
message_id = msg.get('message-id'),
- references = msg.get('references', False),
+ references = msg.get('references', False) or msg.get('in-reply-to', False),
attach = attachments.items(),
context = context)
else:
From 80e39cbe2e5a30020775993a34ab7c5b35fb8518 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala
Date: Thu, 5 Aug 2010 15:24:18 +0530
Subject: [PATCH 10/18] [FIX] Project: rename ctx to context
bzr revid: mra@mra-laptop-20100805095418-4votyplo006tdb8s
---
addons/project/project.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/addons/project/project.py b/addons/project/project.py
index 211fc78a6a6..7be2956bed0 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -705,7 +705,7 @@ class config_compute_remaining(osv.osv_memory):
def _get_remaining(self,cr, uid, context=None):
if context and 'active_id' in context:
- return self.pool.get('project.task').browse(cr, uid, ctx['active_id'], context=context).remaining_hours
+ return self.pool.get('project.task').browse(cr, uid, context['active_id'], context=context).remaining_hours
return False
_columns = {
From 06145300d218a1f996c3f68da488c8074b672c49 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)"
Date: Thu, 5 Aug 2010 15:45:50 +0530
Subject: [PATCH 11/18] [FIX]: base_contact: Changed size of field of contact
and job table, made compatible with that of partner address
lp bug: https://launchpad.net/bugs/605640 fixed
bzr revid: rpa@tinyerp.com-20100805101550-jzcssnf0z4kictxy
---
addons/base_contact/base_contact.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/addons/base_contact/base_contact.py b/addons/base_contact/base_contact.py
index 848bed39783..85a2241aaa0 100644
--- a/addons/base_contact/base_contact.py
+++ b/addons/base_contact/base_contact.py
@@ -45,9 +45,9 @@ class res_partner_contact(osv.osv):
return res
_columns = {
- 'name': fields.char('Last Name', size=30, required=True),
- 'first_name': fields.char('First Name', size=30),
- 'mobile': fields.char('Mobile', size=30),
+ 'name': fields.char('Last Name', size=64, required=True),
+ 'first_name': fields.char('First Name', size=64),
+ 'mobile': fields.char('Mobile', size=64),
'title': fields.many2one('res.partner.title','Title'),
'website': fields.char('Website', size=120),
'lang_id': fields.many2one('res.lang', 'Language'),
@@ -203,7 +203,7 @@ class res_partner_job(osv.osv):
'address_id': fields.many2one('res.partner.address', 'Address', \
help='Address which is linked to the Partner'), # TO Correct: domain=[('partner_id', '=', name)]
'contact_id': fields.many2one('res.partner.contact','Contact', required=True, ondelete='cascade'),
- 'function': fields.char('Partner Function', size=34, help="Function of this contact with this partner"),
+ 'function': fields.char('Partner Function', size=64, help="Function of this contact with this partner"),
'sequence_contact': fields.integer('Contact Seq.',help='Order of\
importance of this address in the list of addresses of the linked contact'),
'sequence_partner': fields.integer('Partner Seq.',help='Order of importance\
From 91418b747758147656627d1c08209661f1146f3a Mon Sep 17 00:00:00 2001
From: "atp (Open ERP)"
Date: Thu, 5 Aug 2010 15:56:19 +0530
Subject: [PATCH 12/18] [IMP]: Usability Improvement
bzr revid: atp@tinyerp.co.in-20100805102619-822pt3hx06rppbn2
---
addons/auction/auction.py | 52 +++---
addons/auction/auction_view.xml | 172 ++++++++++--------
.../wizard/auction_lots_auction_move_view.xml | 17 +-
.../wizard/auction_lots_make_invoice.py | 2 +-
.../wizard/auction_lots_make_invoice_buyer.py | 4 +-
.../auction_lots_make_invoice_buyer_view.xml | 6 +-
.../wizard/auction_lots_make_invoice_view.xml | 8 +-
addons/auction/wizard/auction_pay_buy.py | 14 +-
.../auction/wizard/auction_pay_buy_view.xml | 44 +++--
9 files changed, 179 insertions(+), 140 deletions(-)
diff --git a/addons/auction/auction.py b/addons/auction/auction.py
index 6a241873f98..53ba107ae40 100644
--- a/addons/auction/auction.py
+++ b/addons/auction/auction.py
@@ -289,6 +289,7 @@ class auction_lots(osv.osv):
elif name == "gross_revenue":
if lot.auction_id:
result = lot.buyer_price - lot.seller_price
+
elif name == "net_revenue":
if lot.auction_id:
result = lot.buyer_price - lot.seller_price - lot.costs
@@ -343,39 +344,40 @@ class auction_lots(osv.osv):
_columns = {
'bid_lines':fields.one2many('auction.bid_line', 'lot_id', 'Bids'),
- 'auction_id': fields.many2one('auction.dates', 'Auction Date', select=1),
- 'bord_vnd_id': fields.many2one('auction.deposit', 'Depositer Inventory', required=True),
- 'name': fields.char('Short Description', size=64, required=True),
+ 'auction_id': fields.many2one('auction.dates', 'Auctions', select=1, help="Auction For Objects"),
+ 'bord_vnd_id': fields.many2one('auction.deposit', 'Depositer Inventory', required=True, help="Auction Deposit For Deposit Inventory"),
+ 'name': fields.char('Title', size=64, required=True, help='Auction Objects Name'),
'name2': fields.char('Short Description (2)', size=64),
'lot_type': fields.selection(_type_get, 'Object category', size=64),
- 'author_right': fields.many2one('account.tax', 'Author rights'),
- 'lot_est1': fields.float('Minimum Estimation'),
- 'lot_est2': fields.float('Maximum Estimation'),
- 'lot_num': fields.integer('List Number', required=True, select=1),
+ 'author_right': fields.many2one('account.tax', 'Author rights', help="Account Tax For Author Commission"),
+ 'lot_est1': fields.float('Minimum Estimation', help="Minimum Estimate Price Of Objects"),
+ 'lot_est2': fields.float('Maximum Estimation', help="Maximum Estimate Price Of Objects"),
+ 'lot_num': fields.integer('List Number', required=True, select=1, help="List Number For selected Object in Deposit"),
'create_uid': fields.many2one('res.users', 'Created by', readonly=True),
'history_ids':fields.one2many('auction.lot.history', 'lot_id', 'Auction history'),
- 'lot_local':fields.char('Location', size=64),
+ 'lot_local':fields.char('Location', size=64, help="Auction Location"),
'artist_id':fields.many2one('auction.artists', 'Artist/Author'),
- 'artist2_id':fields.many2one('auction.artists', 'Artist/Author 2'),
+ 'artist2_id':fields.many2one('auction.artists', 'Artist/Author2'),
'important':fields.boolean('To be Emphatized'),
'product_id':fields.many2one('product.product', 'Product', required=True),
'obj_desc': fields.text('Object Description'),
'obj_num': fields.integer('Catalog Number'),
- 'obj_ret': fields.float('Price retired'),
+ 'obj_ret': fields.float('Price retired', help="Objects Ret"),
'obj_comm': fields.boolean('Commission'),
- 'obj_price': fields.float('Adjudication price'),
+ 'obj_price': fields.float('Adjudication price', help="Objects Price"),
'ach_avance': fields.float('Buyer Advance'),
'ach_login': fields.char('Buyer Username', size=64),
- 'ach_uid': fields.many2one('res.partner', 'Buyer'),
- 'ach_emp': fields.boolean('Taken Away', readonly=True),
- 'is_ok': fields.boolean('Buyer\'s payment'),
+ 'ach_uid': fields.many2one('res.partner', 'Buyer'),
+ 'seller_id': fields.related('bord_vnd_id','partner_id', type='many2one', relation='res.partner', string='Seller', readonly=True, help="Seller who is related to depositor Inventory"),
+ 'ach_emp': fields.boolean('Taken Away', readonly=True, help="When This Field is True means, Objects is taken away by Buyer"),
+ 'is_ok': fields.boolean('Buyer\'s payment', help="When Buyer Pay For Account Bank statement', This field is selected as True."),
'ach_inv_id': fields.many2one('account.invoice', 'Buyer Invoice', readonly=True, states={'draft':[('readonly', False)]}),
'sel_inv_id': fields.many2one('account.invoice', 'Seller Invoice', readonly=True, states={'draft':[('readonly', False)]}),
'vnd_lim': fields.float('Seller limit'),
'vnd_lim_net': fields.boolean('Net limit ?', readonly=True),
- 'image': fields.binary('Image'),
- 'paid_vnd':fields.function(_getprice, string='Seller Paid', method=True, type='boolean', store=True, multi="paid_vnd"),
- 'paid_ach':fields.function(_getprice, string='Buyer invoice reconciled', method=True, type='boolean', store=True, multi="paid_ach"),
+ 'image': fields.binary('Image', help="Object Image"),
+ 'paid_vnd':fields.function(_getprice, string='Seller Paid', method=True, type='boolean', store=True, multi="paid_vnd", help="When state of Seller Invoice is 'Paid', This field is selected as True."),
+ 'paid_ach':fields.function(_getprice, string='Buyer Invoice Reconciled', method=True, type='boolean', store=True, multi="paid_ach", help="When state of Buyer Invoice is 'Paid', This field is selected as True."),
'state': fields.selection((
('draft', 'Draft'),
('unsold', 'Unsold'),
@@ -386,14 +388,14 @@ class auction_lots(osv.osv):
\n* The \'Unsold\' state is used when object does not sold for long time, user can also set it as draft state after unsold. \
\n* The \'Paid\' state is used when user pay for the object \
\n* The \'Sold\' state is used when user buy the object.'),
- 'buyer_price': fields.function(_getprice, method=True, string='Buyer price', store=True, multi="buyer_price"),
- 'seller_price': fields.function(_getprice, method=True, string='Seller price', store=True, multi="seller_price"),
- 'gross_revenue':fields.function(_getprice, method=True, string='Gross revenue', store=True, multi="gross_revenue"),
- 'gross_margin':fields.function(_getprice, method=True, string='Gross Margin (%)', store=True, multi="gross_margin"),
- 'costs':fields.function(_getprice, method=True, string='Indirect costs', store=True, multi="costs"),
- 'statement_id': fields.many2many('account.bank.statement.line', 'auction_statement_line_rel', 'auction_id', 'statement', 'Payment'),
- 'net_revenue':fields.function(_getprice, method=True, string='Net revenue', store=True, multi="net_revenue"),
- 'net_margin':fields.function(_getprice, method=True, string='Net Margin (%)', store=True, multi="net_margin"),
+ 'buyer_price': fields.function(_getprice, method=True, string='Buyer price', store=True, multi="buyer_price", help="Objects Price which Buyer Given For Objects"),
+ 'seller_price': fields.function(_getprice, method=True, string='Seller price', store=True, multi="seller_price", help="Seller Price"),
+ 'gross_revenue':fields.function(_getprice, method=True, string='Gross revenue', store=True, multi="gross_revenue", help="Revenue Minus Cost Of Objects Sold."),
+ 'gross_margin':fields.function(_getprice, method=True, string='Gross Margin (%)', store=True, multi="gross_margin", help="Gross Income Divided by Net Sales"),
+ 'costs':fields.function(_getprice, method=True, string='Indirect costs', store=True, multi="costs", help="Total credit of analytic account"),
+ 'statement_id': fields.many2many('account.bank.statement.line', 'auction_statement_line_rel', 'auction_id', 'statement', 'Payment', help="Account Bank statement Line For Given Buyer"),
+ 'net_revenue':fields.function(_getprice, method=True, string='Net revenue', store=True, multi="net_revenue", help="Total Revenue Minus Returns"),
+ 'net_margin':fields.function(_getprice, method=True, string='Net Margin (%)', store=True, multi="net_margin", help="The ratio of net profits to revenues"),
}
_defaults = {
'state':lambda *a: 'draft',
diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml
index 6079081c417..4972d605cbe 100644
--- a/addons/auction/auction_view.xml
+++ b/addons/auction/auction_view.xml
@@ -111,7 +111,7 @@
Auction lots
@@ -246,57 +245,90 @@
+
+
+
+ form
diff --git a/addons/auction/wizard/auction_lots_make_invoice.py b/addons/auction/wizard/auction_lots_make_invoice.py
index 8e463937c50..5d32e644283 100644
--- a/addons/auction/wizard/auction_lots_make_invoice.py
+++ b/addons/auction/wizard/auction_lots_make_invoice.py
@@ -31,7 +31,7 @@ class auction_lots_make_invoice(osv.osv_memory):
_description = "Make invoice"
_columns = {
- 'amount': fields.float('Invoiced Amount', required =True, readonly=True),
+ 'amount': fields.float('Invoiced Amount', required =True, readonly=True, help="Seller Price"),
'objects':fields.integer('# of objects', required =True, readonly=True),
'number':fields.char('Invoice Number', size=64),
}
diff --git a/addons/auction/wizard/auction_lots_make_invoice_buyer.py b/addons/auction/wizard/auction_lots_make_invoice_buyer.py
index 1c36570129c..5eb9a649556 100644
--- a/addons/auction/wizard/auction_lots_make_invoice_buyer.py
+++ b/addons/auction/wizard/auction_lots_make_invoice_buyer.py
@@ -25,14 +25,12 @@ class auction_lots_make_invoice_buyer(osv.osv_memory):
_name = "auction.lots.make.invoice.buyer"
_description = __doc__
-
_columns= {
- 'amount': fields.float('Invoiced Amount', required =True, readonly=True),
+ 'amount': fields.float('Invoiced Amount', required =True, readonly=True, help="Buyer Price"),
'objects':fields.integer('# of objects', required =True, readonly=True),
'number':fields.char('Invoice Number', size=64),
'buyer_id':fields.many2one('res.partner', 'Buyer', required=True),
}
-
_defaults={
'number': lambda *a: False,
}
diff --git a/addons/auction/wizard/auction_lots_make_invoice_buyer_view.xml b/addons/auction/wizard/auction_lots_make_invoice_buyer_view.xml
index d71cfb59414..8ec4746dcf8 100644
--- a/addons/auction/wizard/auction_lots_make_invoice_buyer_view.xml
+++ b/addons/auction/wizard/auction_lots_make_invoice_buyer_view.xml
@@ -6,16 +6,18 @@
auction.lots.make.invoice.buyer
form
-