git.inspyration.org Git - odoo/odoo.git/commit - addons/point_of_sale/point_of_sale_view.xml

projects / odoo / odoo.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 6204218 06e0b30)

author	Quentin (OpenERP) <qdp-launchpad@openerp.com>
	Fri, 29 Nov 2013 16:56:44 +0000 (17:56 +0100)
committer	Quentin (OpenERP) <qdp-launchpad@openerp.com>
	Fri, 29 Nov 2013 16:56:44 +0000 (17:56 +0100)
commit	df2d5e148e04a1a1d01c1ba1689c9095b21f3016
tree	ff73e7763ad6ed51fd987c662f8e188f0a2d8116	tree \| snapshot
parent	6204218a4312efea79474778a89c357d86080e65	commit \| diff
parent	06e0b3045a177a1a47a123828309c15508532031	commit \| diff

[MERGE] trunk

bzr revid: qdp-launchpad@openerp.com-20131129165644-fx0m3ok07l41o507

15 files changed:

addons/delivery/stock.py	diff1 \|	diff2 \|	blob \| history
addons/mrp_byproduct/mrp_byproduct.py	diff1 \|	diff2 \|	blob \| history
addons/mrp_operations/test/workcenter_operations.yml	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/point_of_sale.py	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/point_of_sale_view.xml	diff1 \|	diff2 \|	blob \| history
addons/product/product.py	diff1 \|	diff2 \|	blob \| history
addons/project_mrp/project_mrp.py	diff1 \|	diff2 \|	blob \| history
addons/purchase/purchase.py	diff1 \|	diff2 \|	blob \| history
addons/purchase/purchase_view.xml	diff1 \|	diff2 \|	blob \| history
addons/purchase/report/purchase_report.py	diff1 \|	diff2 \|	blob \| history
addons/sale/sale.py	diff1 \|	diff2 \|	blob \| history
addons/sale/sale_view.xml	diff1 \|	diff2 \|	blob \| history
addons/sale_stock/report/sale_report.py	diff1 \|	diff2 \|	blob \| history
addons/stock/product_view.xml	diff1 \|	diff2 \|	blob \| history
addons/warning/warning.py	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.