diff --git a/addons/account/__terp__.py b/addons/account/__terp__.py
index 3930b9b3e11..94f023e0cab 100644
--- a/addons/account/__terp__.py
+++ b/addons/account/__terp__.py
@@ -35,9 +35,7 @@
Customer and Supplier Invoices
Bank statements
""",
- 'author': 'Tiny',
'website': 'http://www.openerp.com',
- 'depends': ['product', 'base', 'process'],
'init_xml': [],
'update_xml': [
'security/account_security.xml',
diff --git a/addons/account/account.py b/addons/account/account.py
index b6dd4bfb11b..bfd48d55b00 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -2152,7 +2152,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
for key,value in todo_dict.items():
if value['account_collected_id'] or value['account_paid_id']:
- obj_acc_tax.write(cr, uid, [key], vals={
+ obj_acc_tax.write(cr, uid, [key], {
'account_collected_id': acc_template_ref[value['account_collected_id']],
'account_paid_id': acc_template_ref[value['account_paid_id']],
})
diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 56c4ddba96e..63baf5165e4 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -124,7 +124,7 @@ class account_bank_statement(osv.osv):
states={'confirm':[('readonly', True)]}),
'move_line_ids': fields.one2many('account.move.line', 'statement_id',
'Entry lines', states={'confirm':[('readonly',True)]}),
- 'state': fields.selection([('draft', 'Draft'),('confirm', 'Confirm')],
+ 'state': fields.selection([('draft', 'Draft'),('confirm', 'Confirmed')],
'State', required=True,
states={'confirm': [('readonly', True)]}, readonly="1"),
'currency': fields.function(_currency, method=True, string='Currency',
@@ -157,7 +157,7 @@ class account_bank_statement(osv.osv):
if not st.state=='draft':
continue
- if not (abs(st.balance_end - st.balance_end_real) < 0.0001):
+ if not (abs((st.balance_end or 0.0) - st.balance_end_real) < 0.0001):
raise osv.except_osv(_('Error !'),
_('The statement balance is incorrect !\n') +
_('The expected balance (%.2f) is different than the computed one. (%.2f)') % (st.balance_end_real, st.balance_end))
@@ -578,11 +578,13 @@ class account_bank_statement_line(osv.osv):
'note': fields.text('Notes'),
'reconcile_amount': fields.function(_reconcile_amount,
string='Amount reconciled', method=True, type='float'),
+ 'sequence': fields.integer('Sequence'),
}
_defaults = {
'name': lambda self,cr,uid,context={}: self.pool.get('ir.sequence').get(cr, uid, 'account.bank.statement.line'),
'date': lambda *a: time.strftime('%Y-%m-%d'),
'type': lambda *a: 'general',
+ 'sequence': lambda *a: 10,
}
account_bank_statement_line()
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 6d14f25427c..d7ca374a64c 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -179,7 +179,7 @@
-
+
@@ -188,7 +188,7 @@
-
+
@@ -269,7 +269,7 @@
-
+
@@ -318,6 +318,29 @@
+
+ account.invoice.select
+ account.invoice
+ search
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Invoices
account.invoice
@@ -325,6 +348,7 @@
tree,form,calendar,graph
{'type':'out_invoice'}
+
@@ -347,6 +371,7 @@
[('type','=','out_invoice')]
{'type':'out_invoice'}
+
@@ -369,7 +394,7 @@
[('type','=','out_invoice')]
{'type':'out_invoice'}
-
+
Supplier Invoices
@@ -379,6 +404,7 @@
[('type','=','in_invoice')]
{'type':'in_invoice'}
+
@@ -390,7 +416,7 @@
[('type','=','in_invoice')]
{'type':'in_invoice'}
-
+
Customer Refunds
@@ -400,6 +426,7 @@
[('type','=','out_refund')]
{'type':'out_refund'}
+
@@ -412,7 +439,7 @@
[('type','=','out_refund')]
{'type':'out_refund'}
-
+
Supplier Refunds
@@ -422,6 +449,7 @@
[('type','=','in_refund')]
{'type':'in_refund'}
+
@@ -434,7 +462,7 @@
[('type','=','in_refund')]
{'type':'in_refund'}
-
+
@@ -444,6 +472,8 @@
tree,form,calendar,graph
[('state','=','draft'),('type','=','out_invoice')]
{'type':'out_invoice'}
+
+
@@ -457,7 +487,7 @@
-
+
PRO-FORMA Customer Invoices
@@ -466,6 +496,8 @@
tree,form,calendar,graph
[('state','=','proforma2'),('type','=','out_invoice')]
{'type':'out_invoice'}
+
+
@@ -479,7 +511,7 @@
-
+
Unpaid Customer Invoices
@@ -488,6 +520,8 @@
tree,form,calendar,graph
[('state','not in',['draft','cancel']),('reconciled','=',False),('type','=','out_invoice')]
{'type':'out_invoice'}
+
+
@@ -501,7 +535,7 @@
-
+
Draft Supplier Invoices
@@ -510,6 +544,8 @@
tree,form,calendar,graph
[('state','=','draft'),('type','=','in_invoice')]
{'type':'in_invoice'}
+
+
@@ -523,7 +559,7 @@
-
+
Unpaid Supplier Invoices
@@ -532,6 +568,8 @@
tree,form,calendar,graph
[('state','not in',['draft','cancel']),('reconciled','=',False),('type','=','in_invoice')]
{'type':'in_invoice'}
+
+
@@ -545,7 +583,7 @@
-
+
Draft Customer Refunds
@@ -554,6 +592,8 @@
tree,form,calendar,graph
[('state','=','draft'),('type','=','out_refund')]
{'type':'out_refund'}
+
+
@@ -567,7 +607,7 @@
-
+
Unpaid Customer Refunds
@@ -576,6 +616,8 @@
tree,form,calendar,graph
[('state','not in',['draft','cancel']),('reconciled','=',False),('type','=','out_refund')]
{'type':'out_refund'}
+
+
@@ -589,7 +631,7 @@
-
+
Draft Supplier Refunds
@@ -598,6 +640,8 @@
tree,form,calendar,graph
[('state','=','draft'),('type','=','in_refund')]
{'type':'in_refund'}
+
+
@@ -611,7 +655,7 @@
-
+
Unpaid Supplier Refunds
@@ -620,6 +664,8 @@
tree,form,calendar,graph
[('state','not in',['draft','cancel']),('reconciled','=',False),('type','=','in_refund')]
{'type':'in_refund'}
+
+
@@ -633,7 +679,7 @@
-
+
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 1ed28ff2588..49ebdd8ea11 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -659,8 +659,8 @@ class account_move_line(osv.osv):
return j+(p and (':'+p) or '')
return False
- def fields_view_get(self, cr, uid, view_id=None, view_type='form', context={}, toolbar=False):
- result = super(osv.osv, self).fields_view_get(cr, uid, view_id,view_type,context,toolbar=toolbar)
+ def fields_view_get(self, cr, uid, view_id=None, view_type='form', context={}, toolbar=False, submenu=False):
+ result = super(osv.osv, self).fields_view_get(cr, uid, view_id,view_type,context,toolbar=toolbar, submenu=submenu)
if view_type=='tree' and 'journal_id' in context:
title = self.view_header_get(cr, uid, view_id, view_type, context)
journal = self.pool.get('account.journal').browse(cr, uid, context['journal_id'])
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 8353695f76e..2be40d868d9 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -30,8 +30,8 @@
-
-
+
+
@@ -78,7 +78,7 @@
-
+
@@ -323,7 +323,7 @@
+ string="Import Invoice" type="action" attrs="{'invisible':[('state','=','confirm')]}" icon="gtk-open"/>
@@ -332,6 +332,7 @@
+
@@ -351,6 +352,7 @@
+
@@ -363,9 +365,9 @@
-
-
-
+
+
+
@@ -384,8 +386,9 @@
form
tree,form
[('state','=','draft')]
+
-
+
New Statement
@@ -422,7 +425,7 @@
-
+
@@ -884,8 +887,8 @@
-
-
+
+
@@ -984,8 +987,8 @@
-
-
+
+
@@ -1110,7 +1113,7 @@
-
+
@@ -1255,8 +1258,8 @@
-
-
+
+
@@ -1264,7 +1267,7 @@
-
+
@@ -1283,8 +1286,9 @@
form
tree,form
[('state','=','running')]
+
-
+
New Subscription
diff --git a/addons/account/product.py b/addons/account/product.py
index f061e22cb14..f9ae9598e69 100644
--- a/addons/account/product.py
+++ b/addons/account/product.py
@@ -34,7 +34,7 @@ class product_category(osv.osv):
string="Income Account",
method=True,
view_load=True,
- help="This account will be used to value incoming stock for the current product category"),
+ help="This account will be used to value incoming stock(i.e. credit of incoming goods) for the current product category"),
'property_account_expense_categ': fields.property(
'account.account',
type='many2one',
@@ -42,7 +42,7 @@ class product_category(osv.osv):
string="Expense Account",
method=True,
view_load=True,
- help="This account will be used to value outgoing stock for the current product category"),
+ help="This account will be used to value outgoing stock(i.e. debit of outgoing goods) for the current product category"),
}
product_category()
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 02842c47333..94e311db9c5 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -24,7 +24,7 @@
tree
child_ids
-
+
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
index 8d9ffff97f9..cd2148c7255 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
@@ -43,9 +43,10 @@
form
tree,form,graph
[('user_id','=',uid),('state','=','open')]
+
-
+
My Pending Accounts
@@ -53,9 +54,10 @@
form
tree,form,graph
[('user_id','=',uid),('state','=','pending')]
+
-
+
New Analytic Account
@@ -101,8 +103,9 @@
tree,form,graph
[('state','=','open')]
+
-
+
Pending Analytic Accounts
@@ -111,8 +114,9 @@
tree,form,graph
[('state','=','pending')]
+
-
+
diff --git a/addons/account_analytic_plans/account_analytic_plans.py b/addons/account_analytic_plans/account_analytic_plans.py
index 393c681dc01..6132baee654 100644
--- a/addons/account_analytic_plans/account_analytic_plans.py
+++ b/addons/account_analytic_plans/account_analytic_plans.py
@@ -133,9 +133,9 @@ class account_analytic_plan_instance(osv.osv):
ids = self.search(cr, uid, args, limit=limit, context=context or {})
return self.name_get(cr, uid, ids, context or {})
- def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False):
+ def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
wiz_id = self.pool.get('ir.actions.wizard').search(cr, uid, [("wiz_name","=","create.model")])
- res = super(account_analytic_plan_instance,self).fields_view_get(cr, uid, view_id, view_type, context, toolbar)
+ res = super(account_analytic_plan_instance,self).fields_view_get(cr, uid, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
if (res['type']=='form'):
plan_id = False
diff --git a/addons/account_budget/crossovered_budget.py b/addons/account_budget/crossovered_budget.py
index 93cf7c9bd93..54b6de41648 100644
--- a/addons/account_budget/crossovered_budget.py
+++ b/addons/account_budget/crossovered_budget.py
@@ -44,9 +44,12 @@ class account_budget_post(osv.osv):
'dotation_ids': fields.one2many('account.budget.post.dotation', 'post_id', 'Spreading'),
'account_ids': fields.many2many('account.account', 'account_budget_rel', 'budget_id', 'account_id', 'Accounts'),
'crossovered_budget_line': fields.one2many('crossovered.budget.lines', 'general_budget_id', 'Budget Lines'),
+ 'sequence': fields.integer('Sequence'),
}
_defaults = {
+ 'sequence': lambda *a: 1,
}
+ _order = "sequence, name"
def spread(self, cr, uid, ids, fiscalyear_id=False, amount=0.0):
dobj = self.pool.get('account.budget.post.dotation')
@@ -228,7 +231,7 @@ class crossovered_budget_lines(osv.osv):
res = {}
for line in self.browse(cr, uid, ids):
if line.theoritical_amount<>0.00:
- res[line.id]=float(line.practical_amount / line.theoritical_amount)*100
+ res[line.id]=float(line.practical_amount or 0.0 / line.theoritical_amount)*100
else:
res[line.id]=0.00
return res
diff --git a/addons/account_budget/crossovered_budget_view.xml b/addons/account_budget/crossovered_budget_view.xml
index 6e30323c39d..5c6c527543e 100644
--- a/addons/account_budget/crossovered_budget_view.xml
+++ b/addons/account_budget/crossovered_budget_view.xml
@@ -19,6 +19,7 @@
tree
+
@@ -67,12 +68,13 @@
-
-
-
-
+
+
+
+
diff --git a/addons/account_payment/payment_view.xml b/addons/account_payment/payment_view.xml
index 36009a105bd..b1ad3d54f53 100644
--- a/addons/account_payment/payment_view.xml
+++ b/addons/account_payment/payment_view.xml
@@ -96,7 +96,7 @@
-
+
@@ -190,8 +190,9 @@
form
tree,form
[('state','=','draft')]
+
-
+
Payment Orders to Validate
@@ -199,8 +200,9 @@
form
tree,form
[('state','=','open')]
+
-
+
New Payment Order
@@ -291,7 +293,7 @@
-
+
diff --git a/addons/account_report/account.py b/addons/account_report/account.py
index 29a2fe08f0f..4a7b1efd05b 100644
--- a/addons/account_report/account.py
+++ b/addons/account_report/account.py
@@ -59,9 +59,9 @@ class account_report(osv.osv):
def _calc_context(key,obj):
if key==0:
- return obj.find(cr,uid,exception=False)
+ return obj.find(cr, uid, exception=False)
else:
- obj_key=obj.browse(cr,uid,obj.find(cr,uid,exception=False))
+ obj_key=obj.browse(cr,uid,obj.find(cr, uid, exception=False))
if isinstance(obj_key,list):
obj_key=obj_key[0]
key_ids=obj.search(cr,uid,[('date_stop','<',obj_key.date_start)])
diff --git a/addons/account_voucher/account.py b/addons/account_voucher/account.py
index 4006cde9863..33ebecbc08a 100644
--- a/addons/account_voucher/account.py
+++ b/addons/account_voucher/account.py
@@ -256,4 +256,4 @@ class account_account_template(osv.osv):
account_account_template()
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account_voucher/report/rml_parse.py b/addons/account_voucher/report/rml_parse.py
index 31bd26617cd..66362754457 100644
--- a/addons/account_voucher/report/rml_parse.py
+++ b/addons/account_voucher/report/rml_parse.py
@@ -162,5 +162,4 @@ class rml_parse(report_sxw.rml_parse):
rml_head = rml_head.replace('',''' [[company.logo]] ''')
return True
-
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account_voucher/voucher.py b/addons/account_voucher/voucher.py
index d1dc30c6b67..69709f8bc23 100755
--- a/addons/account_voucher/voucher.py
+++ b/addons/account_voucher/voucher.py
@@ -248,7 +248,8 @@ class account_voucher(osv.osv):
ref = inv.reference
else:
ref = self._convert_ref(cr, uid, inv.number)
-
+
+ acc_id = None
date = inv.date
total_currency = 0
acc_id = None
diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml
index bbaa12a3601..39217968ef7 100644
--- a/addons/auction/auction_view.xml
+++ b/addons/auction/auction_view.xml
@@ -76,7 +76,7 @@
=======================================================
-Auction Management/Auction Dates/New Auction Dates
+ Auction Management/Auction Dates/New Auction Dates
=======================================================
Auction dates
@@ -114,7 +114,7 @@ Auction Management/Auction Dates/New Auction Dates
-
+
@@ -150,8 +150,8 @@ Auction Management/Auction Dates/New Auction Dates
-=======================================================
-Auction Management/Auction Dates/Reporting
+ =======================================================
+ Auction Management/Auction Dates/Reporting
=======================================================
@@ -287,11 +287,11 @@ Auction Management/Auction Dates/Reporting
-
-
-
-
-
+
+
+
+
+
@@ -369,28 +369,31 @@ Auction Management/Auction Dates/Reporting
auction.lots
form
[('state','=','sold')]
+
-
+
auction.lots
form
tree,form
[('state','<>','sold')]
+
-
+
auction.lots
form
tree,form
[('auction_id','=', False),('state','=','draft')]
+
-
+
@@ -400,12 +403,14 @@ Auction Management/Auction Dates/Reporting
auction.lots
form
[('state','=','unsold')]
+
+ id="menu_all_objects_unsold"
+ groups="base.group_extended_menu"/>
@@ -449,11 +454,11 @@ Auction Management/Auction Dates/Reporting
-
-
-
-
-
+
+
+
+
+
report.unclassified.objects
form
tree,form
+
-
+
Auction.deposit.tree
diff --git a/addons/auction/wizard/wizard_auction_invoice_buyer.py b/addons/auction/wizard/wizard_auction_invoice_buyer.py
index 2cf68656d8c..3de71962774 100644
--- a/addons/auction/wizard/wizard_auction_invoice_buyer.py
+++ b/addons/auction/wizard/wizard_auction_invoice_buyer.py
@@ -66,9 +66,12 @@ def _values(self,cr,uid, datas,context={}):
def _makeInvoices(self, cr, uid, data, context):
- order_obj = pooler.get_pool(cr.dbname).get('auction.lots')
newinv = []
pool = pooler.get_pool(cr.dbname)
+ order_obj = pool.get('auction.lots')
+ mod_obj = pool.get('ir.model.data')
+ result = mod_obj._get_id(cr, uid, 'account', 'view_account_invoice_filter')
+ id = mod_obj.read(cr, uid, result, ['res_id'])
lots= order_obj.browse(cr,uid,data['ids'])
invoice_number=data['form']['number']
for lot in lots:
@@ -84,7 +87,8 @@ def _makeInvoices(self, cr, uid, data, context):
'res_model': 'account.invoice',
'view_id': False,
'context': "{'type':'in_refund'}",
- 'type': 'ir.actions.act_window'
+ 'type': 'ir.actions.act_window',
+ 'search_view_id': id['res_id']
}
return {}
diff --git a/addons/auction/wizard/wizard_auction_journal.py b/addons/auction/wizard/wizard_auction_journal.py
index 93e742cfc62..0ce0a14ae5c 100644
--- a/addons/auction/wizard/wizard_auction_journal.py
+++ b/addons/auction/wizard/wizard_auction_journal.py
@@ -64,7 +64,11 @@ def _values(self,cr,uid, datas,context={}):
def _makeInvoices(self, cr, uid, data, context):
- order_obj = pooler.get_pool(cr.dbname).get('auction.lots')
+ pool = pooler.get_pool(cr.dbname)
+ order_obj = pool.get('auction.lots')
+ mod_obj = pool.get('ir.model.data')
+ result = mod_obj._get_id(cr, uid, 'account', 'view_account_invoice_filter')
+ id = mod_obj.read(cr, uid, result, ['res_id'])
newinv = []
ids = order_obj.seller_trans_create(cr, uid, data['ids'],context)
cr.commit()
@@ -76,7 +80,8 @@ def _makeInvoices(self, cr, uid, data, context):
'res_model': 'account.invoice',
'view_id': False,
'context': "{'type':'out_refund'}",
- 'type': 'ir.actions.act_window'
+ 'type': 'ir.actions.act_window',
+ 'search_view_id': id['res_id']
}
return {}
diff --git a/addons/audittrail/audittrail.py b/addons/audittrail/audittrail.py
index ee23e790e7b..a7ae0f59075 100644
--- a/addons/audittrail/audittrail.py
+++ b/addons/audittrail/audittrail.py
@@ -22,11 +22,11 @@
import ir
-from osv import fields,osv
+from osv import fields, osv
import netsvc
import pooler
import string
-import time,copy
+import time, copy
from tools.translate import _
class audittrail_rule(osv.osv):
diff --git a/addons/base_contact/base_contact.py b/addons/base_contact/base_contact.py
index b00a5745935..b29bff9c5ac 100644
--- a/addons/base_contact/base_contact.py
+++ b/addons/base_contact/base_contact.py
@@ -49,10 +49,16 @@ class res_partner_contact(osv.osv):
'function_id':fields.related('job_ids','function_id',type='many2one', relation='res.partner.function', string='Main Function'),
'job_id':fields.related('job_ids',type='many2one', relation='res.partner.job', string='Main Job'),
'email': fields.char('E-Mail', size=240),
+ 'comment' : fields.text('Notes', translate=True),
+ 'photo' : fields.binary('Image'),
+
}
_defaults = {
'active' : lambda *a: True,
}
+
+ _order = "name,first_name"
+
def name_get(self, cr, user, ids, context={}):
#will return name and first_name.......
if not len(ids):
@@ -117,20 +123,20 @@ class res_partner_job(osv.osv):
_description ='Contact Partner Function'
_order = 'sequence_contact'
_columns = {
- 'name': fields.related('address_id','partner_id', type='many2one', relation='res.partner', string='Partner'),
- 'address_id':fields.many2one('res.partner.address','Address'),
+ 'name': fields.related('address_id','partner_id', type='many2one', relation='res.partner', string='Partner', help="You may enter Address first,Partner will be linked automatically if any."),
+ 'address_id':fields.many2one('res.partner.address','Address', help='Address which is linked to the Partner'),
'contact_id':fields.many2one('res.partner.contact','Contact', required=True, ondelete='cascade'),
- 'function_id': fields.many2one('res.partner.function','Partner Function'),
+ 'function_id': fields.many2one('res.partner.function','Partner Function', 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 of this job title in the list of job title of the linked partner'),
- 'email': fields.char('E-Mail', size=240),
- 'phone': fields.char('Phone', size=64),
- 'fax': fields.char('Fax', size=64),
+ 'email': fields.char('E-Mail', size=240, help="Job E-Mail"),
+ 'phone': fields.char('Phone', size=64, help="Job Phone no."),
+ 'fax': fields.char('Fax', size=64, help="Job FAX no."),
'extension': fields.char('Extension', size=64, help='Internal/External extension phone number'),
'other': fields.char('Other', size=64, help='Additional phone field'),
- 'date_start' : fields.date('Date Start'),
- 'date_stop' : fields.date('Date Stop'),
- 'state' : fields.selection([('past', 'Past'),('current', 'Current')], 'State', required=True),
+ 'date_start' : fields.date('Date Start',help="Start date of job(Joining Date)"),
+ 'date_stop' : fields.date('Date Stop', help="Last date of job"),
+ 'state' : fields.selection([('past', 'Past'),('current', 'Current')], 'State', required=True, help="Status of Address"),
}
_defaults = {
diff --git a/addons/base_contact/base_contact_demo.xml b/addons/base_contact/base_contact_demo.xml
index 9dbac13dcf0..1945e1dd899 100644
--- a/addons/base_contact/base_contact_demo.xml
+++ b/addons/base_contact/base_contact_demo.xml
@@ -1,4 +1,4 @@
-
+
diff --git a/addons/base_contact/base_contact_view.xml b/addons/base_contact/base_contact_view.xml
index 9b2a9c179fc..58650e3eed7 100644
--- a/addons/base_contact/base_contact_view.xml
+++ b/addons/base_contact/base_contact_view.xml
@@ -1,4 +1,4 @@
-
+
@@ -32,29 +32,36 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -74,6 +81,12 @@
+
+
+
+
+
+
@@ -101,21 +114,20 @@
diff --git a/addons/base_module_record/__terp__.py b/addons/base_module_record/__terp__.py
index 8c6edb399a3..9b9cbca2bf0 100644
--- a/addons/base_module_record/__terp__.py
+++ b/addons/base_module_record/__terp__.py
@@ -22,7 +22,7 @@
{
- 'name': 'Module Recorder',
+ 'name': 'Module Record',
'version': '1.0',
'category': 'Generic Modules/Base',
'description': """
@@ -39,10 +39,8 @@ This should help you to easily create reusable and publishable modules
for custom configurations and demo/testing data.
How to use it:
-1. Start the recording
-2. Do stuff in your Open ERP client
-3. Stop the recording session
-4. Export to a reusable module
+Run Administration/Customization/Module Creation/Export Customizations As a Module wizard.
+Select datetime critearea of recording and objects to be recorded and Record module.
""",
'author': 'Tiny',
'website': 'http://www.openerp.com',
diff --git a/addons/base_module_record/base_module_record.py b/addons/base_module_record/base_module_record.py
index d9cf8368528..144c7f2c80e 100644
--- a/addons/base_module_record/base_module_record.py
+++ b/addons/base_module_record/base_module_record.py
@@ -39,7 +39,7 @@ class recording_objects_proxy(objects_proxy):
pool = pooler.get_pool(args[0])
mod = pool.get('ir.module.record')
if mod and mod.recording:
- if args[4] not in ('default_get','read','fields_view_get','fields_get','search','search_count','name_search','name_get','get','request_get', 'get_sc'):
+ if args[4] in ('copy','write','unlink','create'):
if _old_args is not None:
args[5].update(_old_args)
if args[5]:
@@ -198,6 +198,8 @@ class base_module_record(osv.osv):
if mod_fields[key]['type'] == 'many2one':
if type(data[key])==type(True) or type(data[key])==type(1):
result[key]=data[key]
+ elif not data[key]:
+ result[key] = False
else:
result[key]=data[key][0]
diff --git a/addons/base_module_record/base_module_record_wizard.xml b/addons/base_module_record/base_module_record_wizard.xml
index abced76678a..8eb9c48fac9 100644
--- a/addons/base_module_record/base_module_record_wizard.xml
+++ b/addons/base_module_record/base_module_record_wizard.xml
@@ -1,57 +1,19 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -74,7 +74,7 @@
-
+
diff --git a/addons/base_report_designer/__terp__.py b/addons/base_report_designer/__terp__.py
index c66be0ec379..9782fba2786 100644
--- a/addons/base_report_designer/__terp__.py
+++ b/addons/base_report_designer/__terp__.py
@@ -32,9 +32,9 @@ OpenOffice.
'author': 'Tiny',
'website': 'http://www.openerp.com',
'depends': ['base'],
- 'init_xml': [],
+ 'init_xml': ['base_report_data.xml'],
'update_xml': ['base_report_designer_wizard.xml'],
- 'demo_xml': ['base_report_data.xml'],
+ 'demo_xml': [],
'installable': True,
'active': False,
'certificate': '0056379010493',
diff --git a/addons/base_report_designer/base_report_data.xml b/addons/base_report_designer/base_report_data.xml
index 865a1181a22..f709e6c7be7 100644
--- a/addons/base_report_designer/base_report_data.xml
+++ b/addons/base_report_designer/base_report_data.xml
@@ -7,5 +7,14 @@
+
+
+
+
+
+
+
+
+
diff --git a/addons/base_report_designer/wizard/tiny_sxw2rml/normalized_odt2rml.xsl b/addons/base_report_designer/wizard/tiny_sxw2rml/normalized_odt2rml.xsl
index 644f9209968..50ffb3d81be 100644
--- a/addons/base_report_designer/wizard/tiny_sxw2rml/normalized_odt2rml.xsl
+++ b/addons/base_report_designer/wizard/tiny_sxw2rml/normalized_odt2rml.xsl
@@ -649,16 +649,16 @@
- Times-BoldItalic
+ Helvetica-BoldOblique
- Times-Bold
+ Helvetica-Bold
- Times-Italic
+ Helvetica-Oblique
- Times-Roman
+ Helvetica
@@ -666,7 +666,7 @@
- Times-Roman
+ Helvetica
diff --git a/addons/base_report_designer/wizard/tiny_sxw2rml/normalized_oo2rml.xsl b/addons/base_report_designer/wizard/tiny_sxw2rml/normalized_oo2rml.xsl
index 097564eaccc..66ef0b5b53c 100644
--- a/addons/base_report_designer/wizard/tiny_sxw2rml/normalized_oo2rml.xsl
+++ b/addons/base_report_designer/wizard/tiny_sxw2rml/normalized_oo2rml.xsl
@@ -650,16 +650,16 @@
- Times-BoldItalic
+ Helvetica-BoldOblique
- Times-Bold
+ Helvetica-Bold
- Times-Italic
+ Helvetica-Oblique
- Times-Roman
+ Helvetica
@@ -667,7 +667,7 @@
- Times-Roman
+ Helvetica
diff --git a/addons/board/board.py b/addons/board/board.py
index c6bb5d158aa..120ebbf5600 100644
--- a/addons/board/board.py
+++ b/addons/board/board.py
@@ -86,9 +86,9 @@ class board_board(osv.osv):
return id
- def fields_view_get(self, cr, user, view_id=None, view_type='form', context=None, toolbar=False):
+ def fields_view_get(self, cr, user, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
res = {}
- res = super(board_board, self).fields_view_get(cr, user, view_id, view_type, context, toolbar)
+ res = super(board_board, self).fields_view_get(cr, user, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
vids = self.pool.get('ir.ui.view.custom').search(cr, user, [('user_id','=',user), ('ref_id','=',view_id)])
if vids:
diff --git a/addons/board/board_view.xml b/addons/board/board_view.xml
index e196f5cc682..5904607223a 100644
--- a/addons/board/board_view.xml
+++ b/addons/board/board_view.xml
@@ -57,7 +57,7 @@
@@ -125,6 +152,7 @@
+
@@ -142,6 +170,7 @@
+
@@ -157,6 +186,8 @@
+
+
@@ -180,6 +211,7 @@
+
@@ -204,7 +236,6 @@
-
crm.case.log.tree
@@ -268,6 +299,12 @@
+
+
+
+
+
+
@@ -291,49 +328,27 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
@@ -348,8 +363,6 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ crm.case.select
+ crm.case
+ search
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
All Cases
crm.case
form
+
@@ -379,9 +437,10 @@
crm.case
form
[('state','<>','done'),('state','<>','cancel'),('state','<>','pending')]
+
+
-
-
+
My cases
@@ -389,19 +448,20 @@
form
tree,form,calendar
[('user_id','=',uid)]
+
+
-
+
My Open Cases
crm.case
form
tree,form,calendar
[('user_id','=',uid),('state','<>','done'),('state','<>','cancel'),('state','<>','pending')]
+
+
-
-
-
-
+
crm.case.section.open
@@ -418,7 +478,6 @@
-
crm.case.history.form
crm.case.history
@@ -492,8 +551,10 @@
crm.segmentation
form
-
@@ -69,6 +71,9 @@
tree,calendar
+
+
+
@@ -88,7 +93,7 @@
-
+
Open Bugs
@@ -97,6 +102,9 @@
tree,calendar
+
+
+
@@ -116,7 +124,7 @@
-
+
Bugs With Patches Waiting Approval
@@ -125,6 +133,9 @@
tree,calendar
+
+
+
@@ -144,7 +155,7 @@
-
+
Bugs Not Fixed
@@ -153,6 +164,9 @@
tree,calendar
+
+
+
@@ -172,7 +186,7 @@
-
+
Pending Bugs
@@ -181,6 +195,9 @@
tree,calendar
+
+
+
@@ -200,7 +217,7 @@
-
+
Planned For Future Release
@@ -209,6 +226,9 @@
tree,calendar
+
+
+
@@ -228,8 +248,7 @@
-
-
+
Waiting For Reporter Response
@@ -238,6 +257,9 @@
tree,calendar
+
+
+
@@ -257,8 +279,7 @@
-
-
+
Old Bugs
@@ -267,6 +288,9 @@
tree,calendar
+
+
+
@@ -286,7 +310,7 @@
-
@@ -296,6 +320,9 @@
tree,calendar
+
+
+
@@ -315,15 +342,16 @@
-
+
-
+
New Bug
crm.case
form
form,tree
+
@@ -337,7 +365,7 @@
-
+
My Open Bugs
@@ -346,6 +374,9 @@
tree,calendar
+
+
+
@@ -365,7 +396,7 @@
-
+
My Bugs With Patches
@@ -374,6 +405,9 @@
tree,calendar
+
+
+
@@ -393,7 +427,7 @@
-
+
My Bugs Not Fixed
@@ -402,6 +436,9 @@
tree,calendar
+
+
+
@@ -421,18 +458,20 @@
-
+
- All Feature Request
+ All Feature Requests
crm.case
form
tree,calendar
+
+
@@ -461,6 +500,7 @@
form,tree
+
@@ -474,8 +514,7 @@
-
-
+
Feature Requests Waiting Approval
@@ -484,6 +523,9 @@
tree,calendar
+
+
+
@@ -503,7 +545,7 @@
-
+
Open Feature Requests
crm.case
@@ -511,6 +553,9 @@
tree,calendar
+
+
+
@@ -530,7 +575,7 @@
-
+
Pending Feature Requests
@@ -539,6 +584,9 @@
tree,calendar
+
+
+
@@ -558,7 +606,7 @@
-
+
Planned For Future Release
@@ -567,6 +615,9 @@
tree,calendar
+
+
+
@@ -586,7 +637,7 @@
-
+
Waiting For Reporter Response
@@ -595,6 +646,9 @@
tree,calendar
+
+
+
@@ -614,7 +668,7 @@
-
+
Old Feature Requests
@@ -623,6 +677,9 @@
tree,calendar
+
+
+
@@ -642,7 +699,7 @@
-
+
diff --git a/addons/crm_configuration/crm_bugs_view.xml b/addons/crm_configuration/crm_bugs_view.xml
index c06909de707..a1908c0689e 100644
--- a/addons/crm_configuration/crm_bugs_view.xml
+++ b/addons/crm_configuration/crm_bugs_view.xml
@@ -36,53 +36,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
-
@@ -95,8 +65,6 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -127,10 +118,63 @@
+
+
+
+
+
+
-
+
+
+ crm.case.bugs.select
+ crm.case
+ search
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ crm.case.feature.request.select
+ crm.case
+ search
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
CRM - Bug Tracker Calendar
crm.case
calendar
diff --git a/addons/crm_configuration/crm_claims_menu.xml b/addons/crm_configuration/crm_claims_menu.xml
index 6dab67767e9..9f98aaeffcd 100644
--- a/addons/crm_configuration/crm_claims_menu.xml
+++ b/addons/crm_configuration/crm_claims_menu.xml
@@ -11,6 +11,8 @@
tree,calendar
+
+
@@ -39,6 +41,9 @@
tree,form,calendar
+
+
+
@@ -58,7 +63,7 @@
-
+
Claims
@@ -66,6 +71,7 @@
form
+
@@ -73,7 +79,7 @@
-
+
My Unclosed Claims
@@ -81,6 +87,9 @@
tree,calendar,form
+
+
+
@@ -100,13 +109,15 @@
-
+
My Open Claims
crm.case
tree,calendar,form
+
+
@@ -126,10 +137,10 @@
-
+
-
+
All Unclosed Claims
@@ -137,6 +148,9 @@
tree,calendar,form
+
+
+
@@ -156,7 +170,7 @@
-
+
diff --git a/addons/crm_configuration/crm_claims_view.xml b/addons/crm_configuration/crm_claims_view.xml
index 525122140ab..b1464baad79 100644
--- a/addons/crm_configuration/crm_claims_view.xml
+++ b/addons/crm_configuration/crm_claims_view.xml
@@ -18,6 +18,11 @@
+
+
+
+
+
@@ -41,6 +46,7 @@
+
@@ -50,63 +56,33 @@
-
+
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
+
+
+
+
+
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -137,5 +149,29 @@
-
+
+ crm.case.claims.select
+ crm.case
+ search
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/crm_configuration/crm_config.py b/addons/crm_configuration/crm_config.py
index e4916f3551d..bc66e3354f3 100644
--- a/addons/crm_configuration/crm_config.py
+++ b/addons/crm_configuration/crm_config.py
@@ -68,12 +68,12 @@ class crm_cases(osv.osv):
'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_id','=',section_id)]"),
'category2_id': fields.many2one('crm.case.category2', 'Category Name', domain="[('section_id','=',section_id)]"),
'duration': fields.float('Duration'),
- 'note': fields.text('Note'),
'case_id': fields.many2one('crm.case', 'Related Case'),
'partner_name': fields.char('Employee Name', size=64),
'partner_name2': fields.char('Employee Email', size=64),
'partner_phone': fields.char('Phone', size=32),
'partner_mobile': fields.char('Mobile', size=32),
+ 'child_ids': fields.one2many('crm.case', 'case_id', 'Events'),
}
def stage_next(self, cr, uid, ids, context={}):
@@ -119,7 +119,7 @@ class crm_menu_config_wizard(osv.osv_memory):
_columns = {
'name': fields.char('Name', size=64),
'meeting': fields.boolean('Calendar of Meetings', help="Manages the calendar of meetings of the users."),
- 'lead': fields.boolean('Leads', help="Allows you to track and manage leads which are pre-sales requests or contacts, the very first contact with a customer request."),
+ 'lead': fields.boolean('Prospect', help="Allows you to track and manage leads which are pre-sales requests or contacts, the very first contact with a customer request."),
'opportunity': fields.boolean('Business Opportunities', help="Tracks identified business opportunities for your sales pipeline."),
'jobs': fields.boolean('Jobs Hiring Process', help="Help you to organise the jobs hiring process: evaluation, meetings, email integration..."),
'document_ics': fields.boolean('Shared Calendar', help=" Will allow you to synchronise your Open ERP calendars with your phone, outlook, Sunbird, ical, ..."),
diff --git a/addons/crm_configuration/crm_config_view.xml b/addons/crm_configuration/crm_config_view.xml
index 03b70146083..a4066bdd47f 100644
--- a/addons/crm_configuration/crm_config_view.xml
+++ b/addons/crm_configuration/crm_config_view.xml
@@ -63,6 +63,20 @@
+
+
+ crm.case.calendar.section
+ crm.case
+ calendar
+
+
+
+
+
+
+
+
+
# ------------------------------------------------------
# Stage
# ------------------------------------------------------
diff --git a/addons/crm_configuration/crm_configuration_wizard.xml b/addons/crm_configuration/crm_configuration_wizard.xml
index 25a06d8364a..8bacfa6b68d 100644
--- a/addons/crm_configuration/crm_configuration_wizard.xml
+++ b/addons/crm_configuration/crm_configuration_wizard.xml
@@ -2,6 +2,12 @@
+
+
+
diff --git a/addons/crm_configuration/crm_fund_menu.xml b/addons/crm_configuration/crm_fund_menu.xml
index daa87ab75c6..44df34c9f06 100644
--- a/addons/crm_configuration/crm_fund_menu.xml
+++ b/addons/crm_configuration/crm_fund_menu.xml
@@ -8,6 +8,8 @@
tree,form,graph
+
+
@@ -37,6 +39,9 @@
tree,form
+
+
+
@@ -56,7 +61,7 @@
-
+
Funds
@@ -64,6 +69,7 @@
form,graph
+
@@ -77,7 +83,7 @@
-
+
My Funds Waiting Validation
@@ -85,6 +91,9 @@
tree,form,graph
+
+
+
@@ -104,7 +113,7 @@
-
+
My Funds To Be Processed
@@ -112,6 +121,9 @@
tree,form,graph
+
+
+
@@ -131,10 +143,10 @@
-
+
-
+
All Funds Waiting Validation
@@ -142,6 +154,9 @@
tree,form,graph
+
+
+
@@ -161,7 +176,7 @@
-
+
All Funds To Be Processed
@@ -169,6 +184,9 @@
tree,form,graph
+
+
+
@@ -188,7 +206,7 @@
-
+
diff --git a/addons/crm_configuration/crm_fund_view.xml b/addons/crm_configuration/crm_fund_view.xml
index e39a9a5d7c3..87919838797 100644
--- a/addons/crm_configuration/crm_fund_view.xml
+++ b/addons/crm_configuration/crm_fund_view.xml
@@ -19,6 +19,12 @@
+
+
+
+
+
+
@@ -49,63 +55,34 @@
-
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
+
+
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -145,5 +145,26 @@
+
+
+ crm.case.fund.select
+ crm.case
+ search
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/crm_configuration/crm_helpdesk_menu.xml b/addons/crm_configuration/crm_helpdesk_menu.xml
index 8d408464f4e..7989897f927 100644
--- a/addons/crm_configuration/crm_helpdesk_menu.xml
+++ b/addons/crm_configuration/crm_helpdesk_menu.xml
@@ -10,6 +10,8 @@
tree,calendar,form
+
+
@@ -37,6 +39,9 @@
tree,calendar,form
+
+
+
@@ -57,7 +62,7 @@
-
+
New Helpdesk
@@ -65,6 +70,7 @@
form,tree
+
@@ -79,7 +85,7 @@
-
+
My Unclosed Requests
@@ -87,6 +93,9 @@
tree,calendar,form
+
+
+
@@ -110,7 +119,7 @@
-
+
My helpdesk Propositions to Review
@@ -118,6 +127,9 @@
tree,calendar,form
+
+
+
@@ -137,7 +149,7 @@
-
+
My Pending helpdesk Requests
@@ -145,6 +157,9 @@
tree,calendar,form
+
+
+
@@ -164,7 +179,7 @@
-
+
My Open Helpdesk Requests
@@ -172,6 +187,9 @@
tree,calendar,form
+
+
+
@@ -191,7 +209,7 @@
-
+
@@ -200,6 +218,7 @@
calendar,tree,form
+
@@ -219,13 +238,13 @@
-
+
-
+
@@ -234,6 +253,9 @@
tree,calendar,form
+
+
+
@@ -253,7 +275,7 @@
-
+
All Helpdesk Propositions
@@ -261,6 +283,9 @@
tree,calendar,form
+
+
+
@@ -280,7 +305,7 @@
-
+
All Pending Helpdesk Requests
@@ -288,6 +313,9 @@
tree,calendar,form
+
+
+
@@ -307,7 +335,7 @@
-
+
@@ -316,6 +344,9 @@
tree,calendar,form
+
+
+
@@ -335,7 +366,7 @@
-
+
Calendar of Helpdesk
@@ -343,6 +374,7 @@
calendar,tree,form
+
@@ -362,7 +394,7 @@
-
+
diff --git a/addons/crm_configuration/crm_jobs_menu.xml b/addons/crm_configuration/crm_jobs_menu.xml
index 83ef45b370b..06762cae4a9 100644
--- a/addons/crm_configuration/crm_jobs_menu.xml
+++ b/addons/crm_configuration/crm_jobs_menu.xml
@@ -10,6 +10,8 @@
tree,calendar,form,graph
+
+
@@ -49,6 +51,9 @@
tree,calendar,form,graph
+
+
+
@@ -74,7 +79,7 @@
-
+
New Job Request
@@ -82,6 +87,7 @@
form,tree
+
@@ -107,6 +113,9 @@
tree,calendar,form,graph
+
+
+
@@ -132,7 +141,7 @@
-
+
My Jobs Propositions to Review
@@ -140,6 +149,9 @@
tree,calendar,form,graph
+
+
+
@@ -169,7 +181,7 @@
parent="menu_crm_case_categ0_act_myjobs3"
id="menu_crm_case_categ0_act_myjobs2"
action="crm_case_categ0_act_my2"
- groups="base.group_extended"/>
+ groups="base.group_extended_menu"/>
My Pending Jobs Requests
@@ -177,6 +189,9 @@
tree,calendar,form,graph
+
+
+
@@ -204,7 +219,7 @@
+ groups="base.group_extended_menu"/>
My Open Jobs Requests
@@ -212,6 +227,9 @@
tree,calendar,form,graph
+
+
+
@@ -239,7 +257,7 @@
+ groups="base.group_extended_menu"/>
Calendar Of My Interviews
@@ -247,6 +265,7 @@
calendar,tree,form,graph
+
@@ -272,7 +291,7 @@
-
+
- Leads
- leads
+ Prospects
+ prospects
diff --git a/addons/crm_configuration/crm_lead_menu.xml b/addons/crm_configuration/crm_lead_menu.xml
index b84646bad20..6127d36b35a 100644
--- a/addons/crm_configuration/crm_lead_menu.xml
+++ b/addons/crm_configuration/crm_lead_menu.xml
@@ -6,11 +6,13 @@
- All Leads
+ All Prospects
crm.case
tree,form
+
+
@@ -24,15 +26,18 @@
-
-
+
+
- Current Leads
+ Current Prospects
crm.case
tree,form
+
+
+
@@ -46,14 +51,17 @@
-
+
- Unassigned Leads
+ Unassigned Prospects
crm.case
tree,form
+
+
+
@@ -70,14 +78,18 @@
+ action="crm_case_category_act_leads_unassigned"
+ groups="base.group_extended_menu"/>
- All Draft Leads
+ All Draft Prospects
crm.case
tree,form
+
+
+
@@ -91,14 +103,17 @@
-
+
- All Open Leads
+ All Prospects to Qualify
crm.case
tree,form
+
+
+
@@ -112,14 +127,17 @@
-
+
- All Pending Leads
+ All Pending Prospects
crm.case
tree,form
+
+
+
@@ -133,15 +151,18 @@
-
+
- My Leads
+ My Prospects
crm.case
tree,form
+
+
+
@@ -155,15 +176,16 @@
-
+
- New Lead
+ New Prospect
crm.case
form
form,tree
+
@@ -180,11 +202,14 @@
- My Current Leads
+ My Current Prospects
crm.case
tree,form
+
+
+
@@ -198,14 +223,17 @@
-
+
- My Open Leads
+ My Prospects to Qualify
crm.case
tree,form
+
+
+
@@ -219,14 +247,17 @@
-
+
- My Pending Leads
+ My Pending Prospects
crm.case
tree,form
+
+
+
@@ -240,18 +271,20 @@
-
+
-
+
report.crm.case.user
form
graph,tree
+
-
+
+
@@ -259,22 +292,25 @@
form
graph,tree
+
-
+
report.crm.case.section.stage
form
graph,tree
+
-
+
report.crm.case.section.categ.stage
form
tree
+
@@ -283,6 +319,7 @@
form
tree
+
diff --git a/addons/crm_configuration/crm_lead_view.xml b/addons/crm_configuration/crm_lead_view.xml
index 8a8e76916ff..eb171394414 100644
--- a/addons/crm_configuration/crm_lead_view.xml
+++ b/addons/crm_configuration/crm_lead_view.xml
@@ -3,31 +3,31 @@
# ------------------------------------------------------
- # Leads
+ # Prospects
# ------------------------------------------------------
- CRM - Leads Form
+ CRM - Prospects Form
crm.case
form
-
- CRM - Leads Tree
+ CRM - Prospects Tree
crm.case
tree
-
+
-
+
-
+
+
+
+
+
+
+
- CRM - Leads Calendar
+ CRM - Prospects Calendar
crm.case
calendar
-
+
+
+
+ crm.case.leads.select
+ crm.case
+ search
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/crm_configuration/crm_meeting_demo.xml b/addons/crm_configuration/crm_meeting_demo.xml
index 52622cd9ee4..d491e1449fd 100644
--- a/addons/crm_configuration/crm_meeting_demo.xml
+++ b/addons/crm_configuration/crm_meeting_demo.xml
@@ -12,7 +12,7 @@
-
+
@@ -49,7 +49,7 @@
-
+
diff --git a/addons/crm_configuration/crm_meeting_menu.xml b/addons/crm_configuration/crm_meeting_menu.xml
index 5d75c4be201..c918efacf76 100644
--- a/addons/crm_configuration/crm_meeting_menu.xml
+++ b/addons/crm_configuration/crm_meeting_menu.xml
@@ -7,12 +7,13 @@
name="Schedule a Meeting"
res_model="crm.case"
src_model="res.partner"
- view_mode="calendar,tree,form"
+ view_mode="calendar,tree,form,gantt"
context="{'default_partner_id': active_id, 'default_duration': 4.0}"
domain="[('section_id','=','Meetings')]"/>
+
@@ -33,12 +34,19 @@
-
+
+
+ gantt
+
+
+
crm.case
- calendar,tree,form
+ calendar,tree,form,gantt
+
+
@@ -58,6 +66,12 @@
+
+
+ gantt
+
+
+
crm.case
- calendar,tree,form,graph
+ calendar,tree,form,graph,gantt
+
+
+
@@ -87,6 +104,12 @@
+
+
+ gantt
+
+
+
@@ -94,7 +117,7 @@
crm.case
form
form,tree
-
+
@@ -124,9 +147,10 @@
Next Meetings
crm.case
form
- tree,calendar,form
+ tree,calendar,form,gantt
+
@@ -146,6 +170,11 @@
-
+
+
+ gantt
+
+
+
diff --git a/addons/crm_configuration/crm_meeting_view.xml b/addons/crm_configuration/crm_meeting_view.xml
index f0f43a107af..6f5ebcd9e88 100644
--- a/addons/crm_configuration/crm_meeting_view.xml
+++ b/addons/crm_configuration/crm_meeting_view.xml
@@ -21,88 +21,82 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -122,6 +116,9 @@
+
+
+
@@ -138,5 +135,40 @@
-
+
+
+ CRM - Meetings Gantt
+ crm.case
+ gantt
+
+
+
+
+
+
+
+
+
+
+ crm.case.meetings.select
+ crm.case
+ search
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/crm_configuration/crm_opportunity_menu.xml b/addons/crm_configuration/crm_opportunity_menu.xml
index f312da8e072..120ed288f92 100644
--- a/addons/crm_configuration/crm_opportunity_menu.xml
+++ b/addons/crm_configuration/crm_opportunity_menu.xml
@@ -6,15 +6,11 @@
All Opportunities
crm.case
- tree,form,calendar,graph
+ tree,form,graph
-
-
-
- calendar
-
-
+
+
@@ -38,14 +34,17 @@
-
+
All Open Opportunities
crm.case
- tree,calendar,form,graph
+ tree,form,graph
+
+
+
@@ -53,12 +52,6 @@
-
-
- calendar
-
-
-
form
@@ -71,15 +64,18 @@
-
+
All Unassigned Opportunities
crm.case
- tree,calendar,form,graph
+ tree,form,graph
+
+
+
@@ -87,12 +83,6 @@
-
-
- calendar
-
-
-
form
@@ -105,22 +95,18 @@
-
+
My Opportunities
crm.case
- tree,calendar,form,graph
-
+ tree,form,graph
-
-
-
- calendar
-
-
+
+
+
@@ -140,15 +126,16 @@
-
+
Opportunity
crm.case
form
- form,tree,calendar
+ form,tree
+
@@ -162,11 +149,6 @@
-
-
- calendar
-
-
@@ -186,12 +171,6 @@
-
-
- calendar
-
-
-
form
@@ -204,14 +183,17 @@
-
+
My Pending Opportunities
crm.case
- tree,calendar,form,graph
+ tree,form,graph
+
+
+
@@ -219,12 +201,6 @@
-
-
- calendar
-
-
-
form
@@ -237,7 +213,7 @@
-
+
@@ -245,6 +221,7 @@
form
graph,tree
+
@@ -254,6 +231,7 @@
form
graph,tree
+
@@ -262,6 +240,7 @@
form
graph,tree
+
@@ -270,6 +249,7 @@
form
tree
+
@@ -278,6 +258,7 @@
form
tree
+
diff --git a/addons/crm_configuration/crm_opportunity_view.xml b/addons/crm_configuration/crm_opportunity_view.xml
index 018f5d117d0..45ae181368a 100644
--- a/addons/crm_configuration/crm_opportunity_view.xml
+++ b/addons/crm_configuration/crm_opportunity_view.xml
@@ -16,14 +16,16 @@
+
-
-
+
+
@@ -39,65 +41,34 @@
-
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
+
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -125,22 +132,40 @@
-
+
+
+
+
+
+
+
-
- CRM - Opportunities Calendar
+
+ crm.case.opportunities.select
crm.case
- calendar
-
+ search
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/crm_configuration/crm_phonecall_menu.xml b/addons/crm_configuration/crm_phonecall_menu.xml
index d072e0669f6..16e9f552e52 100644
--- a/addons/crm_configuration/crm_phonecall_menu.xml
+++ b/addons/crm_configuration/crm_phonecall_menu.xml
@@ -22,6 +22,7 @@
tree,calendar
+
@@ -50,6 +51,8 @@
tree,calendar
+
+
@@ -78,6 +81,7 @@
tree
+
@@ -91,7 +95,7 @@
-
+
Planned Calls
@@ -99,7 +103,10 @@
form
tree,calendar
-
+
+
+
+
@@ -119,7 +126,7 @@
-
+
################################################################
@@ -129,6 +136,7 @@
tree,calendar
+
@@ -170,7 +178,7 @@
-
+
Planned Calls
@@ -178,7 +186,9 @@
form
tree,calendar
-
+
+
+
@@ -198,7 +208,7 @@
-
+
Calls Not Held
@@ -207,6 +217,8 @@
tree,calendar
+
+
@@ -226,7 +238,7 @@
-
+
diff --git a/addons/crm_configuration/crm_phonecall_view.xml b/addons/crm_configuration/crm_phonecall_view.xml
index af73dfc8907..8b7a0605754 100644
--- a/addons/crm_configuration/crm_phonecall_view.xml
+++ b/addons/crm_configuration/crm_phonecall_view.xml
@@ -19,6 +19,11 @@
+
+
+
+
+
@@ -29,14 +34,22 @@
form
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -134,6 +140,79 @@
-
+
+
+
+ crm.case.phonecalls.select
+ crm.case
+ search
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ crm.case.inbound.phonecalls.select
+ crm.case
+ search
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ crm.case.outbound.phonecalls.select
+ crm.case
+ search
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/crm_configuration/process/crm_configuration_process.xml b/addons/crm_configuration/process/crm_configuration_process.xml
index 048e7101a87..6fb1533c7b0 100755
--- a/addons/crm_configuration/process/crm_configuration_process.xml
+++ b/addons/crm_configuration/process/crm_configuration_process.xml
@@ -19,7 +19,7 @@
-
+
@@ -63,8 +63,8 @@
-
-
+
+
@@ -72,7 +72,7 @@
-
+
diff --git a/addons/crm_configuration/report/crm_report.py b/addons/crm_configuration/report/crm_report.py
index 1d1b6753a46..c05e3af63e7 100644
--- a/addons/crm_configuration/report/crm_report.py
+++ b/addons/crm_configuration/report/crm_report.py
@@ -26,7 +26,7 @@ import tools.sql
AVAILABLE_STATES = [
('draft','Draft'),
('open','Open'),
- ('cancel', 'Canceled'),
+ ('cancel', 'Cancelled'),
('done', 'Closed'),
('pending','Pending')
]
diff --git a/addons/crm_configuration/wizard/__init__.py b/addons/crm_configuration/wizard/__init__.py
index 3fbc5f7ef54..3be034d69c5 100644
--- a/addons/crm_configuration/wizard/__init__.py
+++ b/addons/crm_configuration/wizard/__init__.py
@@ -23,4 +23,6 @@
import meeting_planify
import wizard_partner_create
import wizard_opportunity_set
+import schedule_phone_call
+import wizard_history_event
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_configuration/wizard/meeting_planify.py b/addons/crm_configuration/wizard/meeting_planify.py
index f2044987ac3..1fad9f9770f 100644
--- a/addons/crm_configuration/wizard/meeting_planify.py
+++ b/addons/crm_configuration/wizard/meeting_planify.py
@@ -50,14 +50,48 @@ class make_meeting(wizard.interface):
def _makeMeeting(self, cr, uid, data, context):
pool = pooler.get_pool(cr.dbname)
-
case_obj = pool.get('crm.case')
- new_id = case_obj.write(cr, uid, data['id'], {
+ sec_obj = pool.get('crm.case.section')
+ meeting_id = sec_obj.search(cr, uid, [('code','=','Mtngs')])
+ if not meeting_id:
+ raise wizard.except_wizard(_('Error !'),
+ _('You did not installed the Meetings when you configured the crm_configuration module.' \
+ '\nyou must create a section with the code \'Mtngs\'.'
+ ))
+ for case in case_obj.browse(cr, uid, data['ids']):
+ new_id=case_obj.copy(cr, uid, case.id)
+ modif = {
'date': data['form']['date'],
- 'duration': data['form']['duration']
- }, context=context)
- case_obj._history(cr, uid, case_obj.browse(cr, uid, [data['id']]), _('meeting'))
- return {}
+ 'duration': data['form']['duration'],
+ 'case_id': case.id,
+ }
+ if meeting_id:
+ modif['section_id']=meeting_id[0]
+ new_id = case_obj.write(cr, uid, [new_id], modif, context=context)
+# case_obj._history(cr, uid, case_obj.browse(cr, uid, data['ids']), _('meeting'))
+ data_obj = pool.get('ir.model.data')
+ result = data_obj._get_id(cr, uid, 'crm_configuration', 'view_crm_case_meetings_filter')
+ id = data_obj.read(cr, uid, result, ['res_id'])
+ id1 = data_obj._get_id(cr, uid, 'crm_configuration', 'crm_case_calendar_view_meet')
+ id2 = data_obj._get_id(cr, uid, 'crm_configuration', 'crm_case_form_view_meet')
+ id3 = data_obj._get_id(cr, uid, 'crm_configuration', 'crm_case_tree_view_meet')
+ if id1:
+ id1 = data_obj.browse(cr, uid, id1, context=context).res_id
+ 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
+ return {
+ 'domain':"[('section_id','=','Meetings')]",
+ 'name': _('Meetings'),
+ 'view_type': 'form',
+ 'view_mode': 'calendar,form,tree',
+ 'res_model': 'crm.case',
+ 'view_id': False,
+ 'views': [(id1,'calendar'),(id2,'form'),(id3,'tree'),(False,'graph')],
+ 'type': 'ir.actions.act_window',
+ 'search_view_id': id['res_id']
+ }
states = {
'init': {
diff --git a/addons/crm_configuration/wizard/schedule_phone_call.py b/addons/crm_configuration/wizard/schedule_phone_call.py
new file mode 100644
index 00000000000..53da7f3bf11
--- /dev/null
+++ b/addons/crm_configuration/wizard/schedule_phone_call.py
@@ -0,0 +1,128 @@
+# -*- encoding: 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 _
+
+case_form = """
+"""
+
+case_fields = {
+ 'user_id' : {'string' : 'Assign To', 'type' : 'many2one', 'relation' : 'res.users'},
+ 'deadline' : {'string' : 'Planned Date', 'type' : 'datetime', 'required' : True},
+ 'note' : {'string' : 'Goals', 'type' : 'text'},
+ 'category_id' : {'string' : 'Category', 'type' : 'many2one', 'relation' : 'crm.case.categ', 'required' : True},
+ 'section_id' : {'string' : 'Section', 'type' : 'many2one', 'relation' : 'crm.case.section', 'required' : True},
+
+}
+
+class reschedule_phone_call(wizard.interface):
+ def _default_values(self, cr, uid, data, context):
+ case_obj = pooler.get_pool(cr.dbname).get('crm.case')
+ sec_obj = pooler.get_pool(cr.dbname).get('crm.case.section')
+ sec_id = sec_obj.search(cr, uid, [('code', '=', 'Phone')])
+
+ if not sec_id:
+ raise wizard.except_wizard(_('Error !'),
+ _('You did not installed the Phone Calls when you configured the crm_configuration module.' \
+ '\nyou must create a section with the code \'Phone\'.'
+ ))
+ categ_id=pooler.get_pool(cr.dbname).get('crm.case.categ').search(cr, uid, [('name','=','Outbound')])
+ case = case_obj.browse(cr, uid, data['ids'][0])
+ 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,
+ 'deadline' : time.strftime('%Y-%m-%d %H:%M:%S'),
+ 'section_id' : sec_id and sec_id[0],
+ '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, 'crm_configuration', 'view_crm_case_phonecalls_filter')
+ res = mod_obj.read(cr, uid, result, ['res_id'])
+ case_obj = pool.get('crm.case')
+
+ # Select the view
+
+ data_obj = pool.get('ir.model.data')
+ id2 = data_obj._get_id(cr, uid, 'crm_configuration', 'crm_case_phone_tree_view')
+ id3 = data_obj._get_id(cr, uid, 'crm_configuration', '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
+
+ # We duplicate the current object
+ for id in data['ids']:
+ new_case = case_obj.copy(cr, uid, id, {'case_id':id,'user_id':form['user_id'],'categ_id':form['category_id'],'description':form['note'],'date' : form['deadline'], 'section_id' : form['section_id']}, context=context)
+ # Don't forget to cancel the current object,
+ for case in case_obj.browse(cr, uid, data['ids']):
+ if case.section_id.code == 'Phone':
+ case_obj.write(cr, uid, [case.id], {'state' : 'cancel'})
+ value = {
+ 'domain': "[('section_id','=',%d)]"%form['section_id'],
+ 'name': _('Phone Call'),
+ 'view_type': 'form',
+ 'view_mode': 'tree,form',
+ 'res_model': 'crm.case',
+# 'view_id': id2,
+ 'views': [(id2,'tree'),(id3,'form'),(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'}
+ }
+ }
+
+reschedule_phone_call('crm.case.reschedule_phone_call')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_configuration/wizard/wizard_history_event.py b/addons/crm_configuration/wizard/wizard_history_event.py
new file mode 100644
index 00000000000..c082628664a
--- /dev/null
+++ b/addons/crm_configuration/wizard/wizard_history_event.py
@@ -0,0 +1,55 @@
+# -*- encoding: 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 wizard
+import pooler
+import time
+
+def _open_history_event(self, cr, uid, data, context):
+ pool = pooler.get_pool(cr.dbname)
+ data_obj = pool.get('ir.model.data')
+ result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_filter')
+ id = data_obj.read(cr, uid, result, ['res_id'])
+ id2 = data_obj._get_id(cr, uid, 'crm_configuration', 'crm_case_calendar_section-view')
+ if id2:
+ id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+ return {
+ 'name': 'History : ' + pooler.get_pool(cr.dbname).get(data['model']).browse(cr,uid,data['ids'])[0].name,
+ 'view_type': 'form',
+ "view_mode": 'calendar, tree, form',
+ 'view_id' : False,
+ 'views': [(id2,'calendar'),(False,'form'),(False,'tree'),(False,'graph')],
+ 'res_model': 'crm.case',
+ 'type': 'ir.actions.act_window',
+ 'domain': "[('case_id','=',%d)]" % (data['id']),
+ 'search_view_id': id['res_id']
+ }
+
+class case_history_event(wizard.interface):
+ states = {
+ 'init': {
+ 'actions': [],
+ 'result': {'type': 'action', 'action': _open_history_event, 'state':'end'}
+ }
+ }
+
+case_history_event('crm.case.history.events')
\ No newline at end of file
diff --git a/addons/crm_configuration/wizard/wizard_opportunity_set.py b/addons/crm_configuration/wizard/wizard_opportunity_set.py
index 6d3527feda4..1768697d931 100644
--- a/addons/crm_configuration/wizard/wizard_opportunity_set.py
+++ b/addons/crm_configuration/wizard/wizard_opportunity_set.py
@@ -28,18 +28,38 @@ import ir
import pooler
from tools.translate import _
+partner_form = """
+"""
+
+partner_fields = {
+ 'action': {'type':'selection',
+ 'selection':[('exist','Link to an existing partner'),('create','Create a new partner')],
+ 'string':'Action', 'required':True, 'default': lambda *a:'create'},
+ 'partner_id' : {'type':'many2one', 'relation':'res.partner', 'string':'Partner'},
+}
+
case_form = """
"""
case_fields = {
- 'name': {'type':'char', 'size':64, 'string':'Opportunity Summary'},
+ 'name': {'type':'char', 'size':64, 'string':'Opportunity Summary', 'required':True},
'planned_revenue': {'type':'float', 'digits':(16,2), 'string': 'Expected Revenue'},
'probability': {'type':'float', 'digits':(16,2), 'string': 'Success Probability'},
+ 'partner_id' : {'type':'many2one', 'relation':'res.partner', 'string':'Partner'},
}
@@ -50,51 +70,118 @@ class make_opportunity(wizard.interface):
case_obj = pool.get('crm.case')
for case in case_obj.browse(cr, uid, data['ids']):
if not case.partner_id:
- raise wizard.except_wizard(_('Warning !'),
- _('You must assign a partner to this lead before converting to opportunity.\n' \
- 'You can use the convert to partner button.'))
- return {'name': case.name, 'probability': case.probability or 20.0, 'planned_revenue':case.planned_revenue}
+ return 'create_partner'
+ return {'name': case.name, 'probability': case.probability or 20.0,
+ 'planned_revenue':case.planned_revenue, 'partner_id':case.partner_id.id}
+
+ def _selectChoice(self, cr, uid, data, context):
+ pool = pooler.get_pool(cr.dbname)
+ case_obj = pool.get('crm.case')
+ for case in case_obj.browse(cr, uid, data['ids']):
+ if not case.partner_id:
+ return 'create_partner'
+ return 'opportunity'
def _makeOrder(self, cr, uid, data, context):
pool = pooler.get_pool(cr.dbname)
- section_obj = pool.get('crm.case.section')
data_obj = pool.get('ir.model.data')
+ result = data_obj._get_id(cr, uid, 'crm_configuration', 'view_crm_case_opportunities_filter')
+ res = data_obj.read(cr, uid, result, ['res_id'])
+ section_obj = pool.get('crm.case.section')
id = section_obj.search(cr, uid, [('code','=','oppor')], context=context)
if not id:
raise wizard.except_wizard(_('Error !'),
_('You did not installed the opportunities tracking when you configured the crm_configuration module.' \
- '\nI can not convert the lead to an opportunity, you must create a section with the code \'oppor\'.'
+ '\nYou can not convert the prospect to an opportunity, you must create a section with the code \'oppor\'.'
))
id = id[0]
id2 = data_obj._get_id(cr, uid, 'crm_configuration', 'crm_case_form_view_oppor')
+ id3 = data_obj._get_id(cr, uid, 'crm_configuration', '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
case_obj = pool.get('crm.case')
- case_obj._history(cr, uid, case_obj.browse(cr, uid, [data['id']]), 'convert')
- case_obj.write(cr, uid, data['ids'], {
+ new_pros=case_obj.copy(cr, uid, data['id'])
+# case_obj._history(cr, uid, case_obj.browse(cr, uid, [new_pros]), 'convert')
+ case_obj.write(cr, uid, [new_pros], {
'section_id': id,
'name': data['form']['name'],
'planned_revenue': data['form']['planned_revenue'],
'probability': data['form']['probability'],
+ 'partner_id': data['form']['partner_id'],
+ 'case_id':data['id'],
+ 'state':'open',
+ })
+ case_obj.write(cr, uid, [data['id']], {
+ 'partner_id': data['form']['partner_id'],
+ 'state':'done',
})
value = {
- 'domain': "[]",
+ 'domain': "[('section_id','=',%d)]"%(id),
'name': _('Opportunity'),
'view_type': 'form',
'view_mode': 'form,tree',
'res_model': 'crm.case',
- 'res_id': int(data['ids'][0]),
+ 'res_id': int(new_pros),
'view_id': False,
- 'views': [(id2,'form'),(False,'tree'),(False,'calendar'),(False,'graph')],
+ 'views': [(id2,'form'),(id3,'tree'),(False,'calendar'),(False,'graph')],
'type': 'ir.actions.act_window',
+ 'search_view_id': res['res_id']
}
return value
+ def _makePartner(self, cr, uid, data, context):
+ pool = pooler.get_pool(cr.dbname)
+ case_obj = pool.get('crm.case')
+ partner_obj = pool.get('res.partner')
+ contact_obj = pool.get('res.partner.address')
+ if data['form']['action']=='create':
+ 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
+ })
+ else:
+ partner = partner_obj.browse(cr,uid,data['form']['partner_id'])
+ partner_id=partner.id
+ contact_id=partner.address and partner.address[0].id
+
+ case_obj.write(cr, uid, data['ids'], {
+ 'partner_id': partner_id,
+ 'partner_address_id': contact_id
+ })
+ return {}
+
states = {
'init': {
+ 'actions': [],
+ 'result': {'type':'choice','next_state':_selectChoice}
+ },
+ 'create_partner': {
+ 'actions': [],
+ 'result': {'type': 'form', 'arch': partner_form, 'fields': partner_fields,
+ 'state' : [('end', 'Cancel', 'gtk-cancel'),('create', 'Continue', 'gtk-go-forward')]}
+ },
+ 'create': {
+ 'actions': [],
+ 'result': {'type': 'action', 'action': _makePartner, 'state':'opportunity' }
+ },
+ 'opportunity': {
'actions': [_selectopportunity],
'result': {'type': 'form', 'arch': case_form, 'fields': case_fields,
'state' : [('end', 'Cancel', 'gtk-cancel'),('confirm', 'Create Opportunity', 'gtk-go-forward')]}
diff --git a/addons/crm_configuration/wizard/wizard_partner_create.py b/addons/crm_configuration/wizard/wizard_partner_create.py
index a5e8e0f47b0..34558e3f1b5 100644
--- a/addons/crm_configuration/wizard/wizard_partner_create.py
+++ b/addons/crm_configuration/wizard/wizard_partner_create.py
@@ -30,13 +30,13 @@ from tools.translate import _
case_form = """
"""
case_fields = {
- 'close': {'type':'boolean', 'string':'Close Lead'}
+ 'close': {'type':'boolean', 'string':'Close Prospect'}
}
@@ -48,11 +48,14 @@ class make_partner(wizard.interface):
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 lead.'))
+ _('A partner is already defined on this prospect.'))
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('crm.case')
partner_obj = pool.get('res.partner')
contact_obj = pool.get('res.partner.address')
@@ -64,7 +67,7 @@ class make_partner(wizard.interface):
partner_id = partner_obj.create(cr, uid, {
'name': case.partner_name or case.name,
'user_id': case.user_id.id,
- 'comment': case.note,
+ 'comment': case.description,
})
contact_id = contact_obj.create(cr, uid, {
'partner_id': partner_id,
@@ -90,6 +93,7 @@ class make_partner(wizard.interface):
'res_id': int(partner_id),
'view_id': False,
'type': 'ir.actions.act_window',
+ 'search_view_id': res['res_id']
}
return value
diff --git a/addons/crm_profiling/crm_profiling_view.xml b/addons/crm_profiling/crm_profiling_view.xml
index 16489e209f6..1f0c3fa4480 100644
--- a/addons/crm_profiling/crm_profiling_view.xml
+++ b/addons/crm_profiling/crm_profiling_view.xml
@@ -65,9 +65,11 @@
@@ -139,7 +141,7 @@
-
+
@@ -164,9 +166,9 @@
-
-
-
+
+
+
diff --git a/addons/crm_vertical/crm_lead_vertical_view.xml b/addons/crm_vertical/crm_lead_vertical_view.xml
index be658f099de..7fd0be28988 100644
--- a/addons/crm_vertical/crm_lead_vertical_view.xml
+++ b/addons/crm_vertical/crm_lead_vertical_view.xml
@@ -2,7 +2,7 @@
@@ -10,7 +10,7 @@
-
+
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 543b194b938..d05aa480367 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -164,9 +164,11 @@
form
tree,form
[('invoice_state','=','2binvoiced'),('state','=','done'),('type','=','out')]
+
{'contact_display': 'partner'}
+
-
+
Generate Draft Invoices On Receptions
@@ -175,8 +177,11 @@
form
tree,form
[('invoice_state','=','2binvoiced'),('state','=','done'),('type','=','in')]
+
+ {'contact_display': 'partner'}
+
-
+
diff --git a/addons/event/event.py b/addons/event/event.py
index 9f12281d8f9..34433683a1a 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -131,7 +131,7 @@ class event(osv.osv):
'register_prospect': fields.function(_get_prospect, method=True, string='Unconfirmed Registrations'),
'date_begin': fields.datetime('Beginning date', required=True),
'date_end': fields.datetime('Ending date', required=True),
- 'state': fields.selection([('draft','Draft'),('confirm','Confirmed'),('done','Done'),('cancel','Canceled')], 'Status', readonly=True, required=True),
+ 'state': fields.selection([('draft','Draft'),('confirm','Confirmed'),('done','Done'),('cancel','Cancelled')], 'Status', readonly=True, required=True),
'mail_auto_registr':fields.boolean('Mail Auto Register',help='Check this box if you want to use the automatic mailing for new registration'),
'mail_auto_confirm':fields.boolean('Mail Auto Confirm',help='Check this box if you want ot use the automatic confirmation emailing or the reminder'),
'mail_registr':fields.text('Registration Email',help='This email will be sent when someone subscribes to the event.'),
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index bb5a4818593..1df91d87cbc 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -73,10 +73,10 @@
-
-
-
-
+
+
+
+
@@ -119,44 +119,47 @@
-
+
+ Events
+ ir.actions.act_window
+ event.event
+ form
+ tree,form
+
+
+
+
+
New event
ir.actions.act_window
event.event
form
form,tree
-
-
-
- Events
- ir.actions.act_window
- event.event
- form
- tree,form
-
-
+
Draft Events
ir.actions.act_window
event.event
[('state','=','draft')]
+
+ action="action_event_view_draft" groups="base.group_extended_menu"/>
Confirmed Events
ir.actions.act_window
event.event
[('state','=','confirm')]
+
+ action="action_event_view_confirm" groups="base.group_extended_menu"/>
@@ -189,7 +192,7 @@
-
+
@@ -199,7 +202,7 @@
-
+
@@ -209,9 +212,9 @@
-
-
-
+
+
+
@@ -230,7 +233,8 @@
-
diff --git a/addons/event_project/wizard/event_task.py b/addons/event_project/wizard/event_task.py
index 8821f389f86..57a9782e151 100644
--- a/addons/event_project/wizard/event_task.py
+++ b/addons/event_project/wizard/event_task.py
@@ -24,6 +24,10 @@ import pooler
from tools.translate import _
def _event_tasks(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, 'project', 'view_task_search_form')
+ id = mod_obj.read(cr, uid, result, ['res_id'])
event_id = data['id']
cr.execute('SELECT project_id FROM event_event WHERE id = %s', (event_id, ))
res = cr.fetchone()
@@ -36,7 +40,8 @@ def _event_tasks(self, cr, uid, data, context):
'view_mode': 'tree,form,calendar',
'res_model': 'project.task',
'context': { },
- 'type': 'ir.actions.act_window'
+ 'type': 'ir.actions.act_window',
+ 'search_view_id': id['res_id']
}
return value
diff --git a/addons/google_map/google_map_view.xml b/addons/google_map/google_map_view.xml
index 453a6b0c556..3fd078ca408 100644
--- a/addons/google_map/google_map_view.xml
+++ b/addons/google_map/google_map_view.xml
@@ -13,7 +13,7 @@
+ string="Map" type="action" icon="gtk-zoom-in"/>
@@ -29,7 +29,7 @@
-
+
@@ -47,7 +47,7 @@
+ string="Map" type="action" icon="gtk-zoom-in"/>
diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 3fe64ea6bba..2a707e79eb6 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -131,7 +131,7 @@ class hr_employee(osv.osv):
'sinid': fields.char('SIN No', size=32),
'otherid': fields.char('Other ID', size=32),
'gender': fields.selection([('',''),('male','Male'),('female','Female')], 'Gender'),
- 'marital': fields.selection([('maried','Maried'),('unmaried','Unmaried'),('divorced','Divorced'),('other','Other')],'Marital Status', size=32),
+ 'marital': fields.selection([('married','Married'),('unmarried','Unmarried'),('divorced','Divorced'),('other','Other')],'Marital Status', size=32),
'address_id': fields.many2one('res.partner.address', 'Working Address'),
'address_home_id': fields.many2one('res.partner.address', 'Home Address'),
diff --git a/addons/hr/hr_department.py b/addons/hr/hr_department.py
index 3fd8fb7321e..a11441e98b6 100644
--- a/addons/hr/hr_department.py
+++ b/addons/hr/hr_department.py
@@ -86,45 +86,65 @@ class res_users(osv.osv):
_inherit = 'res.users'
_description = 'res.users'
- def _parent_compute(self, cr, uid, ids, name, arg, context={}):
+ def _parent_compute(self, cr, uid, ids, name, args, context={}):
result = {}
obj_dept = self.pool.get('hr.department')
- for id in ids:
- ids_dept = obj_dept.search(cr, uid, [('member_ids', 'in', [id])])
+ for user_id in ids:
+ ids_dept = obj_dept.search(cr, uid, [('member_ids', 'in', [user_id])])
parent_ids = []
if ids_dept:
data_dept = obj_dept.read(cr, uid, ids_dept, ['manager_id'])
parent_ids = map(lambda x: x['manager_id'][0], data_dept)
- result[id] = parent_ids
+ result[user_id] = parent_ids
return result
- def _child_compute(self, cr, uid, ids):
- obj_dept = self.pool.get('hr.department')
- child_ids = []
- for id in ids:
- ids_dept = obj_dept.search(cr, uid, [('manager_id', '=', id)])
- if ids_dept:
- data_dept = obj_dept.read(cr, uid, ids_dept, ['member_ids'])
- childs = map(lambda x: x['member_ids'], data_dept)
- childs = tools.flatten(childs)
- if id in childs:
- childs.remove(id)
- child_ids.extend(tools.flatten(childs))
- return child_ids
-
def _parent_search(self, cr, uid, obj, name, args):
parent = []
for arg in args:
if arg[0] == 'parent_id':
parent = arg[2]
- child_ids = self._child_compute(cr, uid, parent)
+ child_ids = self._child_compute(cr, uid, parent,name, args, {})
+ if not child_ids:
+ return [('id', 'in', [0])]
+ return [('id', 'in', child_ids)]
+
+ def _child_compute(self, cr, uid, ids, name, args, context={}):
+ obj_dept = self.pool.get('hr.department')
+ result = {}
+ for manager_id in ids:
+ child_ids = []
+ mgnt_dept_ids = obj_dept.search(cr, uid, [('manager_id', '=', manager_id)])
+ ids_dept = obj_dept.search(cr, uid, [('id', 'child_of', mgnt_dept_ids)])
+ if ids_dept:
+ data_dept = obj_dept.read(cr, uid, ids_dept, ['member_ids'])
+ childs = map(lambda x: x['member_ids'], data_dept)
+ childs = tools.flatten(childs)
+ if manager_id in childs:
+ childs.remove(manager_id)
+ child_ids.extend(tools.flatten(childs))
+ set = {}
+ map(set.__setitem__, child_ids, [])
+ child_ids = set.keys()
+ else:
+ child_ids = []
+ result[manager_id] = child_ids
+ return result
+
+ def _child_search(self, cr, uid, obj, name, args):
+ parent = []
+ for arg in args:
+ if arg[0] == 'child_ids':
+ parent = arg[2]
+ child_ids = self._child_compute(cr, uid, parent,name, args, {})
if not child_ids:
return [('id', 'in', [0])]
return [('id', 'in', child_ids)]
_columns = {
- 'parent_id': fields.function(_parent_compute, relation='res.users',fnct_search=_parent_search, method=True, string="Parent Users", type='many2many'),
- }
+ 'parent_id': fields.function(_parent_compute, relation='res.users',fnct_search=_parent_search, method=True, string="Managers", type='many2many'),
+ 'child_ids': fields.function(_child_compute, relation='res.users', fnct_search=_child_search,method=True, string="Subordinates", type='many2many'),
+ }
+
res_users()
diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml
index cf939258f50..2bd219dcf7d 100644
--- a/addons/hr/hr_department_view.xml
+++ b/addons/hr/hr_department_view.xml
@@ -13,13 +13,13 @@
form
-
-
-
-
-
-
+
+
+
+
+
+
@@ -92,10 +92,33 @@
+
+
+ hr.expense.expense.filter
+ hr.expense.expense
+ search
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
All expenses
hr.expense.expense
form
+
@@ -191,8 +191,9 @@
form
tree,form
[('state','=','open')]
+
-
+
@@ -202,7 +203,7 @@
tree,form
[('user_id', '=', uid)]
-
+
My Draft Ideas
@@ -210,12 +211,13 @@
form
tree,form
[('state','=','draft'),('user_id','=',uid)]
+
-
+ action="action_idea_idea_draft_my"
+ groups="base.group_extended_menu" />
My Open Ideas
@@ -223,11 +225,14 @@
form
tree,form
[('state','=','open'),('user_id','=',uid)]
+
+ action="action_idea_idea_open_my"
+ groups="base.group_extended_menu"
+ />
idea.vote_stat.graph
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index caef74d4540..f5d4c7cd15e 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -127,9 +127,11 @@ class mrp_routing_workcenter(osv.osv):
'name': fields.char('Name', size=64, required=True),
'sequence': fields.integer('Sequence'),
'cycle_nbr': fields.float('Number of Cycle', required=True,
- help="A cycle is defined in the workcenter definition."),
- 'hour_nbr': fields.float('Number of Hours', required=True),
- 'routing_id': fields.many2one('mrp.routing', 'Parent Routing', select=True),
+ help="Time in hours for doing one cycle."),
+ 'hour_nbr': fields.float('Number of Hours', required=True, help="Cost per hour"),
+ 'routing_id': fields.many2one('mrp.routing', 'Parent Routing', select=True,
+ help="routing indicates all the workcenters used, for how long and/or cycles." \
+ "If Routing is indicated then,the third tab of a production order (workcenters) will be automatically pre-completed."),
'note': fields.text('Description')
}
_defaults = {
@@ -186,9 +188,9 @@ class mrp_bom(osv.osv):
'position': fields.char('Internal Ref.', size=64, help="Reference to a position in an external plan."),
'product_id': fields.many2one('product.product', 'Product', required=True),
'product_uos_qty': fields.float('Product UOS Qty'),
- 'product_uos': fields.many2one('product.uom', 'Product UOS'),
+ 'product_uos': fields.many2one('product.uom', 'Product UOS', help="Product UOS (Unit of Sale) is the unit of measurement for the invoicing and promotion of stock."),
'product_qty': fields.float('Product Qty', required=True),
- 'product_uom': fields.many2one('product.uom', 'Product UOM', required=True),
+ 'product_uom': fields.many2one('product.uom', 'Product UOM', required=True, help="UoM (Unit of Measure) is the unit of measurement for the inventory control"),
'product_rounding': fields.float('Product Rounding', help="Rounding applied on the product quantity. For integer only values, put 1.0"),
'product_efficiency': fields.float('Product Efficiency', required=True, help="Efficiency on the production. A factor of 0.9 means a loss of 10% in the production."),
'bom_lines': fields.one2many('mrp.bom', 'bom_id', 'BoM Lines'),
@@ -421,7 +423,7 @@ class mrp_production(osv.osv):
'date_finnished': fields.datetime('End Date'),
'bom_id': fields.many2one('mrp.bom', 'Bill of Material', domain=[('bom_id','=',False)]),
- 'routing_id': fields.many2one('mrp.routing', string='Routing', on_delete='set null'),
+ 'routing_id': fields.many2one('mrp.routing', string='Routing', on_delete='set null', help="The list of operations (list of workcenters) to produce the finished product. The routing is mainly used to compute workcenter costs during operations and to plan futur loads on workcenters based on production plannification."),
'picking_id': fields.many2one('stock.picking', 'Packing list', readonly=True,
help="This is the internal picking list take bring the raw materials to the production plan."),
@@ -432,7 +434,7 @@ class mrp_production(osv.osv):
'product_lines': fields.one2many('mrp.production.product.line', 'production_id', 'Scheduled goods'),
'workcenter_lines': fields.one2many('mrp.production.workcenter.line', 'production_id', 'Workcenters Utilisation'),
- 'state': fields.selection([('draft','Draft'),('picking_except', 'Packing Exception'),('confirmed','Waiting Goods'),('ready','Ready to Produce'),('in_production','In Production'),('cancel','Canceled'),('done','Done')],'Status', readonly=True),
+ 'state': fields.selection([('draft','Draft'),('picking_except', 'Packing Exception'),('confirmed','Waiting Goods'),('ready','Ready to Produce'),('in_production','In Production'),('cancel','Cancelled'),('done','Done')],'Status', readonly=True),
'hour_total': fields.function(_production_calc, method=True, type='float', string='Total Hours', multi='workorder'),
'cycle_total': fields.function(_production_calc, method=True, type='float', string='Total Cycles', multi='workorder'),
@@ -779,6 +781,7 @@ mrp_production_product_line()
class mrp_procurement(osv.osv):
_name = "mrp.procurement"
_description = "Procurement"
+ _order = 'priority,date_planned'
_columns = {
'name': fields.char('Name', size=64, required=True),
'origin': fields.char('Origin', size=64,
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 83a1b4423a8..04a93ac71ee 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -453,7 +453,7 @@
-
+
@@ -470,13 +470,13 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -518,6 +518,26 @@
+
+
+ mrp.production.select
+ mrp.production
+ search
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Production Orders
ir.actions.act_window
@@ -525,6 +545,7 @@
form
tree,form,calendar,graph,gantt
+
@@ -540,7 +561,7 @@
action="mrp_production_action2_gantt"
id="menu_production_orders_start_gantt"
parent="menu_mrp_production_action"
- sequence="20"/>
+ sequence="20" icon="terp-calendar"/>
Production Orders To Start
@@ -549,8 +570,10 @@
form
tree,form,calendar,graph,gantt
[('state','=','ready')]
+
+
-
+
Production Orders in Progress
ir.actions.act_window
@@ -558,8 +581,10 @@
form
tree,form,calendar,graph,gantt
[('state','=','in_production')]
+
+
-
+
Production Orders Waiting Products
ir.actions.act_window
@@ -567,8 +592,10 @@
form
tree,form,calendar,graph,gantt
[('state','=','confirmed')]
+
+
-
+
New Production Order
@@ -696,11 +723,11 @@
-
-
-
-
-
+
+
+
+
+
@@ -738,7 +765,7 @@
tree,form
[('state','=','confirmed')]
-
+
Exceptions Procurements
@@ -748,7 +775,7 @@
tree,form
[('state','=','exception')]
-
+
Exceptions Procurements to Fix
@@ -758,7 +785,7 @@
tree,form
[('state','=','exception'), ('message', '<>', '')]
-
+
Temporary Procurement Exceptions
@@ -768,7 +795,7 @@
tree,form
[('state','=','exception'), ('message', '=', '')]
-
+
New Procurement
diff --git a/addons/mrp/schedulers.py b/addons/mrp/schedulers.py
index 22bca594c95..4cbd01aa60e 100644
--- a/addons/mrp/schedulers.py
+++ b/addons/mrp/schedulers.py
@@ -58,7 +58,7 @@ class mrp_procurement(osv.osv):
report_except = 0
report_later = 0
while True:
- cr.execute('select id from mrp_procurement where state=%s and procure_method=%s order by date_planned limit 500 offset %s', ('confirmed', 'make_to_order', offset))
+ cr.execute('select id from mrp_procurement where state=%s and procure_method=%s order by priority,date_planned limit 500 offset %s', ('confirmed', 'make_to_order', offset))
ids = map(lambda x: x[0], cr.fetchall())
for proc in procurement_obj.browse(cr, uid, ids):
if (maxdate.strftime('%Y-%m-%d')>=proc.date_planned) or (proc.procure_method=='make_to_order'):
diff --git a/addons/mrp_operations/mrp_operations.py b/addons/mrp_operations/mrp_operations.py
index 059f6a5a0e1..19e9c3ebaf7 100644
--- a/addons/mrp_operations/mrp_operations.py
+++ b/addons/mrp_operations/mrp_operations.py
@@ -72,7 +72,7 @@ class mrp_production_workcenter_line(osv.osv):
_columns = {
'state': fields.selection([('draft','Draft'),('startworking', 'In Progress'),('pause','Pause'),('cancel','Canceled'),('done','Finished')],'Status', readonly=True),
'date_start_date': fields.function(_get_date_date, method=True, string='Start Date', type='date'),
- 'date_planned': fields.datetime('Scheduled Date'),
+ 'date_planned': fields.related('production_id', 'date_planned', type='datetime', string='Date Planned'),
'date_planned_end': fields.function(_get_date_end, method=True, string='End Date', type='datetime'),
'date_start': fields.datetime('Start Date'),
'date_finnished': fields.datetime('End Date'),
@@ -290,7 +290,7 @@ class mrp_operations_operation_code(osv.osv):
_columns={
'name': fields.char('Operation Name',size=64, required=True),
'code': fields.char('Code', size=16, required=True),
- 'start_stop': fields.selection([('start','Start'),('pause','Pause'),('resume','Resume'),('cancel','Cancel'),('done','Done')], 'Status', required=True),
+ 'start_stop': fields.selection([('start','Start'),('pause','Pause'),('resume','Resume'),('cancel','Cancelled'),('done','Done')], 'Status', required=True),
}
mrp_operations_operation_code()
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index 7f248929dd5..7341c31c8d5 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -19,8 +19,8 @@
-
-
+
+
@@ -151,6 +151,7 @@
form
tree,form,graph,gantt,calendar
[('production_state','=','ready')]
+
@@ -162,6 +163,7 @@
form
tree,form,graph
[('state','=','draft')]
+
diff --git a/addons/product/product.py b/addons/product/product.py
index 12201761466..207e29cc11c 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -102,6 +102,11 @@ class product_uom(osv.osv):
'rounding': lambda *a: 0.01,
}
+ _sql_constraints = [
+ ('factor_gt_zero', 'CHECK (factor!=0)', 'Value of the factor can never be 0 !'),
+ ('factor_inv_data_gt_zero', 'CHECK (factor_inv_data!=0)', 'Value of the factor_inv_data can never be 0 !'),
+ ]
+
def _compute_qty(self, cr, uid, from_uom_id, qty, to_uom_id=False):
if not from_uom_id or not qty or not to_uom_id:
return qty
@@ -246,7 +251,7 @@ class product_template(osv.osv):
'sale_delay': fields.float('Customer Lead Time', help="This is the average time between the confirmation of the customer order and the delivery of the finished products. It's the time you promise to your customers."),
'produce_delay': fields.float('Manufacturing Lead Time', help="Average time to produce this product. This is only for the production order and, if it is a multi-level bill of material, it's only for the level of this product. Different delays will be summed for all levels and purchase orders."),
'procure_method': fields.selection([('make_to_stock','Make to Stock'),('make_to_order','Make to Order')], 'Procure Method', required=True, help="'Make to Stock': When needed, take from the stock or wait until re-supplying. 'Make to Order': When needed, purchase or produce for the procurement request."),
- 'rental': fields.boolean('Rentable Product'),
+ 'rental': fields.boolean('Can be Rent'),
'categ_id': fields.many2one('product.category','Category', required=True, change_default=True),
'list_price': fields.float('Sale Price', digits=(16, int(config['price_accuracy'])), help="Base price for computing the customer price. Sometimes called the catalog price."),
'standard_price': fields.float('Cost Price', required=True, digits=(16, int(config['price_accuracy'])), help="The cost of the product for accounting stock valuation. It can serves as a base price for supplier price."),
@@ -390,8 +395,8 @@ class product_product(osv.osv):
product = self.browse(cr, uid, [product_id], context)[0]
for supinfo in product.seller_ids:
if supinfo.name.id == partner_id:
- return {'code': supinfo.product_code, 'name': supinfo.product_name}
- return {'code' : product.default_code, 'name' : product.name}
+ return {'code': supinfo.product_code, 'name': supinfo.product_name, 'variants': ''}
+ return {'code' : product.default_code, 'name' : product.name, 'variants': product.variants}
def _product_code(self, cr, uid, ids, name, arg, context={}):
res = {}
@@ -403,12 +408,14 @@ class product_product(osv.osv):
res = {}
for p in self.browse(cr, uid, ids, context):
data = self._get_partner_code_name(cr, uid, [], p.id, context.get('partner_id', None), context)
+ if not data['variants']:
+ data['variants'] = p.variants
if not data['code']:
data['code'] = p.code
if not data['name']:
data['name'] = p.name
res[p.id] = (data['code'] and ('['+data['code']+'] ') or '') + \
- (data['name'] or '')
+ (data['name'] or '') + (data['variants'] and (' - '+data['variants']) or '')
return res
_defaults = {
@@ -438,6 +445,7 @@ class product_product(osv.osv):
'packaging' : fields.one2many('product.packaging', 'product_id', 'Logistical Units', help="Gives the different ways to package the same product. This has no impact on the packing order and is mainly used if you use the EDI module."),
'price_extra': fields.float('Variant Price Extra', digits=(16, int(config['price_accuracy']))),
'price_margin': fields.float('Variant Price Margin', digits=(16, int(config['price_accuracy']))),
+ 'pricelist_id': fields.dummy(string='Pricelist',relation='product.pricelist', type='many2one'),
}
def onchange_uom(self, cursor, user, ids, uom_id,uom_po_id):
@@ -530,7 +538,13 @@ class product_product(osv.osv):
if not context:
context={}
- if ('variant' in context) and context['variant']:
+ product = self.read(cr, uid, id, ['name'], context=context)
+ if not default:
+ default = {}
+ default = default.copy()
+ default['name'] = product['name'] + _(' (copy)')
+
+ if context.get('variant',False):
fields = ['product_tmpl_id', 'active', 'variants', 'default_code',
'price_margin', 'price_extra']
data = self.read(cr, uid, id, fields=fields, context=context)
@@ -573,6 +587,18 @@ class product_packaging(osv.osv):
'length': fields.float('Length', help='The length of the package'),
}
+ _order = 'sequence'
+
+ def name_get(self, cr, uid, ids, context={}):
+ if not len(ids):
+ return []
+ res = []
+ for pckg in self.browse(cr, uid, ids,context=context):
+ p_name = pckg.ean and '[' + pckg.ean + '] ' or ''
+ p_name += pckg.ul.name
+ res.append((pckg.id,p_name))
+ return res
+
def _get_1st_ul(self, cr, uid, context={}):
cr.execute('select id from product_ul order by id asc limit 1')
res = cr.fetchone()
diff --git a/addons/product/product_data.xml b/addons/product/product_data.xml
index 87b28be3bdb..2f000fdbfc6 100644
--- a/addons/product/product_data.xml
+++ b/addons/product/product_data.xml
@@ -12,6 +12,9 @@
Weight
+
+ Working Time
+
+
+
+
Analysis
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 29c67ee640a..5177fce9f88 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -12,11 +12,13 @@
form
@@ -65,6 +67,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -89,6 +107,25 @@
+
+
+ project.project.select
+ project.project
+ search
+
+
+
+
+
+
+
+
+
+
+
+
+
+
project.project.tree
project.project
@@ -115,6 +152,7 @@
form
[]
+
@@ -124,11 +162,13 @@
form
[('state','=','open')]
+
+
-
+
- Template of Projects
+ Templates of Projects
project.project
form
[('state','=','template')]
@@ -195,8 +235,10 @@
form
[('manager', '=', uid)]
+
+
-
@@ -205,10 +247,13 @@
form
[('manager', '=', uid),('state','=','open')]
+
+
@@ -236,7 +281,7 @@
-
+
@@ -259,12 +304,14 @@
+
+
+ project.task.tree
+ project.task
+ tree
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -367,17 +451,15 @@
-
+
-
-
+
-
@@ -422,12 +504,38 @@
+
+ project.task.search.form
+ project.task
+ search
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
All Tasks
project.task
form
tree,form,calendar,gantt,graph
+
+
@@ -437,8 +545,23 @@
form
tree,form,calendar,gantt,graph
[('user_id', '=', uid)]
+
+
+
-
+
+
+
+ My Department Tasks
+ project.task
+ form
+ tree,form,calendar,gantt,graph
+
+ [('user_id', 'child_of', [uid])]
+
+
+
+
My Pending Tasks
@@ -446,9 +569,11 @@
form
tree,form,calendar,graph
[('user_id', '=', uid),('state','=','pending')]
+
+
-
+
My Current Tasks
@@ -456,9 +581,12 @@
form
tree,form,calendar,graph
[('user_id', '=', uid),('state','in',('open','draft'))]
+
+
+
+
-
+
My Tasks in Progress
@@ -466,8 +594,11 @@
form
tree,form,calendar,graph
[('user_id', '=', uid),('state','=','open')]
+
+
+
-
+
My Draft Tasks
@@ -475,9 +606,57 @@
form
tree,form,calendar,graph
[('user_id', '=', uid),('state','=','draft')]
+
+
+
-
+
+
+ My Department's Pending Tasks
+ project.task
+ form
+ tree,form,calendar,graph
+ [('user_id', 'child_of', [uid]),('state','=','pending')]
+
+
+
+
+
+
+
+ My Department's Current Tasks
+ project.task
+ form
+ tree,form,calendar,graph
+
+ [('user_id', 'child_of', [uid]),('state','in',('open','draft'))]
+
+
+
+
+
+
+ My Department's Tasks in Progress
+ project.task
+ form
+ tree,form,calendar,graph
+ [('user_id', 'child_of', [uid]),('state','=','open')]
+
+
+
+
+
+
+ My Department's Draft Tasks
+ project.task
+ form
+ tree,form,calendar,graph
+ [('user_id', 'child_of', [uid]),('state','=','draft')]
+
+
+
+
New Task
@@ -493,8 +672,10 @@
form
tree,form,calendar,graph,gantt
[('state', '=', 'progress')]
+
+
-
+
Unassigned Tasks
@@ -502,8 +683,10 @@
form
tree,form,calendar,graph,gantt
[('user_id', '=', False)]
+
+
-
+
@@ -589,7 +772,7 @@
-
+
diff --git a/addons/project_gtd/project_gtd.py b/addons/project_gtd/project_gtd.py
index 322fe01d0bb..bb0686e5615 100644
--- a/addons/project_gtd/project_gtd.py
+++ b/addons/project_gtd/project_gtd.py
@@ -21,7 +21,7 @@
##############################################################################
from xml import dom
-
+from lxml import etree
from mx import DateTime
from mx.DateTime import now
@@ -90,8 +90,8 @@ class project_gtd_timebox(osv.osv):
'col_planned_hours': fields.boolean('Planned Hours'),
'col_effective_hours': fields.boolean('Effective Hours'),
}
- def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False):
- res = super(project_gtd_timebox,self).fields_view_get(cr, uid, view_id, view_type, context, toolbar)
+ def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
+ res = super(project_gtd_timebox,self).fields_view_get(cr, uid, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
if (res['type']=='form') and ('record_id' in context):
if context['record_id']:
rec = self.browse(cr, uid, int(context['record_id']), context)
@@ -137,7 +137,7 @@ class project_gtd_timebox(osv.osv):
"""
- doc = dom.minidom.parseString(res['arch'])
+ doc = etree.XML(res['arch'])
xarch, xfields = self._view_look_dom_arch(cr, uid, doc, view_id, context=context)
res['arch'] = xarch
res['fields'] = xfields
@@ -171,6 +171,39 @@ class project_task(osv.osv):
_defaults = {
'context_id': _get_context
}
+
+ def next_timebox(self, cr, uid, ids, *args):
+ for timebox in self.browse(cr, uid , ids):
+ if timebox.timebox_id.type=='daily':
+ timebox_ids = self.pool.get('project.gtd.timebox').search(cr, uid, [('type','=','weekly')])
+ if timebox_ids:
+ self.write(cr, uid, ids, {'timebox_id' : timebox_ids[0]})
+ if timebox.timebox_id.type=='weekly':
+ timebox_ids = self.pool.get('project.gtd.timebox').search(cr, uid, [('type','=','monthly')])
+ if timebox_ids:
+ self.write(cr, uid, ids, {'timebox_id' : timebox_ids[0]})
+ if timebox.timebox_id.type=='monthly':
+ timebox_ids = self.pool.get('project.gtd.timebox').search(cr, uid, [('type','=','other')])
+ if timebox_ids:
+ self.write(cr, uid, ids, {'timebox_id':timebox_ids[0]})
+ return True
+
+ def prev_timebox(self, cr, uid, ids, *args):
+ for timebox in self.browse(cr, uid , ids):
+ if timebox.timebox_id.type=='other':
+ timebox_ids = self.pool.get('project.gtd.timebox').search(cr, uid, [('type','=','monthly')])
+ if timebox_ids:
+ self.write(cr, uid, ids, {'timebox_id' : timebox_ids[0]})
+ if timebox.timebox_id.type=='monthly':
+ timebox_ids = self.pool.get('project.gtd.timebox').search(cr, uid, [('type','=','weekly')])
+ if timebox_ids:
+ self.write(cr, uid, ids, {'timebox_id' : timebox_ids[0]})
+ if timebox.timebox_id.type=='weekly':
+ timebox_ids = self.pool.get('project.gtd.timebox').search(cr, uid, [('type','=','daily')])
+ if timebox_ids:
+ self.write(cr, uid, ids, {'timebox_id':timebox_ids[0]})
+ return True
+
# Override read for using this method if context set !!!
#_order = "((55-ascii(coalesce(priority,'2')))*2 + coalesce((date_start::date-current_date)/2,8))"
project_task()
diff --git a/addons/project_gtd/project_gtd_view.xml b/addons/project_gtd/project_gtd_view.xml
index 13a3f1080bc..b84356684a9 100644
--- a/addons/project_gtd/project_gtd_view.xml
+++ b/addons/project_gtd/project_gtd_view.xml
@@ -102,6 +102,8 @@
+
+
@@ -114,12 +116,38 @@
+
+
+ project.task.gtd.inbox.select
+ project.task
+ search
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
My Inbox
project.task
[('user_id','=',uid),('state','in',('open','draft'))]
{'gtd_sort':True}
+
@@ -159,13 +187,14 @@
form
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/addons/project_timesheet/__terp__.py b/addons/project_timesheet/__terp__.py
index 8b86f54382c..a81a891d338 100644
--- a/addons/project_timesheet/__terp__.py
+++ b/addons/project_timesheet/__terp__.py
@@ -34,7 +34,7 @@
'website': 'http://www.openerp.com',
'depends': ['base', 'project', 'hr_timesheet'],
'init_xml': [],
- 'update_xml': [],
+ 'update_xml': ["process/project_timesheet_process.xml"],
'demo_xml': [],
'installable': True,
'active': False,
diff --git a/addons/project_timesheet/process/project_timesheet_process.xml b/addons/project_timesheet/process/project_timesheet_process.xml
new file mode 100644
index 00000000000..80b59f01172
--- /dev/null
+++ b/addons/project_timesheet/process/project_timesheet_process.xml
@@ -0,0 +1,53 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index f5bb716f9d1..7e139b55040 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -149,11 +149,11 @@ class purchase_order(osv.osv):
'origin': fields.char('Origin', size=64,
help="Reference of the document that generated this purchase order request."
),
- 'partner_ref': fields.char('Partner Ref.', size=64),
- 'date_order':fields.date('Date', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)]}, help="Date on which this document has been created."),
+ 'partner_ref': fields.char('Supplier Ref.', size=64),
+ 'date_order':fields.date('Date Ordered', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)]}, help="Date on which this document has been created."),
'date_approve':fields.date('Date Approved', readonly=1),
'partner_id':fields.many2one('res.partner', 'Supplier', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)]}, change_default=True),
- 'partner_address_id':fields.many2one('res.partner.address', 'Address', required=True, states={'posted':[('readonly',True)]}),
+ 'partner_address_id':fields.many2one('res.partner.address', 'Supplier Address', required=True, states={'posted':[('readonly',True)]}),
'dest_address_id':fields.many2one('res.partner.address', 'Destination Address', states={'posted':[('readonly',True)]},
help="Put an address if you want to deliver directly from the supplier to the customer." \
@@ -164,7 +164,7 @@ class purchase_order(osv.osv):
'pricelist_id':fields.many2one('product.pricelist', 'Pricelist', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)]}, help="The pricelist sets the currency used for this purchase order. It also computes the supplier price for the selected products/quantities."),
- 'state': fields.selection([('draft', 'Request for Quotation'), ('wait', 'Waiting'), ('confirmed', 'Confirmed'), ('approved', 'Approved'),('except_picking', 'Shipping Exception'), ('except_invoice', 'Invoice Exception'), ('done', 'Done'), ('cancel', 'Cancelled')], 'Order Status', readonly=True, help="The state of the purchase order or the quotation request. A quotation is a purchase order in a 'Draft' state. Then the order has to be confirmed by the user, the state switch to 'Confirmed'. Then the supplier must confirm the order to change the state to 'Approved'. When the purchase order is paid and received, the state becomes 'Done'. If a cancel action occurs in the invoice or in the reception of goods, the state becomes in exception.", select=True),
+ 'state': fields.selection([('draft', 'Request for Quotation'), ('wait', 'Waiting'), ('confirmed', 'Waiting Supplier Ack'), ('approved', 'Approved'),('except_picking', 'Shipping Exception'), ('except_invoice', 'Invoice Exception'), ('done', 'Done'), ('cancel', 'Cancelled')], 'Order Status', readonly=True, help="The state of the purchase order or the quotation request. A quotation is a purchase order in a 'Draft' state. Then the order has to be confirmed by the user, the state switch to 'Confirmed'. Then the supplier must confirm the order to change the state to 'Approved'. When the purchase order is paid and received, the state becomes 'Done'. If a cancel action occurs in the invoice or in the reception of goods, the state becomes in exception.", select=True),
'order_line': fields.one2many('purchase.order.line', 'order_id', 'Order Lines', states={'approved':[('readonly',True)]}),
'validator' : fields.many2one('res.users', 'Validated by', readonly=True),
'notes': fields.text('Notes'),
@@ -495,7 +495,7 @@ class purchase_order_line(osv.osv):
qty = temp_qty
dt = (DateTime.now() + DateTime.RelativeDateTime(days=seller_delay or 0.0)).strftime('%Y-%m-%d %H:%M:%S')
- prod_name = prod.partner_ref
+ prod_name = self.pool.get('product.product').name_get(cr, uid, [prod.id])[0][1]
res = {'value': {'price_unit': price, 'name':prod_name, 'taxes_id':map(lambda x: x.id, prod.supplier_taxes_id),
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index df971a84b04..51434162854 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -56,11 +56,11 @@
-
+
-
+
@@ -97,11 +97,32 @@
+
+ purchase.order.list.select
+ purchase.order
+ search
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Purchase Orders
ir.actions.act_window
purchase.order
tree,form,calendar,graph
+
@@ -112,8 +133,10 @@
[('state','=','draft')]
form
tree,form,calendar,graph
+
+
-
+
Purchase Order Waiting Approval
@@ -122,8 +145,10 @@
form
tree,form,calendar,graph
[('state','=','confirmed')]
+
+
-
+
Purchase Orders in Progress
@@ -132,8 +157,10 @@
form
tree,form,calendar,graph
[('state','=','approved')]
+
+
-
+
New Purchase Order
diff --git a/addons/purchase/wizard/wizard_group.py b/addons/purchase/wizard/wizard_group.py
index 65c09f33593..09ccc5ddd92 100644
--- a/addons/purchase/wizard/wizard_group.py
+++ b/addons/purchase/wizard/wizard_group.py
@@ -53,8 +53,12 @@ ack_form = """
ack_fields = {}
-def _merge_orders(self, cr, uid, data, context):
- order_obj = pooler.get_pool(cr.dbname).get('purchase.order')
+def _mergeOrders(self, cr, uid, data, context):
+ pool = pooler.get_pool(cr.dbname)
+ order_obj = pool.get('purchase.order')
+ mod_obj = pool.get('ir.model.data')
+ result = mod_obj._get_id(cr, uid, 'purchase', 'view_purchase_order_filter')
+ id = mod_obj.read(cr, uid, result, ['res_id'])
def make_key(br, fields):
list_key = []
@@ -148,7 +152,8 @@ def _merge_orders(self, cr, uid, data, context):
'view_mode': 'tree,form',
'res_model': 'purchase.order',
'view_id': False,
- 'type': 'ir.actions.act_window'
+ 'type': 'ir.actions.act_window',
+ 'search_view_id': id['res_id']
}
diff --git a/addons/report_account/report_receivable.py b/addons/report_account/report_receivable.py
index e7da923bd85..005a8458628 100644
--- a/addons/report_account/report_receivable.py
+++ b/addons/report_account/report_receivable.py
@@ -89,14 +89,14 @@ class report_aged_receivable(osv.osv):
super(report_aged_receivable, self).__init__(pool, cr)
self.called = False
- def fields_view_get(self, cr, user, view_id=None, view_type='form', context=None, toolbar=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_aged_receivable, self).fields_view_get(cr, user, view_id, view_type, context, toolbar)
+ res = super(report_aged_receivable, self).fields_view_get(cr, user, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
return res
def _calc_bal(self, cr, uid, ids, name, args, context):
@@ -121,12 +121,12 @@ class report_aged_receivable(osv.osv):
def init(self, cr, uid=1):
""" This view will be used in dashboard
+ The reason writing this code here is, we need to check date range from today to first date of fiscal year.
"""
# ranges = _get_ranges(cr) # Gets the ranges for the x axis of the graph (name column values)
pool_obj_fy = pooler.get_pool(cr.dbname).get('account.fiscalyear')
- today = mx.DateTime.strptime(time.strftime('%Y-%m-%d'), '%Y-%m-%d') - mx.DateTime.RelativeDateTime(days=1)
- today = today.strftime('%Y-%m-%d')
- fy_id = pool_obj_fy.find(cr,uid, exception=False)
+ today = time.strftime('%Y-%m-%d')
+ fy_id = pool_obj_fy.find(cr, uid, exception=False)
LIST_RANGES = []
if fy_id:
fy_start_date = pool_obj_fy.read(cr, uid, fy_id, ['date_start'])['date_start']
diff --git a/addons/report_analytic_planning/__terp__.py b/addons/report_analytic_planning/__terp__.py
index 53cc8548e16..327b47c6b25 100644
--- a/addons/report_analytic_planning/__terp__.py
+++ b/addons/report_analytic_planning/__terp__.py
@@ -22,20 +22,38 @@
{
- 'name': 'Analytic planning - Reporting',
+ 'name': 'Planning Management Module',
'version': '1.0',
- 'category': 'Generic Modules/Accounting',
- 'description': """Planning on analytic accounts.""",
+ 'category': 'Generic Modules/Human Ressources',
+ 'description': """
+This module helps you to manage your plannings.
+
+This module is based on the analytic accounting and is totally integrated with
+* the timesheets encoding
+* the holidays management
+* the project management
+
+So that, each department manager can know if someone in his team has still unaloccated time for a given planning (taking in consideration the validated leaves) or if he still needs to encode tasks.
+
+At the end of the month, the planning manager can also check if the encoded timesheets are respecting the planned time on each analytic account.
+""",
'author': 'Tiny',
'website': 'http://www.openerp.com',
- 'depends': ['account', 'hr_timesheet_invoice', 'project', 'report_analytic_line'],
+ 'depends': [
+ 'project',
+ 'hr_timesheet',
+ 'hr_holidays',
+ ],
'init_xml': [],
'update_xml': [
'security/ir.model.access.csv',
'report_analytic_planning_view.xml',
'report_analytic_planning_report.xml'
],
- 'demo_xml': ['report_account_analytic.planning.csv'],
+ 'demo_xml': [
+ #'report_account_analytic.planning.csv',
+ 'report_analytic_planning_demo.xml',
+ ],
'installable': True,
'active': False,
'certificate': '0034901836973',
diff --git a/addons/report_analytic_planning/report_account_analytic.planning.csv b/addons/report_analytic_planning/report_account_analytic.planning.csv
index 33247f151eb..41374cedbc0 100644
--- a/addons/report_analytic_planning/report_account_analytic.planning.csv
+++ b/addons/report_analytic_planning/report_account_analytic.planning.csv
@@ -1,10 +1,10 @@
-name,line_ids/amount,line_ids/amount_unit,line_ids/user_id,line_ids/account_id,user_id
-Planning 2007,5.0,Day,admin,Seagate P1,admin
-,7.0,Day,admin,Seagate P2,
-,2.0,Day,admin,Sednacom,
-,3.0,Day,admin,Administratif,
-,4.0,Day,admin,Commercial & Marketing,
-,6.0,Day,demo,Seagate P1,
-,7.0,Day,demo,Seagate P2,
-,1.0,Day,demo,CampToCamp,
-,7.0,Day,demo,Agrolait,
+name,line_ids/amount,line_ids/amount_unit,line_ids/user_id,line_ids/task,line_ids/account_id,user_id
+Planning 2007,5.0,Day,admin,1,Seagate P1,admin
+,7.0,Day,admin,0,Seagate P2,
+,2.0,Day,admin,1,Sednacom,
+,3.0,Day,admin,0,Administratif,
+,4.0,Day,admin,0,Commercial & Marketing,
+,6.0,Day,demo,1,Seagate P1,
+,7.0,Day,demo,1,Seagate P2,
+,1.0,Day,demo,0,CampToCamp,
+,7.0,Day,demo,0,Agrolait,
diff --git a/addons/report_analytic_planning/report_analytic_planning.py b/addons/report_analytic_planning/report_analytic_planning.py
index e5e94cdaf9c..fe4ed5d3e90 100644
--- a/addons/report_analytic_planning/report_analytic_planning.py
+++ b/addons/report_analytic_planning/report_analytic_planning.py
@@ -1,7 +1,7 @@
# -*- encoding: utf-8 -*-
##############################################################################
#
-# OpenERP, Open Source Management Solution
+# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (). All Rights Reserved
# $Id$
#
@@ -20,85 +20,345 @@
#
##############################################################################
-from osv import fields,osv
+from osv import fields, osv
+from tools.translate import _
import time
import mx.DateTime
+class one2many_mod3(fields.one2many):
+ def get(self, cr, obj, ids, name, user=None, offset=0, context=None, values=None):
+ if not context:
+ context = {}
+ res = {}
+ for obj in obj.browse(cr, user, ids, context=context):
+ res[obj.id] = []
+ list_ids = []
+ for item in obj.user_id.child_ids:
+ list_ids.append(item.id)
+ ids2 = obj.pool.get(self._obj).search(cr, user, ['&',(self._fields_id,'=',obj.id),'|',('user_id','in',list_ids),('user_id','=',False)], limit=self._limit)
+ for r in obj.pool.get(self._obj)._read_flat(cr, user, ids2, [self._fields_id], context=context, load='_classic_write'):
+ res[r[self._fields_id]].append( r['id'] )
+ return res
+
class report_account_analytic_planning(osv.osv):
_name = "report_account_analytic.planning"
_description = "Planning"
+
+ def _get_total_planned(self, cr, uid, ids, name, args, context):
+ result = {}
+ for plan in self.browse(cr, uid, ids, context):
+ plan_hrs=0.0
+ for p in plan.planning_user_ids:
+ if not p.plan_open : p.plan_open = 0.0
+ if not p.plan_tasks : p.plan_tasks = 0.0
+ plan_hrs = plan_hrs + p.plan_open + p.plan_tasks
+ result[plan.id] = plan_hrs
+ return result
+
+ def _get_total_free(self, cr, uid, ids, name, args, context):
+ result = {}
+ for plan in self.browse(cr, uid, ids, context):
+ total_free = 0.0
+ for p in plan.planning_user_ids:
+ if p.free:
+ total_free = total_free + p.free
+ result[plan.id] = total_free
+ return result
+
_columns = {
- 'name': fields.char('Planning Name', size=32, required=True),
- 'user_id': fields.many2one('res.users', 'Responsible', required=True),
- 'date_from':fields.date('Start Date', required=True),
- 'date_to':fields.date('End Date', required=True),
- 'line_ids': fields.one2many('report_account_analytic.planning.line', 'planning_id', 'Planning lines'),
- 'stat_ids': fields.one2many('report_account_analytic.planning.stat', 'planning_id', 'Planning analysis', readonly=True),
- 'stat_user_ids': fields.one2many('report_account_analytic.planning.stat.user', 'planning_id', 'Planning by user', readonly=True),
- 'stat_account_ids': fields.one2many('report_account_analytic.planning.stat.account', 'planning_id', 'Planning by account', readonly=True),
- 'state': fields.selection([('open','Open'),('done','Done')], 'Status', required=True)
+ 'name': fields.char('Planning Name', size=32, required=True, readonly=True, states={'draft':[('readonly', False)]}),
+ 'user_id': fields.many2one('res.users', 'Responsible', required=True, readonly=True, states={'draft':[('readonly', False)]}),
+ 'date_from':fields.date('Start Date', required=True, readonly=True, states={'draft':[('readonly', False)]}),
+ 'date_to':fields.date('End Date', required=True, readonly=True, states={'draft':[('readonly', False)]}),
+ 'line_ids': fields.one2many('report_account_analytic.planning.line', 'planning_id', 'Planning lines', readonly=True, states={'draft':[('readonly', False)]}),
+ 'stat_ids': fields.one2many('report_account_analytic.planning.stat', 'planning_id', 'Planning analysis', readonly=True),
+ 'state': fields.selection([('draft','Draft'),('open', 'Open'), ('done', 'Done'),('cancel','Cancelled')], 'Status', required=True),
+ 'business_days' : fields.integer('Business Days', required=True, readonly=True, states={'draft':[('readonly', False)]}, help='Set here the number of working days within this planning for one person full time'),
+ 'planning_user_ids': one2many_mod3('report_account_analytic.planning.user', 'planning_id', 'Planning By User'),
+ 'planning_account': fields.one2many('report_account_analytic.planning.account', 'planning_id', 'Planning By Account'),
+ 'total_planned' : fields.function(_get_total_planned, method=True, string='Total Planned'),
+ 'total_free' : fields.function(_get_total_free, method=True, string='Total Free'),
}
_defaults = {
- 'name': lambda *a: time.strftime('%Y-%m-%d'),
- 'date_from': lambda *a: time.strftime('%Y-%m-01'),
- 'date_to': lambda *a: (mx.DateTime.now()+mx.DateTime.RelativeDateTime(months=1,day=1,days=-1)).strftime('%Y-%m-%d'),
- 'user_id': lambda self,cr,uid,c: uid,
- 'state': lambda *args: 'open'
+ 'name': lambda *a: time.strftime('%B-%y'),
+ 'date_from': lambda *a: time.strftime('%Y-%m-01'),
+ 'date_to': lambda *a: (mx.DateTime.now()+mx.DateTime.RelativeDateTime(months=1, day=1, days=-1)).strftime('%Y-%m-%d'),
+ 'user_id': lambda self, cr, uid, c: uid,
+ 'state': lambda *args: 'draft',
+ 'business_days' : lambda *a: 20,
}
_order = 'date_from desc'
+
+ def action_open(self, cr, uid, id, context={}):
+ self.write(cr, uid, id, {'state' : 'open'})
+ return True
+
+ def action_cancel(self, cr, uid, id, context={}):
+ self.write(cr, uid, id, {'state' : 'cancel'})
+ return True
+
+ def action_draft(self, cr, uid, id, context={}):
+ self.write(cr, uid, id, {'state' : 'draft'})
+ return True
+
+ def action_done(self, cr, uid, id, context={}):
+ self.write(cr, uid, id, {'state' : 'done'})
+ return True
+
report_account_analytic_planning()
class report_account_analytic_planning_line(osv.osv):
_name = "report_account_analytic.planning.line"
_description = "Planning Line"
_rec_name = 'user_id'
+
+ def name_get(self, cr, uid, ids, context={}):
+ if not len(ids):
+ return []
+ reads = self.read(cr, uid, ids, ['user_id','planning_id','note'], context)
+ res = []
+ for record in reads:
+ name = '['+record['planning_id'][1] + " - " +record['user_id'][1]+'] '
+ if record['note']:
+ name += record['note']
+ res.append((record['id'], name))
+ return res
+
+ def _amount_base_uom(self, cr, uid, ids, name, args, context):
+ result = {}
+ for line in self.browse(cr, uid, ids, context):
+ result[line.id] = line.amount / line.amount_unit.factor
+ return result
+
_columns = {
- 'account_id':fields.many2one('account.analytic.account', 'Analytic account', required=True),
- 'planning_id': fields.many2one('report_account_analytic.planning', 'Planning', required=True, ondelete='cascade'),
- 'user_id': fields.many2one('res.users', 'User'),
- 'amount': fields.float('Quantity', required=True),
- 'amount_unit':fields.many2one('product.uom', 'Qty UoM', required=True),
- 'note':fields.text('Note', size=64),
+ 'account_id':fields.many2one('account.analytic.account', 'Analytic account', required=True),
+ 'planning_id': fields.many2one('report_account_analytic.planning', 'Planning', required=True, ondelete='cascade'),
+ 'user_id': fields.many2one('res.users', 'User'),
+ 'amount': fields.float('Quantity', required=True),
+ 'amount_unit': fields.many2one('product.uom', 'Qty UoM', required=True),
+ 'note': fields.text('Note', size=64),
+ 'amount_in_base_uom': fields.function(_amount_base_uom, method=True, string='Quantity in base uom', store=True),
+ 'task_ids': fields.one2many('project.task', 'planning_line_id', 'Planning Tasks'),
}
_order = 'user_id,account_id'
report_account_analytic_planning_line()
-class report_account_analytic_planning_stat_account(osv.osv):
- _name = "report_account_analytic.planning.stat.account"
- _description = "Planning account stat"
- _rec_name = 'account_id'
+
+class project_task(osv.osv):
+ _name = "project.task"
+ _inherit = "project.task"
+ _columns = {
+ 'planning_line_id': fields.many2one('report_account_analytic.planning.line', 'Planning', ondelete='cascade'),
+ }
+project_task()
+
+
+class report_account_analytic_planning_user(osv.osv):
+ _name = "report_account_analytic.planning.user"
+ _description = "Planning by User"
+ _rec_name = 'user_id'
_auto = False
- _log_access = False
- def _sum_amount_real(self, cr, uid, ids, name, args, context):
+
+
+ def _get_tasks(self, cr, uid, ids, name, args, context):
+ result = {}
+ tm = self.pool.get('res.users').browse(cr, uid, uid, context).company_id.project_time_mode_id
+ if tm and tm.factor:
+ div = tm.factor
+ else:
+ div = 1.0
+ for line in self.browse(cr, uid, ids, context):
+ if line.user_id:
+ cr.execute("""select COALESCE(sum(tasks.remaining_hours),0) from project_task tasks \
+ where tasks.planning_line_id in (select id from report_account_analytic_planning_line\
+ where planning_id = %s and user_id=%s)""", (line.planning_id.id, line.user_id.id,))
+
+ result[line.id] = cr.fetchall()[0][0] / div
+ else:
+ result[line.id] = 0
+ return result
+
+ def _get_free(self, cr, uid, ids, name, args, context):
result = {}
for line in self.browse(cr, uid, ids, context):
- cr.execute('select sum(unit_amount) from account_analytic_line where account_id=%s and date>=%s and date<=%s', (line.account_id.id,line.planning_id.date_from,line.planning_id.date_to))
- result[line.id] = cr.fetchone()[0]
+ if line.user_id:
+ result[line.id] = line.planning_id.business_days - line.plan_tasks - line.plan_open - line.holiday
+ else:
+ result[line.id] = 0.0
return result
+
+ def _get_timesheets(self, cr, uid, ids, name, args, context):
+ result = {}
+ for line in self.browse(cr, uid, ids, context):
+ if line.user_id:
+ cr.execute("""
+ SELECT sum(unit_amount/uom.factor) FROM account_analytic_line acc
+ LEFT JOIN product_uom uom ON (uom.id = acc.product_uom_id)
+ WHERE acc.date>=%s and acc.date<=%s and acc.user_id=%s""", (line.planning_id.date_from, line.planning_id.date_to, line.user_id.id ))
+ res = cr.fetchall()
+ result[line.id] = res[0][0]
+ else:
+ result[line.id] = 0
+ return result
+
_columns = {
- 'planning_id': fields.many2one('report_account_analytic.planning', 'Planning'),
- 'account_id': fields.many2one('account.analytic.account', 'Analytic Account', required=True),
- 'quantity': fields.float('Planned', required=True),
- 'sum_amount_real': fields.function(_sum_amount_real, method=True, string='Timesheet'),
+ 'planning_id': fields.many2one('report_account_analytic.planning', 'Planning'),
+ 'user_id': fields.many2one('res.users', 'User', readonly=True),
+ 'tasks' : fields.function(_get_tasks, method=True, string='Remaining Tasks', help='This value is given by the sum of work remaining to do on the task for this planning, expressed in days.'),
+ 'plan_tasks': fields.float('Time Planned on Tasks', readonly=True, help='This value is given by the sum of time allocation with task(s) linked, expressed in days.'),
+ 'free' : fields.function(_get_free, method=True, string='Unallocated Time', readonly=True,help='Computed as \
+Business Days - (Time Allocation of Tasks + Time Allocation without Tasks + Holiday Leaves)'),
+ 'plan_open': fields.float('Time Allocation without Tasks', readonly=True,help='This value is given by the sum of time allocation without task(s) linked, expressed in days.'),
+ 'holiday': fields.float('Leaves',help='This value is given by the total of validated leaves into the \'Date From\' and \'Date To\' of the planning.'),
+ 'timesheet': fields.function(_get_timesheets, method=True, string='Timesheet', help='This value is given by the sum of all work encoded in the timesheet(s) between the \'Date From\' and \'Date To\' of the planning.'),
}
+
def init(self, cr):
- cr.execute("""
- create or replace view report_account_analytic_planning_stat_account as (
- select
- min(l.id) as id,
- l.account_id as account_id,
- sum(l.amount*u.factor) as quantity,
- l.planning_id
- from
- report_account_analytic_planning_line l
- left join
- product_uom u on (l.amount_unit = u.id)
- group by
- planning_id, account_id
+ cr.execute(""" CREATE OR REPLACE VIEW report_account_analytic_planning_user AS (
+ SELECT
+ planning.id AS planning_id,
+ max(planning.id)+COALESCE(users.id,1) AS id,
+ planning.business_days,
+ users.id AS user_id,
+ (SELECT sum(line1.amount_in_base_uom)
+ FROM report_account_analytic_planning_line line1
+ WHERE (
+ SELECT COUNT(1)
+ FROM project_task task
+ WHERE task.planning_line_id = line1.id
+ ) > 0
+ AND line1.user_id = users.id
+ AND line1.planning_id = planning.id
+ )AS plan_tasks,
+ (SELECT SUM(line1.amount_in_base_uom)
+ FROM report_account_analytic_planning_line line1
+ WHERE (
+ SELECT COUNT(1)
+ FROM project_task task
+ WHERE task.planning_line_id = line1.id
+ ) = 0
+ AND line1.user_id = users.id
+ AND line1.planning_id = planning.id
+ ) AS plan_open,
+ (SELECT -(SUM(holidays.number_of_days))
+ FROM hr_holidays holidays
+ WHERE holidays.employee_id IN
+ (
+ SELECT emp.id
+ FROM hr_employee emp WHERE emp.user_id = users.id
+ )
+ AND holidays.state IN ('validate')
+ AND holidays.type = 'remove'
+ AND holidays.date_from >= planning.date_from
+ AND holidays.date_to <= planning.date_to
+ ) AS holiday
+
+ FROM report_account_analytic_planning planning
+ LEFT JOIN report_account_analytic_planning_line line ON (line.planning_id = planning.id), res_users users
+
+ GROUP BY planning.id, planning.business_days, users.id, planning.date_from, planning.date_to
+
+ UNION
+
+ SELECT
+ planning.id AS planning_id,
+ max(planning.id) AS id,
+ planning.business_days,
+ line.user_id,
+ (SELECT SUM(line1.amount_in_base_uom)
+ FROM report_account_analytic_planning_line line1
+ WHERE (SELECT COUNT(1) FROM project_task task WHERE task.planning_line_id = line1.id) > 0
+ AND line1.user_id IS NULL
+ ) AS plan_tasks,
+ (SELECT SUM(line1.amount_in_base_uom)
+ FROM report_account_analytic_planning_line line1
+ WHERE (SELECT COUNT(1) FROM project_task task WHERE task.planning_line_id = line1.id) = 0
+ AND line1.user_id IS NULL
+ ) AS plan_open,
+ '0' AS holiday
+ FROM report_account_analytic_planning planning
+ INNER JOIN report_account_analytic_planning_line line ON line.planning_id = planning.id
+ AND line.user_id IS NULL
+ GROUP BY planning.id, planning.business_days, line.user_id, planning.date_from, planning.date_to
+ )
+ """)
+
+report_account_analytic_planning_user()
+
+class report_account_analytic_planning_account(osv.osv):
+ _name = "report_account_analytic.planning.account"
+ _description = "Planning by Account"
+ _rec_name = 'account_id'
+ _auto = False
+
+ def _get_tasks(self, cr, uid, ids, name, args, context):
+ result = {}
+ tm = self.pool.get('res.users').browse(cr, uid, uid, context).company_id.project_time_mode_id
+ if tm and tm.factor:
+ div = tm.factor
+ else:
+ div = 1.0
+
+ for line in self.browse(cr, uid, ids, context):
+ cr.execute("""
+ SELECT COALESCE(sum(tasks.remaining_hours),0)
+ FROM project_task tasks
+ WHERE tasks.planning_line_id IN (
+ SELECT id
+ FROM report_account_analytic_planning_line
+ WHERE planning_id = %s AND account_id=%s
+ )""", (line.planning_id.id,line.account_id.id ))
+ result[line.id] = cr.fetchall()[0][0] / div
+ return result
+
+ def _get_timesheets(self, cr, uid, ids, name, args, context):
+ result = {}
+ for line in self.browse(cr, uid, ids, context):
+ cr.execute("""
+ SELECT SUM(unit_amount/uom.factor) FROM account_analytic_line acc
+ LEFT JOIN product_uom uom ON (uom.id = acc.product_uom_id)
+ WHERE acc.date>=%s and acc.date<=%s and acc.account_id=%s""", (line.planning_id.date_from, line.planning_id.date_to, line.account_id.id, ))
+ res = cr.fetchall()[0][0]
+ if res:
+ result[line.id] = res
+ else:
+ result[line.id] = 0
+ return result
+
+ _columns = {
+ 'planning_id': fields.many2one('report_account_analytic.planning', 'Planning'),
+ 'account_id': fields.many2one('account.analytic.account', 'Analytic account', readonly=True),
+ 'tasks' : fields.function(_get_tasks, method=True, string='Remaining Tasks', help='This value is given by the sum of work remaining to do on the task for this planning, expressed in days.'),
+ 'plan_tasks': fields.float('Time Allocation of Tasks', readonly=True,help='This value is given by the sum of time allocation with the checkbox \'Assigned in Taks\' set to TRUE expressed in days.'),
+ 'plan_open': fields.float('Time Allocation without Tasks', readonly=True,help='This value is given by the sum of time allocation with the checkbox \'Assigned in Taks\' set to FALSE, expressed in days.'),
+ 'timesheet': fields.function(_get_timesheets, method=True, string='Timesheet',help='This value is given by the sum of all work encoded in the timesheet(s) between the \'Date From\' and \'Date To\' of the planning.'),
+ }
+
+ def init(self, cr):
+ cr.execute(""" create or replace view report_account_analytic_planning_account as (
+ select
+ min(l.id) as id,
+ l.account_id as account_id,
+ sum(l.amount) as quantity,
+ l.planning_id as planning_id,
+ (Select sum(line1.amount_in_base_uom) from report_account_analytic_planning_line line1
+ where (select count(1) from project_task task where task.planning_line_id = line1.id) > 0
+ and l.account_id = line1.account_id
+ and l.planning_id = line1.planning_id
+ ) as plan_tasks,
+ (Select sum(line1.amount_in_base_uom) from report_account_analytic_planning_line line1
+ where (select count(1) from project_task task where task.planning_line_id = line1.id) = 0 and l.account_id = line1.account_id
+ and planning.id=l.planning_id
+ ) as plan_open
+ from report_account_analytic_planning_line l
+ inner join report_account_analytic_planning planning on planning.id=l.planning_id
+ group by l.account_id, l.planning_id, planning.date_from, planning.date_to, planning.id
)
""")
-report_account_analytic_planning_stat_account()
+
+
+report_account_analytic_planning_account()
class report_account_analytic_planning_stat(osv.osv):
_name = "report_account_analytic.planning.stat"
@@ -110,9 +370,11 @@ class report_account_analytic_planning_stat(osv.osv):
result = {}
for line in self.browse(cr, uid, ids, context):
if line.user_id:
- cr.execute('select sum(unit_amount) from account_analytic_line where user_id=%s and account_id=%s and date>=%s and date<=%s', (line.user_id.id,line.account_id.id,line.planning_id.date_from,line.planning_id.date_to))
+ cr.execute('''select sum(acc.unit_amount/uom.factor) from account_analytic_line acc
+ LEFT JOIN product_uom uom ON (uom.id = acc.product_uom_id)
+where user_id=%s and account_id=%s and date>=%s and date<=%s''', (line.user_id.id, line.account_id.id, line.planning_id.date_from, line.planning_id.date_to))
else:
- cr.execute('select sum(unit_amount) from account_analytic_line where account_id=%s and date>=%s and date<=%s', (line.account_id.id,line.planning_id.date_from,line.planning_id.date_to))
+ cr.execute('select sum(unit_amount) from account_analytic_line where account_id=%s and date>=%s and date<=%s', (line.account_id.id, line.planning_id.date_from, line.planning_id.date_to))
result[line.id] = cr.fetchone()[0]
return result
def _sum_amount_tasks(self, cr, uid, ids, name, args, context):
@@ -130,20 +392,20 @@ class report_account_analytic_planning_stat(osv.osv):
project_id in (select id from project_project where category_id=%s) and
date_close>=%s and
date_close<=%s''', (
- line.account_id.id,
- line.planning_id.date_from,
+ line.account_id.id,
+ line.planning_id.date_from,
line.planning_id.date_to)
)
result[line.id] = cr.fetchone()[0]
return result
_columns = {
- 'planning_id': fields.many2one('report_account_analytic.planning', 'Planning'),
- 'user_id': fields.many2one('res.users', 'User'),
- 'manager_id': fields.many2one('res.users', 'Manager'),
- 'account_id': fields.many2one('account.analytic.account', 'Account', required=True),
- 'sum_amount': fields.float('Planned hours', required=True),
- 'sum_amount_real': fields.function(_sum_amount_real, method=True, string='Timesheet'),
- 'sum_amount_tasks': fields.function(_sum_amount_tasks, method=True, string='Tasks'),
+ 'planning_id': fields.many2one('report_account_analytic.planning', 'Planning'),
+ 'user_id': fields.many2one('res.users', 'User'),
+ 'manager_id': fields.many2one('res.users', 'Manager'),
+ 'account_id': fields.many2one('account.analytic.account', 'Account', required=True),
+ 'sum_amount': fields.float('Planned Days', required=True),
+ 'sum_amount_real': fields.function(_sum_amount_real, method=True, string='Timesheet'),
+ 'sum_amount_tasks': fields.function(_sum_amount_tasks, method=True, string='Tasks'),
}
_order = 'planning_id,user_id'
def init(self, cr):
@@ -154,7 +416,7 @@ class report_account_analytic_planning_stat(osv.osv):
l.user_id as user_id,
a.user_id as manager_id,
l.account_id as account_id,
- sum(l.amount*u.factor) as sum_amount,
+ sum(l.amount/u.factor) as sum_amount,
l.planning_id
from
report_account_analytic_planning_line l
@@ -168,43 +430,4 @@ class report_account_analytic_planning_stat(osv.osv):
""")
report_account_analytic_planning_stat()
-class report_account_analytic_planning_stat_user(osv.osv):
- _name = "report_account_analytic.planning.stat.user"
- _description = "Planning user stat"
- _rec_name = 'user_id'
- _auto = False
- _log_access = False
- def _sum_amount_real(self, cr, uid, ids, name, args, context):
- result = {}
- for line in self.browse(cr, uid, ids, context):
- result[line.id] = 0.0
- if line.user_id:
- cr.execute('select sum(unit_amount) from account_analytic_line where user_id=%s and date>=%s and date<=%s', (line.user_id.id,line.planning_id.date_from,line.planning_id.date_to))
- result[line.id] = cr.fetchone()[0]
- return result
- _columns = {
- 'planning_id': fields.many2one('report_account_analytic.planning', 'Planning', required=True),
- 'user_id': fields.many2one('res.users', 'User'),
- 'quantity': fields.float('Planned', required=True),
- 'sum_amount_real': fields.function(_sum_amount_real, method=True, string='Timesheet'),
- }
- def init(self, cr):
- cr.execute("""
- create or replace view report_account_analytic_planning_stat_user as (
- select
- min(l.id) as id,
- l.user_id as user_id,
- sum(l.amount*u.factor) as quantity,
- l.planning_id
- from
- report_account_analytic_planning_line l
- left join
- product_uom u on (l.amount_unit = u.id)
- group by
- planning_id, user_id
- )
- """)
-report_account_analytic_planning_stat_user()
-
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/report_analytic_planning/report_analytic_planning_demo.xml b/addons/report_analytic_planning/report_analytic_planning_demo.xml
new file mode 100644
index 00000000000..9a64217f252
--- /dev/null
+++ b/addons/report_analytic_planning/report_analytic_planning_demo.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ Administration
+
+
+
+
+
+
+
diff --git a/addons/report_analytic_planning/report_analytic_planning_view.xml b/addons/report_analytic_planning/report_analytic_planning_view.xml
index 111ea6da645..755bad51320 100644
--- a/addons/report_analytic_planning/report_analytic_planning_view.xml
+++ b/addons/report_analytic_planning/report_analytic_planning_view.xml
@@ -1,207 +1,313 @@
-
-
- report.account.analytic.planning.tree
- report_account_analytic.planning
- tree
-
-
-
-
-
-
-
-
-
-
-
-
- report.account.analytic.planning.form
- report_account_analytic.planning
- form
-
-
-
-
-
-
- Planning
- report_account_analytic.planning
- form
- tree,form
-
-
-
-
-
- My Planning
- report_account_analytic.planning
- form
- tree,form
- [('user_id','=',uid)]
-
-
-
-
- My Current Planning
- report_account_analytic.planning
- form
- tree,form
- [('user_id','=',uid),('date_from','<=',time.strftime('%Y-%m-%d')), ('date_to','>=',time.strftime('%Y-%m-%d'))]
-
-
-
-
- Current Planning
- report_account_analytic.planning
- form
- tree,form
- [('date_from','<=',time.strftime('%Y-%m-%d')), ('date_to','>=',time.strftime('%Y-%m-%d'))]
-
-
+
+
+
+
+ report.account.analytic.planning.tree
+ report_account_analytic.planning
+ tree
+
+
+
+
+
+
+
+
+
+
+
+
+
-
- New Planning
- report_account_analytic.planning
- form
- form,tree
-
-
-
-
-
-
-
- report.account.analytic.planning.stat.form
- report_account_analytic.planning.stat
- form
-
-
+
+
+
+
+ Plannings
+ report_account_analytic.planning
+ form
+ tree,form
+
+
+
+
+
+
+
+ My Plannings
+ report_account_analytic.planning
+ form
+ tree,form
+ [('user_id','=',uid)]
+
+
+
+
+
+ My Current Plannings
+ report_account_analytic.planning
+ form
+ tree,form
+ [('user_id','=',uid),('date_from','<=',time.strftime('%Y-%m-%d')), ('date_to','>=',time.strftime('%Y-%m-%d'))]
+
+
+
+
+ Current Plannings
+ report_account_analytic.planning
+ form
+ tree,form
+ [('date_from','<=',time.strftime('%Y-%m-%d')),('date_to','>=',time.strftime('%Y-%m-%d'))]
+
+
+
+
+ New Planning
+ report_account_analytic.planning
+ form
+ form,tree
+
+
+
+
+
+
+
+
+ report.account.analytic.planning.stat.form
+ report_account_analytic.planning.stat
+ form
+
+
+
+
+
+
+
+ report.account.analytic.planning.stat.tree
+ report_account_analytic.planning.stat
+ tree
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ report.account.analytic.planning.stat.graph
+ report_account_analytic.planning.stat
+ graph
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Planning Statistics
+ report_account_analytic.planning.stat
+ form
+ graph,tree
+
+
+
+
+
+ My Planning Statistics
+ report_account_analytic.planning.stat
+ form
+ [('user_id','=',uid),('planning_id.state','<>','cancel')]
+ graph,tree
+
+
+
+
+
+ Planning Statistics of My Projects
+ report_account_analytic.planning.stat
+ form
+ [('manager_id','=',uid),('planning_id.state','<>','cancel')]
+ graph,tree
+
+
+
+
+
+
+
+
+ planning.task.form
+ project.task
+ form
+
-
-
-
-
-
-
-
-
-
+
+
+
-
-
- report.account.analytic.planning.stat.graph
- report_account_analytic.planning.stat
- graph
-
-
-
-
-
-
-
-
-
-
-
-
-
- Planning Statistics
- report_account_analytic.planning.stat
- form
- graph,tree
-
-
-
-
- My Planning Statistics
- report_account_analytic.planning.stat
- form
- [('user_id','=',uid),('planning_id.state','=','open')]
- graph,tree
-
-
-
-
- Planning Statistics of My Projects
- report_account_analytic.planning.stat
- form
- [('manager_id','=',uid),('planning_id.state','=','open')]
- graph,tree
-
-
-
-
-
-
-
+
+
diff --git a/addons/report_analytic_planning/security/ir.model.access.csv b/addons/report_analytic_planning/security/ir.model.access.csv
index c57a1581547..e00e0a01554 100644
--- a/addons/report_analytic_planning/security/ir.model.access.csv
+++ b/addons/report_analytic_planning/security/ir.model.access.csv
@@ -1,10 +1,8 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
"access_report_account_analytic_planning","report_account_analytic.planning","model_report_account_analytic_planning","project.group_project_manager",1,1,1,1
"access_report_account_analytic_planning_line","report_account_analytic.planning.line","model_report_account_analytic_planning_line","project.group_project_manager",1,1,1,1
-"access_report_account_analytic_planning_stat_account_manager","report_account_analytic.planning.stat.account manager","model_report_account_analytic_planning_stat_account","project.group_project_manager",1,1,1,0
-"access_report_account_analytic_planning_stat_account","report_account_analytic.planning.stat.account","model_report_account_analytic_planning_stat_account","project.group_project_user",1,0,0,0
"access_report_account_analytic_planning_stat_manager","report_account_analytic.planning.stat manager","model_report_account_analytic_planning_stat","project.group_project_manager",1,1,1,1
"access_report_account_analytic_planning_stat","report_account_analytic.planning.stat","model_report_account_analytic_planning_stat","project.group_project_user",1,0,0,0
-"access_report_account_analytic_planning_stat_user_manager","report_account_analytic.planning.stat.user manager","model_report_account_analytic_planning_stat_user","project.group_project_manager",1,0,0,0
-"access_report_account_analytic_planning_stat_user","report_account_analytic.planning.stat.user","model_report_account_analytic_planning_stat_user","project.group_project_user",1,0,0,0
"access_account_analytic_account_project_manager","account.analytic.account project manager","account.model_account_analytic_account","project.group_project_manager",1,1,1,1
+"access_report_account_analytic_planning_user","report_account_analytic.planning.user","model_report_account_analytic_planning_user","project.group_project_manager",1,1,1,1
+"access_report_account_analytic_planning_account","report_account_analytic.planning.account","model_report_account_analytic_planning_account","project.group_project_manager",1,1,1,1
diff --git a/addons/report_crm/report_crm.py b/addons/report_crm/report_crm.py
index 30bf015188e..a502400777c 100644
--- a/addons/report_crm/report_crm.py
+++ b/addons/report_crm/report_crm.py
@@ -25,7 +25,7 @@ from osv import fields,osv
AVAILABLE_STATES = [
('draft','Draft'),
('open','Open'),
- ('cancel', 'Canceled'),
+ ('cancel', 'Cancelled'),
('done', 'Closed'),
('pending','Pending')
]
diff --git a/addons/report_sale/report_sale_view.xml b/addons/report_sale/report_sale_view.xml
index a4dbdad6b2a..20575f56951 100644
--- a/addons/report_sale/report_sale_view.xml
+++ b/addons/report_sale/report_sale_view.xml
@@ -8,7 +8,7 @@
report.sale.order.product
form
-
-
report.sale.order.product.tree
report.sale.order.product
tree
-
+
@@ -43,7 +42,7 @@
report.sale.order.product
graph
-
+
@@ -51,7 +50,7 @@
- Sales by Product (this month)
+ Sale Orders by Product (this month)
report.sale.order.product
form
graph,tree
@@ -59,7 +58,7 @@
- Sales by Product
+ Sale Orders by Product
report.sale.order.product
form
graph,tree
@@ -73,7 +72,7 @@
report.sale.order.category
form
-
- Sales by Category of Product (this month)
+ Sale Orders by Category of Product (this month)
report.sale.order.category
form
graph,tree
- [('name','=',time.strftime('%Y-%m-01'))]
+ [('name','=',time.strftime('%Y-%m-01')),('state','<>','draft'),('state','<>','cancel')]
- Sales by Category of Products
+ Sale Orders by Category of Products
report.sale.order.category
form
graph,tree
@@ -135,14 +134,14 @@
sale.order
graph
-
+
- Sales of the Month
+ Sale Orders of the Month
sale.order
form
graph,tree,form
@@ -155,7 +154,7 @@
sale.order
graph
-
+ Sale Orders by State
@@ -248,7 +247,7 @@
report.sale.order.created
tree
-
+
diff --git a/addons/report_timesheet/report_timesheet.py b/addons/report_timesheet/report_timesheet.py
index a5a5c8b33bc..3418dd6a561 100644
--- a/addons/report_timesheet/report_timesheet.py
+++ b/addons/report_timesheet/report_timesheet.py
@@ -172,14 +172,14 @@ class report_random_timsheet(osv.osv):
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):
+ 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)
+ 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):
diff --git a/addons/sale/__init__.py b/addons/sale/__init__.py
index ae804757da5..539ebb2cfe3 100644
--- a/addons/sale/__init__.py
+++ b/addons/sale/__init__.py
@@ -27,6 +27,7 @@
import sale
import stock
import product
+import mrp
import wizard
import report
diff --git a/addons/sale/mrp.py b/addons/sale/mrp.py
new file mode 100644
index 00000000000..05c86374071
--- /dev/null
+++ b/addons/sale/mrp.py
@@ -0,0 +1,68 @@
+# -*- encoding: 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
+
+class mrp_production(osv.osv):
+
+ _inherit = 'mrp.production'
+
+ def _ref_calc(self, cr, uid, ids, field_names=None, arg=False, context={}):
+ if not field_names:
+ field_names=[]
+ res = {}
+ for id in ids:
+ res[id] = {}.fromkeys(field_names, False)
+ for f in field_names:
+ field_name = False
+ if f=='sale_name':
+ field_name = 'name'
+ if f=='sale_ref':
+ field_name = 'client_order_ref'
+ for key, value in self._get_sale_ref(cr, uid, ids, field_name).items():
+ res[key][f] = value
+ return res
+
+ def _get_sale_ref(self, cr, uid, ids, field_name=False):
+ move_obj=self.pool.get('stock.move')
+
+ def get_parent_move(move_id):
+ move = move_obj.browse(cr, uid, move_id)
+ if move.move_dest_id:
+ return get_parent_move(move.move_dest_id.id)
+ return move_id
+
+ productions = self.read(cr, uid, ids, ['id','move_prod_id'])
+ res={}
+ for production in productions:
+ res[production['id']] = False
+ if production.get('move_prod_id',False):
+ parent_move_line = get_parent_move(production['move_prod_id'][0])
+ if parent_move_line:
+ move = move_obj.browse(cr,uid,parent_move_line)
+ if field_name == 'name':
+ res[production['id']] = move.sale_line_id and move.sale_line_id.order_id.name or False
+ if field_name=='client_order_ref':
+ res[production['id']] = move.sale_line_id and move.sale_line_id.order_id.client_order_ref or False
+ return res
+
+mrp_production()
\ No newline at end of file
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 1492143a7d0..c5917c08051 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -379,7 +379,8 @@ class sale_order(osv.osv):
'currency_id': order.pricelist_id.currency_id.id,
'comment': order.note,
'payment_term': pay_term,
- 'fiscal_position': order.partner_id.property_account_position.id
+ 'fiscal_position': order.partner_id.property_account_position.id,
+ 'date_invoice' : context.get('date_invoice',False)
}
inv_obj = self.pool.get('account.invoice')
inv.update(self._inv_get(cr, uid, order))
@@ -390,12 +391,17 @@ class sale_order(osv.osv):
inv_obj.button_compute(cr, uid, [inv_id])
return inv_id
- def action_invoice_create(self, cr, uid, ids, grouped=False, states=['confirmed', 'done', 'exception']):
+ def action_invoice_create(self, cr, uid, ids, grouped=False, states=['confirmed', 'done', 'exception'], date_inv = False):
res = False
invoices = {}
invoice_ids = []
- for o in self.browse(cr, uid, ids):
+ context = {}
+ # If date was specified, use it as date invoiced, usefull when invoices are generated this month and put the
+ # last day of the last month as invoice date
+ if date_inv:
+ context['date_inv'] = date_inv
+ for o in self.browse(cr,uid,ids):
lines = []
for line in o.order_line:
if (line.state in states) and not line.invoiced:
@@ -412,15 +418,15 @@ class sale_order(osv.osv):
picking_obj = self.pool.get('stock.picking')
for val in invoices.values():
if grouped:
- res = self._make_invoice(cr, uid, val[0][0], reduce(lambda x, y: x + y, [l for o, l in val], []))
- for o, l in val:
- self.write(cr, uid, [o.id], {'state': 'progress'})
- if o.order_policy == 'picking':
- picking_obj.write(cr, uid, map(lambda x: x.id, o.picking_ids), {'invoice_state': 'invoiced'})
+ res = self._make_invoice(cr, uid, val[0][0], reduce(lambda x,y: x + y, [l for o,l in val], []), context=context)
+ for o,l in val:
+ self.write(cr, uid, [o.id], {'state' : 'progress'})
+ if o.order_policy=='picking':
+ picking_obj.write(cr,uid,map(lambda x:x.id,o.picking_ids),{'invoice_state':'invoiced'})
cr.execute('insert into sale_order_invoice_rel (order_id,invoice_id) values (%s,%s)', (o.id, res))
else:
for order, il in val:
- res = self._make_invoice(cr, uid, order, il)
+ res = self._make_invoice(cr, uid, order, il, context=context)
invoice_ids.append(res)
self.write(cr, uid, [order.id], {'state': 'progress'})
if order.order_policy == 'picking':
@@ -951,7 +957,7 @@ class sale_order_line(osv.osv):
partner = partner_obj.browse(cr, uid, partner_id)
result['tax_id'] = self.pool.get('account.fiscal.position').map_tax(cr, uid, fpos, product_obj.taxes_id)
if not flag:
- result['name'] = product_obj.partner_ref
+ result['name'] = self.pool.get('product.product').name_get(cr, uid, [product_obj.id])[0][1]
domain = {}
if (not uom) and (not uos):
result['product_uom'] = product_obj.uom_id.id
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index f0b8da9a017..a2aa31e86c4 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -145,7 +145,7 @@
-
+
@@ -182,16 +182,16 @@
-
+
-
-
-
-
-
-
+
+
+
+
+
+
@@ -220,12 +220,33 @@
+
+
+ sale.order.list.select
+ sale.order
+ search
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Sales Orders
ir.actions.act_window
sale.order
form
tree,form,calendar,graph
+
@@ -236,10 +257,11 @@
form
tree,form,calendar,graph
[('user_id','=',uid)]
+
+
-
-
+
All Sales Order
@@ -247,8 +269,10 @@
sale.order
form
tree,form,calendar,graph
+
+
-
+
New Quotation
@@ -267,8 +291,10 @@
form
tree,form,calendar,graph
[('state','in',('shipping_except','invoice_except'))]
+
+
-
+
Sales Order To Be Invoiced
@@ -277,8 +303,10 @@
form
tree,form,calendar,graph
[('state','=','manual')]
+
+
-
+
Sales Order in Progress
@@ -287,8 +315,10 @@
form
tree,form,calendar,graph
[('state','in',('progress','waiting_date','manual'))]
+
+
-
+
@@ -298,8 +328,10 @@
form
tree,form,calendar,graph
[('state','=','draft')]
+
+
-
+
My sales in shipping exception
@@ -308,8 +340,10 @@
form
tree,form,calendar,graph
[('state','in',('shipping_except','invoice_except')),('user_id','=',uid)]
+
+
-
+
My sales order waiting Invoice
@@ -318,8 +352,10 @@
form
tree,form,calendar,graph
[('state','=','manual'),('user_id','=',uid)]
+
+
-
+
My sales order in progress
@@ -328,9 +364,10 @@
form
tree,form,calendar,graph
[('state','in',('progress','waiting_date','manual')),('user_id','=',uid)]
+
+
-
-
+
My Quotations
@@ -339,9 +376,10 @@
form
tree,form,calendar,graph
[('state','=','draft'),('user_id','=',uid)]
+
+
-
-
+
sale.order.line.graph
@@ -405,8 +443,8 @@
-
-
+
+
@@ -441,8 +479,9 @@
form
tree,form,graph
[('invoiced','<>', 1),('state','<>','draft'),('state','<>','cancel')]
+
-
+
Uninvoiced and Delivered Lines
@@ -451,8 +490,9 @@
form
tree,form,graph
[('invoiced','<>', 1),('state','=','done')]
+
-
+
diff --git a/addons/sale/unit_test/__init__.py b/addons/sale/unit_test/__init__.py
new file mode 100644
index 00000000000..cfc1f614751
--- /dev/null
+++ b/addons/sale/unit_test/__init__.py
@@ -0,0 +1,24 @@
+# -*- encoding: 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 .
+#
+##############################################################################
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale/unit_test/test.py b/addons/sale/unit_test/test.py
new file mode 100644
index 00000000000..6567e0e9f6b
--- /dev/null
+++ b/addons/sale/unit_test/test.py
@@ -0,0 +1,139 @@
+import unittest
+import pooler
+import netsvc
+from cStringIO import StringIO
+from osv import osv
+
+cr = None
+uid = None
+order_id = None
+
+class sale_order_test_case(unittest.TestCase):
+ def setUp(self):
+ try:
+ self.pool = pooler.get_pool(cr.dbname)
+ self.sale_order = self.pool.get('sale.order')
+ except osv.except_osv,e:
+ self.fail(e.name + e.value)
+ except Exception,e:
+ self.fail(e)
+
+
+ def tearDown(self):
+ try:
+ self.pool = None
+ self.sale_order = None
+ except osv.except_osv,e:
+ self.fail(e.name + e.value)
+ except Exception,e:
+ self.fail(e)
+
+
+ def test_1_Create(self):
+
+ try:
+ global order_id
+ model_obj = self.pool.get('ir.model.data')
+
+ ### SALE ORDER
+ shop = model_obj._get_id(cr, uid, 'sale', 'shop')
+ shop_id = model_obj.browse(cr, uid, shop).res_id
+ partner = model_obj._get_id(cr,uid, 'base', 'res_partner_9')
+ partner_id = model_obj.browse(cr, uid, partner,).res_id
+ partner_invoice = model_obj._get_id(cr, uid, 'base', 'res_partner_address_9')
+ partner_invoice_id = model_obj.browse(cr, uid, partner_invoice).res_id
+ pricelist_id = self.pool.get('res.partner').browse(cr, uid,partner_id).property_product_pricelist.id
+ order_id = self.sale_order.create(cr,uid,
+ {'shop_id':shop_id,'pricelist_id':pricelist_id,'user_id':uid,
+ 'partner_id':partner_id,'partner_invoice_id':partner_invoice_id,
+ 'partner_shipping_id':partner_invoice_id,'partner_order_id':partner_invoice_id})
+ ### SALE ORDER LINE
+ product = model_obj._get_id(cr,uid, 'product', 'product_product_pc2')
+ product_id = model_obj.browse(cr, uid, product).res_id
+ product_uom = model_obj._get_id(cr, uid, 'product', 'product_uom_unit')
+ product_uom_id = model_obj.browse(cr, uid, product_uom).res_id
+ self.pool.get('sale.order.line').create(cr,uid,
+ {'order_id':order_id,'name':'[PC2] Computer assembled on demand',
+ 'product_id':product_id,'product_uom':product_uom_id,'price_unit':600,
+ 'type':'make_to_order'})
+ except osv.except_osv,e:
+ self.fail(e.name + e.value)
+ except Exception,e:
+ self.fail(e)
+
+ def test_2_ConfirmOrder(self):
+ try:
+ self.failUnless(order_id,"No Sale Order Created !")
+ wf_service = netsvc.LocalService("workflow")
+ res = wf_service.trg_validate(uid, 'sale.order',order_id, 'order_confirm', cr)
+ except osv.except_osv,e:
+ self.fail(e.name + e.value)
+ except Exception,e:
+ self.fail(e)
+
+ def test_3_CreateInvoice(self):
+
+ try:
+ self.failUnless(order_id,"No Sale Order Created !")
+ wf_service = netsvc.LocalService("workflow")
+ res = wf_service.trg_validate(uid, 'sale.order',order_id, 'manual_invoice', cr)
+ except osv.except_osv,e:
+ self.fail(e.name + e.value)
+ except Exception,e:
+ self.fail(e)
+
+ def test_4_CancelPicking(self):
+ try:
+ self.failUnless(order_id,"No Sale Order Created !")
+ picking_obj = self.pool.get('stock.picking')
+ pickings = picking_obj.search(cr,uid,[('sale_id','=',order_id)])
+ picking_obj.action_cancel(cr, uid, pickings)
+ except osv.except_osv,e:
+ self.fail(e.name + e.value)
+ except Exception,e:
+ self.fail(e)
+
+ def test_5_PrintOrder(self):
+ try:
+ self.failUnless(order_id,"No Sale Order Created !")
+ report_service = netsvc.LocalService("report")
+ model_obj = self.pool.get('ir.model.data')
+ passwd = self.pool.get('res.users').browse(cr,uid,uid).password
+ report = model_obj._get_id(cr, uid, 'sale', 'report_sale_order')
+ report_id = model_obj.browse(cr, uid, report).res_id
+ report_service.report(cr.dbname, uid, passwd, 'sale.order', [order_id])
+ except osv.except_osv,e:
+ self.fail(e.name + e.value)
+ except Exception,e:
+ self.fail(e)
+
+ def test_6_CancelOrder(self):
+ try:
+ self.failUnless(order_id,"No Sale Order Created !")
+ self.sale_order.action_cancel(cr, uid, [order_id])
+ except osv.except_osv,e:
+ self.fail(e.name + e.value)
+ except Exception,e:
+ self.fail(e)
+
+ def test_7_Unlink(self):
+ try:
+ self.failUnless(order_id,"No Sale Order Created !")
+ self.sale_order.unlink(cr, uid, [order_id])
+ except osv.except_osv,e:
+ self.fail(e.name + e.value)
+ except Exception,e:
+ self.fail(e)
+
+
+def runTest(cursor=None, user=None):
+ global cr
+ global uid
+ cr = cursor
+ uid = user
+ out = StringIO()
+ suite = unittest.TestLoader().loadTestsFromTestCase(sale_order_test_case)
+ res = unittest.TextTestRunner(stream=out,verbosity=2).run(suite)
+ if res.wasSuccessful():
+ return (True,out.getvalue())
+ return (res,out.getvalue())
diff --git a/addons/sale/wizard/make_invoice.py b/addons/sale/wizard/make_invoice.py
index 51fc25f0dbb..0a4a7e305b7 100644
--- a/addons/sale/wizard/make_invoice.py
+++ b/addons/sale/wizard/make_invoice.py
@@ -28,11 +28,13 @@ invoice_form = """
"""
invoice_fields = {
- 'grouped' : {'string':'Group the invoices', 'type':'boolean', 'default': lambda x,y,z: False}
+ 'grouped' : {'string':'Group the invoices', 'type':'boolean', 'default': lambda x,y,z: False},
+ 'invoice_date': {'string': 'Invoiced date', 'type':'date' }
}
ack_form = """
@@ -43,10 +45,12 @@ ack_form = """
ack_fields = {}
def _makeInvoices(self, cr, uid, data, context):
- order_obj = pooler.get_pool(cr.dbname).get('sale.order')
+ pool_obj = pooler.get_pool(cr.dbname)
+ mod_obj = pool_obj.get('ir.model.data')
+ order_obj = pool_obj.get('sale.order')
newinv = []
- order_obj.action_invoice_create(cr, uid, data['ids'], data['form']['grouped'])
+ order_obj.action_invoice_create(cr, uid, data['ids'], data['form']['grouped'], date_inv = data['form']['invoice_date'])
for id in data['ids']:
wf_service = netsvc.LocalService("workflow")
wf_service.trg_validate(uid, 'sale.order', id, 'manual_invoice', cr)
@@ -54,9 +58,7 @@ def _makeInvoices(self, cr, uid, data, context):
for o in order_obj.browse(cr, uid, data['ids'], context):
for i in o.invoice_ids:
newinv.append(i.id)
- pool = pooler.get_pool(cr.dbname)
- mod_obj = pool.get('ir.model.data')
- act_obj = pool.get('ir.actions.act_window')
+ act_obj = pool_obj.get('ir.actions.act_window')
xml_id='action_invoice_tree5'
result = mod_obj._get_id(cr, uid, 'account', xml_id)
id = mod_obj.read(cr, uid, result, ['res_id'])['res_id']
@@ -86,9 +88,7 @@ class make_invoice(wizard.interface):
},
'invoice' : {
'actions' : [_makeInvoices],
- 'result' : {'type' : 'action',
- 'action' : _makeInvoices,
- 'state' : 'end'}
+ 'result' : {'type': 'state', 'state': 'end'}
},
}
make_invoice("sale.order.make_invoice")
diff --git a/addons/sale/wizard/make_invoice_advance.py b/addons/sale/wizard/make_invoice_advance.py
index ceec3cf1307..576601ba7f8 100644
--- a/addons/sale/wizard/make_invoice_advance.py
+++ b/addons/sale/wizard/make_invoice_advance.py
@@ -121,6 +121,9 @@ def _createInvoices(self, cr, uid, data, context={}):
class sale_advance_payment(wizard.interface):
def _open_invoice(self, cr, uid, data, context):
pool_obj = pooler.get_pool(cr.dbname)
+ mod_obj = pool_obj.get('ir.model.data')
+ result = mod_obj._get_id(cr, uid, 'account', 'view_account_invoice_filter')
+ id = mod_obj.read(cr, uid, result, ['res_id'])
model_data_ids = pool_obj.get('ir.model.data').search(cr,uid,[('model','=','ir.ui.view'),('name','=','invoice_form')])
resource_id = pool_obj.get('ir.model.data').read(cr,uid,model_data_ids,fields=['res_id'])[0]['res_id']
return {
@@ -131,7 +134,8 @@ class sale_advance_payment(wizard.interface):
'res_model': 'account.invoice',
'views': [(False,'tree'),(resource_id,'form')],
'context': "{'type':'out_invoice'}",
- 'type': 'ir.actions.act_window'
+ 'type': 'ir.actions.act_window',
+ 'search_view_id': id['res_id']
}
states = {
diff --git a/addons/sale_crm/wizard/makesale.py b/addons/sale_crm/wizard/makesale.py
index 1eb426fec95..4a6f8daf4d2 100644
--- a/addons/sale_crm/wizard/makesale.py
+++ b/addons/sale_crm/wizard/makesale.py
@@ -63,6 +63,9 @@ class make_sale(wizard.interface):
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, 'sale', 'view_sales_order_filter')
+ id = mod_obj.read(cr, uid, result, ['res_id'])
case_obj = pool.get('crm.case')
sale_obj = pool.get('sale.order')
partner_obj = pool.get('res.partner')
@@ -129,6 +132,7 @@ class make_sale(wizard.interface):
'res_model': 'sale.order',
'view_id': False,
'type': 'ir.actions.act_window',
+ 'search_view_id': id['res_id']
}
return value
diff --git a/addons/sale_journal/picking_journal_view.xml b/addons/sale_journal/picking_journal_view.xml
index 047da333c06..9234d333a52 100644
--- a/addons/sale_journal/picking_journal_view.xml
+++ b/addons/sale_journal/picking_journal_view.xml
@@ -19,13 +19,13 @@
-
-
-
+
+
+
-
+
@@ -76,9 +76,10 @@
form
tree,form
[('user_id','=',uid),('state','=','open')]
+
-
+
Packing by journal
@@ -86,9 +87,10 @@
form
tree,form
[('state','=','open')]
+
-
+
Packing by invoice_method
diff --git a/addons/sale_journal/sale_journal_view.xml b/addons/sale_journal/sale_journal_view.xml
index 2c0efe773ea..c2f0aa34581 100644
--- a/addons/sale_journal/sale_journal_view.xml
+++ b/addons/sale_journal/sale_journal_view.xml
@@ -51,14 +51,14 @@
-
-
-
+
+
+
-
-
+
+
@@ -114,9 +114,10 @@
form
tree,form
[('user_id','=',uid),('state','=','open')]
+
-
+
Open journals
@@ -124,9 +125,10 @@
form
tree,form
[('state','=','open')]
+
-
+
sale.order.journal.view.form
diff --git a/addons/scrum/scrum_view.xml b/addons/scrum/scrum_view.xml
index 9133f40d242..c4b91a95f9e 100644
--- a/addons/scrum/scrum_view.xml
+++ b/addons/scrum/scrum_view.xml
@@ -124,8 +124,9 @@
form
tree,form
[('state','=','draft')]
+
-
+
Opened Backlogs
@@ -133,10 +134,9 @@
form
tree,form
[('state','=','open')]
+
-
-
-
+
-
scrum.meeting.tree
scrum.meeting
@@ -374,8 +388,6 @@
-
-
@@ -408,8 +420,9 @@
form
tree,form
[('user_id', '=', uid),('scrum','=',1)]
+
-
+
My opened tasks
@@ -417,8 +430,9 @@
form
tree,form
[('user_id','=',uid),('state','=','open'),('scrum','=',1)]
+
-
+
Opened tasks
@@ -427,7 +441,7 @@
tree,form
[('state','=','open'),('scrum','=',1)]
-
+
diff --git a/addons/scrum/wizard/backlog_to_task.py b/addons/scrum/wizard/backlog_to_task.py
index 4701b95ce29..e1cc25fc428 100644
--- a/addons/scrum/wizard/backlog_to_task.py
+++ b/addons/scrum/wizard/backlog_to_task.py
@@ -36,7 +36,11 @@ btt_fields = {
}
def _do_create(self, cr, uid, data, context):
- backlogs = pooler.get_pool(cr.dbname).get('scrum.product.backlog').browse(cr, uid, data['ids'])
+ pool = pooler.get_pool(cr.dbname)
+ backlogs = pool.get('scrum.product.backlog').browse(cr, uid, data['ids'])
+ mod_obj = pool.get('ir.model.data')
+ result = mod_obj._get_id(cr, uid, 'project', 'view_task_search_form')
+ id = mod_obj.read(cr, uid, result, ['res_id'])
ids = []
for backlog in backlogs:
task = pooler.get_pool(cr.dbname).get('scrum.task')
@@ -57,7 +61,8 @@ def _do_create(self, cr, uid, data, context):
'view_mode': 'tree,form',
'res_model': 'scrum.task',
'view_id': False,
- 'type': 'ir.actions.act_window'
+ 'type': 'ir.actions.act_window',
+ 'search_view_id': id['res_id']
}
return value
diff --git a/addons/stock/product.py b/addons/stock/product.py
index 3fbc0407e89..575e043c3b4 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -1,7 +1,7 @@
# -*- encoding: utf-8 -*-
##############################################################################
#
-# OpenERP, Open Source Management Solution
+# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (). All Rights Reserved
# $Id$
#
@@ -167,12 +167,13 @@ class product_product(osv.osv):
'virtual_available': fields.function(_product_available, method=True, type='float', string='Virtual Stock', help="Futur stock for this product according to the selected location or all internal if none have been selected. Computed as: Real Stock - Outgoing + Incoming.", multi='qty_available'),
'incoming_qty': fields.function(_product_available, method=True, type='float', string='Incoming', help="Quantities of products that are planned to arrive in selected locations or all internal if none have been selected.", multi='qty_available'),
'outgoing_qty': fields.function(_product_available, method=True, type='float', string='Outgoing', help="Quantities of products that are planned to leave in selected locations or all internal if none have been selected.", multi='qty_available'),
- 'track_production' : fields.boolean('Track Production Lots' , help="Force to use a Production Lot during production order"),
- 'track_incoming' : fields.boolean('Track Incomming Lots', help="Force to use a Production Lot during receptions"),
- 'track_outgoing' : fields.boolean('Track Outging Lots', help="Force to use a Production Lot during deliveries"),
+ 'track_production': fields.boolean('Track Production Lots' , help="Force to use a Production Lot during production order"),
+ 'track_incoming': fields.boolean('Track Incomming Lots', help="Force to use a Production Lot during receptions"),
+ 'track_outgoing': fields.boolean('Track Outging Lots', help="Force to use a Production Lot during deliveries"),
+ 'warehouse_id': fields.dummy(string='Warehouse',relation='stock.warehouse',type='many2one'),
}
- def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False):
- res = super(product_product,self).fields_view_get(cr, uid, view_id, view_type, context, toolbar)
+ def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
+ res = super(product_product,self).fields_view_get(cr, uid, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
if ('location' in context) and context['location']:
location_info = self.pool.get('stock.location').browse(cr, uid, context['location'])
fields=res.get('fields',{})
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 86711ba4029..92fe8d54ea6 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -2,6 +2,18 @@
+
+ product.search.stock.form
+ product.product
+ search
+
+
+
+
+
+
+
+
product.category.stock.property.form.inherit
product.category
diff --git a/addons/stock/report_stock.py b/addons/stock/report_stock.py
index 5e5e517121d..0bd44db1171 100644
--- a/addons/stock/report_stock.py
+++ b/addons/stock/report_stock.py
@@ -81,4 +81,84 @@ class stock_report_prodlots(osv.osv):
stock_report_prodlots()
+class stock_report_tracklots(osv.osv):
+ _name = "stock.report.tracklots"
+ _description = "Stock report by tracking lots"
+ _auto = False
+ _columns = {
+ 'name': fields.float('Quantity', readonly=True),
+ 'location_id': fields.many2one('stock.location', 'Location', readonly=True, select=True),
+ 'product_id': fields.many2one('product.product', 'Product', readonly=True, select=True),
+ 'tracking_id': fields.many2one('stock.tracking', 'Tracking lot', readonly=True, select=True),
+ }
+
+ def init(self, cr):
+ cr.execute("""
+ create or replace view stock_report_tracklots as (
+
+ select max(id) as id,
+ location_id,
+ product_id,
+ tracking_id,
+ sum(qty) as name
+ from (
+ select -max(sm.id) as id,
+ sm.location_id,
+ sm.product_id,
+ sm.tracking_id,
+ -sum(sm.product_qty /uo.factor) as qty
+ from stock_move as sm
+ left join stock_location sl
+ on (sl.id = sm.location_id)
+ left join product_uom uo
+ on (uo.id=sm.product_uom)
+ where state = 'done'
+ group by sm.location_id, sm.product_id, sm.product_uom, sm.tracking_id
+ union all
+ select max(sm.id) as id,
+ sm.location_dest_id as location_id,
+ sm.product_id,
+ sm.tracking_id,
+ sum(sm.product_qty /uo.factor) as qty
+ from stock_move as sm
+ left join stock_location sl
+ on (sl.id = sm.location_dest_id)
+ left join product_uom uo
+ on (uo.id=sm.product_uom)
+ where sm.state = 'done'
+ group by sm.location_dest_id, sm.product_id, sm.product_uom, sm.tracking_id
+ ) as report
+ group by location_id, product_id, tracking_id
+ )""")
+
+ def unlink(self, cr, uid, ids, context={}):
+ raise osv.except_osv(_('Error !'), _('You cannot delete any record!'))
+
+stock_report_tracklots()
+
+class report_stock_lines_date(osv.osv):
+ _name = "report.stock.lines.date"
+ _description = "Dates of Inventories"
+ _auto = False
+ _columns = {
+ 'id': fields.integer('Inventory Line Id', readonly=True),
+ 'product_id': fields.many2one('product.product', 'Product', readonly=True, select=True),
+ 'create_date': fields.datetime('Latest Date of Inventory'),
+ }
+ def init(self, cr):
+ cr.execute("""
+ create or replace view report_stock_lines_date as (
+ select
+ l.id as id,
+ p.id as product_id,
+ max(l.create_date) as create_date
+ from
+ product_product p
+ left outer join
+ stock_inventory_line l on (p.id=l.product_id)
+ where l.create_date is not null
+ group by p.id,l.id
+ )""")
+report_stock_lines_date()
+
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/report_stock_view.xml b/addons/stock/report_stock_view.xml
index 61381afba56..57b2608aa05 100644
--- a/addons/stock/report_stock_view.xml
+++ b/addons/stock/report_stock_view.xml
@@ -20,9 +20,26 @@
ir.actions.act_window
stock.report.prodlots
form
- form,tree
+ tree,form
+ {'full':'1'}
+
+
+ stock.report.tracklots.view
+ stock.report.tracklots
+ tree
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ report.stock.lines.date.tree
+ report.stock.lines.date
+ tree
+
+
+
+
+
+
+
+
-
-
- report.stock.lines.date.tree
- report.stock.lines.date
- tree
-
-
-
-
-
-
-
-
+
+ report.stock.lines.date.form
+ report.stock.lines.date
+ form
+
+
+
+
-
- report.stock.lines.date.form
- report.stock.lines.date
- form
-
-
-
-
-
-
- Dates of Inventories
- report.stock.lines.date
- form
- tree,form
-
-
-
-
-
+
+ Dates of Inventories
+ report.stock.lines.date
+ form
+ tree,form
+
+
+
+
+
stock.location.tree
stock.location
tree
@@ -125,7 +147,7 @@
-
+
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 039dfdd99fd..09cbf55b1ed 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -36,8 +36,8 @@ class stock_incoterms(osv.osv):
_name = "stock.incoterms"
_description = "Incoterms"
_columns = {
- 'name': fields.char('Name', size=64, required=True),
- 'code': fields.char('Code', size=3, required=True),
+ 'name': fields.char('Name', size=64, required=True,help="Incoterms are series of sales terms.They are used to divide transaction costs and responsibilities between buyer and seller and reflect state-of-the-art transportation practices."),
+ 'code': fields.char('Code', size=3, required=True,help="code for Incoterms"),
'active': fields.boolean('Active'),
}
_defaults = {
@@ -58,6 +58,21 @@ class stock_location(osv.osv):
_parent_order = 'id'
_order = 'parent_left'
+ def name_get(self, cr, uid, ids, context={}):
+ if not len(ids):
+ return []
+ reads = self.read(cr, uid, ids, ['name','location_id'], context)
+ res = []
+ for record in reads:
+ name = record['name']
+ if context.get('full',False):
+ if record['location_id']:
+ name = record['location_id'][1]+' / '+name
+ res.append((record['id'], name))
+ else:
+ res.append((record['id'], name))
+ return res
+
def _complete_name(self, cr, uid, ids, name, args, context):
def _get_one_full_name(location, level=4):
if location.location_id:
@@ -423,30 +438,32 @@ class stock_picking(osv.osv):
'name': fields.char('Reference', size=64, select=True),
'origin': fields.char('Origin Reference', size=64),
'backorder_id': fields.many2one('stock.picking', 'Back Order'),
- 'type': fields.selection([('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal'), ('delivery', 'Delivery')], 'Shipping Type', required=True, select=True),
+ 'type': fields.selection([('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal'), ('delivery', 'Delivery')], 'Shipping Type', required=True, select=True, help="Shipping type specify, goods coming in or going out."),
'active': fields.boolean('Active'),
'note': fields.text('Notes'),
- 'location_id': fields.many2one('stock.location', 'Location'),
- 'location_dest_id': fields.many2one('stock.location', 'Dest. Location'),
- 'move_type': fields.selection([('direct', 'Direct Delivery'), ('one', 'All at once')], 'Delivery Method', required=True),
+ 'location_id': fields.many2one('stock.location', 'Location', help="Keep empty if you produce at the location where the finished products are needed." \
+ "Set a location if you produce at a fixed location. This can be a partner location " \
+ "if you subcontract the manufacturing operations."),
+ 'location_dest_id': fields.many2one('stock.location', 'Dest. Location',help="Location where the system will stock the finished products."),
+ 'move_type': fields.selection([('direct', 'Direct Delivery'), ('one', 'All at once')], 'Delivery Method', required=True, help="It specifies goods to be delivered all at once or by direct delivery"),
'state': fields.selection([
('draft', 'Draft'),
('auto', 'Waiting'),
('confirmed', 'Confirmed'),
('assigned', 'Available'),
('done', 'Done'),
- ('cancel', 'Canceled'),
+ ('cancel', 'Cancelled'),
], 'Status', readonly=True, select=True),
'min_date': fields.function(get_min_max_date, fnct_inv=_set_minimum_date, multi="min_max_date",
- method=True, store=True, type='datetime', string='Planned Date', select=1),
- 'date': fields.datetime('Date Order'),
- 'date_done': fields.datetime('Date Done'),
+ method=True, store=True, type='datetime', string='Planned Date', select=1, help="Planned date for Packing. Default it takes current date"),
+ 'date': fields.datetime('Date Order', help="Date of Order"),
+ 'date_done': fields.datetime('Date Done', help="Date of completion"),
'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. Planned Date', select=2),
'move_lines': fields.one2many('stock.move', 'picking_id', 'Move lines', states={'done': [('readonly', True)], 'cancel': [('readonly', True)]}),
'auto_picking': fields.boolean('Auto-Packing'),
- 'address_id': fields.many2one('res.partner.address', 'Partner'),
+ 'address_id': fields.many2one('res.partner.address', 'Partner', help="Address of partner"),
'invoice_state': fields.selection([
("invoiced", "Invoiced"),
("2binvoiced", "To Be Invoiced"),
@@ -467,7 +484,8 @@ class stock_picking(osv.osv):
if default is None:
default = {}
default = default.copy()
- default['name'] = self.pool.get('ir.sequence').get(cr, uid, 'stock.picking')
+ if not default.get('name',False):
+ default['name'] = self.pool.get('ir.sequence').get(cr, uid, 'stock.picking')
return super(stock_picking, self).copy(cr, uid, id, default, context)
def onchange_partner_in(self, cr, uid, context, partner_id=None):
@@ -690,6 +708,7 @@ class stock_picking(osv.osv):
'name': (invoice.name or '') + ', ' + (picking.name or ''),
'origin': (invoice.origin or '') + ', ' + (picking.name or '') + (picking.origin and (':' + picking.origin) or ''),
'comment': (comment and (invoice.comment and invoice.comment+"\n"+comment or comment)) or (invoice.comment and invoice.comment or ''),
+ 'date_invoice':context.get('date_inv',False)
}
invoice_obj.write(cursor, user, [invoice_id], invoice_vals, context=context)
else:
@@ -703,7 +722,8 @@ class stock_picking(osv.osv):
'address_contact_id': address_contact_id,
'comment': comment,
'payment_term': payment_term_id,
- 'fiscal_position': partner.property_account_position.id
+ 'fiscal_position': partner.property_account_position.id,
+ 'date_invoice':context.get('date_inv',False)
}
cur_id = self.get_currency_id(cursor, user, picking)
if cur_id:
@@ -744,6 +764,12 @@ class stock_picking(osv.osv):
user, picking, move_line)
account_id = self.pool.get('account.fiscal.position').map_account(cursor, user, partner.property_account_position, account_id)
+ notes = False
+ if move_line.sale_line_id:
+ notes = move_line.sale_line_id.notes
+ elif move_line.purchase_line_id:
+ notes = move_line.purchase_line_id.notes
+
invoice_line_id = invoice_line_obj.create(cursor, user, {
'name': name,
'origin': origin,
@@ -756,6 +782,7 @@ class stock_picking(osv.osv):
'quantity': move_line.product_uos_qty or move_line.product_qty,
'invoice_line_tax_id': [(6, 0, tax_ids)],
'account_analytic_id': account_analytic_id,
+ 'note': notes,
}, context=context)
self._invoice_line_hook(cursor, user, move_line, invoice_line_id)
@@ -934,11 +961,11 @@ class stock_move(osv.osv):
'product_uom': fields.many2one('product.uom', 'Product UOM', required=True),
'product_uos_qty': fields.float('Quantity (UOS)'),
'product_uos': fields.many2one('product.uom', 'Product UOS'),
- 'product_packaging': fields.many2one('product.packaging', 'Packaging'),
+ 'product_packaging': fields.many2one('product.packaging', 'Packaging', help="It specifies attributes of packaging like type, quantity of packaging,etc."),
- 'location_id': fields.many2one('stock.location', 'Source Location', required=True, select=True),
- 'location_dest_id': fields.many2one('stock.location', 'Dest. Location', required=True, select=True),
- 'address_id': fields.many2one('res.partner.address', 'Dest. Address'),
+ 'location_id': fields.many2one('stock.location', 'Source Location', required=True, select=True, help="Set a location if you produce at a fixed location. This can be a partner location if you subcontract the manufacturing operations."),
+ 'location_dest_id': fields.many2one('stock.location', 'Dest. Location', required=True, select=True, help="Location where the system will stock the finished products."),
+ 'address_id': fields.many2one('res.partner.address', 'Dest. Address', help="Adress where goods are to be delivered"),
'prodlot_id': fields.many2one('stock.production.lot', 'Production Lot', help="Production lot is used to put a serial number on the production"),
'tracking_id': fields.many2one('stock.tracking', 'Tracking Lot', select=True, help="Tracking lot is the code that will be put on the logistical unit/pallet"),
@@ -953,7 +980,7 @@ class stock_move(osv.osv):
'note': fields.text('Notes'),
- 'state': fields.selection([('draft', 'Draft'), ('waiting', 'Waiting'), ('confirmed', 'Confirmed'), ('assigned', 'Available'), ('done', 'Done'), ('cancel', 'Canceled')], 'Status', readonly=True, select=True),
+ 'state': fields.selection([('draft', 'Draft'), ('waiting', 'Waiting'), ('confirmed', 'Confirmed'), ('assigned', 'Available'), ('done', 'Done'), ('cancel', 'Cancelled')], 'Status', readonly=True, select=True),
'price_unit': fields.float('Unit Price',
digits=(16, int(config['price_accuracy']))),
}
@@ -1312,7 +1339,7 @@ class stock_inventory(osv.osv):
'date_done': fields.datetime('Date done'),
'inventory_line_id': fields.one2many('stock.inventory.line', 'inventory_id', 'Inventories', readonly=True, states={'draft': [('readonly', False)]}),
'move_ids': fields.many2many('stock.move', 'stock_inventory_move_rel', 'inventory_id', 'move_id', 'Created Moves'),
- 'state': fields.selection( (('draft', 'Draft'), ('done', 'Done')), 'Status', readonly=True),
+ 'state': fields.selection( (('draft', 'Draft'), ('done', 'Done'), ('cancel','Cancelled')), 'Status', readonly=True),
}
_defaults = {
'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
@@ -1366,6 +1393,12 @@ class stock_inventory(osv.osv):
self.write(cr, uid, [inv.id], {'state': 'draft'})
return True
+ def action_cancel_inventary(self, cr, uid, ids, context={}):
+ for inv in self.browse(cr,uid,ids):
+ self.pool.get('stock.move').action_cancel(cr, uid, [x.id for x in inv.move_ids], context)
+ self.write(cr, uid, [inv.id], {'state':'cancel'})
+ return True
+
stock_inventory()
@@ -1460,31 +1493,4 @@ class stock_picking_move_wizard(osv.osv_memory):
stock_picking_move_wizard()
-
-class report_stock_lines_date(osv.osv):
- _name = "report.stock.lines.date"
- _description = "Dates of Inventories"
- _auto = False
- _columns = {
- 'id': fields.integer('Inventory Line Id', readonly=True),
- 'product_id': fields.integer('Product Id', readonly=True),
- 'create_date': fields.datetime('Latest Date of Inventory'),
- }
-
- def init(self, cr):
- cr.execute("""
- create or replace view report_stock_lines_date as (
- select
- l.id as id,
- p.id as product_id,
- max(l.create_date) as create_date
- from
- product_product p
- left outer join
- stock_inventory_line l on (p.id=l.product_id)
- where l.create_date is not null
- group by p.id,l.id
- )""")
-
-report_stock_lines_date()
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 17a0de03be6..6c606663bbd 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -65,9 +65,10 @@
-
-
-
+
+
+
+
@@ -78,6 +79,7 @@
stock.inventory
form
+ {'full':'1'}
@@ -87,14 +89,16 @@
stock.inventory
form
[('state','=','draft')]
+
-
+
New Periodical Inventory
ir.actions.act_window
stock.inventory
form
form,tree
+ [('state','=','draft')]
@@ -221,10 +225,10 @@
stock.production.lot
form
+ {'full':'1'}
-
#
# Lot composition (history)
#
@@ -384,6 +388,7 @@
ir.actions.act_window
form
+ {'full':'1'}
@@ -462,8 +467,8 @@
-
-
+
+
@@ -551,28 +556,28 @@
-
+
-
-
-
+
+
+
-
+
-
-
-
-
-
-
+
+
+
+
+
+
@@ -649,24 +654,24 @@
-
-
-
+
+
+
-
+
-
-
-
-
-
-
+
+
+
+
+
+
@@ -685,6 +690,24 @@
+
+ stock.view_stock_delivery_filter.list.select
+ stock.picking
+ search
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Delivery Orders
@@ -694,6 +717,7 @@
tree,form,calendar
[('type','=','delivery')]
{'contact_display': 'partner'}
+
@@ -723,6 +747,8 @@
tree,form,calendar
[('state','=','assigned'),('type','=','delivery')]
{'contact_display': 'partner'}
+
+
@@ -741,7 +767,7 @@
calendar
-
+
Future Delivery Orders
@@ -751,6 +777,8 @@
tree,form,calendar
[('state','=','confirmed'),('type','=','delivery')]
{'contact_display': 'partner'}
+
+
@@ -769,7 +797,7 @@
calendar
-
+
Calendar of Deliveries
@@ -780,7 +808,7 @@
[('state','=','assigned'),('type','=','delivery')]
{'contact_display': 'partner'}
-
+
#
# Sending Products
@@ -791,7 +819,7 @@
stock.picking
tree
-
+
@@ -839,28 +867,28 @@
on_change="onchange_lot_id(prodlot_id,product_qty, location_id)"/>
-
+
-
-
-
+
+
+
-
+
-
-
-
-
-
-
+
+
+
+
+
+
@@ -887,6 +915,8 @@
tree,form,calendar
[('type','=','out')]
{'contact_display': 'partner'}
+
+
@@ -915,6 +945,8 @@
tree,form,calendar
[('state','=','assigned'),('type','=','out')]
{'contact_display': 'partner'}
+
+
@@ -933,7 +965,7 @@
calendar
-
+
Confirmed Packing Waiting Availability
@@ -943,6 +975,8 @@
tree,form,calendar
[('state','=','confirmed'),('type','=','out')]
{'contact_display': 'partner'}
+
+
@@ -961,7 +995,7 @@
calendar
-
+
#
# Reception of Products
@@ -1030,28 +1064,28 @@
-
+
-
-
-
+
+
+
-
+
-
-
-
-
-
-
+
+
+
+
+
+
@@ -1062,8 +1096,6 @@
-
-
Incoming Products
stock.picking
@@ -1072,6 +1104,8 @@
tree,form,calendar
[('type','=','in')]
{'contact_display': 'partner'}
+
+
@@ -1100,6 +1134,8 @@
tree,form,calendar
[('state','=','assigned'),('type','=','in')]
{'contact_display': 'partner'}
+
+
@@ -1118,7 +1154,7 @@
calendar
-
+
New Reception Packing
@@ -1156,6 +1192,8 @@
tree,form,calendar
[('type','=','internal')]
{'contact_display': 'partner'}
+
+
@@ -1168,8 +1206,10 @@
tree,form,calendar
[('state','=','assigned'),('type','=','internal')]
{'contact_display': 'partner'}
+
+
-
+
Confirmed Packing Waiting Availability
@@ -1179,8 +1219,10 @@
tree,form,calendar
[('state','=','confirmed'),('type','=','internal')]
{'contact_display': 'partner'}
+
+
-
+
New Internal Packing
@@ -1252,14 +1294,14 @@
-
+
-
-
-
-
+
+
+
+
@@ -1280,8 +1322,9 @@
form
[('state','=','draft')]
+
-
+
Available Moves
@@ -1290,8 +1333,9 @@
form
[('state','=','assigned')]
+
-
+
Packing
diff --git a/addons/stock/stock_workflow.xml b/addons/stock/stock_workflow.xml
index eb09fe1b548..3696b5220d0 100644
--- a/addons/stock/stock_workflow.xml
+++ b/addons/stock/stock_workflow.xml
@@ -36,6 +36,14 @@
action_done()
True
+
+
+ cancel
+ True
+ function
+ action_cancel_inventary()
+
+
cancel
@@ -105,5 +113,11 @@
test_cancel()
+
+
+
+ button_cancel
+
+
diff --git a/addons/stock/wizard/wizard_invoice_onshipping.py b/addons/stock/wizard/wizard_invoice_onshipping.py
index abcab123d98..7f07cde5319 100644
--- a/addons/stock/wizard/wizard_invoice_onshipping.py
+++ b/addons/stock/wizard/wizard_invoice_onshipping.py
@@ -32,6 +32,8 @@ invoice_form = """
+
+
"""
@@ -49,17 +51,12 @@ invoice_fields = {
'type': {
'string': 'Type',
'type': 'selection',
- 'selection': [
- ('out_invoice', 'Customer Invoice'),
- ('in_invoice', 'Supplier Invoice'),
- ('out_refund', 'Customer Refund'),
- ('in_refund', 'Supplier Refund'),
- ],
+ 'selection': [],
'required': True
},
+ 'invoice_date': {'string': 'Invoiced date', 'type':'date' }
}
-
def _get_type(obj, cr, uid, data, context):
picking_obj = pooler.get_pool(cr.dbname).get('stock.picking')
usage = 'customer'
@@ -72,6 +69,24 @@ def _get_type(obj, cr, uid, data, context):
if pick.move_lines:
usage = pick.move_lines[0].location_id.usage
+ if pick.type =='out':
+ invoice_fields['type']['selection'] = [
+ ('out_invoice', 'Customer Invoice'),
+ ('in_refund', 'Supplier Refund'),
+ ]
+ elif pick.type =='in':
+ invoice_fields['type']['selection'] = [
+ ('in_invoice', 'Supplier Invoice'),
+ ('out_refund', 'Customer Refund'),
+ ]
+ else:
+ invoice_fields['type']['selection']=[
+ ('out_invoice', 'Customer Invoice'),
+ ('in_invoice', 'Supplier Invoice'),
+ ('out_refund', 'Customer Refund'),
+ ('in_refund', 'Supplier Refund'),
+ ]
+
if pick.type == 'out' and usage == 'supplier':
type = 'in_refund'
elif pick.type == 'out' and usage == 'customer':
@@ -96,6 +111,7 @@ def _create_invoice(obj, cr, uid, data, context):
type = data['form']['type']
+ context['date_inv'] = data['form']['invoice_date']
res = picking_obj.action_invoice_create(cr, uid, data['ids'],
journal_id = data['form']['journal_id'], group=data['form']['group'],
type=type, context= context)
diff --git a/addons/stock/wizard/wizard_location_product.py b/addons/stock/wizard/wizard_location_product.py
index 68f49f1b46a..7380cf9b901 100755
--- a/addons/stock/wizard/wizard_location_product.py
+++ b/addons/stock/wizard/wizard_location_product.py
@@ -24,7 +24,11 @@ import wizard
import pooler
import time
-def _action_open_window(self, cr, uid, data, context):
+def _action_open_window(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, 'product', 'product_search_form_view')
+ id = mod_obj.read(cr, uid, result, ['res_id'])
return {
'name': False,
'view_type': 'form',
@@ -32,7 +36,8 @@ def _action_open_window(self, cr, uid, data, context):
'res_model': 'product.product',
'type': 'ir.actions.act_window',
'context':{'location': data['ids'][0],'from_date':data['form']['from_date'],'to_date':data['form']['to_date']},
- 'domain':[('type','<>','service')]
+ 'domain':[('type','<>','service')],
+ 'search_view_id': id['res_id']
}
diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index 223a94bdcf5..3bfc3feebf8 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -34,9 +34,9 @@
-
-
-
+
+
+
diff --git a/addons/wiki/wiki.py b/addons/wiki/wiki.py
index 7f97f08bb14..fe355a088e9 100644
--- a/addons/wiki/wiki.py
+++ b/addons/wiki/wiki.py
@@ -41,14 +41,16 @@ class WikiGroup(osv.osv):
_order = 'name'
_columns={
'name':fields.char('Wiki Group', size=256, select=True, required=True),
- 'parent_id':fields.many2one('wiki.groups', 'Parent Group', ondelete='set null'),
- 'child_ids':fields.one2many('wiki.groups', 'parent_id', 'Child Groups'),
'page_ids':fields.one2many('wiki.wiki', 'group_id', 'Pages'),
'notes':fields.text("Description", select=True),
'create_date':fields.datetime("Created Date", select=True),
'template': fields.text('Wiki Template'),
'section': fields.boolean("Make Section ?"),
- 'home':fields.many2one('wiki.wiki', 'Pages')
+ 'method':fields.selection([('list','List'),('page','Home Page'),('tree','Tree')],'Display Method'),
+ 'home':fields.many2one('wiki.wiki', 'Pages'),
+ }
+ _defaults = {
+ 'method': lambda *a: 'page',
}
WikiGroup()
@@ -77,11 +79,14 @@ class Wiki(osv.osv):
'history_id':fields.one2many('wiki.wiki.history','wiki_id','History Lines'),
'minor_edit':fields.boolean('Minor edit', select=True),
'summary':fields.char('Summary',size=256, select=True),
- 'section': fields.char('Section', size=32, help="Use page section code like 1.2.1"),
+ 'section': fields.char('Sequence', size=32, help="Use page section code like 1.2.1"),
'group_id':fields.many2one('wiki.groups', 'Wiki Group', select=1, ondelete='set null'),
'toc':fields.boolean('Table of Contents'),
- 'review': fields.boolean('Need Review')
+ 'review': fields.boolean('Need Review'),
+ 'parent_id':fields.many2one('wiki.wiki', 'Parent Page'),
+ 'child_ids':fields.one2many('wiki.wiki', 'parent_id', 'Child Pages'),
}
+
def onchange_group_id(self, cr, uid, ids, group_id, content, context={}):
if (not group_id) or content:
return {}
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index 9c6df8b9c17..452d948668f 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -21,9 +21,8 @@
wiki.groups.tree
wiki.groups
tree
- child_ids
-
+
@@ -33,12 +32,13 @@
wiki.groups
form
-
- Wiki Groups
+ Wikis
wiki.groups
form
tree,form
@@ -69,7 +69,7 @@
action="action_wiki_groups"/>
- Wiki Groups
+ Wikis
wiki.groups
[('parent_id','=',False)]
tree
@@ -79,6 +79,23 @@
id="menu_action_wiki_groups_browse"
action="action_wiki_groups_browse"/>
+
+ wiki.wiki.tree.childs
+ wiki.wiki
+ tree
+ child_ids
+ 100
+
+
+
+
+
+
+
+
+
+
+
wiki.wiki.tree
wiki.wiki
@@ -102,9 +119,10 @@
@@ -120,19 +138,43 @@
- Wiki Pages
+ Search a Pages
wiki.wiki
form
tree,form
{'section':'1'}
-
+
+
+
+ My Pages
+ wiki.wiki
+ form
+ tree,form
+
+ {'section':'1'}
+ [('create_uid','=',uid)]
+
+
+
+
+
+
+ Pages Waiting Review
+ wiki.wiki
+ form
+ tree,form
+
+ {'section':'1'}
+ [('review','=',True)]
+
+
+
+
wiki.wiki.history.tree
wiki.wiki.history
@@ -175,24 +217,38 @@
-
+
+
tree_but_open
wiki.groups
- Wiki Pages
-
+ Search a Page
+
+
+
diff --git a/addons/wiki/wizard/__init__.py b/addons/wiki/wizard/__init__.py
index 69ae1a9e60f..6f734ba3417 100644
--- a/addons/wiki/wizard/__init__.py
+++ b/addons/wiki/wizard/__init__.py
@@ -1,4 +1,5 @@
import open_page
+import open_help
import create_menu
import show_diff
import make_index
diff --git a/addons/wiki/wizard/create_menu.py b/addons/wiki/wizard/create_menu.py
index faae94eb926..68bb6b3defe 100644
--- a/addons/wiki/wizard/create_menu.py
+++ b/addons/wiki/wizard/create_menu.py
@@ -30,7 +30,7 @@ section_form = '''
-
+
'''
section_fields = {
diff --git a/addons/wiki/wizard/open_page.py b/addons/wiki/wizard/open_page.py
index 2223af453f1..892ce3f8758 100644
--- a/addons/wiki/wizard/open_page.py
+++ b/addons/wiki/wizard/open_page.py
@@ -28,19 +28,15 @@ import pooler
from osv import osv
from tools.translate import _
-class wiz_timesheet_open(wizard.interface):
+class wiz_open_page(wizard.interface):
def _open_wiki_page(self, cr, uid, data, context):
pool = pooler.get_pool(cr.dbname)
- menu_id = data['id']
- group_ids = pool.get('wiki.groups.link').search(cr, uid, [('action_id','=',menu_id)])
- if not group_ids:
- raise wizard.except_wizard(_('Open Page'), _('No action found'))
- group = pool.get('wiki.groups.link').browse(cr, uid, group_ids[0])
+ group = pool.get('wiki.groups').browse(cr, uid, data['id'])
value = {
- 'context': "{'group_id':%d, 'section':%s}" % (group.group_id.id, group.group_id.section),
- 'domain': "[('group_id','child_of',[%s])]" % (group.group_id.id),
+ 'context': "{'group_id':%d, 'section':%s}" % (group.id, group.section),
+ 'domain': "[('group_id','=',%d)]" % (group.id),
'name': 'Wiki Page',
'view_type': 'form',
'view_mode': 'form,tree',
@@ -48,12 +44,17 @@ class wiz_timesheet_open(wizard.interface):
'view_id': False,
'type': 'ir.actions.act_window',
}
- if group.group_id.home:
- value['res_id'] = group.group_id.home.id
- else:
+ if group.method == 'page':
+ value['res_id'] = group.home.id
+ elif group.method == 'list':
value['view_type'] = 'form'
value['view_mode'] = 'tree,form'
-
+ elif group.method == 'tree':
+ view_id = pool.get('ir.ui.view').search(cr, uid, [('name','=','wiki.wiki.tree.childs')])
+ value['view_id'] = view_id
+ value['domain'] = [('group_id','=',group.id),('parent_id','=',False)]
+ value['view_type'] = 'tree'
+
return value
states = {
@@ -62,8 +63,7 @@ class wiz_timesheet_open(wizard.interface):
'result' : {'type':'action', 'action':_open_wiki_page, 'state':'end'}
}
}
-wiz_timesheet_open('wiki.wiki.page.open')
+wiz_open_page('wiki.wiki.page.open')
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/wiki/wizard/wizard_view.xml b/addons/wiki/wizard/wizard_view.xml
index e94046b749f..cbc5f020731 100644
--- a/addons/wiki/wizard/wizard_view.xml
+++ b/addons/wiki/wizard/wizard_view.xml
@@ -20,10 +20,15 @@
target="new"
view_mode="form"
/>
-
+