Deepesh Garg
0fcdc33393
Merge pull request #21361 from rohitwaghchaure/fixed-unsupported-operand-type-issue-develop
...
fix: unsupported operand type issue in pricing rule
2020-04-22 08:45:56 +05:30
Rohit Waghchaure
690855d3a1
fix: unsupported operand type issue in pricing rule
2020-04-22 02:49:48 +05:30
Nabin Hait
5f77854448
Revert "fix : Create Pick List Fos Sales Order List ( #20915 )" ( #21352 )
...
This reverts commit 27c6f69435
.
2020-04-21 14:28:08 +05:30
Nabin Hait
a529a5078f
Update purchase_receipt.json
2020-04-21 13:50:26 +05:30
Marica
bda0ddf1cf
fix: Purchase Receipt Form Cleanup ( #21232 )
2020-04-21 13:15:05 +05:30
Marica
9942acd9d4
fix [ux]: Material Request Form Cleanup and UX ( #20810 )
...
* fix (ux): Material Request Form Cleanup
* fix: Get Items from popup UX
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-21 13:13:39 +05:30
Dharmraj-48
27c6f69435
fix : Create Pick List Fos Sales Order List ( #20915 )
...
Co-authored-by: Dharmraj <Dharmraj@bloomstack.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-21 13:10:09 +05:30
Marica
34bbd5b612
fix: Purchase Invoice Form Cleanup ( #21230 )
...
* fix: Purchase Invoice Form Cleanup
* fix: Made Supplier field mandatory
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-21 13:00:14 +05:30
Anupam Kumar
a9d59fad94
fix: on item change UOM not updated ( #21242 )
...
* fix: on item change UOM not updated
* removing uom from js
2020-04-21 12:57:44 +05:30
Rucha Mahabal
ca1c37c56d
fix(Healthcare): remove hardcoded UOM during Item creation for Templates ( #21350 )
2020-04-21 12:54:07 +05:30
Marica
9ea1ad4051
fix: Re-order Item Error Email format ( #21342 )
...
* fix: Re-order Item Error Email format
* fix: Translated strings
2020-04-21 12:52:29 +05:30
rohitwaghchaure
a92eaff83b
fix: scrap items order not showing correctly in stock entry ( #21346 )
2020-04-21 11:27:10 +05:30
rohitwaghchaure
3d2ced7926
Merge pull request #21345 from rohitwaghchaure/fixed_free_item_qty_develop
...
fix: free item quantity issue
2020-04-21 01:10:33 +05:30
Rohit Waghchaure
d093a377ef
fix: free item quantity issue
2020-04-21 01:09:44 +05:30
Shivam Mishra
6372d0a842
Merge pull request #21187 from scmmishra/razorpay-subscription
...
feat: Razorpay subscription for Non profit memberships
2020-04-20 21:01:34 +05:30
Shivam Mishra
745b632ea1
fix: linting fixes
2020-04-20 18:25:51 +05:30
rohitwaghchaure
6e201a00df
Merge pull request #21340 from sahil28297/fix_italy_einvoicing_develop
...
fix(patch): reload 'Import Supplier Invoice' doc
2020-04-20 14:22:48 +05:30
Sahil Khan
f03efdc6b1
fix(patch): reload 'Import Supplier Invoice' doc
2020-04-20 14:18:28 +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