Shivam Mishra
9e0b3b29fa
feat: better message for serial number creation ( #19863 )
2019-12-09 18:21:23 +05:30
Khushal Trivedi
9f0699f7e3
fix-education: date of birth validation
2019-12-09 18:02:06 +05:30
Deepesh Garg
88c4514024
Merge pull request #19864 from nextchamp-saqib/report-col-fix
...
fix: column data not visible after manual selection of columns
2019-12-09 17:57:12 +05:30
Saqib
7e958da6d6
fix: sales order reqd only checks for stock items ( #19865 )
2019-12-09 17:23:19 +05:30
Khushal Trivedi
c08ce703c9
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2019-12-09 16:52:24 +05:30
thefalconx33
2944301c87
fix: website showing disabled items in list of products
2019-12-09 16:35:54 +05:30
Mangesh-Khairnar
4350846f1e
fix(compensatory leave request): Create leave ledger entry on submit/cancel ( #19476 )
...
* fix: allow creation of leave ledger entry
* feat(compensatory-leave-request): create leave ledger entry on submit
* style: add descriptive comments
* test: allow creation of leave period based on company
* fix(leave-allocation): check name of leave allocation for determining overlap
* fix: validate new leaves allocated before updating leave allocation
* test: compensatory leave request creation
* fix: skip leave entries for non expired leave allocation
* test: creation of leave ledger entry on creation of compensatory leave request
* fix: minor changes
* fix: fetch leave approver defined in employee in leave application
* fix: attendance creation and leave balance calculation
* test: create leave period for the compensatory off
* style: add descriptive method name
* test: updation of leave allocation on submit
* fix: remove db_set from compensatory off
2019-12-09 14:27:38 +05:30
Faris Ansari
317bf5a321
feat(marketplace): Add category wise search ( #19760 )
...
feat(marketplace): change route for category wise search
2019-12-09 13:59:30 +05:30
Saqib
39e4f75a76
fix: get outstanding invoices btn working on submitted payment entry ( #19858 )
2019-12-09 13:16:35 +05:30
Deepesh Garg
babc2d1ea4
fix: Consistency in button positions in Sales Order and Purchase Order ( #19833 )
2019-12-09 13:04:44 +05:30
Deepesh Garg
b63101250c
fix: Rounding Adjustment GL entry fix ( #19838 )
...
* fix: Rounding Adjustment GL entry fix
* fix: Spacing in tab
* fix: Comment fix
2019-12-09 13:03:24 +05:30
rohitwaghchaure
d2f64214cc
Merge pull request #19853 from rohitwaghchaure/fixed_production_plan_items_required_to_pull_mr
...
fix: 'NoneType' object is not iterable
2019-12-09 12:31:06 +05:30
Deepesh Garg
da638cd476
fix: NoneType' object has no attribute '__getitem_'_ ( #19859 )
2019-12-09 11:28:31 +05:30
Deepesh Garg
dda1ef6b13
Merge pull request #19758 from hrwX/new_invoice_fix
...
fix(Project): add project in child for items
2019-12-08 20:23:11 +05:30
Deepesh Garg
3139fa2866
Merge branch 'develop' into new_invoice_fix
2019-12-07 19:54:21 +05:30
Deepesh Garg
ddc6e42b08
Merge pull request #19836 from deepeshgarg007/gst_1_validation_msg
...
fix: Validation msg fix in GSTR-1 report
2019-12-07 19:52:43 +05:30
rohitwaghchaure
c229a1b1d5
Merge pull request #19849 from rohitwaghchaure/fixed_timsheet_overlap_issue
...
fix: timesheet overlap error
2019-12-07 14:13:14 +05:30
Rohit Waghchaure
502189913a
fix: 'NoneType' object is not iterable
2019-12-07 14:10:11 +05:30
Rohit Waghchaure
6301874795
fix: timsheet overlap error
2019-12-07 13:20:37 +05:30
Rucha Mahabal
690068142b
feat: Continue Slide and New Illustrations for Onboarding Wizard ( #19813 )
...
* feat: added illustrations for onboarding
* refactor: change help label for supplier
* refactor (breaking): rename Setup Wizard slide to Onboarding Slide
* chore: code cleanup for the old doctype Setup Wizard Slide
* fix: added a 'Continue' type slide
* fix: change text in continue slide
* fix: change text for continue slide
2019-12-06 20:58:26 +05:30
deepeshgarg007
99309229bc
fix: Add missing semicolon
2019-12-06 19:59:54 +05:30
deepeshgarg007
ad53649f41
fix: Validation msg fix in GSTR-1 report
2019-12-06 19:34:49 +05:30
rohitwaghchaure
bce5d189aa
Merge pull request #19831 from rohitwaghchaure/fixed_cache_issue_for_exchange_rate
...
fix: travis failing
2019-12-06 18:45:26 +05:30
Rohit Waghchaure
8ab8376975
fix: Manufacturing UX, added calendar view for job card
2019-12-06 17:40:09 +05:30
Rohit Waghchaure
d98ed8047a
fix: travis failing
2019-12-06 13:17:56 +05:30
Himanshu Warekar
175d604f5f
chore: commonize function
2019-12-04 23:08:51 +05:30
rohitwaghchaure
cfbf895876
Merge pull request #19498 from marination/stock_entry_bom_fetch
...
feat: Provision to fetch items from multiple BOMs in Stock Entry
2019-12-04 21:44:47 +05:30
Himanshu Warekar
98aae4cf3d
Merge branch 'new_invoice_fix' of https://github.com/hrwx/erpnext into new_invoice_fix
2019-12-04 19:01:49 +05:30
Himanshu Warekar
5e90ad6063
Merge branch 'develop' of https://github.com/frappe/erpnext into new_invoice_fix
2019-12-04 19:01:33 +05:30
Khushal Trivedi
d6d78bb08e
solved conflicts
2019-12-04 18:26:47 +05:30
Mangesh-Khairnar
e4274cbfa6
fix: change formatting
2019-12-04 17:51:08 +05:30
ronelvcabrera
370cdc0170
feat(Sales/Purchase Order): optional to reference a Blanket Order ( #19612 )
2019-12-04 16:07:11 +05:30
Pranav Nachnekar
114e0db419
fix: query for finding lost quotation ( #19800 )
...
* fix: query for finding lost quotation
* Update opportunity.py
2019-12-04 15:31:43 +05:30
Nabin Hait
d285e9b7bd
optimize: Optimization of Receivable report filtered based on sales person ( #19796 )
2019-12-04 15:30:58 +05:30
Nabin Hait
acdd5081da
fix: Service start and end date validation for deferred accounting ( #19805 )
2019-12-04 15:30:01 +05:30
Mangesh-Khairnar
a830f89a59
feat: add date filter in the fixed asset register ( #19799 )
...
* feat: add date filter in the fixed asset register
* fix: remove function from keyword argument
2019-12-04 13:32:31 +05:30
sahil28297
eb9c3e1c5b
fix(patch): set proper tax_type and proper account ( #19794 )
2019-12-04 12:01:31 +05:30
Khushal Trivedi
51f2131a41
fix: joining and relieving Date can be on same date as valid use case on emoloyee form ( #19798 )
...
* 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
* Update employee.py
2019-12-04 11:56:44 +05:30
Deepesh Garg
dfd82d22c8
Merge pull request #19792 from nabinhait/ar-summary-based-on-terms
...
feat: Receivable / payable summary based on payment terms
2019-12-04 11:25:28 +05:30
thefalconx33
a639f16dc9
fix: column data not visible after manual selection of columns
2019-12-04 09:46:42 +05:30
Khushal Trivedi
8af51e1f90
fix: joining and relieving Date can be on same date as valid use case
2019-12-03 19:28:16 +05:30
marination
be88d0f8a3
fix: Custom button conditionally visible in draft condition as well
2019-12-03 18:34:38 +05:30
Khushal Trivedi
29c565e0f5
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2019-12-03 17:41:53 +05:30
Shivam Mishra
5128f3bd0f
feat: allow searching from meta fields ( #19711 )
...
* feat: allow searching from meta fields
* feat: remove description in query based on number of items
2019-12-03 17:27:22 +05:30
Saqib
d635bda29b
fix selling setting label for sales order reqd ( #19775 )
2019-12-03 17:05:06 +05:30
Khushal Trivedi
73129e6ac8
fix:Pricing Rule error AttributeError: 'str' object has no attribute 'get' ( #19774 )
...
* 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
2019-12-03 17:03:45 +05:30
Nabin Hait
e176c3c1d1
feat: Receivable / payable summary based on payment terms
2019-12-03 16:56:48 +05:30
Deepesh Garg
8d31171ff8
fix: Party name field in trial balacne for party report ( #19789 )
2019-12-03 16:31:07 +05:30
rohitwaghchaure
36b60dbbef
Merge pull request #19441 from rohitwaghchaure/capacity_planning_for_workstataion_feature
...
fix: capacity planning back
2019-12-03 15:23:06 +05:30
Deepesh Garg
03d1394540
fix: Unable to see parties with negative balance in AR/AP Summary ( #19776 )
2019-12-03 15:12:44 +05:30