Raphael Collet (OpenERP) has proposed merging
lp:~openerp-dev/openobject-server/trunk-first_10_clicks_sale-rco into
lp:openobject-server.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-first_10_clicks_sale-rco/+merge/111197
--
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-first_10_clicks_sale-rco/+merge/111197
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-server/trunk-first_10_clicks_sale-rco.
=== modified file 'openerp/addons/base/base_menu.xml'
--- openerp/addons/base/base_menu.xml 2012-05-19 09:44:37 +0000
+++ openerp/addons/base/base_menu.xml 2012-06-20 11:44:26 +0000
@@ -8,7 +8,7 @@
<menuitem id="menu_management" name="Modules" parent="menu_administration" sequence="0"/>
<menuitem id="menu_config" name="Configuration" parent="menu_administration" sequence="1"/>
<menuitem id="menu_administration_shortcut" parent="menu_administration" name="Custom Shortcuts" sequence="50"/>
- <menuitem id="menu_users" name="Users" parent="menu_administration" sequence="4"/>
+ <menuitem id="menu_users" name="Users" parent="menu_administration" sequence="4" groups="base.group_no_one"/>
<menuitem id="menu_translation" name="Translations" parent="menu_administration" sequence="7"/>
<menuitem id="menu_translation_app" name="Application Terms" parent="menu_translation" sequence="4" groups="base.group_no_one"/>
<menuitem id="menu_translation_export" name="Import / Export" groups="base.group_no_one" parent="menu_translation" sequence="3"/>
=== modified file 'openerp/addons/base/module/module_view.xml'
--- openerp/addons/base/module/module_view.xml 2012-06-19 08:56:09 +0000
+++ openerp/addons/base/module/module_view.xml 2012-06-20 11:44:26 +0000
@@ -69,8 +69,7 @@
<field name="model">ir.module.module</field>
<field name="type">kanban</field>
<field name="arch" type="xml">
-
- <kanban create="false">
+ <kanban create="false">
<field name="icon"/>
<field name="name"/>
<field name="state"/>
@@ -78,22 +77,19 @@
<t t-name="kanban-box">
<div class="oe_module_vignette oe_kanban_auto_height">
<t t-set="installed" t-value="record.state.raw_value == 'installed'"/>
- <a type="edit">
- <img t-attf-src="#{record.icon.value}" class="oe_module_icon"/>
- </a>
+ <img t-attf-src="#{record.icon.value}" class="oe_module_icon"/>
<div class="oe_module_desc">
<h4><a type="edit"><field name="shortdesc"/></a></h4>
<p class="oe_module_name">
<field name="name"/><br/>
</p>
- <button type="object" name="button_immediate_install" states="uninstalled" class="oe_button">Install</button>
- <button t-if="installed" class="oe_button" disabled="disabled">Installed</button>
+ <button type="object" name="button_immediate_install" states="uninstalled">Install</button>
+ <button t-if="installed" disabled="disabled">Installed</button>
</div>
</div>
</t>
</templates>
- </kanban>
-
+ </kanban>
</field>
</record>
@@ -195,7 +191,7 @@
</field>
</record>
<record id="open_module_tree" model="ir.actions.act_window">
- <field name="name">Modules</field>
+ <field name="name">Install a Module</field>
<field name="res_model">ir.module.module</field>
<field name="view_type">form</field>
<field name="view_mode">kanban,tree,form</field>
@@ -203,7 +199,8 @@
<field name="search_view_id" ref="view_module_filter"/>
<field name="help">You can install new modules in order to activate new features, menu, reports or data in your OpenERP instance. To install some modules, click on the button "Install" from the form view and then click on "Start Upgrade".</field>
</record>
- <menuitem action="open_module_tree" id="menu_module_tree" parent="base.menu_management" sequence="1"/>
+ <menuitem id="menu_module_tree" parent="base.menu_management" name="Modules"
+ sequence="1" action="open_module_tree"/>
</data>
</openerp>
=== modified file 'openerp/addons/base/module/wizard/base_language_install_view.xml'
--- openerp/addons/base/module/wizard/base_language_install_view.xml 2012-04-25 08:12:50 +0000
+++ openerp/addons/base/module/wizard/base_language_install_view.xml 2012-06-20 11:44:26 +0000
@@ -3,11 +3,11 @@
<data>
<record id="view_base_language_install" model="ir.ui.view">
- <field name="name">Load Official Translation</field>
+ <field name="name">Load a Translation</field>
<field name="model">base.language.install</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Load Official Translation">
+ <form string="Load a Translation">
<group colspan="4" col="8">
<group colspan="1">
<field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
@@ -19,7 +19,7 @@
</group>
<separator orientation="vertical" colspan="1" rowspan="12"/>
<group colspan="6">
- <separator string="Load an Official Translation" colspan="4"/>
+ <separator string="Load a Translation" colspan="4"/>
<group states="init" colspan="4">
<field name="lang" colspan="4"/>
<field name="overwrite" colspan="4" groups="base.group_no_one"/>
@@ -46,7 +46,7 @@
</record>
<record id="action_view_base_language_install" model="ir.actions.act_window">
- <field name="name">Load Official Translation</field>
+ <field name="name">Load a Translation</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">base.language.install</field>
<field name="view_type">form</field>
@@ -55,7 +55,7 @@
</record>
<menuitem
- name="Load an Official Translation"
+ name="Load a Translation"
action="action_view_base_language_install"
id="menu_view_base_language_install"
parent="menu_translation" sequence="2"/>
=== modified file 'openerp/addons/base/publisher_warranty/publisher_warranty_view.xml'
--- openerp/addons/base/publisher_warranty/publisher_warranty_view.xml 2012-06-15 04:26:45 +0000
+++ openerp/addons/base/publisher_warranty/publisher_warranty_view.xml 2012-06-20 11:44:26 +0000
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
- <menuitem id="menu_publisher_warranty" name="OpenERP Entreprise" parent="base.menu_administration" sequence="5"/>
+ <menuitem id="menu_publisher_warranty" name="OpenERP Entreprise" parent="base.menu_administration" sequence="5"
+ groups="base.group_no_one"/>
<record id="publisher_warranty_contract_tree_view" model="ir.ui.view">
<field name="name">publisher_warranty.contract.tree</field>
=== modified file 'openerp/addons/base/res/res_company_view.xml'
--- openerp/addons/base/res/res_company_view.xml 2012-06-19 08:56:09 +0000
+++ openerp/addons/base/res/res_company_view.xml 2012-06-20 11:44:26 +0000
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<openerp>
<data>
- <menuitem id="menu_res_company_global" parent="base.menu_administration" name="Companies" sequence="2"/>
+ <menuitem id="menu_res_company_global" parent="base.menu_administration" name="Companies" sequence="2"
+ groups="base.group_no_one"/>
<menuitem id="menu_custom_multicompany" parent="base.menu_custom" name="Multi-Companies" sequence="50"/>
=== modified file 'openerp/addons/base/res/res_config.xml'
--- openerp/addons/base/res/res_config.xml 2012-06-09 12:40:45 +0000
+++ openerp/addons/base/res/res_config.xml 2012-06-20 11:44:26 +0000
@@ -7,12 +7,12 @@
<field name="arch" type="xml">
<form version="7.0">
<header>
- <button name="action_skip" icon="gtk-jump-to" special="cancel"
- type="object" string="Cancel" colspan="1"/>
- <button name="action_next" icon="gtk-go-forward"
- type="object" string="Apply" colspan="1"/>
+ <button name="action_next" type="object"
+ string="Apply" icon="gtk-go-forward" class="oe_highlight"/>
+ <button name="action_skip" type="object" special="cancel"
+ string="Cancel" icon="gtk-jump-to"/>
</header>
- <group string="res_config_contents" col="4"/>
+ <group string="res_config_contents"/>
</form>
</field>
</record>
@@ -24,8 +24,8 @@
<field name="arch" type="xml">
<form string="Next Configuration Step" version="7.0">
<header>
- <button name="action_next" icon="gtk-go-forward"
- type="object" string="Continue"/>
+ <button name="action_next" type="object"
+ string="Continue" icon="gtk-go-forward" class="oe_highlight"/>
</header>
<field name="note"/>
</form>
@@ -39,10 +39,10 @@
<field name="arch" type="xml">
<form version="7.0">
<header>
- <button name="action_skip" icon="gtk-jump-to" special="cancel"
- type="object" string="Cancel" colspan="1"/>
- <button name="action_next" icon="gtk-go-forward"
- type="object" string="Install Modules" colspan="1"/>
+ <button name="action_next" type="object"
+ string="Install Modules" icon="gtk-go-forward" class="oe_highlight"/>
+ <button name="action_skip" type="object" special="cancel"
+ string="Cancel" icon="gtk-jump-to"/>
</header>
<separator string="title" colspan="4"/>
</form>
=== modified file 'openerp/addons/base/res/res_partner.py'
--- openerp/addons/base/res/res_partner.py 2012-06-18 16:01:48 +0000
+++ openerp/addons/base/res/res_partner.py 2012-06-20 11:44:26 +0000
@@ -50,6 +50,8 @@
context = {}
if context.get('partner_category_display') == 'short':
return super(res_partner_category, self).name_get(cr, uid, ids, context=context)
+ if isinstance(ids, (int, long)):
+ ids = [ids]
reads = self.read(cr, uid, ids, ['name','parent_id'], context=context)
res = []
for record in reads:
@@ -285,7 +287,9 @@
def name_get(self, cr, uid, ids, context=None):
if context is None:
context = {}
- if not len(ids):
+ if isinstance(ids, (int, long)):
+ ids = [ids]
+ if not ids:
return []
if context.get('show_ref'):
rec_name = 'ref'
=== modified file 'openerp/addons/base/res/res_partner_view.xml'
--- openerp/addons/base/res/res_partner_view.xml 2012-06-19 08:56:09 +0000
+++ openerp/addons/base/res/res_partner_view.xml 2012-06-20 11:44:26 +0000
@@ -262,6 +262,9 @@
<separator orientation="vertical"/>
<filter string="Persons" name="type_person" icon="terp-personal" domain="[('is_company','=',0)]"/>
<filter string="Companies" name="type_company" icon="terp-partner" domain="[('is_company','=',1)]"/>
+ <separator orientation="vertical"/>
+ <filter string="Customers" name="customer" icon="terp-personal" domain="[('customer','=',1)]" help="Customer Partners"/>
+ <filter string="Suppliers" name="supplier" icon="terp-personal" domain="[('supplier','=',1)]" help="Supplier Partners"/>
</group>
<newline />
<group expand="0" string="Group By...">
=== modified file 'openerp/addons/base/res/res_users.py'
--- openerp/addons/base/res/res_users.py 2012-06-15 13:41:22 +0000
+++ openerp/addons/base/res/res_users.py 2012-06-20 11:44:26 +0000
@@ -226,7 +226,7 @@
'company_ids':fields.many2many('res.company','res_company_users_rel','user_id','cid','Companies'),
'context_lang': fields.selection(_lang_get, 'Language', required=True,
- help="The default language used in the graphical user interface, when translations are available. To add a new language, you can use the 'Load an Official Translation' wizard available from the 'Administration' menu."),
+ help="The default language used in the graphical user interface, when translations are available. To add a new language, you can use the 'Load a Translation' wizard available from the 'Administration' menu."),
'context_tz': fields.selection(_tz_get, 'Timezone', size=64,
help="The user's timezone, used to output proper date and time values inside printed reports. "
"It is important to set a value for this field. You should use the same timezone "
_______________________________________________
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
