[MISC] check diff

addons/__init__.py

@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2010-2011 OpenERP s.a. (<http://openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+""" Addons module.
+
+This module serves to contain all OpenERP addons, across all configured addons
+paths. For the code to manage those addons, see openerp.modules.
+
+Addons are made available under `openerp.addons` after
+openerp.tools.config.parse_config() is called (so that the addons paths are
+known).
+
+This module also conveniently reexports some symbols from openerp.modules.
+Importing them from here is deprecated.
+
+"""
+
+# get_module_path is used only by base_module_quality
+from openerp.modules import get_module_resource, get_module_path
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account/__openerp__.py

@@ -153,12 +153,12 @@
         'test/account_period_close.yml',
         'test/account_use_model.yml',
         'test/account_validate_account_move.yml',
+        'test/account_fiscalyear_close.yml',
         #'test/account_bank_statement.yml',
         #'test/account_cash_statement.yml',
         'test/test_edi_invoice.yml',
         'test/account_report.yml',
-        'test/analytic_hierarchy.yml',
-        'test/account_fiscalyear_close.yml', #last test, as it will definitively close the demo fiscalyear
+        'test/account_fiscalyear_close_state.yml', #last test, as it will definitively close the demo fiscalyear
     ],
     'installable': True,
     'auto_install': False,

addons/account/account_assert_test.xml

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <function name="account_assert_balanced" model="account.move"/>
+        <assert model="account.move" search="[]" string="For all Journal Items, the state is valid implies that the sum of credits equals the sum of debits">
+            <test expr="not len(line_id) or line_id[0].state != 'valid' or (sum([l.debit - l.credit for l in line_id]) &lt;= 0.00001)"/>
+        </assert>
     </data>
 </openerp>

addons/account/account_installer.xml

@@ -10,7 +10,7 @@
                 </form>
                 <footer position="replace">
                     <footer>
-                      <button name="action_next" context="{'default_charts':charts}" type="object" string="Continue" class="oe_highlight"/>
+                      <button name="action_next" type="object" string="Continue" class="oe_highlight"/>
                     </footer>
                 </footer>
                 <separator string="title" position="replace">

addons/account/account_menuitem.xml

@@ -5,11 +5,11 @@
         <!-- Top menu item -->
         <menuitem name="Invoicing"
             id="menu_finance"
-            groups="group_account_user,group_account_manager,group_account_invoice"
+            groups="group_account_user,group_account_manager,group_account_invoice,base.nhom_quan_ly_trambanhang_pxk,base.nhom_quan_ly_trambanhang_hoadon,base.nhom_quan_ly_trambanhang_lxh_haiduong"
             sequence="50"/>
 
-        <menuitem id="menu_finance_receivables" name="Customers" parent="menu_finance" sequence="2"/>
-        <menuitem id="menu_finance_payables" name="Suppliers" parent="menu_finance" sequence="3"/>
+        <menuitem id="menu_finance_receivables" name="Customers" parent="menu_finance" sequence="2" groups="group_account_user,group_account_manager,base.nhom_quan_ly_trambanhang_pxk,base.nhom_quan_ly_trambanhang_hoadon,base.nhom_quan_ly_trambanhang_lxh_haiduong"/>
+        <menuitem id="menu_finance_payables" name="Suppliers" parent="menu_finance" sequence="3" groups="group_account_user,group_account_manager"/>
         <menuitem id="menu_finance_bank_and_cash" name="Bank and Cash" parent="menu_finance" sequence="4"
             groups="group_account_user,group_account_manager"/>
         <menuitem id="menu_finance_periodical_processing" name="Periodic Processing" parent="menu_finance" sequence="13" groups="group_account_user,group_account_manager"/>

addons/account/account_pre_install.yml

@@ -7,7 +7,7 @@
     wiz = wizards.browse(cr, uid, ref('account.account_configuration_installer_todo'))
     part = self.pool.get('res.partner').browse(cr, uid, ref('base.main_partner'))
     # if we know the country and the wizard has not yet been executed, we do it
-    if (part.country_id.id) and (part.country_id.code) and (wiz.state=='open'):
+    if (part.country_id.id) and (wiz.state=='open'):
         mod = 'l10n_'+part.country_id.code.lower()
         ids = modules.search(cr, uid, [ ('name','=',mod) ], context=context)
         if ids:

addons/account/account_report.xml

@@ -11,7 +11,7 @@
         <report auto="False" id="account_general_journal" model="account.journal.period" name="account.general.journal" rml="account/report/account_general_journal.rml" string="General Journal" header="False"/>
         <report auto="False" id="account_journal" model="account.journal.period" name="account.journal.period.print" rml="account/report/account_journal.rml" string="Journal" header="False"/>
         <report auto="False" id="account_journal_sale_purchase" model="account.journal.period" name="account.journal.period.print.sale.purchase" rml="account/report/account_journal_sale_purchase.rml" string="Sale/Purchase Journal" header="False"/>
-        <report auto="False" id="account_overdue" model="res.partner" name="account.overdue" rml="account/report/account_print_overdue.rml" string="Due Payments"/>
+        <report auto="False" id="account_overdue" model="res.partner" name="account.overdue" rml="account/report/account_print_overdue.rml" string="Overdue Payments"/>
         <report
             auto="False"
             id="account_invoices"

addons/account/account_view.xml

@@ -995,9 +995,7 @@
                             <group>
                                 <field name="name"/>
                                 <field name="ref"/>
-                                <field name="partner_id"
-                                    domain="['|', ('parent_id', '=', False), ('is_company', '=', True)]"
-                                    on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/>
+                                <field name="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/>
                             </group>
                             <group>
                                 <field name="journal_id"/>
@@ -1070,9 +1068,7 @@
                                 <field name="journal_id" readonly="False"/>
                                 <field name="period_id" readonly="False"/>
                                 <field name="account_id" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation'),('company_id', '=', company_id)]"/>
-                                <field name="partner_id"
-                                    domain="['|', ('parent_id', '=', False), ('is_company', '=', True)]"
-                                    on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/>
+                                <field name="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/>
                                 <newline/>
                                 <field name="debit"/>
                                 <field name="credit"/>
@@ -1116,9 +1112,7 @@
                     <field name="name"/>
                     <field name="ref"/>
                     <field name="statement_id" invisible="1"/>
-                    <field name="partner_id"
-                        domain="['|', ('parent_id', '=', False), ('is_company', '=', True)]"
-                        on_change="onchange_partner_id(move_id, partner_id, account_id, debit, credit, date, journal_id)"/>
+                    <field name="partner_id" on_change="onchange_partner_id(move_id, partner_id, account_id, debit, credit, date, journal_id)"/>
                     <field name="account_id" options='{"no_open":True}' domain="[('journal_id','=',journal_id), ('company_id', '=', company_id)]" on_change="onchange_account_id(account_id, partner_id, context)"/>
                     <field name="account_tax_id" options='{"no_open":True}' invisible="context.get('journal_type', False) not in ['sale','sale_refund','purchase','purchase_refund','general']"/>
                     <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('type','not in',['view','template'])]" invisible="not context.get('analytic_journal_id',False)"/>
@@ -1295,9 +1289,7 @@
                                     <group col="6" colspan="4">
                                         <field name="name"/>
                                         <field name="ref"/>
-                                        <field name="partner_id"
-                                            domain="['|', ('parent_id', '=', False), ('is_company', '=', True)]"
-                                            on_change="onchange_partner_id(False, partner_id, account_id, debit, credit, date, journal_id, context)"/>
+                                        <field name="partner_id" on_change="onchange_partner_id(False, partner_id, account_id, debit, credit, date, journal_id, context)"/>
 
                                         <field name="journal_id"/>
                                         <field name="period_id"/>
@@ -1361,9 +1353,7 @@
                                 <tree colors="blue:state == 'draft';black:state == 'posted'" editable="top" string="Journal Items">
                                     <field name="invoice"/>
                                     <field name="name"/>
-                                    <field name="partner_id"
-                                        domain="['|', ('parent_id', '=', False), ('is_company', '=', True)]"
-                                        on_change="onchange_partner_id(False, partner_id, account_id, debit, credit, parent.date, parent.journal_id, context)"/>
+                                    <field name="partner_id" on_change="onchange_partner_id(False, partner_id, account_id, debit, credit, parent.date, parent.journal_id, context)"/>
                                     <field name="account_id" domain="[('journal_id','=',parent.journal_id),('company_id', '=', parent.company_id)]"/>
                                     <field name="date_maturity"/>
                                     <field name="debit" sum="Total Debit"/>
@@ -1450,7 +1440,7 @@
         <act_window
             id="act_account_move_to_account_move_line_open"
             name="Journal Items"
-            context="{'search_default_move_id': active_id, 'default_move_id': active_id}"
+            context="{'search_default_journal_id': active_id, 'default_journal_id': active_id}"
             res_model="account.move.line"
             src_model="account.move"/>
 
@@ -1598,6 +1588,7 @@
 	                        <label for="value_amount" string="Amount To Pay"  attrs="{'invisible':[('value','=','balance')]}"/>
 	                        <div attrs="{'invisible':[('value','=','balance')]}">
 	                            <field name="value_amount" class="oe_inline"/>
+	                            <label string="%%" class="oe_inline" attrs="{'invisible':['!',('value','=','procent')]}" />
 	                        </div>
                         </group>
                         <group string="Due Date Computation">
@@ -2134,7 +2125,7 @@
                             <field name="chart_template_id" widget="selection" on_change="onchange_chart_template_id(chart_template_id)" domain="[('visible','=', True)]"/>
                         </group>
                         <group>
-                            <field name="company_id" widget="selection"/> <!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
+                            <field name="company_id" widget="selection" on_change="onchange_company_id(company_id)"/> <!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
                             <field name="currency_id" class="oe_inline"/>
                             <field name="sale_tax" attrs="{'invisible': [('complete_tax_set', '!=', True)]}" domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('sale','all'))]"/>
                             <label for="sale_tax_rate" string="Sale Tax" attrs="{'invisible': [('complete_tax_set', '=', True)]}"/>
@@ -2278,6 +2269,7 @@
                         <group>
                             <field name="journal_id" on_change="onchange_journal_id(journal_id)" widget="selection" domain="[('type', '=', 'cash')]" />
                             <field name="user_id" readonly="1" string="Responsible"/>
+                            <field name="total_entry_encoding"/>
                             <field name='company_id' widget="selection" groups="base.group_multi_company" />
                         </group>
                         <group>

addons/account/data/account_data.xml

@@ -16,6 +16,7 @@
         </record>
 
         <record id="account_payment_term_line_immediate" model="account.payment.term.line">
+            <field name="name">Immediate Payment</field>
             <field name="value">balance</field>
             <field eval="0" name="days"/>
             <field eval="0" name="days2"/>