Commit Graph

25452 Commits

Author SHA1 Message Date
Ameya Shenoy
5ed0257ce2 bumped to version 11.0.3-beta.18 2018-11-05 06:50:33 +00:00
Ameya Shenoy
4a75d58d89
Merge branch 'master' into staging-fixes 2018-11-05 06:45:04 +00:00
Ameya Shenoy
eeb66dfc8e
Merge branch 'hotfix' 2018-11-05 06:40:25 +00:00
Ameya Shenoy
59f16bc942 bumped to version 10.1.67 2018-11-05 06:40:25 +00:00
Shreya Shah
6a206225cb
Merge pull request #15902 from agritheory/agritheory-restrict_to_domain
Doctypes in domains that are in beta are now restricted to that domain
2018-11-05 10:56:39 +05:30
Tyler Matteson
d14e46ef02 Doctypes in domains that are in beta are now restricted to that domain
non-profit, agriculture, healthcare, hospitality, education

Please enter the commit message for your changes. Lines starting
2018-11-04 08:39:52 -05:00
rohitwaghchaure
e77f38e7e2
Merge pull request #15894 from rohitwaghchaure/fix_update_claimed_amount
Column ‘claimed_amount’ cannot be null
2018-11-02 18:14:08 +05:30
Rohit Waghchaure
598d34445f [Fix] Column ‘claimed_amount’ cannot be null 2018-11-02 16:02:33 +05:30
Faris Ansari
68dbf7f99c fix: Use frappe.utils.make_event_emitter 2018-11-02 13:30:51 +05:30
rohitwaghchaure
c1d255e7bc
Merge pull request #15882 from Zlash65/fixtds
[Minor] TDS not calculated properly fix
2018-11-02 13:18:09 +05:30
Zarrar
16d45c8e2e safe encode non ascii characters (#15755) 2018-11-02 13:17:24 +05:30
Navdeep Ghai
768513f2f9 fixed divided by zero error (#15885) 2018-11-02 12:19:05 +05:30
rohitwaghchaure
dcb71a61ad [Fix] Payment entry not able to submit (#15859) 2018-11-02 12:12:42 +05:30
Charles-Henri Decultot
a89bce0b6e Encoding correction (#15877) 2018-11-01 13:18:49 +05:30
Zlash65
ab9852d31a tds not calculated appropriately 2018-11-01 11:40:15 +05:30
Shreya Shah
9f931780a2
Merge pull request #15868 from ESS-LLP/fix-membership
fix: Membership - allow system users to create membership
2018-11-01 10:54:32 +05:30
Zarrar
92a4ff4e81
Merge pull request #15874 from shreyashah115/portal-fixes
Add overdue status for sales order
2018-11-01 10:46:08 +05:30
Ameya Shenoy
f3f997f232
Merge branch 'staging' into develop 2018-10-31 13:51:52 +00:00
Ameya Shenoy
46e618bc6e
Merge branch 'staging-fixes' into staging 2018-10-31 13:51:24 +00:00
Ameya Shenoy
9f20f777b2 bumped to version 11.0.3-beta.17 2018-10-31 13:51:24 +00:00
Ameya Shenoy
961849beb4
Merge branch 'master' into staging-fixes 2018-10-31 13:43:12 +00:00
Ameya Shenoy
3f32218bc0
Merge branch 'hotfix' 2018-10-31 13:35:59 +00:00
Ameya Shenoy
b4bff7e298 bumped to version 10.1.66 2018-10-31 13:35:58 +00:00
Shreya Shah
9660d64146
Merge pull request #15873 from frappe/revert-15870-portal-fixes
Revert "Add overdue status for sales order"
2018-10-31 18:20:56 +05:30
Shreya Shah
e140845399
Revert "Add overdue status for sales order" 2018-10-31 18:20:28 +05:30
Shreya Shah
b95d7ae41b
Merge pull request #15870 from shreyashah115/portal-fixes
Add overdue status for sales order
2018-10-31 18:20:18 +05:30
deepeshgarg007
78b273af43 [Bug-Fix] Cannot Save Bank Statement Transaction Entry (#15793)
* Create bank settings only if bank name is available

* Minor bug-fix in validate_overlap
2018-10-31 18:12:03 +05:30
Shreya Shah
41c5fda196 fix(sms-center): Fix db query (#15774) 2018-10-31 18:04:30 +05:30
Shreya Shah
305c82bd8d fix(medical-record): Remove z-index property (#15790) 2018-10-31 18:02:55 +05:30
rohitwaghchaure
cd11bdfdbb [Fix] Supplier wise sales analytics report not showing item details which is added in purchase invoice with update stock (#15869) 2018-10-31 18:02:00 +05:30
Shreya Shah
0c0e49a421 fix: Fix fieldnames in template (#15860) 2018-10-31 18:00:09 +05:30
rohitwaghchaure
3f398d24f3 [Fix] Precision issue, not able to submit the stock entry (#15863) 2018-10-31 17:58:26 +05:30
Shreya
e3a7c68d4f fix(portal): Add overdue status for sales order 2018-10-31 16:00:27 +05:30
Ranjith
f01bf9048d fix: Membership - allow system users to create membership for existing Members 2018-10-31 14:33:28 +05:30
Ameya Shenoy
df62296a26
Merge branch 'staging' into develop 2018-10-30 12:54:16 +00:00
Ameya Shenoy
71ede099ea
Merge branch 'staging-fixes' into staging 2018-10-30 12:53:35 +00:00
Ameya Shenoy
d45fef5423 bumped to version 11.0.3-beta.16 2018-10-30 12:53:35 +00:00
Ameya Shenoy
6178b79555
Merge branch 'master' into staging-fixes 2018-10-30 12:48:45 +00:00
Ameya Shenoy
d9a82738d0
Merge branch 'hotfix' 2018-10-30 12:48:42 +00:00
Ameya Shenoy
1f7a5dcd07 bumped to version 10.1.65 2018-10-30 12:48:42 +00:00
Frappe PR Bot
467ff4f0f2 [Translation] Updated Translations (#15852) 2018-10-30 11:26:11 +05:30
Shreya Shah
452619c668 fix(report): Return if not list (#15849) 2018-10-30 11:26:01 +05:30
rohitwaghchaure
dca4b294bd
Merge pull request #15853 from rohitwaghchaure/delete_button_not_working_for_print_in_mobile
[Fix] Delete button not working in POS for mobile
2018-10-29 16:52:34 +05:30
Rohit Waghchaure
152a0c86b0 [Fix] Delete button not working in POS for Ipad 2018-10-29 16:50:18 +05:30
Shreya Shah
85a9b52dfa
Merge pull request #15789 from deepeshgarg007/production-analytics
[Bug-fix]Production analytics
2018-10-29 15:49:19 +05:30
Shreya Shah
69bbe1995c
Update production_analytics.py 2018-10-29 15:38:21 +05:30
rohitwaghchaure
9d0dba5569
Merge pull request #15851 from frappe/pos-delete-fix
fix: Delete button in POS mobile
2018-10-29 15:19:11 +05:30
deepeshgarg007
7b91f9fa0c Bug Fixes 2018-10-29 15:16:25 +05:30
Faris Ansari
3df1327b94
fix: Delete button in POS mobile
Delete button was covered by page-actions container
2018-10-29 15:15:10 +05:30
Shreya Shah
81cdd967d7
Merge pull request #15794 from ashish-greycube/patch-1
Update employee_advance.py
2018-10-29 14:38:21 +05:30