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

[Nimesh Contractor(Open ERP)]

Hello,

I have done following issues.
1) when we unselect allow multi-currency, values of Gain Exchange Rate Account and Loss Exchange Rate Account will become false.
2) Add group by company in journal.
3) Add filter by purchase and sale, also add group by company and Tax Application in tax.
4) Set value in breadcrumb, number instead if amount after status is posted for Sales receipt.

Thanks,
Nimesh.

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

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

[MERGE] with trunk.

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

[MERGE] with trunk.

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

[MERGE] with trunk.

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

[MERGE] with trunk.

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

[MERGE] with trunk.

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

[MERGE] with trunk.

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

[MERGE] with trunk.

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

[MERGE] merge with latest trunk

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

[MERGE] merge with latest trunk.

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

[MERGE] merge with latest trunk.

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

[MERGE] merge with latest trunk.

Unmerged revisions

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

[MERGE] merge with latest trunk.

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

[MERGE] merge with latest trunk.

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

[MERGE] merge with latest trunk.

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

[MERGE] merge with latest trunk

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

[MERGE] with trunk.

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

[MERGE] with trunk.

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

[MERGE] with trunk.

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

[MERGE] with trunk.

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

[MERGE] with trunk.

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

[MERGE] with trunk.

=== modified file 'account/account_view.xml'
--- account/account_view.xml	2013-09-12 13:20:32 +0000
+++ account/account_view.xml	2013-11-11 06:52:04 +0000
@@ -384,6 +384,7 @@
                     <group expand="0" string="Group By...">
                         <filter string="User" context="{'group_by':'user_id'}" icon="terp-personal"/>
                         <filter string="Type" context="{'group_by':'type'}" icon="terp-stock_symbol-selection"/>
+                        <filter string="Company" context="{'group_by':'company_id'}" icon="terp-stock_symbol-selection"/>
                     </group>
                 </search>
             </field>
@@ -881,6 +882,7 @@
                     <field name="price_include"/>
                     <field name="description"/>
                     <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                    <field name="type_tax_use" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -891,6 +893,13 @@
                 <search string="Search Taxes">
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('description','ilike',self)]" string="Tax"/>
                     <field name="company_id" groups="base.group_multi_company"/>
+                    <filter string="Sale" domain="[('type_tax_use','=','sale')]" />
+                    <filter string="Purchase" domain="[('type_tax_use','=','purchase')]" />
+                    <group string="Group By...">
+                        <filter string="Company" domain="[]" context="{'group_by':'company_id'}"/>
+                        <filter string="Tax Application" domain="[]" context="{'group_by':'type_tax_use'}"/>
+                    </group>
+                    
                 </search>
             </field>
         </record>

=== modified file 'account/res_config.py'
--- account/res_config.py	2013-09-17 12:38:14 +0000
+++ account/res_config.py	2013-11-11 06:52:04 +0000
@@ -257,6 +257,11 @@
     def onchange_tax_rate(self, cr, uid, ids, rate, context=None):
         return {'value': {'purchase_tax_rate': rate or False}}
 
+    def onchange_multi_currency(self, cr, uid, ids, group_multi_currency, context=None):
+        if not group_multi_currency:
+            return {'value': {'income_currency_exchange_account_id': False, 'expense_currency_exchange_account_id': False}}
+        return {}
+
     def onchange_start_date(self, cr, uid, id, start_date):
         if start_date:
             start_date = datetime.datetime.strptime(start_date, "%Y-%m-%d")

=== modified file 'account/res_config_view.xml'
--- account/res_config_view.xml	2013-04-11 10:46:43 +0000
+++ account/res_config_view.xml	2013-11-11 06:52:04 +0000
@@ -122,7 +122,7 @@
                         <label for="id" string="Features"/>
                         <div>
                             <div name="group_multi_currency">
-                                <field name="group_multi_currency" class="oe_inline"/>
+                                <field name="group_multi_currency" class="oe_inline" on_change="onchange_multi_currency(group_multi_currency)"/>
                                 <label for="group_multi_currency"/>
                             </div>
                             <div>

=== modified file 'account_voucher/account_voucher.py'
--- account_voucher/account_voucher.py	2013-08-23 15:46:55 +0000
+++ account_voucher/account_voucher.py	2013-11-11 06:52:04 +0000
@@ -189,7 +189,7 @@
         if not ids:
             return []
         if context is None: context = {}
-        return [(r['id'], (str("%.2f" % r['amount']) or '')) for r in self.read(cr, uid, ids, ['amount'], context, load='_classic_write')]
+        return [(r['id'], (r['number'] or '')) for r in self.read(cr, uid, ids, ['number'], context, load='_classic_write')]
 
     def fields_view_get(self, cr, uid, view_id=None, view_type=False, context=None, toolbar=False, submenu=False):
         mod_obj = self.pool.get('ir.model.data')