Commit Graph
70704 Commits
Author SHA1 Message Date
Fabien Pinckaers f325ec810f [FIX] web graphs for selections
bzr revid: fp@tinyerp.com-20120917163740-l6cb5dhpgyhl3c50
2012-09-17 18:37:40 +02:00
Fabien Pinckaers bfaaf55f9f [IMP] events form view cleaned
bzr revid: fp@tinyerp.com-20120917163301-8b1hf7cklxmx4pcn
2012-09-17 18:33:01 +02:00
Thibault Delavallée 0ff327fa66 [MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120917160657-3zjj4evb1ezgo94a
2012-09-17 18:06:57 +02:00
Thibault Delavallée 8193da95a6 [FIX] [WIP] Fixed a auto-crashing test to auto-ok, event if this is not a real test. Just to try to have a green runbot.
bzr revid: tde@openerp.com-20120917160613-xpd49jz90zith0md
2012-09-17 18:06:13 +02:00
Antonin Bourguignon 01c3220f8e [MERGE] trunk-bug-1050747-cha: bring the event buttons back in the event form view's header by using the proper xml id in @groups
lp bug: https://launchpad.net/bugs/1050747 fixed

bzr revid: abo@openerp.com-20120917160607-p9nc7kpryriz0u3b
2012-09-17 18:06:07 +02:00
Thibault Delavallée 6433a61ec4 [FIX] mail_message: in check_access_rules, use self._table instead of hadcodded mail_message; fix a bug hwen using mail_compose_message. TODO: check if this model has to use the rule checking or not.
bzr revid: tde@openerp.com-20120917160435-9ktdy4vpznvwr51s
2012-09-17 18:04:35 +02:00
Thibault Delavallée fa9a3e6630 [IMP] res_users: added readable files, to allow people like portal users to see their name and basic data when logging...
bzr revid: tde@openerp.com-20120917160241-k96a24nf60jgr0h8
2012-09-17 18:02:41 +02:00
niv-openerp 4de5eb2c96 remove useless stuff
bzr revid: nicolas.vanhoren@openerp.com-20120917155254-n9k71w41ik5o10vw
2012-09-17 17:52:54 +02:00
niv-openerp c9b2356ec7 finally got a fucking working version
bzr revid: nicolas.vanhoren@openerp.com-20120917154103-97mg5dp41oyfhq80
2012-09-17 17:41:03 +02:00
Stephane Wirtel 69d83db1e5 [MERGE] point_of_sale: select the cash journals and hide some elements on the form view.
bzr revid: stw@openerp.com-20120917153714-kelopzdwaysht3pd
2012-09-17 17:37:14 +02:00
Thibault Delavallée abf16c58c6 [IMP] Addons: added invisible field for message_is_follower; note: reidented view; account_voucher: reidented one view.
bzr revid: tde@openerp.com-20120917153533-u102ds3eo1xr1mnt
2012-09-17 17:35:33 +02:00
niv-openerp 396d0d2abe merge trunk
bzr revid: nicolas.vanhoren@openerp.com-20120917153420-vnnulpokzz2l6kvb
2012-09-17 17:34:20 +02:00
niv-openerp 17dd57ee2e put back one more thing
bzr revid: nicolas.vanhoren@openerp.com-20120917153343-9i33ossljtfkl8op
2012-09-17 17:33:43 +02:00
niv-openerp ac47444f6a put back necessary stuff
bzr revid: nicolas.vanhoren@openerp.com-20120917152722-mknjm8lckr8nr83c
2012-09-17 17:27:22 +02:00
niv-openerp d53b210128 removed more stuff
bzr revid: nicolas.vanhoren@openerp.com-20120917151218-4k5c6pnjfxic2v2o
2012-09-17 17:12:18 +02:00
niv-openerp cd12a0faf5 removed lot of stuff
bzr revid: nicolas.vanhoren@openerp.com-20120917151031-h3gofzqv23k6g0t7
2012-09-17 17:10:31 +02:00
Quentin (OpenERP) 2ee0b276cc [FIX] account: accounting creation from bank statement fixed (no partner was assigned on receivable/payable account.move.line)
bzr revid: qdp-launchpad@openerp.com-20120917150548-l081zgzoxz0c8qw5
2012-09-17 17:05:48 +02:00
Raphael Collet 5697e1a776 [FIX] portal: fix incorrect external reference in test
bzr revid: rco@openerp.com-20120917150316-o6kz70nvnm06elwq
2012-09-17 17:03:16 +02:00
Thibault Delavallée 0fea3331ae [TEST] Portal: added some basic tests about access rights.
bzr revid: tde@openerp.com-20120917150157-hyhfrfo249aovfs3
2012-09-17 17:01:57 +02:00
Thibault Delavallée 7f309d2df0 [FIX] Mail: fixed mail_followers widget, now taking into account crash when reading message_follower_ids, to disply only the number of followers, when the user does not have read access on the partners (ex: portal members).
bzr revid: tde@openerp.com-20120917150129-7ahagbvopo2iqoe5
2012-09-17 17:01:29 +02:00
Raphael Collet 0d2e280567 [IMP] portal: improve note on portal group
bzr revid: rco@openerp.com-20120917145825-jq6xux6tzob8pm66
2012-09-17 16:58:25 +02:00
Antonin Bourguignon 091b2d4892 [FIX] typo
bzr revid: abo@openerp.com-20120917145345-atyfzfq6juls0siu
2012-09-17 16:53:45 +02:00
Fabien Pinckaers abf3d2bd53 [IMP] product explanation about the business flow
bzr revid: fp@tinyerp.com-20120917144740-2hsb04t8dpzxzuue
2012-09-17 16:47:40 +02:00
niv-openerp 57ffffbdba merge trunk
bzr revid: nicolas.vanhoren@openerp.com-20120917144607-x6isco6j9a4vt3ah
2012-09-17 16:46:07 +02:00
Fabien Pinckaers 62cda268fe [IMP] invert Save and new, Save and Close
bzr revid: fp@tinyerp.com-20120917140630-sxk5cuiaadfc8wn4
2012-09-17 16:06:30 +02:00
Stephane Wirtel 2a4aaeba31 [FIX] point_of_sale: Show/Hide some groups in function of the state and the cash_control flag
bzr revid: stw@openerp.com-20120917140138-sjsnjxv27nd8rnao
2012-09-17 16:01:38 +02:00
niv-openerp 510dadb76f wip
bzr revid: nicolas.vanhoren@openerp.com-20120917134957-1ita6sb869bj3q1i
2012-09-17 15:49:57 +02:00
Thibault Delavallée 198fd2b12c [IMP] Portal: removed access on res.partner.
bzr revid: tde@openerp.com-20120917134849-ehbv3oq0lhmm19jh
2012-09-17 15:48:49 +02:00
Thibault Delavallée d3e328d3cc [FIX] Portal: fixed demo portal user, linked to asustek, overriding default values, makign some tests crash. Demo portal user should have its own partner.
bzr revid: tde@openerp.com-20120917134832-9t5w8ax3gw3v2y8e
2012-09-17 15:48:32 +02:00
Raphael Collet 6dc01c405b [IMP] portal: simplify portal access management wizard
bzr revid: rco@openerp.com-20120917132212-wo2wrjzja0xsuys8
2012-09-17 15:22:12 +02:00
Harry (OpenERP) 7f0cff07dc [MERGE]
bzr revid: hmo@tinyerp.com-20120917131814-3jmycf6evqk069eg
2012-09-17 18:48:14 +05:30
Jiten (OpenERP) 18864e16cd [MERGE] Merged trunk.
bzr revid: jra@tinyerp.com-20120917131238-wrfdaw9zzivp294k
2012-09-17 18:42:38 +05:30
Jiten (OpenERP) 130119e1db [FIX] Display name instead of number in graph of purchase.
bzr revid: jra@tinyerp.com-20120917054124-1q8gt53scpx9zzpp
bzr revid: jra@tinyerp.com-20120917130934-710qntzcvl54112a
2012-09-17 18:39:34 +05:30
Harry (OpenERP) 765879d17c [MERGE]
bzr revid: hmo@tinyerp.com-20120917130506-yplwv5v9z4j9m7kg
2012-09-17 18:35:06 +05:30
niv-openerp a8418fda38 wip
bzr revid: nicolas.vanhoren@openerp.com-20120917125309-0ioenvhlkaue1lc6
2012-09-17 14:53:09 +02:00
Christophe Simonis 443a7ec6cc merge upstream
bzr revid: chs@openerp.com-20120917124637-f4v13kiah9dn6rz0
2012-09-17 14:46:37 +02:00
Christophe Simonis f988ed24f6 merge upstream
bzr revid: chs@openerp.com-20120917124543-2nc36e0z6jb2szq4
2012-09-17 14:45:43 +02:00
Antonin Bourguignon 4294ecb446 [MERGE] trunk-bug-1027875-rmu: remove deprecated groups="base.group_extended" from several views
also remove conflict file project_timesheet/project_timesheet_data.xml.THIS

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

bzr revid: abo@openerp.com-20120917124323-8lcufmjrj668e8c6
2012-09-17 14:43:23 +02:00
Christophe Matthieu 313c4ef511 [IMP] note: search, css
bzr revid: chm@openerp.com-20120917123054-futj80nzfo725kiv
2012-09-17 14:30:54 +02:00
Antonin Bourguignon 1d8007f03c [FIX] an error from the last merge
bzr revid: abo@openerp.com-20120917122821-0kfcipo5nw5gps08
2012-09-17 14:28:21 +02:00
Harry (OpenERP) f5f769acd3 [MERGE]
bzr revid: hmo@tinyerp.com-20120917122635-y2ghhj71sh23woz4
2012-09-17 17:56:35 +05:30
Amit Patel e6afcac5fd [MERGE]:employee should not access timesheets from the timesheets menu or also payslip
bzr revid: apa@tinyerp.com-20120917122012-rbkf1skp1oeevh5h
2012-09-17 17:50:12 +05:30
Stephane Wirtel 06852d994b [FIX] point_of_sale: Take the 'cash' journals if there is no specific cash journal for the Point Of Sale
bzr revid: stw@openerp.com-20120917120926-h3bzu2k9ds5lnjjr
2012-09-17 14:09:26 +02:00
niv-openerp 5638e061a8 wip
bzr revid: nicolas.vanhoren@openerp.com-20120917120442-y9921oljzpiwdvv0
2012-09-17 14:04:42 +02:00
Antonin Bourguignon ccb15e76f6 [MERGE] latest trunk
bzr revid: abo@openerp.com-20120917114455-nygv16c93qwcwnsx
2012-09-17 13:44:55 +02:00
Amit Patel a0de0c7e46 [IMP]:improved demo data
bzr revid: apa@tinyerp.com-20120917114022-ik1klx01aou35srb
2012-09-17 17:10:22 +05:30
Divyesh Makwana (Open ERP) e21d8c6968 [IMP] product : Put Pricelists menu under Sales/Configuration/Pricelists.
bzr revid: mdi@tinyerp.com-20120917113114-s81w72chvmh63o1e
2012-09-17 17:01:14 +05:30
Mayur Maheshwari (OpenERP) ba567b3850 [IMP]purchase : added name field in analytic plan,improve string of dashboard and invoice control, make purchase line editable when analytic distribution is available, added act_window of create invoice for incoming shipment
bzr revid: mma@tinyerp.com-20120917113113-irc6taebmwqrfxys
2012-09-17 17:01:13 +05:30
Harry (OpenERP) 88ce4c22d9 [FIX] stock: pass picking type in context to set default locations
bzr revid: hmo@tinyerp.com-20120917112642-k1wmdmy7b1jdcexs
2012-09-17 16:56:42 +05:30
Antonin Bourguignon 84094e0c39 [MERGE] trunk-bug-1026434-amb: add missing context to browse and read
lp bug: https://launchpad.net/bugs/1026434 fixed

bzr revid: abo@openerp.com-20120917110744-4g2j0zr9c6uv3ty1
2012-09-17 13:07:44 +02:00