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

1407 Commits

Author SHA1 Message Date
barredterra
242579b77c fix: use party name as title 2020-10-07 14:34:21 +02:00
Prssanna Desai
fd42af5b91
fix: ignore permission while creating supplier scorecard period in supplier scorecard (#23406) 2020-09-23 17:14:37 +05:30
Abhishek Balam
4e6733293f
fix(DocTypes): Reset "owner" values in DocTypes to Administrator (#23350) 
* fix: reset owner values in doctype to Administrator

* fix: updated modified value

* fix: also fixed modified by

* fix: change modified_by to Administrator
 2020-09-18 18:27:24 +05:30
marination
f995f517c9 fix: Test 2020-09-15 17:06:27 +05:30
Marica
baedc627ee
Merge branch 'develop' into item-tax-update-items 2020-09-15 11:30:22 +05:30
marination
4bb8d0c193 chore: Test for PO 2020-09-15 11:18:02 +05:30
Saqib
61314248bb
feat: uom in update items for SO & PO (#22869) 
* feat: uom in update items for SO & PO

* fix: supplied items doesn't updates on uom change

* chore: add uom and conv factor change test

* fix: test

* fix: purchase order updates are not tracked

* fix: fetch conversion factor on uom change

* fix: codacy

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-09-15 11:14:31 +05:30
Rucha Mahabal
a1b5d57076 test: make rfq from opportunity 2020-09-02 13:14:01 +05:30
marination
bc6c4e864d fix: Status in Report and filter query 2020-08-31 20:32:17 +05:30
marination
8f452b8663 fix: Codacy and indicator message 2020-08-24 18:57:07 +05:30
marination
f49665077c feat: Quoted Item Comparison Report Enhancements v2 2020-08-24 18:26:48 +05:30
Afshan
ba33900712 Merge remote-tracking branch 'upstream/develop' into fix-duplicate-dropdown-PO 2020-08-11 20:17:05 +05:30
Afshan
b5b2586968 fix: referencing frm 2020-08-11 20:15:57 +05:30
Suraj Shetty
1923ef052c
refactor: Format and sanitise user inputs to search queries. (#22913) 
* refactor: Sanitize whitelisted method inputs

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

* refactor: Format and sanitize tax_account_query inputs

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

* refactor: Validate and sanitize search inputs via decorator

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

* style: Minor formatting fix

* refactor: Validate and sanitize search inputs using decorator

* fix: Typo

* fix: Remove unwanted import statement

* refactor: Repalce validate_and_sanitize_search_inputs() with validate_and_sanitize_search_inputs

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-08-05 19:42:25 +05:30
Marica
cf00ee49ec
fix: PO/SO view title (#22858) 2020-07-31 15:14:50 +05:30
Deepesh Garg
76028cde6a
Merge branch 'develop' into fix-payment-entry-wrong-bank-account-fetch-develop 2020-07-23 19:05:17 +05:30
Abhishek Balam
d05a98517d
Fix: Increase Length Of "In Words" and "In Words (Company Currency)" fields (#22732) 
* new parent updating logic, made requested changes

* fix: Increase Length of In Words fields

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-07-23 19:01:31 +05:30
Afshan
55125fbe4e
fix: moved custom_make_buttons to PurchaseOrderController to avoid duplication of dropdown options (#22744) 2020-07-23 17:44:38 +05:30
Marica
43b4b1cb55
chore: Export Buying Dashboard (#22767) 
* chore: Export Buying Dashboard

* fix: Use Timespan instead of Between for static filters
 2020-07-23 11:08:49 +05:30
Marica
8ec4198af2
Merge branch 'develop' into club-mr-column 2020-07-20 16:07:10 +05:30
Afshan
2b21b7bafa fix: moved custom_make_buttons to PurchaseOrderController to avoid duplication of dropdown options 2020-07-20 16:05:52 +05:30
rohitwaghchaure
ac984eb37c
Merge branch 'develop' into project-link-for-all-accounts 2020-07-13 11:50:11 +05:30
Afshan
e40605d711 Merge remote-tracking branch 'upstream/develop' into club-mr-column 
Merge remote-tracking branch 'upstream/develop' into club-mr-column
 2020-07-13 11:43:19 +05:30
Afshan
d058840094
fix: removed fiscal year field from "Request for Quotation" doctype (#22446) 
* fix: removed fiscal year field from "Request for Quotation" doctype
 2020-07-12 19:19:59 +05:30
Afshan
e9affe3705 merge branch develop 2020-07-10 16:31:40 +05:30
Afshan
0863beec92 created new report named "requested_items_to_order_and_receive" removed report "requested_items_to_order" also wrote a patch for deleting old report from table "tabReport" 2020-07-10 15:14:01 +05:30
Afshan
dca8a1d69d renamed "pending qty" to "qty to recieved" 2020-07-10 14:26:21 +05:30
rohitwaghchaure
3a3787f9e7
fix: Due to decimal issue make purchase receipt button not showing from PO (#22629) 2020-07-09 20:07:40 +05:30
Michelle Alva
5d514fe4df
fix: grammatical fixes in module onboarding (#22580) 
* fix: grammatical fixes in module onboarding

* fix: more grammatical changes for consistency

* fix: Reorder Stock Onboarding

* fix: update success message

* fix: change order of stock onboarding steps

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-07-08 14:25:51 +05:30
rohitwaghchaure
41c9708f99
Merge branch 'develop' into project-link-for-all-accounts 2020-07-08 13:11:37 +05:30
Afshan
e3269039d3 feat: added columns to get complete analysis for material request 2020-07-07 18:01:37 +05:30
Deepesh Garg
92a03aa5db Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts 2020-07-06 12:37:28 +05:30
Chinmay D. Pai
ed0bb20e6f
chore: add query functions to whitelist 
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
 2020-07-02 12:35:41 +05:30
Afshan
06f11aba0b feat: Autofill Supplier pop-up when only 1 Supplier in RFQ 2020-06-29 21:39:35 +05:30
Marica
510436931b
fix: Added Missing Trends Reports to Buying/Selling Desk (#22502) 
* fix: Added Missing Trends Reports to Buying/Selling Desk

* fix: Move Reports to Other Reports
 2020-06-29 19:52:23 +05:30
Michelle Alva
da0385cd39
fix: change error messages in RFQ 
Before:
1. Row {0}: For supplier {0} Email Address is required to send email
2. Email sent to supplier
3. Request for Quotation is disabled to access from portal, for more check portal settings.
4. Supplier Quotation created.


After:
1. Row {0}: For Supplier {0} Email Address is Required to Send Email
2. Email sent to Supplier
3. The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings.
4. Supplier Quotation Created.
 2020-06-25 08:24:01 +05:30
Marica
b073544e06
Merge branch 'develop' into fix-payment-entry-wrong-bank-account-fetch-develop 2020-06-23 02:24:35 +05:30
Deepesh Garg
edd4aa6faa Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts 2020-06-22 09:59:39 +05:30
Marica
383807f72e
feat: Selling Desk, Dashboard and Onboarding (#22055) 
* feat: Selling Desk, Dashboard and Onboarding

* chore: Selling Onboarding and fixes in Other onboardings

* chore: Dashboard and Number card Fixtures

* fix: Escape filters and Reposition Accounts Dashboard shortcut.

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-06-19 15:33:21 +05:30
Deepesh Garg
3c63f5b76b Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts 2020-06-19 11:41:21 +05:30
rohitwaghchaure
853fce8c7e
Merge branch 'develop' into rfq-multi-uom 2020-06-18 15:49:53 +05:30
P-Froggy
c3b74affe3 fix: Set Value of wrong Bank Account Field in Payment Entry 
Company bank account was wrongly inserted into the field "Party Bank Account" in payment entry, instead of "Bank Account".
Also changes the label of "Default Bank Account" to "Default Company Bank Account", like suggested in PR #20632
 2020-06-18 01:48:37 +02:00
Marica
74f34c2ee3
Merge branch 'develop' into update-items-permission-fix 2020-06-16 17:18:33 +05:30
marination
87dafb4d70 Merge branch 'develop' of https://github.com/frappe/erpnext into rfq-multi-uom 2020-06-15 17:44:04 +05:30
marination
ae862c993b feat: Multi UOM support in Request for Quotation 2020-06-15 17:38:47 +05:30
rohitwaghchaure
d8683d381b
Merge pull request #22205 from deepeshgarg007/fiscal_year_travis 
fix: Travis(develop)
 2020-06-15 16:12:10 +05:30
P-Froggy
2957a631db
fix: Validation of Purchase Order against Material Request missing (#22192) 
Validation of Purchase Order and Purchase Order Item against the linked Material Request Item was missing, so it was possible to exchange items in the purcahse order against others and still fullfill the material request.

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-06-15 13:41:16 +05:30
Marica
7dd92f15fa
Merge branch 'develop' into update-items-permission-fix 2020-06-15 11:44:59 +05:30
marination
359e934cd2 fix: Travis 2020-06-15 11:44:29 +05:30
rohitwaghchaure
25f49d59c5
Merge pull request #22233 from deepeshgarg007/pi_billing_address 
fix: Billing address in for Purchase documents
 2020-06-14 15:10:43 +05:30