Commit Graph

6013 Commits

Author SHA1 Message Date
Christophe Matthieu 78acd983b6 [FIX] crm: missing image for description 2014-07-07 16:14:50 +02:00
Raphael Collet cbe2dbb672 [MERGE] new v8 api by rco
A squashed merge is required as the conversion of the apiculture branch from
bzr to git was not correctly done. The git history contains irrelevant blobs
and commits. This branch brings a lot of changes and fixes, too many to list
exhaustively.

- New orm api, objects are now used instead of ids
- Environements to encapsulates cr uid context while maintaining backward compatibility
- Field compute attribute is a new object oriented way to define function fields
- Shared browse record cache
- New onchange protocol
- Optional copy flag on fields
- Documentation update
- Dead code cleanup
- Lots of fixes
2014-07-06 17:05:41 +02:00
Olivier Dony 34bfa1b44f [MERGE] Forward-port saas-5 up to d9cda97 2014-07-05 01:45:45 +02:00
Thibault Delavallée 27fa618882 [REV] Partial revert of search view changes: indeed the graph view is not already capable of handling group_by on any field, declaring them is still necessary. 2014-07-04 16:44:55 +02:00
Thibault Delavallée f0ef8ac446 [FIX] web_kanban_sparkline, sales_team, stock: use char function field to transmit sparkline data; the data is now correctly dumped into json, and parsed in the widget. 2014-07-04 14:42:38 +02:00
rba-odoo c6d8eaabf5 [IMP]kanban View: harmonize kanban view by changing head as bold and centered and aliases as centered 2014-07-02 14:52:29 +02:00
Thibault Delavallée 160ddc0240 [IMP] crm (sales_team), hr_recruitment, project: fixed display of alias on kanban view. The alias is not shown when not having alias_name (left part) or alias_domain (right part) defined. Indeed only using alias_id.value is not correct, as we could have '<alias_name>' or 'Inactive Alias', depending on the missing part. 2014-07-02 11:35:39 +02:00
Thibault Delavallée 44a5268c00 [IMP] addons: search view cleaning / improvements due to the new search view display 2014-07-01 11:28:08 +02:00
Darshan Kalola 0b6404bd9d [REM] plugin/plugin_outlook/plugin_thunderbird
Unsupported modules, moved to https://github.com/odoo/odoo-extra.

Closes #804
2014-06-27 14:06:07 +02:00
Jaydeep Barot 026e38b48f [REM] Unnecessary `size` parameters on char fields 2014-06-25 17:13:43 +02:00
Thibault Delavallée 719a4f02c9 [REF] mail, crm, hr_recruitment, project, project_issue: simplified reply-to of notification emails (now displaying 'YourCompany -docname- <email>' instead of 'Followers of ...'; added same_thread directly on the mail.message model to ease the reply_to and message-id computation; factorized a bit the reply-to generation for a batch of records; udpated tests accordingly. 2014-06-23 10:47:47 +02:00
Thibault Delavallée 7fc2f8871e Merge pull request #557 from odoo-dev/master-updatevalue_issue3-rda
[IMP] crm: onchange partner on lead form view better fills partner and contact name, depending on whether the partner is a company or not
2014-06-17 09:37:16 +02:00
ged-odoo 74168c4e9d Merge pull request #272 from odoo-dev/master-inline-searchview-ged
[MERGP] Inline Searchview

This task split the searchview in two parts: SearchView and SearchViewDrawer. The drawer is displayed inside the main view and the searchview stays in place.  It also changes the scrolling behavior of the web client: the main view area can scroll without affecting the UI (so the various menus stays in place)

Because of this, other large changes have been made:

the drawer has been redesigned,
the Custom Filter widget has been split in two (Custom Report and SaveCurrentFilter),
the main view is now scrollable, so the UI stays in place and only the view can change
The text 'Group By...' has been changed into 'Group By' (most addons had to be modified)
bootstrap classes are used when it makes sense (for example, badge)
the left menu is also scrollable (separately from the main view)

It is likely that some stupid bugs have been introduced.  Please don't hurt me.
2014-06-12 16:27:11 +02:00
Fabien Meghazi 87378aac26 Convert form views @version="6.1" 2014-06-12 13:55:40 +02:00
Fabien Meghazi faa09da325 Removed version="7.0" from form views 2014-06-12 09:09:59 +02:00
Fabien Meghazi 1ac928af05 Set old form views as explicit @version="6.1" 2014-06-11 14:04:02 +02:00
Géry Debongnie af58bc5914 Merge remote-tracking branch 'odoo/master' into master-inline-searchview-ged 2014-06-11 10:10:58 +02:00
Thibault Delavallée 222e26628a [FIX] crm, crm_partner_assign, res_partner, mail, project: removed deprecated fields, deprecated methods + references to it; also removed deprecated tags on things that are not deprecated anymore. Everything is under control. 2014-06-11 08:44:40 +02:00
Géry Debongnie 8202561511 Merge remote-tracking branch 'odoo/master' into master-inline-searchview-ged 2014-06-10 11:43:17 +02:00
Thibault Delavallée 257631e331 [FIX] sales_team, crm: fixed sales_team form view: alias data was not displayed due to wrongly done inheritance + fixed a typo hidden in the view 2014-06-03 08:55:00 +02:00
Rucha Dave 93f66e98e2 [IMP] update value 2014-05-30 16:02:35 +05:30
Géry Debongnie 62900fe01b Merge remote-tracking branch 'odoo/master' into master-inline-searchview-ged
Conflicts:
	addons/crm/crm_case_section_view.xml
2014-05-26 10:06:31 +02:00
Géry Debongnie 555677f14d [IMP] replace all 'Group By...' by 'Group By'
in all searchview, the 'Group By...' looks weird, next to the Custom
Reports and Filters.  This change was requested by the upper management
2014-05-22 11:44:35 +02:00
Christophe Simonis a756b82372 [MERGE] forward port of branch saas-4 up to revid bb26dea 2014-05-20 20:19:55 +02:00
Martin Trigaux 6718e9d03a [FIX] crm: do not overwrite the value of no_force_assignation if already set in the context 2014-05-20 13:10:56 +02:00
Thibault Delavallée ae89496bbc [MERGE] Sync with trunk 2014-05-14 17:21:54 +02:00
Thibault Delavallée a5311e6900 [MOV] crm: moved css / js related to salesteam to sales_team module; sale_crm: moved data and demo data into
sale and sales_team module.
2014-05-14 14:30:26 +02:00
Martin Trigaux c50d82ddea [FIX] crm: make days to close and days to open simple calendar delta
When computing the duration to close or to open a lead, do not use some kind of complex computation with working days. It does not make sense to use the number of intervals with the number of days. The computation was incorrect and very slow.
Replaced by simple calendar delta.
2014-05-13 16:09:26 +02:00
Thibault Delavallée 2b8739cf8b [IMP] website sales salesteam: refactored implementation
- now having a website sales sales team in website_sale;
- temporarily crm accepted as a dependency of website_sale (will be improved when sales team are
taken out of crm);
- removed website_sale_crm unnecessary module + dead code
- removed shopping cart state + its management
- added acquirer and transaction fields on sale order
- azdded use_opportunities and use_quotations fields on sales team like use_leads
2014-05-12 17:52:10 +02:00
Thibault Delavallée 1101c618a5 [FIX] sales_team: fixed kanban view inheritance 2014-05-12 15:58:47 +02:00
Thibault Delavallée 3af0824fa5 [FIX] crm: typo 2014-05-12 15:58:39 +02:00
Thibault Delavallée 3406b6db39 [CLEAN] sale, sale_crm: cleaning before merging. Cleaned calculation
of default section id + removed duplicated code.
2014-05-12 14:56:01 +02:00
Thibault Delavallée 9199587ec9 [CLEAN] crm: cleaned crm module before merging :
- removed unnecessary changes
- rewrote on_change_user and get_default_sectoin_id to have a correct default section
- removed duplicated code in sales_team module due to code moving not correctly cleaned
2014-05-12 13:41:49 +02:00
Thibault Delavallée 443c830bfc [RENAME] sale_team renamed to sales_team. Update module name, file name and reference to the module. 2014-05-12 10:37:47 +02:00
Denis Ledoux e70fc38f2f [FIX] crm: The get_formview_id method does not expect a model arg anymore
bzr revid: dle@openerp.com-20140512075919-ewldirr5ejd5py13
2014-05-12 09:59:19 +02:00
Prashant Panchal (OpenERP) 138ffedbf0 [MERGE]: Merged with addons 2014-05-09 18:47:56 +05:30
Prashant Panchal (OpenERP) ca2bee0865 [IMP]add groups 'base.group_multi_salesteams' 2014-05-09 16:16:07 +05:30
Prashant Panchal (OpenERP) 6c0389279a [IMP]add groups 'base.group_multi_salesteams' on sales team dependent module 2014-05-09 13:13:13 +05:30
Mantavya Gajjar 0e08ceddb1 [FIX]: review sale_team to add groups on section_id field 2014-05-09 13:08:26 +05:30
Thibault Delavallée ea1e0e3275 [CLEAN] crm, hr_recruitmnet, project: cleaned priority / kanban state in kanban views
bzr revid: tde@openerp.com-20140508152536-s3my5onl33z3kxxx
2014-05-08 17:25:36 +02:00
Thibault Delavallée ae69285593 [CLEAN] crm: fixed opp kanban view update
bzr revid: tde@openerp.com-20140508143128-tazp6gx0ka9glio1
2014-05-08 16:31:28 +02:00
Prashant Panchal (OpenERP) b420dc37d3 [MERGE]merge with trunk 2014-05-08 19:14:33 +05:30
Thibault Delavallée 400b194d60 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20140508123529-w91cb0e6ugzutqd1
2014-05-08 14:35:29 +02:00
Christophe Simonis b8089a1521 [MERGE] forward port of branch saas-4 up to revid 9410 chs@openerp.com-20140507164207-kmme4tsrd4w1m7l1
bzr revid: chs@openerp.com-20140507170112-bjeltv2b0coy60am
2014-05-07 19:01:12 +02:00
Christophe Simonis 1091b24a0c [MERGE] forward port of branch saas-3 up to revid 9450 chs@openerp.com-20140507153348-g2qw61dkxvps13br
bzr revid: chs@openerp.com-20140507160023-8wwqlbf3bv7yqe67
2014-05-07 18:00:23 +02:00
Barad Mahendra 07ccf397a3 [Merge]with trunk
bzr revid: mba@tinyerp.com-20140507104533-jeorqz7rtx8m8i1c
2014-05-07 16:15:33 +05:30
Gery Debongnie 9f3abe3ea4 [FIX] code cleanup (addon crm)
improves the method to count opportunities/meetings/phonecalls in res_partner.py.  It was bugged in two different way: the phonecall_count field was counting the number of meetings and not of phone calls, and it was in the try statement, so it might give an incorrect value if an exception occurs in the computation of opportunity/meeting

Also, remove useless meeting_ids one2many field in crm_lead.py and improves the method meeting_count

bzr revid: ged@openerp.com-20140507100954-1aqnd93iu5wsixob
2014-05-07 12:09:54 +02:00
Gery Debongnie 88cef3a8eb [FIX] code cleanup (addon crm)
remove unused fields meeting_count and meeting_ids

bzr revid: ged@openerp.com-20140507094553-fwj05122ncr3uic1
2014-05-07 11:45:53 +02:00
Prashant Panchal (OpenERP) 3bdba0b499 [MERGE]merge with trunk 2014-05-07 15:15:07 +05:30
Launchpad Translations on behalf of openerp 93bab6ba7a Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140507062712-t81pc41duzjfrwa6
2014-05-07 06:27:12 +00:00
Ravi Gadhia a3e44373d0 Merge with trunk 2014-05-06 14:58:46 +05:30
Kersten Jeremy 868f54780e [MERGE] Merge with trunk-cal-V8-jke. - Change field datetime into date or datetime according to that event type is in all day or not...
bzr revid: jke@openerp.com-20140505162422-k332rm7j21af5ore
2014-05-05 18:24:22 +02:00
Kersten Jeremy 6d00292064 [REF] Replace temp name by real name
bzr revid: jke@openerp.com-20140505154246-8vahdzf60oiksm62
2014-05-05 17:42:46 +02:00
Denis Ledoux ce88158381 [FIX] crm: typo, interrests to interest
bzr revid: dle@openerp.com-20140502145823-vtkqkd7njqf31682
2014-05-02 16:58:23 +02:00
Gery Debongnie a8e1fbcbd3 [FIX] correct a small typo in previous merge (addon crm)
bzr revid: ged@openerp.com-20140502132258-88x9mam35o3k5ndm
2014-05-02 15:22:58 +02:00
Gery Debongnie 5aa2fa150c [MERGE] merge from trunk
bzr revid: ged@openerp.com-20140502130753-4z24z1to9pkrckvq
2014-05-02 15:07:53 +02:00
Ravi Gadhia adf1480f71 [IMP] add alias name 2014-05-02 18:18:40 +05:30
Kersten Jeremy ed6bc9f198 [MERGE] Merge with trunk
bzr revid: jke@openerp.com-20140502123149-4g7d7xh07i5z9dct
2014-05-02 14:31:49 +02:00
Denis Ledoux 03b03d0476 [FIX] crm: in order the mark as lost action to work, the dead stage has to be folded
bzr revid: dle@openerp.com-20140502101525-bzyjpz7jbr1njobl
2014-05-02 12:15:25 +02:00
Ravi Gadhia 78204703b0 [IMP] split crm_case_section + create alias from lead 2014-05-02 14:27:50 +05:30
Antony Lesuisse 7e25b9ae55 [MERGE] saas-4 report_webkit missing dependency on report
bzr revid: al@openerp.com-20140501152604-4cobh5ui47dt4pem
bzr revid: al@openerp.com-20140501155633-gefnc3zqcsr2rhaz
bzr revid: al@openerp.com-20140501161156-4wbsvhh8gz4r22h3
2014-05-01 18:11:56 +02:00
Ravi Gadhia 74f60e6212 [REM] crm.case.section.inherit use crm.case.section for get aliase_id 2014-05-01 14:15:42 +05:30
Ravi Gadhia 3bfdd859e2 Merge with trunk 2014-05-01 13:12:03 +05:30
Denis Ledoux 8da3bb66ca [FIX] crm: get_forwview_id, variable referenced before assignment
bzr revid: dle@openerp.com-20140430094601-4chke4890s55eb92
2014-04-30 11:46:01 +02:00
Kersten Jeremy d9c3c175bd [REF] Calendar refactoring - Manage allday in date field and not datetime.
bzr revid: jke@openerp.com-20140430093613-3tdn2tfiwshcahbz
2014-04-30 11:36:13 +02:00
Antony Lesuisse 0ad1789736 [FIX] crm report revert the split of opportunity and leads
Partialy revert 9007 tde@openerp.com-20131205160029-1tljp52ovcavwxel, restoring
the default_search context instead of domain, restoring the analysis
encompassing both leads and opportunities lifecycle.

bzr revid: al@openerp.com-20140429233909-fy9y85tsnjs262tl
2014-04-30 01:39:09 +02:00
Fabien Meghazi b7003a382a [MERGE] upstream
bzr revid: fme@openerp.com-20140429154104-csm3jq6uxy9tk1ea
2014-04-29 17:41:04 +02:00
Richard Mathot (OpenERP) d0e9ba289f [MERGE] from trunk
bzr revid: rim@openerp.com-20140429124452-5cvpmtpyz2daj8w2
2014-04-29 14:44:52 +02:00
Richard Mathot (OpenERP) c9e5d0e6a1 [IMP] crm: manifest layout
bzr revid: rim@openerp.com-20140429083104-i1amazz4o0cy6xkk
2014-04-29 10:31:04 +02:00
Richard Mathot (OpenERP) 65f2db5c21 [MERGE] from trunk
bzr revid: rim@openerp.com-20140429081937-hhqcg84o7iha78fq
2014-04-29 10:19:37 +02:00
Fabien Meghazi 1c4e2cfd22 [IMP] bundlify addons (except website)
bzr revid: fme@openerp.com-20140424172129-ze74eaz2eaidmxhm
2014-04-24 19:21:29 +02:00
Christophe Simonis 7a7d7febf8 [MERGE] forward port of branch saas-3 up to revid 9429 chs@openerp.com-20140424123538-rxk9got9k2on1ki1
bzr revid: chs@openerp.com-20140424131824-4ksluvhnegp7kplb
bzr revid: chs@openerp.com-20140424134533-lhhcd32n3s0m9cqk
2014-04-24 15:45:33 +02:00
Randhir Mayatra rma-openerp 5cf0648058 [IMP] improve alias_name 2014-04-23 18:21:33 +05:30
Randhir Mayatra rma-openerp 91af4e99ae [MERGE] merge with latest trunk 2014-04-23 17:56:28 +05:30
Randhir Mayatra rma-openerp a26436c57e [IMP] improve kanban view 2014-04-23 17:51:52 +05:30
Randhir Mayatra rma-openerp 2f5250edfa [IMP] improve inherited crm_case_section 2014-04-23 15:17:33 +05:30
Gery Debongnie 2558b7ec01 [IMP] removes double groupby in row dimension, in opportunities analysis
bzr revid: ged@openerp.com-20140423091726-kgnqfqtqjqxvul45
2014-04-23 11:17:26 +02:00
Denis Ledoux b6255eb55d [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 10005 revid:dle@openerp.com-20140422150710-mr9x3vyq0wcg31l5
bzr revid: dle@openerp.com-20140422162028-2icoebrb5q4tg3t3
2014-04-22 18:20:28 +02:00
Denis Ledoux b981f3f8ef [FIX] *: in search views, use operator=child_of instead of filter_domain with a child_of domain
operator child_of has the advantage to do exact ID matching for many2one, and not just matching on the name

bzr revid: dle@openerp.com-20140422150710-mr9x3vyq0wcg31l5
2014-04-22 17:07:10 +02:00
Richard Mathot (OpenERP) f917b1f998 [MERGE] from trunk
bzr revid: rim@openerp.com-20140422133650-bi5lri33o5f0g3yj
2014-04-22 15:36:50 +02:00
Randhir Mayatra rma-openerp 579d261468 [IMP] solve yml issues 2014-04-22 17:20:49 +05:30
Randhir Mayatra rma-openerp 62cd1a6487 [MERGE] merge with latest trunk 2014-04-22 14:21:34 +05:30
Launchpad Translations on behalf of openerp fa60b90c1f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140422075247-nxfftok20ltlnea6
2014-04-22 07:52:47 +00:00
Randhir Mayatra rma-openerp 27ee024847 [IMP] optimize code 2014-04-22 12:53:03 +05:30
Randhir Mayatra rma-openerp d0df0175ec [IMP] improve order of kanban items 2014-04-22 11:55:58 +05:30
Randhir Mayatra rma-openerp 1338f91535 [IMP] improve kanban view 2014-04-22 11:04:24 +05:30
Randhir Mayatra rma-openerp 2d4ebc9edc [IMP] improve kanban view and dependent demo data record 2014-04-21 17:54:27 +05:30
Randhir Mayatra rma-openerp 3bc6bf2d99 [IMP] add demo data files 2014-04-21 16:40:57 +05:30
Randhir Mayatra rma-openerp 9bb0e6f30e [IMP] improve demo data and menu items 2014-04-21 15:32:12 +05:30
Amit Vora 04c809e9f6 [MERGE] [IMP] crm: improved call / meeting buttons and behavior on lead and partner form view.
- improved behavior of schedule a meeting, for both opportunities and partner, with correct
attendees and options;
- removed wizard to schedule a cal, jumping to the list view with correct default values
is sufficient;
- scheduled calls is now accessible using a group, accessible through sales configuration;

bzr revid: tde@openerp.com-20140417145645-cpohfrfpqnskpok6
2014-04-17 16:56:45 +02:00
Darshan Kalola (OpenERP) cccc7a3d0c [MERGE]sync with trunk.
bzr revid: dka@tinyerp.com-20140417132329-sd2skyprb3nt88uw
2014-04-17 18:53:29 +05:30
Cedric Snauwaert 19fac75f42 [FIX]bootstrap tooltip cleaned from trunk-tipsy-to-bootstrap
bzr revid: csn@openerp.com-20140417090515-l1ku2kdc0lzadjxg
2014-04-17 11:05:15 +02:00
Gery Debongnie 0c24df7074 [MERGE] merge from trunk
bzr revid: ged@openerp.com-20140417065356-x7o3jg5bo5430zth
2014-04-17 08:53:56 +02:00
Denis Ledoux 75850c8f95 [ADD] *: replace overriden methods get_formview_action by get_formview_id
Methods to override to specify the view/action to launch for many2one links
get_formview_action use get_formview_id to find the view to open. Therefore, it is simplier to override get_formview_id to tell which view should be opened

bzr revid: dle@openerp.com-20140416143755-07slguqn6zadqsg5
2014-04-16 16:37:55 +02:00
Thibault Delavallée 4336c64a7c [IMP] mail, mass_mailing: using a _mail_mass_mailing class attribute
it is now possible to compute models allowing mass mailing using mass_mailing_campaign
module. This allows to completely remove the bridges modules, using a more generic
controller for unsubscription.

bzr revid: tde@openerp.com-20140416082851-8duo6yrwr5hwd8c2
2014-04-16 10:28:51 +02:00
Gery Debongnie f57b767361 [MERGE] merge from trunk
bzr revid: ged@openerp.com-20140415150146-5ovdjzta58t5dhd2
2014-04-15 17:01:46 +02:00
Barad Mahendra 12b0dfa9b5 [Merge]with trunk
bzr revid: mba@tinyerp.com-20140415093047-1ctqspzbofv1pt3d
2014-04-15 15:00:47 +05:30
Gery Debongnie 69af9ca3dc [IMP] improves the layout of the three stat buttons (schedule call/meeting/convert to opp) in logged calls form view (addon crm)
bzr revid: ged@openerp.com-20140414124926-lggdqus1agzzr7dh
2014-04-14 14:49:26 +02:00
Randhir Mayatra rma-openerp c399e1daaf [MERGE] merge with latest trunk and resolve conflicts
bzr revid: rma@tinyerp.com-20140414110149-r3l00xr8l08ex7oc
2014-04-14 16:31:49 +05:30
Gery Debongnie c9c2ed506a [IMP] change the information displayed on the 'schedule calls' stat buttons in lead/opportunities form views (addon crm)
bzr revid: ged@openerp.com-20140414104819-7te5ilmmsvykdypy
2014-04-14 12:48:19 +02:00
DJ Patel 0d7b0108ed [IMP] crm, project_gtd : Improved the filter string.
bzr revid: mdi@tinyerp.com-20140414102123-j2bu0s4107hgh003
2014-04-14 15:51:23 +05:30
Gery Debongnie d8b2eab2d0 [FIX] correctly names a variable 'meeting_ids' instead of 'opportunity_ids' (addon crm)
bzr revid: ged@openerp.com-20140414100652-gwv5cwht6wl12ah9
2014-04-14 12:06:52 +02:00
DJ Patel 2cb39d6162 [Merge] Merged with trunk.
bzr revid: mdi@tinyerp.com-20140414095348-cc9aos2vdv9y6azh
2014-04-14 15:23:48 +05:30
Randhir Mayatra rma-openerp 355a51a69d [MERGE] merge with latest trunk and resolve remain confclits 2014-04-14 14:17:14 +05:30
Randhir Mayatra rma-openerp e8f488065a [MERGE] merge with latest trunk and resolve conflicts 2014-04-14 14:06:31 +05:30
Richard Mathot (OpenERP) 01d9ea6f64 [MERGE][IMP] crm/sale_crm: Terminology
Replacement of the term "category" by "tag", for the sake of consistency

bzr revid: rim@openerp.com-20140414083511-b5qvr4ek4mgxx17x
2014-04-14 10:35:11 +02:00
Launchpad Translations on behalf of openerp e82fbf7d91 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140412083153-3ona1js7o6z421vg
2014-04-12 08:31:53 +00:00
Richard Mathot (OpenERP) 5d177a9b10 [MERGE] Sync with trunk
bzr revid: rim@openerp.com-20140411142817-svp3hp2qfx1xw25k
2014-04-11 16:28:17 +02:00
Randhir Mayatra rma-openerp 6da28202f3 [MERGE] merge with latest trunk 2014-04-11 12:36:24 +05:30
Randhir Mayatra rma-openerp 85714eabb6 [MERGE] merge with latest trunk
bzr revid: rma@tinyerp.com-20140411062328-srzutp1ln9xe7sxq
2014-04-11 11:53:28 +05:30
Gery Debongnie 2e9ee9c76e [MERGE] merge from rma branch
bzr revid: ged@openerp.com-20140410145131-fj17mdpi13wa5a9m
2014-04-10 16:51:31 +02:00
Gery Debongnie ac2f58ce68 [MERGE] merge from trunk
bzr revid: ged@openerp.com-20140410145022-7nyixn0v2gwkuaje
2014-04-10 16:50:22 +02:00
Randhir Mayatra rma-openerp 458b95eacb [IMP] imrove yml testcases 2014-04-10 18:47:17 +05:30
Launchpad Translations on behalf of openerp fc25f85b52 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140410064650-qqd9g5dsaf5dqm52
2014-04-10 06:46:50 +00:00
Ravish (Open ERP) 31c7c33260 [imp]improve the code 2014-04-09 19:10:28 +05:30
Ravish (Open ERP) cfc2623534 [IMP] improve related yml bug 2014-04-09 15:35:21 +05:30
Barad Mahendra 0522e80ea5 [Merge]with trunk
bzr revid: mba@tinyerp.com-20140408123641-0qyrg1fmgguezmro
2014-04-08 18:06:41 +05:30
DJ Patel 4bbada19b7 [Merge] Merged with trunk.
bzr revid: mdi@tinyerp.com-20140408042721-cc9ujr6abdpnwxqg
2014-04-08 09:57:21 +05:30
Christophe Simonis 0fad8159f3 [MERGE] forward port of branch saas-3 up to revid 9380 chs@openerp.com-20140407144439-10n8fs6zovodwwtx
bzr revid: chs@openerp.com-20140407163318-hh3jwfkj3o2c83lk
2014-04-07 18:33:18 +02:00
Randhir Mayatra rma-openerp 9dbaa58694 [MERGE] merge with latest trunk
bzr revid: rma@tinyerp.com-20140407102440-ngtr58o2w2ypqrol
2014-04-07 15:54:40 +05:30
Ravish (Open ERP) bc90e644a9 [IMP]done the require changes 2014-04-04 17:18:07 +05:30
Christophe Simonis db6fb31870 [MERGE] forward port of branch 7.0 up to revid 9954 chs@openerp.com-20140403153129-jq9zc7ityoy25c73
bzr revid: chs@openerp.com-20140403155904-ya5mas5s3g7ivihb
2014-04-03 17:59:04 +02:00
Launchpad Translations on behalf of openerp 4612b417af Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140403060213-netdplm9jzfr9yy6
2014-04-03 06:02:13 +00:00
Olivier Dony 1cdf8ac3f2 [FIX] crm.lead: missing index on stage_id/type/state
bzr revid: odo@openerp.com-20140402122023-detokob7c6a06rux
2014-04-02 14:20:23 +02:00
DJ Patel 6cc255dd34 [IMP] crm : Improved the filter string of lead search view.
bzr revid: mdi@tinyerp.com-20140402092019-ra01ggdfi0s1bo3f
2014-04-02 14:50:19 +05:30
DJ Patel ada9e4e830 [IMP] crm : Improved the label and help string of lead search view.
bzr revid: mdi@tinyerp.com-20140402091553-vl4cn51ihng3qqjt
2014-04-02 14:45:53 +05:30
Gery Debongnie b854313fa8 [MERGE] merge from trunk
bzr revid: ged@openerp.com-20140402080422-52s9e10fu7br5847
2014-04-02 10:04:22 +02:00
Ravish (Open ERP) 0ee42746df [update] move alias for default lead in to crm 2014-04-02 12:41:23 +05:30
Launchpad Translations on behalf of openerp 16ce262c33 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140329073038-m7q4sxpb8tprh00r
bzr revid: launchpad_translations_on_behalf_of_openerp-20140330061549-r3t0pecngy76c2rw
bzr revid: launchpad_translations_on_behalf_of_openerp-20140331064021-x3wjc8s4oa0ncq95
bzr revid: launchpad_translations_on_behalf_of_openerp-20140401065325-w3viflz7c33n4uis
bzr revid: launchpad_translations_on_behalf_of_openerp-20140402064459-d7e3d8nwo8famjh6
2014-04-02 06:44:59 +00:00
Ravish (Open ERP) 44d3f263cc [IMP] update on code 2014-04-01 18:34:23 +05:30
Ravish (Open ERP) 69c060639a [update] update in code 2014-04-01 15:14:34 +05:30
Ravish (Open ERP) 194005512d [update with trunk] 2014-04-01 12:54:14 +05:30
Barad Mahendra 923db7a8cd [Merge]with trunk
bzr revid: mba@tinyerp.com-20140331091822-i0f05rcwm3qvxpsd
2014-03-31 14:48:22 +05:30
Randhir Mayatra rma-openerp 77ff3a69b8 [IMP] improve icons and views
bzr revid: rma@tinyerp.com-20140328133051-2amm63n2vy3bj3xe
2014-03-28 19:00:51 +05:30
Ravish (Open ERP) 7699504d62 [Add new sale_team module] 2014-03-28 15:28:35 +05:30
Amit Vora d892a5b38e [IMP] improve code
bzr revid: avo@tinyerp.com-20140328063012-mxvgudl5b3219j2i
2014-03-28 12:00:12 +05:30
Amit Vora d88835ed66 [MERGE] merge with main branch
bzr revid: avo@tinyerp.com-20140328050000-xmax3xa0dp4ltxxv
2014-03-28 10:30:00 +05:30
Launchpad Translations on behalf of openerp 51aa261b44 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140327073504-l0fydwct329jhirh
2014-03-27 07:35:04 +00:00
Launchpad Translations on behalf of openerp 87f5acb97b Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140326071242-wi4c4p17bbhfp671
2014-03-26 07:12:42 +00:00
Randhir Mayatra rma-openerp c086291ddd [MERGE] merge with latest trunk
bzr revid: rma@tinyerp.com-20140325135635-rev8asknqwk08svy
2014-03-25 19:26:35 +05:30
Randhir Mayatra rma-openerp 96ea9392aa [IMP] convert button into stat button for products
bzr revid: rma@tinyerp.com-20140324135621-13t191kmnn6t22jk
2014-03-24 19:26:21 +05:30
Christophe Simonis d93b79e6f4 [MERGE] forward port of branch saas-3 up to revid 9345 dle@openerp.com-20140324110349-e82t1bmmtjqbl85k
bzr revid: chs@openerp.com-20140324133811-4az1kvbznd26seow
2014-03-24 14:38:11 +01:00
Randhir Mayatra rma-openerp 0f40b3bc8f [IMP] convert button into stat button for project_issue and stock_claim
bzr revid: rma@tinyerp.com-20140324050921-qxn3n4getus3il6c
2014-03-24 10:39:21 +05:30
Denis Ledoux 54d8cd1e86 [FIX] crm: round robin tests on salesman assignation set force assignation true
bzr revid: dle@openerp.com-20140320183814-163zwgilty4l2jv7
2014-03-20 19:38:14 +01:00
Denis Ledoux abf8e0d54f [ADD] crm: mass convert lead to opp, add force assignation checkbox, to force the salesman/salesteam on converted/merged lead/opps or leave the existing salesman/salesteam
bzr revid: dle@openerp.com-20140320175129-2lj2pu86l3rjoulw
2014-03-20 18:51:29 +01:00
Denis Ledoux 8d52e36fd8 [FIX] crm: convert to opportunity (single lead) display losts
bzr revid: dle@openerp.com-20140319153956-iilonexkeng1fudl
2014-03-19 16:39:56 +01:00
Gery Debongnie 750b2e9084 [MERGE] merge from trunk into local branch
bzr revid: ged@openerp.com-20140319090353-ba64eid83g2q95md
2014-03-19 10:03:53 +01:00
Christophe Simonis 99a3c45976 [MERGE] forward port of branch saas-3 up to revid 9328 chs@openerp.com-20140318120024-mcxmkncn1xktjs7v
bzr revid: chs@openerp.com-20140318132741-aur3q1k7t9iympri
2014-03-18 14:27:41 +01:00
Barad Mahendra 1cfa94706b [Merge]with trunk
bzr revid: mba@tinyerp.com-20140318084344-cuwdqdtphsk6xd7j
2014-03-18 14:13:44 +05:30
Amit Vora f1ce85e807 [IMP] improve code,add condition if context none
bzr revid: avo@tinyerp.com-20140318084314-y63h7bho393fhcix
2014-03-18 14:13:14 +05:30
Denis Ledoux ea4e924208 [FIX] crm: remove the fact that the convert to opp button is hidden if the lead has probability 100: this is possible that you want to convert it anyway
bzr revid: dle@openerp.com-20140317172415-f5thfl78sxx2cb1z
2014-03-17 18:24:15 +01:00
Launchpad Translations on behalf of openerp 9965b2c434 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140315072920-dmiymtbhrgu87wm0
bzr revid: launchpad_translations_on_behalf_of_openerp-20140316060652-akf1fti2hc1a9vmm
bzr revid: launchpad_translations_on_behalf_of_openerp-20140317050959-2xx2aoylhn6a28fo
2014-03-17 05:09:59 +00:00
Gery Debongnie 6fee78b475 [IMP] improves the way the res_partner fields are displayed in the buttons in form view. Specifically, uses the widget 'statinfo' and some related cleanup (addons account, crm)
bzr revid: ged@openerp.com-20140314140114-9t2piu3cpqkldnbo
2014-03-14 15:01:14 +01:00
Amit Vora c6b6455d77 [IMP] imporve coding convention according to PEP8
bzr revid: avo@tinyerp.com-20140314070153-o8dhssyebpbummcw
2014-03-14 12:31:53 +05:30
Launchpad Translations on behalf of openerp aba3459889 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140314065823-xdw7aa9ye4j200pp
bzr revid: launchpad_translations_on_behalf_of_openerp-20140314065836-tn2fv9smot0omj8f
2014-03-14 06:58:36 +00:00
Gery Debongnie 0cba3bef47 [IMP] removes some useless fields (*stat_button) from res_partner in addon crm and uses the new x2many widget in the form view
bzr revid: ged@openerp.com-20140313131858-mp1lfww3osmny27g
2014-03-13 14:18:58 +01:00
Amit Vora 2a50034bfc [MERGE] merge with main branch
bzr revid: avo@tinyerp.com-20140313124845-p248ahqot4v2x74q
2014-03-13 18:18:45 +05:30
Amit Vora 654cbcb880 [IMP] improve code
bzr revid: avo@tinyerp.com-20140313124505-x3q1r7ofms89bvvq
2014-03-13 18:15:05 +05:30
Amit Vora 9e03bc126b [IMP] improve code
bzr revid: avo@tinyerp.com-20140313121727-jpop13zj1h64qj6i
2014-03-13 17:47:27 +05:30
Launchpad Translations on behalf of openerp ba823b0a63 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140313071540-nhiuwlanpkvorb8h
2014-03-13 07:15:40 +00:00
Denis Ledoux e13ac3153f [FIX] crm: get duplicated leads use email_split from tools
bzr revid: dle@openerp.com-20140312164459-gi7ol7huxx3gcbxi
2014-03-12 17:44:59 +01:00
Denis Ledoux 387dc3c911 [FIX] crm: crm to opp, get duplidated leads does not take losts and deads. + search algorithm imp
bzr revid: dle@openerp.com-20140312155453-fj9ngb988advvn8s
2014-03-12 16:54:53 +01:00
Denis Ledoux 187545a06a [FIX] crm: lead to opp, do not force salesteam in mass convert
bzr revid: dle@openerp.com-20140312143102-0887zl1r4tc4yq6z
2014-03-12 15:31:02 +01:00
Gery Debongnie b7bc8b3aa4 [IMP] change the partner form view to display new stat button information in addon account/crm
bzr revid: ged@openerp.com-20140312132347-dyu1i3szlh9r7jq9
2014-03-12 14:23:47 +01:00
Kersten Jeremy 6a01718aef [FIX] Remove test from saas-3 - Tech Saas & AL agreement
bzr revid: dle@openerp.com-20140311164559-1vi0mw3qm8n0vobn
bzr revid: dle@openerp.com-20140312111450-smumao0hm1vzifgn
bzr revid: dle@openerp.com-20140312121555-uum96hj8f2y1rvna
bzr revid: jke@openerp.com-20140312125757-e2kgxuwz0jko77ve
2014-03-12 13:57:57 +01:00
Amit Vora 55c3d2336a [MERGE] merge with main branch
bzr revid: avo@tinyerp.com-20140312090734-1m11cnuavrgl92it
2014-03-12 14:37:34 +05:30
Martin Trigaux 5041f63b35 [FIX] crm: write a value to date_closed field as well if change directly the stage instead of using buttons (which will probably be removed later)
bzr revid: mat@openerp.com-20140311150446-0atbc6esymjyv69e
2014-03-11 16:04:46 +01:00
Christophe Simonis d504764eff [MERGE] forward port of branch saas-3 up to revid 9298 chm@openerp.com-20140311130852-3ft0v1mc9ht1any6
bzr revid: chs@openerp.com-20140311145205-s56fj113fsrnisc3
2014-03-11 15:52:05 +01:00
Denis Ledoux 74af3ac0fe [MERGE] Forward-port of latest saas-2 bugfixes, up to rev. 9144 revid:dle@openerp.com-20140310133913-465x5t3n1bo7fu98
bzr revid: dle@openerp.com-20140310143600-kz7qjfe4p63s0a34
2014-03-10 15:36:00 +01:00
Denis Ledoux 02459f8d4a [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9929 revid:dle@openerp.com-20140325104921-x8zjx5p71l1o3uif
bzr revid: dle@openerp.com-20140310133913-465x5t3n1bo7fu98
bzr revid: dle@openerp.com-20140311164146-2s599kogbqj8e94l
bzr revid: dle@openerp.com-20140312111149-u6y036aej3ywq7et
bzr revid: dle@openerp.com-20140312121145-06s1jvct9v4m7l6s
bzr revid: mat@openerp.com-20140313084409-c0kckxemy3in0mlo
bzr revid: chs@openerp.com-20140313163420-ifa4hyixj722d6jo
bzr revid: chs@openerp.com-20140314102034-g0nzryvwhrpzdas9
bzr revid: chs@openerp.com-20140314104803-19c5snl2fcuih91o
bzr revid: odo@openerp.com-20140314143519-x6rzcfkkqxwc0e1g
bzr revid: chs@openerp.com-20140318110229-y8098w3shdpmoig2
bzr revid: dle@openerp.com-20140318151824-sscl4m8p87emjl8s
bzr revid: dle@openerp.com-20140320112618-yfyihlwz66ryeqf5
bzr revid: dle@openerp.com-20140320161003-j01cc6sqves2wnp2
bzr revid: dle@openerp.com-20140320181252-4gqcog22p1ex0pz7
bzr revid: dle@openerp.com-20140321140450-8ulnhr76qybiadks
bzr revid: dle@openerp.com-20140324104743-ubvu8st7emq9pg1q
bzr revid: dle@openerp.com-20140325112413-xs5z7y81rhyjt0rd
2014-03-25 12:24:13 +01:00
Amit Vora (OpenERP) aef61e1293 [IMP] improve code
bzr revid: voraamitr@gmail.com-20140310131847-jht58ov5mar8nsif
2014-03-10 18:48:47 +05:30
Denis Ledoux c2ba11e72e [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9885 revid:dle@openerp.com-20140310114026-r0ijm0m36su19wn7
bzr revid: dle@openerp.com-20140310122101-gicombyc5ii0yz6a
2014-03-10 13:21:01 +01:00
Amit Vora (OpenERP) 81db3c3a19 [IMP] improve code
bzr revid: voraamitr@gmail.com-20140307113617-5lfnkqlcnavr8f57
2014-03-07 17:06:17 +05:30
Martin Trigaux 8db1b77757 [FIX] crm: write a value to date_closed when mark an opportunity as won or lost.
This value is required to compute 'Days to Close' field

bzr revid: mat@openerp.com-20140307111835-o7nd7dmkn5y8zg2a
2014-03-07 12:18:35 +01:00
Amit Vora (OpenERP) ae1d637c82 [MERGE] merge with main branch
bzr revid: voraamitr@gmail.com-20140307110920-nx2pxsocj8yx4nxn
2014-03-07 16:39:20 +05:30
Martin Trigaux c375851b46 [FIX] phonecall: in 'Logged Call' menu display (by default) only the one in done state (opw 601725)
bzr revid: mat@openerp.com-20140307095428-buwc6m008mowaoy3
2014-03-07 10:54:28 +01:00
Launchpad Translations on behalf of openerp fd98bf36aa Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140307072427-zkvqj45icrzupx0m
bzr revid: launchpad_translations_on_behalf_of_openerp-20140307072433-0lqpjt07j1s8k8cs
2014-03-07 07:24:33 +00:00
Launchpad Translations on behalf of openerp e231045095 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140306061409-nvr56r44q6smklxz
bzr revid: launchpad_translations_on_behalf_of_openerp-20140305055718-w3c9kzsncncpu12w
bzr revid: launchpad_translations_on_behalf_of_openerp-20140306061519-n2qbjt3fe7l104aw
2014-03-06 06:15:19 +00:00
Denis Ledoux 6f12f4ba67 [FIX] crm: lead_to_opp wizard, use email address to find duplicated lead in single convert lead to opp
bzr revid: dle@openerp.com-20140306143621-z5mgcl2cm7kn6we0
2014-03-06 15:36:21 +01:00
Denis Ledoux 6a1e65b561 [FIX] crm: crm_to_lead tests, force assignation, to check round robin
bzr revid: dle@openerp.com-20140306092330-wuhfw36f3xpwdy4d
2014-03-06 10:23:30 +01:00
Denis Ledoux 83a4374363 [FIX] crm: lead_to_opp, do not force assignation in mass convert with deduplication (to prevent change the salesman of an existing opp), + fix get duplicated lead, now based on probability of stage instead of probability of the opp itself
bzr revid: dle@openerp.com-20140305164016-432vz5axo5l4wqko
2014-03-05 17:40:16 +01:00
Thibault Delavallée dab275e931 [IMP] crm: add message_last_pos tin groupby for leads and opportunities
bzr revid: tde@openerp.com-20140305094427-6295fmowatllrxxz
2014-03-05 10:44:27 +01:00
Denis Ledoux 40b1ab36bb [FIX] crm: convert lead to opp wizard, on change salesman choose default salesteam if any
bzr revid: dle@openerp.com-20140304154442-o2zvun8ehv2ro6dl
2014-03-04 16:44:42 +01:00
Launchpad Translations on behalf of openerp b201dc79b7 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140218054104-8egkh4jj7hiiwuih
bzr revid: launchpad_translations_on_behalf_of_openerp-20140219054048-688twg0fubtm2x2q
bzr revid: launchpad_translations_on_behalf_of_openerp-20140220054214-237ri67t9rw3l4fu
bzr revid: launchpad_translations_on_behalf_of_openerp-20140221063855-wniw42r27gyg3h6y
bzr revid: launchpad_translations_on_behalf_of_openerp-20140222073328-xpn7nwqz407yzumq
bzr revid: launchpad_translations_on_behalf_of_openerp-20140223074516-0r09cpmma58ylqji
bzr revid: launchpad_translations_on_behalf_of_openerp-20140224060319-535oheaq2w9u2ye3
bzr revid: launchpad_translations_on_behalf_of_openerp-20140225062420-zl7curej0e0warhz
bzr revid: launchpad_translations_on_behalf_of_openerp-20140226073146-3vzhw4hddr81olbs
bzr revid: launchpad_translations_on_behalf_of_openerp-20140227062959-24e2rn98rqb9afpr
bzr revid: launchpad_translations_on_behalf_of_openerp-20140228072152-f9gm4ud1wu19ge27
bzr revid: launchpad_translations_on_behalf_of_openerp-20140301055205-r0df0fqz9yf5z66i
bzr revid: launchpad_translations_on_behalf_of_openerp-20140302052638-bjf11oumy7w15oco
bzr revid: launchpad_translations_on_behalf_of_openerp-20140304082704-k1z2te1tfud43zy3
2014-03-04 08:27:04 +00:00
Launchpad Translations on behalf of openerp 9863dbe5c8 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140304075238-yra39uwmwahmrnf3
2014-03-04 07:52:38 +00:00
ajay javiya (OpenERP) 8cd330d8f8 [IMP] : code
bzr revid: aja@tinyerp.com-20140304065305-o398j34su6ictbu6
2014-03-04 12:23:05 +05:30
Sunil Sharma (OpenERP) dd4813e360 [mrg]:lp:openobject-addons
bzr revid: sunilsharma.sharma07@gmail.com-20140304063937-vyrt063gzfhsoy4k
2014-03-04 12:09:37 +05:30
ajay javiya (OpenERP) 5976568044 [FIX] : scheduled meeting action not found
[ADD] : field group scheduled calls menu

bzr revid: aja@tinyerp.com-20140304061738-cbk1qalggohf70zc
2014-03-04 11:47:38 +05:30
ajay javiya (OpenERP) 07ff2cb436 [REN] : rename button meetings to schedule mettings
bzr revid: aja@tinyerp.com-20140304052617-p9n4dak7w277hxqk
2014-03-04 10:56:17 +05:30
ajay javiya (OpenERP) e0f8d3f80a [MERGE] : with trunk
bzr revid: aja@tinyerp.com-20140303064742-klvoa7t5l6wnzrg9
2014-03-03 12:17:42 +05:30
Mahendra Barad (OpenERP) da5f8b26df [Merge]with trunk
bzr revid: mba@tinyerp.com-20140228131855-obhatiecnzv1bgqu
2014-02-28 18:48:55 +05:30
Amit Vora (OpenERP) 2a73281281 [IMP] improve code according to PEP8
bzr revid: voraamitr@gmail.com-20140226133222-9poyk5squ291iyyf
2014-02-26 19:02:22 +05:30
Amit Vora (OpenERP) 61702ad635 [MERGE] merge with main branch
bzr revid: voraamitr@gmail.com-20140226124327-lo0zdy3fztjvdtwk
2014-02-26 18:13:27 +05:30
Mahendra Barad (OpenERP) 4bcba1684b [IMP]fix typo
bzr revid: mba@tinyerp.com-20140226111604-3betorm3m0aqqpi0
2014-02-26 16:46:04 +05:30
Denis Ledoux d105ec6e82 [FIX] crm: missing argument in on_change of merge lead/opp wizard
bzr revid: dle@openerp.com-20140225175002-lz0zdwp3th30955q
2014-02-25 18:50:02 +01:00
Kersten Jeremy 4ec292eae9 [MERGE] Fix bug in send_mail_to_attendee of calendar where we passed browse_list and not dict(ids), typo controller calendarr PEP8
bzr revid: jke@openerp.com-20140225173808-60stzxubljuambd4
2014-02-25 18:38:08 +01:00
Kersten Jeremy 2907c8dd66 [TYPO] PEP7 - Module calendar (no E501)
bzr revid: jke@openerp.com-20140224220222-dp26lvbv2bfljxvt
2014-02-24 23:02:22 +01:00
Kersten Jeremy ad86d1afdc [FIX] Remove unused field from crm for calendar. By consequence, bug with email attendee is removed.
bzr revid: jke@openerp.com-20140224104745-egf6hutwzk9gcweh
2014-02-24 11:47:45 +01:00
Mahendra Barad (OpenERP) 258162489e [IMP]improved demo
bzr revid: mba@tinyerp.com-20140221125731-54k3d1ivusomcbz1
2014-02-21 18:27:31 +05:30
Mahendra Barad (OpenERP) 36f5fb5f08 [IMP]added widget for priority
bzr revid: mba@tinyerp.com-20140221122121-67o4o7786gpmh71e
2014-02-21 17:51:21 +05:30