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

40943 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
marination
a0bbe7fea7 fix: Sider and Patches 
- Sider fixes
- Deleted patches that worked as per old schema
- Cleared instances of web fields linked to Item master
 2021-05-17 21:27:42 +05:30
marination
6a802f354b feat: Product View toggling 
- Added fully functional list and grid view toggling
- Added ProductGrid and ProductList controllers
- Moved html snippets, rendered via JS now
- Item Group page also rendered via common controller
- Paging section rendered via JS
- Minor style changes
 2021-05-17 20:44:41 +05:30
Ankush Menat
b6783b158f chore: translation fixes 2021-05-17 17:06:41 +05:30
Ankush Menat
f3b3d81e0b fix: escape company name in deferred_revenue 2021-05-17 17:06:41 +05:30
noahjacob
41ac8be6f2 refactor: base_amount field moved below amount field and renamed 2021-05-17 13:58:27 +05:30
Nabin Hait
6bae78f410 Merge branch 'version-13-pre-release' into version-13 v13.3.0 2021-05-17 11:36:29 +05:30
Nabin Hait
bc92ecb10f bumped to version 13.3.0 2021-05-17 11:56:29 +05:50
Anupam
42d2f663fa fix: sider fixes 2021-05-17 11:08:26 +05:30
Nabin Hait
9ec0f11800 fix: renamed change log 2021-05-17 10:50:42 +05:30
Nabin Hait
2f403f1bcd fix: renamed change log 2021-05-17 10:50:26 +05:30
Nabin Hait
ad0b8fdd1e chore: Added change log for v13.3.0 2021-05-17 10:49:21 +05:30
Deepesh Garg
87baa646e7 Merge pull request #25260 from AfshanKhan/dimension-wise-accounts-balance-reports 
feat: Dimension-wise Accounts Balance Report
 2021-05-16 18:04:01 +05:30
Anupam
35137ba9e0 removing currency filter and added rate conversion while fetching timesheets in SI 2021-05-16 14:17:56 +05:30
Anupam
cab998c293 adding patch 2021-05-15 20:40:20 +05:30
Anupam
fd4743cc31 refactor: timesheet 2021-05-15 20:01:17 +05:30
Deepesh Garg
d8de7fccc2 feat: Show net values in Party Accounts 2021-05-14 19:17:28 +05:30
Alan
55c2fec683 feat: add pending qty section to batch/serial selector dialog (#25519) 
* feat: add pending qty section to batch/serial selector dialog

* fix: call attach in setup and refresh, fix conditional

* refactor: camel to snake casing
 2021-05-14 12:36:41 +05:30
rohitwaghchaure
2aa401826e fix: validation message of quality inspection in purchase receipt (#25666) 2021-05-14 12:34:50 +05:30
rohitwaghchaure
e9f6c8cdb1 fix: validation message of quality inspection in purchase receipt (#25667) 2021-05-14 12:34:13 +05:30
Alan
98fc4195b3 fix: send emails on rfq submit (#25695) 
* fix: send emails on rfq submit

* fix: check if email is present for supplier
 2021-05-14 12:22:28 +05:30
Alan
eca86290bc fix: show uom for item in selector dialog (#25697) 2021-05-14 12:21:38 +05:30
Deepesh Garg
be3cde9313 chore: Code clean up for purchase receipt GL (#25379) 
* chore: Code clean up for purchase receipt GL

* fix: add params for debit and credit in account curreny

* chore: Asset GL entry code cleanup

* fix: Syntax error

* fix: Update variable names

* fix: function naming

* fix: Add undefined variables

* fix: Supplier warehouse fetching

* fix: Linting issues
 2021-05-14 12:20:38 +05:30
Deepesh Garg
55fe85d850 feat(India): Multiple GST enhancement and fixes (#25249) 
* fix: RCM tax calculation

* feat(India): ITC Reversal via Journal Entry

* fix: Reverse Charge booking logic and validation

* fix: Addd patch for availed ITC fields

* fix: Hooks method to update availed ITC field

* fix: Cleanup and fixes in GSTR3B report

* fix: Update params in GSTR-1 report

* fix: Debit note using Sales Invoice

* fix: Setup and patch

* fix: GSTR 3B report cleanup and updates

* fix: Add method to get invoices liable to reverse charge

* fix: Add taxable value in Purchase Invoice Item

* fix: Inward supplies liable to reverse charge

* fix: Linting issues

* fix: GSTR3B report test
 2021-05-14 12:17:41 +05:30
rohitwaghchaure
ba940bb9e1 Merge pull request #25702 from rohitwaghchaure/change-today-to-now-for-reposting 
fix: change today to now to get data for reposting
 2021-05-13 17:44:38 +05:30
rohitwaghchaure
0048418c46 Merge pull request #25703 from rohitwaghchaure/change-today-to-now-for-reposting-pre 
fix: change today to now to get data for reposting
 2021-05-13 17:44:27 +05:30
rohitwaghchaure
fc44478810 Update repost_item_valuation.py 2021-05-13 17:42:33 +05:30
Rohit Waghchaure
a0a88a710e fix: change today to now to get data for reposting 2021-05-13 17:42:06 +05:30
Rohit Waghchaure
af1376c1df chore: change today to now to get data for reposting 2021-05-13 17:39:49 +05:30
Mohammad Hasnain Mohsin Rajan
e85770fe3f fix: bank statement import via google sheet (#25676) 
* fix: google sheet bank statement import

* fix: quotes

Co-authored-by: Ankush Menat <ankushmenat@gmail.com>

* chore: add translation

Co-authored-by: Ankush Menat <ankushmenat@gmail.com>

* chore: grammar

Co-authored-by: Ankush Menat <ankushmenat@gmail.com>

* fix: remove comment

Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
 2021-05-13 17:33:18 +05:30
Mohammad Hasnain Mohsin Rajan
7c6de1a8ac fix: bank statement import via google sheet (#25677) 
* fix: change links in workspace

* fix: google sheet bank statement import

* chore: quotes

* fix: capitalization

* fix: typo

* chore: add translation
 2021-05-13 17:28:49 +05:30
rohitwaghchaure
d42dd5d868 Merge pull request #25694 from rohitwaghchaure/fixed-warehouse-tree-time-out-error-13hotfix 
fix: timeout error while loading warehouse tree
 2021-05-13 17:21:16 +05:30
Rohit Waghchaure
27f50d5852 fix: timeout error while loading warehouse tree 2021-05-13 15:54:35 +05:30
Deepesh Garg
6084baa9ae Merge pull request #25700 from deepeshgarg007/consolidated_report_param_fix_v13 
fix: Parameter for get_filtered_list_for_consolidated_report in consolidated balance sheet
 2021-05-13 15:23:53 +05:30
Deepesh Garg
347fcedb2e Merge pull request #25698 from deepeshgarg007/consolidated_report_param_fix 
fix: Parameter for get_filtered_list_for_consolidated_report in consolidated balance sheet
 2021-05-13 15:23:36 +05:30
Deepesh Garg
8e748f8451 fix: Parameter for get_filtered_list_for_consolidated_report in consolidated balance sheet 2021-05-13 15:21:51 +05:30
Deepesh Garg
95e05fbdac fix: Parameter for get_filtered_list_for_consolidated_report in consolidated balance sheet 2021-05-13 14:59:28 +05:30
Marica
321b8afbff Merge branch 'version-13-hotfix' into e-commerce-refactor 2021-05-13 14:28:45 +05:30
marination
a975f9915b feat: (wip) Toggle Views 
- Auto Height on Cards
- Title with ellipses on length exceed
- Changed namepaces
- Moved product card rendering to JS
- Added Image and List View Toggling buttons
- Kept basic filters rendering just as before
 2021-05-13 14:26:25 +05:30
marination
163a62476e fix: Show Offers section only if offers exist 2021-05-13 14:26:06 +05:30
marination
acb6ce8f95 feat: Offer Display 
- Added offers section in website item
- Added more roles to website item
- Fixed attachment limit issue in website item
- Created Website Offer child doctype
- Added offers listing in Item full page view
- style fixes
 2021-05-13 14:25:40 +05:30
Anurag Mishra
0c482fde5f feat: Leave Policy Assignment Refactor (#24327) 
* feat: Leave Policy Assignment Refactor

* fix: Changes Requested

* fix: sider

* fix: changes requested

* test: fixed

* test: fixed wrong set query

* fix: remove commented code

* fix(style): extra space

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-05-13 13:20:14 +05:30
rohitwaghchaure
c29c6ff9a7 Merge pull request #25692 from rohitwaghchaure/fixed-woocommerce-order-sync-issue-pre 
fix: Woocommerce order sync issue
 2021-05-12 23:09:33 +05:30
Rohit Waghchaure
fe68a0ff80 fix: Woocommerce order sync issue 2021-05-12 23:08:16 +05:30
rohitwaghchaure
0612300631 Merge pull request #25688 from rohitwaghchaure/fixed-woocommerce-order-sync-issue 
fix: Woocommerce order sync issue
 2021-05-12 23:07:46 +05:30
Rohit Waghchaure
c3c54fe058 fix: Woocommerce order sync issue 2021-05-12 19:42:04 +05:30
rohitwaghchaure
3c79ee3a2b Merge pull request #25672 from rohitwaghchaure/fixed-don-not-mao-set-warehouse 
fix: don't map set warehouse from delivery note to purchase receipt
 2021-05-12 17:47:28 +05:30
Afshan
dc205e805f fix: Dialog variable assignment after definition in POS (#25681) 2021-05-12 17:42:06 +05:30
Afshan
6578c045ca fix: Dialog variable assignment after definition in POS (#25680) 2021-05-12 17:41:50 +05:30
rohitwaghchaure
4fbabb4132 Merge pull request #25679 from rohitwaghchaure/fixed-new-fields-not-added 
fix: updated modified time in purchase invoice to pull new fields
 2021-05-12 16:40:23 +05:30
rohitwaghchaure
4ec0656f64 Merge pull request #25678 from rohitwaghchaure/fixed-new-fields-not-added-pre 
fix: updated modified time in purchase invoice to pull new fields
 2021-05-12 16:39:35 +05:30