Merge lp:~openbig/bigconsulting/scheduler into lp:bigconsulting

[gpa(OpenERP)]

added scheduler

=== modified file 'account_invoice_cash_discount/account_invoice_cash_discount.py'
--- account_invoice_cash_discount/account_invoice_cash_discount.py	2010-08-13 10:34:49 +0000
+++ account_invoice_cash_discount/account_invoice_cash_discount.py	2010-09-14 05:41:08 +0000
@@ -24,6 +24,8 @@
 from tools import config
 import time
 from tools.translate import _
+import netsvc
+
 
 class account_payment_term(osv.osv):
     _name = "account.payment.term"
@@ -871,5 +873,205 @@
     }
 account_bank_statement_line()
 
+
+class account_move_line(osv.osv):
+    _inherit="account.move.line"
+    
+    def reconcile(self, cr, uid, ids, type='auto', writeoff_acc_id=False, writeoff_period_id=False, writeoff_journal_id=False, context={}):
+
+        id_set = ','.join(map(str, ids))
+        res_users_obj = self.pool.get('res.users')
+        lines = self.browse(cr, uid, ids, context=context)
+        unrec_lines = filter(lambda x: not x['reconcile_id'], lines)
+        credit = debit = 0.0
+        currency = 0.0
+        account_id = False
+        partner_id = False
+        invoice = False
+        writeoff_lines = []
+        for line in unrec_lines:
+            if line.invoice:
+                invoice = line.invoice
+            if line.state <> 'valid':
+                raise osv.except_osv(_('Error'),
+                        _('Entry "%s" is not valid !') % line.name)
+            credit += line['credit']
+            debit += line['debit']
+            currency += line['amount_currency'] or 0.0
+            account_id = line['account_id']['id']
+            account_type = line['account_id']['type']
+            partner_id = (line['partner_id'] and line['partner_id']['id']) or False
+        writeoff = debit - credit
+        # Ifdate_p in context => take this date
+        if context.has_key('date_p') and context['date_p']:
+            date=context['date_p']
+        else:
+            date = time.strftime('%Y-%m-%d')
+
+        cr.execute('SELECT account_id, reconcile_id '\
+                   'FROM account_move_line '\
+                   'WHERE id IN %s '\
+                   'GROUP BY account_id,reconcile_id',
+                   (tuple(ids),))
+        r = cr.fetchall()
+#TODO: move this check to a constraint in the account_move_reconcile object
+        if (len(r) != 1) and not context.get('fy_closing', False):
+            raise osv.except_osv(_('Error'), _('Entries are not of the same account or already reconciled ! '))
+        if not unrec_lines:
+            raise osv.except_osv(_('Error'), _('Entry is already reconciled'))
+        account = self.pool.get('account.account').browse(cr, uid, account_id, context=context)
+        if not context.get('fy_closing', False) and not account.reconcile:
+            raise osv.except_osv(_('Error'), _('The account is not defined to be reconciled !'))
+        if r[0][1] != None:
+            raise osv.except_osv(_('Error'), _('Some entries are already reconciled !'))
+
+        if (not self.pool.get('res.currency').is_zero(cr, uid, account.company_id.currency_id, writeoff)) or \
+           (account.currency_id and (not self.pool.get('res.currency').is_zero(cr, uid, account.currency_id, currency))):
+            if not writeoff_acc_id:
+                raise osv.except_osv(_('Warning'), _('You have to provide an account for the write off entry !'))
+            if writeoff > 0:
+                debit = writeoff
+                credit = 0.0
+                self_credit = writeoff
+                self_debit = 0.0
+            else:
+                debit = 0.0
+                credit = -writeoff
+                self_credit = 0.0
+                self_debit = -writeoff
+
+            # If comment exist in context, take it
+            if 'comment' in context and context['comment']:
+                libelle=context['comment']
+            else:
+                libelle='Write-Off'
+
+            cur_obj = self.pool.get('res.currency')
+            cur_id = False
+            amount_cur = 0.00
+
+            writeoff_lines.append(
+                (0, 0, {
+                    'name':libelle,
+                    'debit':self_debit,
+                    'credit':self_credit,
+                    'account_id':account_id,
+                    'date':date,
+                    'partner_id':partner_id,
+                    'currency_id': cur_id or (account.currency_id.id or False),
+                    'amount_currency': amount_cur or (account.currency_id.id and -currency or 0.0)
+                })),
+            
+            writeoff_lines.append((0, 0, {
+                    'name':libelle,
+                    'debit':debit,
+                    'credit':credit,
+                    'account_id':writeoff_acc_id,
+                    'analytic_account_id': context.get('analytic_id', False),
+                    'date':date,
+                    'partner_id':partner_id,
+                    'currency_id': cur_id or (account.currency_id.id or False),
+                    'amount_currency': amount_cur or (account.currency_id.id and -currency or 0.0)
+                }))
+            
+            #####################################################
+            if invoice.type == 'out_invoice':
+                partner_acc_id = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context).property_account_receivable.id
+            elif invoice.type=='in_invoice':
+                partner_acc_id = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context).property_account_payable.id
+                    
+            if context.get('company_currency_id',False) != context.get('currency_id',False):
+                expense_acc = res_users_obj.browse(cr, uid, uid, context=context).company_id.expense_account_id
+                revene_acc = res_users_obj.browse(cr, uid, uid, context=context).company_id.revenue_account_id
+
+                amount_cur = cur_obj.compute(cr, uid, context.get('company_currency_id',False), context.get('currency_id',False), abs(writeoff), context=context)
+                cur_id = context.get('currency_id',False)
+                currency_diff = amount_cur - abs(writeoff)
+
+                if currency_diff > 0.0:
+                    writeoff_lines.append((0, 0, {
+                            'name':libelle,
+                            'debit':0.0,
+                            'credit':abs(currency_diff),
+                            'account_id':revene_acc.id,
+                            'date':date,
+                            'partner_id':partner_id,
+                            'currency_id': cur_id or (account.currency_id.id or False),
+                            'amount_currency': amount_cur or (account.currency_id.id and -currency or 0.0)
+                            })),
+                            
+                    writeoff_lines.append((0, 0, {
+                            'name':libelle,
+                            'debit':abs(currency_diff),
+                            'credit':0.0,
+                            'account_id':2,
+                            'analytic_account_id': context.get('analytic_id', False),
+                            'date':date,
+                            'partner_id':partner_id,
+                            'currency_id': cur_id or (account.currency_id.id or False),
+                            'amount_currency': amount_cur or (account.currency_id.id and -currency or 0.0)
+                            }))
+                else:
+                    writeoff_lines.append((0, 0, {
+                            'name':libelle,
+                            'debit':abs(currency_diff),
+                            'credit':0.0,
+                            'account_id':3,
+                            'date':date,
+                            'partner_id':partner_id,
+                            'currency_id': cur_id or (account.currency_id.id or False),
+                            'amount_currency': amount_cur or (account.currency_id.id and -currency or 0.0)
+                            })),
+                            
+                    writeoff_lines.append((0, 0, {
+                            'name':libelle,
+                            'debit':0.0,
+                            'credit':abs(currency_diff),
+                            'account_id':expense_acc.id,
+                            'analytic_account_id': context.get('analytic_id', False),
+                            'date':date,
+                            'partner_id':partner_id,
+                            'currency_id': cur_id or (account.currency_id.id or False),
+                            'amount_currency': amount_cur or (account.currency_id.id and -currency or 0.0)
+                            }))
+            ##########################################3
+                  
+            writeoff_move_id = self.pool.get('account.move').create(cr, uid, {
+                'period_id': writeoff_period_id,
+                'journal_id': writeoff_journal_id,
+                'date':date,
+                'state': 'draft',
+                'line_id': writeoff_lines
+            })
+            writeoff_line_ids = self.search(cr, uid, [('move_id', '=', writeoff_move_id), ('account_id', '=', account_id)])
+            if account_id == writeoff_acc_id:
+                writeoff_line_ids = [writeoff_line_ids[1]]
+
+            if invoice:
+                if (invoice.type == 'out_invoice') or (invoice.type == 'in_invoice'):
+                    condition_1 = (account_type == 'payable' and writeoff > 0.0)
+                    condition_2 = (account_type == 'receivable' and writeoff < 0.0)
+                else:
+                    condition_1 = (account_type == 'payable' and writeoff < 0.0)
+                    condition_2 = (account_type == 'receivable' and writeoff > 0.0)
+                if condition_1 or condition_2:
+                    writeoff_line_ids = self.search(cr, uid, [('move_id', '=', writeoff_move_id), ('account_id', 'in', (account_id,writeoff_acc_id))])
+                    self.pool.get('account.move.line').write(cr ,uid, writeoff_line_ids, {'name':_('Currency Profit/Loss')})
+            ids += writeoff_line_ids
+
+        r_id = self.pool.get('account.move.reconcile').create(cr, uid, {
+            #'name': date,
+            'type': type,
+            'line_id': map(lambda x: (4,x,False), ids),
+            'line_partial_ids': map(lambda x: (3,x,False), ids)
+        })
+        wf_service = netsvc.LocalService("workflow")
+        # the id of the move.reconcile is written in the move.line (self) by the create method above
+        # because of the way the line_id are defined: (4, x, False)
+        for id in ids:
+            wf_service.trg_trigger(uid, 'account.move.line', id, cr)
+        return r_id
+    
+account_move_line()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

=== modified file 'account_invoice_cash_discount/wizard/wizard_discount_reconcile.py'
--- account_invoice_cash_discount/wizard/wizard_discount_reconcile.py	2010-09-13 09:11:53 +0000
+++ account_invoice_cash_discount/wizard/wizard_discount_reconcile.py	2010-09-14 05:41:08 +0000
@@ -69,9 +69,13 @@
 def _trans_rec_reconcile(self, cr, uid, data, context=None):
     pool = pooler.get_pool(cr.dbname)
     account_move_line_obj = pool.get('account.move.line')
-
+    res_users_obj = pool.get('res.users')
+    invoice_obj = pool.get('account.inovice')
+    
     form = data['form']
     account_id = form.get('writeoff_acc_id', False) or form.get('discount_acc_id', False)
+    company_currecy_id = res_users_obj.browse(cr, uid, uid, context=context).company_id.currency_id.id
+    invoice_currecy_id = account_move_line_obj.browse(cr, uid, data['id'], context=context).invoice.currency_id.id
     context['date_p'] = form.get('date_p', False)
     date = False
     if context['date_p']:
@@ -80,7 +84,9 @@
     period_id = False
     if len(ids):
         period_id = ids[0]
-
+        
+    context['company_currency_id'] = company_currecy_id
+    context['currency_id'] = invoice_currecy_id
     journal_id = form.get('journal_id', False)
     context['comment'] = form.get('comment', False)
     context['analytic_id'] = form.get('analytic_id', False)

=== modified file 'account_payment_discount_extension/__terp__.py'
--- account_payment_discount_extension/__terp__.py	2010-08-20 12:17:29 +0000
+++ account_payment_discount_extension/__terp__.py	2010-09-14 05:41:08 +0000
@@ -35,6 +35,7 @@
     "update_xml" : [
             "account_payment_disocunt_wizard.xml",
             "account_payment_discount_view.xml",
+            "account_payment_discount_data.xml",
             ],
     "active": False,
     "installable": True,

=== modified file 'account_payment_discount_extension/account_payment_discount.py'
--- account_payment_discount_extension/account_payment_discount.py	2010-09-20 14:25:34 +0000
+++ account_payment_discount_extension/account_payment_discount.py	2010-09-14 05:41:08 +0000
@@ -25,7 +25,7 @@
 import time
 from datetime import datetime
 from dateutil.relativedelta import relativedelta
-
+from mx import DateTime
 
 class payment_order(osv.osv):
     _inherit='payment.order'
@@ -39,6 +39,7 @@
     _columns={
         'next_payment_date': fields.date('Next Payment Date', states={'open':[('readonly',True)],'close':[('readonly',True)]},),
     }
+    
     def action_date_assign(self, cr, uid, ids, *args):
         data = super(account_invoice,self).action_date_assign(cr, uid, ids, *args)
         for inv in self.browse(cr, uid, ids):
@@ -48,7 +49,27 @@
                     delay = payment_data[0].delay
                     self.write(cr, uid, [inv.id], {'next_payment_date':(datetime.now() + relativedelta(days=delay)).strftime('%Y-%m-%d')})
         return data
+        
+    def _next_date(self, cr, uid, ids, context=None):
+        payment_term_obj = self.pool.get('account.payment.term')
+        current_date = datetime.now().strftime('%Y-%m-%d')
+        ids = self.search(cr, uid, [('state','=','open')]) 
+        for id in ids:
+            invoice_data = self.browse(cr, uid, id, context=context)
+            next_pay_date = invoice_data.next_payment_date
+            payment_data = payment_term_obj.browse(cr, uid, invoice_data.payment_term.id)
+            if next_pay_date: 
+                if next_pay_date < current_date:
+                    for dis_line in payment_data.cash_discount_ids:
+                        discount_date  =  (DateTime.strptime(invoice_data.date_invoice, '%Y-%m-%d') + DateTime.RelativeDateTime(days=dis_line.delay)).strftime('%Y-%m-%d')
+                        if discount_date > current_date:
+                            self.write(cr, uid, [id], {'next_payment_date':discount_date})
+                            break
+        return True
     
+    def check_next_date(self, cr, uid, ids=[], context=None):
+        self._next_date(cr, uid, ids, context=context)
+        
     def copy(self, cr, uid, id, default=None, context=None):
         if default is None:
             default = {}

=== added file 'account_payment_discount_extension/account_payment_discount_data.xml'
--- account_payment_discount_extension/account_payment_discount_data.xml	1970-01-01 00:00:00 +0000
+++ account_payment_discount_extension/account_payment_discount_data.xml	2010-09-14 05:41:08 +0000
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+        
+        <record forcecreate="True" id="ir_cron_discount_action" model="ir.cron">
+            <field name="name">Next Payment Date</field>
+            <field name="interval_number">1</field>
+            <field name="interval_type">days</field>
+            <field name="numbercall">-1</field>
+            <field eval="False" name="doall"/>
+            <field eval="'account.invoice'" name="model"/>
+            <field eval="'check_next_date'" name="function"/>
+            <field eval="'(False,)'" name="args"/>
+        </record>
+        
+    </data>
+</openerp>

=== modified file 'account_payment_discount_extension/wizard/wizard_payment_discount_order.py'
--- account_payment_discount_extension/wizard/wizard_payment_discount_order.py	2010-09-20 14:25:59 +0000
+++ account_payment_discount_extension/wizard/wizard_payment_discount_order.py	2010-09-14 05:41:08 +0000
@@ -27,6 +27,7 @@
 from datetime import datetime
 from dateutil.relativedelta import relativedelta
 from mx import DateTime
+
 FORM = UpdateableStr()
 
 FIELDS = {