Commit Graph
34754 Commits
Author SHA1 Message Date
ARA (OpenERP) 1f294ed284 [MERGE] merge from dev3
bzr revid: ara@tinyerp.com-20110208090123-rrfju8hwzkhl6bag
2011-02-08 14:31:23 +05:30
mtr 9e95ff425c [IMP] account_payment: reverted the changes in the Table3 of <pto_header> of payment order report
bzr revid: mtr@mtr-20110208085350-720dooos21203isd
2011-02-08 14:23:50 +05:30
ARA (OpenERP) 070af54018 [FIX] analytic account - Wrong demo data and account type must be come in tree view
lp bug: https://launchpad.net/bugs/714860 fixed

bzr revid: ara@tinyerp.com-20110208085339-lmn3perl9h040j16
2011-02-08 14:23:39 +05:30
Yogesh (OpenERP) 26447d3f50 [MOV] change module name email to emails
bzr revid: ysa@tinyerp.com-20110208085311-yepv15l0pskvrmc2
2011-02-08 14:23:11 +05:30
mtr cbd2264610 [MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3
bzr revid: mtr@mtr-20110208083535-mqmo1yv6krv3wtft
2011-02-08 14:05:35 +05:30
mtr f979cdb477 [FIX] account_payment: increased size of col.date in payment order report
lp bug: https://launchpad.net/bugs/712960 fixed

bzr revid: mtr@mtr-20110208073212-51a487pz5rrijrsw
2011-02-08 13:02:12 +05:30
Yogesh (OpenERP) 0e7d9e8492 [IMP] test outgoing connection method keep in email.smtp.server object.
bzr revid: ysa@tinyerp.com-20110208072620-5v1wabokqjs9ask4
2011-02-08 12:56:20 +05:30
Mustufa Rangwala c162de5ab1 [REF] Account: typo
bzr revid: mra@mra-laptop-20110208072557-uzi20kapg0c6w4nf
2011-02-08 12:55:57 +05:30
Mustufa Rangwala ff225574c7 [REF] Account: typo
bzr revid: mra@mra-laptop-20110208071702-1a2e37v6bsmwgiya
2011-02-08 12:47:02 +05:30
Mustufa Rangwala 2762d10d8e [REF] account_anglo_saxon/stock.py => remove unused import of fields
bzr revid: mra@mra-laptop-20110208065824-6vl7noekz1grku36
2011-02-08 12:28:24 +05:30
aag (OpenERP) a37471db15 [IMP] Survey,Board: use isinstance in osv wiz
bzr revid: aag@tinyerp.co.in-20110208065426-75gwcq141k2ds9qk
2011-02-08 12:24:26 +05:30
Launchpad Translations on behalf of openerp 7980675a67 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110204141027-7fjkptadcn3xocbk
bzr revid: launchpad_translations_on_behalf_of_openerp-20110206061518-2d22gwew0c23msm1
bzr revid: launchpad_translations_on_behalf_of_openerp-20110207062348-rcrsq83p1141xqat
bzr revid: launchpad_translations_on_behalf_of_openerp-20110208055858-29gz4zyz9o39uv73
bzr revid: launchpad_translations_on_behalf_of_openerp-20110208055933-yutvcfmjc2d00l37
2011-02-08 05:59:33 +00:00
Yogesh (OpenERP) f290a538e1 [IMP] Improve view in email_gateway.
bzr revid: ysa@tinyerp.com-20110208055209-xvu39slrje8gandn
2011-02-08 11:22:09 +05:30
Yogesh (OpenERP) defc1aaf96 [IMP] Improve view in email_template and email module.
bzr revid: ysa@tinyerp.com-20110208054339-7os49d348uerib9q
2011-02-08 11:13:39 +05:30
mtr 06ecfdd71c [MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3
bzr revid: mtr@mtr-20110208053643-dkulp2fbo9d7cj72
2011-02-08 11:06:43 +05:30
Mustufa Rangwala b18aa2ecef [FIX] hr: try to create an employee as employee -> bug
lp bug: https://launchpad.net/bugs/713177 fixed

bzr revid: mra@mra-laptop-20110208051951-usjzx6dih5ap9o45
2011-02-08 10:49:51 +05:30
Yogesh (OpenERP) ab3aeb31a8 [IMP] Improve view in email_template.
bzr revid: ysa@tinyerp.com-20110208051334-bc6k96r4cyc7hx1k
2011-02-08 10:43:34 +05:30
Yogesh (OpenERP) 3cf67ee9de [IMP] improve code in email_template.
bzr revid: ysa@tinyerp.com-20110208050535-4s0rbpd3zzs4g70a
2011-02-08 10:35:35 +05:30
Mustufa Rangwala 4db0767016 [FIX] HR : Correction on List view definition for model hr.employee (Ref : SaaS Maintenance Case 3990)
bzr revid: mra@mra-laptop-20110208045750-9okcwgulbh1ijaw3
2011-02-08 10:27:50 +05:30
ARA (OpenERP) 90dca9891b [MERGE] merge from dev3
bzr revid: ara@tinyerp.com-20110208045730-3722inos43xptghr
2011-02-08 10:27:30 +05:30
Mustufa Rangwala 674bb7ae96 [MERGE] merge from trunk addons
bzr revid: mra@mra-laptop-20110207133209-rwzls8wd06s135pf
bzr revid: mra@mra-laptop-20110208044240-x01j1otdydwly0u3
2011-02-08 10:12:40 +05:30
Launchpad Translations on behalf of openerp 67ecda4ebe Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110208043554-9906z613ss1lyfct
2011-02-08 04:35:54 +00:00
ron@tinyerp.com 783d6d8807 [MERGE]Merged with trunk-dev-addons2
bzr revid: ron@tinyerp.com-20110204082442-5ah3mvlhbjoe83zq
bzr revid: ron@tinyerp.com-20110207043944-4k09do4yh4apuphi
bzr revid: ron@tinyerp.com-20110208043409-i8ffui3iwpzbr0dp
2011-02-08 10:04:09 +05:30
Olivier Dony 0b42c20ad1 [REL] release: bumped up trunk release to 6.1-dev
bzr revid: odo@openerp.com-20110207180114-y8gw071d6ajf5e30
2011-02-07 19:01:14 +01:00
Olivier Dony 17b7ab4ea2 [IMP] tools.config: reorganize some config options in groups
bzr revid: odo@openerp.com-20110207170317-utx2hejesnr0iwr1
2011-02-07 18:03:17 +01:00
Olivier Dony 59f64f3b9c [FIX] orm.write: parent_store updates must be processed in correct order to avoid edge cases
bzr revid: odo@openerp.com-20110207152747-0qyu9aq55vb9ujj6
2011-02-07 16:27:47 +01:00
Mustufa Rangwala 2f1f712fc5 [MERGE] account - demo data - all periods have special = true
bzr revid: mra@mra-laptop-20110207132408-rxlsuxaxrt9apv6s
2011-02-07 18:54:08 +05:30
ARA (OpenERP) 20de3c399f [FIX] account - demo data - all periods have special = true
bzr revid: ara@tinyerp.com-20110207131534-nn1mwnan81mldur3
2011-02-07 18:45:34 +05:30
Vo Minh Thu f8572e5c60 [IMP] openerp python module.
- Some logging code moved from netsvc.py to loglevels.py
- Changed imports to use the new openerp module
- config and netsvc initialization calls move to openerp-server.py
- Moved openerp-server.py outside the old bin directory
- Some imports in tools moved inside the methods to break mutual-dependencies

bzr revid: vmt@openerp.com-20110207125723-ooee7d7ng5elmkso
2011-02-07 13:57:23 +01:00
Jay Vora (OpenERP) 3f63d065da [FIX] HR : Correction on List view definition for model hr.employee (Ref : SaaS Maintenance Case 3990)
bzr revid: jvo@tinyerp.com-20110207124724-dgq10cawnyjidobz
2011-02-07 18:17:24 +05:30
jam 1253310f8f [FIX] outlook use ssl
bzr revid: tfr@openerp.com-20110207123946-ig5gyrky0cz3bqn8
2011-02-07 13:39:46 +01:00
jam d6247fed5d [FIX] Backport bug solve in trunk + ssl implementation
bzr revid: tfr@openerp.com-20110207123644-5315u97ogvcflbr3
2011-02-07 13:36:44 +01:00
ARA (OpenERP) f8886f2e1e [MERGE] merge from dev3
bzr revid: ara@tinyerp.com-20110207123619-v59qtpz6l5z7vjsa
2011-02-07 18:06:19 +05:30
ARA (OpenERP) 5008f8c2d9 [FIX] account - demo data - all periods have special = true
lp bug: https://launchpad.net/bugs/713562 fixed

bzr revid: ara@tinyerp.com-20110207123432-6d83n6agja02v4zu
2011-02-07 18:04:32 +05:30
Thibault Francois adff989502 [FIX] avoid to have lead emails in cc when forward to partner with geo assign
bzr revid: tfr@openerp.com-20110207123153-qig4thicpe3y855a
2011-02-07 13:31:53 +01:00
Mustufa Rangwala f9bce10639 [MERGE] account : period selection not working for BS and PL legal reports
bzr revid: mra@mra-laptop-20110207121649-i13tyevadr8qg3mz
2011-02-07 17:46:49 +05:30
Thibault Francois a84b0ae4e7 [IMP] thunderbird SSL
bzr revid: tfr@openerp.com-20110207120426-a0cm8uxkcdb8gt4t
2011-02-07 13:04:26 +01:00
ARA (OpenERP) 7a8ae0498e [MERGE] merge from dev3
bzr revid: ara@tinyerp.com-20110207115502-vex3vd7pzk7lkjv9
2011-02-07 17:25:02 +05:30
ARA (OpenERP) 0016233f63 [FIX] account : period selection not working for BS and PL legal reports
lp bug: https://launchpad.net/bugs/711886 fixed

bzr revid: ara@tinyerp.com-20110207114854-b7hi16pe98i3w2kh
2011-02-07 17:18:54 +05:30
Jay Vora (OpenERP) 591782def9 [FIX] Hr_Timesheet : Timesheet report should be available for those employees who have user associated with them.
bzr revid: jvo@tinyerp.com-20110207113837-ajxt2kis1xpa6rk8
2011-02-07 17:08:37 +05:30
Jay Vora (OpenERP) c57658c9b1 [FIX] Email_template : Corrected context of action
lp bug: https://launchpad.net/bugs/688069 fixed

bzr revid: jvo@tinyerp.com-20110207113252-o1n57152p85lqj0v
2011-02-07 17:02:52 +05:30
nicolas.bessi@camptocamp.com 0c4b55be88 [FIX] BVR import bug 714221
bzr revid: nicolas.bessi@camptocamp.com-20110207110405-5wenize88n2krhp6
2011-02-07 12:04:05 +01:00
Mustufa Rangwala 40cd5c09fc [MERGE] hr_attendance: v6 hr_attendance - time is rounded to hour
bzr revid: mra@mra-laptop-20110207105145-pbtu64jtnwdhl69h
2011-02-07 16:21:45 +05:30
nicolas.bessi@camptocamp.com 3e24d11177 [MRG] from trunk
bzr revid: nicolas.bessi@camptocamp.com-20110207073724-jz1r6874z7tail4o
bzr revid: nicolas.bessi@camptocamp.com-20110207104146-q84y434e40v0vxmr
2011-02-07 11:41:46 +01:00
Olivier Dony 4a6159b376 [FIX] account.move.line: write() should support ids=int, to be consistent with super.
This shortcoming was made obvious by a recent server change: 3343
revision-id: odo@openerp.com-20110205004316-zaw9qqfke1bcw0s7

bzr revid: odo@openerp.com-20110207103645-nra55tbsakl4xrd7
2011-02-07 11:36:45 +01:00
Olivier Dony 9c287abc14 [FIX] fields.o2m.set(): typo in previous commit, should pass IDs as list to write()
bzr revid: odo@openerp.com-20110207102652-gkgyp5uqo0nk454a
2011-02-07 11:26:52 +01:00
aag (OpenERP) e1f5c71713 [IMP] stock: Add context and check for osv memory wiz for Read method
bzr revid: aag@tinyerp.co.in-20110207095240-i04x6f4cvbjzeqmy
2011-02-07 15:22:40 +05:30
mtr cef6582763 [MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3
bzr revid: mtr@mtr-20110207094608-xuq6l0mtuoksi6o0
2011-02-07 15:16:08 +05:30
mtr e0e8422db1 [IMP] hr_attendance:removed unused variable from 'Weekly Attendance' report
bzr revid: mtr@mtr-20110207094322-im3nesr9lxx080vy
2011-02-07 15:13:22 +05:30
mtr bcc2d840b2 [FIX] hr_attendance:improved 'Attendance by month' and 'Weekly Attendance' report by changing the code into float
lp bug: https://launchpad.net/bugs/711533 fixed

bzr revid: mtr@mtr-20110207093621-6r52uwthtmc08wk7
2011-02-07 15:06:21 +05:30