git.inspyration.org Git - odoo/odoo.git/commit - addons/sale_stock/sale_stock.py

projects / odoo / odoo.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 2f8864e 58907da)

author	Quentin (OpenERP) <qdp-launchpad@openerp.com>
	Mon, 20 Jan 2014 14:42:43 +0000 (15:42 +0100)
committer	Quentin (OpenERP) <qdp-launchpad@openerp.com>
	Mon, 20 Jan 2014 14:42:43 +0000 (15:42 +0100)
commit	fc93025818058900712ea81f26c9ff997c854836
tree	0b743efac1db3a239cb7ebede73ce1e6dadde6e6	tree \| snapshot
parent	2f8864e0a09ef1fa30039597262823c860e184bf	commit \| diff
parent	58907da3ee30be831083f6dcc804c31e7b73df5a	commit \| diff

[MERGE] merged trunk

bzr revid: qdp-launchpad@openerp.com-20140120144243-5kw535p28t1x7yeg

13 files changed:

addons/account_anglo_saxon/test/anglo_saxon.yml	diff1 \|	diff2 \|	blob \| history
addons/account_anglo_saxon/test/anglo_saxon_avg_fifo.yml	diff1 \|	diff2 \|	blob \| history
addons/delivery/delivery_demo.xml	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_expiry/product_expiry_demo.xml	diff1 \|	diff2 \|	blob \| history
addons/purchase/purchase.py	diff1 \|	diff2 \|	blob \| history
addons/purchase/purchase_workflow.xml	diff1 \|	diff2 \|	blob \| history
addons/sale/sale.py	diff1 \|	diff2 \|	blob \| history
addons/sale/sale_demo.xml	diff1 \|	diff2 \|	blob \| history
addons/sale_mrp/sale_mrp.py	diff1 \|	diff2 \|	blob \| history
addons/sale_stock/sale_stock.py	diff1 \|	diff2 \|	blob \| history
addons/sale_stock/test/picking_order_policy.yml	diff1 \|	diff2 \|	blob \| history

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