[MERGE] OPW 575178: process: node conditions have priority over model states

  - process node conditions defined which nodes can be reached in the current
    context, so nodes which doesn't fullfill the conditions should stay gray
    even if ``model_states`` eval to True.

bzr revid: xal@openerp.com-20120716084849-k6c0gdgz3gh8t8dc

diff --cc addons/purchase/process/purchase_process.xml
index ddf557f,e01f6a4..58ad878
--- 1/addons/purchase/process/purchase_process.xml
--- 2/addons/purchase/process/purchase_process.xml
+++ b/addons/purchase/process/purchase_process.xml
@@@ -135,7 -135,7 +135,7 @@@
          <record id="process_condition_conditionorigin" model="process.condition">
              <field name="model_id" ref="purchase.model_purchase_order"/>
              <field name="node_id" ref="process_node_draftpurchaseorder1"/>
-             <field eval="&quot;&quot;&quot;object.origin==''&quot;&quot;&quot;" name="model_states"/>
 -            <field eval="&quot;&quot;&quot;object.origin==False&quot;&quot;&quot;" name="model_states"/>
++            <field eval="&quot;&quot;&quot;not object.origin&quot;&quot;&quot;" name="model_states"/>
              <field eval="&quot;&quot;&quot;condition_origin&quot;&quot;&quot;" name="name"/>
          </record>