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

21215 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Prateeksha Singh
0acb63a938
Update hub domain 💥 2018-02-16 11:07:12 +05:30
Saurabh
db6f0848e3 Merge branch 'hotfix' 2018-02-15 15:17:03 +05:30
Saurabh
ca166eaae5 bumped to version 10.0.23 2018-02-15 15:47:03 +06:00
rohitwaghchaure
a13b177908 [Fix] Not able to select delivery note in delivery trip (#12912) 2018-02-14 17:06:21 +05:30
Saurabh
0500ce445f Merge branch 'hotfix' 2018-02-14 11:45:31 +05:30
Saurabh
351dc08576 bumped to version 10.0.22 2018-02-14 12:15:31 +06:00
rohitwaghchaure
8e675ebbe2 [Fix] Price list exchange rate is not visible when base currency and price list currency is different (#12898) 2018-02-13 17:11:06 +05:30
Faris Ansari
d53b149828 [deadlock fix] Save if not set (#12896) 2018-02-13 16:31:00 +05:30
Faris Ansari
5a91989665 Remove total_projected_qty (#12889) 2018-02-13 16:00:52 +05:30
rohitwaghchaure
62d6593fe7 [Fix] Allow to make disbursement entry even if payment account in not set in the employee loan (#12882) 2018-02-13 14:43:37 +05:30
saurabh-bhosale
ed35a296ab closes #12872 (#12888) 2018-02-13 14:40:59 +05:30
rohitwaghchaure
6a7495dbc8 Removed set only once for maintain stock field in item master (#12878) 2018-02-12 17:25:24 +05:30
tundebabzy
6e90f49a35 Wrong Exchange Rate Is Fetched When Exchange Rate Is Different From Company Currency For Price Lists #12712 (#12714) 
* unconditionally fetch exchange rate

* Revert "unconditionally fetch exchange rate"

This reverts commit d0d404d342092b5ba4398ed3bd8d8ff8f60b5f8a.

* allow for `plc_conversion_rate` field to be reset

* fetch exchange rate using price list currency and company currency not form currency

* clean up
 2018-02-12 15:18:57 +05:30
rohitwaghchaure
6e7e70c977 Added PDC from journal entry in AR report (#12844) 2018-02-12 11:55:07 +05:30
rohitwaghchaure
0aeeb7e02c [Fix] Item variant details report (#12869) 2018-02-12 11:44:39 +05:30
Shreya Shah
caccd2289d posting-date-fix (#12849) 2018-02-12 11:34:46 +05:30
rohitwaghchaure
45ac31ab93 [Fix] Not able to save sales order (#12851) 2018-02-12 11:27:37 +05:30
rohitwaghchaure
7477899d2e Formatter, code cleanup (#12852) 2018-02-12 11:25:58 +05:30
rohitwaghchaure
13afef2f72
Merge pull request #12853 from saurabh6790/timesheet_fixes 
[fix] execute update_time_and_costing and update_project only for distinct task and projects
 2018-02-12 11:19:22 +05:30
Saurabh
cab73b8a02 [fix] execute update_time_and_costing and update_project only for distinct task and projects 2018-02-09 17:04:12 +05:30
Manas Solanki
c7a9e3424b
Merge pull request #12845 from manassolanki/fix-so-update 
don't set the ordered_qty in SO on load from BIN
 2018-02-09 13:16:14 +05:30
Manas Solanki
a884bd9c6a don't set the ordered_qty in SO on load from BIN 2018-02-09 13:12:07 +05:30