Commit Graph
58809 Commits
Author SHA1 Message Date
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
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
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
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
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
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
Bhumi Thakkar (Open ERP) 29ff1bf82a [IMP] Improve code for return value of selection field.
bzr revid: bth@tinyerp.com-20120917110346-0daw7ho3y31zbpu3
2012-09-17 16:33:46 +05:30
Amit Patel 6be5f9556b [MERGE]:typo
bzr revid: apa@tinyerp.com-20120917102136-z44k7zh87yt0h34q
2012-09-17 15:51:36 +05:30
Harry (OpenERP) 8a05219372 [MERGE]
bzr revid: hmo@tinyerp.com-20120917101301-anj09ntq121kkzxn
2012-09-17 15:43:01 +05:30
Divyesh Makwana (Open ERP) ff4347bebd [FIX] crm_helpdesk : Send Reminder doesn't work.
bzr revid: mdi@tinyerp.com-20120917101109-owcdooikeo6ecv23
2012-09-17 15:41:09 +05:30
Antonin Bourguignon 5b80b5e193 [MERGE] trunk-bug-1026085-dsi: fix erroneous author in l10n_ec.
Thanks to Gnuthink Co.Ltd.

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

bzr revid: abo@openerp.com-20120917100437-ikh6g0glkahz9bk0
2012-09-17 12:04:37 +02:00
Amit Patel 7113ed2569 [MERGE]:trunk
bzr revid: apa@tinyerp.com-20120917100412-3sv68xkafq9y2i4j
2012-09-17 15:34:12 +05:30
Amit Patel e308d04d8e [MERGE]
bzr revid: apa@tinyerp.com-20120917100306-20mykzfvurzr71wm
2012-09-17 15:33:06 +05:30
Randhir Mayatra (OpenERP) c353c80621 [IMP] improve the purchase view
bzr revid: rma@tinyerp.com-20120917100152-miaqma5m5tw6n8bl
2012-09-17 15:31:52 +05:30
niv-openerp 48c3104836 wip
bzr revid: nicolas.vanhoren@openerp.com-20120917095518-fco1enwa3yl7mo2b
2012-09-17 11:55:18 +02:00
Divyesh Makwana (Open ERP) 3bdedaeb24 [IMP] crm : Calls, Opportunities, Leads should be restricted to the group Sales/User see all leads.
bzr revid: mdi@tinyerp.com-20120917095053-1v2b71j9b4cl8hxe
2012-09-17 15:20:53 +05:30
Antonin Bourguignon 46f7aa283b [IMP] code cleaning
bzr revid: abo@openerp.com-20120917094112-uahrew8q0jz6aqo3
2012-09-17 11:41:12 +02:00
Antonin Bourguignon fe4f1271dc [MERGE] latest trunk
bzr revid: abo@openerp.com-20120917092035-6kb78u9sr9ifah07
2012-09-17 11:20:35 +02:00
Amit Patel ba2849a7e1 [MERGE]:trunk
bzr revid: apa@tinyerp.com-20120917085325-wm11a0oeiot63wys
2012-09-17 14:23:25 +05:30
Harry (OpenERP) 20820fd8c5 [FIX] purchase: if user does not belong to UOM group, should not display warning regarding UOM category mismatch.
bzr revid: hmo@tinyerp.com-20120917084534-tdr8e6ygjrywv6eg
2012-09-17 14:15:34 +05:30
Divyesh Makwana (Open ERP) 066b30e5c8 [IMP] base_calendar : Improved the Invitation Wizard View.
bzr revid: mdi@tinyerp.com-20120917084436-00kqv09ueod3h709
2012-09-17 14:14:36 +05:30
niv-openerp 8bca30ec6f wip
bzr revid: nicolas.vanhoren@openerp.com-20120917084130-c3x2ryabewwksy5h
2012-09-17 10:41:30 +02:00
Raphael Collet 7d93e8077d [FIX] share: add inheritance on groups search view
bzr revid: rco@openerp.com-20120917082336-87tau8ef2qiu5v3p
2012-09-17 10:23:36 +02:00