Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,239 Commits 3 Branches 0 Tags 1 GiB
2eccb7a1ca
Commit Graph

29645 Commits

Author SHA1 Message Date
Sagar Sharma
2eccb7a1ca
fix: Work order creation from sales order (#28388) 
* fix: Work order creation from sales order

* chore: formatting

Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
 2021-11-15 16:08:15 +05:30
Ankush Menat
c0f06bc8e3
fix: validate hmac unconditionally (#28372) 2021-11-12 14:45:51 +05:30
Sagar Vora
6d3e9bce5f
fix(M-Pesa): validate type before executing get_doc (#28369) 2021-11-12 14:24:33 +05:30
Sagar Vora
24b048925b
fix(WooCommerce): always expect signature in webhook requests (#28367) 2021-11-12 14:08:02 +05:30
Sagar Sharma
a424310581
fix: Collapse Scrap Items in Job Card (#28362) 2021-11-12 13:50:30 +05:30
Deepesh Garg
829f92f10a
Merge pull request #28363 from deepeshgarg007/default_party_account 
fix: Default party account getting overriden in invoices
 2021-11-12 13:04:21 +05:30
Deepesh Garg
88648570d7 fix: Default party account getting overriden in invoices 2021-11-12 12:39:30 +05:30
Sagar Sharma
944bf8da71
fix: Unable to edit supplier scorecard criteria name once created (#28348) 2021-11-11 19:49:41 +05:30
rohitwaghchaure
0157da57b5
Merge pull request #28308 from rohitwaghchaure/commision-rate-not-fetch-from-sales-person 
fix: commission rate not fetch from sales person
 2021-11-11 19:11:31 +05:30
Saqib
ecbe4b16b8
perf(minor): general ledger report (#27987) 2021-11-11 13:55:21 +05:30
Deepesh Garg
0dca97eb9f fix(India): Sales Invoice with duplicate items not showing correct taxable value 2021-11-10 21:07:48 +05:30
Ankush Menat
c96b5492db fix: reload doctype forcefully 2021-11-10 19:41:55 +05:30
Saqib
6d05bb5274
fix(pos): get mode of payments query (#28321) 2021-11-10 13:06:55 +05:30
Ankush Menat
12e81df2b7 fix: default value for allow neg stock in repost_item_valuation 
Negative stock can be toggled back after queuing transactions, this
causes failure when repost is executed.

Now allow_negative_stock stock is set at time of queuing the repost job.
This means setting changes done afterwards won't affect already
submitted reposts.
 2021-11-10 13:05:14 +05:30
Anuja Pawar
2f004693c3
fix(Bank Reconciliation): get credit amount for bank account of type liability 2021-11-10 12:36:54 +05:30
Ankush Menat
e498389b00 fix: ignore cancelled entries in incorrect balance qty report 2021-11-10 12:09:51 +05:30
Rohit Waghchaure
4d4bfa2333 fix: commision rate not fetch from sales person 2021-11-10 00:00:38 +05:30
Anupam Kumar
6954dd6329
feat: Competitor Tagging in Opportunity and Quotation (#28050) 
* feat: Competitor Tagging in Opportunity and Quotation

* fix: review changes

* fix: linter issue

* fix: section label

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-11-09 19:36:27 +05:30
Ankush Menat
ccf84ae88a fix: patch to update job card status 2021-11-09 18:04:50 +05:30
Ankush Menat
fdfa39c231 fix: avoid mutating iterator while iterating over it 2021-11-09 18:04:50 +05:30
Ankush Menat
37799fe3dd fix: use completion qty instead of transfer quantity for JC status 2021-11-09 18:04:50 +05:30
Wolfram Schmidt
6907ad8adb
fix: add Email option to contact email field (#28296) 
* Update warranty_claim.json

Added the Email in option field of Contact Email so you are able to create a notification mapping to this field as reciever.

* Update warranty_claim.json
 2021-11-09 17:32:57 +05:30
Deepesh Garg
20bc613b81
Merge pull request #28294 from ruchamahabal/fix-hr-patch-breaking 
fix(India setup): setup company independent fixtures for patch
 2021-11-09 17:27:13 +05:30
Deepesh Garg
8a253ed1f3
Merge pull request #28238 from nextchamp-saqib/perf-financial-statements 
perf: improve financial statement loading time
 2021-11-09 16:29:58 +05:30
Rucha Mahabal
88b5bda34b fix(India setup): setup company independent fixtures for patch 2021-11-09 16:04:52 +05:30
Sagar Vora
da22744e0f
fix: specify fields to be set in Lead (#28288) 2021-11-09 15:49:32 +05:30
rohitwaghchaure
f57538bd2a
Merge pull request #28150 from anupamvs/manufacturing-work-order-stop 
feat: provision to close the Work Order
 2021-11-09 15:45:53 +05:30
Jannat Patel
17acb08545
fix: sum of components in salary register (#28237) 
* fix: sum of components in salary register

* fix: sum of deduction components

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-11-09 15:21:51 +05:30
Saqib
4a3cef6436
fix: update 'current_invoice_end' after processing invoice (#28278) 2021-11-09 14:16:38 +05:30
Ankush Menat
34f5283c17
fix: show full item name in search widget (#28283) 2021-11-09 11:55:33 +05:30
Anupam Kumar
092936d8ba
Merge branch 'develop' into manufacturing-work-order-stop 2021-11-09 10:51:09 +05:30
Anupam
663a7afe4d fix: get_planned_qty chnages 2021-11-09 10:50:38 +05:30
Bibin
0e8e7e21c3
fix: filter only submitted fees in student fee collection report (#28280) 
* Update student_fee_collection.json

Fix: filter and show only submitted fees documents

* fix: add total row for the student fee collection
 2021-11-09 10:02:05 +05:30
Anupam
27709a1c71 fix: test cases 2021-11-09 09:56:58 +05:30
Deepesh Garg
94d70bca9e
fix: Resolve conflicts 2021-11-08 18:48:46 +05:30
Subin Tom
45fd819729 fix: company condition fix, added company field 
(cherry picked from commit 7ad2717accea61883f98d418b4abed47ca3937a8)
 2021-11-08 13:12:28 +00:00
Subin Tom
d2915c6bc7 fix: fixed company field, updated patch 
(cherry picked from commit 7f2d304f32fdf580a354c1dbba58189cdd4f35f2)

# Conflicts:
#	erpnext/patches.txt
 2021-11-08 13:12:27 +00:00
Subin Tom
e51c4ba8a9 fix: Added company field, filtered account heads 
(cherry picked from commit 902c03cd375c7b1b2f35cff4dfbc5f1ff3e4cd56)
 2021-11-08 13:12:25 +00:00
Subin Tom
75e9100a53 fix: Fixed customer address variable, sales invoice item field currency issue 
(cherry picked from commit 904010ab645fdb16f09072c062269945f7747712)
 2021-11-08 13:12:25 +00:00
Deepesh Garg
2bf3b0fcac
Merge pull request #28272 from deepeshgarg007/ksa_vat_fixes 
fix: KSA VAT setup issues
 2021-11-08 18:08:49 +05:30
Deepesh Garg
0950459b0f
Merge pull request #28065 from Anuja-pawar/gst-category 
fix(minor): check if gst_category exists while validating GSTIN
 2021-11-08 17:53:10 +05:30
Deepesh Garg
07e7b92383
Merge pull request #28185 from vorasmit/ewaybill-fix 
fix(regional): incorrect `totalValue` in ewaybill JSON
 2021-11-08 17:52:07 +05:30
Deepesh Garg
508832e90a fix: Add patch to make custom fields 2021-11-08 17:46:24 +05:30
Deepesh Garg
c81d4734c4 fix: KSA VAT setup issues 2021-11-08 17:14:03 +05:30
Deepesh Garg
419e03954c
Merge pull request #28166 from Havenir/ksa-vat 
feat(Print Format): KSA VAT Invoice
 2021-11-08 15:27:02 +05:30
ahmadpak
8df50cf1e0 update(Print Format): Sales Invoice 
- KSA VAT Invoice
Customer Identification Number Added
 2021-11-08 09:29:33 +03:00
Ankush Menat
db3193dcab
chore: remove migration_hash (#28263) 2021-11-08 10:57:20 +05:30
mergify[bot]
c0b889b94d
fix: auto update price list rate (#28255) (#28256) 
* fix: auto update price list rate

* fix: hide field when auto insert isn't enabled

(cherry picked from commit bb3957eba35a5204a1a01e412dee596532bd525e)

Co-authored-by: Sagar Sharma <63660334+s-aga-r@users.noreply.github.com>

[skip ci]
 2021-11-07 17:42:51 +05:30
Ankush Menat
8fe5feb6a4 chore: remove all six compat code 2021-11-05 11:16:29 +05:30
Ankush Menat
897e90ac55 chore: remove past module dependencies 2021-11-05 11:16:29 +05:30