Commit Graph

32580 Commits

Author SHA1 Message Date
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
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
rohitwaghchaure
f898c807b8
Merge pull request #23227 from rohitwaghchaure/multiple-job-card-fixes
Fix: job card issues
2020-09-02 11:41:37 +05:30
Rohit Waghchaure
86a190652e fix: incorrect job card timer issue 2020-09-02 11:04:56 +05:30
rohitwaghchaure
6a51f3929b
Merge pull request #23054 from marination/general-ledger-filters
fix: General Ledger filter validation
2020-09-01 17:53:32 +05:30
Deepesh Garg
36b7bb0282
Merge pull request #23229 from deepeshgarg007/gst_template_update
fix: Update tax template on supplier address change
2020-09-01 16:27:44 +05:30
Marica
329292b9c3
Merge branch 'develop' into credit-limit-email 2020-09-01 16:18:12 +05:30
Deepesh Garg
cebf803455 fix: Update tax template on supplier address change 2020-09-01 16:15:28 +05:30
rohitwaghchaure
a3dd156a8a
Merge pull request #22796 from anupamvs/variance-report-fix
fix: Target variance report signs
2020-09-01 15:12:21 +05:30
rohitwaghchaure
9bbb9dad8b
Merge pull request #23217 from anupamvs/product-contact-us-v13
fix: contact us button issue
2020-09-01 15:10:37 +05:30
Afshan
eb4b2aa142
fix: get_items from product bundle for purchase order (#22821)
* fix: get_items from product bundle for purchase order

* fix: Don't overwrite  doctype while setting attributes in child row

Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-09-01 15:01:32 +05:30
Shivam Mishra
d19947fccd
Merge pull request #23148 from scmmishra/feat-exotel-customer-link 2020-09-01 13:47:31 +05:30
Shivam Mishra
e91a5437bd
Merge pull request #23038 from scmmishra/iff-invoicing 2020-09-01 13:35:32 +05:30
Shivam Mishra
1b5de62454
Merge pull request #23121 from Mangesh-Khairnar/add-integrations-desk-page
feat: add integrations desk page
2020-09-01 13:34:52 +05:30
Anupam Kumar
232cb37ebf
Merge branch 'develop' into variance-report-fix 2020-09-01 09:31:22 +05:30
Anupam Kumar
477e41197e
Merge branch 'develop' into item-group-filter-portal 2020-09-01 09:09:19 +05:30
Deepesh Garg
37cb44e109
Merge pull request #23127 from marination/quoted-item-report-v2
feat: Quoted Item Comparison Report Enhancements v2
2020-08-31 21:28:56 +05:30