Commit Graph

15581 Commits

Author SHA1 Message Date
Mustufa Rangwala 38738c887d [MERGE] merge with trunk adddons
bzr revid: mra@mra-laptop-20100702140217-sszuoprvonupjici
2010-07-02 19:32:17 +05:30
Mustufa Rangwala d1062142bd [IMP] Sale_* modules cleaning (under developement)
bzr revid: mra@mra-laptop-20100702140032-9cbudkl1ssbi1zb2
2010-07-02 19:30:32 +05:30
Olivier Dony 8c8a9c4b92 [IMP] mail_gateway: another round of encoding handling improvements. WARNING: this version requires to use the updated openerp_mailgate.py script to benefit from all improvements
bzr revid: odo@openerp.com-20100702134445-eoeu987j6smszk02
2010-07-02 15:44:45 +02:00
Mustufa Rangwala 5ab8017a1c [MERGE]
bzr revid: mra@mra-laptop-20100702111708-ooy6m8zcy8ztf10i
bzr revid: mra@mra-laptop-20100702123926-t6veq32zgxkw7d8y
bzr revid: mra@mra-laptop-20100702133729-8h08p75fo3ra9mcu
2010-07-02 19:07:29 +05:30
rpa (Open ERP) b8d5278f2a [IMP]: base_calendar: Improvement for trigger alarm for recurrent events + code improvement
bzr revid: rpa@tinyerp.com-20100702133013-58u9hrvfauqdlqzl
2010-07-02 19:00:13 +05:30
Christophe Simonis 23d6634faa [IMP] marketing_campaign: change the way that the differents activity types are processed.
[FIX] marketing_campaign: deactivate the subcampaign activity type because it is not implemented at all.

bzr revid: chs@openerp.com-20100702131849-961q3075l5wvrorn
2010-07-02 15:18:49 +02:00
Mustufa Rangwala 30baa38c90 [MERGE] merge with trunk addons3
bzr revid: mra@mra-laptop-20100702110349-7s5l3phokpk0djth
2010-07-02 16:33:49 +05:30
Mustufa Rangwala 83404a0425 [IMP] cleaning
bzr revid: mra@mra-laptop-20100702105558-crcx44t8os32erv9
2010-07-02 16:25:58 +05:30
Mantavya Gajjar 0e61edf922 [FIX]: reviwe payroll and recall lost changes during the merge
bzr revid: mga@tinyerp.com-20100702103715-iew7rlke3we92ipg
2010-07-02 16:07:15 +05:30
Xavier Morel 39402113ac [FIX] assert is a statement, not a function
bzr revid: xmo@openerp.com-20100702103432-fyrdgu8a7rl4uj4u
2010-07-02 12:34:32 +02:00
Mustufa Rangwala 13aa45be31 [MERGE] merge with trunk addons
bzr revid: mra@mra-laptop-20100702071324-kcjq6m9s7hl29niw
bzr revid: mra@mra-laptop-20100702083333-ftyxwj0elwmb9cb3
bzr revid: mra@mra-laptop-20100702093820-i77e8r5o9nr2dowj
bzr revid: mra@mra-laptop-20100702103322-garklatxelh1dz4a
2010-07-02 16:03:22 +05:30
Mustufa Rangwala 626738e210 [FIX] account: expense journal with invoice journal in demo
bzr revid: mra@mra-laptop-20100702102301-08ockjagwpcvfe25
2010-07-02 15:53:01 +05:30
Mustufa Rangwala 5407621251 [FIX] account: Now sale journal has invoice sequence defined on it
bzr revid: mra@mra-laptop-20100702093547-rzxphaip8dootmeh
2010-07-02 15:05:47 +05:30
Christophe Simonis ee23522ca8 [IMP] marketing_campaign: workitems of a campaign on partners are linked to this partner
bzr revid: chs@openerp.com-20100702092319-u94h7j64kdbjlwey
2010-07-02 11:23:19 +02:00
rpa (Open ERP) 410fa0575e [IMP]: base_calendar: Minor improvements
bzr revid: rpa@tinyerp.com-20100702091042-zgzsdboa1eazrn0y
2010-07-02 14:40:42 +05:30
Christophe Simonis 0f03d60fdf [FIX] marketing_campaign: auto transitions are also directly processed in manual mode
bzr revid: chs@openerp.com-20100702085719-isca5a7nmwa0j31i
2010-07-02 10:57:19 +02:00
rch(OpenERP) 0042fdf5c6 [IMP]:purchase:improved purchase dashboard.
bzr revid: apa@apa-20100702122630-vh0jz3sugn396fe8
2010-07-02 17:56:30 +05:30
Mustufa Rangwala 786543f93b [MERGE] merge Team3 branch changes => hr_payroll, account
bzr revid: mra@mra-laptop-20100702110752-n013ou3w433igqac
2010-07-02 16:37:52 +05:30
Vir (Open ERP) a1aa3651eb [IMP] event, subscription : Usability improvements
bzr revid: vir@tinyerp.com-20100702083250-k0x6clkog8iqjo6f
2010-07-02 14:02:50 +05:30
Mustufa Rangwala 5498b06e6f [FIX] scrum: button on scrum meeting form with bad messages fixed
bzr revid: mra@mra-laptop-20100702082148-hmu11ex4a1el6x8l
2010-07-02 13:51:48 +05:30
rpa (Open ERP) 2b21569972 [IMP]: base_calendar: Improved module description,
* Added state in event
* Code improvement

bzr revid: rpa@tinyerp.com-20100702073406-p2516r7p6reior5t
2010-07-02 13:04:06 +05:30
Harry (OpenERP) 6d025f60c6 [FIX] remove print statement
bzr revid: hmo@tinyerp.com-20100702070753-0wx80gcmms9acom1
2010-07-02 12:37:53 +05:30
Mustufa Rangwala e4a6411665 [MERGE] Merge Team3 Branch for the changes:
[FIX] Account: creating invoice with invoice sequence fieled on journal fix the error on action number, Add the warning if user try to create invoice without defining invoice sequence field on jounrnal, valdating moves did not create analytic entries and small change in view
[IMP] hr_payroll: view improved

bzr revid: mra@mra-laptop-20100702070702-a4dggmabe59lys7c
2010-07-02 12:37:02 +05:30
Mustufa Rangwala ed39697ac8 [MERGE] merge with trunk addons
bzr revid: mra@mra-laptop-20100702065516-2iighmxuun79f3sc
2010-07-02 12:25:16 +05:30
Mustufa Rangwala 0b385ca309 [IMP] account: Add the warning if user try to create invoice without defining invoice sequence field on jounrnal
bzr revid: mra@mra-laptop-20100702065352-9w7x2x6p7p2ea3vj
2010-07-02 12:23:52 +05:30
Mustufa Rangwala 047be68674 [FIX] account: valdating moves did not create analytic entries and small change in view
bzr revid: mra@mra-laptop-20100702055501-evpi2n97wnio5t19
2010-07-02 11:25:01 +05:30
apa a1b689ec85 [IMP]:auction,event,document:changed dashboard menu
bzr revid: apa@apa-20100702055227-m09wye2iz49y2rx0
2010-07-02 11:22:27 +05:30
Mantavya Gajjar c4aa8bc8a3 [IMP]: improvement in hr_payroll, payslip view
bzr revid: mga@tinyerp.com-20100702054229-3z91plsgvbm338wk
2010-07-02 11:12:29 +05:30
rpa (Open ERP) c463d29838 [REVERT]: crm, mail_gateway: reverted _history refactoring
bzr revid: rpa@tinyerp.com-20100702053819-q4ss32b91wffvqg3
2010-07-02 11:08:19 +05:30
apa c047a3f37a [IMP]:project:changed dashboard menu
bzr revid: apa@apa-20100702051848-ihc6acmjbaifdehz
2010-07-02 10:48:48 +05:30
Mustufa Rangwala 50960407e6 [FIX] account: action number method creating sequnce for the invoice
bzr revid: mra@mra-laptop-20100702051621-4ckg06v9vhi7vihv
2010-07-02 10:46:21 +05:30
Mustufa Rangwala 92fe56a827 [MERGE] merge with trunk addons
bzr revid: mra@mra-laptop-20100702041643-xhkyoehh1gteqtn2
2010-07-02 09:46:43 +05:30
Mustufa Rangwala 6f15b8f1d7 [MERGE] merge Team3 branch for hr_evaluation improvements
bzr revid: mra@mra-laptop-20100702041526-tfmprmwqa0bu06tp
2010-07-02 09:45:26 +05:30
Mustufa Rangwala f0fa7346ec [MERGE] merge with trunk addons
bzr revid: mra@mra-laptop-20100702040822-8ze0grzrpfzv1xoc
2010-07-02 09:38:22 +05:30
Launchpad Code Hosting 161fca6b46 Launchpad automatic translations update.
bzr revid: codehost@crowberry-20100702033302-1er9r9wh455r3j1z
2010-07-02 04:33:02 +01:00
Olivier Dony 287eb0348c [IMP] crm: some cleanup + reorganisation/deduplication of menus for leads/opportunities
bzr revid: odo@openerp.com-20100701193816-tgtugg4dfd3u740w
2010-07-01 21:38:16 +02:00
Olivier Dony 88501910d8 [IMP] crm: date filtering is now working on leads and opportunities
bzr revid: odo@openerp.com-20100701193705-6ldt2nkdv9zaeux4
2010-07-01 21:37:05 +02:00
Christophe Simonis d675dc9bd8 [FIX] marketing_campaign: correct the search of the campaign by model in signal handler
[FIX] marketing_campaign: methods musn't return None
[FIX] marketing_campaign: pass the rights arguments when processing the activities
[FIX] marketing_campaign: record the full traceback for the workitems in exception

bzr revid: chs@openerp.com-20100701163549-jy03byzl2faucxrp
2010-07-01 18:35:49 +02:00
Mustufa Rangwala 5050630130 [MERGE] merge pap branch hr changes
bzr revid: mra@mra-laptop-20100701134356-zto94bffsclikaoo
2010-07-01 19:13:56 +05:30
Christophe Simonis e452f14dac [FIX] marketing_campaign_mailchimp: correct view
bzr revid: chs@openerp.com-20100701133838-kz0e0n3sjka8697q
2010-07-01 15:38:38 +02:00
pap (openerp) e32a158b18 [FIX]:fixed the hr_evaluation bugs listed on piratepad
bzr revid: pap@tinyerp.co.in-20100701133302-jispx2m532d29dee
2010-07-01 19:03:02 +05:30
Mustufa Rangwala a54e5431f8 [MERGE] merge with trunk addons
bzr revid: mra@mra-laptop-20100701104635-w5v2kdy6wogi8izi
bzr revid: mra@mra-laptop-20100701132651-idv2cqfyh88fv1dy
2010-07-01 18:56:51 +05:30
apa 3bc5b6d6a1 [IMP]:changed dashboard menus.
bzr revid: apa@apa-20100701132221-m0gj0w0m8x1xlwdd
2010-07-01 18:52:21 +05:30
Christophe Simonis 1f90109061 [IMP] marketing_campaign: better use of default_get + rewrite some functions
bzr revid: chs@openerp.com-20100701131950-bofqs28jww2sk1e8
2010-07-01 15:19:50 +02:00
Mantavya Gajjar 36c1ba5327 [FIX]: add author and License in all files
bzr revid: mga@tinyerp.com-20100701131622-z225ov1t59c199s3
2010-07-01 18:46:22 +05:30
rpa (Open ERP) adf548ad9c [IMP]: base_calendar: * Simplified unlink and fix problem of removing recurrent events
* Improvement for rrule and alarm

bzr revid: rpa@tinyerp.com-20100701130819-1boyfzfx8hqxbcwk
2010-07-01 18:38:19 +05:30
Christophe Simonis f2bcf8d808 [ADD] marketing_campaign: 2 new transition triggers: auto and signal. auto transition mean the destination activity is immediatly executed. signal transition mean the destination activity is executed only when it receive the signal.
[IMP] marketing_campaign: better activity view

bzr revid: chs@openerp.com-20100701115355-nx7of0ju225idwej
2010-07-01 13:53:55 +02:00
rpa (Open ERP) f2132a56e9 [REF]: mail_gateway, crm: Refactoring of _history for detailed history maintenance
bzr revid: rpa@tinyerp.com-20100701104631-12v4ii33woqj50bq
2010-07-01 16:16:31 +05:30
Mustufa Rangwala da057c8c30 [MERGE] Merge Team3 work from Dev3 branch
hr_payroll: conversion wizard to osv memory, added demo data
project: project and its related modules improements
purchase: improvements
stock_planning: bug fixed for onchange of forecasting

bzr revid: mra@mra-laptop-20100701104349-s915vofq1z9s4h7n
2010-07-01 16:13:49 +05:30
Mustufa Rangwala 595e632881 [MERGE] merge with trunk addons
bzr revid: mra@mra-laptop-20100701102952-qkj555qwqs3601ot
2010-07-01 15:59:52 +05:30