Commit Graph
14898 Commits
Author SHA1 Message Date
psi (Open ERP) 6802a47815 [MERGE] merge with dev-addons3 branch
bzr revid: psi@tinyerp.co.in-20100520043750-oiavvz6xfsfdlopa
2010-05-20 10:07:50 +05:30
mra (Open ERP) 9657c3319f [MERGE] Remove conflict
bzr revid: mra@tinyerp.com-20100520042215-8plhya8f9129lo8k
2010-05-20 09:52:15 +05:30
mra (Open ERP) 1ab525acda [MERGE] Remove conflict
bzr revid: mra@tinyerp.com-20100520041810-ac2ww9oz5jvcj17k
2010-05-20 09:48:10 +05:30
mra (Open ERP) 38dd957438 [MERGE] Merge with main branch
bzr revid: mra@tinyerp.com-20100520041631-90wyd7ouhnpgwy6a
2010-05-20 09:46:31 +05:30
Fabien Pinckaers 3ee0f15d25 [FIX] typo
bzr revid: fp@tinyerp.com-20100519205710-vvj5renv4n47klqk
2010-05-19 22:57:10 +02:00
Fabien Pinckaers a0a8e0fcf6 [IMP] logs
bzr revid: fp@tinyerp.com-20100519205446-ktt4xs641afqq15h
2010-05-19 22:54:46 +02:00
Fabien Pinckaers bd46d32b0c [IMP] Improving logging system for main messages
bzr revid: fp@tinyerp.com-20100519200236-t7y7pefns8t7cp9f
2010-05-19 22:02:36 +02:00
Fabien Pinckaers a527812316 [FIX] Improve logging system
bzr revid: fp@tinyerp.com-20100519200214-rvl5gnb02a6utpau
2010-05-19 22:02:14 +02:00
Fabien Pinckaers bf025fedb6 merge
bzr revid: fp@tinyerp.com-20100519183251-5wk5a337kvqc7sc7
2010-05-19 20:32:51 +02:00
Fabien Pinckaers a3dd9f05dc [FIX] 3 security rules, [IMP] object names for logs
bzr revid: fp@tinyerp.com-20100519183232-9zieyfnah526r312
2010-05-19 20:32:32 +02:00
Fabien Pinckaers fd6eb4e4dd [IMP] logs background activities
bzr revid: fp@tinyerp.com-20100519183210-vyo63jvfs22mpxhg
2010-05-19 20:32:10 +02:00
OpenERP Framework R&D Team defccd6a53 [MERGE] xml import: support "ref" attribute for reference fields as for many2one
bzr revid: odo@openerp.com-20100519165024-5h1mul6438heq3a9
bzr revid: odo@openerp.com-20100519174137-vlt4l0yptau2ga6b
2010-05-19 19:41:37 +02:00
Olivier Dony d65180c290 [ADD] starting draft changelog for 6.0 server
bzr revid: odo@openerp.com-20100519173958-88p9bmv3p7j8uak5
2010-05-19 19:39:58 +02:00
Rvo(Open ERP) d3417a53d3 [MERGE] xml import: support "ref" attribute for reference fields as for many2one
bzr revid: odo@openerp.com-20100519173509-kv39pr196ewcak40
2010-05-19 19:35:09 +02:00
Rvo(Open ERP) f6188dbf2e [MERGE] access rights: addition of some missing access rights for both osv and osv_memory. to be continued
bzr revid: odo@openerp.com-20100519164111-9n8vrpz4lfmml8an
2010-05-19 18:41:11 +02:00
Fabien Pinckaers 6dc4c2e6db merge
bzr revid: fp@tinyerp.com-20100519160002-fpaq0qr1pdomukd8
2010-05-19 18:00:02 +02:00
Fabien Pinckaers 7f1e7b6323 merge
bzr revid: fp@tinyerp.com-20100519155923-7oc44aqpcor1m6oq
2010-05-19 17:59:23 +02:00
Jay (Open ERP) 206aad724a [BACKPORT] Stable fixes and refactorings to trunk
bzr revid: jvo@tinyerp.com-20100519155731-ihlx53vj31ni7d01
2010-05-19 21:27:31 +05:30
Olivier Dony 7891743285 [FIX] purchase: typo in view references
bzr revid: odo@openerp.com-20100519155001-f33jtahfsqcdz9mi
2010-05-19 17:50:01 +02:00
Olivier Dony 73b5ab1b24 [IMP] renamed server option --test-no-rollback to --test-commit, and dropped --test-continue, making it the default
bzr revid: odo@openerp.com-20100519153027-trhfaluudgo4f59z
2010-05-19 17:30:27 +02:00
Jay (Open ERP) 7a397943e4 [REF]
bzr revid: jvo@tinyerp.com-20100519150939-mf955huyjiflenth
2010-05-19 20:39:39 +05:30
Olivier Dony 9103f11ea2 [FIX] corrected previous merge with refactoring of superfluous "My ..." buttons in search views
bzr revid: odo@openerp.com-20100519150406-dn9bjxc160j2kvf8
2010-05-19 17:04:06 +02:00
Jay (Open ERP) 50724c0a0f [MERGE] MErged from main branch
bzr revid: jvo@tinyerp.com-20100519145940-s8tk9v6lmxkp6idg
2010-05-19 20:29:40 +05:30
Stephane Wirtel 2387a788f4 [MERGE]
bzr revid: stephane@openerp.com-20100519142733-ovoo9p3eey7en0p9
2010-05-19 16:27:33 +02:00
Stephane Wirtel 157be7e372 [FIX] add a selection widget for the product_uom
bzr revid: stephane@openerp.com-20100519141842-2sy9m6z2c7r7mu8d
2010-05-19 16:18:42 +02:00
Stephane Wirtel ebd97446d3 [FIX] partner: Add a 'group by' on the salesman
bzr revid: stephane@openerp.com-20100519141736-v6lmwfmx8punvea1
2010-05-19 16:17:36 +02:00
Stephane Wirtel ad198a48ec [FIX] base: partner: change the filter 'My Partners' in the 'Sale Man'
filter

bzr revid: stephane@openerp.com-20100519140144-nnl0s1nokck3e7g3
2010-05-19 16:01:44 +02:00
ksa (Open ERP) af43c90794 Task-ID 771:store log details for workflow
bzr revid: ksa@tinyerp.co.in-20100519135519-omr1rb42u0oijh1k
2010-05-19 19:25:19 +05:30
Stephane Wirtel 3d8605f38e [FIX] base: Replace the name of the 'Partners' action by 'Customer' action
bzr revid: stephane@openerp.com-20100519135115-cz506ke9rzgik3zb
2010-05-19 15:51:15 +02:00
Rvo(Open ERP) 8147f311c3 [MERGE] merged refactoring of superfluous "My ..." buttons in search views
bzr revid: odo@openerp.com-20100519134531-eb6ki0snr5e0xr41
2010-05-19 15:45:31 +02:00
rpa (Open ERP) 37aeeae462 [IMP]: Improvements in crm classes for _inherits(mailgate.thread),
* Moved some functions of action rule for crm_case into crm.py to solve the problem of (python)inheritance

bzr revid: rpa@tinyerp.com-20100519134243-75vrkkymk9k3jssr
2010-05-19 19:12:43 +05:30
rpa (Open ERP) 209efb21ae [IMP]: mailgate_way: Improvement in mail_gateway for the changes in crm objects, now they "_inherits" the mailgate.thread
bzr revid: rpa@tinyerp.com-20100519133928-kt7m3vz4etmgu2i0
2010-05-19 19:09:28 +05:30
mra (Open ERP) e36fb2209f [MERGE] Merge psi branch account: fix company_id error
hr_contract: Added Group By... Contract type in place of Department
hr_timesheet: clean and improve search view(added default user_id)
hr_timesheet_sheet: clean and improve search view(added default user_id)
hr_timesheet_invoice: improve search view(added default user_id)
project: improve search view(added default user_id)

bzr revid: mra@tinyerp.com-20100519133737-j1ycwgzizbv4f4j5
2010-05-19 19:07:37 +05:30
Stephane Wirtel 6844daff79 [FIX] sale: the price list field of the sale order is a selection widget
[FIx] sale: Change the order of the filters in the search view for the
sale order

bzr revid: stephane@openerp.com-20100519133639-94ub9nua4j1furvq
2010-05-19 15:36:39 +02:00
Stephane Wirtel 0d24553ae5 [FIX] sale_crm: Rename Section by Sale Team
bzr revid: stephane@openerp.com-20100519133111-zpatciskxk2n1bdv
2010-05-19 15:31:11 +02:00
Stephane Wirtel a60a2ac216 [IMP] sale_crm: Change the icon of the Create Order in the wizard
bzr revid: stephane@openerp.com-20100519132443-xnas6shpnk86aadi
2010-05-19 15:24:43 +02:00
mso 8c85100d8d [FIX] sale, purchase_manual: grouped field is removed from the sale order line invoice wizard and purchase_manual folder removed
bzr revid: mso@mso-20100519132358-d5saa7guv5rmzghz
2010-05-19 18:53:58 +05:30
psi (Open ERP) 1fa0bc873d [IMP] hr_timesheet_sheet: small change
bzr revid: psi@tinyerp.co.in-20100519131739-fq8eatkfprj7qatp
2010-05-19 18:47:39 +05:30
rga 8e08985eea Improve integrity error message
bzr revid: rga@rga-desktop-20100519131536-s82lok98qtrvu2ab
2010-05-19 18:45:36 +05:30
Stephane Wirtel 36538c54ef [FIX] crm: Use the gtk-close icon instead the gtk-cancel for the Mark Lost button
bzr revid: stephane@openerp.com-20100519131519-3i4xomdwqpeo71ey
2010-05-19 15:15:19 +02:00
Stephane Wirtel b643f09049 [FIX] crm: Change the order of the buttons in the Opportunities view form
bzr revid: stephane@openerp.com-20100519131441-03jl9e591ajrf4np
2010-05-19 15:14:41 +02:00
Stephane Wirtel aee5d6ab4f [FIX] crm: Change the order of the tabs in the notebook, the Email tab is the second
bzr revid: stephane@openerp.com-20100519131352-xvu6e2z6xmmi498s
2010-05-19 15:13:52 +02:00
Stephane Wirtel 5be0286166 [FIX] crm: Replace the icon gtk-close per gtk-apply for the 'Won' field in the opportunities
bzr revid: stephane@openerp.com-20100519131255-o1biifcj42bze3k5
2010-05-19 15:12:55 +02:00
Stephane Wirtel 3048c0513d [FIX] crm: Rename Categories per Categorization
bzr revid: stephane@openerp.com-20100519131118-q5jdt80sihblfvpq
2010-05-19 15:11:18 +02:00
psi (Open ERP) 62d0f91972 [MERGE] Merge with dev-addons3 branch
bzr revid: psi@tinyerp.co.in-20100519130854-hask2hz8duwpin1j
2010-05-19 18:38:54 +05:30
mso a2fef431c4 [Merge] branch merged with lp:~openerp-dev/openobject-addons/sbh-dev-addons1
bzr revid: mso@mso-20100519130712-9tbz0he0kscxe62q
2010-05-19 18:37:12 +05:30
psi (Open ERP) 84dfed9da7 [IMP] account, hr_contract, hr_timesheet, project: small changes, clean
bzr revid: psi@tinyerp.co.in-20100519130703-fgog8lo8zgh8g4rk
2010-05-19 18:37:03 +05:30
Jay (Open ERP) 35791bbde3 [REF]
bzr revid: jvo@tinyerp.com-20100519124923-09fiqka3gexs6yh2
2010-05-19 18:19:23 +05:30
Stephane Wirtel df1ca2ec5e [IMP] crm: Lead: Change the order of the buttons in the form view
bzr revid: stephane@openerp.com-20100519124231-sme0pxr6c12gzik2
2010-05-19 14:42:31 +02:00
Stephane Wirtel 0ab2faf9b7 [FIX] crm: Remove the filter on the Type for the lead search view
bzr revid: stephane@openerp.com-20100519124017-k8mtbqnnjbgru30g
2010-05-19 14:40:17 +02:00