Commit Graph
34754 Commits
Author SHA1 Message Date
Fabien Meghazi 345496d9a3 [ADD] Added do_show and do_hide in views
bzr revid: fme@openerp.com-20110404153426-2vlz4n0s4v69b5o5
2011-04-04 17:34:26 +02:00
niv-openerp 661972d764 [IMP] Removed useless event propagation stoping;
bzr revid: nicolas.vanhoren@openerp.com-20110404151557-8obnz8yyv6ftfod5
2011-04-04 17:15:57 +02:00
niv-openerp 5d4dca9495 [IMP] Removed stoping event propagation on buttons.
bzr revid: nicolas.vanhoren@openerp.com-20110404151215-9put77ezsiiy6mwg
2011-04-04 17:12:15 +02:00
Fabien Meghazi 6dd76ea8f6 [FIX] Simplified dataset. Plugged form view.
bzr revid: fme@openerp.com-20110404150619-z8tc382ujdfw89ji
2011-04-04 17:06:19 +02:00
Vo Minh Thu d4dabd707c [MERGE] backport of trunk at revision 4336.1.1
- original commit message: [FIX] bug 704870 webkit_locals
- original revision-id: nicolas.bessi@camptocamp.com-20110119145032-61kf5gqi281x0br7

bzr revid: vmt@openerp.com-20110404145135-cfd48dsz5401kjo4
2011-04-04 16:51:35 +02:00
niv-openerp 00188c2980 [MERGE]
bzr revid: nicolas.vanhoren@openerp.com-20110404142640-bgdhe7jcwdug4qq2
2011-04-04 16:26:40 +02:00
niv-openerp 19a8432167 [IMP] Added populate sidebar.
bzr revid: nicolas.vanhoren@openerp.com-20110404134705-rmzbxlobntfoblub
2011-04-04 15:47:05 +02:00
aag (OpenERP) 8ba3b54047 [IMP]Base:ADD Give access to others users confg wiz
bzr revid: aag@tinyerp.co.in-20110404133812-4c2l8uu54wo3dkix
2011-04-04 19:08:12 +05:30
aag (OpenERP) eec8920438 [IMP]product:Create some products confg wiz -modify
bzr revid: aag@tinyerp.co.in-20110404133300-gf3ge382gpg1iwpf
2011-04-04 19:03:00 +05:30
Mustufa Rangwala 9843f42b1f [FIX] payroll
bzr revid: mra@mra-laptop-20110404130033-rxhyg3jpwga7xaof
2011-04-04 18:30:33 +05:30
Raphael Collet 0be36d2a4d [MERGE] trunk changes
bzr revid: rco@openerp.com-20110404125418-z77911bfushx5h72
2011-04-04 14:54:18 +02:00
Rucha (Open ERP) ce83a79d21 [FIX]: product, procurement: Removed inconsistency in security rules
lp bug: https://launchpad.net/bugs/748927 fixed

bzr revid: rpa@tinyerp.com-20110404124601-3arpj6rlnxrt00i4
2011-04-04 18:16:01 +05:30
Antony Lesuisse 1865a1dae0 typo
bzr revid: al@openerp.com-20110404113803-hme1ls2rxahxa64w
2011-04-04 13:38:03 +02:00
Quentin (OpenERP) 9202d61260 [IMP] hr_payroll: several major improvements among
* removed hr.payroll.register object
   * removed hr.salary.head.type object, now replaced by a m2o(hr.salary.head) named parent_id on the salary head
   * removed unused fields state and user_id on hr.salary.head
   * defined new object hr.salary.input (and commented the references to hr.holidays)
   * added condition 'Always True' on the hr.salary.rule
   * improved view of hr.salary.rule

bzr revid: qdp-launchpad@openerp.com-20110404113219-nc949ndu1hvtiobl
2011-04-04 13:32:19 +02:00
Raphael Collet b1dfe50e3f remove portal name, and use the group name instead
bzr revid: rco@openerp.com-20110404113036-rqa2bv4c1pz2rt6r
2011-04-04 13:30:36 +02:00
Antony Lesuisse 9ad770a2da [MERGE] xmo viewmanager
bzr revid: al@openerp.com-20110404112535-pa3ss7ymj6mr97r1
2011-04-04 13:25:35 +02:00
Jay Vora (OpenERP) f0148c5ee3 [FIX] Backported the fix from trunk for the bug lp:740047
lp bug: https://launchpad.net/bugs/740047 fixed

bzr revid: jvo@tinyerp.com-20110404112526-0vrj706n3rb5dmi4
2011-04-04 16:55:26 +05:30
Harry (OpenERP) 1cf2e0e884 [MERGE] rename module: email with mail due to conflicts python packages
bzr revid: hmo@tinyerp.com-20110404105639-147c1wj9c17lp4sk
2011-04-04 16:26:39 +05:30
Harry (OpenERP) 6f3e5d049b [IMP] mail_server: In pack_message method, remove argument of debug=False. it is a useless in this method
bzr revid: hmo@tinyerp.com-20110404105347-op0urcs5h1ndmjie
2011-04-04 16:23:47 +05:30
aag (OpenERP) 0e8b7de8a9 [IMP]product:ADD Create some products confg wiz
bzr revid: aag@tinyerp.co.in-20110404105250-bn3mw3w7hivp6v2x
2011-04-04 16:22:50 +05:30
mtr 19dd109f75 [IMP] hr_payroll:improved code to display salary rules as per the sequence of salary head
bzr revid: mtr@mtr-20110404104831-zb30sau1ikzuufjl
2011-04-04 16:18:31 +05:30
Rifakat Haradwala (Open ERP) 4d3b805cf9 [IMP] mail: improvements in email message form view and removed msg.get_unixfrom() causing errors and corrected it in email_thread.py
bzr revid: rha@tinyerp.com-20110404104203-g6ksbb0q6zz5y9sp
2011-04-04 16:12:03 +05:30
Jay Vora (OpenERP) 16a91fe13d [MERGE] Merged Dhruti's branch for the bugfix of lp:739172
bzr revid: jvo@tinyerp.com-20110404103003-p9b0uz7pvwte8al3
2011-04-04 16:00:03 +05:30
psi (Open ERP) c369b99712 [FIX] hr_payroll
bzr revid: psi@tinyerp.co.in-20110404100637-ljba7flsrrawhxdp
2011-04-04 15:36:37 +05:30
Jay Vora (OpenERP) 11466383f0 [FIX] Stock : Removed the buttons which could confuse the users (Ref : Case 4970)
lp bug: https://launchpad.net/bugs/737258 fixed

bzr revid: jvo@tinyerp.com-20110404100521-jxa4a4n7thxy19jn
2011-04-04 15:35:21 +05:30
DHS (OpenERP) 9c03ea93f1 [FIX] Stock : Method do_partial updated with prodlot_id
lp bug: https://launchpad.net/bugs/739172 fixed

bzr revid: dhs@tinyerp.com-20110404100208-jkdb0s1rk97u12vd
2011-04-04 15:32:08 +05:30
ron@tinyerp.com 4bc1c69250 [REF]sale:refectoring code wrong price calculation when changing UoM and pricelist based on other pricelist
bzr revid: ron@tinyerp.com-20110404100141-2i3og2pxcxf3n1sg
2011-04-04 15:31:41 +05:30
Mustufa Rangwala 3bb9bf2065 [FIX] payrol;
bzr revid: mra@mra-laptop-20110404100136-usw6fe76l64bph8u
2011-04-04 15:31:36 +05:30
Rifakat Haradwala (Open ERP) 47a85e9f8f [IMP] mail: rename module email to mail because of parsing error
bzr revid: rha@tinyerp.com-20110404094552-j2rdq2sbeqrbffgn
2011-04-04 15:15:52 +05:30
psi (Open ERP) 9c796d9768 [IMP] Improve verify_sheet method of hr.payslip object so it will consider the child rules and holidays
bzr revid: psi@tinyerp.co.in-20110404090656-mq92felignt05nq5
2011-04-04 14:36:56 +05:30
Raphael Collet cb2137c5da add group to created menuitem, and bug fix in call to write()
bzr revid: rco@openerp.com-20110404090535-o0gzcakbo7f7z4t7
2011-04-04 11:05:35 +02:00
Raphael Collet 3a65fdf1f1 rename and improve create_parent_menu()
bzr revid: rco@openerp.com-20110404084550-s3cb11pged5hk3x8
2011-04-04 10:45:50 +02:00
Raphael Collet 59c12749e0 user interface cleanup
bzr revid: rco@openerp.com-20110404081403-puhk9066y2qdvlxb
2011-04-04 10:14:03 +02:00
psi (Open ERP) cf2ed5f5aa [IMP] onchange will clear the field details_by_salary_head
bzr revid: psi@tinyerp.co.in-20110404065026-6klls1fkg3mt8j41
2011-04-04 12:20:26 +05:30
mtr d2ca30caf9 [IMP] hr_payroll:improved code to calculate total_payment for multiple contract
bzr revid: mtr@mtr-20110404064453-sd7a9pecamnt80fn
2011-04-04 12:14:53 +05:30
ARA (OpenERP) 08695d5433 [FIX] account: Cancel of invoice throws error, validate of move_id is invalid
bzr revid: ara@tinyerp.com-20110404063917-kunaq8rj59pvvjsf
2011-04-04 12:09:17 +05:30
psi (Open ERP) 0c0ea31d9c [IMP] add help on state field of hr.payslip and view improvement
bzr revid: psi@tinyerp.co.in-20110404062930-bf2onlnsmjb5mm43
2011-04-04 11:59:30 +05:30
Harry (OpenERP) 894b4cbb6a [REVIEW+MERGE] merged rha work
bzr revid: hmo@tinyerp.com-20110404060333-06w4xpwnrod1d3ni
2011-04-04 11:33:33 +05:30
Harry (OpenERP) a65b3dc875 [REVIEW+MERGE] merged work
bzr revid: hmo@tinyerp.com-20110404060015-pku4bh49l0g5eamf
2011-04-04 11:30:15 +05:30
Launchpad Translations on behalf of openerp c8aae82bd6 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110402064702-qfsq93p1j55l6182
bzr revid: launchpad_translations_on_behalf_of_openerp-20110403060546-ns1a2n9c6rvzvnzf
bzr revid: launchpad_translations_on_behalf_of_openerp-20110404055359-kfbp4cffom7qa0tm
2011-04-04 05:53:59 +00:00
Harry (OpenERP) 93ecd00c9a [REVIEW]
bzr revid: hmo@tinyerp.com-20110404050444-xnpa5pi0uj71a5gc
2011-04-04 10:34:44 +05:30
Harry (OpenERP) 68ece3098f [REVIEW]
bzr revid: hmo@tinyerp.com-20110404050432-e3y3oc9zjbd7nszl
2011-04-04 10:34:32 +05:30
Mustufa Rangwala 6c5051fa38 [MERGE] merge from trunk-payroll branch
bzr revid: mra@mra-laptop-20110404044953-hi0lrxppki4nekr2
2011-04-04 10:19:53 +05:30
Mustufa Rangwala 57da5007e5 [MERGE] merge from trunk addons
bzr revid: mra@mra-laptop-20110317044632-q2idnbo10137sp20
bzr revid: mra@mra-laptop-20110318090655-j34s9q5qu3iika49
bzr revid: mra@mra-laptop-20110321091456-nn8ydasget5h400r
bzr revid: mra@mra-laptop-20110322130110-e4q5os11b2aphfk6
bzr revid: mra@mra-laptop-20110323043940-490q3q9lnwwvduy0
bzr revid: mra@mra-laptop-20110328045527-rih3g38wcgonx05m
bzr revid: mra@mra-laptop-20110329045144-vclevl8cvq05ga8c
bzr revid: mra@mra-laptop-20110330044007-iiokjyv6ap6k94ak
bzr revid: mra@mra-laptop-20110401043719-mtgl4wwz90mi5rac
bzr revid: mra@mra-laptop-20110404044827-rqbqf6jdaf9o5unc
2011-04-04 10:18:27 +05:30
Stephane Wirtel 4ea4f3a917 [RELEASE] OpenERP 6.0.2
bzr revid: stephane@openerp.com-20110401142528-pwf4wbs9l58ika4z
2011-04-01 16:25:28 +02:00
Raphael Collet 509044d5bd fix __openerp__.py, 'web':True is wrong because there is no web stuff
bzr revid: rco@openerp.com-20110401134003-cb3s1zfl0c8a02q0
2011-04-01 15:40:03 +02:00
mtr c472eaafbc [IMP] hr_payroll:improved code to calculate total_payment using 'NET' rule
bzr revid: mtr@mtr-20110401133226-pbhv7xbr5n7bwwji
2011-04-01 19:02:26 +05:30
Rifakat Haradwala (Open ERP) faa13b7332 [IMP] email.message: fix context problem for attachment in schedule_with_attach()
bzr revid: rha@tinyerp.com-20110401132159-h4mdo4k8zxrgagkz
2011-04-01 18:51:59 +05:30
psi (Open ERP) a5cacc1ff7 [IMP] clean the code
bzr revid: psi@tinyerp.co.in-20110401131735-pwddzzgf21ie4hcj
2011-04-01 18:47:35 +05:30
Mustufa Rangwala f380549275 [IMP] payroll: code clean, add date argument on onchnage-employee from holidays to get it latest contract
bzr revid: mra@mra-laptop-20110401125959-hsuwv6ms31v4it75
2011-04-01 18:29:59 +05:30