Merge lp:~openerp-dev/openobject-addons/trunk-addons-ps-test_7-contract-hip into lp:openobject-addons

[Hiral Patel (OpenERP)]

Hello,

This Branch contain following changes:

   1. When creating a project, if there is no customer, the Type of Account should be "Analytic Account", right now it remains "Contract or Project".
   2. In SO when we select any product and (save and close) and if you again click on product and try to edit quantiity it's not possible.
   3. On Reconcile button on Manual Reconciliation list view KeyError: 'active_ids'.
   4. From the contract view, the customer must be required if the analytic account type is contract.
   5. Improve useability of Sign in sign out by project.
   6. Remove the filters Sale Order & Quotation From SO.
   7. Bank statement:, the computed balance field is missing.
   8. The group "Sales own leads" should see only it's own contracts or the contracts unassigned. (like opportunities).
   9. In contract, check "timesheets" in order to put the default reinvoicing to "100%".
         If you uncheck invoice on timesheet, the invoice ratio should be set to empty (check it's not used for expenses)

Pad Link: http://pad.openerp.com/p/rd-project.task-4489-Z8G7S791

Thanks.

[lp:~openerp-dev/openobject-addons/trunk-addons-ps-test_7-contract-hip]

8208. By Hiral Patel (OpenERP) on 2012-12-20

[MERGE] Merge with lp:openobject-addons

8209. By Hiral Patel (OpenERP) on 2012-12-20

[MERGE] Merge with lp:openobject-addons

8210. By Hiral Patel (OpenERP) on 2012-12-20

Resolve conflicts

8211. By Hiral Patel (OpenERP) on 2012-12-20

[Rev] Revert the changes of revno 8200

8212. By Hiral Patel (OpenERP) on 2012-12-20

[Imp] Improve the code for on change customer change type

8213. By RGA(OpenERP) on 2013-01-30

Merge with trunk

8214. By RGA(OpenERP) on 2013-04-22

Merge with trunk

8215. By Ujjvala Collins on 2013-05-01

[MERGE]: Merged with latest trunk

8216. By RGA(OpenERP) on 2013-05-16

Remove unnecessary change or alredy fixed in trunk

8217. By RGA(OpenERP) on 2013-05-16

Remove record rule which fial runbot test

8218. By Ishwar Malvi(OpenERP) on 2013-05-17

[ADD] record rule: when 'sales own leads' config then login user can see his/her contract only or manager of contract

8219. By Ishwar Malvi(OpenERP) on 2013-05-17

typo:manage space

8220. By RGA(OpenERP) on 2013-05-21

[FIX] Error:active_id not found on domain eval when click on Accouting/Configuration/Analytic Accounts, here we diffenciate partner form view button and analytic accounts menu actions

8221. By RGA(OpenERP) on 2013-05-21

[IMP] Contract/Analytic account: customer field should be required when account type is project or contract

8222. By Ishwar Malvi(OpenERP) on 2013-05-21

[IMP] record rule: unassigned contract(without manager) should be accessed by all user

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

Few points to fix:
1. action_account_analytic_account_partner_form has two reference, we can remove one its duplicated.
2. <field name="domain_force">['|','|','|',('create_uid','=',user.id),('create_uid','=',False),('manager_id','=',user.id),('manager_id','=',False)]</field> -> create_uid will not be false anytime so you can improve it and also you can remove domain for create_uid.

Thanks,
Mustufa Rangwala

review: Needs Fixing

Unmerged revisions

8222. By Ishwar Malvi(OpenERP) on 2013-05-21

[IMP] record rule: unassigned contract(without manager) should be accessed by all user

8221. By RGA(OpenERP) on 2013-05-21

[IMP] Contract/Analytic account: customer field should be required when account type is project or contract

8220. By RGA(OpenERP) on 2013-05-21

[FIX] Error:active_id not found on domain eval when click on Accouting/Configuration/Analytic Accounts, here we diffenciate partner form view button and analytic accounts menu actions

8219. By Ishwar Malvi(OpenERP) on 2013-05-17

typo:manage space

8218. By Ishwar Malvi(OpenERP) on 2013-05-17

[ADD] record rule: when 'sales own leads' config then login user can see his/her contract only or manager of contract

8217. By RGA(OpenERP) on 2013-05-16

Remove record rule which fial runbot test

8216. By RGA(OpenERP) on 2013-05-16

Remove unnecessary change or alredy fixed in trunk

8215. By Ujjvala Collins on 2013-05-01

[MERGE]: Merged with latest trunk

8214. By RGA(OpenERP) on 2013-04-22

Merge with trunk

8213. By RGA(OpenERP) on 2013-01-30

Merge with trunk

=== modified file 'account/partner_view.xml'
--- account/partner_view.xml	2013-04-22 15:34:49 +0000
+++ account/partner_view.xml	2013-05-21 13:53:31 +0000
@@ -50,12 +50,13 @@
             </field>
         </record>
 
-        <record id="action_account_analytic_account_form" model="ir.actions.act_window">
+        <record id="action_account_analytic_account_partner_form" model="ir.actions.act_window">
             <field name="context">{'search_default_partner_id': [active_id], 'default_partner_id': active_id}</field>
             <field name="name">Contracts/Analytic Accounts</field>
             <field name="res_model">account.analytic.account</field>
             <field name="view_mode">tree,form</field>
         </record>
+        
         <record model="ir.ui.view" id="partner_view_buttons">
             <field name="name">partner.view.buttons</field>
             <field name="model">res.partner</field>
@@ -67,7 +68,7 @@
                         name="%(account.action_invoice_tree)d" 
                         context="{'search_default_partner_id': active_id,'default_partner_id': active_id}" groups="account.group_account_invoice"/>
                     <button type="action" string="Journal Items" name="%(account.action_account_moves_all_tree)d" groups="account.group_account_user"/>
-                    <button type="action" string="Contracts/Analytic Accounts" name="%(account.action_account_analytic_account_form)d" 
+                    <button type="action" string="Contracts/Analytic Accounts" name="%(account.action_account_analytic_account_partner_form)d" 
                             groups="analytic.group_analytic_accounting"/>
                 </xpath>
             </field>

=== modified file 'account/project/project_view.xml'
--- account/project/project_view.xml	2013-04-22 15:34:49 +0000
+++ account/project/project_view.xml	2013-05-21 13:53:31 +0000
@@ -71,7 +71,15 @@
                 </tree>
             </field>
         </record>
-
+        
+        <record id="action_account_analytic_account_partner_form" model="ir.actions.act_window">
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.analytic.account</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_account_analytic_account_tree"/>
+            <field name="search_view_id" ref="account.view_account_analytic_account_search"/>
+        </record>
 
         <record id="action_account_analytic_account_form" model="ir.actions.act_window">
             <field name="name">Analytic Accounts</field>

=== modified file 'account_analytic_analysis/account_analytic_analysis.py'
--- account_analytic_analysis/account_analytic_analysis.py	2013-04-04 09:52:57 +0000
+++ account_analytic_analysis/account_analytic_analysis.py	2013-05-21 13:53:31 +0000
@@ -449,6 +449,15 @@
             res[account.id]['toinvoice_total'] =  self._get_total_toinvoice(account)
          return res
 
+    def on_change_invoice_on_timesheets(self, cr, uid, ids, invoice_on_timesheets, context=None):
+        res = {'value': {}}
+        if invoice_on_timesheets:
+            ir_model_obj = self.pool.get('ir.model.data')
+            res['value']['to_invoice'] = ir_model_obj.get_object_reference(cr, uid, 'hr_timesheet_invoice', 'timesheet_invoice_factor1')[1]
+        else:
+            res['value']['to_invoice'] = False
+        return res
+
     _columns = {
         'is_overdue_quantity' : fields.function(_is_overdue_quantity, method=True, type='boolean', string='Overdue Quantity',
                                                 store={

=== modified file 'account_analytic_analysis/account_analytic_analysis_view.xml'
--- account_analytic_analysis/account_analytic_analysis_view.xml	2013-04-22 15:34:49 +0000
+++ account_analytic_analysis/account_analytic_analysis_view.xml	2013-05-21 13:53:31 +0000
@@ -36,7 +36,7 @@
                     </div>
                 </xpath>
                 <field name="partner_id" position="attributes">
-                    <attribute name="attrs">{'required': [('type','=','contract'),'|','|',('fix_price_invoices','=',True), ('invoice_on_timesheets', '=', True), ('recurring_invoices', '=', True)]}</attribute>
+                    <attribute name="attrs">{'required': ['|','|','|',('type','=','contract'),('fix_price_invoices','=',True), ('invoice_on_timesheets', '=', True), ('recurring_invoices', '=', True)]}</attribute>
                 </field>
                 <xpath expr='//group[@name="invoice_on_timesheets"]' position="replace">
                 </xpath>
@@ -87,7 +87,7 @@
                             <td class="oe_timesheet_grey">
                                 <label for="invoice_on_timesheets"/>
                             </td><td class="oe_timesheet_grey">
-                                <field name="invoice_on_timesheets" on_change="onchange_invoice_on_timesheets(invoice_on_timesheets)"/>
+                                <field name="invoice_on_timesheets" on_change="on_change_invoice_on_timesheets(invoice_on_timesheets, context)"/>
                             </td><td>
                                 <field class="oe_inline" name="hours_qtt_est" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
                             </td><td>

=== modified file 'analytic/analytic_view.xml'
--- analytic/analytic_view.xml	2012-11-29 22:26:45 +0000
+++ analytic/analytic_view.xml	2013-05-21 13:53:31 +0000
@@ -21,7 +21,7 @@
 
                         <group name="main">
                             <group>
-                                <field name="partner_id" on_change="on_change_partner_id(partner_id, name)"/>
+                                <field name="partner_id" on_change="on_change_partner_id(partner_id, name)" attrs="{'required': [('type','=','contract')]}"/>
                                 <field name="manager_id"/>
                                 <field name="currency_id" attrs="{'invisible': ['|',('type', '&lt;&gt;', 'view'), ('company_id', '&lt;&gt;', False)]}"/>
                             </group>

=== modified file 'analytic/security/analytic_security.xml'
--- analytic/security/analytic_security.xml	2012-07-13 17:08:38 +0000
+++ analytic/security/analytic_security.xml	2013-05-21 13:53:31 +0000
@@ -15,7 +15,13 @@
         <field eval="True" name="global"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
-
+    
+    <record id="account_rule_personal_analytic_account" model="ir.rule">
+        <field name="name">Personal Analytic Account</field>
+        <field ref="analytic.model_account_analytic_account" name="model_id"/>
+        <field name="domain_force">['|','|','|',('create_uid','=',user.id),('create_uid','=',False),('manager_id','=',user.id),('manager_id','=',False)]</field>
+        <field name="groups" eval="[(4, ref('base.group_sale_salesman'))]"/>
+    </record>
 </data>
 <data noupdate="0">
 

=== modified file 'hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml'
--- hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml	2012-11-29 22:26:45 +0000
+++ hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml	2013-05-21 13:53:31 +0000
@@ -58,17 +58,21 @@
             <field name="arch" type="xml">
                 <form string="Sign In/Out by Project" version="7.0">
                     <group colspan="4" >
-                        <separator string="General Information" colspan="4" />
-                        <field name="name" readonly="True" />
-                        <field name="state" readonly="True" />
-                        <field name="date_start"/>
-                        <field name="server_date"/>
-                        <separator string="Work done in the last period" colspan="4" />
-                        <field name="account_id" colspan="2"/>
-                        <field name="info" colspan="2"/>
-                        <field name="date"/>
-                        <label string="(Keep empty for current_time)" colspan="2"/>
-                        <field name="analytic_amount"/>
+                        <group>
+                            <separator string="General Information" colspan="4" />
+                            <field name="name" readonly="True" />
+                            <field name="state" readonly="True" />
+                            <field name="date_start"/>
+                            <field name="server_date"/>
+                        </group>
+                        <group>
+                            <separator string="Work done in the last period" colspan="4" />
+                            <field name="account_id" colspan="2"/>
+                            <field name="info" colspan="2"/>
+                            <field name="date"/>
+                            <label string="(Keep empty for current_time)" colspan="2"/>
+                            <field name="analytic_amount"/>
+                        </group>
                     </group>
 
                     <footer>

=== modified file 'project/project.py'
--- project/project.py	2013-04-23 15:29:43 +0000
+++ project/project.py	2013-05-21 13:53:31 +0000
@@ -99,13 +99,15 @@
 
     def onchange_partner_id(self, cr, uid, ids, part=False, context=None):
         partner_obj = self.pool.get('res.partner')
+        val = {}
         if not part:
-            return {'value':{}}
-        val = {}
+            val['type'] = 'normal'
+            return {'value':val}
         if 'pricelist_id' in self.fields_get(cr, uid, context=context):
             pricelist = partner_obj.read(cr, uid, part, ['property_product_pricelist'], context=context)
             pricelist_id = pricelist.get('property_product_pricelist', False) and pricelist.get('property_product_pricelist')[0] or False
             val['pricelist_id'] = pricelist_id
+            val['type'] = 'contract'
         return {'value': val}
 
     def _get_projects_from_tasks(self, cr, uid, task_ids, context=None):
@@ -287,7 +289,7 @@
     _order = "sequence, id"
     _defaults = {
         'active': True,
-        'type': 'contract',
+        'type': 'normal',
         'state': 'open',
         'priority': 1,
         'sequence': 10,
@@ -546,7 +548,7 @@
                           model_name=vals.get('alias_model', 'project.task'),
                           context=context)
             vals['alias_id'] = alias_id
-        if vals.get('type', False) not in ('template','contract'):
+        if vals.get('type', False) not in ('template','contract','normal'):
             vals['type'] = 'contract'
         project_id = super(project, self).create(cr, uid, vals, context)
         mail_alias.write(cr, uid, [vals['alias_id']], {'alias_defaults': {'project_id': project_id} }, context)

=== modified file 'project/project_view.xml'
--- project/project_view.xml	2013-04-22 15:34:49 +0000
+++ project/project_view.xml	2013-05-21 13:53:31 +0000
@@ -117,6 +117,7 @@
                                 context="{'default_groups_ref': ['base.group_user', 'project.group_project_manager']}"/>
                         </group>
                         <group>
+                            <field name="type" invisible="1"/>
                             <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
                             <p colspan="2" attrs="{'invisible': [('analytic_account_id','=',False)]}">
                                 To invoice or setup invoicing and renewal options, go to the related contract: <field name="analytic_account_id" readonly="1" required="0" class="oe_inline"/>.

=== modified file 'sale/sale_view.xml'
--- sale/sale_view.xml	2013-04-22 15:34:49 +0000
+++ sale/sale_view.xml	2013-05-21 13:53:31 +0000
@@ -302,8 +302,6 @@
                     <field name="name" string="Sales Order" filter_domain="['|',('name','ilike',self),('client_order_ref','ilike',self)]"/>
                     <filter icon="terp-mail-message-new" string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <separator/>
-                    <filter icon="terp-document-new" string="Quotations" name="draft" domain="[('state','in',('draft','sent'))]" help="Sales Order that haven't yet been confirmed"/>
-                    <filter icon="terp-check" string="Sales" name="sales" domain="[('state','in',('manual','progress'))]"/>
                     <filter icon="terp-dolar_ok!" string="To Invoice" domain="[('state','=','manual')]" help="Sales Order ready to be invoiced"/>
                     <filter icon="terp-dolar_ok!" string="Done" domain="[('state','=','done')]" help="Sales Order done"/>
                     <separator/>