Foram Katharotiya (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-addons20-accounting-fka into
lp:openobject-addons.
Requested reviews:
Amit Patel (OpenERP) (apa-tiny)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons20-accounting-fka/+merge/133207
Hello Sir,
- I have done changes in Supplier Invoice
- Change Account template form view
- Fix Uncaught TypeError: Cannot read property 'attrs' of undefined
- Fix Uncaught TypeError: Cannot call method 'get_domain' of undefined
- Remove the following menus:
- Customers / Journal Items
- Suppliers / Journal Items
- Bank & Cash / Journal Items
- Bank & Cash / Journal Items to Reconcile
- Periodical Processing / Recurring Entries / Manual Recurring
- Accounting / Periodical Processing / Billing / Invoice Task Work
- Configuration / Misc / Recurring Models Menu moves in Periodical Processing
/ Recurring Entries / Models
- Configuration / Financial Accounting / Templates menu moves in
Configuration / Accounts / Templates
Thanks,
FKA
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons20-accounting-fka/+merge/133207
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-addons20-accounting-fka.
=== modified file 'account/account_invoice.py'
--- account/account_invoice.py 2012-11-02 09:21:06 +0000
+++ account/account_invoice.py 2012-11-07 10:35:24 +0000
@@ -185,7 +185,7 @@
_columns = {
'name': fields.char('Description', size=64, select=True, readonly=True, states={'draft':[('readonly',False)]}),
'origin': fields.char('Source Document', size=64, help="Reference of the document that produced this invoice.", readonly=True, states={'draft':[('readonly',False)]}),
- 'supplier_invoice_number': fields.char('Supplier Invoice Number', size=64, help="The reference of this invoice as provided by the supplier.", readonly=True, states={'draft':[('readonly',False)]}),
+ 'supplier_invoice_number': fields.char('Partner Reference', size=64, help="The reference of this invoice as provided by the supplier.", readonly=True, states={'draft':[('readonly',False)]}),
'type': fields.selection([
('out_invoice','Customer Invoice'),
('in_invoice','Supplier Invoice'),
@@ -195,7 +195,7 @@
'number': fields.related('move_id','name', type='char', readonly=True, size=64, relation='account.move', store=True, string='Number'),
'internal_number': fields.char('Invoice Number', size=32, readonly=True, help="Unique number of the invoice, computed automatically when the invoice is created."),
- 'reference': fields.char('Invoice Reference', size=64, help="The partner reference of this invoice."),
+ 'reference': fields.char('Invoice Reference', size=64, help="The Payment Reference of this invoice."),
'reference_type': fields.selection(_get_reference_type, 'Payment Reference',
required=True, readonly=True, states={'draft':[('readonly',False)]}),
'comment': fields.text('Additional Information'),
=== modified file 'account/account_invoice_view.xml'
--- account/account_invoice_view.xml 2012-10-29 13:55:31 +0000
+++ account/account_invoice_view.xml 2012-11-07 10:35:24 +0000
@@ -168,10 +168,8 @@
context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}"
domain="[('supplier', '=', True)]"/>
<field name="fiscal_position" widget="selection"/>
- <group>
- <field name="origin"/>
- <field name="supplier_invoice_number"/>
- </group>
+ <field name="origin"/>
+ <field name="supplier_invoice_number"/>
<label for="reference_type"/>
<div>
<field name="reference_type" class="oe_inline oe_edit_only"/>
=== modified file 'account/account_move_line.py'
--- account/account_move_line.py 2012-10-24 20:14:24 +0000
+++ account/account_move_line.py 2012-11-07 10:35:24 +0000
@@ -1029,7 +1029,7 @@
'move_id': 40,
}
- document = etree.Element('tree', string=title, editable="top",
+ document = etree.Element('tree', string=title,
on_write="on_create_write",
colors="red:state=='draft';black:state=='valid'")
fields_get = self.fields_get(cr, uid, flds, context)
=== modified file 'account/account_view.xml'
--- account/account_view.xml 2012-10-31 14:57:08 +0000
+++ account/account_view.xml 2012-11-07 10:35:24 +0000
@@ -1218,6 +1218,7 @@
<field name="model">account.move.line</field>
<field name="arch" type="xml">
<search string="Search Journal Items">
+ <field name="name" filter_domain="['|', ('name','ilike',self), ('ref','ilike',self)]" string="Move"/>
<field name="date"/>
<filter icon="terp-document-new" string="Unbalanced" domain="[('state','=','draft')]" help="Unbalanced Journal Items"/>
<separator/>
@@ -1549,12 +1550,6 @@
</p>
</field>
</record>
- <menuitem
- name="Journal Items to Reconcile"
- action="action_account_manual_reconcile"
- id="menu_manual_reconcile_bank"
- sequence="20"
- parent="account.menu_finance_bank_and_cash"/>
<menuitem
name="Manual Reconciliation"
@@ -1708,8 +1703,8 @@
<field name="search_view_id" ref="view_model_search"/>
</record>
<menuitem
- action="action_model_form" id="menu_action_model_form" sequence="5"
- parent="account.menu_configuration_misc"/>
+ action="action_model_form" name="Models" id="menu_action_model_form" sequence="5"
+ parent="account.menu_finance_recurrent_entries"/>
<!--
# Payment Terms
@@ -2055,7 +2050,7 @@
<menuitem
id="account_template_folder"
name="Templates"
- parent="menu_finance_accounting"
+ parent="account_account_menu"
groups="account.group_account_manager"/>
<menuitem
id="account_template_taxes"
@@ -2074,28 +2069,23 @@
<field name="model">account.account.template</field>
<field name="arch" type="xml">
<form string="Account Template" version="7.0">
- <notebook>
- <page string="General Information">
- <group col="4">
- <field name="name"/>
- <field name="code"/>
- <newline/>
- <field name="parent_id"/>
- <field name="shortcut"/>
- <field name="type"/>
- <field name="user_type"/>
+ <group col="4">
+ <field name="name"/>
+ <field name="code"/>
+ <newline/>
+ <field name="parent_id"/>
+ <field name="shortcut"/>
+ <field name="type"/>
+ <field name="user_type"/>
- <field name="currency_id" groups="base.group_multi_currency"/>
- <field name="reconcile"/>
- <field name="chart_template_id"/>
- </group>
- <separator string="Default Taxes"/>
- <field name="tax_ids"/>
- </page>
- <page string="Notes">
- <field name="note"/>
- </page>
- </notebook>
+ <field name="currency_id" groups="base.group_multi_currency"/>
+ <field name="reconcile"/>
+ <field name="chart_template_id"/>
+ </group>
+ <separator string="Default Taxes"/>
+ <field name="tax_ids"/>
+ <separator string="Notes"/>
+ <field name="note"/>
</form>
</field>
</record>
=== modified file 'account/test/account_validate_account_move.yml'
--- account/test/account_validate_account_move.yml 2012-10-19 13:30:50 +0000
+++ account/test/account_validate_account_move.yml 2012-11-07 10:35:24 +0000
@@ -32,8 +32,8 @@
import time
date = self._get_date(cr, uid, {'lang': u'en_US', 'normal_view': False, 'active_model': 'ir.ui.menu',
'search_default_journal_id': 1, 'journal_type': 'sale', 'search_default_period_id': 6, 'journal_id': 1, 'view_mode': False,
- 'visible_id': 1, 'period_id': 6, 'tz': False, 'active_ids': [ref('menu_eaction_account_moves_sale')],
- 'search_default_posted': 0, 'active_id': ref('menu_eaction_account_moves_sale')})
+ 'visible_id': 1, 'period_id': 6, 'tz': False, 'active_ids': [ref('menu_action_account_moves_all')],
+ 'search_default_posted': 0, 'active_id': ref('menu_action_account_moves_all')})
partner = self.onchange_partner_id(cr, uid, [], False, ref('base.res_partner_12'), ref('account.cash'), debit=0, credit=2000, date=date, journal=False)
account = self.onchange_account_id(cr, uid, [], account_id=ref('account.a_recv'), partner_id= ref('base.res_partner_12'))
vals = {
@@ -62,11 +62,11 @@
!python {model: account.move.line}: |
ids = self._balance_search(cr, uid, self, 'balance', [('balance', '=', 2000.0)], None, {'lang': u'en_US', 'tz': False, 'active_model': 'ir.ui.menu',
'search_default_journal_id': 1, 'journal_type': 'sale', 'search_default_period_id': 6, 'view_mode': False, 'visible_id': 1,
- 'active_ids': [ref('menu_eaction_account_moves_sale')], 'search_default_posted': 0, 'active_id': ref('menu_eaction_account_moves_sale')})
+ 'active_ids': [ref('menu_action_account_moves_all')], 'search_default_posted': 0, 'active_id': ref('menu_action_account_moves_all')})
bal = self._balance(cr, uid, ids[0][2], 'balance', None,{'lang': u'en_US', 'tz': False, 'active_model': 'ir.ui.menu',
'search_default_journal_id': 1, 'journal_type': 'sale', 'search_default_period_id': 6, 'view_mode': False,
- 'visible_id': 1, 'active_ids': [ref('menu_eaction_account_moves_sale')], 'search_default_posted': 0,
- 'active_id': ref('menu_eaction_account_moves_sale')})
+ 'visible_id': 1, 'active_ids': [ref('menu_action_account_moves_all')], 'search_default_posted': 0,
+ 'active_id': ref('menu_action_account_moves_all')})
assert bal, 'Balance has not been computed correctly'
-
I check that Initially account move state is "Draft"
=== modified file 'account/wizard/account_move_journal_view.xml'
--- account/wizard/account_move_journal_view.xml 2012-08-08 10:59:07 +0000
+++ account/wizard/account_move_journal_view.xml 2012-11-07 10:35:24 +0000
@@ -12,51 +12,5 @@
</field>
</record>
- <record id="action_account_moves_sale" model="ir.actions.act_window">
- <field name="name">Journal Items</field>
- <field name="res_model">account.move.journal</field>
- <field name="view_type">form</field>
- <field name="view_id" ref="view_account_move_journal_form"/>
- <field name="context">{'journal_type':'sale','view_mode':False}</field>
- <field name="target">new</field>
- <field name="help">This view is used by accountants in order to record entries massively in OpenERP. If you want to record a customer invoice, select the journal and the period in the search toolbar. Then, start by recording the entry line of the income account. OpenERP will propose to you automatically the Tax related to this account and the counter-part "Account receivable".</field>
- </record>
- <menuitem action="action_account_moves_sale" sequence="16" id="menu_eaction_account_moves_sale"
- parent="menu_finance_receivables" icon="STOCK_JUSTIFY_FILL" groups="group_account_user,group_account_manager"/>
-
- <record id="action_account_moves_purchase" model="ir.actions.act_window">
- <field name="name">Journal Items</field>
- <field name="res_model">account.move.journal</field>
- <field name="view_type">form</field>
- <field name="view_id" ref="view_account_move_journal_form"/>
- <field name="context">{'journal_type':'purchase','view_mode':False}</field>
- <field name="target">new</field>
- <field name="help">This view is used by accountants in order to record entries massively in OpenERP. If you want to record a supplier invoice, start by recording the line of the expense account, OpenERP will propose to you automatically the Tax related to this account and the counter-part "Account Payable".</field>
- </record>
- <menuitem action="action_account_moves_purchase"
- id="menu_eaction_account_moves_purchase"
- parent="menu_finance_payables"
- icon="STOCK_JUSTIFY_FILL"
- sequence="16"
- groups="group_account_user,group_account_manager"/>
-
- <record id="action_account_moves_bank" model="ir.actions.act_window">
- <field name="name">Journal Items</field>
- <field name="res_model">account.move.journal</field>
- <field name="view_type">form</field>
- <field name="view_id" ref="view_account_move_journal_form"/>
- <field name="context">{'journal_type':'bank','view_mode':False}</field>
- <field name="target">new</field>
- <field name="help">This view is used by accountants in order to record entries massively in OpenERP. Journal items are created by OpenERP if you use Bank Statements, Cash Registers, or Customer/Supplier payments.</field>
- </record>
-
- <menuitem
- action="action_account_moves_bank"
- icon="STOCK_JUSTIFY_FILL"
- id="menu_action_account_moves_bank"
- parent="account.menu_finance_bank_and_cash"
- sequence="16"
- groups="group_account_user,group_account_manager"
- />
</data>
</openerp>
=== modified file 'account/wizard/account_use_model_view.xml'
--- account/wizard/account_use_model_view.xml 2012-08-08 10:59:07 +0000
+++ account/wizard/account_use_model_view.xml 2012-11-07 10:35:24 +0000
@@ -19,18 +19,6 @@
</field>
</record>
- <record id="action_view_account_use_model" model="ir.actions.act_window">
- <field name="name">Manual Recurring</field>
- <field name="res_model">account.use.model</field>
- <field name="view_type">form</field>
- <field name="view_mode">tree,form</field>
- <field name="view_id" ref="view_account_use_model"/>
- <field name="target">new</field>
- <field name="context">{'model_line':'model_line'}</field>
- </record>
-
- <menuitem name="Manual Recurring" action="action_view_account_use_model" id="menu_action_manual_recurring" sequence="10" parent="account.menu_finance_recurrent_entries"/>
-
<record id="view_account_use_model_create_entry" model="ir.ui.view">
<field name="name">account.use.model.create.entry.form</field>
<field name="model">account.use.model</field>
=== modified file 'hr_timesheet_invoice/hr_timesheet_invoice_view.xml'
--- hr_timesheet_invoice/hr_timesheet_invoice_view.xml 2012-11-02 08:36:12 +0000
+++ hr_timesheet_invoice/hr_timesheet_invoice_view.xml 2012-11-07 10:35:24 +0000
@@ -127,31 +127,6 @@
</field>
</record>
- <!-- Menus -->
- <record id="action_hr_analytic_timesheet_open_tree" model="ir.actions.act_window">
- <field name="name">Invoice Tasks Work</field>
- <field name="res_model">account.analytic.line</field>
- <field name="view_type">form</field>
- <field name="view_mode">tree,form</field>
- <field name="domain">[]</field>
- <field name="context">{'search_default_to_invoice': 1}</field>
- <field name="search_view_id" ref="account.view_account_analytic_line_filter"/>
- <field name="help" type="html">
- <p class="oe_view_nocontent_create">
- Click to add some tasks work to be invoiced.
- </p><p>
- This list shows every task you can invoice to the customer.
- Select the lines and invoice from the '<i>more...</i>' contextual
- menu to generate invoices automatically.
- </p>
- </field>
- </record>
- <menuitem
- action="action_hr_analytic_timesheet_open_tree"
- id="menu_hr_analytic_timesheet_tree"
- parent="account.menu_finance_periodical_processing_billing"
- sequence="1"/>
-
<record id="view_hr_timesheet_invoice_factor_search" model="ir.ui.view">
<field name="name">hr_timesheet_invoice.factor.search</field>
<field name="model">hr_timesheet_invoice.factor</field>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
