Quentin (OpenERP)
5e3836c604
[MERGE] merged the branch that change the syntax to use in widget options to python instead of json
...
bzr revid: qdp-launchpad@openerp.com-20121010120143-peurgs2j9qthbpcw
2012-10-10 14:01:43 +02:00
Quentin (OpenERP)
454898d1ba
[MERGE] merged the branch that change the syntax to use in widget options to python instead of json
...
bzr revid: qdp-launchpad@openerp.com-20121010120048-7n3h1o779du2zmo1
2012-10-10 14:00:48 +02:00
Antonin Bourguignon
69850d8c73
[MERGE] trunk-bug-1022509-mdi: fix a group by in project's reporting
...
lp bug: https://launchpad.net/bugs/1022509 fixed
bzr revid: abo@openerp.com-20121010114853-tv06bu1wglcx5iy2
2012-10-10 13:48:53 +02:00
95aaa7f926
[MERGE] trunk-trigger-on_button_cancel.
...
bzr revid: vta@openerp.com-20121010114158-ktm6gbfdcsax4uxe
2012-10-10 13:41:58 +02:00
46b5ac9a37
[FIX] Fixed on_button_cancel.
...
bzr revid: vta@openerp.com-20121010114007-3cw3qlxu2zwt1k0s
2012-10-10 13:40:07 +02:00
Amit Patel
7b585d3e1f
[FIX]:Uncaught TypeError: Cannot read property 'context' of undefined
...
bzr revid: apa@tinyerp.com-20121010113556-p79hzujiunibwsix
2012-10-10 17:05:56 +05:30
pankita shah (Open ERP)
8bbd857198
[IMP] move type field in sale module and improve default state in crm_claim
...
bzr revid: shp@tinyerp.com-20121010113323-wpxt81u5p3hmwl6w
2012-10-10 17:03:23 +05:30
Amit Patel
93dc1c41b7
[MERGE]:trunk
...
bzr revid: apa@tinyerp.com-20121010113227-o0wsd7p5qxdujmxr
2012-10-10 17:02:27 +05:30
Quentin (OpenERP)
a28d4b75bc
[IMP] account_voucher: added monetary widget on customer/supplier payment form view
...
bzr revid: qdp-launchpad@openerp.com-20121010113147-8yxjj1kdx3j1i2ma
2012-10-10 13:31:47 +02:00
Amit Patel
82a1e021cb
[MERGE]:sgo branch
...
bzr revid: apa@tinyerp.com-20121010113057-2wxiemr556x4a9ho
2012-10-10 17:00:57 +05:30
Antony Lesuisse
4c7f416dd4
[FIX] switch_view
...
bzr revid: al@openerp.com-20121010113025-qpz12d28uob7hab9
2012-10-10 13:30:25 +02:00
Xavier Morel
f8a29989c8
[IMP] base_import: simplify styling of looks button
...
bzr revid: xmo@openerp.com-20121010112731-flw3bkijm229mr53
2012-10-10 13:27:31 +02:00
Antonin Bourguignon
550d7905b5
[FIX] domain in view
...
bzr revid: abo@openerp.com-20121010112553-no3nhdvaj5kun1a8
2012-10-10 13:25:53 +02:00
Christophe Matthieu
20d8b0fc76
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20121010112018-oswe04e2j0o95dry
2012-10-10 13:20:18 +02:00
Quentin (OpenERP)
155680a158
[IMP] purchase: added monetary widget on purchase order form view
...
bzr revid: qdp-launchpad@openerp.com-20121010112013-d6z1iq6hpjgdle63
2012-10-10 13:20:13 +02:00
Christophe Matthieu
09ab4151a2
[MERGE] from trunk, rev 7715 undo revert
...
bzr revid: chm@openerp.com-20121010111615-s2owlcrawkztdqeb
bzr revid: chm@openerp.com-20121010111751-duikn1etnsadp550
2012-10-10 13:17:51 +02:00
Antonin Bourguignon
a297629286
[MERGE] trunk
...
bzr revid: abo@openerp.com-20121010111720-g9zzhyrywz1z9jdw
2012-10-10 13:17:20 +02:00
Antonin Bourguignon
9fa829ebca
[FIX] replace the related field with a m2o field and adapt the requet in init() method
...
bzr revid: abo@openerp.com-20121010111649-11p1h305w6j7dwqf
2012-10-10 13:16:49 +02:00
Antonin Bourguignon
42b2412782
[REV] revert the previous 'bugfix' which is not a bugfix; removing a bugged feature doesn't fix anything
...
also remove whitespaces
bzr revid: abo@openerp.com-20121010111538-03xm67fpc3tljfd4
2012-10-10 13:15:38 +02:00
Quentin (OpenERP)
1bb568d22e
[IMP] sale, sale_margin: added monetary widget on sale order form view
...
bzr revid: qdp-launchpad@openerp.com-20121010111205-eokyh1haa69tgrfl
2012-10-10 13:12:05 +02:00
Atul Patel (OpenERP)
eb20086d59
[REM]: Remove print statement
...
bzr revid: atp@tinyerp.com-20121010111151-cgylp0roe61vhzs9
2012-10-10 16:41:51 +05:30
Christophe Matthieu
c5615609e5
[IMP]mail : field reload with wizard mail
...
bzr revid: chm@openerp.com-20121010110203-bs42eg6ie7m79bf3
2012-10-10 13:02:03 +02:00
Quentin (OpenERP)
7c6e893a39
[IMP] account: added monetary widget on account.move.line and cash registers
...
bzr revid: qdp-launchpad@openerp.com-20121010105619-fk13ba9ex0f0ihpv
2012-10-10 12:56:19 +02:00
Quentin (OpenERP)
e2d3d617a9
[IMP] account: added monetary widget on invoices form view
...
bzr revid: qdp-launchpad@openerp.com-20121010104952-jxy17zagby2jp0w2
2012-10-10 12:49:52 +02:00
Frédéric van der Essen
b1fdaa4356
[MERGE] checking for new operator on object instanciation
...
bzr revid: fva@openerp.com-20121010104634-m86qwtg96db204wx
2012-10-10 12:46:34 +02:00
Frédéric van der Essen
21dcc15a2c
[FIX] previous 'forgot now' error message was a bit crappy
...
bzr revid: fva@openerp.com-20121010104433-cb03lb11fi15qrzd
2012-10-10 12:44:33 +02:00
Quentin (OpenERP)
f4f3d6fa15
[REF] code review by odo
...
bzr revid: qdp-launchpad@openerp.com-20121010104220-nqi6c12ua7tnaejt
2012-10-10 12:42:20 +02:00
Frédéric van der Essen
41f16f85d6
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20121010104202-gt1fxo4zzxs0pu1t
2012-10-10 12:42:02 +02:00
Amit Patel
57011e3ef5
[MERGE/FIX]:
...
- If you manually create a session by clicking on "All Sessions" then "Create" and enter a pos, the pos field will dissapear..
- Should not be possible to select view accounts for profit/losss acount on cash registers tab of payment method
bzr revid: apa@tinyerp.com-20121010104043-gcj3ytsjhua7k8p7
2012-10-10 16:10:43 +05:30
Atul Patel (OpenERP)
98eaf2c2bc
[FIX]: Fix on_change_account_id() argument problem
...
bzr revid: atp@tinyerp.com-20121010103450-n4gt4ikp05t6b8yu
2012-10-10 16:04:50 +05:30
Xavier Morel
4dd9a0529e
[ADD] reload file button next to the file input, as webkit browsers and MSIE don't trigger change when a file input is re-set to thee same file
...
Using other events (e.g. 'click') is not kosher as the event is
triggered long before the file is picked, the alternative is to use
the File API and regularly check the file in the input to see if it's
been altered (by storing a crc) and re-pushing it if the hash is
different. Of course this has other issues (risks catching the file
mid-edition...)
A third alternative is, once a file has been uploaded, to clear and
re-insert the corresponding file input. This means the file input will
*always* be empty
bzr revid: xmo@openerp.com-20121010101836-qtqmcc5n5zblgmcp
2012-10-10 12:18:36 +02:00
Christophe Matthieu
df873d22a8
[FIX] mail: context default value error
...
bzr revid: chm@openerp.com-20121010101532-v2vx6h01x4zeq0ac
2012-10-10 12:15:32 +02:00
Quentin (OpenERP)
19c1422f5e
[MERGE] trunk
...
bzr revid: qdp-launchpad@openerp.com-20121010101335-xt44hesaboq6nqg5
2012-10-10 12:13:35 +02:00
a8bf5bfbab
[FIX] Fixed event name on_write_complete.
...
bzr revid: vta@openerp.com-20121010101246-1ht2npz6l75ah06e
2012-10-10 12:12:46 +02:00
bbbc6a304d
[FIX] Fixed event name on_write_complete.
...
bzr revid: vta@openerp.com-20121010101200-1lwcqae44bb88ffa
2012-10-10 12:12:00 +02:00
Quentin (OpenERP)
00783bec57
[MERGE] refactoring branch that use the python syntax for 'options' attribute of widget, that used to be written in json
...
bzr revid: qdp-launchpad@openerp.com-20121010101044-5e72ezmi518mlyca
2012-10-10 12:10:44 +02:00
Quentin (OpenERP)
5f8c1b4907
[REV] revert revision 7730 that will be pushed to trunk via another branch (a dedicated one)
...
bzr revid: qdp-launchpad@openerp.com-20121010100832-asu2rj6j7x5328f0
2012-10-10 12:08:32 +02:00
d50874c9b6
[MERGE] Merged trunk-trigger-on_record_loaded.
...
bzr revid: vta@openerp.com-20121010100524-8njbdbkio2ehfebs
2012-10-10 12:05:24 +02:00
8f7b3acb7c
[MERGE] Merged trunk-trigger-on_record_loaded.
...
bzr revid: vta@openerp.com-20121010100508-26hdgtofjuf9w72g
2012-10-10 12:05:08 +02:00
40eceb20a3
[FIX] Fixed on_record_loaded.
...
bzr revid: vta@openerp.com-20121010100233-tulf3c1fvnt2s85e
2012-10-10 12:02:33 +02:00
31760fd249
[FIX] Fixed on_record_loaded.
...
bzr revid: vta@openerp.com-20121010100218-drvx420qtrjucom1
2012-10-10 12:02:18 +02:00
Quentin (OpenERP)
96cbbe9d59
[MERGE] trunk
...
bzr revid: qdp-launchpad@openerp.com-20121010100111-vta17dz1vq6n6g9a
2012-10-10 12:01:11 +02:00
Frédéric van der Essen
9c71d984e6
[IMP] Class instanciations throws an error when you forgot to use the new operator
...
bzr revid: fva@openerp.com-20121010095509-ojvigsva4hblta7m
2012-10-10 11:55:09 +02:00
Amit Patel
b0dd33a353
[MERGE]:fixed TypeError: 'bool' object is not iterable
...
bzr revid: apa@tinyerp.com-20121010095051-7qql3lfjbscxku0f
2012-10-10 15:20:51 +05:30
95dd656cc9
[MERGE] Merged trunk-trigger-on_mode_switch.
...
bzr revid: vta@openerp.com-20121010094946-he9kgd7dch6meb2t
2012-10-10 11:49:46 +02:00
f1981217e0
[MERGE] Merged trunk-trigger-on_mode_switch.
...
bzr revid: vta@openerp.com-20121010094915-29fy09rwsqxhlbmo
2012-10-10 11:49:15 +02:00
Foram Katharotiya (OpenERP)
f15aa20130
[IMP] remove select view accounts for profit/losss acount on cash registers tab of payment method
...
bzr revid: fka@tinyerp.com-20121010094056-dfzfb9munee7pfpj
2012-10-10 15:10:56 +05:30
12c35d031d
[FIX] Fixed on_mode_switch.
...
bzr revid: vta@openerp.com-20121010093737-0kheus1v0kdj5tk7
2012-10-10 11:37:37 +02:00
83c00b75ff
[FIX] Fixed on_mode_switch.
...
bzr revid: vta@openerp.com-20121010093700-nz326tlux3v5olqj
2012-10-10 11:37:00 +02:00
Frédéric van der Essen
3f48855822
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20121010092710-v4b925d362rxzjr1
2012-10-10 11:27:10 +02:00
Quentin (OpenERP)