← Back to branch summary

~inddiana/sisb/yenni_filtro_tipo_proceso

~inddiana/sisb/yenni_filtro_tipo_proceso

Viewing all changes in revision 586.

Committer: ysantiago at gob
Date: 2013-10-30 14:52:58 UTC
mfrom: (584.2.12 sisb)
Revision ID: ysantiago@industriasdiana.gob.ve-20131030145258-etqczp7i9ker97d6

[MERGE] Merge con sisb 596

files added:
sisb_nomina/report/hr_paroll_report.xml

sisb_nomina/report/report_employees_detail.py

sisb_nomina/report/report_employees_detail.rml

sisb_nomina/report/report_year_report.rml

sisb_nomina/report/report_year_salary.py

sisb_nomina/wizard/hr_payroll_employees_detail.py

sisb_nomina/wizard/hr_payroll_employees_detail.xml

sisb_nomina/wizard/hr_payroll_year_salary.py

sisb_nomina/wizard/hr_payroll_year_salary.xml

files modified:
sisb_nomina/__openerp__.py

sisb_nomina/hr_payroll.py

sisb_nomina/report/__init__.py

sisb_nomina/report/txt_variacion_salario_sso.py

sisb_nomina/sisb_liquidaciones.py

sisb_nomina/sisb_nomina.py

sisb_nomina/view/sisb_nomina_view.xml

sisb_nomina/wizard/__init__.py

sisb_nomina/wizard/hr_salary_increase.py

sisb_nomina/wizard/hr_salary_increase_history.py

sisb_nomina/wizard/prestaciones_employee.py

sisb_nomina/wizard/wizard_generador_variacion_salario_sso.py

sisb_ventas/model/sisb_ventas.py

Show diffs side-by-side

added added

removed removed

sisb_nomina/__openerp__.py

sisb_nomina/hr_payroll.py

sisb_nomina/report/__init__.py

sisb_nomina/report/hr_paroll_report.xml

sisb_nomina/report/report_employees_detail.py

sisb_nomina/report/report_employees_detail.rml

sisb_nomina/report/report_year_report.rml

sisb_nomina/report/report_year_salary.py

sisb_nomina/report/txt_variacion_salario_sso.py

sisb_nomina/sisb_liquidaciones.py

sisb_nomina/sisb_nomina.py

sisb_nomina/view/sisb_nomina_view.xml

sisb_nomina/wizard/__init__.py

sisb_nomina/wizard/hr_payroll_employees_detail.py

sisb_nomina/wizard/hr_payroll_employees_detail.xml

sisb_nomina/wizard/hr_payroll_year_salary.py

sisb_nomina/wizard/hr_payroll_year_salary.xml

sisb_nomina/wizard/hr_salary_increase.py

sisb_nomina/wizard/hr_salary_increase_history.py

sisb_nomina/wizard/prestaciones_employee.py

sisb_nomina/wizard/wizard_generador_variacion_salario_sso.py

sisb_ventas/model/sisb_ventas.py

Older »