projects
/
odoo
/
odoo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
117d0d0
2080ea0
)
[MERGE] forward port of branch 7.0 up to 2080ea0
author
Denis Ledoux
<dle@odoo.com>
Thu, 27 Nov 2014 12:27:37 +0000
(13:27 +0100)
committer
Denis Ledoux
<dle@odoo.com>
Thu, 27 Nov 2014 12:27:37 +0000
(13:27 +0100)
1
2
addons/stock/stock.py
patch
|
diff1
|
diff2
|
blob
|
history
addons/stock/wizard/stock_invoice_onshipping.py
patch
|
diff1
|
diff2
|
blob
|
history
addons/web/static/src/js/view_list.js
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
addons/stock/stock.py
Simple merge
diff --cc
addons/stock/wizard/stock_invoice_onshipping.py
Simple merge
diff --cc
addons/web/static/src/js/view_list.js
Simple merge