Commit Graph
34754 Commits
Author SHA1 Message Date
mtr 971a91390a [IMP] hr_payroll:improvements in salary rules,salary head,salary structure and demo data
bzr revid: mtr@mtr-20110307071829-rluk1idcxjtbw43u
2011-03-07 12:48:29 +05:30
ron@tinyerp.com 46a9cc3546 [IMP]point_of_sale:code Optimize in pos_return.py
bzr revid: ron@tinyerp.com-20110307062432-dtrkxb9xuq6fmsvj
2011-03-07 11:54:32 +05:30
Launchpad Translations on behalf of openerp ab69f51931 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110305063056-5iflsg9hrc66kov4
bzr revid: launchpad_translations_on_behalf_of_openerp-20110306061056-8ookl3wbwu5bl1a1
bzr revid: launchpad_translations_on_behalf_of_openerp-20110307062130-ncl17m2is4h0np20
2011-03-07 06:21:30 +00:00
ARA (OpenERP) 997e6045db [FIX] Account:Product 's unit price changed automatically
lp bug: https://launchpad.net/bugs/728378 fixed

bzr revid: ara@tinyerp.com-20110307061202-5z2i21cexca8j4ph
2011-03-07 11:42:02 +05:30
Ujjvala Collins (OpenERP) b88b1dd37e [MERGE]: Merged with trunk-addons.
bzr revid: uco@tinyerp.com-20110307050645-cc7ggixqnf21t20k
2011-03-07 10:36:45 +05:30
P. Christeas 5aa7042688 anonymization: try to fix the deprecation warnings
Unfortunately, we cannot use bool(foobar) on xpath() results.

bzr revid: p_christ@hol.gr-20110306154856-ajg11p9ysee1t4e4
2011-03-06 17:48:56 +02:00
P. Christeas 2c714fa226 report_webkit: fix bad translatable string
It should either be empty and non-translatable or have some text in it.
(cherry picked from commit 39ff7774f8fde449467f10276cc9813a4b8b2883)

bzr revid: p_christ@hol.gr-20110305221552-cnsk6n0i184nsqpm
2011-03-06 00:15:52 +02:00
Launchpad Translations on behalf of openerp acef7835aa Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110304044411-kcy7jh1aw55rf4wx
bzr revid: launchpad_translations_on_behalf_of_openerp-20110305045223-en91ygfuoggcmjgl
2011-03-05 04:52:23 +00:00
Vo Minh Thu 175dc96747 [IMP] setup.py: cleaning
- Removed unnecessary custom code to search/list files and addons.
- Handling of some environment variable and files created specifically by debian/rule.
- This case should be handled by simply copying the addons in the server (as is done)
  for packaging if needed. A setup.py file will probably be created for addons in the
  future.
- The console option has been reintroduced (it is needed for py2exe) but taking care
  of adding it only on os=nt.
- The dependency on pychart as been commented out as we already include its code.
- Building (with py2exe) on windows has yet to be tested.

bzr revid: vmt@openerp.com-20110304160911-4redpkh8mbn19rid
2011-03-04 17:09:11 +01:00
Thibault Francois 148063f590 [MERGE] author check
bzr revid: tfr@openerp.com-20110304144702-trbynrxegk2r5byv
2011-03-04 15:47:02 +01:00
Jay Vora (OpenERP) 384eea70aa [FIX/IMP/REF] CRM_phonecall : corrected pylint warnng suggested by Buildbot,improved and refactored the case_close() method for the call of write()
bzr revid: jvo@tinyerp.com-20110304142102-th9pzhxufqib9sh6
2011-03-04 19:51:02 +05:30
Jay Vora (OpenERP) 1673f215a2 [MERGE] Merged the branch for the fix of creation of x2many values.(ref: Case 4364)
bzr revid: jvo@tinyerp.com-20110304141515-t4d8hebruerfevjt
2011-03-04 19:45:15 +05:30
Olivier Dony 7819ade0ab [FIX] pproduct: extend default security rule to show products from ancestors companies too
This rule is not suited for most OpenERP objects, but it works
well for partners and products as these records are usually
shared between companies, and all company-specific data (such as
acounting data) is set as per-company properties. A partner or
product can thus be shared cleanly between companies.
This was already possible before by just removing the company
assigned to the product, making it globally visible.

bzr revid: odo@openerp.com-20110304135727-hqparbowklv3vqwm
2011-03-04 14:57:27 +01:00
aag (OpenERP) a224d18daf [IMP] STOCK :RD Project- old style wizard conversion-Remove Dynemic view
bzr revid: aag@tinyerp.co.in-20110304134728-qlrshs8g229btill
2011-03-04 19:17:28 +05:30
Thibault Francois ecc4b3feca [MERGE] fix bug 728539
bzr revid: tfr@openerp.com-20110304125707-jqrj88wu637fxkiw
2011-03-04 13:57:07 +01:00
Thibault Francois 9fb3e10ee7 [MERGE] bug fix 722723
bzr revid: tfr@openerp.com-20110304125334-ht2v8t21lwq7q7md
2011-03-04 13:53:34 +01:00
ron@tinyerp.com 8b22515213 [IMP]point_of_sale:Remove fields_view_get method on wizard
bzr revid: ron@tinyerp.com-20110304124508-yvlaxanttvgqycbi
2011-03-04 18:15:08 +05:30
Thibault Francois 4cead9e021 [FIX] exception raise when not reply to remove, email send to user not to reply_to of the sales team
bzr revid: tfr@openerp.com-20110304121336-lcj3586ayaalq19v
2011-03-04 13:13:36 +01:00
aag (OpenERP) 2f343a6083 [IMP] REWORK-SERVERSIDE :Now skip wiz not Shown , ON SERVER SIDE
bzr revid: aag@tinyerp.co.in-20110304113327-wviumoee6o7n3n0u
2011-03-04 17:03:27 +05:30
ksa (Open ERP) ddf5c95aa8 [FIX]:physical inventory, action import production lots do not get imported
lp bug: https://launchpad.net/bugs/725908 fixed

bzr revid: ksa@tinyerp.co.in-20110304112102-o0bfpek0o6m6ex6c
2011-03-04 16:51:02 +05:30
Thibault Francois 2b7ba42ea9 [FIX] opt-in, opt-out in opportunities and typo
bzr revid: tfr@openerp.com-20110304102750-ujj2tmml1lur3zef
2011-03-04 11:27:50 +01:00
ron@tinyerp.com 3eac4fa82f [IMP]point_of_sale:Improvement in yml
bzr revid: ron@tinyerp.com-20110304102651-8la13x9s42p1h4os
2011-03-04 15:56:51 +05:30
psi (Open ERP) 6bb91a2926 [MERGE] merge with trunk-payroll-salary_rules-mtr branch
bzr revid: psi@tinyerp.co.in-20110304094702-udyk182mv00jg08b
2011-03-04 15:17:02 +05:30
psi (Open ERP) 5b8c80ce13 [IMP] hr_payroll: Improve onchange_employee_id on hr.payslip
bzr revid: psi@tinyerp.co.in-20110304094414-kuahly8xm90zjep6
2011-03-04 15:14:14 +05:30
mtr e584769f5b [IMP] hr_payroll:improved code in hr.payslip(verify_sheet)
bzr revid: mtr@mtr-20110304093534-jjjpp0loyqltxg41
2011-03-04 15:05:34 +05:30
mtr 9ba1adba3e [MERGE] branch merged with trunk-payroll-salary_rules-psi
bzr revid: mtr@mtr-20110304084659-n50jbphpvw3wf88j
2011-03-04 14:16:59 +05:30
mtr e2ed1d82cf [MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-payroll
bzr revid: mtr@mtr-20110304045319-yaciu7is1878du4y
bzr revid: mtr@mtr-20110304083444-a5rdwf071gfddbw1
2011-03-04 14:04:44 +05:30
ARA (OpenERP) 5c331b606d [FIX] hr_recruitment:can not change stage in hr recruitment
bzr revid: ara@tinyerp.com-20110304072551-87ioninlg9hbncym
2011-03-04 12:55:51 +05:30
psi (Open ERP) ed78081860 [MERGE] merge with trunk-payroll-salary_rules-mtr branch
bzr revid: psi@tinyerp.co.in-20110304070625-ya6lepni4jyjw8c7
2011-03-04 12:36:25 +05:30
ARA (OpenERP) 2ee329f399 [FIX] hr_recruitment:can not change stage in hr recruitment
lp bug: https://launchpad.net/bugs/727900 fixed

bzr revid: ara@tinyerp.com-20110304064406-cbvwef86wu5kqph1
2011-03-04 12:14:06 +05:30
Launchpad Translations on behalf of openerp 25dd135be4 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110304062412-3p9ucid6orxyb8zq
2011-03-04 06:24:12 +00:00
Bhumika (OpenERP) 4e00074297 [MERGE]
bzr revid: sbh@tinyerp.com-20110304060314-82o0zw293t05qtvt
2011-03-04 11:33:14 +05:30
Jigar Amin 169cd25823 [BUB/FIX] project_scrum : fixed the default date issue in Scrum Daily Meeting View
bzr revid: jam@tinyerp.com-20110304055708-wttgq7m2925upe2d
2011-03-04 11:27:08 +05:30
aag (OpenERP) eac13bbca9 [IMP] STOCK :RD Project- old style wizard conversion-view_init
bzr revid: aag@tinyerp.co.in-20110304052751-8bfqm36q43gbhhkj
2011-03-04 10:57:51 +05:30
psi (Open ERP) f241d2e3dc [MERGE] merge with trunk-payroll branch
bzr revid: psi@tinyerp.co.in-20110304052550-jvxn2c9en9jmu1lo
2011-03-04 10:55:50 +05:30
Ujjvala Collins (OpenERP) b0e1c25b51 [MERGE]
bzr revid: uco@tinyerp.com-20110304051155-ahhxp2fsbkb7efn8
2011-03-04 10:41:55 +05:30
Mustufa Rangwala 4347b8fd76 [MERGE] Addons3 Branch merged with Trunk addons
bzr revid: mra@mra-laptop-20110304050557-t0e3kwuyz1a98gl5
2011-03-04 10:35:57 +05:30
Launchpad Translations on behalf of openerp 4c3c85a945 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110304044528-3aw0bq4jyxvz4gyb
2011-03-04 04:45:28 +00:00
Bhumika (OpenERP) 1c74497dfc [MERGE] Merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-20110304043927-9q3rkvmjwwawvn07
2011-03-04 10:09:27 +05:30
Fabien Meghazi 34542b8274 Filter buttons style
bzr revid: fme@openerp.com-20110303201654-f0kwdk7ljana84k2
2011-03-03 21:16:54 +01:00
Maxime Chambreuil (http://www.savoirfairelinux.com) c287f498f7 [MERGE] Correction on parameter for the call of history()
lp bug: https://launchpad.net/bugs/727875 fixed

bzr revid: jvo@tinyerp.com-20110303185231-i9gsm48nujefrmbx
2011-03-04 00:22:31 +05:30
Fabien Meghazi afb08ddc2e Working on css
bzr revid: fme@openerp.com-20110303174607-wgxtm92kniqxvu7i
2011-03-03 18:46:07 +01:00
Quentin (OpenERP) aadac1dea3 [FIX] account: fixed buildbot. an occurence of removed field 'refund_journal' was forgotten
bzr revid: qdp-launchpad@openerp.com-20110303170700-59jko6gkzr8ozgst
2011-03-03 18:07:00 +01:00
Quentin (OpenERP) 5a2123a9a0 [MERGE] merged the dev3 branch for the last time :-). Contains few bugfixes and refactoring of account
bzr revid: qdp-launchpad@openerp.com-20110303155944-kzs2fjuxewwmnr7q
2011-03-03 16:59:44 +01:00
Olivier Dony 2094a6aa50 [FIX] res_partner: extend default security rule to show partners from ancestors companies too
This rules is not suited for most OpenERP objects, but it works
well for partners and products as these records are usually
shared between companies, and all company-specific data (such as
acounting data is set as per-company properties). A partner or
product can thus be shared cleanly between companies.
This was already possible before by just removing the company
assigned to the partner, making it globally visible.

bzr revid: odo@openerp.com-20110303155918-zjdgwnorsiex8y8u
2011-03-03 16:59:18 +01:00
Maxime Chambreuil f48e5a1aab [FIX] event lp:727875
lp bug: https://launchpad.net/bugs/727875 fixed

bzr revid: maxime.chambreuil@savoirfairelinux.com-20110303150606-bo9b3pgm1997n3qc
2011-03-03 10:06:06 -05:00
Quentin (OpenERP) a90aeb8c4a [REF] account: refactored the creation of journals in the generation from templates wizard, removed old deprecated boolean 'refund_journal' on account.journal (use the type field instead)
bzr revid: qdp-launchpad@openerp.com-20110303145900-8ghspjidwb540mhp
2011-03-03 15:59:00 +01:00
Fabien Meghazi f435d8ca99 Include xml2json_direct in main. Converted node.@attribute to node.attrs = {}
bzr revid: fme@openerp.com-20110303145552-f4cbxu2oi01ykbxl
2011-03-03 15:55:52 +01:00
Quentin (OpenERP) e147c06bc3 [FIX] account: in the wizard for creating the opening entries, restricted the view on opening periods
bzr revid: qdp-launchpad@openerp.com-20110303145256-nuhwuv15u87sgyw8
2011-03-03 15:52:56 +01:00
Jay Vora (OpenERP) 4f6b1e3136 [Merge] Merged the branch for the fix of case_close() of crm phonecall
bzr revid: jvo@tinyerp.com-20110303143944-2sot4k9gy2ol00xn
2011-03-03 20:09:44 +05:30