Commit Graph
3695 Commits
Author SHA1 Message Date
Quentin (OpenERP) 68c732272f [MERGE] lp: 997616
bzr revid: qdp-launchpad@openerp.com-20120823141221-akfyncw29ppodsyr
2012-08-23 16:12:21 +02:00
Quentin (OpenERP) 557cfcbc53 [MERGE] lp:930209
bzr revid: qdp-launchpad@openerp.com-20120823073047-xizjutknmt8qrtm6
2012-08-23 09:30:47 +02:00
Antonin Bourguignon 121b351b59 [MERGE] latest trunk
bzr revid: abo@openerp.com-20120822175756-ypym270e6cklpbds
2012-08-22 19:57:56 +02:00
Saurang Suthar(OpenERP) 095843797c [IMP] Improved _openerp__.py of all modules by replacing demo_xml with demo, init_xml and update_xml with data and adding noupdate
bzr revid: pso@tinyerp.com-20120822130232-un52dks3sclyx8m5
2012-08-22 18:32:32 +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
Ajay Chauhan (OpenERP) b2af1abc5e [IMP] stock: remove unwanted code
bzr revid: cha@tinyerp.com-20120821084722-9aml07fk8fs2lxd6
2012-08-21 14:17:22 +05:30
Ajay Chauhan (OpenERP) 25917cf9b1 [IMP] stock: add remaining months in selection of month and add group by month & year in search
bzr revid: cha@tinyerp.com-20120821074051-vz24ihn7d9u87usb
2012-08-21 13:10:51 +05:30
Ajay Chauhan (OpenERP) 53878ed5e9 [MERGE] merge with main addons
bzr revid: cha@tinyerp.com-20120821072524-76tddfl3uie4805p
2012-08-21 12:55:24 +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
Frédéric van der Essen 36b8744644 [MERGE] from trunk
bzr revid: fva@openerp.com-20120816162407-w35dzm3xqkxj8jry
2012-08-16 18:24:07 +02:00
Antony Lesuisse da8045d784 add message_followers_ids
bzr revid: al@openerp.com-20120815223038-ppuq03m5wj97u6rj
2012-08-16 00:30:38 +02:00
Vo Minh Thu 2376fe0add [MERGE] merged view changes: the type is now a functional field derived from the arch.
bzr revid: vmt@openerp.com-20120814121117-dent4ctz89kdcabi
2012-08-14 14:11:17 +02:00
Frédéric van der Essen d537abc1b2 [MERGE] from trunk
bzr revid: fva@openerp.com-20120813161157-55ts36fibrys5o7j
2012-08-13 18:11:57 +02:00
Vo Minh Thu 9822629548 [MERGE] merged trunk.
bzr revid: vmt@openerp.com-20120813160657-ilujdek8ys4fzhp9
2012-08-13 18:06:57 +02:00
Stephane Wirtel 36aaaf4a32 [MERGE]
bzr revid: stw@openerp.com-20120813145708-botpw2f1shkhv3on
2012-08-13 16:57:08 +02:00
Stephane Wirtel c356b0ea47 [MERGE] procurement: Fix a part of the code
bzr revid: stw@openerp.com-20120813133528-1n8sykpenpjkgi74
2012-08-13 15:35:28 +02:00
Frédéric van der Essen 01cb3ebb99 [MERGE] from trunk
bzr revid: fva@openerp.com-20120813124439-izug22kl0plts08x
2012-08-13 14:44:39 +02:00
Frédéric van der Essen 4c3e048d40 [MERGE WIP] merging from trunk. Still some issues with the thumbnails
bzr revid: fva@openerp.com-20120813120801-gjufnck0f78ddivg
2012-08-13 14:08:01 +02:00
Rucha (Open ERP) dd7a2972d8 [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120813051411-5no0xcudwbkw07c5
2012-08-13 10:44:11 +05:30
Fabien Pinckaers c17b2443e7 [IMP] improved UI for PoS - mainly forms version=7.0
bzr revid: fp@openerp.com-20120811133406-jvso3qhmozmgnj3j
2012-08-11 15:34:06 +02:00
pso (OpenERP) 6d8289051a [MERGE] Merged with main branch
bzr revid: pso@tinyerp.com-20120809122055-453uxykuk0smrwsu
2012-08-09 17:50:55 +05:30
Pinakin Nayi (OpenERP) 46567ce1f9 [IMP]issur4-warehouse-imp
bzr revid: pna@tinyerp.com-20120809094438-aamnemh4fdjidus4
2012-08-09 15:14:38 +05:30
Twinkle Christian (OpenERP) fc1b1749a8 [IMP]Remove type field from the modules
bzr revid: tch@tinyerp.com-20120809060516-zgx3gdyv6wdshfyw
2012-08-09 11:35:16 +05:30
Launchpad Translations on behalf of openerp e970ecd62c Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120809050051-p6f437n80grsr5vz
2012-08-09 05:00:51 +00:00
Olivier Dony 3fd9a77c83 [REVERT] Cancel PO Template changes from rev.2702 - to be fully re-generated before next release
We'll also attempt to replace the master strings in the
translated .po files before replacing the master strings,
to avoid losing translations just because of mere typo fixes.

bzr revid: odo@openerp.com-20120808144613-wtz50tcz5n7kvcza
2012-08-08 16:46:13 +02:00
Stephane Wirtel 4ae8ce4516 [MERGE]
bzr revid: stw@openerp.com-20120808140846-ay7qn0bymtdbwj9q
2012-08-08 16:08:46 +02:00
Mayur Maheshwari (OpenERP) 9fef2cf483 [MERGE]: Merge with lp:openobject-addons
bzr revid: mma@tinyerp.com-20120808092413-wwoyx4la6ycr7gs2
2012-08-08 14:54:13 +05:30
Antonin Bourguignon 4388ace499 [MERGE] latest trunk
bzr revid: abo@openerp.com-20120808091048-hr1r4vn9milozexf
2012-08-08 11:10:48 +02:00
Rucha (Open ERP) d597437dd7 [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120808063503-ymsvwnerxakqbcbx
2012-08-08 12:05:03 +05:30
Fabien Pinckaers c433498ef7 [IMP] config wizards, feedback from SAM's user testing
bzr revid: fp@tinyerp.com-20120807155552-eo88mb4ngysjd8n6
2012-08-07 17:55:52 +02:00
Antonin Bourguignon a97687a420 [MERGE] latest trunk
also replace the error message title 'Operation Not Permitted' by 'Invalid Action'

bzr revid: abo@openerp.com-20120807120451-zdrrecilfh82obhl
2012-08-07 14:04:51 +02:00
Thibault Delavallée a4e00edcdc [IMP] Added iamges as fields in kanban view where used.
bzr revid: tde@openerp.com-20120807120210-kp0yrn6iiv61yu0o
2012-08-07 14:02:10 +02:00
Antonin Bourguignon 59aa37f0e4 [IMP] all the warning messages now start with 'Warning\!' (not 'Warning' or 'Warning \!')
bzr revid: abo@openerp.com-20120807113414-7mryqyt3jnq8shsa
2012-08-07 13:34:14 +02:00
Antonin Bourguignon 8a64e7580a [IMP] all the error messages now start with 'Error\!' (not 'Error' or 'Error \!')
bzr revid: abo@openerp.com-20120807113137-44vehm0mthqawlo3
2012-08-07 13:31:37 +02:00
Antonin Bourguignon b0e8ae4c7d [IMP] error messages
fix errors ending with an exclamation point; use a point instead
remove uniques (or almost) error messages titles, like 'Encoding Error' (1 occurrence in addons), 'Integrity Error' (1 occurrence in addons), 'Report Name' (1 occurrence in addons), 'Value Error' (1 occurrence in addons), 'Wrong Period Code' (1 occurrence in addons); replace these with 'Error'
add newline character after some messages titles, when necessary
fix 'UserError': should be 'User Error'
remove spaces before exclamation marks
add capital letters to messages titles words (e.g.: 'Invalid action' becomes 'Invalid Action')

bzr revid: abo@openerp.com-20120807110616-u3nlnybtgaebro18
2012-08-07 13:06:16 +02:00
Jigar Amin - OpenERP 935e31b328 merge lp:openobject-addons
bzr revid: jam@tinyerp.com-20120807105628-j3py2jnd1fnbnzza
2012-08-07 16:26:28 +05:30
Thibault Delavallée 6c4dda8441 [MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120807100920-mr0oc56qs2zntvu1
2012-08-07 12:09:20 +02:00
Twinkle Christian (OpenERP) 65aa2db4c9 [IMP]improved views
bzr revid: tch@tinyerp.com-20120807095839-2vse929me5y2r48q
2012-08-07 15:28:39 +05:30
Mayur Maheshwari (OpenERP) 9c891b9fad [FIX]stock :set a on_change on product_id in tree view
bzr revid: mma@tinyerp.com-20120807095835-b2ltv23oamaiojg7
2012-08-07 15:28:35 +05:30
Launchpad Translations on behalf of openerp 3cfd65b43d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120807053928-8131c98edycpivlb
2012-08-07 05:39:28 +00:00
Rucha (Open ERP) 7a112a0af7 [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120807051730-yorimgtra9a5kss3
2012-08-07 10:47:30 +05:30
Fabien Pinckaers 6ff3e790ec [IMP] config wizards small improvements in layout
bzr revid: fp@openerp.com-20120806195620-sozifrvbjockq33u
2012-08-06 21:56:20 +02:00
Fabien Pinckaers 63f2b492f5 [MERGE] improvement placeholders
bzr revid: fp@openerp.com-20120806190527-gb3gs4cexnijaezk
2012-08-06 21:05:27 +02:00
Twinkle Christian (OpenERP) a5f6f9426a [IMP]Improve voew in account
bzr revid: tch@tinyerp.com-20120806132301-oj3zlxxn3tzo1glo
2012-08-06 18:53:01 +05:30
Thibault Delavallée a814343ab7 [MERGE] Mergede with addons/trunk.
bzr revid: tde@openerp.com-20120806124445-hym9imdiqgeot8fu
2012-08-06 14:44:45 +02:00
Stephane Wirtel 3155c9b075 [MERGE] lp:~openerp-dev/openobject-addons/trunk-addons-issues3-account-pso
bzr revid: stw@openerp.com-20120806110035-mkegg0b6x5oom1mr
2012-08-06 13:00:35 +02:00
pso (OpenERP) 389f8d6803 [MERGE] Merge with main branch
bzr revid: pso@tinyerp.com-20120806094234-1b145yrjixy5yrsg
2012-08-06 15:12:34 +05:30
Stephane Wirtel 2f4d4320e2 [MERGE]
bzr revid: stw@openerp.com-20120806075624-ukz8lrnp1li67zft
2012-08-06 09:56:24 +02:00