nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-07 23:31:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,179 Commits 459 Branches 1,746 Tags
6ad268412145eb02454d8c98a0d128e01ac8ab4b
Commit Graph

32179 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuja Pawar
fa5e018330 fix: re-writing sql query with ORM methods 
(cherry picked from commit bc1e7bc15f)
 2021-11-08 18:36:58 +00:00
Anuja Pawar
8c84d6a1d9 fix: sider 
(cherry picked from commit 6a3bd882b4)
 2021-11-08 18:36:56 +00:00
Anuja Pawar
f76139dceb fix: sider 
(cherry picked from commit 4f53837624)
 2021-11-08 18:36:54 +00:00
Anuja Pawar
97544e2bbc fix: check if gst_category exist 
(cherry picked from commit 59c31bb124)
 2021-11-08 18:36:53 +00:00
mergify[bot]
117718d410 fix: ignore unsupported methods while resyncing (#28210) (#28211) 
(cherry picked from commit 72a050fb0b)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-11-02 23:09:44 +05:30
Marica
bcb0683be1 Merge pull request #28198 from frappe/mergify/bp/version-12-hotfix/pr-28195 
fix: (ux) Remove warehouse filter on Batch field for Material Receipt (backport #28195)
 2021-11-02 17:04:23 +05:30
marination
bf5f0a226e chore: Add comment above fix for future reference 
(cherry picked from commit 48886ee705)
 2021-11-02 10:41:16 +00:00
marination
55aaefb53c fix: Remove warehouse filter on Batch field for Material Receipt 
(cherry picked from commit 048210a8f6)
 2021-11-02 10:41:15 +00:00
Rohit Waghchaure
52ed3c219b Merge branch 'v12-pre-release' into version-12 v12.26.0 2021-10-30 15:04:29 +05:30
Rohit Waghchaure
1e378cfde0 bumped to version 12.26.0 2021-10-30 15:24:29 +05:50
rohitwaghchaure
29f5d434d8 Merge pull request #28158 from rohitwaghchaure/v12-change-log-fix 
fix: change log
 2021-10-30 15:01:51 +05:30
Rohit Waghchaure
aa0e21e84b fix: change log 2021-10-30 15:00:32 +05:30
rohitwaghchaure
34bf2004bb Merge pull request #28157 from rohitwaghchaure/v12-pre-release 
chore: change log for v12.26.0
 2021-10-30 14:58:19 +05:30
Rohit Waghchaure
7ac656d737 chore: change log for v12.26.0 2021-10-30 14:44:31 +05:30
Ankush Menat
ba537b0b93 fix: py2 string formatting 2021-10-29 15:41:55 +05:30
mergify[bot]
89b0e5023a fix: Skip empty rows while updating unsaved BOM cost (#28136) (#28141) 
- Dont try to get valuation rate if row has no item code
- Dont try to add exploded items if row has no item code

(cherry picked from commit 292419bc9e)

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2021-10-29 15:40:14 +05:30
rohitwaghchaure
a0e4708470 Merge pull request #28130 from rohitwaghchaure/merge-v12-hotfix-into-pre-release-for-v12-26 
chore: Merge branch 'version-12-hotfix' into 'v12-pre-release'
 2021-10-29 00:48:30 +05:30
Rohit Waghchaure
e60d7ac09e fix: python2 string formatting 2021-10-28 23:11:53 +05:30
Rohit Waghchaure
d6555e8632 Merge branch 'version-12-hotfix' into 'v12-pre-release' 2021-10-28 22:19:15 +05:30
Saqib
14602178e7 Merge pull request #28076 from GangaManoj/gross-profit-backport 
feat: Make Gross Profit Report more readable
 2021-10-27 15:07:23 +05:30
GangaManoj
5f2819c9b1 fix: Add column names 2021-10-25 02:24:19 +05:30
GangaManoj
5bc7d63646 fix: Get Bundle Items 2021-10-25 02:22:27 +05:30
GangaManoj
94162e0139 fix: Get Bundle Items 2021-10-25 02:15:56 +05:30
GangaManoj
e2e751e26f fix: Remove comments 2021-10-25 02:15:31 +05:30
GangaManoj
70244cee89 fix: Get data when grouped by invoice and otherwise 2021-10-25 02:15:03 +05:30
GangaManoj
ae6e69ebd4 fix: Display only the Invoice rows in bold 2021-10-25 02:14:32 +05:30
GangaManoj
6fdf4dd03e fix: Remove base_rate and buying_rate for Invoice rows 2021-10-25 02:12:21 +05:30
GangaManoj
4aede0ea3f fix: Calculate total buying_amount for each invoice 2021-10-25 02:11:14 +05:30
GangaManoj
de660bf9c4 fix: Fetch bundle item details 2021-10-25 02:11:10 +05:30
GangaManoj
391bf86e0a fix: Fetch base_net_total for each Invoice 2021-10-25 02:10:43 +05:30
GangaManoj
452c613974 fix: Calculate total buying_amount and gross profit for each invoice 2021-10-25 02:08:40 +05:30
GangaManoj
dd7b02ad7d fix: Remove Item Code and Item Name columns 2021-10-25 02:08:39 +05:30
GangaManoj
7cc02bf861 fix: Display Items in the format Item Code: Item Name 2021-10-25 02:08:36 +05:30
GangaManoj
678960209c fix: Add items belonging to Product Bundles as children 2021-10-25 02:08:12 +05:30
GangaManoj
e4995dc9ed fix: Set initial_depth to 3 2021-10-25 02:08:12 +05:30
GangaManoj
7cf5dc7dab fix: Assign indent and parent_invoice 2021-10-25 02:08:08 +05:30
GangaManoj
e676a09c18 fix: Make Invoice row bold 2021-10-25 02:04:03 +05:30
GangaManoj
6431243ce3 fix: Display items as descendants of invoices 2021-10-25 02:04:00 +05:30
GangaManoj
49f93b347c fix: Display data in tree form 2021-10-25 02:02:02 +05:30
mergify[bot]
27e9e47ba8 chore: warning for shopify integration deprecation (backport #26701) (#28062) 
* chore: warning for shopify integration deprecation (#26701)

* chore: warning for shopify integration deprecation

* fix: warn deprecation during patch for sysadmins

(cherry picked from commit e43bdf76a5)

# Conflicts:
#	erpnext/patches.txt

* fix: resolve conflicts

Co-authored-by: Ankush <ankush@iwebnotes.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-10-22 12:16:55 +05:30
Jannat Patel
c9f51d3cec Merge pull request #28017 from frappe/mergify/bp/version-12-hotfix/pr-27728 
fix: Employee Leave Balance report should only consider ledgers of transaction type Leave Allocation (backport #27728)
 2021-10-20 14:57:52 +05:30
Jannat Patel
9ae3f26dbf fix: conflicts 2021-10-20 12:34:04 +05:30
Goh Yan Chang
ad736f1789 Update employee_leave_balance.py 
fix: Employee Leave Balance report showing wrong figures
(cherry picked from commit 632f7848a3)

# Conflicts:
#	erpnext/hr/report/employee_leave_balance/employee_leave_balance.py
 2021-10-20 06:58:37 +00:00
Ankush Menat
16ece12516 fix: py2 compatible string formatting 2021-10-09 18:12:07 +05:30
Gavin D'souza
c9e75d2ab5 fix(patch): Handle NULL values from fieldtype change 2021-10-09 18:08:46 +05:30
mergify[bot]
985fdade7e fix(asset): expected value after useful life validation (#27791) 2021-10-05 14:14:52 +05:30
Saqib
10c34da174 fix: unexpected keyword argument 'as_dict' (#27799) 2021-10-05 13:13:20 +05:30
mergify[bot]
d1480be596 fix: set item uom as stock_uom if it isn't set (backport #27623) (#27781) 
* fix: set item uom as stock_uom if it isn't set (#27623)

* fix: set item uom as stock_uom if it isn't set

(cherry picked from commit 5c372202d5)

# Conflicts:
#	erpnext/stock/doctype/stock_entry/stock_entry.js

* fix: resolve conflicts

[skip ci]

Co-authored-by: Alan <2.alan.tom@gmail.com>
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-10-04 22:50:11 +05:30
Noah Jacob
93a744dc12 fix: empty row on new maintenance visit. (#27626) 
* fix: empty row on new maintenance visit.

* fix: check if rows exist
 2021-09-30 15:40:37 +05:30
Saqib
a2b98bb80c fix: cannot delete a project if linked with sales order (#27690) 2021-09-28 19:47:08 +05:30