- Each quotation or sales order must be linked to a shop. The
- shop also defines the warehouse from which the products will be
- delivered for each particular sales.
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
From 5824011dc98718e39b980fade748d201112fb02d Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota
Date: Mon, 25 Mar 2013 15:40:41 +0530
Subject: [PATCH 17/50] [IMP] Removed the HISTORY tab from the customers form
view including the following items 'Events', 'Registrations', 'Claims',
'Tasks' and 'Campaign'.
bzr revid: psa@tinyerp.com-20130325101041-c95snbhicnah4jgl
---
addons/crm_claim/crm_claim.py | 12 ++++++------
addons/crm_claim/crm_claim_view.xml | 5 ++---
addons/event/res_partner.py | 4 ++--
addons/event/res_partner_view.xml | 7 +++----
addons/marketing_campaign/res_partner.py | 6 +++---
addons/marketing_campaign/res_partner_view.xml | 4 ++--
addons/project/res_partner_view.xml | 4 ++--
7 files changed, 20 insertions(+), 22 deletions(-)
diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py
index 275d9edaab4..348dd8cea0c 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -227,11 +227,11 @@ class crm_claim(base_stage, osv.osv):
update_vals[key] = res.group(2).lower()
return super(crm_claim,self).message_update(cr, uid, ids, msg, update_vals=update_vals, context=context)
-
-class res_partner(osv.osv):
- _inherit = 'res.partner'
- _columns = {
- 'claims_ids': fields.one2many('crm.claim', 'partner_id', 'Claims'),
- }
+#
+#class res_partner(osv.osv):
+# _inherit = 'res.partner'
+# _columns = {
+# 'claims_ids': fields.one2many('crm.claim', 'partner_id', 'Claims'),
+# }
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index b1ab72e20f6..7bce61dc557 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -217,7 +217,7 @@
-
+
+
+
\ No newline at end of file
diff --git a/addons/marketing_campaign/res_partner.py b/addons/marketing_campaign/res_partner.py
index c151c2f4050..3db0cfa745b 100644
--- a/addons/marketing_campaign/res_partner.py
+++ b/addons/marketing_campaign/res_partner.py
@@ -25,9 +25,9 @@ class res_partner(osv.osv):
_inherit = 'res.partner'
_columns = {
- 'workitem_ids': fields.one2many('marketing.campaign.workitem',
- 'partner_id', 'Workitems',
- readonly=True),
+ # 'workitem_ids': fields.one2many('marketing.campaign.workitem',
+# 'partner_id', 'Workitems',
+# readonly=True),
}
def copy(self, cr, uid, id, default={}, context=None):
diff --git a/addons/marketing_campaign/res_partner_view.xml b/addons/marketing_campaign/res_partner_view.xml
index 63c65ccd97f..9524dddc17d 100644
--- a/addons/marketing_campaign/res_partner_view.xml
+++ b/addons/marketing_campaign/res_partner_view.xml
@@ -3,7 +3,7 @@
-
+
diff --git a/addons/project/res_partner_view.xml b/addons/project/res_partner_view.xml
index d668e3c7092..e17695dec29 100644
--- a/addons/project/res_partner_view.xml
+++ b/addons/project/res_partner_view.xml
@@ -3,7 +3,7 @@
-
+
From b51362d554f8b8dc221f837e6bf4a60b2349dd41 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota
Date: Tue, 26 Mar 2013 17:08:12 +0530
Subject: [PATCH 18/50] [IMP] Removed the History tab from customer form. >>>
Remove the related one2many:>> 1)Tasks 2)Events 3)Registrations
4)Campaign 5)Claims. >>> Add act_window buttons in the top right corner:>>
1)Tasks 2)Claims.
bzr revid: psa@tinyerp.com-20130326113812-xzqpcgwk2yhyike2
---
addons/crm_claim/crm_claim.py | 12 ++---
addons/crm_claim/crm_claim_view.xml | 49 +++++++++--------
addons/event/__init__.py | 1 -
addons/event/__openerp__.py | 1 -
addons/event/res_partner.py | 36 -------------
addons/event/res_partner_view.xml | 44 ---------------
addons/marketing_campaign/__init__.py | 1 -
addons/marketing_campaign/__openerp__.py | 1 -
addons/marketing_campaign/res_partner.py | 42 ---------------
.../marketing_campaign/res_partner_view.xml | 23 --------
addons/project/res_partner_view.xml | 53 ++++++++++++-------
11 files changed, 68 insertions(+), 195 deletions(-)
delete mode 100644 addons/event/res_partner.py
delete mode 100644 addons/event/res_partner_view.xml
delete mode 100644 addons/marketing_campaign/res_partner.py
delete mode 100644 addons/marketing_campaign/res_partner_view.xml
diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py
index 348dd8cea0c..275d9edaab4 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -227,11 +227,11 @@ class crm_claim(base_stage, osv.osv):
update_vals[key] = res.group(2).lower()
return super(crm_claim,self).message_update(cr, uid, ids, msg, update_vals=update_vals, context=context)
-#
-#class res_partner(osv.osv):
-# _inherit = 'res.partner'
-# _columns = {
-# 'claims_ids': fields.one2many('crm.claim', 'partner_id', 'Claims'),
-# }
+
+class res_partner(osv.osv):
+ _inherit = 'res.partner'
+ _columns = {
+ 'claims_ids': fields.one2many('crm.claim', 'partner_id', 'Claims'),
+ }
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 7bce61dc557..42696e58825 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -217,33 +217,40 @@
-
+ res.partner.claim.info.formres.partner
- 20
+ 30
-
- False
-
-
-
-
-
-
-
-
-
+
+
- -->
-
+
diff --git a/addons/event/__init__.py b/addons/event/__init__.py
index ce8b64ed9a9..eb9690ec3bc 100644
--- a/addons/event/__init__.py
+++ b/addons/event/__init__.py
@@ -22,6 +22,5 @@
import event
import wizard
import report
-import res_partner
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index 54b77c82f69..699bf8398d8 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -48,7 +48,6 @@ Key Features
'event_data.xml',
'report/report_event_registration_view.xml',
'board_association_view.xml',
- 'res_partner_view.xml',
'email_template.xml',
],
'demo': ['event_demo.xml'],
diff --git a/addons/event/res_partner.py b/addons/event/res_partner.py
deleted file mode 100644
index 892cd8ed0c2..00000000000
--- a/addons/event/res_partner.py
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2010 Tiny SPRL ().
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
-#
-##############################################################################
-
-from openerp.osv import fields, osv
-
-class res_partner(osv.osv):
- _inherit = 'res.partner'
-
- _columns = {
- 'speaker': fields.boolean('Speaker', help="Check this box if this contact is a speaker."),
- # 'event_ids': fields.one2many('event.event','main_speaker_id', readonly=True),
- # 'event_registration_ids': fields.one2many('event.registration','partner_id', readonly=True),
- }
-
-
-res_partner()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/event/res_partner_view.xml b/addons/event/res_partner_view.xml
deleted file mode 100644
index f596df57ee5..00000000000
--- a/addons/event/res_partner_view.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-
\ No newline at end of file
diff --git a/addons/marketing_campaign/__init__.py b/addons/marketing_campaign/__init__.py
index 23796d1baaf..d37d8604380 100644
--- a/addons/marketing_campaign/__init__.py
+++ b/addons/marketing_campaign/__init__.py
@@ -20,7 +20,6 @@
##############################################################################
import marketing_campaign
-import res_partner
import report
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/marketing_campaign/__openerp__.py b/addons/marketing_campaign/__openerp__.py
index a51347fd1bb..0a37f8aae0b 100644
--- a/addons/marketing_campaign/__openerp__.py
+++ b/addons/marketing_campaign/__openerp__.py
@@ -59,7 +59,6 @@ input segments, workflow.
'marketing_campaign_view.xml',
'marketing_campaign_data.xml',
'marketing_campaign_workflow.xml',
- 'res_partner_view.xml',
'report/campaign_analysis_view.xml',
'security/marketing_campaign_security.xml',
'security/ir.model.access.csv'
diff --git a/addons/marketing_campaign/res_partner.py b/addons/marketing_campaign/res_partner.py
deleted file mode 100644
index 3db0cfa745b..00000000000
--- a/addons/marketing_campaign/res_partner.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2010 Tiny SPRL ().
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
-#
-##############################################################################
-
-from openerp.osv import fields,osv
-
-class res_partner(osv.osv):
- _inherit = 'res.partner'
-
- _columns = {
- # 'workitem_ids': fields.one2many('marketing.campaign.workitem',
-# 'partner_id', 'Workitems',
-# readonly=True),
- }
-
- def copy(self, cr, uid, id, default={}, context=None):
- default.update({
- 'workitem_ids': [],
- })
- return super(res_partner, self).copy(cr, uid, id, default=default, context=context)
-
-res_partner()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/marketing_campaign/res_partner_view.xml b/addons/marketing_campaign/res_partner_view.xml
deleted file mode 100644
index 9524dddc17d..00000000000
--- a/addons/marketing_campaign/res_partner_view.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/addons/project/res_partner_view.xml b/addons/project/res_partner_view.xml
index e17695dec29..633426d3060 100644
--- a/addons/project/res_partner_view.xml
+++ b/addons/project/res_partner_view.xml
@@ -2,30 +2,45 @@
+
+ res.partner.project.task.tree
+ project.task
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Tasks
+ project.task
+ form
+ tree,form,calendar
+ {'search_default_partner_id': [active_id]}
+ [['partner_id','=', active_id]]
+
+
+
-
+
+
From 74388f30f68dc02972107fb4c17a46dbfec2a11d Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota
Date: Tue, 26 Mar 2013 17:43:02 +0530
Subject: [PATCH 19/50] [IMP] Added default_partner_id in tasks.
bzr revid: psa@tinyerp.com-20130326121302-0kthhnpyo3xn7jca
---
addons/project/res_partner_view.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/addons/project/res_partner_view.xml b/addons/project/res_partner_view.xml
index 633426d3060..49f0c836ecb 100644
--- a/addons/project/res_partner_view.xml
+++ b/addons/project/res_partner_view.xml
@@ -22,7 +22,7 @@
project.taskformtree,form,calendar
- {'search_default_partner_id': [active_id]}
+ {'search_default_partner_id': [active_id], 'default_partner_id': active_id}[['partner_id','=', active_id]]
From b644629fe1896b32de292d761026a5aabbe2a971 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota
Date: Tue, 26 Mar 2013 18:39:32 +0530
Subject: [PATCH 20/50] [IMP] Removed domain partner_id bcz not needed.
bzr revid: psa@tinyerp.com-20130326130932-gs0q1b5db849jm5o
---
addons/crm_claim/crm_claim_view.xml | 1 -
addons/project/res_partner_view.xml | 1 -
2 files changed, 2 deletions(-)
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 42696e58825..1f985ee76d5 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -233,7 +233,6 @@
formtree,form,calendar{'search_default_partner_id': [active_id]}
- [['partner_id','=', active_id]]
diff --git a/addons/project/res_partner_view.xml b/addons/project/res_partner_view.xml
index 49f0c836ecb..c927b315faa 100644
--- a/addons/project/res_partner_view.xml
+++ b/addons/project/res_partner_view.xml
@@ -23,7 +23,6 @@
formtree,form,calendar{'search_default_partner_id': [active_id], 'default_partner_id': active_id}
- [['partner_id','=', active_id]]
From 8ac6fc4098c9db795e7ac6278b0efa952bee9856 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota
Date: Tue, 26 Mar 2013 19:01:10 +0530
Subject: [PATCH 21/50] [IMP] Added domain
bzr revid: psa@tinyerp.com-20130326133110-xr3s65kfo6r8lrb0
---
addons/project/res_partner_view.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/addons/project/res_partner_view.xml b/addons/project/res_partner_view.xml
index c927b315faa..49f0c836ecb 100644
--- a/addons/project/res_partner_view.xml
+++ b/addons/project/res_partner_view.xml
@@ -23,6 +23,7 @@
formtree,form,calendar{'search_default_partner_id': [active_id], 'default_partner_id': active_id}
+ [['partner_id','=', active_id]]
From b861514201b3d8c329e63c63880b9f4971e59310 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota
Date: Wed, 3 Apr 2013 16:45:28 +0530
Subject: [PATCH 22/50] [IMP] Added access rights for the Claims and Task
buttons in Customers form view.
bzr revid: psa@tinyerp.com-20130403111528-to7chtzbydovdt3n
---
addons/crm_claim/crm_claim_view.xml | 3 ++-
addons/project/res_partner_view.xml | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 1f985ee76d5..d6502dbc0fa 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -246,7 +246,8 @@
+ string="Claims"
+ groups="base.group_sale_salesman" />
diff --git a/addons/project/res_partner_view.xml b/addons/project/res_partner_view.xml
index 49f0c836ecb..d89e874075c 100644
--- a/addons/project/res_partner_view.xml
+++ b/addons/project/res_partner_view.xml
@@ -37,7 +37,8 @@
+ string="Tasks"
+ groups="project.group_project_user" />
From 4bb708e79e4cdd8b6c06fbdf670b8204ac050093 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota
Date: Tue, 9 Apr 2013 11:25:07 +0530
Subject: [PATCH 23/50] [IMP] Added action for the *Issues* button in Customers
form view. On clicking the *Claims* button in Customer form view it is
showing the filter like 'Partner' so made it as 'Customer' Added field
Partner_id in search view of Project.
bzr revid: psa@tinyerp.com-20130409055507-7v15i2hppum0exoz
---
addons/crm_claim/crm_claim_view.xml | 2 +-
addons/project/project_view.xml | 1 +
addons/project_issue/project_issue_view.xml | 21 +++++++++++++++++++--
3 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index ebd832f484e..28aa55ac2e2 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -201,7 +201,7 @@
-
+
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index a016c46e0e0..fbc06bb0416 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -32,6 +32,7 @@
+
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index f888ff9da77..cfbdadbe349 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -154,7 +154,7 @@
-
+
@@ -316,6 +316,23 @@
+
+ project.issue
+ form
+ Issues
+ kanban,tree,form,calendar,graph
+ {'search_default_partner_id': [active_id], 'default_partner_id': active_id}
+
+
+ Click to report a new issue.
+
+ The OpenERP issues tacker allows you to efficiently manage things
+ like internal requests, software development bugs, customer
+ complaints, project troubles, material breakdowns, etc.
+
- The OpenERP issues tacker allows you to efficiently manage things
- like internal requests, software development bugs, customer
- complaints, project troubles, material breakdowns, etc.
-
-
-
-
project.project.form.inherited
@@ -408,7 +391,7 @@
+ name="%(act_project_project_2_project_issue_all)d" context="{'search_default_partner_id': [active_id], 'default_partner_id': active_id}" groups="project.group_project_user"/>
From cdf4d94e7fb7a1285f2b71c6613d55c00b88deb8 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota
Date: Tue, 9 Apr 2013 16:40:17 +0530
Subject: [PATCH 25/50] [IMP] Removed domain.
bzr revid: psa@tinyerp.com-20130409111017-0mo14lixdkzh7hp8
---
addons/project/res_partner_view.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/addons/project/res_partner_view.xml b/addons/project/res_partner_view.xml
index 39ceb9dfdbd..7ef3b413be6 100644
--- a/addons/project/res_partner_view.xml
+++ b/addons/project/res_partner_view.xml
@@ -23,7 +23,6 @@
formtree,form,calendar{'search_default_partner_id': [active_id], 'default_partner_id': active_id}
- [['partner_id','=', active_id]]
From eb1ede2367ab8bf6bfa62dcdafa13e7eb1bfb0e1 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota
Date: Fri, 12 Apr 2013 13:55:00 +0530
Subject: [PATCH 26/50] [IMP] Improved code of Meetings buttons in Customers
form view which is showing 'id' of Customer. Removed unwanted code of views
and action and used older actions.
bzr revid: psa@tinyerp.com-20130412082500-xf96csxd5unz66cr
---
addons/base_calendar/crm_meeting.py | 25 ++++++++++++++
addons/base_calendar/crm_meeting_view.xml | 18 ++++++++--
addons/crm/res_partner_view.xml | 4 ---
addons/crm_claim/crm_claim_view.xml | 22 ++----------
addons/project/project_view.xml | 1 +
addons/project/res_partner_view.xml | 38 ++-------------------
addons/project_issue/project_issue_view.xml | 20 ++---------
7 files changed, 48 insertions(+), 80 deletions(-)
diff --git a/addons/base_calendar/crm_meeting.py b/addons/base_calendar/crm_meeting.py
index 6010f5ccfca..927fd22a6c8 100644
--- a/addons/base_calendar/crm_meeting.py
+++ b/addons/base_calendar/crm_meeting.py
@@ -44,6 +44,29 @@ class crm_meeting(base_state, osv.Model):
_description = "Meeting"
_order = "id desc"
_inherit = ["calendar.event", "mail.thread", "ir.needaction_mixin"]
+ def _get_attendee(self, cursor, user, ids, name, arg, context=None):
+ res = {}
+ return res
+
+ def _attendees_search(self, cursor, user, obj, name, args, context=None):
+ if not len(args):
+ return []
+ clause = ''
+ res = False
+ for arg in args:
+ if arg[1] == '=':
+ if arg[2]:
+ clause = 'rel.partner_id = ' + str(arg[2])
+ if clause:
+ cursor.execute('SELECT rel.meeting_id ' \
+ 'FROM crm_meeting_partner_rel AS rel ' \
+ 'WHERE ' + clause )
+ res = cursor.fetchall()
+
+ if not res:
+ return [('id', '=', 0)]
+ return [('id', 'in', [x[0] for x in res])]
+
_columns = {
# base_state required fields
'create_date': fields.datetime('Creation Date', readonly=True),
@@ -52,6 +75,8 @@ class crm_meeting(base_state, osv.Model):
'date_closed': fields.datetime('Closed', readonly=True),
'partner_ids': fields.many2many('res.partner', 'crm_meeting_partner_rel', 'meeting_id', 'partner_id',
string='Attendees', states={'done': [('readonly', True)]}),
+ 'partner_id': fields.function(_get_attendee, string='Attendees',
+ fnct_search=_attendees_search, type='many2one', relation='res.partner'),
'state': fields.selection(
[('draft', 'Unconfirmed'), ('open', 'Confirmed')],
string='Status', size=16, readonly=True, track_visibility='onchange'),
diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml
index d9b659b91fa..98db03da62d 100644
--- a/addons/base_calendar/crm_meeting_view.xml
+++ b/addons/base_calendar/crm_meeting_view.xml
@@ -234,7 +234,7 @@
-
+
@@ -291,6 +291,20 @@
-
+
+
+ res.partner.view.buttons.meeting
+ res.partner
+
+
+
+
+
+
+
+
diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index dd6c50dbaba..3cc4162f36e 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -99,10 +99,6 @@
-
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 28aa55ac2e2..03ac2557c6a 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -217,25 +217,6 @@
-
- res.partner.crm.claim.tree
- crm.claim
-
-
-
-
-
-
-
-
- Claims
- crm.claim
- form
- tree,form,calendar
- {'search_default_partner_id': [active_id]}
-
-
-
res.partner.claim.info.form
@@ -245,8 +226,9 @@
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index a016c46e0e0..fbc06bb0416 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -32,6 +32,7 @@
+
diff --git a/addons/project/res_partner_view.xml b/addons/project/res_partner_view.xml
index 7ef3b413be6..ea9095cd0d8 100644
--- a/addons/project/res_partner_view.xml
+++ b/addons/project/res_partner_view.xml
@@ -2,41 +2,6 @@
-
- res.partner.project.task.tree
- project.task
-
-
-
-
-
-
-
-
-
-
-
-
-
- Tasks
- project.task
- form
- tree,form,calendar
- {'search_default_partner_id': [active_id], 'default_partner_id': active_id}
-
-
-
-
- res.partner.task.search.form.group
- project.task
-
-
-
-
-
-
-
-
res.partner.task.buttons
@@ -46,8 +11,9 @@
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 7e9cad61545..1221fc4234a 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -154,7 +154,7 @@
-
+
@@ -281,22 +281,6 @@
-
- Project Issue - Feature Tracker Search
- project.issue
-
-
-
-
-
-
-
-
-
-
-
-
-
project.issueform
@@ -391,7 +375,7 @@
+ name="%(act_project_project_2_project_issue_all)d" context="{'search_default_partner_id': active_id, 'default_partner_id': active_id}" groups="project.group_project_user"/>
From 7b8884d16473576116bd0af6cacd2c65ffc627bf Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota
Date: Fri, 12 Apr 2013 14:25:30 +0530
Subject: [PATCH 27/50] [IMP] Added the code of EVENT for adding 'Speaker'
checkbox which was by mistake deleted.
bzr revid: psa@tinyerp.com-20130412085530-8ci2ok0b9trnlx3r
---
addons/event/event.py | 9 +++++++++
addons/event/event_view.xml | 12 ++++++++++++
2 files changed, 21 insertions(+)
diff --git a/addons/event/event.py b/addons/event/event.py
index 9e50128c592..068a07d8e5f 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -403,4 +403,13 @@ class event_registration(osv.osv):
data.update(d['value'])
return {'value': data}
+class res_partner(osv.osv):
+ _inherit = 'res.partner'
+
+ _columns = {
+ 'speaker': fields.boolean('Speaker', help="Check this box if this contact is a speaker."),
+ }
+
+res_partner()
+
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 8efae21f676..507834145fa 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -478,5 +478,17 @@
+
+
+ res.partner.event.info.inherit
+ res.partner
+
+
+
+
+
+
+
+
From 56e6e546c536c6d2cd7a46a1f5b07c5a95bdcd33 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota
Date: Fri, 12 Apr 2013 15:24:12 +0530
Subject: [PATCH 28/50] [IMP] Placed the inherited view in proper place.
bzr revid: psa@tinyerp.com-20130412095412-gdcvp0z2t9prc9jb
---
addons/crm_claim/crm_claim_menu.xml | 17 +++++++++++++++++
addons/crm_claim/crm_claim_view.xml | 17 -----------------
2 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/addons/crm_claim/crm_claim_menu.xml b/addons/crm_claim/crm_claim_menu.xml
index 5abfcabbc71..44566c16cb5 100644
--- a/addons/crm_claim/crm_claim_menu.xml
+++ b/addons/crm_claim/crm_claim_menu.xml
@@ -46,5 +46,22 @@
+
+
+ res.partner.claim.info.form
+ res.partner
+
+ 30
+
+
+
+
+
+
+
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 03ac2557c6a..a083f7507cb 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -217,22 +217,5 @@
-
-
- res.partner.claim.info.form
- res.partner
-
- 30
-
-
-
-
-
-
-
From 061886bb0703e3781325bd82582163b3459c5ed3 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota
Date: Fri, 12 Apr 2013 16:18:42 +0530
Subject: [PATCH 29/50] [IMP] Improved
bzr revid: psa@tinyerp.com-20130412104842-k31jy0spgjgz60vf
---
addons/base_calendar/crm_meeting.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/addons/base_calendar/crm_meeting.py b/addons/base_calendar/crm_meeting.py
index 927fd22a6c8..7a9c5b59b1e 100644
--- a/addons/base_calendar/crm_meeting.py
+++ b/addons/base_calendar/crm_meeting.py
@@ -44,6 +44,7 @@ class crm_meeting(base_state, osv.Model):
_description = "Meeting"
_order = "id desc"
_inherit = ["calendar.event", "mail.thread", "ir.needaction_mixin"]
+
def _get_attendee(self, cursor, user, ids, name, arg, context=None):
res = {}
return res
@@ -62,11 +63,10 @@ class crm_meeting(base_state, osv.Model):
'FROM crm_meeting_partner_rel AS rel ' \
'WHERE ' + clause )
res = cursor.fetchall()
-
if not res:
return [('id', '=', 0)]
return [('id', 'in', [x[0] for x in res])]
-
+
_columns = {
# base_state required fields
'create_date': fields.datetime('Creation Date', readonly=True),
@@ -75,7 +75,7 @@ class crm_meeting(base_state, osv.Model):
'date_closed': fields.datetime('Closed', readonly=True),
'partner_ids': fields.many2many('res.partner', 'crm_meeting_partner_rel', 'meeting_id', 'partner_id',
string='Attendees', states={'done': [('readonly', True)]}),
- 'partner_id': fields.function(_get_attendee, string='Attendees',
+ 'partner_id': fields.function(_get_attendee, string='Attendees',
fnct_search=_attendees_search, type='many2one', relation='res.partner'),
'state': fields.selection(
[('draft', 'Unconfirmed'), ('open', 'Confirmed')],
From fc1ee21fa711ced953b7af90422194a154b4b0e6 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota
Date: Tue, 16 Apr 2013 10:23:34 +0530
Subject: [PATCH 30/50] [IMP] Improve code and make the meetings available in
Advanced search by name.
bzr revid: psa@tinyerp.com-20130416045334-70gt4bb7v83q7z02
---
addons/base_calendar/crm_meeting.py | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/addons/base_calendar/crm_meeting.py b/addons/base_calendar/crm_meeting.py
index 9b1cc4f36d1..0d4b5b06816 100644
--- a/addons/base_calendar/crm_meeting.py
+++ b/addons/base_calendar/crm_meeting.py
@@ -54,14 +54,17 @@ class crm_meeting(base_state, osv.Model):
return []
clause = ''
res = False
- for arg in args:
- if arg[1] == '=':
- if arg[2]:
- clause = 'rel.partner_id = ' + str(arg[2])
+ for field, operator, value in args:
+ if operator == '=':
+ if value:
+ clause = 'rel.partner_id ' + operator + str(value)
+ elif operator == 'ilike':
+ if value:
+ clause = 'p.id = rel.partner_id and p.name ' + operator + "'%" + str(value) +"%'"
if clause:
- cursor.execute('SELECT rel.meeting_id ' \
- 'FROM crm_meeting_partner_rel AS rel ' \
- 'WHERE ' + clause )
+ cursor.execute('SELECT rel.meeting_id, p.name ' \
+ 'FROM crm_meeting_partner_rel AS rel, res_partner AS p ' \
+ 'WHERE ' + clause)
res = cursor.fetchall()
if not res:
return [('id', '=', 0)]
From d187245d7083ddcd8ffd61a6410296e74cb4b24f Mon Sep 17 00:00:00 2001
From: "sgo@tinyerp.com" <>
Date: Wed, 17 Apr 2013 12:26:14 +0530
Subject: [PATCH 31/50] [IMP]improve code
bzr revid: sgo@tinyerp.com-20130417065614-tobshhmomx82zkaa
---
addons/point_of_sale/report/pos_receipt.rml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/addons/point_of_sale/report/pos_receipt.rml b/addons/point_of_sale/report/pos_receipt.rml
index 0802114bb48..02b8a5b1a1a 100644
--- a/addons/point_of_sale/report/pos_receipt.rml
+++ b/addons/point_of_sale/report/pos_receipt.rml
@@ -75,7 +75,7 @@
[[ address and display_address(address)]]Tel : [[ address and address.phone ]]User : [[ o.user_id.name ]]
- Shop : [[ o.shop_id.name ]]
+ Warehouse : [[ o.warehouse_id.name ]]Date : [[ o.date_order ]]
From 12a8feb93983f94bf29598e13408ce5611813dab Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota
Date: Thu, 16 May 2013 18:13:37 +0530
Subject: [PATCH 32/50] [IMP] Added action for the Customers form > Claims
button to inhibit the double filter Partner and Responsible and shifted the
code in crm_view.
bzr revid: psa@tinyerp.com-20130516124337-7l6kxh92l3wb4yt7
---
addons/crm_claim/crm_claim_menu.xml | 16 ----------------
addons/crm_claim/crm_claim_view.xml | 28 ++++++++++++++++++++++++++++
2 files changed, 28 insertions(+), 16 deletions(-)
diff --git a/addons/crm_claim/crm_claim_menu.xml b/addons/crm_claim/crm_claim_menu.xml
index 44566c16cb5..b3b821c777d 100644
--- a/addons/crm_claim/crm_claim_menu.xml
+++ b/addons/crm_claim/crm_claim_menu.xml
@@ -46,22 +46,6 @@
-
-
- res.partner.claim.info.form
- res.partner
-
- 30
-
-
-
-
-
-
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index fe8db7ab53a..238394d8c57 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -217,5 +217,33 @@
+
+
+ res.partner.claim.info.form
+ res.partner
+
+ 30
+
+
+
+
+
+
+
+
+ Claims
+ crm.claim
+ form
+ tree,calendar,form
+
+ {"stage_type":'claim'}
+
+ Record and track your customers' claims. Claims may be linked to a sales order or a lot. You can send emails with attachments and keep the full history for a claim (emails sent, intervention type and so on). Claims may automatically be linked to an email address using the mail gateway module.
+
+
From 4009942cf6128e662c9d2c589f1519121082a908 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota
Date: Thu, 16 May 2013 18:32:58 +0530
Subject: [PATCH 33/50] Improved.
bzr revid: psa@tinyerp.com-20130516130258-ylme998oo1us9nk8
---
addons/crm_claim/crm_claim_view.xml | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 238394d8c57..7ae5435c6b0 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -217,6 +217,18 @@
+
+
+ Claims
+ crm.claim
+ form
+ tree,calendar,form
+
+ {"stage_type":'claim'}
+
+ Record and track your customers' claims. Claims may be linked to a sales order or a lot. You can send emails with attachments and keep the full history for a claim (emails sent, intervention type and so on). Claims may automatically be linked to an email address using the mail gateway module.
+
+
res.partner.claim.info.form
@@ -233,17 +245,6 @@
-
-
- Claims
- crm.claim
- form
- tree,calendar,form
-
- {"stage_type":'claim'}
-
- Record and track your customers' claims. Claims may be linked to a sales order or a lot. You can send emails with attachments and keep the full history for a claim (emails sent, intervention type and so on). Claims may automatically be linked to an email address using the mail gateway module.
-
From 1c7e3fa732f441dd730d8fa7bdc185aba5ab08d4 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota
Date: Fri, 24 May 2013 10:27:41 +0530
Subject: [PATCH 34/50] [IMP] Improved code as in trunk.
bzr revid: psa@tinyerp.com-20130524045741-3hx0kozz9eobv69b
---
addons/base_calendar/crm_meeting.py | 28 -----------------------
addons/base_calendar/crm_meeting_view.xml | 18 ++-------------
addons/crm/res_partner_view.xml | 4 ++++
3 files changed, 6 insertions(+), 44 deletions(-)
diff --git a/addons/base_calendar/crm_meeting.py b/addons/base_calendar/crm_meeting.py
index 0d4b5b06816..aa476002abc 100644
--- a/addons/base_calendar/crm_meeting.py
+++ b/addons/base_calendar/crm_meeting.py
@@ -44,32 +44,6 @@ class crm_meeting(base_state, osv.Model):
_description = "Meeting"
_order = "id desc"
_inherit = ["calendar.event", "mail.thread", "ir.needaction_mixin"]
-
- def _get_attendee(self, cursor, user, ids, name, arg, context=None):
- res = {}
- return res
-
- def _attendees_search(self, cursor, user, obj, name, args, context=None):
- if not len(args):
- return []
- clause = ''
- res = False
- for field, operator, value in args:
- if operator == '=':
- if value:
- clause = 'rel.partner_id ' + operator + str(value)
- elif operator == 'ilike':
- if value:
- clause = 'p.id = rel.partner_id and p.name ' + operator + "'%" + str(value) +"%'"
- if clause:
- cursor.execute('SELECT rel.meeting_id, p.name ' \
- 'FROM crm_meeting_partner_rel AS rel, res_partner AS p ' \
- 'WHERE ' + clause)
- res = cursor.fetchall()
- if not res:
- return [('id', '=', 0)]
- return [('id', 'in', [x[0] for x in res])]
-
_columns = {
# base_state required fields
'create_date': fields.datetime('Creation Date', readonly=True),
@@ -78,8 +52,6 @@ class crm_meeting(base_state, osv.Model):
'date_closed': fields.datetime('Closed', readonly=True),
'partner_ids': fields.many2many('res.partner', 'crm_meeting_partner_rel', 'meeting_id', 'partner_id',
string='Attendees', states={'done': [('readonly', True)]}),
- 'partner_id': fields.function(_get_attendee, string='Attendees',
- fnct_search=_attendees_search, type='many2one', relation='res.partner'),
'state': fields.selection(
[('draft', 'Unconfirmed'), ('open', 'Confirmed')],
string='Status', size=16, readonly=True, track_visibility='onchange'),
diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml
index 98db03da62d..d9b659b91fa 100644
--- a/addons/base_calendar/crm_meeting_view.xml
+++ b/addons/base_calendar/crm_meeting_view.xml
@@ -234,7 +234,7 @@
-
+
@@ -291,20 +291,6 @@
-
-
- res.partner.view.buttons.meeting
- res.partner
-
-
-
-
-
-
-
-
+
diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index 3cc4162f36e..dd6c50dbaba 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -99,6 +99,10 @@
+
From 58ee646b46bb6bfc0ac2c2544875cd0e8db150be Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota
Date: Fri, 24 May 2013 11:28:55 +0530
Subject: [PATCH 35/50] [IMP] Improved the string from Attendees => Invited
People.
bzr revid: psa@tinyerp.com-20130524055855-p9p7dhm655opo4t6
---
addons/base_calendar/crm_meeting.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/addons/base_calendar/crm_meeting.py b/addons/base_calendar/crm_meeting.py
index aa476002abc..1051a7a894c 100644
--- a/addons/base_calendar/crm_meeting.py
+++ b/addons/base_calendar/crm_meeting.py
@@ -60,7 +60,7 @@ class crm_meeting(base_state, osv.Model):
'categ_ids': fields.many2many('crm.meeting.type', 'meeting_category_rel',
'event_id', 'type_id', 'Tags'),
'attendee_ids': fields.many2many('calendar.attendee', 'meeting_attendee_rel',\
- 'event_id', 'attendee_id', 'Attendees', states={'done': [('readonly', True)]}),
+ 'event_id', 'attendee_id', 'Invited People', states={'done': [('readonly', True)]}),
}
_defaults = {
'state': 'open',
From dd5fc2479cd21bcf5592d84498e00ead719ec561 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota
Date: Mon, 27 May 2013 12:12:47 +0530
Subject: [PATCH 36/50] [IMP] Improved the action name and added a new create
arrow in actions.
bzr revid: psa@tinyerp.com-20130527064247-sqaf8jpsktc7vevk
---
addons/crm_claim/crm_claim_menu.xml | 8 +++++++-
addons/crm_claim/crm_claim_view.xml | 14 ++++++++++----
2 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/addons/crm_claim/crm_claim_menu.xml b/addons/crm_claim/crm_claim_menu.xml
index 5abfcabbc71..8ba3aab8b51 100644
--- a/addons/crm_claim/crm_claim_menu.xml
+++ b/addons/crm_claim/crm_claim_menu.xml
@@ -15,7 +15,13 @@
{"search_default_user_id":uid, "stage_type":'claim'}
- Record and track your customers' claims. Claims may be linked to a sales order or a lot. You can send emails with attachments and keep the full history for a claim (emails sent, intervention type and so on). Claims may automatically be linked to an email address using the mail gateway module.
+
+
+ Click to create a new claim.
+
+ Record and track your customers' claims. Claims may be linked to a sales order or a lot. You can send emails with attachments and keep the full history for a claim (emails sent, intervention type and so on). Claims may automatically be linked to an email address using the mail gateway module.
+
+
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 7ae5435c6b0..e9bc2b6cfb9 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -218,7 +218,7 @@
-
+ Claimscrm.claimform
@@ -226,11 +226,17 @@
{"stage_type":'claim'}
- Record and track your customers' claims. Claims may be linked to a sales order or a lot. You can send emails with attachments and keep the full history for a claim (emails sent, intervention type and so on). Claims may automatically be linked to an email address using the mail gateway module.
+
+
+ Click to create a new claim.
+
+ Record and track your customers' claims. Claims may be linked to a sales order or a lot. You can send emails with attachments and keep the full history for a claim (emails sent, intervention type and so on). Claims may automatically be linked to an email address using the mail gateway module.
+
- Click to create a new claim.
+ Click here to create a new claim.
Record and track your customers' claims. Claims may be linked to a sales order or a lot. You can send emails with attachments and keep the full history for a claim (emails sent, intervention type and so on). Claims may automatically be linked to an email address using the mail gateway module.
- Click to create a new claim.
+ Click here to create a new claim.
Record and track your customers' claims. Claims may be linked to a sales order or a lot. You can send emails with attachments and keep the full history for a claim (emails sent, intervention type and so on). Claims may automatically be linked to an email address using the mail gateway module.
+ The OpenERP issues tacker allows you to efficiantly manage things
+ like internal requests, software development bugs, customer
+ complaints, project troubles, material breakdowns, etc.
+
+
+
+
res.partner.issues.button.viewres.partner
-
+
+ name="%(act_res_partner_2_project_issue)d"
+ groups="project.group_project_user"/>
From cef85ce5a861a8334471709ed5374771bd16d678 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota
Date: Thu, 6 Jun 2013 15:42:25 +0530
Subject: [PATCH 42/50] [IMP] updated filter for partner_id when the customers
is searched.
bzr revid: psa@tinyerp.com-20130606101225-85ssqpgpb8x1l1yk
---
addons/crm/crm_lead_view.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 6ddd06c1c90..72e83f5854c 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -331,7 +331,7 @@
-
+
From 5418e395731507f1ac2bd06642aeb05d4c481fea Mon Sep 17 00:00:00 2001
From: "sgo@tinyerp.com" <>
Date: Fri, 7 Jun 2013 15:31:29 +0530
Subject: [PATCH 43/50] [IMP]make warehouse required true and improve warning
when there is no warehouse define for current company
bzr revid: sgo@tinyerp.com-20130607100129-vyvxbhbckakc7kr6
---
addons/sale_stock/sale_stock.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/addons/sale_stock/sale_stock.py b/addons/sale_stock/sale_stock.py
index 9c71382af17..8fcf6fc47a7 100644
--- a/addons/sale_stock/sale_stock.py
+++ b/addons/sale_stock/sale_stock.py
@@ -70,7 +70,7 @@ class sale_order(osv.osv):
company_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id
warehouse_ids = self.pool.get('stock.warehouse').search(cr, uid, [('company_id','=',company_id)], context=context)
if not warehouse_ids:
- raise osv.except_osv(_('Error!'), _('There is no default location for the current user\'s company!'))
+ raise osv.except_osv(_('Error!'), _('There is no warehouse defined for the current company!'))
return warehouse_ids[0]
# This is False
@@ -140,7 +140,7 @@ class sale_order(osv.osv):
'picking_ids': fields.one2many('stock.picking.out', 'sale_id', 'Related Picking', readonly=True, help="This is a list of delivery orders that has been generated for this sales order."),
'shipped': fields.boolean('Delivered', readonly=True, help="It indicates that the sales order has been delivered. This field is updated only after the scheduler(s) have been launched."),
'picked_rate': fields.function(_picked_rate, string='Picked', type='float'),
- 'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse'),
+ 'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse',required=True),
'invoice_quantity': fields.selection([('order', 'Ordered Quantities'), ('procurement', 'Shipped Quantities')], 'Invoice on',
help="The sales order will automatically create the invoice proposition (draft invoice).\
You have to choose if you want your invoice based on ordered ", required=True, readonly=True, states={'draft': [('readonly', False)]}),
From 8f5433c9901c602591b46b6d7aaebc1bcc9a1d04 Mon Sep 17 00:00:00 2001
From: "sgo@tinyerp.com" <>
Date: Fri, 7 Jun 2013 17:21:31 +0530
Subject: [PATCH 44/50] [IMP]add group by warehouse in sales analysis
bzr revid: sgo@tinyerp.com-20130607115131-m72rx8ulr54sur9a
---
addons/sale_stock/report/sale_report.py | 3 +++
addons/sale_stock/report/sale_report_view.xml | 11 +++++++++++
2 files changed, 14 insertions(+)
diff --git a/addons/sale_stock/report/sale_report.py b/addons/sale_stock/report/sale_report.py
index c1f79e323b7..0feb3ee2392 100644
--- a/addons/sale_stock/report/sale_report.py
+++ b/addons/sale_stock/report/sale_report.py
@@ -27,6 +27,7 @@ class sale_report(osv.osv):
_columns = {
'shipped': fields.boolean('Shipped', readonly=True),
'shipped_qty_1': fields.integer('Shipped', readonly=True),
+ 'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse',readonly=True),
'state': fields.selection([
('draft', 'Quotation'),
('waiting_date', 'Waiting Schedule'),
@@ -58,6 +59,7 @@ class sale_report(osv.osv):
s.partner_id as partner_id,
s.user_id as user_id,
s.company_id as company_id,
+ s.warehouse_id as warehouse_id,
extract(epoch from avg(date_trunc('day',s.date_confirm)-date_trunc('day',s.create_date)))/(24*60*60)::decimal(16,2) as delay,
s.state,
t.categ_id as categ_id,
@@ -82,6 +84,7 @@ class sale_report(osv.osv):
s.date_confirm,
s.partner_id,
s.user_id,
+ s.warehouse_id,
s.company_id,
s.state,
s.shipped,
diff --git a/addons/sale_stock/report/sale_report_view.xml b/addons/sale_stock/report/sale_report_view.xml
index ae8b12ca168..6642bffcede 100644
--- a/addons/sale_stock/report/sale_report_view.xml
+++ b/addons/sale_stock/report/sale_report_view.xml
@@ -7,9 +7,20 @@
+
+
+ sale.report.search.sale.stock
+ sale.report
+
+
+
+
+
+
+
\ No newline at end of file
From dbf432ee258c1e737e2b41ff5938e6d12aafe7a2 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota
Date: Mon, 10 Jun 2013 18:49:08 +0530
Subject: [PATCH 45/50] [REM] Removed the filter_domain which is added by
mistake.
bzr revid: psa@tinyerp.com-20130610131908-8r4ufv7vjnqppdw6
---
addons/crm/crm_lead_view.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 72e83f5854c..6ddd06c1c90 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -331,7 +331,7 @@
-
+
From c99ac69e618dc3c3a80d4c9b30173fa6f2b5599b Mon Sep 17 00:00:00 2001
From: "sgo@tinyerp.com" <>
Date: Tue, 11 Jun 2013 14:08:59 +0530
Subject: [PATCH 46/50] [IMP]improve message string
bzr revid: sgo@tinyerp.com-20130611083859-tamafus1vdohpjyg
---
addons/sale_stock/sale_stock.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/addons/sale_stock/sale_stock.py b/addons/sale_stock/sale_stock.py
index 8fcf6fc47a7..af3555d07f8 100644
--- a/addons/sale_stock/sale_stock.py
+++ b/addons/sale_stock/sale_stock.py
@@ -70,7 +70,7 @@ class sale_order(osv.osv):
company_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id
warehouse_ids = self.pool.get('stock.warehouse').search(cr, uid, [('company_id','=',company_id)], context=context)
if not warehouse_ids:
- raise osv.except_osv(_('Error!'), _('There is no warehouse defined for the current company!'))
+ raise osv.except_osv(_('Error!'), _('There is no warehouse defined for current company.'))
return warehouse_ids[0]
# This is False
From 45780c147d676ac52dfbed8be75ca6babced9a18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?=
Date: Fri, 14 Jun 2013 14:05:40 +0200
Subject: [PATCH 47/50] [IMP] Partner View Improvement: remove history tab.
This server branch comes with an addons branch where the various items of the
history tab are removed and transformed into contextual buttons. Names are
added to two pages of the partner notebook to be able to reference them in
future inheritance.
bzr revid: tde@openerp.com-20130614120540-5qvvh07cu2quwi71
---
openerp/addons/base/res/res_partner_view.xml | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index 2e7b6f0c14d..f02021313c0 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -293,10 +293,10 @@
-
+
-
+
-
-
-
From bc58a5a2241a887da8445c693c42d95d68b15a82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?=
Date: Fri, 14 Jun 2013 16:16:43 +0200
Subject: [PATCH 48/50] [CLEAN] Misc cleaning before merging.
bzr revid: tde@openerp.com-20130614141643-29z9zslusyhj4u5j
---
addons/point_of_sale/point_of_sale.py | 6 +++---
addons/sale/sale.py | 6 +++---
addons/sale_stock/sale_stock.py | 14 +++++++-------
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index 7ad2cc64b04..370aa2e55ff 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -115,11 +115,11 @@ class pos_config(osv.osv):
def _default_warehouse(self, cr, uid, context=None):
user = self.pool.get('res.users').browse(cr, uid, uid, context)
- res = self.pool.get('stock.warehouse').search(cr, uid, [('company_id','=',user.company_id.id)], context=context)
+ res = self.pool.get('stock.warehouse').search(cr, uid, [('company_id', '=', user.company_id.id)], limit=1, context=context)
return res and res[0] or False
-
+
def _default_pricelist(self, cr, uid, context=None):
- res = self.pool.get('product.pricelist').search(cr, uid, [('type', '=', 'sale')])
+ res = self.pool.get('product.pricelist').search(cr, uid, [('type', '=', 'sale')], limit=1, context=context)
return res and res[0] or False
_defaults = {
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 61168d92464..6f4275e7730 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -150,9 +150,9 @@ class sale_order(osv.osv):
for line in self.pool.get('sale.order.line').browse(cr, uid, ids, context=context):
result[line.order_id.id] = True
return result.keys()
-
+
def _get_default_company(self, cr, uid, context=None):
- company_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id
+ company_id = self.pool.get('res.users')._get_company(cr, uid, uid, context=context)
if not company_id:
raise osv.except_osv(_('Error!'), _('There is no default company for the current user!'))
return company_id
@@ -219,7 +219,7 @@ class sale_order(osv.osv):
'invoice_quantity': fields.selection([('order', 'Ordered Quantities')], 'Invoice on', help="The sales order will automatically create the invoice proposition (draft invoice).", required=True, readonly=True, states={'draft': [('readonly', False)]}),
'payment_term': fields.many2one('account.payment.term', 'Payment Term'),
'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position'),
- 'company_id': fields.many2one('res.company','Company')
+ 'company_id': fields.many2one('res.company', 'Company'),
}
_defaults = {
'date_order': fields.date.context_today,
diff --git a/addons/sale_stock/sale_stock.py b/addons/sale_stock/sale_stock.py
index af3555d07f8..f8f6a4dd8a5 100644
--- a/addons/sale_stock/sale_stock.py
+++ b/addons/sale_stock/sale_stock.py
@@ -63,12 +63,12 @@ class sale_order(osv.osv):
vals.update({'invoice_quantity': 'order'})
if vals['order_policy'] == 'picking':
vals.update({'invoice_quantity': 'procurement'})
- order = super(sale_order, self).create(cr, uid, vals, context=context)
+ order = super(sale_order, self).create(cr, uid, vals, context=context)
return order
-
+
def _get_default_warehouse(self, cr, uid, context=None):
- company_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id
- warehouse_ids = self.pool.get('stock.warehouse').search(cr, uid, [('company_id','=',company_id)], context=context)
+ company_id = self.pool.get('res.users')._get_company(cr, uid, uid, context=context)
+ warehouse_ids = self.pool.get('stock.warehouse').search(cr, uid, [('company_id', '=', company_id)], context=context)
if not warehouse_ids:
raise osv.except_osv(_('Error!'), _('There is no warehouse defined for current company.'))
return warehouse_ids[0]
@@ -140,7 +140,7 @@ class sale_order(osv.osv):
'picking_ids': fields.one2many('stock.picking.out', 'sale_id', 'Related Picking', readonly=True, help="This is a list of delivery orders that has been generated for this sales order."),
'shipped': fields.boolean('Delivered', readonly=True, help="It indicates that the sales order has been delivered. This field is updated only after the scheduler(s) have been launched."),
'picked_rate': fields.function(_picked_rate, string='Picked', type='float'),
- 'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse',required=True),
+ 'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse', required=True),
'invoice_quantity': fields.selection([('order', 'Ordered Quantities'), ('procurement', 'Shipped Quantities')], 'Invoice on',
help="The sales order will automatically create the invoice proposition (draft invoice).\
You have to choose if you want your invoice based on ordered ", required=True, readonly=True, states={'draft': [('readonly', False)]}),
@@ -163,12 +163,12 @@ class sale_order(osv.osv):
raise osv.except_osv(_('Invalid Action!'), _('In order to delete a confirmed sales order, you must cancel it.\nTo do so, you must first cancel related picking for delivery orders.'))
return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)
-
+
def onchange_warehouse_id(self, cr, uid, ids, warehouse_id, context=None):
val = {}
if warehouse_id:
warehouse = self.pool.get('stock.warehouse').browse(cr, uid, warehouse_id, context=context)
- if warehouse.company_id.id:
+ if warehouse.company_id:
val['company_id'] = warehouse.company_id.id
return {'value': val}
From e738adfafe01a579ebc3359de860a07381fde0d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?=
Date: Fri, 14 Jun 2013 16:33:17 +0200
Subject: [PATCH 49/50] [FIX] sale, sale_stock: fixed calls to get_company
taking an extra uid
bzr revid: tde@openerp.com-20130614143317-65mbgfugskxqnxp7
---
addons/sale/sale.py | 2 +-
addons/sale_stock/sale_stock.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 49fa8521e27..67c6f82ced3 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -152,7 +152,7 @@ class sale_order(osv.osv):
return result.keys()
def _get_default_company(self, cr, uid, context=None):
- company_id = self.pool.get('res.users')._get_company(cr, uid, uid, context=context)
+ company_id = self.pool.get('res.users')._get_company(cr, uid, context=context)
if not company_id:
raise osv.except_osv(_('Error!'), _('There is no default company for the current user!'))
return company_id
diff --git a/addons/sale_stock/sale_stock.py b/addons/sale_stock/sale_stock.py
index a47a77a7e3d..3f7ac28c900 100644
--- a/addons/sale_stock/sale_stock.py
+++ b/addons/sale_stock/sale_stock.py
@@ -67,7 +67,7 @@ class sale_order(osv.osv):
return order
def _get_default_warehouse(self, cr, uid, context=None):
- company_id = self.pool.get('res.users')._get_company(cr, uid, uid, context=context)
+ company_id = self.pool.get('res.users')._get_company(cr, uid, context=context)
warehouse_ids = self.pool.get('stock.warehouse').search(cr, uid, [('company_id', '=', company_id)], context=context)
if not warehouse_ids:
raise osv.except_osv(_('Error!'), _('There is no warehouse defined for current company.'))
From 50106b25e8163d6032b9ccabe514622c073b2fb1 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Sun, 16 Jun 2013 04:38:29 +0000
Subject: [PATCH 50/50] Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130616043829-skwivcwkvq31nhfh
---
addons/hr_contract/i18n/th.po | 232 ++++++++++++++++++++++++++++++++++
1 file changed, 232 insertions(+)
create mode 100644 addons/hr_contract/i18n/th.po
diff --git a/addons/hr_contract/i18n/th.po b/addons/hr_contract/i18n/th.po
new file mode 100644
index 00000000000..faa98497b01
--- /dev/null
+++ b/addons/hr_contract/i18n/th.po
@@ -0,0 +1,232 @@
+# Thai translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-06-15 17:09+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: Thai \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-06-16 04:38+0000\n"
+"X-Generator: Launchpad (build 16667)\n"
+
+#. module: hr_contract
+#: field:hr.contract,wage:0
+msgid "Wage"
+msgstr ""
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Information"
+msgstr "ข้อมูล"
+
+#. module: hr_contract
+#: field:hr.contract,trial_date_start:0
+msgid "Trial Start Date"
+msgstr "วันที่เริ่มต้นการทดลอง"
+
+#. module: hr_contract
+#: field:hr.employee,vehicle:0
+msgid "Company Vehicle"
+msgstr ""
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Group By..."
+msgstr "จัดกลุ่มตาม..."
+
+#. module: hr_contract
+#: field:hr.contract,department_id:0
+msgid "Department"
+msgstr "แผนก"
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: field:hr.contract,employee_id:0
+#: model:ir.model,name:hr_contract.model_hr_employee
+msgid "Employee"
+msgstr "พนักงาน"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Search Contract"
+msgstr ""
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: view:hr.employee:0
+#: field:hr.employee,contract_ids:0
+#: model:ir.actions.act_window,name:hr_contract.act_hr_employee_2_hr_contract
+#: model:ir.actions.act_window,name:hr_contract.action_hr_contract
+#: model:ir.ui.menu,name:hr_contract.hr_menu_contract
+msgid "Contracts"
+msgstr "สัญญา"
+
+#. module: hr_contract
+#: field:hr.employee,children:0
+msgid "Number of Children"
+msgstr "จำนวนบุตร"
+
+#. module: hr_contract
+#: help:hr.employee,contract_id:0
+msgid "Latest contract of the employee"
+msgstr ""
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Job"
+msgstr "งาน"
+
+#. module: hr_contract
+#: field:hr.contract,advantages:0
+msgid "Advantages"
+msgstr ""
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Work Permit"
+msgstr "ใบอนุญาตทำงาน"
+
+#. module: hr_contract
+#: model:ir.actions.act_window,name:hr_contract.action_hr_contract_type
+#: model:ir.ui.menu,name:hr_contract.hr_menu_contract_type
+msgid "Contract Types"
+msgstr "ประเภทสัญญา"
+
+#. module: hr_contract
+#: view:hr.employee:0
+msgid "Medical Exam"
+msgstr ""
+
+#. module: hr_contract
+#: field:hr.contract,date_end:0
+msgid "End Date"
+msgstr "วันสิ้นสุด"
+
+#. module: hr_contract
+#: help:hr.contract,wage:0
+msgid "Basic Salary of the employee"
+msgstr "เงินเดือนของพนักงาน"
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: field:hr.contract,name:0
+msgid "Contract Reference"
+msgstr "อ้างอิงตามสัญญา"
+
+#. module: hr_contract
+#: help:hr.employee,vehicle_distance:0
+msgid "In kilometers"
+msgstr ""
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: field:hr.contract,notes:0
+msgid "Notes"
+msgstr ""
+
+#. module: hr_contract
+#: field:hr.contract,permit_no:0
+msgid "Work Permit No"
+msgstr ""
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: view:hr.employee:0
+#: field:hr.employee,contract_id:0
+#: model:ir.model,name:hr_contract.model_hr_contract
+#: model:ir.ui.menu,name:hr_contract.next_id_56
+msgid "Contract"
+msgstr ""
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: field:hr.contract,type_id:0
+#: view:hr.contract.type:0
+#: field:hr.contract.type,name:0
+#: model:ir.model,name:hr_contract.model_hr_contract_type
+msgid "Contract Type"
+msgstr ""
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: field:hr.contract,working_hours:0
+msgid "Working Schedule"
+msgstr ""
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Salary and Advantages"
+msgstr ""
+
+#. module: hr_contract
+#: field:hr.contract,job_id:0
+msgid "Job Title"
+msgstr ""
+
+#. module: hr_contract
+#: constraint:hr.contract:0
+msgid "Error! Contract start-date must be less than contract end-date."
+msgstr ""
+
+#. module: hr_contract
+#: field:hr.employee,manager:0
+msgid "Is a Manager"
+msgstr ""
+
+#. module: hr_contract
+#: field:hr.contract,date_start:0
+msgid "Start Date"
+msgstr ""
+
+#. module: hr_contract
+#: field:hr.contract,visa_no:0
+msgid "Visa No"
+msgstr ""
+
+#. module: hr_contract
+#: field:hr.employee,vehicle_distance:0
+msgid "Home-Work Dist."
+msgstr ""
+
+#. module: hr_contract
+#: field:hr.employee,place_of_birth:0
+msgid "Place of Birth"
+msgstr ""
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Trial Period Duration"
+msgstr ""
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Duration"
+msgstr ""
+
+#. module: hr_contract
+#: field:hr.contract,visa_expire:0
+msgid "Visa Expire Date"
+msgstr ""
+
+#. module: hr_contract
+#: field:hr.employee,medic_exam:0
+msgid "Medical Examination Date"
+msgstr ""
+
+#. module: hr_contract
+#: field:hr.contract,trial_date_end:0
+msgid "Trial End Date"
+msgstr ""
+
+#. module: hr_contract
+#: view:hr.contract.type:0
+msgid "Search Contract Type"
+msgstr ""