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

author	vra <vra@tinyerp.com>
	Fri, 21 May 2010 09:17:39 +0000 (14:47 +0530)
committer	vra <vra@tinyerp.com>
	Fri, 21 May 2010 09:17:39 +0000 (14:47 +0530)
commit	da9fc29dbcd1b1ff09f6b08917e94fffe84db043
tree	723c40d4d7a3d5107385f6955b32357f64fed89d	tree \| snapshot
parent	7a397943e43868b80c104f039d306abe0f79d7c9	commit \| diff

[MERGE] MErged from main branch

bzr revid: vra@tinyerp.com-20100521091739-a6m659ghorwfg5c8

98 files changed:

addons/account/account_analytic_line.py		diff \| blob \| history
addons/account/account_bank_statement.py		diff \| blob \| history
addons/account/i18n/th.po		diff \| blob \| history
addons/auction/__openerp__.py		diff \| blob \| history
addons/auction/wizard/__init__.py		diff \| blob \| history
addons/auction/wizard/auction_aie_send.py	[new file with mode: 0644]	blob
addons/auction/wizard/auction_aie_send_result.py	[new file with mode: 0644]	blob
addons/auction/wizard/auction_aie_send_result_view.xml	[new file with mode: 0644]	blob
addons/auction/wizard/auction_aie_send_view.xml	[new file with mode: 0644]	blob
addons/auction/wizard/auction_lots_numerotate.py	[new file with mode: 0644]	blob
addons/auction/wizard/auction_lots_numerotate_view.xml	[new file with mode: 0644]	blob
addons/auction/wizard/wizard_aie_send.py	[deleted file]	blob \| history
addons/auction/wizard/wizard_aie_send_result.py	[deleted file]	blob \| history
addons/auction/wizard/wizard_lots_numerotate.py	[deleted file]	blob \| history
addons/crm/crm_lead.py		diff \| blob \| history
addons/delivery/__openerp__.py		diff \| blob \| history
addons/delivery/test/delivery_test.yml	[new file with mode: 0644]	blob
addons/marketing_campaign/__openerp__.py		diff \| blob \| history
addons/marketing_campaign/marketing_campaign_workflow.xml	[new file with mode: 0644]	blob
addons/mrp/__openerp__.py		diff \| blob \| history
addons/mrp/mrp_view.xml		diff \| blob \| history
addons/mrp/mrp_workflow.xml		diff \| blob \| history
addons/mrp/report/mrp_production_order_view.xml		diff \| blob \| history
addons/mrp/report/order.rml		diff \| blob \| history
addons/mrp/test/mrp_phantom_bom.yml		diff \| blob \| history
addons/mrp/test/mrp_procurement.yml	[new file with mode: 0644]	blob
addons/mrp/test/mrp_production_order.yml		diff \| blob \| history
addons/mrp_procurement/mrp_procurement_view.xml		diff \| blob \| history
addons/mrp_procurement/mrp_procurement_workflow.xml		diff \| blob \| history
addons/multi_company/i18n/fr.po		diff \| blob \| history
addons/point_of_sale/__openerp__.py		diff \| blob \| history
addons/point_of_sale/pos.py		diff \| blob \| history
addons/point_of_sale/pos_demo.xml		diff \| blob \| history
addons/point_of_sale/pos_view.xml		diff \| blob \| history
addons/point_of_sale/posrule_data.xml		diff \| blob \| history
addons/point_of_sale/test/pos_test.yml	[new file with mode: 0644]	blob
addons/point_of_sale/wizard/pos_get_sale.py		diff \| blob \| history
addons/point_of_sale/wizard/pos_payment.py		diff \| blob \| history
addons/point_of_sale/wizard/pos_return.py		diff \| blob \| history
addons/product/product_data.xml		diff \| blob \| history
addons/product/product_view.xml		diff \| blob \| history
addons/project/project_view.xml		diff \| blob \| history
addons/project_mrp/__openerp__.py		diff \| blob \| history
addons/project_mrp/project_mrp_workflow.xml		diff \| blob \| history
addons/purchase/__openerp__.py		diff \| blob \| history
addons/purchase/purchase.py		diff \| blob \| history
addons/purchase/purchase_view.xml		diff \| blob \| history
addons/purchase/test/purchase_from_manual.yml	[new file with mode: 0644]	blob
addons/purchase/test/purchase_from_order.yml	[new file with mode: 0644]	blob
addons/purchase/test/purchase_from_picking.yml	[new file with mode: 0644]	blob
addons/purchase/wizard/purchase_installer.py		diff \| blob \| history
addons/purchase/wizard/purchase_line_invoice_view.xml		diff \| blob \| history
addons/purchase_requisition/__openerp__.py		diff \| blob \| history
addons/purchase_requisition/purchase_requisition.py		diff \| blob \| history
addons/purchase_requisition/purchase_requisition_view.xml		diff \| blob \| history
addons/purchase_requisition/test/purchase_requisition.yml	[new file with mode: 0644]	blob
addons/purchase_requisition/test/purchase_requisition_exclusive.yml	[new file with mode: 0644]	blob
addons/purchase_requisition/wizard/purchase_requisition_partner.py		diff \| blob \| history
addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml		diff \| blob \| history
addons/sale/__openerp__.py		diff \| blob \| history
addons/sale/sale_view.xml		diff \| blob \| history
addons/sale/test/advance_invoice.yml	[new file with mode: 0644]	blob
addons/sale/test/prepaid_sale_order.yml	[new file with mode: 0644]	blob
addons/sale/test/sale_procurement.yml	[new file with mode: 0644]	blob
addons/sale/test/shipping_manual_sale_order.yml	[new file with mode: 0644]	blob
addons/sale/wizard/__init__.py		diff \| blob \| history
addons/sale/wizard/make_invoice.py	[deleted file]	blob \| history
addons/sale/wizard/sale_line_invoice.py		diff \| blob \| history
addons/sale/wizard/sale_line_invoice.xml		diff \| blob \| history
addons/sale/wizard/sale_make_invoice.py	[new file with mode: 0644]	blob
addons/sale/wizard/sale_make_invoice.xml	[new file with mode: 0644]	blob
addons/sale/wizard/sale_make_invoice_advance.py		diff \| blob \| history
addons/sale_crm/sale_crm_view.xml		diff \| blob \| history
addons/sale_journal/picking_journal_view.xml		diff \| blob \| history
addons/sale_journal/picking_journal_view_report.xml		diff \| blob \| history
addons/sale_journal/sale_journal_view.xml		diff \| blob \| history
addons/stock/__openerp__.py		diff \| blob \| history
addons/stock/i18n/fr.po		diff \| blob \| history
addons/stock/product_view.xml		diff \| blob \| history
addons/stock/report/report_stock_move.py		diff \| blob \| history
addons/stock/report/report_stock_move_view.xml		diff \| blob \| history
addons/stock/report/report_stock_view.xml		diff \| blob \| history
addons/stock/stock.py		diff \| blob \| history
addons/stock/stock_view.xml		diff \| blob \| history
addons/stock/test/stock_test.yml	[new file with mode: 0644]	blob
addons/stock/wizard/__init__.py		diff \| blob \| history
addons/stock/wizard/stock_change_standard_price_view.xml		diff \| blob \| history
addons/stock/wizard/stock_partial_move.py		diff \| blob \| history
addons/stock/wizard/stock_replacement.py	[new file with mode: 0644]	blob
addons/stock/wizard/stock_replacement_view.xml	[new file with mode: 0644]	blob
addons/stock/wizard/stock_ups.py	[new file with mode: 0644]	blob
addons/stock/wizard/stock_ups_view.xml	[new file with mode: 0644]	blob
addons/stock/wizard/wizard_replacement.py	[deleted file]	blob \| history
addons/stock/wizard/wizard_ups.py	[deleted file]	blob \| history
addons/stock_location/__openerp__.py		diff \| blob \| history
addons/stock_location/test/stock_location.yml	[new file with mode: 0644]	blob
addons/stock_planning/stock_planning.py		diff \| blob \| history
addons/stock_planning/stock_planning_view.xml		diff \| blob \| history

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

RSS Atom