Commit Graph
37875 Commits
Author SHA1 Message Date
Rucha (Open ERP) 8caa6c7dab [IMP, REM]: Fixed view of company after changes in server, Removed unwanted view
bzr revid: rpa@tinyerp.com-20110513070627-funzvol19b85ahwi
2011-05-13 12:36:27 +05:30
Rucha (Open ERP) 2b32f8af67 [IMP]: base: Improvement in function field, and fixed adding new fields in country view
bzr revid: rpa@tinyerp.com-20110513070521-qdwxasydlioc2qiu
2011-05-13 12:35:21 +05:30
pso (OpenERP) 036adb6552 [IMP] account_asset: Improved asset category view
bzr revid: pso@tinyerp.com-20110513070347-nmkyesgqryzoaddd
2011-05-13 12:33:47 +05:30
Mustufa Rangwala f46219d266 [REF] Payroll: remove unused import
bzr revid: mra@mra-laptop-20110513063931-g83470vtp5z9o5lv
2011-05-13 12:09:31 +05:30
Mustufa Rangwala 83345d5af5 [IMP] Payroll: clean codee
bzr revid: mra@mra-laptop-20110513063639-kx4lbs2gq3bef6py
2011-05-13 12:06:39 +05:30
Mustufa Rangwala 62c0ddad78 [IMP] Payroll: demo and default string improvements
bzr revid: mra@mra-laptop-20110513062405-pf57a2ntrsze36mp
2011-05-13 11:54:05 +05:30
Mustufa Rangwala 340a1a11d6 [IMP] Payroll: remove unused mehtod def sum from payslip now...it will work now with payslips class ..
bzr revid: mra@mra-laptop-20110513060327-viq49sr0cx0nj1zp
2011-05-13 11:33:27 +05:30
Mustufa Rangwala e85341722f [IMP] Payroll: remove print
bzr revid: mra@mra-laptop-20110513060206-59oo6dc2arw8bps0
2011-05-13 11:32:06 +05:30
Mustufa Rangwala 5439b7eb58 [IMP] Payroll: Payslips with python code
bzr revid: mra@mra-laptop-20110513060012-q0qcwg6wbe9vk613
2011-05-13 11:30:12 +05:30
Mustufa Rangwala efdacca163 [MERGE] Payroll: merge from main trunk-payroll branch
bzr revid: mra@mra-laptop-20110513050945-zj8tudmzqdkqayli
2011-05-13 10:39:45 +05:30
Rucha (Open ERP) a153a6dff4 [MERGE]: Merge with main project branch
bzr revid: rpa@tinyerp.com-20110513050925-m9mkqhneycebgvsg
2011-05-13 10:39:25 +05:30
Launchpad Translations on behalf of openerp 892034c97c Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110513043534-1q8fovektkzgm1zw
2011-05-13 04:35:34 +00:00
Quentin (OpenERP) b21655ea29 [MERGE] merged dev branch
bzr revid: qdp-launchpad@openerp.com-20110512193633-j1jfda3x9uwcxq2b
2011-05-12 21:36:33 +02:00
Quentin (OpenERP) 3703b2ed58 [MERGE] merged rpa's branch for res.company redirection
bzr revid: qdp-launchpad@openerp.com-20110512175250-pgvjwzvct5y222i0
2011-05-12 19:52:50 +02:00
Quentin (OpenERP) a050672ca1 [MERGE] merged aag branch with main wizard rework
bzr revid: qdp-launchpad@openerp.com-20110512174203-h674yve5zf3xwvkv
2011-05-12 19:42:03 +02:00
Quentin (OpenERP) 1073a9314c [IMP] account_asset: improved views
bzr revid: qdp-launchpad@openerp.com-20110512172431-6eeily31wm4r1h33
2011-05-12 19:24:31 +02:00
Quentin (OpenERP) 018dd8122b [MERGE] merged the feature branch with boolean on depreciaiton line to depicts if the line is already in the accounting
bzr revid: qdp-launchpad@openerp.com-20110512171005-yxs93csnzgrez0i0
2011-05-12 19:10:05 +02:00
Quentin (OpenERP) 158936f7aa [FIX] account_asset: create_move function
bzr revid: qdp-launchpad@openerp.com-20110512170529-e32zm40dspbie2em
2011-05-12 19:05:29 +02:00
Quentin (OpenERP) 48fc094fce [MERGE] merged the pso branch with button on depreciation line (+improved asset.category form view)
bzr revid: qdp-launchpad@openerp.com-20110512165442-s1c6426afv5nqz7z
2011-05-12 18:54:42 +02:00
Fabien Meghazi 4508febaea [ADD] Added widget field type "email"
bzr revid: fme@openerp.com-20110512162550-ksv72qrac2l9ttvi
2011-05-12 18:25:50 +02:00
Quentin (OpenERP) f595581803 [IMP] hr_payroll: implemented the feature worked_days.WORK100.number_of_hours + improved worked_days.sum() method
bzr revid: qdp-launchpad@openerp.com-20110512161628-wc8zvq62nqldc5jt
2011-05-12 18:16:28 +02:00
Fabien Meghazi d9fa808fcf [ADD] Added non editable image field widget
bzr revid: fme@openerp.com-20110512152248-53z3r716040mvb9t
2011-05-12 17:22:48 +02:00
Fabien Meghazi 55e1c6e7f4 [FIX] Fixed some litteral arguments in on_changes
bzr revid: fme@openerp.com-20110512144835-ygbu7nfxjz7hp160
2011-05-12 16:48:35 +02:00
Fabien Meghazi 270566ad53 [FIX] Fixed form dates parsing & formatting
bzr revid: fme@openerp.com-20110512144355-1ollzrcf722lwwh7
2011-05-12 16:43:55 +02:00
Fabien Meghazi 6b09377f4f [FIX] fixed dates.js
bzr revid: fme@openerp.com-20110512143835-16l5c3ajj36l4nrn
2011-05-12 16:38:35 +02:00
Fabien Meghazi 50194d321e [ADD] Added float_time form widget
bzr revid: fme@openerp.com-20110512143222-2gc42sludahd7c6i
2011-05-12 16:32:22 +02:00
mtr 8ff806bea3 [IMP] hr_payroll: improved sum method of worked days
bzr revid: mtr@mtr-20110512135825-r6ighyds5xusu4cd
2011-05-12 19:28:25 +05:30
Quentin (OpenERP) 7499c98d42 [MERGE] merged psi's branch with payslip report
bzr revid: qdp-launchpad@openerp.com-20110512135749-jaipercgs20ae539
2011-05-12 15:57:49 +02:00
sma (Tiny) d352848b48 [IMP] Add combo image.
bzr revid: sma@tinyerp.com-20110512134705-aldge5yx7bi9i8vz
2011-05-12 19:17:05 +05:30
sma (Tiny) 14eaf4afb9 [IMP] Remove static image.
bzr revid: sma@tinyerp.com-20110512134626-bb3t3c1rhz020xno
2011-05-12 19:16:26 +05:30
Vo Minh Thu 4a6155d80c [MERGE] --i18n-overwrite can be used with --update.
bzr revid: vmt@openerp.com-20110512134553-7iomtd21nqsxs63q
2011-05-12 15:45:53 +02:00
sma (Tiny) 1e4bbe7bd6 [IMP] Improve button click.
bzr revid: sma@tinyerp.com-20110512134524-d9wkls6cv6iqykzs
2011-05-12 19:15:24 +05:30
pso (OpenERP) 9c2ab087ca [IMP] account_asset: Improved create_move method
bzr revid: pso@tinyerp.com-20110512134420-joc4keo8jtjbklqp
2011-05-12 19:14:20 +05:30
Rucha (Open ERP) eb11bcb933 [IMP]: base: Improvement in company view, Added function fields for address information
bzr revid: rpa@tinyerp.com-20110512134015-8naikq64nabar4vy
2011-05-12 19:10:15 +05:30
psi (Open ERP) 211844634f [IMP] pass details_by_salary_rule_category instead of line_ids so the report will show payslip_lines with rule as Appear on payslip checked
bzr revid: psi@tinyerp.co.in-20110512133940-cwmcdbtl3rz8giru
2011-05-12 19:09:40 +05:30
Rucha (Open ERP) 66d7ca89b7 [IMP]: base: Improvement in company config wizard
bzr revid: rpa@tinyerp.com-20110512133928-c6u5675fiurn7cf3
2011-05-12 19:09:28 +05:30
aag (OpenERP) 4199b38fe7 [REM]base_setup:Remove new company config wiz
bzr revid: aag@tinyerp.co.in-20110512133736-sdfg0no4k10iccaw
2011-05-12 19:07:36 +05:30
Rifakat Haradwala (Open ERP) b3f5910c7f [IMP] delivery: created configuratin wizard and improvements in delivery module
bzr revid: rha@tinyerp.com-20110512132534-moj5yapjvjergwpq
2011-05-12 18:55:34 +05:30
psi (Open ERP) 80f2474862 [MERGE, IMP] merge with main payroll branch, Add payslip lines by contribution register on Employee payslip report
bzr revid: psi@tinyerp.co.in-20110512083943-5e5eys6j7ae0af8e
bzr revid: psi@tinyerp.co.in-20110512130543-ld0w9si6oypo298u
2011-05-12 18:35:43 +05:30
Mustufa Rangwala 8dea4d2698 [MERGE] merge from trunk-payroll main branch
bzr revid: mra@mra-laptop-20110512130410-5ybp0b0drz6iqg7f
2011-05-12 18:34:10 +05:30
Vo Minh Thu 6a3342acfb [MERGE] orm: pass the context around.
lp bug: https://launchpad.net/bugs/704696 fixed

bzr revid: vmt@openerp.com-20110512125239-b2s0etg1yrjoa970
2011-05-12 14:52:39 +02:00
pso (OpenERP) 5d071e9ed3 [IMP] account_asset: Put multicompany group on company field
bzr revid: pso@tinyerp.com-20110512124814-g6aw3stg5kzyh6wn
2011-05-12 18:18:14 +05:30
pso (OpenERP) 8fe08e9eb3 [IMP] account_asset: Added company by default
bzr revid: pso@tinyerp.com-20110512124038-nptmrgoyrq76aqoy
2011-05-12 18:10:38 +05:30
Rucha (Open ERP) 33d9a30005 [IMP, REF]: base_setup, hr_holidays: Code improvement and refactoring in assign legal leave wizard
bzr revid: rpa@tinyerp.com-20110512123920-m82iqsnw0c2v6gqj
2011-05-12 18:09:20 +05:30
Vo Minh Thu c666a297cf [REF] ir_ui_menu: _get_image_icon simplified, more general.
- code actually from chs a.k.a. Christophe (OpenERP) a.k.a. kangol.

bzr revid: vmt@openerp.com-20110512123752-l1gpv6qr193wt4yf
2011-05-12 14:37:52 +02:00
mtr 54586b7d55 [IMP] hr_payroll: updated localdict to copmute payslip on payslip
bzr revid: mtr@mtr-20110512123619-bss3lcy1dlrbi9r7
2011-05-12 18:06:19 +05:30
Anup (OpenERP) e28a2d7ec9 [FIX] account : Move lines take the Journal and Period from the Move itself(Maintenance Case 5598)
bzr revid: ach@tinyerp.com-20110512122212-hzr9u49p4w4b2133
2011-05-12 17:52:12 +05:30
mtr 30dee04d10 [IMP] hr_payroll: improved method of hr.payslip,to call it without passing(cr,uid)
bzr revid: mtr@mtr-20110512120752-sdqi99qim652kwk0
2011-05-12 17:37:52 +05:30
Quentin (OpenERP) 631d8a9e53 [MERGE] merged the branch containing the modifications on hr_payroll_account (author mtr and qpd)
bzr revid: qdp-launchpad@openerp.com-20110512115719-m5ppmv0sk02wutgr
2011-05-12 13:57:19 +02:00
Quentin (OpenERP) 4418c83a5f [REF] hr_payroll: added TODO comment
bzr revid: qdp-launchpad@openerp.com-20110512115458-kg1s089del0032lx
2011-05-12 13:54:58 +02:00