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

26464 Commits

Author SHA1 Message Date
Ankush Menat
d235fc75ad
fix: remove nonexistent method from pick list (#25279) 
This method is merged in calculate_rate_and_amount() during repost item
valuation refactoring.

Ref:
e10f0a5a6c (diff-a160e3a8907dcdf28ce7728bb7dd45914ad8ab033489ea3de4c80fb1c4ca7fe9)
 2021-04-12 10:23:06 +05:30
Deepesh Garg
4d4d7074d0
Merge pull request #25053 from deepeshgarg007/delivery_note_gst_category 
fix: Add GST category field in Delivery Note
 2021-04-10 22:12:42 +05:30
Deepesh Garg
1466e2d758
Merge pull request #25271 from deepeshgarg007/loan_penalty_new_fix 
fix: Consider paid repayment entries in subsequent loan repayments
 2021-04-10 21:00:46 +05:30
Deepesh Garg
81ecd0b8b6 Merge branch 'develop' of https://github.com/frappe/erpnext into delivery_note_gst_category 2021-04-10 20:54:38 +05:30
Deepesh Garg
b58590251b fix: minor improvements and tests 2021-04-10 19:55:36 +05:30
rohitwaghchaure
5899477cbb
Merge pull request #25015 from rohitwaghchaure/fixed-patch-item-reposting-for-incorrect-sl-and-gl-develop 
fix: patch
 2021-04-10 18:58:44 +05:30
Deepesh Garg
f38a653a08 fix: Show exact error message in datetime 2021-04-10 18:34:51 +05:30
Deepesh Garg
e7efbc1d33 Merge branch 'develop' of https://github.com/frappe/erpnext into loan_penalty_new_fix 2021-04-10 18:33:38 +05:30
Deepesh Garg
37d6c19a34 fix: Consider paid repayment entries in subsequent loan repayments 2021-04-10 18:33:26 +05:30
Deepesh Garg
8a01dbe8e1
Merge pull request #25261 from ankush/issue_status_banner_fix 
fix: condition for SLA status banner
 2021-04-10 17:56:51 +05:30
Rohit Waghchaure
1db8c51749 fix: changed logic 2021-04-10 10:45:29 +05:30
Rohit Waghchaure
b9aa775f3b fix: pricing_rule test cases 2021-04-10 10:45:28 +05:30
Rohit Waghchaure
1358443cdb fix: patch 2021-04-10 10:42:08 +05:30
Deepesh Garg
c85c243f9c
Merge pull request #25255 from nextchamp-saqib/issue-condition-fix 
fix: condition for setting agreement status
 2021-04-09 21:40:14 +05:30
Deepesh Garg
df9388aa8e
Merge pull request #25086 from deepeshgarg007/advance_amount_precision 
fix: Precision issues while allocating advance amount
 2021-04-09 21:39:02 +05:30
noahjacob
110f28f869 Company field editable and is readonly after saving. 2021-04-09 20:01:47 +05:30
Saqib
14b98c1737
Merge branch 'develop' into issue-condition-fix 2021-04-09 18:29:01 +05:30
Anupam Kumar
986452107b
fix: Lead Source's module (#24583) 
* fix: Lead Source's module

* fix: patch fix
 2021-04-09 18:15:51 +05:30
Anupam Kumar
a91d7bd4b5
Merge branch 'develop' into se-add-to-transit 2021-04-09 18:00:03 +05:30
Anupam Kumar
cd2aedd0c6
Merge branch 'develop' into planning 2021-04-09 17:59:47 +05:30
Ankush Menat
5451bbf7d2
fix: condition for SLA status banner 
If the document is NOT in the closed state and fulfilled then there
won't be any banner. This bug was introduced while fixing a bug related
to buttons, so separated out code for showing buttons and showing
banners.
 2021-04-09 17:19:02 +05:30
rohitwaghchaure
526f76c27d
Merge pull request #25257 from rohitwaghchaure/travis-fix-for-project 
fix: travis
 2021-04-09 17:07:22 +05:30
Rohit Waghchaure
ca5e10892c fix: travis 2021-04-09 16:23:45 +05:30
Afshan
dc73a9995d
Merge branch 'develop' into add-blank-for-status-issue-reports 2021-04-09 13:04:34 +05:30
Saqib Ansari
032246dc2b feat(italy): add document type field for e-invoicing 2021-04-09 12:08:24 +05:30
Marica
d38618fc34
Merge branch 'develop' into item-dashboard-fixes 2021-04-09 11:57:56 +05:30
Marica
5467d7c3e3
fix: Use system precision instead of SLE precision 2021-04-09 11:56:49 +05:30
Marica
a7ac01153e
fix: Remove redundant import and import cint 2021-04-09 11:55:44 +05:30
Saqib Ansari
e7813b69c4 fix: condition for setting agreement status 2021-04-09 11:46:16 +05:30
Marica
b89a40aa3c
Merge branch 'develop' into fix_picked_qty_in_DN 2021-04-09 11:45:39 +05:30
Marica
7f0e92c9b9
Merge pull request #25232 from nextchamp-saqib/coa-importer-validate-fix 
fix: keyerror while validating coa file
 2021-04-09 11:44:40 +05:30
Deepesh Garg
63e6036d12
Merge pull request #25235 from ankush/remove_purch_inv_validation 
fix: remove gst name validation for purchase Invoice
 2021-04-09 10:48:34 +05:30
Saqib
4191e7999d
chore: add error title 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2021-04-08 21:04:56 +05:30
Deepesh Garg
edb4663258
Merge pull request #25251 from nextchamp-saqib/einv-ack-no-fix 
fix(india): set correct ack no. on irn generation
 2021-04-08 20:48:01 +05:30
Saqib Ansari
30720d2139 fix: set correct ack no. on irn generation 2021-04-08 19:06:44 +05:30
Rucha Mahabal
b7aa658a51
refactor(HR): Add missing reports and doctypes to the Workspace (#24994) 
* refactor(HR): Add missing reports and doctypes to the Workspace

* refactor: remove Employee Tax and Benefits from HR Workspace

Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
 2021-04-08 18:13:21 +05:30
Jannat Patel
d9fa79de99
fix: serial no refresh issue (#25127) 
* fix: serial no refresh issue

* fix: sider
 2021-04-08 16:04:57 +05:30
Anupam Kumar
9d830255c1
Merge branch 'develop' into se-add-to-transit 2021-04-08 14:44:08 +05:30
rohitwaghchaure
f9fde054e1
Merge pull request #25242 from rohitwaghchaure/fixed-test-case-for-bom-cost 
fix: bom cost test case
 2021-04-08 14:39:08 +05:30
Marica
6a98d39201
Merge branch 'develop' into fixed-incorrect-batch-selected-in-purchase-rceipt-develop 2021-04-08 13:57:35 +05:30
HENRY Florian
e286750a0f
fix: UOM length unit in global setup list is empty (#24855) 
* When ERPNext is installed in localized language the category of UOM Conversion Factor is tranlasted into installed languaes. Filter must be locallized

* fix

* fix

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2021-04-08 13:56:29 +05:30
Marica
fb9fc944c5
Merge branch 'develop' into coa-importer-validate-fix 2021-04-08 13:46:42 +05:30
Rohit Waghchaure
fa8bb87a86 fix: bom cost test case 2021-04-08 13:38:22 +05:30
Ankush Menat
cb625d868c
fix: round total quantity in job card 2021-04-08 12:05:52 +05:30
Saqib
f10d107a0a
Merge branch 'develop' into coa-importer-validate-fix 2021-04-08 11:25:29 +05:30
Anupam Kumar
dfdf72cbb2
Merge branch 'develop' into planning 2021-04-08 10:58:05 +05:30
Anupam Kumar
8edf9d23c0
Merge branch 'develop' into se-add-to-transit 2021-04-08 10:57:50 +05:30
Ankush Menat
76c8521010
fix: remove gst name validation for purch Invoice 2021-04-07 16:28:13 +05:30
Afshan
e2da3cbc28
fix: payroll issues (#24540) 
* fix: payroll issues

* fix: enhancements

* fix: rename variables and refactor

* fix: slider

* fix: added missing arguments

* fix: test cases

* fix: slider

* fix: slider

fix: slider

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-04-07 15:13:44 +05:30
Saqib Ansari
5541aeaa82 fix: keyerror while validating coa file 2021-04-07 12:34:20 +05:30
Walstan Baptista
c39720db50
fix: frappe.whitelist for doc methods (#25231) 2021-04-07 11:51:22 +05:30
Walstan Baptista
90e240c3e6
fix: frappe.whitelist for doc methods (#25230) 2021-04-07 11:32:51 +05:30
Saurabh
547fd31a37 bumped to version 13.0.1 2021-04-07 11:33:40 +05:50
Nabin Hait
aa809ceffe
fix: Patch fixes for v13 upgrade (#25220) 2021-04-07 10:57:46 +05:30
Deepesh Garg
5af6aea9f9 fix: Posting Date check 2021-04-07 09:46:13 +05:30
Deepesh Garg
d551940dc5 fix: Remove comments 2021-04-06 23:55:48 +05:30
Deepesh Garg
a42194f3d5 Merge branch 'develop' of https://github.com/frappe/erpnext into loan_fixes_phase_2 2021-04-06 23:53:34 +05:30
Rucha Mahabal
d77ea7c88b
Merge pull request #25190 from ruchamahabal/approver-perms 
feat(HR): share doc with employee approvers if they don't have access
 2021-04-06 14:32:34 +05:30
Rucha Mahabal
0bcd3c45ed fix: leave approver perms test 2021-04-06 13:46:53 +05:30
Deepesh Garg
dfe91b5df3
Merge pull request #25212 from deepeshgarg007/loan_shortfall_preference 
fix: Give first preference to loan security on repayment
 2021-04-06 11:06:03 +05:30
Anupam Kumar
7b6c8bb3ab
fix: error message compensatory leave request (#25206) 2021-04-06 10:20:10 +05:30
Rucha Mahabal
d1970d3c38
Merge branch 'develop' into approver-perms 2021-04-06 10:09:18 +05:30
Rucha Mahabal
084e90e5d3 fix(test): set user as Administrator 2021-04-06 10:07:50 +05:30
Deepesh Garg
015fd681ec fix: Give first preference to loan security on repayment 2021-04-06 00:49:46 +05:30
Sagar Vora
c9cdf74dc5
test: remove print() (#25205) 2021-04-05 16:38:10 +05:30
Marica
4440ff7a0d
Merge branch 'develop' into item-dashboard-fixes 2021-04-05 16:25:57 +05:30
Marica
bc50193702
Merge branch 'develop' into fix_picked_qty_in_DN 2021-04-05 16:24:53 +05:30
Sagar Vora
9967a7ce02
test: clear all existing quotations to avoid AssertionError (#25202) 2021-04-05 15:35:52 +05:30
Rucha Mahabal
9948525dd3
Merge branch 'develop' into approver-perms 2021-04-05 14:54:11 +05:30
Sagar Vora
9a0907131a
test: create tax rule if it doesnt exist (#25199) 2021-04-05 14:50:09 +05:30
Walstan Baptista
8789ef16a1
test: uses _Test Item instead of _Test Item Home Desktop 100 (#25198) 2021-04-05 13:18:03 +05:30
Anoop
b27441b40c
fix: failing patch - reload_doc new doctypes added in v13 (#25194) 2021-04-05 10:41:28 +05:30
Ankush Menat
36ff0748bf
fix: broken type check in stock ageing report 2021-04-05 10:18:44 +05:30
Rucha Mahabal
b7436a04c3
fix: Ignore Permission for Leave Ledger Entry (#25172) 2021-04-04 20:09:00 +05:30
Rucha Mahabal
57ab3a5a88
Merge branch 'develop' into approver-perms 2021-04-04 19:57:58 +05:30
Rucha Mahabal
19c3286b06 fix: linter and sider issues 2021-04-04 19:54:00 +05:30
Rucha Mahabal
8c055b5469 fix: ignore share permission while sharing doc with approver 2021-04-04 18:45:06 +05:30
Rucha Mahabal
13c0a350af test: leave, expense, shift request approver permissions 2021-04-04 18:37:46 +05:30
Rucha Mahabal
ba10ef4403 feat(HR): share doc with employee approvers if they don't have access 2021-04-04 17:16:48 +05:30
Rohit Waghchaure
8b829711fc fix: incorrect batch picked in subcontracted purchase receipt 2021-04-04 12:43:38 +05:30
Sagar Vora
8aacd341c7
test: disable shopping cart before running Tax Rule tests (#25183) 2021-04-03 23:01:16 +05:30
Sagar Vora
993cf8c2cd
test: cleanup BOM in test_routing and prevent overlap in test_job_card (#25180) 2021-04-03 20:25:19 +05:30
Walstan Baptista
37b826b988
fix: correct calculation for discount amount when margin is set (#25179) 2021-04-03 19:48:46 +05:30
Sagar Vora
cce3efe0c1
test: specify warehouse list to avoid error (#25174) 
* test: specify warehouse list to avoid error

* test: get_all_warehouses of BOM company
 2021-04-03 19:46:44 +05:30
Walstan Baptista
b7481633b1
test: adds role after setting user to Administrator (#25177) 2021-04-03 17:37:59 +05:30
Sagar Vora
f68f41d7a7
test: fix multiple tests in Leave Application (#25173) 2021-04-03 17:34:57 +05:30
Deepesh Garg
232c127295
Merge pull request #25107 from deepeshgarg007/stock_entry_serial_batch_selector 
fix: Hide serial and batch selector in Stock Entry
 2021-04-03 17:15:22 +05:30
Deepesh Garg
b7e7eeaf8d
Merge pull request #25138 from deepeshgarg007/loan_shortfall_percentage 
fix: Add shortfall ratio in Loan Security Shortfall
 2021-04-03 17:13:27 +05:30
rohitwaghchaure
fe72e17a7b
Merge pull request #25109 from ankush/po_to_pr_fixes 
fix: incorrect status creating PR from PO after creating PI
 2021-04-03 17:11:14 +05:30
Sagar Vora
f6b1fa0a1c
test: clear tax rules before making POS Invoices (#25171) 2021-04-03 16:06:41 +05:30
Walstan Baptista
5d77f10baa
test: docs are not deleted in tearDown (#25123) 
* test: docs are not deleted in tearDown
 2021-04-03 13:38:55 +05:30
Ankush Menat
87b2a51322
fix: escape sql filters in credit report 
closes #24965
 2021-04-03 12:34:34 +05:30
Saqib
a30d70e490
Merge branch 'develop' into customer_duplicates 2021-04-03 12:22:22 +05:30
Kaviya Periyasamy
2cef23d4c9
fix: object referencing the same address issue (#25159) 
* fix: variable reference to same address

* fix: object referencing same address issue

* fix: value error
 2021-04-03 11:30:49 +05:30
Rucha Mahabal
2453b0cf6a
fix: component amount calculation based on formula with abbr not working (#25117) 2021-04-02 17:00:28 +05:30
bhavesh95863
7535341016
fix(regional): remove shipping address GSTIN validation for e-invoice (#25153) 2021-04-02 15:04:48 +05:30
Ankush Menat
e41d48c7de
fix: disable auto naming of customer during import 2021-04-02 14:22:04 +05:30
Marica
7f9fedf08a
Merge branch 'develop' into fix_picked_qty_in_DN 2021-04-02 13:19:19 +05:30
Saqib
5447b250fe
fix: place of supply of e-invoicing (#25148) 2021-04-02 12:16:19 +05:30
Deepesh Garg
7f10044195 fix: Typo 2021-04-02 12:04:42 +05:30
Saurabh
e7b3047eca chore: Bump version to v13.0.0 2021-04-01 22:59:28 +05:30
Anuja Pawar
87dea3923b
fix: Picked Qty conversion from Stock Qty to Qty while creating DN from Pick List (#25106) 
* fix: picked qty from Stock Qty to Qty in DN

* fix: suggested changes and added test

* fix: sider changes

* fix: sider changes
 2021-04-01 22:05:08 +05:30
Saurabh
f9b9298a6d
fix: reload doc in patch (#25144) 2021-04-01 21:59:35 +05:30
Jannat Patel
c01b2caaa3
fix: serial no refresh issue (#25129) 2021-04-01 20:48:51 +05:30
Afshan
ace4ce64a0
fix: validation msg for TransDocNo e-invoicing (#25121) 2021-04-01 20:28:12 +05:30
Suraj Shetty
c5347c4a34 fix: get_route_options_for_new_doc for project 2021-04-01 19:59:29 +05:30
Nabin Hait
db5f0f79b1
chore: added v13 change log (#25140) 2021-04-01 19:59:02 +05:30
Suraj Shetty
7b97d49a58
Merge pull request #25141 from surajshetty3416/fix-get_route_options_for_new_doc 
fix: get_route_options_for_new_doc for Project
 2021-04-01 19:58:01 +05:30
Suraj Shetty
67169ba2d3 fix: get_route_options_for_new_doc for project 2021-04-01 19:52:07 +05:30
Marica
f46fbcc1ad
Merge pull request #25118 from marination/qc-back-update 
fix: Query values incorrectly escaped while back updating Quality Inspection
 2021-04-01 18:30:58 +05:30
Sagar Vora
d3ee8c7731
fix: customer creation from shopping cart (#25136) 2021-04-01 18:18:19 +05:30
Deepesh Garg
eea20f83ab fix: Add shortfall ratio in Loan Security Shortfall 2021-04-01 18:13:54 +05:30
Rucha Mahabal
0773d6772d
fix(POS): local variable 'customer_currency' referenced before assignment (#25137) 2021-04-01 17:47:19 +05:30
Marica
913e7254cb
Merge branch 'develop' into qc-back-update 2021-04-01 17:40:46 +05:30
Marica
f4e7e72f67
Merge pull request #25131 from marination/qc-back-update-pre-release 
fix: Query values incorrectly escaped while back updating Quality Inspection
 2021-04-01 17:39:56 +05:30
Walstan Baptista
446a6df662
test: set opening stock to fix NegativeStock errors (#25101) 
Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2021-04-01 16:54:26 +05:30
Sagar Vora
98d250995d
fix(India): create property setters for shorter naming series (#25134) 2021-04-01 16:52:28 +05:30
Sagar Vora
88f5c42b09
test: set formula in scorecard to avoid ValidationError (#25116) 2021-04-01 16:44:05 +05:30
Anuja P
7982688508 fix: sider changes 2021-04-01 16:04:28 +05:30
Walstan Baptista
58625674f4
test: correct naming series to avoid ValidationError (#25132) 2021-04-01 15:55:37 +05:30
marination
a3da206b64 fix: Don't string format args as they may not be escaped properly 
- Append even conditional args to args list and send to query executer
- It will escape all values that are sent to it
- String formatting without escaping causes issues with % sign, etc.
 2021-04-01 15:45:33 +05:30
Marica
9ef323fcfd
Merge branch 'develop' into qc-back-update 2021-04-01 15:44:20 +05:30
Anuja P
45d0b9bce6 test: added tests for Pick List for item with multiple UOM 2021-04-01 15:38:13 +05:30
Sagar Vora
4c31fbb687
fix(India): create property setters for shorter naming series (as per GST Rules) (#25128) 2021-04-01 15:32:37 +05:30
Rucha Mahabal
6717773c28
fix: Travis (#25078) 
* fix(test): set default accounts in mode of payment

* fix(test): import_doc params in shopify settings test

* fix: syntax error in salary slip test

* fix(test): use Temporary Opening account for Stock Reco opening entry

* fix(test): skip GST doc naming validations for tests

* fix(test): Salary Structure Assignment date edge case

* fix(test): GST doc naming validations

* fix: sider

* revert: skip GST doc naming validations for tests
 2021-04-01 15:30:34 +05:30
Nabin Hait
7f7b3608bb fix: merge conflict 2021-04-01 15:05:53 +05:30
Nabin Hait
11eb30d082 fix: merge conflict 2021-04-01 15:03:11 +05:30
Rohit Waghchaure
58ca5a7329 fix: repost not completed backdated transactions 2021-04-01 14:59:49 +05:30
Rucha Mahabal
53a1aaf33d
fix: Salary Structure object has no attribute set_totals (#25113) 2021-04-01 14:40:15 +05:30
Rucha Mahabal
d765b21825
fix: Salary Structure object has no attribute set_totals (#25114) 2021-04-01 14:39:52 +05:30
marination
561fa6b530 fix: Don't string format args as they may not be escaped properly 
- Append even conditional args to args list and send to query executer
- It will escape all values that are sent to it
- String formatting without escaping causes issues with % sign, etc.
 2021-04-01 12:56:05 +05:30
Ankush Menat
1bdf9c4161
fix: patch for purchase receipt status 2021-04-01 11:58:34 +05:30
Ankush Menat
427a98d6cd
fix: do not copy percent billed from PO to PR 2021-04-01 11:51:31 +05:30
Ankush Menat
8993ccb7d2
fix: update PR status in database 2021-04-01 11:51:31 +05:30
Ankush Menat
4198cf58e5
test: add tests for PO->PI, PO->PR workflow 
Add failing test cases for PR status and PR percent billed.
 2021-04-01 11:51:30 +05:30
rohitwaghchaure
56bd4d71a9
Merge pull request #25112 from rohitwaghchaure/fixed-clear-source-warehouse 
fix: not able to save material request
 2021-03-31 23:58:44 +05:30
Rohit Waghchaure
825850a58f fix: not able to save material request 2021-03-31 23:55:06 +05:30
Marica
bfc2590e3b
Merge branch 'develop' into patch-7 2021-03-31 22:23:23 +05:30
Marica
8617c0ab99
Merge pull request #25070 from marination/update-items-bin 
fix: Update Bin via Update Item on Purchase/Sales Order
 2021-03-31 22:21:41 +05:30
Afshan
2fef245607
fix: don't set Company:company:default_currency as default for currency link fields (#25111) 2021-03-31 21:57:04 +05:30
Prssanna Desai
f3c34aa6ae
fix: don't set "Company:company:default_currency" as default for currency link fields (#25095) 
* fix: don't set Company:company:default_currency as default for currency link fields

* fix: Company:company:default_currency and refactor

Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
Co-authored-by: Afshan <afshan13k@gmail.com>
 2021-03-31 21:52:48 +05:30
marination
85a7ec91a1 fix: Run Patches to updated Reserved, Requested and Ordered Qty 2021-03-31 21:07:59 +05:30
marination
7665a85039 fix: Run Patches to updated Reserved, Requested and Ordered Qty 2021-03-31 21:03:55 +05:30
Deepesh Garg
9f7bb14ea1 fix: Remove console 2021-03-31 20:01:00 +05:30
Anuja P
a1d0932093 fix: suggested changes 2021-03-31 19:59:28 +05:30
Deepesh Garg
2d86eb3ab1 fix: Hide serial and batch selector in Stock Entry 2021-03-31 19:57:50 +05:30
Ankush Menat
777745f1e0
fix: do not fetch stopped MR in production plan 
- Ignore stopped MR while using fetch button
- Add filter on field inside child table.

Related issue: ISS-20-21-10757
 2021-03-31 19:53:19 +05:30
Anupam Kumar
1033cf72f6
fix: added flag for dont_fetch_price_list_rate in transaction (#25041) 2021-03-31 19:39:45 +05:30
Anupam Kumar
35415fa575
fix: added flag for dont_fetch_price_list_rate in transaction (#25083) 2021-03-31 19:39:33 +05:30
Anuja P
fb9ce3f37b fix: Picked Qty conversion from Stock Qty to item Qty in DN 2021-03-31 19:26:42 +05:30