projects
/
odoo
/
odoo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
60cfaf6
83ce828
)
[MERGE] OPW 579210: sale_margin/sale_layout: fix incompatibilities when both modules...
author
Xavier ALT
<xal@openerp.com>
Wed, 2 Jan 2013 11:50:01 +0000
(12:50 +0100)
committer
Xavier ALT
<xal@openerp.com>
Wed, 2 Jan 2013 11:50:01 +0000
(12:50 +0100)
bzr revid: xal@openerp.com-
20130102115001
-c241nzm0ak949wv8
1
2
addons/sale/sale_view.xml
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
addons/sale/sale_view.xml
Simple merge