Commit Graph
27004 Commits
Author SHA1 Message Date
psi (Open ERP) 16d8b6fa23 [MERGE] merge with dev-addons3
bzr revid: psi@tinyerp.co.in-20110215062816-lxkxynivirj7cy7w
2011-02-15 11:58:16 +05:30
Mustufa Rangwala 95460c75db [MERGE] merge from trunk addons
bzr revid: mra@mra-laptop-20110215050557-mqpy4v42s7fvi02q
2011-02-15 10:35:57 +05:30
Launchpad Translations on behalf of openerp 5eb533a415 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110216050027-qh55wef1rwb8hc9y
bzr revid: launchpad_translations_on_behalf_of_openerp-20110215043802-u5lpwzvi9tsp5qbj
bzr revid: launchpad_translations_on_behalf_of_openerp-20110216050338-aj0ab43kdrpgrh0r
bzr revid: launchpad_translations_on_behalf_of_openerp-20110217043649-3o2fe7rz274hzokb
2011-02-17 04:36:49 +00:00
psi (Open ERP) 5fbb27fd3e [MERGE] merge with dev-addons3
bzr revid: psi@tinyerp.co.in-20110214124832-uiq3wslrfx237lld
2011-02-14 18:18:32 +05:30
psi (Open ERP) 7c175a6caa [FIX] account_voucher: set attrs invisible on fields and buttons while being called from account bank statement
lp bug: https://launchpad.net/bugs/713116 fixed

bzr revid: psi@tinyerp.co.in-20110214124521-ksyhai8r9tf4366i
2011-02-14 18:15:21 +05:30
Olivier Dony 07f520a856 [MERGE] merged bugfixes from 6.0 up to revision 4401
bzr revid: odo@openerp.com-20110214114507-8uwohpcblsfhgjae
2011-02-14 12:45:07 +01:00
Launchpad Translations on behalf of openerp 958038785b Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110209060136-nfjweh4nw0sfdtyb
bzr revid: launchpad_translations_on_behalf_of_openerp-20110210053441-nhro56vsok1xjorb
bzr revid: launchpad_translations_on_behalf_of_openerp-20110211062554-w9k6gkzfxorm7alk
bzr revid: launchpad_translations_on_behalf_of_openerp-20110211062659-b0a6mwp18ipvn64n
bzr revid: launchpad_translations_on_behalf_of_openerp-20110212060645-t8l1wzw8znrsi1ze
bzr revid: launchpad_translations_on_behalf_of_openerp-20110213053327-7uwmixbkd8pmy53a
bzr revid: launchpad_translations_on_behalf_of_openerp-20110214054817-4wgpcwobeghg1dht
bzr revid: launchpad_translations_on_behalf_of_openerp-20110215053913-nqwsr2zc5fhc1prr
2011-02-15 05:39:13 +00:00
Olivier Dony e1d2a87fc9 [FIX] tools.config: expansion of user and path should work with multiple addons path too
lp bug: https://launchpad.net/bugs/716710 fixed

bzr revid: odo@openerp.com-20110214102914-98gdvyx5y4v2kysx
2011-02-14 11:29:14 +01:00
Mustufa Rangwala 21c8be370a [MERGE] account voucher - unusual naming => Dr/Cr
bzr revid: mra@mra-laptop-20110214084721-lv98g71n15qamv69
2011-02-14 14:17:21 +05:30
Mustufa Rangwala f9b4360ed5 [MERGE] merge from trunk addons
bzr revid: mra@mra-laptop-20110211124850-cgo5bpo3x1kdvvvq
bzr revid: mra@mra-laptop-20110214045842-34pth5vqeyjzdw1j
bzr revid: mra@mra-laptop-20110214083448-zguq05zhuu7wtfic
2011-02-14 14:04:48 +05:30
mtr 0ac1558542 [FIX] account_voucher:changed the string 'Cr/Dr' to 'Dr/Cr'
lp bug: https://launchpad.net/bugs/717890 fixed

bzr revid: mtr@mtr-20110214072045-oy523b802rfa7mvc
2011-02-14 12:50:45 +05:30
sma (Tiny) b8e933d3c4 [FIX] base_module_record: returning of recording wizard with ir.actions.act_window_close.
bzr revid: sma@tinyerp.com-20110214064933-pcor9k7ir043agvp
2011-02-14 12:19:33 +05:30
mtr 34ca428acd [MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3
bzr revid: mtr@mtr-20110211123540-4kt3pt4v04j07s9x
bzr revid: mtr@mtr-20110211125652-1q1wti4kdanj7fuu
bzr revid: mtr@mtr-20110214050331-x7j216ezod7a9h93
2011-02-14 10:33:31 +05:30
Launchpad Translations on behalf of openerp 8d2b6108dd Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110212050059-ue5zqyqtbezt6fhi
bzr revid: launchpad_translations_on_behalf_of_openerp-20110213043832-py10651pr3tdp702
2011-02-13 04:38:32 +00:00
Mustufa Rangwala d0649df01b [MERGE] account: context not passed in tree_but_action
bzr revid: mra@mra-laptop-20110211123951-c4d0qm3qsllztltr
2011-02-11 18:09:51 +05:30
mtr 544b729486 [IMP] account:corrected the code for bug fixed lp:716300
bzr revid: mtr@mtr-20110211123329-zomdcx0hftcaol4d
2011-02-11 18:03:29 +05:30
noz (OpenERP) c1b7ef58e6 [FIX] web_uservoice: update import to openobject.rpc instead of openerp.utils.rpc (package moved back into core).
bzr revid: noz@tinyerp.com-20110211122506-82fvpswt1ntprva2
2011-02-11 17:55:06 +05:30
Mustufa Rangwala 73f677ba8b [MERGE] base_vat: Cannot specify RFC in the accounting options => Add maxico validation
bzr revid: mra@mra-laptop-20110211122023-dwn73bobjzpqlxss
2011-02-11 17:50:23 +05:30
Mustufa Rangwala 9876019ced [MERGE] hr_holidays: manager user not get hr request send by employee
bzr revid: mra@mra-laptop-20110211121032-rg5t8wgx2izd91pe
2011-02-11 17:40:32 +05:30
psi (Open ERP) bf9943488e [FIX, IMP] hr_holidays: manager user not get hr request send by employee(Improve my last commit)
lp bug: https://launchpad.net/bugs/716271 fixed

bzr revid: psi@tinyerp.co.in-20110211113649-nt4yqs57agralwjr
2011-02-11 17:06:49 +05:30
ARA (OpenERP) 992a20c3db [MERGE] merge from dev3
bzr revid: ara@tinyerp.com-20110211113206-7sdhsmbgz7xq298w
2011-02-11 17:02:06 +05:30
mtr 18b6a90d50 [MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3
bzr revid: mtr@mtr-20110211112933-lh7bhfl7x5bcgklw
2011-02-11 16:59:33 +05:30
ARA (OpenERP) 2862f55c91 [FIX] Cannot specify RFC in the accounting options
lp bug: https://launchpad.net/bugs/713772 fixed

bzr revid: ara@tinyerp.com-20110211112907-1bjk2d84wvuhclz5
2011-02-11 16:59:07 +05:30
mtr e93166a2c4 [FIX] account:context is correctly passed in 'Chart of Accounts'
lp bug: https://launchpad.net/bugs/716300 fixed

bzr revid: mtr@mtr-20110211112737-esnj1iyhcwlqn87v
2011-02-11 16:57:37 +05:30
psi (Open ERP) e365a48c77 [FIX] hr_holidays: manager user not get hr request send by employee
lp bug: https://launchpad.net/bugs/716271 fixed

bzr revid: psi@tinyerp.co.in-20110211100804-ppf51573o389zpmy
2011-02-11 15:38:04 +05:30
Mustufa Rangwala b195679178 [MERGE] merge from trunk addons
bzr revid: mra@mra-laptop-20110211085343-xkwicm96oc4ezr1i
2011-02-11 14:23:43 +05:30
Mustufa Rangwala c81d9f7816 [MERGE] sale_margin: wrong computation => margin on sale order (due to store problem)
bzr revid: mra@mra-laptop-20110211083102-yb9oyba8d73e8m4i
2011-02-11 14:01:02 +05:30
ARA (OpenERP) 71396272e0 [FIX]sale margin module : wrong computation
lp bug: https://launchpad.net/bugs/715470 fixed

bzr revid: ara@tinyerp.com-20110211064408-jc5g7d80y1qa4548
2011-02-11 12:14:08 +05:30
Launchpad Translations on behalf of openerp 30bfcd2574 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110211045958-qw2uif8guhebh48q
2011-02-11 04:59:58 +00:00
ARA (OpenERP) ea903f7981 [MERGE] merge from dev3
bzr revid: ara@tinyerp.com-20110210044431-7tuirnmi7q26r5mf
bzr revid: ara@tinyerp.com-20110210091904-x9svpaakr7pbnii3
bzr revid: ara@tinyerp.com-20110211045615-aa3j199a7owta4tw
2011-02-11 10:26:15 +05:30
Mustufa Rangwala 9d7833ab56 [MERGE] merge from trunk addons
bzr revid: mra@mra-laptop-20110211044815-ovzs9z6bvsuwyiqo
2011-02-11 10:18:15 +05:30
Jay Vora (OpenERP) 0771b32361 [FIX] Purchase : Destination address should not be restricted to be an address of any partner
lp bug: https://launchpad.net/bugs/710516 fixed

bzr revid: jvo@tinyerp.com-20110210184806-qg3ivhwlcp69b39v
2011-02-11 00:18:06 +05:30
Jay Vora (OpenERP) 62e3bd941e [FIX] Base_module_record : Module creation should create a file called __openerp__.py instead of __terp__.py
[RENAME] Anonymization : __terp__.py file Renamed as __openerp__.py
[IMP] Point_of_sale : Improved menu name Cash Register Management

bzr revid: jvo@tinyerp.com-20110210165648-8e83y3u7kxlnqayg
2011-02-10 22:26:48 +05:30
Xavier Morel b0d1c26a07 [FIX] pad, share, wiki: update import to openobject.rpc instead of openerp.utils.rpc (package moved back into core)
Also removed a few unused imports

bzr revid: xmo@openerp.com-20110210161042-aq414sd3i4p6abka
2011-02-10 17:10:42 +01:00
Mustufa Rangwala e98148f02f [MERGE] hr_attendacne: Add missing action on employee to print weekly report
bzr revid: mra@mra-laptop-20110210112615-iradv2to27xybtpy
2011-02-10 16:56:15 +05:30
mtr ffd85dccc6 [IMP] hr_attendance: added missing action in the wizard for 'Weekly Attendance Report'
bzr revid: mtr@mtr-20110210110735-4wqqa0p42q0ylq57
2011-02-10 16:37:35 +05:30
mtr e45a9dfb4e [MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3
bzr revid: mtr@mtr-20110210100021-0vq2l3bg8xb1zcm7
2011-02-10 15:30:21 +05:30
psi (Open ERP) ee96d59fef [MERGE] merge with dev-addons3
bzr revid: psi@tinyerp.co.in-20110210092705-7c183c13z40pg0es
2011-02-10 14:57:05 +05:30
Mustufa Rangwala 277fc8b348 [MERGE] refactor as much as possible the code to generate the chart of accounts, journals, taxes, chart of taxes... from templates because currently the code:
- exists in account/installer.py  (if you select the generic chart of account)
 - exists in account/account.py (if you select a l10n_** module and then run the second wizard.

so, i think that we need to make a common function that will be call in both cases. The generic chart of account should be defined as a l10n_** module (with same objects (templates..)

bzr revid: mra@mra-laptop-20110210091102-xlaj9sgv6ugk169n
2011-02-10 14:41:02 +05:30
Jay Vora (OpenERP) fac9aead1e [FIX] Fetchmail: Unicode error corrected on exception
lp bug: https://launchpad.net/bugs/708616 fixed

bzr revid: jvo@tinyerp.com-20110210073453-m13on9w8gxdur13u
2011-02-10 13:04:53 +05:30
psi (Open ERP) 8ef20c5b31 [IMP] account: Improvement in refector code for tax, account, journal template generation
bzr revid: psi@tinyerp.co.in-20110210065057-3mvlgcyixg7pc900
2011-02-10 12:20:57 +05:30
Mustufa Rangwala 240c5452d7 [MERGE] account_payment: error when adding lines to bank statement
bzr revid: mra@mra-laptop-20110210062429-vnqvafchb9qemclu
2011-02-10 11:54:29 +05:30
mtr 8373953ee3 [MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3
bzr revid: mtr@mtr-20110210060556-k3r457hcqro3ff33
2011-02-10 11:35:56 +05:30
mtr b2d1d230ce [FIX] account_payment:added the missing argument 'date' in the onchange_partner_id of wizard (account.payment.populate.statement) and passed the correct date in the onchange_partner_id of wizard (account.statement.from.invoice.lines)
lp bug: https://launchpad.net/bugs/715365 fixed

bzr revid: mtr@mtr-20110210060026-waqyknss4283z004
2011-02-10 11:30:26 +05:30
Launchpad Translations on behalf of openerp d42e59d6bf Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110210053519-lmorpyq5gfrpelk6
2011-02-10 05:35:19 +00:00
psi (Open ERP) e2108dbd6b [MERGE] merge with dev-addons3
bzr revid: psi@tinyerp.co.in-20110209133400-73rpy43pqn62g41n
bzr revid: psi@tinyerp.co.in-20110210045329-zt83id81sr9kdoly
2011-02-10 10:23:29 +05:30
Mustufa Rangwala 393bbe5000 [MERGE] merge from trunk
bzr revid: mra@mra-laptop-20110210044347-5vc0jpluwx50wm8e
2011-02-10 10:13:47 +05:30
Launchpad Translations on behalf of openerp 7f5b7235ce Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110210043610-mqxp4vpb886lcdrj
2011-02-10 04:36:10 +00:00
Xavier Morel 24626799a8 [IMP] pad: use get_session instead of session
bzr revid: xmo@openerp.com-20110209154326-tvqohq851i0j6b0y
2011-02-09 16:43:26 +01:00
Xavier Morel d02beb5f69 [IMP] web_livechat: use rpc.RPCProxy instead of rpc.session.execute (as direct session access will probably get restricted soon on the web client)
bzr revid: xmo@openerp.com-20110209143542-m5vp1smqev2xap48
2011-02-09 15:35:42 +01:00