Merge lp:~openerp-dev/openobject-addons/trunk-usability1_purchase_sale-nco into lp:openobject-addons

[Nimesh Contractor(Open ERP)]

Hello,

I have done following things.
1) When we install account_followup, there are 2 group by options in partner search view, I have merge it.
2) Accounting tab in partner form view is always visible even if we don't have accounting rights, I have make it invisible if user don't have accounting rights.
3) I have make "Receive Invoice" button invisible, when the purchase order's invoicing policy is based on order lines.

Thanks,
Nimesh.

[lp:~openerp-dev/openobject-addons/trunk-usability1_purchase_sale-nco]

8702. By Nimesh Contractor(Open ERP) on 2013-06-05

[MERGE] with trunk.

8703. By Nimesh Contractor(Open ERP) on 2013-06-07

[MERGE] with trunk.

8704. By Nimesh Contractor(Open ERP) on 2013-06-28

[MERGE] with trunk.

8705. By Nimesh Contractor(Open ERP) on 2013-07-01

[MERGE] with trunk.

8706. By Nimesh Contractor(Open ERP) on 2013-07-03

[MERGE] with trunk.

8707. By Nimesh Contractor(Open ERP) on 2013-07-22

[MERGE] with trunk.

8708. By Nimesh Contractor(Open ERP) on 2013-07-26

[MERGE] with addons

8709. By Amit Bhavsar (Open ERP) on 2013-08-23

[MERGE] merge with latest trunk

8710. By Amit Bhavsar (Open ERP) on 2013-10-30

[MERGE] merge with latest trunk.

8711. By Amit Bhavsar (Open ERP) on 2013-11-11

[MERGE] merge with latest trunk.

Unmerged revisions

8711. By Amit Bhavsar (Open ERP) on 2013-11-11

[MERGE] merge with latest trunk.

8710. By Amit Bhavsar (Open ERP) on 2013-10-30

[MERGE] merge with latest trunk.

8709. By Amit Bhavsar (Open ERP) on 2013-08-23

[MERGE] merge with latest trunk

8708. By Nimesh Contractor(Open ERP) on 2013-07-26

[MERGE] with addons

8707. By Nimesh Contractor(Open ERP) on 2013-07-22

[MERGE] with trunk.

8706. By Nimesh Contractor(Open ERP) on 2013-07-03

[MERGE] with trunk.

8705. By Nimesh Contractor(Open ERP) on 2013-07-01

[MERGE] with trunk.

8704. By Nimesh Contractor(Open ERP) on 2013-06-28

[MERGE] with trunk.

8703. By Nimesh Contractor(Open ERP) on 2013-06-07

[MERGE] with trunk.

8702. By Nimesh Contractor(Open ERP) on 2013-06-05

[MERGE] with trunk.

=== modified file 'account/partner_view.xml'
--- account/partner_view.xml	2013-06-14 12:10:20 +0000
+++ account/partner_view.xml	2013-11-11 06:55:47 +0000
@@ -97,7 +97,7 @@
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
                 <page name="sales_purchases" position="after" version="7.0">
-                <page string="Accounting" col="4" name="accounting" attrs="{'invisible': [('is_company','=',False),('parent_id','!=',False)]}">
+                <page string="Accounting" col="4" name="accounting" attrs="{'invisible': [('is_company','=',False),('parent_id','!=',False)]}" groups="account.group_account_invoice">
                     <group>
                         <group>
                             <field name="property_account_position" widget="selection"/>
@@ -127,7 +127,7 @@
                         </tree>
                     </field>
                 </page>
-                <page string="Accounting" name="accounting_disabled" attrs="{'invisible': ['|',('is_company','=',True),('parent_id','=',False)]}">
+                <page string="Accounting" name="accounting_disabled" attrs="{'invisible': ['|',('is_company','=',True),('parent_id','=',False)]}" groups="account.group_account_invoice">
                     <div>
                         <p>Accounting-related settings are managed on <button name="open_commercial_entity" type="object" string="the parent company" class="oe_link"/></p>
                     </div>

=== modified file 'account_followup/account_followup_customers.xml'
--- account_followup/account_followup_customers.xml	2013-06-03 12:18:52 +0000
+++ account_followup/account_followup_customers.xml	2013-11-11 06:55:47 +0000
@@ -50,11 +50,11 @@
                         <filter string="No Responsible" domain="[('payment_responsible_id', '=', False)]"/>
                         <filter string="My Follow-ups" domain="[('payment_responsible_id','=', uid)]" name="my"/>
                     </group>
-                    <group expand="1" string="Group By...">
-                        <filter string="Follow-up Responsible" context="{'group_by':'payment_responsible_id'}"/>
-                        <filter string="Followup Level" context="{'group_by':'latest_followup_level_id'}"/>
-                    </group>
                 </search>
+                <xpath expr="//filter[@string='Country']" position="after">
+                    <filter string="Follow-up Responsible" context="{'group_by':'payment_responsible_id'}"/>
+                    <filter string="Followup Level" context="{'group_by':'latest_followup_level_id'}"/>
+                </xpath>
             </field>
         </record>
 

=== modified file 'purchase/purchase_view.xml'
--- purchase/purchase_view.xml	2013-09-17 11:48:53 +0000
+++ purchase/purchase_view.xml	2013-11-11 06:55:47 +0000
@@ -173,7 +173,7 @@
                     <button name="invoice_ok" states="except_invoice" string="Manually Corrected"/>
                     <button name="purchase_approve" states="confirmed" string="Approve Order" class="oe_highlight" groups="purchase.group_purchase_manager"/>
                     <button name="view_picking" string="Receive Products" type="object" attrs="{'invisible': ['|', ('shipped','=',True), ('state','!=', 'approved')]}" class="oe_highlight"/>
-                    <button name="view_invoice" string="Receive Invoice" type="object" attrs="{'invisible': ['|', ('invoice_method','=','picking'), '|', ('state','!=', 'approved'), ('invoiced','=',True) ]}" class="oe_highlight"/>
+                    <button name="view_invoice" string="Receive Invoice" type="object" attrs="{'invisible': ['|', ('invoice_method','in',['picking','manual']), '|', ('state','!=', 'approved'), ('invoiced','=',True) ]}" class="oe_highlight"/>
                     <button name="action_cancel_draft" states="cancel,confirmed" string="Set to Draft" type="object" />
                     <button name="purchase_cancel" states="draft,confirmed,sent" string="Cancel"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,sent,approved,done" statusbar_colors='{"except_picking":"red","except_invoice":"red","confirmed":"blue"}' readonly="1"/>