Rajesh Prajapati (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-addons_issue17_accounting-rpr into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons_issue17_accounting-rpr/+merge/129882
Hello
Improved the field string to Start Date, Menu string to Invoicing until
account_accountant installed, removed the graph view
Thanks,
Rajesh
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons_issue17_accounting-rpr/+merge/129882
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-addons_issue17_accounting-rpr.
=== modified file 'account/res_config_view.xml'
--- account/res_config_view.xml 2012-10-15 13:50:27 +0000
+++ account/res_config_view.xml 2012-10-16 13:13:28 +0000
@@ -264,7 +264,7 @@
<field name="target">inline</field>
</record>
- <menuitem id="menu_account_config" name="Accounting" parent="base.menu_config"
+ <menuitem id="menu_account_config" name="Invoicing" parent="base.menu_config"
sequence="14" action="action_account_config"/>
</data>
=== modified file 'account_accountant/account_accountant_data.xml'
--- account_accountant/account_accountant_data.xml 2012-09-24 08:39:22 +0000
+++ account_accountant/account_accountant_data.xml 2012-10-16 13:13:28 +0000
@@ -5,6 +5,7 @@
<!-- Top menu item -->
<menuitem name="Accounting"
id="account.menu_finance"/>
+ <menuitem id="account.menu_account_config" name="Accounting" parent="base.menu_config"/>
</data>
=== modified file 'account_budget/account_budget_view.xml'
--- account_budget/account_budget_view.xml 2012-10-08 06:59:09 +0000
+++ account_budget/account_budget_view.xml 2012-10-16 13:13:28 +0000
@@ -290,7 +290,7 @@
<field name="arch" type="xml">
<notebook position="inside">
<page string="Budget Lines" groups="account.group_account_user">
- <field name="crossovered_budget_line" widget="one2many_list" colspan="4" nolabel="1" mode="tree,graph">
+ <field name="crossovered_budget_line" widget="one2many_list" colspan="4" nolabel="1" mode="tree">
<tree string="Budget Lines" editable="top">
<field name="crossovered_budget_id"/>
<field name="general_budget_id"/>
@@ -310,11 +310,6 @@
<field name="paid_date"/>
<field name="planned_amount"/>
</form>
- <graph type="bar" string="Lines">
- <field name="general_budget_id" />
- <field name="planned_amount" operator="+"/>
- <field group="True" name="analytic_account_id"/>
- </graph>
</field>
</page>
</notebook>
=== modified file 'analytic/analytic.py'
--- analytic/analytic.py 2012-10-05 14:36:06 +0000
+++ analytic/analytic.py 2012-10-16 13:13:28 +0000
@@ -160,7 +160,7 @@
'partner_id': fields.many2one('res.partner', 'Customer'),
'user_id': fields.many2one('res.users', 'Project Manager'),
'manager_id': fields.many2one('res.users', 'Account Manager'),
- 'date_start': fields.date('Date Start'),
+ 'date_start': fields.date('Start Date'),
'date': fields.date('Date End', select=True),
'company_id': fields.many2one('res.company', 'Company', required=False), #not required because we want to allow different companies to use the same chart of account, except for leaf accounts.
'state': fields.selection([('template', 'Template'),('draft','New'),('open','In Progress'), ('cancelled', 'Cancelled'),('pending','To Renew'),('close','Closed')], 'Status', required=True,),
_______________________________________________
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
