Commit Graph

30640 Commits

Author SHA1 Message Date
Shivam Mishra
d445ffc458 feat: whitelist api 2020-04-28 16:04:31 +05:30
Shivam Mishra
7b836e9a92 refactor: update susbcription values all the time 2020-04-28 15:43:04 +05:30
Shivam Mishra
745b632ea1 fix: linting fixes 2020-04-20 18:25:51 +05:30
Shivam Mishra
83f80517c6
Merge branch 'develop' into razorpay-subscription 2020-04-20 13:54:00 +05:30
Wolfram Schmidt
6d49238159
Update project.json (#21274)
unnecessary requirement for project creation as this is a field of the Type select which will be pre-filled. When creating a project of list view it will also bring up this field as it has "reqd": 1. A new projekt will have the status set to open in most cases.

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Himanshu <himanshuwarekar@yahoo.com>
2020-04-19 20:19:10 +05:30
rohitwaghchaure
3bc23f5339
Merge pull request #21334 from scmmishra/issue-list-context
fix: filters as dictionary
2020-04-19 13:58:22 +05:30
Shivam Mishra
bd53f3b080 fix: filters as dictionary 2020-04-19 12:47:48 +05:30
Deepesh Garg
3cec5cbb0f
fix: Total amount field ordering in transactions (#21313) 2020-04-18 22:13:48 +05:30
Deepesh Garg
6298bbb1eb
Merge pull request #21328 from rohitwaghchaure/fixed-account-name-in-gl_print
fix: account name not showing in the gl print
2020-04-18 20:40:50 +05:30
Rohit Waghchaure
9793500154 fix: account name not showing in the gl print 2020-04-18 19:02:07 +05:30
rohitwaghchaure
866867661e
Merge pull request #21204 from rohitwaghchaure/fixed_internal_issue_develop
fix: minor issues
2020-04-18 02:08:26 +05:30
Deepesh Garg
5239c0e6d5
Merge pull request #21320 from Mangesh-Khairnar/fix-gl-entry-label
fix: add label to gl report
2020-04-17 20:00:42 +05:30
Mangesh-Khairnar
bd14a64bfb fix: add label to gl entry 2020-04-17 19:52:47 +05:30
gavin
25932e0613
Merge pull request #21298 from gavindsouza/tally-migration-fixes
fix: Tally migration
2020-04-17 19:12:55 +05:30
Deepesh Garg
3c6795a52d
Merge pull request #21305 from deepeshgarg007/partial_loan_repayment_fixes
fix: Loan Repayment code clean up and other fixes
2020-04-17 11:16:38 +05:30
Nabin Hait
7eaa7f2e41
fix: requested qty for customer provided item and rate for sales (#21299)
* fix: requested qty for customer provided item and rate for sales

* fix: requested qty for material transfer

* fix: customer provided item can be sales item

* fix: requested qty test cases
2020-04-17 10:52:28 +05:30
rohitwaghchaure
e894c35b9a
Merge pull request #21309 from rohitwaghchaure/fixed_job_card_time_issue_develop
fix: job card timer issue
2020-04-17 00:56:28 +05:30
Rohit Waghchaure
250daa3f94 fix: job card time issue 2020-04-17 00:50:00 +05:30
Deepesh Garg
bf78ed6947 fix: Loan Repayment code clean up and other fixes 2020-04-16 22:53:47 +05:30
Nabin Hait
03af0299a6
fix: requested qty calculation and some other small fixes (#21296)
* fix: Made received qty readonly and no-copy

* fix: Made release date mandatory

* fix: requested qty calculation fix for UOM
2020-04-16 20:11:32 +05:30
Shivam Mishra
3e4ab760db
Merge branch 'develop' into razorpay-subscription 2020-04-16 18:17:42 +05:30
Gavin D'souza
496c6a3baa style: removed unused imports and updated formatting 2020-04-16 16:51:59 +05:30
Deepesh Garg
d521ba2c00
Merge pull request #21102 from nextchamp-saqib/asset-cat-validation
fix: no server side validations for accounts in asset category
2020-04-16 16:25:08 +05:30
Saqib
14cdb24290
fix: serial and batch selection from delivery note bug fix (#21291) 2020-04-16 16:21:35 +05:30
Saqib Ansari
33eb35d8b1 fix: incorrect transalation 2020-04-16 16:16:09 +05:30
Gavin D'souza
6abdfc586b fix: strip data fields of whitespaces 2020-04-16 16:14:29 +05:30
Gavin D'souza
72a94941bf fix(tally-migration): DocType improvement 2020-04-16 16:12:40 +05:30
Gavin D'souza
2ad7e81560 fix: handle errors in enqueued methods and update status 2020-04-16 16:11:55 +05:30
Shivam Mishra
88c1f28351
Merge branch 'develop' into razorpay-subscription 2020-04-16 12:23:46 +05:30
Deepesh Garg
44c0c6c159
Merge branch 'develop' into asset-cat-validation 2020-04-16 11:23:52 +05:30
Deepesh Garg
17ab1592c7
Merge pull request #21265 from vishdha/chart_account_v13
fix: Chart of account importer UX improved
2020-04-16 11:21:05 +05:30
vishdha
5b36d15927 fix: fix Transalation 2020-04-16 11:13:43 +05:30
rohitwaghchaure
65628ac3e2
Merge pull request #21283 from marination/stock-entry-get-items-mr
fix: Fetch Material Requests with type Issue as well in Stock Entry via Get Items from
2020-04-16 00:33:03 +05:30
Marica
3e541a1d04
Merge pull request #21285 from nextchamp-saqib/warehouse-fix-dev
fix: warehouse unset if an item doesn't have default warehouse
2020-04-15 23:55:36 +05:30
Marica
20ce433652
Merge branch 'develop' into warehouse-fix-dev 2020-04-15 23:48:27 +05:30
Saqib Ansari
f53299e98a fix: warehouse unset when cannot find item warehouse
* cannot set delivery date when all items gets deleted and new are added
2020-04-15 22:10:48 +05:30
Saqib Ansari
34640777cd fix: pos not accessible without default customer 2020-04-15 22:10:43 +05:30
marination
0b98a6296b fix: Fetch Material Requests with type Issue as well in Stock Entry via Get Items from 2020-04-15 21:19:04 +05:30
rohitwaghchaure
1c5b12e7d4
Merge pull request #21280 from anupamvs/opportunity-calendar
Adding Opportunity Calendar View
2020-04-15 19:29:49 +05:30
Anupam K
9ee8110411 Adding Calendar view for Opportunity 2020-04-15 18:37:35 +05:30
rohitwaghchaure
c3f994b15e
Merge pull request #21197 from marination/default-item-manufacturer
feat: Provision to set Default Item Manufacturer
2020-04-15 16:35:08 +05:30
Anupam K
c4c44a9a2b Initial JS setup 2020-04-15 12:58:24 +05:30
sahil28297
0ebcb4733a
Merge pull request #21276 from ruchamahabal/patch-fix
fix: patch for Healthcare Refactoring
2020-04-15 11:59:12 +05:30
sahil28297
dd719ea151
Merge branch 'develop' into patch-fix 2020-04-15 11:58:02 +05:30
Rucha Mahabal
11121f4905 fix: patch for Healthcare Refactoring 2020-04-15 11:53:39 +05:30
Deepesh Garg
10b68295ad
Merge pull request #21275 from deepeshgarg007/loan_topup_test_fix
fix: Loan topup test
2020-04-15 11:23:33 +05:30
Deepesh Garg
9e9d44d139 fix: Loan topup test 2020-04-15 11:20:24 +05:30
Rohit Waghchaure
d0f6f1808b fix: minor issues 2020-04-14 17:26:58 +05:30
vishdha
5008be1db5 fix: message bold 2020-04-14 17:17:26 +05:30
vishdha
10a6f4bd05 fix: Chart of account importer UX improved 2020-04-14 17:17:26 +05:30