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

29111 Commits

Author SHA1 Message Date
Saqib Ansari
44139fbac5 fix: cancelled sales invoices are considered in billed quantity calculation 2021-09-13 16:50:11 +05:30
Saqib
7292f5476d
feat: (get_items_from) filter material request item in purchase order (#27449) 2021-09-13 12:13:43 +05:30
Ankush Menat
d743c41b54
fix(ux): apply proper filtering in stock reports (#27411) 
* fix(ux): apply proper filtering in stock reports

Stock Balance: apply company filter to warehouse field
Stock Ageing: apply company filter to warehouse field

* fix: unnecessary parens

Co-authored-by: Alan <2.alan.tom@gmail.com>
 2021-09-12 16:38:18 +05:30
Ankush Menat
6ef879fca2
fix(ux): clean invalid fields from variant setting (#27412) 2021-09-12 16:36:51 +05:30
Frappe PR Bot
a52d4c25ff
fix: fail migration due to None type during v13_0.update_returned_qty_in_pr_dn (#27430) (#27436) 
* fix: fail migration due to None type

* fix: incorrect key: value pair in filter.

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
(cherry picked from commit becf471a3a238cfaa20a8940e0106c7e0e0386c2)

Co-authored-by: Devin Slauenwhite <devin.slauenwhite@gmail.com>
 2021-09-11 17:54:55 +05:30
Sagar Vora
dae0a1c1d6
fix: Template Error due to use of single quote (#27433) 2021-09-11 17:54:21 +05:30
Ankush Menat
62fc544280
test: basic tests for controllers/queries (#27422) 2021-09-10 12:46:35 +05:30
Anuja Pawar
a58e309297
fix: fix to fetch customers and billing email in PSOA (#27363) 2021-09-09 19:37:52 +05:30
Subin Tom
8b4c57ee09
fix: pos payment mode selection issue (#27409) 2021-09-09 19:33:34 +05:30
Anupam Kumar
7edac5a5d7
fix: removing duplicate currency() from sales_invoice.js (#27410) 2021-09-09 19:17:01 +05:30
Noah Jacob
acdb10377f
refactor: .doc missing and empty row on new doc (#27408) 
* refactor: .doc missing and empty row on new doc

* fix: let -> const
 2021-09-09 18:54:00 +05:30
Ankush Menat
678335f8ac
fix: job card overlap unknown column jc.employee (#27403) 
* fix: incorrect query for job card overlap

* test: employee overlap in job cards

* test: simplify/refactor job card tests
 2021-09-09 12:24:23 +05:30
Deepesh Garg
9104796eb8
Merge pull request #27258 from deepeshgarg007/tds_validity 
feat: Validity dates in Tax Withholding Rates
 2021-09-09 12:17:36 +05:30
Anuja Pawar
3576668638
fix: added Show Remarks checkbox in AR & AP reports (#27374) 2021-09-09 11:57:29 +05:30
Deepesh Garg
e7e2ce1271 fix: Linting Issues 2021-09-09 11:36:57 +05:30
Deepesh Garg
c33bbd4f39 fix: Test Case 2021-09-09 11:13:29 +05:30
rohitwaghchaure
295020451f
fix: added delivery date filters to get sales orders in production plan (#27367) 2021-09-08 19:28:30 +05:30
Alan
81d3524d27
fix: auto complete sales order rows in production plan (#27352) 
* fix: auto complete sales order rows in production plan

* fix: sider
 2021-09-08 16:48:42 +05:30
Saqib
9c27f9be1e
fix: document naming rule not working for subscription invoices (#27386) 2021-09-08 16:47:04 +05:30
Dany Robert
fa819f2fb0
fix: General Ledger translation issues (#27298) 
* fix: remove translations from GL report options

Options need not be translated, their display label gets translated
client side.

* fix: make group by options translatable

* ci: semgrep rule for translated options in report

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-09-08 16:28:05 +05:30
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
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