Mayur Maheshwari(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-terminology_sale-mma into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-terminology_sale-mma/+merge/128485
Hello
I have Renamed following things:
- “Sales orders” into “Sale Orders”
- “partner grade” into “partner level”
- “Current membership state” into “Current membership status”
- “Can constitute an expense” into “Can be expensed”
- “meeting detail” into “Meeting Details”
- “Order reference”into “Quotation number”
- Timebox into “Timeframe”
- “Storage Localisation” into “Storage Localization”
Thanks
Mayur
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-terminology_sale-mma/+merge/128485
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-terminology_sale-mma.
=== modified file 'base_calendar/base_calendar.py'
--- base_calendar/base_calendar.py 2012-10-05 18:50:15 +0000
+++ base_calendar/base_calendar.py 2012-10-08 13:11:29 +0000
@@ -1022,6 +1022,7 @@
rule or repeating pattern of time to exclude from the recurring rule."),
'rrule': fields.function(_get_rulestring, type='char', size=124, \
fnct_inv=_rrule_write, store=True, string='Recurrent Rule'),
+<<<<<<< TREE
'rrule_type': fields.selection([
('daily', 'Daily'),
('weekly', 'Weekly'),
@@ -1029,6 +1030,13 @@
('yearly', 'Yearly')
], 'Recurrency', states={'done': [('readonly', True)]},
help="Let the event automatically repeat at that interval"),
+=======
+ 'rrule_type': fields.selection([('none', ''), ('daily', 'Day(s)'), \
+ ('weekly', 'Week(s)'), ('monthly', 'Month(s)'), \
+ ('yearly', 'Year(s)'),],
+ 'Recurrency', states={'done': [('readonly', True)]},
+ help="Let the event automatically repeat at that interval"),
+>>>>>>> MERGE-SOURCE
'alarm_id': fields.many2one('res.alarm', 'Reminder', states={'done': [('readonly', True)]},
help="Set an alarm at this time, before the event occurs" ),
'base_calendar_alarm_id': fields.many2one('calendar.alarm', 'Alarm'),
=== modified file 'base_calendar/crm_meeting_view.xml'
--- base_calendar/crm_meeting_view.xml 2012-10-05 14:54:13 +0000
+++ base_calendar/crm_meeting_view.xml 2012-10-08 13:11:29 +0000
@@ -86,7 +86,7 @@
</h2>
</div>
<notebook>
- <page string="Meeting Detail">
+ <page string="Meeting Details">
<group>
<group>
<field name="date" string="Starting at"/>
=== modified file 'base_vat/base_vat_view.xml'
--- base_vat/base_vat_view.xml 2012-08-06 19:05:27 +0000
+++ base_vat/base_vat_view.xml 2012-10-08 13:11:29 +0000
@@ -11,7 +11,7 @@
<label for="vat"/>
<div>
<field name="vat" on_change="vat_change(vat)" placeholder="e.g. BE0477472701" class="oe_inline"/>
- <button colspan="2" name="button_check_vat" string="Check VAT" type="object" icon="gtk-execute" class="oe_inline"/>
+ <button colspan="2" name="button_check_vat" string="Check Validity" type="object" icon="gtk-execute" class="oe_inline"/>
<field name="vat_subjected" class="oe_inline"/>
</div>
</field>
=== modified file 'crm_partner_assign/res_partner_view.xml'
--- crm_partner_assign/res_partner_view.xml 2012-08-08 12:19:50 +0000
+++ crm_partner_assign/res_partner_view.xml 2012-10-08 13:11:29 +0000
@@ -77,7 +77,7 @@
<field name="inherit_id" ref="base.view_partner_tree"/>
<field name="arch" type="xml">
<field name="user_id" position="after">
- <field name="grade_id"/>
+ <field name="grade_id" string="Partner Level"/>
<field name="activation"/>
</field>
</field>
=== modified file 'hr_expense/hr_expense.py'
--- hr_expense/hr_expense.py 2012-09-27 19:10:59 +0000
+++ hr_expense/hr_expense.py 2012-10-08 13:11:29 +0000
@@ -233,7 +233,7 @@
class product_product(osv.osv):
_inherit = "product.product"
_columns = {
- 'hr_expense_ok': fields.boolean('Can Constitute an Expense', help="Determines if the product can be visible in the list of product within a selection from an HR expense sheet line."),
+ 'hr_expense_ok': fields.boolean('Can be Expensed', help="Determines if the product can be visible in the list of product within a selection from an HR expense sheet line."),
}
def on_change_hr_expense_ok(self, cr, uid, id, hr_expense_ok):
=== modified file 'membership/membership.py'
--- membership/membership.py 2012-09-21 13:11:44 +0000
+++ membership/membership.py 2012-10-08 13:11:29 +0000
@@ -323,7 +323,7 @@
help = 'The price negotiated by the partner'),
'membership_state': fields.function(
__get_membership_state,
- string = 'Current Membership State', type = 'selection',
+ string = 'Current Membership Status', type = 'selection',
selection = STATE,
store = {
'account.invoice': (_get_invoice_partner, ['state'], 10),
=== modified file 'product/product_view.xml'
--- product/product_view.xml 2012-09-30 14:16:38 +0000
+++ product/product_view.xml 2012-10-08 13:11:29 +0000
@@ -144,7 +144,7 @@
<field name="state"/>
<field name="product_manager"/>
</group>
- <group name="store" string="Storage Localisation">
+ <group name="store" string="Storage Localization">
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
<field name="loc_rack" attrs="{'invisible':[('type','=','service')]}"/>
<field name="loc_row" attrs="{'invisible':[('type','=','service')]}"/>
@@ -763,7 +763,7 @@
</div>
<field name="warranty"/>
</group>
- <group name="store" string="Storage Localisation">
+ <group name="store" string="Storage Localization">
<field name="loc_rack"/>
<field name="loc_row"/>
<field name="loc_case"/>
=== modified file 'project_gtd/project_gtd_view.xml'
--- project_gtd/project_gtd_view.xml 2012-08-13 16:06:57 +0000
+++ project_gtd/project_gtd_view.xml 2012-10-08 13:11:29 +0000
@@ -93,7 +93,7 @@
<field name="arch" type="xml">
<field name="progress" position="after">
<field name="context_id" widget="selection" options='{"no_open": true}'/>
- <field name="timebox_id" widget="selection" options='{"no_open": true}'/>
+ <field name="timebox_id" widget="selection" options='{"no_open": true}' string="Timeframe"/>
</field>
</field>
</record>
=== modified file 'sale/sale_view.xml'
--- sale/sale_view.xml 2012-10-05 13:22:22 +0000
+++ sale/sale_view.xml 2012-10-08 13:11:29 +0000
@@ -131,7 +131,24 @@
<field name="arch" type="xml">
<tree string="Sales Orders" fonts="bold:message_unread==True" colors="grey:state=='cancel';blue:state in ('waiting_date','manual');red:state in ('invoice_except','shipping_except')">
<field name="message_unread" invisible="1"/>
- <field name="name"/>
+ <field name="name" string="Order number"/>
+ <field name="date_order"/>
+ <field name="partner_id"/>
+ <field name="user_id"/>
+ <field name="amount_total" sum="Total Tax Included"/>
+ <field name="state"/>
+ </tree>
+ </field>
+ </record>
+
+ <record id="view_quotation_tree" model="ir.ui.view">
+ <field name="name">sale.order.tree</field>
+ <field name="model">sale.order</field>
+ <field name="priority">2</field>
+ <field name="arch" type="xml">
+ <tree string="Quotation" fonts="bold:message_unread==True" colors="grey:state=='cancel';blue:state in ('waiting_date','manual');red:state in ('invoice_except','shipping_except')">
+ <field name="message_unread" invisible="1"/>
+ <field name="name" string="Quotation Number"/>
<field name="date_order"/>
<field name="partner_id"/>
<field name="user_id"/>
@@ -358,7 +375,7 @@
</record>
<record id="action_order_form" model="ir.actions.act_window">
- <field name="name">Sales Orders</field>
+ <field name="name">Sale Orders</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">sale.order</field>
<field name="view_type">form</field>
@@ -405,6 +422,7 @@
<field name="type">ir.actions.act_window</field>
<field name="res_model">sale.order</field>
<field name="view_type">form</field>
+ <field name="view_id" ref="view_quotation_tree"/>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="context">{'show_address': 1}</field>
<field name="domain">[('state','in',('draft','sent','cancel'))]</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
