Mangesh-Khairnar
|
da7b1673c3
|
test: track pi and pr changes
|
2019-04-26 01:31:16 +05:30 |
|
Mangesh-Khairnar
|
869544c0bc
|
fix: add mapped records as functions
|
2019-04-26 01:31:16 +05:30 |
|
Mangesh-Khairnar
|
438fa620b0
|
feat: fetch purchase invoice and purchase receipt records for actual cost calculation
|
2019-04-26 01:31:16 +05:30 |
|
Mangesh-Khairnar
|
fcd0edf415
|
test: compare expected data to generated data
|
2019-04-26 01:31:16 +05:30 |
|
Mangesh-Khairnar
|
46b9204e9d
|
feat: fetch data from budget records for cost estimation
|
2019-04-26 01:31:16 +05:30 |
|
Mangesh-Khairnar
|
5de08f71c5
|
feat: fetch all required fields from po
|
2019-04-26 01:31:16 +05:30 |
|
Mangesh-Khairnar
|
69909c0f51
|
feat: create procurement tracker report
|
2019-04-26 01:31:16 +05:30 |
|
Nabin Hait
|
4fcefda6c7
|
Merge pull request #17332 from deepeshgarg007/automatic_so_po
feat: Automatic inter company Sales and Purchase order
|
2019-04-26 00:24:08 +05:30 |
|
Nabin Hait
|
5c4b7b32a1
|
Merge pull request #17373 from netchampfaris/item-attribute-order-dynamic
fix: Order Item attribute values dynamically
|
2019-04-26 00:21:39 +05:30 |
|
Nabin Hait
|
4c31acf5e4
|
Merge pull request #17382 from nabinhait/tax-exemption-dev
refactor: Employee Tax Exemption (develop)
|
2019-04-26 00:20:46 +05:30 |
|
Nabin Hait
|
ec7a18737b
|
fix: test cases
|
2019-04-25 22:30:23 +05:30 |
|
Nabin Hait
|
6adfc5618d
|
fix: test cases
|
2019-04-25 21:42:26 +05:30 |
|
Nabin Hait
|
1d21d89d2f
|
Merge pull request #17378 from rohitwaghchaure/trial_balance_error_finance_book_develop
fix: Trial balance finance book issue
|
2019-04-25 20:34:38 +05:30 |
|
Nabin Hait
|
c245ed88b5
|
Merge pull request #17379 from nabinhait/pos-advance-dev
fix: Don't allocate advance if pos
|
2019-04-25 20:33:41 +05:30 |
|
Nabin Hait
|
49446ba760
|
fix: test cases
|
2019-04-25 19:54:49 +05:30 |
|
Shivam Mishra
|
9fe7257bfc
|
fix (ui): refactored breadcrumbs
|
2019-04-25 19:44:37 +05:30 |
|
Shivam Mishra
|
2428485ebb
|
fix (ui): Card layout
|
2019-04-25 19:33:22 +05:30 |
|
Shivam Mishra
|
37a55345fd
|
feat: removed home page for lms role
|
2019-04-25 19:29:56 +05:30 |
|
Nabin Hait
|
04e7bf464f
|
refactor: Employee Tax Exemption
|
2019-04-25 18:53:39 +05:30 |
|
Nabin Hait
|
e70696e111
|
Merge branch 'develop' into pos-advance-dev
|
2019-04-25 17:53:56 +05:30 |
|
Rohit Waghchaure
|
c181064782
|
fix: Trial balance finance book issue
|
2019-04-25 17:51:09 +05:30 |
|
Nabin Hait
|
4a994d4eb8
|
fix: Don't allocate advance if pos
|
2019-04-25 17:49:38 +05:30 |
|
deepeshgarg007
|
ce809d57a2
|
Merge branch 'develop' of https://github.com/frappe/erpnext into automatic_so_po
|
2019-04-25 14:29:31 +05:30 |
|
deepeshgarg007
|
f34e4f0e36
|
fix: Test case for inter-company-transaction
|
2019-04-25 14:28:57 +05:30 |
|
deepeshgarg007
|
4a4ce12eb4
|
fix: Commonfied code for inter-company-transaction
|
2019-04-25 14:28:19 +05:30 |
|
Faris Ansari
|
dd201b0797
|
fix: Order Item attribute values dynamically
|
2019-04-25 13:03:50 +05:30 |
|
Rohit Waghchaure
|
9c1fa77f4e
|
fixed test cases
|
2019-04-25 11:57:27 +05:30 |
|
Rohit Waghchaure
|
691e03a36b
|
fix: Straight line asset depreciation not working if Expected Value After Useful Life is defined
|
2019-04-25 11:57:20 +05:30 |
|
Nabin Hait
|
07e005f963
|
Merge pull request #17350 from nabinhait/item-tax-patch
fix: create account if not exists in item tax patch
|
2019-04-25 10:40:46 +05:30 |
|
Nabin Hait
|
8784b0b134
|
Update move_item_tax_to_item_tax_template.py
|
2019-04-25 10:40:34 +05:30 |
|
deepeshgarg007
|
fef14182b7
|
Merge branch 'develop' of https://github.com/frappe/erpnext into automatic_so_po
|
2019-04-25 08:27:40 +05:30 |
|
Nabin Hait
|
2cb57dc3e7
|
Update move_item_tax_to_item_tax_template.py
|
2019-04-24 23:34:04 +05:30 |
|
Nabin Hait
|
d828f84da6
|
Merge pull request #17359 from netchampfaris/item-attribute-order-fix
fix: Item Attribute Order
|
2019-04-24 23:16:34 +05:30 |
|
Deepesh Garg
|
ea9c758648
|
Merge pull request #17331 from deepeshgarg007/inactive_items
feat: Inactive items report
|
2019-04-24 22:30:54 +05:30 |
|
Rushabh Mehta
|
3f1c7a5e5b
|
Merge pull request #16810 from scmmishra/lms-beta-v2
feat: LMS Feature
|
2019-04-24 12:50:52 +05:30 |
|
Faris Ansari
|
90d7150859
|
Merge branch 'develop' into item-attribute-order-fix
|
2019-04-24 11:58:27 +05:30 |
|
Faris Ansari
|
cb7ca63979
|
fix: Item Attribute Order fix
|
2019-04-24 11:57:40 +05:30 |
|
scmmishra
|
bf7d13a7be
|
Merge branch 'develop' of https://github.com/frappe/erpnext into lms-beta-v2
|
2019-04-24 09:50:19 +05:30 |
|
Nabin Hait
|
0908907ae1
|
Merge branch 'develop' into aahi_loan_report
|
2019-04-24 09:37:52 +05:30 |
|
Nabin Hait
|
43324179d0
|
Merge pull request #17339 from KanchanChauhan/fix-stock-entry-feed
fix: Subject of Stock Entry feed
|
2019-04-24 09:35:18 +05:30 |
|
Nabin Hait
|
f593935026
|
Merge pull request #17330 from nabinhait/income-tax-period-factor-dev
fix: Income tax period factor considering joining and relieving date
|
2019-04-24 09:19:30 +05:30 |
|
Nabin Hait
|
08da372ae5
|
Merge branch 'develop' into income-tax-period-factor-dev
|
2019-04-24 09:19:21 +05:30 |
|
Nabin Hait
|
8d3644d826
|
Merge pull request #17351 from nabinhait/rounded-salary-tax
fix: Rounded tax amount in salary slip
|
2019-04-24 09:19:00 +05:30 |
|
Deepesh Garg
|
719dc506b9
|
Merge pull request #17352 from nabinhait/pos-advance
fix: don't allocate advances if POS
|
2019-04-24 08:18:05 +05:30 |
|
Deepesh Garg
|
7dddc0c5bf
|
Merge branch 'develop' into fix-stock-entry-feed
|
2019-04-24 08:14:10 +05:30 |
|
Deepesh Garg
|
fa420c0309
|
Merge pull request #17245 from surajshetty3416/employee-skill-map
feat: Employee skill map
|
2019-04-24 08:10:07 +05:30 |
|
Deepesh Garg
|
12af1c3837
|
Merge branch 'develop' into employee-skill-map
|
2019-04-24 00:03:04 +05:30 |
|
Rohan
|
d12e9426bd
|
fix(selling): Fix method to also consider return documents (#17340)
|
2019-04-23 23:08:26 +05:30 |
|
Nabin Hait
|
aa028d7856
|
fix: don't allocate advances if POS
|
2019-04-23 21:44:21 +05:30 |
|
Nabin Hait
|
c144f66dac
|
Merge branch 'develop' into income-tax-period-factor-dev
|
2019-04-23 21:39:33 +05:30 |
|