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

[MERGE]

Browse Source 
bzr revid: hmo@tinyerp.com-20100830132623-23x03hqobof2ihj7
This commit is contained in:
Harry (OpenERP)
2010-08-30 18:56:23 +05:30
parent d51566542a f0d7dae0d7
commit 9689501109
3 changed files with 108 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/board/board_view.xml
+14 -1
View File
@@ -88,7 +88,7 @@
<field eval="1" name="priority"/>
<field name="arch" type="xml">
<form string="Dashboard">
<field name="name" select="1"/>
<field name="name"/>
<button colspan="2"
name="%(action_board_menu_create)d"
string="Create Menu" type="action"
@@ -113,6 +113,18 @@
</form>
</field>
</record>
<record id="view_board_search" model="ir.ui.view">
<field name="name">board.board.search</field>
<field name="model">board.board</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Dashboard">
<field name="name"/>
<field name="line_ids"/>
</search>
</field>
</record>
<!-- Action for DashBoard Definition form -->
@@ -121,6 +133,7 @@
<field name="res_model">board.board</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="search_view_id" ref="view_board_search"/>
</record>
<menuitem
addons/mrp/test/mrp_procurement.yml
+2 -2
View File
@@ -318,7 +318,7 @@
from tools.translate import _
prod_obj = self.pool.get('mrp.production')
prod_ids = prod_obj.search(cr, uid, [('product_id.name','=','Shirt')])
self.do_produce(cr, uid, [1], context={'active_ids': prod_ids})
self.do_produce(cr, uid, [ref('mrp_product_produce0')], context={'active_ids': prod_ids})
-
I create record for remaining products with quantity 35.00.
-
@@ -334,7 +334,7 @@
from tools.translate import _
stock_obj = self.pool.get('stock.move')
stock_ids = stock_obj.search(cr, uid, [('product_id.name','=','Buttons')])
self.do_move_consume(cr, uid, [1], context={'active_ids': stock_ids})
self.do_move_consume(cr, uid, [ref('stock_move_consume0')], context={'active_ids': stock_ids})
-
And finally production order is done.
-
addons/process/process_view.xml
+92 -143
View File
@@ -15,10 +15,10 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Process">
<group colspan="4" string="Details">
<field name="name" select="1"/>
<group colspan="4" col="6">
<field name="name"/>
<field name="model_id"/>
<field name="active"/>
<field name="model_id" select="1"/>
</group>
<notebook colspan="4">
<page string="Nodes">
@@ -30,80 +30,54 @@
<field name="flow_start"/>
</tree>
<form string="Process Node">
<group colspan="4" string="Details">
<field name="name" select="1"/>
<group colspan="4" col="4">
<field name="name"/>
<field name="flow_start"/>
<field name="process_id" readonly="1" required="0"/> <!-- used by transition_out -->
<newline/>
<field name="model_id" select="1"/>
<field name="menu_id"/>
<newline/>
<field name="kind" select="1"/>
<field name="help_url" widget="url"/>
<field name="model_states"/>
<field name="subflow_id" domain="[('name', '!=', parent.name)]" attrs="{'readonly':[('kind','=','state')]}"/>
<field name="subflow_id" attrs="{'invisible':[('kind','!=','subflow')]}"/>
</group>
<notebook colspan="4">
<page string="Outgoing Transitions">
<field name="transition_out" colspan="4" nolabel="1">
<tree string="Transitions">
<field name="name"/>
<field name="target_node_id"/>
</tree>
<form string="Transition">
<group colspan="4" string="Details">
<field name="name"/>
<newline/>
<field name="target_node_id" domain="[('process_id', '=', parent.process_id)]"/>
</group>
<notebook colspan="4">
<page string="Buttons">
<field name="action_ids" colspan="4" nolabel="1">
<tree string="Actions">
<field name="name"/>
<field name="state"/>
<field name="action"/>
</tree>
<form string="Actions">
<field name="name" colspan="4"/>
<newline/>
<field name="state"/>
<field name="action"/>
</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>
<page string="Extra Information">
<field name="note" colspan="4" nolabel="1"/>
</page>
</notebook>
</form>
</field>
</page>
<page string="Conditions">
<field name="condition_ids" nolabel="1" colspan="4">
<tree string="Conditions">
<field name="name"/>
<field name="model_id"/>
<field name="model_states"/>
</tree>
<form string="Condition">
<field name="name"/>
<field name="model_id"/>
<newline/>
<field name="model_states" colspan="4"/>
</form>
</field>
</page>
<page string="Extra Information">
<field name="note" nolabel="1" colspan="4"/>
</page>
</notebook>
<page string="Properties">
<group colspan="4" col="6">
<field name="model_id" select="1"/>
<field name="menu_id"/>
<field name="help_url" widget="url"/>
</group>
<separator string="Conditions" colspan="4"/>
<field name="model_states"/>
<field name="condition_ids" nolabel="1" colspan="4">
<tree string="Other Conditions" editable="top">
<field name="name"/>
<field name="model_id"/>
<field name="model_states"/>
</tree>
</field>
</page>
<page string="Transitions">
<group colspan="4" col="4">
<group colspan="2" col="2">
<field name="transition_in" nolabel="1" height="400">
<tree string="Incoming Transitions">
<field name="name"/>
<field name="source_node_id"/>
</tree>
</field>
</group>
<group colspan="2" col="2">
<field name="transition_out" nolabel="1" height="400">
<tree string="Outgoing Transitions">
<field name="name"/>
<field name="target_node_id"/>
</tree>
</field>
</group>
</group>
</page>
<page string="Notes">
<field name="note" nolabel="1" colspan="4"/>
</page>
</notebook>
</form>
</field>
</page>
@@ -180,80 +154,55 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Process Node">
<group colspan="4" string="Details">
<field name="name" select="1"/>
<field name="flow_start"/>
<group colspan="4" col="6">
<field name="name"/>
<field name="process_id"/>
<newline/>
<field name="model_id" select="1"/>
<field name="menu_id"/>
<newline/>
<field name="flow_start"/>
<field name="kind" select="1"/>
<field name="help_url" widget="url"/>
<field name="model_states"/>
<field name="subflow_id" attrs="{'readonly':[('kind','=','state')]}"/>
<field name="subflow_id" attrs="{'invisible':[('kind','!=','subflow')]}"/>
</group>
<notebook colspan="4">
<page string="Outgoing Transitions">
<field name="transition_out" colspan="4" nolabel="1">
<tree string="Transitions">
<field name="name"/>
<field name="target_node_id"/>
</tree>
<form string="Transition">
<group colspan="4" string="Details">
<field name="name"/>
<newline/>
<field name="target_node_id" domain="[('process_id', '=', parent.process_id)]"/>
</group>
<notebook colspan="4">
<page string="Buttons">
<field name="action_ids" colspan="4" nolabel="1">
<tree string="Actions">
<field name="name"/>
<field name="state"/>
<field name="action"/>
</tree>
<form string="Actions">
<field name="name" colspan="4"/>
<newline/>
<field name="state"/>
<field name="action"/>
</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>
<page string="Extra Information">
<field name="note" colspan="4" nolabel="1"/>
</page>
</notebook>
</form>
</field>
</page>
<page string="Conditions">
<field name="condition_ids" nolabel="1" colspan="4">
<tree string="Conditions">
<field name="name"/>
<field name="model_id"/>
<field name="model_states"/>
</tree>
<form string="Condition">
<field name="name"/>
<field name="model_id"/>
<newline/>
<field name="model_states" colspan="4"/>
</form>
</field>
</page>
<page string="Extra Information">
<field name="note" nolabel="1" colspan="4"/>
</page>
</notebook>
<page string="Properties">
<group colspan="4" col="6">
<field name="model_id" select="1"/>
<field name="menu_id"/>
<field name="help_url" widget="url"/>
</group>
<separator string="Conditions" colspan="4"/>
<field name="model_states"/>
<field name="condition_ids" nolabel="1" colspan="4">
<tree string="Other Conditions" editable="top">
<field name="name"/>
<field name="model_id"/>
<field name="model_states"/>
</tree>
</field>
</page>
<page string="Transitions">
<group colspan="4" col="4">
<group colspan="2" col="2">
<field name="transition_in" nolabel="1" height="400">
<tree string="Incoming Transitions">
<field name="name"/>
<field name="source_node_id"/>
</tree>
</field>
</group>
<group colspan="2" col="2">
<field name="transition_out" nolabel="1" height="400">
<tree string="Outgoing Transitions">
<field name="name"/>
<field name="target_node_id"/>
</tree>
</field>
</group>
</group>
</page>
<page string="Notes">
<field name="note" nolabel="1" colspan="4"/>
</page>
</notebook>
</form>
</field>
</record>