pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,987 Commits 1 Branch 0 Tags
aaaeb7e347729afcb06516611f10a31eeebb0c4a
Commit Graph
26987 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
ARA (OpenERP) aaaeb7e347 [MERGE] merge from dev3 
bzr revid: ara@tinyerp.com-20110214045210-i0z86auggdmuavcf
 2011-02-14 10:22:10 +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
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
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
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
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
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
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
psi (Open ERP) 4ce06e0f88 [IMP] account: refactor code for generation of chart of templates 
bzr revid: psi@tinyerp.co.in-20110209132830-srd9cfw1i9dnm77u
 2011-02-09 18:58:30 +05:30
Mustufa Rangwala dc8b3643e7 [MERGE] Multi-Company Environment :Configuration of consolidated type of account is not possible due to the _check_type constraints. 
bzr revid: mra@mra-laptop-20110209122606-4cl9vxeo7tw6hol7
 2011-02-09 17:56:06 +05:30
ARA (OpenERP) 687653230f [MERGE] merge from dev3 
bzr revid: ara@tinyerp.com-20110209120829-hqieuyahulhpikwk
 2011-02-09 17:38:29 +05:30
ARA (OpenERP) e0a95e80c1 [FIX] Multi-Company Environment :Configuration of consolidated type of account is not possible due to the _check_type constraints 
lp bug: https://launchpad.net/bugs/715695 fixed

bzr revid: ara@tinyerp.com-20110209120535-o3htlw38zves04fm
 2011-02-09 17:35:35 +05:30
Mustufa Rangwala 48cbf30eaa [MERGE] merge from trunk addons 
bzr revid: mra@mra-laptop-20110209102752-senao2hjfbhus004
 2011-02-09 15:57:52 +05:30
Mustufa Rangwala e53e098905 [MERGE] l10n_uk: correct type of accounts of vat 
bzr revid: mra@mra-laptop-20110209101755-if4x7ay3xjm691jp
 2011-02-09 15:47:55 +05:30
mtr 85ef7e9c6a [FIX] l10n_uk:improved the account type of tax,residual amount is correctly referenced and calculated 
lp bug: https://launchpad.net/bugs/715269 fixed

bzr revid: mtr@mtr-20110209094922-6fa3ozq12mmtvhro
 2011-02-09 15:19:22 +05:30
Olivier Dony 14ebc46e3a [FIX] tools.translate: add missing imports after previous merge 
bzr revid: odo@openerp.com-20110209090231-odqbf8leyurdh945
 2011-02-09 10:02:31 +01:00
mtr b40afe2c0d [MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3 
bzr revid: mtr@mtr-20110209052414-1fbdmtrp674bxegf
 2011-02-09 10:54:14 +05:30
ARA (OpenERP) db892909f0 [MERGE] merge from dev3 
bzr revid: ara@tinyerp.com-20110209045631-aacgw8dg6vozxyxz
 2011-02-09 10:26:31 +05:30
Launchpad Translations on behalf of openerp 7b6e366a5f Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20110208043710-75bxojtr8ox15lgb
bzr revid: launchpad_translations_on_behalf_of_openerp-20110209045556-98ev5i679ddf25uu
 2011-02-09 04:55:56 +00:00
Olivier Dony d31260e8a8 [FIX] tools.config: override root_path in config, and avoid saving it 
This should help avoid common issues with an obsolete root_path saved in
the config file. We also expand the path on-the-fly, and do the same for
addons_path.

bzr revid: odo@openerp.com-20110208170927-3kqk0c06qmxu2ko5
 2011-02-08 18:09:27 +01:00
Olivier Dony cfc6d831df [MERGE] merged latest 6.0 fixes up to rev 3339 
Revision 3339 = odo@openerp.com-20110208140924-0bgxqgt1oyrxwz3z

bzr revid: odo@openerp.com-20110208164923-u7mzknc0b3avb9i0
 2011-02-08 17:49:23 +01:00
Vo Minh Thu 6713d57ab1 [MERGE] merge of the openerp python module branch. 
bzr revid: vmt@openerp.com-20110208150149-x4vu09aj42ezma5a
 2011-02-08 16:01:49 +01:00
Olivier Dony 4d735c9a73 [FIX] osv_memory: expire records only based on age by default + provide configurable settings 
This revision introduces two new config parameters and the corresponding 
server startup parameters:
- osv_memory_count_limit: limit on number or records in each osv_mem table
- osv_memory_age_limit: limit on maximum age of records in each osv_mem table
The default values have been changed to count=False (disabled), age=1 (hour),
so that in the default config the server will only expire osv_memory records
that are 1 hour old or more, avoiding problems related with some
osv_memory classes that instantiate a large number of short-lived objects.

A corresponding set of YAML tests has been added to test the proper behaviour
of the new parameters, and check the various use cases.

lp bug: https://launchpad.net/bugs/555271 fixed
lp bug: https://launchpad.net/bugs/709559 fixed

bzr revid: odo@openerp.com-20110208140924-0bgxqgt1oyrxwz3z
 2011-02-08 15:09:24 +01:00