Commit Graph

330 Commits

Author SHA1 Message Date
Gaurav Patel
0ed7edd58a Master gaurav 05072018 2018-07-13 09:30:51 +00:00
Parthiv Patel
89863abf7d Merge branch 'master-akshar-05072018' into 'master-patch-july-2018'
Master akshar 05072018

See merge request flectra-hq/flectra!94
2018-07-13 09:28:02 +00:00
Parthiv Patel
548b771a48 Merge branch 'master-haresh-05072018' into 'master-patch-july-2018'
Master haresh 05072018

See merge request flectra-hq/flectra!93
2018-07-13 09:26:56 +00:00
Haresh Chavda
90389d2065 Master haresh 05072018 2018-07-13 09:26:56 +00:00
Parthiv Patel
a6b79054ac Merge branch 'master-rutuba-09072018' into 'master-patch-july-2018'
Master rutuba 09072018

See merge request flectra-hq/flectra!92
2018-07-13 09:25:41 +00:00
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
Rutuba Chavda
a187d536e2 [ADD]:Added Upstream Patch for l10n_co 2018-07-10 17:35:12 +05:30
Rutuba Chavda
9c3e07fb50 [ADD]:Added Upstream Patch for l10n_fr_certification 2018-07-10 11:46:17 +05:30
Rutuba Chavda
e21726da23 [ADD]:Added Upstream Patch for l10n_fr 2018-07-10 11:27:46 +05:30
Rutuba Chavda
f2c6e2fcca [ADD]:Added Upstream Patch for l10n_es 2018-07-09 17:44:59 +05:30
Rutuba Chavda
33570932ce [ADD]:Added Upstream Patch for l10n_do 2018-07-09 16:57:04 +05:30
az-flectra
b1faf35d76 Added Upstream Patch for website_sale_options 2018-07-09 16:25:06 +05:30
az-flectra
9d65bd343f Added Upstream Patch for im_livechat 2018-07-09 16:24:28 +05:30
az-flectra
b40e3903f2 Added Upstream Patch for website_sale_delivery 2018-07-09 16:23:49 +05:30
az-flectra
3712c502ce Added Upstream Patch for website_forum 2018-07-09 16:22:54 +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
Rutuba Chavda
53707ee062 [ADD]:Added Upstream Patch for l10n_cn_small_business 2018-07-09 12:24:03 +05:30
az-flectra
de11d52ad4 Added Upstream Patch for transifex 2018-07-06 11:00:29 +05:30
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