Commit Graph

312 Commits

Author SHA1 Message Date
Parthiv Patel
6aee6c4511 Merge branch 'master-riddhi-05072018' into 'master-patch-july-2018'
Master riddhi 05072018

See merge request flectra-hq/flectra!89
2018-07-13 09:21:44 +00:00
riddhikansaraflectra
ecce69be69 Master riddhi 05072018 2018-07-13 09:21:44 +00:00
Parthiv Patel
24fd7e5c2f Merge branch 'master-bhumika-06072018' into 'master-patch-july-2018'
Master bhumika 06072018

See merge request flectra-hq/flectra!90
2018-07-13 09:21:38 +00:00
Bhumika
8e2d35fd5c Master bhumika 06072018 2018-07-13 09:21:38 +00:00
Parthiv Patel
823c7409a5 Merge branch 'master-branch' into 'master'
[FIX]: Issue : 85 : Branch.

See merge request flectra-hq/flectra!88
2018-06-29 11:37:11 +00:00
Kunjal
cb0640a320 [FIX]: Issue : 85 : Branch. 2018-06-29 15:33:00 +05:30
Parthiv Patel
e423538eb3 Merge branch 'master-account-journal' into 'master'
[ADD]: journals.

See merge request flectra-hq/flectra!87
2018-06-28 07:22:05 +00:00
Kunjal
2e7c272a35 [ADD]: journals. 2018-06-28 11:14:25 +05:30
Parthiv Patel
db6cd01722 Merge branch 'master-account-discount' into 'master'
Improve code of prepare invoice vals and increase width of div

See merge request flectra-hq/flectra!86
2018-06-26 10:33:29 +00:00
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
Parthiv Patel
2327702b3b Merge branch 'master-account-discount' into 'master'
[IMP] Give reference id of div in account

See merge request flectra-hq/flectra!84
2018-06-25 11:15:10 +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
Parthiv Patel
9959cf5279 Merge branch 'master' into 'master'
[FIX] channel issues

See merge request flectra-hq/flectra!83
2018-06-22 06:34:38 +00:00
Yusuf Kapasi
9ad9b388c3 [FIX] channel issues 2018-06-22 11:33:22 +05:30
Flectra
28cd526602 [REL] Flectra v1.3 Sunbeam 2018-06-21 16:32:07 +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
Parthiv Patel
584e24f945 Merge branch 'master' into 'master'
[IMP]India GST: change label of fiscal position -> Nature of transaction

See merge request flectra-hq/flectra!81
2018-06-21 10:55:18 +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
Parthiv Patel
ac31557348 Merge branch 'master-so/po-riddhi' into 'master'
Master so/po riddhi

See merge request flectra-hq/flectra!78
2018-06-20 07:39:59 +00:00
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