Faris Ansari
ec7b064528
fix: Clear messages during setup fixtures
2019-05-14 16:21:09 +05:30
Anurag Mishra
52f31d211d
Merge branch 'develop' into bom_items_and_scraps
2019-05-14 15:29:43 +05:30
Shivam Mishra
621cdeb36a
Merge pull request #17592 from scmmishra/acad-fixes
...
fix: bug fixes in LMS
2019-05-14 15:20:22 +05:30
Anurag Mishra
f1f2a3eed0
feat: added report for showinrg complete hierarchy of bom with item details and scraps
2019-05-14 15:04:26 +05:30
Saurabh
1d90ebb16a
Merge pull request #17579 from rmehta/remove-feedback-trigger
...
fix: remove link to feedback trigger
2019-05-14 14:38:30 +05:30
Deepesh Garg
1f02fcdf89
Merge pull request #17597 from deepeshgarg007/territory_group_fixes_develop
...
fix: Make territory filter mandatory
2019-05-14 14:37:39 +05:30
deepeshgarg007
d9a22726f1
fix: Make territory filter mandatory
2019-05-14 14:36:40 +05:30
Shivam Mishra
776d891b19
fix: test for course
2019-05-14 14:16:50 +05:30
Shivam Mishra
f82d0a6074
fix: show video duration and publish date only if data exists
2019-05-14 12:02:51 +05:30
Deepesh Garg
bbdd737b5c
Merge pull request #17590 from deepeshgarg007/inactive_items_row_develop
...
fix: Do not append row if item is sold within days since last ordered
2019-05-14 11:56:59 +05:30
Deepesh Garg
571c5c8bf1
Merge branch 'develop' into inactive_items_row_develop
2019-05-14 11:54:08 +05:30
Shivam Mishra
2430fd3a4c
chore: show description on course card
2019-05-14 11:24:51 +05:30
Shivam Mishra
f2d62195b0
chore: Minor code improvements
2019-05-14 11:24:45 +05:30
Shivam Mishra
d2c4af154b
fix: Video not found bug
2019-05-14 11:24:40 +05:30
rohitwaghchaure
39be1d43bc
Merge pull request #17546 from rohitwaghchaure/incorrect_payment_amount_if_advance_amount_in_si_develop
...
fix: incorrect payment amount in the payment terms if the sales invoice has the advance amount
2019-05-14 11:15:14 +05:30
Shivam Mishra
51b6fe2b8d
feat: Allow disbaling LMS ( #17587 )
2019-05-14 10:22:15 +05:30
deepeshgarg007
4dcba49b5f
fix: Do not append row if item is sold within days since last order
2019-05-14 08:53:24 +05:30
Anurag Mishra
73706f85aa
feat: Bank remittance report for tracking payroll-entry transactions ( #17013 )
...
* feat: Bank remittance report for tracking payroll-entry transactions
* feat: show Company bank account and bank name
* feat: Added Permissions to view report
* feat: Validated report only if debit account is present
* fix: query optimisation
* feat: Added From date and To date filters
* fix: code optimisation
* fix: requested changes
* fix: requested changes and refactor
* style: indentation
* style: Formatting
* fix: added parameter filters
2019-05-13 19:03:21 +05:30
Deepesh Garg
3866e132f7
Merge pull request #17582 from asbasawaraj/blanket_order_in_selling_module_page
...
feat: Added Link to Blanket Order in Selling Module Page
2019-05-13 16:52:23 +05:30
Deepesh Garg
dbf9251324
Merge branch 'develop' into blanket_order_in_selling_module_page
2019-05-13 16:49:47 +05:30
Basawaraj Savalagi
09bafc6d10
feat: Added Link to Blanket Orded in Selling Module Page
2019-05-13 14:59:19 +05:30
Rushabh Mehta
cb83742859
fix: remove link to feedback trigger
2019-05-13 14:19:09 +05:30
Saurabh
9706aaab65
Merge pull request #17556 from Alchez/develop-lead-import-fix
...
feat(crm): Allow leads to be imported without person name
2019-05-13 12:10:12 +05:30
Saurabh
1ab0b78ece
Merge pull request #17569 from Mangesh-Khairnar/training-event-fix
...
feat: validate training event period
2019-05-13 11:47:39 +05:30
Suraj Shetty
c24ace48a6
Merge pull request #17554 from surajshetty3416/fix-rename-account-develop
...
fix: Show "Merge Account" button only to users with write access
2019-05-13 10:04:01 +05:30
Deepesh Garg
aeb864af5a
Merge pull request #17577 from deepeshgarg007/territory_items_develop
...
fix: Show all territories and items in inactive sales item report
2019-05-12 20:43:49 +05:30
deepeshgarg007
0c874d915b
fix: Indentation fixes
2019-05-12 18:38:57 +05:30
deepeshgarg007
7c12cfcb63
fix: Show all territories and items in inactive sales item report
2019-05-12 18:38:49 +05:30
Mangesh-Khairnar
b4e8128fdb
feat: validate training event period
2019-05-11 23:26:47 +05:30
Mangesh-Khairnar
4df61b1495
fix: join multiple emails
2019-05-11 20:10:20 +05:30
Mangesh-Khairnar
cd4289e10e
feat: remove button on import of an order
2019-05-11 20:04:03 +05:30
Rohan Bansal
9778ff8ab3
feat(crm): Allow leads to be imported without person name
2019-05-10 16:09:48 +05:30
Suraj Shetty
b68ae15dec
fix: Check permissions before renaming the account
2019-05-10 14:42:07 +05:30
Suraj Shetty
699f132d05
fix: Show "Merge Account" button only to users with write access
2019-05-10 14:41:40 +05:30
Rohit Waghchaure
5c27791382
fix: test cases
2019-05-10 14:31:07 +05:30
Saurabh
a15908f6a3
Merge pull request #17542 from rohitwaghchaure/project_update_statue_emails_sending_frequestly_develop
...
fix: project update status emails sent frequently
2019-05-10 13:24:50 +05:30
rohitwaghchaure
490411ba28
Update project.py
2019-05-10 12:03:20 +05:30
Saurabh
b10392134d
Merge pull request #17544 from surajshetty3416/improve-item-search-perf
...
perf: Index show_in_website field for faster item search
2019-05-10 11:54:54 +05:30
rohitwaghchaure
8b7a5133a6
Merge pull request #17522 from rohitwaghchaure/invoiced_items_gross_margin_api_develop
...
feat: Get invoiced item's gross margin using API
2019-05-09 19:57:02 +05:30
Rohit Waghchaure
4a267b9340
fix: incorrect payment amount in the payment terms if the sales invoice has the advance amount
2019-05-09 19:52:53 +05:30
Suraj Shetty
2df91addd7
perf: Index show_in_website field for faster item search
2019-05-09 19:19:34 +05:30
Rohit Waghchaure
6b9543b213
fix: project update status emails sent frequently
2019-05-09 19:06:31 +05:30
Saurabh
13955e3a68
Merge pull request #17533 from sahil28297/sync_site_develop
...
feat(sync_site): return more data in level
2019-05-09 17:34:58 +05:30
sahil28297
ce82e4fd54
Merge branch 'develop' into sync_site_develop
2019-05-09 14:48:39 +05:30
Deepesh Garg
828dd6d328
Merge pull request #17531 from deepeshgarg007/gst3b-precision-fix
...
fix: Minor fixes in gstr reports
2019-05-09 14:41:57 +05:30
Sahil Khan
73e281d339
feat(sync_site): return more data in level
2019-05-09 14:32:15 +05:30
Mangesh-Khairnar
93c9a99548
style: change formatting
2019-05-09 12:23:24 +05:30
deepeshgarg007
19c8802971
fix: Precision fixes in gstr3b-report
2019-05-09 12:15:56 +05:30
deepeshgarg007
2097916d9e
fix: Invoice type fixes in gstr-1 report
2019-05-09 12:15:29 +05:30
Saurabh
2b6b504f30
Merge branch 'develop' into invoiced_items_gross_margin_api_develop
2019-05-09 12:06:12 +05:30
