Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
37,450 Commits 3 Branches 0 Tags 1 GiB
82d147ea62
Commit Graph

37450 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Saqib Ansari
61675f1a43 fix: purchase receipt gl entries with same item code 2021-06-17 13:05:43 +05:30
GangaManoj
05c70ac584 fix(Asset): Replace asset_value with value_after_depreciation in Finance Books 2021-06-17 13:02:02 +05:30
Deepesh Garg
510077b3d4 fix(minor): Translation and linting issues 2021-06-17 11:21:21 +05:30
Deepesh Garg
b8442816ca Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into payroll_accounting_dimension 2021-06-17 11:19:12 +05:30
Suraj Shetty
00332d1834 Merge branch 'develop' of github.com:frappe/erpnext into refactor-website-routing 2021-06-17 09:47:16 +05:30
GangaManoj
66d4e2ba51 fix(Asset Repair): Display value_after_depreciation in Finance Books 2021-06-17 08:28:19 +05:30
Deepesh Garg
913e92c29f
Merge pull request #26044 from GangaManoj/account-multiselect-gl 
feat(General Ledger): Implement multi-account selection
 2021-06-16 22:33:50 +05:30
Deepesh Garg
5c19a9251f fix: Accouting Dimensions for payroll entry accrual Journal Entry 2021-06-16 22:14:29 +05:30
Subin Tom
6f9de8c86f fix: removed extra space from label rate 2021-06-16 20:01:29 +05:30
Subin Tom
c03a947e98 fix: removed extra space from label rate 2021-06-16 19:47:55 +05:30
Saqib Ansari
2be7e90e78 fix(e-invoicing): IRN generation for export invoices with round off 2021-06-16 19:00:34 +05:30
GangaManoj
41b7c1aec0 fix(General Ledger): Improve account filter 2021-06-16 14:40:14 +05:30
Afshan
3b1b4684ba
fix: check for duplicate payment terms in Payment Term Template (#26003) 2021-06-16 14:30:45 +05:30
Afshan
8c73f6f19e
fix(pos): pos loyalty card alignment (#26051) 2021-06-16 14:28:26 +05:30
Afshan
d5c172590f
fix(pos): pos loyalty card alignment (#26050) 2021-06-16 14:28:03 +05:30
Saqib
60ce00531d
fix: label for enabling ledger posting of change amount (#26070) 2021-06-16 14:25:55 +05:30
GangaManoj
86f689e54a fix(General Ledger): Get account_currency accurately 2021-06-16 14:23:02 +05:30
Anurag Mishra
b1c72da7d7 fix: Training event 2021-06-16 14:08:32 +05:30
Saqib
1fd80992d7
fix(pos): 'NoneType' object is not iterable (#26066) 2021-06-16 13:27:34 +05:30
Ankush
fd84847f2b
fix: syntax fixes for native class (#26064) 2021-06-16 11:14:40 +05:30
Deepesh Garg
d70c6996f2
Merge pull request #25951 from nextchamp-saqib/invoice-opening-pnl-validation 
fix: opening invoices can alter profit and loss of a closed year
 2021-06-16 10:52:40 +05:30
GangaManoj
34997789cd fix(Asset Repair): Filter Warehouse by Company 2021-06-16 10:48:07 +05:30
GangaManoj
6d6aee29e8 fix(Asset Repair): Fix GL Entry creation 2021-06-16 10:42:37 +05:30
GangaManoj
491763fa27 fix(Asset Repair): Fix Sider issues 2021-06-16 08:45:54 +05:30
GangaManoj
a33e751b0f fix(Asset Repair): Make Cost Center non-mandatory 2021-06-16 08:35:50 +05:30
GangaManoj
abb0c769a4 fix(Asset Repair): Uncheck allow_on_submit for all fields 2021-06-16 08:33:05 +05:30
GangaManoj
c61bbc5915 fix(Asset Repair): Use existing function from asset.py for fetching fixed_asset_account 2021-06-16 08:26:02 +05:30
GangaManoj
94ac52c47d fix(Asset Repair): Add mandatory_depends_on condition for Purchase Invoice 2021-06-16 08:18:45 +05:30
GangaManoj
71c60f75d7 fix(Asset Repair): Filter Cost Center and Project by Company 2021-06-16 08:13:36 +05:30
GangaManoj
9e07b7d4a7 fix(Asset Repair): Add Company field 2021-06-16 08:07:06 +05:30
GangaManoj
bf52f55870 fix(Asset Repair): Make Stock Items and Warehouse mandatory if stock_consumption is checked 2021-06-16 07:56:40 +05:30
GangaManoj
695cd70994 fix(Asset Repair): Add title to error messages 2021-06-16 07:50:03 +05:30
GangaManoj
14ea9ebcb7 fix(Asset Repair): Display fields according to the state of the doc 2021-06-16 07:03:32 +05:30
GangaManoj
53a9ac4466 fix(General Ledger): Condense account_conditions 2021-06-16 04:10:29 +05:30
GangaManoj
79dc0f0afc fix: Remove console.log() 2021-06-16 03:37:11 +05:30
Deepesh Garg
fb9cb78980
Merge pull request #26045 from GangaManoj/filter-cc-project 
fix(General Ledger): Filter Cost Center and Project drop-down lists by Company
 2021-06-15 21:18:49 +05:30
Nabin Hait
0950481253 fix: merge conflict 2021-06-15 20:18:06 +05:30
Nabin Hait
a97556fa8d Merge branch 'version-13-pre-release' into version-13 2021-06-15 19:58:40 +05:30
Nabin Hait
24a88f6cf6 bumped to version 13.5.0 2021-06-15 20:18:40 +05:50
Nabin Hait
1e2df2c109 fix(pos): 'NoneType' object is not iterable 2021-06-15 19:53:57 +05:30
Nabin Hait
b2f2d0e749 chore: Added change log for v13.5.0 2021-06-15 19:44:06 +05:30
Noah Jacob
b5a1491176
fix: escaped warehouse value for sql query (#26049) 2021-06-15 12:44:04 +05:30
Deepesh Garg
95bc141531
Merge pull request #26056 from deepeshgarg007/gst_taxtable_value_with_discount_v13 
fix(India): Taxable value for invoices with additional discount
 2021-06-15 12:05:16 +05:30
GangaManoj
285bc60684 fix(Asset Repair): Set asset_name as title 2021-06-15 12:02:07 +05:30
GangaManoj
d4acf87feb fix(Asset Repair): Make Accounting Dimensions section collapsible 2021-06-15 11:37:17 +05:30
Deepesh Garg
433815daba fix: Update einvoice json test 2021-06-14 20:43:51 +05:30
Deepesh Garg
4afda3c89c fix(India): Taxable value for invoices with additional discount 2021-06-14 20:43:42 +05:30
Deepesh Garg
a717b5ad6e
Merge pull request #26055 from deepeshgarg007/payment_entry_auto_tax_fixes_pre_release 
fix: Auto tax calculations in Payment Entry
 2021-06-14 20:39:52 +05:30
Deepesh Garg
5149101045
Merge pull request #26037 from deepeshgarg007/payment_entry_auto_tax_fixes 
fix: Auto tax calculations in Payment Entry
 2021-06-14 20:39:41 +05:30
Deepesh Garg
bbf6121bb5 fix: Revert unintended changes 2021-06-14 20:09:31 +05:30