Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,056 Commits 3 Branches 0 Tags 1 GiB
55e97dce8a
Commit Graph

39056 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anupam
55e97dce8a fix: sider issue 2021-10-31 14:45:36 +05:30
Anupam
e290fe0721 fix: sider issue 2021-10-31 14:42:10 +05:30
Anupam
5d4c5652af feat: added confirm dialog on closing of workorder 2021-10-31 14:20:03 +05:30
Anupam
23af036894 feat: provision to close the Work Order 2021-10-29 17:27:17 +05:30
Deepesh Garg
d0e2b52f51
Merge pull request #28122 from nemesis189/consolidated-finan-report-empty-list-error 
fix: Consolidated Financial Report throws error for empty equity data list
 2021-10-29 12:11:16 +05:30
Deepesh Garg
28c116a1bf
Merge pull request #27609 from GangaManoj/unlink-po-on-cancelling-so 
fix: Unlink PO on cancelling SO
 2021-10-29 11:57:41 +05:30
Deepesh Garg
051aaa708d fix: Ignore PO on So cancel 2021-10-29 11:35:34 +05:30
Ganga Manoj
61757c17ae
Merge branch 'develop' into unlink-po-on-cancelling-so 2021-10-28 21:06:00 +05:30
GangaManoj
d24cfff388 fix: Remove unused imports 2021-10-28 20:06:48 +05:30
Deepesh Garg
98f4b90300
Merge pull request #28071 from deepeshgarg007/lower_deduction_cetificate_fixes 
fix : Get LTDS based on tax withholding category
 2021-10-28 19:59:19 +05:30
GangaManoj
1a9d2684e2 fix: Remove debugger 2021-10-28 19:27:45 +05:30
GangaManoj
8844fdbf23 fix: Remove print statements 2021-10-28 19:26:09 +05:30
Deepesh Garg
812249e5d1 Merge branch 'develop' of https://github.com/frappe/erpnext into lower_deduction_cetificate_fixes 2021-10-28 19:01:51 +05:30
Deepesh Garg
09a5616e2d fix: Rewrite patch using query builder 2021-10-28 19:01:24 +05:30
Deepesh Garg
8e2b4ef456
Merge branch 'develop' into unlink-po-on-cancelling-so 2021-10-28 14:44:34 +05:30
Ankush Menat
b01635e1da
refactor!: remove hub #28117 
refactor!: remove hub
 2021-10-28 14:07:15 +05:30
Subin Tom
d786855d94 fix: Consolidated Financial Report throws error for empty equity data list 2021-10-28 13:19:19 +05:30
Faris Ansari
c8d0d9ece9
Merge pull request #28048 from netchampfaris/print-format-builder-templates 
feat: Taxes template for selling/buying doctypes
 2021-10-28 12:33:21 +05:30
Anupam Kumar
4787a75208
fix: opportunity link is missign from customer (#28110) 2021-10-28 11:13:11 +05:30
Deepesh Garg
c5a16a999c
Merge pull request #28114 from deepeshgarg007/fs_auto_email_report 
fix: Autoemail report not showing dynamic report filters
 2021-10-27 19:58:26 +05:30
Ankush Menat
d81b87d9b3 fix(ux): make qty 1 by default in WO 2021-10-27 19:46:06 +05:30
Ankush Menat
2221c9ed89 fix: don't show blocked supplier in autocomplete 2021-10-27 19:46:06 +05:30
Ankush Menat
5902762ec8 fix(ux): alternative item two way validation 2021-10-27 19:46:06 +05:30
Ankush Menat
5f9bd9b8e9 fix: remove bad hardcoded max value 2021-10-27 19:46:06 +05:30
Deepesh Garg
3a6894fb9c fix: Autoemail report not showing dynamic report filters 2021-10-27 19:39:18 +05:30
Ankush Menat
e0cf45e7ec
fix(ux): misleading label for image fields (#28107) 2021-10-27 15:27:33 +05:30
Ganga Manoj
c9f3ea5fea
fix: Remove pointless buttons from Payment Order 
fix: Remove pointless buttons from Payment Order
 2021-10-27 15:16:38 +05:30
hendrik
f24ed6723e
fix(general_ledger): Order by in case Group by Account (#28093) 
* Update general_ledger.py

Fix order_by_statement if filter group by: Group by Account

* chore: whitespace

Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
 2021-10-27 14:38:20 +05:30
Deepesh Garg
af9ead84e9
Merge pull request #28080 from deepeshgarg007/payment_terms_precision_validate 
fix: Payment Terms validation precision
 2021-10-27 11:48:23 +05:30
Summayya Hashmani
0806e32049
fix(ux): add naming series to ERPNext setting workspace (#28090) 
* fix(ux): add naming series to setting workspace

* fix: doctype link to naming series

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

Co-authored-by: Summayya <frappe@Summayyas-MacBook-Air.local>
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
 2021-10-27 11:46:10 +05:30
Saqib
879a1fca76
perf(minor): improve sales invoice submission (#27916) 
* perf: skip get_pricing_rules if no pricing rule exists

* perf: fetch mode of payments data in single query

* perf: get total company stock only for purchase order

* perf: skip insertion of stock ledger entry

* fix: undo changes to allow negative stock flag

* fix: sider

Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-10-27 11:42:50 +05:30
Alan
05831b18ad
fix: update production plan status #27567 
fix: update production plan status
 2021-10-27 11:36:37 +05:30
mergify[bot]
25d1c1ce86
fix: add filter to query to avoid send reminder for zero years (#28092) (#28096) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
(cherry picked from commit 8cad23b8fb4d830a5703e107c371ae9319bc003d)

Co-authored-by: gsi-maruiz <62341390+gsi-maruiz@users.noreply.github.com>
 2021-10-27 11:21:26 +05:30
Dany Robert
2920f2f614
fix: change modified timestamp to apply changes on migrate #28095 
fix: change modified timestamp to apply changes on migrate
 2021-10-27 11:17:48 +05:30
Ankush Menat
479ecb8de0 test: picklist item grouping 2021-10-27 11:10:52 +05:30
Ankush Menat
6942900555 refactor: use defaultdict and enumeration 2021-10-27 11:10:52 +05:30
Diksha Jadhav
f2d136e574 feat(pick list): group items based on item code and warehouse before printing picklist 2021-10-27 11:10:52 +05:30
Ankush Menat
6ec047cba9
fix(ux): overbiling message in SO->SI, PO->PI (#28088) 2021-10-27 10:30:05 +05:30
Deepesh Garg
7ab7753bfa Merge branch 'develop' of https://github.com/frappe/erpnext into lower_deduction_cetificate_fixes 2021-10-26 20:56:40 +05:30
Deepesh Garg
a87c201785
Merge pull request #28054 from deepeshgarg007/tax_withholding_category_filters 
fix(minor): Filters and validations in Tax Withholding Category
 2021-10-26 20:51:24 +05:30
Deepesh Garg
0c28b477af
Merge pull request #28074 from deepeshgarg007/pan_field_hide_develop 
fix: Move PAN field from standard doctype to fixtures for India
 2021-10-26 20:44:11 +05:30
Deepesh Garg
6b22894275
Merge pull request #28052 from deepeshgarg007/company_address_update 
fix: Auto update company address check on linking with company
 2021-10-26 20:40:13 +05:30
Deepesh Garg
277dfeaf4e
Merge pull request #28057 from deepeshgarg007/company_change_fixes 
fix: Update receivable/payable account on company change
 2021-10-26 20:36:52 +05:30
Deepesh Garg
0136aedfdc
Merge pull request #28055 from deepeshgarg007/payment_entry_ux 
fix(UX): Add mandatory depends on condition for reference no and date fields
 2021-10-26 20:02:34 +05:30
Deepesh Garg
1165a8ac3a
Merge branch 'develop' into company_change_fixes 2021-10-26 19:52:45 +05:30
Deepesh Garg
89d5e494dd fix: Reload customer and supplier doctype 2021-10-26 19:51:03 +05:30
Kenneth Sequeira
07a3be6f61
fix: remove VM from installation (#28075) 2021-10-25 20:10:52 +05:30
Deepesh Garg
9c1705205f fix: Payment Terms validation precision 2021-10-25 20:06:24 +05:30
Subin Tom
fc8307621c
fix: POS Closing Entry without linked invoices (#28042) 2021-10-25 13:18:08 +05:30
Deepesh Garg
cd4b20313e fix: Test case fixes and linting issues 2021-10-25 11:21:55 +05:30