From 4d6111702cfc9ed517ee3f96fb958e8893e560d7 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Thu, 2 Aug 2007 09:37:45 +0000 Subject: [PATCH] Cleaning upper/lowercase in menus bzr revid: fp@tinyerp.com-8574c781bfbef7d6a05bfcbd6a0495ca180b392e --- addons/account/account.py | 21 +- addons/account/account_invoice_view.xml | 32 +-- addons/account/account_view.xml | 50 ++-- addons/account/account_wizard.xml | 26 +- addons/account/project/project_view.xml | 18 +- addons/account_followup/followup_demo.xml | 4 +- .../account_followup/followup_report_view.xml | 2 +- addons/account_followup/followup_view.xml | 8 +- .../hr_timesheet_invoice_view.xml | 16 +- addons/purchase/purchase_view.xml | 12 +- addons/purchase/report/request_quotation.rml | 226 +----------------- .../purchase_journal_view.xml | 16 +- .../report_purchase/report_purchase_view.xml | 8 +- addons/stock/stock_view.xml | 16 +- 14 files changed, 117 insertions(+), 338 deletions(-) diff --git a/addons/account/account.py b/addons/account/account.py index d899d9284ba..78f501c0692 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -272,15 +272,18 @@ class account_account(osv.osv): context = {} args = args[:] ids = [] - if name and str(name).startswith('partner:'): - part_id = int(name.split(':')[1]) - part = self.pool.get('res.partner').browse(cr, user, part_id, context) - args += [('id','in', (part.property_account_payable[0],part.property_account_receivable[0]))] - name = False - if name and str(name).startswith('type:'): - type = name.split(':')[1] - args += [('type','=', type)] - name = False + try: + if name and str(name).startswith('partner:'): + part_id = int(name.split(':')[1]) + part = self.pool.get('res.partner').browse(cr, user, part_id, context) + args += [('id','in', (part.property_account_payable[0],part.property_account_receivable[0]))] + name = False + if name and str(name).startswith('type:'): + type = name.split(':')[1] + args += [('type','=', type)] + name = False + except: + pass if name: ids = self.search(cr, user, [('code','=like',name+"%")]+ args, limit=limit) if not ids: diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml index 9e89f9ac1b0..b116c1fcf9b 100644 --- a/addons/account/account_invoice_view.xml +++ b/addons/account/account_invoice_view.xml @@ -295,7 +295,7 @@ - Customers Refund + Customers refund account.invoice form form,tree @@ -306,7 +306,7 @@ - Suppliers Refund + Suppliers refund account.invoice form form,tree @@ -359,7 +359,7 @@ - Opened Customers Invoices + Open customer invoices account.invoice form [('state','=','open'),('type','=','out_invoice')] @@ -377,7 +377,7 @@ - + Draft Suppliers Invoices @@ -401,7 +401,7 @@ - Opened Suppliers Invoices + Open supplier invoices account.invoice form [('state','=','open'),('type','=','in_invoice')] @@ -419,10 +419,10 @@ - + - Draft Customers Refund + Draft customers refund account.invoice form [('state','=','draft'),('type','=','out_refund')] @@ -440,10 +440,10 @@ - + - Opened Customers Refund + Open customer refunds account.invoice form [('state','=','open'),('type','=','out_refund')] @@ -461,10 +461,10 @@ - + - Draft Suppliers Refund + Draft suppliers refund account.invoice form [('state','=','draft'),('type','=','in_refund')] @@ -482,10 +482,10 @@ - + - Opened Suppliers Refund + Open suppliers refund account.invoice form [('state','=','open'),('type','=','in_refund')] @@ -503,7 +503,7 @@ - + account.invoice @@ -525,13 +525,13 @@ - - - Fiscal Years + Fiscal years account.fiscalyear form tree,form @@ -139,7 +139,7 @@ form tree,form - + account.account.tree @@ -158,13 +158,13 @@ - Account Charts + Account charts account.account tree [('code','=','0')] - + account.account.list @@ -281,12 +281,12 @@ - Account Journal + Account journal account.journal form tree,form - + account.bank.statement.tree @@ -436,12 +436,12 @@ - Account Types + Account types account.account.type form tree,form - + @@ -523,14 +523,14 @@ - Tax Codes Structure + Tax codes structure account.tax.code [('parent_id','=',False)] tree - + - @@ -68,13 +68,13 @@ @@ -87,26 +87,26 @@ id="wizard_unreconcile"/> @@ -156,13 +156,13 @@ keyword="client_print_multi" id="wizard_budget_report"/> form - - Analytic Accounts Charts + Analytic accounts charts ir.actions.act_window account.analytic.account [('parent_id','=',False)] tree - + - + account.analytic.line.form @@ -136,7 +136,7 @@ form - + @@ -213,7 +213,7 @@ form tree,form - # @@ -305,7 +305,7 @@ - Account Cost and Revenue by journal + Account cost and revenue by journal report.hr.timesheet.invoice.journal form tree,graph @@ -315,13 +315,13 @@ action="report_account_analytic_journal_tree"/> - Account Cost and Revenue by journal (This Month) + Account cost and revenue by journal (This Month) report.hr.timesheet.invoice.journal form tree [('name','=',time.strftime('%Y-%m-01'))] - diff --git a/addons/account_followup/followup_demo.xml b/addons/account_followup/followup_demo.xml index 59de9e35629..b45bb169ec0 100644 --- a/addons/account_followup/followup_demo.xml +++ b/addons/account_followup/followup_demo.xml @@ -3,8 +3,8 @@ - Default Follow-Up - This is the default followup, with 15 net days, 30 net days and 45 days end of month levels. + Default follow-up + First letter after 15 net days, 30 net days and 45 days end of month levels. diff --git a/addons/account_followup/followup_report_view.xml b/addons/account_followup/followup_report_view.xml index 511a46a02c1..381dfc2ba5e 100644 --- a/addons/account_followup/followup_report_view.xml +++ b/addons/account_followup/followup_report_view.xml @@ -42,7 +42,7 @@ - Follow-Ups + Follow-ups account_followup.stat form diff --git a/addons/account_followup/followup_view.xml b/addons/account_followup/followup_view.xml index feef1d7bee3..09aaa7a4687 100644 --- a/addons/account_followup/followup_view.xml +++ b/addons/account_followup/followup_view.xml @@ -39,7 +39,7 @@ @@ -56,7 +56,7 @@ account_followup.followup.print.all @@ -101,7 +101,7 @@ diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml index 9e3579cfc19..9054144222e 100644 --- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml +++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml @@ -106,7 +106,7 @@ tree,form [('to_invoice','<>',False)] - @@ -118,7 +118,7 @@ tree,form [('invoice_id','=',False),('to_invoice','!=',False)] - @@ -130,7 +130,7 @@ tree,form [('invoice_id','=',False),('to_invoice','!=',False),('user_id','=',uid)] - @@ -141,7 +141,7 @@ tree,form [('state','<>','close'),('type','<>','view')] - @@ -152,7 +152,7 @@ tree,form [('state','<>','close'),('type','<>','view'),('pricelist_id','<>',False)] - @@ -164,7 +164,7 @@ tree,form [('state','=','draft'),('type','<>','view')] - @@ -176,7 +176,7 @@ tree,form [('state','=','pending'),('type','<>','view')] - @@ -214,7 +214,7 @@ diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml index e44f1341e42..3d4ef240977 100644 --- a/addons/purchase/purchase_view.xml +++ b/addons/purchase/purchase_view.xml @@ -71,7 +71,7 @@ purchase.order form,tree - + Request for quotation ir.actions.act_window @@ -80,25 +80,25 @@ form tree,form - + - Purchase Order waiting Approval + Purchase order waiting Approval ir.actions.act_window purchase.order form tree,form [('state','=','confirmed')] - + - Running Purchase Order + Running purchase order ir.actions.act_window purchase.order form tree,form [('state','=','approved')] - + purchase.order.tree diff --git a/addons/purchase/report/request_quotation.rml b/addons/purchase/report/request_quotation.rml index afe4ca25259..e906b709542 100644 --- a/addons/purchase/report/request_quotation.rml +++ b/addons/purchase/report/request_quotation.rml @@ -1,227 +1,3 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [[ repeatIn(objects,'o') ]] - [[ setLang(o.partner_id.lang) ]] - - - - - - - - - - - - - - [[ repeatIn(o.dest_address_id and [o.dest_address_id] or [],'addr') ]] - Shipping address : - [[ o.partner_id.title or '' ]] [[ o.partner_id.name ]] - [[ addr.title or '' ]] [[ addr.name ]] - [[ addr.street ]] - [[ addr.street2 or '' ]] - [[ addr.zip or '' ]] [[ addr.city or '' ]] - [[ addr.state_id and addr.state_id.name or '' ]] - [[ addr.country_id and addr.country_id.name or '' ]] - - - - - [[ repeatIn((o.warehouse_id and o.warehouse_id.partner_address_id and [o.warehouse_id.partner_address_id]) or [],'addr') ]] - [[ o.partner_id.title or '' ]] [[ o.partner_id.name ]] - [[ addr.title or '' ]] [[ addr.name ]] - [[ addr.street ]] - [[ addr.street2 or '' ]] - [[ addr.zip or '' ]] [[ addr.city or '' ]] - [[ addr.state_id and addr.state_id.name or '' ]] - [[ addr.country_id and addr.country_id.name or '' ]] - - - - - - - - - - - - - - [[ o.partner_id.title or '' ]] [[ o.partner_id.name ]] - [[ o.partner_address_id.title or '' ]] [[ o.partner_address_id.name ]] - [[ o.partner_address_id.street ]] - [[ o.partner_address_id.street2 or '' ]] - [[ o.partner_address_id.zip or '' ]] [[ o.partner_address_id.city or '' ]] - [[ o.partner_address_id.state_id and o.partner_address_id.state_id.name or '' ]] - [[ o.partner_address_id.country_id and o.partner_address_id.country_id.name or '' ]] - - - - Tél. : [[ o.partner_address_id.phone or '' ]] - Fax : [[ o.partner_address_id.fax or '' ]] - TVA : [[ o.partner_id.vat or '' ]] - - - - Request for Quotation [[ o.name ]] - - - - Our project: [[ o.project_id and o.project_id.complete_name or '/' ]] - Other reference : [[ o.ref or '' ]] - Printed: [[ time.strftime('%d/%m/%Y') ]] - - - - Please find hereby a request for quotation. - - - - - - - Product - - - Date - - - Qty - - - -
- [[ repeatIn(o.order_line,'line') ]] - - - - [[ line.product_id and line.product_id.default_code or '' ]] - [[ line.name ]] - - - [[ time.strftime('%d/%m/%Y', time.strptime( line.date_planned, '%Y-%m-%d')) ]] - - - [[ line.product_qty ]] [[ line.product_uom.name ]] - - - - - - - [[ repeatIn((line.notes and line.notes.splitlines()) or [], 'l') ]] - - - [[ l or removeParentNode('table') ]] - - - - - - - - -
- - - - - - - [[ o.notes or '' ]] [[ setTag('para','xpre') ]] - - - - - - - Thanks, - - - - [[ user.signature ]] - - - - - - - - +[[ repeatIn(objects,'order') ]][[ setLang(order.partner_id.lang) ]] [[ order.partner_id.title ]][[ order.partner_id.name ]][[ order.partner_address_id.title ]][[ order.partner_address_id.name ]][[ order.partner_address_id.street ]][[ order.partner_address_id.street2 ]][[ order.partner_address_id.zip ]][[ order.partner_address_id.city ]][[ order.partner_address_id.state_id.code ]][[ order.partner_address_id.country_id.code ]] Tel. : [[ order.partner_address_id.phone ]]Fax : [[ order.partner_address_id.fax ]]TVA : [[ order.partner_id.vat ]]Request for Quotation [[ order.name ]] Other reference :[[ order.ref ]]Printed: [[ time.strftime('%d/%m/%Y') ]] Please find hereby a request for quotation. ProductDateQty
[[ repeatIn(order.order_line,'order_line') ]][[ order_line.product_id.default_code ]] - [[ order_line.name ]][[ time.strftime('%d/%m/%Y', time.strptime( order_line.date_planned, '%Y-%m-%d')) ]][[ order_line.product_qty ]][[ order_line.product_uom.name ]][[ order_line.notes ]]
[[ order.notes ]] Thanks, [[ user.signature ]] diff --git a/addons/purchase_journal/purchase_journal_view.xml b/addons/purchase_journal/purchase_journal_view.xml index 10e23fd560a..0d42d141bcb 100644 --- a/addons/purchase_journal/purchase_journal_view.xml +++ b/addons/purchase_journal/purchase_journal_view.xml @@ -88,7 +88,7 @@ tree,form @@ -100,31 +100,31 @@ [] - My Opened Journals + My open journals purchase_journal.purchase.journal form tree,form [('user_id','=',uid),('state','=','open')] - Opened Journals + Open journals purchase_journal.purchase.journal form tree,form [('state','=','open')] @@ -194,7 +194,7 @@ [('name','=',time.strftime('%Y-%m-01'))] @@ -205,7 +205,7 @@ tree,form diff --git a/addons/report_purchase/report_purchase_view.xml b/addons/report_purchase/report_purchase_view.xml index e5ecda0dfab..5f8d2faf84f 100644 --- a/addons/report_purchase/report_purchase_view.xml +++ b/addons/report_purchase/report_purchase_view.xml @@ -47,13 +47,13 @@ tree [('name','=',time.strftime('%Y-%m-01'))] - + report.purchase.order.product form tree - + # # Purchases by category by month @@ -100,13 +100,13 @@ tree [('name','=',time.strftime('%Y-%m-01'))] - + report.purchase.order.category form tree - + - + stock.tracking.tree @@ -341,7 +341,7 @@ stock.location form -
+ @@ -366,7 +366,7 @@ stock.location tree - + @@ -381,7 +381,7 @@ form - + stock.location.tree @@ -389,7 +389,7 @@ tree child_ids - + @@ -772,7 +772,7 @@ form - + Draft Moves @@ -782,7 +782,7 @@ [('state','=','draft')] - + Assigned Moves @@ -792,7 +792,7 @@ [('state','=','assigned')] - + # -------------------------------------------------------------