Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29,630 Commits 3 Branches 0 Tags 1 GiB
61bd6ccc2b
Commit Graph

29630 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
thefalconx33
61bd6ccc2b fix: travis failing for leave application test 2019-12-26 18:27:58 +05:30
deepeshgarg007
bd1da65098 fix: Update modified date 2019-12-26 18:26:13 +05:30
deepeshgarg007
0b9a98ad43 fix: Add against blanket order field in sales order 2019-12-26 18:15:13 +05:30
deepeshgarg007
8857d87c5b fix: Travis 2019-12-26 17:34:02 +05:30
Deepesh Garg
4ee6e37fc3
Merge pull request #20091 from nextchamp-saqib/account-period 
fix: only show doctypes which impact accounting in accounting period
 2019-12-26 17:18:08 +05:30
Deepesh Garg
3f7a1a736c
Merge pull request #20090 from geniusupgrader/develop 
fix: fix to issue #20089
 2019-12-26 16:06:10 +05:30
thefalconx33
6291ca8e40 fix: only show doctypes which impact accounting in accounting period 2019-12-26 13:55:35 +05:30
Saqib
7519436260
Merge pull request #19876 from rohitwaghchaure/provision_to_select_custom_fields_in_pos 
feat: provision to select the custom fields in the online POS
 2019-12-26 13:40:43 +05:30
Robin Rosenstock
e6387f9dca fix to issue #20089 2019-12-26 08:09:47 +00:00
Rohit Waghchaure
682273a00b feat: provision to select the custom fields in the online POS 2019-12-26 11:59:19 +05:30
Himanshu
e2ea11c437 fix: remove quote (#20076) 2019-12-25 15:15:35 +05:30
Parth J. Kharwar
8c4cf12c93 Setting preferred driver email in delivery trip (#19832) 
* fix: add driver's preferred contact email in delivery trip

* fix: modify driver's preferred email patch and blank field checks

* fix: patch file fix

* fix: patch changes to improve speed

* fix: removal of conflicts

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2019-12-25 15:14:52 +05:30
rohitwaghchaure
6e8a9286c2 fix: multiple stock entry issues for the work order (#18686) 
* fix: multiple stock entry issues for the work order

* Update work_order.py

* Update work_order.py

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2019-12-24 18:53:32 +05:30
Rohan
7372672044 fix: pull serial numbers linked to batches + pull warehouse correctly (develop) (#19022) 
* fix: pull serial numbers according to set warehouses

* fix: handle purchase returns
 2019-12-24 18:19:58 +05:30
DeeMysterio
df3b4e48fe fix(adress): get the address title at the top and mandatory in display (#20074) 2019-12-24 18:10:18 +05:30
Khushal Trivedi
dd42dbc6a3 fix: date validation on student form, instructor duplicate fix on student grp, instructor with same employee id fix (#20072) 
* fix: date validation on inpatient record, else condition removing on clinical prcd templ which is not req

* fix:Pricing Rule error AttributeError: 'str' object has no attribute 'get' #19770

* fix:Pricing Rule error AttributeError: 'str' object has no attribute 'get' #19770

* fix: joining and relieving Date can be on same date as valid use case

* fix-education: date of birth validation

* fix:Sibling child table filtering for duplacacy on student form

* fix:Sibling child table filtering for duplacacy on student form

* fix:Sibling child table filtering for duplacacy on student form

* fix: date validation on student form, instructor duplicacy fix on student grp, instructor with same employee id fix

* fix: date validation on student form, instructor duplicacy fix on student grp, instructor with same employee id fix

* fix: Exclude current record while validating duplicate employee

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2019-12-24 18:07:09 +05:30
Mitchy25
fee8340f98 fix: Bank Reconciliation Allows to Over Reconcile (#19461) 
* Update bank_reconciliation.py

* fix: improve error message while over reconciling

* fix: only check over-reconciliation when against payment entry

Co-authored-by: Saqib <thefalconx33@gmail.com>
 2019-12-24 18:02:18 +05:30
Don-Leopardo
ec258a43d9 perf: Asset Depreciations and Balances report (#18022) 2019-12-24 17:35:53 +05:30
Pranav Nachnekar
b972f763f3 fix: added validation for cost center (#19932) 
* fix: add validation for cost centers in sales invoice

* use `get_cached_value` for getting compnay, formatting of error message
 2019-12-24 16:46:46 +05:30
Deepesh Garg
e0b4d33039
Merge pull request #18715 from Alchez/v12-lead-address-contact 
feat: create address and contact after lead creation (develop)
 2019-12-24 16:46:05 +05:30
deepeshgarg007
d7427919a4 fix: Address section rearrange and minor bug fixes 2019-12-24 16:45:09 +05:30
Saqib
0ad7449ae3 feat: allow adding & deleting of items in submitted SO & PO (#19911) 
* feat: allow adding of items after quotation submission

* feat: allow deletion of items from submitted SO & PO

* fix: case when items are added and deleted at once

* fix: add test cases
* For deletion of items while Updating Items after submitting PO & SO
 2019-12-24 16:42:30 +05:30
Don-Leopardo
5557b16260 fix: order_type validation restriction (#18096) 2019-12-24 16:39:34 +05:30
rohitwaghchaure
5c0ea2d7c9
Merge pull request #19708 from Alchez/dev-batch-to-stock-ledger 
feat: drill down on batch transactions (develop)
 2019-12-24 15:25:05 +05:30
Deepesh Garg
e633567787
Merge branch 'develop' into v12-lead-address-contact 2019-12-24 14:43:41 +05:30
Deepesh Garg
a02bb5170b
Merge pull request #19913 from nextchamp-saqib/cart-address-fix 
fix: enable adding of address without enabling checkout feature
 2019-12-24 14:08:19 +05:30
rohitwaghchaure
08433c2919 fix: supplier email id field not showing in the notification for purchase cycle doctypes (#20071) 2019-12-24 13:03:47 +05:30
Deepesh Garg
58408217f6
Merge pull request #19822 from Mangesh-Khairnar/edit-item-details 
feat(marketplace): edit item details
 2019-12-24 13:02:20 +05:30
Saqib
977489697d
Merge pull request #19973 from deepeshgarg007/budget_variance_dimension 
feat: Dynamic filters for dimensions in budget variance report
 2019-12-24 12:57:50 +05:30
Deepesh Garg
55bc26e300 fix: Allow creation of multiple landed cost voucher against a Purchase Document (#20058) 2019-12-24 12:55:01 +05:30
Himanshu
5af4c57ef7 fix: ambihious error (#20068) 2019-12-24 12:31:38 +05:30
Sun Howwrongbum
088be37e64 feat: consider expiry_date during Batch queries (#20065) 2019-12-24 12:29:25 +05:30
RJPvT
818c49279c Update supplier_scorecard.py (#20061) 2019-12-24 12:24:58 +05:30
Deepesh Garg
f5bd920e8f
Merge pull request #19955 from deepeshgarg007/employee_advance_return 
feat: Capture return amount against Employee Advance via Journal Entry
 2019-12-24 11:52:20 +05:30
Deepesh Garg
cc62aad503
fix: Label for return amount 2019-12-24 11:51:39 +05:30
Rohan
ff98a52834
Merge branch 'develop' into v12-lead-address-contact 2019-12-24 11:21:08 +05:30
DeeMysterio
152c6be209 fix(employee onboarding): stop showing irrelevant job offer links for a job applicant (#20053) 2019-12-23 19:02:29 +05:30
Wolfram Schmidt
964cbc03ba Update employee.json (#20057) 
unnecessary description. Should be added by customer manually if needed individually.
 2019-12-23 18:50:40 +05:30
Prasad Ramesh
b3e50d846b Update README.md (#20049) 2019-12-23 18:47:25 +05:30
Parth J. Kharwar
da5d5c4941 fix(hr): update leave application status on cancel (#19883) 2019-12-23 18:41:17 +05:30
Khushal Trivedi
d8c10bcedb fix:Sibling child table filtering for duplicate entry on student form (#19908) 
* fix: date validation on inpatient record, else condition removing on clinical prcd templ which is not req

* fix:Pricing Rule error AttributeError: 'str' object has no attribute 'get' #19770

* fix:Pricing Rule error AttributeError: 'str' object has no attribute 'get' #19770

* fix: joining and relieving Date can be on same date as valid use case

* fix-education: date of birth validation

* fix:Sibling child table filtering for duplacacy on student form

* fix:Sibling child table filtering for duplacacy on student form

* fix:Sibling child table filtering for duplacacy on student form
 2019-12-23 18:38:11 +05:30
Prssanna Desai
4f72c0b8b5 fix: wrong items in table being deleted (#19994) 2019-12-23 18:27:12 +05:30
Marica
93cb64ee30 enhancement`: Added Set Reserve Warehouse field in Purchase Order. (#19991) 2019-12-23 18:24:56 +05:30
Pranav Nachnekar
8bada8759a fix: wrap scheduled_time with getdate() (#20044) 
* fix: wrap `scheduled_time` with `getdate()`

Handles inconsistent data returned from the ORM.

* fix: use `getdate()` instead of `date()`
 2019-12-23 18:19:29 +05:30
Anurag Mishra
bd5f5dabbd fix: Salary Structure Fixes (#19923) 2019-12-23 18:01:40 +05:30
Deepesh Garg
2b3482d5dd fix: Do not validate accounting dimensions if from repost (#20042) 
* fix: Do not check for accounting dimensions in case of repost

* fix: Do not validate accounting dimensions if from repost
 2019-12-23 17:58:50 +05:30
Saqib
c1b6b4ed35 fix: breadcrumb for company list (#20051) 2019-12-23 17:28:00 +05:30
Saqib
9078607600 fix: paid amount gets overwritten by get_outstanding_invoices (#20050) 2019-12-23 16:25:16 +05:30
Saqib
06f9538e51 fix: bad condition while checking last asset movement entry (#20047) 2019-12-23 16:08:21 +05:30
Saqib
4f18d2548d fix: none type object updates AR report row (#19958) 2019-12-23 16:01:38 +05:30