Commit Graph

1178 Commits

Author SHA1 Message Date
Thibault Delavallée 49c0b7a820 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20140106135700-rt0g44w5xmpbtxiu
2014-01-06 14:57:00 +01:00
Paramjit Singh Sahota 7980ac78ae [IMP] Improved code as per the suggestions on the Merge proposal.
bzr revid: psa@tinyerp.com-20131230072452-zew8ys6lqomzxcsm
2013-12-30 12:54:52 +05:30
Paramjit Singh Sahota bd7a61b8ff [IMP] Added attrs for closing balance.
bzr revid: psa@tinyerp.com-20131015064247-ibvmy8b8wzqjtklm
2013-10-15 12:12:47 +05:30
Paramjit Singh Sahota 7d0e4e5fed [IMP] Improved attrs.
bzr revid: psa@tinyerp.com-20131011124816-xk990kd0vpg5tvtn
2013-10-11 18:18:16 +05:30
Paramjit Singh Sahota 878815b5cf [IMP] Improved the positioning of the label and the field.
bzr revid: psa@tinyerp.com-20131007132616-81o4wyu0xud2bqbm
2013-10-07 18:56:16 +05:30
Paramjit Singh Sahota cf1236e79f [IMP] Improved code and indents.
bzr revid: psa@tinyerp.com-20131007115230-f8yvrevrswemvdb8
2013-10-07 17:22:30 +05:30
Sunil Sharma (OpenERP) 5bd847b751 [IMP]:account:improve accountview inline css
bzr revid: sunilsharma.sharma07@gmail.com-20131007110030-9anpjxohswigh95f
2013-10-07 16:30:30 +05:30
Sunil Sharma (OpenERP) ee18fc5e16 [IMP]:account:improve accountview
bzr revid: sunilsharma.sharma07@gmail.com-20131007095051-a7ug7f745udw62ga
2013-10-07 15:20:51 +05:30
Thibault Delavallée 607de396ba [MERGE] Sync with trunk, until revision 8927
bzr revid: tde@openerp.com-20131002135442-g8l2vpkq7h0roqdt
2013-10-02 15:54:42 +02:00
Paramjit Singh Sahota 9814a86c95 [IMP] Hide only the cash control page in cash register.
bzr revid: psa@tinyerp.com-20130918132917-gllo1kjvozy9s1qe
2013-09-18 18:59:17 +05:30
Paramjit Singh Sahota bfff65d4ac [IMP] if 'cash control' if false in the journal, no need to have the opening and closing cash control tab in cash registers
bzr revid: psa@tinyerp.com-20130918091041-c5zponkbu5uwgb94
2013-09-18 14:40:41 +05:30
Paramjit Singh Sahota 5f06129179 [IMP] Improved code for
In cash registers, it does not work at all 
>>real closing balance is not updated
>>opening balance is not updated
>>and so amount is never good

bzr revid: psa@tinyerp.com-20130917130901-hem0iwy608vkwe02
2013-09-17 18:39:01 +05:30
Paramjit Singh Sahota 2c2fdc09f1 [IMP] Make OBI label to Description and make the cash control tab as default in cash registers.
bzr revid: psa@tinyerp.com-20130916072909-4c1s5y4ah3riusik
2013-09-16 12:59:09 +05:30
Paramjit Singh Sahota daa7594cbb [MERGE] Merged lp:openobject-addons.
bzr revid: psa@tinyerp.com-20130913112155-jll3rlzcgsjrtzv4
2013-09-13 16:51:55 +05:30
Thibault Delavallée eaba6bffb7 [FORWARD] Forward port of saas-1 branch until revision 8773 revid tde@openerp.com-20130912121059-k840pi4rwdzpez8g
Most of 7.0 commit about COAs (9434) has been discarded, because another fix has been implemented
for the trunk branch. This new fix will be merged right after this forward port
of 7.0 / saas-1 branch.

bzr revid: tde@openerp.com-20130912131546-2f8p23bwwcc7930c
2013-09-12 15:15:46 +02:00
Denis Ledoux 546a191f0a [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9459 rev-id: fva@openerp.com-20130918153347-fy4nuvbm82ngfb8x
bzr revid: mat@openerp.com-20130826135110-f9q4p65ds2aholcw
bzr revid: dle@openerp.com-20130828141129-ecxl2vlpb8vw0o9f
bzr revid: dle@openerp.com-20130828162659-n8a0ku9o3h01qaov
bzr revid: dle@openerp.com-20130830094205-q3itwd7x0246d9n6
bzr revid: dle@openerp.com-20130830133604-mfnfbscn5wdk4vi4
bzr revid: dle@openerp.com-20130902131244-v9uh0s8rg4889i7j
bzr revid: mat@openerp.com-20130903134105-68ziuaccreu6rs61
bzr revid: chs@openerp.com-20130906171851-jtfsf4au1k30wwlr
bzr revid: dle@openerp.com-20130909103120-k5oefxgebhyslac3
bzr revid: dle@openerp.com-20130909170047-pbzw4ernvcpivbhh
bzr revid: chs@openerp.com-20130910122113-171osvcukxffxcry
bzr revid: tde@openerp.com-20130912121059-k840pi4rwdzpez8g
bzr revid: dle@openerp.com-20130913085251-p906ci2divy82jur
bzr revid: tde@openerp.com-20130913092546-kzshg1a7sls566l8
bzr revid: mat@openerp.com-20130917122102-drf8fj9lrjj0fvju
bzr revid: mat@openerp.com-20130917161614-w8u2c1ayeb5kxm30
bzr revid: dle@openerp.com-20130918161305-7ep1642nxzyy3vhd
2013-09-18 18:13:05 +02:00
Thibault Delavallée 8b48cc9520 [MERGE] addons: added groups when quick creating user in various addons.
bzr revid: tde@openerp.com-20130904141122-uaxlnu7qxzri4q3a
2013-09-04 16:11:22 +02:00
Thibault Delavallée ed0a829cb3 [MERGE] [IMP] addons: improved name and tooltips of groupby date in various addons.
bzr revid: tde@openerp.com-20130904141053-yustqiuzynbettq8
2013-09-04 16:10:53 +02:00
Turkesh Patel (Open ERP) 3bbe2330af [IMP] improved code to set default accounts in l10n_us,l10n_ma and added new currency_id field to set currency based on select coa, fixed installation time error of l10n_ve
bzr revid: tpa@tinyerp.com-20130903070707-7ib7qi5yubhr11u8
2013-09-03 12:37:07 +05:30
Randhir Mayatra (OpenERP) 606431f0ee [MERGE]merge with parent
bzr revid: rma@tinyerp.com-20130830053621-briu78l6scvuleu4
2013-08-30 11:06:21 +05:30
Christophe Matthieu 75ff22286f [MERGE] from trunk
bzr revid: chm@openerp.com-20130726143134-4vmzxqcb2d3fnwwx
2013-07-26 16:31:34 +02:00
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
Antony Lesuisse 6b38eac5d9 website layout, contactus, homepage
bzr revid: al@openerp.com-20130701002054-wggvlsjfxjcza3o6
2013-07-01 02:20:54 +02:00
Foram Katharotiya (OpenERP) 5a761f9752 [MERGE] with trunk
bzr revid: fka@tinyerp.com-20130617065636-t6kjnfe6vyz6m8av
2013-06-17 12:26:36 +05:30
Atul Patel (OpenERP) fa4c6c9ddb [MERGE]: Merged with addons
bzr revid: atp@tinyerp.com-20130617043251-u68mctnl61391f7c
2013-06-17 10:02:51 +05:30
Christophe Simonis 6a9adbca62 [MERGE] forward port of branch 7.0 up to revid 9236 mat@openerp.com-20130613160953-itt79mu5xrl7suv4
bzr revid: chs@openerp.com-20130613181503-82234mo34wxb0oap
2013-06-13 20:15:03 +02:00
sgo@tinyerp.com 5ee65de025 [MERGE]sync with trunk
bzr revid: sgo@tinyerp.com-20130613084838-twjsl8cdi5ajjp4c
2013-06-13 14:18:38 +05:30
Nimesh Contractor (OpenERP) da12842c49 [MERGE] with trunk.
bzr revid: nco@tinyerp.com-20130607055051-y81h76w8rjid3iqv
2013-06-07 11:20:51 +05:30
Martin Trigaux 3136aae3f5 [FIX] account: don't display non-commercial partners for bank statement
bzr revid: mat@openerp.com-20130605074957-tpd3jol51ww7j86i
2013-06-05 09:49:57 +02:00
Olivier Dony 0f983a0146 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9183
rev-id launchpad_translations_on_behalf_of_openerp-20130531070107-7d2k818beg8965ll

bzr revid: odo@openerp.com-20130603121852-jdl6vlo9dmjk0rlc
2013-06-03 14:18:52 +02:00
Martin Trigaux 1908d590be [IMP] sort stock picking by id, no percent label for tax amount
bzr revid: mat@openerp.com-20130528115811-klv4spx00srr4vqb
2013-05-28 13:58:11 +02:00
Nimesh Contractor (OpenERP) 87f3996894 [IMP] put computed balance field.
bzr revid: nco@tinyerp.com-20130528114216-2ow9907o6ckrse12
2013-05-28 17:12:16 +05:30
Quentin (OpenERP) bcf32c6d64 [MERGE] forward port of bugfixes made in addons v7 up to revision 9098.
bzr revid: qdp-launchpad@openerp.com-20130514120341-cvxysuez350hy9s2
2013-05-14 14:03:41 +02:00
Cedric Snauwaert 31ffb01f87 [FIX]chart of account wizard: show company id field in wizard view
bzr revid: csn@openerp.com-20130425120604-2toia7v6yuemjl6g
2013-04-25 14:06:04 +02:00
Quentin (OpenERP) 33f27b362b [MERGE] forward port of addons v7 up to revision 9045
bzr revid: qdp-launchpad@openerp.com-20130422153449-c62emljfa4a49758
2013-04-22 17:34:49 +02:00
Quentin (OpenERP) 46e95cb136 [FIX] account, account.move.line form view: the same method was defined twice, differently, and parameters were not correctly passed in onchanges
bzr revid: qdp-launchpad@openerp.com-20130418134032-t3y4dk4sp4eu2031
2013-04-18 15:40:32 +02:00
Tejas Tank 6e63c47c64 [FIX] pos,cash-register: corrected word theoritical to theoretical changes.
bzr revid: tta@openerp.com-20130412093807-9bazw36l9khrjm0l
2013-04-12 15:08:07 +05:30
Tejas Tank b062573df4 [IMP] pos,cash-register: Corrected tooltips and layout.
bzr revid: tta@openerp.com-20130409044724-1jhnyjhp0ka1ckf6
2013-04-09 10:17:24 +05:30
Josse Colpaert b3ac941896 [MERGE] Merge from trunk
bzr revid: jco@openerp.com-20130408151751-kta4x8swa6wcmsnl
2013-04-08 17:17:51 +02:00
Tejas Tank 76b7a08275 [IMP] pos session and cash register, Improved tooltip and layout.
bzr revid: tta@openerp.com-20130405092419-jpa89isevfq6jw49
2013-04-05 14:54:19 +05:30
Tejas Tank 91c318fd4b merged latest
bzr revid: tta@openerp.com-20130321095230-pe9j9riyyyosa460
2013-03-21 15:22:30 +05:30
Ajay Chauhan (OpenERP) 0a7683d39f [IMP] account, pos: added string 'Closing Balance' to fields 'balance_end_real' & 'cash_register_balance_end_real'
bzr revid: cha@tinyerp.com-20130315095454-ljh2bjd1brds80m5
2013-03-15 15:24:54 +05:30
Ajay Chauhan (OpenERP) bcd4ee5cd2 [IMP] account: added class 'oe_account_total' to get total in align
bzr revid: cha@tinyerp.com-20130315073131-eltl1141mtxspokd
2013-03-15 13:01:31 +05:30
Ajay Chauhan (OpenERP) d0933e93b5 [IMP] account: added classes to set marginn & get label bold
bzr revid: cha@tinyerp.com-20130315071339-wu5yz4t8pax9ijlk
2013-03-15 12:43:39 +05:30
Ajay Chauhan (OpenERP) dbc91ddf99 [IMP] account: made 'difference' small & 'computed balance' bold
bzr revid: cha@tinyerp.com-20130314120504-30st2jl9mo5ylxqc
2013-03-14 17:35:04 +05:30
Ajay Chauhan (OpenERP) 1fc0935865 [IMP] account: solve missing currency symbol issue at cash register total
bzr revid: cha@tinyerp.com-20130314072156-2fjxrvqex1jtbwoo
2013-03-14 12:51:56 +05:30
Ajay Chauhan (OpenERP) c8c72c150b [IMP] account: solve vertical alignment problem at cash register total
bzr revid: cha@tinyerp.com-20130314063911-rg1bjy80h99r4yb3
2013-03-14 12:09:11 +05:30
Ajay Chauhan (OpenERP) c121461ea8 [IMP] account, pos: change string Theoretical Balance to 'Computed Balance'
bzr revid: cha@tinyerp.com-20130314052259-9zp8hwepvoey29mv
2013-03-14 10:52:59 +05:30
Ajay Chauhan (OpenERP) 1cb664ea4f [MERGE] merge with lp:openobject-addons
bzr revid: cha@tinyerp.com-20130313130410-kovoq936lua9yugo
2013-03-13 18:34:10 +05:30
Ajay Chauhan (OpenERP) c216e9521c [IMP] account: remove added string from the fields
bzr revid: cha@tinyerp.com-20130313115218-uf1eqfynqo55jf8t
2013-03-13 17:22:18 +05:30