rohitwaghchaure
fc471ed63b
Merge pull request #17142 from rohitwaghchaure/incorrect_pos_profile_selected_develop
...
fix: incorrect POS profile selected
2019-04-05 09:59:16 +05:30
Rohit Waghchaure
c2ed03f77a
always set the company from the POS Profile
2019-04-05 09:58:04 +05:30
Rohit Waghchaure
e8e3fb175d
fix: incorrect POS profile selected
2019-04-05 09:57:52 +05:30
rohitwaghchaure
cbdd3304a4
Merge pull request #17138 from rohitwaghchaure/search_items_not_works_in_the_pos
...
fix: POS search items not works properly if item group filter has applied
2019-04-05 00:45:53 +05:30
cjpit
0c87895afc
fix(node_modules): remove hardcoded symlink ( #16975 )
...
* add node_modules directory to gitignore
* remove node_modules symlink
2019-04-05 00:12:26 +05:30
Rohit Waghchaure
0a4aee0206
fix: POS search items not works properly if item group filter has applied
2019-04-04 16:02:15 +05:30
Rohit Waghchaure
55d3bcac37
fix: not able to change pos profile
2019-04-04 15:26:00 +05:30
Nabin Hait
9087efa5be
Merge pull request #17131 from Anurag810/desk-fixes
...
fix: desk for selling module, sales invoice now avaialble at module page (WN-SUP41771).
2019-04-04 11:49:56 +05:30
Nabin Hait
b861c4bc46
Merge pull request #16895 from Alchez/hotfix-shipping-charge-override
...
fix(transaction): Fix shipping rule charge override by tax template
2019-04-04 11:48:48 +05:30
Nabin Hait
94c822f5f0
Merge pull request #17022 from hrwX/cost_center_fix
...
fix(Purchase Invoice): Cost Centre as per company
2019-04-04 11:43:44 +05:30
Anurag Mishra
76795aa086
fix: desk for selling module sales invoice now avaialble at module page
2019-04-04 11:38:42 +05:30
Himanshu Warekar
5ccc4731d0
fix: typo fix
2019-04-04 11:02:05 +05:30
Nabin Hait
fdf52a82d6
Merge pull request #17127 from rmehta/warehouse-account-fix-develop
...
fix(kaizen): warehouse account description
2019-04-04 10:50:42 +05:30
Nabin Hait
3149596b53
Merge pull request #17102 from hrwX/hsn_india_v12
...
fix(India): HSN Code
2019-04-04 10:49:55 +05:30
Nabin Hait
b652421a54
Merge pull request #17106 from nabinhait/loan-link
...
fix: Added link for loan in HR module page
2019-04-04 10:49:37 +05:30
Rushabh Mehta
3720e64506
fix(kaizen): warehouse account description
2019-04-04 09:02:41 +05:30
Rushabh Mehta
43257c8cc3
fix(rename): Help Desk => Support
2019-04-02 08:59:15 +05:30
rohitwaghchaure
c0435f21c2
Merge pull request #17098 from rohitwaghchaure/incorrect_calculation_of_imponibile_importo_develop
...
fix: incorrect calcualtion of ImponibileImporto if tax rate is zero
2019-04-01 23:15:17 +05:30
Nabin Hait
9d431a8a83
fix: Added link for Expense Claim in HR module page
2019-04-01 21:06:12 +05:30
Nabin Hait
948cc631c6
fix: Added link for loan in HR module page
2019-04-01 20:58:20 +05:30
Himanshu Warekar
656d8e4557
fix(India): HSN Code
2019-04-01 19:38:43 +05:30
Rohit Waghchaure
58f489fec8
fix: calcualtion of ImponibileImporto if tax rate is zero
2019-04-01 18:18:27 +05:30
Deepesh Garg
6b320bea81
fix: GSTR3b test case fix ( #17094 )
2019-04-01 17:55:01 +05:30
Rohit Waghchaure
6f3f2185ab
fix: pos takes more time to add an item in the cart
2019-04-01 16:45:47 +05:30
rohitwaghchaure
f4d8457905
Merge pull request #17090 from rohitwaghchaure/pos_qty_decrement_not_working
...
fix: POS qty decrement freezing the screen
2019-04-01 14:57:33 +05:30
Rohit Waghchaure
e994494e3e
fix: POS qty decrement freezing the screen
2019-04-01 14:29:55 +05:30
Rohit Waghchaure
614f5adf6d
fix: code cleanup
2019-04-01 10:53:08 +05:30
Rohit Waghchaure
70b996af73
fix: test cases
2019-03-31 20:34:52 +05:30
Rohit Waghchaure
e540534e42
fix: Pricing rule not working for POS
2019-03-31 17:13:18 +05:30
Nabin Hait
da7a193f11
fix(stock): Fixed stock balance and stock ledger report
2019-03-30 15:53:04 +05:30
rohitwaghchaure
725f37cea5
Revert "fix(Delivery Note): Fix issue credit note"
2019-03-30 13:21:50 +05:30
rohitwaghchaure
b6505bddeb
Merge pull request #17025 from hrwX/fix_issue_credit
...
fix(Delivery Note): Fix issue credit note
2019-03-30 12:31:29 +05:30
Himanshu
20c17b8229
fix(Update GSTIN): remove '.__' from template ( #17062 )
...
'.__' Avoid Server Side Template Injection
2019-03-30 12:11:01 +05:30
rohitwaghchaure
43d79eaa92
Merge pull request #17057 from hrwX/bank_reconciliation_fix
...
fix(Bank Reconciliation): get credit and debit as float and not string
2019-03-30 10:16:12 +05:30
rohitwaghchaure
689a967443
Merge pull request #17065 from rohitwaghchaure/not_able_to_create_chart_of_account_develop
...
fix: user not able to create chart of account in parent if child has no chart of account
2019-03-30 10:13:55 +05:30
Deepesh Garg
56e23e7d47
feat: GSTR1 json format download ( #16887 )
...
* feat: download gstr-1 b2b in json in its appropriate json format
* fix: download file as raw type
* feat: added logic to convert export gst data to its json
* code commonify and logic for b2cl added
* fix: Codacy and typo fixes
* fix: B2B json creation fixes
* fix: Filter customer by category
* fix: Fetch fp from to date
2019-03-29 22:22:54 +05:30
Rohit Waghchaure
cc59fcd75e
fix: user not able to create chart of account in parent if child has no chart of account
2019-03-29 19:23:04 +05:30
rohitwaghchaure
706cf7d3d2
Merge pull request #17001 from scmmishra/develop-task-status
...
fix: task overdue status propagates to project
2019-03-29 18:44:17 +05:30
Himanshu
6b54649bfe
fix(Salary Slip): Consider Leave without Pay for calculation ( #17023 )
...
Please read the pull request checklist to make sure your changes are merged: https://github.com/frappe/erpnext/wiki/Pull-Request-Checklist
2019-03-29 18:32:23 +05:30
Nabin Hait
92797eee87
Merge pull request #17052 from deepeshgarg007/patch-fix
...
fix: Add patch to move item tax to item tax template
2019-03-29 16:37:17 +05:30
Rushabh Mehta
1c68ddc9c0
Merge pull request #17045 from rmehta/fix-sla-auto-update
...
fix(sla): update agreement status on save'
2019-03-29 16:25:40 +05:30
Himanshu Warekar
95003cbbca
fix: get credit and debit as float and not string
2019-03-29 16:21:59 +05:30
Rushabh Mehta
048e5f44b5
fix(test): item variant
2019-03-29 14:34:14 +05:30
rohitwaghchaure
e38c0e8716
Merge pull request #17053 from rohitwaghchaure/pos_items_not_loading_v12
...
fix: POS items not loading
2019-03-29 13:54:11 +05:30
Rohit Waghchaure
b00c16470d
fix: POS items not loading
2019-03-29 13:47:45 +05:30
Nabin Hait
7b2c52b6f2
Merge branch 'hotfix' of https://github.com/frappe/erpnext into develop
2019-03-29 13:26:46 +05:30
Nabin Hait
862f77cc13
Merge branch 'deferred_revenue' into hotfix
2019-03-29 13:26:16 +05:30
Nabin Hait
66d07c2700
fix(accounts): Indentation
2019-03-29 13:25:11 +05:30
Nabin Hait
d4e038b6ca
Merge branch 'hotfix' of https://github.com/frappe/erpnext into develop
2019-03-29 12:41:48 +05:30
Nabin Hait
cf7538c17f
Merge pull request #17046 from nabinhait/deferred_revenue
...
Refactor: deferred revenue booking logic
2019-03-29 12:39:36 +05:30