Commit Graph

212 Commits

Author SHA1 Message Date
Christophe Simonis ac865c8a78 [MERGE] forward port of branch 7.0 up to 9fa7624 2015-07-07 13:58:35 +02:00
Christophe Combelles 2c37f83435 [FIX] analytic: duplication of analytic lines
When duplicating analytic accounts, child accounts are duplicated as well.
The custom copy method removes the analytic lines but this applies only on the
first copy. As the copy_data method recursively copies child accounts, these
child accounts did not use the custom copy method but the basic copy_data.

Move to copy_data

Fixes #6368, lp:1149676
2015-07-02 16:54:46 +02:00
Paramjit Singh Sahota 7f8f78cc4f [MERGE] Merged lp:openobject-addons.
bzr revid: psa@tinyerp.com-20131021055621-l0dw112tf8535j7q
2013-10-21 11:26:21 +05:30
Denis Ledoux a7e05f1af4 [MERGE] Forward-port of latest saas-1 bugfixes, up to rev. 8793 rev-id: dle@openerp.com-20131018124037-v3501acvv4fh1077
bzr revid: dle@openerp.com-20131018125818-1k168nlo2ferj25w
2013-10-18 14:58:18 +02:00
Denis Ledoux 1a555475cc [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9529 rev-id: mat@openerp.com-20131018120428-2vdmdm2th8rz57zr
bzr revid: dle@openerp.com-20131018121236-zp221von16vekthp
2013-10-18 14:12:36 +02:00
Martin Trigaux afaa1159ad [ADD] account: test for added check
bzr revid: mat@openerp.com-20131015141408-rpdp110btoc0wll3
2013-10-15 16:14:08 +02:00
Paramjit Singh Sahota daa7594cbb [MERGE] Merged lp:openobject-addons.
bzr revid: psa@tinyerp.com-20130913112155-jll3rlzcgsjrtzv4
2013-09-13 16:51:55 +05:30
Paramjit Singh Sahota edf9d5ef8e [IMP] Improved code for following
1/.  Onchange on Cash Control was not working in POS
2/.  Added new css for cash control
3/.  Fixed the issue for the space between the Real Closing Balance and Differences.

bzr revid: psa@tinyerp.com-20130711105900-zzxnzky2nr6ms4c9
2013-07-11 16:29:00 +05:30
sgo@tinyerp.com 6a3cdf718c [MERGE]sync with trunk
bzr revid: sgo@tinyerp.com-20130605071905-o2ldzc6vxqnoe099
2013-06-05 12:49:05 +05:30
Olivier Dony 325f710360 [FIX] account: split the actions to open analytic accounts, as context is not compatible
The same action was erroneously used in two incompatible
cases: once for openining the list of analytic accounts
from a partner form view (requires a special context
with a client-side `active_id` variable) and the second
one for the main Analytic Account menu item (which
cannot have `active_id` in the context - it would crash).

The fix includes setting an empty ({}) context explicitly
on the original action to be sure the incorrect context
is removed upon update.


The error was introduced at rev.8685
revid:qdp-launchpad@openerp.com-20130418125951-8p0tfexd9jj8l75b

bzr revid: odo@openerp.com-20130507165113-67lam91046t56ky8
2013-05-07 18:51:13 +02:00
sgo@tinyerp.com 56cb7db019 [IMP]improve yml for account
bzr revid: sgo@tinyerp.com-20130221052958-metvr090gsubdc5u
2013-02-21 10:59:58 +05:30
dle@openerp.com d84a100dd6 [ADD]form in action quick journal items and CSS Class to handle switcher
bzr revid: dle@openerp.com-20121220104345-yrj9w6demtlba00l
2012-12-20 11:43:45 +01:00
Olivier Dony 5db87bea9c [MERGE] Bugfixes from 6.1 until revision 6800
bzr revid: odo@openerp.com-20121206153856-9y9v8ok6yxo6l5f0
2012-12-06 16:38:56 +01:00
Denis Ledoux dle@openerp.com d05caecd7e [MERGE][FIX][IMP]Latest trunk + lots of things. I should have pushed more often, but its too late now : (
bzr revid: dle@openerp.com-20121121172954-qpnw0arhb632b8ve
2012-11-21 18:29:54 +01:00
Denis Ledoux dle@openerp.com 87cab5ffa1 [DEL]Journal Items
bzr revid: dle@openerp.com-20121113131412-6mm1pz8jhstr46pp
2012-11-13 14:14:12 +01:00
Denis Ledoux dle@openerp.com cebd3c37b4 [FIX]Readding wizard and journals items menuitem
bzr revid: dle@openerp.com-20121113111738-rvvy3h3uox4odwyg
2012-11-13 12:17:38 +01:00
Denis Ledoux dle@openerp.com fee0e6b67a [DEL]Journal items menuitem for supplier, customer and bank/cash
bzr revid: dle@openerp.com-20121112154318-jt555uecspjxfj7f
2012-11-12 16:43:18 +01:00
Denis Ledoux dle@openerp.com a6d97dccbd [ADD]Changes of context
bzr revid: dle@openerp.com-20121109123423-3tkugord76afa2r9
2012-11-09 13:34:23 +01:00
Denis Ledoux dle@openerp.com 9e56b3b6a8 [ADD]QuickAdd Move Line View
bzr revid: dle@openerp.com-20121105084152-35bvurqkvuv4k0ow
2012-11-05 09:41:52 +01:00
Fabien Pinckaers e9f4840c93 [IMP] emoving bad code, no invitation system on events
[IMP] no more certifiate, will be managed in apps.openerp.com directly

bzr revid: fp@tinyerp.com-20120926121627-60isym4hdjkaxe9p
2012-09-26 14:16:27 +02:00
niv-openerp cd12a0faf5 removed lot of stuff
bzr revid: nicolas.vanhoren@openerp.com-20120917151031-h3gofzqv23k6g0t7
2012-09-17 17:10:31 +02:00
RGA(OpenERP) f8936e0f00 Merge with trunk
bzr revid: rgaopenerp-20120827063112-jo5kud1xw2waqywf
2012-08-27 12:01:12 +05:30
pso (OpenERP) c78a04bc68 [MERGE] Merged HSA's branch to improve __openerp__.py of all modules by replacing init_xml, update_xml with data, demo_xml with demo, Adding noupdate in init_xml files
bzr revid: pso@tinyerp.com-20120822071445-yamr1s0zf3fk9jj7
2012-08-22 12:44:45 +05:30
Hardik 8f9f860323 [IMP]Update __openerp__.py for all modules
bzr revid: hsa@tinyerp.com-20120820125644-px287o03bxrx8h3o
2012-08-20 18:26:44 +05:30
help 0d4603f4f9 [IMP]improved modules description from rst2html
bzr revid: help-20120820092716-x61hs1o7d8lz6tpg
2012-08-20 14:57:16 +05:30
Hardik b040d2706d [IMP]update __openerp__.py in all modules
bzr revid: hsa@tinyerp.com-20120817111540-rfql0ifsvbx5nz7g
2012-08-17 16:45:40 +05:30
RGA(OpenERP) fbddeaa021 [IMP] impromve sql view for model, remove method for nothing to reconcile button
bzr revid: rgaopenerp-20120808135747-vdi2wztvi9qprsus
2012-08-08 19:27:47 +05:30
RGA(OpenERP) 7cf4fb8779 [IMP] remove addition field from act_window, pass it through context of action
bzr revid: rgaopenerp-20120807084410-1w2jycfedlgg80f0
2012-08-07 14:14:10 +05:30
RGA(OpenERP) 89328b74ab [IMP] change model name + clean up
bzr revid: rgaopenerp-20120806125332-y0bp5ojab6d72ksq
2012-08-06 18:23:32 +05:30
RGA(OpenERP) 08fd6917b5 [IMP] change file name
bzr revid: rgaopenerp-20120806113248-urvz0z1bqje57t0h
2012-08-06 17:02:48 +05:30
RGA(OpenERP) 41f18dc264 Merge with trunk
bzr revid: rgaopenerp-20120725113844-mcz488pe9niuxa45
2012-07-25 17:08:44 +05:30
Mayur Maheshwari (OpenERP) 75fb9fbe91 [IMP]all: improve some typo in module description
bzr revid: mma@tinyerp.com-20120720064111-216mdw2wjrwavhe4
2012-07-20 12:11:11 +05:30
Purnendu Singh (OpenERP) c45d68d6b8 [MERGE] Merge with main addons
bzr revid: psi@tinyerp.com-20120718055558-03lss1ha0tcdi2dk
2012-07-18 11:25:58 +05:30
RGA(OpenERP) c574671aa2 Merge with trunk
bzr revid: rgaopenerp-20120717052359-fhiv2am6anyjc70z
2012-07-17 10:53:59 +05:30
Ajay Chauhan (OpenERP) 66b80419e0 [IMP] : Update Description for modules
bzr revid: cha@tinyerp.com-20120712095425-l1i8o33okp2tzfjx
2012-07-12 15:24:25 +05:30
Ajay Chauhan (OpenERP) 8a847dcf5e [IMP] : improve title & description for modules
bzr revid: cha@tinyerp.com-20120711084057-b7f3jt6p0kht6wrp
2012-07-11 14:10:57 +05:30
Frédéric van der Essen f8d32d3304 [MERGE] point_of_sale
bzr revid: fva@openerp.com-20120710142447-s0z5ca89bofh0n2c
2012-07-10 16:24:47 +02:00
Ajay Chauhan (OpenERP) 4fe87edb8f [IMP] : improve description for modules
bzr revid: cha@tinyerp.com-20120706103356-lctrqno2dy0wrpvt
2012-07-06 16:03:56 +05:30
Ajay Chauhan (OpenERP) 3a49884f6f [IMP] : improve description for modules
bzr revid: cha@tinyerp.com-20120702055949-cr9i6q2yrhhosuzr
2012-07-02 11:29:49 +05:30
RGA(OpenERP) 4647ff5b8f [IMP] create sql view(model) to fecth appropriate data from various tables, improve view as per mock-up specification
bzr revid: rgaopenerp-20120627130529-5jonfjm2fkoh61vu
2012-06-27 18:35:29 +05:30
RGA(OpenERP) a14e4b502c [IMP] form view and apply css
bzr revid: rgaopenerp-20120622054234-cj001wr9crf7chyi
2012-06-22 11:12:34 +05:30
RGA(OpenERP) cf8581e99c [ADD] directory structure for web addons
bzr revid: rgaopenerp-20120611072042-r5lj4z6p3tqsonx8
2012-06-11 12:50:42 +05:30
Frédéric van der Essen cf17814781 [MERGE] trunk
bzr revid: fva@openerp.com-20120521092023-qcis495ngwsudw43
2012-05-21 11:20:23 +02:00
Mayur Maheshwari (OpenERP) ea859f54c8 [IMP]all: remove a complexity in openerp and move asset management and Payroll in extra modules
bzr revid: mma@tinyerp.com-20120518052605-e6sdmicwtb4kcoq0
2012-05-18 10:56:05 +05:30
Raphael Collet b66ba6f11c [FIX] account: incorrect spec for loading data file
bzr revid: rco@openerp.com-20120509124033-5dowcrc20mdzz58q
2012-05-09 14:40:33 +02:00
olt@tinyerp.com d1e195b569 [FIX] reverted __openerp__.py: the commented line was already commented before so it was wrongly uncommented
bzr revid: olt@tinyerp.com-20120508095632-bkmmw5rerw9uifs4
2012-05-08 11:56:32 +02:00
Najlaâ 071158358f remove comment for openerp file
bzr revid: nel@tinyerp.com-20120507115311-6eal7ta2qcps97xl
2012-05-07 13:53:11 +02:00
Najlaâ 7b8a28bb3a [FIX] account: fixed starting details of bank statement
bzr revid: nel@tinyerp.com-20120507115051-cqz3mxi1trbmcuvr
2012-05-07 13:50:51 +02:00
Stephane Wirtel ec308a08e7 [IMP] account: Add new wizard for the cash register "Take Money Out", "Put Money In"
[FIX] point_of_sale: Fix some bugs

bzr revid: stw@openerp.com-20120504125158-p45qfzo8mif6x9xe
2012-05-04 14:51:58 +02:00
Jagdish Panchal (Open ERP) c5cd83284d [IMP] Account: improve code for chart of account wizard
bzr revid: jap@tinyerp.com-20120503103645-atid3qv10o12ijnj
2012-05-03 16:06:45 +05:30