[IMP]account_analytic_account: Improve cron function temp via button and split query

bzr revid: dbr@tinyerp.com-20130222131401-ou4dktk5kiojnsw1

diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index 1b8637f..ce0ebac 100644 (file)
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -28,6 +28,8 @@ import openerp.tools
 from openerp import tools
 from openerp.tools.translate import _
 
+from dateutil.relativedelta import relativedelta
+
 from openerp.addons.decimal_precision import decimal_precision as dp
 
 _logger = logging.getLogger(__name__)
@@ -82,59 +84,29 @@ class account_analytic_invoice_line(osv.osv_memory):
 
     _order = 'name desc'
 
-    def init(self, cr):
-        tools.drop_view_if_exists(cr, 'account_analytic_invoice_line')
-        cr.execute("""
-        create or replace view account_analytic_invoice_line as (
-        
-        SELECT
-        l.id as id,
-        account.id as analytic_account_id,
-        account.write_date as write_date,
-        l.product_id as product_id,
-        l.name as name,
-        l.unit_amount as quantity,
-        l.product_uom_id as uos_id,
-        t.list_price as price_unit
-        FROM
-        account_analytic_line as l 
-        LEFT JOIN account_analytic_account account ON (l.account_id = account.id)
-        LEFT JOIN account_analytic_journal journal ON (l.journal_id = journal.id)
-        left join product_product p on (l.product_id=p.id)
-        left join product_template t on (p.product_tmpl_id=t.id)
-        WHERE (l.to_invoice IS NOT NULL) and (l.invoice_id IS NULL)
-UNION 
-    SELECT
-        sol.id as id,
-        account.id as analytic_account_id,
-        account.write_date as write_date,
-        sol.product_id as product_id,
-        sol.name as name,
-        sol.product_uom_qty as quantity,
-        sol.product_uom as uos_id,
-        sol.price_unit as price_unit
-        FROM
-        sale_order as so 
-        LEFT JOIN account_analytic_account account ON (so.project_id = account.id)
-    LEFT JOIN sale_order_line sol on (so.id = sol.order_id)
-        WHERE so.partner_id = account.partner_id
-UNION 
-
-    SELECT
-        exp.id as id,
-        account.id as analytic_account_id,
-        account.write_date as write_date,
-        exp.product_id as product_id,
-        exp.name as name,
-        exp.unit_quantity as quantity,
-        exp.uom_id as uos_id,
-        exp.unit_amount as price_unit
-        FROM
-    hr_expense_line as exp
-        LEFT JOIN account_analytic_account account ON (exp.analytic_account = account.id)
-        
-        )
-         """)
+    def _select(self):
+        select_str = """ SELECT l.id as id, account.id as analytic_account_id, account.write_date as write_date, l.product_id as product_id,
+                        l.name as name, l.unit_amount as quantity, l.product_uom_id as uos_id,t.list_price as price_unit"""
+        return select_str
+
+    def _from(self):
+        from_str = """
+                LEFT JOIN account_analytic_account account ON (l.account_id = account.id)
+                LEFT JOIN account_analytic_journal journal ON (l.journal_id = journal.id)
+                LEFT JOIN product_product p on (l.product_id=p.id)
+                LEFT JOIN product_template t on (p.product_tmpl_id=t.id)
+        """
+        return from_str
+    
+    def init(self, cr): 
+        # self._table = account_invoice_report
+        tools.drop_view_if_exists(cr, 'account_analytic_invoice_line')       
+        cr.execute("""CREATE or REPLACE VIEW account_analytic_invoice_line as (
+                      %s FROM account_analytic_line AS l %s WHERE (l.to_invoice IS NOT NULL) and (l.invoice_id IS NULL)
+                      
+        )""" % (
+        self._select(), self._from() ))
+
 account_analytic_invoice_line()
 
 class account_analytic_account(osv.osv):
@@ -745,27 +717,28 @@ class account_analytic_account(osv.osv):
 
         return True
 
-    def cron_create_invoice(self, cr, uid, context=None):
-#        res = []
-#        inv_obj = self.pool.get('account.invoice')
-#        journal_obj = self.pool.get('account.journal')
-#        inv_lines = []
-#        contract_ids = self.search(cr, uid, [('next_date','<=',time.strftime("%Y-%m-%d")), ('state','=', 'open'), ('recurring_invoices','=', True)], context=context, order='name asc')
-#        a = self.pool.get('hr.timesheet.invoice.create.final').do_create(cr, uid, contract_ids, context=None)
-#        contracts = self.browse(cr, uid, contract_ids, context=context)
-#        for contract in contracts:
-#            next_date = datetime.datetime.strptime(contract.next_date, "%Y-%m-%d")
-#            interval = contract.interval
-#
-#            if contract.rrule_type == 'monthly':
-#                new_date = next_date+relativedelta(months=+interval)
-#            if contract.rrule_type == 'daily':
-#                new_date = next_date+relativedelta(days=+interval)
-#            if contract.rrule_type == 'weekly':
-#                new_date = next_date+relativedelta(weeks=+interval)
-#
-#            # Link this new invoice to related contract
-#            contract.write({'next_date':new_date}, context=context)
+    def cron_create_invoice(self, cr, uid, ids, context=None):
+        res = []
+        inv_obj = self.pool.get('account.invoice')
+        journal_obj = self.pool.get('account.journal')
+        inv_lines = []
+        contract_ids = self.search(cr, uid, [('next_date','<=',time.strftime("%Y-%m-%d")), ('state','=', 'open'), ('recurring_invoices','=', True)], context=context, order='name asc')
+        context.update({'data':{},'active_ids': contract_ids})
+        a = self.pool.get('hr.timesheet.invoice.create.final').do_create(cr, uid, contract_ids, context=context)
+        contracts = self.browse(cr, uid, contract_ids, context=context)
+        for contract in contracts:
+            next_date = datetime.datetime.strptime(contract.next_date, "%Y-%m-%d")
+            interval = contract.interval
+
+            if contract.rrule_type == 'monthly':
+                new_date = next_date+relativedelta(months=+interval)
+            if contract.rrule_type == 'daily':
+                new_date = next_date+relativedelta(days=+interval)
+            if contract.rrule_type == 'weekly':
+                new_date = next_date+relativedelta(weeks=+interval)
+
+            # Link this new invoice to related contract
+            contract.write({'next_date':new_date}, context=context)
         return True
 
 class account_analytic_account_summary_user(osv.osv):

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index 39954d3..918d982 100644 (file)
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -239,6 +239,9 @@
                         </div>
                         <field name="amount_tax" nolabel="1" widget="monetary" options="{'currency_field': 'currency_id'}"/>
                         <field name="amount_total" class="oe_subtotal_footer_separator" widget="monetary" options="{'currency_field': 'currency_id'}"/>
+                        <button name="cron_create_invoice"
+                                string="(Create Invoice)"
+                                type="object" help="Compute Invoices"/>
                     </group>
                  </xpath>
             </field>

diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
index 1cb5c57..26556c1 100644 (file)
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
@@ -183,6 +183,7 @@ class account_analytic_line(osv.osv):
             journal_types[line.journal_id.type].add(line.account_id.id)
         for journal_type, account_ids in journal_types.items():
             for account in analytic_account_obj.browse(cr, uid, list(account_ids), context=context):
+                print"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",account,account.partner_id,account.pricelist_id
                 partner = account.partner_id
                 if (not partner) or not (account.pricelist_id):
                     raise osv.except_osv(_('Analytic Account incomplete !'),

diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py
index 2d2f60e..708bc1a 100644 (file)
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py
@@ -43,7 +43,10 @@ class final_invoice_create(osv.osv_memory):
     }
 
     def do_create(self, cr, uid, ids, context=None):
-        data = self.read(cr, uid, ids, [], context=context) or None
+        if not 'data' in context:
+            data = self.read(cr, uid, ids, [], context=context)[0]
+        else:
+            data = {}
         # hack for fixing small issue (context should not propagate implicitly between actions)
         if 'default_type' in context:
             del context['default_type']