projects
/
odoo
/
odoo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9d2cf73
7c4f374
)
merge upstream
author
Christophe Simonis
<chs@openerp.com>
Wed, 17 Jul 2013 14:29:47 +0000
(16:29 +0200)
committer
Christophe Simonis
<chs@openerp.com>
Wed, 17 Jul 2013 14:29:47 +0000
(16:29 +0200)
bzr revid: chs@openerp.com-
20130717142947
-de40mn3234gt5044
1
2
addons/crm/crm_lead.py
patch
|
diff1
|
diff2
|
blob
|
history
addons/crm/wizard/crm_lead_to_opportunity.py
patch
|
diff1
|
diff2
|
blob
|
history
addons/crm/wizard/crm_lead_to_opportunity_view.xml
patch
|
diff1
|
diff2
|
blob
|
history
addons/crm/wizard/crm_merge_opportunities_view.xml
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
addons/crm/crm_lead.py
Simple merge
diff --cc
addons/crm/wizard/crm_lead_to_opportunity.py
Simple merge
diff --cc
addons/crm/wizard/crm_lead_to_opportunity_view.xml
Simple merge
diff --cc
addons/crm/wizard/crm_merge_opportunities_view.xml
Simple merge