Browse Source

[MERGE] Merge from luis branch

pull/2/head
unknown 11 years ago
parent
commit
a0c58b186a
  1. 2
      partner_do_merge/__openerp__.py
  2. 4
      partner_do_merge/model/partner.py
  3. 21
      partner_do_merge/view/res_partner_view.xml
  4. 1
      partner_do_merge/wizard/__init__.py
  5. 18
      partner_do_merge/wizard/base_partner_merge.py
  6. 65
      partner_do_merge/wizard/merge_by_partner.py
  7. 36
      partner_do_merge/wizard/merge_by_partner.xml

2
partner_do_merge/__openerp__.py

@ -50,6 +50,8 @@ created an action menu in the partner view
],
'data': [
'wizard/base_partner_merge_view.xml',
'wizard/merge_by_partner.xml',
'view/res_partner_view.xml',
],
'js': [
],

4
partner_do_merge/model/partner.py

@ -66,6 +66,10 @@ class res_partner(osv.Model):
store=_display_name_store_triggers),
'id': fields.integer('Id', readonly=True),
'create_date': fields.datetime('Create Date', readonly=True),
'partner_merged_ids' : fields.many2many('res.partner',\
'partners_mergeds', 'partner_active', 'partner_id', 'Relation '\
'with partner merged', domain=['|', ('active','=',True), (\
'active','=',False)], readonly=True)
}

21
partner_do_merge/view/res_partner_view.xml

@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record model="ir.ui.view" id="view_partner_form_inh_partner_merge_form">
<field name="name">view.partner.form.inh.partner.merge.form</field>
<field name="type">form</field>
<field name="model">res.partner</field>
<field name="inherit_id" ref="base.view_partner_form"/>
<field name="arch" type="xml">
<xpath expr="//page[@name='page_history']" position="after">
<page string="Merged With" name="merged_with">
<field name='partner_merged_ids'/>
</page>
</xpath>
</field>
</record>
</data>
</openerp>

1
partner_do_merge/wizard/__init__.py

@ -1 +1,2 @@
import base_partner_merge
import merge_by_partner

18
partner_do_merge/wizard/base_partner_merge.py

@ -375,9 +375,9 @@ class MergePartnerAutomatic(osv.TransientModel):
", ".join('%s<%s>(ID %s)' %
(p.name, p.email or 'n/a', p.id) for p in
src_partners)))
for partner in src_partners:
partner.unlink()
partner.write({'active' : False})
def clean_emails(self, cr, uid, context=None):
"""
@ -478,13 +478,13 @@ class MergePartnerAutomatic(osv.TransientModel):
for key in self._columns.keys()
if key.startswith(group_by_str)
]
groups = [
field
for field in fields
if getattr(this, '%s%s' % (group_by_str, field), False)
]
if not groups:
raise osv.except_osv(_('Error'),
_("""You have to specify a filter for your
@ -536,7 +536,7 @@ class MergePartnerAutomatic(osv.TransientModel):
})
this.write(values)
return {
'type': 'ir.actions.act_window',
'res_model': this._name,
@ -628,7 +628,7 @@ class MergePartnerAutomatic(osv.TransientModel):
groups = self._compute_selected_groupby(this)
query = self._generate_query(groups, this.maximum_group)
self._process_query(cr, uid, ids, query, context=context)
return self._next_screen(cr, uid, this, context)
def automatic_process_cb(self, cr, uid, ids, context=None):
@ -773,12 +773,16 @@ class MergePartnerAutomatic(osv.TransientModel):
return self._next_screen(cr, uid, this, context)
def merge_pbp(self, cr, uid, partner_ids, dst_partner_id, context=None):
self._merge(cr, uid, partner_ids, dst_partner_id, context=context)
return True
def merge_cb(self, cr, uid, ids, context=None):
assert is_integer_list(ids)
context = dict(context or {}, active_test=False)
this = self.browse(cr, uid, ids[0], context=context)
partner_ids = set(map(int, this.partner_ids))
if not partner_ids:
this.write({'state': 'finished'})

65
partner_do_merge/wizard/merge_by_partner.py

@ -0,0 +1,65 @@
# -*- encoding: utf-8 -*-
###########################################################################
# Module Writen to OpenERP, Open Source Management Solution
#
# Copyright (c) 2010 Vauxoo - http://www.vauxoo.com/
# All Rights Reserved.
# info Vauxoo (info@vauxoo.com)
############################################################################
# Coded by: Luis Torres (luis_t@vauxoo.com)
############################################################################
#
# 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 <http://www.gnu.org/licenses/>.
#
##############################################################################
from openerp.osv import osv, fields
from openerp import SUPERUSER_ID
class wizard_merge_partner_by_partner(osv.osv_memory):
_name = 'wizard.merge.partner.by.partner'
def default_get(self, cr, uid, fields, context=None):
partner_obj = self.pool.get('res.partner')
partner = partner_obj.browse(cr, uid, context.get('active_id'),\
context=context)
res = {'partner_id' : partner.id , 'partner_ids' : [partner.id]}
return res
_columns = {
'partner_id' : fields.many2one('res.partner', 'Partner', readonly=True,
required=True, help='Correct partner to complete data'),
'partner_ids': fields.many2many('res.partner', 'partners_to_merge',
'partner_id', 'wizard_id', 'Partner to merge', help='Partners to '\
'merge'),
}
def merge_cb(self, cr, uid, ids, context=None):
base_partner_obj = self.pool.get('base.partner.merge.automatic.wizard')
partner_obj = self.pool.get('res.partner')
for data in self.browse(cr, uid, ids, context=context):
dst_partner = data.partner_id
partner_ids = set(map(int, data.partner_ids))
if len(partner_ids) >= 2:
base_partner_obj.merge_pbp(cr, SUPERUSER_ID, partner_ids,\
dst_partner, context=context)
list_partners = data.partner_ids
if dst_partner in data.partner_ids:
list_partners.remove(dst_partner)
partner_mergeds = []
for x in list_partners:
partner_mergeds.append(x.id)
partner_obj.write(cr, uid, dst_partner.id, {'partner_merged_ids' : [(6, 0, partner_mergeds)]}, context=context)
return True

36
partner_do_merge/wizard/merge_by_partner.xml

@ -0,0 +1,36 @@
<openerp>
<data>
<record model="ir.ui.view" id="view_merge_parter_by_partner_wizard">
<field name="name">view.merge.partner.by.partner.wizard</field>
<field name="model">wizard.merge.partner.by.partner</field>
<field name="arch" type="xml">
<form string="Merge Parners" version="7.0">
<group>
<field name='partner_id'/>
<field name='partner_ids'>
<tree string="Partners to Merge">
<field name="name"/>
</tree>
</field>
</group>
<footer>
<button name="merge_cb" type="object" string="Merge" class="oe_highlight"/>
or
<button name="action_skip" type="object" special="cancel" string="Cancel" class="oe_link"/>
</footer>
</form>
</field>
</record>
<act_window id="merge_parter_by_partner_wizard"
name="Merge Partners"
src_model="res.partner"
res_model="wizard.merge.partner.by.partner"
view_mode="form"
target="new"
key2="client_action_multi"
/>
</data>
</openerp>
Loading…
Cancel
Save