Commit Graph

382 Commits

Author SHA1 Message Date
Haresh Chavda
f113b10d44 [REM] Remove scrap functionality 2018-07-31 15:58:39 +05:30
Haresh Chavda
57de0cd91d [IMP] Change aseet type view, Sale wizard calculation and screenshot 2018-07-28 12:56:48 +05:30
Chintan Ambaliya
d37fcb3fa4 [FIX] Issues #79 compatible CTRL+P with firefox browser 2018-07-26 18:24:51 +05:30
Haresh Chavda
9f0bc3ca6d [ADD] index file and misc changes 2018-07-25 15:25:19 +05:30
Haresh Chavda
1b2971d5b8 [ADD] Add Fiscal year concept and Asset report and misc 2018-07-24 16:45:11 +05:30
Parthiv Patel
488bb3d8e6 Merge branch 'master-gst' into 'master'
[IMP] Gst Summary report changes

See merge request flectra-hq/flectra!117
2018-07-23 13:27:36 +00:00
Parthiv Patel
77d8e41d59 Merge branch 'master-advance-pricelist' into 'master'
[FIX] issues [87]:Invalid State Code and [88]:Sale Advance Pricelist Installation Error

See merge request flectra-hq/flectra!115
2018-07-23 12:25:55 +00:00
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
Riddhi Kansara
6b19bd4c10 [REM]remove application true from l10n_in_gst module 2018-07-23 10:24:24 +05:30
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
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
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
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
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
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
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
riddhikansaraflectra
ecce69be69 Master riddhi 05072018 2018-07-13 09:21:44 +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
sheetalPatil
cecc73bd42 [ADD]:Added Upstream patch for payment_adyen 2018-07-10 16:03:42 +05:30
sheetalPatil
3ee4085418 [ADD]:Added Upstream patch for payment 2018-07-10 16:03:07 +05:30
Hansa Rathod
db466a1d6a [IMP]: Added Upstream patch for HR 2018-07-10 15:47:25 +05:30
Hansa Rathod
c4123b8447 [IMP]: Added Upstream patch for Portal 2018-07-10 15:16:06 +05:30
Kunjal
1e1d7f9f6d [ADD] : Added Upstream Patch for Analytic. 2018-07-10 14:39:14 +05:30
Kunjal
cc9a88e2d2 [ADD]: Added Upstream Patch for account_voucher. 2018-07-10 14:39:14 +05:30
Kunjal
086d6fd53f [ADD]: Added Upstream Patch for account_payment. 2018-07-10 14:39:13 +05:30
Kunjal
c6591970cd [ADD]: Added Upstream Patch for account_analytic_default. 2018-07-10 14:39:13 +05:30
Kunjal
5e965cc037 [ADD] : Added Upstream Patch for Account. 2018-07-10 14:37:54 +05:30
Hansa Rathod
f64e05c61a [IMP]: Added Upstream patch for Mass Mailing Event Track 2018-07-10 14:08:54 +05:30
Fatemi Lokhandwala
58ce064c7b [ADD]:Added Upstream Patch for pos_restaurant 2018-07-10 13:29:21 +05:30
Hansa Rathod
f780ec241f [IMP]: Added Upstream patch for Mass Mailing Event 2018-07-10 13:24:43 +05:30
Fatemi Lokhandwala
79aad71e3f [ADD]:Added Upstream Patch for pos_mercury 2018-07-10 13:09:12 +05:30
Fatemi Lokhandwala
c8ce027ecb [ADD]:Added Upstream Patch for point_of_sale 2018-07-10 12:27:47 +05:30
Fatemi Lokhandwala
00ea1bb90f [ADD]:Added Upstream Patch for stock_dropshipping 2018-07-10 12:25:52 +05:30
Hansa Rathod
bc3d5d7ba9 [IMP]: Added Upstream patch for Mail Mailing 2018-07-10 12:17:50 +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
Harsh Vadodaria
d63d28f7be [IMP]: Added Upstream Patch for product_email_template 2018-07-10 11:07:21 +05:30