Commit Graph
34754 Commits
Author SHA1 Message Date
sbh (Open ERP) 752bce134a [Fix] product_margin: Add security file
bzr revid: sbh@tinyerp.com-20100622065706-0luisuoaildqmil3
2010-06-22 12:27:06 +05:30
sbh (Open ERP) 8e1638cbec [Fix] product_expiry: Fix the xpath for split_in_lots
bzr revid: sbh@tinyerp.com-20100622064550-hxv2ctsl083q5dka
2010-06-22 12:15:50 +05:30
Mustufa Rangwala 5fc492711d [REF]
bzr revid: mra@mra-laptop-20100622063837-qwr82m4c0zyt9nd7
2010-06-22 12:08:37 +05:30
Mustufa Rangwala 089e0aec4d [MERGE]
bzr revid: mra@mra-laptop-20100622063736-do76osiw6wae8ijv
2010-06-22 12:07:36 +05:30
sbh (Open ERP) bcc7299d52 [IMP] product_expiry: rename the __terp__.py to __openerp__.py
bzr revid: sbh@tinyerp.com-20100622060859-9jt7eub0ik1sc0pl
2010-06-22 11:38:59 +05:30
sbh (Open ERP) 11a2a077af [Add] product_expiry: Add the security rules
bzr revid: sbh@tinyerp.com-20100622060108-vb39jarhk3uoulfv
2010-06-22 11:31:08 +05:30
UCO(Open ERP) 829c812605 [IMP] account, account_budget, email_template : Usability improvements in Menus
bzr revid: vir@tinyerp.com-20100622053322-lvfu6brpde40tsvm
2010-06-22 11:03:22 +05:30
Mustufa Rangwala ca4e0c56a1 [MERGE] https://code.launchpad.net/~openerp-dev/openobject-addons/pap_account_bug_fixes => PAP branch for account changes
bzr revid: mra@mra-laptop-20100622052345-s30xi46ibf2gf00l
2010-06-22 10:53:45 +05:30
mtr 6ca81d51d2 [MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3
bzr revid: mtr@mtr-20100622052031-gls48cysmwj9mwp3
2010-06-22 10:50:31 +05:30
atp (Open ERP) b0efd26edd [MERGE]: merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons2
bzr revid: atp@tinyerp.co.in-20100622051544-c7hig73zk2at66cy
2010-06-22 10:45:44 +05:30
sbh (Open ERP) 163cec1ada [MERGE]:Merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons3
bzr revid: sbh@tinyerp.com-20100622051519-whhkz6u9a9xh8irs
2010-06-22 10:45:19 +05:30
pap (openerp) 84400e1a62 [IMP]:improved views
bzr revid: pap@tinyerp.co.in-20100622051041-jiz0g2tkz59mw76o
2010-06-22 10:40:41 +05:30
Mustufa Rangwala 01445fb482 [REF]
bzr revid: mra@mra-laptop-20100622050751-mr5sbbw3ur95yuu0
2010-06-22 10:37:51 +05:30
psi (Open ERP) 1ea0412ce9 [MERGE] Merge with dev-addons3 branch
bzr revid: psi@tinyerp.co.in-20100622050021-i2kjbdw4mdg61hwb
2010-06-22 10:30:21 +05:30
Mustufa Rangwala a7984065da [MERGE] merge with trunk addons
[REF] account

bzr revid: mra@mra-laptop-20100622044900-6vhhr37i4v8yeq5i
2010-06-22 10:19:00 +05:30
uco a23aacee3f [MERGE]
bzr revid: uco@tinyerp.com-20100622043909-8jofjsbi50hisluz
2010-06-22 10:09:09 +05:30
uco f9cdc69f5f [MERGE]
bzr revid: uco@tinyerp.com-20100622043758-lskl5zqv907c1w09
2010-06-22 10:07:58 +05:30
Launchpad Code Hosting ad0129985e Launchpad automatic translations update.
bzr revid: codehost@crowberry-20100622042050-gbet3uvllvx7vhyu
2010-06-22 05:20:50 +01:00
Mustufa Rangwala cc375b68a2 [MERGE] merge mtr branch for sale, purchase ..changes
bzr revid: mra@mra-laptop-20100622035929-hv425nk2sdgk2xef
2010-06-22 09:29:29 +05:30
Launchpad Code Hosting 833b99b175 Launchpad automatic translations update.
bzr revid: codehost@crowberry-20100622035213-0dgn4rr7vqo1e167
2010-06-22 04:52:13 +01:00
Mustufa Rangwala 0b88078d26 [MERGE] merge sbh branch for stock
bzr revid: mra@mra-laptop-20100622034928-tp90pvrw3fi6myzx
2010-06-22 09:19:28 +05:30
Mustufa Rangwala fc076c95f1 [MERGE] Merge with trunk addons remove conflicts on stock module
bzr revid: mra@mra-laptop-20100622034434-o28onhil9wh0aasv
2010-06-22 09:14:34 +05:30
Fabien Pinckaers 7640ceb5a2 modifs
bzr revid: fp@tinyerp.com-20100621215224-ehh5oz2z1cup7kep
2010-06-21 23:52:24 +02:00
Fabien Pinckaers 4517a086c7 removed multi-company default
bzr revid: fp@tinyerp.com-20100621215107-n1vl0iwtsqbtjs1e
2010-06-21 23:51:07 +02:00
Fabien Pinckaers 711e9e9b7e improve
bzr revid: fp@tinyerp.com-20100621215054-aog8glnkl8corg6o
2010-06-21 23:50:54 +02:00
Fabien Pinckaers 7c506ecccc imp
bzr revid: fp@tinyerp.com-20100621212207-v4xxa3x82sydd0np
2010-06-21 23:22:07 +02:00
Fabien Pinckaers fc8464cd1d [IMP] better useability
bzr revid: fp@tinyerp.com-20100621212055-qxs8t6d1u6q73qwz
2010-06-21 23:20:55 +02:00
Fabien Pinckaers fc41cf7b96 [IMP] better useability
bzr revid: fp@tinyerp.com-20100621211627-2dhjebvnrdqzf710
2010-06-21 23:16:27 +02:00
Mantavya Gajjar 7e2af9b9e2 [MERGE]: merging from the same branch
bzr revid: mga@tinyerp.com-20100621204848-ecste1963bil7ljf
2010-06-22 02:18:48 +05:30
Mantavya Gajjar 832ce4a6e2 [ADD]: add demo data
[FIX]: remove commented code
[ADD]: add demo data file to the module descriptor file

bzr revid: mga@tinyerp.com-20100621204523-nzkwal4rm7hpvaga
2010-06-22 02:15:23 +05:30
Fabien Pinckaers d39ab835a4 [FIX] improvements in views
bzr revid: fp@tinyerp.com-20100621194842-c0ccgv8r36kh4grz
2010-06-21 21:48:42 +02:00
Fabien Pinckaers 6c3b5cd2c2 merge
bzr revid: fp@tinyerp.com-20100621185954-bx6u3vd9tpaygkq7
2010-06-21 20:59:54 +02:00
Fabien Pinckaers 805fb21c22 merge
bzr revid: fp@tinyerp.com-20100621185808-ffoiamidk7szdwqg
2010-06-21 20:58:08 +02:00
Fabien Pinckaers 9c3da9c251 [FIX] sale,purchase,stock
bzr revid: fp@tinyerp.com-20100621184058-try3rw3m59uc4e55
2010-06-21 20:40:58 +02:00
nel@tinyerp.com 2e6ff42f38 [IMP] point of sale
bzr revid: nel@tinyerp.com-20100621161229-xtb82392avghya68
2010-06-21 18:12:29 +02:00
atp (Open ERP) 46bb1ea51b [IMP]: membership: usability improvement in membership module.
bzr revid: atp@tinyerp.co.in-20100621155713-1hs8du994l3at43r
2010-06-21 21:27:13 +05:30
nel@tinyerp.com c5e5a3b262 [FIX] stock: function create
bzr revid: nel@tinyerp.com-20100621155551-47idl8ntymw48le6
2010-06-21 17:55:51 +02:00
atp (Open ERP) b3a841111b [IMP]: event: Minor Improvement in event module.
bzr revid: atp@tinyerp.co.in-20100621155446-kcw6124yl60yjyau
2010-06-21 21:24:46 +05:30
nel@tinyerp.com 3cad22e37f [FIX] stock: function create
bzr revid: nel@tinyerp.com-20100621154346-fuwv231eo4gc7lpa
2010-06-21 17:43:46 +02:00
P. Christeas 1ee1886dcd rml2pdf: Log stray exceptions, use special when expected.
If the eval() raises an exception, we should log that. Unless it's the
one we expect to see (thus changed to a special type), where we can keep
silently ignoring it.

Note: the GeneratorExit requires python 2.5 .

bzr revid: p_christ@hol.gr-20100621143701-oenf5fp57qs1bxz4
2010-06-21 17:37:01 +03:00
P. Christeas 4afe236b0c safe_eval: fix wrt whitespace on expressions.
Regular eval() would not care about leading whitespace. But, compile() would
break if lines start with space. Strip that.
Also, allow some exceptions to pass through, so that we can examine the
syntax errors etc.

bzr revid: p_christ@hol.gr-20100621143632-0hvrck77lterxjtl
2010-06-21 17:36:32 +03:00
sbh (Open ERP) de589d0d73 [Fix] stock_planning: Fix the problem of department_user
bzr revid: sbh@tinyerp.com-20100621140624-dogb0z6rdwd84gj4
2010-06-21 19:36:24 +05:30
mtr 59487231d8 [MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3
bzr revid: mtr@mtr-20100621140608-922odd1dew2vljwd
2010-06-21 19:36:08 +05:30
mtr f8ed9066ad [IMP] procurement,purchase,purchase_requisition,sale,sale_journal:Improvements made as per the testing
bzr revid: mtr@mtr-20100621135911-rudvobfa6o090s1o
2010-06-21 19:29:11 +05:30
Mustufa Rangwala 0f65a8c775 [MERGE] merge psi branch for pirapad changes account_* modules
bzr revid: mra@mra-laptop-20100621133940-6f78gcehoofllipy
2010-06-21 19:09:40 +05:30
Mustufa Rangwala 3bc79da268 [MERGE]
bzr revid: mra@mra-laptop-20100621133636-y6j9h85wyloo9eut
2010-06-21 19:06:36 +05:30
Mustufa Rangwala c4b9845b18 [MERGE] merge pap branch for account and l10nbe and analytic changes for bugs/improvement from pirapad
bzr revid: mra@mra-laptop-20100621133309-37i4v9180xm0bjby
2010-06-21 19:03:09 +05:30
psi (Open ERP) 47c9ca2270 [MERGE] Merge with dev-addons3 branch
bzr revid: psi@tinyerp.co.in-20100621132033-kkfaj8vhyqh5isql
2010-06-21 18:50:33 +05:30
Aline Preillon 43653a7a1f [MERGE]
bzr revid: aline@aline-laptop-20100621132031-drpix8vlh4c22dux
2010-06-21 15:20:31 +02:00
Aline Preillon 1b875faaf1 [IMP] avoid crash when qty set to zero
bzr revid: aline@aline-laptop-20100621131951-nutuf5s1qragki1l
2010-06-21 15:19:51 +02:00