nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-18 14:25:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,972 Commits 443 Branches 1,739 Tags
85dca013ee467c526d3d64b0c7222b7fbfec528f
Commit Graph

31972 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rohitwaghchaure
a3e92489c2 Merge pull request #22337 from frappe/mergify/bp/version-12-hotfix/pr-22334 
fix: Customer Group label in Item-wise Sales History report (bp #22334)
 2020-06-19 11:00:17 +05:30
Kenneth Sequeira
4793e9c24c fix: Customer Group label in Itemwise Sales report 
(cherry picked from commit 766f978858)
 2020-06-19 05:29:07 +00:00
rohitwaghchaure
dd8dcd29c3 Merge pull request #22332 from marination/item-edit-hotfix 
fix: Unabled to create batched item
 2020-06-19 10:57:25 +05:30
Kenneth Sequeira
10624f3fa6 fix: Customer Group label in Itemwise Sales report 
(cherry picked from commit 766f978858)
 2020-06-19 05:26:23 +00:00
Marica
a0aa16c68c Merge branch 'version-12-hotfix' into item-edit-hotfix 2020-06-18 22:02:32 +05:30
marination
67361bef73 fix: Unabled to create batched item 2020-06-18 21:47:36 +05:30
Poranut Chollavorn
acf399c4e0 fix(pricing_rule): apply_on logic dont get cleanup 2020-06-18 14:41:26 +00:00
Sahil Khan
66a33bf7d9 Merge branch 'v12-pre-release' into version-12 v12.10.0 2020-06-18 20:06:18 +05:30
Sahil Khan
aa27a0e85c bumped to version 12.10.0 2020-06-18 20:26:18 +05:50
sahil28297
a9dbff0eae chore: correct version in release note 2020-06-18 20:03:00 +05:30
Marica
a9ed42f93d fix: Quality procedure fixes (#22287) 
* fix: Quality Procedure Fixes

- Dont prompt error message if parent is the same in child
- filter child procedure field
- Disable New button in tree view
- Editable grid for Quality Procedure Proces table.

* chore: Remove unnecessary get_doc

* fix: Codacy

Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
(cherry picked from commit cce1116b4e)
 2020-06-18 13:48:34 +00:00
Marica
cce1116b4e fix: Quality procedure fixes (#22287) 
* fix: Quality Procedure Fixes

- Dont prompt error message if parent is the same in child
- filter child procedure field
- Disable New button in tree view
- Editable grid for Quality Procedure Proces table.

* chore: Remove unnecessary get_doc

* fix: Codacy

Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
 2020-06-18 19:15:49 +05:30
Poranut Chollavorn
66806ff1b0 fix(pricing_rules): rule won't got use across [item_code, item_group, brands] 2020-06-18 13:43:15 +00:00
Deepesh Garg
fc488a2b46 fix: Do not copy Item Tax template from SO to PO (#22326) 2020-06-18 18:19:49 +05:30
Nabin Hait
f53ee9026b chore: Added Change log 2020-06-18 18:13:51 +05:30
mergify[bot]
5bd479e8ee refactor: handle exceptions when updating addresses (#22307) (#22316) 
* refactor: handle exceptions when updating addresses

* refactor: fold common statements in a loop

(cherry picked from commit 34d2bfbb3e)

Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
 2020-06-18 17:04:45 +05:30
mergify[bot]
531ef15e30 refactor: handle exceptions when updating addresses (#22307) (#22315) 
* refactor: handle exceptions when updating addresses

* refactor: fold common statements in a loop

(cherry picked from commit 34d2bfbb3e)

Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
 2020-06-18 17:04:36 +05:30
Deepesh Garg
6dc6da1ce2 Merge pull request #22324 from deepeshgarg007/item_tax_map_v12 
fix: Do not copy Item Tax template from SO to PO
 2020-06-18 17:02:56 +05:30
Deepesh Garg
f9dbcef5c9 fix: Do not copy Item Tax template from SO to PO 2020-06-18 17:01:32 +05:30
mergify[bot]
1ca4370033 fix: asset maintenance fixes (#21277) (#22294) 
* fix: asset maintenance fixes

* fix: tests

(cherry picked from commit 9c494d3e72)

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2020-06-18 15:39:13 +05:30
mergify[bot]
62882ea65b fix: asset maintenance fixes (#21277) (#22300) 
* fix: asset maintenance fixes

* fix: tests

(cherry picked from commit 9c494d3e72)

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2020-06-18 15:30:04 +05:30
mergify[bot]
0c08324fab chore: add standard queries hooks to whitelist (#21939) (#22305) 
standard queries are used within the search widget, and now require to
be whitelisted before they can be executed through the search widget.

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>

Co-authored-by: sahil28297 <37302950+sahil28297@users.noreply.github.com>
(cherry picked from commit 96100e9507)

Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
 2020-06-18 15:29:46 +05:30
mergify[bot]
2417d9492f fix(HR): typo in error message in Employee Balance Report (#22306) (#22313) 
* fix: typo in date error message

* fix: error message cleanup in Leave Balance report

(cherry picked from commit af6a0f3a9d)

Co-authored-by: Kenneth Sequeira <33246109+kennethsequeira@users.noreply.github.com>
 2020-06-18 15:28:39 +05:30
Marica
c6886e28f2 Merge branch 'version-12-hotfix' into rfq-multi-uom-hotfix 2020-06-18 14:42:27 +05:30
marination
b865d58b81 fix: Patch simplification 
- Also, apply patch to all docs
 2020-06-18 14:43:31 +05:30
Kenneth Sequeira
af6a0f3a9d fix(HR): typo in error message in Employee Balance Report (#22306) 
* fix: typo in date error message

* fix: error message cleanup in Leave Balance report
 2020-06-18 14:34:11 +05:30
rohitwaghchaure
130d254b5a Merge pull request #22310 from rohitwaghchaure/fixed-incorrect-variable-used-pre-release 
fix: incorrect variable used while adding items in the submitted sale…
 2020-06-18 14:18:22 +05:30
Rohit Waghchaure
82abcc94fa fix: incorrect variable used while adding items in the submitted sales order 2020-06-18 14:17:16 +05:30
rohitwaghchaure
f635a1739e Merge pull request #22308 from rohitwaghchaure/fixed-incorrect-variable-used 
fix: incorrect variable used while adding new item in the submitted Sales Order
 2020-06-18 14:00:51 +05:30
Rohit Waghchaure
c75236579f fix: incorrect variable used while adding items in the submitted sales order 2020-06-18 13:59:23 +05:30
Mangesh-Khairnar
6a0bd556d7 fix: update shopify api version (#22297) 2020-06-18 12:48:52 +05:30
mergify[bot]
5d042ad496 fix: update shopify api version (#22284) (#22299) 
Co-authored-by: Saurabh <saurabh@erpnext.com>
(cherry picked from commit 53b601523b)

Co-authored-by: Mangesh-Khairnar <mkhairnar10@gmail.com>
 2020-06-18 09:47:15 +05:30
mergify[bot]
59938a46eb fix: typo for language in Terms description (#22270) (#22272) 
(cherry picked from commit c159556c24)

Co-authored-by: Kenneth Sequeira <33246109+kennethsequeira@users.noreply.github.com>
 2020-06-18 09:46:03 +05:30
P-Froggy
1284b9b17d fix: Set Value of wrong Bank Account Field in Payment Entry 
Company bank account was wrongly inserted into the field "Party Bank Account" in payment entry, instead of "Bank Account".
Adds filters for "Party Bank Account" based on selected Party (I forgot to create a PR for version-12 back in February, see commit #393a626).
Also changes the label of "Default Bank Account" to "Default Company Bank Account", like suggested in PR #20632

#### Please Note
This is kind of a revert of PR #19390. However, it seems like the function "get_party_bank_account" in Bank Account doctype changed how it worked since it is clearly pulling the default company bank account.
 2020-06-18 02:11:15 +02:00
Marica
c5c179490b Merge pull request #22293 from marination/variant-error-msg-pre-release 
fix: Typo in Item Variant Error Message
 2020-06-17 19:24:11 +05:30
Marica
1345bc2f82 Merge pull request #22291 from marination/variant-error-msg-hotfix 
fix: Typo in Item Variant error message
 2020-06-17 19:23:42 +05:30
marination
e256a7439e fix: Typo 2020-06-17 19:20:56 +05:30
marination
e67195b0b9 fix: Typo 2020-06-17 19:06:56 +05:30
Deepesh Garg
e4eb353065 Merge branch 'version-12-hotfix' into rcm_version-12-hotfix 2020-06-17 15:33:45 +05:30
Marica
b665da7cb4 Merge pull request #22282 from frappe/mergify/bp/v12-pre-release/pr-22281 
fix: Message Formatting for missing Expense Account (bp #22281)
 2020-06-17 13:55:25 +05:30
marination
7be4ba9351 fix: Message Formatting 
(cherry picked from commit 17ec1d6b28)
 2020-06-17 08:24:16 +00:00
Marica
41dadba990 Merge pull request #22281 from marination/expense-account-message 
fix: Message Formatting for missing Expense Account
 2020-06-17 13:51:09 +05:30
marination
17ec1d6b28 fix: Message Formatting 2020-06-17 13:46:21 +05:30
rohitwaghchaure
d4c2c4e170 Merge pull request #22276 from frappe/mergify/bp/v12-pre-release/pr-22268 
fix: pos, serial no popup coming two times (bp #22268)
 2020-06-17 12:27:20 +05:30
rohitwaghchaure
23a2d789ec Merge pull request #22277 from frappe/mergify/bp/v12-pre-release/pr-22248 
fix: v12 travis (bp #22248)
 2020-06-17 12:27:07 +05:30
Rohit Waghchaure
5e68fdbaee fix: travis 
(cherry picked from commit e4834d2a37)
 2020-06-17 05:40:14 +00:00
rohitwaghchaure
9c55efa8c6 fix: pos, serial no popup comin two times (#22268) 
(cherry picked from commit 03f688acd9)
 2020-06-17 05:35:50 +00:00
rohitwaghchaure
256b6950f5 Merge pull request #22273 from frappe/mergify/bp/v12-pre-release/pr-22267 
refactor: hide company currency fields in the routing (bp #22267)
 2020-06-17 10:59:58 +05:30
rohitwaghchaure
956368e457 refactor: hide company currency fields in the routing (#22267) 
(cherry picked from commit fd3ff6be18)
 2020-06-17 04:13:12 +00:00
rohitwaghchaure
fd3ff6be18 refactor: hide company currency fields in the routing (#22267) 2020-06-17 09:37:41 +05:30