minor changes in process
bzr revid: solanki.priyesh@gmail.com-20081013133037-tp7enmbx9vf8ocpy
This commit is contained in:
parent
92ab49dee4
commit
eab27019cc
|
@ -67,7 +67,7 @@
|
|||
"product_view.xml",
|
||||
"account_assert_test.xml",
|
||||
"process/invoice_process.xml",
|
||||
"process/statement_process.xml"
|
||||
"process/statement_process.xml",
|
||||
],
|
||||
"translations" : {
|
||||
"fr": "i18n/french_fr.csv"
|
||||
|
|
|
@ -23,6 +23,7 @@
|
|||
<field eval=""""Analytic"""" name="name"/>
|
||||
<field eval=""""From analytic accounts, It creates invoice."""" name="note"/>
|
||||
<field name="process_id" ref="process_process_invoiceworkflow0"/>
|
||||
<field name="subflow_id" ref="process_process_invoiceworkflow0"/>
|
||||
<field eval=""""object.state in ('draft', 'open', 'pending', 'close')"""" name="model_states"/>
|
||||
<field eval="1" name="flow_start"/>
|
||||
</record>
|
||||
|
@ -62,10 +63,11 @@
|
|||
<record id="process_node_bankstatement0" model="process.node">
|
||||
<field name="menu_id" ref="account.menu_bank_statement_tree2"/>
|
||||
<field name="model_id" ref="account.model_account_bank_statement"/>
|
||||
<field eval=""""subflow"""" name="kind"/>
|
||||
<field eval=""""state"""" name="kind"/>
|
||||
<field eval=""""Bank Statement"""" name="name"/>
|
||||
<field eval=""""Statement encoding produces payment entries"""" name="note"/>
|
||||
<field name="process_id" ref="process_process_invoiceworkflow0"/>
|
||||
<!-- <field name="subflow_id" ref="process_process_statementworkflow0"/>-->
|
||||
<field eval=""""object.state=='draft'"""" name="model_states"/>
|
||||
<field eval="1" name="flow_start"/>
|
||||
</record>
|
||||
|
@ -102,7 +104,7 @@
|
|||
<field eval=""""object.state=='paid'"""" name="model_states"/>
|
||||
<field eval="0" name="flow_start"/>
|
||||
</record>
|
||||
|
||||
|
||||
<!--
|
||||
Process Transition
|
||||
-->
|
||||
|
|
|
@ -78,10 +78,11 @@
|
|||
<field eval=""""Reconciliation of Entries"""" name="name"/>
|
||||
<field eval=""""Reconcilation of the entries with invoice."""" name="note"/>
|
||||
<field name="process_id" ref="process_process_statementworkflow0"/>
|
||||
<field name="subflow_id" ref="account.process_process_invoiceworkflow0"/>
|
||||
<field eval=""""object.state=='valid'"""" name="model_states"/>
|
||||
<field eval="0" name="flow_start"/>
|
||||
</record>
|
||||
|
||||
|
||||
<!--
|
||||
Process Transition
|
||||
-->
|
||||
|
@ -131,6 +132,15 @@
|
|||
<field model="process.node" name="source_node_id" ref="process_node_accountingstatemententries0"/>
|
||||
</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=""""Statement Entries"""" name="name"/>
|
||||
<field eval=""""From statement, create entries"""" name="note"/>
|
||||
<field model="process.node" name="target_node_id" ref="process_node_paymententries0"/>
|
||||
<field model="process.node" name="source_node_id" ref="process_node_bankstatement0"/>
|
||||
</record>
|
||||
|
||||
<!--
|
||||
Process Action
|
||||
-->
|
||||
|
|
|
@ -14,7 +14,9 @@
|
|||
""",
|
||||
"depends" : ["base", "process"],
|
||||
"init_xml" : ["document_data.xml"],
|
||||
"update_xml" : ["document_view.xml"],
|
||||
"update_xml" : ["document_view.xml",
|
||||
# "process/document_process.xml"
|
||||
],
|
||||
"demo_xml" : ["document_demo.xml"],
|
||||
"active": False,
|
||||
"installable": True
|
||||
|
|
|
@ -89,6 +89,7 @@
|
|||
<field eval=""""Timesheet"""" name="name"/>
|
||||
<field eval=""""Defines the task work entry into timesheet line"""" name="note"/>
|
||||
<field name="process_id" ref="process_process_hrtimesheetworkflow0"/>
|
||||
<field name="subflow_id" ref="hr_timesheet.process_process_timesheetworkflow0"/>
|
||||
<field eval=""""object.state=='draft'"""" name="model_states"/>
|
||||
<field eval="0" name="flow_start"/>
|
||||
</record>
|
||||
|
|
|
@ -858,7 +858,7 @@ class mrp_procurement(osv.osv):
|
|||
return True
|
||||
return False
|
||||
|
||||
def action_confirm(self, cr, uid, ids):
|
||||
def action_confirm(self, cr, uid, ids, context={}):
|
||||
for procurement in self.browse(cr, uid, ids):
|
||||
if procurement.product_id.type in ('product', 'consu'):
|
||||
if not procurement.move_id:
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
<?xml version="1.0" ?>
|
||||
<openerp>
|
||||
<data>
|
||||
|
||||
|
@ -43,6 +42,7 @@
|
|||
<field eval=""""Procurements"""" name="name"/>
|
||||
<field eval=""""Procurement Orders"""" name="note"/>
|
||||
<field name="process_id" ref="purchase.process_process_purchaseworkflow0"/>
|
||||
<field name="subflow_id" ref="process_process_procurementworkflow0"/>
|
||||
<field eval=""""object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting') """" name="model_states"/>
|
||||
<field eval="1" name="flow_start"/>
|
||||
</record>
|
||||
|
@ -54,6 +54,7 @@
|
|||
<field eval=""""Production order"""" name="name"/>
|
||||
<field eval=""""Procurement for raw materials"""" name="note"/>
|
||||
<field name="process_id" ref="process_process_procurementworkflow0"/>
|
||||
<field name="subflow_id" ref="process_process_procurementworkflow0"/>
|
||||
<field eval=""""object.state in ('draft', 'picking_except', 'confirmed', 'ready', 'in_production', 'cancel', 'done')"""" name="model_states"/>
|
||||
<field eval="1" name="flow_start"/>
|
||||
</record>
|
||||
|
@ -109,6 +110,7 @@
|
|||
<field eval=""""Subcontracting"""" name="name"/>
|
||||
<field eval=""""Procure method is purchase"""" name="note"/>
|
||||
<field name="process_id" ref="process_process_procurementworkflow0"/>
|
||||
<field name="subflow_id" ref="purchase.process_process_purchaseworkflow0"/>
|
||||
<field eval=""""object.state=='draft'"""" name="model_states"/>
|
||||
<field eval="0" name="flow_start"/>
|
||||
</record>
|
||||
|
@ -153,6 +155,7 @@
|
|||
<field eval=""""Stockable request"""" name="name"/>
|
||||
<field eval=""""If procure method is purchase"""" name="note"/>
|
||||
<field name="process_id" ref="process_process_procurementworkflow0"/>
|
||||
<field name="subflow_id" ref="purchase.process_process_purchaseworkflow0"/>
|
||||
<field eval=""""object.state=='draft'"""" name="model_states"/>
|
||||
<field eval="0" name="flow_start"/>
|
||||
</record>
|
||||
|
@ -164,6 +167,7 @@
|
|||
<field eval=""""Stockable production"""" name="name"/>
|
||||
<field eval=""""If procure method is produce"""" name="note"/>
|
||||
<field name="process_id" ref="process_process_procurementworkflow0"/>
|
||||
<field name="subflow_id" ref="process_process_procurementworkflow0"/>
|
||||
<field eval=""""object.state=='confirmed'"""" name="model_states"/>
|
||||
<field eval="0" name="flow_start"/>
|
||||
</record>
|
||||
|
|
|
@ -9,10 +9,11 @@
|
|||
<record id="process_node_tasks0" model="process.node">
|
||||
<field name="menu_id" ref="project.menu_action_view_task"/>
|
||||
<field name="model_id" ref="project.model_project_task"/>
|
||||
<field eval=""""state"""" name="kind"/>
|
||||
<field eval=""""subflow"""" name="kind"/>
|
||||
<field eval=""""Tasks"""" name="name"/>
|
||||
<field eval=""""In case you sell services on sale order (task subflow)"""" name="note"/>
|
||||
<field name="process_id" ref="sale.process_process_salesworkflow0"/>
|
||||
<field name="subflow_id" ref="project.process_process_tasksworkflow0"/>
|
||||
<field eval=""""object.state=='draft'"""" name="model_states"/>
|
||||
<field eval="0" name="flow_start"/>
|
||||
</record>
|
||||
|
@ -35,6 +36,7 @@
|
|||
<field eval=""""Procure task"""" name="name"/>
|
||||
<field eval=""""If Procure method is produce"""" name="note"/>
|
||||
<field name="process_id" ref="mrp.process_process_procurementworkflow0"/>
|
||||
<field name="subflow_id" ref="project.process_process_tasksworkflow0"/>
|
||||
<field eval=""""object.state=='draft'"""" name="model_states"/>
|
||||
<field eval="0" name="flow_start"/>
|
||||
</record>
|
||||
|
|
|
@ -23,6 +23,7 @@
|
|||
<field eval=""""Purchase Order"""" name="name"/>
|
||||
<field eval=""""After confirming purchase order, it is approved by supplier."""" name="note"/>
|
||||
<field name="process_id" ref="account.process_process_invoiceworkflow0"/>
|
||||
<field name="subflow_id" ref="process_process_purchaseworkflow0"/>
|
||||
<field eval=""""object.state=='draft'"""" name="model_states"/>
|
||||
<field eval="1" name="flow_start"/>
|
||||
</record>
|
||||
|
@ -67,6 +68,7 @@
|
|||
<field eval=""""Invoice Control"""" name="name"/>
|
||||
<field eval=""""Draft invoices are pre-generated for control."""" name="note"/>
|
||||
<field name="process_id" ref="process_process_purchaseworkflow0"/>
|
||||
<field name="subflow_id" ref="account.process_process_invoiceworkflow0"/>
|
||||
<field eval=""""object.state=='draft'"""" name="model_states"/>
|
||||
<field eval="0" name="flow_start"/>
|
||||
</record>
|
||||
|
@ -89,6 +91,7 @@
|
|||
<field eval=""""Invoice after packing"""" name="name"/>
|
||||
<field eval=""""In case you control based on delivery"""" name="note"/>
|
||||
<field name="process_id" ref="process_process_purchaseworkflow0"/>
|
||||
<field name="subflow_id" ref="account.process_process_invoiceworkflow0"/>
|
||||
<field eval=""""object.state=='draft'"""" name="model_states"/>
|
||||
<field eval="0" name="flow_start"/>
|
||||
</record>
|
||||
|
|
|
@ -23,6 +23,7 @@
|
|||
<field eval=""""Order"""" name="name"/>
|
||||
<field eval=""""After confirming order, Create the invoice."""" name="note"/>
|
||||
<field name="process_id" ref="account.process_process_invoiceworkflow0"/>
|
||||
<field name="subflow_id" ref="process_process_salesworkflow0"/>
|
||||
<field eval=""""object.state=='draft'"""" name="model_states"/>
|
||||
<field eval="1" name="flow_start"/>
|
||||
</record>
|
||||
|
@ -34,6 +35,7 @@
|
|||
<field eval=""""Sale Order Procurement"""" name="name"/>
|
||||
<field eval=""""Procurement for each line"""" name="note"/>
|
||||
<field name="process_id" ref="mrp.process_process_procurementworkflow0"/>
|
||||
<field name="subflow_id" ref="process_process_salesworkflow0"/>
|
||||
<field eval=""""object.state in ('draft', 'waiting_date', 'manual', 'progress', 'shipping_except', 'invoice_except', 'done', 'cancel')"""" name="model_states"/>
|
||||
<field eval="1" name="flow_start"/>
|
||||
</record>
|
||||
|
@ -85,10 +87,11 @@
|
|||
<record id="process_node_invoice0" model="process.node">
|
||||
<field name="menu_id" ref="account.menu_invoice_draft"/>
|
||||
<field name="model_id" ref="account.model_account_invoice"/>
|
||||
<field eval=""""state"""" name="kind"/>
|
||||
<field eval=""""subflow"""" name="kind"/>
|
||||
<field eval=""""Invoice"""" name="name"/>
|
||||
<field eval=""""In case you invoice based on sale order."""" name="note"/>
|
||||
<field name="process_id" ref="process_process_salesworkflow0"/>
|
||||
<field name="subflow_id" ref="account.process_process_invoiceworkflow0"/>
|
||||
<field eval=""""object.state=='draft'"""" name="model_states"/>
|
||||
<field eval="0" name="flow_start"/>
|
||||
</record>
|
||||
|
@ -96,10 +99,11 @@
|
|||
<record id="process_node_invoiceafterdelivery0" model="process.node">
|
||||
<field name="menu_id" ref="account.menu_invoice_draft"/>
|
||||
<field name="model_id" ref="account.model_account_invoice"/>
|
||||
<field eval=""""state"""" name="kind"/>
|
||||
<field eval=""""subflow"""" name="kind"/>
|
||||
<field eval=""""Invoice after delivery"""" name="name"/>
|
||||
<field eval=""""In case you invoice based on deliveries (subflow)"""" name="note"/>
|
||||
<field name="process_id" ref="process_process_salesworkflow0"/>
|
||||
<field name="subflow_id" ref="account.process_process_invoiceworkflow0"/>
|
||||
<field eval=""""object.state=='draft'"""" name="model_states"/>
|
||||
<field eval="0" name="flow_start"/>
|
||||
</record>
|
||||
|
@ -123,7 +127,7 @@
|
|||
<field eval=""""Salesman"""" name="name"/>
|
||||
</record>
|
||||
|
||||
<record id="sale.trans_draft_router" model="workflow.transition">
|
||||
<record id="sale.trans_router_wait_ship" model="workflow.transition">
|
||||
<field name="role_id" ref="res_roles_salesman0"/>
|
||||
</record>
|
||||
|
||||
|
|
Loading…
Reference in New Issue