Commit Graph
29844 Commits
Author SHA1 Message Date
DBR (OpenERP) 7e9db70ace MERGE:lp:~openerp-dev/openobject-addons/trunk-import_google-Backlog_2_ref-dbr
bzr revid: dbr@tinyerp.com-20110606071010-mf063vww9oivtwtl
2011-06-06 12:40:10 +05:30
DBR (OpenERP) 26c410280d [MERGE] Merge with lp:~openerp-dev/openobject-addons/trunk-import_google
bzr revid: dbr@tinyerp.com-20110602102659-5by0ugh5pd66nsie
2011-06-02 15:56:59 +05:30
Bhumika (OpenERP) d847f37ea5 [Fix] base_calendar: Add the remove function during the merge
bzr revid: sbh@tinyerp.com-20110602062601-gulg4g3rjkgmd0fz
2011-06-02 11:56:01 +05:30
Bhumika (OpenERP) c00c1e44e3 [Fix] google_base_account: Fix the gdata for contact and calander import
bzr revid: sbh@tinyerp.com-20110602054849-2qi8mgcwtfjl7ljd
2011-06-02 11:18:49 +05:30
Bhumika (OpenERP) 5a554c49ba [FIX] google_base_account: remove unused code
bzr revid: sbh@tinyerp.com-20110601131458-3kkhkh39jtpdkv0j
2011-06-01 18:44:58 +05:30
Bhumika (OpenERP) c827143085 [Fix] crm: correct the indeation
bzr revid: sbh@tinyerp.com-20110601120047-knq61e9m0sotf5b0
2011-06-01 17:30:47 +05:30
Bhumika (OpenERP) aaacdac704 [MERGE] Merge with lp:~openerp-dev/openobject-addons/trunk-calendar
bzr revid: sbh@tinyerp.com-20110601111119-7nggxba11p0bp5wb
2011-06-01 16:41:19 +05:30
Bhumika (OpenERP) 3a6010b706 [MERGE] Merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-20110601103949-lhzpnstpexkxca91
2011-06-01 16:09:49 +05:30
Quentin (OpenERP) 7d60eddba8 [IMP] account, analytic accounting: added group by state on analytic accounts
bzr revid: qdp-launchpad@openerp.com-20110601102021-pe3ixdhuwd410g0j
2011-06-01 12:20:21 +02:00
Bhumika (OpenERP) 89a8933a1d [MERGE ] Merge lp:~openerp-dev/openobject-addons/trunk-contact-google-sync
bzr revid: sbh@tinyerp.com-20110601093227-8eex1ulr086pmctm
2011-06-01 15:02:27 +05:30
Bhumika (OpenERP) 7530ba40d5 [MERGE] Merge import framework
bzr revid: sbh@tinyerp.com-20110601092808-wkrbrh7b5rffxrme
2011-06-01 14:58:08 +05:30
Quentin (OpenERP) 26d85afab6 [IMP] account: added access rights for model_account_treasury_report
bzr revid: qdp-launchpad@openerp.com-20110601091116-iysfehqoj7r2hlue
2011-06-01 11:11:16 +02:00
Vo Minh Thu 6d1753a734 [FIX] tools/config: properly cast config file values.
bzr revid: vmt@openerp.com-20110601074400-hv1jrgoqw2ji0yah
2011-06-01 09:44:00 +02:00
Quentin (OpenERP) 039af62c64 [MERGE] merged xrg branch with fix of mexican vat verification
bzr revid: qdp-launchpad@openerp.com-20110601065556-ymu9i6fz07t0f82u
2011-06-01 08:55:56 +02:00
Launchpad Translations on behalf of openerp 6c57b9ddc1 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110601043809-ocpn3eaostvtf4mx
2011-06-01 04:38:09 +00:00
Fabien Meghazi bbb0e3e6bc [IMP] Dashboard cleanup
bzr revid: fme@openerp.com-20110531222838-t2a9ksc7l2sthghn
2011-06-01 00:28:38 +02:00
Quentin (OpenERP) 4860c4d86f [MERGE] lp:768430
bzr revid: qdp-launchpad@openerp.com-20110531220951-6mtceil9xsbmnktp
2011-06-01 00:09:51 +02:00
Quentin (OpenERP) b463d4ff8b [MERGE] lp:717198
bzr revid: qdp-launchpad@openerp.com-20110531215534-6rj4n9hlzw6w25w1
2011-05-31 23:55:34 +02:00
Quentin (OpenERP) 4ea9c5e715 [MERGE] merge of rpa's branch: we shouldn't be able to see orderpoint and procurement of parent companies (reverted other rules for pricelist from proposed branch)
bzr revid: qdp-launchpad@openerp.com-20110531212320-gizw4iaz2t0wdw4b
2011-05-31 23:23:20 +02:00
Quentin (OpenERP) d5e4c48449 [IMP] account: treasury report compliancy with multi company + fixed warning of account/report/account_treasury_report.py (unused ref_dict variable)
bzr revid: qdp-launchpad@openerp.com-20110531205128-i1noccss0p3x8a1p
2011-05-31 22:51:28 +02:00
Fabien Meghazi 4705e30d0b [FIX] Fixed load() in action controller. Was not calling clean_action()
bzr revid: fme@openerp.com-20110531195202-6z6veclumppp1mlr
2011-05-31 21:52:02 +02:00
Fabien Meghazi e38e5f735d [FIX] Removed _.sprintf
bzr revid: fme@openerp.com-20110531154933-5rf6kiyqo4my7bb4
2011-05-31 17:49:33 +02:00
Fabien Meghazi fe421b4108 [IMP] Do not link to openerp.screen when unecessary
bzr revid: fme@openerp.com-20110531154338-d0ill7s23oqz79pq
2011-05-31 17:43:38 +02:00
Vo Minh Thu 358f6881f3 [REF] openerp/report/render/render.py: removed silly main() method, rewrote french comment in english.
bzr revid: vmt@openerp.com-20110531152711-49kyo4xhtak3r874
2011-05-31 17:27:11 +02:00
Vo Minh Thu 89a7b72bf0 [MERGE] fix in tools/config.
bzr revid: vmt@openerp.com-20110531151615-3byoonhhcxpfdwl9
2011-05-31 17:16:15 +02:00
Quentin (OpenERP) 107b1ebbc4 [IMP] account: added treasury report
bzr revid: qdp-launchpad@openerp.com-20110531151231-pg36qumj491j8fsx
2011-05-31 17:12:31 +02:00
tfr@openerp.com a843faf44c [FIX] import table with no data inside made crash resolve dependencies
bzr revid: tfr@openerp.com-20110531142545-l130b9b6xffdrcew
2011-05-31 16:25:45 +02:00
Quentin (OpenERP) b5bb00cdd3 [FIX] hr: display the expected number of employees and number of employees when grouping
bzr revid: qdp-launchpad@openerp.com-20110531140258-p30r6fq5wuyl8j7h
2011-05-31 16:02:58 +02:00
tfr@openerp.com d27ae843a3 [FIX] duplicate and edit all bug + refactor crm_case crm_base meeting phonecall
bzr revid: tfr@openerp.com-20110531133232-aiclel28l79p25bj
2011-05-31 15:32:32 +02:00
niv-openerp 153733a6a3 [fix] many fixes to o2m & m2m
bzr revid: nicolas.vanhoren@openerp.com-20110531131510-5zq9rfezkvfq5me8
2011-05-31 15:15:10 +02:00
niv-openerp fd9c0f359e [fix] small typo in m2m
bzr revid: nicolas.vanhoren@openerp.com-20110531131414-em4fcrbwfiqcq6g1
2011-05-31 15:14:14 +02:00
niv-openerp f6d4bdc555 Import old branch.
bzr revid: nicolas.vanhoren@openerp.com-20110531130154-45t27asxk5pcr7sd
2011-05-31 15:01:54 +02:00
Vo Minh Thu 6672e72c46 [FIX] tools/config: default values always override the config files:
- this bug was introduced by commit 3417.6.4 vmt@openerp.com-20110419134016-og6ye1hjrb0j52cl.

bzr revid: vmt@openerp.com-20110531125322-myptetqusymunily
2011-05-31 14:53:22 +02:00
tfr@openerp.com f4e2caca91 [FIX] rm print from sbh
bzr revid: tfr@openerp.com-20110531115929-k7xbz4j3bj86uygi
2011-05-31 13:59:29 +02:00
Xavier Morel 5695adf5e6 [IMP] @editable on forms and fields is nonsense, on trees it should only be able to take the values 'top' and 'bottom'
bzr revid: xmo@openerp.com-20110531101518-1ycw1fjy5vczcf8g
2011-05-31 12:15:18 +02:00
Xavier Morel b041c205ff [REM] @editable on fields and forms, makes no sense
bzr revid: xmo@openerp.com-20110531091456-kuyg11u9vtvxn8uv
2011-05-31 11:14:56 +02:00
tfr@openerp.com 1e5f389dad [MERGE] Correction from dbr
bzr revid: tfr@openerp.com-20110531085454-bsfcu5mfbwtyowxa
2011-05-31 10:54:54 +02:00
Xavier Morel 134d61feba [FIX] tree/@editable value is top or bottom, 1 is not acceptable
bzr revid: xmo@openerp.com-20110531083919-xx0chei0bm0ynq3x
2011-05-31 10:39:19 +02:00
Xavier Morel 9a5058a6b4 [FIX] group cleanup issue during apoptosis: remove all children from storage otherwise risk of zombie children
bzr revid: xmo@openerp.com-20110531063313-gv7z5vhwnrt5x6pg
2011-05-31 08:33:13 +02:00
Xavier Morel c404804f28 [IMP] re-add lost base.controllers.__init__
bzr revid: xmo@openerp.com-20110531061326-gskit8sefxv56go2
2011-05-31 08:13:26 +02:00
Launchpad Translations on behalf of openerp f9f3fcca30 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110531044750-6p5w7mfp6bow8hl6
2011-05-31 04:47:50 +00:00
Launchpad Translations on behalf of openerp 8dc31b78ab Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110531044735-dhu40as3jjdi6qwe
2011-05-31 04:47:35 +00:00
Quentin (OpenERP) f1658260e4 [MERGE] bugfix for assert error: Human Resources/Configuration/Human Resources/Employees/Categories of Employee/Categories structure
while open the employee view form above menu and try to filter results, i am getting this assertion error.

bzr revid: qdp-launchpad@openerp.com-20110530165804-h46rxi92qxzljr8w
2011-05-30 18:58:04 +02:00
Quentin (OpenERP) ba3ee64859 [MERGE] lp:777803
bzr revid: qdp-launchpad@openerp.com-20110530163158-0tnmt1b96omcjbft
2011-05-30 18:31:58 +02:00
Quentin (OpenERP) 95942eff53 [MERGE] lp:773128
bzr revid: qdp-launchpad@openerp.com-20110530162749-mgix0v37qag65q06
2011-05-30 18:27:49 +02:00
Quentin (OpenERP) d124481632 [MERGE] lp:777121
bzr revid: qdp-launchpad@openerp.com-20110530162143-0jkl2zvcmnaw63av
2011-05-30 18:21:43 +02:00
Quentin (OpenERP) 002d27a81e [MERGE] lp:778473
bzr revid: qdp-launchpad@openerp.com-20110530150655-pv24ogkrchnooib1
2011-05-30 17:06:55 +02:00
Quentin (OpenERP) edc8ebc7c5 [MERGE] lp:780668
bzr revid: qdp-launchpad@openerp.com-20110530150102-5dpu652vgz4by2dc
2011-05-30 17:01:02 +02:00
Quentin (OpenERP) 99ce8bc19b [MERGE] lp:764855
bzr revid: qdp-launchpad@openerp.com-20110530145526-t22u7m93fdse1zp6
2011-05-30 16:55:26 +02:00
Quentin (OpenERP) 13d5e05e0c [MERGE] lp:767039
bzr revid: qdp-launchpad@openerp.com-20110530144537-7l7l518a0hzhzlwr
2011-05-30 16:45:37 +02:00