uco
667bb86cb4
[MERGE]
...
bzr revid: uco@tinyerp.com-20100623105136-ns21drk1o1t00873
2010-06-23 16:21:36 +05:30
Xavier Morel
53e633bf44
[ADD] help field on act_window to store help page description (location suggested by fp)
...
bzr revid: xmo@openerp.com-20100623091952-35ulioifcv0qt0kp
2010-06-23 11:19:52 +02:00
560db9ee0b
[MOD] action button changed in modules list view, customization menu set in extended group
...
bzr revid: vir@tinyerp.com-20100623103404-3da9wdgy3qhz3p49
2010-06-23 16:04:04 +05:30
uco
6519bbb516
[IMP] base_module_record, multi_company, process: Menus should be displayed in Extended view only.
...
bzr revid: uco@tinyerp.com-20100623072723-w6qw04bun5d32txd
2010-06-23 12:57:23 +05:30
uco
5257e2c845
[MERGE]
...
bzr revid: uco@tinyerp.com-20100623044719-hk0e9ax0oqxshbq4
2010-06-23 10:17:19 +05:30
Launchpad Code Hosting
cafb5b4d4f
Launchpad automatic translations update.
...
bzr revid: codehost@crowberry-20100623035234-4z4wc3bpqr3y1k61
2010-06-23 04:52:34 +01:00
86b55a1b3e
[MERGE] orm: port of 5.0 fix for parent_store computation when previous parent is NULL
...
lp bug: https://launchpad.net/bugs/581137 fixed
bzr revid: odo@openerp.com-20100622155719-a6g6udc6p2s6cp0v
2010-06-22 17:57:19 +02:00
Olivier Dony
8f841dc233
[IMP] tools: added disclaimer on detect_ip_addr
...
bzr revid: odo@openerp.com-20100622154500-lsoxuy0cz1p05lrb
2010-06-22 17:45:00 +02:00
Fabien Pinckaers
a01b658d8d
[FIX] print several instances of the workflow
...
bzr revid: fp@tinyerp.com-20100622121659-qiqmtya118ftm8mc
2010-06-22 14:16:59 +02:00
Vir (Open ERP)
805d199f37
[MOD] pos : small changes
...
bzr revid: vir@tinyerp.com-20100622111410-mb1fnn25dd441km4
2010-06-22 16:44:10 +05:30
P. Christeas
9f4465817e
[MERGE] report: correct exception handlers
...
bzr revid: odo@openerp.com-20100622105304-9bab100r6nv0x460
2010-06-22 12:53:04 +02:00
uco
93ea7917bf
[FIX] point_of_sale: Put check constraint for quantity <= 0 in sale order line.
...
[IMP] point_of_sale: Changed menu sequences.
bzr revid: uco@tinyerp.com-20100622101239-fcan55bfuunr4c5i
2010-06-22 15:42:39 +05:30
P. Christeas
218843e025
Rml2pdf: never catch more than Exception.
...
If using the 'except:' syntax, we are also catching system exit and kbd
interrupt, which shouldn't be handled in that context.
bzr revid: p_christ@hol.gr-20100622094540-tlqkov6sksgw8b6s
2010-06-22 12:45:40 +03:00
Olivier Dony
5138f83593
[IMP] safe_eval: improved exception handling
...
bzr revid: odo@openerp.com-20100622093527-ygyvdsz2w4aalf08
2010-06-22 11:35:27 +02:00
P. Christeas
4392684a28
[MERGE] safe_eval, reports: improve logging and exception handling
...
bzr revid: odo@openerp.com-20100622093238-xy4dwtg80ikf0nhz
2010-06-22 11:32:38 +02:00
vra
b311f12e2a
[REVERT] revert the migrate folder changes for SQL-Injection.
...
bzr revid: vra@tinyerp.com-20100621090543-q2l7y6tedu33kd9w
2010-06-21 14:35:43 +05:30
vra
2dfc9149b3
[MERGE] merge the changes from main trunk server branch.
...
bzr revid: vra@tinyerp.com-20100621045456-oksz1ficjbeon8dw
2010-06-21 10:24:56 +05:30
vra
1cf10a7daa
[FIX][IMP] SQL-Injection ,minor improvement.
...
bzr revid: vra@tinyerp.com-20100618140537-mjbviu7sxxwn83x8
2010-06-18 19:35:37 +05:30
Anup (OpenERP)
e0d94956c1
[IMP] SQL injection Refactored
...
bzr revid: ach@tinyerp.com-20100618101641-84cdea9n1pzx36v2
2010-06-18 15:46:41 +05:30
Anup (OpenERP)
253c7786a3
[MERGE] Merged from the main trunk server
...
bzr revid: ach@tinyerp.com-20100615133947-xmf38gf47ljnb00l
bzr revid: ach@tinyerp.com-20100616112927-8ecwh6n270tkp6gp
bzr revid: ach@tinyerp.com-20100618093614-7wtc8cw3korg3280
2010-06-18 15:06:14 +05:30
Mustufa Rangwala
d73e5f7757
[REF]
...
bzr revid: mra@mra-laptop-20100618072359-a860w5bc6y9i56wi
2010-06-18 12:53:59 +05:30
Mustufa Rangwala
1be397c0ea
[REF]
...
bzr revid: mra@mra-laptop-20100618071912-t2pfa227jp2xcxlb
2010-06-18 12:49:12 +05:30
pap (openerp)
6be25e1411
merge
...
bzr revid: pap@tinyerp.co.in-20100618051752-hmcmnm3x0qvun6eq
bzr revid: pap@tinyerp.co.in-20100618065517-aivfz3iwzfm33fdv
bzr revid: pap@tinyerp.co.in-20100618071807-xseqfzsntzw898sf
2010-06-18 12:48:07 +05:30
sbh (Open ERP)
3a76c0baaf
[Fix] stock: Check the field is exist then qty_available display in report
...
bzr revid: sbh@tinyerp.com-20100618071206-poxwm1ovzdk6s083
2010-06-18 12:42:06 +05:30
2af260f978
[REVERT]:Integration script,Makefile changes need to create diff repository as it is affecting test.openobject.com:8010
...
bzr revid: nch@tinyerp.com-20100618071204-44ftuhvtun3yerzt
2010-06-18 12:42:04 +05:30
sbh (Open ERP)
3e7f590e31
[Fix] stock: Remove the duplicate action for report and put error if move line is not create
...
bzr revid: sbh@tinyerp.com-20100618070339-q14dg8p56w02p394
2010-06-18 12:33:39 +05:30
vra
fd1578daec
[MERGE] merge the changes from trunk main branch.
...
bzr revid: vra@tinyerp.com-20100618065505-qwivms0atr8ld3zr
2010-06-18 12:25:05 +05:30
sbh (Open ERP)
bbb8574000
[Fix] Stock: Fix the name of picking action
...
bzr revid: sbh@tinyerp.com-20100618064626-7oh625i6bj1f454i
2010-06-18 12:16:26 +05:30
Mustufa Rangwala
da9b711d75
[FIX] conflicts solve for menu account strutur
...
bzr revid: mra@mra-laptop-20100618064043-9gnokcgtre9lu89c
2010-06-18 12:10:43 +05:30
psi (Open ERP)
360afadc80
[IMP] account: Improve the wizard view, accunt_analytic_plan:Improve form view
...
bzr revid: psi@tinyerp.co.in-20100618062520-b0ry32hrod0cmtsr
2010-06-18 11:55:20 +05:30
sbh (Open ERP)
d07e439331
[Fix] Stock: Fix the problem of key error orgin for outgoing picking
...
bzr revid: sbh@tinyerp.com-20100618062439-91tah2gr61jqgdvq
2010-06-18 11:54:39 +05:30
Mustufa Rangwala
68f8c1d573
[MERGE]
...
bzr revid: mra@mra-laptop-20100618043703-1f7cn3iilchx7vxa
bzr revid: mra@mra-laptop-20100618062143-vkgjue5qzdimp96z
2010-06-18 11:51:43 +05:30
vra
2cb7e09f47
[REF] ref.
...
bzr revid: vra@tinyerp.com-20100618060559-wslsjxa4t4aw97vz
2010-06-18 11:35:59 +05:30
bffad7400e
[MOD] Changes in main menu sequence, Reoraganization of Tools menu
...
bzr revid: vir@tinyerp.com-20100618060400-1alih9oe4ewwhmwz
2010-06-18 11:34:00 +05:30
e23f44c42d
[MOD] Small change in menu sequence
...
bzr revid: vir@tinyerp.com-20100618055858-s1ilio4v2zxwl6cl
2010-06-18 11:28:58 +05:30
mtr
ed74d897dd
[MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3
...
bzr revid: mtr@mtr-20100618055549-peueqkwyp3mdxmqp
2010-06-18 11:25:49 +05:30
sbh (Open ERP)
135e85fb83
[MERGE] : Merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons3
...
bzr revid: sbh@tinyerp.com-20100618053109-qc8qenijutozjcn3
2010-06-18 11:01:09 +05:30
psi (Open ERP)
12e2a87595
[MERGE] Merge with dev-addons3 branch
...
bzr revid: psi@tinyerp.co.in-20100618052733-kfuqzqr3jq0nj2uq
2010-06-18 10:57:33 +05:30
Vir (Open ERP)
cb628bae50
[MERGE] Merge with Trunk Addons
...
bzr revid: vir@tinyerp.com-20100618052158-why0uz9oiltw8h1h
2010-06-18 10:51:58 +05:30
vra
22ca2fd839
[MERGE] Merge the changes from main trunk branch.
...
bzr revid: vra@tinyerp.com-20100618052116-lbcdxkqh4cqv1xlt
2010-06-18 10:51:16 +05:30
rpa (Open ERP)
3678e74f3f
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: rpa@tinyerp.com-20100617052120-0o23k9z3r28g5pkc
bzr revid: rpa@tinyerp.com-20100618050156-fhpx2xa8bhrj0w3n
2010-06-18 10:31:56 +05:30
uco (OpenERP)
993c3fa1d2
[MERGE]: Merged with trunk-server
...
bzr revid: uco@tinyerp.com-20100618043543-vy1f34tly0lwrz14
2010-06-18 10:05:43 +05:30
uco (OpenERP)
0ebc579832
[MERGE]: Merged with trunk-addons
...
bzr revid: uco@tinyerp.com-20100618043247-89skoxkyj967xuv3
2010-06-18 10:02:47 +05:30
Launchpad Code Hosting
b8bc3af4d8
Launchpad automatic translations update.
...
bzr revid: codehost@crowberry-20100618033308-7p6kb07l11bx3hgc
2010-06-18 04:33:08 +01:00
Launchpad Code Hosting
19c3027ac5
Launchpad automatic translations update.
...
bzr revid: codehost@crowberry-20100618033234-85ymlh6ucg7eynam
2010-06-18 04:32:34 +01:00
Mantavya Gajjar
f789e02e82
[IMP]: enable holiday calculation with payslip
...
bzr revid: mga@tinyerp.com-20100618031140-eqg2negwaggok5tf
2010-06-18 08:41:40 +05:30
Mantavya Gajjar
fc7529f3e6
[IMP]: improvements to payroll module
...
bzr revid: mga@tinyerp.com-20100618005141-bh618yzj9ucz1jt5
2010-06-18 06:21:41 +05:30
uco (OpenERP)
2b7a322470
[IMP]: Re-organized Tools menu structure.
...
bzr revid: uco@tinyerp.com-20100617134420-52257h3u0w6y7iux
2010-06-17 19:14:20 +05:30
Mustufa Rangwala
99f39da4aa
[IMP] account: menu strcuture changes (ref: pap)
...
bzr revid: mra@mra-laptop-20100617132201-1fqjju5vlar0qo92
2010-06-17 18:52:01 +05:30
pap (openerp)
c8a0a2a191
[IMP]:
...
1) added missing wizards under Financial Management/Periodical Processing
2) added entry_type on move line for different types of invoices
bzr revid: pap@tinyerp.co.in-20100617131758-668hhpu1q1qkmt20
2010-06-17 18:47:58 +05:30
uco