Nabin Hait
|
d584cfbf43
|
Fixed merge conflict
|
2019-04-15 16:16:25 +05:30 |
|
Nabin Hait
|
fa8f13dc98
|
Merge pull request #17213 from rohitwaghchaure/optimized_code_to_get_items_for_pos
fix: POS takes lot of time to load the items data
|
2019-04-15 10:11:31 +05:30 |
|
Nabin Hait
|
6ecc83aaf0
|
Merge pull request #17182 from hrwX/revert_salary_slip
Revert(Salary Slip): Wrong Formula
|
2019-04-15 10:08:53 +05:30 |
|
Nabin Hait
|
e7e2e93419
|
Merge pull request #17183 from netchampfaris/duplicate-variant-check-d
fix: Validate variant attributes only if is_new
|
2019-04-15 10:08:28 +05:30 |
|
Nabin Hait
|
8ab393448f
|
Merge pull request #17218 from netchampfaris/item-price-packing-unit-d
fix: Set default value for Packing Unit as 0
|
2019-04-15 10:06:45 +05:30 |
|
Nabin Hait
|
9fd3f10b67
|
Merge pull request #17220 from Anurag810/payment-entry-fix
fix: handle for party type member in payment entry (v12)
|
2019-04-15 10:06:08 +05:30 |
|
rohitwaghchaure
|
033b1babe8
|
Merge pull request #17186 from rohitwaghchaure/bank_account_in_bank_reconcilliation
feat: Added bank account no in bank reconcilliation
|
2019-04-14 16:10:19 +05:30 |
|
Deepesh Garg
|
1b0edbc8b3
|
fix: GSTR3b 3b template fix (#17224)
|
2019-04-13 18:37:08 +05:30 |
|
Anurag Mishra
|
95714297a4
|
fix: handle for party type member in payment entry
|
2019-04-12 15:03:46 +05:30 |
|
Suraj Shetty
|
c90364f94d
|
feat: Add task weight for employee onboarding activity (#17216)
This activity weight will be used to update the task weight
|
2019-04-12 14:12:03 +05:30 |
|
Faris Ansari
|
581e5fbfda
|
fix: Set default value for Packing Unit as 0
The default value 1 assumes Items will be always packed in integer
quantities. This is not the usual case.
|
2019-04-12 12:39:12 +05:30 |
|
Rushabh Mehta
|
54ba900e72
|
Merge pull request #17214 from rmehta/auto-assign-issue
feat: auto assign lead/opportunity to lead owner, customer account manager
|
2019-04-12 11:11:59 +05:30 |
|
Nabin Hait
|
851acc30b3
|
Merge pull request #17208 from asbasawaraj/fixed_sanctioned_amount_update_issue
fix: Fixed Sanctioned Amount Update Issue in Expense Claim
|
2019-04-12 11:06:02 +05:30 |
|
Nabin Hait
|
165e92ad5b
|
Merge pull request #17210 from rohitwaghchaure/fix_taxes_and_charges_are_adding_multiple_times
fix: Taxes and charges table not clear the existing rows if the template is changed
|
2019-04-12 11:02:37 +05:30 |
|
Rushabh Mehta
|
4f49ce4124
|
feat: auto assign lead/opportunity to lead owner, customer account manager
|
2019-04-12 09:04:17 +05:30 |
|
Rohit Waghchaure
|
2454d89068
|
Optimized the code to fix slow loading of items in the POS
|
2019-04-11 19:52:00 +05:30 |
|
Faris Ansari
|
0ff5a7b30f
|
Merge pull request #16827 from Mangesh-Khairnar/so-on-hold
Feature: Sales order on hold
|
2019-04-11 19:29:48 +05:30 |
|
Rohit Waghchaure
|
72cc37e8da
|
fix: Taxes and charges table not clear the existing rows if the template is changed
|
2019-04-11 18:35:15 +05:30 |
|
Basawaraj Savalagi
|
9ce8c3061f
|
Fixed Sanctioned Amount Update Issue in Expense Claim
|
2019-04-11 16:30:11 +05:30 |
|
Mangesh-Khairnar
|
3ab2a18088
|
Merge branch 'develop' into so-on-hold
|
2019-04-11 15:49:06 +05:30 |
|
Faris Ansari
|
6472ed2c1e
|
Merge pull request #16941 from Mangesh-Khairnar/po-on-hold
Feature: Purchase order on hold
|
2019-04-11 15:36:54 +05:30 |
|
Nabin Hait
|
65cca62ef9
|
fixed merge conflict
|
2019-04-11 12:32:43 +05:30 |
|
Nabin Hait
|
89206e74d0
|
fixed merge conflict
|
2019-04-11 12:31:14 +05:30 |
|
rohitwaghchaure
|
92b190febb
|
Merge pull request #17199 from Anurag810/pos_running_items
fix: item order by idx in pos(v12)
|
2019-04-11 11:53:22 +05:30 |
|
Nabin Hait
|
0f62b13dd8
|
Merge pull request #17159 from rohitwaghchaure/sales_return_not_working_for_bundle_items
fix: sales return not working for product bundle items
|
2019-04-11 11:44:57 +05:30 |
|
Nabin Hait
|
961d7ace4a
|
Merge pull request #17189 from nabinhait/sales-person
fix: Made employee optional in sales person
|
2019-04-11 11:37:08 +05:30 |
|
Nabin Hait
|
38351587fc
|
Merge pull request #17197 from nabinhait/training-feedback
fix: training feedback code cleanup
|
2019-04-11 11:36:50 +05:30 |
|
Anurag Mishra
|
4c29d80cf1
|
fix: minor fixes
|
2019-04-11 11:14:32 +05:30 |
|
Anurag Mishra
|
accf310aa3
|
fix: start date and loan period should be mandatory
|
2019-04-11 11:08:07 +05:30 |
|
rohitwaghchaure
|
4898d1936b
|
Merge pull request #17200 from Anurag810/pos_running
fix: order by idx(v11)
|
2019-04-11 10:57:05 +05:30 |
|
rohitwaghchaure
|
a6f54aa437
|
Merge pull request #17204 from rohitwaghchaure/fix_test_cases_for_item_variant_develop
fix: item variant test cases(cherry-pick)
|
2019-04-11 10:56:06 +05:30 |
|
rohitwaghchaure
|
22d6eb3eaa
|
Merge pull request #17191 from rohitwaghchaure/asset_depreciation_rate_hotfix
fix: Asset depreciation formula for WDV method, user was not able to edit schedule table for Manula method
|
2019-04-11 09:58:02 +05:30 |
|
rohitwaghchaure
|
6cd114b467
|
Merge pull request #17198 from rohitwaghchaure/fix_auto_assign_payment_entry_to_invoice
fix: don't assign the advance payment entries if Allocate Advances Automatically is disabled
|
2019-04-11 09:57:45 +05:30 |
|
Rohit Waghchaure
|
9665a531fc
|
fix: item variant test cases
|
2019-04-11 09:56:00 +05:30 |
|
rohitwaghchaure
|
2521b1347b
|
Merge pull request #17201 from rohitwaghchaure/fix_test_cases_for_item_variant
Fix: item variant test cases
|
2019-04-10 19:16:51 +05:30 |
|
Anurag Mishra
|
9a2ae67f86
|
fix: order by idx
|
2019-04-10 17:57:23 +05:30 |
|
Rohit Waghchaure
|
f3a9552e48
|
fix: item variant test cases
|
2019-04-10 17:57:09 +05:30 |
|
Anurag Mishra
|
5ab5f77fd4
|
fix: order by idx
|
2019-04-10 17:53:45 +05:30 |
|
Rohit Waghchaure
|
49907e746b
|
fix: test cases
|
2019-04-10 17:33:32 +05:30 |
|
Rohit Waghchaure
|
45d0b31d44
|
fix: test cases
|
2019-04-10 17:25:08 +05:30 |
|
Rohit Waghchaure
|
b286fc99b8
|
fix: don't assign the advance payment entries if Allocate Advances Automatically is disabled
|
2019-04-10 16:16:30 +05:30 |
|
Nabin Hait
|
c8c678f747
|
fix: training feedback code cleanup
|
2019-04-10 15:56:16 +05:30 |
|
Rohit Waghchaure
|
bb0d4e37b9
|
fix: Asset depreciation formula for WDV method, user was not able to edit schedule table for Manula method
|
2019-04-10 03:14:11 +05:30 |
|
Nabin Hait
|
b305f38869
|
fix: Made employee optional in sales person
|
2019-04-09 20:06:11 +05:30 |
|
Rohit Waghchaure
|
30fda3ee54
|
feat: Added bank account no in bank reconcilliation
|
2019-04-09 18:58:23 +05:30 |
|
Mangesh-Khairnar
|
63cf56f406
|
style: change function call to anonymous function call
|
2019-04-09 17:47:25 +05:30 |
|
Faris Ansari
|
4da3d0015a
|
fix: Validate variant attributes only if is_new
|
2019-04-09 17:40:53 +05:30 |
|
Nabin Hait
|
7dcdb93596
|
Merge pull request #17178 from Anurag810/timesheet_report_fixes
fix: timesheet_report (WN-SUP41913)
|
2019-04-09 17:28:22 +05:30 |
|
Himanshu Warekar
|
5632dbdd18
|
revert: wrong formula
|
2019-04-09 16:53:54 +05:30 |
|
rohitwaghchaure
|
5f2238e98f
|
Merge pull request #17181 from Anurag810/fix_auditing_voucher
fix: Auditing voucher
|
2019-04-09 16:36:03 +05:30 |
|