CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-21 03:04:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,943 Commits 425 Branches 1,723 Tags
2a615af00a754162c202d10f77e1c1d36a6d48cd
Commit Graph

40943 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Saqib Ansari
8a8921fb5b fix: unknown column 'ref_exchange_rate' 
(cherry picked from commit 18e5d59d24)
 2021-09-27 07:36:15 +00:00
Saqib Ansari
705f094a1a chore: hide exchange gain loss if empty 
(cherry picked from commit e6b4d33f4b)
 2021-09-27 07:36:15 +00:00
Saqib Ansari
19b06b0745 patch: invalid gain loss gl entry 
(cherry picked from commit beebfb323a)
 2021-09-27 07:36:15 +00:00
Saqib Ansari
2108bf9f73 fix: cost center in exchange gain loss gl entry 
(cherry picked from commit 78ad50efc2)
 2021-09-27 07:36:14 +00:00
Saqib Ansari
677a59b005 chore: hide exchange gain loss if empty 
(cherry picked from commit dd2d039ca8)
 2021-09-27 07:36:13 +00:00
Saqib Ansari
af531372da fix: setting of gain/loss if party account is in company currency 
(cherry picked from commit 64efe8bf15)
 2021-09-27 07:36:13 +00:00
Frappe PR Bot
986ca8815d fix: local variable 'fiscal_year_details' referenced before assignment (#27658) 2021-09-26 20:28:06 +05:30
Frappe PR Bot
646f8b7871 fix: update default KSA VAT rate for setup (#27614) (#27622) 
(cherry picked from commit abded895f3)

Co-authored-by: Kenneth Sequeira <33246109+kennethsequeira@users.noreply.github.com>
 2021-09-26 11:14:20 +05:30
Frappe PR Bot
08e24bd907 fix: holiday message reminder (#27654) 
Minor grammatical change

(cherry picked from commit dafe99b6e2)

Co-authored-by: escix <preminik@preminik.com>
 2021-09-26 11:12:48 +05:30
Frappe PR Bot
e5a062ceb6 feat: add Partly Paid status in Invoices (#27636) 
(cherry picked from commit c8b9a55e96)

Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2021-09-22 12:17:58 +05:30
Bhavesh Maheshwari
9ebabb86b3 fix: remove unknown field employee_name from query (#27634) 
* fix: remove unknown field employee_name from query

* fix: remove unknown fieldname

Co-authored-by: root <root@vultr.guest>
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
 2021-09-21 20:30:53 +05:30
Frappe PR Bot
5a8d57f2ae fix: remove bad default for anniversary reminders (#27632) (#27633) 
🤦

(cherry picked from commit c302c7ab42)

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-09-21 17:55:05 +05:30
Frappe PR Bot
47c6fba317 fix: (ux) Use subassembly schedule date while making WO from Prod Plan (bp #27628) 
- Set subassemply WO's planned start date from Production Plan

(cherry picked from commit 9110223341)

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2021-09-21 17:12:45 +05:30
Frappe PR Bot
19446a8ddd feat: Merge POS invoices based on customer group (#27553) 
* feat: Merge POS invoices based on customer group (#27471)

* feat: Merge POS invoices based on customer group

* fix: Linting Issues

* fix: fieldname

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
(cherry picked from commit c9c8957250)

# Conflicts:
#	erpnext/patches.txt

* fix: Update patches.txt

* fix: Remove v14 patch

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2021-09-21 11:17:44 +05:30
Frappe PR Bot
fec19a9532 Update training_result.js (#27615) (#27620) 
cur_frm is deprecated

(cherry picked from commit 5c400da4e2)

Co-authored-by: François de Ryckel <f.deryckel@gmail.com>
 2021-09-21 09:32:18 +05:30
mergify[bot]
6ba1b03ee5 fix: reference row added in allocation table (#27613) 2021-09-20 21:37:55 +05:30
Ganga Manoj
1ba4afa986 fix: Set parent_detail_docname to prevent overwriting Packed/Bundle Items on saving (#27571) 2021-09-20 21:36:07 +05:30
mergify[bot]
10cffe81b0 fix: Webform Permission for custom doctype (backport #26232) (#27592) 
* fix: Webform Permission for custom doctype (#26232)

* fix: Webform Permission for custom doctype

* fix: sider fix

* fix: app check condition for getting correct list_context

* chore: Better naming convention

* test: Added test case to check permission for webform of custom doctype

* chore: linting issue

* chore: linting issue

* fix: sider fix

* test: minor changes

* chore: linter and better naming method

* chore: linter fix

(cherry picked from commit 9aa6f52edd)

# Conflicts:
#	erpnext/hooks.py

* chore: Resolved Conflicts

Co-authored-by: Shariq Ansari <30859809+shariquerik@users.noreply.github.com>
 2021-09-20 20:28:29 +05:30
Ankush Menat
72c22a4219 Merge pull request #27604 from frappe/mergify/bp/version-13-hotfix/pr-27601 
fix(ux): warn when overbilling allowance was bypassed due to role (backport #27601)
 2021-09-20 18:17:40 +05:30
Ankush Menat
684ca451d3 fix(ux): better error message 
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
(cherry picked from commit 21a955d20b)
 2021-09-20 12:13:37 +00:00
Ankush Menat
8cdd6eacdd refactor: add guard clause in for loop 
Reduce overly indented code/improve readability.

(cherry picked from commit 5e4fbba753)
 2021-09-20 12:13:37 +00:00
Ankush Menat
2dc590c0c0 fix: warn when overbilling checks are skipped. 
(cherry picked from commit 43bf82b58b)
 2021-09-20 12:13:36 +00:00
Ankush Menat
55393d160d perf: extract loop invariant db calls 
(cherry picked from commit 648b2d72a5)
 2021-09-20 12:13:36 +00:00
Frappe PR Bot
9b46dd512b fix(plaid): query to check if bank account exists (#27595) 2021-09-20 15:45:13 +05:30
Saqib
7aaecbcac9 fix: Move related fields together in Selling Settings (#27383) 2021-09-20 15:30:50 +05:30
Deepesh Garg
846d128c5d fix: Test Case 2021-09-20 11:06:10 +05:30
Rohit Waghchaure
c800ff5068 Merge branch 'version-13-pre-release' into version-13 v13.11.1 2021-09-19 14:39:45 +05:30
Rohit Waghchaure
de8b3570f5 bumped to version 13.11.1 2021-09-19 14:59:45 +05:50
Frappe PR Bot
5978286b52 fix: Handle is_search_module_loaded for redis version < 4.0.0 (#27574) (#27578) 
- Return False if error occurs

(cherry picked from commit d6ed6d53e9)

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2021-09-18 15:25:44 +05:30
Marica
d6ed6d53e9 fix: Handle is_search_module_loaded for redis version < 4.0.0 (#27574) 
- Return False if error occurs
 2021-09-18 14:23:44 +05:30
Frappe PR Bot
a741fd1cfe fix: PO/PINV - Check if doctype has company_address field before setting the value (#27441) (#27575) 
Co-authored-by: Vama Mehta <vama.mehta@inqubit.in>
(cherry picked from commit 666eaae6ce)

Co-authored-by: vama <vamagithub@gmail.com>
 2021-09-18 13:24:33 +05:30
vama
666eaae6ce fix: PO/PINV - Check if doctype has company_address field before setting the value (#27441) 
Co-authored-by: Vama Mehta <vama.mehta@inqubit.in>
 2021-09-18 13:21:45 +05:30
Anoop
9ffb65b5a4 fix(healthcare): Duplicate Contact error on add Patient (#27427) 
* fix: duplicate contact error when linking existing Customer to Patient
validation for existing User email and mobile before creating user on Patient update

* test: patient - test contact, user creation

* fix: test_patient_contact clearing contact breaking other tests
sider issues

* fix: use db_set instead of set_value

* fix(test): overlapping appointments

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-09-18 01:02:31 +05:30
Subin Tom
8c01ae952b conflict fixes 2021-09-17 20:18:39 +05:30
Subin Tom
e8cf32e1c8 fixing conflicts 2021-09-17 20:16:10 +05:30
Frappe PR Bot
e6d0a57f0c ci: fix docs checker for empty body (#27569) 
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-09-17 17:20:59 +05:30
Saqib
5451aed115 Merge branch 'version-13-hotfix' into backport-fix-selling-settings 2021-09-17 15:56:01 +05:30
Frappe PR Bot
bd1c823aa6 fix: unecessary keyword args were passed in mapper functions (#27563) (#27564) 
(cherry picked from commit e03d9aa889)

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-09-17 13:21:33 +05:30
Frappe PR Bot
6ed40463a0 fix: unecessary keyword args were passed in mapper functions (#27563) (#27565) 
(cherry picked from commit e03d9aa889)

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-09-17 13:11:54 +05:30
Subin Tom
8dfdab9dc1 fix: Tax breakup based on items, missing GST fields (#27524) 
* fix: Tax breakup based on items

* fix: added gst fields,warehouse validation to pos inv,patch

* fix: tax breakup test fix, eway bill hsn fix

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
(cherry picked from commit d49346ac45)

# Conflicts:
#	erpnext/patches.txt
#	erpnext/regional/india/setup.py
 2021-09-17 05:21:40 +00:00
Frappe PR Bot
e990bb8816 fix: Remove duplicates from customer_code field (bp #27555) 
(cherry picked from commit 41f11eca72)

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2021-09-17 05:15:03 +00:00
Deepesh Garg
e2eb72eb5b fix: Deferred revenue entries post account freezing 2021-09-16 18:54:57 +05:30
Frappe PR Bot
450e1e8ed4 fix: no validation on item defaults (#27549) 
* fix: no validation on item defaults (#27393)

* fix: no validation on item defaults

* fix: cache value while validating

* test: item default company relation

* fix: reorder validations

* refactor: add guard conditions on update_defaults

* test: add default warehouse for item group

* fix: validate item defaults for item groups

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
(cherry picked from commit 5eba1ccd51)

# Conflicts:
#	erpnext/setup/doctype/item_group/item_group.py
#	erpnext/stock/doctype/item/item.py

* fix: resolve conflicts

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-09-16 12:25:39 +00:00
Saqib
24c08f5092 Merge branch 'version-13-hotfix' into backport-fix-selling-settings 2021-09-16 16:59:54 +05:30
Frappe PR Bot
adc5bf7b9c Merge pull request #27543 from frappe-pr-bot/backport/version-13-hotfix/27538 
fix: Validate if item exists on uploading items in stock reco
 2021-09-16 16:07:56 +05:30
Frappe PR Bot
e9683fad47 fix(ProdPlan): Get SubAssy Items does not work (bp #27537) 
* fix(ProdPlan): Get SubAssy Items does not work

This button wasn't working unless the document was saved already.

* fix: make form dirty when subassy item are fetched

(cherry picked from commit 78fe92542c)

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-09-16 10:22:43 +00:00
Frappe PR Bot
5a34520f3f fix(minor): Employee filter in Unpaid Expense Claims report (#27530) (#27531) 
(cherry picked from commit 866763c16a)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-09-16 00:14:00 +05:30
Frappe PR Bot
8b3ef8e96e test: automated test for running all stock reports (#27510) (#27522) 
* test: automated test for running all stock reports

These test do not assert correctness, they just check that "execute" function
is working with sane filters.

* test: make report execution test modular

(cherry picked from commit 70c203d19e)

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-09-15 22:23:07 +05:30
Rohit Waghchaure
79d1cf161e Merge branch 'version-13-pre-release' into version-13 v13.11.0 2021-09-15 21:11:53 +05:30
Rohit Waghchaure
fb55b57f5c bumped to version 13.11.0 2021-09-15 21:31:52 +05:50