[MERGE] misc fixes

bzr revid: fp@tinyerp.com-20120928075641-sx7cfje2g188buog

addons/account/partner_view.xml

@@ -92,34 +92,7 @@
                             <field name="debit"/>
                         </group>
                     </group>
-                    <field name="bank_ids">
+                    <field name="bank_ids" context="{'default_partner_id': active_id, 'form_view_ref': 'base.view_partner_bank_form'}">
-                        <form string="Bank account" version="7.0">
-                            <group col="4">
-                                <field name="state"/>
-                                <field name="acc_number"/>
-                            </group>
-                            <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="zip" class="oe_inline" placeholder="ZIP"/>
-                                            <field name="city" class="oe_inline" placeholder="City"/>
-                                        </div>
-                                        <field name="state_id" placeholder="State" options='{"no_open": true}'/>
-                                        <field name="country_id" placeholder="Country" options='{"no_open": true}'/>
-                                    </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="e.g. GEBABEBB"/>
-                                </group>
-                            </group>
-                        </form>
                         <tree string="Bank Details">
                             <field name="sequence" invisible="1"/>
                             <field name="acc_number"/>

addons/crm_claim/crm_claim_view.xml

@@ -241,7 +241,7 @@
                     <attribute name="invisible">False</attribute>
                 </xpath>
                 <xpath expr="//page[@name='page_history']" position="inside">
-                    <group name="grp_claim" string="Claim">
+                    <group name="grp_claim" string="Claims">
                         <field name="claims_ids" colspan="4" nolabel="1">
                             <tree string="Partners Claim" editable="bottom">
                                 <field name="name"/>

addons/crm_profiling/crm_profiling_view.xml

@@ -124,7 +124,7 @@
         <field name="inherit_id" ref="base.view_partner_form"/>
         <field name="arch" type="xml">
             <notebook position="inside">
-                <page string="Profiling">
+                <page string="Profiling" groups="base.group_user">
                   <button string="Use a questionnaire"
                       name="%(action_open_questionnaire)d" type="action" colspan="1"
                       icon="gtk-justify-fill" />

addons/crm_profiling/security/ir.model.access.csv

@@ -1,6 +1,7 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_crm_profiling_answer_salesman,crm_profiling.answer.salesman,model_crm_profiling_answer,base.group_sale_salesman,1,1,1,0
 access_crm_profiling_answer_manager,crm_profiling.answer.manager,model_crm_profiling_answer,base.group_sale_manager,1,1,1,1
+access_crm_profiling_answer_user,crm_profiling.answer.user,model_crm_profiling_answer,base.group_user,1,0,0,0
 access_crm_profiling_question_salesman,crm_profiling.question.salesman,model_crm_profiling_question,base.group_sale_salesman,1,1,1,0
 access_crm_profiling_question_manager,crm_profiling.question.manager,model_crm_profiling_question,base.group_sale_manager,1,1,1,1
 access_crm_profiling_questionnarie_salesman,crm_profiling.questionnarie.salesman,model_crm_profiling_questionnaire,base.group_sale_salesman,1,1,1,0

addons/event/res_partner_view.xml

@@ -16,7 +16,7 @@
                     <attribute name="invisible">False</attribute>
                 </xpath>
                 <xpath expr="//page[@name='page_history']" position="inside">
-                    <group name="grp_event" string="Event">
+                    <group name="grp_event" string="Events">
                         <field name="event_ids" colspan="4" nolabel="1">
                             <tree string="Events">
                                 <field name="name" string="Event"/>
@@ -24,7 +24,7 @@
                             </tree>
                         </field>
                     </group>
-                    <group name="grp_registration" string="Registration">
+                    <group name="grp_registration" string="Registrations">
                         <field name="event_registration_ids" colspan="4" nolabel="1">
                             <tree string="Events Registration">
                                 <field name="event_begin_date" string="Date"/>

addons/l10n_ch/account_wizard.py

@@ -36,8 +36,9 @@ class WizardMultiChartsAccounts(osv.osv_memory):
     def execute(self, cr, uid, ids, context=None):
         """Override of code in order to be able to link journal with account in XML"""
         res = super(WizardMultiChartsAccounts, self).execute(cr, uid, ids, context)
-        path = addons.get_module_resource(os.path.join('l10n_ch','sterchi_chart','account_journal_rel.xml'))
+        path = addons.get_module_resource('l10n_ch','sterchi_chart','account_journal_rel.xml')
         tools.convert_xml_import(cr, 'l10n_ch', path, idref=None, mode='init', noupdate=True, report=None)
+        res.update({'type': 'ir.actions.act_window_close'})
         return res
 
 WizardMultiChartsAccounts()

addons/l10n_ch/bank_view.xml

@@ -29,34 +29,6 @@
             </field>
         </record>
 
-        <!-- res.partner.bank in res partner form-->
-        <!-- Partner -> Bank Details -->
-        
-        <record model="ir.ui.view" id="l10nch_view_res_partner_bank_add_groups">
-            <field name="name">res.partner_bank.form.hide.f2</field>
-            <field name="model">res.partner</field>
-            <field name="inherit_id" ref="account.view_partner_property_form"/>
-            <field name="arch" type="xml">
-                <field name="state" position="after">
-                    <newline/>
-                    <separator colspan="4" string="Account Infos"/>
-                    <group string="Bank account info" colspan="4" attrs="{'invisible': [('state','in', ['bvpost','bvrpost'])]}" >
-                        <field name="acc_number" string="Account/IBAN Number" attrs="{'required': [('state','not in',['bvpost','bvrpost'])]}"/>
-                        <field name="dta_code"/>
-                        <newline/>
-                    </group>
-                    <newline/>
-                    <group string="Postal account info" colspan="4"  attrs="{'invisible': [('state','not in', ['bvpost','bvrpost','bvbank','bvrbank'])]}" >
-                        <field name="post_number" attrs="{'required': [('state','in',['bvpost','bvrpost','bvrbank'])]}"/>
-                        <newline/>
-                    </group>
-                    <separator colspan="4" string="Financial Institute Infos"/>
-                    <field name="bank" />
-                </field>
-            </field>
-        </record>
-
-
         <!-- res.partner.bank base form-->
         <!-- Sales -> Configuration -> Address Book -> Bank accounts -->
         <!-- Invoice -> Bank account -->
@@ -66,35 +38,21 @@
             <field name="model">res.partner.bank</field>
             <field name="inherit_id" ref="base.view_partner_bank_form"/>
             <field name="arch" type="xml">
-                <field name="state" position="after">
+                <xpath expr="//field[@name='acc_number']" position="attributes">
-                    <newline/>
+                    <attribute name="attrs">{'required': [('state','not in',['bvpost','bvrpost'])]}</attribute>
-                    
+                </xpath>
-                    <separator colspan="4" string="Account Infos"/>
+                <xpath expr="//field[@name='acc_number']" position="after">
-                        <newline/>
+                    <field name="post_number" attrs="{'required': [('state','in',['bvpost','bvrpost','bvrbank'])], 'invisible': [('state','not in', ['bvpost','bvrpost','bvbank','bvrbank'])]}"/>
-                    <group string="Bank account info" colspan="4" attrs="{'invisible': [('state','in', ['bvpost','bvrpost'])]}" >
+                    <field name="dta_code" attrs="{'invisible': [('state','in', ['bvpost','bvrpost'])]}"/>
-                            <field name="acc_number" string="Account/IBAN Number" attrs="{'required': [('state','not in',['bvpost','bvrpost'])]}"/>
+                    <field name="my_bank"  attrs="{'invisible': ['|', ('state', 'not in', ['bvrpost','bvrbank']), ('company_id', '=', False)]}" />
-                            <field name="dta_code"/>
+                </xpath>
-                        <newline/>
+                <xpath expr="//group[@name='bank']" position="after">
-                    </group>
+                    <group string="BVR print options" attrs="{'invisible': [('my_bank', '!=', True)]}" >
-                    <newline/>
-                    <group string="Postal account info" colspan="4"  attrs="{'invisible': [('state','not in', ['bvpost','bvrpost','bvbank','bvrbank'])]}" >
-                        <field name="post_number" attrs="{'required': [('state','in',['bvpost','bvrpost','bvrbank'])]}"/>
-                        <newline/>
-                    </group>
-                    <separator colspan="4" string="Financial Institute Infos"/>
-                    <newline/>
-                    <group attrs="{'invisible': ['|', ('state', 'not in', ['bvrpost','bvrbank']), ('company_id', '=', False)]}" colspan="4">
-                        <field name="my_bank"  attrs="{'invisible': [('company_id', '=', False)]}" />
-                        <group string="BVR print options" colspan="4"  attrs="{'invisible': [('my_bank', '!=', True)]}" >
                         <field name="bvr_adherent_num" attrs="{'invisible': [('state','!=','bvrbank')]}"/>
                         <field name="print_bank"/>
                         <field name="print_account"/>
-                            <newline/>
                     </group>
-                    </group>
+                </xpath>
-                    <newline/>
-                    <field name="bank" />
-                </field>
             </field>
         </record>        
 

addons/marketing_campaign/res_partner_view.xml

@@ -12,7 +12,7 @@
                    <attribute name="invisible">False</attribute>
                 </xpath>
                 <xpath expr="//page[@name='page_history']" position="inside">
-                    <group name="grp_campaign" string="Campaign">
+                    <group name="grp_campaign" string="Campaigns">
                         <field name="workitem_ids" colspan="4" nolabel="1"/>
                     </group>
                 </xpath>

addons/membership/membership.py

@@ -338,7 +338,7 @@ class Partner(osv.osv):
                     -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 = 'Membership Start Date', type = 'date',
                     store = {
                         'account.invoice': (_get_invoice_partner, ['state'], 10),
                         'membership.membership_line': (_get_partner_id, ['state'], 10, ),
@@ -346,7 +346,7 @@ class Partner(osv.osv):
                     }, help="Date from which membership becomes active."),
         'membership_stop': fields.function(
                     _membership_date,
-                    string = 'Stop Membership Date', type='date', multi='membership_stop',
+                    string = 'Membership End Date', type='date', multi='membership_stop',
                     store = {
                         'account.invoice': (_get_invoice_partner, ['state'], 10),
                         'membership.membership_line': (_get_partner_id, ['state'], 10),

addons/sale/report/sale_order.rml

@@ -153,6 +153,12 @@
   </pto_header>
     <para style="terp_default_8">[[repeatIn(objects,'o')]]</para>
     <para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
     <blockTable colWidths="265.0,51.0,225.0" style="Table1">
       <tr>
         <td>

addons/sale/res_config_view.xml

@@ -12,10 +12,6 @@
                     <group>
                         <label for="id" string="Invoicing Process"/>
                         <div>
-                            <div>
-                                <field name="group_invoice_so_lines" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)" class="oe_inline"/>
-                                <label for="group_invoice_so_lines"/>
-                            </div>
                             <div name="timesheet">
                                 <field name="timesheet" class="oe_inline" on_change="onchange_timesheet(timesheet)"/>
                                 <label for="timesheet"/>

addons/sale/sale.py

@@ -699,7 +699,7 @@ class sale_order_line(osv.osv):
         'invoice_lines': fields.many2many('account.invoice.line', 'sale_order_line_invoice_rel', 'order_line_id', 'invoice_id', 'Invoice Lines', readonly=True),
         'invoiced': fields.boolean('Invoiced', readonly=True),
         'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Product Price'), readonly=True, states={'draft': [('readonly', False)]}),
-        'price_subtotal': fields.function(_amount_line, string='Subtotal', digits_compute= dp.get_precision('Account')),
+        'price_subtotal': fields.function(_amount_line, string='Subtotal', digits_compute= dp.get_precision('Account'), store=True),
         'tax_id': fields.many2many('account.tax', 'sale_order_tax', 'order_line_id', 'tax_id', 'Taxes', readonly=True, states={'draft': [('readonly', False)]}),
         'address_allotment_id': fields.many2one('res.partner', 'Allotment Partner'),
         'product_uom_qty': fields.float('Quantity', digits_compute= dp.get_precision('Product UoS'), required=True, readonly=True, states={'draft': [('readonly', False)]}),