diff options
| author | Amit Patel (OpenERP) <apa@tinyerp.com> | 2012-06-15 19:06:39 +0530 |
|---|---|---|
| committer | Amit Patel (OpenERP) <apa@tinyerp.com> | 2012-06-15 19:06:39 +0530 |
| commit | b9cbfb9a98b5b1187d92ca5b0f8e5d2d60017d3e (patch) | |
| tree | 7f381abb025f1a50350434eca6c19910e947015c | |
| parent | 41f2eba9fb2b1b8ca7bd90cee1f8c35ac237112c (diff) | |
[IMP]:improved sale to invoice
bzr revid: apa@tinyerp.com-20120615133639-aarxp5rn5ovirjug
| -rw-r--r-- | addons/account_analytic_analysis/account_analytic_analysis.py | 15 | ||||
| -rw-r--r-- | addons/account_analytic_analysis/account_analytic_analysis_view.xml | 8 |
2 files changed, 19 insertions, 4 deletions
diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py index 7f10d1dc397..d3892ccd59b 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis.py +++ b/addons/account_analytic_analysis/account_analytic_analysis.py @@ -437,6 +437,21 @@ class account_analytic_account(osv.osv): 'remaining_total' : fields.function(_sum_of_fields, type="float",multi="sum_of_all"), 'toinvoice_total' : fields.function(_sum_of_fields, type="float",multi="sum_of_all"), } + + def open_sale_order_lines(self,cr,uid,ids,context=None): + if context is None: + context = {} + sale_ids = self.pool.get('sale.order').search(cr,uid,[('project_id','=',context.get('search_default_project_id',False)),('partner_id','=',context.get('search_default_partner_id',False))]) + return { + 'type': 'ir.actions.act_window', + 'name': _('Sale Order Lines'), + 'view_type': 'form', + 'view_mode': 'tree,form', + 'context': context, + 'domain' : [('order_id','in',sale_ids)], + 'res_model': 'sale.order.line', + 'nodestroy': True, + } def on_change_template(self, cr, uid, ids, template_id, context=None): if not template_id: diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml index da6618f490d..71958b02ddc 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml +++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml @@ -8,10 +8,10 @@ <act_window id="action_sales_order" - name="Sales Order Lines" + name="Sales Orders" res_model="sale.order" src_model="account.analytic.account" - /> + /> <record id="account_analytic_account_form_form" model="ir.ui.view"> <field name="name">account.analytic.account.invoice.form.inherit</field> @@ -61,8 +61,8 @@ </td><td> <field class="oe_form_inline" name="ca_to_invoice" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/> </td><td> - <button name="%(action_sales_order)d" string="All Sales" type="action" context="{'default_partner_id': [partner_id], 'search_default_partner_id': [partner_id]}" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/> - <button name="%(sale.action_order_line_tree2)d" string="Lines To Invoice" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/></td> + <button name="%(action_sales_order)d" string="All Sales" type="action" context="{'default_partner_id': [partner_id], 'search_default_partner_id': [partner_id],'search_default_project_id': [active_id],'default_project_id': [active_id]}" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/> + <button name="open_sale_order_lines" string="Lines To Invoice" type="object" context="{'default_partner_id': [partner_id],'default_project_id': active_id,'search_default_uninvoiced': 1,'search_default_project_id': active_id,'search_default_partner_id': [partner_id]}" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/></td> </tr><tr attrs="{'invisible':[('use_timesheets','=',False)]}"> <td> <label for="invoice_on_timesheets"/> |