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 |
|
Nabin Hait
|
90bca999dd
|
Merge branch 'develop' into inactive_items
|
2019-04-23 21:39:22 +05:30 |
|
Nabin Hait
|
09438562d4
|
Merge branch 'develop' into fix-stock-entry-feed
|
2019-04-23 21:39:04 +05:30 |
|
Nabin Hait
|
80a5cb3dcc
|
Merge branch 'develop' into item-tax-patch
|
2019-04-23 21:38:45 +05:30 |
|
Nabin Hait
|
acac41d62b
|
Merge branch 'develop' into rounded-salary-tax
|
2019-04-23 21:38:16 +05:30 |
|
Nabin Hait
|
5e0bc20ab8
|
Merge pull request #17337 from nabinhait/travis-fix-dev
fix: Load doc before save
|
2019-04-23 21:35:18 +05:30 |
|
Audacityy
|
bf8d3658c9
|
Issue form reorder (#17346)
* fix: Issue form reorder
|
2019-04-23 18:55:42 +05:30 |
|
Nabin Hait
|
553a3ea7d2
|
fix: create account if not exists in item tax patch
|
2019-04-23 18:46:17 +05:30 |
|
Nabin Hait
|
1f61a1ecf2
|
minot fix
|
2019-04-23 18:44:57 +05:30 |
|
Nabin Hait
|
6592a6bcd4
|
Merge branch 'develop' into income-tax-period-factor-dev
|
2019-04-23 18:38:54 +05:30 |
|
Nabin Hait
|
8bbc0a0c3b
|
Merge branch 'develop' into inactive_items
|
2019-04-23 18:38:44 +05:30 |
|
Deepesh Garg
|
cb2c13fa50
|
fix: Stock Ledger report fix (#17343)
|
2019-04-23 17:29:59 +05:30 |
|
Nabin Hait
|
24b4a8722e
|
fix: Rounded tax amount in salary slip
|
2019-04-23 15:54:32 +05:30 |
|
Kanchan Chauhan
|
253c6f962d
|
fix: Subject of Stock Entry feed
|
2019-04-23 14:40:02 +05:30 |
|
Nabin Hait
|
64bfdd9596
|
fix: test cases
|
2019-04-23 13:37:19 +05:30 |
|
Nabin Hait
|
593242fa5c
|
fix: Calculate rate based on discount on server side only if not rate or pricing rule applied
|
2019-04-23 13:22:38 +05:30 |
|
Nabin Hait
|
319c912f91
|
fix: Load doc before save
|
2019-04-23 13:13:36 +05:30 |
|
Rushabh Mehta
|
77b82894ff
|
fix(style): buttons in address and contact
|
2019-04-23 07:57:31 +05:30 |
|
Suraj Shetty
|
df59c1573d
|
feat: Add training date field
|
2019-04-22 23:35:36 +05:30 |
|
deepeshgarg007
|
e3ea806390
|
fix: Ignore sql injections
|
2019-04-22 21:08:29 +05:30 |
|
deepeshgarg007
|
d5e7bf8f0f
|
Merge branch 'develop' of https://github.com/frappe/erpnext into inactive_items
|
2019-04-22 21:07:27 +05:30 |
|
deepeshgarg007
|
4f57328924
|
Merge branch 'develop' of https://github.com/frappe/erpnext into automatic_so_po
|
2019-04-22 20:25:41 +05:30 |
|
deepeshgarg007
|
555f425da1
|
fix: Test case and styling fixes
|
2019-04-22 20:24:31 +05:30 |
|
Deepesh Garg
|
2ef7022385
|
fix: Remove print statements (#17333)
|
2019-04-22 19:25:18 +05:30 |
|
scmmishra
|
936f36ccda
|
fix: import frappe._ in lms.py
|
2019-04-22 18:55:19 +05:30 |
|
scmmishra
|
68b3203366
|
chore: Moved get_quiz_progress and get_program_progress to a class function in program_enrollment
|
2019-04-22 18:50:08 +05:30 |
|
scmmishra
|
3673b25b64
|
fix: quiz is now visible to administrator
|
2019-04-22 18:10:19 +05:30 |
|
deepeshgarg007
|
d249325d98
|
Merge branch 'develop' of https://github.com/frappe/erpnext into automatic_so_po
|
2019-04-22 18:00:13 +05:30 |
|
deepeshgarg007
|
a89d1df655
|
fix: Typo fixes
|
2019-04-22 17:54:38 +05:30 |
|
scmmishra
|
804a74c01c
|
fix (ui): UI fixes to Video page
|
2019-04-22 17:52:48 +05:30 |
|
scmmishra
|
6c8f23b27e
|
fixed (ui): Fixed cards with better buttons
|
2019-04-22 17:51:30 +05:30 |
|