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

7212 Commits

Author SHA1 Message Date
Deepesh Garg
a57d39909e
Merge pull request #28302 from nemesis189/shipping-rule-updation-error 
fix: Shipping Rule picking up old net_rate
 2021-11-19 08:21:53 +05:30
rohitwaghchaure
b9c8489de6
Merge pull request #28417 from rohitwaghchaure/currency-wise-pricing-rule-not-working 
fix: currency wise pricing rule not working
 2021-11-17 14:02:19 +05:30
Rohit Waghchaure
43aeb541c2 fix: currency wise pricing rule not working 2021-11-17 13:30:17 +05:30
Sagar Vora
c00d0a3e24
fix: better validation for Integration Request (#28186) 2021-11-16 20:31:18 +05:30
Subin Tom
a8e2c02e14 fix: fixed tests, separated a method for shipping charges 2021-11-16 19:06:49 +05:30
Marica
6bd0c1dbf1
Merge pull request #28269 from marination/pr-return-ux 
refactor:  (ux) Accepted/Rejected/Received Qty UX
 2021-11-16 18:00:42 +05:30
Subin Tom
a1807a2f98
fix: POS idx issue in taxes table while merging (#28389) 2021-11-16 17:46:26 +05:30
Marica
4afcbfdc08
Merge branch 'develop' into pr-return-ux 2021-11-16 15:15:48 +05:30
marination
293f6cbafd fix: Sider, Linter and Server Side Test 
- Fix Server side PR test
- linter: re-arrange imports
- sider: avoid single line multi statement
- Code cleanup: Improve code readability and avoid horizontal scroll in test_purchase_receipt
- Removed unused variables in test_purchase_receipt
 2021-11-16 14:36:15 +05:30
Ahmed Shareef
952fc87c99
refactor: fix help section background in dark mode (#28406) 2021-11-16 14:30:13 +05:30
marination
e9c75d6eea test: Purchase Invoice Received Qty 2021-11-16 11:55:34 +05:30
Rohit Waghchaure
d82910b08a fix: Pricing Rule not created against the Promotional Scheme 2021-11-16 10:27:59 +05:30
marination
afe1c45f7f fix: Sider + Fields UX 
- remove extra space (sider)
- PR: Bring rejected qty in grid view
- PI: Rename `Stock Qty` to `Accepted Qty in Stock UOM`
- PI: Move `Accepted Qty in Stock UOM` under Stock UOM
 2021-11-15 17:17:29 +05:30
Deepesh Garg
829f92f10a
Merge pull request #28363 from deepeshgarg007/default_party_account 
fix: Default party account getting overriden in invoices
 2021-11-12 13:04:21 +05:30
Deepesh Garg
88648570d7 fix: Default party account getting overriden in invoices 2021-11-12 12:39:30 +05:30
rohitwaghchaure
0157da57b5
Merge pull request #28308 from rohitwaghchaure/commision-rate-not-fetch-from-sales-person 
fix: commission rate not fetch from sales person
 2021-11-11 19:11:31 +05:30
Saqib
ecbe4b16b8
perf(minor): general ledger report (#27987) 2021-11-11 13:55:21 +05:30
Saqib
6d05bb5274
fix(pos): get mode of payments query (#28321) 2021-11-10 13:06:55 +05:30
Anuja Pawar
2f004693c3
fix(Bank Reconciliation): get credit amount for bank account of type liability 2021-11-10 12:36:54 +05:30
Rohit Waghchaure
4d4bfa2333 fix: commision rate not fetch from sales person 2021-11-10 00:00:38 +05:30
Deepesh Garg
8a253ed1f3
Merge pull request #28238 from nextchamp-saqib/perf-financial-statements 
perf: improve financial statement loading time
 2021-11-09 16:29:58 +05:30
Saqib
4a3cef6436
fix: update 'current_invoice_end' after processing invoice (#28278) 2021-11-09 14:16:38 +05:30
Ankush Menat
8fe5feb6a4 chore: remove all six compat code 2021-11-05 11:16:29 +05:30
Ankush Menat
897e90ac55 chore: remove past module dependencies 2021-11-05 11:16:29 +05:30
Ankush Menat
6098e92ba9 chore: remove utf-8 compat code 2021-11-05 11:16:29 +05:30
Saqib Ansari
b7a44fe0a3 perf: improve financial statement loading time 2021-11-03 18:17:31 +05:30
hrwx
2bce193b81 Merge branch 'develop' of https://github.com/frappe/erpnext into subscription_active_fixes 2021-11-02 14:05:10 +00:00
Saqib
ec0a72423a
fix: Calculate depreciation_amount accurately (#27585) 2021-11-02 18:45:03 +05:30
hrwx
890a786858 fix: do not generate multiple invoices 2021-11-02 11:58:01 +00:00
Anuja Pawar
d72709dd81
fix(Payment Entry): splitting outstanding rows as per payment terms (#27946) 2021-11-02 16:28:46 +05:30
Deepesh Garg
fb9e72cc8a
Merge pull request #28162 from deepeshgarg007/pan_field_missing_error 
fix: Error for missing PAN no field
 2021-10-30 19:29:26 +05:30
Deepesh Garg
541c892f97 fix: Error for missing PAN no field 2021-10-30 18:22:46 +05:30
Anuja Pawar
1a6e98ed48
fix(Payment Reconciliation): clear child tables on company/party change (#28008) 2021-10-29 20:52:47 +05:30
Deepesh Garg
eb720d18c3
Merge pull request #28145 from deepeshgarg007/coa_import_is_group 
fix: COA importer importing all accounts as group
 2021-10-29 17:04:20 +05:30
Subin Tom
75a76e634d
fix: POS consolidated invoice rounded total issue (#28006) 2021-10-29 16:45:04 +05:30
Deepesh Garg
8ccd3fee9e fix: COA importer importing all accounts as group 2021-10-29 16:08:52 +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
812249e5d1 Merge branch 'develop' of https://github.com/frappe/erpnext into lower_deduction_cetificate_fixes 2021-10-28 19:01:51 +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
Saqib
f530764105
Merge branch 'develop' into fix-depr-after-sale 2021-10-28 12:43:51 +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
Saqib
a261d08dd8
fix: reset temporary flag after use 2021-10-27 18:30:37 +05:30
Saqib
470c07c6e9
Merge branch 'develop' into fix-depr-after-sale 2021-10-27 16:02:38 +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
Saqib
2e61c5eb55
Merge branch 'develop' into fix-depr-after-sale 2021-10-27 15:12:51 +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
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
GangaManoj
06c505ddc2 fix: Linters 2021-10-27 05:23:01 +05:30
GangaManoj
cde0dae987 fix: Add flag for reverse depreciation entries 2021-10-26 21:04:06 +05:30