Christophe Matthieu
385986cc9d
[MERGE] from trunk-fix-1084424: use abs(v)<epsilon when checking a small difference between 2 values
...
bzr revid: chm@openerp.com-20121203151655-1eehju2e61mtlfxw
2012-12-03 16:16:55 +01:00
vta vta@openerp.com
44f27eca8e
[IMP] Improve M2OButton.
...
bzr revid: vta@openerp.com-20121203151525-j464860k1ueqztp6
2012-12-03 16:15:25 +01:00
Olivier Dony
40becc876d
[MERGE] stock: proper quantity rounding, courtesy of Sebastien Lange (Syleam)
...
bzr revid: odo@openerp.com-20121203150134-eqej5zsjzm4a4z90
2012-12-03 16:01:34 +01:00
niv-openerp
06ca46957c
Added small effect on conversations
...
bzr revid: nicolas.vanhoren@openerp.com-20121203145009-osxforhc5om0zaeu
2012-12-03 15:50:09 +01:00
Xavier ALT
6f4e427213
[FIX] l10n_lu: COA: replace reserve/surplus account by income/expense opening accounts
...
bzr revid: xal@openerp.com-20121203144808-wbpwp7dem8gir1sx
2012-12-03 15:48:08 +01:00
Raphael Collet
41ceffd52b
[ADD] auth_signup: merge in functionality of auth_reset_password
...
bzr revid: rco@openerp.com-20121203144424-39wrr5z78smswox2
2012-12-03 15:44:24 +01:00
Xavier ALT
f554a16430
[MERGE] l10n_lu: removed xml view referencing unexisting fields (removed in a previous commit)
...
forward-port of v6.1 addons revid: qdp-launchpad@openerp.com-20120717233637-gyslmk25604r5rfz
bzr revid: xal@openerp.com-20121203142047-12s7l6od56uq6r58
2012-12-03 15:20:47 +01:00
Xavier ALT
ea0240c011
[MERGE] l10n_lu: forward-port chart-of-account and tax updates
...
bzr revid: xal@openerp.com-20121203141941-wwimo1ldpri95o3p
2012-12-03 15:19:41 +01:00
niv-openerp
6b0cd14ce8
merge trunk
...
bzr revid: nicolas.vanhoren@openerp.com-20121203135125-wxhzh2ga3qpw6mte
2012-12-03 14:51:25 +01:00
Antonin Bourguignon
df6a5e1a73
[MERGE] trunk
...
bzr revid: abo@openerp.com-20121203133455-81ewscuz0o94helo
2012-12-03 14:34:55 +01:00
Tejas Tank
56ed801148
Merged Latest
...
bzr revid: tta@openerp.com-20121203132941-obr5lph9af9cymbq
2012-12-03 18:29:41 +05:00
Bhumi Thakkar (Open ERP)
eb75f47a0c
[FIX] user who has hr/employee rights can invite users.
...
bzr revid: bth@tinyerp.com-20121203132746-x568lcknr6hprhq4
2012-12-03 18:57:46 +05:30
ajay javiya (OpenERP)
61639fd491
[FIX]:Issue of add custome field on object
...
bzr revid: aja@tinyerp.com-20121203132713-298spxst191htlh7
2012-12-03 18:57:13 +05:30
Sanjay Gohel (Open ERP)
c91da1fb35
[MERGE]merge with latest trunk
...
bzr revid: sgo@tinyerp.com-20121203132425-umzbdj5gm6m29b6c
2012-12-03 18:54:25 +05:30
Vishmita
8207b38ab1
[FIX]set message when email send successfully to user in reset password
...
bzr revid: vja@tinyerp.com-20121203132358-uiaoi5xgejxtzkul
2012-12-03 18:53:58 +05:30
Sanjay Gohel (Open ERP)
cd7cbce093
[MERGE]merge with lp:~openerp-dev/openobject-addons/trunk-tracked-fields-chs-handle-stage-sgo
...
bzr revid: sgo@tinyerp.com-20121203131758-bge2ditl4yl7vhqu
2012-12-03 18:47:58 +05:30
Christophe Matthieu
7769228419
[IMP] mail: _notify, change read into browse
...
bzr revid: chm@openerp.com-20121203131206-ks7tjpf7voei00at
2012-12-03 14:12:06 +01:00
Foram Katharotiya (OpenERP)
e1d1b049c1
[IMP] remove _get_subscription_data method
...
bzr revid: fka@tinyerp.com-20121203130126-1ofjqy0w459q58p1
2012-12-03 18:31:26 +05:30
Olivier Dony
6c00237919
[MERGE] instance.init: less offensive constant
...
bzr revid: odo@openerp.com-20121203125820-e1k8dphqhp35z2z2
2012-12-03 13:58:20 +01:00
Vishmita
7f8eeaed36
[MERGE]Merge lp:openobject-addons
...
bzr revid: vja@tinyerp.com-20121203123254-5nxab019yuwwda80
2012-12-03 18:02:54 +05:30
Xavier Morel
f9670e67a2
[FIX] rollback default conversion of js Object to py.object (not py.dict) and add default toJSON to all py.object
...
* Accesses in contexts & domains are object derefs, so using dicts was
dumb
* But objects still need to round-trip through in case of e.g. o2m
commands in contexts, so py.object needs a toJSON (or a special
object kind needs to be added, specifically for round-tripping
objects through)
bzr revid: xmo@openerp.com-20121203122312-gc499mujf4l0nuz7
2012-12-03 13:23:12 +01:00
pankita shah (Open ERP)
0c375a3d6f
[IMP] improve data(Immediate Payment,15days) and remove data from data(30 Days end of Month,30% Advance, End 30 Days) and keep in demo
...
bzr revid: shp@tinyerp.com-20121203121900-fb52ryi5d2acolj8
2012-12-03 17:49:00 +05:30
Xavier Morel
54ea7670d3
[FIX] incorrect conversion of JS arrays to py.js lists/tuples
...
bzr revid: xmo@openerp.com-20121203114706-dn5sqq3glqst4g1q
2012-12-03 12:47:06 +01:00
Thibault Delavallée
ce923903b5
[IMP] [REVIEW] [DOC] addons: added some comments in the various data files about subtypes.
...
bzr revid: tde@openerp.com-20121203114009-obtca9gf3t7b909y
2012-12-03 12:40:09 +01:00
Thibault Delavallée
3b06de54cc
[IMP] base_status: updated Chatter body messages to have shorter sentences.
...
bzr revid: tde@openerp.com-20121203113936-cgyvn0io82twh2be
2012-12-03 12:39:36 +01:00
Thibault Delavallée
300e802490
[IMP] [REVIEW] project: cleaned subtypes, added comments in data files. Updated messages body to have shorter sentences.
...
bzr revid: tde@openerp.com-20121203113906-g0nhtn9j22d3lf0b
2012-12-03 12:39:06 +01:00
Christophe Matthieu
96cd88b04c
[MERGE] from trunk-patest-w45: date and timerelative with timezone
...
bzr revid: chm@openerp.com-20121203113044-p7xbxnva5kg9xbpu
2012-12-03 12:30:44 +01:00
Jalpesh Patel (OpenERP)
48c3aee44d
[Merge] Merge with lp:openobject-addons
...
bzr revid: pja@tinyerp.com-20121203112559-ofkbangr2rzhrud8
2012-12-03 16:55:59 +05:30
vta vta@openerp.com
04149ce60e
[FIX] Fixed context, and added comments as per TDE suggestion.
...
bzr revid: vta@openerp.com-20121203110131-suh6dc2y4gfsp933
2012-12-03 12:01:31 +01:00
Vo Minh Thu
7afd9783e8
[IMP] Use the loglevel TEST when logging test file loading and testsuite execution.
...
bzr revid: vmt@openerp.com-20121203104228-8a5on97pn9r1klls
2012-12-03 11:42:28 +01:00
Christophe Matthieu
e87ff010e7
[MERGE] from trunk-openchatter-doc-chm: doc to use openchatter client action and options
...
bzr revid: chm@openerp.com-20121203102923-nd7qfc5002bmajdg
2012-12-03 11:29:23 +01:00
Vidhin Mehta (OpenERP)
2e05f7f6f5
[IMP]lib issue of jquery ui custom.bug already post on jquery ui support http://bugs.jqueryui.com/ticket/5466 .
...
bzr revid: vme@tinyerp.com-20121203102736-usb3qcd03sdxkxfi
2012-12-03 15:57:36 +05:30
dle@openerp.com
2bfd5ecdf7
[FIX]Syntax according to sublime-linter, remove of unused variables
...
bzr revid: dle@openerp.com-20121203102112-jsxy7th8v0bfolv4
2012-12-03 11:21:12 +01:00
Hiral Patel (OpenERP)
d316e72623
[FIX][trunk] column id on table sale_order doesn't exist after unistall module delivery
...
bzr revid: hip@tinyerp.com-20121203095209-dryb4c2iews10s4b
2012-12-03 15:22:09 +05:30
Thibault Delavallée
c3a3492848
[MERGE] Sync with trunk.
...
bzr revid: tde@openerp.com-20121203093454-lf21qlsuse1ve8ro
2012-12-03 10:34:54 +01:00
ggh-openerp
5ed6cae896
[IMP]Event registration create from SO we remove one messages
...
bzr revid: ggh@tinyerp.com-20121203093441-ldiliu306x7l7ii0
2012-12-03 15:04:41 +05:30
Paramjit Singh Sahota
6af43c05f1
[FIX][trunk] Process view broken again. Link to object context problems.
...
lp bug: https://launchpad.net/bugs/1085017 fixed
bzr revid: psa@tinyerp.com-20121203092416-k35t4bf5dq6c20l0
2012-12-03 14:54:16 +05:30
Christophe Matthieu
3e91a0a80b
[IMP] mail: doc
...
bzr revid: chm@openerp.com-20121203092317-cq9xbl9g4xgn58kq
2012-12-03 10:23:17 +01:00
Christophe Matthieu
b577b29487
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20121203091951-fd9dn570gfv13edr
2012-12-03 10:19:51 +01:00
Christophe Matthieu
ffe7fd9bcc
[FIX] etherpad: When a user access to the edit mode from a kanban view or list view, etherpad is dipslay on readonly mode but with the oe_editing class. Why: The deferer for read only arrive after the display of edit mode. Fix: check in the deferer if the etherpad is already in readonly mode.
...
bzr revid: chm@openerp.com-20121203085116-jn83em3pd5le28rp
2012-12-03 09:51:16 +01:00
Xavier Morel
0b54cbb64f
[IMP] update py.js for abs builtin support
...
bzr revid: xmo@openerp.com-20121203084803-ib325gp18g5xvdv6
2012-12-03 09:48:03 +01:00
Vishmita
305f64478d
[FIX]Change report title
...
bzr revid: vja@tinyerp.com-20121203081331-w7ahvcy6garpn4v8
2012-12-03 13:43:31 +05:30
Tejas Tank
61382204dc
[FIX] Does not require to set related field in default.
...
bzr revid: tta@openerp.com-20121203074442-cbzavdhswqyd306g
2012-12-03 12:44:42 +05:00
Ajay Chauhan (OpenERP)
2469d3b4ab
[MERGE] merge with lp:openobject-server
...
bzr revid: cha@tinyerp.com-20121203062636-xnhqfm6491lib2hl
2012-12-03 11:56:36 +05:30
Paramjit Singh Sahota
4521ee8108
[IMP] Improved code for the End Date field: which should be updated automatically if you change the Scheduled Date.
...
bzr revid: psa@tinyerp.com-20121203062209-t57bjlhw0vkraeg0
2012-12-03 11:52:09 +05:30
Divyesh Makwana (Open ERP)
0993b7fcc2
[Merge] Merge with main addons.
...
bzr revid: mdi@tinyerp.com-20121203055922-apvkuwgy02d62rsx
2012-12-03 11:29:22 +05:30
Paramjit Singh Sahota
77a640594e
[IMP] Improved.
...
bzr revid: psa@tinyerp.com-20121203053238-mv0xz9mexf651f87
2012-12-03 11:02:38 +05:30
Tejas Tank
82b2faa366
Merged Latest.
...
bzr revid: tta@openerp.com-20121203052209-cxcrp8nru1rvd6y1
2012-12-03 10:22:09 +05:00
Ajay Chauhan (OpenERP)
8b67b2f597
[MERGE] merge with main addons
...
bzr revid: cha@tinyerp.com-20121203052157-f40ofmgrxws7oktx
2012-12-03 10:51:57 +05:30
Paramjit Singh Sahota
4290c54aa7
[MERGE] Merged lp:openobject-addons.
...
bzr revid: psa@tinyerp.com-20121203051142-3kqunad7eob21ujn
2012-12-03 10:41:42 +05:30