Commit Graph

235 Commits

Author SHA1 Message Date
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
Parthiv Patel
38f16a6160 Merge branch 'master-crm' into 'master'
[REV] crm: allow a user assigned to activity to see lead

See merge request flectra-hq/flectra!31
2018-03-06 05:41:28 +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
Flectra
8d151a8bf5 Merge branch '1.0' of gitlab.com:flectra-hq/flectra into 1.0 2018-02-26 05:31:39 -08:00
Parthiv Patel
babc507dea Update README.md 2018-02-25 12:33:15 +00:00
Siddharth Bhalgami
3424f1a7d2 [CHANGE] Win32 Pixmaps icon renamed !! 2018-02-23 15:22:29 +05:30
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
Parthiv Patel
a5fa03a1be Merge branch 'master-multi-branch' into 'master'
[IMP]: Feature: New Branch Configuration and Setup

See merge request flectra-hq/flectra!25
2018-02-12 11:47:42 +00:00
kunjal patel
462167e087 [IMP]: Feature: New Branch Configuration and Setup 2018-02-12 11:43:43 +00:00
Parthiv Patel
09dd9328d8 Merge branch 'master-sale-account-discount' into 'master'
[IMP] Check condition if gross amount exists

See merge request flectra-hq/flectra!24
2018-02-12 11:26:09 +00:00
Flectra
141d7f52bd [FIX] cla 2018-02-12 14:21:15 +05:30
Flectra
637e7edc2b [FIX] doc 2018-02-12 14:21:15 +05:30
Flectra
03282c19f1 [FIX] cla 2018-02-11 23:56:08 -08:00
Flectra
dafaed76d5 [FIX] doc 2018-02-11 23:55:56 -08:00
Haresh Chavda
ef8fc58c3c [IMP] Check condition if gross amount exists 2018-02-09 11:34:22 +05:30
Parthiv Patel
5b462b14b1 Merge branch 'master-cron-log' into 'master'
Scheduled failure Logs and keep days for email .

See merge request flectra-hq/flectra!22
2018-02-08 09:24:02 +00:00
kunjal patel
eccbea79bb Scheduled failure Logs and keep days for email . 2018-02-08 09:21:46 +00:00
Parthiv Patel
5d8eb4fb9f Merge branch 'master-sale-account-discount' into 'master'
[IMP] Remove unnecessary code

See merge request flectra-hq/flectra!23
2018-02-08 09:04:37 +00:00
Haresh Chavda
c71b512ea1 [IMP] Remove unnecessary code 2018-02-08 10:04:47 +05:30
Parthiv Patel
75b675cb95 Merge branch '1.0-sheetal' into 'master'
[ADD]:Alpha3 iso country code field for res.country

See merge request flectra-hq/flectra!21
2018-02-02 12:35:07 +00:00
sheetalPatil
5ad248a3e7 [ADD]:Flectra alpha3 iso country code field added 2018-02-02 11:21:32 +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
Mayank Vara
5dc9d9a6d6 [FIX]index file style revert 2018-01-31 17:52:36 +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
FlectraHQ Admin
5fab9ebbbe Merge branch 'master-branding' into 'master'
[IMP] comment branding code of power by

See merge request flectra-hq/flectra!18
2018-01-30 11:24:49 +00:00
Haresh Chavda
864f1781e8 [IMP] comment branding code of power by 2018-01-30 15:44:17 +05:30
FlectraHQ Admin
d3b3dec9cc Merge branch 'master-account' into 'master'
[FIX]: Full Accounting Features.

See merge request flectra-hq/flectra!17
2018-01-30 10:07:21 +00:00
Kunjal
c6be9a7b66 [FIX]: Full Accounting Features. 2018-01-30 14:33:03 +05:30
Parthiv Patel
989c0f8e3e Merge branch 'master-purchase-indent' into 'master'
Master purchase indent

See merge request flectra-hq/flectra!15
2018-01-29 11:39:21 +00:00
Haresh Chavda
887dec3ed5 Master purchase indent 2018-01-29 11:35:08 +00:00
Parthiv Patel
1d4dae4cb4 Merge branch 'master-multi-branch' into 'master'
[FIX]: Sale report issue : #5.

See merge request flectra-hq/flectra!14
2018-01-29 09:27:31 +00:00
Kunjal
8145e84f1f [FIX]: Sale report issue : #5. 2018-01-29 12:08:45 +05:30
Parthiv Patel
549fa198f1 Update README.md 2018-01-27 10:27:28 +00:00
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
flectra-admin
fc3fa9dc77 [REL] Flectra 1.0 2018-01-25 18:34:51 +05:30