[MERGE]

bzr revid: hmo@tinyerp.com-20120926082033-fy70s0ei53v3l0e1

addons/account/account_menuitem.xml

@@ -8,7 +8,7 @@
             groups="group_account_user,group_account_manager,group_account_invoice"
             sequence="100"/>
 
-        <menuitem id="menu_finance_receivables" name="Customers" parent="menu_finance" sequence="2"/>
+        <menuitem id="menu_finance_receivables" name="Customers" groups="base.group_user" parent="menu_finance" sequence="2"/>
         <menuitem id="menu_finance_payables" name="Suppliers" parent="menu_finance" sequence="3"/>
         <menuitem id="menu_finance_bank_and_cash" name="Bank and Cash" parent="menu_finance" sequence="4"
             groups="group_account_user,group_account_manager"/>

addons/account/partner_view.xml

@@ -92,7 +92,7 @@
                             <field name="debit"/>
                         </group>
                     </group>
-                    <field name="bank_ids">
+                    <field name="bank_ids" context="{'default_partner_id': active_id}">
                         <form string="Bank account" version="7.0">
                             <group col="4">
                                 <field name="state"/>

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/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

@@ -41,7 +41,7 @@
                     <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="acc_number" placeholder="Account Number" string="Account/IBAN Number" attrs="{'required': [('state','not in',['bvpost','bvrpost'])]}"/>
                         <field name="dta_code"/>
                         <newline/>
                     </group>
@@ -72,7 +72,7 @@
                     <separator colspan="4" string="Account Infos"/>
                         <newline/>
                     <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="acc_number" placeholder="Account Number" string="Account/IBAN Number" attrs="{'required': [('state','not in',['bvpost','bvrpost'])]}"/>
                             <field name="dta_code"/>
                         <newline/>
                     </group>
@@ -92,8 +92,6 @@
                             <newline/>
                         </group>
                     </group>
-                    <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/purchase/report/request_quotation.rml

@@ -167,4 +167,4 @@
     <para style="terp_default_9">[[ user.signature or '' ]]</para>
   </pto>
   </story>
-</document>
+</document>

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

@@ -65,3 +65,4 @@ access_stock_tracking_purchase_user,stock.tracking purchase.user,stock.model_sto
 access_stock_location_purchase_manager,stock.location purchase manager,stock.model_stock_location,purchase.group_purchase_manager,1,0,0,0
 access_stock_warehouse_orderpoint_manager,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,purchase.group_purchase_manager,1,0,0,0
 access_stock_warehouse_orderpoint_manager,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,group_purchase_user,1,0,0,0
+access_purchase_order,purchase.order,model_purchase_order,base.group_user,1,0,0,0

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)]}),