pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
127,612 Commits 1 Branch 0 Tags
0cda05853ed553aad2d5259dae5e3bb94de0605c
Commit Graph
127612 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
ksa (Open ERP) bfe5e62f36 [MERGE]: Merge with lp:openobject-trunk-dev-addons2 
bzr revid: ksa@tinyerp.co.in-20110214045245-35s63j0coiq7mhe1
 2011-02-14 10:22:45 +05:30
ARA (OpenERP) aaaeb7e347 [MERGE] merge from dev3 
bzr revid: ara@tinyerp.com-20110214045210-i0z86auggdmuavcf
 2011-02-14 10:22:10 +05:30
ron@tinyerp.com 6be54d550c [MERGE]Merged with trunk-dev-addons2 
bzr revid: ron@tinyerp.com-20110214044746-9aljqcv0qcr4rcju
 2011-02-14 10:17:46 +05:30
Rucha (Open ERP) 572224f266 [MERGE]: Merge with lp:openobject-addons/trunk 
bzr revid: rpa@tinyerp.com-20110210044334-x4evnsl0ufb74zgr
bzr revid: rpa@tinyerp.com-20110211052134-j7pqqe9bq136px1y
bzr revid: rpa@tinyerp.com-20110214044657-x0o43in322xeinx5
 2011-02-14 10:16:57 +05:30
Sbh (OpenERP) 62df31924c [Fix] sync_google_contact: fix import module name 
bzr revid: sbh@tinyerp.com-20110214042830-jgdsehnwf9nmn7jy
 2011-02-14 09:58:30 +05:30
Sbh (OpenERP) 011e972aab [MERGE] Merge with lp:openobject-addons 
bzr revid: sbh@tinyerp.com-20110214041724-p0gljwopawjsnwe6
 2011-02-14 09:47:24 +05:30
Sbh (OpenERP) 933119c971 [MERGE] Merge with lp:openobject-addons 
bzr revid: sbh@tinyerp.com-20110214040454-nmppvkbfmde5hfzw
 2011-02-14 09:34:54 +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
Ujjvala Collins (OpenERP) 6af2f1929c [MERGE] 
bzr revid: uco@tinyerp.com-20110211133022-8e3hu134wwl0qonv
 2011-02-11 19:00:22 +05:30
ron@tinyerp.com bf880017ea [FIX]product:Product UoM conversion error needs definition 
lp bug: https://launchpad.net/bugs/716705 fixed

bzr revid: ron@tinyerp.com-20110211130200-hsc3iaasjizn5ipn
 2011-02-11 18:32:00 +05:30
aag (OpenERP) f394ec2357 [FIX] Purchase:[PS] Purchase order line_ Unit of measure 
lp bug: https://launchpad.net/bugs/716117 fixed

bzr revid: aag@tinyerp.co.in-20110211125920-iarez31rjra2bep8
 2011-02-11 18:29:20 +05:30
Sbh (OpenERP) ff04a32a2b [IMP] google_contact: change name of module to sync_google_contact 
bzr revid: sbh@tinyerp.com-20110211125126-fl7w2p8651ouez79
 2011-02-11 18:21:26 +05:30
Sbh (OpenERP) a8a359b2fc [IMP] google_base_contact: Improve the view and add addres field 
bzr revid: sbh@tinyerp.com-20110211124556-wla2ry5z9h98x0dw
 2011-02-11 18:15:56 +05:30
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
Sbh (OpenERP) fb26e7924e [ADD] Add google_base_account module 
bzr revid: sbh@tinyerp.com-20110211123753-vag9bnriwc0a934o
 2011-02-11 18:07:53 +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
ron@tinyerp.com 9be8ea5995 [FIX]mrp_operation:cancelling MO given - given arguments wrong 
lp bug: https://launchpad.net/bugs/709065 fixed

bzr revid: ron@tinyerp.com-20110211112520-c79ulbypasq38stt
 2011-02-11 16:55:20 +05:30
ksa (Open ERP) f77e00af19 [FIX]: Try to select destination address which has no partner on it 
lp bug: https://launchpad.net/bugs/710516 fixed

bzr revid: ksa@tinyerp.co.in-20110211104624-5gqtxl14itgw1xvz
 2011-02-11 16:16:24 +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
aag (OpenERP) a997044246 [MERGE]: Merge with lp:openobject-trunk-dev-addons2 
bzr revid: aag@tinyerp.co.in-20110209055048-157gqqfod0c4i2n4
bzr revid: aag@tinyerp.co.in-20110210045208-e596961ovqnojotg
bzr revid: aag@tinyerp.co.in-20110211060123-foybp90c1kydu4mj
 2011-02-11 11:31:23 +05:30
Sbh (OpenERP) 6a548a3975 [MERGE] Merge with lp:openobject-adons 
bzr revid: sbh@tinyerp.com-20110211053608-rxeuw80sbsu97wve
 2011-02-11 11:06:08 +05:30
ksa (Open ERP) c7117d134c [MERGE]: Merge with lp:openobject-trunk-dev-addons2 
bzr revid: ksa@tinyerp.co.in-20110210045853-8dmwvs77mvfzmctl
bzr revid: ksa@tinyerp.co.in-20110211052751-nz3r5q8g9bwil339
 2011-02-11 10:57:51 +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
Sbh (OpenERP) 05c26efb87 [IMP] rename google_contact to google_contact_sync 
bzr revid: sbh@tinyerp.com-20110210130730-ko6g5ycf21p3nxgu
 2011-02-10 18:37:30 +05:30
Sbh (OpenERP) 8abe6ed04f [IMP] google_contact: changes sequence 
bzr revid: sbh@tinyerp.com-20110210115726-ilft8b8nbw3xwfds
 2011-02-10 17:27:26 +05:30
Ujjvala Collins (OpenERP) fd0cb62f1c [ADD] google_contact: Added a wizard to import google contacts. 
bzr revid: uco@tinyerp.com-20110210112805-kijvixuhavnghuck
 2011-02-10 16:58:05 +05:30
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
Sbh (OpenERP) be4e40bf3f [FIX] google_contact: small change 
bzr revid: sbh@tinyerp.com-20110210102315-pm34m9v8h1vo22yf
 2011-02-10 15:53:15 +05:30
Sbh (OpenERP) eeb4a028db [Fix] google_contact: Featch all contact detail 
bzr revid: sbh@tinyerp.com-20110210100612-xsmv0458vzaz57v4
 2011-02-10 15:36:12 +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