Merge lp:~unifield-team/unifield-server/us-724 into lp:unifield-server

[jftempo]

[lp:~unifield-team/unifield-server/us-724]

3624. By Vincent GREINER on 2016-03-18

[FIX] [TYPO] tax user type

3625. By Vincent GREINER on 2016-03-21

US-724 [FIX] pending payment, importable invoices: only import not already imported invoices (we do this bc check with invoice_line_id==False was not enough => tax move lines are never tied to an invoice line id

=== modified file 'bin/addons/register_accounting/account_bank_statement.py'
--- bin/addons/register_accounting/account_bank_statement.py	2016-03-16 16:44:07 +0000
+++ bin/addons/register_accounting/account_bank_statement.py	2016-03-21 14:49:11 +0000
@@ -1755,7 +1755,8 @@
         res_ml_ids = []
         process_invoice_move_line_ids = []
         total_payment = True
-        if st_line.first_move_line_id.amount_currency != total_amount:
+        diff = st_line.first_move_line_id.amount_currency - total_amount
+        if abs(diff) > 0.001:
             # multi unpartial payment
             total_payment = False
             # Delete them

=== modified file 'bin/addons/register_accounting/account_move_line.py'
--- bin/addons/register_accounting/account_move_line.py	2015-08-14 12:34:44 +0000
+++ bin/addons/register_accounting/account_move_line.py	2016-03-21 14:49:11 +0000
@@ -97,7 +97,7 @@
         default_account = self.pool.get('res.users').browse(cr, uid, uid, context).company_id.import_invoice_default_account
         if default_account:
             dom1.append(('account_id', '!=', default_account.id))
-        return dom1+[('amount_residual_import_inv', '>', 0)]
+        return dom1+[('amount_residual_import_inv', '>', 0.001)]
 
     # @@override account.account_move_line _amount_residual()
     def _amount_residual_import_inv(self, cr, uid, ids, field_names, args, context=None):

=== modified file 'bin/addons/register_accounting/wizard/import_invoice_on_registers.py'
--- bin/addons/register_accounting/wizard/import_invoice_on_registers.py	2015-10-22 09:26:59 +0000
+++ bin/addons/register_accounting/wizard/import_invoice_on_registers.py	2016-03-21 14:49:11 +0000
@@ -67,13 +67,21 @@
             ids = [ids]
         if context is None:
             context = {}
+        msg = False
+
+        # Amount check
+        for l in self.read(cr, uid, ids, ['amount_to_pay']):
+            if vals['amount'] < 0:
+                msg = _('Negative amount are forbidden!')
+            elif vals['amount'] > abs(l['amount_to_pay']):
+                msg = _("Amount %.2f can't be greater than 'Amount to pay': %.2f") % (vals['amount'], abs(l['amount_to_pay']))
+            if msg:
+                # reset wrong amount
+                vals = { 'amount': abs(l['amount_to_pay']) }
+
         res = super(wizard_import_invoice_lines, self).write(cr,uid, ids, vals, context=context)
-        # Amount check
-        for l in self.read(cr, uid, ids, ['amount', 'amount_to_pay']):
-            if l['amount'] < 0:
-                raise osv.except_osv(_('Warning'), _('Negative amount are forbidden!'))
-            if l['amount'] > abs(l['amount_to_pay']):
-                raise osv.except_osv(_('Warning'), _("Amount %.2f can't be greater than 'Amount to pay': %.2f")%(vals['amount'], abs(l['amount_to_pay'])))
+        if msg:
+            raise osv.except_osv(_('Warning'), msg)
         return res
 
 wizard_import_invoice_lines()

=== modified file 'bin/addons/register_accounting/wizard/import_invoice_on_registers_view.xml'
--- bin/addons/register_accounting/wizard/import_invoice_on_registers_view.xml	2015-07-16 15:46:18 +0000
+++ bin/addons/register_accounting/wizard/import_invoice_on_registers_view.xml	2016-03-21 14:49:11 +0000
@@ -33,7 +33,7 @@
                 <form string="Import Entries">
                     <group colspan="4" expand="1">
                         <separator string="Payable and Receivables" colspan="4"/>
-                        <field name="line_ids" domain="[('ready_for_import_in_register','=',True), ('currency_id', '=', currency_id), ('invoice_line_id', '=', False)]"
+                        <field name="line_ids" domain="[('ready_for_import_in_register','=',True), ('currency_id', '=', currency_id), ('invoice_line_id', '=', False), ('imported_invoice_line_ids', '=', False)]"
                           context="{'from': 'wizard_import_invoice'}" colspan="4" nolabel="1">
                             <tree string="Account Entry Lines" editable="top" noteditable="True">
                                 <field name="invoice"/>