git.inspyration.org Git - odoo/odoo.git/commit

author	Josse Colpaert <jco@openerp.com>
	Fri, 2 May 2014 13:03:52 +0000 (15:03 +0200)
committer	Josse Colpaert <jco@openerp.com>
	Fri, 2 May 2014 13:03:52 +0000 (15:03 +0200)
commit	8b84615de17a0dd539c2b66d50b2627b9c75dd79
tree	147b31eebefc5c226aba431b467f5e4141d0d319	tree \| snapshot
parent	ca65a8e62462c171c2410ea465a63d929f999950	commit \| diff
parent	a22d0ce78aee714b5dbde24a0ac7c6755416b5b9	commit \| diff

[MERGE] Merge from trunk test

bzr revid: jco@openerp.com-20140502130352-c3h1fk332eqyd78b

31 files changed:

addons/event_sale/event_sale_view.xml	diff1 \|	diff2 \|	blob \| history
addons/hw_escpos/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/mrp/__openerp__.py	diff1 \|	diff2 \|	blob \| history
addons/mrp/process/procurement_process.xml.THIS	\|	\|	blob
addons/mrp/process/service_product_process.xml.THIS	\|	\|	blob
addons/mrp/process/stockable_product_process.xml.THIS	\|	\|	blob
addons/mrp/security/ir.model.access.csv	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/point_of_sale.py	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/point_of_sale_data.xml	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/point_of_sale_view.xml	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/report/pos_receipt.rml.THIS	\|	\|	blob
addons/point_of_sale/report/pos_report.py	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/static/src/xml/pos.xml	diff1 \|	diff2 \|	blob \| history
addons/procurement/__openerp__.py	diff1 \|	diff2 \|	blob \| history
addons/procurement/procurement.py	diff1 \|	diff2 \|	blob \| history
addons/product/product.py	diff1 \|	diff2 \|	blob \| history
addons/purchase/__openerp__.py	diff1 \|	diff2 \|	blob \| history
addons/purchase/board_purchase_view.xml.THIS	\|	\|	blob
addons/purchase/process/purchase_process.xml.THIS	\|	\|	blob
addons/purchase/purchase.py	diff1 \|	diff2 \|	blob \| history
addons/purchase/purchase_view.xml	diff1 \|	diff2 \|	blob \| history
addons/report/models/report.py	diff1 \|	diff2 \|	blob \| history
addons/sale/__openerp__.py	diff1 \|	diff2 \|	blob \| history
addons/sale/sale_view.xml	diff1 \|	diff2 \|	blob \| history
addons/stock/__openerp__.py	diff1 \|	diff2 \|	blob \| history
addons/stock/board_warehouse_view.xml.THIS	\|	\|	blob
addons/stock/security/ir.model.access.csv	diff1 \|	diff2 \|	blob \| history
addons/stock/stock.py	diff1 \|	diff2 \|	blob \| history
addons/stock/views.moved/report_package_barcode.xml	\|	\|	blob
addons/stock/views.moved/report_stockinventory.xml	\|	\|	blob
addons/stock/views.moved/report_stockpicking.xml	\|	\|	blob

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

RSS Atom

addons/event_sale/event_sale_view.xml	diff1 \|	diff2 \|	blob \| history
addons/hw_escpos/controllers/main.py	diff1 \|	diff2 \|	blob \| history
addons/mrp/__openerp__.py	diff1 \|	diff2 \|	blob \| history
addons/mrp/process/procurement_process.xml.THIS	\|	\|	blob
addons/mrp/process/service_product_process.xml.THIS	\|	\|	blob
addons/mrp/process/stockable_product_process.xml.THIS	\|	\|	blob
addons/mrp/security/ir.model.access.csv	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/point_of_sale.py	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/point_of_sale_data.xml	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/point_of_sale_view.xml	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/report/pos_receipt.rml.THIS	\|	\|	blob
addons/point_of_sale/report/pos_report.py	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/static/src/xml/pos.xml	diff1 \|	diff2 \|	blob \| history
addons/procurement/__openerp__.py	diff1 \|	diff2 \|	blob \| history
addons/procurement/procurement.py	diff1 \|	diff2 \|	blob \| history
addons/product/product.py	diff1 \|	diff2 \|	blob \| history
addons/purchase/__openerp__.py	diff1 \|	diff2 \|	blob \| history
addons/purchase/board_purchase_view.xml.THIS	\|	\|	blob
addons/purchase/process/purchase_process.xml.THIS	\|	\|	blob
addons/purchase/purchase.py	diff1 \|	diff2 \|	blob \| history
addons/purchase/purchase_view.xml	diff1 \|	diff2 \|	blob \| history
addons/report/models/report.py	diff1 \|	diff2 \|	blob \| history
addons/sale/__openerp__.py	diff1 \|	diff2 \|	blob \| history
addons/sale/sale_view.xml	diff1 \|	diff2 \|	blob \| history
addons/stock/__openerp__.py	diff1 \|	diff2 \|	blob \| history
addons/stock/board_warehouse_view.xml.THIS	\|	\|	blob
addons/stock/security/ir.model.access.csv	diff1 \|	diff2 \|	blob \| history
addons/stock/stock.py	diff1 \|	diff2 \|	blob \| history
addons/stock/views.moved/report_package_barcode.xml	\|	\|	blob
addons/stock/views.moved/report_stockinventory.xml	\|	\|	blob
addons/stock/views.moved/report_stockpicking.xml	\|	\|	blob