nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-15 03:01:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,842 Commits 463 Branches 1,752 Tags
4ff1a4361d72a32b58e528ccade64ea9e263abea
Commit Graph

30842 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
rohitwaghchaure
03f688acd9 fix: pos, serial no popup comin two times (#22268) 2020-06-17 09:36:23 +05:30
rohitwaghchaure
fd5c577b40 Merge pull request #22248 from rohitwaghchaure/fixed-version-12-hotfix-travis 
fix: v12 travis
 2020-06-16 09:55:26 +05:30
Rohit Waghchaure
e4834d2a37 fix: travis 2020-06-15 22:24:56 +05:30
marination
1e76bdcc3c feat: Multi UOM support in Request for Quotation 2020-06-15 17:53:47 +05:30
Sahil Khan
b6c6406206 Merge branch 'version-12-hotfix' of https://github.com/frappe/erpnext into v12-pre-release 2020-06-15 16:58:22 +05:30
rohitwaghchaure
253a698708 Merge pull request #22247 from marination/backflush-rm-rate-hotfix 
fix: Wrong key sent to get_valuation_rate
 2020-06-15 14:50:02 +05:30
marination
b819d8cdb6 fix: Wrong key sent to gte_valuation_rate 2020-06-15 14:47:37 +05:30
P-Froggy
84f44588d8 fix: Validation of Purchase Order against Material Request missing (#22224) 
Validation of Purchase Order and Purchase Order Item against the linked Material Request Item was missing.
This way, it was possible to exchange items while making a purchase order and still fulfill the material request, even though the items did not match.

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-06-15 13:40:54 +05:30
rohitwaghchaure
14961e55c8 Merge pull request #22196 from marination/add-to-cart-stock-hotfix 
fix: Handle unavailable Variants in Website
 2020-06-15 13:11:18 +05:30
rohitwaghchaure
db48fc2559 Merge pull request #22218 from marination/update-items-permission-fix-hotfix 
fix: submitted sales order can be updated with no permission
 2020-06-15 13:10:15 +05:30
marination
713cbcea44 fix: Travis 2020-06-15 12:09:04 +05:30
marination
0a31e2ea92 fix: Fetch cart setting from argument 2020-06-15 12:02:28 +05:30
rohitwaghchaure
087278baba Merge pull request #22209 from frappe/michellealva-expense-claim 
fix: add filter for cost center in expense table
 2020-06-15 10:36:31 +05:30
rohitwaghchaure
faff772619 Merge pull request #22220 from Anurag810/quality_procedure_fix_v12 
fix: Child is shown in Parent process if added from tree view
 2020-06-15 10:34:09 +05:30
Deepesh Garg
fa1af6d74e Merge pull request #22200 from marination/qi-on-return-hotfix 
fix: Don't prompt for Quality Inspection on Return Documents.
 2020-06-14 17:10:13 +05:30
rohitwaghchaure
01d2548235 Merge pull request #22238 from rohitwaghchaure/item-none-not-found-opening-creation-tool 
fix: item none not found while making sales invoice using opening inv…
 2020-06-14 15:09:08 +05:30
Rohit Waghchaure
5b11d18d86 fix: item none not found while making sales invoice using opening invoice creation tool 2020-06-14 14:06:12 +05:30
Deepesh Garg
e4cd23746b fix: Consider Overseas category in RCM 2020-06-14 13:20:09 +05:30
Deepesh Garg
d2ed36f167 Merge pull request #22229 from deepeshgarg007/financial_statement_to_date 
fix: Data not appearing properly for some fiscal_year in financial statements
 2020-06-13 19:19:55 +05:30
Deepesh Garg
1222fb074f fix: Data not appearing properly for some fiscal_year in financial statemets 2020-06-13 19:16:37 +05:30
Abhishek Balam
486be1049c fix(HR): Rename due_advance_amount field in Employee Advance for v12 (#22216) 
* added patch for moving data

* changed fieldname and references for easier debugging

* style: Added EOF

* reload doc for patch
 2020-06-13 01:18:29 +05:30
Anurag Mishra
9319153ab3 fix: Child is shown in Parent process if added from tree view 2020-06-12 17:04:25 +05:30
rohitwaghchaure
9ea539d335 Merge pull request #22158 from pipech/v12-hotfix-pricing_rule-missing_income_account 
fix(pricing_rule): missing income account when getting free product
 2020-06-12 17:00:13 +05:30
marination
f6054a2de8 fix: Added PO test and conversion factor fix 
- Don't change conversion factor if stock uom and uom is the same
- Added PO test
- Added Accounts User basic role in PO
- Minor fixes, wrong variables
 2020-06-12 16:28:44 +05:30
Saqib Ansari
6a9f368292 fix: unexpected removal of print hide field 2020-06-12 16:25:57 +05:30
Saqib Ansari
9ee4841520 fix: cannot update delivery date 2020-06-12 16:25:38 +05:30
Saqib Ansari
39e125b8a2 fix: label 2020-06-12 16:25:28 +05:30
Saqib Ansari
37b614af0e fix: submitted sales order can be updated with no permission 2020-06-12 16:25:07 +05:30
Marica
1dc3c40b00 Merge branch 'version-12-hotfix' into qi-on-return-hotfix 2020-06-12 12:32:27 +05:30
Marica
8ce5e04777 Update stock_controller.py 2020-06-12 12:32:12 +05:30