openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #03016
[Merge] lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-ara into lp:~openerp-dev/openobject-addons/trunk-dev-addons3
Ashvin Rathod (OpenERP) has proposed merging lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-ara into lp:~openerp-dev/openobject-addons/trunk-dev-addons3.
Requested reviews:
OpenERP R&D Team (openerp-dev)
Related bugs:
#615522 Report Of Invoice : Payment Term + Due date not printed
https://bugs.launchpad.net/bugs/615522
#649029 [sale] incoterm field poorly implemented [direct sql / not translatable]
https://bugs.launchpad.net/bugs/649029
#656378 [trunk] general ledger -
https://bugs.launchpad.net/bugs/656378
#672553 opening entries from chart of account doesn't use context
https://bugs.launchpad.net/bugs/672553
#674480 [6.0 RC2] incorrect creation of Accounting Journals is some localizations prevents multiple charts from being installed
https://bugs.launchpad.net/bugs/674480
#675494 [Trunk] - If you delete an invoice entry, invoice still exists
https://bugs.launchpad.net/bugs/675494
#681398 sale access right
https://bugs.launchpad.net/bugs/681398
#689536 [6.0] partner layout salesman/salesteam issue
https://bugs.launchpad.net/bugs/689536
#690326 [6.0RC1] View mode "tree,form,search" in several window actions
https://bugs.launchpad.net/bugs/690326
#690753 [6.0] and [5.x] account_analytic_line must not be deleted if the journal etc is deleted
https://bugs.launchpad.net/bugs/690753
#691072 [6.0RC1][TRUNK][account_voucher] Wrong definition of field 'company_id' in 'account_voucher_line' object
https://bugs.launchpad.net/bugs/691072
#692986 [6.0] hr_payroll_account hr_payroll_account_view.xml - required fields block opening form
https://bugs.launchpad.net/bugs/692986
#694833 Salary Structure deduction percentage limitation
https://bugs.launchpad.net/bugs/694833
#695960 [6.0RC1][hr_timesheet]Problems printing timesheet reports
https://bugs.launchpad.net/bugs/695960
#696914 [6.0 RC2] account bank statement - usability
https://bugs.launchpad.net/bugs/696914
#697673 Wrong column title in timesheet view
https://bugs.launchpad.net/bugs/697673
#697989 Failed to install module multi_company
https://bugs.launchpad.net/bugs/697989
#701410 shouldn't see employee's categories in simplify view
https://bugs.launchpad.net/bugs/701410
#701683 [6.0 rc2] Setup/upgrade/run fails for init:module account_analytic_plans
https://bugs.launchpad.net/bugs/701683
#702318 Default period and account in invoices line for multi-company doesn't work
https://bugs.launchpad.net/bugs/702318
#705675 Error creating a DTA
https://bugs.launchpad.net/bugs/705675
#707398 [6.0] Account_payment: "Select Invoices to Pay" button on payment order not working
https://bugs.launchpad.net/bugs/707398
#707404 [trunk][account] useless variable in button_confirm_bank
https://bugs.launchpad.net/bugs/707404
#711886 [6.0 trunk] account : period selection not working for BS and PL legal reports
https://bugs.launchpad.net/bugs/711886
#713562 [6.0] account - demo data - all periods have "special = true"
https://bugs.launchpad.net/bugs/713562
#713772 Cannot specify RFC in the accounting options
https://bugs.launchpad.net/bugs/713772
#714860 analytic account - Wrong demo data and account type must be come in tree view
https://bugs.launchpad.net/bugs/714860
#715470 [PS] sale margin module : wrong computation
https://bugs.launchpad.net/bugs/715470
#715695 Multi-Company Environment :Configuration of consolidated type of account is not possible due to the _check_type constraints.
https://bugs.launchpad.net/bugs/715695
#717874 [6.0] account id - domain must check for <> view and consolidation and matching company_id
https://bugs.launchpad.net/bugs/717874
For more details, see:
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-dev-addons3-ara/+merge/49608
Hello,
[FIX]: account id - domain must check for <> view and consolidation and matching company_id
https://bugs.launchpad.net/openobject-addons/+bug/717874
Thanks,
ara
--
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-dev-addons3-ara/+merge/49608
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-ara into lp:~openerp-dev/openobject-addons/trunk-dev-addons3.
=== modified file 'account/account_view.xml'
--- account/account_view.xml 2011-02-03 10:32:28 +0000
+++ account/account_view.xml 2011-02-14 11:41:37 +0000
@@ -582,7 +582,7 @@
<field name="ref"/>
<field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
<field name="type" on_change="onchange_type(partner_id, type)"/>
- <field domain="[('journal_id', '=', parent.journal_id), ('type', '<>', 'view')]" name="account_id"/>
+ <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '<>', 'view')]" name="account_id"/>
<field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('company_id', '=', parent.company_id), ('type', '<>', 'view')]"/>
<field name="amount"/>
<field name="sequence" readonly="0"/>
@@ -1048,7 +1048,7 @@
<page string="Information">
<group col="2" colspan="2">
<separator colspan="2" string="Amount"/>
- <field name="account_id" select="1" domain="[('type','<>','view'),('type','<>','consolidation')]"/>
+ <field name="account_id" select="1" domain="[('company_id', '=', company_id),('type','<>','view'),('type','<>','consolidation')]"/>
<field name="debit"/>
<field name="credit"/>
<field name="quantity"/>
@@ -1343,7 +1343,7 @@
<page string="Information">
<group col="2" colspan="2">
<separator colspan="2" string="Amount"/>
- <field name="account_id" domain="[('type','<>','view'),('type','<>','consolidation')]"/>
+ <field name="account_id" domain="[('company_id', '=', parent.company_id), ('type','<>','view'),('type','<>','consolidation')]"/>
<field name="debit"/>
<field name="credit"/>
<field name="quantity"/>
