Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
30,329 Commits 3 Branches 0 Tags 1 GiB
5dcd2c118e
Commit Graph

30329 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shivam Mishra
1fd1852c6a
Merge branch 'develop' into yet-another-desk 2020-03-10 18:20:27 +05:30
Deepesh Garg
4b20e852ea fix: Get invoice details only if invoice is selected 2020-03-10 10:36:05 +05:30
Deepesh Garg
9f28a3124c
Merge pull request #20890 from deepeshgarg007/itemised_purchase_register 
fix: HSN code not visible in GST Itemised Purchase register
 2020-03-10 10:05:31 +05:30
Deepesh Garg
74d4e9e4ea
Merge pull request #20884 from deepeshgarg007/first_row_dimension 
fix: Acccounting Dimension disappearing in first row after refresh
 2020-03-09 22:47:25 +05:30
Deepesh Garg
5e58666091 fix: HSN code not visible in GST Itemised Purchase register 2020-03-09 22:38:41 +05:30
Saqib
f866ed9679
fix: [pos] customer group filter resets on syncing offline invoices (#20873) 2020-03-09 18:30:47 +05:30
Marica
508ad51d9c
fix: Validate Serial No/Batch No against unserialized Item in Stock Reconciliation (#20858) 2020-03-09 18:13:41 +05:30
Marica
4528badfcf
fix: ModuleNotFoundError on Turkey Company setup (#20853) 2020-03-09 18:07:43 +05:30
Deepesh Garg
8d72b14776 fix: Acccounting Dimension disappearing in first row after refresh 2020-03-09 08:06:07 +05:30
Raffael Meyer
f669f30c08 add missing equity accounts 2020-03-06 16:17:06 +01:00
Raffael Meyer
7b7513ab2b adjust groups 2020-03-06 12:32:49 +01:00
Saqib
b978d79573
fix: show uom in print formats instead of stock uom (#20843) 
Co-authored-by: Saqib Ansari <saqibansari@Saqibs-MacBook-Pro.local>
 2020-03-06 11:03:46 +05:30
Marica
fc96c1a2d6
fix: update_child_qty_rate() missing argument (#20838) 2020-03-06 10:57:59 +05:30
Shivam Mishra
0310366d5a fix (cleanup): remove incomplete dependencies data 2020-03-05 11:28:40 +05:30
Chinmay D. Pai
612e58dca8
fix: use ERPNext in welcome email when default company is not set 
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
 2020-03-05 10:08:43 +05:30
Deepesh Garg
6dc335d898
Merge pull request #20824 from scmmishra/report-options 
feat: update profit and loss for new report summary API
 2020-03-04 16:07:31 +05:30
Deepesh Garg
a75cf35bb7
Merge pull request #20755 from lokesh-indictrans/develop 
fix: user is not able to do 'Set as Lost' for Quotation (#20603)
 2020-03-04 11:56:52 +05:30
Deepesh Garg
6d604a151b
fix: Validation message 2020-03-04 11:55:10 +05:30
Deepesh Garg
d985aa0f15
Merge pull request #20820 from deepeshgarg007/gst_itemised 
fix: HSN code no visible in GST itemised sales register
 2020-03-04 10:42:14 +05:30
Deepesh Garg
a245a3a47f fix: HSN code no visible in GST itemised sales register 2020-03-04 10:23:49 +05:30
Lokesh Waingankar
d398c73bc5 fix: Removed html tags in pop up message (#20603) 2020-03-03 19:07:51 +05:30
Lokesh Waingankar
6795422204 Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2020-03-03 12:12:56 +05:30
Shivam Mishra
1f151c1032 refactor: update restrict to domain data 2020-03-02 19:37:12 +05:30
Anurag Mishra
cf04b3c680
fix: added standard filters (#20807) 2020-03-02 19:25:01 +05:30
Deepesh Garg
12aa35aa43
fix: Label and UX fixes in AP/AP reports (#20803) 2020-03-02 19:10:29 +05:30
Priyanka Gangar
ca05c83796
fix: fetch sales person name (#20805) 
* fix: fetch sales person name

* Update sales_person.js

Co-authored-by: pinka0925 <44537026+pinka0925@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-03-02 19:06:06 +05:30
Deepesh Garg
cd96be9993
fix: Excel support and UX fixes for chart of accounts importer (#20703) 
* fix: Excel support and UX fixes for chart of accounts importer

* fix: Linting Errors

* fix: Blank chart preview

* fix: Added template types for download

* fix: Description on template selection

* fix: Linting fixes

* fix: Move logic for download template to dialog
 2020-03-02 18:57:21 +05:30
Deepesh Garg
cc2771baa7
fix: Total amount not displayed in Journal Entry (#20794) 
* fix: Total amount not displayed in Journal Entry

* fix: Update paid_to_received field

* fix: set total amount

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-03-02 18:09:19 +05:30
Saurabh
19df2ffbd8
[bug][fix]: set status to object instead of variable (#20790) 2020-03-02 17:50:05 +05:30
Lokesh Waingankar
38242bc21f Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2020-03-02 17:45:59 +05:30
Shivam Mishra
3f59af3ef1 feat: added base config for domains 2020-03-02 17:25:18 +05:30
Shivam Mishra
8a8e8d6c5c feat: added base pages for desk 2020-03-02 16:56:31 +05:30
Frappe PR Bot
eb2f79b16e
feat: Updated translation (#20784) 2020-03-02 16:52:42 +05:30
Marica
ed25ec7ee5
chore: Item Price and Product Bundle Form cleanup (#20772) 
* chore: Item Price and Product Bundle Form cleanup

* fix: Trailing comma
 2020-03-02 15:51:14 +05:30
Saqib
ff52d16fb3
chore: control reposting of future gl entries with flags (#20774) 2020-03-02 15:19:18 +05:30
Saqib
e9ac3e0d64
feat: link serial no to batch no (#20778) 
* feat: link serial no to batch no

* fix: test cases
 2020-03-02 15:02:58 +05:30
Saqib
7b8c3dee3d
fix: reconciled entries showing in bank reco (#20787) 2020-03-02 15:01:06 +05:30
P-Froggy
f1014bb978 Merge branch 'develop' of https://github.com/P-Froggy/erpnext into develop 2020-03-02 00:21:12 +01:00
P-Froggy
313efe9b32 fix: add missing semicolon 2020-03-02 00:21:08 +01:00
P-Froggy
3bf04154b1
Merge branch 'develop' into develop 2020-03-02 00:18:23 +01:00
Deepesh Garg
9ec42ee588
Merge pull request #20786 from deepeshgarg007/loan-applicationfetch-fix 
fix: Remove fetch from loan_application.json
 2020-03-01 22:18:16 +05:30
Deepesh Garg
09188e4a21 fix: Remove fetch from loan_application.json 2020-03-01 22:16:27 +05:30
Deepesh Garg
0c7b60aa99
Merge pull request #20768 from marination/buying-dashboard 
chore: Rearranged Buying Module Dashboard
 2020-02-29 17:33:51 +05:30
Deepesh Garg
a624b7312a
Merge pull request #20782 from radhikagattani123/develop 
fix: Student Admission accepting end date less than start date. #20625
 2020-02-29 17:29:42 +05:30
radhikag
86ecaa59ca fix : Student Admission accepting end date less than start date. #20625 2020-02-29 12:47:03 +05:30
Deepesh Garg
2090d113e5
Merge pull request #20781 from deepeshgarg007/loan_shortfall_enhance 
fix: Add loan to value ratio in loan security type
 2020-02-29 09:01:27 +05:30
Deepesh Garg
eee7f77d47 fix: Add loan to value ratio in loan security type 2020-02-29 08:58:15 +05:30
P-Froggy
f9b3e4be78 Merge branch 'develop' of https://github.com/P-Froggy/erpnext into develop 2020-02-28 20:46:41 +01:00
P-Froggy
266e689c4f fix: Show swift number and branch code in quick entry of bank doctype 2020-02-28 20:46:36 +01:00
P-Froggy
393a626834 fix: Allow only bank accounts of the respective party in payment entry 2020-02-28 20:45:48 +01:00