Merge lp:~vauxoo/addons-vauxoo/7.0-account_no_check_default_reconcile-dev_luis into lp:addons-vauxoo/7.0

[Luis Torres - http://www.vauxoo.com]

Se cambio que el campo de conciliación completa en los vouchers no se pueda seleccionar cuando la linea provenga de una nota de credito

[lp:~vauxoo/addons-vauxoo/7.0-account_no_check_default_reconcile-dev_luis]

938. By Launchpad Translations on behalf of vauxoo on 2013-11-26

Launchpad automatic translations update.

939. By Julio Serna-http://www.vauxoo.com on 2013-11-26

[MERGE]modified module account_invoice_number changed replace by attributes

940. By Launchpad Translations on behalf of vauxoo on 2013-11-27

Launchpad automatic translations update.

941. By Sabrina Romero - http://www.vauxoo.com on 2013-11-28

[MERGE] account_asset_move_check module added.

[Jose Antonio Morales Ponce(vauxoo) - - http://www.vauxoo.com (josemoralesp)]

Se repiten muchas veces el mismo fragmento de codigo, se puede hacer un metodo generico y que los 3 metodos lo usen esto va a reducir el codigo.

review: Needs Fixing

[lp:~vauxoo/addons-vauxoo/7.0-account_no_check_default_reconcile-dev_luis]

942. By Julio Serna-http://www.vauxoo.com on 2013-11-29

[MERGE]addded report webkit to report partner balance

943. By Jose Antonio Morales Ponce(vauxoo) - - http://www.vauxoo.com on 2013-12-03

[MERGE] Changed name of module in link to Manejo de Tareas and changed http to https

944. By Launchpad Translations on behalf of vauxoo on 2013-12-06

Launchpad automatic translations update.

945. By Isaac López Zúñiga on 2013-12-10

[MERGE] report_multicompany added

946. By Julio Serna-http://www.vauxoo.com on 2013-12-11

[MERGE] validate folio_id not is duplicate

947. By Jorge Angel Naranjo Rogel - http://www.vauxoo.com on 2013-12-13

[IMP][report_multicompany]Changed field report_name of text to related
[IMP][report_multicompany]Changed function create and report_multicompany_create where the sequence is assigning by sequence minimal
[IMP][report_multicompany] Improvement view, added search view
IIMP][report_multicompany] Added default in sequence = 10

Merge from: lp:~vauxoo/addons-vauxoo/7.0-addons-vauxoo_report_multicompany_imp_dev_jorge

948. By Sabrina Romero - http://www.vauxoo.com on 2013-12-17

[FIX][debit_credit_note] Error fixed in value assigning to the 'origin' field.

949. By Launchpad Translations on behalf of vauxoo on 2013-12-18

Launchpad automatic translations update.

950. By Yanina Aular (Vauxoo) on 2013-12-19

[FIX] Error message for captcha changed

951. By Launchpad Translations on behalf of vauxoo on 2013-12-26

Launchpad automatic translations update.

952. By Launchpad Translations on behalf of vauxoo on 2014-01-03

Launchpad automatic translations update.

953. By Isaac López Zúñiga on 2014-01-06

[MERGE] report_multicompany_create receives company_id

954. By Launchpad Translations on behalf of vauxoo on 2014-01-11

Launchpad automatic translations update.

955. By Launchpad Translations on behalf of vauxoo on 2014-01-12

Launchpad automatic translations update.

956. By Jose Antonio Morales Ponce(vauxoo) - - http://www.vauxoo.com on 2014-01-13

[IMP] For we can add a widget with binary fields we add a new template that allows show the binary fields with bootstrap style

957. By Launchpad Translations on behalf of vauxoo on 2014-01-21

Launchpad automatic translations update.

958. By hbto [Vauxoo] http://www.vauxoo.com on 2014-01-21

[IMP] Decoupling Functionality from Fiscal Requirements in OVL

959. By Julio Serna-http://www.vauxoo.com on 2014-01-30

[IMP] validate line of refund

960. By Julio Serna-http://www.vauxoo.com on 2014-01-30

[MERGE] conflict resolved in merge

961. By Julio Serna-http://www.vauxoo.com on 2014-01-30

[IMP]get cr and dr in each onchange by function get_cr_dr

962. By Julio Serna-http://www.vauxoo.com on 2014-01-30

[PEP8]

963. By Julio Serna-http://www.vauxoo.com on 2014-01-30

[IMP] readonly = True in amount when in line of refund

964. By Julio Serna-http://www.vauxoo.com on 2014-03-07

[IMP]not concile refund line in payment

=== modified file 'account_voucher_no_check_default/__openerp__.py'
--- account_voucher_no_check_default/__openerp__.py	2013-10-29 21:56:46 +0000
+++ account_voucher_no_check_default/__openerp__.py	2014-03-07 01:28:12 +0000
@@ -40,7 +40,8 @@
         ],
     "demo" : [],
     "data" : [
-        "view/voucher_payment_receipt_view.xml"],
+        "view/voucher_payment_receipt_view.xml"
+        ],
     'js': [],
     'qweb' : [],
     'css':[],

=== modified file 'account_voucher_no_check_default/account_voucher.py'
--- account_voucher_no_check_default/account_voucher.py	2013-08-06 19:34:02 +0000
+++ account_voucher_no_check_default/account_voucher.py	2014-03-07 01:28:12 +0000
@@ -28,17 +28,112 @@
 class account_voucher(osv.Model):
     _inherit = 'account.voucher'
     
+    def get_cr_dr(self, cr, uid, ids, values, ttype, amount, context=None):
+        move_exclude = []
+        if values.get('line_cr_ids', False) and ttype == 'payment' and amount >= 0:
+            move_exclude = [
+                self.get_move_exclude(cr, uid, ids, line, context=context)
+                    for line in values.get('line_cr_ids') ]
+        if values.get('line_dr_ids', False) and ttype == 'receipt' and amount >= 0:
+            move_exclude = [
+                self.get_move_exclude(cr, uid, ids, line, context=context)
+                    for line in values.get('line_dr_ids') ]
+        return move_exclude
+                
+    def get_move_exclude(self, cr, uid, ids, line, context=None):
+        acc_move_line_obj = self.pool.get('account.move.line')
+        acc_invoice_obj = self.pool.get('account.invoice')
+        
+        acc_line = line.get('move_line_id', False)
+        move_exclude = False
+        move_id = acc_line and acc_move_line_obj.browse(cr, uid, acc_line,\
+            context=context).move_id or False
+        invoice_line = move_id and acc_invoice_obj.search(cr, uid, [\
+            ('move_id', '=', move_id.id)], context=context) or False
+        if invoice_line:
+            line.update({'reconcile' : False, 'line_to_invoice' : True, 'amount': 0})
+            move_exclude = acc_line
+        return move_exclude
+    
+    def move_include(self, cr, uid, values, val_exclude, context=None):
+        value_cr = [ val_cr.get('move_line_id', False)
+                        for val_cr in values.get('line_cr_ids', {}) ]
+                        
+        value_dr = [ val_dr.get('move_line_id', False)
+                        for val_dr in values.get('line_dr_ids', {}) ]
+                        
+        return list(set(value_cr + value_dr) - set(val_exclude))
+    
+    def recompute_moves(self, cr, uid, ids, partner_id, journal_id, amount, currency_id,
+        ttype, date, values, move_exclude, context=None):
+        
+        move_include = self.move_include(cr, uid, values, move_exclude, context=context)
+        context['move_line_ids'] = move_include
+        
+        result = self.recompute_voucher_lines(cr, uid, ids, partner_id, journal_id,
+                amount, currency_id, ttype, date, context=context)
+        values_new = result.get('value', {})
+        
+        for val_cr in values.get('line_cr_ids', {}):
+            val_cr.update({'amount': line['amount']
+                                for line in values_new.get('line_cr_ids')
+                                    if line['move_line_id'] == val_cr['move_line_id']})
+                                    
+        for val_dr in values.get('line_dr_ids', {}):
+            val_dr.update({'amount': line['amount']
+                                for line in values_new.get('line_dr_ids')
+                                    if line['move_line_id'] == val_dr['move_line_id']})
+        return True
+    
     def onchange_partner_id(self, cr, uid, ids, partner_id, journal_id,\
         amount, currency_id, ttype, date, context=None):
-        res = super(account_voucher, self).onchange_partner_id(cr, uid, ids,\
-            partner_id, journal_id, amount, currency_id, ttype, date,\
-            context=context)
-        values = res.get('value', False)
-        if values and values.get('line_cr_ids') and ttype == 'payment':
-            for line in values.get('line_cr_ids'):
-                line.update({'reconcile' : False})
-        if values and values.get('line_dr_ids') and ttype == 'receipt':
-            for line in values.get('line_dr_ids'):
-                line.update({'reconcile' : False})
-        return res
-    
+        if context is None:
+            context = {}
+        res = super(account_voucher, self).onchange_partner_id(cr, uid, ids, partner_id,\
+            journal_id, amount, currency_id, ttype, date, context=context)
+        values = res.get('value', {})
+        
+        move_exclude = self.get_cr_dr(cr, uid, ids, values, ttype, amount, context=context)
+        
+        self.recompute_moves(cr, uid, ids, partner_id, journal_id, amount, currency_id,
+                                ttype, date, values, move_exclude, context=context)
+        return res
+        
+    def onchange_amount(self, cr, uid, ids, amount, rate, partner_id, journal_id, currency_id,\
+        ttype, date, payment_rate_currency_id, company_id, context=None):
+        if context is None:
+            context = {}
+            
+        res = super(account_voucher, self).onchange_partner_id(cr, uid, ids, partner_id,\
+            journal_id, amount, currency_id, ttype, date, context=context)
+        values = res.get('value', {})
+        
+        move_exclude = self.get_cr_dr(cr, uid, ids, values, ttype, amount, context=context)
+        
+        self.recompute_moves(cr, uid, ids, partner_id, journal_id, amount, currency_id,
+                                ttype, date, values, move_exclude, context=context)
+        return res
+        
+    def onchange_journal(self, cr, uid, ids, journal_id, line_ids, tax_id,\
+        partner_id, date, amount, ttype, company_id, context=None):
+        if context is None:
+            context = {}
+            
+        res = super(account_voucher, self).onchange_journal(cr, uid, ids, journal_id, line_ids,\
+            tax_id, partner_id, date, amount, ttype, company_id, context=context)
+        values = res and res.get('value', {}) or {}
+        
+        move_exclude = self.get_cr_dr(cr, uid, ids, values, ttype, amount, context=context)
+        
+        self.recompute_moves(cr, uid, ids, partner_id, journal_id, amount,
+                values.get('currency_id', False), ttype, date, values,
+                move_exclude, context=context)
+        return res
+    
+class account_voucher_line(osv.Model):
+    _inherit = 'account.voucher.line'
+    
+    _columns = {
+        'line_to_invoice': fields.boolean('Line to Invoice', help='If this field is true indicates'\
+            ' that this line coming from an invoice refound')
+    }

=== modified file 'account_voucher_no_check_default/view/voucher_payment_receipt_view.xml'
--- account_voucher_no_check_default/view/voucher_payment_receipt_view.xml	2013-10-29 21:56:46 +0000
+++ account_voucher_no_check_default/view/voucher_payment_receipt_view.xml	2014-03-07 01:28:12 +0000
@@ -1,24 +1,36 @@
 <?xml version='1.0' encoding='utf-8'?>
 <openerp>
     <data>
-        <record model="ir.ui.view" id="view_vendor_payment_form_inherit">
-            <field name="name">account.voucher.payment.form.inherit</field>
+        <record model="ir.ui.view" id="view_vendor_payment_form_inherit_reconcile">
+            <field name="name">account.voucher.payment.form.inherit.reconcile</field>
             <field name="model">account.voucher</field>
             <field name="inherit_id" ref="account_voucher.view_vendor_payment_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//field[@name='line_cr_ids']" position="attributes">
-                    <attribute name="readonly">1</attribute>
+                <xpath expr="//field[@name='line_cr_ids']/tree/field[@name='reconcile']" position="after">
+                    <field name='line_to_invoice' invisible="1"/>
+                </xpath>
+                <xpath expr="//field[@name='line_cr_ids']/tree/field[@name='reconcile']" position="attributes">
+                    <attribute name="attrs">{'readonly': [('line_to_invoice', '=', True)]}</attribute>
+                </xpath>
+                <xpath expr="//field[@name='line_cr_ids']/tree/field[@name='amount']" position="attributes">
+                    <attribute name="attrs">{'readonly': [('line_to_invoice', '=', True)]}</attribute>
                 </xpath>
             </field>
         </record>
 
-        <record model="ir.ui.view" id="view_vendor_receipt_form_inherit3">
-            <field name="name">account.voucher.receipt.form.inherit3</field>
+        <record model="ir.ui.view" id="view_vendor_receipt_form_inherit_reconcile">
+            <field name="name">account.voucher.receipt.form.inherit.reconcile</field>
             <field name="model">account.voucher</field>
             <field name="inherit_id" ref="account_voucher.view_vendor_receipt_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//field[@name='line_dr_ids']" position="attributes">
-                     <attribute name="readonly">1</attribute>
+                <xpath expr="//field[@name='line_dr_ids']/tree/field[@name='reconcile']" position="after">
+                    <field name='line_to_invoice' invisible="1"/>
+                </xpath>
+                <xpath expr="//field[@name='line_dr_ids']/tree/field[@name='reconcile']" position="attributes">
+                     <attribute name="attrs">{'readonly': [('line_to_invoice', '=', True)]}</attribute>
+                </xpath>
+                <xpath expr="//field[@name='line_dr_ids']/tree/field[@name='amount']" position="attributes">
+                    <attribute name="attrs">{'readonly': [('line_to_invoice', '=', True)]}</attribute>
                 </xpath>
             </field>
         </record>