Commit Graph

544 Commits

Author SHA1 Message Date
Parthiv Patel
b3063ab3e1 Merge branch 'master-stock' into 'master'
[IMP] Issus#99 : The requested operation cannot be completed due to security restrictions

See merge request flectra-hq/flectra!116
2018-07-23 12:25:49 +00:00
Haresh Chavda
ab9747ed2a [IMP] Gst Summary report changes 2018-07-23 17:52:19 +05:30
Parthiv
48803ecd0e [ADD] patch till 3528e804de50f0112315e23b65066ff752a3f7b2 2018-07-23 17:44:20 +05:30
Parthiv
973d6f5003 [ADD] upstream patching till 88ff6beb016702cbda710aa31bbf10d51ab68fab 2018-07-23 14:16:49 +05:30
Parthiv Patel
efb6c34f02 Merge branch 'master-riddhi-05072018' into 'master-patch-july-2018'
[REM]remove application true from l10n_in_gst module

See merge request flectra-hq/flectra!113
2018-07-23 07:22:08 +00:00
Riddhi Kansara
6b19bd4c10 [REM]remove application true from l10n_in_gst module 2018-07-23 10:24:24 +05:30
Parthiv Patel
a36d3972d1 Merge branch 'master-riddhi-05072018' into 'master-patch-july-2018'
[REM]Remove application true from l10n_in_gst, l10n_sg_gst and account_cash_flow module

See merge request flectra-hq/flectra!112
2018-07-20 08:54:22 +00:00
Riddhi Kansara
4dfb8ea83f [REM]Remove application true from l10n_in_gst, l10n_sg_gst and account_cash_flow module 2018-07-20 13:26:53 +05:30
Parthiv Patel
f2e1110720 Merge branch 'master-patch-july-2018' into 'master-patch-july-2018'
Master patch july 2018

See merge request flectra-hq/flectra!111
2018-07-19 14:21:56 +00:00
Harsh
7ef5c42fe4 Master patch july 2018 2018-07-19 14:21:56 +00:00
Parthiv Patel
de63417863 Merge branch 'master-rutuba-09072018' into 'master-patch-july-2018'
Master rutuba 09072018

See merge request flectra-hq/flectra!109
2018-07-19 13:23:27 +00:00
Parthiv Patel
c5dd18a0f4 Merge branch 'master-akshar-05072018' into 'master-patch-july-2018'
Master akshar 05072018

See merge request flectra-hq/flectra!110
2018-07-19 13:23:06 +00:00
az-flectra
02f2d71f38 Added Upstream Patch for website_sale_delivery 2018-07-19 18:13:46 +05:30
Parthiv Patel
b70f5ed3ab Merge branch 'master-fatemi-05072018' into 'master-patch-july-2018'
Master fatemi 05072018

See merge request flectra-hq/flectra!108
2018-07-19 12:41:33 +00:00
Parthiv Patel
41baf6a0da Merge branch 'master-haresh-19072018' into 'master-patch-july-2018'
[IMP] Added Upstream Patch for [Purchase]

See merge request flectra-hq/flectra!107
2018-07-19 12:41:17 +00:00
Parthiv Patel
05250730da Merge branch 'master-riddhi-05072018' into 'master-patch-july-2018'
Master riddhi 05072018

See merge request flectra-hq/flectra!106
2018-07-19 12:38:55 +00:00
Rutuba Chavda
c4e1876a27 [ADD]:Added Upstream Patch for sales_team 2018-07-19 18:05:30 +05:30
Rutuba Chavda
794925b329 [ADD]:Added Upstream Patch for l10n_mx 2018-07-19 17:45:04 +05:30
Rutuba Chavda
e0b3d11fe8 [ADD]:Added Upstream Patch for l10n_fr 2018-07-19 17:40:15 +05:30
Haresh Chavda
3c8a45bc03 [IMP] Added Upstream Patch for [Purchase] 2018-07-19 17:34:06 +05:30
az-flectra
b851be6ef5 Added Upstream Patch for mail 2018-07-19 17:19:58 +05:30
Parthiv Patel
d04e148d82 Merge branch 'master-gaurav-19072018' into 'master-patch-july-2018'
[Add] Added Upstream Patch For website_blog,website_event,website_forum

See merge request flectra-hq/flectra!105
2018-07-19 11:48:38 +00:00
Fatemi Lokhandwala
f826a5dbf3 [ADD]:Added Upstream Patch for auth_signup 2018-07-19 17:15:46 +05:30
Riddhi Kansara
1a1e197981 [ADD]Added Upstream Patch for hw_scale module 2018-07-19 17:14:12 +05:30
Gaurav Patel
16b77ebcb9 [Add] Added Upstream Patch For website_blog,website_event,website_forum 2018-07-19 17:13:02 +05:30
Parthiv Patel
191a40616c Merge branch 'master-hiren-19072018' into 'master-patch-july-2018'
[ADD] Added upstream patch for web_editor,website_gengo

See merge request flectra-hq/flectra!104
2018-07-19 11:42:34 +00:00
Parthiv Patel
d0c65d6989 Merge branch 'master-chintan-19072018' into 'master-patch-july-2018'
Added Upstream Patch for web, website

See merge request flectra-hq/flectra!103
2018-07-19 11:42:03 +00:00
Riddhi Kansara
1260eab566 [ADD]Added Upstream Patch for hw_proxy module 2018-07-19 17:04:30 +05:30
Chintan Ambaliya
da5b6d7dbf Added Upstream Patch for web, website 2018-07-19 17:04:13 +05:30
Hiren Jungi
73bc1fec3e [ADD] Added upstream patch for web_editor,website_gengo 2018-07-19 17:02:41 +05:30
az-flectra
5e19179427 Added Upstream Patch for crm 2018-07-19 17:01:58 +05:30
Fatemi Lokhandwala
7a79c0c5d9 [ADD]:Added Upstream Patch for auth_oauth 2018-07-19 16:58:13 +05:30
Riddhi Kansara
bbce466361 [ADD]Added Upstream Patch for board module 2018-07-19 16:51:45 +05:30
Riddhi Kansara
68d53a77cb [ADD]Added Upstream Patch for board module 2018-07-19 16:42:36 +05:30
Riddhi Kansara
9662062c1b Merge branch 'master-riddhi-05072018' of https://gitlab.com/riddhikansaraflectra/flectra into master-riddhi-05072018 2018-07-19 16:41:26 +05:30
Parthiv
f26d51740b Merge branch 'master-patch-july-2018' of https://gitlab.com/flectra-hq/flectra into master-patch-july-2018 2018-07-19 16:24:44 +05:30
Parthiv
ec59f69127 [ADD] upstream patching 2018-07-19 16:22:28 +05:30
Haresh Chavda
8a5c510fba [IMP] Issus#99 : The requested operation cannot be completed due to security restrictions 2018-07-19 15:47:39 +05:30
Parthiv Patel
750aef6e5f Merge branch 'master-patch-july-2018' into 'master-patch-july-2018'
[IMP]: Added Upstream Patch for account

See merge request flectra-hq/flectra!102
2018-07-19 08:51:57 +00:00
Harsh Vadodaria
4a7f4787b5 [IMP]: Added Upstream Patch for account 2018-07-18 12:48:49 +05:30
Parthiv Patel
67a50b29b4 Merge branch 'master-hansa-05072018' into 'master-patch-july-2018'
[IMP]: Added Upstream patch for Mail

See merge request flectra-hq/flectra!101
2018-07-13 12:18:43 +00:00
Hansa Rathod
ff1e80988b [IMP]: Added Upstream patch for Mail 2018-07-13 17:46:35 +05:30
Parthiv Patel
e313b2a500 Merge branch 'master-hansa-05072018' into 'master-patch-july-2018'
Master hansa 05072018

See merge request flectra-hq/flectra!100
2018-07-13 11:21:23 +00:00
Hansa Rathod
fa23dddf2b [IMP]: Added Upstream patch for Mail 2018-07-13 16:09:27 +05:30
Parthiv Patel
d6834ffaca Merge branch 'master-fatemi-05072018' into 'master-patch-july-2018'
Master fatemi 05072018

See merge request flectra-hq/flectra!91
2018-07-13 09:51:33 +00:00
Parthiv Patel
4250b41e4b Merge branch 'master-chintan-hiren-mayank-13072018' into 'master-patch-july-2018'
Master chintan hiren mayank 13072018

See merge request flectra-hq/flectra!99
2018-07-13 09:51:12 +00:00
ChintAn Ambaliya
7dd719a67f Master chintan hiren mayank 13072018 2018-07-13 09:51:12 +00:00
Parthiv Patel
604cf9e3e0 Merge branch 'master-harsh-06072018' into 'master-patch-july-2018'
Master harsh 06072018

See merge request flectra-hq/flectra!98
2018-07-13 09:50:24 +00:00
Parthiv Patel
8683567ebd Merge branch 'master-kunjal-06072018' into 'master-patch-july-2018'
Master kunjal 06072018

See merge request flectra-hq/flectra!97
2018-07-13 09:42:58 +00:00
Parthiv Patel
3881ab378e Merge branch 'master-sheetal-06072018' into 'master-patch-july-2018'
Master sheetal 06072018

See merge request flectra-hq/flectra!96
2018-07-13 09:34:32 +00:00