Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
46,158 Commits 3 Branches 0 Tags 1 GiB
d77b0295fa
Commit Graph

46158 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ruthra kumar
d77b0295fa
Merge pull request #36642 from ruthra-kumar/toggle_for_negative_rates 
refactor: toggle for negative item rates in Selling Settings
 2023-08-15 08:12:10 +05:30
ruthra kumar
a0fc68538f refactor: toggle for negative rates in Selling Settings 2023-08-15 07:34:33 +05:30
Kevin Shenk
7ab55b1bb2
fix: Document Name link validation in Bank Reconciliation Tool (#36495) 
fix: format_row broke Document Name link validation

#35540 broke Voucher Matching, leading to an invalid link exception on submission. This is because the format_row() function overwrites the row data instead of just providing a formatter on the DataTable column, and therefore passes through the formatted (linked) column data instead of the Document Name only.

This patch moves the appropriate frappe.form.formatters.Link function to a dedicated format hook on the DataTable columns definition, both fixing the error and retaining the functionality of #35540.
 2023-08-14 19:03:01 +05:30
abdosaeed95
670d9e5556
fix: validate loyalty_amount against rounded_total instead of grand_total (#36466) 2023-08-14 18:54:01 +05:30
HarryPaulo
843e77e72d
fix: standard formula to calculate the "difference" (#36612) 2023-08-14 18:51:30 +05:30
Deepesh Garg
985ff9781b
fix: Tax withholding post LDC limit consumed (#36611) 
* fix: Tax withholding post LDC limit consumed

* fix: LDC condition check
 2023-08-14 18:19:15 +05:30
Gursheen Kaur Anand
12a6f3b997
feat: add invoice totals in tax withholding report (#36567) 
* fix: add invoice totals in tax withholding report

* fix: naming series col in tax withholding report

* fix: tds computation summary cols
 2023-08-14 18:15:47 +05:30
mergify[bot]
1ff80fcbee
fix: Button Alignment center in hero slider (backport #36607) (#36638) 
fix: Button Alignment center in hero slider (#36607)

fix: speling in CSS (Button alignment center is not working on hero slider)#36561
(cherry picked from commit b131f70ed6a8e3b763d59106084440e08a73b815)

Co-authored-by: ViralKansodiya <141210323+viralkansodiya@users.noreply.github.com>
 2023-08-14 16:25:38 +05:30
Ankush Menat
8b57979e9c
fix: clear demo data with unknown columns (#36637) 2023-08-14 08:46:48 +00:00
ViralKansodiya
75652799cd
feat: Tick on checkbox to include draft timesheets (#36577) 
feat: Tick on Check box to include Draft Timesheets
 2023-08-14 14:14:49 +05:30
Ankush Menat
e023e33a15
fix(demo): drop parent item group (#36636) 
This is translated according to user language, so "All Item Groups" might not
exist on site.

The code already finds root item group without doing anything.

towards https://github.com/frappe/erpnext/issues/36635
 2023-08-14 13:46:16 +05:30
Deepesh Garg
fbb5058531
fix: AR/AP report based on payment terms (#36574) 
* fix: AR/AP report based on payment terms

* fix: AR/AP report based on payment terms
 2023-08-14 08:32:07 +05:30
Deepesh Garg
39ec11200e
fix(demo): Item creation with India Compliance app (#36627) 2023-08-13 18:33:09 +05:30
RitvikSardana
ae2c600223
fix: POS compatible for mobile view (#36534) 
* fix: POS compatable for mobile view

* fix: variables for margin and font size, and dark mode compatibility while selecting any item from cart

---------

Co-authored-by: Ritvik Sardana <ritviksardana@Ritviks-MacBook-Air.local>
 2023-08-13 13:27:43 +05:30
Naufal Afif
ce25f9e8c9
fix: wrong currency on financial-statement based reports (#36524) 
* add missing field options on financial_statement Total field

* format financial statement code
 2023-08-13 13:26:56 +05:30
ruthra kumar
3c7702c53c
Merge pull request #36309 from ruthra-kumar/fix_incorrect_validation_on_partial_pay_for_so 
fix: allocation validation blocks partial payment for SO and PO
 2023-08-13 08:42:42 +05:30
s-aga-r
539cfd08f0
fix: fetch Stock UOM from Item if not set (#36606) 2023-08-12 22:42:01 +05:30
Ankush Menat
2d3fa8040c fix(UX): make demo button dismissable for session 2023-08-12 11:35:02 +05:30
Ankush Menat
6b464edf84 fix: dont render demo clear button if onboarding tour present 2023-08-12 11:35:02 +05:30
Deepesh Garg
f8e7bc08af
Merge pull request #36564 from deepeshgarg007/monthly_sales_update 
fix: Make default sales update frequency as monthly instead of each transaction
 2023-08-11 22:39:04 +05:30
Deepesh Garg
7f062a71f1
Merge pull request #36582 from deepeshgarg007/final_total 
fix: Group Account total not showing in Financial Statements
 2023-08-11 21:56:44 +05:30
ruthra kumar
713880aef0
Merge pull request #36590 from ruthra-kumar/disallow_multiple_so_if_blocked_in_settings 
fix: disallow mulitple SO with same Purchase Order No if not enabled in Settings
 2023-08-11 19:46:24 +05:30
Anand Baburajan
627986efa1
fix: wrap none type rate under flt (#36602) 2023-08-11 18:01:27 +05:30
ruthra kumar
64614cd915 refactor(test): don't set po_no by default 2023-08-11 17:43:50 +05:30
Ankush Menat
57449589e7
chore: mergify - update stable branches 
[skip ci]
 2023-08-11 16:20:50 +05:30
Ankush Menat
581d98c5ae
Merge pull request #35777 from deepeshgarg007/demo_data_on_install 
feat: Demo setup
 2023-08-11 14:38:38 +05:30
Anand Baburajan
98e82e0d99
chore: set default filter dates if missing (#36597) 2023-08-11 08:51:48 +00:00
ruthra kumar
5bed119de9
Merge pull request #36593 from ruthra-kumar/update_permission_for_semi_auto_reconciliation_tool 
chore: update permissions for Process Payment Reconciliation
 2023-08-11 11:42:47 +05:30
ruthra kumar
cd28d15292 chore: update permissions for Process Payment Reconciliation 2023-08-11 10:56:57 +05:30
ruthra kumar
dbd3fdbb41 fix: disallow mulitple SO with same PO No 2023-08-11 09:59:07 +05:30
Anand Baburajan
d138948c70
feat: daily asset depreciation method [dev] (#36588) 
feat: daily asset depreciation method
 2023-08-10 17:46:01 +00:00
Deepesh Garg
90bc0d6bd0 Merge branch 'demo_data_on_install' of https://github.com/deepeshgarg007/erpnext into demo_data_on_install 2023-08-10 21:48:03 +05:30
Deepesh Garg
567f4c37fc fix: Add order data 2023-08-10 21:46:34 +05:30
Deepesh Garg
000de4eddf chore: Update customer/supplier names 2023-08-10 21:45:55 +05:30
Ankush Menat
c8e6e067ae chore: telemetry for demo data erasure 2023-08-10 18:27:42 +05:30
Ankush Menat
8bdf280cfb fix: confirm before clearing demo data 2023-08-10 17:55:15 +05:30
Ankush Menat
e4b863af05 refactor: gracefully fail while clearing demo data 2023-08-10 17:52:53 +05:30
Ankush Menat
940b1d9e67 feat(ux): account workspace number cards 2023-08-10 17:46:35 +05:30
Ankush Menat
704e6577e5 chore: use royalty free images 2023-08-10 17:29:55 +05:30
Ankush Menat
5fb92cbb49 fix: enqueue at front to speed up demo 2023-08-10 17:16:58 +05:30
Ankush Menat
3a21c90d10 fix: misc fixes in demo data 
- Generate demo data field copy
- absolute imports
- remove whitelisting where it's not required
- telemetry
- banner copy
- move to background
- clear bootinfo after setup
 2023-08-10 16:53:16 +05:30
Deepesh Garg
baf5cddd1b fix: Group Account total not showing in Financial Statements 2023-08-10 16:09:38 +05:30
ruthra kumar
936fb1decf
Merge pull request #36578 from ruthra-kumar/toggle_uom_hiding_on_print 
fix: unhide `uom` and `stock_uom` fields in print view
 2023-08-10 15:38:32 +05:30
ruthra kumar
18e3c67d97
Merge pull request #36573 from ruthra-kumar/system_generated_field_and_update_remarks 
refactor: 'is system generated' field and better remarks in Journal Entry
 2023-08-10 15:37:47 +05:30
Ankush Menat
f2eb3d0f94 chore: remove old build system file 
[skip ci]
 2023-08-10 15:24:07 +05:30
Ankush Menat
ba6de0b4ff Merge branch 'develop' into demo_data_on_install 2023-08-10 15:22:52 +05:30
ruthra kumar
11cd163db7 fix: unhide uom and stock_uom fields in print view 2023-08-10 14:40:47 +05:30
ruthra kumar
4ed4b0240d refactor: enable 'no-copy' 2023-08-10 14:32:37 +05:30
ruthra kumar
de17eaef38 refactor: set flag display condition 2023-08-10 10:05:25 +05:30
Ankush Menat
5169006085 fix: move company rename to long queue 2023-08-10 10:02:59 +05:30