[MERGE]: Merge with lp:openobject-addons
bzr revid: rpa@tinyerp.com-20101006041326-w4rs602jjhszw37s
This commit is contained in:
rpa (Open ERP)
commit
a2c3dfb4d3
|
|
@ -120,7 +120,6 @@ module named account_voucher.
|
|||
'project/analytic_account_demo.xml',
|
||||
'demo/account_minimal.xml',
|
||||
'account_unit_test.xml',
|
||||
'board_account_demo.xml',
|
||||
],
|
||||
'test': [
|
||||
'test/account_customer_invoice.yml',
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<openerp>
|
||||
<data noupdate="1">
|
||||
<!--
|
||||
Administrator shortcut
|
||||
Demo user startup menu
|
||||
-->
|
||||
<record id="base.user_root" model="res.users">
|
||||
<field name="action_id" ref="open_board_account"/>
|
||||
</record>
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
|
|
@ -122,7 +122,6 @@
|
|||
-->
|
||||
|
||||
<record id="process_transition_confirmstatementfromdraft0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Confirm statement"""" name="name"/>
|
||||
<field eval=""""The accountant confirms the statement."""" name="note"/>
|
||||
|
|
@ -131,7 +130,6 @@
|
|||
</record>
|
||||
|
||||
<record id="process_transition_analyticinvoice0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""From analytic accounts"""" name="name"/>
|
||||
<field eval=""""Analytic costs (timesheets, some purchased products, ...) come from analytic accounts. These generate draft invoices."""" name="note"/>
|
||||
|
|
@ -140,7 +138,6 @@
|
|||
</record>
|
||||
|
||||
<record id="process_transition_customerinvoice0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Validation"""" name="name"/>
|
||||
<field eval=""""Draft invoices are checked, validated and printed."""" name="note"/>
|
||||
|
|
@ -150,7 +147,6 @@
|
|||
</record>
|
||||
|
||||
<record id="process_transition_validentries0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Validation"""" name="name"/>
|
||||
<field eval=""""Accountant validates the accounting entries coming from the invoice."""" name="note"/>
|
||||
|
|
@ -159,7 +155,6 @@
|
|||
</record>
|
||||
|
||||
<record id="process_transition_entriesreconcile0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Accounting entries"""" name="name"/>
|
||||
<field eval=""""Accounting entries are the first input of the reconciliation."""" name="note"/>
|
||||
|
|
@ -168,7 +163,6 @@
|
|||
</record>
|
||||
|
||||
<record id="process_transition_statemententries0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Validation"""" name="name"/>
|
||||
<field eval=""""Manual or automatic creation of payment entries according to the statements"""" name="note"/>
|
||||
|
|
@ -177,7 +171,6 @@
|
|||
</record>
|
||||
|
||||
<record id="process_transition_paymentreconcile0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Payment entries"""" name="name"/>
|
||||
<field eval=""""Payment entries are the second input of the reconciliation."""" name="note"/>
|
||||
|
|
@ -186,7 +179,6 @@
|
|||
</record>
|
||||
|
||||
<record id="process_transition_reconcilepaid0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Payment"""" name="name"/>
|
||||
<field eval=""""As soon as the reconciliation is done, the invoice can be paid."""" name="note"/>
|
||||
|
|
|
|||
|
|
@ -65,7 +65,6 @@
|
|||
-->
|
||||
|
||||
<record id="process_transition_filestatement0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Automatic import of the bank statement"""" name="name"/>
|
||||
<field eval=""""Import of the statement in the system from an electronic file"""" name="note"/>
|
||||
|
|
@ -74,7 +73,6 @@
|
|||
</record>
|
||||
|
||||
<record id="process_transition_invoicemanually0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Manual entry"""" name="name"/>
|
||||
<field eval=""""A statement with manual entries becomes a draft statement."""" name="note"/>
|
||||
|
|
@ -84,7 +82,6 @@
|
|||
</record>
|
||||
|
||||
<record id="process_transition_invoiceimport0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Import from invoice or payment"""" name="name"/>
|
||||
<field eval=""""Import of the statement in the system from a supplier or customer invoice"""" name="note"/>
|
||||
|
|
|
|||
|
|
@ -1,21 +1,21 @@
|
|||
<?xml version="1.0" ?>
|
||||
<openerp>
|
||||
<data>
|
||||
|
||||
<!--
|
||||
Process
|
||||
|
||||
<!--
|
||||
Process
|
||||
-->
|
||||
|
||||
|
||||
<record id="process_process_supplierinvoiceprocess0" model="process.process">
|
||||
<field eval="1" name="active"/>
|
||||
<field name="model_id" ref="account.model_account_invoice"/>
|
||||
<field eval=""""Supplier Invoice"""" name="name"/>
|
||||
</record>
|
||||
|
||||
<!--
|
||||
|
||||
<!--
|
||||
Process Node
|
||||
-->
|
||||
|
||||
|
||||
<record id="process_node_analyticcost0" model="process.node">
|
||||
<field name="menu_id" ref="account.account_analytic_def_account"/>
|
||||
<field name="model_id" ref="analytic.model_account_analytic_account"/>
|
||||
|
|
@ -26,7 +26,7 @@
|
|||
<field eval=""""object.state in ('draft', 'open', 'pending', 'close')"""" name="model_states"/>
|
||||
<field eval="1" name="flow_start"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_node_supplierdraftinvoices0" model="process.node">
|
||||
<field name="menu_id" ref="account.menu_action_invoice_tree2"/>
|
||||
<field name="model_id" ref="account.model_account_invoice"/>
|
||||
|
|
@ -37,7 +37,7 @@
|
|||
<field eval=""""object.state=='draft'"""" name="model_states"/>
|
||||
<field eval="0" name="flow_start"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_node_supplierinvoiceinvoice0" model="process.node">
|
||||
<field name="menu_id" ref="account.menu_finance_payables"/>
|
||||
<field name="model_id" ref="account.model_account_invoice"/>
|
||||
|
|
@ -48,7 +48,7 @@
|
|||
<field eval=""""object.state=='draft'"""" name="model_states"/>
|
||||
<field eval="0" name="flow_start"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_node_supplierbankstatement0" model="process.node">
|
||||
<field name="menu_id" ref="account.menu_bank_statement_tree"/>
|
||||
<field name="model_id" ref="account.model_account_bank_statement"/>
|
||||
|
|
@ -60,7 +60,7 @@
|
|||
<field eval=""""object.state=='draft'"""" name="model_states"/>
|
||||
<field eval="0" name="flow_start"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_node_supplieraccountingentries0" model="process.node">
|
||||
<field name="menu_id" ref="account.menu_action_move_journal_line_form"/>
|
||||
<field name="model_id" ref="account.model_account_move"/>
|
||||
|
|
@ -70,7 +70,7 @@
|
|||
<field name="process_id" ref="process_process_supplierinvoiceprocess0"/>
|
||||
<field eval="0" name="flow_start"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_node_supplierpaymentorder0" model="process.node">
|
||||
<field name="menu_id" ref="account.menu_eaction_account_moves_all"/>
|
||||
<field name="model_id" ref="account.model_account_move_line"/>
|
||||
|
|
@ -81,7 +81,7 @@
|
|||
<field eval=""""object.state=='draft'"""" name="model_states"/>
|
||||
<field eval="1" name="flow_start"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_node_supplierreconciliation0" model="process.node">
|
||||
<field name="menu_id" ref="account.menu_eaction_account_moves_all"/>
|
||||
<field name="model_id" ref="account.model_account_move_reconcile"/>
|
||||
|
|
@ -92,7 +92,7 @@
|
|||
<field eval=""""object.state=='valid'"""" name="model_states"/>
|
||||
<field eval="0" name="flow_start"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_node_supplierpaidinvoice0" model="process.node">
|
||||
<field name="menu_id" ref="account.menu_action_invoice_tree1"/>
|
||||
<field name="model_id" ref="account.model_account_invoice"/>
|
||||
|
|
@ -103,22 +103,20 @@
|
|||
<field eval=""""object.state=='paid'"""" name="model_states"/>
|
||||
<field eval="0" name="flow_start"/>
|
||||
</record>
|
||||
|
||||
<!--
|
||||
|
||||
<!--
|
||||
Process Transition
|
||||
-->
|
||||
|
||||
|
||||
<record id="process_transition_supplieranalyticcost0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""From analytic accounts"""" name="name"/>
|
||||
<field eval=""""Analytic costs (timesheets, some purchased products, ...) come from analytic accounts. These generate draft supplier invoices."""" name="note"/>
|
||||
<field model="process.node" name="target_node_id" ref="process_node_supplierdraftinvoices0"/>
|
||||
<field model="process.node" name="source_node_id" ref="process_node_analyticcost0"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_transition_suppliercustomerinvoice0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Validation"""" name="name"/>
|
||||
<field eval=""""Draft invoices are validated. """" name="note"/>
|
||||
|
|
@ -126,51 +124,46 @@
|
|||
<field model="process.node" name="source_node_id" ref="process_node_supplierdraftinvoices0"/>
|
||||
<field eval="[(6,0,[ref('account.pro2_to_open')])]" name="transition_ids"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_transition_suppliervalidentries0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Validation"""" name="name"/>
|
||||
<field eval=""""Accountant validates the accounting entries coming from the invoice. """" name="note"/>
|
||||
<field model="process.node" name="target_node_id" ref="process_node_supplieraccountingentries0"/>
|
||||
<field model="process.node" name="source_node_id" ref="process_node_supplierinvoiceinvoice0"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_transition_supplierentriesreconcile0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Accounting entries"""" name="name"/>
|
||||
<field eval=""""Accounting entries are an input of the reconciliation."""" name="note"/>
|
||||
<field model="process.node" name="target_node_id" ref="process_node_supplierreconciliation0"/>
|
||||
<field model="process.node" name="source_node_id" ref="process_node_supplieraccountingentries0"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_transition_paymentorderbank0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Payment entries"""" name="name"/>
|
||||
<field eval=""""The payment order is sent to the bank."""" name="note"/>
|
||||
<field model="process.node" name="target_node_id" ref="process_node_supplierbankstatement0"/>
|
||||
<field model="process.node" name="source_node_id" ref="process_node_supplierpaymentorder0"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_transition_paymentorderreconcilation0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Validation"""" name="name"/>
|
||||
<field eval=""""Bank statements are entered in the system."""" name="note"/>
|
||||
<field model="process.node" name="target_node_id" ref="process_node_supplierreconciliation0"/>
|
||||
<field model="process.node" name="source_node_id" ref="process_node_supplierbankstatement0"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_transition_supplierreconcilepaid0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""System payment"""" name="name"/>
|
||||
<field eval=""""As soon as the reconciliation is done, the invoice's state turns to “done” (i.e. paid) in the system."""" name="note"/>
|
||||
<field model="process.node" name="target_node_id" ref="process_node_supplierpaidinvoice0"/>
|
||||
<field model="process.node" name="source_node_id" ref="process_node_supplierreconciliation0"/>
|
||||
</record>
|
||||
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
|
|
|
|||
|
|
@ -65,28 +65,24 @@
|
|||
<field name="act_from" ref="act_confirm" />
|
||||
<field name="act_to" ref="act_validate" />
|
||||
<field name="signal">validate</field>
|
||||
<field name="role_id" ref="crossovered_budget_role"/>
|
||||
</record>
|
||||
|
||||
<record model="workflow.transition" id="t3">
|
||||
<field name="act_from" ref="act_confirm" />
|
||||
<field name="act_to" ref="act_cancel" />
|
||||
<field name="signal">cancel</field>
|
||||
<field name="role_id" ref="crossovered_budget_role"/>
|
||||
</record>
|
||||
|
||||
<record model="workflow.transition" id="t4">
|
||||
<field name="act_from" ref="act_validate" />
|
||||
<field name="act_to" ref="act_cancel" />
|
||||
<field name="signal">cancel</field>
|
||||
<field name="role_id" ref="crossovered_budget_role"/>
|
||||
</record>
|
||||
|
||||
<record model="workflow.transition" id="t5">
|
||||
<field name="act_from" ref="act_validate" />
|
||||
<field name="act_to" ref="act_done" />
|
||||
<field name="signal">done</field>
|
||||
<field name="role_id" ref="crossovered_budget_role"/>
|
||||
</record>
|
||||
|
||||
<record model="workflow.transition" id="t6">
|
||||
|
|
|
|||
|
|
@ -114,7 +114,7 @@ class account_payment_populate_statement(osv.osv_memory):
|
|||
'voucher_id': voucher_id,
|
||||
}, context=context)
|
||||
|
||||
line_obj.write(cr, uid, [line.id], {'bank_statement_line_id': st_line_id})
|
||||
line_obj.write(cr, uid, [line.id], {'bank_statement_line_id': st_line_id})
|
||||
return {'type': 'ir.actions.act_window_close'}
|
||||
|
||||
account_payment_populate_statement()
|
||||
|
|
|
|||
|
|
@ -163,7 +163,8 @@
|
|||
<!-- Invitation menu -->
|
||||
|
||||
<menuitem id="menu_attendee_invitations"
|
||||
name="Event Invitations" parent="base.menu_calendar_configuration"
|
||||
parent="base.menu_calendar_configuration"
|
||||
groups="base.group_extended"
|
||||
sequence="10" action="action_view_attendee_form" />
|
||||
|
||||
<!-- ALARM FORM VIEW-->
|
||||
|
|
@ -496,6 +497,7 @@
|
|||
|
||||
<menuitem id="menu_events"
|
||||
name="Events" parent="base.menu_calendar_configuration"
|
||||
groups="base.group_extended"
|
||||
sequence="5" action="action_view_event" />
|
||||
|
||||
</data>
|
||||
|
|
|
|||
|
|
@ -60,7 +60,6 @@
|
|||
-->
|
||||
|
||||
<record id="process_transition_contacttofunction0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Contact to function"""" name="name"/>
|
||||
<field eval=""""Defines contacts and functions."""" name="note"/>
|
||||
|
|
@ -69,7 +68,6 @@
|
|||
</record>
|
||||
|
||||
<record id="process_transition_functiontoaddress0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Function to address"""" name="name"/>
|
||||
<field eval=""""Define functions and address."""" name="note"/>
|
||||
|
|
@ -78,7 +76,6 @@
|
|||
</record>
|
||||
|
||||
<record id="process_transition_partnertoaddress0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Partner to address"""" name="name"/>
|
||||
<field eval=""""Define partners and their addresses."""" name="note"/>
|
||||
|
|
|
|||
|
|
@ -3,12 +3,11 @@
|
|||
<data>
|
||||
|
||||
<!--
|
||||
Default bank account description
|
||||
-->
|
||||
Default bank account description
|
||||
-->
|
||||
<record id="bank_iban" model="res.partner.bank.type">
|
||||
<field name="name">IBAN Account</field>
|
||||
<field name="code">iban</field>
|
||||
<field name="bank" ref="base.res_bank_1"/>
|
||||
</record>
|
||||
<record id="bank_iban_field" model="res.partner.bank.type.field">
|
||||
<field name="name">iban</field>
|
||||
|
|
|
|||
|
|
@ -119,7 +119,6 @@ Create dashboard for CRM that includes:
|
|||
'crm_meeting_demo.xml',
|
||||
'crm_opportunity_demo.xml',
|
||||
'crm_phonecall_demo.xml',
|
||||
'board_crm_demo.xml',
|
||||
],
|
||||
'test': [
|
||||
'test/test_crm_lead.yml',
|
||||
|
|
|
|||
|
|
@ -1,14 +0,0 @@
|
|||
<?xml version="1.0"?>
|
||||
<openerp>
|
||||
<data noupdate="1">
|
||||
|
||||
<!--
|
||||
Administrator shortcut
|
||||
Demo user startup menu
|
||||
-->
|
||||
<record model="res.users" id="base.user_root">
|
||||
<field name="action_id" ref="open_board_crm"/>
|
||||
</record>
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
|
|
@ -33,9 +33,10 @@
|
|||
</record>
|
||||
|
||||
<record model="crm.case.stage" id="stage_lead5">
|
||||
<field name="name">Win</field>
|
||||
<field name="name">Won</field>
|
||||
<field eval="'100'" name="probability"/>
|
||||
<field eval="'5'" name="sequence"/>
|
||||
<field eval="1" name="on_change"/>
|
||||
<field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
|
||||
</record>
|
||||
|
||||
|
|
|
|||
|
|
@ -13,7 +13,8 @@
|
|||
<field name="context">{'object_id':'crm.meeting'}</field>
|
||||
</record>
|
||||
|
||||
<menuitem action="crm_meeting_categ_action" name="Categories of Meeting"
|
||||
<menuitem action="crm_meeting_categ_action"
|
||||
groups="base.group_extended"
|
||||
id="menu_crm_case_meeting-act" parent="base.menu_calendar_configuration" sequence="1"/>
|
||||
|
||||
<!-- CRM Meetings Form View -->
|
||||
|
|
|
|||
|
|
@ -85,10 +85,11 @@ class crm_opportunity(osv.osv):
|
|||
"""
|
||||
res = super(crm_opportunity, self).case_close(cr, uid, ids, args)
|
||||
stage_id = super(crm_opportunity, self).stage_next(cr, uid, ids, context={'force_domain': [('probability', '=', 0)]})
|
||||
if not stage_id:
|
||||
raise osv.except_osv(_('Warning !'), _('There is no stage for lost opportunities defined for this Sale Team.'))
|
||||
value = self.onchange_stage_id(cr, uid, ids, stage_id, context={})['value']
|
||||
value.update({'date_closed': time.strftime('%Y-%m-%d %H:%M:%S'), 'stage_id': stage_id})
|
||||
value = {}
|
||||
if stage_id:
|
||||
value = self.onchange_stage_id(cr, uid, ids, stage_id, context={}).get('value', {})
|
||||
value['stage_id'] = stage_id
|
||||
value.update({'date_closed': time.strftime('%Y-%m-%d %H:%M:%S')})
|
||||
|
||||
res = self.write(cr, uid, ids, value)
|
||||
for (id, name) in self.name_get(cr, uid, ids):
|
||||
|
|
|
|||
|
|
@ -14,14 +14,14 @@
|
|||
<label string="Stage:" align="1.0"/>
|
||||
<group colspan="1" col="4">
|
||||
<field name="stage_id" nolabel="1"
|
||||
widget="selection"
|
||||
on_change="onchange_stage_id(stage_id)"
|
||||
domain="[('object_id.model', '=', 'crm.lead')]"
|
||||
readonly="1" />
|
||||
domain="[('object_id.model', '=', 'crm.lead')]"/>
|
||||
<button name="stage_previous"
|
||||
states="open,pending" type="object"
|
||||
icon="gtk-go-back" string="" />
|
||||
<button name="stage_next" states="open,pending"
|
||||
type="object" icon="gtk-go-forward" string="" />
|
||||
states="draft,open,pending" type="object"
|
||||
icon="gtk-go-back" string="" />
|
||||
<button name="stage_next" states="draft,open,pending"
|
||||
type="object" icon="gtk-go-forward" string="" />
|
||||
</group>
|
||||
<field name="user_id"/>
|
||||
|
||||
|
|
@ -88,7 +88,7 @@
|
|||
groups="base.group_extended"
|
||||
icon="gtk-go-up" />
|
||||
<button name="case_cancel" string="Cancel"
|
||||
states="draft,open,pending" type="object"
|
||||
states="draft" type="object"
|
||||
icon="gtk-close" />
|
||||
<button name="case_mark_lost" string="Mark Lost"
|
||||
states="open,pending" type="object"
|
||||
|
|
@ -283,14 +283,6 @@
|
|||
string="Pending" help="Pending Opportunities"
|
||||
domain="[('state','=','pending')]"/>
|
||||
<separator orientation="vertical"/>
|
||||
<filter icon="terp-go-today" string="Today"
|
||||
domain="[('create_date','<', time.strftime('%%Y-%%m-%%d 23:59:59')), ('create_date','>=', time.strftime('%%Y-%%m-%%d 00:00:00'))]"
|
||||
help="Todays' Opportunities" />
|
||||
<filter icon="terp-go-week" string="7 Days"
|
||||
help="Opportunities created during last 7 days"
|
||||
domain="[('create_date','<', time.strftime('%%Y-%%m-%%d 23:59:59')),('create_date','>=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d 00:00:00'))]"
|
||||
/>
|
||||
<separator orientation="vertical"/>
|
||||
<field name="name" string="Opportunity"/>
|
||||
<field name="partner_id"/>
|
||||
<field name="user_id">
|
||||
|
|
|
|||
|
|
@ -202,6 +202,7 @@
|
|||
|
||||
<menuitem action="crm_case_resource_type_act"
|
||||
id="menu_crm_case_resource_type_act" sequence="4"
|
||||
groups="base.group_extended"
|
||||
parent="base.menu_sale_config_sales" />
|
||||
|
||||
<record id="crm_case_section_act_tree" model="ir.actions.act_window">
|
||||
|
|
|
|||
|
|
@ -57,7 +57,6 @@
|
|||
-->
|
||||
|
||||
<record id="process_transition_leadopportunity0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Prospect Opportunity"""" name="name"/>
|
||||
<field eval=""""Creating business opportunities from Leads"""" name="note"/>
|
||||
|
|
@ -66,7 +65,6 @@
|
|||
</record>
|
||||
|
||||
<record id="process_transition_leadpartner0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Prospect Partner"""" name="name"/>
|
||||
<field eval=""""Prospect is converting to business partner"""" name="note"/>
|
||||
|
|
@ -75,7 +73,6 @@
|
|||
</record>
|
||||
|
||||
<record id="process_transition_opportunitymeeting0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Opportunity Meeting"""" name="name"/>
|
||||
<field eval=""""Normal or phone meeting for opportunity"""" name="note"/>
|
||||
|
|
|
|||
|
|
@ -331,38 +331,34 @@ This is useful for CRM leads for example"),
|
|||
default.update({'name':new_name})
|
||||
return super(email_template, self).copy(cr, uid, id, default, context)
|
||||
|
||||
def compute_pl(self,
|
||||
model_object_field,
|
||||
sub_model_object_field,
|
||||
null_value, template_language='mako'):
|
||||
def build_expression(self, field_name, sub_field_name, null_value, template_language='mako'):
|
||||
"""
|
||||
Returns the expression based on data provided
|
||||
@param model_object_field: First level field
|
||||
@param sub_model_object_field: Second level drilled down field (M2O)
|
||||
@param null_value: What has to be returned if the value is empty
|
||||
@param template_language: The language used for templating
|
||||
Returns a template expression based on data provided
|
||||
@param field_name: field name
|
||||
@param sub_field_name: sub field name (M2O)
|
||||
@param null_value: default value if the target value is empty
|
||||
@param template_language: name of template engine
|
||||
@return: computed expression
|
||||
"""
|
||||
#Configure for MAKO
|
||||
copy_val = ''
|
||||
|
||||
expression = ''
|
||||
if template_language == 'mako':
|
||||
if model_object_field:
|
||||
copy_val = "${object." + model_object_field
|
||||
if sub_model_object_field:
|
||||
copy_val += "." + sub_model_object_field
|
||||
if null_value:
|
||||
copy_val += " or '" + null_value + "'"
|
||||
if model_object_field:
|
||||
copy_val += "}"
|
||||
if field_name:
|
||||
expression = "${object." + field_name
|
||||
if sub_field_name:
|
||||
expression += "." + sub_field_name
|
||||
if null_value:
|
||||
expression += " or '''%s'''" % null_value
|
||||
expression += "}"
|
||||
elif template_language == 'django':
|
||||
if model_object_field:
|
||||
copy_val = "{{object." + model_object_field
|
||||
if sub_model_object_field:
|
||||
copy_val += "." + sub_model_object_field
|
||||
if null_value:
|
||||
copy_val = copy_val + '|default:"' + null_value + '"'
|
||||
copy_val = copy_val + "}}"
|
||||
return copy_val
|
||||
if field_name:
|
||||
expression = "{{object." + field_name
|
||||
if sub_field_name:
|
||||
expression += "." + sub_field_name
|
||||
if null_value:
|
||||
expression += "|default: '''%s'''" % null_value
|
||||
expression += "}}"
|
||||
return expression
|
||||
|
||||
def onchange_model_object_field(self, cr, uid, ids, model_object_field, template_language, context=None):
|
||||
if not model_object_field:
|
||||
|
|
@ -374,7 +370,7 @@ This is useful for CRM leads for example"),
|
|||
res_ids = self.pool.get('ir.model').search(cr, uid, [('model', '=', field_obj.relation)], context=context)
|
||||
if res_ids:
|
||||
result['sub_object'] = res_ids[0]
|
||||
result['copyvalue'] = self.compute_pl(False,
|
||||
result['copyvalue'] = self.build_expression(False,
|
||||
False,
|
||||
False,
|
||||
template_language)
|
||||
|
|
@ -383,7 +379,7 @@ This is useful for CRM leads for example"),
|
|||
else:
|
||||
#Its a simple field... just compute placeholder
|
||||
result['sub_object'] = False
|
||||
result['copyvalue'] = self.compute_pl(field_obj.name,
|
||||
result['copyvalue'] = self.build_expression(field_obj.name,
|
||||
False,
|
||||
False,
|
||||
template_language
|
||||
|
|
@ -402,7 +398,7 @@ This is useful for CRM leads for example"),
|
|||
sub_field_obj = self.pool.get('ir.model.fields').browse(cr, uid, sub_model_object_field, context)
|
||||
if res_ids:
|
||||
result['sub_object'] = res_ids[0]
|
||||
result['copyvalue'] = self.compute_pl(field_obj.name,
|
||||
result['copyvalue'] = self.build_expression(field_obj.name,
|
||||
sub_field_obj.name,
|
||||
False,
|
||||
template_language
|
||||
|
|
@ -412,7 +408,7 @@ This is useful for CRM leads for example"),
|
|||
else:
|
||||
#Its a simple field... just compute placeholder
|
||||
result['sub_object'] = False
|
||||
result['copyvalue'] = self.compute_pl(field_obj.name,
|
||||
result['copyvalue'] = self.build_expression(field_obj.name,
|
||||
False,
|
||||
False,
|
||||
template_language
|
||||
|
|
@ -431,7 +427,7 @@ This is useful for CRM leads for example"),
|
|||
sub_field_obj = self.pool.get('ir.model.fields').browse(cr, uid, sub_model_object_field, context)
|
||||
if res_ids:
|
||||
result['sub_object'] = res_ids[0]
|
||||
result['copyvalue'] = self.compute_pl(field_obj.name,
|
||||
result['copyvalue'] = self.build_expression(field_obj.name,
|
||||
sub_field_obj.name,
|
||||
null_value,
|
||||
template_language
|
||||
|
|
@ -441,7 +437,7 @@ This is useful for CRM leads for example"),
|
|||
else:
|
||||
#Its a simple field... just compute placeholder
|
||||
result['sub_object'] = False
|
||||
result['copyvalue'] = self.compute_pl(field_obj.name,
|
||||
result['copyvalue'] = self.build_expression(field_obj.name,
|
||||
False,
|
||||
null_value,
|
||||
template_language
|
||||
|
|
|
|||
|
|
@ -47,26 +47,22 @@
|
|||
<field name="act_from" ref="act_draft"/>
|
||||
<field name="act_to" ref="act_approved"/>
|
||||
<field name="signal">button_approval</field>
|
||||
<field name="role_id" ref="PE_ADMIN"/>
|
||||
</record>
|
||||
|
||||
<record id="trans_approved_suspended" model="workflow.transition">
|
||||
<field name="act_from" ref="act_approved"/>
|
||||
<field name="act_to" ref="act_suspended"/>
|
||||
<field name="signal">button_suspended</field>
|
||||
<field name="role_id" ref="PE_ADMIN"/>
|
||||
</record>
|
||||
<record id="trans_suspended_reapproved" model="workflow.transition">
|
||||
<field name="act_from" ref="act_suspended"/>
|
||||
<field name="act_to" ref="act_draft"/>
|
||||
<field name="signal">get_reapprove</field>
|
||||
<field name="role_id" ref="PE_ADMIN"/>
|
||||
</record>
|
||||
<record id="trans_suspended_dummy" model="workflow.transition">
|
||||
<field name="act_from" ref="act_suspended"/>
|
||||
<field name="act_to" ref="act_dummy"/>
|
||||
<field name="signal">get_never</field>
|
||||
<field name="role_id" ref="PE_ADMIN"/>
|
||||
</record>
|
||||
</data>
|
||||
</openerp>
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@
|
|||
'board_association_view.xml',
|
||||
'res_partner_view.xml',
|
||||
],
|
||||
'demo_xml': ['event_demo.xml', 'board_association_demo.xml'],
|
||||
'demo_xml': ['event_demo.xml'],
|
||||
'test': ['test/test_event.yml'],
|
||||
'installable': True,
|
||||
'active': False,
|
||||
|
|
|
|||
|
|
@ -1,10 +0,0 @@
|
|||
<?xml version="1.0"?>
|
||||
<openerp>
|
||||
<data noupdate="1">
|
||||
|
||||
<record model="res.users" id="base.user_root">
|
||||
<field name="action_id" ref="open_board_associations_manager"/>
|
||||
</record>
|
||||
</data>
|
||||
</openerp>
|
||||
|
||||
|
|
@ -303,7 +303,7 @@ class event_registration(osv.osv):
|
|||
'name': fields.char('Summary', size=124, readonly=True, states={'draft': [('readonly', False)]}),
|
||||
'email_cc': fields.text('CC', size=252 , readonly=False, states={'done': [('readonly', True)]}, help="These email addresses will be added to the CC field of all inbound and outbound emails for this record before being sent. Separate multiple email addresses with a comma"),
|
||||
'nb_register': fields.integer('Quantity', required=True, readonly=True, states={'draft': [('readonly', False)]}, help="Number of Registrations or Tickets"),
|
||||
'event_id': fields.many2one('event.event', 'Event Related', required=True, readonly=True, states={'draft': [('readonly', False)]}),
|
||||
'event_id': fields.many2one('event.event', 'Event', required=True, readonly=True, states={'draft': [('readonly', False)]}),
|
||||
'partner_id': fields.many2one('res.partner', 'Partner', states={'done': [('readonly', True)]}),
|
||||
"partner_invoice_id": fields.many2one('res.partner', 'Partner Invoiced', readonly=True, states={'draft': [('readonly', False)]}),
|
||||
"contact_id": fields.many2one('res.partner.contact', 'Partner Contact', readonly=False, states={'done': [('readonly', True)]}), #TODO: filter only the contacts that have a function into the selected partner_id
|
||||
|
|
|
|||
|
|
@ -227,27 +227,27 @@
|
|||
<field name="arch" type="xml">
|
||||
<search string="Events">
|
||||
<group col="10" colspan="4">
|
||||
<filter icon="terp-check" string="Current" name="draft" domain="[('state','in',('draft', 'confirm'))]" help="Current Events"/>
|
||||
<filter icon="terp-camera_test" string="Open" domain="[('state','=','confirm')]" help="Open Events"/>
|
||||
<filter icon="terp-check" string="Current" name="draft" domain="[('state','in',('draft', 'confirm'))]" help="Events in draft or confirmed state"/>
|
||||
<filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','confirm')]" help="Confirmed events"/>
|
||||
<separator orientation="vertical"/>
|
||||
<field name="name" string="Event" select="1"/>
|
||||
<field name="state" select="1"/>
|
||||
<field name="name" select="1"/>
|
||||
<field name="user_id" widget="selection">
|
||||
<filter icon="terp-personal"
|
||||
string="My Events"
|
||||
help="My Events"
|
||||
domain="[('user_id','=',uid)]"/>
|
||||
<filter icon="terp-personal"
|
||||
string="My Events"
|
||||
help="My Events"
|
||||
domain="[('user_id','=',uid)]"/>
|
||||
</field>
|
||||
<field name="date_begin" select="1"/>
|
||||
<field name="state" select="1"/>
|
||||
</group>
|
||||
<newline/>
|
||||
<group expand="0" string="Group By..." colspan="4" col="12">
|
||||
<filter string="Responsible" icon="terp-personal" context="{'group_by': 'user_id'}"/>
|
||||
<separator orientation="vertical"/>
|
||||
<filter string="Event Type" icon="terp-crm" context="{'group_by':'type'}"/>
|
||||
<filter string="state" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
|
||||
<separator orientation="vertical"/>
|
||||
<filter string="Responsible" icon="terp-personal" context="{'group_by': 'user_id'}"/>
|
||||
<separator orientation="vertical"/>
|
||||
<filter string="Creation" icon="terp-go-month"
|
||||
<filter string="Beginning Date" icon="terp-go-month"
|
||||
domain="[]" context="{'group_by':'date_begin'}"/>
|
||||
</group>
|
||||
</search>
|
||||
|
|
@ -296,11 +296,11 @@
|
|||
<field name="type">tree</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree string="Registration">
|
||||
<field name="date" string="Date"/>
|
||||
<field name="event_id"/>
|
||||
<field name="partner_id"/>
|
||||
<field name="event_id"/>
|
||||
<field name="nb_register"/>
|
||||
<field name="price_subtotal"/>
|
||||
<field name="price_subtotal" sum="Total"/>
|
||||
<field name="user_id"/>
|
||||
<field name="state"/>
|
||||
<button name="button_reg_close" string="Close Registration" states="open" type="object" icon="gtk-close"/>
|
||||
<button name="check_confirm" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
|
||||
|
|
@ -344,9 +344,9 @@
|
|||
<separator string="" colspan="4"/>
|
||||
<group col="8" colspan="4">
|
||||
<field name="state" select="1" colspan="2"/>
|
||||
<button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
|
||||
<button name="button_reg_close" string="Close Registration" states="open" type="object" icon="gtk-close"/>
|
||||
<button name="check_confirm" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
|
||||
<button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
|
||||
</group>
|
||||
</page>
|
||||
<page string="Extra Info">
|
||||
|
|
@ -469,27 +469,26 @@
|
|||
<field name="arch" type="xml">
|
||||
<search string="Event Registration">
|
||||
<group col="12" colspan="4">
|
||||
<filter icon="terp-check" string="Current" name="draft" domain="[('state','in',('draft', 'open'))]" help="Current Registrations"/>
|
||||
<filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]" help="Open Registrations"/>
|
||||
<filter icon="terp-check" string="Current" name="draft" domain="[('state','in',('draft', 'open'))]" help="Registrations in unconfirmed or confirmed state"/>
|
||||
<filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','open')]" help="Confirmed registrations"/>
|
||||
<separator orientation="vertical"/>
|
||||
<field name="partner_id" />
|
||||
<field name="event_id" widget="selection"/>
|
||||
<field name="state" select="1"/>
|
||||
|
||||
<field name="user_id" widget="selection">
|
||||
<filter icon="terp-personal"
|
||||
string="My Registration"
|
||||
help="My Registration"
|
||||
domain="[('user_id','=',uid)]"/>
|
||||
<filter icon="terp-personal"
|
||||
string="My Registrations"
|
||||
help="My Registrations"
|
||||
domain="[('user_id','=',uid)]"/>
|
||||
</field>
|
||||
<field name="state" select="1"/>
|
||||
</group>
|
||||
<newline/>
|
||||
<group expand="0" string="Group By...">
|
||||
<filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
|
||||
<filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
|
||||
<separator orientation="vertical"/>
|
||||
<filter string="Event" icon="terp-crm" domain="[]" context="{'group_by':'event_id'}"/>
|
||||
<filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
|
||||
<separator orientation="vertical"/>
|
||||
<filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
|
||||
<filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
|
||||
</group>
|
||||
</search>
|
||||
</field>
|
||||
|
|
|
|||
|
|
@ -27,8 +27,8 @@
|
|||
<field name="hr_recruitment"/>
|
||||
<field name="hr_timesheet_sheet"/>
|
||||
<field name="hr_contract"/>
|
||||
<field name="hr_evaluation"/>
|
||||
<field name="hr_attendance"/>
|
||||
<field name="hr_evaluation" groups="base.group_extended"/>
|
||||
<field name="hr_payroll" groups="base.group_extended"/>
|
||||
<field name="hr_payroll_account" groups="base.group_extended"/>
|
||||
</group>
|
||||
|
|
|
|||
|
|
@ -51,8 +51,7 @@ class hr_installer(osv.osv_memory):
|
|||
_defaults = {
|
||||
'hr_holidays': True,
|
||||
'hr_expense': True,
|
||||
}
|
||||
|
||||
}
|
||||
hr_installer()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -51,7 +51,6 @@
|
|||
-->
|
||||
|
||||
<record id="process_transition_employeeuser0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Link a user to an employee"""" name="name"/>
|
||||
<field eval=""""The field Relate'd user in the Employee form allows to link the OpenERP user (and his rights and role) to the employee."""" name="note"/>
|
||||
|
|
@ -60,7 +59,6 @@
|
|||
</record>
|
||||
|
||||
<record id="process_transition_contactofemployee0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Link the employee to information"""" name="name"/>
|
||||
<field eval=""""In the Employee form, there are different kind of information like Contact information."""" name="note"/>
|
||||
|
|
|
|||
|
|
@ -75,14 +75,12 @@
|
|||
<field name="act_from" ref="act_confirm"/>
|
||||
<field name="act_to" ref="act_accepted"/>
|
||||
<field name="signal">validate</field>
|
||||
<field name="role_id" ref="HR"/>
|
||||
</record>
|
||||
|
||||
<record id="t4" model="workflow.transition">
|
||||
<field name="act_from" ref="act_confirm"/>
|
||||
<field name="act_to" ref="act_refused"/>
|
||||
<field name="signal">refuse</field>
|
||||
<field name="role_id" ref="HR"/>
|
||||
</record>
|
||||
|
||||
<record id="t5" model="workflow.transition">
|
||||
|
|
@ -95,21 +93,18 @@
|
|||
<field name="act_from" ref="act_accepted"/>
|
||||
<field name="act_to" ref="act_refused"/>
|
||||
<field name="signal">refuse</field>
|
||||
<field name="role_id" ref="HR"/>
|
||||
</record>
|
||||
|
||||
<record id="t7" model="workflow.transition">
|
||||
<field name="act_from" ref="act_confirm"/>
|
||||
<field name="act_to" ref="act_draft"/>
|
||||
<field name="signal">draft</field>
|
||||
<field name="role_id" ref="HR"/>
|
||||
</record>
|
||||
|
||||
<record id="t8" model="workflow.transition">
|
||||
<field name="act_from" ref="act_accepted"/>
|
||||
<field name="act_to" ref="act_invoice"/>
|
||||
<field name="signal">invoice</field>
|
||||
<field name="role_id" ref="HR_INV"/>
|
||||
</record>
|
||||
|
||||
<record id="t9" model="workflow.transition">
|
||||
|
|
@ -128,7 +123,6 @@
|
|||
<field name="act_from" ref="act_refused"/>
|
||||
<field name="act_to" ref="act_draft"/>
|
||||
<field name="signal">draft</field>
|
||||
<field name="role_id" ref="HR"/>
|
||||
</record>
|
||||
|
||||
</data>
|
||||
|
|
|
|||
|
|
@ -1,21 +1,21 @@
|
|||
<?xml version="1.0" ?>
|
||||
<openerp>
|
||||
<data>
|
||||
|
||||
|
||||
<!--
|
||||
Process
|
||||
-->
|
||||
|
||||
|
||||
<record id="process_process_expenseprocess0" model="process.process">
|
||||
<field eval="1" name="active"/>
|
||||
<field name="model_id" ref="model_hr_expense_expense"/>
|
||||
<field eval=""""Expense"""" name="name"/>
|
||||
</record>
|
||||
|
||||
|
||||
<!--
|
||||
Process Node
|
||||
-->
|
||||
|
||||
|
||||
<record id="process_node_draftexpenses0" model="process.node">
|
||||
<field name="menu_id" ref="menu_expense_all"/>
|
||||
<field name="model_id" ref="model_hr_expense_expense"/>
|
||||
|
|
@ -26,7 +26,7 @@
|
|||
<field eval=""""object.state=='draft'"""" name="model_states"/>
|
||||
<field eval="1" name="flow_start"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_node_confirmedexpenses0" model="process.node">
|
||||
<field name="menu_id" ref="menu_expense_all"/>
|
||||
<field name="model_id" ref="model_hr_expense_expense"/>
|
||||
|
|
@ -37,7 +37,7 @@
|
|||
<field eval=""""object.state=='confirm'"""" name="model_states"/>
|
||||
<field eval="0" name="flow_start"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_node_refused0" model="process.node">
|
||||
<field name="menu_id" ref="menu_expense_all"/>
|
||||
<field name="model_id" ref="model_hr_expense_expense"/>
|
||||
|
|
@ -48,7 +48,7 @@
|
|||
<field eval=""""object.state=='canceled'"""" name="model_states"/>
|
||||
<field eval="0" name="flow_start"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_node_approved0" model="process.node">
|
||||
<field name="menu_id" ref="menu_expense_all"/>
|
||||
<field name="model_id" ref="model_hr_expense_expense"/>
|
||||
|
|
@ -59,7 +59,7 @@
|
|||
<field eval=""""object.state=='accepted'"""" name="model_states"/>
|
||||
<field eval="0" name="flow_start"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_node_supplierinvoice0" model="process.node">
|
||||
<field name="menu_id" ref="account.menu_action_invoice_tree2"/>
|
||||
<field name="model_id" ref="account.model_account_invoice"/>
|
||||
|
|
@ -70,7 +70,7 @@
|
|||
<field eval=""""object.state=='draft'"""" name="model_states"/>
|
||||
<field eval="0" name="flow_start"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_node_reimbursement0" model="process.node">
|
||||
<field name="menu_id" ref="account.menu_action_invoice_tree2"/>
|
||||
<field name="model_id" ref="account.model_account_invoice"/>
|
||||
|
|
@ -81,7 +81,7 @@
|
|||
<field eval=""""object.state=='paid'"""" name="model_states"/>
|
||||
<field eval="0" name="flow_start"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_node_reinvoicing0" model="process.node">
|
||||
<field name="menu_id" ref="account.menu_action_invoice_tree1"/>
|
||||
<field name="model_id" ref="account.model_account_invoice"/>
|
||||
|
|
@ -92,96 +92,90 @@
|
|||
<field eval=""""object.state=='draft'"""" name="model_states"/>
|
||||
<field eval="0" name="flow_start"/>
|
||||
</record>
|
||||
|
||||
|
||||
<!--
|
||||
Process Transition
|
||||
-->
|
||||
|
||||
|
||||
<record id="process_transition_confirmexpense0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Confirm expense"""" name="name"/>
|
||||
<field eval=""""Expense is confirmed."""" name="note"/>
|
||||
<field model="process.node" name="target_node_id" ref="process_node_confirmedexpenses0"/>
|
||||
<field model="process.node" name="source_node_id" ref="process_node_draftexpenses0"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_transition_refuseexpense0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Refuse expense"""" name="name"/>
|
||||
<field eval=""""Expense is refused."""" name="note"/>
|
||||
<field model="process.node" name="target_node_id" ref="process_node_refused0"/>
|
||||
<field model="process.node" name="source_node_id" ref="process_node_confirmedexpenses0"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_transition_approveexpense0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Approve expense"""" name="name"/>
|
||||
<field eval=""""Expense is approved."""" name="note"/>
|
||||
<field model="process.node" name="target_node_id" ref="process_node_approved0"/>
|
||||
<field model="process.node" name="source_node_id" ref="process_node_confirmedexpenses0"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_transition_approveinvoice0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Supplier Invoice"""" name="name"/>
|
||||
<field eval=""""Creates supplier invoice."""" name="note"/>
|
||||
<field model="process.node" name="target_node_id" ref="process_node_supplierinvoice0"/>
|
||||
<field model="process.node" name="source_node_id" ref="process_node_approved0"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_transition_reimburseexpense0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Reimburse expense"""" name="name"/>
|
||||
<field eval=""""After creating invoice, reimburse expenses"""" name="note"/>
|
||||
<field model="process.node" name="target_node_id" ref="process_node_reimbursement0"/>
|
||||
<field model="process.node" name="source_node_id" ref="process_node_supplierinvoice0"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_transition_reimbursereinvoice0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Reinvoice"""" name="name"/>
|
||||
<field eval=""""Create Customer invoice"""" name="note"/>
|
||||
<field model="process.node" name="target_node_id" ref="process_node_reinvoicing0"/>
|
||||
<field model="process.node" name="source_node_id" ref="process_node_reimbursement0"/>
|
||||
</record>
|
||||
|
||||
|
||||
<!--
|
||||
Process Transition Action
|
||||
-->
|
||||
|
||||
|
||||
<record id="process_transition_action_confirm0" model="process.transition.action">
|
||||
<field eval=""""expense_confirm"""" name="action"/>
|
||||
<field eval=""""object"""" name="state"/>
|
||||
<field eval=""""Confirm"""" name="name"/>
|
||||
<field name="transition_id" ref="process_transition_confirmexpense0"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_transition_action_refuse0" model="process.transition.action">
|
||||
<field eval=""""expense_canceled"""" name="action"/>
|
||||
<field eval=""""object"""" name="state"/>
|
||||
<field eval=""""Refuse"""" name="name"/>
|
||||
<field name="transition_id" ref="process_transition_refuseexpense0"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_transition_action_accept0" model="process.transition.action">
|
||||
<field eval=""""expense_accept"""" name="action"/>
|
||||
<field eval=""""object"""" name="state"/>
|
||||
<field eval=""""Accept"""" name="name"/>
|
||||
<field name="transition_id" ref="process_transition_approveexpense0"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_transition_action_supplierinvoice0" model="process.transition.action">
|
||||
<field eval=""""action_invoice_create"""" name="action"/>
|
||||
<field eval=""""object"""" name="state"/>
|
||||
<field eval=""""Invoice"""" name="name"/>
|
||||
<field name="transition_id" ref="process_transition_approveinvoice0"/>
|
||||
</record>
|
||||
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
|
|
@ -77,28 +77,24 @@
|
|||
<field name="act_to" ref="act_validate" />
|
||||
<field name="signal">validate</field>
|
||||
<field name="condition">(holiday_status_id.double_validation == False)</field>
|
||||
<field name="role_id" ref="HR_holidays"/>
|
||||
</record>
|
||||
|
||||
<record model="workflow.transition" id="t3">
|
||||
<field name="act_from" ref="act_confirm" />
|
||||
<field name="act_to" ref="act_refuse" />
|
||||
<field name="signal">refuse</field>
|
||||
<field name="role_id" ref="HR_holidays"/>
|
||||
</record>
|
||||
|
||||
<record model="workflow.transition" id="t4">
|
||||
<field name="act_from" ref="act_validate" />
|
||||
<field name="act_to" ref="act_cancel" />
|
||||
<field name="signal">cancel</field>
|
||||
<field name="role_id" ref="HR_holidays"/>
|
||||
</record>
|
||||
|
||||
<record model="workflow.transition" id="t5">
|
||||
<field name="act_from" ref="act_refuse" />
|
||||
<field name="act_to" ref="act_cancel" />
|
||||
<field name="signal">cancel</field>
|
||||
<field name="role_id" ref="HR_holidays"/>
|
||||
</record>
|
||||
|
||||
<record model="workflow.transition" id="t7">
|
||||
|
|
@ -124,7 +120,6 @@
|
|||
<field name="act_to" ref="act_validate1" />
|
||||
<field name="condition">(holiday_status_id.double_validation == True)</field>
|
||||
<field name="signal">validate</field>
|
||||
<field name="role_id" ref="HR_holidays"/>
|
||||
</record>
|
||||
|
||||
</data>
|
||||
|
|
|
|||
|
|
@ -1,21 +1,21 @@
|
|||
<?xml version="1.0" ?>
|
||||
<openerp>
|
||||
<data>
|
||||
|
||||
<data>
|
||||
|
||||
<!--
|
||||
Process
|
||||
-->
|
||||
|
||||
|
||||
<record id="process_process_holidaysprocess0" model="process.process">
|
||||
<field eval=""""Holidays"""" name="name"/>
|
||||
<field name="model_id" ref="hr_holidays.model_hr_holidays"/>
|
||||
<field eval="1" name="active"/>
|
||||
</record>
|
||||
|
||||
|
||||
<!--
|
||||
Process Node
|
||||
-->
|
||||
|
||||
|
||||
<record id="process_node_holidaysdefinition0" model="process.node">
|
||||
<field name="menu_id" ref="hr_holidays.menu_open_ask_holidays_new"/>
|
||||
<field name="model_id" ref="hr_holidays.model_hr_holidays_per_user"/>
|
||||
|
|
@ -25,7 +25,7 @@
|
|||
<field name="process_id" ref="process_process_holidaysprocess0"/>
|
||||
<field eval="1" name="flow_start"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_node_holidaysrequest0" model="process.node">
|
||||
<field name="menu_id" ref="hr_holidays.menu_open_ask_holidays_new"/>
|
||||
<field name="model_id" ref="hr_holidays.model_hr_holidays"/>
|
||||
|
|
@ -36,7 +36,7 @@
|
|||
<field eval=""""object.state=='draft'"""" name="model_states"/>
|
||||
<field eval="0" name="flow_start"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_node_refused0" model="process.node">
|
||||
<field name="menu_id" ref="hr_holidays.menu_open_ask_holidays_new"/>
|
||||
<field name="model_id" ref="hr_holidays.model_hr_holidays"/>
|
||||
|
|
@ -47,7 +47,7 @@
|
|||
<field eval=""""object.state=='refuse'"""" name="model_states"/>
|
||||
<field eval="0" name="flow_start"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_node_approved0" model="process.node">
|
||||
<field name="menu_id" ref="hr_holidays.menu_open_ask_holidays_new"/>
|
||||
<field name="model_id" ref="hr_holidays.model_hr_holidays"/>
|
||||
|
|
@ -58,7 +58,7 @@
|
|||
<field eval=""""object.state=='validate'"""" name="model_states"/>
|
||||
<field eval="0" name="flow_start"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_node_calendar0" model="process.node">
|
||||
<field name="menu_id" ref="hr_holidays.menu_open_ask_holidays_new"/>
|
||||
<field name="model_id" ref="hr_holidays.model_hr_holidays"/>
|
||||
|
|
@ -69,7 +69,7 @@
|
|||
<field eval=""""object.state=='validate'"""" name="model_states"/>
|
||||
<field eval="0" name="flow_start"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_node_holidays0" model="process.node">
|
||||
<field name="menu_id" ref="hr_holidays.menu_open_ask_holidays"/>
|
||||
<field name="model_id" ref="hr_holidays.model_hr_holidays"/>
|
||||
|
|
@ -80,7 +80,7 @@
|
|||
<field eval=""""object.state in ('draft', 'validate', 'confirm', 'refuse', 'cancel')"""" name="model_states"/>
|
||||
<field eval="0" name="flow_start"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_node_legaldeclaration0" model="process.node">
|
||||
<field name="menu_id" ref="hr_holidays.menu_open_ask_holidays"/>
|
||||
<field name="model_id" ref="hr_holidays.model_hr_holidays"/>
|
||||
|
|
@ -89,91 +89,85 @@
|
|||
<field eval=""""Legal Declaration Document to declare new employee"""" name="note"/>
|
||||
<field name="process_id" ref="hr.process_process_employeecontractprocess0"/>
|
||||
<field eval="0" name="flow_start"/>
|
||||
</record>
|
||||
|
||||
</record>
|
||||
|
||||
<!--
|
||||
Process Transition
|
||||
-->
|
||||
|
||||
|
||||
|
||||
|
||||
<record id="process_transition_employeedeclaration0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Employee Declaration"""" name="name"/>
|
||||
<field eval=""""Document for employee"""" name="note"/>
|
||||
<field model="process.node" name="target_node_id" ref="process_node_legaldeclaration0"/>
|
||||
<field model="process.node" name="source_node_id" ref="hr.process_node_employee0"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_transition_holidaysdefrequest0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Holidays def Request"""" name="name"/>
|
||||
<field eval=""""If holidays available, employee can take it and fill it."""" name="note"/>
|
||||
<field model="process.node" name="target_node_id" ref="process_node_holidaysrequest0"/>
|
||||
<field model="process.node" name="source_node_id" ref="process_node_holidaysdefinition0"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_transition_refusedrequest0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Refused Request"""" name="name"/>
|
||||
<field eval=""""Request is refused."""" name="note"/>
|
||||
<field model="process.node" name="target_node_id" ref="process_node_refused0"/>
|
||||
<field model="process.node" name="source_node_id" ref="process_node_holidaysrequest0" />
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_transition_approvedrequest0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Approved Request"""" name="name"/>
|
||||
<field eval=""""Request is approved."""" name="note"/>
|
||||
<field model="process.node" name="target_node_id" ref="process_node_approved0"/>
|
||||
<field model="process.node" name="source_node_id" ref="process_node_holidaysrequest0"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_transition_setholiday0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Set Holiday"""" name="name"/>
|
||||
<field eval=""""Holiday is set in the calendar."""" name="note"/>
|
||||
<field model="process.node" name="target_node_id" ref="process_node_calendar0"/>
|
||||
<field model="process.node" name="source_node_id" ref="process_node_approved0"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_transition_employeeholidays0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Employee Holidays"""" name="name"/>
|
||||
<field eval=""""Employee get holidays"""" name="note"/>
|
||||
<field model="process.node" name="target_node_id" ref="process_node_holidays0"/>
|
||||
<field model="process.node" name="source_node_id" ref="process_node_legaldeclaration0"/>
|
||||
</record>
|
||||
|
||||
|
||||
<!--
|
||||
Process Transition Action
|
||||
-->
|
||||
|
||||
|
||||
<record id="process_transition_action_confirm0" model="process.transition.action">
|
||||
<field eval=""""holidays_confirm"""" name="action"/>
|
||||
<field eval=""""object"""" name="state"/>
|
||||
<field eval=""""Confirm"""" name="name"/>
|
||||
<field name="transition_id" ref="process_transition_holidaysdefrequest0"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_transition_action_reufse0" model="process.transition.action">
|
||||
<field eval=""""holidays_refuse"""" name="action"/>
|
||||
<field eval=""""object"""" name="state"/>
|
||||
<field eval=""""Refuse"""" name="name"/>
|
||||
<field name="transition_id" ref="process_transition_refusedrequest0"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_transition_action_validate0" model="process.transition.action">
|
||||
<field eval=""""holidays_validate"""" name="action"/>
|
||||
<field eval=""""object"""" name="state"/>
|
||||
<field eval=""""Validate"""" name="name"/>
|
||||
<field name="transition_id" ref="process_transition_approvedrequest0"/>
|
||||
</record>
|
||||
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
|
|
@ -1,21 +1,21 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<openerp>
|
||||
<data>
|
||||
|
||||
|
||||
<!-- Roles definition -->
|
||||
|
||||
|
||||
<record id="HR" model="res.roles">
|
||||
<field name="name">Timesheets validation</field>
|
||||
</record>
|
||||
|
||||
|
||||
<!-- Workflow definition -->
|
||||
|
||||
|
||||
<record id="wkf_timesheet" model="workflow">
|
||||
<field name="name">hr_timesheet_sheet.sheet</field>
|
||||
<field name="osv">hr_timesheet_sheet.sheet</field>
|
||||
<field name="on_create">True</field>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="act_new" model="workflow.activity">
|
||||
<field name="wkf_id" ref="wkf_timesheet"/>
|
||||
<field name="name">new</field>
|
||||
|
|
@ -42,7 +42,7 @@
|
|||
<field name="action">write({'state':'done'})</field>
|
||||
<field name="flow_stop">True</field>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="t0" model="workflow.transition">
|
||||
<field name="act_from" ref="act_new"/>
|
||||
<field name="act_to" ref="act_draft"/>
|
||||
|
|
@ -56,13 +56,11 @@
|
|||
<field name="act_from" ref="act_confirm"/>
|
||||
<field name="act_to" ref="act_done"/>
|
||||
<field name="signal">done</field>
|
||||
<field name="role_id" ref="HR"/>
|
||||
</record>
|
||||
<record id="t3" model="workflow.transition">
|
||||
<field name="act_from" ref="act_confirm"/>
|
||||
<field name="act_to" ref="act_draft"/>
|
||||
<field name="signal">cancel</field>
|
||||
<field name="role_id" ref="HR"/>
|
||||
</record>
|
||||
</data>
|
||||
</openerp>
|
||||
|
|
|
|||
|
|
@ -1,21 +1,21 @@
|
|||
<?xml version="1.0" ?>
|
||||
<openerp>
|
||||
<data>
|
||||
|
||||
<!--
|
||||
|
||||
<!--
|
||||
Process
|
||||
-->
|
||||
|
||||
|
||||
<record id="process_process_hrtimesheetprocess0" model="process.process">
|
||||
<field eval="1" name="active"/>
|
||||
<field name="model_id" ref="hr_timesheet_sheet.model_hr_timesheet_sheet_sheet"/>
|
||||
<field eval=""""Hr Timesheet"""" name="name"/>
|
||||
</record>
|
||||
|
||||
<!--
|
||||
|
||||
<!--
|
||||
Process Node
|
||||
-->
|
||||
|
||||
|
||||
<record id="process_node_attendance0" model="process.node">
|
||||
<field name="model_id" ref="hr.model_hr_employee"/>
|
||||
<field eval=""""state"""" name="kind"/>
|
||||
|
|
@ -24,7 +24,7 @@
|
|||
<field name="process_id" ref="process_process_hrtimesheetprocess0"/>
|
||||
<field eval="1" name="flow_start"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_node_timesheet0" model="process.node">
|
||||
<field name="menu_id" ref="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form"/>
|
||||
<field name="model_id" ref="hr_timesheet_sheet.model_hr_timesheet_sheet_sheet"/>
|
||||
|
|
@ -35,7 +35,7 @@
|
|||
<field eval=""""object.state=='draft'"""" name="model_states"/>
|
||||
<field eval="0" name="flow_start"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_node_drafttimesheetsheet0" model="process.node">
|
||||
<field name="menu_id" ref="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form"/>
|
||||
<field name="model_id" ref="hr_timesheet_sheet.model_hr_timesheet_sheet_sheet"/>
|
||||
|
|
@ -46,7 +46,7 @@
|
|||
<field eval=""""object.state=='draft'"""" name="model_states"/>
|
||||
<field eval="0" name="flow_start"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_node_confirmedtimesheet0" model="process.node">
|
||||
<field name="menu_id" ref="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form"/>
|
||||
<field name="model_id" ref="hr_timesheet_sheet.model_hr_timesheet_sheet_sheet"/>
|
||||
|
|
@ -68,7 +68,7 @@
|
|||
<field eval=""""object.state=='done'"""" name="model_states"/>
|
||||
<field eval="0" name="flow_start"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_node_invoiceonwork0" model="process.node">
|
||||
<field name="menu_id" ref="account.menu_finance_receivables"/>
|
||||
<field name="model_id" ref="account.model_account_invoice"/>
|
||||
|
|
@ -91,39 +91,32 @@
|
|||
<field eval=""""object.state in ('open', pending', 'done', 'cancelled')"""" name="model_states"/>
|
||||
<field eval="1" name="flow_start"/>
|
||||
</record>
|
||||
|
||||
<!--
|
||||
|
||||
<!--
|
||||
Process Transition
|
||||
-->
|
||||
|
||||
|
||||
<record id="res_roles_hr0" model="res.roles">
|
||||
<field eval=""""HR"""" name="name"/>
|
||||
</record>
|
||||
|
||||
<record id="hr_timesheet_sheet.t1" model="workflow.transition">
|
||||
<field name="role_id" ref="res_roles_hr0"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_transition_attendancetimesheet0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Sign in/out"""" name="name"/>
|
||||
<field eval=""""The employee signs in and signs out."""" name="note"/>
|
||||
<field model="process.node" name="target_node_id" ref="process_node_drafttimesheetsheet0"/>
|
||||
<field model="process.node" name="source_node_id" ref="process_node_attendance0"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_transition_timesheetdraft0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Service"""" name="name"/>
|
||||
<field eval=""""The timesheet line represents the time spent by the employee on a specific service provided."""" name="note"/>
|
||||
<field model="process.node" name="target_node_id" ref="process_node_drafttimesheetsheet0"/>
|
||||
<field model="process.node" name="source_node_id" ref="process_node_timesheet0"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_transition_confirmtimesheet0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Confirmation"""" name="name"/>
|
||||
<field eval=""""The employee periodically confirms his own timesheets."""" name="note"/>
|
||||
|
|
@ -131,58 +124,55 @@
|
|||
<field model="process.node" name="source_node_id" ref="process_node_drafttimesheetsheet0"/>
|
||||
<field eval="[(6,0,[ref('hr_timesheet_sheet.t1')])]" name="transition_ids"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_transition_validatetimesheet0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Validation"""" name="name"/>
|
||||
<field eval=""""The project manager validates the timesheets."""" name="note"/>
|
||||
<field model="process.node" name="target_node_id" ref="process_node_validatedtimesheet0"/>
|
||||
<field model="process.node" name="source_node_id" ref="process_node_confirmedtimesheet0"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_transition_invoiceontimesheet0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Billing"""" name="name"/>
|
||||
<field eval=""""The invoice is created based on the timesheet."""" name="note"/>
|
||||
<field model="process.node" name="target_node_id" ref="process_node_invoiceonwork0"/>
|
||||
<field model="process.node" name="source_node_id" ref="process_node_confirmedtimesheet0"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_transition_tasktimesheet0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Task timesheet"""" name="name"/>
|
||||
<field eval=""""Moves task entry into the timesheet line"""" name="note"/>
|
||||
<field model="process.node" name="target_node_id" ref="process_node_timesheet0"/>
|
||||
<field model="process.node" name="source_node_id" ref="process_node_workontask0"/>
|
||||
</record>
|
||||
|
||||
<!--
|
||||
</record>
|
||||
|
||||
<!--
|
||||
Process Action
|
||||
-->
|
||||
|
||||
|
||||
<record id="process_transition_action_draftconfirmtimesheet0" model="process.transition.action">
|
||||
<field eval=""""button_confirm"""" name="action"/>
|
||||
<field eval=""""object"""" name="state"/>
|
||||
<field eval=""""Confirm"""" name="name"/>
|
||||
<field name="transition_id" ref="process_transition_confirmtimesheet0"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_transition_action_validatetimesheet0" model="process.transition.action">
|
||||
<field eval=""""write({'state':'done'})"""" name="action"/>
|
||||
<field eval=""""object"""" name="state"/>
|
||||
<field eval=""""Validate"""" name="name"/>
|
||||
<field name="transition_id" ref="process_transition_validatetimesheet0"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_transition_action_refusetimesheet0" model="process.transition.action">
|
||||
<field eval=""""write({'state':'draft'})"""" name="action"/>
|
||||
<field eval=""""object"""" name="state"/>
|
||||
<field eval=""""Refuse"""" name="name"/>
|
||||
<field name="transition_id" ref="process_transition_validatetimesheet0"/>
|
||||
</record>
|
||||
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
|
|
|
|||
|
|
@ -135,16 +135,6 @@
|
|||
</record>
|
||||
|
||||
<!-- Emails action-->
|
||||
<record model="ir.actions.act_window" id="action_view_mailgate_message">
|
||||
<field name="name">Emails</field>
|
||||
<field name="res_model">mailgate.message</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="domain">[('history', '=', True)]</field>
|
||||
<field name="view_id" ref="view_mailgate_message_tree"/>
|
||||
<field name="context">{"search_default_user_id":uid}</field>
|
||||
</record>
|
||||
|
||||
<record model="ir.actions.act_window" id="action_view_mailgate_thread">
|
||||
<field name="name">Mailgateway Threads</field>
|
||||
<field name="res_model">mailgate.thread</field>
|
||||
|
|
@ -196,18 +186,9 @@
|
|||
view_id="view_mailgate_message_tree"
|
||||
/>
|
||||
|
||||
|
||||
<menuitem name="Emails" id="menu_base_config_mail"
|
||||
parent="base.menu_base_partner" sequence="5" />
|
||||
|
||||
<menuitem name="Emails" id="menu_mailgate_message"
|
||||
parent="menu_base_config_mail"
|
||||
action="mail_gateway.action_view_mailgate_message"
|
||||
/>
|
||||
|
||||
<act_window
|
||||
id="act_res_partner_open_email" name="Attachments"
|
||||
res_model="ir.attachment"
|
||||
res_model="ir.attachment"
|
||||
src_model="mailgate.message"
|
||||
domain="[('res_id', '=', res_id),('res_model','=',model)]"/>
|
||||
|
||||
|
|
|
|||
|
|
@ -29,10 +29,9 @@
|
|||
<attribute name="string">Configure</attribute>
|
||||
</xpath>
|
||||
<group colspan="8">
|
||||
<field name="marketing_campaign" />
|
||||
<field name="email_template" />
|
||||
<field name="crm_profiling" />
|
||||
<field name="marketing_campaign" />
|
||||
<field name="marketing_campaign_mailchimp" />
|
||||
</group>
|
||||
</data>
|
||||
</field>
|
||||
|
|
|
|||
|
|
@ -29,10 +29,8 @@ class marketing_installer(osv.osv_memory):
|
|||
help="Helps you to design templates of emails and integrate them in your different processes."),
|
||||
'marketing_campaign':fields.boolean('Marketing Campaigns',
|
||||
help="Helps you to manage marketing campaigns and automate actions and communication steps."),
|
||||
'marketing_campaign_mailchimp':fields.boolean('Mailchimp Integration',
|
||||
help="This modules integrate mailchimp.com's service with OpenERP to automate mass mailings."),
|
||||
'crm_profiling':fields.boolean('Profiling Tools',
|
||||
help="Helps you to perform segmentation within partners and design segmentation questionnaires")
|
||||
help="Helps you to perform segmentation of partners and design segmentation questionnaires")
|
||||
}
|
||||
marketing_installer()
|
||||
|
||||
|
|
|
|||
|
|
@ -1,21 +1,21 @@
|
|||
<?xml version="1.0" ?>
|
||||
<openerp>
|
||||
<data>
|
||||
|
||||
|
||||
<!--
|
||||
Process
|
||||
-->
|
||||
|
||||
|
||||
<record id="process_process_membershipprocess0" model="process.process">
|
||||
<field eval=""""Membership Process"""" name="name"/>
|
||||
<field name="model_id" ref="base.model_res_partner"/>
|
||||
<field eval="1" name="active"/>
|
||||
</record>
|
||||
|
||||
|
||||
<!--
|
||||
Process Node
|
||||
-->
|
||||
|
||||
|
||||
<record id="process_node_membershipproduct0" model="process.node">
|
||||
<field name="menu_id" ref="membership.menu_membership_products"/>
|
||||
<field name="model_id" ref="product.model_product_product"/>
|
||||
|
|
@ -25,7 +25,7 @@
|
|||
<field name="process_id" ref="process_process_membershipprocess0"/>
|
||||
<field eval="1" name="flow_start"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_node_waitingmember0" model="process.node">
|
||||
<field name="menu_id" ref="account.menu_action_invoice_tree1"/>
|
||||
<field name="model_id" ref="account.model_account_invoice"/>
|
||||
|
|
@ -35,7 +35,7 @@
|
|||
<field name="process_id" ref="process_process_membershipprocess0"/>
|
||||
<field eval="0" name="flow_start"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_node_invoicedmember0" model="process.node">
|
||||
<field name="menu_id" ref="account.menu_action_invoice_tree1"/>
|
||||
<field name="model_id" ref="account.model_account_invoice"/>
|
||||
|
|
@ -45,7 +45,7 @@
|
|||
<field name="process_id" ref="process_process_membershipprocess0"/>
|
||||
<field eval="0" name="flow_start"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_node_paidmember0" model="process.node">
|
||||
<field name="menu_id" ref="account.menu_action_invoice_tree1"/>
|
||||
<field name="model_id" ref="account.model_account_invoice"/>
|
||||
|
|
@ -56,7 +56,7 @@
|
|||
<field eval=""""object.state=='paid'"""" name="model_states"/>
|
||||
<field eval="0" name="flow_start"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_node_setassociation0" model="process.node">
|
||||
<field name="menu_id" ref="membership.menu_members"/>
|
||||
<field name="model_id" ref="base.model_res_partner"/>
|
||||
|
|
@ -67,7 +67,7 @@
|
|||
<field eval=""""object.state=='paid'"""" name="model_states"/>
|
||||
<field eval="0" name="flow_start"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_node_associatedmember0" model="process.node">
|
||||
<field name="menu_id" ref="membership.menu_members"/>
|
||||
<field name="model_id" ref="base.model_res_partner"/>
|
||||
|
|
@ -78,62 +78,57 @@
|
|||
<field eval=""""object.state=='associated'"""" name="model_states"/>
|
||||
<field eval="0" name="flow_start"/>
|
||||
</record>
|
||||
|
||||
|
||||
<!--
|
||||
Process Transition
|
||||
-->
|
||||
|
||||
|
||||
<record id="process_transition_producttomember0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Product to member"""" name="name"/>
|
||||
<field eval=""""Define product for membership."""" name="note"/>
|
||||
<field model="process.node" name="target_node_id" ref="process_node_waitingmember0"/>
|
||||
<field model="process.node" name="source_node_id" ref="process_node_membershipproduct0"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_transition_waitingtoinvoice0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Waiting to invoice"""" name="name"/>
|
||||
<field eval=""""Draft invoice is now open."""" name="note"/>
|
||||
<field model="process.node" name="target_node_id" ref="process_node_invoicedmember0"/>
|
||||
<field model="process.node" name="source_node_id" ref="process_node_waitingmember0"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_transition_action_create0" model="process.transition.action">
|
||||
<field eval=""""invoice_open"""" name="action"/>
|
||||
<field eval=""""object"""" name="state"/>
|
||||
<field eval=""""Create"""" name="name"/>
|
||||
<field name="transition_id" ref="process_transition_waitingtoinvoice0"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_transition_invoicetopaid0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Invoice to paid"""" name="name"/>
|
||||
<field eval=""""Invoice is be paid."""" name="note"/>
|
||||
<field model="process.node" name="target_node_id" ref="process_node_paidmember0"/>
|
||||
<field model="process.node" name="source_node_id" ref="process_node_invoicedmember0"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_transition_invoicetoassociate0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""invoice to associate"""" name="name"/>
|
||||
<field eval=""""Invoiced member may be Associated member."""" name="note"/>
|
||||
<field model="process.node" name="target_node_id" ref="process_node_associatedmember0"/>
|
||||
<field model="process.node" name="source_node_id" ref="process_node_invoicedmember0"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_transition_associationpartner0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Association Partner"""" name="name"/>
|
||||
<field eval=""""Associated partner."""" name="note"/>
|
||||
<field model="process.node" name="target_node_id" ref="process_node_associatedmember0"/>
|
||||
<field model="process.node" name="source_node_id" ref="process_node_setassociation0"/>
|
||||
</record>
|
||||
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
|
|
@ -85,7 +85,6 @@
|
|||
],
|
||||
'demo_xml': [
|
||||
'mrp_demo.xml',
|
||||
'board_manufacturing_demo.xml'
|
||||
],
|
||||
'test': [
|
||||
'test/mrp_procurement.yml',
|
||||
|
|
|
|||
|
|
@ -1,9 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<openerp>
|
||||
<data noupdate="1">
|
||||
<record id="base.user_root" model="res.users">
|
||||
<field name="action_id" ref="open_board_manufacturing"/>
|
||||
</record>
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" ?>
|
||||
<openerp>
|
||||
<data>
|
||||
|
||||
|
||||
|
||||
<record id="process_node_productionorder0" model="process.node">
|
||||
<field name="menu_id" ref="mrp.menu_mrp_production_action"/>
|
||||
|
|
@ -14,7 +14,7 @@
|
|||
<field eval="1" name="flow_start"/>
|
||||
</record>
|
||||
|
||||
|
||||
|
||||
<record id="process_node_minimumstockrule0" model="process.node">
|
||||
<field name="menu_id" ref="mrp.menu_action_orderpoint_form"/>
|
||||
<field name="model_id" ref="procurement.model_stock_warehouse_orderpoint"/>
|
||||
|
|
@ -36,7 +36,7 @@
|
|||
<field eval=""""object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')"""" name="model_states"/>
|
||||
<field eval="0" name="flow_start"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_node_stockproduct1" model="process.node">
|
||||
<field name="menu_id" ref="base.menu_mrp_procurement_action"/>
|
||||
<field name="model_id" ref="mrp.model_procurement_order"/>
|
||||
|
|
@ -60,7 +60,7 @@
|
|||
<field eval=""""object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')"""" name="model_states"/>
|
||||
<field eval="0" name="flow_start"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_node_serviceproduct1" model="process.node">
|
||||
<field name="menu_id" ref="base.menu_mrp_procurement_action"/>
|
||||
<field name="model_id" ref="mrp.model_procurement_order"/>
|
||||
|
|
@ -128,7 +128,6 @@
|
|||
<field eval="0" name="flow_start"/>
|
||||
</record>
|
||||
<record id="process_transition_servicemto0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Make to Order"""" name="name"/>
|
||||
<field eval=""""If the service has a 'Produce' supply method, this creates a task in the project management module of OpenERP."""" name="note"/>
|
||||
|
|
@ -137,7 +136,6 @@
|
|||
</record>
|
||||
|
||||
<record id="process_transition_servicemts0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Make to Stock"""" name="name"/>
|
||||
<field eval=""""This is used in case of a service without any impact in the system, a training session for instance."""" name="note"/>
|
||||
|
|
@ -146,7 +144,6 @@
|
|||
</record>
|
||||
|
||||
<record id="process_transition_stockmts0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Make to Stock"""" name="name"/>
|
||||
<field eval=""""The system waits for the products to be available in the stock. These products are typically procured manually or through a minimum stock rule."""" name="note"/>
|
||||
|
|
@ -155,7 +152,6 @@
|
|||
</record>
|
||||
|
||||
<record id="process_transition_stockproduct0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Make to Order"""" name="name"/>
|
||||
<field eval=""""The system creates an order (production or purchased) depending on the sold quantity and the products parameters."""" name="note"/>
|
||||
|
|
@ -164,7 +160,6 @@
|
|||
</record>
|
||||
|
||||
<record id="process_transition_productionprocureproducts0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Procurement of raw material"""" name="name"/>
|
||||
<field eval=""""In order to supply raw material (to be purchased or produced), the production order creates as much procurement orders as components listed in the BOM, through a run of the schedulers (MRP)."""" name="note"/>
|
||||
|
|
@ -173,7 +168,6 @@
|
|||
</record>
|
||||
|
||||
<record id="process_transition_minimumstockprocure0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""'Minimum stock rule' material"""" name="name"/>
|
||||
<field eval=""""The 'Minimum stock rule' allows the system to create procurement orders automatically as soon as the minimum stock is reached."""" name="note"/>
|
||||
|
|
@ -182,7 +176,6 @@
|
|||
</record>
|
||||
|
||||
<record id="process_transition_procurestockableproduct0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Procurement of stockable Products"""" name="name"/>
|
||||
<field eval=""""Depending on the chosen method to supply the stockable products, the procurement order creates a RFQ, a production order, ... """" name="note"/>
|
||||
|
|
@ -191,7 +184,6 @@
|
|||
</record>
|
||||
|
||||
<record id="process_transition_procureserviceproduct0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Procurement of services"""" name="name"/>
|
||||
<field eval=""""Depending on the chosen method to 'supply' the service, the procurement order creates a RFQ for a subcontracting purchase order or waits until the service is done (= the delivery of the products)."""" name="note"/>
|
||||
|
|
@ -200,7 +192,6 @@
|
|||
</record>
|
||||
|
||||
<record id="process_transition_purchaseprocure0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Automatic RFQ"""" name="name"/>
|
||||
<field eval=""""The system launches automatically a RFQ to the preferred supplier."""" name="note"/>
|
||||
|
|
@ -209,7 +200,6 @@
|
|||
</record>
|
||||
|
||||
<record id="process_transition_producttostockrules0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Procurement rule"""" name="name"/>
|
||||
<field eval=""""The Minimum Stock Rule is an automatic procurement rule based on a mini and maxi quantity. It's available in the Inventory management menu and configured by product."""" name="note"/>
|
||||
|
|
@ -218,7 +208,6 @@
|
|||
</record>
|
||||
|
||||
<record id="process_transition_billofmaterialrouting0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Material Routing"""" name="name"/>
|
||||
<field eval=""""The Bill of Material is linked to a routing, i.e. the succession of work centers."""" name="note"/>
|
||||
|
|
@ -227,7 +216,6 @@
|
|||
</record>
|
||||
|
||||
<record id="process_transition_bom0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Manufacturing decomposition"""" name="name"/>
|
||||
<field eval=""""The Bill of Material is the product's decomposition. The components (that are products themselves) can also have their own Bill of Material (multi-level)."""" name="note"/>
|
||||
|
|
|
|||
|
|
@ -36,7 +36,6 @@
|
|||
-->
|
||||
|
||||
<record id="process_transition_servicerfq0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""To Buy"""" name="name"/>
|
||||
<field eval=""""If the service has a 'Buy' supply method, this creates a RFQ, a subcontracting demand for instance."""" name="note"/>
|
||||
|
|
|
|||
|
|
@ -66,7 +66,6 @@
|
|||
-->
|
||||
|
||||
<record id="process_transition_stockrfq0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""To Buy"""" name="name"/>
|
||||
<field eval=""""In case the Supply method of the product is Buy, the system creates a purchase order."""" name="note"/>
|
||||
|
|
@ -75,7 +74,6 @@
|
|||
</record>
|
||||
|
||||
<record id="process_transition_stockproduction0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""To Produce"""" name="name"/>
|
||||
<field eval=""""In case the Supply method of the product is Produce, the system creates a production order."""" name="note"/>
|
||||
|
|
|
|||
|
|
@ -72,7 +72,6 @@
|
|||
-->
|
||||
|
||||
<record id="process_transition_productionstart0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Creation of the work order"""" name="name"/>
|
||||
<field eval=""""The work orders are created on the basis of the production order."""" name="note"/>
|
||||
|
|
@ -81,7 +80,6 @@
|
|||
</record>
|
||||
|
||||
<record id="process_transition_workstartoperation0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Details of the work order"""" name="name"/>
|
||||
<field eval=""""There is 1 work order per work center. The information about the number of cycles or the cycle time."""" name="note"/>
|
||||
|
|
@ -90,7 +88,6 @@
|
|||
</record>
|
||||
|
||||
<record id="process_transition_startdoneoperation0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Operation done"""" name="name"/>
|
||||
<field eval=""""When the operation is finished, the operator updates the system by finishing the work order."""" name="note"/>
|
||||
|
|
@ -99,7 +96,6 @@
|
|||
</record>
|
||||
|
||||
<record id="process_transition_startcanceloperation0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Operation cancelled"""" name="name"/>
|
||||
<field eval=""""When the operation needs to be cancelled, you can do it in the work order form."""" name="note"/>
|
||||
|
|
|
|||
|
|
@ -679,27 +679,27 @@ class mrp_repair_line(osv.osv, ProductChangeMixin):
|
|||
"""
|
||||
if not type:
|
||||
return {'value': {
|
||||
'location_id': False,
|
||||
'location_dest_id': False
|
||||
}
|
||||
}
|
||||
produc_id = self.pool.get('stock.location').search(cr, uid, [('name','=','Production')])[0]
|
||||
if type == 'add':
|
||||
stock_id = self.pool.get('stock.location').search(cr, uid, [('name','=','Stock')])[0]
|
||||
to_invoice = False
|
||||
if guarantee_limit and datetime.strptime(date.today().strftime('%Y-%m-%d'), '%Y-%m-%d') > datetime.strptime(guarantee_limit, '%Y-%m-%d'):
|
||||
to_invoice=True
|
||||
|
||||
return {'value': {
|
||||
'to_invoice': to_invoice,
|
||||
'location_id': stock_id,
|
||||
'location_dest_id': produc_id
|
||||
}
|
||||
}
|
||||
return {'value': {
|
||||
'to_invoice': False,
|
||||
'location_id': produc_id,
|
||||
'location_id': False,
|
||||
'location_dest_id': False
|
||||
}
|
||||
}
|
||||
|
||||
product_id = self.pool.get('stock.location').search(cr, uid, [('name','=','Production')])[0]
|
||||
if type != 'add':
|
||||
return {'value': {
|
||||
'to_invoice': False,
|
||||
'location_id': product_id,
|
||||
'location_dest_id': False
|
||||
}
|
||||
}
|
||||
|
||||
stock_id = self.pool.get('stock.location').search(cr, uid, [('name','=','Stock')])[0]
|
||||
to_invoice = (guarantee_limit and
|
||||
datetime.strptime(guarantee_limit, '%Y-%m-%d') < datetime.now())
|
||||
return {'value': {
|
||||
'to_invoice': to_invoice,
|
||||
'location_id': stock_id,
|
||||
'location_dest_id': product_id
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -282,9 +282,6 @@
|
|||
</form>
|
||||
</field>
|
||||
</page>
|
||||
<page string="Roles Required">
|
||||
<field name="role_ids" colspan="4" nolabel="1"/>
|
||||
</page>
|
||||
<page string="Roles from Workflow">
|
||||
<field name="transition_ids" colspan="4" nolabel="1"/>
|
||||
</page>
|
||||
|
|
|
|||
|
|
@ -40,7 +40,6 @@
|
|||
-->
|
||||
|
||||
<record id="process_transition_supplierofproduct0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Supplier of the product"""" name="name"/>
|
||||
<field eval=""""1 or several supplier(s) can be linked to a product. All information stands in the product form."""" name="note"/>
|
||||
|
|
|
|||
|
|
@ -257,11 +257,12 @@
|
|||
<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>
|
||||
<field name="help">This is a hyerarchical structure of your product's categories, you can enter a category to browse all products in this category and his children.</field>
|
||||
</record>
|
||||
<menuitem
|
||||
action="product_category_action"
|
||||
id="product.menu_products_category"
|
||||
groups="base.group_extended"
|
||||
parent="base.menu_product"
|
||||
sequence="0"/>
|
||||
<record id="product_category_action_form" model="ir.actions.act_window">
|
||||
|
|
|
|||
|
|
@ -25,15 +25,13 @@ class misc_tools_installer(osv.osv_memory):
|
|||
_inherit = 'res.config.installer'
|
||||
|
||||
_columns = {
|
||||
'lunch':fields.boolean('Lunch',help='Helps to manage Lunch Orders.'),
|
||||
'subscription':fields.boolean('Recurring Documents',help='Helps to add subscription on documents.'),
|
||||
'survey':fields.boolean('Survey',help='Manages Custom Surveys.'),
|
||||
'idea':fields.boolean('Idea',help='Manages ideas and votes'),
|
||||
'audittrail':fields.boolean('Audit Trail',help="Lets you to track user's operations on specific Objects."),
|
||||
'lunch':fields.boolean('Lunch',help='A simple module to help you to manage Lunch orders.'),
|
||||
'subscription':fields.boolean('Recurring Documents',help='Helps to generate automatically recurring documents.'),
|
||||
'survey':fields.boolean('Survey',help='Allows you to organize surveys.'),
|
||||
'idea':fields.boolean('Ideas Box',help='Promote ideas of the employees, votes and discussion on best ideas.'),
|
||||
}
|
||||
_defaults = {
|
||||
'lunch': True,
|
||||
}
|
||||
|
||||
misc_tools_installer()
|
||||
|
||||
|
|
|
|||
|
|
@ -26,10 +26,9 @@
|
|||
</xpath>
|
||||
<group colspan="8">
|
||||
<field name="lunch"/>
|
||||
<field name="subscription"/>
|
||||
<field name="survey"/>
|
||||
<field name="idea"/>
|
||||
<field name="audittrail"/>
|
||||
<field name="survey"/>
|
||||
<field name="subscription" groups="base.group_extended"/>
|
||||
</group>
|
||||
</data>
|
||||
</field>
|
||||
|
|
|
|||
|
|
@ -3,12 +3,9 @@
|
|||
<data noupdate="1">
|
||||
|
||||
<!--
|
||||
Administrator shortcut
|
||||
Demo user startup menu
|
||||
-->
|
||||
<record id="base.user_root" model="res.users">
|
||||
<field name="action_id" ref="open_board_project"/>
|
||||
</record>
|
||||
Administrator shortcut
|
||||
Demo user startup menu
|
||||
-->
|
||||
|
||||
<record id="note_project" model="board.note">
|
||||
<field name="name">Don't forget the new development policies.</field>
|
||||
|
|
|
|||
|
|
@ -34,14 +34,10 @@ class project_installer(osv.osv_memory):
|
|||
'hr_timesheet_sheet': fields.boolean('Timesheets',
|
||||
help="Tracks and helps employees encode and validate timesheets "
|
||||
"and attendances."),
|
||||
'hr_timesheet_invoice': fields.boolean('Invoice Based on Hours',
|
||||
help="Helps generate invoices based on human resources "
|
||||
"costs and general expenses."),
|
||||
'project_timesheet': fields.boolean('Bill Time on Tasks',
|
||||
help="Helps generate invoices based on time spent on tasks, if activated on the project."),
|
||||
'account_budget': fields.boolean('Budgets',
|
||||
help="Helps accountants manage analytic and crossover budgets."),
|
||||
'project_messages': fields.boolean('Project Messages',
|
||||
help="Lets employees send messages to other members of the "
|
||||
"projects they're working on."),
|
||||
'project_issue': fields.boolean('Issues Tracker',
|
||||
help="Automatically synchronizes project tasks and crm cases."),
|
||||
# Methodologies
|
||||
|
|
@ -50,7 +46,7 @@ class project_installer(osv.osv_memory):
|
|||
"in the SCRUM methodology."),
|
||||
'project_gtd': fields.boolean('Getting Things Done',
|
||||
help="GTD is a methodology to efficiently organise yourself and your tasks. This module fully integrates GTD principle with OpenERP's project management."),
|
||||
}
|
||||
}
|
||||
|
||||
_defaults={
|
||||
'project_issue': True,
|
||||
|
|
|
|||
|
|
@ -2,20 +2,20 @@
|
|||
<openerp>
|
||||
<data>
|
||||
|
||||
<!--
|
||||
<!--
|
||||
Process
|
||||
-->
|
||||
|
||||
|
||||
<record id="process_process_tasksprocess0" model="process.process">
|
||||
<field eval="1" name="active"/>
|
||||
<field name="model_id" ref="project.model_project_task"/>
|
||||
<field eval=""""Tasks"""" name="name"/>
|
||||
</record>
|
||||
|
||||
<!--
|
||||
|
||||
<!--
|
||||
Process Node
|
||||
-->
|
||||
|
||||
|
||||
<record id="process_node_taskbydelegate0" model="process.node">
|
||||
<field name="menu_id" ref="project.menu_action_view_task"/>
|
||||
<field name="model_id" ref="project.model_project_task"/>
|
||||
|
|
@ -26,7 +26,7 @@
|
|||
<field eval=""""object.state in ('open', 'pending')"""" name="model_states"/>
|
||||
<field eval="1" name="flow_start"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_node_drafttask0" model="process.node">
|
||||
<field name="menu_id" ref="project.menu_action_view_task"/>
|
||||
<field name="model_id" ref="project.model_project_task"/>
|
||||
|
|
@ -37,7 +37,7 @@
|
|||
<field eval=""""object.state=='draft'"""" name="model_states"/>
|
||||
<field eval="0" name="flow_start"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_node_opentask0" model="process.node">
|
||||
<field name="menu_id" ref="project.menu_action_view_task"/>
|
||||
<field name="model_id" ref="project.model_project_task"/>
|
||||
|
|
@ -48,7 +48,7 @@
|
|||
<field eval=""""object.state=='open'"""" name="model_states"/>
|
||||
<field eval="0" name="flow_start"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_node_donetask0" model="process.node">
|
||||
<field name="menu_id" ref="project.menu_action_view_task"/>
|
||||
<field name="model_id" ref="project.model_project_task"/>
|
||||
|
|
@ -59,77 +59,74 @@
|
|||
<field eval=""""object.state=='done'"""" name="model_states"/>
|
||||
<field eval="0" name="flow_start"/>
|
||||
</record>
|
||||
|
||||
<!--
|
||||
|
||||
<!--
|
||||
Process Transition
|
||||
-->
|
||||
|
||||
|
||||
<record id="process_transition_delegate0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Delegate"""" name="name"/>
|
||||
<field eval=""""Delegates tasks to the other user"""" name="note"/>
|
||||
<field model="process.node" name="target_node_id" ref="process_node_drafttask0"/>
|
||||
<field model="process.node" name="source_node_id" ref="process_node_taskbydelegate0"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_transition_draftopentask0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Draft Open task"""" name="name"/>
|
||||
<field eval=""""From draft state, it will come into the open state."""" name="note"/>
|
||||
<field model="process.node" name="target_node_id" ref="process_node_opentask0"/>
|
||||
<field model="process.node" name="source_node_id" ref="process_node_drafttask0"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_transition_opendonetask0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Open Done Task"""" name="name"/>
|
||||
<field eval=""""When task is completed, it will come into the done state."""" name="note"/>
|
||||
<field model="process.node" name="target_node_id" ref="process_node_donetask0"/>
|
||||
<field model="process.node" name="source_node_id" ref="process_node_opentask0"/>
|
||||
</record>
|
||||
|
||||
|
||||
<!--
|
||||
|
||||
|
||||
<!--
|
||||
Process Action
|
||||
-->
|
||||
|
||||
|
||||
<record id="process_transition_action_draftopentask0" model="process.transition.action">
|
||||
<field eval=""""do_open"""" name="action"/>
|
||||
<field eval=""""object"""" name="state"/>
|
||||
<field eval=""""Open"""" name="name"/>
|
||||
<field name="transition_id" ref="process_transition_draftopentask0"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_transition_action_draftcanceltask0" model="process.transition.action">
|
||||
<field eval=""""do_cancel"""" name="action"/>
|
||||
<field eval=""""object"""" name="state"/>
|
||||
<field eval=""""Cancel"""" name="name"/>
|
||||
<field name="transition_id" ref="process_transition_draftopentask0"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_transition_action_openpendingtask0" model="process.transition.action">
|
||||
<field eval=""""do_pending"""" name="action"/>
|
||||
<field eval=""""object"""" name="state"/>
|
||||
<field eval=""""Set pending"""" name="name"/>
|
||||
<field name="transition_id" ref="process_transition_opendonetask0"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_transition_action_opendrafttask0" model="process.transition.action">
|
||||
<field eval=""""do_draft"""" name="action"/>
|
||||
<field eval=""""object"""" name="state"/>
|
||||
<field eval=""""Draft"""" name="name"/>
|
||||
<field name="transition_id" ref="process_transition_opendonetask0"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="process_transition_action_opencanceltask0" model="process.transition.action">
|
||||
<field eval=""""do_cancel"""" name="action"/>
|
||||
<field eval=""""object"""" name="state"/>
|
||||
<field eval=""""Cancel"""" name="name"/>
|
||||
<field name="transition_id" ref="process_transition_opendonetask0"/>
|
||||
</record>
|
||||
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
|
|
|
|||
|
|
@ -27,11 +27,11 @@
|
|||
<field name="project_issue"/>
|
||||
<field name="project_long_term" groups="base.group_extended"/>
|
||||
<field name="hr_timesheet_sheet"/>
|
||||
<field name="hr_timesheet_invoice"/>
|
||||
<field name="project_timesheet"/>
|
||||
<field name="account_budget" groups="base.group_extended"/>
|
||||
<field name="project_messages" groups="base.group_extended"/>
|
||||
<newline/>
|
||||
<separator string="Methodologies" colspan="4"/>
|
||||
<field name="project_scrum" groups="base.group_extended"/>
|
||||
<field name="project_scrum"/>
|
||||
<field name="project_gtd"/>
|
||||
</group>
|
||||
</data>
|
||||
|
|
|
|||
|
|
@ -22,7 +22,6 @@
|
|||
-->
|
||||
|
||||
<record id="process_transition_backlogtask0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Backlog Task"""" name="name"/>
|
||||
<field eval=""""From backlog create task."""" name="note"/>
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
""",
|
||||
'author': 'OpenERP SA',
|
||||
'website': 'http://www.openerp.com',
|
||||
'depends': ['base', 'project', 'hr_timesheet_sheet', 'hr_timesheet_invoice'],
|
||||
'depends': ['project', 'hr_timesheet_sheet', 'hr_timesheet_invoice'],
|
||||
'init_xml': [],
|
||||
'update_xml': ["security/ir.model.access.csv","process/project_timesheet_process.xml", "report/task_report_view.xml", "project_timesheet_view.xml"],
|
||||
'demo_xml': [],
|
||||
|
|
|
|||
|
|
@ -43,7 +43,6 @@
|
|||
-->
|
||||
|
||||
<record id="process_transition_filltimesheet0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Fill Timesheet"""" name="name"/>
|
||||
<field eval=""""Task summary is comes into the timesheet line"""" name="note"/>
|
||||
|
|
@ -52,7 +51,6 @@
|
|||
</record>
|
||||
|
||||
<record id="process_transition_taskencoding0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Task encoding"""" name="name"/>
|
||||
<field eval=""""Encode how much time u spent on your task"""" name="note"/>
|
||||
|
|
@ -61,7 +59,6 @@
|
|||
</record>
|
||||
|
||||
<record id="process_transition_taskinvoice0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Task invoice"""" name="name"/>
|
||||
<field eval=""""After task is completed, Create its invoice."""" name="note"/>
|
||||
|
|
|
|||
|
|
@ -138,14 +138,6 @@
|
|||
<field eval=""""Salesman"""" name="name"/>
|
||||
</record>
|
||||
|
||||
<record id="sale.trans_draft_router" model="workflow.transition">
|
||||
<field name="role_id" ref="res_roles_salesman0"/>
|
||||
</record>
|
||||
|
||||
<record id="sale.trans_wait_invoice_invoice_manual" model="workflow.transition">
|
||||
<field name="role_id" ref="res_roles_salesman0"/>
|
||||
</record>
|
||||
|
||||
<record id="process_transition_confirmquotation0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Confirm Quotation"""" name="name"/>
|
||||
|
|
@ -197,7 +189,6 @@
|
|||
</record>
|
||||
|
||||
<record id="process_transition_saleorderprocurement0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Procurement of sold material"""" name="name"/>
|
||||
<field eval=""""For every sale order line, a procurement order is created to supply the sold product."""" name="note"/>
|
||||
|
|
@ -206,7 +197,6 @@
|
|||
</record>
|
||||
|
||||
<record id="process_transition_saleinvoice0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""From a sale order"""" name="name"/>
|
||||
<field eval=""""A sale order generates an invoice, as soon as it is confirmed by the salesman. Depending on the Invoicing control of the sale order, the invoice is based on delivered or on ordered quantities."""" name="note"/>
|
||||
|
|
|
|||
|
|
@ -423,8 +423,14 @@ class sale_order(osv.osv):
|
|||
pay_term = order.payment_term.id
|
||||
else:
|
||||
pay_term = False
|
||||
invoiced_sale_line_ids = self.pool.get('sale.order.line').search(cr, uid, [('order_id', '=', order.id), ('invoiced', '=', True)], context=context)
|
||||
from_line_invoice_ids = []
|
||||
for invoiced_sale_line_id in self.pool.get('sale.order.line').browse(cr, uid, invoiced_sale_line_ids, context=context):
|
||||
for invoice_line_id in invoiced_sale_line_id.invoice_lines:
|
||||
if invoice_line_id.invoice_id.id not in from_line_invoice_ids:
|
||||
from_line_invoice_ids.append(invoice_line_id.invoice_id.id)
|
||||
for preinv in order.invoice_ids:
|
||||
if preinv.state not in ('cancel',):
|
||||
if preinv.state not in ('cancel',) and preinv.id not in from_line_invoice_ids:
|
||||
for preline in preinv.invoice_line:
|
||||
inv_line_id = self.pool.get('account.invoice.line').copy(cr, uid, preline.id, {'invoice_id': False, 'price_unit': -preline.price_unit})
|
||||
lines.append(inv_line_id)
|
||||
|
|
@ -471,7 +477,6 @@ class sale_order(osv.osv):
|
|||
lines = []
|
||||
for line in o.order_line:
|
||||
if line.invoiced:
|
||||
#raise osv.except_osv(_('Error !'), _('The Sale Order already has some lines invoiced. You should continue the billing process by line.'))
|
||||
continue
|
||||
elif (line.state in states):
|
||||
lines.append(line.id)
|
||||
|
|
|
|||
|
|
@ -39,7 +39,6 @@
|
|||
|
||||
|
||||
<record id="process_transition_crmopportunityquotation" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Crm opportunity quotation"""" name="name"/>
|
||||
<field eval=""""Opportunity goes into the quotation"""" name="note"/>
|
||||
|
|
@ -49,7 +48,6 @@
|
|||
|
||||
|
||||
<record id="process_transition_opportunityquotation0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Opportunity Quotation"""" name="name"/>
|
||||
<field eval=""""Opportunity convert into quotation"""" name="note"/>
|
||||
|
|
@ -58,7 +56,6 @@
|
|||
</record>
|
||||
|
||||
<record id="process_transition_opportunitypricelist0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Opportunity Pricelist"""" name="name"/>
|
||||
<field eval=""""Opporunity convert to the Pricelist"""" name="note"/>
|
||||
|
|
@ -67,7 +64,6 @@
|
|||
</record>
|
||||
|
||||
<record id="process_transition_opportunityanalytic0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Opportunity Analytic"""" name="name"/>
|
||||
<field eval=""""Analytic Account"""" name="note"/>
|
||||
|
|
|
|||
|
|
@ -180,10 +180,11 @@ class crm_make_sale(osv.osv_memory):
|
|||
'partner_id': fields.many2one('res.partner', 'Customer', required=True),
|
||||
'sale_order_line': fields.one2many('sale.order.make.line', 'opportunity_order_id', 'Product Line'),
|
||||
'analytic_account': fields.many2one('account.analytic.account', 'Analytic Account'),
|
||||
'close': fields.boolean('Close Case', help='Check this to close the case after having created the sale order.'),
|
||||
'close': fields.boolean('Close Opportunity', help='Check this to close the opportunity after having created the sale order.'),
|
||||
}
|
||||
_defaults = {
|
||||
'shop_id': _get_shop_id,
|
||||
'close': lambda *args: 1,
|
||||
'partner_id': _selectPartner,
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Create a Sale Order" >
|
||||
<group width="660" height="300">
|
||||
<group colspan="4">
|
||||
<field name="partner_id" required="1"/>
|
||||
<field name="shop_id" required="1" widget="selection"/>
|
||||
<field name="analytic_account" domain="[('parent_id','!=',False)]" />
|
||||
<field name="close" required="1"/>
|
||||
</group>
|
||||
<field name="analytic_account" domain="[('type','=','normal')]"
|
||||
groups="base.group_extended"/>
|
||||
<field name="close"/>
|
||||
</group>
|
||||
<field colspan="4" mode="tree,form,graph" name="sale_order_line" nolabel="1" widget="one2many_list">
|
||||
<form string="Sale Order Lines">
|
||||
<notebook>
|
||||
|
|
@ -65,7 +65,6 @@
|
|||
<button special="cancel" string="_Close" icon="gtk-cancel"/>
|
||||
<button name="makeOrder" string="_Create" type="object" icon='gtk-ok'/>
|
||||
</group>
|
||||
</group>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
|||
|
|
@ -913,7 +913,6 @@
|
|||
</page>
|
||||
<page string="Additional info" groups="base.group_extended,base.group_multi_company">
|
||||
<field name="auto_picking" groups="base.group_extended"/>
|
||||
<field name="invoice_state" groups="base.group_extended"/>
|
||||
<field name="date_done" groups="base.group_extended"/>
|
||||
<field name="move_type" groups="base.group_extended"/>
|
||||
<field name="type" groups="base.group_extended"/>
|
||||
|
|
|
|||
|
|
@ -1,8 +0,0 @@
|
|||
this is a test file:
|
||||
-------------------
|
||||
the purpose is to test the buidlbot engine
|
||||
|
||||
how to do?
|
||||
we simply gonna make several commit in a local branch, and also several commits in the main branch, then merge and see what happens
|
||||
|
||||
iii
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
1
|
||||
2
|
||||
3
|
||||
4
|
||||
5
|
||||
6
|
||||
7
|
||||
8
|
||||
Loading…
Reference in New Issue