3f600062d3
[IMP]remove server warnings
...
bzr revid: tch@tinyerp.com-20120906132533-51shfwfgzguwufsl
2012-09-06 18:55:33 +05:30
28b6979371
[FIX] account: Add an ondelete=cascade on the payment term line
...
[FIX] crm_claim: Fix a bug with the precedence of a menuitem
[FIX] hr_timesheet_sheet: Fix the ids of name_get
bzr revid: stw@openerp.com-20120906125407-8lbgehsf0yvy35vw
2012-09-06 14:54:07 +02:00
6273941772
[MERGE] currency from company
...
bzr revid: fp@tinyerp.com-20120907134229-oblfauk8y435nwhz
2012-09-07 15:42:29 +02:00
e363813dba
[MERGE] from trunk
...
bzr revid: rco@openerp.com-20120906081044-9ut2ykbfekyrkwii
2012-09-06 10:10:44 +02:00
043f823c5e
[MERGE]
...
bzr revid: hmo@tinyerp.com-20120906072641-eqrucys1ql7712t4
2012-09-06 12:56:41 +05:30
1334eb7a0d
[MERGE]:trunk-mail-cleaning-fp
...
bzr revid: apa@tinyerp.com-20120906061835-gb317yvqnd5vaiei
2012-09-06 11:48:35 +05:30
e07a624e1a
[MERGE]
...
bzr revid: hmo@tinyerp.com-20120906054754-0ia4w343p38gqv26
2012-09-06 11:17:54 +05:30
41e16c6592
[MERGE] sync with trunk
...
bzr revid: odo@openerp.com-20120905163135-9f6q0ghri1kq6z75
2012-09-05 18:31:35 +02:00
b84d5ae61a
[MERGE] from trunk
...
bzr revid: rco@openerp.com-20120905151128-v2i2544xpv8kdg2h
2012-09-05 17:11:28 +02:00
97de9d6d3f
[FIX] point_of_sale: Set the right account for the internal account.
...
[REF] point_of_sale: Review the code for the Take Money Out and Push Money In.
[FIX] point_of_sale: Can post a session with an order in the invoiced state.
bzr revid: stw@openerp.com-20120905150538-v9ex7wehyebft7tu
2012-09-05 17:05:38 +02:00
2d89c39f89
[MERGE] account: If the credit or debit field does not exist in the journal entry line, return 0.0
...
bzr revid: stw@openerp.com-20120905130038-3lk43b0ftzoscobm
2012-09-05 15:00:38 +02:00
9d871c5036
[MERGE][IMP]merge with mail-cleaning-fp and improve code
...
bzr revid: sgo@tinyerp.com-20120905093255-gs4vbp3gxav6iutt
2012-09-05 15:02:55 +05:30
2160072508
[MERGE] sync with trunk
...
bzr revid: odo@openerp.com-20120905073134-v1j98vzvmwe6a72i
2012-09-05 09:31:34 +02:00
43c71f585e
[MERGE]merge with mail-cleaning-fp
...
bzr revid: sgo@tinyerp.com-20120905050803-qwrknvluqtkpwx6g
2012-09-05 10:38:03 +05:30
d155b77a04
[MERGE] account: remove the payement term lines if we remove the payment term
...
bzr revid: stw@openerp.com-20120904151837-cuwhc0iawvl32vh9
2012-09-04 17:18:37 +02:00
3d61c15c01
[MERGE] account: return the right value if there is no chart_account in the Account Common Report
...
bzr revid: stw@openerp.com-20120904150006-s7dbriqd8lmkg6yq
2012-09-04 17:00:06 +02:00
d6ddb23a4e
[REM] email.template: remove all text versions of demo/data templates
...
bzr revid: odo@openerp.com-20120904132803-9cgj4g10xtm121ko
2012-09-04 15:28:03 +02:00
7f1a3872f5
[MERGE] trunk-editable_list (make SO/PO/invoice/expense lines editable)
...
bzr revid: rco@openerp.com-20120904123435-lzo9gpaigdrcnsmi
2012-09-04 14:34:35 +02:00
0a5ebb52e1
[MERGE]:trunk-mail-cleaning-fp
...
bzr revid: apa@tinyerp.com-20120904104409-w9zl98qjpem10pan
2012-09-04 16:14:09 +05:30
5930fd069f
[MERGE] Merged trunk.
...
bzr revid: jra@tinyerp.com-20120904102700-8f94o2dvdt0f33bv
2012-09-04 15:57:00 +05:30
48c081f271
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120904075142-4xnbxyf52ph0jezj
2012-09-04 09:51:42 +02:00
74e4fe0f53
[MERGE] USablity improvements: product form/kanban/search, membership, projects
...
bzr revid: fp@tinyerp.com-20120903175638-lq221k6yjyams8kn
2012-09-03 19:56:38 +02:00
13659d0590
[MERGE]:trunk-mail-cleaning-fp
...
bzr revid: apa@tinyerp.com-20120903100634-qxrkrpnpon10s44i
2012-09-03 15:36:34 +05:30
f39f799897
Fix: Account configuration : removed currency group.
...
bzr revid: tta@openerp.com-20120903095908-tswt6gi2zl5w89s2
2012-09-03 15:29:08 +05:30
6fa349a4eb
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120903091818-0qnjl3e5tss54bbj
2012-09-03 11:18:18 +02:00
c8d240afbd
[MERGE] Merged with main branch
...
bzr revid: pso@tinyerp.com-20120903065528-b73t9t63t2iq20sw
2012-09-03 12:25:28 +05:30
dfb82b2081
[MERGE] Merge from trunk.
...
bzr revid: jra@tinyerp.com-20120903065444-bcadcpsnadx0vhpx
2012-09-03 12:24:44 +05:30
aa216774ea
[IMP] make changes into account data for the subtype
...
bzr revid: rma@tinyerp.com-20120903061713-xuhcfdqi4e7cp6qf
2012-09-03 11:47:13 +05:30
da7c583359
[IMP] contracts
...
bzr revid: fp@tinyerp.com-20120901072137-le4el67es4zhw8n7
2012-09-01 09:21:37 +02:00
1eac0fbe52
[REF] Replace the user id 1 by openerp.SUPERUSER_ID
...
bzr revid: stw@openerp.com-20120831135136-8k2wjeiixqt6tnkr
2012-08-31 15:51:36 +02:00
7829c44833
[IMP] account: make the lines in invoice form editable, and add missing fields
...
bzr revid: rco@openerp.com-20120831135029-dki57juih0qcw5as
2012-08-31 15:50:29 +02:00
e07499a9a2
[MERGE] Merged HSA's branch to add currency field on accounting config wizard and to improve tooltip
...
bzr revid: pso@tinyerp.com-20120831125842-m0ioafazvs1h47gq
2012-08-31 18:28:42 +05:30
596debf67e
[IMP]make changes into account data for subtype
...
bzr revid: rma@tinyerp.com-20120831124722-2u9fcx10gnrcfsl5
2012-08-31 18:17:22 +05:30
6104756d30
[MERGE] account: when generating objects from templates, set the default taxes as a super user + refactoring of deprecated set() method of ir.values
...
bzr revid: qdp-launchpad@openerp.com-20120831124141-yl4sq3ajrttvm81z
2012-08-31 14:41:41 +02:00
b8d21a0f3c
[IMP] Improved code in account.py to pass ids for browse method.
...
bzr revid: jra@tinyerp.com-20120831115722-u53j64h3cvvhpbcx
2012-08-31 17:27:22 +05:30
0cb8be90ab
[IMP] If ids are int or long then convert into list.
...
bzr revid: bth@tinyerp.com-20120831114125-z3rk36ip710u1czd
2012-08-31 17:11:25 +05:30
b5a8f42641
[MERGE] merge lp:~openerp-dev/openobject-addons/trunk-remove-warnings-server-installation-account-bth
...
bzr revid: bth@tinyerp.com-20120831113829-vkkmdexyyhoeh3zu
2012-08-31 17:08:29 +05:30
a284bf3e51
[MERGE]merge with parent branch
...
bzr revid: rma@tinyerp.com-20120831103206-4rk0yreikjgb0a51
2012-08-31 16:02:06 +05:30
a6272c7f48
[IMP] Improved code to remove warning(server log) on installation.
...
bzr revid: jra@tinyerp.com-20120831101025-h4kpc9pmnk293giy
2012-08-31 15:40:25 +05:30
b6eacb18e7
[IMP]Add multi currency field and tooltip messages are add
...
bzr revid: hsa@tinyerp.com-20120831084455-fnugi1p4q6hwb5r3
2012-08-31 14:14:55 +05:30
c14a11482c
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120831074032-3b41p3qnuknfv461
2012-08-31 09:40:32 +02:00
278ad45c38
[MERGE]
...
bzr revid: hmo@tinyerp.com-20120830141006-u0ptli8ab49uhafl
2012-08-30 19:40:06 +05:30
bce4d99a27
[MERGE] from trunk
...
bzr revid: rco@openerp.com-20120830135354-at09zudifgjwiury
2012-08-30 15:53:54 +02:00
54237bc2a2
[MERGE] point_of_sale: Add some improvements and bug fixes
...
bzr revid: stw@openerp.com-20120830132642-o9ish51w0s7aigzn
2012-08-30 15:26:42 +02:00
0d07918cce
[MERGE]merge with parent branch
...
bzr revid: rma@tinyerp.com-20120830125932-nb9392qz9j3ellx8
2012-08-30 18:29:32 +05:30
1dd00e9116
[IMP]Add data of the subtype in accouting modules
...
bzr revid: rma@tinyerp.com-20120830124947-xxkah5za90oa5tuy
2012-08-30 18:19:47 +05:30
91c022497b
[MERGE]merge with lp:~openerp-dev/openobject-addons/trunk-mail-cleaning-fp and done changes as needed
...
bzr revid: sgo@tinyerp.com-20120830112426-15b9jere67yyoa3q
2012-08-30 16:54:26 +05:30
e0006d678c
[MERGE] Merged with main branch
...
bzr revid: pso@tinyerp.com-20120830085240-xjou0bp03967xp7j
2012-08-30 14:22:40 +05:30
4675aa0256
[MERGE] merge with main addons
...
bzr revid: psi@tinyerp.com-20120829112422-yxvlvmpvtoaasnbe
2012-08-29 16:54:22 +05:30
0e14e8dc20
[MERGE]Merged with latest trunk
...
bzr revid: dhr@tinyerp.com-20120829102402-3sdf5i8rfgq9dxca
2012-08-29 15:54:02 +05:30
19cc477918
[IMP]Removed currency group from amount field
...
bzr revid: dhr@tinyerp.com-20120829100809-366o73igiko7wq8z
2012-08-29 15:38:09 +05:30
d3bb4f5ae5
merge
...
bzr revid: fp@tinyerp.com-20120829094828-b8pxz76tfnigfffw
2012-08-29 11:48:28 +02:00
77593dcc2a
[IMP] if not list then convert into list.
...
bzr revid: bth@tinyerp.com-20120829091107-ohpgyjikeaatrxd1
2012-08-29 14:41:07 +05:30
8b910c1f1d
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120829074244-x6u8dnw4owiw93pv
2012-08-29 09:42:44 +02:00
6086951935
[MERGE]Merged with trunk
...
bzr revid: dhr@tinyerp.com-20120829061429-yko2f9xgqsyynvig
2012-08-29 11:44:29 +05:30
f45b3bf33c
[IMP]Account : changes made for amount_currency field and related changes applied
...
bzr revid: dhr@tinyerp.com-20120829061048-rc6x81wewks3x0e2
2012-08-29 11:40:48 +05:30
7c5c081c7c
[FIX] account: The 'With Last Closing Balance' is checked per default in the demo mode
...
bzr revid: stw@openerp.com-20120828131828-lqmsnlqxph83vhaf
2012-08-28 15:18:28 +02:00
baad695095
[FIX] account: company isn't a kwarg for set_default. company_id is
...
bzr revid: qdp-launchpad@openerp.com-20120828112329-g5y9n2e18bvci9r5
2012-08-28 13:23:29 +02:00
768d9cdb7e
[IMP] account: Merge the opening_control and closing_control flags in cash_control
...
[IMP] account: In the case where the bank statement is a cash register, we can get the coins of the last register.
[IMP] account: Hide the 'Available Coins' if the journal hasn't the cash_control flag.
[FIX] account: Use some default values for the profit/loss and internal account.
[IMP] point_of_sale: Avoid to have two payment methods with the cash_control in a pos.config object.
[REF] point_of_sale: Refactor the computation code of the cash_journal, cash_register and cash_control flags.
[IMP] point_of_sale: Store the difference in the right account if the journal of the statement is a cash_control or nota.
[FIX] point_of_sale: Use the session name instead of the order name for the account.bank.statement.line .
[IMP] point_of_sale: [DEMO] Define the default payment_methods for the pos.config.
bzr revid: stw@openerp.com-20120828112116-lblikdcn92lcpc7w
2012-08-28 13:21:16 +02:00
0fb11f25c4
[FIX] account: when generating objects from templates, set the default taxes as a super user + use of set_default() instead of deprecated set(key='default') (on ir.values)
...
bzr revid: qdp-launchpad@openerp.com-20120828095345-erwdm59r3wspqbah
2012-08-28 11:53:45 +02:00
3733972565
[MERGE]merged with trunk
...
bzr revid: dhr@tinyerp.com-20120828092928-da2a6k1f2e7g9i42
2012-08-28 14:59:28 +05:30
8ff4fbdc60
[IMP]account_analytic_analysis: applying group multi currency to currency field
...
bzr revid: dhr@tinyerp.com-20120828084945-06v2328h6zqkqgp3
2012-08-28 14:19:45 +05:30
4e31d1be93
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120828064335-bftlutj6aiymztbp
bzr revid: launchpad_translations_on_behalf_of_openerp-20120828072410-7ndsu3tnyrjhtuor
2012-08-28 07:24:10 +00:00
547ac8ac4e
[IMP]Account:applying multi_currency group to currency fields
...
bzr revid: dhr@tinyerp.com-20120827130340-tw52x8w0v6lyt2d8
2012-08-27 18:33:40 +05:30
ae3970d9a3
Merge with latest addons.
...
bzr revid: amb@tinyerp.com-20120827130303-5d1w7r5dau6wj14g
2012-08-27 18:33:03 +05:30
4b0d1be1c0
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120827083705-p2edynkzch7hszrd
2012-08-27 10:37:05 +02:00
f06f0da395
[MERGE] Merged with main branch
...
bzr revid: pso@tinyerp.com-20120823130751-55j9naym9rab8492
bzr revid: pso@tinyerp.com-20120827053644-mzy2bj3fppc3ij4e
2012-08-27 11:06:44 +05:30
7ac661a814
[MERGE] latest trunk
...
bzr revid: abo@openerp.com-20120824124434-dnq8eptnttr3cnko
2012-08-24 14:44:34 +02:00
f6a818f683
[IMP] fix a typo
...
bzr revid: abo@openerp.com-20120824110912-0sdtpd1udzrgvli5
2012-08-24 13:09:12 +02:00
f37ef70b66
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: jir@tinyerp.com-20120824105752-hz9ho2vf0jeiwg5a
2012-08-24 16:27:52 +05:30
3b73e7e173
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: jir@tinyerp.com-20120824093240-xu2vnw5pfnlt3437
2012-08-24 15:02:40 +05:30
3e79640aaf
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: mma@tinyerp.com-20120824083535-hvv8cex6d33hfh2o
2012-08-24 14:05:35 +05:30
927ef928a3
[Merge]merged with trunk
...
bzr revid: dhr@tinyerp.com-20120823094724-7w7rv6ma5p89v9fe
bzr revid: dhr@tinyerp.com-20120823132250-88n61c3yaw0r50l7
bzr revid: dhr@tinyerp.com-20120824061705-ll37s5lnpgu7e7xg
2012-08-24 11:47:05 +05:30
afa60ebc74
[FIX] lp: 1039013, where an id is given to name_get instead of a list of ids
...
lp bug: https://launchpad.net/bugs/1039013 fixed
bzr revid: qdp-launchpad@openerp.com-20120823142656-nsqml3jnyylpgzxu
2012-08-23 16:26:56 +02:00
111a7880c6
[MERGE] Merged with main branch
...
bzr revid: pso@tinyerp.com-20120823102334-6d2rkaer09k8n6n0
2012-08-23 15:53:34 +05:30
ec11fa23a8
[IMP] Given the access rights for the account.journal.cashbox.line in ACCOUNT.
...
bzr revid: psa@tinyerp.com-20120823100640-5i00hwtv12wei7re
2012-08-23 15:36:40 +05:30
7fa9451428
[IMP] Added onchange on company to fetch currency related to it
...
bzr revid: pso@tinyerp.com-20120823095141-oc840e23y1sk1mjs
2012-08-23 15:21:41 +05:30
fd29eccadd
[MERGE] lp:1039557. Courtesy of Paulius Sladkevičius
...
bzr revid: qdp-launchpad@openerp.com-20120823075700-6cguwv1dxo92f0wg
2012-08-23 09:57:00 +02:00
6bb1c6cc98
[MRG] merge with lp:openobject-addons
...
bzr revid: tpa@tinyerp.com-20120823075233-qusrimwu903wdsmf
2012-08-23 13:22:33 +05:30
00139302a7
[MERGE]merged with trunk
...
bzr revid: dhr@tinyerp.com-20120823072017-c48q59mif39j55wm
2012-08-23 12:50:17 +05:30
121b351b59
[MERGE] latest trunk
...
bzr revid: abo@openerp.com-20120822175756-ypym270e6cklpbds
2012-08-22 19:57:56 +02:00
a0679e6e4f
[MERGE] demo data branch
...
bzr revid: qdp-launchpad@openerp.com-20120822160856-k308a270wx2wnsj6
2012-08-22 18:08:56 +02:00
75befda5e8
[IMP]Tax related fixes in account_invoice,delivery sale and stock ,purchase requistion
...
bzr revid: dhr@tinyerp.com-20120822131816-g4o83w2ot084wyeo
2012-08-22 18:48:16 +05:30
b4ed7eb4ea
[IMP]Adding taxes to product category
...
bzr revid: dhr@tinyerp.com-20120822124710-loo8pjj33g1dgzp5
2012-08-22 18:17:10 +05:30
406e58399f
[FIX] mail: unify message_post calls, fix typos, various lint cleanup
...
bzr revid: odo@openerp.com-20120822113439-aoy7v4njs6o34tu5
2012-08-22 13:34:39 +02:00
7545cc8ab4
Added multi-company support for the refund invoice creating
...
bzr revid: paulius@hacbee.com-20120822085513-tqx81zcaquw8r1tc
2012-08-22 11:55:13 +03:00
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
8d178ae413
[Merge] Merge with main addons.
...
bzr revid: mdi@tinyerp.com-20120820041322-lcph0efef1zj6n0u
bzr revid: mdi@tinyerp.com-20120821043948-9h8huqju00pc4qm6
bzr revid: mdi@tinyerp.com-20120822044718-3gpku8pqin0a4rek
2012-08-22 10:17:18 +05:30
eeb7878d43
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120821150936-0pvvttbq6w3t2byi
2012-08-21 17:09:36 +02:00
8f9f860323
[IMP]Update __openerp__.py for all modules
...
bzr revid: hsa@tinyerp.com-20120820125644-px287o03bxrx8h3o
2012-08-20 18:26:44 +05:30
aef562c3be
[IMP] account : rml_footer1 and rml_footer2 are merged in rml_footer text field
...
bzr revid: rpr@tinyerp.com-20120820113357-lzcj72pl3hjh9xts
2012-08-20 17:03:57 +05:30
4b0ff5f342
[IMP] Removed group from currency on set accounting options wizard
...
bzr revid: pso@tinyerp.com-20120820111140-b9vnkll7ifx1gz0w
2012-08-20 16:41:40 +05:30
3b02c8a6cb
[MERGE] Merge with main addons
...
bzr revid: cha@tinyerp.com-20120820111000-f4zjx3a7svj1vcab
2012-08-20 16:40:00 +05:30
20981ac1a3
[IMP] account: make little change in onchange method.
...
bzr revid: cha@tinyerp.com-20120820105942-zkyrqrebn3s3j9nc
2012-08-20 16:29:42 +05:30
0d4603f4f9
[IMP]improved modules description from rst2html
...
bzr revid: help-20120820092716-x61hs1o7d8lz6tpg
2012-08-20 14:57:16 +05:30
56177da6c5
[IMP] Improved default view and method of set accounting options wizard
...
bzr revid: pso@tinyerp.com-20120820073038-3dmkx96br61t9gd0
2012-08-20 13:00:38 +05:30
e8a3d11ba3
[MERGE] Merged with main branch
...
bzr revid: pso@tinyerp.com-20120820050142-81nb86dbv328rp13
2012-08-20 10:31:42 +05:30
6cce0bd9fc
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120818045843-s3w3d71x75m26ww8
2012-08-18 04:58:43 +00:00
06f60b3517
[FIX] body_text --> body, not ure it's good enough
...
bzr revid: fp@tinyerp.com-20120817120606-t97l9x2dguuv7kmp
2012-08-17 14:06:06 +02:00
b040d2706d
[IMP]update __openerp__.py in all modules
...
bzr revid: hsa@tinyerp.com-20120817111540-rfql0ifsvbx5nz7g
2012-08-17 16:45:40 +05:30
Twinkle Christian (OpenERP)
Stephane Wirtel
Fabien Pinckaers
Raphael Collet
Harry (OpenERP)
Amit Patel (OpenERP)
Olivier Dony
Sanjay Gohel (Open ERP)
Jiten (OpenERP)
Thibault Delavallée
Tejas Tank
pso (OpenERP)
Randhir Mayatra (OpenERP)
Quentin (OpenERP)
Bhumi Thakkar (Open ERP)
Hardik
Purnendu Singh (OpenERP)
Dharti Ratani (OpenERP)
Launchpad Translations on behalf of openerp
Amit Bhavsar (Open ERP)
Antonin Bourguignon
Jignesh Rathod (Open ERP)
Mayur Maheshwari (OpenERP)
Paramjit Singh Sahota
Turkesh Patel (Open ERP)
Paulius Sladkevičius
Divyesh Makwana (Open ERP)
Rajesh Prajapati (OpenERP)
Ajay Chauhan (OpenERP)