Merge lp:~unifield-team/unifield-wm/UFTP-78 into lp:unifield-wm

[Olivier DOSSMANN]

To see changes made.

[lp:~unifield-team/unifield-wm/UFTP-78]

2208. By Sean Carroll on 2014-09-18

UFTP-78:[FIX] restricted accounts

2209. By Olivier DOSSMANN on 2014-10-08

UFTP-78 [MERGE] Last unifield trunk

2210. By Olivier DOSSMANN on 2014-10-08

UFTP-78 [FIX] Register lines import: wrong domain name for RESTRICTED_ACCOUNT_AREA choice to restrict lines at import

2211. By Olivier DOSSMANN on 2014-10-10

UFTP-78 [FIX] Register line import: Allow 10210 accounts to be imported.

2212. By Olivier DOSSMANN on 2014-10-10

UFTP-78 [FIX] Code 10210 should be not restricted

2213. By Olivier DOSSMANN on 2014-10-10

UFTP-78 [FIX] Problem with red lines on cheque registers

=== added file '.project'
--- .project	1970-01-01 00:00:00 +0000
+++ .project	2014-10-10 10:21:16 +0000
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>utp1017-unifield-wm</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.python.pydev.PyDevBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.python.pydev.pythonNature</nature>
+	</natures>
+</projectDescription>

=== added file '.pydevproject'
--- .pydevproject	1970-01-01 00:00:00 +0000
+++ .pydevproject	2014-10-10 10:21:16 +0000
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?eclipse-pydev version="1.0"?>
+
+<pydev_project>
+<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
+<path>/${PROJECT_DIR_NAME}</path>
+</pydev_pathproperty>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
+</pydev_project>

=== added directory '.settings'
=== added file '.settings/org.eclipse.core.resources.prefs'
--- .settings/org.eclipse.core.resources.prefs	1970-01-01 00:00:00 +0000
+++ .settings/org.eclipse.core.resources.prefs	2014-10-10 10:21:16 +0000
@@ -0,0 +1,15 @@
+#Tue Jun 17 16:29:53 CEST 2014
+eclipse.preferences.version=1
+encoding//account_hq_entries/hq_entries.py=utf-8
+encoding//account_hq_entries/wizard/hq_entries_split.py=utf-8
+encoding//analytic_distribution/account.py=utf-8
+encoding//analytic_distribution/analytic_account.py=utf-8
+encoding//analytic_distribution/analytic_distribution.py=utf-8
+encoding//analytic_distribution/invoice.py=utf-8
+encoding//analytic_distribution/wizard/analytic_distribution_wizard.py=utf-8
+encoding//financing_contract/contract.py=utf-8
+encoding//financing_contract/format_line.py=utf-8
+encoding//msf_button_access_rights/osv_override.py=utf-8
+encoding//msf_currency_revaluation/res_currency.py=utf-8
+encoding//register_accounting/account_bank_statement.py=utf-8
+encoding//register_accounting/wizard/wizard_register_import.py=utf-8

=== modified file 'register_accounting/account_bank_statement.py'
--- register_accounting/account_bank_statement.py	2014-10-07 07:50:37 +0000
+++ register_accounting/account_bank_statement.py	2014-10-10 10:21:16 +0000
@@ -427,7 +427,7 @@
                 create_cashbox_lines(self, cr, uid, reg.id, context=context)
             # For bank statement, give balance_end
             elif reg.journal_id.type == 'bank':
-                # Verify that another bank statement exists
+                # Verify that another bank statement exists.
                 st_prev_ids = self.search(cr, uid, [('prev_reg_id', '=', reg.id)], context=context)
                 if len(st_prev_ids) > 1:
                     raise osv.except_osv(_('Error'), _('A problem occured: More than one register have this one as previous register!'))
@@ -974,6 +974,8 @@
         """
         Get all analytic lines linked to the given register lines
         """
+        
+        print '_get_fp_analytic_lines:', ids
         if not context:
             context = {}
 
@@ -987,6 +989,18 @@
             res[absl.id] = aal_obj.get_corrections_history(cr, uid, aal_ids, context=context)
         return res
 
+    def _check_red_on_supplier(self, cr, uid, ids, name, arg, context=None):
+        result = {}
+        for id in ids:
+            result[id] = {'red_on_supplier': False}        
+            
+        for out in self.browse(cr, uid, ids, context=context):
+            type_for_register = out.account_id.type_for_register
+            if type_for_register in ['advance','transfer_same','down_payment','transfer']:
+                if out.partner_id.id is False and out.employee_id.id is False and out.transfer_journal_id.id is False: 
+                    result[out.id]['red_on_supplier'] = True
+        return result
+
     _columns = {
         'transfer_journal_id': fields.many2one("account.journal", "Journal", ondelete="restrict"),
         'employee_id': fields.many2one("hr.employee", "Employee", ondelete="restrict"),
@@ -1027,6 +1041,7 @@
             ('transfer', 'Internal Transfer'), ('transfer_same', 'Internal Transfer (same currency)'), ('advance', 'Operational Advance'),
             ('payroll', 'Third party required - Payroll'), ('down_payment', 'Down payment'), ('donation', 'Donation')] , readonly=True),
         'fp_analytic_lines': fields.function(_get_fp_analytic_lines, type="one2many", obj="account.analytic.line", method=True, string="Analytic lines linked to the given register line(s). Correction(s) included."),
+        'red_on_supplier': fields.function(_check_red_on_supplier, method=True, type="boolean", string="Supplier flag", store=False, readonly=True, multi="m"),
         'journal_id': fields.related('statement_id','journal_id', string="Journal", type='many2one', relation='account.journal', readonly=True),
     }
 

=== modified file 'register_accounting/account_view.xml'
--- register_accounting/account_view.xml	2014-09-23 08:09:20 +0000
+++ register_accounting/account_view.xml	2014-10-10 10:21:16 +0000
@@ -52,8 +52,9 @@
                         <notebook colspan="4">
                             <page string="Transaction" name="statement_line_ids">
                                 <field colspan="4" name="line_ids" nolabel="1">
-                                    <tree editable="bottom" string="Statement lines" noteditable="state=='hard' or direct_invoice is True" colors="red:(display_analytic_button and (not analytic_distribution_id or analytic_distribution_state == 'invalid')) or (type_for_register == 'transfer' and transfer_amount == 0.0 and state in ('draft', 'temp'))">
+                                    <tree editable="bottom" string="Statement lines" noteditable="state=='hard' or direct_invoice is True" colors="red:(display_analytic_button and (not analytic_distribution_id or analytic_distribution_state == 'invalid')) or (type_for_register == 'transfer' and transfer_amount == 0.0 and state in ('draft', 'temp')) or red_on_supplier == True">
                                         <field name="transfer_amount" invisible="1"/>
+                                        <field name="red_on_supplier" invisible="1"/>
                                         <button name="button_duplicate" string="Duplicate" type="object" icon="gtk-copy" />
                                         <button name="button_analytic_lines" string="Analytic lines" type="object" icon="terp-stock_zoom" />
                                         <field name="document_date" attrs="{'readonly': [('from_import_cheque_id', '!=', False)]}"/>
@@ -194,7 +195,7 @@
                         <notebook colspan="4">
                             <page string="Cash Transactions" attrs="{'invisible': [('state','=','draft')]}">
                                 <field colspan="4" name="line_ids" nolabel="1">
-                                    <tree editable="bottom" string="Statement lines" noteditable="state=='hard' or direct_invoice is True" colors="red:(display_analytic_button and (not analytic_distribution_id or analytic_distribution_state == 'invalid')) or (type_for_register == 'transfer' and transfer_amount == 0.0 and state in ('draft', 'temp'))">
+                                    <tree editable="bottom" string="Statement lines" noteditable="state=='hard' or direct_invoice is True" colors="red:(display_analytic_button and (not analytic_distribution_id or analytic_distribution_state == 'invalid')) or (type_for_register == 'transfer' and transfer_amount == 0.0 and state in ('draft', 'temp')) or red_on_supplier == True">
                                       <field name="transfer_amount" invisible="1"/>
                                         <button name="button_duplicate" string="Duplicate" type="object" icon="gtk-copy" />
                                         <button name="button_analytic_lines" string="Analytic lines" type="object" icon="terp-stock_zoom" />
@@ -204,6 +205,7 @@
                                             attrs="{'invisible': ['|', ('from_cash_return', '=', True), '|', ('amount', '&gt;=', 0), '|',
                                             ('employee_id', '=', False), ('type_for_register','!=','advance')]}"/>
                                         <field name="document_date"/>
+                                        <field name="red_on_supplier" invisible="1" />
                                         <field name="date" />
                                         <field name="sequence_for_reference"/>
                                         <field name="name" string="Description"/>
@@ -685,11 +687,12 @@
                         <page string="Transaction" name="statement_line_ids">
                             <field colspan="4" name="line_ids" nolabel="1">
                                 <!-- WARNING: because of UTP-331, in cheque register direct invoice lines should be editable but ONLY for cheque_number FIELD. That's why ALL field must be not editable when "direct_invoice" is True. -->
-                                <tree editable="bottom" string="Statement lines" noteditable="state=='hard'" colors="red:(display_analytic_button and (not analytic_distribution_id or analytic_distribution_state == 'invalid')) or (type_for_register == 'transfer' and transfer_amount == 0.0 and state in ('draft', 'temp'))">
+                                <tree editable="bottom" string="Statement lines" noteditable="state=='hard'" colors="red:(display_analytic_button and (not analytic_distribution_id or analytic_distribution_state == 'invalid')) or (type_for_register == 'transfer' and transfer_amount == 0.0 and state in ('draft', 'temp')) or red_on_supplier == True">
                                     <field name="transfer_amount" invisible="1"/>
                                     <button name="button_duplicate" string="Duplicate" type="object" icon="gtk-copy" />
                                     <button name="button_analytic_lines" string="Analytic lines" type="object" icon="terp-stock_zoom" />
                                     <field name="document_date" attrs="{'readonly': [('direct_invoice', '=', True)]}"/>
+                                    <field name="red_on_supplier" invisible="1" />
                                     <field name="date" attrs="{'readonly': [('direct_invoice', '=', True)]}"/>
                                     <field name="cheque_number" required="1"/>
                                     <field name="sequence_for_reference"/>

=== modified file 'register_accounting/wizard/wizard_register_import.py'
--- register_accounting/wizard/wizard_register_import.py	2014-09-29 12:45:23 +0000
+++ register_accounting/wizard/wizard_register_import.py	2014-10-10 10:21:16 +0000
@@ -363,7 +363,6 @@
                     line = self.pool.get('import.cell.data').get_line_values(cr, uid, ids, r)
                     # utp1043 pad the line with False if some trailing columns missing. Occurs on Excel 2003
                     line.extend([False for i in range(len(cols) - len(line))])
-
                     # Bypass this line if NO debit AND NO credit
                     try:
                         bd = line[cols['amount_in']]
@@ -427,7 +426,12 @@
                         errors.append(_('Line %s. G/L account %s not found!') % (current_line_num, account_code,))
                         continue
                     r_account = account_ids[0]
-                    account = self.pool.get('account.account').read(cr, uid, r_account, ['type_for_register', 'is_analytic_addicted'], context)
+                    account_obj = self.pool.get('account.account')
+                    restricted_ids = account_obj.search(cr, uid, [('restricted_area', '=', 'register_lines'), ('id', '=', r_account)])
+                    if not restricted_ids and account_code != '10210':
+                        errors.append(_('Line %s. G/L account %s is restricted.') % (current_line_num, account_code,))
+                        continue
+                    account = account_obj.read(cr, uid, r_account, ['type_for_register', 'is_analytic_addicted'], context)
                     type_for_register = account.get('type_for_register', '')
 
                     # cheque_number
@@ -445,9 +449,7 @@
                             cheque_numbers.append(r_cheque_number)
                         else:
                             errors.append(_('Line %s. Cheque number is missing') % (current_line_num,))
-
                     # Check that Third party exists (if not empty)
-
                     tp_label = _('Partner')
                     partner_type = 'partner'
                     third_party_journal_ids = None

=== modified file 'register_accounting/wizard/wizard_register_import.xml'
--- register_accounting/wizard/wizard_register_import.xml	2014-09-29 09:46:24 +0000
+++ register_accounting/wizard/wizard_register_import.xml	2014-10-10 10:21:16 +0000
@@ -63,7 +63,7 @@
                                 <th class='account' style='border: thin solid black; border-left: none;'>Account</th>
                                 <th class='third_party' style='border: thin solid black; border-left: none;'>Third party</th>
                                 <th class='amount_in' style='border: thin solid black; border-left: none;'>Amount IN</th>
-                                <th class='amount_out' style='border: thin solid black; border-left: none;'>Amount ON</th>
+                                <th class='amount_out' style='border: thin solid black; border-left: none;'>Amount OUT</th>
                                 <th class='destination' style='border: thin solid black; border-left: none;'>Destination</th>
                                 <th class='cost_center' style='border: thin solid black; border-left: none;'>Cost Centre</th>
                                 <th class='funding_pool' style='border: thin solid black; border-left: none;'>Funding Pool</th>