Randhir Mayatra (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-addons9-apa-purchase_issue-rma into
lp:~openerp-dev/openobject-addons/trunk-addons9-purchase-apa.
Requested reviews:
Amit Patel (OpenERP) (apa-tiny)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons9-apa-purchase_issue-rma/+merge/124184
Hello Sir,
I have Improve the purchase issues
Thank you..
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons9-apa-purchase_issue-rma/+merge/124184
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-addons9-purchase-apa.
=== modified file 'purchase/purchase.py'
--- purchase/purchase.py 2012-09-11 14:16:50 +0000
+++ purchase/purchase.py 2012-09-13 12:32:30 +0000
@@ -318,7 +318,7 @@
for po in self.browse(cr, uid, ids, context=context):
pick_ids += [picking.id for picking in po.picking_ids]
- res = mod_obj.get_object_reference(cr, uid, 'stock', 'view_picking_in_form')
+ res = mod_obj.get_object_reference(cr, uid, 'stock', 'view_picking_form')
res_id = res and res[1] or False
return {
@@ -347,6 +347,7 @@
template_id = template and template[1] or False
res = mod_obj.get_object_reference(cr, uid, 'mail', 'email_compose_message_wizard_form')
res_id = res and res[1] or False
+<<<<<<< TREE
ctx = dict(context)
ctx.update({
'default_model': 'purchase.order',
@@ -354,6 +355,12 @@
'default_use_template': True,
'default_template_id': template_id,
})
+=======
+ ctx = dict(context, active_model='purchase.order', active_id=ids[0])
+ ctx.update({'mail.compose.template_id': template_id})
+ wf_service = netsvc.LocalService("workflow")
+ wf_service.trg_validate(uid, 'purchase.order',ids[0], 'send_rfq', cr)
+>>>>>>> MERGE-SOURCE
return {
'view_type': 'form',
'view_mode': 'form',
=== modified file 'purchase/purchase_view.xml'
--- purchase/purchase_view.xml 2012-09-11 13:07:01 +0000
+++ purchase/purchase_view.xml 2012-09-13 12:32:30 +0000
@@ -26,7 +26,9 @@
<menuitem
action="product.product_pricelist_action_for_purchase" id="menu_product_pricelist_action2_purchase"
parent="menu_purchase_config_pricelist" sequence="10" />
-
+ <menuitem
+ action="product.product_price_type_action" id="menu_product_pricelist_action2_purchase_type"
+ parent="menu_purchase_config_pricelist" sequence="60" />
<menuitem
id="menu_product_in_config_purchase" name="Products"
parent="menu_purchase_config_purchase" sequence="30" groups="base.group_no_one"/>
@@ -184,11 +186,11 @@
<button name="picking_ok" states="except_picking" string="Manually Corrected"/>
<button name="invoice_ok" states="except_invoice" string="Manually Corrected"/>
<button name="purchase_approve" states="confirmed" string="Approve Order" class="oe_highlight"/>
- <button name="view_invoice" string="Receive Invoice" type="object" attrs="{'invisible': ['|', ('invoice_method','=','picking'), '|', ('state','!=', 'approved'), ('invoiced','=',True) ]}" class="oe_highlight"/>
- <button name="view_picking" string="Receive Products" type="object" attrs="{'invisible': ['|', ('shipped','=',True), ('state','!=', 'approved')]}" class="oe_highlight"/>
+ <button name="view_invoice" string="Receive Invoice" type="object" states="draft,sent" attrs="{'invisible': ['|', ('invoice_method','=','picking'), '|', ('state','!=', 'approved'), ('invoiced','=',True) ]}" class="oe_highlight"/>
+ <button name="view_picking" string="Receive Products" type="object" states="confirmed,approved,done" class="oe_highlight"/>
<button name="action_cancel_draft" states="cancel,sent,confirmed" string="Set to Draft" type="object" />
<button name="purchase_cancel" states="draft,confirmed,sent" string="Cancel"/>
- <field name="state" widget="statusbar" statusbar_visible="draft,approved,done" statusbar_colors='{"except_picking":"red","except_invoice":"red","confirmed":"blue"}' readonly="1"/>
+ <field name="state" widget="statusbar" statusbar_visible="draft,approved,done,sent" statusbar_colors='{"except_picking":"red","except_invoice":"red","confirmed":"blue"}' readonly="1"/>
</header>
<sheet>
<div class="oe_title">
=== modified file 'purchase/res_config.py'
--- purchase/res_config.py 2012-08-22 12:15:15 +0000
+++ purchase/res_config.py 2012-09-13 12:32:30 +0000
@@ -62,6 +62,9 @@
help="""Purchase Requisitions are used when you want to request quotations from several suppliers for a given set of products.
You can configure per product if you directly do a Request for Quotation
to one supplier or if you want a purchase requisition to negotiate with several suppliers."""),
+ 'group_analytic_account_for_purchases': fields.boolean('analytic accounting for purchases',
+ implied_group='purchase.group_analytic_accounting',
+ help="Allows you to specify an analytic account on purchase orders."),
}
_defaults = {
=== modified file 'purchase/res_config_view.xml'
--- purchase/res_config_view.xml 2012-08-22 12:15:15 +0000
+++ purchase/res_config_view.xml 2012-09-13 12:32:30 +0000
@@ -77,6 +77,16 @@
</div>
</div>
</group>
+ <separator name="analytic_account" string="Analytic Accounting" invisible="1"/>
+ <group name="analytic_account_purchase" >
+ <label for="id" string="Purchase"/>
+ <div>
+ <div>
+ <field name="group_analytic_account_for_purchases" class="oe_inline"/>
+ <label for="group_analytic_account_for_purchases"/>
+ </div>
+ </div>
+ </group>
</form>
</field>
</record>
_______________________________________________
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
