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

33310 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anupam Kumar
ec7002625f
Delete __init__.py 2020-11-06 17:11:33 +05:30
Anupam
14ef229b12 Revert "Update item_add_to_cart.html" 
This reverts commit 5b3af82e75.
 2020-11-06 16:50:15 +05:30
Anupam
886b680e1b revert changes 2020-11-06 16:48:39 +05:30
Anupam
beba8da0a6 Merge branch 'version-13-beta-pre-release' of https://github.com/frappe/erpnext into pre-release 2020-11-06 16:38:16 +05:30
Anupam Kumar
ca9b58589b
fix: replaced formatdate -> format_date (#23847) 
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2020-11-06 14:56:27 +05:30
Marica
d07f6b7ef6
Merge pull request #23848 from AfshanKhan/fix-stock-mismatch-filter-pre-release 
fix: showing error for wrong filters.
 2020-11-06 13:42:07 +05:30
Marica
0d441b66cd
Merge pull request #23808 from nabinhait/web-page-bank-statement-section-pre-release 
fix: Added link of bank reconciliation and clearance in accounting desk page
 2020-11-06 13:16:44 +05:30
marination
427c1bb0a7 fix: Add missing links 
- Added Bank Transaction Statement Entry and Bank Statement Settings
 2020-11-06 13:08:53 +05:30
Afshan
4d3e83682e fix: showing error for wrong filters. 2020-11-06 12:25:46 +05:30
Anupam
bab078b4f5 fix: replaced formatdate -> format_date 2020-11-06 12:05:45 +05:30
rohitwaghchaure
c83769c3d1
Merge pull request #23842 from rohitwaghchaure/multiple-pricing-rules-are-not-applied-pre-release 
fix: multiple pricing rules are not working on selling side
 2020-11-06 01:06:45 +05:30
Rohit Waghchaure
88e0a64df2 added test cases 2020-11-05 20:07:27 +05:30
Rohit Waghchaure
2fe3b1807f fix: multiple pricing rules are not working on selling side 2020-11-05 20:07:19 +05:30
Saqib
65820f6b6c
fix: cannot expand row in update items dialog (#23840) 2020-11-05 17:38:43 +05:30
Saqib
76cd680c57
fix: asset finance book depreciation posting date fix (#23834) 2020-11-05 16:37:19 +05:30
Marica
596656b372
Merge pull request #23824 from marination/delete-quoted-item-old-report-pre-release 
chore: Delete Quoted Item Comparison Report
 2020-11-05 10:03:58 +05:30
Marica
0c74cd8872
Merge pull request #23821 from marination/so-to-po-dialog-fix-v13-beta 
fix: SO to PO Mapping Issue
 2020-11-05 09:26:32 +05:30
Marica
5c4b35e65e
Merge pull request #23827 from marination/rfq-test-fixes-pre-release 
chore: Reposition RFQ fields
 2020-11-05 09:24:29 +05:30
Abhishek Balam
48d9173a55
Merge pull request #23828 from abhishekbalam/psoa_testcase_fix 
fix(PSOA): key error if no customers found
 2020-11-05 00:21:24 +05:30
Abhishek Balam
5db99e0649 fix: code improvement, match error type for message 2020-11-04 23:43:11 +05:30
Abhishek Balam
5fe3abcfae fix: sales person without customer link throwing keyerror 2020-11-04 23:23:34 +05:30
marination
edd9080ea6 chore: Reposition RFQ fields 2020-11-04 22:13:57 +05:30
Rucha Mahabal
dd7f4df669
fix: Budget test cases (#23822) 2020-11-04 21:59:08 +05:30
marination
75fcfbb49c chore: Delete Quoted Item Comparison Report 2020-11-04 21:24:04 +05:30
marination
e3864c9b16 fix: Make sure row object has doctype so that read only property is applied to rows 2020-11-04 21:08:36 +05:30
marination
413b1c3b43 fix: SO to PO Mapping Issue 
- removed type: GET , which made the URL longer
- Added only relevant fields from Items table to Dialog table to reduce args load
- Made separate method to set table data in dialog
- Added freeze message
 2020-11-04 21:08:27 +05:30
Rucha Mahabal
de79dd36e7
Merge pull request #23818 from ruchamahabal/fix-therapy-plan-template-v13 
fix: therapy plan and session fixes
 2020-11-04 21:06:58 +05:30
Rucha Mahabal
e50697d459 fix: sider 2020-11-04 20:24:04 +05:30
Rucha Mahabal
40246caf5e fix: therapy plan and session fixes 2020-11-04 20:13:53 +05:30
Mangesh-Khairnar
5756798689
fix: update integrations desk page (#23772) 2020-11-04 16:44:44 +05:30
rohitwaghchaure
ed2f9edcdd
Merge pull request #23813 from rohitwaghchaure/fixed-sequence-id-column-display-pre-release 
fix: on save sequence id column override with workstation
 2020-11-04 14:25:58 +05:30
Rohit Waghchaure
58c538d46b fix: on save sequence id column override with workstation 2020-11-04 13:35:42 +05:30
rohitwaghchaure
e0828a80c7
Merge pull request #23811 from rohitwaghchaure/sequence-id-column-override-withoperation-pre 
fix: sequence id override with operation column
 2020-11-04 13:16:21 +05:30
Rohit Waghchaure
4cf346c082 fix: sequence id override with operation column 2020-11-04 13:14:28 +05:30
Nabin Hait
da14a76ee0 fix: Added link of bank reconciliation and clearance in accounting desk page 2020-11-04 13:06:36 +05:30
Rucha Mahabal
bc8809f4bf
Merge pull request #23800 from ruchamahabal/fix-ipme-v13 
fix: Inpatient Medication Order and Entry fixes
 2020-11-03 15:41:52 +05:30
Rucha Mahabal
6c135dd06d fix: Inpatient Medication Order and Entry fixes 2020-11-03 14:43:40 +05:30
Saqib
940e307194
fix: cannot save customer email & phone (#23798) 2020-11-03 10:51:18 +05:30
Saqib
a53e8404d1
fix: cannot add items to cart (#23795) 
* fix: _ is not defined

* fix: item image alt gets overflowed due to large text

* fix: available item qty in pos search

* fix: cash shortcuts overflow
 2020-11-03 10:07:50 +05:30
Saqib
ce7d7155db
fix: asset finance book posting date fix (#23779) 2020-10-30 15:30:27 +05:30
Rucha Mahabal
400737d005
Merge pull request #23768 from ruchamahabal/fix-issue-v13-beta 
fix: set SLA variance in seconds for Duration fieldtype
 2020-10-30 00:10:45 +05:30
Rucha Mahabal
1636383120
fix: subscription test case 
Co-authored-by: Marica <maricadsouza221197@gmail.com>

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-10-30 00:09:55 +05:30
Rucha Mahabal
2bb7ed34d8
fix: Student Attendance error message (#23769) 2020-10-29 23:03:53 +05:30
Rucha Mahabal
c548d56498 fix: set SLA variance in seconds for Duration fieldtype (#23765) 
* fix: calculate SLA variance in seconds for Duration fieldtype

* fix: sider
 2020-10-29 22:41:38 +05:30
Saqib
825d79b31b
fix: pos profile has no attr 'show_only_available_items' (#23759) 2020-10-29 13:23:59 +05:30
Deepesh Garg
2004f64bcd
Merge pull request #23755 from deepeshgarg007/accounting_dimension_gl_fix_v13 
fix: Do not allow Company as accounting dimension
 2020-10-29 11:58:19 +05:30
Deepesh Garg
0dcb5887f3 fix: Do not allow Company as accounting dimension 2020-10-29 11:54:14 +05:30
Saqib
0d5aff54c2
fix: pos register shows cancelled documents (#23745) 2020-10-28 17:09:07 +05:30
Saqib
b088c783df
fix: item wise tax calculation (#23746) 2020-10-28 17:07:30 +05:30
Saqib
34873bf26b
fix: multiple pos issues (#23725) 
* fix: point of sale search

* fix: pos fetches expired serial nos

* fix: pos doesn't refresh on route change

* fix: opening balances not set in opening entry

* fix: remove debug statement

* fix: invalid query if no serial no is reserved by pos invoice

* chore: make new order btn primary

* chore: filter warehouse by company

* chore: add shortcuts for new order and email

* fix: cannot fetch serial no if no batch control

* chore: add shortcuts for menu items

* feat: standard keyboard shortcuts for pos page

* feat: display only items that are in stock

* fix: empty point of sale page if opening entry dialog is closed

* feat: conversion factor in pos item details

* fix: show all invalid mode of payments

* chore: show all items if allow negative stock is checked

* fix: -ve amount set when changing mode of payment

* fix: pos closing validations

* fix: test

* fix: non expired serial no fetching query

* fix: cannot dismiss pos opening creation dialog

* fix: transalation strings

* fix: msgprint to throw

* chore: use as_list in frappe.throw

* chore: clean up pos invoice.js & .py

* fix: codacy

* fix: transalation syntax

* fix: codacy

* fix: set_missing_values called twice from pos page

* fix: mode selector with double spaces

* fix: do not allow tables in pos additional fields

* fix: pos is not defined

* feat: set mode of payments for returns

* fix: remove naming series from pos profile

* fix: error message

* fix: minor bugs

* chore: re-arrange pos closing entry detail fields

* fix: sider & frappe linter

* fix: more translation strings

* fix: travis

* fix: more translation strings

* fix: sider

* fix: travis

* fix: unexpected end of string

* fix: travis
 2020-10-26 13:24:47 +05:30