Commit Graph
61925 Commits
Author SHA1 Message Date
Rajesh Prajapati (OpenERP) d07862d61a [MERGE] merge with main server
bzr revid: rpr@tinyerp.com-20121008061045-lyu9nb756rvis02x
2012-10-08 11:40:45 +05:30
Rajesh Prajapati (OpenERP) c290f61a4d [MERGE] merge with main addons
bzr revid: rpr@tinyerp.com-20121008060825-uitjn8xtpfz24dfq
2012-10-08 11:38:25 +05:30
Mayur Maheshwari (OpenERP) 8926173f86 [MERGE]: Merge with lp:openobject-addons
bzr revid: mma@tinyerp.com-20121008060135-v2kqft87wju94z7j
2012-10-08 11:31:35 +05:30
Mayur Maheshwari (OpenERP) 0e947a457d [MERGE]: Merge with lp:openobject-addons
bzr revid: mma@tinyerp.com-20121008055803-xod8puhl8heoc23b
2012-10-08 11:28:03 +05:30
Mayur Maheshwari (OpenERP) af4d1bee91 [FIx]procurment : move demo data file to demo section to fix the name error
bzr revid: mma@tinyerp.com-20121008052836-b7ktuwwock78oxku
2012-10-08 10:58:36 +05:30
Amit Patel a12d249a24 [MERGE]:lp:~openerp-dev/openobject-addons/trunk-imp-point-of-sale-apa-ticket-sgo
bzr revid: apa@tinyerp.com-20121008052619-syi1k5oq1bq8p1s4
2012-10-08 10:56:19 +05:30
Jalpesh Patel (OpenERP) 70ec007c16 [Merge]merge with lp:openobject-addons
bzr revid: pja@tinyerp.com-20121008051450-c8a3m0111aeyki2o
2012-10-08 10:44:50 +05:30
Atul Patel (OpenERP) c95f769f99 [MERGE]: Merged with lp:openobject-server
bzr revid: atp@tinyerp.com-20121008051328-s9bbi1dhu5g0sc7j
2012-10-08 10:43:28 +05:30
pankita shah (Open ERP) 6761871c4e [IMP] indentation of active ids of timesheet.py
bzr revid: shp@tinyerp.com-20121008051014-fvftsi2mt44abyyn
2012-10-08 10:40:14 +05:30
Sanjay Gohel (Open ERP) 2698803e66 [MERGE]merge with parent
bzr revid: sgo@tinyerp.com-20121008050903-t8oef1ee7c8nxqbt
2012-10-08 10:39:03 +05:30
Atul Patel (OpenERP) bcb37010ec [MERGE]: Merged with lp:openobject-addons
bzr revid: atp@tinyerp.com-20121008050835-athkoqaqezda34s9
2012-10-08 10:38:35 +05:30
Amit Patel bcd6f15c4a [MERGE]:trunk
bzr revid: apa@tinyerp.com-20121004050416-v97xptyl93coz8v8
bzr revid: apa@tinyerp.com-20121008050741-iddjpex59d6gu07j
2012-10-08 10:37:41 +05:30
Ajay Chauhan (OpenERP) 07cf313d8c [MERGE] merge with lp:openobject-addons
bzr revid: cha@tinyerp.com-20121005051643-sdqj92jh7vt77ysn
bzr revid: cha@tinyerp.com-20121008050459-2dv1fz23tubmp1qz
2012-10-08 10:34:59 +05:30
Ajay Chauhan (OpenERP) 634cb59470 [MERGE] merge with lp:openobject-addons
bzr revid: cha@tinyerp.com-20121004050131-emowa7pye2si6cja
bzr revid: cha@tinyerp.com-20121008050019-d1rkpmvni8nmzml6
2012-10-08 10:30:19 +05:30
Ajay Chauhan (OpenERP) 14fdc7497c [MERGE] merge with lp:openobject-addons
bzr revid: cha@tinyerp.com-20121008045651-kt3esedbe5vy5dhk
2012-10-08 10:26:51 +05:30
Antony Lesuisse bc3cf0b74f rm files, move postload hook
bzr revid: al@openerp.com-20121006171053-qggp1r5263h7v7vd
2012-10-06 19:10:53 +02:00
Antony Lesuisse 55bcd978af [MERGE] callback2deferred session.rpc
bzr revid: al@openerp.com-20121006163238-7ni5r324c0yqi5a0
2012-10-06 18:32:38 +02:00
Antony Lesuisse ef56fc10d0 [MERGE] callback2deferred dataset.call
bzr revid: al@openerp.com-20121006162030-s5moj83dzegxlron
2012-10-06 18:20:30 +02:00
Antonin Bourguignon e6781e11ec [FIX] yml tests: do not use 'none' in calendar_event creation during tests; use False instead
bzr revid: abo@openerp.com-20121005185015-fj62y6tfra3oqo1g
2012-10-05 20:50:15 +02:00
Antonin Bourguignon 6dad993aa3 [FIX] remove a 'none' value for rrule_type field
bzr revid: abo@openerp.com-20121005174426-nzl24tpvz3qvu5x2
2012-10-05 19:44:26 +02:00
Antonin Bourguignon cbf91c37b9 [IMP] code style and comments
bzr revid: abo@openerp.com-20121005171055-sxm4okovczkgmj2p
2012-10-05 19:10:55 +02:00
Antonin Bourguignon ef2f6ce414 [IMP] remove the 'none' value for 'rrule_type' (recurrence rule type); this value doesn't make sense
bzr revid: abo@openerp.com-20121005165212-etg3lya4ep3g10kx
2012-10-05 18:52:12 +02:00
Frédéric van der Essen 6b361ee04c [MERGE] css fixes
bzr revid: fva@openerp.com-20121005152648-34x69lrsk7mbi068
2012-10-05 17:26:48 +02:00
Antonin Bourguignon 474e665fcc [IMP] code style: rename some of those uggly 'datas' var into 'data'
bzr revid: abo@openerp.com-20121005150638-m64hn1kn7nxvp5e0
2012-10-05 17:06:38 +02:00
Antonin Bourguignon def9d0dabf [IMP] meeting form view: when 'recurrency' is checked, the recurrency options are required
bzr revid: abo@openerp.com-20121005145413-7yyc3rr6ecx3ofu5
2012-10-05 16:54:13 +02:00
Frédéric van der Essen 8fc09c1c78 [MERGE] from trunk
bzr revid: fva@openerp.com-20121005144933-zvtkq24i1188rsny
2012-10-05 16:49:33 +02:00
Quentin (OpenERP) 46c83756da [FIX] analytic: fix crash when trying to set currency_id to False in an analytic account
bzr revid: qdp-launchpad@openerp.com-20121005143606-1evrpd8g3drg0v8m
2012-10-05 16:36:06 +02:00
Antonin Bourguignon b0bf2f9603 [MERGE] trunk
bzr revid: abo@openerp.com-20121005142029-anrpd7tx1zx9ke1m
2012-10-05 16:20:29 +02:00
Frédéric van der Essen a280aa6d81 [FIX] removed blue background for readonly fields, fixed css errors as reported by firefox
bzr revid: fva@openerp.com-20121005140831-ssp03115gu7zy1ge
2012-10-05 16:08:31 +02:00
Frédéric van der Essen ddb869f180 [FIX] fixing css errors as reported by firefox
bzr revid: fva@openerp.com-20121005140616-w5tulvk6v6hesjmn
2012-10-05 16:06:16 +02:00
niv-openerp 050f8daa8c [FIX] problem with calculation of modifiers
bzr revid: nicolas.vanhoren@openerp.com-20121005135528-ridisb8ybcng1szi
2012-10-05 15:55:28 +02:00
niv-openerp 3cd2ffe006 [IMP] added lot of stuff
bzr revid: nicolas.vanhoren@openerp.com-20121005135352-t43v2rc153ch2gvh
2012-10-05 15:53:52 +02:00
RGA(OpenERP) f3ac1341e9 [FIX] use .html to ecapse string to human redable html format
bzr revid: rgaopenerp-20121005133622-3n20h9sva67ry9p3
2012-10-05 19:06:22 +05:30
Sanjay Gohel (Open ERP) a014d89ab6 [IMP]add receipt ref for receipt in pos and pos order
bzr revid: sgo@tinyerp.com-20121005133315-qjwl6nx360em8u43
2012-10-05 19:03:15 +05:30
Atul Patel (OpenERP) 3f0c2c1bb7 [IMP]: Enble stock moves menu in stock.
bzr revid: atp@tinyerp.com-20121005133129-iik7g60lme14ccm3
2012-10-05 19:01:29 +05:30
Quentin (OpenERP) 168a29fdb9 [MERGE] merged the branch that is linked to the fix of yaml_import.py.
* fixed numerous yaml tests or onchange() that are not compatible with the new constraint: a field must be in the view if a onchange returns a value for it
 * fixed numerous yaml tests because the more realistic way we create records now spotted problems in them
 * sale and sale_stock: fixed onchange function
 * sale, sale_stock: added some tests to verify the onchange is triggered
 * account_voucher: fixed generation of journal entry for writeoff in secondary currency
 * account_voucher: fixed the yaml test that should have spotted above problem but which was eroneous too
 * event: replaced wrong reference to base.extended by base.group_no_one
 * mrp: improved stock move naming

bzr revid: qdp-launchpad@openerp.com-20121005132222-t58904z7qw6ztbvf
2012-10-05 15:22:22 +02:00
Jalpesh Patel (OpenERP) 50a7718e45 [IMP]send mail (automated purchase order notification mail)
bzr revid: pja@tinyerp.com-20121005131804-qliwjans60m08lhx
2012-10-05 18:48:04 +05:30
Christophe Matthieu af7e536f24 [IMP] mail chatter
bzr revid: chm@openerp.com-20121005131013-r00x50m6184ef1ea
2012-10-05 15:10:13 +02:00
Mayur Maheshwari (OpenERP) d20fbedc99 [FIX]sale_stock :improve code
bzr revid: mma@tinyerp.com-20121005130308-au9bzaugkh57qclp
2012-10-05 18:33:08 +05:30
Quentin (OpenERP) 47275f238d [MERGE] improvements/fixes of yaml_import for a more realistic creation of record (as if it was done by a form view)
* Upon creation of records in yaml, the view to use for the one2many fields should be the one define in-line in the record form view (if any)
 * Now raises an error if an onchange call returns a field that is not in the view (because computing something that is of no use is probably not expected: the onchange OR the view should be fixed/improved)
 * Improve performances by reducing the number of fields_view_get()  and fields_get() call
 * code refactoring

bzr revid: qdp-launchpad@openerp.com-20121005130226-0etkh88cq2puukrf
2012-10-05 15:02:26 +02:00
Raphael Collet 13e3792d42 [MERGE] from trunk
bzr revid: rco@openerp.com-20121005125036-slbqs4ezwebh3hsv
2012-10-05 14:50:36 +02:00
Raphael Collet 4f235060a7 [MERGE] from trunk
bzr revid: rco@openerp.com-20121005124845-suonokozsufyicg2
2012-10-05 14:48:45 +02:00
Christophe Matthieu 9ca47b7f99 [IMP]mail chatter: wizard liked
bzr revid: chm@openerp.com-20121005122741-a0hwb656ww61qcro
2012-10-05 14:27:41 +02:00
Rajesh Prajapati (OpenERP) 3eb1670267 [IMP] Sale : onchange removed from sale_view
bzr revid: rpr@tinyerp.com-20121005122642-rf692y75mdjpr26k
2012-10-05 17:56:42 +05:30
Quentin (OpenERP) 6046f9f226 [REF] yaml_import: comments refactoring
bzr revid: qdp-launchpad@openerp.com-20121005120653-jyq8352trvki24uc
2012-10-05 14:06:53 +02:00
Rajesh Prajapati (OpenERP) cdff4611b0 [MERGE] merge with main addons
bzr revid: rpr@tinyerp.com-20121005120503-07e0zo8ucv8k0q3s
2012-10-05 17:35:03 +05:30
Raphael Collet 6c8756a5a2 [IMP] test_orm: add test for create with given inherited ancestor
bzr revid: rco@openerp.com-20121005115619-l9qsoofumwrs5kle
2012-10-05 13:56:19 +02:00
Quentin (OpenERP) 9d678d1fd1 [MERGE] trunk
bzr revid: qdp-launchpad@openerp.com-20121005115057-am34fqwxopdgkh3y
2012-10-05 13:50:57 +02:00
Antonin Bourguignon f38d9ec3cd [IMP] comments and whitespaces
bzr revid: abo@openerp.com-20121005114919-7rgseqg9f0y2cdvn
2012-10-05 13:49:19 +02:00
niv-openerp a4fbe4dec8 [IMP] improved modifiers calculus
bzr revid: nicolas.vanhoren@openerp.com-20121005114846-ddc3fqpftu3k8iob
2012-10-05 13:48:46 +02:00