scmmishra
abb35ad308
fix: Possible fix for failing tests
2019-04-09 12:38:42 +05:30
Mangesh-Khairnar
b70b048fa2
style: change type comparison for boolean expression
2019-04-09 12:26:52 +05:30
Mangesh-Khairnar
16c4fd6733
Merge branch 'develop' of https://github.com/frappe/erpnext into so-on-hold
2019-04-09 12:13:45 +05:30
Mangesh-Khairnar
a2facd4dd2
style: change function call to anonymous function
2019-04-09 12:07:44 +05:30
scmmishra
b7d9efe901
Merged develop in lms
2019-04-09 11:39:12 +05:30
Rushabh Mehta
0d3986c9f6
fix(dashboard): account timeline for balance sheet accounts
2019-04-09 11:36:41 +05:30
scmmishra
dd889f8796
fix: Fixed hero image field in COurse and Topic
2019-04-09 11:36:31 +05:30
Anurag Mishra
17fbafa390
fix: filters,added total,only submitted doc,considered fraction
2019-04-09 11:31:11 +05:30
Faris Ansari
aac7719dd9
fix: Translated string method in Jinja ( #17174 )
2019-04-08 21:50:58 +05:30
scmmishra
88f0c464b4
feat: Added breadcrumbs
2019-04-08 19:56:21 +05:30
Rushabh Mehta
da3f07221c
fix(dashboard): accounting timeline query fix
2019-04-08 19:38:55 +05:30
Rushabh Mehta
3882a41c51
fix(dashboard): simpler way to get account timeline from first principles
2019-04-08 19:05:12 +05:30
Rushabh Mehta
2cce72412d
Merge pull request #17168 from frappe/revert-17086-check-version-hf
...
Revert "fix: Raise exception if apps are on incompatible branches"
2019-04-08 17:11:15 +05:30
Rushabh Mehta
1412a681f3
Revert "fix: Raise exception if apps are on incompatible branches"
2019-04-08 17:10:56 +05:30
Rushabh Mehta
fbc56c6d97
fix(style): left padding in marketplace view
2019-04-08 17:02:22 +05:30
Mangesh-Khairnar
1934a76cd8
feat: Add status field in multiple reports linked with purchase order and sales order creation ( #17107 )
...
* enhancement: add status field in ordered itemd to be delivered
* enhancement: add status field in purchase order itemd to be received
* enhancement: add a status column in the billed reports
2019-04-08 16:29:59 +05:30
Saurabh
b0c939d280
Merge branch 'hotfix'
2019-04-08 15:09:04 +05:30
Saurabh
00a5e7a1d0
bumped to version 11.1.20
2019-04-08 15:39:03 +06:00
Nabin Hait
f1698bb2df
fix: unique variant based on
2019-04-08 14:59:43 +05:30
Nabin Hait
79c9d5d24a
Merge pull request #17146 from Anurag810/timesheet-report
...
feat: Timesheet report
2019-04-08 10:33:44 +05:30
Rohit Waghchaure
3771db92b8
fix: sales return not working for bundle items
2019-04-06 17:34:40 +05:30
rohitwaghchaure
bc02ee23e0
Merge pull request #17078 from rohitwaghchaure/unlinked_advance_payment_on_cancellation_of_order
...
feat: provision to unlink advance payment entry on cancelation of order
2019-04-06 12:30:05 +05:30
Rohit Waghchaure
9835c89e17
Added test cases
2019-04-06 12:29:05 +05:30
Saurabh
c32f8eb0cb
Merge branch 'hotfix'
2019-04-05 16:59:22 +05:30
Saurabh
63fabc3723
bumped to version 11.1.19
2019-04-05 17:29:22 +06:00
Nabin Hait
398e4b9472
fix: Ignore item tax patch if old schema does not exists
2019-04-05 16:41:17 +05:30
Nabin Hait
e6ee43b102
Merge pull request #17145 from Mangesh-Khairnar/salary-register-doj
...
feat: add date of joining column in salary register
2019-04-05 16:02:48 +05:30
Nabin Hait
374b85b38e
Merge pull request #17140 from hrwX/pe_supp_inv_v12
...
fix(Payment Entry): Return Bill No on for Payment Entry
2019-04-05 15:59:58 +05:30
Nabin Hait
d70476fbc8
Merge pull request #17139 from hrwX/pe_supp_inv_v11
...
fix(Payment Entry): Return Bill No for Payment Entry
2019-04-05 15:59:43 +05:30
Nabin Hait
8cf76e74e0
Merge pull request #17133 from hrwX/validate_stock_transaction_v11
...
fix(Item): check transactions for batch, serial check
2019-04-05 15:41:35 +05:30
Nabin Hait
843e440191
Merge branch 'hotfix' into validate_stock_transaction_v11
2019-04-05 15:41:26 +05:30
Nabin Hait
9302a19d74
Merge pull request #17135 from hrwX/validate_stock_transaction_v12
...
fix(Item): check transactions for batch, serial check
2019-04-05 15:40:19 +05:30
Nabin Hait
1580e24946
Merge pull request #17137 from netchampfaris/item-group-clean-description
...
fix(Item Group): Don't clean description html
2019-04-05 15:39:44 +05:30
Nabin Hait
603dce428b
Merge pull request #17144 from nabinhait/variant-fix
...
fix: Default variant Based on
2019-04-05 15:38:15 +05:30
Anurag Mishra
0dc62e8747
fix: Removed raw query and used frappe.get_all
2019-04-05 14:36:43 +05:30
Anurag Mishra
f71c147ea8
Added mandatory feilds to the report
2019-04-05 14:36:43 +05:30
Anurag Mishra
5c17e7760b
fix: readability
2019-04-05 14:36:43 +05:30
Anurag Mishra
b57c024ff7
feat: Project Billing Summary for timesheet
2019-04-05 14:36:43 +05:30
Anurag Mishra
61aab377b6
Minor Fixes
2019-04-05 14:36:42 +05:30
Anurag Mishra
3d27aabdeb
Commonify code
2019-04-05 14:36:42 +05:30
Anurag Mishra
94514ffee9
feat: timesheet Employee Summary Report
2019-04-05 14:36:42 +05:30
Mangesh-Khairnar
3c251663bb
style: add type comparison for boolean expression
2019-04-05 14:10:05 +05:30
rohitwaghchaure
e334413b34
Merge pull request #17141 from rohitwaghchaure/incorrect_pos_profile_selected_if
...
fix: incorrect auto POS profile selected in the sales invoice
2019-04-05 13:04:05 +05:30
Mangesh-Khairnar
e7d53540de
feat: add doj column in salary register
2019-04-05 12:56:11 +05:30
Mangesh-Khairnar
3d667b4c94
Merge branch 'develop' of https://github.com/frappe/erpnext into po-on-hold
2019-04-05 12:11:26 +05:30
Nabin Hait
a3357e4e86
fix: Default variant Based on
2019-04-05 12:10:36 +05:30
John Clarke
b733984ca1
fix: Remove duplicate Timesheet item ( #17066 )
2019-04-05 11:02:25 +05:30
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
