Commit Graph
37875 Commits
Author SHA1 Message Date
ksa (Open ERP) 66ca9a91f0 [IMP]: improvement for set in order by data
bzr revid: ksa@tinyerp.co.in-20110308065944-rdaw3maa69gv8sbd
2011-03-08 12:29:44 +05:30
Mustufa Rangwala d39237d474 [IMP/FIX] hr_payroll: Improvement and cleaning
bzr revid: mra@mra-laptop-20110308063637-zfv8hawzqkdvsk8d
2011-03-08 12:06:37 +05:30
Rifakat Haradwala (Open ERP) 285ef6b2c1 [IMP] : stock, stock_planning: changes in pot file
bzr revid: rha@tinyerp.com-20110308063208-xnjsoli41w9vvxcb
2011-03-08 12:02:08 +05:30
Launchpad Translations on behalf of openerp a22396857b Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110308062859-q6ue5zq5lsjtg6th
2011-03-08 06:28:59 +00:00
Rucha (Open ERP) 47c03a1791 [MERGE]: Merge with latest trunk
bzr revid: rpa@tinyerp.com-20110304071529-o3xhrc9pncukz17l
bzr revid: rpa@tinyerp.com-20110308061452-haah37xm0y5rkaf5
2011-03-08 11:44:52 +05:30
mtr a53ecf2423 [MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-payroll
bzr revid: mtr@mtr-20110308055255-k0pdcjznb5pzo1a3
2011-03-08 11:22:55 +05:30
mtr de09fe0af3 [IMP] hr_payroll:improved code of onchange_employee_id for min and max range condition
bzr revid: mtr@mtr-20110308055145-q31b346sxscys51o
2011-03-08 11:21:45 +05:30
ARA (OpenERP) fba4c4f2c3 [FIX] sale_analytic_plans: Position of Analytic distribution field
lp bug: https://launchpad.net/bugs/728384 fixed

bzr revid: ara@tinyerp.com-20110308054626-63pcrctnlxkpxlc7
2011-03-08 11:16:26 +05:30
Ujjvala Collins (OpenERP) 918be06345 [FIX] sync_google_contact: Fixed yaml error.
bzr revid: uco@tinyerp.com-20110308052234-kfzlhlq1ic23m2j0
2011-03-08 10:52:34 +05:30
Fabien Meghazi 2bbba687cd Search view groups
bzr revid: fme@openerp.com-20110307162047-xufrqodbvj4h6zwa
2011-03-07 17:20:47 +01:00
Fabien Meghazi 01876da228 css inputs
bzr revid: fme@openerp.com-20110307142440-kby6620q7zvaq7xq
2011-03-07 15:24:40 +01:00
Fabien Meghazi a8394573ca Qweb: added trim support
bzr revid: fme@openerp.com-20110307135515-0vkl56xc7pxtlive
2011-03-07 14:55:15 +01:00
Fabien Meghazi c19798a74e Fix indentation
bzr revid: fme@openerp.com-20110307135237-q6w2asndu84an7a7
2011-03-07 14:52:37 +01:00
Ujjvala Collins (OpenERP) 5edc07449d [ADD] sync_google_calendar: Added a module to import events from google calendar.
bzr revid: uco@tinyerp.com-20110307134215-f79hz1jgi3cre2cr
2011-03-07 19:12:15 +05:30
Thibault Francois 47caccfe28 [IMP] code refactoring
bzr revid: tfr@openerp.com-20110307133354-u5hlh70xn13z0bhl
2011-03-07 14:33:54 +01:00
mtr a4cc0a400d [IMP] hr_payroll:added warning to fix the error on payslip,when structure is not defined for an employee
bzr revid: mtr@mtr-20110307131329-dlpac23lr2edb863
2011-03-07 18:43:29 +05:30
ron@tinyerp.com 185de3a01b [FIX]product:Purchase Order price calculation wrong
lp bug: https://launchpad.net/bugs/728092 fixed

bzr revid: ron@tinyerp.com-20110307125008-pan2v3m9w7ea2t1r
2011-03-07 18:20:08 +05:30
mtr b66b346664 [IMP] hr_payroll:improved code to fix the error on payslip,when structure is not defined for an employee
bzr revid: mtr@mtr-20110307124607-kj0qokxxblhx4uie
2011-03-07 18:16:07 +05:30
Vo Minh Thu a85ed9248e [MERGE] merged trunk.
bzr revid: vmt@openerp.com-20110307121541-62h00c7pp7lbqzhr
2011-03-07 13:15:41 +01:00
mtr 7b7a1915f4 [MERGE] branch merged with trunk-payroll-salary_rules-psi
bzr revid: mtr@mtr-20110307113703-mu4v0hsd8e7a6qqa
2011-03-07 17:07:03 +05:30
mtr 6e6b21a875 [IMP] hr_payroll,hr_contract:commented 'hr.contract.wage.type' and improved strings of menuitem in payroll.
bzr revid: mtr@mtr-20110307112817-f3c7o3fro4oxzejn
2011-03-07 16:58:17 +05:30
Ujjvala Collins (OpenERP) 32f3ddf375 [MERGE]: Merged with trunk-addons.
bzr revid: uco@tinyerp.com-20110307111145-z0ly1cpi6crmo1f2
2011-03-07 16:41:45 +05:30
Jigar Amin 038d246b28 [BUG/FIX] peoject_issue : Assgined to readonly
lp bug: https://launchpad.net/bugs/725736 fixed

bzr revid: jam@tinyerp.com-20110307110647-bucrgruecq0wi2zo
2011-03-07 16:36:47 +05:30
Ujjvala Collins (OpenERP) d00bdceae2 [MERGE]: Merged with google-contact branch to get google_base_account module.
bzr revid: uco@tinyerp.com-20110307105812-tcvy6dvrofbeicv5
2011-03-07 16:28:12 +05:30
mtr ad9f23f99f [IMP] hr_payroll:added field 'python_code' and improved view of Salary Rules
bzr revid: mtr@mtr-20110307104513-mjcjedxtozza6wdf
2011-03-07 16:15:13 +05:30
Anup (OpenERP) 9adaf9ef8c [MERGE] Merged the branch for the fix of write() call on stock
bzr revid: jvo@tinyerp.com-20110307101625-ahn6wwld9e16e3dm
2011-03-07 15:46:25 +05:30
Jay Vora (OpenERP) 05fab9dcce [FIX] Stock : Call to write() with integer format of IDS can cause crash on system,normally write should be called with [IDS] format(Ref : Maintenance case 4416)
bzr revid: jvo@tinyerp.com-20110307095246-32l3ele6e7n2e9fo
2011-03-07 15:22:46 +05:30
mtr e85b5701ee [IMP] hr_payroll:added default company_id on salary rules
bzr revid: mtr@mtr-20110307094710-px4r3q1ik57h536k
2011-03-07 15:17:10 +05:30
Antony Lesuisse 5fabf04810 base_hello manifest
bzr revid: al@openerp.com-20110307093214-df425vc8krhc1bqq
2011-03-07 10:32:14 +01:00
psi (Open ERP) e35ce1fdcd [IMP] hr_payroll: Get line_ids on hr_payslip based on salary rules, Improve _calculate function on hr.payslip, if Appears on payslip is set then the salary rule will be added in line_ids of hr.payslip else it will consider in calculation only
bzr revid: psi@tinyerp.co.in-20110307092649-u6cd4hkfk8biikqq
2011-03-07 14:56:49 +05:30
Antony Lesuisse fc679ac8a5 preliminary addons loading support
bzr revid: al@openerp.com-20110307092632-e0a6rho0bvuk04ei
2011-03-07 10:26:32 +01:00
mtr a40185970f [MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-payroll
bzr revid: mtr@mtr-20110307084702-31hy9x8zv2fwnnzb
2011-03-07 14:17:02 +05:30
mtr 11c72fb988 [IMP] hr_payroll:removed 'advantages_net' and 'advantages_gross' fields from hr.contract
bzr revid: mtr@mtr-20110307084515-3o33wpeh1uh3czhe
2011-03-07 14:15:15 +05:30
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