Nimesh Contractor(Open ERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-improve-purchase-requisition-view-atp-add_open_chatter-nco
into
lp:~openerp-dev/openobject-addons/trunk-improve-purchase-requisition-view-atp.
Requested reviews:
Atul Patel(OpenERP) (atp-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-improve-purchase-requisition-view-atp-add_open_chatter-nco/+merge/108288
Hello sir,
I have resolve the conflicts.
Thanks,
NCO.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-improve-purchase-requisition-view-atp-add_open_chatter-nco/+merge/108288
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-improve-purchase-requisition-view-atp.
=== modified file 'purchase_requisition/purchase_requisition.py'
--- purchase_requisition/purchase_requisition.py 2012-05-31 09:59:13 +0000
+++ purchase_requisition/purchase_requisition.py 2012-06-01 06:14:27 +0000
@@ -31,6 +31,7 @@
class purchase_requisition(osv.osv):
_name = "purchase.requisition"
_description="Purchase Requisition"
+ _inherit = "mail.thread"
_columns = {
'name': fields.char('Requisition Reference', size=32,required=True),
'origin': fields.char('Source', size=32),
=== modified file 'purchase_requisition/purchase_requisition_view.xml'
--- purchase_requisition/purchase_requisition_view.xml 2012-06-01 04:39:33 +0000
+++ purchase_requisition/purchase_requisition_view.xml 2012-06-01 06:14:27 +0000
@@ -72,7 +72,7 @@
<group colspan="2">
<label colspan="2" string=""/>
<button name="%(action_purchase_requisition_partner)d" string="Request a Quotation" type="action" icon="gtk-execute"
- attrs="{'readonly': [('state', '=', 'done')]}"/>
+ attrs="{'readonly': [('state', '=', 'done')],'invisible': [('state', 'in', ('done','draft','cancel')),('line_ids','=',0)]}"/>
</group>
<separator colspan="4" string="Quotations"/>
<field colspan="4" name="purchase_ids" nolabel="1" mode="tree,form">
@@ -91,11 +91,13 @@
</tree>
</field>
</page>
-
<page string="Notes">
<field name="description" colspan="4" nolabel="1"/>
</page>
</notebook>
+ <div class="oe_form_bottom">
+ <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
+ </div>
</sheet>
</form>
</field>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
