pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] with trunk

Browse Source 
bzr revid: fka@tinyerp.com-20121123041653-i17tnuh8o0thxti8
This commit is contained in:
Foram Katharotiya (OpenERP)
2012-11-23 09:46:53 +05:30
parent c5c6279a28 ba1e6454da
commit 20aaa2dcaa
28 changed files with 87 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/account_menuitem.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<menuitem name="Invoicing"
id="menu_finance"
groups="group_account_user,group_account_manager,group_account_invoice"
sequence="100"/>
sequence="50"/>
<menuitem id="menu_finance_receivables" name="Customers" parent="menu_finance" sequence="2"/>
<menuitem id="menu_finance_payables" name="Suppliers" parent="menu_finance" sequence="3"/>
addons/association/profile_association.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<menuitem name="Association"
id="base.menu_association"
groups="base.group_user"
sequence="70"/>
sequence="45"/>
<menuitem name="Configuration" id="base.menu_event_config" parent="base.menu_association" sequence="30"/>
<menuitem name="Association" id="base.menu_report_association" parent="base.menu_reporting" sequence="23"/>
addons/auth_openid/static/src/js/auth_openid.js
+34 -32
View File
@@ -5,42 +5,44 @@ var QWeb = instance.web.qweb;
instance.web.Login = instance.web.Login.extend({
start: function() {
this._super.apply(this, arguments);
var self = this;
this._default_error_message = this.$el.find('.oe_login_error_message').text();
this.$openid_selected_button = $();
this.$openid_selected_input = $();
this.$openid_selected_provider = null;
var openIdProvider = null;
if (this.has_local_storage && this.remember_credentials) {
openIdProvider = localStorage.getItem('openid-provider');
}
if (openIdProvider) {
$openid_selected_provider = openIdProvider;
this.do_openid_select('a[href="#' + openIdProvider + '"]', openIdProvider, true);
if (this.has_local_storage && this.remember_credentials) {
this.$openid_selected_input.find('input').val(localStorage.getItem('openid-login'));
var d = self._super.apply(this, arguments).done(function() {
self._default_error_message = self.$el.find('.oe_login_error_message').text();
self.$openid_selected_button = $();
self.$openid_selected_input = $();
self.$openid_selected_provider = null;
var openIdProvider = null;
if (self.has_local_storage && self.remember_credentials) {
openIdProvider = localStorage.getItem('openid-provider');
}
}
else {
this.do_openid_select('a[data-url=""]', 'login,password', true);
}
this.$el.find('a[data-url]').click(function (event) {
event.preventDefault();
var selected_oidh = $(this).attr('href').substr(1);
if (selected_oidh != self.$openid_selected_provider) {
self.do_openid_select(this, selected_oidh);
if (openIdProvider) {
$openid_selected_provider = openIdProvider;
self.do_openid_select('a[href="#' + openIdProvider + '"]', openIdProvider, true);
if (self.has_local_storage && self.remember_credentials) {
self.$openid_selected_input.find('input').val(localStorage.getItem('openid-login'));
}
}
else {
self.do_openid_select('a[data-url=""]', 'login,password', true);
}
self.$el.find('a[data-url]').click(function (event) {
event.preventDefault();
var selected_oidh = $(this).attr('href').substr(1);
if (selected_oidh != self.$openid_selected_provider) {
self.do_openid_select(this, selected_oidh);
}
});
self._check_error();
});
this._check_error();
return d;
},
addons/auth_signup/static/src/js/auth_signup.js
+4 -2
View File
@@ -32,9 +32,11 @@ openerp.auth_signup = function(instance) {
// in case of a signup, retrieve the user information from the token
if (self.params.db && self.params.token) {
d = self.rpc("/auth_signup/retrieve", {dbname: self.params.db, token: self.params.token})
d.done(function() {
self.rpc("/auth_signup/retrieve", {dbname: self.params.db, token: self.params.token})
.done(self.on_token_loaded)
.fail(self.on_token_failed);
.fail(self.on_token_failed)
});
}
return d;
},
addons/crm/crm_lead_view.xml
+1 -1
View File
@@ -317,7 +317,7 @@
<div>
<b><field name="name"/></b>
<t t-if="record.planned_revenue.raw_value">
- <b><t t-esc="Math.round(record.planned_revenue.value)"/>
- <b><t t-esc="record.planned_revenue.value"/>
<field name="company_currency"/></b>
</t>
</div>
addons/crm_claim/crm_claim_menu.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<menuitem name="Project"
id="base.menu_main_pm"
groups="base.group_sale_salesman"
sequence="90"/>
sequence="40"/>
<menuitem id="base.menu_aftersale" name="After-Sale Services"
groups="base.group_sale_salesman"
addons/event/event_view.xml
+1 -1
View File
@@ -14,7 +14,7 @@
<menuitem name="Events"
id="event_main_menu"
groups="base.group_user"
sequence="80"/>
sequence="115"/>
<menuitem name="Events Organization" id="base.menu_event_main" parent="event_main_menu"/>
<!-- EVENTS -->
addons/fleet/fleet_view.xml
+1 -1
View File
@@ -149,7 +149,7 @@
</field>
</record>
<menuitem name="Fleet" id="menu_root" sequence="70" />
<menuitem name="Fleet" id="menu_root" sequence="110" />
<menuitem name="Configuration" parent="menu_root" id="fleet_configuration" sequence="3" />
<menuitem action="fleet_vehicle_model_act" parent="fleet_configuration" id="fleet_vehicle_model_menu" groups="base.group_no_one"/>
<menuitem action="fleet_vehicle_model_brand_act" parent="fleet_configuration" id="fleet_vehicle_model_brand_menu" groups="base.group_no_one"/>
addons/hr/hr_view.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<menuitem name="Human Resources"
id="menu_hr_root"
groups="base.group_hr_manager,base.group_hr_user,base.group_user"
sequence="110"/>
sequence="90"/>
<menuitem id="menu_hr_main" parent="menu_hr_root" name="Human Resources" sequence="0"/>
<menuitem id="menu_hr_configuration" name="Configuration" parent="hr.menu_hr_root" groups="base.group_hr_manager" sequence="50"/>
<menuitem id="menu_hr_management" name="Human Resources" parent="hr.menu_hr_configuration" groups="base.group_no_one" sequence="25"/>
addons/idea/idea_view.xml
+1 -1
View File
@@ -2,7 +2,7 @@
<openerp>
<data>
<!-- Top menu item -->
<menuitem name="Tools" id="base.menu_tools" sequence="160"/>
<menuitem name="Tools" id="base.menu_tools" sequence="120"/>
<!-- Idea Categories Search View-->
<record model="ir.ui.view" id="view_idea_category_search">
<field name="name">idea.category.search</field>
addons/knowledge/knowledge_view.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<menuitem name="Knowledge"
id="knowledge.menu_document"
groups="base.group_system,base.group_document_user"
sequence="130"/>
sequence="116"/>
<menuitem name="Configuration" id="knowledge.menu_document_configuration"
parent="knowledge.menu_document" sequence="50"/>
addons/lunch/lunch_view.xml
+2 -2
View File
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
<openerp>
<data>
<!--Menu and Title-->
<menuitem id='menu_lunch' name='Lunch' sequence="300"/>
<!-- Top menu item -->
<menuitem id='menu_lunch' name='Lunch' sequence="100"/>
<menuitem name="Lunch" parent="menu_lunch" id="menu_lunch_title" sequence="50" />
<menuitem name="Administrate Orders" parent="menu_lunch" id="menu_lunch_admin" sequence="51" groups="group_lunch_manager"/>
<menuitem name="Administrate Cash Moves" parent="menu_lunch" id="menu_lunch_cash" sequence="52" groups="group_lunch_manager"/>
addons/marketing/marketing_view.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<menuitem name="Marketing"
id="base.marketing_menu"
groups="marketing.group_marketing_user,marketing.group_marketing_manager"
sequence="120"/>
sequence="85"/>
</data>
</openerp>
addons/membership/membership_view.xml
+9 -9
View File
@@ -134,8 +134,7 @@
parent="base.menu_marketing_config_association"
id="menu_membership_products"
action="action_membership_products"
sequence="1"
groups="base.group_partner_manager"/>
sequence="1"/>
<!-- MEMBERSHIP/CURRENT MEMBERS -->
@@ -183,7 +182,7 @@
<field name="name">Members</field>
<field name="res_model">res.partner</field>
<field name="search_view_id" ref="view_res_partner_member_filter"/>
<field name="context">{"search_default_all_members": 1}</field>
<field name="context">{"search_default_all_members": 1, "default_free_member": True}</field>
</record>
<record model="ir.actions.act_window.view" id="action_membership_members_view_tree">
@@ -234,15 +233,16 @@
<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"/>
<field name="membership_state"/>
<button name="%(action_membership_invoice_view)d" type="action" string="Buy Membership"
attrs="{'invisible':[('free_member','=',True)]}" class="oe_link"/>
</div>
</group>
<group>
<field name="associate_member" attrs="{'readonly':[('membership_state','!=', 'none')]}"/>
<field name="membership_start"/>
<field name="membership_stop"/>
<field name="membership_cancel"/>
<field name="associate_member" attrs="{'invisible':[('free_member','=',True)]}"/>
<field name="membership_start" attrs="{'invisible':[('membership_start','=',False)]}"/>
<field name="membership_stop" attrs="{'invisible':[('membership_stop','=',False)]}"/>
<field name="membership_cancel" attrs="{'invisible':[('membership_cancel','=',False)]}"/>
</group>
</group>
<field name="member_lines" nolabel="1" colspan="4" readonly="1">
addons/membership/wizard/membership_invoice_view.xml
+1 -1
View File
@@ -12,7 +12,7 @@
<field name="member_price"/>
</group>
<footer>
<button string="Join" name="membership_invoice" type="object" class="oe_highlight" />
<button string="Invoice Membership" name="membership_invoice" type="object" class="oe_highlight" />
or
<button string="Cancel" class="oe_link" special="cancel" />
</footer>
addons/mrp/mrp_view.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<menuitem name="Manufacturing"
id="base.menu_mrp_root"
groups="group_mrp_user,group_mrp_manager"
sequence="60"/>
sequence="80"/>
<menuitem name="Manufacturing"
id="menu_mrp_manufacturing"
addons/point_of_sale/point_of_sale_view.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<menuitem name="Point of Sale"
id="menu_point_root"
groups="group_pos_manager,group_pos_user"
sequence="140"/>
sequence="30"/>
<record id="categ_others" model="pos.category">
<field name="name">Others</field>
addons/portal/portal_view.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<menuitem name="Portal"
id="portal_menu"
groups="base.group_no_one,portal.group_portal"
sequence="20"/>
sequence="15"/>
<menuitem name="Our company" id="portal_company" parent="portal_menu" sequence="10"/>
<menuitem name="News" id="portal_company_news" parent="portal_company" sequence="10" action="action_news"/>
addons/procurement/procurement_view.xml
+2 -2
View File
@@ -56,7 +56,7 @@
<h1>
<field name="name" class="oe_inline"/>
<label string="-" attrs="{'invisible':[('origin','=',False)]}"/>
<field name="origin" class="oe_inline"/>
<field name="origin" class="oe_inline" placeholder="e.g. SO005"/>
</h1>
<group>
<group>
@@ -77,7 +77,7 @@
<label for="product_qty"/>
<div>
<field name="product_qty" class="oe_inline"/>
<field name="product_uom" class="oe_inline"/>
<field name="product_uom" class="oe_inline" groups="product.group_uom"/>
</div>
<label for="product_uos_qty" groups="product.group_uos"/>
<div groups="product.group_uos">
addons/product/product_view.xml
+1 -1
View File
@@ -96,7 +96,7 @@
<field name="price_extra" groups="product.group_product_variant"/>
</group>
</group>
<field name="description" placeholder="describe the product characteristics for internal use..."/>
<field name="description" placeholder="describe the product characteristics..."/>
</page>
<page string="Procurements" groups="base.group_user">
<group name="procurement">
addons/project/project_data.xml
+6 -12
View File
@@ -35,7 +35,7 @@
<record id="project_tt_specification" model="project.task.type">
<field name="sequence">2</field>
<field name="name">Specification</field>
<field name="state">draft</field>
<field name="state">pending</field>
<field name="case_default" eval="True"/>
</record>
<record id="project_tt_design" model="project.task.type">
@@ -44,37 +44,31 @@
<field name="state">open</field>
<field name="case_default" eval="True"/>
</record>
<record id="project_tt_negotiation" model="project.task.type">
<field name="sequence">3</field>
<field name="name">Negotiation</field>
<field name="state">pending</field>
<field name="case_default" eval="False"/>
<field name="fold" eval="True"/>
</record>
<record id="project_tt_development" model="project.task.type">
<field name="sequence">4</field>
<field name="sequence">3</field>
<field name="name">Development</field>
<field name="state">open</field>
<field name="case_default" eval="True"/>
</record>
<record id="project_tt_testing" model="project.task.type">
<field name="sequence">5</field>
<field name="sequence">4</field>
<field name="name">Testing</field>
<field name="state">open</field>
<field name="case_default" eval="True"/>
</record>
<record id="project_tt_merge" model="project.task.type">
<field name="sequence">6</field>
<field name="sequence">5</field>
<field name="name">Merge</field>
<field name="state">open</field>
<field name="case_default" eval="False"/>
<field name="fold" eval="True"/>
</record>
<record id="project_tt_deployment" model="project.task.type">
<field name="sequence">7</field>
<field name="sequence">6</field>
<field name="name">Done</field>
<field name="state">done</field>
<field name="case_default" eval="True"/>
<field name="fold" eval="True"/>
</record>
<record id="project_tt_cancel" model="project.task.type">
<field name="sequence">7</field>
addons/project/project_demo.xml
+2 -2
View File
@@ -36,7 +36,7 @@
<field name="user_id" ref="base.user_demo"/>
<field name="description">Implement new website for Sale and Warehouse Management for a customer.</field>
<field name="alias_model">project.task</field>
<field name="type_ids" eval="[(6, 0, [ref('project_tt_analysis'),ref('project_tt_specification'),ref('project_tt_negotiation'),ref('project_tt_development'),ref('project_tt_testing'),ref('project_tt_deployment')])]"/>
<field name="type_ids" eval="[(6, 0, [ref('project_tt_analysis'),ref('project_tt_specification'),ref('project_tt_development'),ref('project_tt_testing'),ref('project_tt_deployment')])]"/>
</record>
<record id="project_project_2" model="project.project">
@@ -114,7 +114,7 @@
<field name="project_id" ref="project.project_project_1"/>
<field name="name">Budget Planning</field>
<field name="date_deadline" eval="time.strftime('%Y-%m-24')"/>
<field name="stage_id" ref="project_tt_negotiation"/>
<field name="stage_id" ref="project_tt_testing"/>
<field name="color">4</field>
</record>
<record id="project_task_4" model="project.task">
addons/project/project_view.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<menuitem name="Project"
id="base.menu_main_pm"
groups="group_project_manager,group_project_user"
sequence="90"/>
sequence="40"/>
<menuitem id="menu_project_management" name="Project" parent="base.menu_main_pm" sequence="1"/>
<menuitem id="base.menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60"/>
addons/purchase/purchase_view.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<menuitem name="Purchases"
id="base.menu_purchase_root"
groups="group_purchase_manager,group_purchase_user"
sequence="40"/>
sequence="60"/>
<menuitem id="menu_procurement_management" name="Purchase"
parent="base.menu_purchase_root" sequence="1" />
addons/stock/stock_view.xml
+3 -3
View File
@@ -6,7 +6,7 @@
<menuitem name="Warehouse"
id="menu_stock_root"
groups="group_stock_manager,group_stock_user"
sequence="50"/>
sequence="70"/>
<menuitem id="menu_stock_warehouse_mgmt" name="Receive/Deliver By Orders" parent="menu_stock_root" sequence="1"/>
<menuitem id="menu_stock_products_moves" name="Receive/Deliver Products" parent="menu_stock_root" sequence="2"/>
@@ -114,7 +114,7 @@
</header>
<sheet>
<div class="oe_right oe_button_box">
<button name="%(action_view_stock_fill_inventory)d" string="Fill Inventory" type="action" />
<button name="%(action_view_stock_fill_inventory)d" string="Fill Inventory" states="draft,confirm" type="action" />
</div>
<group>
<group>
@@ -1235,7 +1235,7 @@
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
</group>
<group name="origin_grp" string="Origin">
<field name="picking_id"/>
<field name="picking_id" domain="[('type','=',type)]"/>
<field name="type" on_change="onchange_move_type(type)"/>
<field name="location_id" groups="stock.group_locations"/>
<field name="create_date" groups="base.group_no_one"/>
addons/stock/wizard/stock_fill_inventory.py
+6 -7
View File
@@ -60,9 +60,6 @@ class stock_fill_inventory(osv.osv_memory):
if context.get('active_id', False):
stock = self.pool.get('stock.inventory').browse(cr, uid, context.get('active_id', False))
if stock.state == 'done':
raise osv.except_osv(_('Warning!'), _('Stock Inventory is already Validated.'))
return True
def fill_inventory(self, cr, uid, ids, context=None):
@@ -124,19 +121,21 @@ class stock_fill_inventory(osv.osv_memory):
res[location] = datas
if not flag:
raise osv.except_osv(_('Warning!'), _('No product in this location.'))
raise osv.except_osv(_('Warning!'), _('No product in this location. Please select a location in the product form.'))
for stock_move in res.values():
for stock_move_details in stock_move.values():
stock_move_details.update({'inventory_id': context['active_ids'][0]})
domain = []
for field, value in stock_move_details.items():
if field == 'product_qty' and fill_inventory.set_stock_zero:
domain.append((field, 'in', [value,'0']))
continue
domain.append((field, '=', value))
if fill_inventory.set_stock_zero:
stock_move_details.update({'product_qty': 0})
for field, value in stock_move_details.items():
domain.append((field, '=', value))
line_ids = inventory_line_obj.search(cr, uid, domain, context=context)
if not line_ids:
addons/subscription/subscription_view.xml
+1 -1
View File
@@ -2,7 +2,7 @@
<openerp>
<data>
<!-- Top menu item -->
<menuitem name="Tools" id="base.menu_tools" sequence="160"/>
<menuitem name="Tools" id="base.menu_tools" sequence="120"/>
<menuitem id="next_id_45" name="Recurring Events" parent="base.menu_tools" sequence="4"/>
<!-- Subscription Views -->
addons/survey/survey_view.xml
+1 -1
View File
@@ -2,7 +2,7 @@
<openerp>
<data>
<!-- Top menu item -->
<menuitem name="Tools" id="base.menu_tools" sequence="160"/>
<menuitem name="Tools" id="base.menu_tools" sequence="120"/>
<menuitem name="Surveys" id="menu_surveys" parent="base.menu_tools" sequence="2" groups="base.group_tool_user,base.group_tool_manager,base.group_survey_user"/>