Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
21,237 Commits 3 Branches 0 Tags 1 GiB
3799f8bec9
Commit Graph

21237 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nabin Hait
3799f8bec9 Don't validate serial nos while cancelling the transaction 2018-02-26 16:39:06 +05:30
Nabin Hait
127c61e930 Fixed logic in itemwise recommended reorder level 2018-02-26 12:43:17 +05:30
Nabin Hait
e55831a89c Projected Qty in Auto reorder email 2018-02-26 11:38:40 +05:30
Nabin Hait
4ff4d185f7 Merge branch 'hotfix' 2018-02-23 16:59:42 +05:30
Nabin Hait
d54953e419 bumped to version 10.1.4 2018-02-23 17:29:42 +06:00
Zarrar
339426c926 fix permission issue for stock balance report - Item Group (#13069) 2018-02-23 16:58:55 +05:30
Nabin Hait
489ff6e21c Merge branch 'hotfix' 2018-02-23 16:49:41 +05:30
Nabin Hait
d12fb58c12 bumped to version 10.1.3 2018-02-23 17:19:40 +06:00
Ameya Shenoy
82048cf3ce verify payment entry amount is positive (#13066) 
* verify payment entry amount is positive

* Update sales_invoice.py

* Update sales_invoice.py
 2018-02-23 16:33:28 +05:30
rohitwaghchaure
4d76269eeb [Fix] Item wise sales register report (#13055) 2018-02-23 16:25:30 +05:30
Shreya Shah
d5b2e39f45 improve validation (#13058) 2018-02-23 16:23:57 +05:30
rohitwaghchaure
dd0fc1084e [Fix] PDC amount, PDC print layout issue (#13062) 2018-02-23 16:20:46 +05:30
Nabin Hait
d283ee73f3 Fetch timesheet based on project 2018-02-23 12:58:39 +05:30
Nabin Hait
93f138eece Merge branch 'hotfix' 2018-02-22 18:18:34 +05:30
Nabin Hait
2b2cf13408 bumped to version 10.1.2 2018-02-22 18:48:34 +06:00
Nabin Hait
7f49b57aaa
Update added_extra_gst_custom_field_in_gstr2.py 2018-02-22 18:17:57 +05:30
Nabin Hait
00330f52bd Merge branch 'hotfix' 2018-02-22 18:10:37 +05:30
Nabin Hait
6b69fc7e5d bumped to version 10.1.1 2018-02-22 18:40:37 +06:00
Saurabh
d8cd54dfd0 [fix] remove gstr2 fields from Sales Invoice and Delivery Note too (#13047) 2018-02-22 18:05:40 +05:30
tundebabzy
2949e9c5dc
Merge pull request #13036 from tundebabzy/issue-13019 
Uncaught Server Exception : adjust_qty_for_expired_items #13019
 2018-02-22 11:04:53 +01:00
Nabin Hait
15bd3167a8 Merge branch 'hotfix' 2018-02-22 14:39:37 +05:30
Nabin Hait
9b530fb2cb bumped to version 10.1.0 2018-02-22 15:09:37 +06:00
Nabin Hait
06bace9089
Fixed develop version 2018-02-22 14:36:26 +05:30
tundebabzy
c15978fca0 fix indentation 2018-02-22 09:50:49 +01:00
Nabin Hait
cb2264e0b4 Merge branch 'vishdha-leaderboard' into hotfix 2018-02-22 14:00:04 +05:30
Nabin Hait
7d862276af Cleanup and fixes on leaderboard 2018-02-22 13:59:41 +05:30
Nabin Hait
e4fe2d9603 Merge branch 'leaderboard' of https://github.com/vishdha/erpnext into vishdha-leaderboard 2018-02-22 11:35:10 +05:30
rohitwaghchaure
23a2b65576 [Fix] BOM Update Tool not update grandparent's exploded BOM (#13026) 2018-02-22 11:32:09 +05:30
Shreya Shah
0bde9e11c7 clear log if no attachments (#13023) 2018-02-22 10:55:40 +05:30
vishdha
09d56754ea [fix] Codacy issue 2018-02-21 16:10:09 +05:30
vishdha
e9166d7c19 [fix] Sales partner details get from sales Order and company currency details from selected company 2018-02-21 15:35:58 +05:30
vishdha
9a64d4371e [fix] Codacy Issue 2018-02-21 15:35:58 +05:30
vishdha
d4491d361f [new] Filter based on company: 2018-02-21 15:35:58 +05:30
vishdha
09acb779d7 [new] Leader board 2018-02-21 15:35:58 +05:30
Zarrar
67f74414c4 disable expand_all button for BOM (#13015) 2018-02-21 14:46:41 +05:30
Shreya Shah
8a77a0e1e4 Add total row in all trends reports (#13010) 
* total in sales order trends report

* total in all trends reports
 2018-02-21 14:46:07 +05:30
Zarrar
bc5515651b [Hotfix] Selecting create on blank field throws error (#13014) 
* selecting create on blank field error fix

* error when fetching default_print_format
 2018-02-21 11:13:14 +05:30
Shreya Shah
f65afac353 db_update instead of save to avoid unnecessary validations (#13009) 2018-02-21 11:12:04 +05:30
Pawan Mehta
2fbb4923a7 item balance report (#12983) 
* item balance report

* remove hard coding

* Update item_balance.json

* Update item_balance.json

Change name to "Item Balance (Simple)"

* Update item_balance.json
 2018-02-20 12:17:49 +05:30
rohitwaghchaure
554f2de23d Code cleanup online POS (#12985) 2018-02-20 11:18:01 +05:30
Vishal Dhayagude
a5003f8f5b [minor] Balance Qty added in reorder level email notification (#13000) 2018-02-20 11:14:54 +05:30
tundebabzy
6c5d7986ab Outstanding Amount not getting updated in Payment Entry #12713 (#12975) 
* allow to `set_missing_ref_details` by force

* update payment entry references during submit and cancel
 2018-02-19 13:11:56 +05:30
Shreya Shah
5448318146 fix total field (#12992) 2018-02-19 12:44:52 +05:30
Pawan Mehta
174a18399c Added Payment Details to Sales Payment Summary Report (#12358) 
* [fix] #12357

* label changes
 2018-02-19 12:39:13 +05:30
Saurabh
ec23a6f0eb [fix] section break for raw_material_details (#12976) 2018-02-19 11:33:11 +05:30
Jay Parikh
33b2614377 [Bug] Wrong Calculation of Total Weight at Purchase Invoice item for Purchasing in Different Unit (UoM) #12965 (#12966) 2018-02-16 14:45:40 +05:30
Nabin Hait
b95ecd7fcd
Gstr reports (#12940) 
* GSTR1 for B2B (#12296)

* [minor] Modified GSTR1 report to identify missing GST Account in GST Settings (#12426)

* [minor] Modified GSTR1 report to identify missing GST Account in GST Settings

* Update gstr_1.py

* GSTR1 for B2B, B2CL and B2CS (#12459)

* [Report] GSTR - 1 CDNR Report (#12554)

* [wip] cdnr

* [WIP] cdnr with optional data

* [wip] Export GSTR-1

* [minor] Minor changes in export

* [new] Custom field added for GST

* [fix] Minor changes in GSTR1 Report

* [minor] Minor changes in gstr1

* [fix] Codacy Fixed

* Update setup.py

* [wip] Gstr2

* [fix] Fetch correct Tax Details

* [minor] ITC data append to row

* [fix] CDNR negative value

* Cleanup and fixes on GSTR-2

* Minor fixes in gstr reports (#12848)

* [new] B2C limit fetch from GST Settings (#12905)

* [new] b2c limit fetch from gst setting

* [fix] Patch Added for b2c limit

* Update gstr_1.py

* Update utils.py

* Cusotm fields related GSTR2

* minor fixes

* minor fixes

* some more fixes

* Added duplicate patch and some tests as not required on develop
 2018-02-16 13:19:04 +05:30
Nabin Hait
cc98d40ff7
Payment reco auto allocation and maintain same order of records (#12963) 
* Automatically allocate amount after selecting invoice against a payment entry

* codacy fixes
 2018-02-16 13:14:20 +05:30
rohitwaghchaure
103c4e9b92 [Fix] Incorrect rate in item-wise sales register (#12943) 2018-02-16 12:57:35 +05:30
Zarrar
5a947f38ab avoid overlap with dropdown (#12941) 2018-02-16 12:49:30 +05:30