[Merge]with: lp:~openerp-dev/openobject-addons/trunk-configuration-imp-dbr
bzr revid: dbr@tinyerp.com-20120704083250-hn8o3hssydqknr2a
This commit is contained in:
commit
0a537afe4e
|
@ -25,14 +25,16 @@
|
|||
<button type="object" name="open_company" string="Configure Your Company Data" icon="gtk-execute"/>
|
||||
</group>
|
||||
</group>
|
||||
<group string="External Accesses">
|
||||
<field name="module_share"/>
|
||||
<field name="module_portal"/>
|
||||
</group>
|
||||
<group string="Others">
|
||||
<label for="id" string="Outgoing Mail Servers"/>
|
||||
<button type="action" name="%(base.action_ir_mail_server_list)d"
|
||||
<group>
|
||||
<group string="External Accesses">
|
||||
<field name="module_share"/>
|
||||
<field name="module_portal"/>
|
||||
</group>
|
||||
<group string="Others">
|
||||
<label for="id" string="Outgoing Mail Servers"/>
|
||||
<button type="action" name="%(base.action_ir_mail_server_list)d"
|
||||
string="Configure" icon="gtk-execute"/>
|
||||
</group>
|
||||
</group>
|
||||
</sheet>
|
||||
</form>
|
||||
|
@ -63,9 +65,11 @@
|
|||
<sheet>
|
||||
<field name="module_crm" invisible="1"/>
|
||||
<group name="config_sale"/>
|
||||
<group name="config_fetchmail" string="Emails" attrs="{'invisible': [('module_crm','=',False)]}">
|
||||
<field name="module_plugin_thunderbird"/>
|
||||
<field name="module_plugin_outlook"/>
|
||||
<group name="config_fetchmail_main">
|
||||
<group name="config_fetchmail" string="Emails" attrs="{'invisible': [('module_crm','=',False)]}">
|
||||
<field name="module_plugin_thunderbird"/>
|
||||
<field name="module_plugin_outlook"/>
|
||||
</group>
|
||||
</group>
|
||||
<group name="config_crm"/>
|
||||
</sheet>
|
||||
|
|
|
@ -16,20 +16,21 @@
|
|||
attrs="{'invisible': [('fetchmail_lead','=',False)]}"/>
|
||||
</div>
|
||||
</group>
|
||||
|
||||
<group name="config_crm" position="after">
|
||||
<group name="config_fetchmail_main" version="7.0" position="inside">
|
||||
<group string="Import and Synchronize Data from an Other Application">
|
||||
<field name="module_import_sugarcrm"/>
|
||||
<field name="module_crm_caldav"/>
|
||||
<field name="module_import_google"/>
|
||||
</group>
|
||||
|
||||
<group string="Documents and Wiki">
|
||||
<field name="module_wiki_sale_faq"/>
|
||||
</group>
|
||||
|
||||
<group string="Customer Form">
|
||||
<field name="module_google_map"/>
|
||||
</group>
|
||||
<group name="config_crm" position="inside">
|
||||
<group>
|
||||
<group string="Documents and Wiki">
|
||||
<field name="module_wiki_sale_faq"/>
|
||||
</group>
|
||||
<group string="Customer Form">
|
||||
<field name="module_google_map"/>
|
||||
</group>
|
||||
</group>
|
||||
</group>
|
||||
</field>
|
||||
|
|
|
@ -13,22 +13,26 @@
|
|||
<button string="Cancel" type="object" name="cancel" class="oe_link"/>
|
||||
</header>
|
||||
<sheet>
|
||||
<group string="Manufacturing Order">
|
||||
<field name="module_mrp_operations"/>
|
||||
<field name="module_stock_planning"/>
|
||||
<field name="module_mrp_subproduct"/>
|
||||
<field name="module_mrp_repair"/>
|
||||
<group>
|
||||
<group string="Manufacturing Order">
|
||||
<field name="module_mrp_operations"/>
|
||||
<field name="module_stock_planning"/>
|
||||
<field name="module_mrp_subproduct"/>
|
||||
<field name="module_mrp_repair"/>
|
||||
</group>
|
||||
<group string="Products">
|
||||
<field name="module_product_manufacturer"/>
|
||||
</group>
|
||||
</group>
|
||||
<group string="Logistics">
|
||||
<field name="module_mrp_jit"/>
|
||||
<field name="module_stock_no_autopicking"/>
|
||||
</group>
|
||||
<group string="Bill Of Material">
|
||||
<field name="group_mrp_routings"/>
|
||||
<field name="group_mrp_properties"/>
|
||||
</group>
|
||||
<group string="Products">
|
||||
<field name="module_product_manufacturer"/>
|
||||
<group>
|
||||
<group string="Logistics">
|
||||
<field name="module_mrp_jit"/>
|
||||
<field name="module_stock_no_autopicking"/>
|
||||
</group>
|
||||
<group string="Bill Of Material">
|
||||
<field name="group_mrp_routings"/>
|
||||
<field name="group_mrp_properties"/>
|
||||
</group>
|
||||
</group>
|
||||
</sheet>
|
||||
</form>
|
||||
|
|
|
@ -26,12 +26,14 @@
|
|||
<field name="time_unit" domain="[('category_id.name','=','Working Time')]"/>
|
||||
</group>
|
||||
</group>
|
||||
<group string="Planning">
|
||||
<field name="module_project_long_term"/>
|
||||
</group>
|
||||
<group string="Helpdesk and Support" name="support">
|
||||
<field name="module_project_issue"/>
|
||||
<field name="module_project_issue_sheet"/>
|
||||
<group>
|
||||
<group string="Planning">
|
||||
<field name="module_project_long_term"/>
|
||||
</group>
|
||||
<group string="Helpdesk and Support" name="support">
|
||||
<field name="module_project_issue"/>
|
||||
<field name="module_project_issue_sheet"/>
|
||||
</group>
|
||||
</group>
|
||||
</sheet>
|
||||
</form>
|
||||
|
|
|
@ -14,8 +14,8 @@
|
|||
</header>
|
||||
<sheet>
|
||||
<group string="Invoicing">
|
||||
<field name="default_invoice_method"/>
|
||||
<field name="decimal_precision"/>
|
||||
<field name="default_invoice_method" class="oe_inline"/>
|
||||
<field name="decimal_precision" class="oe_inline"/>
|
||||
</group>
|
||||
<group string="Purchase Order">
|
||||
<group>
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
<field name="type">form</field>
|
||||
<field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
|
||||
<field name="arch" type="xml">
|
||||
<group name="config_sale" position="after">
|
||||
<group name="config_sale" position="inside">
|
||||
<field name="module_project_timesheet" invisible="1"/>
|
||||
<field name="module_project_mrp" invisible="1"/>
|
||||
<group string="Invoicing Policy">
|
||||
|
@ -25,7 +25,7 @@
|
|||
attrs="{'invisible': [('task_work','=',False), ('module_account_analytic_analysis','=',False)],'required': ['|', ('task_work','=',True), ('module_account_analytic_analysis','=',True)]}"/>
|
||||
</group>
|
||||
</group>
|
||||
|
||||
<newline/>
|
||||
<group string="Sale Order">
|
||||
<group>
|
||||
<field name="group_uom"/>
|
||||
|
@ -42,8 +42,9 @@
|
|||
<field name="module_sale_journal"/>
|
||||
</group>
|
||||
</group>
|
||||
|
||||
<group string="Contracts">
|
||||
</group>
|
||||
<group name="config_fetchmail_main" position="after">
|
||||
<group name="group_contacts" string="Contracts">
|
||||
<field name="module_account_analytic_analysis" on_change="onchange_timesheet(module_account_analytic_analysis)"/>
|
||||
<field name="module_analytic_user_function" attrs="{'invisible':[('module_account_analytic_analysis','=',False)]}"/>
|
||||
</group>
|
||||
|
|
|
@ -14,36 +14,32 @@
|
|||
<button string="Cancel" type="object" name="cancel" class="oe_link"/>
|
||||
</header>
|
||||
<sheet>
|
||||
<group string="Traceability">
|
||||
<field name="group_stock_production_lot"/>
|
||||
<field name="group_stock_tracking_lot"/>
|
||||
<field name="module_product_expiry"
|
||||
attrs="{'invisible': [('group_stock_production_lot','=',False)]}"/>
|
||||
<group>
|
||||
<group string="Traceability">
|
||||
<field name="group_stock_production_lot"/>
|
||||
<field name="group_stock_tracking_lot"/>
|
||||
<field name="module_product_expiry"
|
||||
attrs="{'invisible': [('group_stock_production_lot','=',False)]}"/>
|
||||
</group>
|
||||
<group string="Partners">
|
||||
<field name="module_claim_from_delivery"/>
|
||||
</group>
|
||||
</group>
|
||||
<group string="Logistics">
|
||||
<group>
|
||||
<group>
|
||||
<group string="Logistics">
|
||||
<field name="group_stock_multiple_locations"/>
|
||||
<field name="module_stock_invoice_directly"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="module_stock_location"/>
|
||||
<field name="decimal_precision"/>
|
||||
<field name="decimal_precision" class="oe_inline"/>
|
||||
</group>
|
||||
</group>
|
||||
<group string="Products">
|
||||
<group>
|
||||
<group string="Products">
|
||||
<field name="group_stock_packaging"/>
|
||||
<field name="group_uom"/>
|
||||
<field name="group_uos"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="group_stock_inventory_valuation"/>
|
||||
<field name="group_stock_inventory_valuation" class="oe_inline"/>
|
||||
<field name="group_product_variant"/>
|
||||
</group>
|
||||
</group>
|
||||
<group string="Partners">
|
||||
<field name="module_claim_from_delivery"/>
|
||||
</group>
|
||||
</sheet>
|
||||
</form>
|
||||
</field>
|
||||
|
|
Loading…
Reference in New Issue