pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,964 Commits 1 Branch 0 Tags
ffd85dccc6f8fec49cee6c2c96ff54bbe7bc4165
Commit Graph
26964 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Vo Minh Thu 3613935c53 [FIX] addons.__init__: make sure ad_paths is initialized before using it. 
bzr revid: vmt@openerp.com-20110208132719-qhlqqjkcyg3j9hv8
 2011-02-08 14:27:19 +01:00
Mustufa Rangwala 4087891ac8 [REF] Account: account invoice model translation problem with no context param 
bzr revid: mra@mra-laptop-20110208125653-uyw5y167go3kqgxw
 2011-02-08 18:26:53 +05:30
Xavier Morel 804fa924cf [FIX] share: share wizard would not open in some cases due to view_id not being found in ir_act_window 
Switch to using the action_id itself instead of reverse-matching action_id from view_id
* Not all ir_act_window have a view_id, for some we're supposed to go through ir_act_window_view
* Multiple ir_act_window (or ir_act_window_view) may have the same view_id, and we don't really have enough information to select the right one

Keep the old resolution via view_id for now, in case users update their web client and their addons out of sync

bzr revid: xmo@openerp.com-20110208123241-lj8v12ygz2a0jsgx
 2011-02-08 13:32:41 +01:00
Mustufa Rangwala adb0329f7e [REF] account: typos 
bzr revid: mra@mra-laptop-20110208112438-gtm9zoh7uzx8n8xi
 2011-02-08 16:54:38 +05:30
Vo Minh Thu 09f1a84797 [FIX] wrapper script: change the way we go in the upper directory. 
bzr revid: vmt@openerp.com-20110208105908-vpkcprw38ufz0x1e
 2011-02-08 11:59:08 +01:00
Vo Minh Thu 6226c1ed44 [IMP] added bin/openerp-server.py as a wrapper for backward compatibility. 
bzr revid: vmt@openerp.com-20110208102102-92rfpx6c5midjg5c
 2011-02-08 11:21:02 +01:00
Mustufa Rangwala 0557f8c4c0 [MERGE] account_payment: increase size of col. date in payment order pdf 
bzr revid: mra@mra-laptop-20110208100430-uo3xyzoshrnzmnil
 2011-02-08 15:34:30 +05:30
Mustufa Rangwala 3ec79a77fb [MERGE] analytic account - Wrong demo data and account type must be come in tree view => change parents to view=tyype 
bzr revid: mra@mra-laptop-20110208095402-gmvxanmusfv4rqav
 2011-02-08 15:24:02 +05:30
Vo Minh Thu 45239ae493 [IMP] openerp.__init__ can imports all its submodules. 
- The config parser is given sys.args explicitely
- addons.__init__ changed so it can be imported in openerp.__init__

bzr revid: vmt@openerp.com-20110208092923-42mj8sb8mkfbiytw
 2011-02-08 10:29:23 +01:00
Vo Minh Thu ec17bb9e74 [IMP] forgot to add loglevels.py and reexport 3 functions in tools.misc. 
bzr revid: vmt@openerp.com-20110208092458-qjfvf1vgflervdpm
 2011-02-08 10:24:58 +01:00
ARA (OpenERP) 1f294ed284 [MERGE] merge from dev3 
bzr revid: ara@tinyerp.com-20110208090123-rrfju8hwzkhl6bag
 2011-02-08 14:31:23 +05:30
mtr 9e95ff425c [IMP] account_payment: reverted the changes in the Table3 of <pto_header> of payment order report 
bzr revid: mtr@mtr-20110208085350-720dooos21203isd
 2011-02-08 14:23:50 +05:30
ARA (OpenERP) 070af54018 [FIX] analytic account - Wrong demo data and account type must be come in tree view 
lp bug: https://launchpad.net/bugs/714860 fixed

bzr revid: ara@tinyerp.com-20110208085339-lmn3perl9h040j16
 2011-02-08 14:23:39 +05:30
mtr cbd2264610 [MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3 
bzr revid: mtr@mtr-20110208083535-mqmo1yv6krv3wtft
 2011-02-08 14:05:35 +05:30
mtr f979cdb477 [FIX] account_payment: increased size of col.date in payment order report 
lp bug: https://launchpad.net/bugs/712960 fixed

bzr revid: mtr@mtr-20110208073212-51a487pz5rrijrsw
 2011-02-08 13:02:12 +05:30
Mustufa Rangwala c162de5ab1 [REF] Account: typo 
bzr revid: mra@mra-laptop-20110208072557-uzi20kapg0c6w4nf
 2011-02-08 12:55:57 +05:30
Mustufa Rangwala ff225574c7 [REF] Account: typo 
bzr revid: mra@mra-laptop-20110208071702-1a2e37v6bsmwgiya
 2011-02-08 12:47:02 +05:30
Mustufa Rangwala 2762d10d8e [REF] account_anglo_saxon/stock.py => remove unused import of fields 
bzr revid: mra@mra-laptop-20110208065824-6vl7noekz1grku36
 2011-02-08 12:28:24 +05:30
Launchpad Translations on behalf of openerp 7980675a67 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20110204141027-7fjkptadcn3xocbk
bzr revid: launchpad_translations_on_behalf_of_openerp-20110206061518-2d22gwew0c23msm1
bzr revid: launchpad_translations_on_behalf_of_openerp-20110207062348-rcrsq83p1141xqat
bzr revid: launchpad_translations_on_behalf_of_openerp-20110208055858-29gz4zyz9o39uv73
bzr revid: launchpad_translations_on_behalf_of_openerp-20110208055933-yutvcfmjc2d00l37
 2011-02-08 05:59:33 +00:00
mtr 06ecfdd71c [MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3 
bzr revid: mtr@mtr-20110208053643-dkulp2fbo9d7cj72
 2011-02-08 11:06:43 +05:30
Mustufa Rangwala b18aa2ecef [FIX] hr: try to create an employee as employee -> bug 
lp bug: https://launchpad.net/bugs/713177 fixed

bzr revid: mra@mra-laptop-20110208051951-usjzx6dih5ap9o45
 2011-02-08 10:49:51 +05:30
Mustufa Rangwala 4db0767016 [FIX] HR : Correction on List view definition for model hr.employee (Ref : SaaS Maintenance Case 3990) 
bzr revid: mra@mra-laptop-20110208045750-9okcwgulbh1ijaw3
 2011-02-08 10:27:50 +05:30
ARA (OpenERP) 90dca9891b [MERGE] merge from dev3 
bzr revid: ara@tinyerp.com-20110208045730-3722inos43xptghr
 2011-02-08 10:27:30 +05:30