Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,090 Commits 3 Branches 0 Tags 1 GiB
c62518c094
Commit Graph

27090 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rohit Waghchaure
e98d1c1147 fix: allow import for packing slip 2019-05-31 14:16:11 +05:30
Deepesh Garg
bd3c60254a
Merge pull request #17819 from deepeshgarg007/module 
fix: Add chart of accounts importer in data import module
 2019-05-31 13:33:20 +05:30
Deepesh Garg
25857d6ee3
Merge pull request #17816 from deepeshgarg007/ar_translations_develop 
fix: Add translations for missing labels in AR report
 2019-05-31 12:37:36 +05:30
Saurabh
90b60cfb0d
Merge pull request #17818 from rohitwaghchaure/fixed_pos_cash_payment_modal_develop 
fix: POS cash mode of payment css
 2019-05-31 12:29:19 +05:30
rohitwaghchaure
09d8bb8aa9
Merge pull request #17822 from rohitwaghchaure/pricing_rule_applying_on_the_non_conditional_item 
fix: pricing rule is applying on the incorrect item
 2019-05-31 12:17:18 +05:30
Rohit Waghchaure
840244c562 fix: pricing rule is applying on the incorrect item 2019-05-31 12:16:35 +05:30
deepeshgarg007
9f9516597c fix: Add chart of accounts importer in data import module 2019-05-31 10:11:46 +05:30
Rohit Waghchaure
4fd704dbb6 fix: POS cash mode of payment css 2019-05-30 23:25:41 +05:30
deepeshgarg007
480586152b fix: Label translations 2019-05-30 22:34:00 +05:30
deepeshgarg007
da2e456f70 fix: Add translations for missing labels in AR report 2019-05-30 22:30:32 +05:30
rohitwaghchaure
3fa54905a2
Merge pull request #17814 from rohitwaghchaure/new_pricing_rule_not_exists_issue 
fix: pricing rule not exists issue
 2019-05-30 22:25:45 +05:30
Rohit Waghchaure
ac8f4b449d fix: pricing rule not exists issue 2019-05-30 22:24:24 +05:30
deepeshgarg007
2580075583 Merge branch 'develop' of https://github.com/frappe/erpnext into dimensions 2019-05-30 22:11:27 +05:30
deepeshgarg007
52ea2874ec fix: Multiple fixes in accounting dimensions 2019-05-30 22:09:36 +05:30
Shivam Mishra
46b3446da0 refactor: add check for max passing score 2019-05-30 18:55:16 +05:30
Shivam Mishra
7c7053fcf5 refactor: added question type field 2019-05-30 18:54:58 +05:30
Shivam Mishra
253a2bd260 refactor: goodbye Vue 👋 2019-05-30 18:54:11 +05:30
Shivam Mishra
e94e9d2b06 feat: content navigation and activity tracking working 2019-05-30 18:23:03 +05:30
Nabin Hait
0e1e37c921 fix: Added Expense Account field to push value from PO-PR-PI 2019-05-30 18:13:41 +05:30
Shivam Mishra
3336fb595c style: removed console.logs 2019-05-30 18:04:36 +05:30
Rohan Bansal
250734dd24 fix(selling): Remove Totals row for tree-based Sales Analytics 2019-05-30 17:30:50 +05:30
Nabin Hait
b6ffaf11fe
Merge pull request #17787 from nabinhait/naming-series-chars 
fix: Allowed '{' and '}' in naming series
 2019-05-30 17:25:08 +05:30
Nabin Hait
1bb3fc3c19
Merge pull request #17789 from sunnyakaxd/patch-2 
fix: Dont fetch all orders to update a few
 2019-05-30 17:24:49 +05:30
Shivam Mishra
12579617f3 refactor: added enrolled status to program card 2019-05-30 17:20:31 +05:30
Shivam Mishra
4991fca5cc feat: enabled per student access 2019-05-30 16:37:15 +05:30
Shivam Mishra
24bd07d000 refactor: style changes and template refactor 2019-05-30 16:36:58 +05:30
Shivam Mishra
dfdb92f4b1 refactor: added enrollment api 2019-05-30 16:36:01 +05:30
Shivam Mishra
f22793f91b refactor: added program card macro 2019-05-30 16:34:53 +05:30
Nabin Hait
d060890817 fix: Rounding adjustment while additional discount amount is aplied on grand total 2019-05-30 16:05:30 +05:30
Deepesh Garg
af32ed6d8f
Merge pull request #17360 from SaiFi0102/Product-Bundle-Balance 
feat: Product Bundle Balance Report
 2019-05-30 15:58:25 +05:30
Saurabh
2b40a44429
Merge pull request #17802 from frappe-pr-bot/translations-2019-05-30 
feat: Updated translation
 2019-05-30 15:56:45 +05:30
Nabin Hait
4d58734492 fix: Rounding adjustment while additional discount amount is aplied on grand total 2019-05-30 15:51:29 +05:30
Saif Ur Rehman
7129231dbb fix(Product Bundle Balance): Update frappe.db.escape for v12 2019-05-30 13:55:32 +05:00
Anurag Mishra
62d58acea9
fix: Added description if item variants does not have description in map(v12) (#17796) 
* fix: variant item description based on attribute

* style: removed unwanted changes
 2019-05-30 14:04:08 +05:30
frappe
5aeb62f288 feat: Updated translation 2019-05-30 08:17:59 +00:00
deepeshgarg007
a9b2e4e4a8 fix: White space in subscription plan dashboard 2019-05-30 12:18:10 +05:30
deepeshgarg007
e233708754 fix: Tax category dashboard 2019-05-30 12:14:16 +05:30
deepeshgarg007
4baf69656d Merge branch 'develop' of https://github.com/frappe/erpnext into dashboards 2019-05-30 11:54:31 +05:30
deepeshgarg007
8f3a6c1596 fix: Dashboards for doctypes in accounting modules 2019-05-30 11:53:12 +05:30
Himanshu Warekar
70a2734aab fix: config file for qms 2019-05-30 01:40:31 +05:30
Shivam Mishra
f927502cc5 refactor: added lms utilities for enrollment and program list 2019-05-29 18:39:52 +05:30
Shivam Mishra
5aa8df840e refactor: cards and hero markup 2019-05-29 18:38:58 +05:30
Shivam Mishra
08425d46fa refactor: set Student as default portal role for Education 2019-05-29 18:37:52 +05:30
Deepesh Garg
12a9a3ffa3
Merge branch 'develop' into Product-Bundle-Balance 2019-05-29 18:23:21 +05:30
Shivam Mishra
9944ef2baf
Merge pull request #17791 from adityahase/remove-manifest 
perf: Remove MANIFEST.in
 2019-05-29 15:31:35 +05:30
Shivam Mishra
63d8cabb3d fix: program card height bug 2019-05-29 15:16:59 +05:30
Shivam Mishra
b7874157f7 refactor: /lms redirects to home if lms is disbaled 2019-05-29 15:15:59 +05:30
Shivam Mishra
65681bf317 refactor: allow disbaling self enroll on lms 2019-05-29 15:15:30 +05:30
Aditya Hase
960c6138db perf: Remove MANIFEST.in 
Faster pip install -e erpnext

https://stackoverflow.com/questions/24727709/do-python-projects-need-a-manifest-in-and-what-should-be-in-it

https://github.com/frappe/frappe/pull/7360
 2019-05-29 15:14:07 +05:30
Himanshu Mishra
70029b818b
Update status_updater.py 2019-05-29 14:19:35 +05:30