Commit Graph

440 Commits

Author SHA1 Message Date
riddhikansaraflectra
f27882fa3c Master so/po riddhi 2018-06-20 07:39:59 +00:00
Parthiv Patel
a216e549e6 Merge branch 'master-account-discount' into 'master'
Give reference name of div and h2 tags

See merge request flectra-hq/flectra!77
2018-06-18 09:47:50 +00:00
Haresh Chavda
1086da4650 [IMP] Give reference name of div and h2 tags 2018-06-18 14:56:17 +05:30
Parthiv Patel
921d871a52 Merge branch 'master-account-discount' into 'master'
Discount method in Credit Notes and add blank div in customer invoice form.

See merge request flectra-hq/flectra!76
2018-06-18 06:01:22 +00:00
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
Parthiv Patel
e31492a01a Merge branch 'master-account-fiscal' into 'master'
[ADD]: Fiscal Periods.

See merge request flectra-hq/flectra!75
2018-06-14 08:23:33 +00:00
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
Parthiv Patel
9bcdd406a3 Merge branch 'master-clear-search' into 'master'
[FIX] clear search button work anywhere on website page

See merge request flectra-hq/flectra!73
2018-06-05 06:04:33 +00:00
Chintan Ambaliya
1d1b0a789f [FIX] clear search button work anywhere on website page 2018-06-05 11:00:15 +05:30
Parthiv Patel
284c4d305f Merge branch 'master-clear-search' into 'master'
[ADD] Clear search button in shop

See merge request flectra-hq/flectra!72
2018-06-01 12:59:24 +00:00
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
Parthiv Patel
acfffa6fb3 Merge branch 'master-media-print' into 'master'
[FIX] Issue #75

See merge request flectra-hq/flectra!71
2018-06-01 06:08:43 +00:00
Chintan Ambaliya
7b907a59cb [FIX] Issue #75 2018-06-01 10:56:01 +05:30
Parthiv Patel
846520e5d6 Merge branch 'master-rest-api-issues' into 'master'
[FIX] Fixes REST API issues #70, #71 and #73 and add basic guideline of Rest API on description page

See merge request flectra-hq/flectra!70
2018-05-31 12:27:52 +00:00
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
Parthiv Patel
bf98f2f23f Merge branch 'master' into 'master'
[IMP]GST:change field label, fiscal position->Nature of Transection,changes gst excel report format

See merge request flectra-hq/flectra!69
2018-05-30 11:51:17 +00:00
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
Flectra
130803e4bb [ADD] opl-1 license option in module 2018-05-24 17:52:24 +05:30
Parthiv Patel
d8f980e192 Merge branch 'master' into 'master'
Master

See merge request flectra-hq/flectra!67
2018-05-23 11:45:58 +00:00
Yusuf Kapasi
e4f930ff24 [IMP] update package list in requirements.txt to resolve numpy error 2018-05-23 15:32:40 +05:30
Haresh Chavda
1cc836d92c [ADD] Website Sale Advance Pricelist 2018-05-23 14:38:18 +05:30
Parthiv Patel
0eee27005d Merge branch 'master' into 'master'
[FIX] update URL for installation of flectra key file

See merge request flectra-hq/flectra!65
2018-05-21 12:34:35 +00:00
Yusuf Kapasi
3621e59625 [FIX] update URL for installation of flectra key file 2018-05-21 17:02:57 +05:30
Parthiv Patel
4bd185b9a9 Merge branch 'master-issue-website-menu-69' into 'master'
[FIX] Warning 'website.menu.write() with unknown fields: className, style, text' and Fix Isuue: #69

See merge request flectra-hq/flectra!63
2018-05-18 07:13:11 +00:00
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
Parthiv Patel
64ed79ecc2 Merge branch 'master-advance-pricelist' into 'master'
Sale Advance Pricelist

See merge request flectra-hq/flectra!60
2018-05-15 08:34:35 +00:00
Haresh Chavda
090136aef2 [IMP] Cart Rules code modify, Change content of index file and misc changes. 2018-05-15 13:06:16 +05:30
Parthiv Patel
48e2689de5 Merge branch 'master-statistics' into 'master'
[FIX]: statistics

See merge request flectra-hq/flectra!61
2018-05-15 07:10:35 +00:00
Kunjal
0287b7d9a3 [FIX]: Send statistics. 2018-05-14 18:11:17 +05:30
Parthiv Patel
b7f399c8fa Merge branch 'master' into 'master'
[FIX]product page filter radio button visible

See merge request flectra-hq/flectra!59
2018-05-11 04:52:23 +00:00
mayank
2c971d89d8 [FIX]product page filter radio button visible 2018-05-10 18:16:54 +05:30
Parthiv Patel
4099b257df Merge branch 'master-is_homepage-warning' into 'master'
[FIX] 'website.menu.write() with unknown fields: is_homepage' when change menu sequence on website

See merge request flectra-hq/flectra!57
2018-05-09 04:53:55 +00:00
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
Parthiv Patel
8a29d9a1f6 Merge branch 'flectra-prd-visible-issue' into 'master'
[FIX] Products not visible in Main catagory Issue: #45

See merge request flectra-hq/flectra!55
2018-05-03 11:21:56 +00:00
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
Parthiv Patel
1b9ba2af17 Merge branch 'master-cash-flow' into 'master'
[ADD] Index File.

See merge request flectra-hq/flectra!51
2018-05-03 06:08:21 +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