Commit Graph

320 Commits

Author SHA1 Message Date
sheetalPatil
21211564c3 [ADD]:Added Upstream patch for auth_signup 2018-07-09 15:22:08 +05:30
Rutuba Chavda
406e4608d0 [ADD]:Added Upstream Patch for l10n_cr 2018-07-09 15:12:53 +05:30
Rutuba Chavda
c8e45fa64d [ADD]:Added Upstream Patch for l10n_co 2018-07-09 14:18:17 +05:30
Hansa Rathod
2b13d02718 [IMP]: Added Upstream patch for HR Timesheet 2018-07-09 13:02:36 +05:30
Hansa Rathod
78c81d52e3 [IMP]: Added Upstream patch for HR Recruitment 2018-07-09 12:59:04 +05:30
Rutuba Chavda
53707ee062 [ADD]:Added Upstream Patch for l10n_cn_small_business 2018-07-09 12:24:03 +05:30
Hansa Rathod
98a6ee1337 [IMP]: Added Upstream patch for HR Expense 2018-07-09 11:18:45 +05:30
Harsh Vadodaria
8a22829f5e [IMP]: Added Upstream Patch for l10n_ch 2018-07-06 18:36:09 +05:30
Fatemi Lokhandwala
227710041f [ADD]:Added Upstream Patch for stock 2018-07-06 18:28:06 +05:30
Hansa Rathod
9fdbf4b78e [IMP]:Added Upstream Patch for HR Contract 2018-07-06 17:00:44 +05:30
Harsh Vadodaria
c8bd2bfdc2 [IMP]: Added Upstream Patch for l10n_ca 2018-07-06 16:57:58 +05:30
Hansa Rathod
61bebe4dcb [IMP]:Added Upstream Patch for HR Attendance 2018-07-06 15:57:17 +05:30
Harsh Vadodaria
87ec60d4df [IMP]: Added Upstream Patch for hr_payroll 2018-07-06 15:23:58 +05:30
Harsh Vadodaria
ac96a360fd [IMP]: Added Upstream Patch for hr_holidays 2018-07-06 14:05:44 +05:30
Hansa Rathod
3826601311 [IMP]:Added Upstream Patch for Account Check Printing 2018-07-06 13:47:43 +05:30
Fatemi Lokhandwala
f313b7e8e8 [ADD]:Added Upstream Patch for mrp_repair 2018-07-06 13:28:57 +05:30
az-flectra
de11d52ad4 Added Upstream Patch for transifex 2018-07-06 11:00:29 +05:30
Kunjal
cb0640a320 [FIX]: Issue : 85 : Branch. 2018-06-29 15:33:00 +05:30
Kunjal
2e7c272a35 [ADD]: journals. 2018-06-28 11:14:25 +05:30
Haresh Chavda
2067297b8c [IMP] Improve code of prepare invoice vals and increase width of div 2018-06-26 14:50:06 +05:30
Parthiv Patel
259da26efd Merge branch 'master-issue-print-pdf' into 'master'
[FIX] Issue #79

See merge request flectra-hq/flectra!85
2018-06-25 11:20:07 +00:00
Chintan Ambaliya
960f252c84 [FIX] Issue #79 2018-06-25 16:11:03 +05:30
Haresh Chavda
5a38fab3f7 [IMP] Give reference id of div in account 2018-06-25 14:36:44 +05:30
Yusuf Kapasi
9ad9b388c3 [FIX] channel issues 2018-06-22 11:33:22 +05:30
Parthiv Patel
74910c1ef9 Merge branch 'master-payment-riddhi' into 'master'
[IMP]Modify image path into payment data file

See merge request flectra-hq/flectra!80
2018-06-21 10:56:22 +00:00
Chinmayi Vyas
88699fbddd [IMP]India GST: change label of fiscal position -> Nature of transaction 2018-06-21 16:18:22 +05:30
Riddhi Kansara
f10e082211 [IMP]Modify image path into payment data file 2018-06-21 13:29:03 +05:30
riddhikansaraflectra
f27882fa3c Master so/po riddhi 2018-06-20 07:39:59 +00:00
Haresh Chavda
1086da4650 [IMP] Give reference name of div and h2 tags 2018-06-18 14:56:17 +05:30
Haresh Chavda
4199b5d3f1 [IMP] Give reference of discount method in Credit Notes and add blank div in customer invoice form 2018-06-18 10:51:16 +05:30
Flectra
9c9cc927dd [FIX] app store link 2018-06-17 11:39:19 +05:30
Kunjal
86b65570da [ADD]: Fiscal Periods. 2018-06-14 12:41:22 +05:30
Parthiv Patel
d7ad609d55 Merge branch 'master-website-advance-pricelist' into 'master'
[ADD] Website Sale Advance Pricelist

See merge request flectra-hq/flectra!64
2018-06-12 05:40:29 +00:00
Chintan Ambaliya
1d1b0a789f [FIX] clear search button work anywhere on website page 2018-06-05 11:00:15 +05:30
Chintan Ambaliya
8a656fdd91 [ADD] Clear search button in shop 2018-06-01 17:33:23 +05:30
Parthiv Patel
b45da31481 Merge branch 'master-stock-ageing-report' into 'master'
[ADD]Stock Ageing qweb Report: lists the age-wise break-up of Inventory to point…

See merge request flectra-hq/flectra!62
2018-06-01 06:09:11 +00:00
Chintan Ambaliya
7b907a59cb [FIX] Issue #75 2018-06-01 10:56:01 +05:30
Chintan Ambaliya
1f776c6cd5 [FIX] Fixes REST API issues #70, #71 and #73 and add basic guideline of Rest API on description page 2018-05-31 16:51:41 +05:30
Chinmayi Vyas
e28a6ede8a [IMP]GST:change field label, fiscal position->Nature of Transection,changes gst excel report format 2018-05-30 15:10:48 +05:30
Haresh Chavda
1cc836d92c [ADD] Website Sale Advance Pricelist 2018-05-23 14:38:18 +05:30
Chintan Ambaliya
fd8441d630 [FIX] Warning 'website.menu.write() with unknown fields: className, style, text' and Fix Isuue: #69 2018-05-17 12:56:12 +05:30
Chinmayi Vyas
6006bc1926 [ADD]Stock Ageing qweb Report: lists the age-wise break-up of Inventory to point out old stock and displays the age of the stock in hand 2018-05-16 16:15:11 +05:30
Haresh Chavda
090136aef2 [IMP] Cart Rules code modify, Change content of index file and misc changes. 2018-05-15 13:06:16 +05:30
mayank
2c971d89d8 [FIX]product page filter radio button visible 2018-05-10 18:16:54 +05:30
Chintan Ambaliya
ff3d93dfb7 [FIX] 'website.menu.write() with unknown fields: is_homepage' when change menu sequence on website 2018-05-08 11:02:14 +05:30
Parthiv Patel
1d4568c657 Merge branch 'master-branch' into 'master'
[FIX]: Improved branch.

See merge request flectra-hq/flectra!56
2018-05-03 14:49:31 +00:00
Kunjal
5a7452a410 [FIX]: Improved branch. 2018-05-03 18:23:27 +05:30
Chintan Ambaliya
86ec69a40e [FIX] Products not visible in Main catagory Issue: #45 2018-05-03 15:53:51 +05:30
Parthiv Patel
d80ac40ac6 Merge branch 'master-report-gst-riddhi' into 'master'
[FIX]singapore account tax group

See merge request flectra-hq/flectra!54
2018-05-03 06:08:34 +00:00
Riddhi Kansara
c136d86a7b [FIX]singapore account tax group
[FIX]modify test cases based on tax group

[FIX]l10n_sg_gst report issue
2018-05-02 15:23:21 +05:30
Kunjal
dfe0a6bdbf [ADD] Index File. 2018-05-01 15:38:48 +05:30
Parthiv Patel
4df11df642 Merge branch 'master-report-gst-riddhi' into 'master'
[ADD]Add index.html file and change icon for gst singapore.

See merge request flectra-hq/flectra!49
2018-05-01 07:18:36 +00:00
Chinmayi Vyas
ca1cad70e5 [FIX]indian chart of account issue, gst traceback on partner form 2018-04-30 13:51:13 +05:30
mayank
899cd0f216 [IMP]forward port wishlist changes to flectra 2018-04-27 16:44:54 +05:30
Chinmayi Vyas
4a9499557e [FIX] HSN calculation issue on gstr-2 summary 2018-04-27 13:20:00 +05:30
Riddhi Kansara
78b06169b9 [ADD]Add index.html file and change icon for gst singapore. 2018-04-26 15:52:50 +05:30
Chinmayi Vyas
97d6e4c58a [FIX] Translation Issue of Theme Selector Dropdown & Change Version of Flectra 2018-04-25 12:21:28 +05:30
Siddharth Bhalgami
b52ab98e3f Fixes https://gitlab.com/flectra-hq/flectra/issues/59 2018-04-23 16:07:47 +05:30
Flectra
2368ade927 [ADD] condition to drop table only if it exists 2018-04-21 08:12:56 +05:30
Parthiv Patel
8601c469ae Merge branch 'master' into 'master'
[FIX] Made release planning tasks editable

See merge request flectra-hq/flectra!47
2018-04-20 10:35:56 +00:00
Ahmed Girach
ecb4f67911 [FIX] Made release planning tasks editable 2018-04-20 15:32:20 +05:30
Riddhi Kansara
b3a53d6236 [ADD]Add GST Report Singapore Localization 2018-04-20 14:27:40 +05:30
Rutuba Chavda
653abef735 [ADD]:account_cash_flow:Add branch_id 2018-04-19 14:29:27 +05:30
Kunjal
b0f6928355 [ADD]: Cash Flow Report. 2018-04-19 14:29:27 +05:30
Chinmayi Vyas
056853fbe4 [ADD] GST module for Indian Localization: configure indian taxes and chart of accounts, summary and excel report for GSTR-1,GSTR-2 2018-04-19 12:34:28 +05:30
Siddharth Bhalgami
f81184cb98 Fixes https://gitlab.com/flectra-hq/flectra/issues/60 2018-04-18 11:22:57 +05:30
Gaurav Patel
8b91e0b9c5 [Add] Theme Leith 2018-04-16 12:23:12 +05:30
Chinmayi Vyas
58e83ab178 [REM]Remove Enterprise Tags 2018-04-12 18:28:20 +05:30
Haresh Chavda
822889a722 [ADD] Sale Advance Pricelist module 2018-04-12 16:44:34 +05:30
Haresh Chavda
b9e6c2c48e [ADD/IMP] Add icon and change author name 2018-04-10 10:54:12 +05:30
Siddharth Bhalgami
8a9c9173e9 Fixes https://gitlab.com/flectra-hq/flectra/issues/51 2018-04-10 10:48:45 +05:30
Parthiv Patel
17601ebbe0 Merge branch 'master-branch' into 'master'
[FIX]: Set branch in portal user.

See merge request flectra-hq/flectra!42
2018-04-10 02:48:31 +00:00
Siddharth Bhalgami
9ca2b698d3 [IMP] Added warning message for oauth lib for REST
[ADD] Added lib in requirements.txt
2018-04-09 18:16:51 +05:30
flectra-admin
487ed76bc1 [ODOO] Upstream Changes of Odoo to Flectra till commit ref. d636c6c95c 2018-04-09 17:13:32 +05:30
Kunjal
4293581eb2 [FIX]: Set branch in portal user. 2018-04-06 17:38:31 +05:30
Siddharth Bhalgami
e67b7e553c Fixes https://gitlab.com/flectra-hq/flectra/issues/50 2018-04-06 16:44:23 +05:30
Kunjal
21784b3fe5 [FIX]: POS: Remove field and Attrs. 2018-03-28 12:16:08 +05:30
Siddharth Bhalgami
3c75c057d1 [ADD] Manage product category visibility on website by partners/customers tags!
If specific tag(s) of partner/customer matches with product category's ``Partner Tags`` field then,
that product category will be visible to that partner/customer in website/E-commerce.

Partner Tags Hierarchy will also work...
For Ex.
-> ``Partner`` is Parent Tag
-> ``Partner/Gold`` is Child Tag

If Any Partner/Customer which have Tag of ``Partner``,
then automatically it'll also shows the prodcut category with ``Partner/Gold``,
because ``Partner/Gold`` is Child Of ``Partner`` tag.

Also, If Main Product Category have Partner Tag then that tag will automatically apply to its Child Category & their products.

For More Info: Issue - https://gitlab.com/flectra-hq/flectra/issues/45
2018-03-27 12:31:46 +05:30
Rutuba Chavda
fb4a6f28bd [FIX]:rma,website_rma,project_scrum:Change screenshots 2018-03-23 12:03:38 +05:30
Siddharth Bhalgami
a6c8f12991 [IMP] FireFox Side-Navbar Scroll Issue Fixed
Kanban Image Issue: If Image is unset then in kanban its showing error(NaN bytes) -- (FIX forward port from Odoo)
2018-03-23 11:25:57 +05:30
Rutuba Chavda
40da1d3d45 [FIX]:rma,website_rma,project_scrum:Change author name in manifest file 2018-03-21 15:47:01 +05:30
Kunjal
9be65ead1c [FIX]: Account Config. 2018-03-21 11:57:01 +05:30
Chintan Ambaliya
cef050984d [IMP] display Bookmark message when bookmark section empty 2018-03-20 15:13:04 +05:30
Rutuba Chavda
8fa706c986 [FIX]:website_rma:Changes in test cases 2018-03-15 13:01:20 +05:30
Rutuba Chavda
49eddebd0e [ADD]:website_rma:Add new module website_rma 2018-03-15 12:23:20 +05:30
Siddharth Bhalgami
5f5020a05d [FIX] Product Brand Kanban Image display Issue
Even image is exist in form view, but still its not coming up in Kanban view!
2018-03-14 15:16:49 +05:30
Siddharth Bhalgami
f82dab43da [FIX] Auto Migration for website_sale module
This migration needed if your code-base is upadted with/above commit ref:
e088762a21
2018-03-14 14:43:42 +05:30
Siddharth Bhalgami
d0ade88829 [FIX] website_blog: Blog Single page is not open with Admin rights, due to falsy domain! 2018-03-13 16:55:33 +05:30
Kunjal
2614448dd5 [FIX]: Mail Issue. 2018-03-12 16:30:35 +05:30
Mayank Vara
83b3dd675f [ADD]New Theme theme_hermit 2018-03-09 15:16:45 +05:30
Chintan Ambaliya
13e820a64d [IMP] Set cover image from project document(ir.attachment) for project 2018-03-07 18:29:09 +05:30
Siddharth Bhalgami
3e52008bb1 [IMP] Added default website value in Payment Gateways!
As by-default every payment gateways/payment acquirer are selected/activate for default website.
2018-03-07 16:59:48 +05:30
Flectra
44e3e5269b [FIX] fr translation issue 2018-03-07 11:33:04 +05:30
Parthiv Patel
886e8ad7bf Merge branch 'master-sale-account-discount' into 'master'
[IMP] Tax calculation when click on update discount button and misc changes

See merge request flectra-hq/flectra!32
2018-03-06 06:24:45 +00:00
Haresh Chavda
8346854efa [IMP] Tax calculation when click on update discount button and misc changes 2018-03-06 10:54:07 +05:30
Kunjal
481cfbdf6a [REV] crm: allow a user assigned to activity to see lead 2018-03-05 16:11:18 +05:30
Chintan Ambaliya
4cf45b1c78 [ADD] Advance Menu Search and Menu Bookmark Facility (web) 2018-03-05 12:43:54 +05:30
gaurav_patel123
87f3b80eba [FIX] Icon After Manage Database Issue 2018-03-05 11:57:30 +05:30
Parthiv Patel
89bf2d249f Merge branch 'gaurav-web' into 'master'
[MOD] Layout Tiles And Sort Button

See merge request flectra-hq/flectra!29
2018-03-02 06:15:02 +00:00
Rutuba Chavda
31fb99ea41 [ADD]:rma:Add warranty date in stock production lot view 2018-02-28 14:59:56 +05:30
gaurav_patel123
9f8d989ce7 [MOD] Layout Tiles And Sort Button 2018-02-28 14:40:44 +05:30
Flectra
9e876f7e9d [FIX] issue with translation 2018-02-26 08:13:14 -08:00
Chintan Ambaliya
89cc22f0e1 [FIX] Web Full Screen Issue: #26 2018-02-22 10:48:08 +05:30
Siddharth Bhalgami
8aa4ce5f6f [IMP] Make homepage_editor_welcome_message compatible with Multi Website.
Domain information is added in welcome message for HomePage of Each Website.
2018-02-15 18:23:23 +05:30
Chintan Ambaliya
117821f704 [FIX] Enable Groupby button in search view for mobile responsive 2018-02-15 11:39:21 +05:30
Siddharth Bhalgami
cc4b9885df [IMP] Added 2nd website with domain (0.0.0.0) as demo data for Multi Website feature. 2018-02-14 16:56:38 +05:30
Siddharth Bhalgami
e088762a21 [IMP] Improve Multi-Website Functionalities:-
- Affected Modules:
    website_sale, website_blog, website_partner, website_crm_partner_assign,
    website_customer, website_slides, website_links, website_membership,
    website_hr, website_hr_recruitment, website_payment, website_sale_delivery,
    website_forum, website_event

- Remove unnecessary model `website.product.pricelist` from website_sale,
  All its mechanism already transferd to existing model `product.pricelist`

- Change in `product.pricelist` model, make website_id(o2m) to website_ids(m2m),
  As user can choose that same pricelist can be used in multiple websites

- Added `default_website` as default values in `website_ids(m2m)` & `website_id(m2o)` field in
  almost all affected modules (mentioned above!!)

- To use/publish things(like... product, pricelist, blog, forum, events, etc...) in website,
  User have to set `website_published` mechanism `on` (if it's available for that model/object),
  Also have to set/assign different websites in `website_ids` field as per needs
2018-02-12 18:44:52 +05:30
Siddharth Bhalgami
2b42b1b300 [IMP] /shop page variants (Total 3 Variants !!)
- (Default) Default one with products listing
- (Option1) Categorized Shop Page with all listing of products category
- (Option2) Blank Shop Page with no content! User can design their own /shop page

User can easily choose any one option for /shop page from `Customize` menu at a time.
2018-02-12 18:44:52 +05:30
kunjal patel
462167e087 [IMP]: Feature: New Branch Configuration and Setup 2018-02-12 11:43:43 +00:00
Haresh Chavda
ef8fc58c3c [IMP] Check condition if gross amount exists 2018-02-09 11:34:22 +05:30
kunjal patel
eccbea79bb Scheduled failure Logs and keep days for email . 2018-02-08 09:21:46 +00:00
Haresh Chavda
c71b512ea1 [IMP] Remove unnecessary code 2018-02-08 10:04:47 +05:30
Chinmayi Vyas
310e414497 [ADD]empty group on customer invoice and sale order's form view to set left side block beside subtotal group
previously, difficult to set any fields to the left side of subtotal group in inherited views,
now use <xpath expr="//group[@name='left_panel']" position="inside"> to add fields.
2018-02-01 13:08:10 +05:30
FlectraHQ Admin
49f9021614 Merge branch 'master-account' into 'master'
[FIX]: Configuration wizard logo : Issue #9.

See merge request flectra-hq/flectra!19
2018-01-31 09:53:26 +00:00
thomi
aa71509781 [IMP] account: missing translations 2018-01-31 13:06:08 +05:30
thomi
be7e525d16 [IMP] account_discount: translations 2018-01-31 13:05:58 +05:30
Kunjal
7047f5a0c6 [FIX]: Configuration wizard logo : Issue #9. 2018-01-31 12:59:53 +05:30
Haresh Chavda
864f1781e8 [IMP] comment branding code of power by 2018-01-30 15:44:17 +05:30
Kunjal
c6be9a7b66 [FIX]: Full Accounting Features. 2018-01-30 14:33:03 +05:30
Haresh Chavda
887dec3ed5 Master purchase indent 2018-01-29 11:35:08 +00:00
Kunjal
8145e84f1f [FIX]: Sale report issue : #5. 2018-01-29 12:08:45 +05:30
Parthiv Patel
6d2049b373 Merge branch 'master-purchase-indent' into 'master'
[ADD]:Purchase Indent

See merge request flectra-hq/flectra!10
2018-01-25 13:34:19 +00:00
Mayank Vara
743c399aac [ADD] Themes which support Multi-Website features. Added 2 themes: Theme Art & Theme Techreceptives 2018-01-25 18:17:06 +05:30
Parthiv Patel
9394e7a28c Merge branch 'master-sale-account-discount' into 'master'
[IMP/ADD] Add Sales and Account Discount Test Cases and Remove Branding In Emails

See merge request flectra-hq/flectra!12
2018-01-25 12:21:27 +00:00
Kunjal
b91cd5ed79 [FIX]: Account report : Multi branch. 2018-01-25 14:06:41 +05:30
Haresh Chavda
5627e1e297 [IMP/ADD] Add Sales and Account Test Cases and Remove sent by code in flectra 2018-01-25 12:37:16 +05:30
Fatemi Lokhandwala
4374cda18f [ADD]:Purchase Indent 2018-01-25 11:52:10 +05:30
Parthiv Patel
778eef5b33 Merge branch 'master' into 'master'
[FIX] account_discount: calculation if tax option included used

See merge request flectra-hq/flectra!11
2018-01-24 13:01:08 +00:00
thomi
91c9454281 [FIX] account_discount: calculation if tax option included used 2018-01-24 13:14:47 +01:00
Parthiv Patel
92587f7883 Merge branch 'master' into 'master'
[FIX] sales_discount: calculation if tax option included used

See merge request flectra-hq/flectra!9
2018-01-24 10:49:27 +00:00
Chintan Ambaliya
15cfca3e68 [ADD] Custom RTL Stylesheet 2018-01-24 12:59:23 +05:30
Siddharth Bhalgami
b70bbf4028 [FIX] Fixed Image Issue in Language Flag Snippet Template 2018-01-24 11:38:11 +05:30
Siddharth Bhalgami
5c5629ae10 [ADD/IMP] Added RTL support which depends on language direction(left-to-right/right-to-left), Display language flag icon in User profile 2018-01-24 10:20:51 +05:30
thomi
775913b9dd [FIX] sales_discount: calculation if tax option included used 2018-01-23 15:12:15 +01:00
Parthiv Patel
b2f2d45dc6 Merge branch 'master-multi-branch' into 'master'
Mail test case solved

See merge request flectra-hq/flectra!8
2018-01-23 12:20:23 +00:00
Haresh Chavda
41e383e17f [IMP] Mail test case solved 2018-01-23 17:06:24 +05:30
thomi
4b1ecc6ba2 [IMP] web_editor: translations 2018-01-23 10:12:23 +01:00
Haresh Chavda
9b7034a258 [IMP] Mail test cases 2018-01-23 12:50:05 +05:30
Haresh Chavda
113f9601f2 [IMP] Assign group in branch 2018-01-23 12:10:28 +05:30
Kunjal
c2c2f9e4fc [FIX]: Multi branch improvement. 2018-01-23 12:06:24 +05:30
FlectraHQ Admin
af82b539b8 Merge branch 'master' into 'master'
[ADD] sales_discount: translation

See merge request flectra-hq/flectra!4
2018-01-22 13:35:01 +00:00
chintan-ambaliya
31f5af381e [FIX] Solve Internal error during Upload/Add image in form view 2018-01-22 14:43:10 +05:30
Kaushal Prajappati
32d5a77281 [FIX] website menu display 2018-01-22 11:13:14 +05:30
Kunjal
effce68e09 [FIX]: Multi Branch : Purchase, Sale stock. 2018-01-19 19:06:50 +05:30
Kunjal
5993da4d2a [ADD]: Multi Branch : Sale, Account. 2018-01-19 19:06:50 +05:30
thomi
807fd0cec4 [ADD] sales_discount: translation 2018-01-19 13:57:39 +01:00
Chintan Ambaliya
dbdbad7ab1 [ADD] Drag & Drop Single or Multiple file(s) for Attachment(s) (Form View) 2018-01-19 17:42:32 +05:30
Kaushal Prajappati
07d7f19efa a[IMP]menu snippet 2018-01-19 17:39:08 +05:30
Haresh Chavda
4b4e078745 [IMP] Test cases sequence chnage and solved 2018-01-19 17:35:17 +05:30
Haresh Chavda
4933cf35a5 [IMP] Solved xpath replace issues 2018-01-19 16:15:28 +05:30