Commit Graph

62340 Commits

Author SHA1 Message Date
Sanjay Gohel (Open ERP) 8f83c2194b [IMP]pos tab in user will show edit button only in edit form and change string of form and help
bzr revid: sgo@tinyerp.com-20121105131121-umf8viq2gy1mf3p9
2012-11-05 18:41:21 +05:30
Launchpad Translations on behalf of openerp 2d42b35fba Launchpad automatic translations update.
bzr revid: odo@openerp.com-20121105111708-086ye2o6s2a8i7sn
2012-11-05 12:17:08 +01:00
Fabien Pinckaers ef3210031d [MERGE] pos: fix multicompany bugs
(this is also an attempt to fix history breakage due to fp-style merge)

bzr revid: odo@openerp.com-20121105111609-yuaw6wu6jd1ar2a1
2012-11-05 12:16:09 +01:00
Launchpad Translations on behalf of openerp 958edad965 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121105044053-iwdfmabj0neffc9o
2012-11-05 04:40:53 +00:00
Launchpad Translations on behalf of openerp 29fffbc97d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121104045554-ygf95bxx3xy44tm1
2012-11-04 04:55:54 +00:00
Fabien Pinckaers 974ca267cf [MERGE] fix multi-company for pos
bzr revid: fp@openerp.com-20121103172128-rx5lvo5xzmsj9ay1
2012-11-03 18:21:28 +01:00
Fabien Pinckaers 4a15e55895 [FIX] bug pos
bzr revid: fp@openerp.com-20121103171627-7mvvn13494ofbbh0
2012-11-03 18:16:27 +01:00
Fabien Pinckaers 74476c8e22 [FIX] POS close session without cash register
bzr revid: fp@openerp.com-20121103171225-nlp53s0aenamdhcg
2012-11-03 18:12:25 +01:00
Antony Lesuisse 74cda3df5b [MERGE] content-disposition fixes by Giedrius Slavinskas
lp bug: https://launchpad.net/bugs/1072803 fixed

bzr revid: al@openerp.com-20121103153406-m2xlwm9af2ekcdc7
2012-11-03 16:34:06 +01:00
Antony Lesuisse 8d82b8bb96 [MERGE] view_editor css fixes
bzr revid: al@openerp.com-20121103152724-ag7pq44gm8tmwsv5
2012-11-03 16:27:24 +01:00
Fabien Pinckaers fa90c9e771 [MERGE] trunk
bzr revid: fp@openerp.com-20121103152552-zlf761mkoxbgyxfh
2012-11-03 16:25:52 +01:00
Fabien Pinckaers ce874db95a [FIX] POS
bzr revid: fp@openerp.com-20121103152504-f3o6ce0e833hdibj
2012-11-03 16:25:04 +01:00
Antony Lesuisse cdd2398496 [MERGE] auth_signup jsonrpc instead of post and redirect
bzr revid: al@openerp.com-20121103144237-5otizomez1du5iyq
2012-11-03 15:42:37 +01:00
Fabien Pinckaers 15be6914be [IMP] typo
bzr revid: fp@openerp.com-20121103134730-z42xnfgieoccl16i
2012-11-03 14:47:30 +01:00
Fabien Pinckaers 367edaad26 [IMP] order of invoice types
bzr revid: fp@openerp.com-20121103134512-mwkqzsnz3ndy5fsb
2012-11-03 14:45:12 +01:00
Fabien Pinckaers c7550c110a [IMP] typo
bzr revid: fp@openerp.com-20121103133857-6aly1tcxv5jkfp8y
2012-11-03 14:38:57 +01:00
Fabien Pinckaers e0453227ef [IMP] useability: invisible contract type if defined by default
bzr revid: fp@openerp.com-20121103133510-nsuenjvgbkbxx2ub
2012-11-03 14:35:10 +01:00
Launchpad Translations on behalf of openerp f3a92c9633 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121103050437-hjtar0inhj4gqyfi
2012-11-03 05:04:37 +00:00
Fabien Pinckaers b020e99c8c [FIX] english typo
bzr revid: fp@openerp.com-20121102174603-i5hsivz4ktg7n7ns
2012-11-02 18:46:03 +01:00
Fabien Pinckaers c058a0dd37 [IMP] mrp work orders visible only when option activated
bzr revid: fp@openerp.com-20121102174336-e2w6okf83axcxqs1
2012-11-02 18:43:36 +01:00
Fabien Pinckaers 88bb090baa [MERGE] English typos
bzr revid: fp@openerp.com-20121102174200-wg7p02quakvby09j
2012-11-02 18:42:00 +01:00
Fabien Pinckaers 015aa35395 [MERGE] English typos
bzr revid: fp@openerp.com-20121102173850-nvj56rd5c8gp3k8x
2012-11-02 18:38:50 +01:00
Fabien Pinckaers 0acbe74789 [MERGE] English typos
bzr revid: fp@openerp.com-20121102173701-b424fq3bn7ferxbd
2012-11-02 18:37:01 +01:00
Fabien Pinckaers 68f87f818b [MERGE] English typos
bzr revid: fp@openerp.com-20121102173550-4dg9dmjlpp386vg9
2012-11-02 18:35:50 +01:00
Fabien Pinckaers cd68364301 [MERGE] English typos
bzr revid: fp@openerp.com-20121102173407-umicel4287htim14
2012-11-02 18:34:07 +01:00
Fabien Pinckaers 1d0c338860 [IMP] notes
bzr revid: fp@openerp.com-20121102172510-6pdu2sfdk7vlnnp5
2012-11-02 18:25:10 +01:00
Fabien Pinckaers 9483de8103 [MERGE]
bzr revid: fp@openerp.com-20121102172151-g300zcve1ongskyc
2012-11-02 18:21:51 +01:00
Fabien Pinckaers 01cd1742cc [FIX]
bzr revid: fp@openerp.com-20121102162805-tp46s4x40dwedkij
2012-11-02 17:28:05 +01:00
Fabien Pinckaers f47bf0fd0b [MERGE] addons 16 sale
bzr revid: fp@openerp.com-20121102162611-3nt9oo1zcyzjh81l
2012-11-02 17:26:11 +01:00
Fabien Pinckaers 4c68620d56 [MERGE] addons 16 survey
bzr revid: fp@openerp.com-20121102162246-ynz8g2yhfkbcq4f5
2012-11-02 17:22:46 +01:00
Thibault Delavallée 17a907fff4 [MERGE] Merged branch about task and issues followers being retrieved from the related project, with matching subtypes.
This implementation is not the best-one, because subscribing to a projet
does not subscribe the user to previous task; only future tasks (or issues).
However, the subtype model is quite experimental and is likely to be
improved in the next version. Therefore the current implementation
is kept.

bzr revid: tde@openerp.com-20121102162111-kg2q4u5gwu0z28kv
2012-11-02 17:21:11 +01:00
Fabien Pinckaers 3e491392aa [MERGE] empty
bzr revid: fp@openerp.com-20121102162109-o3cj87lu1djvz9hf
2012-11-02 17:21:09 +01:00
Fabien Pinckaers 20ac4c6df7 [MERGE] addons 16 stock
bzr revid: fp@openerp.com-20121102161902-nqbefjj2gwja1te8
2012-11-02 17:19:02 +01:00
Fabien Pinckaers 62a577e226 [MERGE] addons 16 contract
bzr revid: fp@openerp.com-20121102161629-174ot7zzls8l1ras
2012-11-02 17:16:29 +01:00
Fabien Pinckaers c2913a5cc0 [MERGE] addons 16
bzr revid: fp@openerp.com-20121102161101-hynn88pft6ipygy5
2012-11-02 17:11:01 +01:00
Fabien Pinckaers 5bf7721564 [MERGE] multi-True on some actions
bzr revid: fp@openerp.com-20121102160832-avu5on171u2lccge
2012-11-02 17:08:32 +01:00
Thibault Delavallée 93976b33f9 [DOC] Added some comments.
bzr revid: tde@openerp.com-20121102160734-gbh3iox0zb9hign7
2012-11-02 17:07:34 +01:00
Fabien Pinckaers 1cdba81560 [MERGE] multi=True
bzr revid: fp@openerp.com-20121102160613-rwq05zxz5r32ul80
2012-11-02 17:06:13 +01:00
Fabien Pinckaers 31cf1f3dec [MERGE]
bzr revid: fp@openerp.com-20121102160310-ektb2rrpsfs3weq8
2012-11-02 17:03:10 +01:00
Fabien Pinckaers 65e13a660a [MERGE] addons 16 hr attendances
bzr revid: fp@openerp.com-20121102155907-imopbpyapswzsp3u
2012-11-02 16:59:07 +01:00
Fabien Pinckaers 1e717e471c [IMP] note demo tpyo
bzr revid: fp@openerp.com-20121102155642-22xcfvifiycou7nu
2012-11-02 16:56:42 +01:00
Thibault Delavallée 0573d1fb40 [FIX] mail: fixed tests, with comment that became Discussions.
bzr revid: tde@openerp.com-20121102154548-5ayn6ns89xz54o70
2012-11-02 16:45:48 +01:00
Thibault Delavallée 3450efc109 [FIX] project_issue: fixed subtype implementation, about followers of project automatically following issues. Updated subtype names.
bzr revid: tde@openerp.com-20121102154154-o8dpil045ub2spbd
2012-11-02 16:41:54 +01:00
Cedric Snauwaert 499cc41b20 [FIX]module account_asset : fix the date problem with depreciation board (without using prorata) when recomputing the board and some entries were already validated
bzr revid: csn@openerp.com-20121102152751-6jt0uom3hqn8arhs
2012-11-02 16:27:51 +01:00
Thibault Delavallée d8a67f02f8 [FIX] project: fixed auto-follow for task and cleaned code. Also fixed subtype name and related models, as well as comment, now Discussions.
bzr revid: tde@openerp.com-20121102152430-mww1cqcjiluuhtvv
2012-11-02 16:24:30 +01:00
Thibault Delavallée ec906e2f02 [MERGE] Sync with addons/trunk.
bzr revid: tde@openerp.com-20121102145711-qyht7qj9s1gfb21a
2012-11-02 15:57:11 +01:00
Xavier Morel 72a447bd95 [FIX] tabbing out of an m2o which opens some sort of weird dialog thing while in an editable o2m
The tab blurs the current fields, focuses the next one, then the
dialog thing opens and steals the focus from the *next* field (not the
one which created it), which thus triggers *blur* ultimately blurring
(and saving) the row being edited.

Add a trigger call in some random place which seems to make things not
fail.

bzr revid: xmo@openerp.com-20121102141348-5au6sarq0mw2ct67
2012-11-02 15:13:48 +01:00
Xavier Morel 956bfd007d [REV] garbage
bzr revid: xmo@openerp.com-20121102140127-69e3ae5vca1ni46r
2012-11-02 15:01:27 +01:00
vta vta@openerp.com a360547db8 [MERGE] Merged trunk-improve-google-doc-vba.
bzr revid: vta@openerp.com-20121102132240-5kgbexueqh6envkf
2012-11-02 14:22:40 +01:00
Nimesh (Open ERP) d67c150411 [MERGE] merge with lp:openobject-addons
bzr revid: nco@tinyerp.com-20121102132223-d18m3nsi7mgwt868
2012-11-02 18:52:23 +05:30