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

38682 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Saqib
df3e4ce1c0
fix: scan barcode fields input length (#27389) 
* fix: undo unintentional changes

* fix: scan barcode fields input length
 2021-09-08 16:04:13 +05:30
Deepesh Garg
ee1486209d Merge branch 'develop' of https://github.com/frappe/erpnext into tds_validity 2021-09-08 11:33:42 +05:30
Ankush Menat
5596988c94
ci: fix docs checker for wiki based docs (#27380) 2021-09-07 14:53:30 +05:30
Marica
61a1356109
fix: Check if Item is serialised before trying to fetch SN and set SO in it (#27358) 2021-09-07 14:42:17 +05:30
rohitwaghchaure
058d98342a
fix: missed to add voucher_type, voucher_no to get GL Entries (#27368) 
* fix: missed to add voucher_type, voucher_no to get gl entries

* test: get voucherwise details utilities

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-09-07 12:14:40 +05:30
Deepesh Garg
8f6d22b7ea
Merge pull request #27373 from deepeshgarg007/gstin_filter_issue 
fix: GSTR-1 Reports not showing any data
 2021-09-07 11:09:14 +05:30
Deepesh Garg
6dfcc1e2ae fix: Remove print and debug 2021-09-07 11:08:30 +05:30
Deepesh Garg
e1f55df4d7 fix: GSTR-1 Reports not showing any data 2021-09-07 11:07:22 +05:30
Mohammed Yusuf Shaikh
d795e55694
feat(CRM): Sales Pipeline Analytics Report and Opportunity Summary by Sales Stage Report (#26639) 
* feat: Sales Pipeline Analytics Report

* fix: sider Issues and added tests

* fix: Semgrep Issue

* feat: Opportunity Summary by Sales Stage Report

* fix: add some checks and tests

* fix: sider issues and test

* fix: additional checks for error handling and minor changes

* fix: remove unused conditions

* fix: Changes mentioned on PR

* fix: currency conversions and other changes

* fix: remove unused imports

* fix: correction for failing test case

* fix: recorrected failing test case

* fix: sider issues and resolve test case errors

* fix: rewrite query using query builder

* fix: test case changes

* fix: sider fixes and other changes

* fix: clear data before running test

* fix: test case fixed

* refactor: code formatting

- smaller functions

- variable and function naming

* refactor: improve code formatting

* fix: linter issues

* fix: linter issues

* fix: change indentation to tabs

* fix: linter issues

* fix: naming, code formatting

* fix: quarterly values not showing up in Sales Pipeline Analytics

* fix: typo in tests

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-09-07 10:49:34 +05:30
Anupam Kumar
88c9fe35bd
fix: employee remider settings (#27365) 2021-09-07 00:15:58 +05:30
Anupam Kumar
b0d970001a
feat: multi-currency in Opportunity (#26590) 
* feat: multi-currency

* refactor: lead form

* fix: test case for opportunity item

* fix: removing local changes

* fix: test cases

* fix: test cases

* fix: review changes

* fix: reverting lead.json chnages

* fix: toggle display for currency fields

* review changes

* fix: test case

* fix: linter issues

* fix: unused import

* feat: grand total in opportunity

* fix: patch

* fix: sort imports

* fix: reload opportunity item doctype

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-09-06 16:54:28 +05:30
Ankush Menat
14b01619de
fix: patch failure for vat audit report (#27355) 2021-09-06 13:47:56 +05:30
Marica
0f2a52078c
fix: Dont fetch Stopped/Cancelled MRs in Stock Entry Get Items dialog (#27326) 2021-09-06 13:14:09 +05:30
Deepesh Garg
51d9572fe7 fix: Hardcode fiscal year and posting date 2021-09-05 17:56:12 +05:30
Deepesh Garg
ceaa804f04
fix: Presentation currency conversion in reports (#27316) 2021-09-05 17:21:29 +05:30
rohitwaghchaure
7b4a65484a
fix: manually added weight per unit reset to zero after save (#27330) 2021-09-03 22:00:14 +05:30
Ankush Menat
73b3a2f685
chore: whitespace 2021-09-03 21:57:38 +05:30
Deepesh Garg
092d41ecda fix: Debug CI 2021-09-03 20:04:18 +05:30
Deepesh Garg
41392acd18 Merge branch 'develop' of https://github.com/frappe/erpnext into tds_validity 2021-09-03 19:19:35 +05:30
Deepesh Garg
8f5a77446e
Merge pull request #27279 from deepeshgarg007/gstr_1_cdnr_unregistered_json_develop 
feat: CDNR Unreg json generation
 2021-09-03 13:55:00 +05:30
Deepesh Garg
a06a70d1a4 fix: Patch error and tests 2021-09-03 13:13:37 +05:30
Deepesh Garg
79d250845e fix: Patch 2021-09-03 13:13:37 +05:30
Deepesh Garg
2b34028acd fix: Patch and linting errors 2021-09-03 13:13:37 +05:30
Ganga Manoj
64fcd1a092
fix: make datetime objects readable (#27301) 
* fix: Make datetime objects readable

* fix: Remove unused imports
 2021-09-03 12:54:47 +05:30
Subin Tom
798b464ee3
fix: braintree payment processed twice (#27300) 2021-09-03 12:30:57 +05:30
Saqib
98696c0ec9
Merge pull request #27306 from GangaManoj/fix-selling-settings 
fix: Move related fields together in Selling Settings
 2021-09-03 12:30:02 +05:30
Ankush Menat
d1fe060e4a
fix: south africa vat patch failure (#27323) 
reload doc is necessary on new doctypes
 2021-09-03 12:02:32 +05:30
Shariq Ansari
e68c55ce83
fix: Removing first Spacer from home page (#27321) 2021-09-03 11:00:33 +05:30
GangaManoj
ebdc568e85 fix: Rename 'Action if Same Rate is Not Maintained' to 'Action if Same Rate is Not Maintained Throughout Sales Cycle' 2021-09-02 19:32:51 +05:30
Deepesh Garg
e1fffdb262 fix: Linting issues 2021-09-02 19:10:49 +05:30
Deepesh Garg
c85242e03d Merge branch 'develop' of https://github.com/frappe/erpnext into gstr_1_cdnr_unregistered_json_develop 2021-09-02 18:59:59 +05:30
Deepesh Garg
e8a5dc371b fix: Add payment entry custom fields 2021-09-02 18:56:04 +05:30
Ankush Menat
eec40513be
fix: minor linting issues (#27314) 
* fix: syntax error in gratuity

* fix: unpacking None into three variables

* fix: unexpected kwarg for delete_accounting_dimensions
 2021-09-02 17:42:45 +05:30
Ankush Menat
60185c8c71
chore: linting 
[skip ci]
 2021-09-02 17:36:05 +05:30
Ankush Menat
8b1a61be29
chore: ignore import cleanup commit in blame 2021-09-02 16:46:25 +05:30
Chillar Anand
915b34391c
chore: Clean up imports (#27302) 
* chore: Added isort to pre-commit config

* chore: Sort imports with isort

* chore: Clean up imports with pycln

* chore: Sort imports with isort

* chore: Fix import issues

* chore: Clean up sider issues

* chore: Remove import errors from flake8 ignore list

* chore: Clean up lint issues
 2021-09-02 16:44:59 +05:30
Ankush Menat
b25d28e023
fix(patch): delete stale shopify doctypes (#27313) 2021-09-02 14:53:06 +05:30
Saqib
366012817f
Merge branch 'develop' into fix-selling-settings 2021-09-02 11:13:52 +05:30
Saqib
a158b825fc
Merge pull request #27124 from GangaManoj/gross-profit-product-bundle 
feat: Improve Product Bundle handling
 2021-09-02 11:12:56 +05:30
Devin Slauenwhite
43c476ddf7
fix: (Backport-develop) track salary slip ytd gross salary. (#27242) 
* fix: track salary slip ytd gross salary.

* fix: ytd gross salary unique label

* Revert "fix: ytd gross salary unique label"

This reverts commit a68b387ac21e32c250d042caf75ef301b5a49a1a.

* fix: gross ytd salary unique label
 2021-09-02 09:39:35 +05:30
Anupam Kumar
c25367f107
Merge pull request #27292 from anupamvs/comany-name-field-issue-develop 
fix: mapping for company name lead->contact
 2021-09-02 09:32:47 +05:30
Rucha Mahabal
f828d853e3
fix: Org Chart fixes (#27290) 
* fix(org chart): multiple root nodes not expanding on clicking Expand All

* fix: unstable filter inserts duplicate nodes
 2021-09-01 23:07:26 +05:30
GangaManoj
799d67d785 fix: Only display 'Role Allowed to Override Stop Action' if 'Maintain Same Rate Throughout Sales Cycle' is checked 2021-09-01 22:55:10 +05:30
GangaManoj
f2a7fbd126 fix: Remove redundant description 2021-09-01 22:49:05 +05:30
GangaManoj
06484321d1 fix: Move related fields to the same section 2021-09-01 22:48:09 +05:30
Deepesh Garg
d5a736d11e test: Update test case 2021-09-01 21:15:24 +05:30
Ankush Menat
dea5c34d8d
chore: whitespace 2021-09-01 19:59:22 +05:30
Ankush Menat
81eb6fde07
Merge pull request #27288 from ankush/strict_linting 
chore: cleanup linting errors and introduce strict linting checks
 2021-09-01 19:32:49 +05:30
Raffael Meyer
605f73b4d4
feat: add voucher-specific data to DATEV export (bp #26589) (#27287) 
* feat: add voucher-specific data to datev export

* refactor: def instead of lambda
 2021-09-01 19:27:54 +05:30
rohitwaghchaure
2a8cd05b44
fix: production plan UX and validation message (#27278) 2021-09-01 19:16:03 +05:30