Merge lp:~openerp-dev/openobject-addons/trunk-bug-812027-ara into lp:openobject-addons

[Ashvin Rathod (OpenERP)]

Hello,

Fix: Multicompany - recurring entries - generate entries

Thanks,
ara

[Ashvin Rathod (OpenERP) (ara-tinyerp)]

Hello,

I have also add domain on account_id field for recurring lines.

Thanks,
ara

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

Thanks for the work Ashvin,
But you can improve your patch using limit=1 in search criteria for periods.

review: Needs Fixing

[Ashvin Rathod (OpenERP) (ara-tinyerp)]

Hello,

I have add search criteria for periods.

Thanks,
ara

review: Needs Resubmitting

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

review: Approve

[qdp (OpenERP) (qdp)]

no, you must continue using find and give company_id in the context in order to have the search made using that company_id.

review: Needs Fixing

[qdp (OpenERP) (qdp)]

As we are trying to keep a clean merge proposal list on which review is needed, i'm also setting your merge proposal in "work in progress". Set it back to "needs review" when your work is over and it will automatcally appears in our TODO-list.

Thanks,
Quentin

[Purnendu Singh (OpenERP) (purnendu-singh)]

Hello,

As per suggestion find function of account_period object is used to get proper period.

I will place a new mp for the issue raised in comment #1 by Kevin McMenamin on bug.

Thanks and regards,
Purnendu Singh

review: Needs Resubmitting

[qdp (OpenERP) (qdp)]

hi,

that was closer.. but while having a look more in detail at the code, i saw that the whole function generate() was copied/pasted into account/wizard/account_use_model.py! Thus i refactored.

Having your merge proposal now a bit far away from what has been merged, i have to reject it. For the <sake of clarity>.

Thanks

=== modified file 'account/account.py'
--- account/account.py	2011-11-14 10:39:45 +0000
+++ account/account.py	2011-11-16 07:13:28 +0000
@@ -2186,6 +2186,7 @@
         account_move_obj = self.pool.get('account.move')
         account_move_line_obj = self.pool.get('account.move.line')
         pt_obj = self.pool.get('account.payment.term')
+        period_obj = self.pool.get('account.period')
 
         if context is None:
             context = {}
@@ -2193,14 +2194,12 @@
         if datas.get('date', False):
             context.update({'date': datas['date']})
 
-        period_id = self.pool.get('account.period').find(cr, uid, dt=context.get('date', False))
-        if not period_id:
-            raise osv.except_osv(_('No period found !'), _('Unable to find a valid period !'))
-        period_id = period_id[0]
-
         move_date = context.get('date', time.strftime('%Y-%m-%d'))
         move_date = datetime.strptime(move_date,"%Y-%m-%d")
         for model in self.browse(cr, uid, ids, context=context):
+            context.update({'company_id': model.company_id.id})
+            period_ids = period_obj.find(cr, uid, dt=context.get('date', False), context=context)
+            period_id = period_ids and period_ids[0] or False
             try:
                 entry['name'] = model.name%{'year': move_date.strftime('%Y'), 'month': move_date.strftime('%m'), 'date': move_date.strftime('%Y-%m')}
             except:

=== modified file 'account/account_view.xml'
--- account/account_view.xml	2011-11-14 11:34:05 +0000
+++ account/account_view.xml	2011-11-16 07:13:28 +0000
@@ -1626,7 +1626,7 @@
                 <tree string="Journal Entry Model Line" editable="bottom">
                     <field name="sequence"/>
                     <field name="name"/>
-                    <field name="account_id"/>
+                    <field name="account_id" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation'), ('company_id', '=', parent.company_id)]"/>
                     <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
                     <field name="partner_id"/>
                     <field name="debit"/>
@@ -1645,12 +1645,12 @@
                 <form string="Journal Entry Model Line">
                     <field colspan="4" name="name" select="1"/>
                     <field name="sequence"/>
-                    <field name="account_id" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                    <field name="account_id" domain="[('type','&lt;&gt;','view'), ('type','&lt;&gt;','consolidation'), ('company_id', '=', parent.company_id)]"/>
                     <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
                     <field name="partner_id"/>
                     <field name="debit" select="1"/>
                     <field name="credit" select="1"/>
-                     <field name="quantity"/>
+                    <field name="quantity"/>
                     <field name="date_maturity"/>
                 </form>
             </field>

=== modified file 'account/wizard/account_use_model.py'
--- account/wizard/account_use_model.py	2011-01-27 06:32:26 +0000
+++ account/wizard/account_use_model.py	2011-11-16 07:13:28 +0000
@@ -64,10 +64,9 @@
             data_model = account_model_obj.browse(cr, uid, context['active_ids'], context=context)
         for model in data_model:
             entry['name'] = model.name%{'year':time.strftime('%Y'), 'month':time.strftime('%m'), 'date':time.strftime('%d')}
-            period_id = account_period_obj.find(cr, uid, context=context)
-            if not period_id:
-                raise osv.except_osv(_('No period found !'), _('Unable to find a valid period !'))
-            period_id = period_id[0]
+            context.update({'company_id': model.company_id.id})
+            period_ids = account_period_obj.find(cr, uid, context=context)
+            period_id = period_ids and period_ids[0] or False
             move_id = account_move_obj.create(cr, uid, {
                 'ref': entry['name'],
                 'period_id': period_id,