pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE]

Browse Source 
bzr revid: hmo@tinyerp.com-20100205072543-8vq66m57zqffa7cq
This commit is contained in:
Harry (Open ERP)
2010-02-05 12:55:43 +05:30
parent 3392c4e4a1 881d9bfcb4
commit 4be5071c70
14 changed files with 34 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/base_contact/__terp__.py
+1 -1
View File
@@ -40,7 +40,7 @@
""",
'author': 'Tiny',
'website': 'http://www.openerp.com',
'depends': ['base','process','sale'],
'depends': ['base','process'],
'init_xml': [],
'update_xml': [
'security/ir.model.access.csv',
addons/base_contact/base_contact_view.xml
+4 -2
View File
@@ -419,8 +419,6 @@
res_model="res.partner.job"
src_model="res.partner"
/>
<menuitem name="Contacts" id="menu_procurement_mgt_partner_contact_form" action="action_partner_contact_form"
parent="purchase.menu_procurement_management_supplier"/>
<!-- Act window defining a shorcut on partner address to open all his jobs -->
<act_window
@@ -430,5 +428,9 @@
src_model="res.partner.address"
/>
<menuitem icon="terp-purchase" id="base.menu_purchase_root" name="Procurement Management"/>
<menuitem id="base.menu_procurement_management_supplier" name="Suppliers"
parent="base.menu_purchase_root" sequence="3"/>
<menuitem name="Contacts" id="menu_partner_contact_supplier_form" action="action_partner_contact_form" parent = "base.menu_procurement_management_supplier" sequence="2"/>
</data>
</openerp>
addons/document/document_view.xml
+4 -4
View File
@@ -3,9 +3,9 @@
<!--<menuitem name="Document Management" icon="terp-stock" id="menu_document"/>
<menuitem name="Document Configuration" id="menu_document_configuration" parent="menu_document"/>-->
<menuitem name="Knowledge Management" icon="terp-stock" id="menu_document"/>
<menuitem name="Configuration" id="menu_document_configuration" parent="menu_document" sequence="50"/>
<menuitem name="Document Management" id="menu_document_management_configuration" parent="menu_document_configuration" />
<menuitem name="Knowledge Management" icon="terp-stock" id="base.menu_document"/>
<menuitem name="Configuration" id="base.menu_document_configuration" parent="base.menu_document" sequence="50"/>
<menuitem name="Document Management" id="menu_document_management_configuration" parent="base.menu_document_configuration" sequence="1"/>
<record model="ir.ui.view" id="view_document_storage_form">
<field name="name">document.storage</field>
@@ -249,7 +249,7 @@
<field name="res_model">ir.attachment</field>
<field name="view_type">form</field>
</record>
<menuitem name="Documents" id="menu_document_doc" parent="menu_document" sequence="5"/>
<menuitem name="Documents" id="menu_document_doc" parent="base.menu_document" sequence="5"/>
<menuitem
name="Search a File"
action="action_document_file_form"
addons/document/security/document_security.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<field name="name">Document / Manager</field>
</record>
<record id="menu_document_configuration" model="ir.ui.menu">
<record id="base.menu_document_configuration" model="ir.ui.menu">
<field name="groups_id" eval="[(6,0,[ref('group_document_manager')])]"/>
</record>
addons/hr_holidays/__terp__.py
+1 -1
View File
@@ -47,7 +47,7 @@
""",
'author': 'Tiny & Axelor',
'website': 'http://www.openerp.com',
'depends': ['hr', 'crm', 'process','hr_attendance'],
'depends': ['hr', 'crm', 'process'],
'init_xml': [],
'update_xml': [
'security/ir.model.access.csv',
addons/hr_timesheet_sheet/__terp__.py
+1 -1
View File
@@ -45,7 +45,7 @@ The validation can be configured in te company:
""",
'author': 'Tiny',
'website': 'http://www.openerp.com',
'depends': ['hr_timesheet', 'hr_timesheet_invoice', 'process','hr_attendance'],
'depends': ['hr_timesheet', 'hr_timesheet_invoice', 'process'],
'init_xml': [],
'update_xml': [
'security/ir.model.access.csv',
addons/project_timesheet/__terp__.py
+1 -1
View File
@@ -31,7 +31,7 @@
""",
'author': 'Tiny',
'website': 'http://www.openerp.com',
'depends': ['base', 'project', 'hr_timesheet_sheet','hr_timesheet'],
'depends': ['base', 'project', 'hr_timesheet_sheet'],
'init_xml': [],
'update_xml': ["process/project_timesheet_process.xml"],
'demo_xml': [],
addons/purchase/purchase_view.xml
+9 -9
View File
@@ -1,24 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<!--<menuitem icon="terp-purchase" id="menu_purchase_root" name="Purchase Management"
<!--<menuitem icon="terp-purchase" id="base.menu_purchase_root" name="Purchase Management"
groups="group_purchase_user"/>-->
<menuitem icon="terp-purchase" id="menu_purchase_root" name="Procurement Management"
<menuitem icon="terp-purchase" id="base.menu_purchase_root" name="Procurement Management"
groups="group_purchase_user"/>
<menuitem id="menu_procurement_management" name="Procurement Management"
parent="menu_purchase_root" sequence="1"/>
parent="base.menu_purchase_root" sequence="1"/>
<!--supplier menu-->
<menuitem id="menu_procurement_management_supplier" name="Suppliers"
parent="menu_purchase_root" sequence="3"/>
<menuitem id="base.menu_procurement_management_supplier" name="Suppliers"
parent="base.menu_purchase_root" sequence="3"/>
<menuitem id="menu_procurement_management_supplier_name" name="Suppliers"
parent="menu_procurement_management_supplier" action="base.action_partner_supplier_form" />
parent="base.menu_procurement_management_supplier" action="base.action_partner_supplier_form" sequence="1"/>
<!--Inventory control-->
<menuitem id="menu_procurement_management_nventory" name="Inventory Control"
parent="menu_purchase_root" sequence="4"/>
parent="base.menu_purchase_root" sequence="4"/>
<menuitem action="stock.action_picking_tree4" id="menu_action_picking_tree4" parent="menu_procurement_management_nventory"
name="Incoming shipments" sequence="9"/>
<menuitem action="stock.action_reception_picking_move" id="menu_action_reception_picking_move"
@@ -26,13 +26,13 @@
<!--Invoice control-->
<menuitem id="menu_procurement_management_invoice" name="Invoice Control"
parent="menu_purchase_root" sequence="6"/>
parent="base.menu_purchase_root" sequence="6"/>
<menuitem name="Pending Invoices" id="menu_procurement_management_panding_invoice" action="account.action_invoice_tree_panding_invoice"
parent="menu_procurement_management_invoice"/>
<!--product menu-->
<menuitem id="menu_procurement_management_product" name="Product"
parent="menu_purchase_root" sequence="8"/>
parent="base.menu_purchase_root" sequence="8"/>
<menuitem name="Products" id="menu_procurement_partner_contact_form" action="product.product_normal_action_puchased"
parent="menu_procurement_management_product"/>
addons/purchase_manual/purchase_manual_view.xml
+1 -1
View File
@@ -77,7 +77,7 @@
<field name="view_id" ref="purchase_order_line_form"/>
<field name="act_window_id" ref="purchase_line_form_action"/>
</record>
<!-- <menuitem action="purchase_line_form_action" id="menu_purchase_line_form_action" parent="purchase.menu_purchase_root"/>-->
<!-- <menuitem action="purchase_line_form_action" id="menu_purchase_line_form_action" parent="base.menu_purchase_root"/>-->
<record id="purchase_line_form_action2" model="ir.actions.act_window">
<field name="name">Uninvoiced Purchase Order Lines</field>
addons/purchase_tender/purchase_tender_view.xml
+1 -1
View File
@@ -68,7 +68,7 @@
<field name="res_model">purchase.tender</field>
<field name="view_type">form</field>
</record>
<!-- <menuitem name="Purchase Tenders" id="menu_purchase_tender" parent="purchase.menu_purchase_root"/>-->
<!-- <menuitem name="Purchase Tenders" id="menu_purchase_tender" parent="base.menu_purchase_root"/>-->
<!-- <menuitem id="menu_purchase_Tender1" parent="menu_purchase_tender" action="action_purchase_tender"/>-->
<menuitem id="menu_purchase_Tender_pro_mgt" parent="purchase.menu_procurement_management" action="action_purchase_tender"/>
<record model="ir.actions.act_window" id="action_purchase_tender_draft">
addons/report_purchase/report_purchase_view.xml
+1 -1
View File
@@ -79,7 +79,7 @@
<field name="search_view_id" ref="view_order_product_search"/>
</record>
<menuitem id="next_id_73" name="Reporting" parent="purchase.menu_purchase_root"/>
<menuitem id="next_id_73" name="Reporting" parent="base.menu_purchase_root"/>
<menuitem action="action_order_product_tree_all" id="menu_report_order_product_all"
name="PO by Products" parent="next_id_73"/>
addons/report_timesheet/__terp__.py
+1 -1
View File
@@ -28,7 +28,7 @@
All Month, Timesheet By User, Timesheet Of Month, Timesheet By Account""",
'author': 'Tiny',
'website': 'http://www.openerp.com',
'depends': ['hr_timesheet', 'hr_timesheet_invoice','hr_attendance'],
'depends': ['hr_timesheet', 'hr_timesheet_invoice'],
'init_xml': [],
'update_xml': ['security/ir.model.access.csv', 'report_timesheet_view.xml'],
'demo_xml': [],
addons/wiki/__terp__.py
+1 -1
View File
@@ -30,7 +30,7 @@
""",
'author': 'Tiny & Axelor',
'website': 'http://openerp.com',
'depends': ['base','document'],
'depends': ['base'],
'init_xml': [],
'update_xml': [
'wiki_view.xml',
addons/wiki/wiki_view.xml
+7 -8
View File
@@ -1,12 +1,11 @@
<?xml version="1.0"?>
<openerp>
<data>
<!-- <menuitem name="Document Management" icon="terp-stock" id="menu_document2"/>-->
<menuitem name="Knowledge Management" icon="terp-stock" id="menu_document2"/>
<!--<menuitem name="Wiki Configuration" id="menu_document_configuration" parent="menu_document2"/>-->
<menuitem name="Wiki" id="menu_document_configuration" parent="document.menu_document_configuration"/>
<!--<menuitem parent="menu_document2" name="Wiki" id="menu_document"/>-->
<menuitem parent="menu_document2" name="Collaborative Content" id="menu_document"/>
<menuitem name="Knowledge Management" icon="terp-stock" id="base.menu_document"/>
<menuitem name="Configuration" id="base.menu_document_configuration" parent="base.menu_document" sequence="50"/>
<menuitem name="Wiki" id="menu_wiki_configuration" parent="base.menu_document_configuration" sequence="2"/>
<menuitem id="base.menu_document2" name="Collaborative Content" parent="base.menu_document"/>
<wizard
id="wizard_group_menu_create"
string="Create Menu"
@@ -70,7 +69,7 @@
id="menu_action_wiki_groups"
action="action_wiki_groups"/>-->
<menuitem name="Wiki Groups"
parent="menu_document_configuration"
parent="menu_wiki_configuration"
id="menu_action_wiki_groups"
action="action_wiki_groups"/>
@@ -169,7 +168,7 @@
<field name="context">{'section':'1'}</field>
<field name="search_view_id" ref="view_wiki_filter"/>
</record>
<menuitem parent="menu_document" id="menu_action_wiki_wiki" name="Wiki Pages" action="action_wiki"/>
<menuitem parent="base.menu_document2" id="menu_action_wiki_wiki" name="Wiki Pages" action="action_wiki"/>
<!-- Pages Waiting Review -->
<record model="ir.actions.act_window" id="action_wiki_review">