[MERGE]
authorHarry (Open ERP) <hmo@tinyerp.com>
Thu, 11 Mar 2010 14:24:49 +0000 (19:54 +0530)
committerHarry (Open ERP) <hmo@tinyerp.com>
Thu, 11 Mar 2010 14:24:49 +0000 (19:54 +0530)
commitbdc78703ea5df2940617130080d8a532b9312676
tree0cbd42fcfee26afbfec36096f03f51139a3f867a
parent50e304188262e8d76875edeb4b7add4ab2e64577
parentcefc85c5841ce79144fcc569db79972961be388f
[MERGE]

bzr revid: hmo@tinyerp.com-20100311142449-gfhiuwigpchfr074
52 files changed:
addons/caldav/caldav_node.py
addons/delivery/__terp__.py
addons/delivery/delivery_wizard.xml
addons/delivery/wizard/delivery_sale_order.py
addons/delivery/wizard/delivery_sale_order_view.xml
addons/mrp/__init__.py
addons/mrp/__terp__.py
addons/mrp/mrp.py
addons/mrp/mrp_view.xml
addons/mrp/mrp_wizard.py
addons/mrp/mrp_wizard.xml
addons/mrp/mrp_wizard_view.xml
addons/mrp/schedulers.py
addons/mrp/wizard/__init__.py
addons/mrp/wizard/change_production_qty.py
addons/mrp/wizard/change_production_qty_view.xml
addons/mrp/wizard/make_procurement_product.py
addons/mrp/wizard/make_procurement_view.xml
addons/mrp/wizard/mrp_product_produce.py
addons/mrp/wizard/mrp_product_produce_view.xml
addons/mrp/wizard/orderpoint_procurement.py
addons/mrp/wizard/orderpoint_procurement_view.xml
addons/mrp/wizard/schedulers_all_view.xml
addons/mrp_repair/__terp__.py
addons/mrp_repair/mrp_repair.py
addons/mrp_repair/mrp_repair_wizard.xml
addons/mrp_repair/wizard/cancel_repair.py
addons/mrp_repair/wizard/mrp_repair_cancel_view.xml
addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
addons/point_of_sale/wizard/pos_add_product.py
addons/point_of_sale/wizard/pos_add_product.xml
addons/product_margin/product_margin_view.xml
addons/product_margin/wizard/product_margin.py
addons/product_margin/wizard/product_margin_view.xml
addons/sale/wizard/sale_line_invoice.py
addons/sale/wizard/sale_line_invoice.xml
addons/sale/wizard/sale_make_invoice_advance.xml
addons/stock/__init__.py
addons/stock/__terp__.py
addons/stock/stock_view.xml
addons/stock/stock_wizard.py
addons/stock/stock_wizard_view.xml
addons/stock/wizard/__init__.py
addons/stock/wizard/stock_fill_inventory.py
addons/stock/wizard/stock_fill_inventory_view.xml
addons/stock/wizard/stock_inventory_set_stock_zero.py
addons/stock/wizard/stock_inventory_set_stock_zero_view.xml
addons/stock/wizard/stock_invoice_onshipping_view.xml
addons/stock/wizard/stock_location_product.py
addons/stock/wizard/stock_location_product_view.xml
addons/stock/wizard/stock_move.py
addons/stock/wizard/stock_move_view.xml