lp:~openerp-dev/openobject-addons/trunk-reactivate_closed_contract-jpr

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:openobject-addons

Mustufa Rangwala (Open ERP) (community): Needs Fixing on 2014-04-25

Jitendra Prajapati(OpenERP) (community): Needs Resubmitting on 2014-04-11

Diff: 272 lines (+92/-11)

10 files modified

account/project/analytic_account_demo.xml (+1/-0)
account/project/project_view.xml (+14/-1)
account_analytic_analysis/account_analytic_analysis.py (+13/-0)
account_analytic_analysis/account_analytic_analysis_view.xml (+7/-0)
account_analytic_plans/account_analytic_plans_view.xml (+6/-6)
analytic/analytic.py (+10/-1)
hr_timesheet_invoice/hr_timesheet_invoice.py (+14/-0)
sale/sale.py (+6/-2)
sale/sale_view.xml (+1/-1)
sale_analytic_plans/sale_analytic_plans.py (+20/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

9021. By Jitendra Prajapati(OpenERP) on 2014-05-15

[IMP]improve code: change account type

9020. By Jitendra Prajapati(OpenERP) on 2014-05-15

[IMP]improve help string

9019. By Jitendra Prajapati(OpenERP) on 2014-05-13

[MERGE]sync main branch

9018. By Jitendra Prajapati(OpenERP) on 2014-05-13

[IMP]improve code: set proper table alias name

9017. By Jitendra Prajapati(OpenERP) on 2014-05-13

[MISC]remove

9016. By Jitendra Prajapati(OpenERP) on 2014-05-12

[MISC]

9015. By Jitendra Prajapati(OpenERP) on 2014-05-12

[MERGE]sync main branch

9014. By Jitendra Prajapati(OpenERP) on 2014-05-12

[MISC]

9013. By Jitendra Prajapati(OpenERP) on 2014-05-12

[IMP]add variable in account_analytic_account for selection field
get label for warning message.

9012. By Jitendra Prajapati(OpenERP) on 2014-05-12

[IMP]set state value using global variable for warning message.
if contract is in cancelled state do not allow user to create or write timesheet.