Commit Graph

560 Commits

Author SHA1 Message Date
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
Parthiv Patel 702723ad1b Merge branch 'master-gaurav-05072018' into 'master-patch-july-2018'
Master gaurav 05072018

See merge request flectra-hq/flectra!95
2018-07-13 09:30:51 +00:00
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
Hansa Rathod 431f2118d5 [IMP]: Added Upstream patch for Mail 2018-07-11 12:36:45 +05:30
Harsh Vadodaria 3b923e19db [IMP]: Added Upstream Patch for product 2018-07-10 19:03:09 +05:30
Hansa Rathod d4c0819ce9 [IMP]: Added Upstream patch for Mail 2018-07-10 18:38:51 +05:30
Fatemi Lokhandwala d281943b49 [ADD]:Added Upstream Patch for pos_restaurant 2018-07-10 17:59:56 +05:30
Fatemi Lokhandwala 1c0f3c438c [ADD]:Added Upstream Patch for point_of_sale 2018-07-10 17:59:10 +05:30
Fatemi Lokhandwala 819ccc9bf3 [ADD]:Added Upstream Patch for sale_stock 2018-07-10 17:57:57 +05:30
Rutuba Chavda a187d536e2 [ADD]:Added Upstream Patch for l10n_co 2018-07-10 17:35:12 +05:30
Harsh Vadodaria a89dc249e8 [IMP]: Added Upstream Patch for hr_holidays 2018-07-10 17:30:57 +05:30
Hansa Rathod f4ba553e51 [IMP]: Added Upstream patch for Portal 2018-07-10 17:25:25 +05:30
Harsh Vadodaria 278fa470cf [IMP]: Added Upstream Patch for hr_expense 2018-07-10 17:11:47 +05:30
Kunjal 7cf60bc315 [ADD]: Added Upstream Patch for calendar. 2018-07-10 16:48:35 +05:30
Kunjal 804235226e [ADD]: Added Upstream Patch for crm. 2018-07-10 16:48:18 +05:30
sheetalPatil bcdb9e3ed1 [ADD]:Added Upstream patch for payment_transfer 2018-07-10 16:35:44 +05:30
sheetalPatil 0708710ecf [ADD]:Added Upstream patch for payment_stripe 2018-07-10 16:35:43 +05:30
sheetalPatil 623614afff [ADD]:Added Upstream patch for payment_sips 2018-07-10 16:35:42 +05:30
sheetalPatil e978d8c5a5 [ADD]:Added Upstream patch for payment_payumoney 2018-07-10 16:35:42 +05:30
sheetalPatil 76cab08351 [ADD]:Added Upstream patch for payment_paypal 2018-07-10 16:35:41 +05:30
sheetalPatil 169637cdf5 [ADD]:Added Upstream patch for payment_ogone 2018-07-10 16:35:40 +05:30
sheetalPatil 48a88443b1 [ADD]:Added Upstream patch for base_address_extended 2018-07-10 16:35:40 +05:30
sheetalPatil 179c9f058d [ADD]:Added Upstream patch for base_address_city 2018-07-10 16:35:39 +05:30
sheetalPatil 1617df3efc [ADD]:Added Upstream patch for barcodes 2018-07-10 16:34:59 +05:30
Hansa Rathod 86f95ea592 [IMP]: Added Upstream patch for Mass Mailing 2018-07-10 16:14:41 +05:30
sheetalPatil f26524e7dd [ADD]:Added Upstream patch for payment_authorize 2018-07-10 16:03:44 +05:30
sheetalPatil 7a27960d56 [ADD]:Added Upstream patch for payment_buckaroo 2018-07-10 16:03:43 +05:30