Twinkle Christian(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-sloppy-rng-jam-improve-tch into
lp:~openerp-dev/openobject-addons/trunk-sloppy-rng-jam.
Requested reviews:
Jigar Amin (OpenERP) (jam-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-sloppy-rng-jam-improve-tch/+merge/118526
Hello Sir,
I have improved all views.
Kindly review this.
Thanks,
TCH.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-sloppy-rng-jam-improve-tch/+merge/118526
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-sloppy-rng-jam.
=== modified file 'account/account_invoice_view.xml'
--- account/account_invoice_view.xml 2012-08-04 14:35:56 +0000
+++ account/account_invoice_view.xml 2012-08-07 10:19:20 +0000
@@ -149,7 +149,7 @@
<field name="type">form</field>
<field name="priority">2</field>
<field name="arch" type="xml">
- <form version="7.0">
+ <form string="Supplier Invoice" version="7.0">
<header>
<span groups="base.group_user">
<button name="invoice_open" states="draft,proforma2" string="Validate" class="oe_highlight"/>
@@ -289,7 +289,7 @@
<field name="model">account.invoice</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form version="7.0">
+ <form string="Invoice" version="7.0">
<header>
<span groups="base.group_user">
<button name="action_invoice_sent" type="object" string="Send by Email" attrs="{'invisible':['|',('sent','=',True), ('state', '!=', 'open')]}" class="oe_highlight"/>
=== modified file 'account/account_view.xml'
--- account/account_view.xml 2012-08-04 14:35:56 +0000
+++ account/account_view.xml 2012-08-07 10:19:20 +0000
@@ -11,7 +11,7 @@
<field name="model">account.fiscalyear</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form version="7.0">
+ <form string="Fiscal year" version="7.0">
<header>
<button name="create_period" states="draft" string="Create Monthly Periods" type="object" class="oe_highlight"/>
<button name="create_period3" states="draft" string="Create 3 Months Periods" type="object" class="oe_highlight"/>
@@ -104,7 +104,7 @@
<field name="model">account.period</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form version="7.0">
+ <form string="Account Period" version="7.0">
<header>
<button name="action_draft" states="done" string="Set to Draft" type="object" groups="account.group_account_manager"/>
<field name="state" widget="statusbar" nolabel="1"/>
@@ -1368,7 +1368,7 @@
<field name="model">account.move</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form version="7.0">
+ <form string="Account Entry" version="7.0">
<header>
<button name="button_validate" states="draft" string="Post" type="object" class="oe_highlight"/>
<button name="button_cancel" states="posted" string="Cancel" type="object"/>
@@ -2625,7 +2625,7 @@
<field name="model">account.bank.statement</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form version="7.0">
+ <form string="Statement" version="7.0">
<header>
<button name="button_confirm_cash" states="open" string="Close CashBox" type="object" class="oe_highlight"/>
<button name="button_open" states="draft" string="Open CashBox" type="object" class="oe_highlight"/>
=== modified file 'account_budget/account_budget_view.xml'
--- account_budget/account_budget_view.xml 2012-08-04 14:35:56 +0000
+++ account_budget/account_budget_view.xml 2012-08-07 10:19:20 +0000
@@ -107,7 +107,7 @@
<field name="model">crossovered.budget</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form version="7.0">
+ <form string="Budget" version="7.0">
<header>
<button string="Confirm" name="confirm" states="draft" type="workflow" class="oe_highlight"/>
<button string="Approve" name="validate" states="confirm" type="workflow" class="oe_highlight"/>
=== modified file 'account_payment/account_payment_view.xml'
--- account_payment/account_payment_view.xml 2012-08-04 14:35:56 +0000
+++ account_payment/account_payment_view.xml 2012-08-07 10:19:20 +0000
@@ -101,7 +101,7 @@
<field name="model">payment.order</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form version="7.0">
+ <form string="Payment Order" version="7.0">
<header>
<button name="open" states="draft" string="Confirm Payments" class="oe_highlight"/>
<button name="set_done" states="open" string="Make Payments" type="object" class="oe_highlight"/>
=== modified file 'account_voucher/account_voucher_view.xml'
--- account_voucher/account_voucher_view.xml 2012-07-31 11:28:04 +0000
+++ account_voucher/account_voucher_view.xml 2012-08-07 10:19:20 +0000
@@ -41,7 +41,7 @@
<field name="model">account.voucher</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form version="7.0">
+ <form string="Accounting Voucher" version="7.0">
<header>
<button name="proforma_voucher" string="Post" states="draft" class="oe_highlight"/>
<button name="cancel_voucher" string="Cancel" type="object" states="posted" confirm="Are you sure to unreconcile this record?"/>
=== modified file 'account_voucher/voucher_payment_receipt_view.xml'
--- account_voucher/voucher_payment_receipt_view.xml 2012-08-04 14:35:56 +0000
+++ account_voucher/voucher_payment_receipt_view.xml 2012-08-07 10:19:20 +0000
@@ -123,7 +123,7 @@
<field name="model">account.voucher</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form version="7.0">
+ <form string="Voucher Payment" version="7.0">
<header>
<button name="proforma_voucher" string="Validate" states="draft" invisible="context.get('line_type', False)" class="oe_highlight"/>
<button name="cancel_voucher" string="Cancel" states="draft,proforma" invisible="context.get('line_type', False)"/>
@@ -288,7 +288,7 @@
<field name="model">account.voucher</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form version="7.0">
+ <form string="Receipt" version="7.0">
<header>
<button name="proforma_voucher" string="Validate" states="draft" invisible="context.get('line_type', False)" class="oe_highlight"/>
<button name="cancel_voucher" string="Cancel" states="draft,proforma" invisible="context.get('line_type', False)"/>
=== modified file 'account_voucher/voucher_sales_purchase_view.xml'
--- account_voucher/voucher_sales_purchase_view.xml 2012-08-04 14:35:56 +0000
+++ account_voucher/voucher_sales_purchase_view.xml 2012-08-07 10:19:20 +0000
@@ -62,7 +62,7 @@
<field name="model">account.voucher</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form version="7.0">
+ <form string="Sale voucher" version="7.0">
<header>
<button name="proforma_voucher" string="Validate" states="draft" class="oe_highlight"/>
<button name="%(act_pay_voucher)d" context="{'narration':narration, 'title':'Customer Payment', 'type':'receipt', 'partner_id':partner_id, 'reference':reference, 'amount':amount}" type="action" string="Pay" attrs="{'invisible':['|',('pay_now','=','pay_now'),'|',('state','=','draft'), ('paid','=',True)]}" class="oe_highlight"/>
@@ -206,7 +206,7 @@
<field name="model">account.voucher</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form version="7.0">
+ <form string="Purchase Voucher" version="7.0">
<header>
<button name="proforma_voucher" string="Validate" states="draft" class="oe_highlight"/>
<button name="%(act_pay_bills)d" context="{'narration':narration, 'title':'Bill Payment', 'type':'payment', 'partner_id': partner_id, 'reference':reference}" type="action" string="Pay Bill" attrs="{'invisible':['|',('pay_now','=','pay_now'),'|',('state','=','draft'), ('paid','=',True)]}" class="oe_highlight"/>
=== modified file 'analytic/analytic_view.xml'
--- analytic/analytic_view.xml 2012-07-23 12:05:31 +0000
+++ analytic/analytic_view.xml 2012-08-07 10:19:20 +0000
@@ -7,7 +7,7 @@
<field name="model">account.analytic.account</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form version="7.0">
+ <form string="Analytic Account" version="7.0">
<sheet string="Analytic Account">
<label for="name" class="oe_edit_only"/>
<h1>
=== modified file 'crm/crm_phonecall_view.xml'
--- crm/crm_phonecall_view.xml 2012-08-04 14:35:56 +0000
+++ crm/crm_phonecall_view.xml 2012-08-07 10:19:20 +0000
@@ -106,7 +106,7 @@
<field name="model">crm.phonecall</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form version="7.0">
+ <form string="Phone Call" version="7.0">
<header>
<button name="case_close" string="Held" type="object" class="oe_highlight"
states="open,pending"/>
=== modified file 'crm_claim/crm_claim_view.xml'
--- crm_claim/crm_claim_view.xml 2012-08-04 14:35:56 +0000
+++ crm_claim/crm_claim_view.xml 2012-08-07 10:19:20 +0000
@@ -104,7 +104,7 @@
<field name="model">crm.claim</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form version="7.0">
+ <form string="Claim" version="7.0">
<header>
<span groups="base.group_user">
<button name="case_open" string="Open" type="object" class="oe_highlight"
=== modified file 'crm_helpdesk/crm_helpdesk_view.xml'
--- crm_helpdesk/crm_helpdesk_view.xml 2012-07-31 11:28:04 +0000
+++ crm_helpdesk/crm_helpdesk_view.xml 2012-08-07 10:19:20 +0000
@@ -28,7 +28,7 @@
<field name="model">crm.helpdesk</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form version="7.0">
+ <form string="Helpdesk Support" version="7.0">
<header>
<button name="case_open" string="Open" type="object" class="oe_highlight"
states="draft,pending"/>
=== modified file 'crm_profiling/wizard/open_questionnaire_view.xml'
--- crm_profiling/wizard/open_questionnaire_view.xml 2012-07-11 15:50:14 +0000
+++ crm_profiling/wizard/open_questionnaire_view.xml 2012-08-07 10:19:20 +0000
@@ -34,7 +34,7 @@
<field name="model">open.questionnaire</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form version="7.0">
+ <form string="Open Questionnaire" version="7.0">
<separator colspan="4" string="Questionnaire"/>
<field name="question_ans_ids" colspan="4" nolabel="1" mode="tree,form" width="550" height="200"/>
<footer>
=== modified file 'document/document_view.xml'
--- document/document_view.xml 2012-08-04 14:35:56 +0000
+++ document/document_view.xml 2012-08-07 10:19:20 +0000
@@ -296,7 +296,7 @@
<field name="type">tree</field>
<field name="priority" eval="1"/>
<field name="arch" type="xml">
- <tree colors="blue:type in ('url',)">
+ <tree colors="blue:type in ('url',)" string="Attachments">
<field name="name"/>
<field name="parent_id" />
<field name="user_id"/>
=== modified file 'event/event_view.xml'
--- event/event_view.xml 2012-08-04 14:35:56 +0000
+++ event/event_view.xml 2012-08-07 10:19:20 +0000
@@ -449,7 +449,7 @@
<field name="model">event.registration</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form version="7.0">
+ <form string="Event Registration" version="7.0">
<header>
<button name="registration_open" string="Confirm" states="draft" type="object" class="oe_highlight"/>
<button name="button_reg_close" string="Attended" states="open" type="object" class="oe_highlight"/>
=== modified file 'hr_holidays/hr_holidays_view.xml'
--- hr_holidays/hr_holidays_view.xml 2012-08-04 14:35:56 +0000
+++ hr_holidays/hr_holidays_view.xml 2012-08-07 10:19:20 +0000
@@ -92,7 +92,7 @@
<field name="type">form</field>
<field name="priority">1</field>
<field name="arch" type="xml">
- <form version="7.0">
+ <form string="Leave Request" version="7.0">
<header>
<button string="Submit to Manager" name="confirm" states="draft" type="workflow" class="oe_highlight"/>
<button string="Approve" name="validate" states="confirm" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
@@ -550,7 +550,6 @@
<label for="remaining_leaves"/>
<div>
<field name="remaining_leaves" class="oe_inline"/>
- <label/>
<button name="%(act_hr_employee_holiday_request)d" string="Leaves" type="action" class="oe_inline oe_right"/>
</div>
</field>
=== modified file 'import_google/sync_google_calendar_view.xml'
--- import_google/sync_google_calendar_view.xml 2012-07-06 12:43:14 +0000
+++ import_google/sync_google_calendar_view.xml 2012-08-07 10:19:20 +0000
@@ -7,8 +7,8 @@
<field name="type">form</field>
<field name="inherit_id" ref="base_calendar.view_crm_meeting_form"/>
<field name="arch" type="xml">
- <field name="categ_id" position="replace">
- <field name="categ_id" widget="selection" domain="[('user_id', 'in', [uid, False])]"/>
+ <field name="categ_ids" position="replace">
+ <field name="categ_ids" widget="selection" domain="[('user_id', 'in', [uid, False])]"/>
</field>
</field>
</record>
=== modified file 'lunch/lunch_view.xml'
--- lunch/lunch_view.xml 2012-07-31 11:28:04 +0000
+++ lunch/lunch_view.xml 2012-08-07 10:19:20 +0000
@@ -23,7 +23,7 @@
<field name="name">Order</field>
<field name="model">lunch.order</field>
<field name="arch" type="xml">
- <form version="7.0">
+ <form string="Lunch Order" version="7.0">
<header>
<button name="%(action_lunch_order_confirm)d" string="Confirm Order" type="action" states="draft" class="oe_highlight"/>
<button name="%(action_lunch_order_cancel)d" string="Cancel Order" type="action" states="confirmed" />
=== modified file 'marketing_campaign/marketing_campaign_view.xml'
--- marketing_campaign/marketing_campaign_view.xml 2012-08-04 14:35:56 +0000
+++ marketing_campaign/marketing_campaign_view.xml 2012-08-07 10:19:20 +0000
@@ -26,7 +26,7 @@
<field name="model">marketing.campaign</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form version="7.0">
+ <form string="Marketing Campaign" version="7.0">
<header>
<button name="state_running_set" string="Run" states="draft" class="oe_highlight"/>
<button name="state_done_set" string="Done" states="running" class="oe_highlight"/>
@@ -158,7 +158,7 @@
<field name="model">marketing.campaign.segment</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form version="7.0">
+ <form string="Marketing Campaign Segment" version="7.0">
<header>
<button name="state_running_set" string="Run" states="draft" class="oe_highlight"/>
<button name="state_done_set" string="Close" states="running" class="oe_highlight"/>
=== modified file 'mrp/mrp_view.xml'
--- mrp/mrp_view.xml 2012-08-04 14:35:56 +0000
+++ mrp/mrp_view.xml 2012-08-07 10:19:20 +0000
@@ -30,7 +30,7 @@
<form string="Properties categories" version="7.0">
<label for="name"/>
<field name="name"/>
- <label name="description"/>
+ <label for="description"/>
<field name="description"/>
</form>
</field>
=== modified file 'mrp_operations/mrp_operations_view.xml'
--- mrp_operations/mrp_operations_view.xml 2012-08-04 14:35:56 +0000
+++ mrp_operations/mrp_operations_view.xml 2012-08-07 10:19:20 +0000
@@ -66,7 +66,7 @@
<field name="type">form</field>
<field name="inherit_id" eval="False"/>
<field name="arch" type="xml">
- <form version="7.0">
+ <form string="Production Workcenter" version="7.0">
<header>
<button name="button_start_working" string="Start" states="draft" class="oe_highlight"/>
<button name="button_resume" string="Resume" states="pause" class="oe_highlight"/>
=== modified file 'mrp_repair/mrp_repair_view.xml'
--- mrp_repair/mrp_repair_view.xml 2012-08-04 14:35:56 +0000
+++ mrp_repair/mrp_repair_view.xml 2012-08-07 10:19:20 +0000
@@ -27,7 +27,7 @@
<field name="model">mrp.repair</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form version="7.0">
+ <form string="Repair Order" version="7.0">
<header>
<button name="repair_confirm" states="draft" string="Confirm Repair" class="oe_highlight"/>
<button name="repair_ready" states="confirmed,ready" string="Start Repair" class="oe_highlight"/>
=== modified file 'portal/portal_view.xml'
--- portal/portal_view.xml 2012-08-04 14:35:56 +0000
+++ portal/portal_view.xml 2012-08-07 10:19:20 +0000
@@ -31,7 +31,7 @@
<field name="override_menu"/>
<field name="parent_menu_id"
context="{'ir.ui.menu.full_list': True}"/>
- <label colspan="1"/>
+ <label for="partent_menu_id" colspan="1"/>
<button name="do_create_menu" type="object"
string="Create Parent Menu"/>
</group>
=== modified file 'project_issue/project_issue_view.xml'
--- project_issue/project_issue_view.xml 2012-08-06 07:56:24 +0000
+++ project_issue/project_issue_view.xml 2012-08-07 10:19:20 +0000
@@ -96,7 +96,7 @@
<field name="model">project.issue</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form version="7.0">
+ <form string="Issue" version="7.0">
<header>
<span groups="base.group_user">
<button name="case_open" string="Open" type="object"
=== modified file 'report_webkit/header_view.xml'
--- report_webkit/header_view.xml 2012-06-09 19:49:46 +0000
+++ report_webkit/header_view.xml 2012-08-07 10:19:20 +0000
@@ -5,7 +5,7 @@
<field name="model">ir.header_img</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form version="7.0">
+ <form string="Header Image" version="7.0">
<group>
<field name="name"/>
<field name="type"/>
@@ -21,7 +21,7 @@
<field name="model">ir.header_webkit</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form version="7.0">
+ <form string="HTML Header" version="7.0">
<group>
<group>
<field name="name"/>
=== modified file 'sale/sale_view.xml'
--- sale/sale_view.xml 2012-08-04 14:35:56 +0000
+++ sale/sale_view.xml 2012-08-07 10:19:20 +0000
@@ -523,7 +523,7 @@
<group>
<group>
<field name="product_id" readonly="1"/>
- <label name="product_uom_qty"/>
+ <label for="product_uom_qty"/>
<div>
<field name="product_uom_qty" readonly="1" class="oe_inline"/>
<field name="product_uom" groups="product.group_uom" class="oe_inline"/>
=== modified file 'share/wizard/share_wizard_view.xml'
--- share/wizard/share_wizard_view.xml 2012-07-11 15:50:14 +0000
+++ share/wizard/share_wizard_view.xml 2012-08-07 10:19:20 +0000
@@ -30,7 +30,7 @@
<field name="model">share.wizard</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form version="7.0">
+ <form string="Configuration" version="7.0">
<group>
<field name="user_type" invisible="1"/>
<field name="invite" invisible="1"/>
=== modified file 'stock/stock_view.xml'
--- stock/stock_view.xml 2012-08-06 07:56:24 +0000
+++ stock/stock_view.xml 2012-08-07 10:19:20 +0000
@@ -641,7 +641,7 @@
<field name="type">tree</field>
<field name="field_parent">child_ids</field>
<field name="arch" type="xml">
- <tree toolbar="1">
+ <tree toolbar="1" string="Locations" >
<field icon="icon" name="name"/>
</tree>
</field>
=== modified file 'stock/wizard/stock_partial_move_view.xml'
--- stock/wizard/stock_partial_move_view.xml 2012-07-11 15:50:14 +0000
+++ stock/wizard/stock_partial_move_view.xml 2012-08-07 10:19:20 +0000
@@ -20,7 +20,7 @@
<field name="model">stock.partial.move</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form version="7.0">
+ <form string="Stock Move" version="7.0">
<separator string="Products"/>
<field name="move_ids"/>
<footer>
@@ -56,7 +56,7 @@
<field name="model">stock.partial.move.line</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form version="7.0">
+ <form string="Stock Partial Move Line" version="7.0">
<group>
<field name="product_id" />
<field name="quantity" />
=== modified file 'stock/wizard/stock_partial_picking_view.xml'
--- stock/wizard/stock_partial_picking_view.xml 2012-07-11 15:50:14 +0000
+++ stock/wizard/stock_partial_picking_view.xml 2012-08-07 10:19:20 +0000
@@ -15,7 +15,7 @@
<field name="model">stock.partial.picking</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form version="7.0">
+ <form string="Stock partial Picking" version="7.0">
<field name="hide_tracking" invisible="1"/>
<separator string="Transfer Products" name="product_separator"/>
<field name="move_ids" context="{'hide_tracking': hide_tracking}">
@@ -63,7 +63,7 @@
<field name="model">stock.partial.picking.line</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form version="7.0">
+ <form string="Stock Picking Line" version="7.0">
<group col="4">
<field name="product_id" />
<field name="quantity" />
=== modified file 'stock/wizard/stock_return_picking_view.xml'
--- stock/wizard/stock_return_picking_view.xml 2012-07-11 15:50:14 +0000
+++ stock/wizard/stock_return_picking_view.xml 2012-08-07 10:19:20 +0000
@@ -44,7 +44,7 @@
<field name="model">stock.return.picking.memory</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form version="7.0">
+ <form string="Return Picking Memory" version="7.0">
<group col="4">
<field name="product_id" />
<field name="quantity" />
=== modified file 'stock_planning/stock_planning_view.xml'
--- stock_planning/stock_planning_view.xml 2012-07-31 11:28:04 +0000
+++ stock_planning/stock_planning_view.xml 2012-08-07 10:19:20 +0000
@@ -12,7 +12,7 @@
<field name="model">stock.period</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form version="7.0">
+ <form string="Stock Period" version="7.0">
<header>
<button name="button_open" string="Open" states="draft" type="object"/>
<button name="button_close" string="Close" states="open" type="object"/>
@@ -80,7 +80,7 @@
<field name="model">stock.sale.forecast</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form version="7.0">
+ <form string="Stock and Sale Forecast" version="7.0">
<header>
<button name="action_validate" string="Approve" states="draft" type="object" class="oe_highlight"/>
<field name="state" widget="statusbar"/>
=== modified file 'survey/survey_view.xml'
--- survey/survey_view.xml 2012-08-04 14:35:56 +0000
+++ survey/survey_view.xml 2012-08-07 10:19:20 +0000
@@ -1141,7 +1141,7 @@
<field name="model">survey.request</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form version="7.0">
+ <form string="Request" version="7.0">
<header>
<button name="survey_req_draft" string="Set to Draft" states="cancel,done" type="object"/>
<button name="survey_req_waiting_answer" string="Waiting Answer" states="draft" 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
