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

31619 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marica
c62a6df016
Merge branch 'develop' into qi-on-return 2020-06-12 12:31:20 +05:30
Marica
fd3d976e06
Update erpnext/controllers/stock_controller.py 
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2020-06-12 12:30:59 +05:30
Abhishek Balam
996b306cda fix territory count 2020-06-12 11:38:07 +05:30
Abhishek Balam
72450d2af3 add revenue if within date range 2020-06-12 11:07:57 +05:30
Abhishek Balam
f596b5950e indent to tabs 2020-06-12 11:07:28 +05:30
Deepesh Garg
d09aa53571
Merge pull request #22208 from aliriocastro/fix-itemwise-rec-reord-level-report 
fix: key name to get float precision was misspelled
 2020-06-12 10:04:58 +05:30
Deepesh Garg
ca97e19b7e
Merge pull request #22203 from marination/account-tree 
fix: Check for Company before rendering tree in Account Tree
 2020-06-12 10:02:41 +05:30
Alirio Castro
faf33072c8 fix: key was mispelled 2020-06-11 23:32:53 -04:00
Alirio Castro
da6b0a51a2 Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2020-06-11 23:28:40 -04:00
Shivam Mishra
241088c73e
Merge branch 'develop' into membership-fixes 2020-06-11 16:53:15 +00:00
John Clarke
6b55f66f02
Stock Ageing TypeError: ‘<’ not supported between instances of ‘int’ and ‘str’ 
Proposed fix re this error report https://discuss.erpnext.com/t/stock-ageing-report-typeerror-not-supported-between-instances-of-int-and-str/62605
 2020-06-11 10:24:48 -06:00
Deepesh Garg
9df4532d14 fix: Travis(develop) 2020-06-11 21:33:43 +05:30
marination
c9a6e4f151 fix: Check for Company before rendering tree in Account Tree 2020-06-11 19:54:44 +05:30
Abhishek Balam
44b8cf4fef
enable 'user cannot create' for payment request (#22044) 
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-06-11 19:31:41 +05:30
Rucha Mahabal
d7481f59ba fix: patch 2020-06-11 17:41:05 +05:30
Rucha Mahabal
4dbb7c552c
Merge branch 'develop' into sla-enhancements 2020-06-11 17:04:20 +05:30
Rucha Mahabal
9c27d683ba
fix: priority column width 
Co-authored-by: Himanshu <himanshuwarekar@yahoo.com>
 2020-06-11 17:03:53 +05:30
marination
596560c3c2 fix: Don't prompt for Quality Inspection on Return Documents. 2020-06-11 16:39:03 +05:30
Shivam Mishra
3f60801566
Merge branch 'develop' into membership-fixes 2020-06-11 10:16:39 +00:00
Shivam Mishra
8c24810f30 refactor: ignore mandatory for customer 2020-06-11 15:42:29 +05:30
Shivam Mishra
49d51b8ce7 feat: check duplicate contact explicitly 2020-06-11 14:24:07 +05:30
Shivam Mishra
84fcc55a36 refactor: do nothing if member is not found 2020-06-11 13:34:40 +05:30
Shivam Mishra
8d61a0abef fix: use string to verify webhook 2020-06-11 13:34:25 +05:30
Deepesh Garg
7d3c3b9a8b
Merge pull request #22188 from deepeshgarg007/payment_terms_outstanding 
fix: Update payment schedule based on payment terms
 2020-06-10 22:17:37 +05:30
Deepesh Garg
a0fd97f2ac fix: Update payment schedule based on payment terms 2020-06-10 22:15:27 +05:30
Deepesh Garg
f108574772
Merge pull request #22186 from deepeshgarg007/inter_warehouse_party_validation 
fix: Party validation for inter-warehouse transaction
 2020-06-10 20:02:43 +05:30
Deepesh Garg
7963e2b708 fix: Party validation for inter-warehouse transaction 2020-06-10 19:57:49 +05:30
Rohan
d60d2e1826
fix: only auto-set serial nos and batches if allowed in Stock Settings (develop) (#21781) 
* fix: only auto-set serial nos and batches if allowed in Stock Settings

* fix: bug with setting disabled batch no in Pick List

* fix: remove auto-set batch variable

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-06-10 19:10:56 +05:30
rohitwaghchaure
526132d60a
Merge pull request #22182 from marination/website-price-list 
fix: Prioritize Default Customer Price List in Portal
 2020-06-10 19:07:12 +05:30
Marica
170d4b7db9
Merge branch 'develop' into website-price-list 2020-06-10 18:57:44 +05:30
Deepesh Garg
f2615634a5
Merge pull request #22185 from deepeshgarg007/item-wise-report-export_v12 
fix: Item-wise sales and purchase register export
 2020-06-10 18:51:41 +05:30
Deepesh Garg
a6acf18f6c fix: Item-wise sales and purchase register export 2020-06-10 18:50:50 +05:30
Deepesh Garg
6e0d6bd74c
Merge pull request #22184 from deepeshgarg007/item-wise-report-export 
fix: Item-wise sales and purchase register export
 2020-06-10 18:48:35 +05:30
Deepesh Garg
08fee12266 fix: Item-wise sales and purchase register export 2020-06-10 18:33:24 +05:30
marination
fdddb679ed fix: Prioritize Default Customer Price List in Portal 2020-06-10 18:22:59 +05:30
rohitwaghchaure
496b6a28f2
Merge pull request #22179 from rohitwaghchaure/code-cleanup-for-handling-batch-case-in-SI-develop 
fix: Cannot read property 'has_batch_no' of undefined
 2020-06-10 17:57:07 +05:30
Rohit Waghchaure
afe8e88cb8 fix: Cannot read property 'has_batch_no' of undefined 2020-06-10 17:55:24 +05:30
Marica
aeeadee8f8
Merge branch 'develop' into update-items-permission-fix 2020-06-10 15:19:33 +05:30
rohitwaghchaure
0233f94570
Merge pull request #22081 from deepeshgarg007/jv_list_view 
fix: Add total debit in Journal Entry list view
 2020-06-10 14:17:13 +05:30
rohitwaghchaure
95331a31a7
Merge pull request #22155 from frappe/barredterra-billing_hours 
feat(projects): bill all hours by default
 2020-06-10 14:16:18 +05:30
rohitwaghchaure
9ea9a99889
Merge pull request #22063 from marination/procurement-tracker-develop 
fix: Procurement Tracker Data Consistency
 2020-06-10 14:13:36 +05:30
rohitwaghchaure
3a9c1b23db
Merge pull request #22096 from marination/valuation-rate 
fix: '>=' not supported between instances of 'str' and 'int'
 2020-06-10 14:12:13 +05:30
rohitwaghchaure
63e8f2c430
Merge pull request #22175 from Anurag810/expense_claim_cost_center_fix 
fix: set cost center in child table
 2020-06-10 13:40:51 +05:30
rohitwaghchaure
88b964348e
Merge pull request #22176 from Anurag810/hr_desk_page_fixes 
fix: dependency for leave Period in Desk page
 2020-06-10 13:39:51 +05:30
Rucha Mahabal
1e49c6b68b fix: update duration options 2020-06-10 12:58:16 +05:30
Anurag Mishra
452b7760df fix: dependency for leave Period in Desk page 2020-06-10 12:48:21 +05:30
Rucha Mahabal
5b6d2c2e7b
Merge branch 'develop' into sla-enhancements 2020-06-10 12:33:19 +05:30
rohitwaghchaure
904e0f4eda
Merge pull request #22106 from Anurag810/employee_onboarding_fix 
fix: problem during assigning
 2020-06-10 12:30:15 +05:30
Anurag Mishra
402c347f83 fix: set cost center in child table 2020-06-10 12:27:59 +05:30
Anupam Kumar
934e30ecac
update program course (#22166) 2020-06-10 11:07:43 +05:30