Ajay Chauhan(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-fgi_purchase-cha into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-fgi_purchase-cha/+merge/135874
Hello,
I have solved issues related to purchase of 'FGI Various Issues'.
Thanks,
Ajay Chauhan
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-fgi_purchase-cha/+merge/135874
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-fgi_purchase-cha.
=== modified file 'account/product_view.xml'
--- account/product_view.xml 2012-10-18 07:24:56 +0000
+++ account/product_view.xml 2012-11-23 11:40:28 +0000
@@ -7,14 +7,14 @@
<field name="inherit_id" ref="product.product_normal_form_view"/>
<field name="arch" type="xml">
<notebook position="inside">
- <page string="Accounting" groups="account.group_account_user">
+ <page string="Accounting" groups="account.group_account_invoice">
<group name="properties">
<group>
- <field name="property_account_income" domain="[('type','<>','view'),('type','<>','consolidation')]" attrs="{'readonly':[('sale_ok','=',0)]}"/>
+ <field name="property_account_income" domain="[('type','<>','view'),('type','<>','consolidation')]" attrs="{'readonly':[('sale_ok','=',0)]}" groups="account.group_account_user"/>
<field name="taxes_id" colspan="2" attrs="{'readonly':[('sale_ok','=',0)]}" widget="many2many_tags"/>
</group>
<group>
- <field name="property_account_expense" domain="[('type','<>','view'),('type','<>','consolidation')]" />
+ <field name="property_account_expense" domain="[('type','<>','view'),('type','<>','consolidation')]" groups="account.group_account_user"/>
<field name="supplier_taxes_id" colspan="2" widget="many2many_tags"/>
</group>
</group>
=== modified file 'purchase/edi/purchase_order_action_data.xml'
--- purchase/edi/purchase_order_action_data.xml 2012-11-20 11:36:00 +0000
+++ purchase/edi/purchase_order_action_data.xml 2012-11-23 11:40:28 +0000
@@ -44,7 +44,7 @@
% if object.partner_ref:
Your reference: ${object.partner_ref}<br />
% endif
- % if object.user_id:
+ % if object.validator:
Your contact: <a href="mailto:${object.validator.email or ''}?subject=Order%20${object.name}">${object.validator.name}</a>
% endif
</p>
=== modified file 'purchase/purchase.py'
--- purchase/purchase.py 2012-11-20 11:36:00 +0000
+++ purchase/purchase.py 2012-11-23 11:40:28 +0000
@@ -190,6 +190,7 @@
'invoiced': fields.function(_invoiced, string='Invoice Received', type='boolean', help="It indicates that an invoice has been paid"),
'invoiced_rate': fields.function(_invoiced_rate, string='Invoiced', type='float'),
'invoice_method': fields.selection([('manual','Based on Purchase Order lines'),('order','Based on generated draft invoice'),('picking','Based on incoming shipments')], 'Invoicing Control', required=True,
+ readonly=True, states={'draft':[('readonly',False)], 'sent':[('readonly',False)]},
help="Based on Purchase Order lines: place individual lines in 'Invoice Control > Based on P.O. lines' from where you can selectively create an invoice.\n" \
"Based on generated invoice: create a draft invoice you can validate later.\n" \
"Bases on incoming shipments: let you create an invoice when receptions are validated."
@@ -1167,4 +1168,13 @@
product_template()
+class mail_compose_message(osv.osv):
+ _inherit = 'mail.compose.message'
+ def send_mail(self, cr, uid, ids, context=None):
+ context = context or {}
+ if context.get('default_model') == 'purchase.order' and context.get('default_res_id'):
+ wf_service = netsvc.LocalService("workflow")
+ wf_service.trg_validate(uid, 'purchase.order', context['default_res_id'], 'send_rfq', cr)
+ return super(mail_compose_message, self).send_mail(cr, uid, ids, context=context)
+
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'purchase/purchase_view.xml'
--- purchase/purchase_view.xml 2012-11-21 16:27:53 +0000
+++ purchase/purchase_view.xml 2012-11-23 11:40:28 +0000
@@ -654,7 +654,7 @@
<field name="inherit_id" ref="account.product_normal_form_view"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='property_account_expense']" position="replace" >
- <field name="property_account_expense" domain="[('type','<>','view'),('type','<>','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}" />
+ <field name="property_account_expense" domain="[('type','<>','view'),('type','<>','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}" groups="account.group_account_user"/>
</xpath>
<xpath expr="//field[@name='supplier_taxes_id']" position="replace" >
<field name="supplier_taxes_id" colspan="2" widget="many2many_tags" attrs="{'readonly':[('purchase_ok','=',0)]}"/>
=== modified file 'purchase/report/request_quotation.rml'
--- purchase/report/request_quotation.rml 2012-09-28 05:04:33 +0000
+++ purchase/report/request_quotation.rml 2012-11-23 11:40:28 +0000
@@ -88,6 +88,7 @@
<para style="terp_default_9">[[repeatIn(objects,'order')]]</para>
<para style="terp_default_9">[[ setLang(order.partner_id.lang) ]]</para>
<blockTable colWidths="250.0,59.0,221.0" style="Table_Address_Detail">
+ <tr></tr>
<tr>
<td>
<para style="terp_default_Bold_9">Expected Delivery address:</para>
=== modified file 'purchase/res_config.py'
--- purchase/res_config.py 2012-11-15 12:38:51 +0000
+++ purchase/res_config.py 2012-11-23 11:40:28 +0000
@@ -43,9 +43,6 @@
'group_costing_method':fields.boolean("Compute product cost price based on average cost",
implied_group='product.group_costing_method',
help="""Allows you to compute product cost price based on average cost."""),
- 'group_purchase_delivery_address': fields.boolean("Allow a different address for incoming products and invoicing",
- implied_group='purchase.group_delivery_invoice_address',
- help="Allows you to specify different delivery and invoice addresses on a purchase order."),
'module_warning': fields.boolean("Alerts by products or supplier",
help="""Allow to configure notification on products and trigger them when a user wants to purchase a given product or a given supplier.
Example: Product: this product is deprecated, do not purchase more than 5.
=== modified file 'purchase/res_config_view.xml'
--- purchase/res_config_view.xml 2012-09-17 10:01:52 +0000
+++ purchase/res_config_view.xml 2012-11-23 11:40:28 +0000
@@ -55,10 +55,6 @@
<label for="group_uom"/>
</div>
<div>
- <field name="group_purchase_delivery_address" class="oe_inline"/>
- <label for="group_purchase_delivery_address"/>
- </div>
- <div>
<field name="group_costing_method" class="oe_inline"/>
<label for="group_costing_method"/>
</div>
=== modified file 'purchase/security/purchase_security.xml'
--- purchase/security/purchase_security.xml 2012-09-16 15:05:17 +0000
+++ purchase/security/purchase_security.xml 2012-11-23 11:40:28 +0000
@@ -15,11 +15,6 @@
<field name="users" eval="[(4, ref('base.user_root'))]"/>
</record>
- <record id="group_delivery_invoice_address" model="res.groups">
- <field name="name">Addresses in Purchase Orders</field>
- <field name="category_id" ref="base.module_category_hidden"/>
- </record>
-
<record id="group_analytic_accounting" model="res.groups">
<field name="name">Analytic Accounting for Purchases</field>
<field name="category_id" ref="base.module_category_hidden"/>
=== modified file 'purchase_requisition/wizard/purchase_requisition_partner_view.xml'
--- purchase_requisition/wizard/purchase_requisition_partner_view.xml 2012-08-09 06:05:16 +0000
+++ purchase_requisition/wizard/purchase_requisition_partner_view.xml 2012-11-23 11:40:28 +0000
@@ -7,7 +7,7 @@
<field name="arch" type="xml">
<form string="Purchase Requisition" version="7.0">
<group>
- <field name="partner_id"/>
+ <field name="partner_id" context="{'default_supplier': 1, 'default_customer': 0}"/>
</group>
<footer>
<button name="create_order" string="Create Quotation" type="object" class="oe_highlight"/>
_______________________________________________
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
