Yogesh Sakhreliya
d0c25a2c23
[FIX] display simple error instead of traceback in sql bad query.
...
bzr revid: ysa@tinyerp.com-20110106112317-0mj9v7n8n133af29
2011-01-06 16:53:17 +05:30
Yogesh Sakhreliya
98ad323b09
Merge with trunk server.
...
bzr revid: ysa@tinyerp.com-20110105054554-b610911t87eu57xe
bzr revid: ysa@tinyerp.com-20110106112019-naj3ep24d9604wzd
2011-01-06 16:50:19 +05:30
Yogesh Sakhreliya
8697c0f3b2
Merge with trunk-dev-addons2.
...
bzr revid: ysa@tinyerp.com-20110106112001-wh6d4y46mpm0bf5h
2011-01-06 16:50:01 +05:30
P. Christeas
73af237c8b
pyPdf: upgrade from upstream git: 4abdca42a7d8a4
...
bzr revid: p_christ@hol.gr-20110106111400-hqw1nu5wx1mict4t
2011-01-06 13:14:00 +02:00
jam-openerp
1e5bc28b7b
[IMP] Project_long_term : Refactoring Phase Scheduling
...
bzr revid: jam@tinyerp.com-20110106111307-ih6bct0ay2273hmz
2011-01-06 16:43:07 +05:30
mtr
0cea2e7269
[MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3
...
bzr revid: mtr@mtr-20110106111216-j05lwp2ftz92j2ul
2011-01-06 16:42:16 +05:30
jam-openerp
29eb70fa33
[IMP] Project_long_term : YAML Test cases imporvments
...
bzr revid: jam@tinyerp.com-20110106111114-pciivckumitqgsuc
2011-01-06 16:41:14 +05:30
jam-openerp
27bdfdb896
[IMP] resource: Refactoring Phase Scheduling changes
...
bzr revid: jam@tinyerp.com-20110106110834-vcvfxbmikqnuwzlo
2011-01-06 16:38:34 +05:30
jam-openerp
af54f1c255
[IMP] Project_long_term : Refactoring Phase Scheduling
...
bzr revid: jam@tinyerp.com-20110106110628-guapsfn423rdy95j
2011-01-06 16:36:28 +05:30
uco (OpenERP)
b5b7511057
[ADD] crm: Added a yaml for recurrent meeting.
...
bzr revid: uco@tinyerp.com-20110106105632-5jw1vfgrmz05e8pd
2011-01-06 16:26:32 +05:30
qdp-launchpad@tinyerp.com
a852306c63
[FIX] account: removed multi-company group on company_id fields of accounting configuration wizards
...
lp bug: https://launchpad.net/bugs/697698 fixed
bzr revid: qdp-launchpad@tinyerp.com-20110106105524-59waxrqs9t9yyzj1
2011-01-06 11:55:24 +01:00
mtr
0aebb83683
[IMP] crm_helpdesk,hr_expense,purchase,purchase_requisition,survey:changed static date of 2010 to current date
...
bzr revid: mtr@mtr-20110106105520-1htuk0f2ei2fdt4f
2011-01-06 16:25:20 +05:30
Vo Minh Thu
4629c7af78
[IMP] translation: Added two columns to ir_translation to fix the res_ids after loading is done.
...
Currently res_ids are resolved and written to ir_translation on the fly, as
the .po are loaded, line by line. Doing this in a second step should resolve
a translation bug and make things faster too.
bzr revid: vmt@openerp.com-20110106105021-xj9vah5oz0ceto7i
2011-01-06 11:50:21 +01:00
pso
4726bb5699
[MERGE] merge from trunk addons3
...
bzr revid: pso@tinyerp.com-20110106102448-oxv8l0khbere77u4
2011-01-06 15:54:48 +05:30
Mustufa Rangwala
b02074d06e
[MERGE] hr_timsheet_sheet: po and pot changes
...
bzr revid: mra@mra-laptop-20110106101139-dauq9ddev0lkdy7i
2011-01-06 15:41:39 +05:30
ARA (OpenERP)
7a9f1cda04
[MERGE] merge from dev3
...
bzr revid: ara@tinyerp.com-20110106093452-q7umgig6ohqli1r3
2011-01-06 15:04:52 +05:30
uco (OpenERP)
dd4197df83
[FIX] project: Corrected parent_id problem on Projects form view.
...
bzr revid: uco@tinyerp.com-20110106093236-yx48vquedjd5ui8k
2011-01-06 15:02:36 +05:30
pso
f10ef4a42a
[FIX] hr_timesheet_invoice: Improved rml, field and view
...
lp bug: https://launchpad.net/bugs/697704 fixed
bzr revid: pso@tinyerp.com-20110106092347-dz5cj7rb1zzorf1j
2011-01-06 14:53:47 +05:30
ARA (OpenERP)
97ace61a87
[IMP]hr_timesheet_sheet: improve po, pot files
...
bzr revid: ara@tinyerp.com-20110106090843-ewtfu2yxz2w04zdx
2011-01-06 14:38:43 +05:30
Mustufa Rangwala
b46a46fa93
[MERGE] Account: String changes for fiscalyear closing entries used good string + PO and POT changes as per the same string + remove unused action
...
bzr revid: mra@mra-laptop-20110106085641-3tkg3soz7o98hrk0
2011-01-06 14:26:41 +05:30
Mustufa Rangwala
be30e70274
[MERGE] survey: type (wating => waiting answer)
...
pos: Correct demo
hr_timesheet_sheet: Search view added hr timesheet account for bug fixes
bzr revid: mra@mra-laptop-20110106084352-6zpmzkxvmd0zw6gm
2011-01-06 14:13:52 +05:30
psi (Open ERP)
82f6adfd21
[FIX] account: update warning on cancel opening entries
...
lp bug: https://launchpad.net/bugs/697714 fixed
bzr revid: psi@tinyerp.co.in-20110106083412-a63wnhbstlqp9x9v
2011-01-06 14:04:12 +05:30
Mustufa Rangwala
3e2473f7a5
[MERGE] merge from trunk addons
...
bzr revid: mra@mra-laptop-20110106075212-m18yq1v5l6d7rbm0
2011-01-06 13:22:12 +05:30
pso
59066de8fd
[IMP] survey: Improved po files
...
bzr revid: pso@tinyerp.com-20110106071809-zk5z6zoq4lpiumb5
2011-01-06 12:48:09 +05:30
Mustufa Rangwala
7d823e0e55
[MERGE] Improved yml,changed static date of 2010 to current date in the account*,auction,base_calendar,crm*,hr*,delivery,event,idea,lunch module.
...
bzr revid: mra@mra-laptop-20110106065052-g3iyjn7rby00eji3
2011-01-06 12:20:52 +05:30
psi (Open ERP)
c0bd6bcc50
[REF] account: remove unused action
...
bzr revid: psi@tinyerp.co.in-20110106064907-8zvb0hc2iamcvfy7
2011-01-06 12:19:07 +05:30
Mustufa Rangwala
7cec8e3d52
[MERGE] hr_timesheet_sheet: Wrong column title in timesheet view
...
bzr revid: mra@mra-laptop-20110106064553-03rcvwm4bebwwgku
2011-01-06 12:15:53 +05:30
pso
118169f202
[IMP] point_of_sale: Improved demo file
...
bzr revid: pso@tinyerp.com-20110106063133-cqixpy3whocb4l1z
2011-01-06 12:01:33 +05:30
husen
660565f56e
fixed typo
...
bzr revid: husen@husen-laptop-20110106061732-clmvihyz26g64ujs
2011-01-06 11:47:32 +05:30
pso
23258bb500
[FIX] hr_timesheet_sheet: Created search view for timesheet account
...
lp bug: https://launchpad.net/bugs/697691 fixed
bzr revid: pso@tinyerp.com-20110106060736-q7skma4ixlm7e2u9
2011-01-06 11:37:36 +05:30
ARA (OpenERP)
576b79a482
[MERGE] merge from dev3
...
bzr revid: ara@tinyerp.com-20110106055744-jf77y2g3d5fv1m98
2011-01-06 11:27:44 +05:30
mtr
b52e7b74e5
[MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3
...
bzr revid: mtr@mtr-20110106055001-whjpypbgbxcqs07s
2011-01-06 11:20:01 +05:30
psi (Open ERP)
a8bb7ac5df
[MERGE] merge with dev-addons3
...
bzr revid: psi@tinyerp.co.in-20110106054642-lo93g38osgc89hct
2011-01-06 11:16:42 +05:30
Mustufa Rangwala
cc162e066c
[MERGE] Account: action_cancel on invoice method fixed , add active field with extend group on account (XRG branch)
...
bzr revid: mra@mra-laptop-20110106054309-9hkqjfg9b72oqfym
2011-01-06 11:13:09 +05:30
Launchpad Translations on behalf of openerp
35fa7cd34e
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110106043500-7v9lu0vz6rw06og9
bzr revid: launchpad_translations_on_behalf_of_openerp-20110106053849-1bfeq2m1gsv0j789
2011-01-06 05:38:49 +00:00
rpa (Open ERP)
53bff26505
[FIX]: purchase: Fixed pricelist of PO as purchase pricelist instead of Public pricelist
...
bzr revid: rpa@tinyerp.com-20110106053727-srr35ji3wnd56vhn
2011-01-06 11:07:27 +05:30
mtr
3d7e6eb788
[IMP] account_followup,auction,base_calendar,crm,hr*,idea,lunch:changed static date of 2010 to current date
...
bzr revid: mtr@mtr-20110106053608-whpiu8tu9xkoo1ix
2011-01-06 11:06:08 +05:30
ARA (OpenERP)
9944b0a261
[FIX]hr_timesheet_sheet: wrong coloumn in timesheet view
...
lp bug: https://launchpad.net/bugs/697673 fixed
bzr revid: ara@tinyerp.com-20110106053521-foflkifrz4rbqck9
2011-01-06 11:05:21 +05:30
pso
5a7f5d3fa7
[FIX] survey: Renamed state name
...
lp bug: https://launchpad.net/bugs/697672 fixed
bzr revid: pso@tinyerp.com-20110106053422-08a4e41rkwdj60wc
2011-01-06 11:04:22 +05:30
pso
a63eaf7d9a
[MERGE] merge from trunk addons3
...
bzr revid: pso@tinyerp.com-20110106052708-4ywi0tgtjyre5qpi
2011-01-06 10:57:08 +05:30
Mustufa Rangwala
b8c0748743
[MERGE] POS, Project, project long term: Improved yml and demo files to remove static datetime values with datetime lib
...
bzr revid: mra@mra-laptop-20110106051511-lqfqe10loe5mxuzz
2011-01-06 10:45:11 +05:30
aag (OpenERP)
a961a4f81f
[MERGE]: Merge with lp:openobject-trunk-dev-addons2
...
bzr revid: aag@tinyerp.co.in-20110106051259-24c6ewm2xowxepno
2011-01-06 10:42:59 +05:30
Mustufa Rangwala
a99b9581ef
[MERGE] YML improvement for mail_gateway, marketing_*, mrp_* module
...
bzr revid: mra@mra-laptop-20110106050803-qp6rnj81hyz980y5
2011-01-06 10:38:03 +05:30
Mustufa Rangwala
0d7b52f824
[MERGE] project_timesheet: yaml correct for datetime
...
bzr revid: mra@mra-laptop-20110106050433-h4h083nrd80su1z2
2011-01-06 10:34:33 +05:30
ksa (Open ERP)
750578885b
[MERGE]: Merge with lp:openobject-trunk-dev-addons2
...
bzr revid: ksa@tinyerp.co.in-20110106050229-rk9n30bv7tmj9ujd
2011-01-06 10:32:29 +05:30
ARA (OpenERP)
74c0095279
[MERGE] merge from dev3
...
bzr revid: ara@tinyerp.com-20110105131734-q2t76dn07o2hdszm
bzr revid: ara@tinyerp.com-20110106050207-0orb7sntw1e5ptrs
2011-01-06 10:32:07 +05:30
Mustufa Rangwala
611643ddaa
[MERGE] merge from trunk addons
...
bzr revid: mra@mra-laptop-20110106045609-mp12xm4p66osklva
2011-01-06 10:26:09 +05:30
uco (OpenERP)
ea4cd90e85
[MERGE]
...
bzr revid: uco@tinyerp.com-20110106045303-1eh6q5o1jc7ke1jw
2011-01-06 10:23:03 +05:30
rpa (Open ERP)
ac1558643b
[MERGE]: Merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons2
...
bzr revid: rpa@tinyerp.com-20110106044931-55xzkg0e3xle5z11
2011-01-06 10:19:31 +05:30
Sbh (OpenERP)
86d359fe6e
[MERGE] Merge with lp:openobject-addons
...
bzr revid: sbh@tinyerp.com-20110106044724-gzw1qf0slonwo0tp
2011-01-06 10:17:24 +05:30