Merge lp:~fnegrini/openerp.pt-br-localiz/openerp.pt-br-localiz into lp:~openerp-brazil-core-team/openerp.pt-br-localiz/openerp.pt-br-localiz-v7.0
- openerp.pt-br-localiz
- Merge into openerp.pt-br-localiz-v7.0
Proposed by
Fabio Negrini
| Status: | Superseded |
|---|---|
| Proposed branch: | lp:~fnegrini/openerp.pt-br-localiz/openerp.pt-br-localiz |
| Merge into: | lp:~openerp-brazil-core-team/openerp.pt-br-localiz/openerp.pt-br-localiz-v7.0 |
| Diff against target: |
980 lines (+576/-181) 14 files modified
l10n_br_crm/crm_lead_view.xml (+3/-6) l10n_br_crm/crm_opportunity_view.xml (+3/-6) l10n_br_crm_zip/__init__.py (+21/-0) l10n_br_crm_zip/__openerp__.py (+39/-0) l10n_br_crm_zip/crm_lead.py (+75/-0) l10n_br_crm_zip/crm_lead_view.xml (+19/-0) l10n_br_crm_zip/crm_opportunity_view.xml (+19/-0) l10n_br_data_zip/__openerp__.py (+3/-3) l10n_br_data_zip/l10n_br_data_zip.py (+138/-4) l10n_br_data_zip/l10n_br_data_zip_view.xml (+3/-1) l10n_br_data_zip/res_partner.py (+42/-82) l10n_br_data_zip/res_partner_view.xml (+1/-1) l10n_br_data_zip/wizard/l10n_br_data_zip_search.py (+175/-72) l10n_br_data_zip/wizard/l10n_br_data_zip_search_view.xml (+35/-6) |
| To merge this branch: | bzr merge lp:~fnegrini/openerp.pt-br-localiz/openerp.pt-br-localiz |
| Related bugs: | |
| Related blueprints: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Renato Lima - http://www.akretion.com | Needs Resubmitting | ||
| Fabio Negrini | Needs Resubmitting | ||
| Raphaël Valyi - http://www.akretion.com | Pending | ||
|
Review via email:
|
|||
This proposal supersedes a proposal from 2013-03-08.
This proposal has been superseded by a proposal from 2013-03-15.
Commit message
Description of the change
Migração do módulo ZIP e com novas funcionalidades.
Bug de não atualizar os dados do parceiro após a seleção corrigido
To post a comment you must log in.
Revision history for this message
| Fabio Negrini (fnegrini) wrote : Posted in a previous version of this proposal | # |
review:
Approve
Revision history for this message
| Fabio Negrini (fnegrini) wrote : | # |
Agora os dados do parceiro são atualizados imediatamente mesmo quando é aberto o wizard
review:
Approve
Revision history for this message
| Renato Lima - http://www.akretion.com (renatonlima) wrote : | # |
Olá Fabio,
Mais uma vez obrigado pela contribuição, eu fiz alguns testes e existe um problema, eu tinha colocado no wizard de busca duas tela, uma com os campos do endereço principais obrigatórios para as pessoas preencherem esses campos antes da busca do ceps para reduzir o resultado da busca, porque os campos no endereço do parceiro são obrigatórios e como você eliminou no wizard a tela com os campos obrigatórios de endereço e esta pegando diretamente os campos do parceiros para aparecer o resultado diretamente (o que achei interessante), existe um problema que se você não preencher os campos do endereço como pais, estado, municio, bairro e endereço, o wizard tenta trazer todos os ceps e como a base de cep tem alguns mil registro, acaba trabando o OpenERP.
Neste casso eu sugiro no método de busca você conferir se ao pressionar o botão de busca pelo menos esses campos pais, estado, municio, bairro ou endereço ou cep estão preenchidos, caso não estejam preenchidos você pode fazer o raise falando que para busca pelo menos esses campos devem ser preenchido, uma outra solução e também no método search do cep verificar se há mais de 80 ou 100 elementos na lista com os IDs caso tenha mais você pode cortar a lista e trazer somente os 80 ou 100 primeiros
review:
Needs Fixing
- 516. By root <root@ubuntu-desktop>
-
corrigido bug de tentar trazer todos os ceps. Obrigatório Estado, Município e Logradouro
Revision history for this message
| Fabio Negrini (fnegrini) wrote : | # |
Renato,
Criei uma excessão para impedir este tipo de busca. Baixe a revno 516 e pde testar novamente.
review:
Needs Resubmitting
Revision history for this message
| Renato Lima - http://www.akretion.com (renatonlima) wrote : | # |
Olá Fabio,
No arquivo l10n_br_data_zip.py no inicio do arquivo você deve importar:
from openerp.
Na linha onde esta:
raise osv.except_
Deveria ficar assim:
l10n_br_data_zip
raise osv.except_
_'Necessário informar Estado, município e logradouro')
review:
Needs Resubmitting
- 517. By root <root@ubuntu-desktop>
-
Chamada da excessão agora permite tradução. Revisão nas views do CRM
Revision history for this message
| Fabio Negrini (fnegrini) wrote : | # |
Renato,
Chamada de excessão alterada para permitir tradução.
Aproveito para informar que a branch também já está com o módulo l10n_br_crm convertido e o novo módulo l10n_br_crm_zip que integra a busca por cep nos prospectos e oportunidades do CRM. Importante testar antes de proceder com o merge.
Revno 517
Abs,
Fabio
review:
Needs Resubmitting
Revision history for this message
| Renato Lima - http://www.akretion.com (renatonlima) wrote : | # |
Olá Fábio,
Eu testei a revisão #517 e existe um problema de encoding se você digitar uma rua, bairro ou complemento usando por exemplo: "ç" gera um erro. Eu não tive tenho de olhar com detalhes, mas parece que o problema esta quando você procura o CEP no método search ou quando você volta o resultado da busca do cep para o endereço do parceiro.
review:
Needs Resubmitting
Revision history for this message
| Fabio Negrini (fnegrini) wrote : | # |
Renato,
Não consegui reproduzir o Erro. Fiz vários testes e todos retornaram sem problemas. Um dos testes que fiz foi fazer a seguinte busca:
Endereço: José
Bairro: Ahú
Cidade: Curitiba
Estado: Paraná
A busca retorna três endereços listados pelo Wizard. Testei o retorno dos três e todos funcionaram corretamente. Tem como passar um passo-a-passo para reproduzir o erro?
Abs,
Fabio
Unmerged revisions
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
| 1 | === modified file 'l10n_br_crm/crm_lead_view.xml' | |||
| 2 | --- l10n_br_crm/crm_lead_view.xml 2013-01-03 04:21:33 +0000 | |||
| 3 | +++ l10n_br_crm/crm_lead_view.xml 2013-03-13 12:27:20 +0000 | |||
| 4 | @@ -12,17 +12,14 @@ | |||
| 5 | 12 | <field name="city" invisible="1" /> | 12 | <field name="city" invisible="1" /> |
| 6 | 13 | </field> | 13 | </field> |
| 7 | 14 | <field name="state_id" position="replace"> | 14 | <field name="state_id" position="replace"> |
| 10 | 15 | <field name="state_id" /> | 15 | <field name="state_id" placeholder="estado"/> |
| 11 | 16 | <field name="l10n_br_city_id" placeholder="municipio" on_change="onchange_l10n_br_city_id(l10n_br_city_id)" /> | 16 | <field name="l10n_br_city_id" placeholder="municipio"/> |
| 12 | 17 | </field> | 17 | </field> |
| 13 | 18 | <field name="street2" position="replace"> | 18 | <field name="street2" position="replace"> |
| 14 | 19 | <field name="district" placeholder="bairro"/> | ||
| 15 | 19 | <field name="number" placeholder="numero"/> | 20 | <field name="number" placeholder="numero"/> |
| 16 | 20 | <field name="street2" placeholder="complemento"/> | 21 | <field name="street2" placeholder="complemento"/> |
| 17 | 21 | </field> | 22 | </field> |
| 18 | 22 | <!-- FIXME field name="zip" position="replace"> | ||
| 19 | 23 | <field name="zip" on_change="onchange_mask_zip(zip)" /> | ||
| 20 | 24 | <button name="zip_search" string="Pesquisar CEP" colspan="2" type="object" icon="gtk-select-all"/> | ||
| 21 | 25 | </field --> | ||
| 22 | 26 | </field> | 23 | </field> |
| 23 | 27 | </record> | 24 | </record> |
| 24 | 28 | 25 | ||
| 25 | 29 | 26 | ||
| 26 | === modified file 'l10n_br_crm/crm_opportunity_view.xml' | |||
| 27 | --- l10n_br_crm/crm_opportunity_view.xml 2013-01-03 04:21:33 +0000 | |||
| 28 | +++ l10n_br_crm/crm_opportunity_view.xml 2013-03-13 12:27:20 +0000 | |||
| 29 | @@ -12,17 +12,14 @@ | |||
| 30 | 12 | <field name="city" invisible="1" /> | 12 | <field name="city" invisible="1" /> |
| 31 | 13 | </field> | 13 | </field> |
| 32 | 14 | <field name="state_id" position="replace"> | 14 | <field name="state_id" position="replace"> |
| 35 | 15 | <field name="state_id" /> | 15 | <field name="state_id" placeholder="estado"/> |
| 36 | 16 | <field name="l10n_br_city_id" placeholder="municipio" on_change="onchange_l10n_br_city_id(l10n_br_city_id)" /> | 16 | <field name="l10n_br_city_id" placeholder="municipio" /> |
| 37 | 17 | </field> | 17 | </field> |
| 38 | 18 | <field name="street2" position="replace"> | 18 | <field name="street2" position="replace"> |
| 39 | 19 | <field name="district" placeholder="bairro"/> | ||
| 40 | 19 | <field name="number" placeholder="numero" /> | 20 | <field name="number" placeholder="numero" /> |
| 41 | 20 | <field name="street2" placeholder="complemento" /> | 21 | <field name="street2" placeholder="complemento" /> |
| 42 | 21 | </field> | 22 | </field> |
| 43 | 22 | <!-- FIXME field name="zip" position="replace"> | ||
| 44 | 23 | <field name="zip" on_change="onchange_mask_zip(zip)" /> | ||
| 45 | 24 | <button name="zip_search" string="Pesquisar CEP" colspan="2" type="object" icon="gtk-select-all"/> | ||
| 46 | 25 | </field --> | ||
| 47 | 26 | </field> | 23 | </field> |
| 48 | 27 | </record> | 24 | </record> |
| 49 | 28 | 25 | ||
| 50 | 29 | 26 | ||
| 51 | === added directory 'l10n_br_crm_zip' | |||
| 52 | === added file 'l10n_br_crm_zip/__init__.py' | |||
| 53 | --- l10n_br_crm_zip/__init__.py 1970-01-01 00:00:00 +0000 | |||
| 54 | +++ l10n_br_crm_zip/__init__.py 2013-03-13 12:27:20 +0000 | |||
| 55 | @@ -0,0 +1,21 @@ | |||
| 56 | 1 | # -*- encoding: utf-8 -*- | ||
| 57 | 2 | ############################################################################### | ||
| 58 | 3 | # # | ||
| 59 | 4 | # Copyright (C) 2011 Renato Lima - Akretion # | ||
| 60 | 5 | # # | ||
| 61 | 6 | #This program is free software: you can redistribute it and/or modify # | ||
| 62 | 7 | #it under the terms of the GNU Affero General Public License as published by # | ||
| 63 | 8 | #the Free Software Foundation, either version 3 of the License, or # | ||
| 64 | 9 | #(at your option) any later version. # | ||
| 65 | 10 | # # | ||
| 66 | 11 | #This program is distributed in the hope that it will be useful, # | ||
| 67 | 12 | #but WITHOUT ANY WARRANTY; without even the implied warranty of # | ||
| 68 | 13 | #MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # | ||
| 69 | 14 | #GNU Affero General Public License for more details. # | ||
| 70 | 15 | # # | ||
| 71 | 16 | #You should have received a copy of the GNU Affero General Public License # | ||
| 72 | 17 | #along with this program. If not, see <http://www.gnu.org/licenses/>. # | ||
| 73 | 18 | ############################################################################### | ||
| 74 | 19 | |||
| 75 | 20 | import crm_lead | ||
| 76 | 21 | |||
| 77 | 0 | 22 | ||
| 78 | === added file 'l10n_br_crm_zip/__openerp__.py' | |||
| 79 | --- l10n_br_crm_zip/__openerp__.py 1970-01-01 00:00:00 +0000 | |||
| 80 | +++ l10n_br_crm_zip/__openerp__.py 2013-03-13 12:27:20 +0000 | |||
| 81 | @@ -0,0 +1,39 @@ | |||
| 82 | 1 | # -*- encoding: utf-8 -*- | ||
| 83 | 2 | ############################################################################### | ||
| 84 | 3 | # # | ||
| 85 | 4 | # Copyright (C) 2011 Fabio Negrini - Akretion # | ||
| 86 | 5 | # # | ||
| 87 | 6 | #This program is free software: you can redistribute it and/or modify # | ||
| 88 | 7 | #it under the terms of the GNU Affero General Public License as published by # | ||
| 89 | 8 | #the Free Software Foundation, either version 3 of the License, or # | ||
| 90 | 9 | #(at your option) any later version. # | ||
| 91 | 10 | # # | ||
| 92 | 11 | #This program is distributed in the hope that it will be useful, # | ||
| 93 | 12 | #but WITHOUT ANY WARRANTY; without even the implied warranty of # | ||
| 94 | 13 | #MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # | ||
| 95 | 14 | #GNU Affero General Public License for more details. # | ||
| 96 | 15 | # # | ||
| 97 | 16 | #You should have received a copy of the GNU Affero General Public License # | ||
| 98 | 17 | #along with this program. If not, see <http://www.gnu.org/licenses/>. # | ||
| 99 | 18 | ############################################################################### | ||
| 100 | 19 | |||
| 101 | 20 | { | ||
| 102 | 21 | 'name': 'CRM ZIP', | ||
| 103 | 22 | 'description': 'ZIP Search Integration for Brazilian Localization of CRM module', | ||
| 104 | 23 | 'category': 'Localization', | ||
| 105 | 24 | 'license': 'AGPL-3', | ||
| 106 | 25 | 'author': 'Fabio Negrini - OpenERP Brasil', | ||
| 107 | 26 | 'website': 'http://openerpbrasil.org', | ||
| 108 | 27 | 'version': '0.6', | ||
| 109 | 28 | 'depends': [ | ||
| 110 | 29 | 'l10n_br_data_zip', | ||
| 111 | 30 | 'l10n_br_crm', | ||
| 112 | 31 | ], | ||
| 113 | 32 | 'data': [ | ||
| 114 | 33 | 'crm_lead_view.xml', | ||
| 115 | 34 | 'crm_opportunity_view.xml', | ||
| 116 | 35 | ], | ||
| 117 | 36 | 'demo': [], | ||
| 118 | 37 | 'installable': True, | ||
| 119 | 38 | 'auto_install': True, | ||
| 120 | 39 | } | ||
| 121 | 0 | 40 | ||
| 122 | === added file 'l10n_br_crm_zip/crm_lead.py' | |||
| 123 | --- l10n_br_crm_zip/crm_lead.py 1970-01-01 00:00:00 +0000 | |||
| 124 | +++ l10n_br_crm_zip/crm_lead.py 2013-03-13 12:27:20 +0000 | |||
| 125 | @@ -0,0 +1,75 @@ | |||
| 126 | 1 | # -*- encoding: utf-8 -*- | ||
| 127 | 2 | ############################################################################### | ||
| 128 | 3 | # # | ||
| 129 | 4 | # Copyright (C) 2012 Renato Lima - Akretion # | ||
| 130 | 5 | # # | ||
| 131 | 6 | #This program is free software: you can redistribute it and/or modify # | ||
| 132 | 7 | #it under the terms of the GNU Affero General Public License as published by # | ||
| 133 | 8 | #the Free Software Foundation, either version 3 of the License, or # | ||
| 134 | 9 | #(at your option) any later version. # | ||
| 135 | 10 | # # | ||
| 136 | 11 | #This program is distributed in the hope that it will be useful, # | ||
| 137 | 12 | #but WITHOUT ANY WARRANTY; without even the implied warranty of # | ||
| 138 | 13 | #MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # | ||
| 139 | 14 | #GNU Affero General Public License for more details. # | ||
| 140 | 15 | # # | ||
| 141 | 16 | #You should have received a copy of the GNU Affero General Public License # | ||
| 142 | 17 | #along with this program. If not, see <http://www.gnu.org/licenses/>. # | ||
| 143 | 18 | ############################################################################### | ||
| 144 | 19 | |||
| 145 | 20 | from openerp.osv import fields, osv | ||
| 146 | 21 | |||
| 147 | 22 | |||
| 148 | 23 | class crm_lead(osv.Model): | ||
| 149 | 24 | """ CRM Lead Case """ | ||
| 150 | 25 | _inherit = "crm.lead" | ||
| 151 | 26 | |||
| 152 | 27 | |||
| 153 | 28 | def zip_search(self, cr, uid, ids, context=None): | ||
| 154 | 29 | |||
| 155 | 30 | obj_zip = self.pool.get('l10n_br_data.zip') | ||
| 156 | 31 | |||
| 157 | 32 | for crm_lead in self.browse(cr, uid, ids): | ||
| 158 | 33 | |||
| 159 | 34 | zip_ids = obj_zip.zip_search_multi(cr, uid, ids, context, | ||
| 160 | 35 | country_id = crm_lead.country_id.id, \ | ||
| 161 | 36 | state_id = crm_lead.state_id.id, \ | ||
| 162 | 37 | l10n_br_city_id = crm_lead.l10n_br_city_id.id, \ | ||
| 163 | 38 | district = crm_lead.district, \ | ||
| 164 | 39 | street = crm_lead.street, \ | ||
| 165 | 40 | zip = crm_lead.zip, | ||
| 166 | 41 | ) | ||
| 167 | 42 | |||
| 168 | 43 | if len(zip_ids) == 1: | ||
| 169 | 44 | |||
| 170 | 45 | zip_read = obj_zip.set_result(cr, uid, ids, context, zip_ids[0]) | ||
| 171 | 46 | |||
| 172 | 47 | result = { | ||
| 173 | 48 | 'country_id': zip_read['country_id'], | ||
| 174 | 49 | 'state_id': zip_read['state_id'], | ||
| 175 | 50 | 'l10n_br_city_id': zip_read['l10n_br_city_id'], | ||
| 176 | 51 | 'district': zip_read['district'], | ||
| 177 | 52 | 'street': zip_read['street'], | ||
| 178 | 53 | 'zip': zip_read['zip'], | ||
| 179 | 54 | } | ||
| 180 | 55 | |||
| 181 | 56 | self.write(cr, uid, crm_lead.id, result) | ||
| 182 | 57 | |||
| 183 | 58 | return True | ||
| 184 | 59 | |||
| 185 | 60 | else: | ||
| 186 | 61 | |||
| 187 | 62 | if len(zip_ids) > 1: | ||
| 188 | 63 | |||
| 189 | 64 | return obj_zip.create_wizard(cr, uid, ids, context, self._name, | ||
| 190 | 65 | country_id = crm_lead.country_id.id, \ | ||
| 191 | 66 | state_id = crm_lead.state_id.id, \ | ||
| 192 | 67 | l10n_br_city_id = crm_lead.l10n_br_city_id.id, \ | ||
| 193 | 68 | district = crm_lead.district, \ | ||
| 194 | 69 | street = crm_lead.street, \ | ||
| 195 | 70 | zip = crm_lead.zip, | ||
| 196 | 71 | zip_ids = zip_ids | ||
| 197 | 72 | ) | ||
| 198 | 73 | else: | ||
| 199 | 74 | |||
| 200 | 75 | return True | ||
| 201 | 0 | \ No newline at end of file | 76 | \ No newline at end of file |
| 202 | 1 | 77 | ||
| 203 | === added file 'l10n_br_crm_zip/crm_lead_view.xml' | |||
| 204 | --- l10n_br_crm_zip/crm_lead_view.xml 1970-01-01 00:00:00 +0000 | |||
| 205 | +++ l10n_br_crm_zip/crm_lead_view.xml 2013-03-13 12:27:20 +0000 | |||
| 206 | @@ -0,0 +1,19 @@ | |||
| 207 | 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 208 | 2 | <openerp> | ||
| 209 | 3 | <data> | ||
| 210 | 4 | |||
| 211 | 5 | <!-- CRM Lead Form View --> | ||
| 212 | 6 | <record model="ir.ui.view" id="l10n_br_crm_case_form_view_leads1"> | ||
| 213 | 7 | <field name="name">l10n_br_crm.leads1</field> | ||
| 214 | 8 | <field name="model">crm.lead</field> | ||
| 215 | 9 | <field name="inherit_id" ref="crm.crm_case_form_view_leads" /> | ||
| 216 | 10 | <field name="arch" type="xml"> | ||
| 217 | 11 | <field name="zip" position="replace"> | ||
| 218 | 12 | <field name="zip"/> | ||
| 219 | 13 | <button name="zip_search" string="Buscar Endereço" colspan="2" type="object" icon="gtk-select-all"/> | ||
| 220 | 14 | </field> | ||
| 221 | 15 | </field> | ||
| 222 | 16 | </record> | ||
| 223 | 17 | |||
| 224 | 18 | </data> | ||
| 225 | 19 | </openerp> | ||
| 226 | 0 | 20 | ||
| 227 | === added file 'l10n_br_crm_zip/crm_opportunity_view.xml' | |||
| 228 | --- l10n_br_crm_zip/crm_opportunity_view.xml 1970-01-01 00:00:00 +0000 | |||
| 229 | +++ l10n_br_crm_zip/crm_opportunity_view.xml 2013-03-13 12:27:20 +0000 | |||
| 230 | @@ -0,0 +1,19 @@ | |||
| 231 | 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 232 | 2 | <openerp> | ||
| 233 | 3 | <data> | ||
| 234 | 4 | |||
| 235 | 5 | <!-- CRM Opportunity Form View --> | ||
| 236 | 6 | <record model="ir.ui.view" id="l10n_br_crm_case_form_view_oppor1"> | ||
| 237 | 7 | <field name="name">l10n_br_crm.opportunities1</field> | ||
| 238 | 8 | <field name="model">crm.lead</field> | ||
| 239 | 9 | <field name="inherit_id" ref="crm.crm_case_form_view_oppor" /> | ||
| 240 | 10 | <field name="arch" type="xml"> | ||
| 241 | 11 | <field name="zip" position="replace"> | ||
| 242 | 12 | <field name="zip"/> | ||
| 243 | 13 | <button name="zip_search" string="Buscar Endereço" colspan="2" type="object" icon="gtk-select-all"/> | ||
| 244 | 14 | </field> | ||
| 245 | 15 | </field> | ||
| 246 | 16 | </record> | ||
| 247 | 17 | |||
| 248 | 18 | </data> | ||
| 249 | 19 | </openerp> | ||
| 250 | 0 | 20 | ||
| 251 | === modified file 'l10n_br_data_zip/__openerp__.py' | |||
| 252 | --- l10n_br_data_zip/__openerp__.py 2013-02-11 15:51:01 +0000 | |||
| 253 | +++ l10n_br_data_zip/__openerp__.py 2013-03-13 12:27:20 +0000 | |||
| 254 | @@ -19,7 +19,7 @@ | |||
| 255 | 19 | 19 | ||
| 256 | 20 | { | 20 | { |
| 257 | 21 | 'name': 'Brazilian Localisation Data Extension for zip codes', | 21 | 'name': 'Brazilian Localisation Data Extension for zip codes', |
| 259 | 22 | 'description': 'Brazilian Localisation Data Extension for zip codes', | 22 | 'description': 'Brazilian Localization Data Extension for zip codes', |
| 260 | 23 | 'license': 'AGPL-3', | 23 | 'license': 'AGPL-3', |
| 261 | 24 | 'author': 'Akretion, OpenERP Brasil', | 24 | 'author': 'Akretion, OpenERP Brasil', |
| 262 | 25 | 'version': '0.1', | 25 | 'version': '0.1', |
| 263 | @@ -27,14 +27,14 @@ | |||
| 264 | 27 | 'l10n_br_base', | 27 | 'l10n_br_base', |
| 265 | 28 | ], | 28 | ], |
| 266 | 29 | 'data': [ | 29 | 'data': [ |
| 268 | 30 | 'zip.sql' | 30 | 'zip.sql', |
| 269 | 31 | 'l10n_br_data_zip_view.xml', | 31 | 'l10n_br_data_zip_view.xml', |
| 270 | 32 | 'res_partner_view.xml', | 32 | 'res_partner_view.xml', |
| 271 | 33 | 'wizard/l10n_br_data_zip_search_view.xml', | 33 | 'wizard/l10n_br_data_zip_search_view.xml', |
| 272 | 34 | 'security/ir.model.access.csv', | 34 | 'security/ir.model.access.csv', |
| 273 | 35 | ], | 35 | ], |
| 274 | 36 | 'demo': [], | 36 | 'demo': [], |
| 276 | 37 | 'category': 'Localisation', | 37 | 'category': 'Localization', |
| 277 | 38 | 'active': False, | 38 | 'active': False, |
| 278 | 39 | 'installable': True | 39 | 'installable': True |
| 279 | 40 | } | 40 | } |
| 280 | 41 | 41 | ||
| 281 | === modified file 'l10n_br_data_zip/l10n_br_data_zip.py' | |||
| 282 | --- l10n_br_data_zip/l10n_br_data_zip.py 2013-01-19 00:22:49 +0000 | |||
| 283 | +++ l10n_br_data_zip/l10n_br_data_zip.py 2013-03-13 12:27:20 +0000 | |||
| 284 | @@ -16,9 +16,9 @@ | |||
| 285 | 16 | #You should have received a copy of the GNU Affero General Public License # | 16 | #You should have received a copy of the GNU Affero General Public License # |
| 286 | 17 | #along with this program. If not, see <http://www.gnu.org/licenses/>. # | 17 | #along with this program. If not, see <http://www.gnu.org/licenses/>. # |
| 287 | 18 | ############################################################################### | 18 | ############################################################################### |
| 291 | 19 | 19 | import re | |
| 292 | 20 | from osv import osv, fields | 20 | from openerp.osv import osv, fields |
| 293 | 21 | 21 | from openerp.tools.translate import _ | |
| 294 | 22 | 22 | ||
| 295 | 23 | class l10n_br_data_zip(osv.Model): | 23 | class l10n_br_data_zip(osv.Model): |
| 296 | 24 | """ Este objeto persiste todos os códigos postais que podem ser | 24 | """ Este objeto persiste todos os códigos postais que podem ser |
| 297 | @@ -37,5 +37,139 @@ | |||
| 298 | 37 | domain="[('country_id','=',country_id)]"), | 37 | domain="[('country_id','=',country_id)]"), |
| 299 | 38 | 'l10n_br_city_id': fields.many2one( | 38 | 'l10n_br_city_id': fields.many2one( |
| 300 | 39 | 'l10n_br_base.city', 'Cidade', | 39 | 'l10n_br_base.city', 'Cidade', |
| 302 | 40 | required=True, domain="[('state_id','=',state_id)]") | 40 | required=True, domain="[('state_id','=',state_id)]"), |
| 303 | 41 | } | 41 | } |
| 304 | 42 | |||
| 305 | 43 | def set_domain(self, country_id=False, state_id=False, l10n_br_city_id=False, district=False, street=False, zip=False): | ||
| 306 | 44 | |||
| 307 | 45 | domain = [] | ||
| 308 | 46 | |||
| 309 | 47 | if zip: | ||
| 310 | 48 | new_zip = re.sub('[^0-9]', '', zip or '') | ||
| 311 | 49 | domain.append(('code', '=', new_zip)) | ||
| 312 | 50 | else: | ||
| 313 | 51 | |||
| 314 | 52 | if state_id == False or \ | ||
| 315 | 53 | l10n_br_city_id == False or\ | ||
| 316 | 54 | len(street or '') == 0: | ||
| 317 | 55 | raise osv.except_osv(_('Parametros insuficientes'), | ||
| 318 | 56 | _('Necessário informar Estado, município e logradouro')) | ||
| 319 | 57 | |||
| 320 | 58 | if country_id: | ||
| 321 | 59 | domain.append(('country_id', '=', country_id)) | ||
| 322 | 60 | |||
| 323 | 61 | if state_id: | ||
| 324 | 62 | domain.append(('state_id', '=', state_id)) | ||
| 325 | 63 | |||
| 326 | 64 | if l10n_br_city_id: | ||
| 327 | 65 | domain.append(('l10n_br_city_id', '=', l10n_br_city_id)) | ||
| 328 | 66 | |||
| 329 | 67 | if district: | ||
| 330 | 68 | domain.append(('district', 'like', district)) | ||
| 331 | 69 | |||
| 332 | 70 | if street: | ||
| 333 | 71 | domain.append(('street', 'like', street)) | ||
| 334 | 72 | |||
| 335 | 73 | return domain | ||
| 336 | 74 | |||
| 337 | 75 | def set_result(self, cr, uid, ids, context, zip_id=None): | ||
| 338 | 76 | |||
| 339 | 77 | result = { | ||
| 340 | 78 | 'country_id': False, | ||
| 341 | 79 | 'state_id': False, | ||
| 342 | 80 | 'l10n_br_city_id': False, | ||
| 343 | 81 | 'district': False, | ||
| 344 | 82 | 'street': False, | ||
| 345 | 83 | 'zip': False | ||
| 346 | 84 | } | ||
| 347 | 85 | |||
| 348 | 86 | if zip_id != None: | ||
| 349 | 87 | |||
| 350 | 88 | zip_read = self.read(cr, uid, zip_id, [ | ||
| 351 | 89 | 'street_type', | ||
| 352 | 90 | 'street', | ||
| 353 | 91 | 'district', | ||
| 354 | 92 | 'code', | ||
| 355 | 93 | 'l10n_br_city_id', | ||
| 356 | 94 | 'state_id', | ||
| 357 | 95 | 'country_id' | ||
| 358 | 96 | ], | ||
| 359 | 97 | context=context) | ||
| 360 | 98 | |||
| 361 | 99 | zip = zip_read['code'] | ||
| 362 | 100 | |||
| 363 | 101 | if len(zip) == 8: | ||
| 364 | 102 | zip = '%s-%s' % (zip[0:5], zip[5:8]) | ||
| 365 | 103 | |||
| 366 | 104 | result = { | ||
| 367 | 105 | 'country_id': zip_read['country_id'] and zip_read['country_id'][0] or False, | ||
| 368 | 106 | 'state_id': zip_read['state_id'] and zip_read['state_id'][0] or False, | ||
| 369 | 107 | 'l10n_br_city_id': zip_read['l10n_br_city_id'] and zip_read['l10n_br_city_id'][0] or False, | ||
| 370 | 108 | 'district': (zip_read['district'] or ''), | ||
| 371 | 109 | 'street': ((zip_read['street_type'] or '') + ' ' + (zip_read['street'] or '')), | ||
| 372 | 110 | 'zip': zip, | ||
| 373 | 111 | } | ||
| 374 | 112 | |||
| 375 | 113 | return result | ||
| 376 | 114 | |||
| 377 | 115 | |||
| 378 | 116 | def zip_search_multi(self, cr, uid, ids, context, country_id=False, state_id=False, l10n_br_city_id=False, district=False, street=False, zip=False): | ||
| 379 | 117 | |||
| 380 | 118 | domain = self.set_domain(country_id = country_id, | ||
| 381 | 119 | state_id = state_id, | ||
| 382 | 120 | l10n_br_city_id = l10n_br_city_id, | ||
| 383 | 121 | district = district, | ||
| 384 | 122 | street = street, | ||
| 385 | 123 | zip = zip) | ||
| 386 | 124 | |||
| 387 | 125 | zip_id = self.search(cr, uid, domain) | ||
| 388 | 126 | |||
| 389 | 127 | return zip_id | ||
| 390 | 128 | |||
| 391 | 129 | def zip_search(self, cr, uid, ids, context, country_id=False, state_id=False, l10n_br_city_id=False, district=False, street=False, zip=False): | ||
| 392 | 130 | |||
| 393 | 131 | result = self.set_result(cr, uid, ids, context) | ||
| 394 | 132 | |||
| 395 | 133 | zip_id = self.zip_search_multi(cr, uid, ids, context, | ||
| 396 | 134 | country_id, | ||
| 397 | 135 | state_id, | ||
| 398 | 136 | l10n_br_city_id, | ||
| 399 | 137 | district, | ||
| 400 | 138 | street, | ||
| 401 | 139 | zip) | ||
| 402 | 140 | |||
| 403 | 141 | if len(zip_id) == 1: | ||
| 404 | 142 | |||
| 405 | 143 | result = self.set_result(cr, uid, ids, context, zip_id[0]) | ||
| 406 | 144 | |||
| 407 | 145 | return result | ||
| 408 | 146 | |||
| 409 | 147 | else: | ||
| 410 | 148 | |||
| 411 | 149 | return False | ||
| 412 | 150 | |||
| 413 | 151 | def create_wizard(self, cr, uid, ids, context, object_name, country_id=False, state_id=False, l10n_br_city_id=False, district=False, street=False, zip=False, zip_ids=False): | ||
| 414 | 152 | |||
| 415 | 153 | context.update({'zip': zip, | ||
| 416 | 154 | 'street': street, | ||
| 417 | 155 | 'district': district, | ||
| 418 | 156 | 'country_id': country_id, | ||
| 419 | 157 | 'state_id': state_id, | ||
| 420 | 158 | 'l10n_br_city_id': l10n_br_city_id, | ||
| 421 | 159 | 'zip_ids': zip_ids, | ||
| 422 | 160 | 'address_id': ids[0], | ||
| 423 | 161 | 'object_name': object_name}) | ||
| 424 | 162 | |||
| 425 | 163 | result = { | ||
| 426 | 164 | 'name': 'Zip Search', | ||
| 427 | 165 | 'view_type': 'form', | ||
| 428 | 166 | 'view_mode': 'form', | ||
| 429 | 167 | 'res_model': 'l10n_br_data.zip.search', | ||
| 430 | 168 | 'view_id': False, | ||
| 431 | 169 | 'context': context, | ||
| 432 | 170 | 'type': 'ir.actions.act_window', | ||
| 433 | 171 | 'target': 'new', | ||
| 434 | 172 | 'nodestroy': True, | ||
| 435 | 173 | } | ||
| 436 | 174 | |||
| 437 | 175 | return result | ||
| 438 | 42 | 176 | ||
| 439 | === modified file 'l10n_br_data_zip/l10n_br_data_zip_view.xml' | |||
| 440 | --- l10n_br_data_zip/l10n_br_data_zip_view.xml 2012-12-11 04:31:17 +0000 | |||
| 441 | +++ l10n_br_data_zip/l10n_br_data_zip_view.xml 2013-03-13 12:27:20 +0000 | |||
| 442 | @@ -8,6 +8,7 @@ | |||
| 443 | 8 | <field name="arch" type="xml"> | 8 | <field name="arch" type="xml"> |
| 444 | 9 | <tree string="CEPs"> | 9 | <tree string="CEPs"> |
| 445 | 10 | <field name="code" select="1"/> | 10 | <field name="code" select="1"/> |
| 446 | 11 | <field name="district" select="1"/> | ||
| 447 | 11 | <field name="street_type" select="1"/> | 12 | <field name="street_type" select="1"/> |
| 448 | 12 | <field name="street" select="1"/> | 13 | <field name="street" select="1"/> |
| 449 | 13 | </tree> | 14 | </tree> |
| 450 | @@ -29,7 +30,8 @@ | |||
| 451 | 29 | </form> | 30 | </form> |
| 452 | 30 | </field> | 31 | </field> |
| 453 | 31 | </record> | 32 | </record> |
| 455 | 32 | 33 | ||
| 456 | 34 | |||
| 457 | 33 | <record model="ir.actions.act_window" id="action_l10n_br_data_zip"> | 35 | <record model="ir.actions.act_window" id="action_l10n_br_data_zip"> |
| 458 | 34 | <field name="name">CEPs</field> | 36 | <field name="name">CEPs</field> |
| 459 | 35 | <field name="type">ir.actions.act_window</field> | 37 | <field name="type">ir.actions.act_window</field> |
| 460 | 36 | 38 | ||
| 461 | === modified file 'l10n_br_data_zip/res_partner.py' | |||
| 462 | --- l10n_br_data_zip/res_partner.py 2013-01-20 23:42:40 +0000 | |||
| 463 | +++ l10n_br_data_zip/res_partner.py 2013-03-13 12:27:20 +0000 | |||
| 464 | @@ -18,97 +18,57 @@ | |||
| 465 | 18 | ############################################################################### | 18 | ############################################################################### |
| 466 | 19 | 19 | ||
| 467 | 20 | import re | 20 | import re |
| 469 | 21 | from osv import osv | 21 | from openerp.osv import osv |
| 470 | 22 | 22 | ||
| 471 | 23 | 23 | ||
| 472 | 24 | class res_partner(osv.Model): | 24 | class res_partner(osv.Model): |
| 473 | 25 | _inherit = 'res.partner' | 25 | _inherit = 'res.partner' |
| 474 | 26 | 26 | ||
| 475 | 27 | #TODO migrate | ||
| 476 | 28 | def zip_search(self, cr, uid, ids, context=None): | 27 | def zip_search(self, cr, uid, ids, context=None): |
| 477 | 29 | 28 | ||
| 478 | 30 | result = { | ||
| 479 | 31 | 'street': False, | ||
| 480 | 32 | 'l10n_br_city_id': False, | ||
| 481 | 33 | 'city': False, | ||
| 482 | 34 | 'state_id': False, | ||
| 483 | 35 | 'country_id': False, | ||
| 484 | 36 | 'zip': False | ||
| 485 | 37 | } | ||
| 486 | 38 | |||
| 487 | 39 | obj_zip = self.pool.get('l10n_br_data.zip') | 29 | obj_zip = self.pool.get('l10n_br_data.zip') |
| 488 | 40 | 30 | ||
| 489 | 41 | for res_partner in self.browse(cr, uid, ids): | 31 | for res_partner in self.browse(cr, uid, ids): |
| 490 | 32 | |||
| 491 | 33 | zip_ids = obj_zip.zip_search_multi(cr, uid, ids, context, | ||
| 492 | 34 | country_id = res_partner.country_id.id, \ | ||
| 493 | 35 | state_id = res_partner.state_id.id, \ | ||
| 494 | 36 | l10n_br_city_id = res_partner.l10n_br_city_id.id, \ | ||
| 495 | 37 | district = res_partner.district, \ | ||
| 496 | 38 | street = res_partner.street, \ | ||
| 497 | 39 | zip = res_partner.zip, | ||
| 498 | 40 | ) | ||
| 499 | 41 | |||
| 500 | 42 | if len(zip_ids) == 1: | ||
| 501 | 43 | |||
| 502 | 44 | zip_read = obj_zip.set_result(cr, uid, ids, context, zip_ids[0]) | ||
| 503 | 42 | 45 | ||
| 508 | 43 | domain = [] | 46 | result = { |
| 509 | 44 | if res_partner.zip: | 47 | 'country_id': zip_read['country_id'], |
| 510 | 45 | zip = re.sub('[^0-9]', '', res_partner.zip or '') | 48 | 'state_id': zip_read['state_id'], |
| 511 | 46 | domain.append(('code', '=', zip)) | 49 | 'l10n_br_city_id': zip_read['l10n_br_city_id'], |
| 512 | 50 | 'district': zip_read['district'], | ||
| 513 | 51 | 'street': zip_read['street'], | ||
| 514 | 52 | 'zip': zip_read['zip'], | ||
| 515 | 53 | } | ||
| 516 | 54 | |||
| 517 | 55 | self.write(cr, uid, res_partner.id, result) | ||
| 518 | 56 | |||
| 519 | 57 | return True | ||
| 520 | 58 | |||
| 521 | 47 | else: | 59 | else: |
| 589 | 48 | domain.append(('street', '=', res_partner.street)) | 60 | |
| 590 | 49 | domain.append(('district', '=', res_partner.district)) | 61 | if len(zip_ids) > 1: |
| 591 | 50 | domain.append(('country_id', '=', \ | 62 | |
| 592 | 51 | res_partner.country_id.id)) | 63 | return obj_zip.create_wizard(cr, uid, ids, context, self._name, |
| 593 | 52 | domain.append(('state_id', '=', \ | 64 | country_id = res_partner.country_id.id, \ |
| 594 | 53 | res_partner.state_id.id)) | 65 | state_id = res_partner.state_id.id, \ |
| 595 | 54 | domain.append(('l10n_br_city_id', '=', \ | 66 | l10n_br_city_id = res_partner.l10n_br_city_id.id, \ |
| 596 | 55 | res_partner.l10n_br_city_id.id)) | 67 | district = res_partner.district, \ |
| 597 | 56 | 68 | street = res_partner.street, \ | |
| 598 | 57 | zip_id = obj_zip.search(cr, uid, domain) | 69 | zip = res_partner.zip, |
| 599 | 58 | 70 | zip_ids = zip_ids | |
| 600 | 59 | if not len(zip_id) == 1: | 71 | ) |
| 601 | 60 | 72 | else: | |
| 602 | 61 | context.update({ | 73 | |
| 603 | 62 | 'zip': res_partner.zip, | 74 | return True |
| 537 | 63 | 'street': res_partner.street, | ||
| 538 | 64 | 'district': res_partner.district, | ||
| 539 | 65 | 'country_id': \ | ||
| 540 | 66 | res_partner.country_id.id, | ||
| 541 | 67 | 'state_id': res_partner.state_id.id, | ||
| 542 | 68 | 'l10n_br_city_id': \ | ||
| 543 | 69 | res_partner.l10n_br_city_id.id, | ||
| 544 | 70 | 'address_id': ids, | ||
| 545 | 71 | 'object_name': self._name, | ||
| 546 | 72 | }) | ||
| 547 | 73 | |||
| 548 | 74 | result = { | ||
| 549 | 75 | 'name': 'Zip Search', | ||
| 550 | 76 | 'view_type': 'form', | ||
| 551 | 77 | 'view_mode': 'form', | ||
| 552 | 78 | 'res_model': 'l10n_br_data.zip.search', | ||
| 553 | 79 | 'view_id': False, | ||
| 554 | 80 | 'context': context, | ||
| 555 | 81 | 'type': 'ir.actions.act_window', | ||
| 556 | 82 | 'target': 'new', | ||
| 557 | 83 | 'nodestroy': True, | ||
| 558 | 84 | } | ||
| 559 | 85 | return result | ||
| 560 | 86 | |||
| 561 | 87 | zip_read = obj_zip.read(cr, uid, zip_id, [ | ||
| 562 | 88 | 'street_type', | ||
| 563 | 89 | 'street', 'district', | ||
| 564 | 90 | 'code', | ||
| 565 | 91 | 'l10n_br_city_id', | ||
| 566 | 92 | 'city', 'state_id', | ||
| 567 | 93 | 'country_id' | ||
| 568 | 94 | ], | ||
| 569 | 95 | context=context)[0] | ||
| 570 | 96 | |||
| 571 | 97 | zip = re.sub('[^0-9]', '', zip_read['code'] or '') | ||
| 572 | 98 | if len(zip) == 8: | ||
| 573 | 99 | zip = '%s-%s' % (zip[0:5], zip[5:8]) | ||
| 574 | 100 | |||
| 575 | 101 | result['street'] = ((zip_read['street_type'] or '') + ' ' \ | ||
| 576 | 102 | + (zip_read['street'] or '')) | ||
| 577 | 103 | result['district'] = zip_read['district'] | ||
| 578 | 104 | result['zip'] = zip | ||
| 579 | 105 | result['l10n_br_city_id'] = zip_read['l10n_br_city_id'] \ | ||
| 580 | 106 | and zip_read['l10n_br_city_id'][0] or False | ||
| 581 | 107 | result['city'] = zip_read['l10n_br_city_id'] \ | ||
| 582 | 108 | and zip_read['l10n_br_city_id'][1] or '' | ||
| 583 | 109 | result['state_id'] = zip_read['state_id'] \ | ||
| 584 | 110 | and zip_read['state_id'][0] or False | ||
| 585 | 111 | result['country_id'] = zip_read['country_id'] \ | ||
| 586 | 112 | and zip_read['country_id'][0] or False | ||
| 587 | 113 | self.write(cr, uid, res_partner.id, result) | ||
| 588 | 114 | return False | ||
| 604 | 115 | 75 | ||
| 605 | === modified file 'l10n_br_data_zip/res_partner_view.xml' | |||
| 606 | --- l10n_br_data_zip/res_partner_view.xml 2012-12-11 04:31:17 +0000 | |||
| 607 | +++ l10n_br_data_zip/res_partner_view.xml 2013-03-13 12:27:20 +0000 | |||
| 608 | @@ -10,7 +10,7 @@ | |||
| 609 | 10 | <field name="arch" type="xml"> | 10 | <field name="arch" type="xml"> |
| 610 | 11 | <field name="zip" position="replace"> | 11 | <field name="zip" position="replace"> |
| 611 | 12 | <field name="zip" placeholder="ZIP" on_change="onchange_mask_zip(zip)"/> | 12 | <field name="zip" placeholder="ZIP" on_change="onchange_mask_zip(zip)"/> |
| 613 | 13 | <button name="zip_search" string="Pesquisar CEP" type="object"/> | 13 | <button name="zip_search" string="Buscar Endereço" type="object"/> |
| 614 | 14 | </field> | 14 | </field> |
| 615 | 15 | </field> | 15 | </field> |
| 616 | 16 | </record> | 16 | </record> |
| 617 | 17 | 17 | ||
| 618 | === modified file 'l10n_br_data_zip/wizard/l10n_br_data_zip_search.py' | |||
| 619 | --- l10n_br_data_zip/wizard/l10n_br_data_zip_search.py 2013-01-03 04:21:33 +0000 | |||
| 620 | +++ l10n_br_data_zip/wizard/l10n_br_data_zip_search.py 2013-03-13 12:27:20 +0000 | |||
| 621 | @@ -20,13 +20,16 @@ | |||
| 622 | 20 | import re | 20 | import re |
| 623 | 21 | import string | 21 | import string |
| 624 | 22 | 22 | ||
| 629 | 23 | from osv import osv, fields | 23 | from openerp.osv import osv, fields |
| 630 | 24 | 24 | ||
| 631 | 25 | 25 | ||
| 632 | 26 | class l10n_br_data_zip_search(osv.osv_memory): | 26 | |
| 633 | 27 | class l10n_br_data_zip_search(osv.TransientModel): | ||
| 634 | 28 | |||
| 635 | 27 | _name = 'l10n_br_data.zip.search' | 29 | _name = 'l10n_br_data.zip.search' |
| 636 | 30 | |||
| 637 | 28 | _description = 'Zipcode Search' | 31 | _description = 'Zipcode Search' |
| 639 | 29 | #_inherit = 'ir.wizard.screen' | 32 | |
| 640 | 30 | _columns = { | 33 | _columns = { |
| 641 | 31 | 'code': fields.char('CEP', size=8), | 34 | 'code': fields.char('CEP', size=8), |
| 642 | 32 | 'street': fields.char('Logradouro', size=72), | 35 | 'street': fields.char('Logradouro', size=72), |
| 643 | @@ -38,15 +41,28 @@ | |||
| 644 | 38 | 'l10n_br_city_id': fields.many2one( | 41 | 'l10n_br_city_id': fields.many2one( |
| 645 | 39 | 'l10n_br_base.city', 'Cidade', | 42 | 'l10n_br_base.city', 'Cidade', |
| 646 | 40 | domain="[('state_id','=',state_id)]"), | 43 | domain="[('state_id','=',state_id)]"), |
| 648 | 41 | 'zip_ids': fields.many2many('l10n_br_data.zip','zip_search', | 44 | |
| 649 | 45 | 'zip_ids': fields.many2many('l10n_br_data.zip.result','zip_search', | ||
| 650 | 42 | 'zip_id', 'zip_search_id', 'CEP', | 46 | 'zip_id', 'zip_search_id', 'CEP', |
| 652 | 43 | readonly=True), | 47 | readonly=False), |
| 653 | 48 | |||
| 654 | 44 | 'state':fields.selection([('init','init'), | 49 | 'state':fields.selection([('init','init'), |
| 656 | 45 | ('done','done')], 'state', readonly=True)} | 50 | ('done','done')], 'state', readonly=True), |
| 657 | 51 | 'address_id': fields.integer('Id do objeto', invisible=True), | ||
| 658 | 52 | 'object_name': fields.char('Nome do bjeto', size=100, invisible=True), | ||
| 659 | 53 | } | ||
| 660 | 46 | 54 | ||
| 661 | 47 | _defaults = { | 55 | _defaults = { |
| 662 | 48 | 'state': 'init'} | 56 | 'state': 'init'} |
| 663 | 49 | 57 | ||
| 664 | 58 | def create(self, cr, uid, vals, context): | ||
| 665 | 59 | |||
| 666 | 60 | result = super(l10n_br_data_zip_search, self).create(cr, uid, vals, context) | ||
| 667 | 61 | |||
| 668 | 62 | context.update({'search_id': result}) | ||
| 669 | 63 | |||
| 670 | 64 | return result | ||
| 671 | 65 | |||
| 672 | 50 | def default_get(self, cr, uid, fields_list, context=None): | 66 | def default_get(self, cr, uid, fields_list, context=None): |
| 673 | 51 | 67 | ||
| 674 | 52 | if context is None: | 68 | if context is None: |
| 675 | @@ -61,78 +77,165 @@ | |||
| 676 | 61 | data['country_id'] = context.get('country_id', False) | 77 | data['country_id'] = context.get('country_id', False) |
| 677 | 62 | data['state_id'] = context.get('state_id', False) | 78 | data['state_id'] = context.get('state_id', False) |
| 678 | 63 | data['l10n_br_city_id'] = context.get('l10n_br_city_id', False) | 79 | data['l10n_br_city_id'] = context.get('l10n_br_city_id', False) |
| 679 | 80 | data['address_id'] = context.get('address_id', False) | ||
| 680 | 81 | data['object_name'] = context.get('object_name', False) | ||
| 681 | 82 | |||
| 682 | 83 | zip_ids = context.get('zip_ids', False) | ||
| 683 | 84 | |||
| 684 | 85 | if zip_ids != False: | ||
| 685 | 86 | |||
| 686 | 87 | obj_zip_result = self.pool.get('l10n_br_data.zip.result') | ||
| 687 | 88 | |||
| 688 | 89 | zip_result_ids = obj_zip_result.map_to_zip_result(cr, uid, 0, context, | ||
| 689 | 90 | zip_ids, data['object_name'], data['address_id']) | ||
| 690 | 91 | |||
| 691 | 92 | data['zip_ids'] = zip_result_ids | ||
| 692 | 93 | |||
| 693 | 94 | data['state'] = 'done' | ||
| 694 | 64 | 95 | ||
| 695 | 65 | return data | 96 | return data |
| 697 | 66 | 97 | ||
| 698 | 67 | def zip_search(self, cr, uid, ids, context=None): | 98 | def zip_search(self, cr, uid, ids, context=None): |
| 699 | 68 | 99 | ||
| 700 | 69 | data = self.read(cr, uid, ids, [], context=context)[0] | 100 | data = self.read(cr, uid, ids, [], context=context)[0] |
| 701 | 70 | 101 | ||
| 702 | 71 | domain = [ | ||
| 703 | 72 | ('country_id','=',data['country_id'][0]), | ||
| 704 | 73 | ('state_id','=',data['state_id'][0]), | ||
| 705 | 74 | ('l10n_br_city_id','=',data['l10n_br_city_id'][0]),] | ||
| 706 | 75 | |||
| 707 | 76 | if data['code']: | ||
| 708 | 77 | zip = re.sub('[^0-9]', '', data['code'] or '') | ||
| 709 | 78 | domain.append(('code','=',zip)) | ||
| 710 | 79 | |||
| 711 | 80 | if data['street']: | ||
| 712 | 81 | domain.append(('street','=',data['street'])) | ||
| 713 | 82 | |||
| 714 | 83 | if data['district']: | ||
| 715 | 84 | domain.append(('district','=',data['district'])) | ||
| 716 | 85 | |||
| 717 | 86 | obj_zip = self.pool.get('l10n_br_data.zip') | 102 | obj_zip = self.pool.get('l10n_br_data.zip') |
| 718 | 103 | |||
| 719 | 104 | obj_zip_result = self.pool.get('l10n_br_data.zip.result') | ||
| 720 | 105 | |||
| 721 | 106 | domain = obj_zip.set_domain(country_id = data['country_id'][0], \ | ||
| 722 | 107 | state_id = data['state_id'][0], \ | ||
| 723 | 108 | l10n_br_city_id = data['l10n_br_city_id'][0],\ | ||
| 724 | 109 | district = data['district'], \ | ||
| 725 | 110 | street = data['street'], \ | ||
| 726 | 111 | zip = data['code']) | ||
| 727 | 112 | |||
| 728 | 113 | # Search zip_ids | ||
| 729 | 87 | zip_ids = obj_zip.search(cr, uid, domain) | 114 | zip_ids = obj_zip.search(cr, uid, domain) |
| 730 | 88 | 115 | ||
| 731 | 116 | #MAP zip to zip.search.result | ||
| 732 | 117 | zip_result_ids = obj_zip_result.map_to_zip_result(cr, uid, ids, context, | ||
| 733 | 118 | zip_ids, data['object_name'], data['address_id']) | ||
| 734 | 119 | |||
| 735 | 89 | self.write(cr, uid, ids, | 120 | self.write(cr, uid, ids, |
| 736 | 90 | {'state': 'done', | 121 | {'state': 'done', |
| 785 | 91 | 'zip_ids': [[6, 0, zip_ids]]}, context=context) | 122 | 'zip_ids': [[6, 0, zip_result_ids]]}, context=context) |
| 786 | 92 | return False | 123 | |
| 787 | 93 | 124 | return { | |
| 788 | 94 | def zip_search_end(self, cr, uid, ids, context=None): | 125 | 'type': 'ir.actions.act_window', |
| 789 | 95 | 126 | 'res_model': 'l10n_br_data.zip.search', | |
| 790 | 96 | result = { | 127 | 'view_mode': 'form', |
| 791 | 97 | 'street': False, | 128 | 'view_type': 'form', |
| 792 | 98 | 'l10n_br_city_id': False, | 129 | 'res_id': data['id'], |
| 793 | 99 | 'city': False, | 130 | 'views': [(False, 'form')], |
| 794 | 100 | 'state_id': False, | 131 | 'target': 'new', |
| 795 | 101 | 'country_id': False, | 132 | 'nodestroy': True, |
| 796 | 102 | 'zip': False | 133 | } |
| 797 | 103 | } | 134 | |
| 798 | 104 | 135 | def zip_new_search(self, cr, uid, ids, context=None): | |
| 799 | 105 | data = self.read(cr, uid, ids, [], context=context)[0] | 136 | |
| 800 | 106 | 137 | data = self.read(cr, uid, ids, [], context=context)[0] | |
| 801 | 107 | if data['zip_ids']: | 138 | |
| 802 | 108 | address_id = context.get('address_id', False) | 139 | self.write(cr, uid, ids, |
| 803 | 109 | object_name = context.get('object_name', False) | 140 | {'state': 'init', |
| 804 | 110 | if address_id and object_name: | 141 | 'zip_ids': [[6, 0, []]]}, context=context) |
| 805 | 111 | obj_zip = self.pool.get('l10n_br_data.zip') | 142 | |
| 806 | 112 | zip_read = obj_zip.read( | 143 | return { |
| 807 | 113 | cr, uid, data['zip_ids'], ['street_type', | 144 | 'type': 'ir.actions.act_window', |
| 808 | 114 | 'street', | 145 | 'res_model': 'l10n_br_data.zip.search', |
| 809 | 115 | 'district', | 146 | 'view_mode': 'form', |
| 810 | 116 | 'code', | 147 | 'view_type': 'form', |
| 811 | 117 | 'l10n_br_city_id', | 148 | 'res_id': data['id'], |
| 812 | 118 | 'city', 'state_id', | 149 | 'views': [(False, 'form')], |
| 813 | 119 | 'country_id'], context=context)[0] | 150 | 'target': 'new', |
| 814 | 120 | 151 | 'nodestroy': True | |
| 815 | 121 | zip = re.sub('[^0-9]', '', zip_read['code'] or '') | 152 | } |
| 816 | 122 | if len(zip) == 8: | 153 | |
| 817 | 123 | zip = '%s-%s' % (zip[0:5], zip[5:8]) | 154 | |
| 818 | 124 | 155 | ||
| 819 | 125 | result['street'] = ((zip_read['street_type'] or '') + ' ' + (zip_read['street'] or '')) | 156 | |
| 820 | 126 | result['district'] = zip_read['district'] | 157 | class l10n_br_data_zip_result(osv.TransientModel): |
| 821 | 127 | result['zip'] = zip | 158 | |
| 822 | 128 | result['l10n_br_city_id'] = zip_read['l10n_br_city_id'] and zip_read['l10n_br_city_id'][0] or False | 159 | _name = 'l10n_br_data.zip.result' |
| 823 | 129 | result['city'] = zip_read['l10n_br_city_id'] and zip_read['l10n_br_city_id'][1] or '' | 160 | |
| 824 | 130 | result['state_id'] = zip_read['state_id'] and zip_read['state_id'][0] or False | 161 | _description = 'Zipcode result' |
| 825 | 131 | result['country_id'] = zip_read['country_id'] and zip_read['country_id'][0] or False | 162 | |
| 826 | 132 | 163 | _columns = { | |
| 827 | 133 | obj_partner = self.pool.get(object_name) | 164 | 'zip_id': fields.many2one('l10n_br_data.zip', 'Zipcode', readonly=True, invisible=True), |
| 828 | 134 | obj_partner.write(cr, uid, address_id, result, context=context) | 165 | 'search_id': fields.many2one('l10n_br_data.zip.search', 'Search', readonly=True, invisible=True), |
| 829 | 135 | 166 | 'address_id': fields.integer('Id do objeto', invisible=True), | |
| 830 | 136 | return {'type': 'ir.actions.act_window_close'} | 167 | 'object_name': fields.char('Nome do bjeto', size=100, invisible=True), |
| 831 | 137 | 168 | #ZIPCODE data to be shown | |
| 832 | 138 | l10n_br_data_zip_search() | 169 | 'code': fields.char('CEP', size=9, readonly=True), |
| 833 | 170 | 'street': fields.char('Logradouro', size=72, readonly=True), | ||
| 834 | 171 | 'district': fields.char('Bairro', size=72, readonly=True), | ||
| 835 | 172 | 'country_id': fields.many2one('res.country', 'Country', readonly=True), | ||
| 836 | 173 | 'state_id': fields.many2one('res.country.state', 'Estado', | ||
| 837 | 174 | domain="[('country_id','=',country_id)]", readonly=True), | ||
| 838 | 175 | 'l10n_br_city_id': fields.many2one( | ||
| 839 | 176 | 'l10n_br_base.city', 'Cidade', | ||
| 840 | 177 | required=True, domain="[('state_id','=',state_id)]", readonly=True), | ||
| 841 | 178 | } | ||
| 842 | 179 | |||
| 843 | 180 | |||
| 844 | 181 | def map_to_zip_result(self, cr, uid, ids, context, zip_ids, object_name, address_id): | ||
| 845 | 182 | |||
| 846 | 183 | obj_zip = self.pool.get('l10n_br_data.zip') | ||
| 847 | 184 | |||
| 848 | 185 | result = [] | ||
| 849 | 186 | |||
| 850 | 187 | for zip_id in zip_ids: | ||
| 851 | 188 | |||
| 852 | 189 | zip_data = obj_zip.set_result(cr, uid, ids, context, zip_id) | ||
| 853 | 190 | |||
| 854 | 191 | zip_result_data = { | ||
| 855 | 192 | 'zip_id': False, | ||
| 856 | 193 | 'code': False, | ||
| 857 | 194 | 'street': False, | ||
| 858 | 195 | 'district': False, | ||
| 859 | 196 | 'country_id': False, | ||
| 860 | 197 | 'state_id': False, | ||
| 861 | 198 | 'l10n_br_city_id': False, | ||
| 862 | 199 | } | ||
| 863 | 200 | |||
| 864 | 201 | zip_result_data['zip_id'] = zip_id | ||
| 865 | 202 | zip_result_data['object_name'] = object_name | ||
| 866 | 203 | zip_result_data['address_id'] = address_id | ||
| 867 | 204 | zip_result_data['code'] = zip_data['zip'] | ||
| 868 | 205 | zip_result_data['street'] = zip_data['street'] | ||
| 869 | 206 | zip_result_data['district'] = zip_data['district'] | ||
| 870 | 207 | zip_result_data['country_id'] = zip_data['country_id'] | ||
| 871 | 208 | zip_result_data['state_id'] = zip_data['state_id'] | ||
| 872 | 209 | zip_result_data['l10n_br_city_id'] = zip_data['l10n_br_city_id'] | ||
| 873 | 210 | |||
| 874 | 211 | |||
| 875 | 212 | zip_result_id = self.create(cr, uid, zip_result_data, context=context) | ||
| 876 | 213 | |||
| 877 | 214 | result.append(zip_result_id) | ||
| 878 | 215 | |||
| 879 | 216 | return result | ||
| 880 | 217 | |||
| 881 | 218 | def zip_select(self, cr, uid, ids, context=None): | ||
| 882 | 219 | |||
| 883 | 220 | data = self.read(cr, uid, ids, [], context=context)[0] | ||
| 884 | 221 | |||
| 885 | 222 | address_id = data['address_id'] | ||
| 886 | 223 | |||
| 887 | 224 | object_name = data['object_name'] | ||
| 888 | 225 | |||
| 889 | 226 | if address_id and object_name: | ||
| 890 | 227 | |||
| 891 | 228 | obj = self.pool.get(object_name) | ||
| 892 | 229 | |||
| 893 | 230 | obj_zip = self.pool.get('l10n_br_data.zip') | ||
| 894 | 231 | |||
| 895 | 232 | result = obj_zip.set_result(cr, uid, ids, context, data['zip_id'][0]) | ||
| 896 | 233 | |||
| 897 | 234 | obj.write(cr, uid, address_id, result, context=context) | ||
| 898 | 235 | |||
| 899 | 236 | return True | ||
| 900 | 237 | |||
| 901 | 238 | |||
| 902 | 239 | |||
| 903 | 240 | |||
| 904 | 241 | |||
| 905 | 139 | 242 | ||
| 906 | === modified file 'l10n_br_data_zip/wizard/l10n_br_data_zip_search_view.xml' | |||
| 907 | --- l10n_br_data_zip/wizard/l10n_br_data_zip_search_view.xml 2013-01-03 04:21:33 +0000 | |||
| 908 | +++ l10n_br_data_zip/wizard/l10n_br_data_zip_search_view.xml 2013-03-13 12:27:20 +0000 | |||
| 909 | @@ -1,7 +1,7 @@ | |||
| 910 | 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 911 | 2 | <openerp> | 2 | <openerp> |
| 912 | 3 | <data noupdate="0"> | 3 | <data noupdate="0"> |
| 914 | 4 | 4 | ||
| 915 | 5 | <record id="view_l10n_br_data_zip_search" model="ir.ui.view"> | 5 | <record id="view_l10n_br_data_zip_search" model="ir.ui.view"> |
| 916 | 6 | <field name="name">Pesquisar CEP</field> | 6 | <field name="name">Pesquisar CEP</field> |
| 917 | 7 | <field name="model">l10n_br_data.zip.search</field> | 7 | <field name="model">l10n_br_data.zip.search</field> |
| 918 | @@ -19,20 +19,49 @@ | |||
| 919 | 19 | </group> | 19 | </group> |
| 920 | 20 | <group colspan="8" col="8" states="done"> | 20 | <group colspan="8" col="8" states="done"> |
| 921 | 21 | <!-- <separator colspan="8" string="Resuldado da Pesquisa"/> --> | 21 | <!-- <separator colspan="8" string="Resuldado da Pesquisa"/> --> |
| 923 | 22 | <field colspan="8" height="130" nolabel="1" name="zip_ids" /> | 22 | <field colspan="8" height="130" nolabel="1" name="zip_ids" wizard="one2many_list" readonly="1"/> |
| 924 | 23 | </group> | 23 | </group> |
| 925 | 24 | <footer states="init"> | 24 | <footer states="init"> |
| 926 | 25 | <button name="zip_search" string="Pesquisar" type="object" class="oe_highlight"/> | 25 | <button name="zip_search" string="Pesquisar" type="object" class="oe_highlight"/> |
| 927 | 26 | or | ||
| 928 | 27 | <button special="cancel" string="Cancelar" class="oe_link"/> | 26 | <button special="cancel" string="Cancelar" class="oe_link"/> |
| 929 | 28 | </footer> | 27 | </footer> |
| 930 | 29 | <footer states="done"> | 28 | <footer states="done"> |
| 932 | 30 | <button name="zip_search_end" type="object" string="Fechar" class="oe_highlight"/> | 29 | <!-- <button name="zip_search_end" string="Transferir" type="object" class="oe_highlight"/> --> |
| 933 | 30 | <button special="cancel" string="Cancelar" class="oe_link"/> | ||
| 934 | 31 | <button name="zip_new_search" string="Nova Pesquisa" type="object" class="oe_highlight"/> | ||
| 935 | 31 | </footer> | 32 | </footer> |
| 936 | 32 | </form> | 33 | </form> |
| 937 | 33 | </field> | 34 | </field> |
| 938 | 34 | </record> | 35 | </record> |
| 940 | 35 | 36 | ||
| 941 | 37 | <record model="ir.ui.view" id="view_l10n_br_data_zip_result_tree"> | ||
| 942 | 38 | <field name="name">l10n_br_data.zip.result</field> | ||
| 943 | 39 | <field name="model">l10n_br_data.zip.result</field> | ||
| 944 | 40 | <field name="arch" type="xml"> | ||
| 945 | 41 | <tree string="CEPs"> | ||
| 946 | 42 | <button name="zip_select" string="Selecionar" type="object" icon="gtk-apply"/> | ||
| 947 | 43 | <field name="code" select="1"/> | ||
| 948 | 44 | <field name="district" select="1"/> | ||
| 949 | 45 | <field name="street" select="1"/> | ||
| 950 | 46 | </tree> | ||
| 951 | 47 | </field> | ||
| 952 | 48 | </record> | ||
| 953 | 49 | |||
| 954 | 50 | <record model="ir.ui.view" id="view_l10n_br_data_zip_result_form"> | ||
| 955 | 51 | <field name="name">l10n_br_data.zip.result</field> | ||
| 956 | 52 | <field name="model">l10n_br_data.zip.result</field> | ||
| 957 | 53 | <field name="arch" type="xml"> | ||
| 958 | 54 | <form string="CEPs"> | ||
| 959 | 55 | <field name="code" select="1"/> | ||
| 960 | 56 | <field name="street" select="1"/> | ||
| 961 | 57 | <field name="district" select="2"/> | ||
| 962 | 58 | <field name="country_id" select="2"/> | ||
| 963 | 59 | <field name="state_id" select="2"/> | ||
| 964 | 60 | <field name="l10n_br_city_id" select="2"/> | ||
| 965 | 61 | </form> | ||
| 966 | 62 | </field> | ||
| 967 | 63 | </record> | ||
| 968 | 64 | |||
| 969 | 36 | <record id="action_l10n_br_data_zip_search" model="ir.actions.act_window"> | 65 | <record id="action_l10n_br_data_zip_search" model="ir.actions.act_window"> |
| 970 | 37 | <field name="name">Pesquisar CEP</field> | 66 | <field name="name">Pesquisar CEP</field> |
| 971 | 38 | <field name="type">ir.actions.act_window</field> | 67 | <field name="type">ir.actions.act_window</field> |
| 972 | @@ -41,6 +70,6 @@ | |||
| 973 | 41 | <field name="view_mode">form</field> | 70 | <field name="view_mode">form</field> |
| 974 | 42 | <field name="target">new</field> | 71 | <field name="target">new</field> |
| 975 | 43 | </record> | 72 | </record> |
| 977 | 44 | 73 | ||
| 978 | 45 | </data> | 74 | </data> |
| 979 | 46 | </openerp> | 75 | </openerp> |
| 980 | 47 | \ No newline at end of file | 76 | \ No newline at end of file |
Ainda não está 100% quando há um retorno do wizard, mas pode melhorar até o release final.