diff options
| author | Quentin (OpenERP) <qdp-launchpad@openerp.com> | 2012-10-11 19:13:28 +0200 |
|---|---|---|
| committer | Quentin (OpenERP) <qdp-launchpad@openerp.com> | 2012-10-11 19:13:28 +0200 |
| commit | f830a534d67cd34dc4b98f9207cbaab6fd80e966 (patch) | |
| tree | 9bb89fbd8615ed18d0f270839d262b35db3c9431 | |
| parent | 2f31d1a2ed3b9a190555e8851f0b28b386771dd0 (diff) | |
| parent | 6eaf6337adeba22e4e66811538bf25b78c7bbe3b (diff) | |
[MERGE] staging branch with several small fixes
bzr revid: qdp-launchpad@openerp.com-20121011171328-an6udr3wulgza86c
| -rw-r--r-- | addons/project/project.py | 3 | ||||
| -rw-r--r-- | addons/project/project_view.xml | 2 | ||||
| -rw-r--r-- | addons/purchase/purchase_view.xml | 5 |
3 files changed, 5 insertions, 5 deletions
diff --git a/addons/project/project.py b/addons/project/project.py index 58431ffd061..1451f2d7938 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -510,8 +510,7 @@ def Project(): model_name=vals.get('alias_model', 'project.task'), context=context) vals['alias_id'] = alias_id - if vals.get('partner_id', False): - vals['type'] = 'contract' + vals['type'] = 'contract' project_id = super(project, self).create(cr, uid, vals, context) mail_alias.write(cr, uid, [vals['alias_id']], {'alias_defaults': {'project_id': project_id} }, context) self.create_send_note(cr, uid, [project_id], context=context) diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 03c0ee2440b..4c6d3b6ac09 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -63,7 +63,7 @@ <field name="arch" type="xml"> <form string="Project" version="7.0"> <header> - <button name="set_done" string="Done" type="object" states="open,pending"/> + <button name="set_done" string="Close Project" type="object" states="open,pending"/> <button name="set_open" string="Re-open project" type="object" states="pending" class="oe_highlight"/> <button name="set_open" string="Re-open project" type="object" states="cancelled,close"/> <button name="set_pending" string="Pending" type="object" states="open"/> diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml index 5070a38bd9b..6d1ad931c71 100644 --- a/addons/purchase/purchase_view.xml +++ b/addons/purchase/purchase_view.xml @@ -198,8 +198,9 @@ <field name="arch" type="xml"> <form string="Purchase Order" version="7.0"> <header> - <button name="purchase_confirm" states="draft,sent" string="Confirm Order" class="oe_highlight"/> - <button name="wkf_send_rfq" states="draft" string="Send RFQ" type="object" context="{'send_rfq':True}"/> + <button name="wkf_send_rfq" states="draft" string="Send RFQ" type="object" context="{'send_rfq':True}" class="oe_highlight"/> + <button name="purchase_confirm" states="draft" string="Confirm Order"/> + <button name="purchase_confirm" states="sent" string="Confirm Order" class="oe_highlight"/> <button name="wkf_send_rfq" states="confirmed" string="Resend Purchase Order" type="object" class="oe_highlight"/> <button name="action_cancel" states="except_picking,except_invoice" string="Cancel" type="object" /> <button name="picking_ok" states="except_picking" string="Manually Corrected"/> |