Yaltik/flectra
2
0
Fork 0
Code Pull Requests Releases Activity
550 Commits 6 Branches 0 Tags 154 MiB
7854da5a9b
Commit Graph

388 Commits

Author SHA1 Message Date
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
Harsh Vadodaria
7255e401de [IMP]: Added Upstream Patch for product 2018-07-10 10:49:27 +05:30
Fatemi Lokhandwala
61ecd3fa7b [ADD]:Added Upstream Patch for stock_landed_costs 2018-07-10 10:48:40 +05:30
Fatemi Lokhandwala
0da768c114 [ADD]:Added Upstream Patch for mrp 2018-07-09 18:07:58 +05:30
Rutuba Chavda
f2c6e2fcca [ADD]:Added Upstream Patch for l10n_es 2018-07-09 17:44:59 +05:30
Fatemi Lokhandwala
a861b436a1 [ADD]:Added Upstream Patch of stock_account 2018-07-09 17:12:38 +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
Fatemi Lokhandwala
fea006c468 [ADD]:Added Upstream Patch for sale_stock 2018-07-09 15:53:28 +05:30
sheetalPatil
21211564c3 [ADD]:Added Upstream patch for auth_signup 2018-07-09 15:22:08 +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
Hansa Rathod
2b13d02718 [IMP]: Added Upstream patch for HR Timesheet 2018-07-09 13:02:36 +05:30
Hansa Rathod
78c81d52e3 [IMP]: Added Upstream patch for HR Recruitment 2018-07-09 12:59:04 +05:30
Rutuba Chavda
53707ee062 [ADD]:Added Upstream Patch for l10n_cn_small_business 2018-07-09 12:24:03 +05:30
Haresh Chavda
89b55fce31 [FIX] issues [87]:Invalid State Code and [88]:Sale Advance Pricelist Installation Error 2018-07-09 12:05:04 +05:30
Hansa Rathod
98a6ee1337 [IMP]: Added Upstream patch for HR Expense 2018-07-09 11:18:45 +05:30
Harsh Vadodaria
8a22829f5e [IMP]: Added Upstream Patch for l10n_ch 2018-07-06 18:36:09 +05:30
Fatemi Lokhandwala
227710041f [ADD]:Added Upstream Patch for stock 2018-07-06 18:28:06 +05:30
Hansa Rathod
9fdbf4b78e [IMP]:Added Upstream Patch for HR Contract 2018-07-06 17:00:44 +05:30
Harsh Vadodaria
c8bd2bfdc2 [IMP]: Added Upstream Patch for l10n_ca 2018-07-06 16:57:58 +05:30
Hansa Rathod
61bebe4dcb [IMP]:Added Upstream Patch for HR Attendance 2018-07-06 15:57:17 +05:30
Harsh Vadodaria
87ec60d4df [IMP]: Added Upstream Patch for hr_payroll 2018-07-06 15:23:58 +05:30
Harsh Vadodaria
ac96a360fd [IMP]: Added Upstream Patch for hr_holidays 2018-07-06 14:05:44 +05:30
Hansa Rathod
3826601311 [IMP]:Added Upstream Patch for Account Check Printing 2018-07-06 13:47:43 +05:30
Fatemi Lokhandwala
f313b7e8e8 [ADD]:Added Upstream Patch for mrp_repair 2018-07-06 13:28:57 +05:30
az-flectra
de11d52ad4 Added Upstream Patch for transifex 2018-07-06 11:00:29 +05:30
Kunjal
cb0640a320 [FIX]: Issue : 85 : Branch. 2018-06-29 15:33:00 +05:30
Kunjal
2e7c272a35 [ADD]: journals. 2018-06-28 11:14:25 +05:30
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
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
Yusuf Kapasi
9ad9b388c3 [FIX] channel issues 2018-06-22 11:33:22 +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
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
riddhikansaraflectra
f27882fa3c Master so/po riddhi 2018-06-20 07:39:59 +00:00
Haresh Chavda
1086da4650 [IMP] Give reference name of div and h2 tags 2018-06-18 14:56:17 +05:30
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
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
Chintan Ambaliya
1d1b0a789f [FIX] clear search button work anywhere on website page 2018-06-05 11:00:15 +05:30
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
Chintan Ambaliya
7b907a59cb [FIX] Issue #75 2018-06-01 10:56:01 +05:30
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
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
Haresh Chavda
1cc836d92c [ADD] Website Sale Advance Pricelist 2018-05-23 14:38:18 +05:30
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
Chinmayi Vyas
6006bc1926 [ADD]Stock Ageing qweb Report: lists the age-wise break-up of Inventory to point out old stock and displays the age of the stock in hand 2018-05-16 16:15:11 +05:30
Haresh Chavda
090136aef2 [IMP] Cart Rules code modify, Change content of index file and misc changes. 2018-05-15 13:06:16 +05:30
mayank
2c971d89d8 [FIX]product page filter radio button visible 2018-05-10 18:16:54 +05:30
Chintan Ambaliya
ff3d93dfb7 [FIX] 'website.menu.write() with unknown fields: is_homepage' when change menu sequence on website 2018-05-08 11:02:14 +05:30
Parthiv Patel
1d4568c657 Merge branch 'master-branch' into 'master' 
[FIX]: Improved branch.

See merge request flectra-hq/flectra!56
 2018-05-03 14:49:31 +00:00
Kunjal
5a7452a410 [FIX]: Improved branch. 2018-05-03 18:23:27 +05:30
Chintan Ambaliya
86ec69a40e [FIX] Products not visible in Main catagory Issue: #45 2018-05-03 15:53:51 +05:30
Parthiv Patel
d80ac40ac6 Merge branch 'master-report-gst-riddhi' into 'master' 
[FIX]singapore account tax group

See merge request flectra-hq/flectra!54
 2018-05-03 06:08:34 +00:00
Riddhi Kansara
c136d86a7b [FIX]singapore account tax group 
[FIX]modify test cases based on tax group

[FIX]l10n_sg_gst report issue
 2018-05-02 15:23:21 +05:30
Kunjal
dfe0a6bdbf [ADD] Index File. 2018-05-01 15:38:48 +05:30
Parthiv Patel
4df11df642 Merge branch 'master-report-gst-riddhi' into 'master' 
[ADD]Add index.html file and change icon for gst singapore.

See merge request flectra-hq/flectra!49
 2018-05-01 07:18:36 +00:00
Chinmayi Vyas
ca1cad70e5 [FIX]indian chart of account issue, gst traceback on partner form 2018-04-30 13:51:13 +05:30
mayank
899cd0f216 [IMP]forward port wishlist changes to flectra 2018-04-27 16:44:54 +05:30
Chinmayi Vyas
4a9499557e [FIX] HSN calculation issue on gstr-2 summary 2018-04-27 13:20:00 +05:30
Riddhi Kansara
78b06169b9 [ADD]Add index.html file and change icon for gst singapore. 2018-04-26 15:52:50 +05:30
Chinmayi Vyas
97d6e4c58a [FIX] Translation Issue of Theme Selector Dropdown & Change Version of Flectra 2018-04-25 12:21:28 +05:30
Siddharth Bhalgami
b52ab98e3f Fixes https://gitlab.com/flectra-hq/flectra/issues/59 2018-04-23 16:07:47 +05:30
Flectra
2368ade927 [ADD] condition to drop table only if it exists 2018-04-21 08:12:56 +05:30
Parthiv Patel
8601c469ae Merge branch 'master' into 'master' 
[FIX] Made release planning tasks editable

See merge request flectra-hq/flectra!47
 2018-04-20 10:35:56 +00:00
Ahmed Girach
ecb4f67911 [FIX] Made release planning tasks editable 2018-04-20 15:32:20 +05:30
Riddhi Kansara
b3a53d6236 [ADD]Add GST Report Singapore Localization 2018-04-20 14:27:40 +05:30
Rutuba Chavda
653abef735 [ADD]:account_cash_flow:Add branch_id 2018-04-19 14:29:27 +05:30
Kunjal
b0f6928355 [ADD]: Cash Flow Report. 2018-04-19 14:29:27 +05:30
Chinmayi Vyas
056853fbe4 [ADD] GST module for Indian Localization: configure indian taxes and chart of accounts, summary and excel report for GSTR-1,GSTR-2 2018-04-19 12:34:28 +05:30
Siddharth Bhalgami
f81184cb98 Fixes https://gitlab.com/flectra-hq/flectra/issues/60 2018-04-18 11:22:57 +05:30
Gaurav Patel
8b91e0b9c5 [Add] Theme Leith 2018-04-16 12:23:12 +05:30
Chinmayi Vyas
58e83ab178 [REM]Remove Enterprise Tags 2018-04-12 18:28:20 +05:30
Haresh Chavda
822889a722 [ADD] Sale Advance Pricelist module 2018-04-12 16:44:34 +05:30
Haresh Chavda
b9e6c2c48e [ADD/IMP] Add icon and change author name 2018-04-10 10:54:12 +05:30
Siddharth Bhalgami
8a9c9173e9 Fixes https://gitlab.com/flectra-hq/flectra/issues/51 2018-04-10 10:48:45 +05:30
Parthiv Patel
17601ebbe0 Merge branch 'master-branch' into 'master' 
[FIX]: Set branch in portal user.

See merge request flectra-hq/flectra!42
 2018-04-10 02:48:31 +00:00
Siddharth Bhalgami
9ca2b698d3 [IMP] Added warning message for oauth lib for REST 
[ADD] Added lib in requirements.txt
 2018-04-09 18:16:51 +05:30
flectra-admin
487ed76bc1 [ODOO] Upstream Changes of Odoo to Flectra till commit ref. d636c6c95c 2018-04-09 17:13:32 +05:30
Kunjal
4293581eb2 [FIX]: Set branch in portal user. 2018-04-06 17:38:31 +05:30
Siddharth Bhalgami
e67b7e553c Fixes https://gitlab.com/flectra-hq/flectra/issues/50 2018-04-06 16:44:23 +05:30
Kunjal
21784b3fe5 [FIX]: POS: Remove field and Attrs. 2018-03-28 12:16:08 +05:30
Siddharth Bhalgami
3c75c057d1 [ADD] Manage product category visibility on website by partners/customers tags! 
If specific tag(s) of partner/customer matches with product category's ``Partner Tags`` field then,
that product category will be visible to that partner/customer in website/E-commerce.

Partner Tags Hierarchy will also work...
For Ex.
-> ``Partner`` is Parent Tag
-> ``Partner/Gold`` is Child Tag

If Any Partner/Customer which have Tag of ``Partner``,
then automatically it'll also shows the prodcut category with ``Partner/Gold``,
because ``Partner/Gold`` is Child Of ``Partner`` tag.

Also, If Main Product Category have Partner Tag then that tag will automatically apply to its Child Category & their products.

For More Info: Issue - https://gitlab.com/flectra-hq/flectra/issues/45
 2018-03-27 12:31:46 +05:30
Rutuba Chavda
fb4a6f28bd [FIX]:rma,website_rma,project_scrum:Change screenshots 2018-03-23 12:03:38 +05:30
Siddharth Bhalgami
a6c8f12991 [IMP] FireFox Side-Navbar Scroll Issue Fixed 
Kanban Image Issue: If Image is unset then in kanban its showing error(NaN bytes) -- (FIX forward port from Odoo)
 2018-03-23 11:25:57 +05:30
Rutuba Chavda
40da1d3d45 [FIX]:rma,website_rma,project_scrum:Change author name in manifest file 2018-03-21 15:47:01 +05:30
Kunjal
9be65ead1c [FIX]: Account Config. 2018-03-21 11:57:01 +05:30