 psi (Open ERP)
|
db4327dd2d
|
[IMP] add company on hr.payroll.register form and tree view
bzr revid: psi@tinyerp.co.in-20110318131313-gd7o475deqaooyo3
|
2011-03-18 18:43:13 +05:30 |
|
|
psi (Open ERP)
|
a3d4555688
|
[IMP] payslip line created by holidays will also consider the amount_type=code
bzr revid: psi@tinyerp.co.in-20110317125547-lj532yj9wy79uz2a
|
2011-03-17 18:25:47 +05:30 |
|
|
psi (Open ERP)
|
aeb88e7675
|
[IMP] change for amount_type='code' on hr.salary.rule object improve the calculation for the same
bzr revid: psi@tinyerp.co.in-20110317113535-7o5j9gz8bf3g8zmx
|
2011-03-17 17:05:35 +05:30 |
|
|
psi (Open ERP)
|
468631afd7
|
[MERGE] Merge with mtr's branch
bzr revid: psi@tinyerp.co.in-20110317085442-5lt6vjulygmqeif3
|
2011-03-17 14:24:42 +05:30 |
|
|
psi (Open ERP)
|
7ba66b09f7
|
[MERGE] merge with trunk-payroll branch
bzr revid: psi@tinyerp.co.in-20110316131539-hbaisqy414peh99s
|
2011-03-16 18:45:39 +05:30 |
|
|
psi (Open ERP)
|
3947b67231
|
[IMP] small improvment in compute_sheet method of hr.payroll.register
bzr revid: psi@tinyerp.co.in-20110316131407-ax2dysk4x6b1kjph
|
2011-03-16 18:44:07 +05:30 |
|
|
psi (Open ERP)
|
c42ce2d208
|
[IMP] imporve the compute_sheet method of hr.payroll.register
bzr revid: psi@tinyerp.co.in-20110316114302-m5vg413dk7otpzxz
|
2011-03-16 17:13:02 +05:30 |
|
|
Mustufa Rangwala
|
42aaf728a9
|
[MERGE] Merge from trunk addons
bzr revid: mra@mra-laptop-20110316043544-su18vv9wgf1px5qa
|
2011-03-16 10:05:44 +05:30 |
|
|
Quentin (OpenERP)
|
4185ba6f49
|
[FIX] survey: fixed action_next in survey (1 fix related to previous change on osv.memory read merge, another one related to wrong value passed for key sur_name_id in context (sur_id wasn't defined))
bzr revid: qdp-launchpad@openerp.com-20110315154324-70oh0npusr2v41ko
|
2011-03-15 16:43:24 +01:00 |
|
|
Quentin (OpenERP)
|
8dbefcf405
|
[FIX] project_long_term: fixed 2 errors when scheduling phases/tasks (due to previous merge on osv_memory)
bzr revid: qdp-launchpad@openerp.com-20110315150912-tofluvt1xu6wr8zt
|
2011-03-15 16:09:12 +01:00 |
|
|
Quentin (OpenERP)
|
23b1441e8a
|
[FIX] project_gtd: fixed error when assigning a timebox to a task (due to previous merge on osv_memory)
bzr revid: qdp-launchpad@openerp.com-20110315150555-lu1gp7m5q279uxd4
|
2011-03-15 16:05:55 +01:00 |
|
|
Quentin (OpenERP)
|
8891dea230
|
[FIX] mrp: fixed error in do_move_consume(due to previous merge on osv_memory)
bzr revid: qdp-launchpad@openerp.com-20110315150348-s0vkdsuc61qhdtvr
|
2011-03-15 16:03:48 +01:00 |
|
|
Quentin (OpenERP)
|
9b351c8d5d
|
[FIX] hr_timesheet_invoice: fixed error when invoicing (due to previous merge on osv_memory)
bzr revid: qdp-launchpad@openerp.com-20110315145931-zlle0u5ybzzep434
|
2011-03-15 15:59:31 +01:00 |
|
|
Quentin (OpenERP)
|
6c82be0d52
|
[FIX] account: fixed error when closing fiscalyear (due to previous merge on osv_memory)
bzr revid: qdp-launchpad@openerp.com-20110315145357-7h6ixa67ghjo33mc
|
2011-03-15 15:53:57 +01:00 |
|
|
mtr
|
97a83283c4
|
[MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-payroll
bzr revid: mtr@mtr-20110315133452-zj24rp0da2k4hrgi
|
2011-03-15 19:04:52 +05:30 |
|
|
mtr
|
ee2f49bc09
|
[IMP] hr_payroll:added code for child rules
bzr revid: mtr@mtr-20110315133322-uqg7rawcx4btm332
|
2011-03-15 19:03:22 +05:30 |
|
|
Quentin (OpenERP)
|
8482c7eeed
|
[MERGE] merged the branch of rpa containing the fix of hr_evaluation yaml test
bzr revid: qdp-launchpad@openerp.com-20110315133205-s5h66nwwiuohdn9w
|
2011-03-15 14:32:05 +01:00 |
|
|
Quentin (OpenERP)
|
559e65c84e
|
[MERGE] merged the dev branch related to the change of read() of osv_memory in order to work by batch (server side change, revno: 3369, revision-id: odo@openerp.com-20110315132628-uhhpf95b9iyin482). It will now return a tuple (id, name) for the m2o instead and thus the osv_memory objects have been changed accordingly
bzr revid: qdp-launchpad@openerp.com-20110315132726-dpwcxa08a2l12yy6
|
2011-03-15 14:27:26 +01:00 |
|
|
Olivier Dony
|
ad2967d350
|
[MERGE] merged fix for osm_memory.read() of m2o fields with name - pending addons fix
bzr revid: odo@openerp.com-20110315132628-uhhpf95b9iyin482
|
2011-03-15 14:26:28 +01:00 |
|
|
Rucha (Open ERP)
|
d083f9de47
|
[FIX]: hr_evaluation: Fixed yml warnings
bzr revid: rpa@tinyerp.com-20110315131830-z109ot0xbae82tbq
|
2011-03-15 18:48:30 +05:30 |
|
|
Quentin (OpenERP)
|
bca5ce7190
|
[MERGE] merged the dev branch: conversion of oldstyle wizard (a la partial picking), that includes the removal of 2 unused wizards (mrp/wizard/mrp_track_prod.py and stock/wizard/stock_split_move.py)
bzr revid: qdp-launchpad@openerp.com-20110315122147-0lj9n4v7cmxjrpkz
|
2011-03-15 13:21:47 +01:00 |
|
|
Quentin (OpenERP)
|
e432647951
|
[REM] stock: removed unused wizard stock_split_move.py
bzr revid: qdp-launchpad@openerp.com-20110315105452-c1yzeqta7v8vr2i5
|
2011-03-15 11:54:52 +01:00 |
|
|
Quentin (OpenERP)
|
15af8f9504
|
[REM] mrp: removed unused wizard mrp_track_prod.py
bzr revid: qdp-launchpad@openerp.com-20110315105429-gr1l180zktpncbw4
|
2011-03-15 11:54:29 +01:00 |
|
|
Quentin (OpenERP)
|
9b75f1733e
|
[MERGE] merged with main addons branch
bzr revid: qdp-launchpad@openerp.com-20110315105106-k0b1ijh28vfnla12
|
2011-03-15 11:51:06 +01:00 |
|
|
psi (Open ERP)
|
57a9c5e7f5
|
[IMP] small improvement in default of python_compute field of hr.salary.rule object
bzr revid: psi@tinyerp.co.in-20110315095722-i6kpzy3c6yt6tjw7
|
2011-03-15 15:27:22 +05:30 |
|
|
Thibault Francois
|
6e9a16b712
|
[FIX] bug lp:734720
bzr revid: tfr@openerp.com-20110315090234-6l9bv47laome6qhn
|
2011-03-15 10:02:34 +01:00 |
|
|
Thibault Francois
|
229e8e0c94
|
[FIX] bug lp:733799
bzr revid: tfr@openerp.com-20110315090145-n131k1cvioei0kix
|
2011-03-15 10:01:45 +01:00 |
|
|
Launchpad Translations on behalf of openerp
|
68cea1f17c
|
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110315045524-g1gk5txaht0rafmz
|
2011-03-15 04:55:24 +00:00 |
|
|
Mustufa Rangwala
|
00ef0b0c2e
|
[MERGE] merge from trunk addons
bzr revid: mra@mra-laptop-20110302052932-1tt9xs62v39htl32
bzr revid: mra@mra-laptop-20110303061405-azv302dg6qkr94le
bzr revid: mra@mra-laptop-20110304045245-kd3ycla3c2a851ur
bzr revid: mra@mra-laptop-20110307050004-xceuvt5r7qsiyd6e
bzr revid: mra@mra-laptop-20110308053154-x0wtawpjq6jrqxv6
bzr revid: mra@mra-laptop-20110310051004-vo6ktz5cb0l6y9ao
bzr revid: mra@mra-laptop-20110314062835-a2kggd1e7vce3i0l
bzr revid: mra@mra-laptop-20110315043807-etzoyb4d2e0v5mn0
|
2011-03-15 10:08:07 +05:30 |
|
|
psi (Open ERP)
|
fd1bf58bfb
|
[IMP] improve code so it will calculate lines for type=code
bzr revid: psi@tinyerp.co.in-20110314133428-cey6umex57d62po8
|
2011-03-14 19:04:28 +05:30 |
|
|
Tristan Hill (credativ)
|
e301abeba2
|
[FIX] report_webkit : non-admin user not having rights of report write
lp bug: https://launchpad.net/bugs/733799 fixed
bzr revid: rme@tinyerp.com-20110314131835-hawz2pycjz4xcmvg
|
2011-03-14 18:48:35 +05:30 |
|
|
psi (Open ERP)
|
748259854c
|
[MERGE] merge with mtr's branch
bzr revid: psi@tinyerp.co.in-20110314122749-6b4i14zwcs5zudyr
|
2011-03-14 17:57:49 +05:30 |
|
|
Thibault Francois
|
5db90156e9
|
[MERGE] fix lp:731294
bzr revid: tfr@openerp.com-20110314122547-c5x3llhblzbdpusl
|
2011-03-14 13:25:47 +01:00 |
|
|
psi (Open ERP)
|
8092a079d2
|
[IMP] remove unused code
bzr revid: psi@tinyerp.co.in-20110314120359-clwrb39i70lkfxsf
|
2011-03-14 17:33:59 +05:30 |
|
|
Mustufa Rangwala
|
5d5392dff5
|
[FIX] small fix
bzr revid: mra@mra-laptop-20110314114708-uff1npg60l21q488
|
2011-03-14 17:17:08 +05:30 |
|
|
Mustufa Rangwala
|
9672c7c83f
|
[FIX] small fix
bzr revid: mra@mra-laptop-20110314114447-h1zwjsaedpmlnmdl
|
2011-03-14 17:14:47 +05:30 |
|
|
RME (OpenERP)
|
fa03c816ec
|
[FIX] crm : CRM dashboard having confusing name
lp bug: https://launchpad.net/bugs/734720 fixed
bzr revid: rme@tinyerp.com-20110314113604-k3xn8yxhhnub3yu3
|
2011-03-14 17:06:04 +05:30 |
|
|
Mustufa Rangwala
|
bfdec77ead
|
[IMP] payroll cleaning
bzr revid: mra@mra-laptop-20110314112227-6rzbc31dpg0tvop1
|
2011-03-14 16:52:27 +05:30 |
|
|
Thibault Francois
|
0c307168c6
|
[MERGE] fix lp:730651
bzr revid: tfr@openerp.com-20110314110208-qkkw3j227aalda4g
|
2011-03-14 12:02:08 +01:00 |
|
|
Antony Lesuisse
|
099cbcb416
|
merge xmo testsuite and improvement for qweb
bzr revid: al@openerp.com-20110314104422-53gcaty2m9g2lhxu
|
2011-03-14 11:44:22 +01:00 |
|
|
Thibault Francois
|
92a2b731d0
|
[MERGE] bug lp:732518
bzr revid: tfr@openerp.com-20110314103841-8dkiw6domlyfjkqh
|
2011-03-14 11:38:41 +01:00 |
|
|
Rucha (Open ERP)
|
62b3abd6c0
|
[MERGE]: Merge with latest trunk
bzr revid: rpa@tinyerp.com-20110314102742-xsankh8h4q562lv8
|
2011-03-14 15:57:42 +05:30 |
|
|
mtr
|
007e96a197
|
[IMP] hr_payroll:improved code for min and max range condition for amount_type=percentage
bzr revid: mtr@mtr-20110314094429-zulakh5vl7cykotu
|
2011-03-14 15:14:29 +05:30 |
|
|
mtr
|
617ec80f97
|
[MERGE] branch merged with trunk-payroll-salary_rules-psi
bzr revid: mtr@mtr-20110314090928-dkkkld0rr6zkyzu1
|
2011-03-14 14:39:28 +05:30 |
|
|
psi (Open ERP)
|
d7e626ff76
|
[MERGE] merge with mtr's branch
bzr revid: psi@tinyerp.co.in-20110314090226-f9ut7cqf5l0r1xud
|
2011-03-14 14:32:26 +05:30 |
|
|
Mustufa Rangwala
|
adf35bc8e0
|
[IMP] Cleaning employee object
bzr revid: mra@mra-laptop-20110314085854-g192a5k8is984klt
|
2011-03-14 14:28:54 +05:30 |
|
|
psi (Open ERP)
|
41fd33e46e
|
[IMP] improve in workflow of hr.payslip object
bzr revid: psi@tinyerp.co.in-20110314085750-5qk7f0txo8b003d2
|
2011-03-14 14:27:50 +05:30 |
|
|
Mustufa Rangwala
|
e50705e393
|
[IMP] remove line_ids (hr.payslip lines) from employee object
bzr revid: mra@mra-laptop-20110314084555-jxm2en3l9yiy8tyb
|
2011-03-14 14:15:55 +05:30 |
|
|
Mustufa Rangwala
|
a523e73c1e
|
[IMP] hr_payroll: Code improved
bzr revid: mra@mra-laptop-20110314072317-rivtyc4yokwvsqtd
|
2011-03-14 12:53:17 +05:30 |
|
|
psi (Open ERP)
|
03514546bc
|
[MERGE] merge with mtr's payroll branch
bzr revid: psi@tinyerp.co.in-20110314063558-49f4r1uhqe8v0i3m
bzr revid: psi@tinyerp.co.in-20110314064457-z00g49gp27o1ucgs
|
2011-03-14 12:14:57 +05:30 |
|