Date: Sun, 14 Oct 2012 13:15:10 +0530
Subject: [PATCH 41/71] [FIX]: Change typo whether
bzr revid: atp@tinyerp.com-20121014074510-hs4qtwefs5gpwqw9
---
addons/product/product_view.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 6860b6221de..9d690cd4a5c 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -236,7 +236,7 @@
Click to define a new product.
- You must define a product for everything you sell, wether it's
+ You must define a product for everything you sell, whether it's
a physical product, a consumable or a service you offer to
customers.
From b5317c514ce79d80cd6910a29109a1dca25f2660 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)"
Date: Sun, 14 Oct 2012 14:31:33 +0530
Subject: [PATCH 42/71] [REM]: Remove calendar invitaiton view and menu.
bzr revid: atp@tinyerp.com-20121014090133-i50ibni56y7jf3b6
---
addons/base_calendar/base_calendar_view.xml | 335 --------------------
addons/crm/__openerp__.py | 1 -
addons/crm/crm_meeting_view.xml | 12 -
addons/crm/crm_phonecall_view.xml | 6 +-
4 files changed, 3 insertions(+), 351 deletions(-)
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index d5dc75df873..a9cfa179480 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -1,120 +1,11 @@
-
-
- calendar.attendee.form
- calendar.attendee
-
-
-
-
-
-
-
- calendar.attendee.tree
- calendar.attendee
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- calendar.attendee.search
- calendar.attendee
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Event Invitations
- ir.actions.act_window
- calendar.attendee
- form
- tree,form
-
- {'default_sent_by_uid': uid}
-
-
-
@@ -171,231 +62,5 @@
action="base_calendar.action_res_alarm_view"
parent="base.menu_calendar_configuration" sequence="5"/>
-
-
- Event Form
- calendar.event
-
-
-
-
-
-
-
- Event Tree
- calendar.event
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Events Calendar
- calendar.event
-
-
-
-
-
-
-
-
-
-
-
-
- Calendar Events Search
- calendar.event
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Events
- ir.actions.act_window
- calendar.event
- form
- calendar,tree,form
-
-
-
-
-
-
diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index dd36aa19041..caa21ad2d9c 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -85,7 +85,6 @@ Dashboard for CRM will include:
'crm_lead_view.xml',
'crm_lead_menu.xml',
- 'crm_meeting_view.xml',
'crm_meeting_menu.xml',
'crm_meeting_shortcut_data.xml',
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 068f7cfbf64..14710cf8f37 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -2,17 +2,5 @@
-
-
- calendar.attendee.form.inherit
- calendar.attendee
-
-
-
-
-
-
-
-
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 16f7eab65d3..e70d67a55dd 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -70,14 +70,14 @@
+
-
From eb1aca64ed214e97915c398d83c080a074e29b96 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)"
Date: Mon, 15 Oct 2012 10:42:37 +0530
Subject: [PATCH 43/71] [FIX]: Add event view TO FIX YAML error
bzr revid: atp@tinyerp.com-20121015051237-sl5toatsg71nfzaw
---
addons/base_calendar/base_calendar_view.xml | 226 ++++++++++++++++++++
1 file changed, 226 insertions(+)
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index 742ac7d8806..72f3e1dee83 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -61,6 +61,232 @@
groups="base.group_no_one"
action="base_calendar.action_res_alarm_view"
parent="base.menu_calendar_configuration" sequence="5"/>
+
+
+
+ Event Form
+ calendar.event
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Event Tree
+ calendar.event
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Events Calendar
+ calendar.event
+
+
+
+
+
+
+
+
+
+
+
+
+ Calendar Events Search
+ calendar.event
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Events
+ ir.actions.act_window
+ calendar.event
+ form
+ calendar,tree,form
+
+
+
+
+
From 7ca9a1294a30c3691478ca0c1b68111df406810c Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)"
Date: Mon, 15 Oct 2012 12:50:14 +0530
Subject: [PATCH 44/71] [IMP]project_timesheet:implemented method for setting
default values.
bzr revid: kbh@tinyerp.com-20121015072014-st4aavfgw4pve3ad
---
addons/project_timesheet/project_timesheet.py | 53 ++++++++-----------
1 file changed, 21 insertions(+), 32 deletions(-)
diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py
index 724944d9994..bc3e764491c 100644
--- a/addons/project_timesheet/project_timesheet.py
+++ b/addons/project_timesheet/project_timesheet.py
@@ -272,6 +272,27 @@ res_partner()
class account_analytic_line(osv.osv):
_inherit = "account.analytic.line"
+ def _default_account_id(self, cr, uid, context=None):
+ proxy = self.pool.get('account.analytic.account')
+ record_ids = proxy.search(cr, uid, [('user_id', '=', uid)], context=context)
+ employee = proxy.browse(cr, uid, record_ids[0], context=context)
+ if employee:
+ return employee.id
+ return False
+
+ def _default_product(self, cr, uid, context=None):
+ proxy = self.pool.get('hr.employee')
+ record_ids = proxy.search(cr, uid, [('user_id', '=', uid)], context=context)
+ employee = proxy.browse(cr, uid, record_ids[0], context=context)
+ if employee.product_id:
+ return employee.product_id.id
+ return False
+
+ _defaults = {
+ 'product_id': _default_product,
+ 'account_id': _default_account_id
+ }
+
def on_change_account_id(self, cr, uid, ids, account_id):
res = {}
if not account_id:
@@ -284,38 +305,6 @@ class account_analytic_line(osv.osv):
raise osv.except_osv(_('Invalid Analytic Account !'), _('You cannot select a Analytic Account which is in Close or Cancelled state.'))
return res
- def _default_product(self, cr, uid, context=None):
- proxy = self.pool.get('hr.employee')
- record_ids = proxy.search(cr, uid, [('user_id', '=', uid)], context=context)
- print "record_ids",record_ids
- employee = proxy.browse(cr, uid, record_ids[0], context=context)
- if employee.product_id:
- return employee.product_id.id
- return False
-
- def _default_product_uom(self, cr, uid, context=None):
- proxy = self.pool.get('hr.employee')
- record_ids = proxy.search(cr, uid, [('user_id', '=', uid)], context=context)
- print "record_ids",record_ids
- employee = proxy.browse(cr, uid, record_ids[0], context=context)
- if employee.product_id and employee.product_id.uom_id:
- return employee.product_id.uom_id.id
- return False
-
- def _default_invoice(self, cr, uid, context=None):
- proxy = self.pool.get('hr_timesheet_invoice.factor')
- record_ids = proxy.search(cr, uid, [('customer_name', '=', '100%')], context=context)
- invoice = proxy.browse(cr, uid, record_ids[0], context=context)
- if invoice:
- return invoice.id
- return False
-
- _defaults = {
- 'product_id': _default_product,
- 'product_uom_id': _default_product_uom,
- 'to_invoice': _default_invoice
- }
-
account_analytic_line()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
From a35b5a7f02c0aa4a81e3ee9001ff89dada91fd7b Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)"
Date: Mon, 15 Oct 2012 15:10:57 +0530
Subject: [PATCH 45/71] [ADD]added on_change on field
bzr revid: kbh@tinyerp.com-20121015094057-n4l3xei6o417dh1o
---
addons/account/project/project_view.xml | 2 +-
addons/project_timesheet/project_timesheet_view.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 70db95425b1..3d2b300f009 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -141,7 +141,7 @@