lp:~openerp-dev/openobject-addons/6.1-opw-576855-nep

Branch merges

Propose for merging

No branches dependent on this one.

Approved for merging into lp:openobject-addons/6.1

Naresh(OpenERP) (community): Approve on 2012-11-19

Diff: 21 lines (+2/-2)

1 file modified

hr_payroll/hr_payroll_demo.xml (+2/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

6897. By Nehal Panchal (OpenERP) on 2012-07-19

[FIX] hr_payroll : Fixed Salary Rule's Python Code and Quantity for payslip computation

6896. By nel on 2012-07-19

[FIX] duplication of MO

6895. By Launchpad Translations on behalf of openerp on 2012-07-19

Launchpad automatic translations update.

6894. By Launchpad Translations on behalf of openerp on 2012-07-18

Launchpad automatic translations update.

6893. By Quentin (OpenERP) <email address hidden> on 2012-07-17

[FIX] l10n_lu: removed xml view referencing unexisting fields (removed in a previous commit)

6892. By nel on 2012-07-17

[FIX] mrp: compare quantities in production using float_compare

6891. By Launchpad Translations on behalf of openerp on 2012-07-17

Launchpad automatic translations update.

6890. By Xavier ALT on 2012-07-16

[MERGE] OPW 574806: process: process node active state should be evaluated on related related model_id, if defined (v6.0 forward-port)

6889. By Xavier ALT on 2012-07-16

[MERGE] OPW 575178: process: node conditions have priority over model states (v6.0 forward-port)

  - process node conditions defined which nodes can be reached in the current
    context, so nodes which doesn't fullfill the conditions should stay gray
    even if ``model_states`` eval to True.

6888. By Launchpad Translations on behalf of openerp on 2012-07-16

Launchpad automatic translations update.