Commit Graph
76756 Commits
Author SHA1 Message Date
Paramjit Singh Sahota bfff65d4ac [IMP] if 'cash control' if false in the journal, no need to have the opening and closing cash control tab in cash registers
bzr revid: psa@tinyerp.com-20130918091041-c5zponkbu5uwgb94
2013-09-18 14:40:41 +05:30
Olivier Dony ff9e90fad6 [MERGE] tools.translate: add compatibility with Babel v.1.3, courtesy of Stefan Rijnhart (Therp)
lp bug: https://launchpad.net/bugs/1226576 fixed

bzr revid: odo@openerp.com-20130918081216-8dnkmyp4wif3nm24
2013-09-18 10:12:16 +02:00
Thibault Delavallée 3a163c1932 [IMP] addons: cleaned spaces and indentation of help messages of various res_config fields
bzr revid: tde@openerp.com-20130918080910-l6os3d4rff1p7vzd
2013-09-18 10:09:10 +02:00
Stefan Rijnhart 7de17a9358 [FIX] Keep backwards compatibility with Babel 0.9.6
bzr revid: stefan@therp.nl-20130918074505-59q1fs3ixlev1ein
2013-09-18 09:45:05 +02:00
Stefan Rijnhart a9b8936a4d [RVT] Undo previous fix
bzr revid: stefan@therp.nl-20130918074407-ae6yu2f001vxl0le
2013-09-18 09:44:07 +02:00
Martin Trigaux eb26358196 [FIX] sale_crm: move code reverted at revision 9452 to the sale_crm module instead of project_mrp
bzr revid: mat@openerp.com-20130918073333-xikarmzmmmdzp3ia
2013-09-18 09:33:33 +02:00
Olivier Dony 54c4fe7f01 [MERGE] project_mrp: correct reference to process.node from sales process
The project_mrp process extends the sales process at
the procurement phase, however that part of the sales
process has now been moved to the `sale_stock` module,
which is not a dependency of `project_mrp` anymore.
There is however little reason to duplicate that
process node, so as a temporary hack, we can copy
its external ID, even though there is no direct
dependency between the two.

For next version we should fix this hack by moving
the node to a common dependency between sale_stock
and project_mrp, such as `sale`.

lp bug: https://launchpad.net/bugs/1223276 fixed

bzr revid: odo@openerp.com-20130918074002-wrhnq0w4t8xx3rgv
2013-09-18 09:40:02 +02:00
Darshan Kalola (OpenERP) 8175717f8b [MERGE]merged with main addons
bzr revid: dka@tinyerp.com-20130918070456-sd7fkbk9wzh9dyue
2013-09-18 12:34:56 +05:30
ima-openerp 0afff9aae3 [IMP]removed unused method which is defined only for web shortcuts module.
bzr revid: ishwarmalvi13@gmail.com-20130918065854-u0aiyu5e1z7tf09g
2013-09-18 12:28:54 +05:30
Darshan Kalola (OpenERP) bfa265d287 [IMP]attached cv and discussion to demo data and linked demo data to job position and linked job postion to survey
bzr revid: dka@tinyerp.com-20130918062509-7g8ttro8rkj6sn3c
2013-09-18 11:55:09 +05:30
Launchpad Translations on behalf of openerp 99576f547c Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130918051117-44x8mgdnm0ucqyp4
2013-09-18 05:11:17 +00:00
Launchpad Translations on behalf of openerp fb7d1001dd Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130918044924-csoci28hkz0lyqm3
2013-09-18 04:49:24 +00:00
Frédéric van der Essen 6bb396eb68 [MERGE] point_of_sale: various fixes and improvements
bzr revid: fva@openerp.com-20130917162146-40l4zmby8lmo2dtn
2013-09-17 18:21:46 +02:00
Martin Trigaux bdf2395e3a [FIX] project_mrp: revert addition in commit 9445 breaking databases withtout mrp module
bzr revid: mat@openerp.com-20130917160918-dohb1lb5vtqsy5lv
2013-09-17 18:09:18 +02:00
Olivier Dony 4116a38181 [FIX] project_mrp: correct reference to process.node from sales process
The project_mrp process extends the sales process at
the procurement phase, however that part of the sales
process has now been moved to the `sale_stock` module,
which is not a dependency of `project_mrp` anymore.
There is however little reason to duplicate that
process node, so as a temporary hack, we can copy
its external ID, even though there is no direct
dependency between the two.

For next version we should fix this hack by moving
the node to a common dependency between sale_stock
and project_mrp, such as `sale`.

lp bug: https://launchpad.net/bugs/1223276 fixed

bzr revid: odo@openerp.com-20130917160337-lih7bjqastozga8w
2013-09-17 18:03:37 +02:00
Frédéric van der Essen 14dd9656e2 [MERGE] from trunk
bzr revid: fva@openerp.com-20130917152501-2uohstpmkf5jrcvr
2013-09-17 17:25:01 +02:00
Paramjit Singh Sahota 5f06129179 [IMP] Improved code for
In cash registers, it does not work at all 
>>real closing balance is not updated
>>opening balance is not updated
>>and so amount is never good

bzr revid: psa@tinyerp.com-20130917130901-hem0iwy608vkwe02
2013-09-17 18:39:01 +05:30
Darshan Kalola (OpenERP) d1a23edd2e [IMP]align multi-line string
bzr revid: dka@tinyerp.com-20130917130814-wikgcy25594gk8dx
2013-09-17 18:38:14 +05:30
Frédéric van der Essen 0d826f64ca [FIX] point_of_sale: missing renamings from the JobQueue refactor
bzr revid: fva@openerp.com-20130917124615-kqtix2atp1xguszw
2013-09-17 14:46:15 +02:00
Darshan Kalola (OpenERP) 21876a5810 [MERGE]merged with main addons
bzr revid: dka@tinyerp.com-20130917123814-wqx07inh0ckcqdgw
2013-09-17 18:08:14 +05:30
Frédéric van der Essen ad6bbe490a [FIX] point_of_sale: scaled product weren't ordered with the correct weight
bzr revid: fva@openerp.com-20130917123446-671ijt70i93p0w67
2013-09-17 14:34:46 +02:00
Frédéric van der Essen 674054c97e [IMP] point_of_sale: removed ProductWidget for faster product list updates
bzr revid: fva@openerp.com-20130917122929-8pybdbvgrv8kbgru
2013-09-17 14:29:29 +02:00
Stefan Rijnhart b224b40fac [FIX] Restore compatibility with Babel > 0.9.6
lp bug: https://launchpad.net/bugs/1226576 fixed

bzr revid: stefan@therp.nl-20130917122312-r6s7dgzdsfil7xyg
2013-09-17 14:23:12 +02:00
Thibault Delavallée 1f3195c271 [MERGE] [IMP] purchase: misc menu improvements
- Pricelists menu now in Configuration / Pricelists
- Partner Categories menu renamed to Partner Tags

bzr revid: tde@openerp.com-20130917114853-2stgi1xyh6bh8tex
2013-09-17 13:48:53 +02:00
Thibault Delavallée 2a3a631ef4 [MERGE] [ADD] mass mailing module: handle mass mailing campaigns, get statistics of email waves
This module allows to define mass mailing campaigns and to have statistics about mass mailings. Each campaign holds several waves of mass mailing. Tracked statistics are the opening datetime, the reply datetime, the bounce datetime. The statistics are stored onto a mail.mail.statistics model. This allows to delete emails without loosing statistics.

Emails sent using mass mailing use a blank image linked to a controller that allows to track the opening of the email. When a reply goes through the mail gateway, the message_id in the email references is used to find its parent and, if found, update its replied date.

This module adds a new parameter, the bounce alias. If set, the Return-Path of sent emails is set to bounce_alias@alias_domain (i.e. bounce@mydomain.com). Any email coming through the mail gateway using this alias set its parent, if found, as bounced. If the related model has a message_bounce field, this field is incremented. This is for example the case for crm.lead model, allowing to filter and delete leads linked to a wrong address.

Misc :
- mail: test_mail_base is now called common; moved mail.group tests into their own file
- mail: fixed some issues in controllers (forgotten import, controllers not updated to new specifications of oe framework)
- mail, email_template, mail.compose.message: template rendering is now done in batch; now each template is rendered for all res_ids. Refactored email or mail_message value creation in mail.compose.message, to extract value creation from the process of sending emails. This allows to ease the inheritance.
- mail.compose.message: in mass_mailing, default value is to create a pure email mailing, not mass posting on document (aka, post is now False by default)
- mail.message, mail.followers: cleaned posting and notification email process, to lessen the number of queries to execute (read -> browse, refactored some methods)
- mail.message: cleaned form view, removing unnecessary group_by
- mail.message: reply_to and message_id computation in create now have their own methods located in mail_message.py (and not in mail_mail.py anymore for reply_to)
- mail.mail: slightly cleaned form view
- mail.thread: processing of routes in mail gateway is now done in message_route_process, extracted from message_route, to ease inheritance
- base_setup: added field in res_config to install mass_mailing
- crm: added message_bounce field

bzr revid: tde@openerp.com-20130917110214-z8494dfuok1g89lh
2013-09-17 13:02:14 +02:00
Thibault Delavallée ff0eb116ea [MERGE] [IMP] tools: added a regex for bounce email addresses
[IMP] read_group: added possibility to customize the group_by on datetime fields. A special context key can be used for datetime fields : datetime_format.
context[datetime_format] = {
    'field_name': {
        groupby_format: format for to_char (default: yyyy-mm)
        display_format: format for displaying the value in the result (default: MMM yyyy)
        interval: day, month or year; used for begin and end date of group_by
                  intervals computation (default: month)
    }
}

bzr revid: tde@openerp.com-20130917110040-l3b5i0vk8qiwy0cm
2013-09-17 13:00:40 +02:00
Dharmraj Zala (OpenERP Trainee) 1b6bbcfec7 [IMP] avoided use of matplotlib library
bzr revid: dizzy.zala@gmail.com-20130917104325-4b2mijamy0ll3d8b
2013-09-17 16:13:25 +05:30
Dharmraj Zala (OpenERP Trainee) bffaf163cc [IMP] avoided use of matplotlib library
bzr revid: dizzy.zala@gmail.com-20130917103829-c6s5qkwkiy8igj1t
2013-09-17 16:08:29 +05:30
Thibault Delavallée 8ae3b158db [IMP] cleaning before merging :
- added fields on mail.mail.statistics form view to have all data;
- added comments;
- cleaned get_mail_values override now that statistics are created using o2m command

bzr revid: tde@openerp.com-20130917103555-jwhgl8y49g505ugz
2013-09-17 12:35:55 +02:00
Thibault Delavallée 2bc275457a [CLEAN] mail: removed unnecessary change
bzr revid: tde@openerp.com-20130917102046-8khoz9axz5vr6j13
2013-09-17 12:20:46 +02:00
Frédéric van der Essen c33fd59465 [MERGE] from upstream
bzr revid: fva@openerp.com-20130917101910-4h2g2njs2e9toc36
2013-09-17 12:19:10 +02:00
Frédéric van der Essen 65c70b85a7 [IMP + FIX] point_of_sale: plugged the memory leaks
- correctly call destroy on widgets
 - unbind backbone events on destroy
 - jquery show() hide() flooded jQuery.cache
 - introduced automated ui tests

bzr revid: fva@openerp.com-20130917101420-g76gos2qjjaii3zf
2013-09-17 12:14:20 +02:00
Thibault Delavallée 54c014c4ea [IMP] read_group: group_by -> groupby (same variable, but was used in previous implementation, so I keep it)
bzr revid: tde@openerp.com-20130917100447-u0qhdsw14wdngxwc
2013-09-17 12:04:47 +02:00
Thibault Delavallée 643996de2b [FIX] mass_mailing: fixed bouncing tracking
mail_mail now have a statistics_ids field, allowing to create statistics when creating a mail.mail.
This is done in the mail composer, using classic o2m command. Mail_mail create is overrided to ipdate
the statistics value (message_id) that is computed directly in the create and not accessible
in the values dict.
Added model and res_id on stat model, to allow message_bounce update, without havign to rely
on the mail.mail existence.

bzr revid: tde@openerp.com-20130917094218-7jz5mnldogzhlioh
2013-09-17 11:42:18 +02:00
Martin Trigaux c0be2ae2a7 [MERGE] [FIX] base_calendar: Fix domain evaluation for calendar recursive and fix search method for recurrency date
bzr revid: mat@openerp.com-20130917093906-3oe3xr7zaoc1r80m
2013-09-17 11:39:06 +02:00
Thibault Delavallée a2d167bd0a [MERGE] Sybc with trunk
bzr revid: tde@openerp.com-20130917085022-a0u60kug7siqzksa
2013-09-17 10:50:22 +02:00
Thibault Delavallée fb4ab9dd0c [IMP] mass mailing: improvements :
- improved mass mailing wizard creation (everything is showed, better alignment, filter_id required, added default document on Partner)
- campaign: o2m is now readonly in form view, added an empty list help

bzr revid: tde@openerp.com-20130917085003-yof5gfy68y56ougf
2013-09-17 10:50:03 +02:00
Martin Trigaux edf34053ad [FIX] stock: use user's language as default value to fetch product translation
bzr revid: mat@openerp.com-20130917074045-4o5t46t7fucqr354
2013-09-17 09:40:45 +02:00
Martin Trigaux f699c0cb6e [FIX] stock: decimal precision of new_price field on update cost price wizard is not same as defined in cost_price field
bzr revid: mat@openerp.com-20130917073805-dg4yvxrjkv35k7p1
2013-09-17 09:38:05 +02:00
ajay javiya (OpenERP) c01f6cd477 [IMP]:Internal attendees should automatically be accepted meeting and
[REM]: conflicts

bzr revid: aja@tinyerp.com-20130917070406-mwqyqjczn9sv2lux
2013-09-17 12:34:06 +05:30
Dharmraj Zala (OpenERP Trainee) c49e884679 [IMP] miscellaneous improvements
bzr revid: dizzy.zala@gmail.com-20130917055450-1mbdt8u0up6ucw0h
2013-09-17 11:24:50 +05:30
Dharmraj Zala (OpenERP Trainee) b1647e2d32 [IMP] miscellaneous improvements
bzr revid: dizzy.zala@gmail.com-20130917055129-zvh1tbhghy1vr9oc
2013-09-17 11:21:29 +05:30
Launchpad Translations on behalf of openerp a46cbb7a31 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130913060803-zltruvkg213vqm57
bzr revid: launchpad_translations_on_behalf_of_openerp-20130915061052-1kts2jol7uvq1n4f
bzr revid: launchpad_translations_on_behalf_of_openerp-20130917051850-e1s8v09muo1atjwh
bzr revid: launchpad_translations_on_behalf_of_openerp-20130917051903-257acdjbxi60zyv8
2013-09-17 05:19:03 +00:00
Launchpad Translations on behalf of openerp bc0d066505 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130914054213-dq0kt273ooy6fozn
bzr revid: launchpad_translations_on_behalf_of_openerp-20130915055539-hzmy1ws1il6z8fji
bzr revid: launchpad_translations_on_behalf_of_openerp-20130915054954-zisp7huxai3ew84l
bzr revid: launchpad_translations_on_behalf_of_openerp-20130916054225-m0j262vooofcavqz
bzr revid: launchpad_translations_on_behalf_of_openerp-20130917043759-tke0eln0ca01hsm7
2013-09-17 04:37:59 +00:00
Atul Patel (OpenERP) fae3b84d56 [MERGE]: Merged with addons
bzr revid: atp@tinyerp.com-20130916152505-x47ny72x23ahvj85
2013-09-16 20:55:05 +05:30
Atul Patel (OpenERP) 58fcaa9d40 [MERGE]: Merged with server
bzr revid: atp@tinyerp.com-20130916152046-vc454ytxm3gkq5sj
2013-09-16 20:50:46 +05:30
Martin Trigaux 7bdd9a6ad3 [FIX] hr_timesheet_sheet: use timezone in hour computation for timesheet
bzr revid: mat@openerp.com-20130916143300-sa3zpm505ac6r145
2013-09-16 16:33:00 +02:00
Turkesh Patel (Open ERP) 3cdc986c0c [IMP] improved code to pass tooltip delay in option and added function so we can set requred help in inherited modules.
bzr revid: tpa@tinyerp.com-20130916130825-pciwsn0doshstrp2
2013-09-16 18:38:25 +05:30
Turkesh Patel (Open ERP) da358b54ab [IMP] improved code to show bar required help and with delay
bzr revid: tpa@tinyerp.com-20130916130700-e9ipoezcjeyva3mb
2013-09-16 18:37:00 +05:30
Martin Trigaux 461b5d8191 [MERGE] [FIX] mrp_subproduct: correctly take into account subproduct_factor when checking quantities on BoM
bzr revid: mat@openerp.com-20130916123442-cch34mghmwh1p18e
2013-09-16 14:34:42 +02:00