Harry (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-sale_crm-imp-kjo into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-sale_crm-imp-kjo/+merge/115522
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-sale_crm-imp-kjo/+merge/115522
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-sale_crm-imp-kjo.
=== modified file 'account/partner_view.xml'
--- account/partner_view.xml 2012-06-28 06:40:05 +0000
+++ account/partner_view.xml 2012-07-18 11:09:22 +0000
@@ -76,56 +76,56 @@
<field name="arch" type="xml">
<page string="History" position="before" version="7.0">
<page string="Accounting" col="4">
- <group col="4">
- <group string="Customer Accounting Properties" col="4">
+ <group>
+ <group >
<field name="property_account_receivable" groups="account.group_account_invoice" />
<field name="property_account_position" widget="selection"/>
<field name="property_payment_term" widget="selection"/>
</group>
- <group string="Supplier Accounting Properties" col="4">
+ <group>
<field name="property_account_payable" groups="account.group_account_invoice"/>
</group>
- <group string="Customer Credit" col="4">
+ <group>
<field name="credit"/>
<field name="credit_limit"/>
</group>
- <group string="Supplier Debit" col="4">
+ <group>
<field name="debit"/>
</group>
- <field name="bank_ids">
- <form string="Bank account" version="7.0">
- <field name="state"/>
- <field name="acc_number"/>
- <group>
- <group name="owner" string="Bank Account Owner">
- <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
- <field name="owner_name"/>
- <label for="street" string="Address"/>
+ </group>
+ <field name="bank_ids">
+ <form string="Bank account" version="7.0">
+ <field name="state"/>
+ <field name="acc_number"/>
+ <group>
+ <group name="owner" string="Bank Account Owner">
+ <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
+ <field name="owner_name"/>
+ <label for="street" string="Address"/>
+ <div>
+ <field name="street" placeholder="Street..."/>
<div>
- <field name="street" placeholder="Street..."/>
- <div>
- <field name="zip" class="oe_inline" placeholder="ZIP"/>
- <field name="city" class="oe_inline" placeholder="City"/>
- </div>
- <field name="state_id" placeholder="State"/>
- <field name="country_id" placeholder="Country"/>
+ <field name="zip" class="oe_inline" placeholder="ZIP"/>
+ <field name="city" class="oe_inline" placeholder="City"/>
</div>
- </group>
- <group name="bank" string="Information About the Bank">
- <field name="bank" on_change="onchange_bank_id(bank)"/>
- <field name="bank_name"/>
- <field name="bank_bic" placeholder="[Identifier code]"/>
- </group>
- </group>
- </form>
- <tree string="Bank Details">
- <field name="sequence" invisible="1"/>
- <field name="acc_number"/>
- <field name="bank_name"/>
- <field name="owner_name"/>
- </tree>
- </field>
- </group>
+ <field name="state_id" placeholder="State"/>
+ <field name="country_id" placeholder="Country"/>
+ </div>
+ </group>
+ <group name="bank" string="Information About the Bank">
+ <field name="bank" on_change="onchange_bank_id(bank)"/>
+ <field name="bank_name"/>
+ <field name="bank_bic" placeholder="[Identifier code]"/>
+ </group>
+ </group>
+ </form>
+ <tree string="Bank Details">
+ <field name="sequence" invisible="1"/>
+ <field name="acc_number"/>
+ <field name="bank_name"/>
+ <field name="owner_name"/>
+ </tree>
+ </field>
</page>
</page>
</field>
=== modified file 'account/project/project_view.xml'
--- account/project/project_view.xml 2012-07-12 14:46:00 +0000
+++ account/project/project_view.xml 2012-07-18 11:09:22 +0000
@@ -118,38 +118,33 @@
<field name="name">account.analytic.line.form</field>
<field name="model">account.analytic.line</field>
<field name="type">form</field>
+ <field name="priority">1</field>
<field name="arch" type="xml">
<form string="Analytic Entry" version="7.0">
<group>
<group>
<field name="name"/>
+ <field name="date"/>
+ <label for="unit_amount"/>
+ <group class="oe_inline">
+ <field name="unit_amount" nolabel="1"/>
+ <field name="product_uom_id" nolabel="1" />
+ </group>
+ <field name="amount"/>
+ </group>
+ <group>
<field name="account_id"/>
<field name="journal_id"/>
+ <field name="product_id"/>
</group>
<group>
- <field name="date"/>
<field name="ref"/>
<field name="company_id" groups="base.group_multi_company"/>
</group>
- <group string="Amount">
- <field name="amount"/>
- <label for="amount_currency"/>
- <div>
- <field name="amount_currency" class="oe_inline"/>
- <field name="currency_id" class="oe_inline"/>
- </div>
- </group>
- <group string="Product Information">
- <field name="product_id"/>
- <label for="unit_amount"/>
- <div>
- <field name="unit_amount" class="oe_inline"/>
- <field name="product_uom_id" class="oe_inline"/>
- </div>
- </group>
- <group string="General Accounting">
+ <group>
<field name="general_account_id"/>
<field name="move_id" readonly="1"/>
+ <field name="amount_currency" class="oe_inline"/>
</group>
</group>
</form>
=== modified file 'base_calendar/base_calendar.py'
--- base_calendar/base_calendar.py 2012-07-14 15:33:50 +0000
+++ base_calendar/base_calendar.py 2012-07-18 11:09:22 +0000
@@ -1034,7 +1034,7 @@
('confidential', 'Public for Employees')], 'Privacy', states={'done': [('readonly', True)]}),
'location': fields.char('Location', size=264, help="Location of Event", states={'done': [('readonly', True)]}),
'show_as': fields.selection([('free', 'Free'), ('busy', 'Busy')], \
- 'Show Time as', states={'done': [('readonly', True)]}),
+ 'Show Time As', states={'done': [('readonly', True)]}),
'base_calendar_url': fields.char('Caldav URL', size=264),
'state': fields.selection([('tentative', 'Tentative'),
('cancelled', 'Cancelled'),
@@ -1060,8 +1060,8 @@
'user_id': fields.many2one('res.users', 'Responsible', states={'done': [('readonly', True)]}),
'organizer': fields.char("Organizer", size=256, states={'done': [('readonly', True)]}), # Map with Organizer Attribure of VEvent.
'organizer_id': fields.many2one('res.users', 'Organizer', states={'done': [('readonly', True)]}),
- 'end_type' : fields.selection([('count', 'Number of repetitions'), ('end_date','End date')], 'Recurrence termination'),
- 'interval': fields.integer('Repeat every', help="Repeat every (Days/Week/Month/Year)"),
+ 'end_type' : fields.selection([('count', 'Number of repetitions'), ('end_date','End date')], 'Recurrence Termination'),
+ 'interval': fields.integer('Repeat Every', help="Repeat every (Days/Week/Month/Year)"),
'count': fields.integer('Repeat', help="Repeat x times"),
'mo': fields.boolean('Mon'),
'tu': fields.boolean('Tue'),
=== modified file 'crm/crm_meeting_view.xml'
--- crm/crm_meeting_view.xml 2012-07-14 15:33:50 +0000
+++ crm/crm_meeting_view.xml 2012-07-18 11:09:22 +0000
@@ -1,9 +1,7 @@
<?xml version="1.0"?>
<openerp>
<data>
-
<!-- Calendar Attendee Form View -->
-
<record id="attendee_form_view_inherit" model="ir.ui.view">
<field name="name">calendar.attendee.form.inherit</field>
<field name="model">calendar.attendee</field>
=== modified file 'crm_claim/crm_claim_view.xml'
--- crm_claim/crm_claim_view.xml 2012-07-13 09:53:41 +0000
+++ crm_claim/crm_claim_view.xml 2012-07-18 11:09:22 +0000
@@ -257,6 +257,9 @@
<xpath expr="//page[@string='History']" position="attributes">
<attribute name="invisible">False</attribute>
</xpath>
+ <xpath expr="//group[@string='Claim']" position="attributes">
+ <attribute name="invisible">False</attribute>
+ </xpath>
</field>
</record>
<record id="view_claim_partner_info_form1" model="ir.ui.view">
@@ -267,7 +270,7 @@
<field name="priority">20</field>
<field name="arch" type="xml">
<data>
- <xpath expr="//page[@string='History']" position="inside">
+ <xpath expr="//group[@string='Claim']" position="inside">
<field name="claims_ids" colspan="4" nolabel="1">
<tree string="Partners Claim" editable="bottom">
<field name="name"/>
=== modified file 'crm_fundraising/crm_fundraising_menu.xml'
--- crm_fundraising/crm_fundraising_menu.xml 2012-05-21 16:07:45 +0000
+++ crm_fundraising/crm_fundraising_menu.xml 2012-07-18 11:09:22 +0000
@@ -9,7 +9,7 @@
parent="base.menu_base_partner" sequence="8" />
<record model="ir.actions.act_window" id="crm_case_category_act_fund_all1">
- <field name="name">Funds</field>
+ <field name="name">Fund Raising</field>
<field name="res_model">crm.fundraising</field>
<field name="view_mode">tree,form,graph</field>
<field name="view_id" ref="crm_fundraising.crm_case_tree_view_fund"/>
=== modified file 'event/res_partner_view.xml'
--- event/res_partner_view.xml 2012-02-23 10:18:10 +0000
+++ event/res_partner_view.xml 2012-07-18 11:09:22 +0000
@@ -13,6 +13,15 @@
<field name="supplier" position="after">
<field name="speaker"/>
</field>
+ <xpath expr="//page[@string='History']" position="attributes">
+ <attribute name="invisible">False</attribute>
+ </xpath>
+ <xpath expr="//group[@string='Event']" position="attributes">
+ <attribute name="invisible">False</attribute>
+ </xpath>
+ <xpath expr="//group[@string='Registration']" position="attributes">
+ <attribute name="invisible">False</attribute>
+ </xpath>
</field>
</record>
<record id="view_event_partner_info_form" model="ir.ui.view">
@@ -21,13 +30,15 @@
<field name="type">form</field>
<field name="inherit_id" ref="base.view_partner_form"/>
<field name="arch" type="xml">
- <page string="History" position="inside">
+ <group string="Event" position="inside">
<field name="event_ids" colspan="4" nolabel="1">
<tree string="Events">
<field name="name" string="Event"/>
<field name="main_speaker_id"/>
</tree>
</field>
+ </group>
+ <group string="Registration" position="inside">
<field name="event_registration_ids" colspan="4" nolabel="1">
<tree string="Events Registration">
<field name="event_begin_date" string="Date"/>
@@ -39,7 +50,7 @@
<button name="check_confirm" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
</tree>
</field>
- </page>
+ </group>
</field>
</record>
=== modified file 'hr_timesheet_invoice/hr_timesheet_invoice_view.xml'
--- hr_timesheet_invoice/hr_timesheet_invoice_view.xml 2012-07-06 07:42:15 +0000
+++ hr_timesheet_invoice/hr_timesheet_invoice_view.xml 2012-07-18 11:09:22 +0000
@@ -114,7 +114,7 @@
<field name="type">form</field>
<field name="inherit_id" ref="account.view_account_analytic_line_form"/>
<field name="arch" type="xml">
- <field name="product_uom_id" position="after">
+ <field name="amount" position="before">
<field name="to_invoice"/>
<field name="invoice_id"/>
</field>
=== modified file 'import_sugarcrm/import_sugarcrm_view.xml'
--- import_sugarcrm/import_sugarcrm_view.xml 2012-07-02 11:27:50 +0000
+++ import_sugarcrm/import_sugarcrm_view.xml 2012-07-18 11:09:22 +0000
@@ -13,7 +13,7 @@
<button name="import_all" string="_Import"
type="object" class="oe_highlight"/>
<button name="import_from_scheduler_all" string="_Schedule Recurrent Imports"
- type="object" class="oe_highlight" />
+ type="object"/> or
<button special="cancel" string="_Cancel" class="oe_link"/>
</header>
<sheet>
=== modified file 'l10n_fr_rib/bank_view.xml'
--- l10n_fr_rib/bank_view.xml 2012-06-07 11:20:11 +0000
+++ l10n_fr_rib/bank_view.xml 2012-07-18 11:09:22 +0000
@@ -9,7 +9,7 @@
<field name="type">form</field>
<field name="arch" type="xml">
<data>
- <xpath expr="//page[@string='Accounting']/group/field[@name='bank_ids']/form/field[@name='acc_number']" position="before">
+ <xpath expr="//page[@string='Accounting']/field[@name='bank_ids']/form/field[@name='acc_number']" position="before">
<newline />
<field name="bank_code" />
<field name="office" />
@@ -17,7 +17,7 @@
<field name="key" />
<newline />
</xpath>
- <xpath expr="//page[@string='Accounting']/group/field[@name='bank_ids']/tree/field[@name='acc_number']" position="after">
+ <xpath expr="//page[@string='Accounting']/field[@name='bank_ids']/tree/field[@name='acc_number']" position="after">
<field name="rib_acc_number"/>
</xpath>
</data>
=== modified file 'marketing_campaign/res_partner_view.xml'
--- marketing_campaign/res_partner_view.xml 2012-07-05 13:11:35 +0000
+++ marketing_campaign/res_partner_view.xml 2012-07-18 11:09:22 +0000
@@ -3,8 +3,8 @@
<data>
<!-- Partners inherited form -->
- <record id="base.view_crm_partner_info_History" model="ir.ui.view">
- <field name="name">res.partner.crm.history.inherit1</field>
+ <record id="base.view_crm_partner_info_History2" model="ir.ui.view">
+ <field name="name">res.partner.crm.history.inherit2</field>
<field name="model">res.partner</field>
<field name="type">form</field>
<field name="inherit_id" ref="base.view_partner_form"/>
@@ -12,6 +12,9 @@
<xpath expr="//page[@string='History']" position="attributes">
<attribute name="invisible">False</attribute>
</xpath>
+ <xpath expr="//group[@string='Campaign']" position="attributes">
+ <attribute name="invisible">False</attribute>
+ </xpath>
</field>
</record>
<record id="view_workitem_partner_info_form" model="ir.ui.view">
@@ -20,9 +23,9 @@
<field name="type">form</field>
<field name="inherit_id" ref="base.view_partner_form"/>
<field name="arch" type="xml">
- <page string="History" position="inside">
+ <group string="Campaign" position="inside">
<field name="workitem_ids" colspan="4" nolabel="1"/>
- </page>
+ </group>
</field>
</record>
</data>
=== modified file 'membership/membership.py'
--- membership/membership.py 2012-06-29 13:48:22 +0000
+++ membership/membership.py 2012-07-18 11:09:22 +0000
@@ -315,11 +315,11 @@
return self._membership_state(*args, **kwargs)
_columns = {
- 'associate_member': fields.many2one('res.partner', 'Associate member',help="A member with whom you want to associate your membership.It will consider the membership state of the associated member."),
+ 'associate_member': fields.many2one('res.partner', 'Associate Member',help="A member with whom you want to associate your membership.It will consider the membership state of the associated member."),
'member_lines': fields.one2many('membership.membership_line', 'partner', 'Membership'),
- 'free_member': fields.boolean('Free member', help = "Select if you want to give membership free of cost."),
+ 'free_member': fields.boolean('Free Member', help = "Select if you want to give membership free of cost."),
'membership_amount': fields.float(
- 'Membership amount', digits=(16, 2),
+ 'Membership Amount', digits=(16, 2),
help = 'The price negotiated by the partner'),
'membership_state': fields.function(
__get_membership_state,
@@ -338,7 +338,7 @@
-Paid Member: A member who has paid the membership amount."""),
'membership_start': fields.function(
_membership_date, multi = 'membeship_start',
- string = 'Start membership date', type = 'date',
+ string = 'Start Membership Date', type = 'date',
store = {
'account.invoice': (_get_invoice_partner, ['state'], 10),
'membership.membership_line': (_get_partner_id, ['state'], 10, ),
@@ -346,7 +346,7 @@
}, help="Date from which membership becomes active."),
'membership_stop': fields.function(
_membership_date,
- string = 'Stop membership date', type='date', multi='membership_stop',
+ string = 'Stop Membership Date', type='date', multi='membership_stop',
store = {
'account.invoice': (_get_invoice_partner, ['state'], 10),
'membership.membership_line': (_get_partner_id, ['state'], 10),
@@ -354,7 +354,7 @@
}, help="Date until which membership remains active."),
'membership_cancel': fields.function(
_membership_date,
- string = 'Cancel membership date', type='date', multi='membership_cancel',
+ string = 'Cancel Membership Date', type='date', multi='membership_cancel',
store = {
'account.invoice': (_get_invoice_partner, ['state'], 11),
'membership.membership_line': (_get_partner_id, ['state'], 10),
=== modified file 'membership/membership_view.xml'
--- membership/membership_view.xml 2012-07-12 15:20:16 +0000
+++ membership/membership_view.xml 2012-07-18 11:09:22 +0000
@@ -242,13 +242,10 @@
<notebook position="inside">
<page string="Membership">
<group>
- <group>
+ <group col="3">
<field name="free_member"/>
- <label for="membership_state"/>
- <div>
- <field name="membership_state" class="oe_inline"/>
- <button name="%(action_membership_invoice_view)d" type="action" string="Join Membership" attrs="{'readonly':[('free_member','=',True)]}" class="oe_inline oe_right"/>
- </div>
+ <button name="%(action_membership_invoice_view)d" type="action" string="Join Membership" attrs="{'readonly':[('free_member','=',True)]}" class="oe_inline oe_right"/>
+ <field name="membership_state" class="oe_inline"/>
</group>
<group>
<field name="associate_member" attrs="{'readonly':[('membership_state','!=', 'none')]}"/>
=== modified file 'mrp/mrp_view.xml'
--- mrp/mrp_view.xml 2012-07-13 09:53:41 +0000
+++ mrp/mrp_view.xml 2012-07-18 11:09:22 +0000
@@ -381,8 +381,12 @@
<field name="active"/>
</group>
<group>
- <field name="date_start"/>
- <field name="date_stop"/>
+ <label for="date_start" string="Validity"/>
+ <div>
+ <field name="date_start" class="oe_online"/>
+ <label string=" - " attrs="{'invisible':[('date_start','=', False),('date_stop','=', False)]}"/>
+ <field name="date_stop" class="oe_online"/>
+ </div>
<field name="product_rounding"/>
<field name="product_efficiency"/>
</group>
=== modified file 'plugin_outlook/plugin_outlook.xml'
--- plugin_outlook/plugin_outlook.xml 2012-06-29 09:32:56 +0000
+++ plugin_outlook/plugin_outlook.xml 2012-07-18 11:09:22 +0000
@@ -11,10 +11,8 @@
<form position="attributes">
<attribute name="string">Install Outlook Plug-In</attribute>
</form>
- <separator string="title" position="before">
- <label string="This plug-in allows you to create and link outlook emails with openerp objects."/>
- </separator>
- <xpath expr="//header" position="replace"/>
+ <xpath expr="//button[@string='Install Modules']" position="replace"/>
+ <xpath expr="//button[@string='Cancel']" position="replace"/>
<xpath expr="//separator[@string='title']" position="after" version="7.0">
<group>
<field name="plugin32" widget="url"/>
@@ -29,8 +27,8 @@
</ul>
</xpath>
<separator string="title" position="attributes">
- <attribute name="string">Install Outlook Plug-In</attribute>
- </separator>
+ <attribute name="string"></attribute>
+ </separator>
</data>
</field>
</record>
=== modified file 'plugin_thunderbird/plugin_thunderbird.xml'
--- plugin_thunderbird/plugin_thunderbird.xml 2012-06-29 09:32:56 +0000
+++ plugin_thunderbird/plugin_thunderbird.xml 2012-07-18 11:09:22 +0000
@@ -11,10 +11,8 @@
<form position="attributes">
<attribute name="string">Install Thunderbird Plug-In</attribute>
</form>
- <separator string="title" position="before">
- <label string="This plug-in allows you to link your email to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."/>
- </separator>
- <xpath expr="//header" position="replace"/>
+ <xpath expr="//button[@string='Install Modules']" position="replace"/>
+ <xpath expr="//button[@string='Cancel']" position="replace"/>
<xpath expr="//separator[@string='title']" position="after">
<group>
<field name="thunderbird" invisible="1"/>
@@ -35,8 +33,9 @@
</ul>
</xpath>
<separator string="title" position="attributes">
- <attribute name="string">Install Thunderbird Plug-In</attribute>
- </separator>
+ <attribute name="string"></attribute>
+ </separator>
+
</data>
</field>
</record>
=== modified file 'product/product_view.xml'
--- product/product_view.xml 2012-07-13 09:53:41 +0000
+++ product/product_view.xml 2012-07-18 11:09:22 +0000
@@ -313,19 +313,14 @@
<field name="arch" type="xml">
<form string="Product Categories" version="7.0">
<sheet>
- <div class="oe_title">
- <h1>
- <label for="name" class="oe_edit_only"/>
+ <group>
+ <group>
<field name="name"/>
- </h1>
- </div>
- <group>
- <group>
- <field name="type"/>
- </group>
- <group>
- <field name="parent_id"/>
- </group>
+ <field name="parent_id"/>
+ </group>
+ <group>
+ <field name="type"/>
+ </group>
</group>
<group name="basic">
<group name="account_property" string="Account Properties"/>
=== modified file 'project/res_partner_view.xml'
--- project/res_partner_view.xml 2012-06-28 12:18:20 +0000
+++ project/res_partner_view.xml 2012-07-18 11:09:22 +0000
@@ -12,6 +12,9 @@
<xpath expr="//page[@string='History']" position="attributes">
<attribute name="invisible">False</attribute>
</xpath>
+ <xpath expr="//group[@string='Tasks']" position="attributes">
+ <attribute name="invisible">False</attribute>
+ </xpath>
</field>
</record>
<record id="view_task_partner_info_form" model="ir.ui.view">
@@ -20,7 +23,7 @@
<field name="type">form</field>
<field name="inherit_id" ref="base.view_partner_form"/>
<field name="arch" type="xml">
- <page string="History" position="inside">
+ <group string="Tasks" position="inside">
<field name="task_ids" colspan="4" nolabel="1">
<tree string="Tasks" editable="bottom">
<field name="name"/>
@@ -31,7 +34,7 @@
<button name="action_close" states="draft,pending,open" string="Done" type="object" icon="terp-dialog-close" help="For changing to done state"/>
</tree>
</field>
- </page>
+ </group>
</field>
</record>
=== modified file 'project_timesheet/project_timesheet_view.xml'
--- project_timesheet/project_timesheet_view.xml 2012-07-06 07:42:15 +0000
+++ project_timesheet/project_timesheet_view.xml 2012-07-18 11:09:22 +0000
@@ -70,7 +70,7 @@
<field name="inherit_id" ref="account.view_account_analytic_line_form"/>
<field name="arch" type="xml">
<field name="account_id" position="replace">
- <field name="account_id" string="Analytic account/project" on_change="on_change_account_id(account_id)"/>
+ <field name="account_id" string="Analytic Account/Project" on_change="on_change_account_id(account_id)"/>
</field>
</field>
</record>
=== modified file 'sale/sale_view.xml'
--- sale/sale_view.xml 2012-07-18 10:18:09 +0000
+++ sale/sale_view.xml 2012-07-18 11:09:22 +0000
@@ -174,7 +174,6 @@
<field name="partner_id" on_change="onchange_partner_id(partner_id)" domain="[('customer','=',True)]" context="{'search_default_customer':1, 'show_address': 1}" options='{"always_reload": true, "highlight_first_line": true}'/>
<field domain="[('parent_id','=',partner_id)]" name="partner_invoice_id" groups="sale.group_delivery_invoice_address"/>
<field domain="[('parent_id','=',partner_id)]" name="partner_shipping_id" groups="sale.group_delivery_invoice_address"/>
-
<field name="project_id" context="{'partner_id':partner_id, 'pricelist_id':pricelist_id, 'default_name':name}" groups="sale.group_analytic_accounting" domain="[('type','in',['view','normal','contract'])]"/>
</group>
<group>
@@ -263,6 +262,8 @@
<field name="amount_tax"/>
<field name="amount_total" class="oe_subtotal_footer_separator"/>
</group>
+ <group name="sale_delivery">
+ </group>
<div class="oe_clear">
<label for="note"/>
</div>
@@ -297,7 +298,7 @@
<tree string="Invoices" colors="blue:state == 'draft';black:state in ('proforma','proforma2','open');gray:state == 'cancel'">
<field name="date_invoice"/>
<field name="number"/>
- <field name="partner_id"/>
+ <field name="partner_id" string="Customer"/>
<field name="user_id"/>
<field name="date_due"/>
<field name="amount_total"/>
=== modified file 'sale/stock_view.xml'
--- sale/stock_view.xml 2012-07-17 15:19:01 +0000
+++ sale/stock_view.xml 2012-07-18 11:09:22 +0000
@@ -7,7 +7,7 @@
<field name="type">form</field>
<field name="inherit_id" ref="stock.view_picking_form"/>
<field name="arch" type="xml">
- <field name="auto_picking" position="after">
+ <field name="move_type" position="before">
<field name="sale_id"/>
</field>
</field>
=== modified file 'sale_margin/sale_margin_view.xml'
--- sale_margin/sale_margin_view.xml 2012-07-14 19:57:57 +0000
+++ sale_margin/sale_margin_view.xml 2012-07-18 11:09:22 +0000
@@ -8,8 +8,13 @@
<field name="model">sale.order</field>
<field name="inherit_id" ref="sale.view_order_form"/>
<field name="arch" type="xml">
- <xpath expr="//group[@name='sale_total']" position="inside">
- <field name="margin"/>
+ <xpath expr="//group[@name='sale_delivery']" position="inside">
+ <group>
+ <label for="margin"/>
+ <div>
+ <field name="margin"/>
+ </div>
+ </group>
</xpath>
</field>
</record>
=== modified file 'stock/stock_view.xml'
--- stock/stock_view.xml 2012-07-17 15:19:01 +0000
+++ stock/stock_view.xml 2012-07-18 11:09:22 +0000
@@ -860,7 +860,7 @@
</form>
</field>
</page>
- <page string="Additional info">
+ <page string="Additional Info">
<group>
<group>
<field name="move_type"/>
@@ -874,7 +874,7 @@
</group>
</page>
<page string="Notes">
- <field name="note" placeholder="Add an internal note..."/>
+ <field name="note" placeholder="Add an internal note"/>
</page>
</notebook>
</sheet>
=== modified file 'wiki/wiki_view.xml'
--- wiki/wiki_view.xml 2012-07-02 16:37:25 +0000
+++ wiki/wiki_view.xml 2012-07-18 11:09:22 +0000
@@ -155,7 +155,7 @@
</group>
<group col="2" colspan="2">
<separator colspan="4" string="Meta Information"/>
- <field name="tags"/>
+ <field name="tags" widget="many2many_tags"/>
<field name="toc" groups="base.group_no_one"/>
</group>
</sheet>
=== modified file 'wiki_sale_faq/wiki_sale_faq_view.xml'
--- wiki_sale_faq/wiki_sale_faq_view.xml 2012-02-24 06:23:31 +0000
+++ wiki_sale_faq/wiki_sale_faq_view.xml 2012-07-18 11:09:22 +0000
@@ -17,7 +17,7 @@
</record>
<record model="ir.actions.act_window" id="action_wiki_test">
- <field name="name">Wiki Pages</field>
+ <field name="name">Sales FAQ</field>
<field name="res_model">wiki.wiki</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
_______________________________________________
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
