odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] 

bzr revid: uco@tinyerp.com-20100819131656-05g7tso6gfelxs2h
This commit is contained in:
uco (Open ERP) 2010-08-19 18:46:56 +05:30
parent 31d249a9ab 773a00e724
commit 408d9e326b
9 changed files with 56 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/account/configurable_account_chart.xml
View File

@ -284,6 +284,14 @@
<field name="user_type" ref="conf_account_type_expense"/>
</record>
<record id="conf_a_salary_expense" model="account.account.template">
<field name="code">221</field>
<field name="name">Salary Expenses</field>
<field ref="conf_ovr" name="parent_id"/>
<field name="type">other</field>
<field name="user_type" ref="conf_account_type_expense"/>
</record>
<!-- Taxes -->
<!-- TAX Code Definitions -->

8
addons/account/demo/account_minimal.xml
View File

@ -300,6 +300,14 @@
<field name="parent_id" ref="ovr"/>
</record>
<record id="a_salary_expense" model="account.account">
<field name="code">X2112</field>
<field name="name">Salary Expenses - (test)</field>
<field ref="ovr" name="parent_id"/>
<field name="type">other</field>
<field name="user_type" ref="account_type_expense"/>
</record>
<!-- Properties -->
<record forcecreate="True" id="property_account_receivable" model="ir.property">
<field name="name">property_account_receivable</field>

1
addons/account/project/project_view.xml
View File

@ -60,6 +60,7 @@
<field name="credit"/>
<field name="balance"/>
<field name="company_currency_id"/>
<field name="date" invisible="1"/>
</tree>
</field>
</record>

10
addons/crm/crm_opportunity_menu.xml
View File

@ -30,6 +30,16 @@
<field name="context">{'search_default_user_id':uid,'search_default_current':1, 'default_type': 'opportunity'}</field>
<field name="view_id" ref="crm_case_tree_view_oppor"/>
<field name="search_view_id" ref="crm.view_crm_case_opportunities_filter"/>
<field name="help">Opportunities allows you to track your best deals pipeline: history of
the communication, expected revenues, stage of each opportunity,
excepted closings, etc. Opportunities are usually connected with the
email gateway: new emails may create opportunities and each opportunity
automatically gets the history of the conversation with the customer.
Your teams will be able to plan meeting and phonecalls from
opportunities, to convert opportunities into quotations, to manage
documents related to the opportunity, to track all activities related to
this customer, etc.</field>
</record>
<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_oppor11">

1
addons/document/document_view.xml
View File

@ -335,6 +335,7 @@
<field name="name">Document</field>
<field name="view_type">form</field>
<field name="search_view_id" ref="view_attach_filter"/>
<field name="help">Documents give your access to all attached documents; it's a repository of all attached documents (mails, documents attached to a project, etc.)</field>
</record>
<menuitem name="Documents" id="menu_document_doc" parent="knowledge.menu_document" sequence="0"/>
<menuitem

12
addons/l10n_chart_uk_minimal/l10n_uk_chart.xml
View File

@ -232,13 +232,21 @@
</record>
<record model="account.account.template" id="income_fx_expense">
<field name="name">Foreign Exchange Loss - (test)</field>
<field name="code">X2111</field>
<field name="name">Foreign Exchange Loss</field>
<field name="code">2111</field>
<field name="type">other</field>
<field name="user_type" ref="account_type_expense"/>
<field name="reconcile" eval="False"/>
<field name="parent_id" ref="ovr"/>
</record>
<record id="a_salary_expense" model="account.account.template">
<field name="code">2112</field>
<field name="name">Salary Expenses</field>
<field ref="ovr" name="parent_id"/>
<field name="type">other</field>
<field name="user_type" ref="account_type_expense"/>
</record>
</data>
</openerp>

10
addons/l10n_in/l10n_in_chart.xml
View File

@ -446,6 +446,16 @@
<field name="parent_id" ref="IA_AC11"/>
</record>
<record model="account.account.template" id="IA_AC115">
<field name="name">Salary Expenses</field>
<field name="code">IA_AC115</field>
<field name="type">other</field>
<field name="user_type" ref="account_type_expense1"/>
<field name="reconcile" eval="False"/>
<field name="parent_id" ref="IA_AC11"/>
</record>
<record model="account.account.template" id="IA_AC12">

2
addons/product/product_view.xml
View File

@ -194,6 +194,7 @@
<field name="view_type">form</field>
<field name="view_id" ref="product_product_tree_view"/>
<field name="search_view_id" ref="product_search_form_view"/>
<field name="help">In OpenERP, a product is something you can buy and sell. It can be a raw material, a stockable product, a consumable or a service. The product form contains a detailed information on the products like procurement logistic, sales price, product category, suppliers, etc.</field>
</record>
<menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0" groups="base.group_system,group_product_manager"/>
@ -253,6 +254,7 @@
<field name="domain">[('parent_id','=',False)]</field>
<field name="view_type">tree</field>
<field name="view_id" ref="product_category_tree_view"/>
<field name="help">Products category opens a tree structure view of your products by category.</field>
</record>
<menuitem
action="product_category_action"

6
addons/sale/sale_view.xml
View File

@ -288,6 +288,12 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="search_view_id" ref="view_sales_order_filter"/>
<field name="help">The sale order manages the invoicing, the product fullfilment and the
delivery processes. OpenERP can handle products, services and
consumables so that a sale order can trigger tasks, manufacturing
orders, purchases, etc. It support several invoicing methods according
to your configuration: from the sale order, from the pickings, etc.
</field>
</record>
<menuitem action="action_order_form" id="menu_sale_order" parent="base.menu_sales" sequence="3"/>