revert pso merge because of conflicts
authorhda@tinyerp.com <>
Fri, 7 Nov 2008 07:34:10 +0000 (13:04 +0530)
committerhda@tinyerp.com <>
Fri, 7 Nov 2008 07:34:10 +0000 (13:04 +0530)
commit26da3a62cf3c6f6c9652cadfaf73c77dc705af41
tree0c184e8e5d7dccaa62c611bfe385878c63272a0d
parent818d795547ee9fef6b922ca95605874395e8af4f
revert pso merge because of conflicts

bzr revid: hda@tinyerp.com-20081107073410-p8k13j0p04fk73qz
24 files changed:
addons/account/__terp__.py
addons/account/process/customer_invoice_process.xml [deleted file]
addons/account/process/invoice_process.xml [new file with mode: 0644]
addons/account/process/statement_process.xml
addons/account/process/supplier_invoice_process.xml [deleted file]
addons/base_contact/__terp__.py
addons/base_contact/base_contact_view.xml
addons/base_contact/process/base_contact_process.xml [deleted file]
addons/crm_configuration/process/crm_configuration_process.xml
addons/document/__terp__.py
addons/hr/process/hr_process.xml
addons/hr_expense/__terp__.py
addons/hr_expense/process/hr_expense_process.xml [deleted file]
addons/hr_holidays/process/hr_holidays_process.xml
addons/membership/__terp__.py
addons/membership/process/membership_process.xml [deleted file]
addons/mrp/process/procurement_process.xml
addons/product/process/product_process.xml
addons/project_mrp/process/project_mrp_process.xml
addons/purchase/process/purchase_process.xml
addons/sale/process/sale_process.xml
addons/sale_crm/process/sale_crm_process.xml
addons/stock/__terp__.py
addons/stock/process/stock_process.xml [deleted file]