Fabien Pinckaers
parent
b4ae45eb70
commit
7f1d5b9bfd
|
|
@ -811,7 +811,6 @@
|
|||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Account Entry">
|
||||
<separator colspan="4" string="General Information"/>
|
||||
<group colspan="4" col="6">
|
||||
<field name="name" select="1" readonly="True"/>
|
||||
<field name="period_id" select="2"/>
|
||||
|
|
@ -821,7 +820,6 @@
|
|||
<field name="type" select="1" groups="base.group_extended"/>
|
||||
</group>
|
||||
|
||||
<separator colspan="4" string="Entry Lines"/>
|
||||
<field colspan="4" name="line_id" nolabel="1" widget="one2many_list" default_get="{'lines':line_id ,'journal':journal_id }">
|
||||
<form string="Account Entry Line">
|
||||
<separator colspan="4" string="General Information"/>
|
||||
|
|
@ -860,6 +858,7 @@
|
|||
</tree>
|
||||
</field>
|
||||
|
||||
<separator colspan="4" string="State"/>
|
||||
<field name="state" select="1"/>
|
||||
<group col="2" colspan="2">
|
||||
<button name="button_validate" states="draft" string="Validate" type="object"/>
|
||||
|
|
|
|||
|
|
@ -36,16 +36,10 @@
|
|||
<field name="website"/>
|
||||
<field name="lang_id"/>
|
||||
<field name="active"/>
|
||||
<<<<<<< TREE
|
||||
<separator string="Functions" colspan="4"/>
|
||||
<field name="job_ids" colspan="4" nolabel="1" mode="tree, form">
|
||||
<form string="Functions">
|
||||
=======
|
||||
<field name="partner_id" invisible="1" select="2"/>
|
||||
<field name="function_id" invisible="1" select="2"/>
|
||||
<field name="job_ids" colspan="4" nolabel="1" mode="tree,form">
|
||||
<form string="Functions and Addresses">
|
||||
>>>>>>> MERGE-SOURCE
|
||||
<field name="function_id"/>
|
||||
<field name="address_id"/>
|
||||
<field name="name"/>
|
||||
|
|
@ -56,11 +50,7 @@
|
|||
<field name="date_stop" />
|
||||
<field name="state" />
|
||||
</form>
|
||||
<<<<<<< TREE
|
||||
<tree string="Functions">
|
||||
=======
|
||||
<tree string="Functions and Addresses">
|
||||
>>>>>>> MERGE-SOURCE
|
||||
<field name="sequence_contact" string="Seq."/>
|
||||
<field name="function_id"/>
|
||||
<field name="name"/>
|
||||
|
|
@ -126,10 +116,7 @@
|
|||
<field name="email"/>
|
||||
</tree>
|
||||
<form string="Contacts">
|
||||
<<<<<<< TREE
|
||||
=======
|
||||
<field name="name"/>
|
||||
>>>>>>> MERGE-SOURCE
|
||||
<field name="sequence_partner"/>
|
||||
<field name="contact_id"/>
|
||||
<field name="function_id"/>
|
||||
|
|
@ -290,17 +277,10 @@
|
|||
<field name="function_id" select="1"/>
|
||||
<field name="email" select="2"/>
|
||||
<field name="phone" select="2"/>
|
||||
<<<<<<< TREE
|
||||
<field name="sequence_contact" select="2"/>
|
||||
<field name="sequence_partner" select="2"/>
|
||||
<field name="date_start" />
|
||||
<field name="date_stop" />
|
||||
=======
|
||||
<field name="sequence_contact" select="2" groups="base.group_user"/>
|
||||
<field name="sequence_partner" select="2" groups="base.group_user"/>
|
||||
<field name="date_start" groups="base.group_user"/>
|
||||
<field name="date_stop" groups="base.group_user"/>
|
||||
>>>>>>> MERGE-SOURCE
|
||||
<field name="state" select="2" />
|
||||
</page>
|
||||
</notebook>
|
||||
|
|
@ -310,31 +290,19 @@
|
|||
|
||||
<!-- Menuitem for res.partner.job -->
|
||||
<record model="ir.actions.act_window" id="action_res_partner_job">
|
||||
<<<<<<< TREE
|
||||
<field name="name">Functions</field>
|
||||
=======
|
||||
<field name="name">Contact's Jobs</field>
|
||||
>>>>>>> MERGE-SOURCE
|
||||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="res_model">res.partner.job</field>
|
||||
<field name="view_type">form</field>
|
||||
</record>
|
||||
<<<<<<< TREE
|
||||
<menuitem name="Partners/Functions" action="action_res_partner_job" id="menu_action_res_partner_job"/>
|
||||
=======
|
||||
<menuitem
|
||||
name="Partners/Contact's Jobs"
|
||||
action="action_res_partner_job"
|
||||
id="menu_action_res_partner_job"
|
||||
groups="base.group_extended"/>
|
||||
|
||||
>>>>>>> MERGE-SOURCE
|
||||
<!-- Act window defining a shorcut on partners to open all his contacts -->
|
||||
<<<<<<< TREE
|
||||
<act_window name="Open all Partner's Function"
|
||||
=======
|
||||
<act_window name="Partner Contacts"
|
||||
>>>>>>> MERGE-SOURCE
|
||||
domain="[('name', '=', active_id)]"
|
||||
res_model="res.partner.job"
|
||||
src_model="res.partner"
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@
|
|||
-->
|
||||
|
||||
<record id="process_process_contractworkflow0" model="process.process">
|
||||
<<<<<<< TREE
|
||||
<field eval=""""Contracts flow for services companies."""" name="note"/>
|
||||
<field eval="1" name="active"/>
|
||||
<field eval=""""Contract Workflow"""" name="name"/>
|
||||
|
|
@ -18,7 +17,6 @@
|
|||
-->
|
||||
|
||||
<record id="process_node_leads0" model="process.node">
|
||||
<field name="menu_id" ref="crm_configuration.menu_crm_case_categ0_act_leads_all"/>
|
||||
<field name="model_id" ref="crm.model_crm_case"/>
|
||||
<field eval=""""subflow"""" name="kind"/>
|
||||
<field eval=""""Leads"""" name="name"/>
|
||||
|
|
@ -29,7 +27,6 @@
|
|||
</record>
|
||||
|
||||
<record id="process_node_partner0" model="process.node">
|
||||
<field name="menu_id" ref="base.menu_partner_form"/>
|
||||
<field name="model_id" ref="base.model_res_partner"/>
|
||||
<field eval=""""state"""" name="kind"/>
|
||||
<field eval=""""Partner"""" name="name"/>
|
||||
|
|
@ -39,7 +36,6 @@
|
|||
</record>
|
||||
|
||||
<record id="process_node_opportunities0" model="process.node">
|
||||
<field name="menu_id" ref="crm_configuration.menu_crm_case_categ0_act_oppor11"/>
|
||||
<field name="model_id" ref="crm.model_crm_case"/>
|
||||
<field eval=""""subflow"""" name="kind"/>
|
||||
<field eval=""""Opportunities"""" name="name"/>
|
||||
|
|
@ -50,7 +46,6 @@
|
|||
</record>
|
||||
|
||||
<record id="process_node_meeting0" model="process.node">
|
||||
<field name="menu_id" ref="crm_configuration.menu_crm_case_category_act_meetings"/>
|
||||
<field name="model_id" ref="crm.model_crm_case"/>
|
||||
<field eval=""""state"""" name="kind"/>
|
||||
<field eval=""""Meeting"""" name="name"/>
|
||||
|
|
@ -61,8 +56,6 @@
|
|||
</record>
|
||||
|
||||
<record id="process_node_contractanalytic0" model="process.node">
|
||||
<field name="menu_id" ref="account.account_analytic_def_account"/>
|
||||
<field name="model_id" ref="account.model_account_analytic_account"/>
|
||||
<field eval=""""subflow"""" name="kind"/>
|
||||
<field eval=""""Analytic account"""" name="name"/>
|
||||
<field eval=""""Reflect the contract made with customer"""" name="note"/>
|
||||
|
|
@ -71,8 +64,6 @@
|
|||
</record>
|
||||
|
||||
<record id="process_node_contractpricelist0" model="process.node">
|
||||
<field name="menu_id" ref="product.menu_product_pricelist_action2"/>
|
||||
<field name="model_id" ref="product.model_product_pricelist"/>
|
||||
<field eval=""""subflow"""" name="kind"/>
|
||||
<field eval=""""Contract Pricelist"""" name="name"/>
|
||||
<field eval=""""Contract Volume (pricelist)"""" name="note"/>
|
||||
|
|
@ -128,102 +119,6 @@
|
|||
<field model="process.node" name="target_node_id" ref="process_node_contractanalytic0"/>
|
||||
<field model="process.node" name="source_node_id" ref="process_node_opportunities0"/>
|
||||
</record>
|
||||
=======
|
||||
<field eval=""""Contracts flow for services companies."""" name="note"/>
|
||||
<field eval="1" name="active"/>
|
||||
<field eval=""""Contract Workflow"""" name="name"/>
|
||||
</record>
|
||||
|
||||
<!--
|
||||
Process Node
|
||||
-->
|
||||
|
||||
<record id="process_node_leads0" model="process.node">
|
||||
<field name="model_id" ref="crm.model_crm_case"/>
|
||||
<field eval=""""subflow"""" name="kind"/>
|
||||
<field eval=""""Leads"""" name="name"/>
|
||||
<field eval=""""Premier Contact Leads"""" name="note"/>
|
||||
<field name="process_id" ref="process_process_contractworkflow0"/>
|
||||
<field eval=""""object.state in ('draft', 'open', 'pending', 'done', 'cancel')"""" name="model_states"/>
|
||||
<field eval="1" name="flow_start"/>
|
||||
</record>
|
||||
|
||||
<record id="process_node_opportunities0" model="process.node">
|
||||
<field name="model_id" ref="crm.model_crm_case"/>
|
||||
<field eval=""""subflow"""" name="kind"/>
|
||||
<field eval=""""Opportunities"""" name="name"/>
|
||||
<field eval=""""Business Opportunities"""" name="note"/>
|
||||
<field name="process_id" ref="process_process_contractworkflow0"/>
|
||||
<field eval=""""object.state in ('draft', 'open', 'pending', 'done', 'cancel')"""" name="model_states"/>
|
||||
<field eval="0" name="flow_start"/>
|
||||
</record>
|
||||
|
||||
<record id="process_node_accord0" model="process.node">
|
||||
<field name="model_id" ref="crm.model_crm_case"/>
|
||||
<field eval=""""state"""" name="kind"/>
|
||||
<field eval=""""Accord"""" name="name"/>
|
||||
<field eval=""""Accord Client Contract"""" name="note"/>
|
||||
<field name="process_id" ref="process_process_contractworkflow0"/>
|
||||
<field eval=""""object.state=='done'"""" name="model_states"/>
|
||||
<field eval="0" name="flow_start"/>
|
||||
</record>
|
||||
|
||||
<record id="process_node_contractanalytic0" model="process.node">
|
||||
<field eval=""""subflow"""" name="kind"/>
|
||||
<field eval=""""Contract Analytic"""" name="name"/>
|
||||
<field eval=""""Analytic Accounts"""" name="note"/>
|
||||
<field name="process_id" ref="process_process_contractworkflow0"/>
|
||||
<field eval="0" name="flow_start"/>
|
||||
</record>
|
||||
|
||||
<record id="process_node_contractpricelist0" model="process.node">
|
||||
<field eval=""""subflow"""" name="kind"/>
|
||||
<field eval=""""Contract Pricelist"""" name="name"/>
|
||||
<field eval=""""Contract Volume (pricelist)"""" name="note"/>
|
||||
<field name="process_id" ref="process_process_contractworkflow0"/>
|
||||
<field eval="0" name="flow_start"/>
|
||||
</record>
|
||||
|
||||
<!--
|
||||
Process Transition
|
||||
-->
|
||||
|
||||
<record id="process_transition_leadopportunity0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Lead Opportunity"""" name="name"/>
|
||||
<field eval=""""Creating business opportunities from leads"""" name="note"/>
|
||||
<field model="process.node" name="target_node_id" ref="process_node_opportunities0"/>
|
||||
<field model="process.node" name="source_node_id" ref="process_node_leads0"/>
|
||||
</record>
|
||||
|
||||
<record id="process_transition_opportunitiesaccord0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Opportunities Accord"""" name="name"/>
|
||||
<field eval=""""When leads are confirmed"""" name="note"/>
|
||||
<field model="process.node" name="target_node_id" ref="process_node_accord0"/>
|
||||
<field model="process.node" name="source_node_id" ref="process_node_opportunities0"/>
|
||||
</record>
|
||||
|
||||
<record id="process_transition_accordanalytic0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Accord Analytic"""" name="name"/>
|
||||
<field eval=""""Goes into the Analytic"""" name="note"/>
|
||||
<field model="process.node" name="target_node_id" ref="process_node_contractanalytic0"/>
|
||||
<field model="process.node" name="source_node_id" ref="process_node_accord0"/>
|
||||
</record>
|
||||
|
||||
<record id="process_transition_accordpricelist0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Accord Pricelist"""" name="name"/>
|
||||
<field eval=""""Goes into the Pricelist"""" name="note"/>
|
||||
<field model="process.node" name="target_node_id" ref="process_node_contractpricelist0"/>
|
||||
<field model="process.node" name="source_node_id" ref="process_node_accord0"/>
|
||||
</record>
|
||||
>>>>>>> MERGE-SOURCE
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
|
|
|
|||
|
|
@ -30,18 +30,6 @@
|
|||
* User Authentification
|
||||
* Document Indexation
|
||||
""",
|
||||
<<<<<<< TREE
|
||||
"depends" : ["base"],
|
||||
"init_xml" : ["document_data.xml"],
|
||||
"update_xml" : [
|
||||
"document_view.xml",
|
||||
"security/document_security.xml",
|
||||
"security/ir.model.access.csv",
|
||||
],
|
||||
"demo_xml" : ["document_demo.xml"],
|
||||
"active": False,
|
||||
"installable": True
|
||||
=======
|
||||
"depends" : ["base","process"],
|
||||
"init_xml" : [
|
||||
"document_data.xml",
|
||||
|
|
@ -56,5 +44,4 @@
|
|||
"demo_xml" : [],
|
||||
"active": False,
|
||||
"installable": True
|
||||
>>>>>>> MERGE-SOURCE
|
||||
}
|
||||
|
|
|
|||
|
|
@ -43,36 +43,19 @@
|
|||
<record id="process_node_quotation0" model="process.node">
|
||||
<field name="menu_id" ref="sale.menu_action_order_tree10"/>
|
||||
<field name="model_id" ref="sale.model_sale_order"/>
|
||||
<<<<<<< TREE
|
||||
<field eval=""""state"""" name="kind"/>
|
||||
<field eval=""""Ok"""" name="name"/>
|
||||
<field eval=""""Quotation (A sale order in draft state)"""" name="note"/>
|
||||
=======
|
||||
<field eval="'state'" name="kind"/>
|
||||
<field eval="'Quotation'" name="name"/>
|
||||
<field eval="'Quotations are sales order in draft state.'" name="note"/>
|
||||
>>>>>>> MERGE-SOURCE
|
||||
<field name="process_id" ref="process_process_salesworkflow0"/>
|
||||
<<<<<<< TREE
|
||||
<field eval=""""object.state=='draft'"""" name="model_states"/>
|
||||
<field eval="0" name="flow_start"/>
|
||||
=======
|
||||
<field name="model_states">object.state=='draft'</field>
|
||||
<field eval="1" name="flow_start"/>
|
||||
>>>>>>> MERGE-SOURCE
|
||||
</record>
|
||||
|
||||
<record id="process_node_saleorder0" model="process.node">
|
||||
<field name="menu_id" ref="sale.menu_action_order_tree9"/>
|
||||
<field name="model_id" ref="sale.model_sale_order"/>
|
||||
<<<<<<< TREE
|
||||
<field eval=""""state"""" name="kind"/>
|
||||
<field eval=""""Ok"""" name="name"/>
|
||||
<field eval=""""Ok"""" name="note"/>
|
||||
=======
|
||||
<field eval="'Sale Order'" name="name"/>
|
||||
<field eval="'Confirmed by the customer.'" name="note"/>
|
||||
>>>>>>> MERGE-SOURCE
|
||||
<field name="process_id" ref="process_process_salesworkflow0"/>
|
||||
<field name="model_states">object.state in ('waiting_date','manual','progress')</field>
|
||||
</record>
|
||||
|
|
@ -91,14 +74,8 @@
|
|||
<record id="process_node_packinglist0" model="process.node">
|
||||
<field name="menu_id" ref="stock.menu_picking_waiting"/>
|
||||
<field name="model_id" ref="stock.model_stock_picking"/>
|
||||
<<<<<<< TREE
|
||||
<field eval=""""state"""" name="kind"/>
|
||||
<field eval=""""Outgoing Products"""" name="name"/>
|
||||
<field eval=""""Packing OUT is created for stockable products."""" name="note"/>
|
||||
=======
|
||||
<field eval="'Packing List'" name="name"/>
|
||||
<field eval="'The worker have to pack the requested products.'" name="note"/>
|
||||
>>>>>>> MERGE-SOURCE
|
||||
<field name="process_id" ref="process_process_salesworkflow0"/>
|
||||
<field name="model_states">object.state in ('assigned', 'confirmed')</field>
|
||||
</record>
|
||||
|
|
@ -106,15 +83,9 @@
|
|||
<record id="process_node_deliveryorder0" model="process.node">
|
||||
<field name="menu_id" ref="stock.menu_picking_waiting_delivery"/>
|
||||
<field name="model_id" ref="stock.model_stock_picking"/>
|
||||
<<<<<<< TREE
|
||||
<field eval=""""state"""" name="kind"/>
|
||||
<field eval=""""Delivery Order"""" name="name"/>
|
||||
<field eval=""""Delivery, from the warehouse to the customer."""" name="note"/>
|
||||
=======
|
||||
<field eval="'state'" name="kind"/>
|
||||
<field eval="'Delivery Order'" name="name"/>
|
||||
<field eval="'The delivery order document, when boxes leaves the warehouse.'" name="note"/>
|
||||
>>>>>>> MERGE-SOURCE
|
||||
<field name="process_id" ref="process_process_salesworkflow0"/>
|
||||
<field name="model_states">object.state in ('done')</field>
|
||||
</record>
|
||||
|
|
@ -122,15 +93,9 @@
|
|||
<record id="process_node_invoice0" model="process.node">
|
||||
<field name="menu_id" ref="account.menu_invoice_draft"/>
|
||||
<field name="model_id" ref="account.model_account_invoice"/>
|
||||
<<<<<<< TREE
|
||||
<field eval=""""subflow"""" name="kind"/>
|
||||
<field eval=""""Draft Invoice"""" name="name"/>
|
||||
<field eval=""""Draft customer invoice, to be reviewed by accountant."""" name="note"/>
|
||||
=======
|
||||
<field eval="'subflow'" name="kind"/>
|
||||
<field eval="'Invoice'" name="name"/>
|
||||
<field eval="'Invoice based on the sale order.'" name="note"/>
|
||||
>>>>>>> MERGE-SOURCE
|
||||
<field name="process_id" ref="process_process_salesworkflow0"/>
|
||||
<field name="subflow_id" ref="account.process_process_invoiceworkflow0"/>
|
||||
</record>
|
||||
|
|
@ -138,15 +103,9 @@
|
|||
<record id="process_node_invoiceafterdelivery0" model="process.node">
|
||||
<field name="menu_id" ref="account.menu_invoice_draft"/>
|
||||
<field name="model_id" ref="account.model_account_invoice"/>
|
||||
<<<<<<< TREE
|
||||
<field eval=""""subflow"""" name="kind"/>
|
||||
<field eval=""""Draft Invoice"""" name="name"/>
|
||||
<field eval=""""Invoice based on packing lists"""" name="note"/>
|
||||
=======
|
||||
<field eval="'subflow'" name="kind"/>
|
||||
<field eval="'Invoice on Packing'" name="name"/>
|
||||
<field eval="'In case you invoice based on packings'" name="note"/>
|
||||
>>>>>>> MERGE-SOURCE
|
||||
<field name="process_id" ref="process_process_salesworkflow0"/>
|
||||
<field name="subflow_id" ref="account.process_process_invoiceworkflow0"/>
|
||||
<field eval="0" name="flow_start"/>
|
||||
|
|
|
|||
Loading…
Reference in New Issue