From ba567b3850fc2c9efb876dbe3160d4561d23e64c Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Mon, 17 Sep 2012 17:01:13 +0530 Subject: [PATCH 1/5] [IMP]purchase : added name field in analytic plan,improve string of dashboard and invoice control, make purchase line editable when analytic distribution is available, added act_window of create invoice for incoming shipment bzr revid: mma@tinyerp.com-20120917113113-irc6taebmwqrfxys --- .../account_analytic_plans.py | 1 + .../account_analytic_plans_view.xml | 4 +++ addons/purchase/purchase.py | 2 +- addons/purchase/purchase_view.xml | 2 +- .../purchase_analytic_plans_view.xml | 25 +++++++++++++++++++ .../board_purchase_view.xml | 4 +-- .../wizard/stock_invoice_onshipping_view.xml | 10 ++++++++ 7 files changed, 44 insertions(+), 4 deletions(-) diff --git a/addons/account_analytic_plans/account_analytic_plans.py b/addons/account_analytic_plans/account_analytic_plans.py index 234d6fe0cf8..46a06b45547 100644 --- a/addons/account_analytic_plans/account_analytic_plans.py +++ b/addons/account_analytic_plans/account_analytic_plans.py @@ -263,6 +263,7 @@ class account_analytic_plan_instance_line(osv.osv): _name = "account.analytic.plan.instance.line" _description = "Analytic Instance Line" _columns = { + 'name': fields.char('Plan Name', size=64), 'plan_id': fields.many2one('account.analytic.plan.instance', 'Plan Id'), 'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account', required=True, domain=[('type','<>','view')]), 'rate': fields.float('Rate (%)', required=True), diff --git a/addons/account_analytic_plans/account_analytic_plans_view.xml b/addons/account_analytic_plans/account_analytic_plans_view.xml index 76d6aeed7b8..17eb61148b3 100644 --- a/addons/account_analytic_plans/account_analytic_plans_view.xml +++ b/addons/account_analytic_plans/account_analytic_plans_view.xml @@ -112,10 +112,12 @@ +
+ @@ -159,6 +161,7 @@
+ @@ -172,6 +175,7 @@ account.analytic.plan.instance.line + diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index 1f6279af3ad..90105468dda 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -179,7 +179,7 @@ class purchase_order(osv.osv): 'shipped_rate': fields.function(_shipped_rate, string='Received', type='float'), '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','Bases on incoming shipments')], 'Invoicing Control', required=True, + '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, 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." diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml index 53f27245e7e..a46eaf7ab96 100644 --- a/addons/purchase/purchase_view.xml +++ b/addons/purchase/purchase_view.xml @@ -346,7 +346,7 @@ Quotations ir.actions.act_window purchase.order - {'search_default_draft': 1} + {'search_default_draft': 1, 'search_default_to_approve': 1} [('state','in',('draft','sent','confirmed'))] tree,form,graph,calendar diff --git a/addons/purchase_analytic_plans/purchase_analytic_plans_view.xml b/addons/purchase_analytic_plans/purchase_analytic_plans_view.xml index d224b9800f7..6feb6d27bf2 100644 --- a/addons/purchase_analytic_plans/purchase_analytic_plans_view.xml +++ b/addons/purchase_analytic_plans/purchase_analytic_plans_view.xml @@ -13,5 +13,30 @@ + + purchase.order.form.analytic.inherit + purchase.order + + + + + + + + + + + purchase.order.form.editable.list + purchase.order + + + + + + + + + diff --git a/addons/purchase_double_validation/board_purchase_view.xml b/addons/purchase_double_validation/board_purchase_view.xml index 0557963fcb1..c2cc4df88b8 100644 --- a/addons/purchase_double_validation/board_purchase_view.xml +++ b/addons/purchase_double_validation/board_purchase_view.xml @@ -3,7 +3,7 @@ - Purchase Order Waiting Approval + Purchase Orders Waiting Approval ir.actions.act_window purchase.order form @@ -17,7 +17,7 @@ - + diff --git a/addons/stock/wizard/stock_invoice_onshipping_view.xml b/addons/stock/wizard/stock_invoice_onshipping_view.xml index 10d748624fc..4dd139aa40a 100644 --- a/addons/stock/wizard/stock_invoice_onshipping_view.xml +++ b/addons/stock/wizard/stock_invoice_onshipping_view.xml @@ -30,5 +30,15 @@ view_type="form" target="new" id="action_stock_invoice_onshipping"/> + + From 87ae883d52fbb53515c2258b5dba31df396d9e20 Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Wed, 19 Sep 2012 11:19:33 +0530 Subject: [PATCH 2/5] [IMP]purchase_requisition : remove dependency mrp from purchase_requisition bzr revid: mma@tinyerp.com-20120919054933-lw5myhphzix1qt3j --- addons/purchase_requisition/__openerp__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/purchase_requisition/__openerp__.py b/addons/purchase_requisition/__openerp__.py index f2492b207c0..30af4699c48 100644 --- a/addons/purchase_requisition/__openerp__.py +++ b/addons/purchase_requisition/__openerp__.py @@ -32,7 +32,7 @@ When a purchase order is created, you now have the opportunity to save the related requisition. This new object will regroup and will allow you to easily keep track and order all your purchase orders. """, - 'depends' : ['purchase','mrp'], + 'depends' : ['purchase'], 'demo': ['purchase_requisition_demo.xml'], 'data': ['security/purchase_tender.xml', 'wizard/purchase_requisition_partner_view.xml', From 728383c97a5baa388ea27363dbb0552d0c56275a Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Wed, 19 Sep 2012 17:11:52 +0530 Subject: [PATCH 3/5] [IMP]stock : improve typo bzr revid: mma@tinyerp.com-20120919114152-8yvsserlmzjtnm9e --- addons/stock/wizard/stock_invoice_onshipping_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/stock/wizard/stock_invoice_onshipping_view.xml b/addons/stock/wizard/stock_invoice_onshipping_view.xml index 4dd139aa40a..423a1fc29e8 100644 --- a/addons/stock/wizard/stock_invoice_onshipping_view.xml +++ b/addons/stock/wizard/stock_invoice_onshipping_view.xml @@ -21,7 +21,7 @@ - - Date: Fri, 21 Sep 2012 17:11:03 +0530 Subject: [PATCH 4/5] [IMP] purchase : add a label on cr_ids and dr_ids bzr revid: mma@tinyerp.com-20120921114103-rv5w09nx9z72v21r --- addons/account_voucher/voucher_payment_receipt_view.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml index c41ed6d5577..6daa930ff50 100644 --- a/addons/account_voucher/voucher_payment_receipt_view.xml +++ b/addons/account_voucher/voucher_payment_receipt_view.xml @@ -71,6 +71,7 @@ +