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

32979 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rohitwaghchaure
937b63433d
Merge pull request #23270 from kasgel/patch-1 
fix(utils): pass stock_qty to get_pricing_rule_for_item
 2020-09-06 20:46:15 +05:30
Deepesh Garg
c0fb7cb189
Merge pull request #23272 from deepeshgarg007/loan_repayment_method 
fix: Repayment Method not visible correctly
 2020-09-05 21:19:31 +05:30
Deepesh Garg
5158d0fbba fix: Repayment Method not visible correctly 2020-09-05 21:16:57 +05:30
kasgel
a59f8640d1
fix: pass stock_qty to get_pricing_rule_for_item 
get_pricing_rule_for_item uses the "stock_qty" and "qty" arguments to filter pricing rules.
Not passing stock_qty prevents for example the shopping cart from filtering pricing rules appropriately based on Quantity.
 2020-09-05 12:15:49 +02:00
Deepesh Garg
8e4ae0af56
Merge pull request #23269 from deepeshgarg007/loan_security_unpledge_utility 
fix: API changes in loan security unpledge utility
 2020-09-04 22:44:03 +05:30
Deepesh Garg
1b4ed454d2 fix: Add reference no and descripiton field in Loan Security Pledge and Unpledge 2020-09-04 22:42:41 +05:30
Deepesh Garg
e4c38e5fe5 fix: Remove print statement 2020-09-04 22:30:13 +05:30
Deepesh Garg
4d636fde3a fix: API changes in loan security unpledge utility 2020-09-04 22:23:30 +05:30
Mangesh-Khairnar
7456ffca0f fix: teardown created payment order 2020-09-04 19:59:01 +05:30
Mangesh-Khairnar
a76bf4d7af fix: remove unused imports 2020-09-04 19:08:08 +05:30
Mangesh-Khairnar
d9e4883392 test: check payment order creation against payment entry 2020-09-04 18:55:14 +05:30
rohitwaghchaure
515d8b9e50
Merge pull request #23259 from anupamvs/se-quntity 
fix: SE quantity data type issue
 2020-09-04 16:07:13 +05:30
rohitwaghchaure
c9a5afaa1c
Merge pull request #23263 from Semiranis/uom_after_qty 
feat: Option to print UOM after quantity
 2020-09-04 16:06:46 +05:30
Shivam Mishra
a2655fda8d
Merge pull request #23261 from scmmishra/rzp-api 
feat: don't allow guests
 2020-09-04 15:19:21 +05:30
Shivam Mishra
4a238a2093 feat: don't allow guests 2020-09-04 15:18:16 +05:30
Anupam K
faebef21b7 fix: SE quantity data type issue 2020-09-04 15:09:16 +05:30
Mangesh-Khairnar
e1889d0c1b fix(payment entry): update payment order status 2020-09-04 14:45:19 +05:30
Mangesh-Khairnar
8d8af94182 fix: capture advance payments in payment order 2020-09-04 12:17:56 +05:30
Marica
059ade81b2
Merge pull request #23249 from marination/leaderboard-supplier 
fix: Supplier Leaderboard
 2020-09-04 11:27:25 +05:30
Frappe ERPnext
2e8e06c350 Merge branch 'develop' of https://github.com/frappe/erpnext into uom_after_qty 2020-09-03 18:08:02 +02:00
Frappe ERPnext
9355641c49 refactor: logic moved to standard template 
Previously print_settings.py controller decided which template to use.
Now standard template decides what to print according to settings.
 2020-09-03 17:31:21 +02:00
Frappe ERPnext
a5d5e70bf4 Revert "feat: Option to print UOM after quantity" 
This reverts commit a787882a8f.
 2020-09-03 17:30:25 +02:00
Marica
8d6b2d016f
Merge branch 'develop' into leaderboard-supplier 2020-09-03 20:08:37 +05:30
marination
2a56000460 fix: Supplier Leaderboard fix 2020-09-03 19:45:04 +05:30
Deepesh Garg
b306fa355d
Merge pull request #23248 from deepeshgarg007/pda_account_filter 
fix: Account filter in Process Deferred Accounting doctype
 2020-09-03 19:22:56 +05:30
rohitwaghchaure
e399a8e82c
Merge pull request #23242 from rohitwaghchaure/incorrect-qty-after-transaction-stock-reco-develop 
fix: incorrect qty after transaction in stock ledger entry
 2020-09-03 18:59:24 +05:30
Deepesh Garg
9b681770d0 fix: Account filter in Process Deferred Accounting doctype 2020-09-03 18:09:02 +05:30
Anurag Mishra
e5b7cb0c15 fix: data was not properly maped 2020-09-03 16:59:21 +05:30
gavin
72e53842c4
Merge pull request #23237 from frappe/dependabot/npm_and_yarn/bl-3.0.1 
chore(deps): bump bl from 3.0.0 to 3.0.1
 2020-09-03 16:08:22 +05:30
gavin
21985d4ecc
Merge branch 'develop' into dependabot/npm_and_yarn/bl-3.0.1 2020-09-03 15:31:41 +05:30
gavin
f20b6360de
Merge branch 'develop' into overlap_for_additional_salary 2020-09-03 15:27:58 +05:30
Anurag Mishra
7952f89596 feat: Overlap validation additional salary 2020-09-03 15:21:35 +05:30
Rohit Waghchaure
68b0108301 fix: incorrect qty after transaction in stock ledger entry 2020-09-03 15:10:07 +05:30
rohitwaghchaure
d00bc3f422
Merge branch 'develop' into item-group-filter-portal 2020-09-03 15:04:04 +05:30
rohitwaghchaure
4b59043266
Merge pull request #23241 from Anurag810/hiding_regional_reports 
feat: removed roles for some regional report and added via setup
 2020-09-03 15:01:07 +05:30
rohitwaghchaure
6ffe809c66
Merge pull request #23233 from ruchamahabal/fix-rfq-conv-factor 
fix: set conversion factor while creating RFQ from Opportunity
 2020-09-03 14:45:01 +05:30
Anurag Mishra
54cd194b41 feat: removed roles for some reginal report and added via setup 2020-09-03 13:52:40 +05:30
Rucha Mahabal
979ad180fa fix: update rfq item in postprocess 2020-09-03 11:03:22 +05:30
rohitwaghchaure
5952efd66c
Merge pull request #23239 from michellealva/bank-reco-fix1 
fix: Add "Bank Clearance" and "Bank Reconciliation" in desk
 2020-09-03 10:56:17 +05:30
michellealva
0857e6d669 fix: Add "Bank Clearance" and "Bank Reconciliation" in desk 2020-09-03 10:37:43 +05:30
Frappe ERPnext
f28bef868d feat: Checkbox for activation of printing UOM after quantity 
Checkbox will be added to Frappe after installation of ERPNext.
(Print Settings docType is part of frappe app, not erpnext app)
 2020-09-02 21:42:52 +02:00
Frappe ERPnext
be3b8a1c96 Merge branch 'develop' of https://github.com/frappe/erpnext into uom_after_qty 2020-09-02 21:31:31 +02:00
dependabot[bot]
b872035fd9
chore(deps): bump bl from 3.0.0 to 3.0.1 
Bumps [bl](https://github.com/rvagg/bl) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/rvagg/bl/releases)
- [Commits](https://github.com/rvagg/bl/compare/v3.0.0...v3.0.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-09-02 17:22:19 +00:00
Anupam Kumar
c3984691b3
fix: Sales funnel data is inconsistent (#23110) 
* fix: Sales funnel data is inconsistent

* fix: data inconsistency

* fix: Converted Count

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-09-02 20:01:14 +05:30
Anurag Mishra
41f421d400 feat: added option to add custom remarks in payment entry 2020-09-02 13:47:18 +05:30
Rucha Mahabal
a1b5d57076 test: make rfq from opportunity 2020-09-02 13:14:01 +05:30
rohitwaghchaure
3312956890
Merge pull request #23019 from prssanna/gross-profit-total 
feat: enable total row in Gross Profit Report
 2020-09-02 12:18:41 +05:30
rohitwaghchaure
1ab6c3fe94
Merge pull request #23059 from marination/credit-limit-email 
fix: Credit Limit Email not working
 2020-09-02 12:14:51 +05:30
Rucha Mahabal
d2881ba4dd fix: set conversion factor while creating RFQ from Opportunity 2020-09-02 11:52:59 +05:30
rohitwaghchaure
efd1ac5840
Merge pull request #23050 from anupamvs/stock-entry-type 
fix: deleting unused Stock Entry Type
 2020-09-02 11:43:29 +05:30