pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
70,704 Commits 1 Branch 0 Tags
724cbb6dee94de43343fa380c33ea9329647a759
Commit Graph
70704 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Mantavya Gajjar 7946df8439 [FIX]: replace TAB -> space in some files 
[IMP]: accounting improvements 
* Re-arranging the menus
* Recurring entries, menu, view
* Manual Recurring - improve wizard text

bzr revid: mga@tinyerp.com-20100624094249-6bxr4e13r9fjpyhp
 2010-06-24 15:12:49 +05:30
Jay (Open ERP) 22bb9e0338 [MERGE] SQL Injection fixes 
bzr revid: jvo@tinyerp.com-20100624094215-19linhymer6mkr6x
 2010-06-24 15:12:15 +05:30
sbh (Open ERP) 62d62dd490 [ADD] auction: Merge the translation of board_auction into auction 
bzr revid: sbh@tinyerp.com-20100624094122-9o9jpowry556ghd2
 2010-06-24 15:11:22 +05:30
vra 7ed648ce88 [MERGE] merge the changes from main trunk branch. 
bzr revid: vra@tinyerp.com-20100624084539-ne1e1tscqn1z3jw5
bzr revid: vra@tinyerp.com-20100624084650-svala4jb0dnf7aal
 2010-06-24 14:16:50 +05:30
Olivier Dony 5696ed3785 [REVERT] openerp-server: revert partial change from commit 2397 that should not have gone through - need to find cleaner way of shutting down server 
bzr revid: odo@openerp.com-20100624084009-0g9rozjaay5m26km
 2010-06-24 10:40:09 +02:00
Aline Preillon 666c9db5f7 merge 
bzr revid: aline@aline-laptop-20100624083709-mrikr1i4q0yxm9gi
 2010-06-24 10:37:09 +02:00
Aline Preillon 33152c6e69 [FIX] use same parameter of the function 
bzr revid: aline@aline-laptop-20100624083545-ixu6vbxl31bael8a
 2010-06-24 10:35:45 +02:00
Mantavya Gajjar cafff69f99 [MERGE]: merging from the same branch 
bzr revid: mga@tinyerp.com-20100624082525-1dx0uj8fq5o5pddh
 2010-06-24 13:55:25 +05:30
Mustufa Rangwala 2842b7eac3 [MERGE] Merge with trunk addons 
bzr revid: mra@mra-laptop-20100624082217-wnb66ya0ynkzvle6
 2010-06-24 13:52:17 +05:30
Mustufa Rangwala be99faa3a8 [IMP] procumenent 
bzr revid: mra@mra-laptop-20100624081820-3yhokq1m2e6kuozg
 2010-06-24 13:48:20 +05:30
Mantavya Gajjar 092afb51ba [REM]: remove module account_report_india 
[ADD]: add reports from account_report_india to account module directly
[COMMENT]: this change may required to update the default chart of account

bzr revid: mga@tinyerp.com-20100624081444-1e9fevyt1xtlv6qx
 2010-06-24 13:44:44 +05:30
P. Christeas, Olivier Dony 162c7b50ae [IMP] orm/translate: don't attempt to translate callable constraints 
bzr revid: odo@openerp.com-20100624075425-ylv7weqpy7skg7md
 2010-06-24 09:54:25 +02:00
mtr 3a3baac0cd [MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3 
bzr revid: mtr@mtr-20100624075407-u8ku663yr4ih7trg
 2010-06-24 13:24:07 +05:30
mtr 846ca104d0 [IMP] sale,sale_journal,sale_margin:Improvements made as per the testing 
bzr revid: mtr@mtr-20100624075000-7i6auafofeueg9lu
 2010-06-24 13:20:00 +05:30
Mod2 Team (OpenERP) e22e84125a [IMP] CalDAV 
* useability improvement in export ics file wizard

bzr revid: hmo@tinyerp.com-20100624072328-6citdyy2bl9yy2i6
 2010-06-24 12:53:28 +05:30
Fabien Pinckaers 133346839f merge 
bzr revid: fp@tinyerp.com-20100624071449-gtzu0qplfboonk39
 2010-06-24 09:14:49 +02:00
Fabien Pinckaers 296565c892 fix 
bzr revid: fp@tinyerp.com-20100624071408-ucw4br9hx0lo848e
 2010-06-24 09:14:08 +02:00
Mod2 Team (OpenERP) 52b0a8eaa6 [IMP] base_module_quality 
* replace __terp__ with __openerp__ in all tests.

bzr revid: hmo@tinyerp.com-20100624071342-je03w5mouzlg0kmz
 2010-06-24 12:43:42 +05:30
sbh (Open ERP) 9e955a6d89 Merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons3 
bzr revid: sbh@tinyerp.com-20100624065342-d1rjv53ahc40oox1
 2010-06-24 12:23:42 +05:30
Mod2 Team (OpenERP) b7a1ff4ef9 [ADD] base_contact: 
* [ADD] add configuration wizard  to migrate  addresses into contact

bzr revid: hmo@tinyerp.com-20100624064650-pujl9lwoy9caen0i
 2010-06-24 12:16:50 +05:30
Fabien Pinckaers 3058bf6bb2 [IMP] misc 
bzr revid: fp@tinyerp.com-20100624064029-hkd1dnap74a6rolc
 2010-06-24 08:40:29 +02:00
Rga(openERP) 3d0dc6bcd6 [MERGE]:ir.filters instead of ir.act.windows 
bzr revid: nch@tinyerp.com-20100624063706-mlaess6m9itg4vdb
 2010-06-24 12:07:06 +05:30
psi (Open ERP) 62211766f6 [IMP] project_planning: Improve Translations, 
[MERGE] Merge with dev-addons3 branch

bzr revid: psi@tinyerp.co.in-20100624063605-6dknkiiqa19l0g3r
 2010-06-24 12:06:05 +05:30
ksa (Open ERP) 16f9954df3 [MERGE]: Merge with lp:openobject-trunk-dev-addons2 
bzr revid: ksa@tinyerp.co.in-20100624053527-92mal6rb4qgfeduv
 2010-06-24 11:05:27 +05:30
Vir (Open ERP) 93febc0163 [MOD] Usability chanegs in point of sale module 
bzr revid: vir@tinyerp.com-20100624051749-lc5m1u95q3vidotw
 2010-06-24 10:47:49 +05:30
uco 563695ff37 [MERGE] 
bzr revid: uco@uco-20100624045707-5du9tsscf3re3s6v
 2010-06-24 10:27:07 +05:30
sbh (Open ERP) 5a4c4c822a MERGE] : Merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons3 
bzr revid: sbh@tinyerp.com-20100624045101-12uxs4it3i1ca1w1
 2010-06-24 10:21:01 +05:30
uco 91ce4bac6d [MERGE] 
bzr revid: uco@uco-20100624044444-neqc1qtzttfo0oos
 2010-06-24 10:14:44 +05:30
Mustufa Rangwala e240abd8a5 Remove conflicts 
bzr revid: mra@mra-laptop-20100624043529-ycm1nhj8x20un0jt
 2010-06-24 10:05:29 +05:30
Mustufa Rangwala 09533ac112 [MERGE] Merge branch with trunk addons and remove the conflicts 
bzr revid: mra@mra-laptop-20100624042431-j6jpehkhemxv1k01
 2010-06-24 09:54:31 +05:30
Launchpad Code Hosting 09fa5d4fb2 Launchpad automatic translations update. 
bzr revid: codehost@crowberry-20100624034728-gyv0119m128veldp
 2010-06-24 04:47:28 +01:00
Launchpad Code Hosting 5f6b0a5341 Launchpad automatic translations update. 
bzr revid: codehost@crowberry-20100624034632-l93tdm9ue4l0l1up
 2010-06-24 04:46:32 +01:00
Fabien Pinckaers 2f19dfc507 [IMP] module views 
bzr revid: fp@tinyerp.com-20100623203657-pn0ukwwbgm5w7m9j
 2010-06-23 22:36:57 +02:00
Fabien Pinckaers 920e5f5c5f [FIX] improve mailgateway system, removed thread_id 
bzr revid: fp@tinyerp.com-20100623202929-332dlnhgjk01dbme
 2010-06-23 22:29:29 +02:00
Mod2 Team (OpenERP) cd86bccc13 [IMP] base_action_rule: 
* make proxy method of create/write methods of subcribed rule object to generate log details
* Move data of scheduler to check action rule every 4 hours from crm module into base_action_rule

bzr revid: hmo@tinyerp.com-20100624061755-blx8nzf8h9tr8xar
 2010-06-24 11:47:55 +05:30
Mod2 Team (OpenERP) db704adb67 [IMP] Audittrail: 
* Support action and workflow log detail    
* Removed 'View log' menu
* Modified form view of auditrail rule object to display new fields
TOFIX
  - Why need to restart server after subcribe audittrail rule?

bzr revid: hmo@tinyerp.com-20100624060346-grlpb9h6blk4umvf
 2010-06-24 11:33:46 +05:30
Mantavya Gajjar 2bad80bbc8 [IMP]: improve journal view 
bzr revid: mga@tinyerp.com-20100623200814-pcwri3u7loim50t4
 2010-06-24 01:38:14 +05:30
Mantavya Gajjar 8c5ded0c92 [MERGE]: merging from the same branch 
bzr revid: mga@tinyerp.com-20100623195017-o7nsrjir65y8rf8r
 2010-06-24 01:20:17 +05:30
Mantavya Gajjar b1991d21d5 [IMP]: accounting improvements 
* account.move
* account.move.line
* account.invoice
* account.voucher
* bank statement

bzr revid: mga@tinyerp.com-20100623194406-3go72eb7hseiylhb
 2010-06-24 01:14:06 +05:30
Fabien Pinckaers 7c8fad1420 [IMP] marketing campaign statistics 
bzr revid: fp@tinyerp.com-20100623153708-njpaifwv52fnhssj
 2010-06-23 17:37:08 +02:00
Olivier Dony 77264e3ba7 [FIX] orm: correct computation of parent_store for specific cases with duplicate/copy() 
bzr revid: odo@openerp.com-20100623151535-hsqhjzmkgrr1q87t
 2010-06-23 17:15:35 +02:00
Olivier Dony, Jay Vora 39e866ce70 [FIX] orm: proper recursive copy of translations through one2many relationships during copy() 
lp bug: https://launchpad.net/bugs/524424 fixed

bzr revid: odo@openerp.com-20100623151439-evc74f1a3so382z0
 2010-06-23 17:14:39 +02:00
Xavier Morel 48dc8f17a9 [REM] special casing of administrator in ir.ui.menu/search 
bzr revid: xmo@openerp.com-20100623143910-7ilj2syd3m144zd8
 2010-06-23 16:39:10 +02:00
P. Christeas 7921eca4c9 Merge remote branch 'origin/dms-bugfix' into trunk-fix-webdav 
bzr revid: p_christ@hol.gr-20100623140834-osouha6ld3n376m2
 2010-06-23 17:08:34 +03:00
P. Christeas c6e0309c9b Document: fix unicode passed as content-type header 
Py-webdav will not allow us to have unicode in the mimetype. And that's
not in the protocol, anyway. So, ensure we are only sending a string (was
broken since the db query would convert to unicode).

bzr revid: p_christ@hol.gr-20100623140720-nzst9y9hmarfo7qv
 2010-06-23 17:07:20 +03:00
P. Christeas df40ff60dc Document: fix creating of empty files. 
For an empty file, the interface (eg. webdav) could ask to create with
data=None. Allow that.

bzr revid: p_christ@hol.gr-20100623140709-m11r40kk2dl9okvo
 2010-06-23 17:07:09 +03:00
ksa (Open ERP) d2a1dd61c8 [IMP]: Improvement for menu and Encryption problem 
bzr revid: ksa@tinyerp.co.in-20100623135302-lqcee5dl77vcrpta
 2010-06-23 19:23:02 +05:30
Mustufa Rangwala 0c307a4a12 [MERGE] 
bzr revid: mra@mra-laptop-20100623134155-qsp44jm51gssfd8m
 2010-06-23 19:11:55 +05:30
psi (Open ERP) ff31964f93 [IMP]account: Improve translation file 
bzr revid: psi@tinyerp.co.in-20100623133657-cqrtjzg3df5flies
 2010-06-23 19:06:57 +05:30
Anup (OpenERP) 6844dd588b [FIX] account: fiscalyear closing wizard: entries of account with defferal method=='unreconciled' that are reconciled on a next fiscalyear 
bzr revid: ach@tinyerp.com-20100623133332-ezf32tdffz3rpzi9
 2010-06-23 19:03:32 +05:30