Commit Graph
83232 Commits
Author SHA1 Message Date
Thibault Delavallée 3a359f0ef4 [REV] website_sale: reverted changes in shop
bzr revid: tde@openerp.com-20140122171429-rb6g4zpyl8cw6fvv
2014-01-22 18:14:29 +01:00
Thibault Delavallée 46c55500ff [MERGE] Sync with website-al
bzr revid: tde@openerp.com-20140122171321-6r2q42p7ebfv3kb9
2014-01-22 18:13:21 +01:00
Thibault Delavallée 055932fc6a [IMP] product: cleaned form in create mode. Moreover generally
changing the template is not possible anymore; create a new tempalte or a new
variant instead. When creating a new product, you will always create a new
template.
Added the link to the template from the product form view.
Cleaned some code (code move).

bzr revid: tde@openerp.com-20140122170218-6j2sixoxvvbbxvhd
2014-01-22 18:02:18 +01:00
Cedric Snauwaert 2be02b0966 [FIX]order stock_inventory_line by location name, product code, product name
lp bug: https://launchpad.net/bugs/1087033 fixed

bzr revid: csn@openerp.com-20140122163351-c6si7b339inpq5gi
2014-01-22 17:33:51 +01:00
Xavier Morel f70e542556 [CHG] python 2.6 compat'
bzr revid: xmo@openerp.com-20140122161727-0inchgb570e1r7pi
2014-01-22 17:17:27 +01:00
Gery Debongnie 39e0f4736f [REF] refactoring: removes the 'interval' attributes in groupbys and improves searchbar integration (addon web_graph)
bzr revid: ged@openerp.com-20140122160707-39el7frwfj4pwd4d
2014-01-22 17:07:07 +01:00
Josse Colpaert 71b2a70920 [MERGE] Merge in order to check corrects lots
bzr revid: jco@openerp.com-20140122153934-e1ohled5joz2z9pp
2014-01-22 16:39:34 +01:00
Josse Colpaert 2213f6f102 [IMP] Add lot on mrp_repair operations
bzr revid: jco@openerp.com-20140122153519-zs2062b653l16qb5
2014-01-22 16:35:19 +01:00
Fabien Meghazi 8d28d74dc9 [FIX] stupid fme
bzr revid: fme@openerp.com-20140122153022-y7pe379qjxqy67vs
2014-01-22 16:30:22 +01:00
Xavier Morel 5b7ade9db1 [ADD] ways to correctly handle local datetimes in e.g. domains
* change datetime.now() to generate user-local naive datetimes
* add datetime.utcnow() behaving as the old now()
* add date.today() generating a user-local date (for the current day)
* add datetime.replace() to replace any specific attribute of the
  datetime object (except tzinfo, for now)
* datetime.toJSON() now returns the equivalent javascript Date object
  (warning: uses the datetime attributes directly, since datetimes are
  naive if they were created with utcnow() the Date result is going to
  be complete nonsense). With the previous commit datetime.now()
  generates a user-local now() which is converted to the correct UTC
  datetime when sent to the server.

This means it becomes possible to generate datetime bounds for the
user's local today with either

    datetime.datetime.now().replace(hour=0, minute=0, second=0)

or

    datetime.datetime.combine(
        datetime.date.today(),
        datetime.time())

and once send over JSON-RPC the server will get the local datetime
in UTC to the server's format.

nb: user-local means "in the timezone of the user's browser" in this
context.

bzr revid: xmo@openerp.com-20140122151911-akn1nr6e739eg92s
2014-01-22 16:19:11 +01:00
Christophe Matthieu 91f44259b6 [FIX] website_sale: ecommerce_change_pricelist context
bzr revid: chm@openerp.com-20140122151852-ia7x4sd5l2h7oskx
2014-01-22 16:18:52 +01:00
Fabien Meghazi 1895d8bd76 [FIX] clear ir.ui.view cache on translation write/create
bzr revid: fme@openerp.com-20140122151327-keaozhwa7rx4qj73
2014-01-22 16:13:27 +01:00
Fabien Meghazi 9cd7e946b2 [FIX] clear ir.ui.view cache on write()
bzr revid: fme@openerp.com-20140122150230-bfb02rtxm3ojpvye
2014-01-22 16:02:30 +01:00
Thibault Delavallée 7dd432cd5d [MERGE] [REF] [IMP] base_action_rule: allow using a resource.calendar to compute
day-based timing conditions.

[REF] resource: cleaned, refactored and improved code for resource.calendar
module. Old API is kept for backward compatibility.
[TESTS] resource: added tests for the new implementation of the various
methods.

[IMP] base_action_rule: using the resource module, added the possibility
to specify a resource.calendar to compute day-based timing conditions.

[IMP] hr_contract: added an override of base action rule to add the possibility
of using an employees's resource.calendar to compute day-based timing
conditions.

bzr revid: tde@openerp.com-20140122150032-uu6mk8s0arachzy4
2014-01-22 16:00:32 +01:00
Christophe Matthieu 0fe979572b [FIX] website_sale: test tour
bzr revid: chm@openerp.com-20140122145821-da1l5l5bji39j5mv
2014-01-22 15:58:21 +01:00
Christophe Matthieu 0c5b6caa10 [FIX] website: payment get pricelist
bzr revid: chm@openerp.com-20140122145328-5xjhu5uublljqdkx
2014-01-22 15:53:28 +01:00
Josse Colpaert a173b17ce3 [IMP] Use quant instead of move
bzr revid: jco@openerp.com-20140122143951-vywil9totup32kib
2014-01-22 15:39:51 +01:00
Thibault Delavallée 339c2ecc54 [IMP] default_interval also in schedule_hours, allowing to
schedule some work with a default calendar, like previous version
of resource module.

bzr revid: tde@openerp.com-20140122142805-8zyntmkx72l10fbq
2014-01-22 15:28:05 +01:00
ddm@openerp.com 3ddf62ac83 [FIX] HTML editor error reporting
bzr revid: ddm@openerp.com-20140122142537-as7tyryit0ft0p35
2014-01-22 15:25:37 +01:00
Cedric Snauwaert f7d2d9e918 [FIX]remove setting for stock_no_autopicking that has been removed
lp bug: https://launchpad.net/bugs/1271466 fixed

bzr revid: csn@openerp.com-20140122141123-wbxk3exizay9cgf9
2014-01-22 15:11:23 +01:00
Xavier Morel 36eedfab43 [ADD] JSONify Date objects to a UTC datetime in OpenERP server format
This way, the client can send genuine local Date objects without
caring too much, the server will get them in an expected format. This
can then be used by leaving Date objects in domains, and have these
date objects end up correctly in the server without creators of
domains having to manually serialize them to UTC from a local datetime
somehow.

bzr revid: xmo@openerp.com-20140122135426-zm80cj5wm9iebs76
2014-01-22 14:54:26 +01:00
Martin Trigaux dec3b8176e [MERGE] [FIX] plugin: fixing issues with push_message method (opw 593592)
retrieve 'message_id' key from dict produced by message_parse instead of 'message-id'
add author_id, message_from and message_id info
set message with content as html, do not add body_html field which is inexistant in mail.message model

bzr revid: mat@openerp.com-20140122134728-558gkuhjpi2bc277
2014-01-22 14:47:28 +01:00
Thibault Delavallée 2f275894f3 [CLEAN] resource: removed some TDE NOTE
bzr revid: tde@openerp.com-20140122134700-0iwb4uhg8jjdjzxn
2014-01-22 14:47:00 +01:00
Thibault Delavallée 6df94832bd [CLEAN] resource: some cleaning in docstrings
bzr revid: tde@openerp.com-20140122134609-7fvd1p49r8e40zoa
2014-01-22 14:46:09 +01:00
Denis Ledoux d69ecb8d8f [FIX] mrp, stock: avoid float rounding errors using float_compare
bzr revid: dle@openerp.com-20140122133822-fkt5gqanpptlx9jx
2014-01-22 14:38:22 +01:00
Fabien Meghazi 92f06e7eab [MERGE] server side login
bzr revid: fme@openerp.com-20140122133757-hougjgwesg9n9s1p
2014-01-22 14:37:57 +01:00
Fabien Meghazi fc7711066b [MERGE] server side login
bzr revid: fme@openerp.com-20140122133720-2cjcdymf6qqj213u
2014-01-22 14:37:20 +01:00
Fabien Meghazi e475921d56 [MERGE] server side login
bzr revid: fme@openerp.com-20140122133639-dofswdeao3b2htbh
2014-01-22 14:36:39 +01:00
Gery Debongnie a3bb723379 [IMP] changes the backend code of graph view to use the new functionality of read_group (use 'field_name:interval' in readgroup instead of context (addon web_graph)
bzr revid: ged@openerp.com-20140122133452-wy3hrsrokhnwc3ru
2014-01-22 14:34:52 +01:00
Thibault Delavallée 9fbbba1ee0 [IMP] resource : some docstrings cleaning + void calendar
taken into account in days scheduling + finished yesys

bzr revid: tde@openerp.com-20140122132918-4c1ag6y5gqasi32d
2014-01-22 14:29:18 +01:00
Cedric Snauwaert 8eff4a3af8 [FIX]inventory adjustment: move_ids should be readonly once inventory has been validated
lp bug: https://launchpad.net/bugs/1271262 fixed

bzr revid: csn@openerp.com-20140122132730-x0oiddxio1nkiwo3
2014-01-22 14:27:30 +01:00
ddm@openerp.com bdc1266264 [FIX] HTML editor, reopen template
bzr revid: ddm@openerp.com-20140122132338-4mhth5fzy8iijxja
2014-01-22 14:23:38 +01:00
Christophe Matthieu 6979de83cb [FIX] website snippet vs widget on drop
bzr revid: chm@openerp.com-20140122132159-efse87uk30t0tehv
2014-01-22 14:21:59 +01:00
Cedric Snauwaert e086290eb0 [FIX]inventory adjustment: should not show negative qty at start and prevent user should not input negative qty
lp bug: https://launchpad.net/bugs/1271244 fixed

bzr revid: csn@openerp.com-20140122130411-vab09j3bo5r7ks0f
2014-01-22 14:04:11 +01:00
ajay javiya (OpenERP) a7a07a3334 [IMP]: replace boolean is_optional with one2many optional_line_id
bzr revid: aja@tinyerp.com-20140122130158-9js853et0uf74d5b
2014-01-22 18:31:58 +05:30
Ravi Gohil (OpenERP) 8b20bb442c [FIX] plugin: Email pushed from Outlook plugin does not have body content and 'Author' and 'From' are set blank and/or incorrectly. (Maintenance Case: 593592,602431)
bzr revid: rgo@tinyerp.com-20140122125231-zarrt1rzx6pyerf6
2014-01-22 18:22:31 +05:30
Josse Colpaert 93d932da55 [IMP] Pass active_id in context
bzr revid: jco@openerp.com-20140122125211-flbai1rfuhy568f3
2014-01-22 13:52:11 +01:00
Christophe Matthieu d724f00198 [FIX] website_sale: promo code
bzr revid: chm@openerp.com-20140122124809-9xha1jsnnxaod65z
2014-01-22 13:48:09 +01:00
Gery Debongnie d0806ed3f7 [FIX] makes the querygroup methods compatible with the 'field:interval' format of groupbys accepted by read_group
bzr revid: ged@openerp.com-20140122124449-4nodai5vkoz3eryf
2014-01-22 13:44:49 +01:00
Gery Debongnie 74386a5bb9 [IMP] changes the method read_group so that it now accepts groupbys of the form 'field:groupby_function', like 'create_date:week' for example. Also, removes the previous hack using the context (orm.py)
bzr revid: ged@openerp.com-20140122124206-b5p06tpzw2i7tpo2
2014-01-22 13:42:06 +01:00
Thibault Delavallée ec2c2d4e86 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20140122123237-5rc5fdyau0422fj2
2014-01-22 13:32:37 +01:00
Josse Colpaert fbd144c9e7 [WIP] Start changing move to quant
bzr revid: jco@openerp.com-20140122123159-v9tvkzrry61a6n39
2014-01-22 13:31:59 +01:00
Gery Debongnie 4845221231 [FIX] fixes the call to read_group to make it use the new way to group dates by interval, instead of using the context (addon mass mailing)
bzr revid: ged@openerp.com-20140122122251-t0yrrjfa6ob5eoj0
2014-01-22 13:22:51 +01:00
ajay javiya (OpenERP) 78247bf308 [ADD] : counter with remaining time
bzr revid: aja@tinyerp.com-20140122121856-li5wzu0j8grlts3d
2014-01-22 17:48:56 +05:30
Thibault Delavallée d944a652dc [FIX] product: when computing lst_price, that is the public price
computed based on the template price + margin and extra, use the
pricelist currency if a pricelist has been given. This alows for
example to have 'promo' prices on the ecommerce that are in the
same currency.

bzr revid: tde@openerp.com-20140122120042-ovh2mi70q0beeqwq
2014-01-22 13:00:42 +01:00
Christophe Matthieu 8256bdfe44 [IMP] website: add a log report in tour test
bzr revid: chm@openerp.com-20140122112041-id595hkptgzoym6w
2014-01-22 12:20:41 +01:00
Fabien Meghazi fff9749edd [ADD] TODO for database manager
bzr revid: fme@openerp.com-20140122105712-cawi7lp0mnm9k9hv
2014-01-22 11:57:12 +01:00
Fabien Meghazi fea8520889 [FIX] local_redirect() should forward code to redirect_with_hash()
bzr revid: fme@openerp.com-20140122104022-hal3xe6eywffly3u
2014-01-22 11:40:22 +01:00
Fabien Meghazi c450c82e74 [IMP] use company logo controller for login layout
bzr revid: fme@openerp.com-20140122102646-ftmcud2yn7062ohq
2014-01-22 11:26:46 +01:00
Fabien Meghazi 5013315f57 [MERGE] upstream
bzr revid: fme@openerp.com-20140122102358-te3vpyhblujbxkzt
2014-01-22 11:23:58 +01:00