Commit Graph
34754 Commits
Author SHA1 Message Date
ksa (Open ERP) 32ce4e3fae [MERGE]:Merge with trunk-configuration-rework
bzr revid: ksa@tinyerp.co.in-20110411131208-q930q31zpxg9y7fn
2011-04-11 18:42:08 +05:30
mtr 5f8574d16f [MERGE] branch merged with trunk-payroll
bzr revid: mtr@mtr-20110411131049-yu4ipa9cij4yywip
2011-04-11 18:40:49 +05:30
mtr 3c3d8349c9 [IMP] hr_payroll: improved demo data i.e. sequence on salary rules
bzr revid: mtr@mtr-20110411130803-fp5gfz4plxap6h59
2011-04-11 18:38:03 +05:30
Xavier Morel 5fc7311f1a [ADD] row-wise colors
bzr revid: xmo@openerp.com-20110411125450-3h0ay8fskd1s6nz5
2011-04-11 14:54:50 +02:00
Quentin (OpenERP) 88828dd3b2 [dummy commit
bzr revid: qdp-launchpad@openerp.com-20110411124459-dd3blau4cs379eh3
2011-04-11 14:44:59 +02:00
Osenda 7b22b1c452 [IMP] name change hr_payroll_rule to hr_payroll_l10n_be & on data
bzr revid: osenda-20110411123438-xyv7cz1r5znwgun2
2011-04-11 14:34:38 +02:00
Fabien Meghazi b6ff5848b0 [FIX] Use parent element id for form header
bzr revid: fme@openerp.com-20110411123207-q3ka2w9qg7z7n4jp
2011-04-11 14:32:07 +02:00
Mustufa Rangwala 3f69757064 [MERGE] merge from trunk payroll
bzr revid: mra@mra-laptop-20110411122559-8s7vnahm7jguta5d
2011-04-11 17:55:59 +05:30
Rucha (Open ERP) 712f70c41c [MERGE]: Merge work of aag for new proposed changes for field restart (WORK IN PROGRESS)
bzr revid: rpa@tinyerp.com-20110411122509-wxuavchvlcm73fsu
2011-04-11 17:55:09 +05:30
Rucha (Open ERP) a899e684ae [MERGE]: Merge work of aag for new proposed changes for field restart (WORK IN PROGRESS)
bzr revid: rpa@tinyerp.com-20110411122500-1vzefrgg6x561uk7
2011-04-11 17:55:00 +05:30
Osenda 7db7286b71 [IMP] name change hr_payroll_rule to hr_payroll_l10n_be
bzr revid: osenda-20110411122335-nqixyoipevd5ljgh
2011-04-11 14:23:35 +02:00
Mustufa Rangwala c4a1c85e41 [REM] payroll: remove the if condition from payslip lines appears
bzr revid: mra@mra-laptop-20110411121241-eh69dw6hq2bu8smb
2011-04-11 17:42:41 +05:30
Quentin (OpenERP) 7080f2b5f3 [IMP] hr_payroll: refund payslip feature improved
bzr revid: qdp-launchpad@openerp.com-20110411121046-7r0dzzqiw6hv6hkl
2011-04-11 14:10:46 +02:00
Rifakat Haradwala (Open ERP) fbad6f6767 [IMP] email.compose.message: mass mailing
* created a method do_mass_mail() for mass maining
* improvements for mass mailing in case of template, took the value from wizard and evaluated using mako template

bzr revid: rha@tinyerp.com-20110411121032-j4u2ao710vc1dt8k
2011-04-11 17:40:32 +05:30
Olivier Dony cf1a395cbf [FIX] base: corrected symbol for CFA currency added in previous revision
bzr revid: odo@openerp.com-20110411120908-4my154j6429jjjaq
2011-04-11 14:09:08 +02:00
niv-openerp 5c774c82fb [IMP] Implemented working saved actions.
bzr revid: nicolas.vanhoren@openerp.com-20110411115933-xjmrhnsgrbhqlzfa
2011-04-11 13:59:33 +02:00
mtr d433642232 [IMP] hr_payroll: added access rules
bzr revid: mtr@mtr-20110411115823-kp0oarpmo8vz9rtr
2011-04-11 17:28:23 +05:30
Fabien Meghazi b1f219c502 [IMP] Update dataset and pager in case of new record
bzr revid: fme@openerp.com-20110411115507-p8x1jb11iok2xusr
2011-04-11 13:55:07 +02:00
Olivier Dony 3c6a1956d6 [MERGE] merged addition of CFA currency, courtesy of Tidiane Sy (BAAMTU)
bzr revid: odo@openerp.com-20110411114816-mz4t0h2rch1qjd72
2011-04-11 13:48:16 +02:00
Antony Lesuisse 31ff2c1772 add doctype to disable quirks mode
bzr revid: al@openerp.com-20110411114810-6vvo1jmu7rg5bo8z
2011-04-11 13:48:10 +02:00
Thibault Francois 99fb6b258b [MERGE] trunk
bzr revid: tfr@openerp.com-20110411114653-b6w336jsx0u4hne4
2011-04-11 13:46:53 +02:00
niv-openerp bd0d7f1fbb [MERGE]
bzr revid: nicolas.vanhoren@openerp.com-20110411114649-gdu6t0cjvikxm1jf
2011-04-11 13:46:49 +02:00
niv-openerp bfacf53e04 [IMP] Open new window.
bzr revid: nicolas.vanhoren@openerp.com-20110411114529-332vb6wtrocrwjm0
2011-04-11 13:45:29 +02:00
Mustufa Rangwala 8994649cf3 [MERGE] merge from trunk payroll
bzr revid: mra@mra-laptop-20110411114415-bp4bchwp51i0932i
2011-04-11 17:14:15 +05:30
Mustufa Rangwala 81a66b9d39 [FIX] payroll: grouping of details by salayr head AND domain is not applied on first tab of payslip, we should see there only the payslip lines with appears_on_payslip = True
bzr revid: mra@mra-laptop-20110411113637-qfnxuylu1icn6889
2011-04-11 17:06:37 +05:30
Fabien Meghazi 86c1b252e6 [ADD] Added record creation. Refactored form view.
bzr revid: fme@openerp.com-20110411113516-s8ydhmknehgbwp2n
2011-04-11 13:35:16 +02:00
Quentin (OpenERP) 3e1f543b78 [FIX] hr_payroll: refund button
bzr revid: qdp-launchpad@openerp.com-20110411111923-18x2v4weqm71hms4
2011-04-11 13:19:23 +02:00
noz (OpenERP) 8ca75e0b11 [FIX] Sent first chat message to self.
bzr revid: noz@tinyerp.com-20110411111538-yxvexkoyldb5xrid
2011-04-11 16:45:38 +05:30
Xavier Morel 911369822a [ADD] processing of context['set_editable'] on list view
bzr revid: xmo@openerp.com-20110411111451-5j6ve9f1wjiuzjfx
2011-04-11 13:14:51 +02:00
mtr d996fc00ae [MERGE] branch merged with trunk-payroll
bzr revid: mtr@mtr-20110411110135-38vwvlqttj8ou9gc
2011-04-11 16:31:35 +05:30
mtr a325842fc3 [IMP] hr_payroll: improved demo data
bzr revid: mtr@mtr-20110411105747-w76xe1ylr9e14r42
2011-04-11 16:27:47 +05:30
Mustufa Rangwala 295f699558 [REM] unused code
bzr revid: mra@mra-laptop-20110411104437-08y014kaeelpw150
2011-04-11 16:14:37 +05:30
Kunal Chavda (OpenERP) 57ea8384a7 [IMP]Initially show stackedbar chart with static data.
bzr revid: kch@tinyerp.com-20110411103925-6o0bgwp71njh33bs
2011-04-11 16:09:25 +05:30
Mustufa Rangwala dd68253b95 [IMP] payroll: new structure should get as default for parent_id: ref(structure_base)
bzr revid: mra@mra-laptop-20110411103527-7zza1n093a27ohhu
2011-04-11 16:05:27 +05:30
Xavier Morel 3412b89d95 [IMP] add a bunch of tests for transformation of invisible fields, make View.fields_view_get take a request so it can use the request context for its evaluations
bzr revid: xmo@openerp.com-20110411103118-msx5plh2lnz5obps
2011-04-11 12:31:18 +02:00
Jay Vora (OpenERP) 2fe8efd428 [FIX] Stock : System should not create duplicate moves while processing with chained locations
lp bug: https://launchpad.net/bugs/722538 fixed

bzr revid: jvo@tinyerp.com-20110411102952-9lhk38kshrp8ha2p
2011-04-11 15:59:52 +05:30
Rucha (Open ERP) b306d963ea [MERGE]: Merge work of aag for new wizards to be appeared in config panel (Work in progress)
bzr revid: rpa@tinyerp.com-20110411102108-d6pqgxcqsef0bdxl
2011-04-11 15:51:08 +05:30
Rucha (Open ERP) 6e8ea475f5 [MERGE]: Merge work of aag for new wizards to be appeared in config panel (Work in progress)
bzr revid: rpa@tinyerp.com-20110411102051-eqb1t4j3bdbs7njx
2011-04-11 15:50:51 +05:30
Olivier Dony f59ac0d6b1 [MERGE] merged latest fixes from 6.0 - up to rev 3399
bzr revid: odo@openerp.com-20110411101327-dxkwvwstjf9xc58s
2011-04-11 12:13:27 +02:00
Olivier Dony c8e48449b3 [FIX] orm.read_group: fix group_by for date[time]s, currently showing duplicate groups
bzr revid: odo@openerp.com-20110411100847-va4ok35jx3tohor6
2011-04-11 12:08:47 +02:00
Quentin (OpenERP) a1fec3b62f [MERGE] merged mra's dev branch containing stuff with refund
bzr revid: qdp-launchpad@openerp.com-20110411100846-4vwlngl6iqb2juvv
2011-04-11 12:08:46 +02:00
Antony Lesuisse c2865075b1 web_chat im.js eol 0x0d to 0x0a
bzr revid: al@openerp.com-20110411092646-dykbpwndmn5gawf1
2011-04-11 11:26:46 +02:00
noz (OpenERP) 3b7d2dd1c3 [FIX] Fixed dynamic return for poll method.
bzr revid: noz@tinyerp.com-20110411090802-zzrsexmojj6w9zan
2011-04-11 14:38:02 +05:30
Olivier Dony 7373327366 [IMP] portal: missing access rights
bzr revid: odo@openerp.com-20110411090222-i8heuh5lgp2e3eju
2011-04-11 11:02:22 +02:00
Thibault Francois 047b10f0ff [FIX] mass convert oldest lead
bzr revid: tfr@openerp.com-20110411085120-xdjn8z046ak9enen
2011-04-11 10:51:20 +02:00
niv-openerp 3cebc66f52 [MERGE]
bzr revid: nicolas.vanhoren@openerp.com-20110411084323-j4jd728cxcwpx5gy
bzr revid: nicolas.vanhoren@openerp.com-20110411084544-30y055us60o2uksz
2011-04-11 10:45:44 +02:00
Xavier Morel d99bacbd60 [TEST] add test for normalize_attrs of states
bzr revid: xmo@openerp.com-20110411084259-gpkw2nzpw8ctuhy5
2011-04-11 10:42:59 +02:00
Mustufa Rangwala 07cfef6b51 [MERGE] merge from trunk-payroll main branch
bzr revid: mra@mra-laptop-20110411084222-ztm9ackwbvq7v021
2011-04-11 14:12:22 +05:30
Mustufa Rangwala d4950bdbd8 [IMP] Payroll: put back the tab with rules grouped by head
bzr revid: mra@mra-laptop-20110411084007-g5p3gvdcl7z9uh2m
2011-04-11 14:10:07 +05:30
Olivier Dony c262393950 [IMP] tools.convert,rng: fixed support for <url> tag
bzr revid: odo@openerp.com-20110411083201-2ir0ed4o3xdal6tk
2011-04-11 10:32:01 +02:00